diff options
213 files changed, 21040 insertions, 27155 deletions
diff --git a/FILES.byname b/FILES.byname index 0bf9f5fe79..03c2cbaa8e 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2047,12 +2047,12 @@ 2022/12/25 | 1673 | biblio/citation-style-language/README.md 2022/12/25 | 11958 | biblio/citation-style-language/vancouver.csl 2022/12/25 | 604004 | biblio/citation-style-language.zip -2023/03/10 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/03/11 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2023/03/10 | 2768677 | biblio/ctan-bibdata/ctan.bib -2023/03/10 | 3653738 | biblio/ctan-bibdata/ctan.pdf +2023/03/11 | 2768681 | biblio/ctan-bibdata/ctan.bib +2023/03/11 | 3654013 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2023/03/10 | 4048478 | biblio/ctan-bibdata.zip +2023/03/11 | 4050238 | biblio/ctan-bibdata.zip 2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk 2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh 2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst @@ -5408,7 +5408,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2023/03/10 | 154567 | FILES.last07days +2023/03/11 | 156913 | FILES.last07days 2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs 2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf 2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf @@ -5876,6 +5876,13 @@ 2003/07/10 | 3192 | fonts/ae/vf/laessb8.vf 2003/07/10 | 3164 | fonts/ae/vf/laessi8.vf 2007/07/04 | 236485 | fonts/ae.zip +2023/03/11 | 130437 | fonts/alchemist/alchemist.pdf +2023/03/11 | 2144 | fonts/alchemist/alchemist-ref.bib +2023/03/11 | 15328 | fonts/alchemist/alchemist.sty +2023/03/11 | 43007 | fonts/alchemist/alchemist.tex +2023/03/11 | 12800 | fonts/alchemist/manual.sty +2023/03/11 | 858 | fonts/alchemist/README.md +2023/03/11 | 149124 | fonts/alchemist.zip 2019/10/15 | 1103219 | fonts/alegreya/doc/alegreya-samples.pdf 2019/10/12 | 2448 | fonts/alegreya/doc/alegreya-samples.tex 2019/10/09 | 4391 | fonts/alegreya/doc/OFL.txt @@ -152628,475 +152635,485 @@ 2022/10/22 | 1338 | graphics/chemobabel/LICENSE 2022/10/22 | 1726 | graphics/chemobabel/README.md 2022/10/22 | 1325653 | graphics/chemobabel.zip -2022/11/28 | 1185 | graphics/circuit_macros/boxdims.sty -2022/11/28 | 13829 | graphics/circuit_macros/CHANGES -2022/11/28 | 462 | graphics/circuit_macros/Copying -2022/11/28 | 14279 | graphics/circuit_macros/darrow.m4 -2022/11/28 | 26 | graphics/circuit_macros/doc/ACsymbol.m4 -2022/11/28 | 494 | graphics/circuit_macros/doc/AmpTableMan.m4 -2022/11/28 | 1230 | graphics/circuit_macros/doc/AntennasMan.m4 -2022/11/28 | 1618 | graphics/circuit_macros/doc/ArrestersMan.m4 -2022/11/28 | 1017 | graphics/circuit_macros/doc/arrowex.m4 -2022/11/28 | 2634 | graphics/circuit_macros/doc/AudioMan.m4 -2022/11/28 | 131 | graphics/circuit_macros/doc/Axes.m4 -2022/11/28 | 614 | graphics/circuit_macros/doc/BigResistor.m4 -2022/11/28 | 1619 | graphics/circuit_macros/doc/BipMan.m4 -2022/11/28 | 1074 | graphics/circuit_macros/doc/bistableMan.m4 -2022/11/28 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 -2022/11/28 | 130 | graphics/circuit_macros/doc/bitrbody.m4 -2022/11/28 | 50 | graphics/circuit_macros/doc/bitr.m4 -2022/11/28 | 154219 | graphics/circuit_macros/doc/body.tex -2022/11/28 | 1953 | graphics/circuit_macros/doc/Buffer.m4 -2022/11/28 | 1063 | graphics/circuit_macros/doc/CapacitorsMan.m4 -2022/11/28 | 4343 | graphics/circuit_macros/doc/Circuit_macros.bib -2022/11/28 | 1030606 | graphics/circuit_macros/doc/Circuit_macros.pdf -2022/11/28 | 3019 | graphics/circuit_macros/doc/Circuit_macros.tex -2022/11/28 | 1857 | graphics/circuit_macros/doc/Composite.m4 -2022/11/28 | 1121 | graphics/circuit_macros/doc/ConfigA.m4 -2022/11/28 | 1258 | graphics/circuit_macros/doc/ConfigB.m4 -2022/11/28 | 1292 | graphics/circuit_macros/doc/ConfigC.m4 -2022/11/28 | 2179 | graphics/circuit_macros/doc/ConnMan.m4 -2022/11/28 | 3326 | graphics/circuit_macros/doc/ContactMan.m4 -2022/11/28 | 1585 | graphics/circuit_macros/doc/ContactsMan.m4 -2022/11/28 | 1995 | graphics/circuit_macros/doc/Corners.m4 -2022/11/28 | 1329 | graphics/circuit_macros/doc/currents.m4 -2022/11/28 | 2389 | graphics/circuit_macros/doc/Dac.m4 -2022/11/28 | 1151 | graphics/circuit_macros/doc/Darlington.m4 -2022/11/28 | 26 | graphics/circuit_macros/doc/DCsymbol.m4 -2022/11/28 | 105650 | graphics/circuit_macros/doc/defines.tex -2022/11/28 | 1485 | graphics/circuit_macros/doc/DemultiplexerMan.m4 -2022/11/28 | 1790 | graphics/circuit_macros/doc/DiodesMan.m4 -2022/11/28 | 483 | graphics/circuit_macros/doc/eboxdims.m4 -2022/11/28 | 981 | graphics/circuit_macros/doc/EmarrowsMan.m4 -2022/11/28 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 -2022/11/28 | 5315 | graphics/circuit_macros/doc/fetMan.m4 -2022/11/28 | 329 | graphics/circuit_macros/doc/FF.m4 -2022/11/28 | 1975 | graphics/circuit_macros/doc/FlipFlop.m4 -2022/11/28 | 970 | graphics/circuit_macros/doc/Flowdiag.m4 -2022/11/28 | 999 | graphics/circuit_macros/doc/FusesMan.m4 -2022/11/28 | 831 | graphics/circuit_macros/doc/GroundsMan.m4 -2022/11/28 | 1132 | graphics/circuit_macros/doc/HeadersMan.m4 -2022/11/28 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 -2022/11/28 | 1342 | graphics/circuit_macros/doc/InductorsMan.m4 -2022/11/28 | 2362 | graphics/circuit_macros/doc/JackMan.m4 -2022/11/28 | 2119 | graphics/circuit_macros/doc/LogicMan.m4 -2022/11/28 | 269 | graphics/circuit_macros/doc/Loop.m4 -2022/11/28 | 387 | graphics/circuit_macros/doc/lrarrows.m4 -2022/11/28 | 4969 | graphics/circuit_macros/doc/Makefile -2022/11/28 | 963 | graphics/circuit_macros/doc/MoreTableMan.m4 -2022/11/28 | 1575 | graphics/circuit_macros/doc/mplex.m4 -2022/11/28 | 1400 | graphics/circuit_macros/doc/MultiplexerMan.m4 -2022/11/28 | 499 | graphics/circuit_macros/doc/NLGMan.m4 -2022/11/28 | 1128 | graphics/circuit_macros/doc/NPDTMan.m4 -2022/11/28 | 1040 | graphics/circuit_macros/doc/NportMan.m4 -2022/11/28 | 783 | graphics/circuit_macros/doc/Oblique.m4 -2022/11/28 | 137 | graphics/circuit_macros/doc/opampexbody.m4 -2022/11/28 | 56 | graphics/circuit_macros/doc/opampex.m4 -2022/11/28 | 1433 | graphics/circuit_macros/doc/OpampMan.m4 -2022/11/28 | 835 | graphics/circuit_macros/doc/Opto.m4 -2022/11/28 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 -2022/11/28 | 1982 | graphics/circuit_macros/doc/PconnMan.m4 -2022/11/28 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 -2022/11/28 | 774 | graphics/circuit_macros/doc/quick.m4 -2022/11/28 | 2086 | graphics/circuit_macros/doc/relaycoilMan.m4 -2022/11/28 | 1259 | graphics/circuit_macros/doc/RelayMan.m4 -2022/11/28 | 1149 | graphics/circuit_macros/doc/ResistorsMan.m4 -2022/11/28 | 369 | graphics/circuit_macros/doc/sampleIC.m4 -2022/11/28 | 404 | graphics/circuit_macros/doc/Series.m4 -2022/11/28 | 1406 | graphics/circuit_macros/doc/ShiftRMan.m4 -2022/11/28 | 421 | graphics/circuit_macros/doc/Sinus.m4 -2022/11/28 | 7464 | graphics/circuit_macros/doc/SLDsMan.m4 -2022/11/28 | 2225 | graphics/circuit_macros/doc/SourcesMan.m4 -2022/11/28 | 217 | graphics/circuit_macros/doc/stringdims.m4 -2022/11/28 | 4780 | graphics/circuit_macros/doc/SwitchesMan.m4 -2022/11/28 | 1463 | graphics/circuit_macros/doc/Taps.m4 -2022/11/28 | 1022 | graphics/circuit_macros/doc/TgateMan.m4 -2022/11/28 | 150 | graphics/circuit_macros/doc/Thermal.m4 -2022/11/28 | 3321 | graphics/circuit_macros/doc/thyristorMan.m4 -2022/11/28 | 535 | graphics/circuit_macros/doc/Tline.m4 -2022/11/28 | 165 | graphics/circuit_macros/doc/tranbody.m4 -2022/11/28 | 660 | graphics/circuit_macros/doc/ujtMan.m4 -2022/11/28 | 944 | graphics/circuit_macros/doc/VariableMan.m4 -2022/11/28 | 13 | graphics/circuit_macros/doc/Version.tex -2022/11/28 | 3346 | graphics/circuit_macros/doc/WindingsMan.m4 -2022/11/28 | 449 | graphics/circuit_macros/doc/woodchips.m4 -2022/11/28 | 2912 | graphics/circuit_macros/doc/Workflow.m4 -2022/11/28 | 1526 | graphics/circuit_macros/doc/XformMan.m4 -2022/11/28 | 23650 | graphics/circuit_macros/dpictools.pic -2022/11/28 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 -2022/11/28 | 2402 | graphics/circuit_macros/examples/Adder.m4 -2022/11/28 | 4205 | graphics/circuit_macros/examples/Alogix.m4 -2022/11/28 | 494 | graphics/circuit_macros/examples/AmpTable.m4 -2022/11/28 | 1230 | graphics/circuit_macros/examples/Antennas.m4 -2022/11/28 | 5013 | graphics/circuit_macros/examples/AntiqueClock.m4 -2022/11/28 | 1615 | graphics/circuit_macros/examples/Arresters.m4 -2022/11/28 | 1786 | graphics/circuit_macros/examples/ArrowFn.m4 -2022/11/28 | 6270 | graphics/circuit_macros/examples/ASME_Y14-5.m4 -2022/11/28 | 771 | graphics/circuit_macros/examples/Attention.m4 -2022/11/28 | 2634 | graphics/circuit_macros/examples/Audio.m4 -2022/11/28 | 2517 | graphics/circuit_macros/examples/Autoencoder.m4 -2022/11/28 | 1962 | graphics/circuit_macros/examples/Autologix.m4 -2022/11/28 | 4638 | graphics/circuit_macros/examples/Ball.m4 -2022/11/28 | 1619 | graphics/circuit_macros/examples/Bip.m4 -2022/11/28 | 917 | graphics/circuit_macros/examples/birds.m4 -2022/11/28 | 1075 | graphics/circuit_macros/examples/bistable.m4 -2022/11/28 | 3175 | graphics/circuit_macros/examples/Blogix.m4 -2022/11/28 | 2542 | graphics/circuit_macros/examples/brace.m4 -2022/11/28 | 3198 | graphics/circuit_macros/examples/Btree.m4 -2022/11/28 | 3509 | graphics/circuit_macros/examples/Buttons.m4 -2022/11/28 | 991 | graphics/circuit_macros/examples/Byte.m4 -2022/11/28 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 -2022/11/28 | 1201 | graphics/circuit_macros/examples/Capacitors.m4 -2022/11/28 | 233 | graphics/circuit_macros/examples/Ccurve.m4 -2022/11/28 | 1039 | graphics/circuit_macros/examples/chaos.m4 -2022/11/28 | 1222 | graphics/circuit_macros/examples/Chips.m4 -2022/11/28 | 7670 | graphics/circuit_macros/examples/Chuck.m4 -2022/11/28 | 482 | graphics/circuit_macros/examples/clock.m4 -2022/11/28 | 724 | graphics/circuit_macros/examples/Connectors.m4 -2022/11/28 | 2178 | graphics/circuit_macros/examples/Conn.m4 -2022/11/28 | 27105 | graphics/circuit_macros/examples/Consumption.m4 -2022/11/28 | 3464 | graphics/circuit_macros/examples/Contact.m4 -2022/11/28 | 1585 | graphics/circuit_macros/examples/Contacts.m4 -2022/11/28 | 7034 | graphics/circuit_macros/examples/control.m4 -2022/11/28 | 551 | graphics/circuit_macros/examples/Counting.m4 -2022/11/28 | 2562 | graphics/circuit_macros/examples/Crow.m4 -2022/11/28 | 1879 | graphics/circuit_macros/examples/Cruller.m4 -2022/11/28 | 7734 | graphics/circuit_macros/examples/csc.m4 -2022/11/28 | 6003 | graphics/circuit_macros/examples/CSlight.m4 -2022/11/28 | 5889 | graphics/circuit_macros/examples/Csource.m4 -2022/11/28 | 460 | graphics/circuit_macros/examples/debug1.tex -2022/11/28 | 1959 | graphics/circuit_macros/examples/debug2.m4 -2022/11/28 | 655 | graphics/circuit_macros/examples/Decoder.m4 -2022/11/28 | 1485 | graphics/circuit_macros/examples/Demultiplexer.m4 -2022/11/28 | 654 | graphics/circuit_macros/examples/diamond.m4 -2022/11/28 | 6854 | graphics/circuit_macros/examples/Dini.m4 -2022/11/28 | 1787 | graphics/circuit_macros/examples/Diodes.m4 -2022/11/28 | 1955 | graphics/circuit_macros/examples/dpv/ABlogixDPV.m4 -2022/11/28 | 2528 | graphics/circuit_macros/examples/dpv/AdderDPV.m4 -2022/11/28 | 4340 | graphics/circuit_macros/examples/dpv/AlogixDPV.m4 -2022/11/28 | 538 | graphics/circuit_macros/examples/dpv/AmpTableDPV.m4 -2022/11/28 | 1090 | graphics/circuit_macros/examples/dpv/AntennasDPV.m4 -2022/11/28 | 1626 | graphics/circuit_macros/examples/dpv/ArrestersDPV.m4 -2022/11/28 | 1894 | graphics/circuit_macros/examples/dpv/ArrowFnDPV.m4 -2022/11/28 | 2720 | graphics/circuit_macros/examples/dpv/AudioDPV.m4 -2022/11/28 | 2989 | graphics/circuit_macros/examples/dpv/AutoencoderDPV.m4 -2022/11/28 | 1668 | graphics/circuit_macros/examples/dpv/Banking.m4 -2022/11/28 | 1812 | graphics/circuit_macros/examples/dpv/BipDPV.m4 -2022/11/28 | 4292 | graphics/circuit_macros/examples/dpv/BtreeDPV.m4 -2022/11/28 | 3567 | graphics/circuit_macros/examples/dpv/ButtonsDPV.m4 -2022/11/28 | 937 | graphics/circuit_macros/examples/dpv/ByteDPV.m4 -2022/11/28 | 7546 | graphics/circuit_macros/examples/dpv/ByteDPV.svg -2022/11/28 | 6413 | graphics/circuit_macros/examples/dpv/CanLogicDPV.m4 -2022/11/28 | 1160 | graphics/circuit_macros/examples/dpv/CapacitorsDPV.m4 -2022/11/28 | 1214 | graphics/circuit_macros/examples/dpv/ChipsDPV.m4 -2022/11/28 | 2111 | graphics/circuit_macros/examples/dpv/ConnDPV.m4 -2022/11/28 | 715 | graphics/circuit_macros/examples/dpv/ConnectorsDPV.m4 -2022/11/28 | 15366 | graphics/circuit_macros/examples/dpv/ConnectorsDPV.pic -2022/11/28 | 32750 | graphics/circuit_macros/examples/dpv/ConnectorsDPV.svg -2022/11/28 | 3646 | graphics/circuit_macros/examples/dpv/ContactDPV.m4 -2022/11/28 | 1737 | graphics/circuit_macros/examples/dpv/ContactsDPV.m4 -2022/11/28 | 8006 | graphics/circuit_macros/examples/dpv/controlDPV.m4 -2022/11/28 | 34203 | graphics/circuit_macros/examples/dpv/controlDPV.svg -2022/11/28 | 793 | graphics/circuit_macros/examples/dpv/CountingDPV.m4 -2022/11/28 | 2525 | graphics/circuit_macros/examples/dpv/CrowDPV.m4 -2022/11/28 | 1874 | graphics/circuit_macros/examples/dpv/CrullerDPV.m4 -2022/11/28 | 7778 | graphics/circuit_macros/examples/dpv/cscDPV.m4 -2022/11/28 | 7418 | graphics/circuit_macros/examples/dpv/CsourceDPV.m4 -2022/11/28 | 45528 | graphics/circuit_macros/examples/dpv/CsourceDPV.svg -2022/11/28 | 745 | graphics/circuit_macros/examples/dpv/DecoderDPV.m4 -2022/11/28 | 1373 | graphics/circuit_macros/examples/dpv/DemultiplexerDPV.m4 -2022/11/28 | 609 | graphics/circuit_macros/examples/dpv/diamondDPV.m4 -2022/11/28 | 6854 | graphics/circuit_macros/examples/dpv/DiniDPV.m4 -2022/11/28 | 1647 | graphics/circuit_macros/examples/dpv/DiodesDPV.m4 -2022/11/28 | 1050 | graphics/circuit_macros/examples/dpv/DPVconfig.m4 -2022/11/28 | 1966 | graphics/circuit_macros/examples/dpv/DriveDPV.m4 -2022/11/28 | 4757 | graphics/circuit_macros/examples/dpv/EEPDPV.m4 -2022/11/28 | 28340 | graphics/circuit_macros/examples/dpv/EEPDPV.svg -2022/11/28 | 1071 | graphics/circuit_macros/examples/dpv/EmarrowsDPV.m4 -2022/11/28 | 6285 | graphics/circuit_macros/examples/dpv/EscherDPV.m4 -2022/11/28 | 10871 | graphics/circuit_macros/examples/dpv/EVplugsDPV.m4 -2022/11/28 | 2443 | graphics/circuit_macros/examples/dpv/ex00DPV.m4 -2022/11/28 | 2629 | graphics/circuit_macros/examples/dpv/ex01DPV.m4 -2022/11/28 | 15560 | graphics/circuit_macros/examples/dpv/ex01DPV.svg -2022/11/28 | 1093 | graphics/circuit_macros/examples/dpv/ex02DPV.m4 -2022/11/28 | 855 | graphics/circuit_macros/examples/dpv/ex03DPV.m4 -2022/11/28 | 1891 | graphics/circuit_macros/examples/dpv/ex04DPV.m4 -2022/11/28 | 3390 | graphics/circuit_macros/examples/dpv/ex05DPV.m4 -2022/11/28 | 2018 | graphics/circuit_macros/examples/dpv/ex06DPV.m4 -2022/11/28 | 2559 | graphics/circuit_macros/examples/dpv/ex08DPV.m4 -2022/11/28 | 4119 | graphics/circuit_macros/examples/dpv/ex09DPV.m4 -2022/11/28 | 1699 | graphics/circuit_macros/examples/dpv/ex10DPV.m4 -2022/11/28 | 2685 | graphics/circuit_macros/examples/dpv/ex11DPV.m4 -2022/11/28 | 3522 | graphics/circuit_macros/examples/dpv/ex12DPV.m4 -2022/11/28 | 966 | graphics/circuit_macros/examples/dpv/ex15DPV.m4 -2022/11/28 | 1893 | graphics/circuit_macros/examples/dpv/ex16DPV.m4 -2022/11/28 | 1204 | graphics/circuit_macros/examples/dpv/ex17DPV.m4 -2022/11/28 | 1065 | graphics/circuit_macros/examples/dpv/ex18DPV.m4 -2022/11/28 | 1882 | graphics/circuit_macros/examples/dpv/ex21DPV.m4 -2022/11/28 | 24807 | graphics/circuit_macros/examples/dpv/examplesDPV.htmx -2022/11/28 | 18477 | graphics/circuit_macros/examples/dpv/examplesDPVs.html -2022/11/28 | 24811 | graphics/circuit_macros/examples/dpv/examplesDPVs.htmx -2022/11/28 | 8517 | graphics/circuit_macros/examples/dpv/expDPV.m4 -2022/11/28 | 1700 | graphics/circuit_macros/examples/dpv/EyeDPV.m4 -2022/11/28 | 5365 | graphics/circuit_macros/examples/dpv/fetDPV.m4 -2022/11/28 | 5171 | graphics/circuit_macros/examples/dpv/FlowDPV.m4 -2022/11/28 | 33087 | graphics/circuit_macros/examples/dpv/FlowDPV.svg -2022/11/28 | 555 | graphics/circuit_macros/examples/dpv/FontsDPV.m4 -2022/11/28 | 5546 | graphics/circuit_macros/examples/dpv/FontsDPV.svg -2022/11/28 | 1996 | graphics/circuit_macros/examples/dpv/FourbarDPV.m4 -2022/11/28 | 959 | graphics/circuit_macros/examples/dpv/FusesDPV.m4 -2022/11/28 | 5228 | graphics/circuit_macros/examples/dpv/GeometryDPV.m4 -2022/11/28 | 1875 | graphics/circuit_macros/examples/dpv/GrayCodeDPV.m4 -2022/11/28 | 5469 | graphics/circuit_macros/examples/dpv/graysurfDPV.m4 -2022/11/28 | 810 | graphics/circuit_macros/examples/dpv/GroundsDPV.m4 -2022/11/28 | 1265 | graphics/circuit_macros/examples/dpv/HeadersDPV.m4 -2022/11/28 | 12711 | graphics/circuit_macros/examples/dpv/HeathkitDPV.m4 -2022/11/28 | 89812 | graphics/circuit_macros/examples/dpv/HeathkitDPV.svg -2022/11/28 | 2171 | graphics/circuit_macros/examples/dpv/I2LDPV.m4 -2022/11/28 | 11601 | graphics/circuit_macros/examples/dpv/icsDPV.m4 -2022/11/28 | 4292 | graphics/circuit_macros/examples/dpv/InclepsDPV.m4 -2022/11/28 | 21384 | graphics/circuit_macros/examples/dpv/Incl.jpg -2022/11/28 | 1343 | graphics/circuit_macros/examples/dpv/InductorsDPV.m4 -2022/11/28 | 2051 | graphics/circuit_macros/examples/dpv/JackDPV.m4 -2022/11/28 | 10699 | graphics/circuit_macros/examples/dpv/keyboardDPV.m4 -2022/11/28 | 7203 | graphics/circuit_macros/examples/dpv/lcctDPV.m4 -2022/11/28 | 6216 | graphics/circuit_macros/examples/dpv/LgateDPV.m4 -2022/11/28 | 63 | graphics/circuit_macros/examples/dpv/local_init.m4 -2022/11/28 | 1931 | graphics/circuit_macros/examples/dpv/LogicDPV.m4 -2022/11/28 | 30451 | graphics/circuit_macros/examples/dpv/LoglogDPV.m4 -2022/11/28 | 5992 | graphics/circuit_macros/examples/dpv/Makefile -2022/11/28 | 3473 | graphics/circuit_macros/examples/dpv/MCDPV.m4 -2022/11/28 | 3489 | graphics/circuit_macros/examples/dpv/MixerDPV.m4 -2022/11/28 | 973 | graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 -2022/11/28 | 1953 | graphics/circuit_macros/examples/dpv/MotorControlDPV.m4 -2022/11/28 | 1403 | graphics/circuit_macros/examples/dpv/MultiplexerDPV.m4 -2022/11/28 | 532 | graphics/circuit_macros/examples/dpv/NLGDPV.m4 -2022/11/28 | 1157 | graphics/circuit_macros/examples/dpv/NPDTDPV.m4 -2022/11/28 | 758 | graphics/circuit_macros/examples/dpv/Np.m4 -2022/11/28 | 1238 | graphics/circuit_macros/examples/dpv/NportDPV.m4 -2022/11/28 | 7404 | graphics/circuit_macros/examples/dpv/NportDPV.svg -2022/11/28 | 1034 | graphics/circuit_macros/examples/dpv/OpampDPV.m4 -2022/11/28 | 2551 | graphics/circuit_macros/examples/dpv/OptoisoDPV.m4 -2022/11/28 | 10238 | graphics/circuit_macros/examples/dpv/paletteDPV.m4 -2022/11/28 | 113485 | graphics/circuit_macros/examples/dpv/paletteDPV.svg -2022/11/28 | 1781 | graphics/circuit_macros/examples/dpv/PconnDPV.m4 -2022/11/28 | 6153 | graphics/circuit_macros/examples/dpv/PlateDPV.m4 -2022/11/28 | 3778 | graphics/circuit_macros/examples/dpv/PushPullDPV.m4 -2022/11/28 | 2027 | graphics/circuit_macros/examples/dpv/pwrsupplyDPV.m4 -2022/11/28 | 947 | graphics/circuit_macros/examples/dpv/QuantumDPV.m4 -2022/11/28 | 901 | graphics/circuit_macros/examples/dpv/quickDPV.m4 -2022/11/28 | 4226 | graphics/circuit_macros/examples/dpv/quickDPV.svg -2022/11/28 | 774 | graphics/circuit_macros/examples/dpv/quick.m4 -2022/11/28 | 6153 | graphics/circuit_macros/examples/dpv/quick.pic -2022/11/30 | 15247 | graphics/circuit_macros/examples/dpv/quick.svg -2022/11/28 | 5892 | graphics/circuit_macros/examples/dpv/quick.tex -2022/11/30 | 15247 | graphics/circuit_macros/examples/dpv/quick.xsvg -2022/11/28 | 3756 | graphics/circuit_macros/examples/dpv/randomDPV.m4 -2022/11/28 | 609 | graphics/circuit_macros/examples/dpv/README_svg -2022/11/28 | 7546 | graphics/circuit_macros/examples/dpv/RectifiersDPV.m4 -2022/11/28 | 3825 | graphics/circuit_macros/examples/dpv/recycleDPV.m4 -2022/11/28 | 2069 | graphics/circuit_macros/examples/dpv/relaycoilDPV.m4 -2022/11/28 | 1431 | graphics/circuit_macros/examples/dpv/RelayDPV.m4 -2022/11/28 | 1188 | graphics/circuit_macros/examples/dpv/ResistorsDPV.m4 -2022/11/28 | 5485 | graphics/circuit_macros/examples/dpv/roseDPV.m4 -2022/11/28 | 563 | graphics/circuit_macros/examples/dpv/RotboxDPV.m4 -2022/11/28 | 1837 | graphics/circuit_macros/examples/dpv/SchottkyDPV.m4 -2022/11/28 | 4761 | graphics/circuit_macros/examples/dpv/sfgDPV.m4 -2022/11/28 | 7494 | graphics/circuit_macros/examples/dpv/shapesDPV.m4 -2022/11/28 | 1313 | graphics/circuit_macros/examples/dpv/ShiftRDPV.m4 -2022/11/28 | 1331 | graphics/circuit_macros/examples/dpv/SierpinskiDPV.m4 -2022/11/28 | 419 | graphics/circuit_macros/examples/dpv/SixpoleDPV.m4 -2022/11/28 | 4376 | graphics/circuit_macros/examples/dpv/slddiagsDPV.m4 -2022/11/28 | 8810 | graphics/circuit_macros/examples/dpv/SmithchartDPV.m4 -2022/11/28 | 1907 | graphics/circuit_macros/examples/dpv/SourcesDPV.m4 -2022/11/28 | 417 | graphics/circuit_macros/examples/dpv/SQUIDDPV.m4 -2022/11/28 | 5132 | graphics/circuit_macros/examples/dpv/SwitchesDPV.m4 -2022/11/28 | 1055 | graphics/circuit_macros/examples/dpv/TgateDPV.m4 -2022/11/28 | 1444 | graphics/circuit_macros/examples/dpv/ThreeDPV.m4 -2022/11/28 | 3310 | graphics/circuit_macros/examples/dpv/thyristorDPV.m4 -2022/11/28 | 1612 | graphics/circuit_macros/examples/dpv/TimerDPV.m4 -2022/11/28 | 13505 | graphics/circuit_macros/examples/dpv/tstDPV.htmx -2022/11/28 | 1630 | graphics/circuit_macros/examples/dpv/TTLnandDPV.m4 -2022/11/28 | 3091 | graphics/circuit_macros/examples/dpv/TtreeDPV.m4 -2022/11/28 | 12478 | graphics/circuit_macros/examples/dpv/TubediagsDPV.m4 -2022/11/28 | 682 | graphics/circuit_macros/examples/dpv/ujtDPV.m4 -2022/11/28 | 24138 | graphics/circuit_macros/examples/dpv/UNODPV.m4 -2022/11/28 | 988 | graphics/circuit_macros/examples/dpv/VariableDPV.m4 -2022/11/28 | 2994 | graphics/circuit_macros/examples/dpv/WindingsDPV.m4 -2022/11/28 | 353 | graphics/circuit_macros/examples/dpv/windows.m4 -2022/11/28 | 3631 | graphics/circuit_macros/examples/dpv/wormDPV.m4 -2022/11/28 | 1559 | graphics/circuit_macros/examples/dpv/XformDPV.m4 -2022/11/28 | 1985 | graphics/circuit_macros/examples/dpv/XORDPV.m4 -2022/11/28 | 1546 | graphics/circuit_macros/examples/dpv/Xtest.m4 -2022/11/28 | 1966 | graphics/circuit_macros/examples/Drive.m4 -2022/11/28 | 4885 | graphics/circuit_macros/examples/EEP.m4 -2022/11/28 | 977 | graphics/circuit_macros/examples/Emarrows.m4 -2022/11/28 | 6282 | graphics/circuit_macros/examples/Escher.m4 -2022/11/28 | 4002 | graphics/circuit_macros/examples/Euro.m4 -2022/11/28 | 10836 | graphics/circuit_macros/examples/EVplugs.m4 -2022/11/28 | 2412 | graphics/circuit_macros/examples/ex00.m4 -2022/11/28 | 2294 | graphics/circuit_macros/examples/ex01.m4 -2022/11/28 | 1100 | graphics/circuit_macros/examples/ex02.m4 -2022/11/28 | 673 | graphics/circuit_macros/examples/ex03.m4 -2022/11/28 | 1654 | graphics/circuit_macros/examples/ex04.m4 -2022/11/28 | 3510 | graphics/circuit_macros/examples/ex05.m4 -2022/11/28 | 1700 | graphics/circuit_macros/examples/ex06.m4 -2022/11/28 | 2556 | graphics/circuit_macros/examples/ex08.m4 -2022/11/28 | 4313 | graphics/circuit_macros/examples/ex09.m4 -2022/11/28 | 1492 | graphics/circuit_macros/examples/ex10.m4 -2022/11/28 | 2361 | graphics/circuit_macros/examples/ex11.m4 -2022/11/28 | 3339 | graphics/circuit_macros/examples/ex12.m4 -2022/11/28 | 1003 | graphics/circuit_macros/examples/ex15.m4 -2022/11/28 | 1865 | graphics/circuit_macros/examples/ex16.m4 -2022/11/28 | 1126 | graphics/circuit_macros/examples/ex17.m4 -2022/11/28 | 865 | graphics/circuit_macros/examples/ex18.m4 -2022/11/28 | 2000 | graphics/circuit_macros/examples/ex21.m4 -2022/11/28 | 1897548 | graphics/circuit_macros/examples/examples.pdf -2022/11/28 | 1766 | graphics/circuit_macros/examples/examples.tex -2022/11/28 | 8372 | graphics/circuit_macros/examples/exp.m4 -2022/11/28 | 2086 | graphics/circuit_macros/examples/Eye.m4 -2022/11/28 | 5311 | graphics/circuit_macros/examples/fet.m4 -2022/11/28 | 19397 | graphics/circuit_macros/examples/files.tex -2022/11/28 | 645 | graphics/circuit_macros/examples/Floor.m4 -2022/11/28 | 11255 | graphics/circuit_macros/examples/FlowchartDefs.m4 -2022/11/28 | 4751 | graphics/circuit_macros/examples/Flow.m4 -2022/11/28 | 999 | graphics/circuit_macros/examples/Fuses.m4 -2022/11/28 | 5093 | graphics/circuit_macros/examples/Geometry.m4 -2022/11/28 | 1818 | graphics/circuit_macros/examples/GrayCode.m4 -2022/11/28 | 5486 | graphics/circuit_macros/examples/graysurf.m4 -2022/11/28 | 828 | graphics/circuit_macros/examples/Grounds.m4 -2022/11/28 | 1132 | graphics/circuit_macros/examples/Headers.m4 -2022/11/28 | 1458 | graphics/circuit_macros/examples/header.tex -2022/11/28 | 13420 | graphics/circuit_macros/examples/Heathkit.m4 -2022/11/28 | 2068 | graphics/circuit_macros/examples/I2L.m4 -2022/11/28 | 1668 | graphics/circuit_macros/examples/IC10107.m4 -2022/11/28 | 11440 | graphics/circuit_macros/examples/ics.m4 -2022/11/28 | 32 | graphics/circuit_macros/examples/Incl.eps.bb -2022/11/28 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz -2022/11/28 | 772 | graphics/circuit_macros/examples/Incleps.m4 -2022/11/28 | 29772 | graphics/circuit_macros/examples/Incl.pdf -2022/11/28 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 -2022/11/28 | 1443 | graphics/circuit_macros/examples/Inductors.m4 -2022/11/28 | 2571 | graphics/circuit_macros/examples/IntersectingPlanes.m4 -2022/11/28 | 2362 | graphics/circuit_macros/examples/Jack.m4 -2022/11/28 | 10699 | graphics/circuit_macros/examples/keyboard.m4 -2022/11/28 | 118060 | graphics/circuit_macros/examples/keyboard.pdf -2022/11/28 | 489 | graphics/circuit_macros/examples/Koch.m4 -2022/11/28 | 7127 | graphics/circuit_macros/examples/lcct.m4 -2022/11/28 | 2119 | graphics/circuit_macros/examples/Logic.m4 -2022/11/28 | 2304 | graphics/circuit_macros/examples/Loglog.m4 -2022/11/28 | 4501 | graphics/circuit_macros/examples/Lyap.m4 -2022/11/28 | 11170 | graphics/circuit_macros/examples/Makefile -2022/11/28 | 2986 | graphics/circuit_macros/examples/MC.m4 -2022/11/28 | 2846 | graphics/circuit_macros/examples/Metamodel.m4 -2022/11/28 | 95140 | graphics/circuit_macros/examples/mf/cct.mf -2022/11/28 | 764 | graphics/circuit_macros/examples/mf/cct.tfm -2022/11/28 | 4615 | graphics/circuit_macros/examples/mf/font.m4 -2022/11/28 | 1529 | graphics/circuit_macros/examples/mf/Makefile -2022/11/28 | 1076 | graphics/circuit_macros/examples/mf/mftest -2022/11/28 | 3785 | graphics/circuit_macros/examples/Mixer.m4 -2022/11/28 | 960 | graphics/circuit_macros/examples/MoreTable.m4 -2022/11/28 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 -2022/11/28 | 497 | graphics/circuit_macros/examples/mpost/examplesmpost.tex -2022/11/28 | 4361 | graphics/circuit_macros/examples/mpost/Makefile -2022/11/28 | 685 | graphics/circuit_macros/examples/mpost/mptest -2022/11/28 | 749 | graphics/circuit_macros/examples/mpost/README-mpost -2022/11/28 | 418 | graphics/circuit_macros/examples/mpost/tstmpost.tex -2022/11/28 | 1400 | graphics/circuit_macros/examples/Multiplexer.m4 -2022/11/28 | 499 | graphics/circuit_macros/examples/NLG.m4 -2022/11/28 | 1128 | graphics/circuit_macros/examples/NPDT.m4 -2022/11/28 | 1040 | graphics/circuit_macros/examples/Nport.m4 -2022/11/28 | 2792 | graphics/circuit_macros/examples/OpAmpFilter.m4 -2022/11/28 | 1433 | graphics/circuit_macros/examples/Opamp.m4 -2022/11/28 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 -2022/11/28 | 1852 | graphics/circuit_macros/examples/Orbits.m4 -2022/11/28 | 10193 | graphics/circuit_macros/examples/paletteSVG.m4 -2022/11/28 | 1997 | graphics/circuit_macros/examples/Pconn.m4 -2022/11/28 | 1419 | graphics/circuit_macros/examples/person.m4 -2022/11/28 | 6215 | graphics/circuit_macros/examples/Plate.m4 -2022/11/28 | 1174 | graphics/circuit_macros/examples/PPA.m4 -2022/11/28 | 715 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex -2022/11/28 | 4784 | graphics/circuit_macros/examples/psfrag/Makefile -2022/11/28 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt -2022/11/28 | 371 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex -2022/11/28 | 3954 | graphics/circuit_macros/examples/PushPull.m4 -2022/11/28 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 -2022/11/28 | 918 | graphics/circuit_macros/examples/Quantum.m4 -2022/11/28 | 774 | graphics/circuit_macros/examples/quick.m4 -2022/11/28 | 3727 | graphics/circuit_macros/examples/random.m4 -2022/11/28 | 3420 | graphics/circuit_macros/examples/README-examples -2022/11/28 | 7006 | graphics/circuit_macros/examples/Rectifiers.m4 -2022/11/28 | 3825 | graphics/circuit_macros/examples/recycle.m4 -2022/11/28 | 2086 | graphics/circuit_macros/examples/relaycoil.m4 -2022/11/28 | 1259 | graphics/circuit_macros/examples/Relay.m4 -2022/11/28 | 1147 | graphics/circuit_macros/examples/Resistors.m4 -2022/11/28 | 1443 | graphics/circuit_macros/examples/Resolver.m4 -2022/11/28 | 5485 | graphics/circuit_macros/examples/rose.m4 -2022/11/28 | 221 | graphics/circuit_macros/examples/rotate.tex -2022/11/28 | 1525 | graphics/circuit_macros/examples/rotatetext.m4 -2022/11/28 | 533 | graphics/circuit_macros/examples/Rotbox.m4 -2022/11/28 | 365 | graphics/circuit_macros/examples/rotellipse.m4 -2022/11/28 | 747 | graphics/circuit_macros/examples/SampleFlow.m4 -2022/11/28 | 1778 | graphics/circuit_macros/examples/Schottky.m4 -2022/11/28 | 3991 | graphics/circuit_macros/examples/sfg.m4 -2022/11/28 | 295 | graphics/circuit_macros/examples/ShadeSector.m4 -2022/11/28 | 3749 | graphics/circuit_macros/examples/Shaky.m4 -2022/11/28 | 7708 | graphics/circuit_macros/examples/shapes.m4 -2022/11/28 | 1406 | graphics/circuit_macros/examples/ShiftR.m4 -2022/11/28 | 1331 | graphics/circuit_macros/examples/Sierpinski.m4 -2022/11/28 | 419 | graphics/circuit_macros/examples/Sixpole.m4 -2022/11/28 | 8833 | graphics/circuit_macros/examples/Smithchart.m4 -2022/11/28 | 370 | graphics/circuit_macros/examples/snake.m4 -2022/11/28 | 2165 | graphics/circuit_macros/examples/Sources.m4 -2022/11/28 | 1906 | graphics/circuit_macros/examples/SPM.m4 -2022/11/28 | 380 | graphics/circuit_macros/examples/SQUID.m4 -2022/11/28 | 953 | graphics/circuit_macros/examples/squiggle.m4 -2022/11/28 | 1795 | graphics/circuit_macros/examples/Stator.m4 -2022/11/28 | 4782 | graphics/circuit_macros/examples/Switches.m4 -2022/11/28 | 591 | graphics/circuit_macros/examples/test.m4 -2022/11/28 | 416 | graphics/circuit_macros/examples/testpdf.tex -2022/11/28 | 1022 | graphics/circuit_macros/examples/Tgate.m4 -2022/11/28 | 1287 | graphics/circuit_macros/examples/Three.m4 -2022/11/28 | 3321 | graphics/circuit_macros/examples/thyristor.m4 -2022/11/28 | 219 | graphics/circuit_macros/examples/tst1.tex -2022/11/28 | 409 | graphics/circuit_macros/examples/tst.tex -2022/11/28 | 464 | graphics/circuit_macros/examples/tsttikz.tex -2022/11/28 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 -2022/11/28 | 9869 | graphics/circuit_macros/examples/tubedefs.m4 -2022/11/28 | 13294 | graphics/circuit_macros/examples/Tubediags.m4 -2022/11/28 | 660 | graphics/circuit_macros/examples/ujt.m4 -2022/11/28 | 23616 | graphics/circuit_macros/examples/UNO.m4 -2022/11/28 | 932 | graphics/circuit_macros/examples/Variable.m4 -2022/11/28 | 1916 | graphics/circuit_macros/examples/venus.m4 -2022/11/28 | 449 | graphics/circuit_macros/examples/Wheat.m4 -2022/11/28 | 3346 | graphics/circuit_macros/examples/Windings.m4 -2022/11/28 | 353 | graphics/circuit_macros/examples/windows.m4 -2022/11/28 | 2801 | graphics/circuit_macros/examples/worm.m4 -2022/11/28 | 337 | graphics/circuit_macros/examples/xfig/Makefile -2022/11/28 | 21398 | graphics/circuit_macros/examples/xfig/xfiglib.fig -2022/11/28 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 -2022/11/28 | 1526 | graphics/circuit_macros/examples/Xform.m4 -2022/11/28 | 1823 | graphics/circuit_macros/examples/XOR.m4 -2022/11/28 | 656 | graphics/circuit_macros/examples/Zcos.m4 -2022/11/28 | 1019 | graphics/circuit_macros/gpic.m4 -2022/11/28 | 3794 | graphics/circuit_macros/INSTALL -2022/11/28 | 12765 | graphics/circuit_macros/lib3D.m4 -2022/11/28 | 179685 | graphics/circuit_macros/libcct.m4 -2022/11/28 | 91701 | graphics/circuit_macros/libgen.m4 -2022/11/28 | 47825 | graphics/circuit_macros/liblog.m4 -2022/11/28 | 32742 | graphics/circuit_macros/libSLD.m4 -2022/11/28 | 19176 | graphics/circuit_macros/Licence.txt -2022/11/28 | 1639 | graphics/circuit_macros/Makefile -2022/11/28 | 1114 | graphics/circuit_macros/mfpic.m4 -2022/11/28 | 1640 | graphics/circuit_macros/mpost.m4 -2022/11/28 | 2085 | graphics/circuit_macros/pgf.m4 -2022/11/28 | 2834 | graphics/circuit_macros/postscript.m4 -2022/11/28 | 706 | graphics/circuit_macros/psfrag.m4 -2022/11/28 | 2099 | graphics/circuit_macros/pstricks.m4 -2022/11/28 | 15834 | graphics/circuit_macros/README -2022/11/28 | 11995 | graphics/circuit_macros/svg.m4 -2022/11/28 | 1029 | graphics/circuit_macros/xfig.m4 -2022/11/30 | 3729888 | graphics/circuit_macros.zip +2023/03/11 | 1185 | graphics/circuit_macros/boxdims.sty +2023/03/11 | 14038 | graphics/circuit_macros/CHANGES +2023/03/11 | 462 | graphics/circuit_macros/Copying +2023/03/11 | 14279 | graphics/circuit_macros/darrow.m4 +2023/03/11 | 26 | graphics/circuit_macros/doc/ACsymbol.m4 +2023/03/11 | 494 | graphics/circuit_macros/doc/AmpTableMan.m4 +2023/03/11 | 1230 | graphics/circuit_macros/doc/AntennasMan.m4 +2023/03/11 | 1618 | graphics/circuit_macros/doc/ArrestersMan.m4 +2023/03/11 | 1017 | graphics/circuit_macros/doc/arrowex.m4 +2023/03/11 | 2634 | graphics/circuit_macros/doc/AudioMan.m4 +2023/03/11 | 131 | graphics/circuit_macros/doc/Axes.m4 +2023/03/11 | 614 | graphics/circuit_macros/doc/BigResistor.m4 +2023/03/11 | 1619 | graphics/circuit_macros/doc/BipMan.m4 +2023/03/11 | 1074 | graphics/circuit_macros/doc/bistableMan.m4 +2023/03/11 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 +2023/03/11 | 130 | graphics/circuit_macros/doc/bitrbody.m4 +2023/03/11 | 50 | graphics/circuit_macros/doc/bitr.m4 +2023/03/11 | 152586 | graphics/circuit_macros/doc/body.tex +2023/03/11 | 1953 | graphics/circuit_macros/doc/Buffer.m4 +2023/03/11 | 1063 | graphics/circuit_macros/doc/CapacitorsMan.m4 +2023/03/11 | 4343 | graphics/circuit_macros/doc/Circuit_macros.bib +2023/03/11 | 1037622 | graphics/circuit_macros/doc/Circuit_macros.pdf +2023/03/11 | 3019 | graphics/circuit_macros/doc/Circuit_macros.tex +2023/03/11 | 1857 | graphics/circuit_macros/doc/Composite.m4 +2023/03/11 | 1121 | graphics/circuit_macros/doc/ConfigA.m4 +2023/03/11 | 1258 | graphics/circuit_macros/doc/ConfigB.m4 +2023/03/11 | 1292 | graphics/circuit_macros/doc/ConfigC.m4 +2023/03/11 | 2353 | graphics/circuit_macros/doc/ConnMan.m4 +2023/03/11 | 3326 | graphics/circuit_macros/doc/ContactMan.m4 +2023/03/11 | 1585 | graphics/circuit_macros/doc/ContactsMan.m4 +2023/03/11 | 1995 | graphics/circuit_macros/doc/Corners.m4 +2023/03/11 | 1329 | graphics/circuit_macros/doc/currents.m4 +2023/03/11 | 2389 | graphics/circuit_macros/doc/Dac.m4 +2023/03/11 | 1151 | graphics/circuit_macros/doc/Darlington.m4 +2023/03/11 | 26 | graphics/circuit_macros/doc/DCsymbol.m4 +2023/03/11 | 108134 | graphics/circuit_macros/doc/defines.tex +2023/03/11 | 1485 | graphics/circuit_macros/doc/DemultiplexerMan.m4 +2023/03/11 | 1790 | graphics/circuit_macros/doc/DiodesMan.m4 +2023/03/11 | 483 | graphics/circuit_macros/doc/eboxdims.m4 +2023/03/11 | 981 | graphics/circuit_macros/doc/EmarrowsMan.m4 +2023/03/11 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 +2023/03/11 | 5315 | graphics/circuit_macros/doc/fetMan.m4 +2023/03/11 | 329 | graphics/circuit_macros/doc/FF.m4 +2023/03/11 | 1975 | graphics/circuit_macros/doc/FlipFlop.m4 +2023/03/11 | 970 | graphics/circuit_macros/doc/Flowdiag.m4 +2023/03/11 | 1353 | graphics/circuit_macros/doc/FusesMan.m4 +2023/03/11 | 831 | graphics/circuit_macros/doc/GroundsMan.m4 +2023/03/11 | 1132 | graphics/circuit_macros/doc/HeadersMan.m4 +2023/03/11 | 560 | graphics/circuit_macros/doc/heaterMan.m4 +2023/03/11 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 +2023/03/11 | 1342 | graphics/circuit_macros/doc/InductorsMan.m4 +2023/03/11 | 2362 | graphics/circuit_macros/doc/JackMan.m4 +2023/03/11 | 2119 | graphics/circuit_macros/doc/LogicMan.m4 +2023/03/11 | 269 | graphics/circuit_macros/doc/Loop.m4 +2023/03/11 | 387 | graphics/circuit_macros/doc/lrarrows.m4 +2023/03/11 | 5033 | graphics/circuit_macros/doc/Makefile +2023/03/11 | 784 | graphics/circuit_macros/doc/MoreTableMan.m4 +2023/03/11 | 1575 | graphics/circuit_macros/doc/mplex.m4 +2023/03/11 | 1400 | graphics/circuit_macros/doc/MultiplexerMan.m4 +2023/03/11 | 499 | graphics/circuit_macros/doc/NLGMan.m4 +2023/03/11 | 1128 | graphics/circuit_macros/doc/NPDTMan.m4 +2023/03/11 | 1040 | graphics/circuit_macros/doc/NportMan.m4 +2023/03/11 | 783 | graphics/circuit_macros/doc/Oblique.m4 +2023/03/11 | 137 | graphics/circuit_macros/doc/opampexbody.m4 +2023/03/11 | 56 | graphics/circuit_macros/doc/opampex.m4 +2023/03/11 | 1433 | graphics/circuit_macros/doc/OpampMan.m4 +2023/03/11 | 835 | graphics/circuit_macros/doc/Opto.m4 +2023/03/11 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 +2023/03/11 | 1982 | graphics/circuit_macros/doc/PconnMan.m4 +2023/03/11 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 +2023/03/11 | 774 | graphics/circuit_macros/doc/quick.m4 +2023/03/11 | 2086 | graphics/circuit_macros/doc/relaycoilMan.m4 +2023/03/11 | 1259 | graphics/circuit_macros/doc/RelayMan.m4 +2023/03/11 | 1149 | graphics/circuit_macros/doc/ResistorsMan.m4 +2023/03/11 | 369 | graphics/circuit_macros/doc/sampleIC.m4 +2023/03/11 | 404 | graphics/circuit_macros/doc/Series.m4 +2023/03/11 | 1406 | graphics/circuit_macros/doc/ShiftRMan.m4 +2023/03/11 | 421 | graphics/circuit_macros/doc/Sinus.m4 +2023/03/11 | 7363 | graphics/circuit_macros/doc/SLDsMan.m4 +2023/03/11 | 2225 | graphics/circuit_macros/doc/SourcesMan.m4 +2023/03/11 | 217 | graphics/circuit_macros/doc/stringdims.m4 +2023/03/11 | 4780 | graphics/circuit_macros/doc/SwitchesMan.m4 +2023/03/11 | 1463 | graphics/circuit_macros/doc/Taps.m4 +2023/03/11 | 1022 | graphics/circuit_macros/doc/TgateMan.m4 +2023/03/11 | 150 | graphics/circuit_macros/doc/Thermal.m4 +2023/03/11 | 3321 | graphics/circuit_macros/doc/thyristorMan.m4 +2023/03/11 | 535 | graphics/circuit_macros/doc/Tline.m4 +2023/03/11 | 165 | graphics/circuit_macros/doc/tranbody.m4 +2023/03/11 | 660 | graphics/circuit_macros/doc/ujtMan.m4 +2023/03/11 | 944 | graphics/circuit_macros/doc/VariableMan.m4 +2023/03/11 | 13 | graphics/circuit_macros/doc/Version.tex +2023/03/11 | 3346 | graphics/circuit_macros/doc/WindingsMan.m4 +2023/03/11 | 449 | graphics/circuit_macros/doc/woodchips.m4 +2023/03/11 | 2912 | graphics/circuit_macros/doc/Workflow.m4 +2023/03/11 | 1526 | graphics/circuit_macros/doc/XformMan.m4 +2023/03/11 | 24034 | graphics/circuit_macros/dpictools.pic +2023/03/11 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 +2023/03/11 | 2402 | graphics/circuit_macros/examples/Adder.m4 +2023/03/11 | 4205 | graphics/circuit_macros/examples/Alogix.m4 +2023/03/11 | 494 | graphics/circuit_macros/examples/AmpTable.m4 +2023/03/11 | 1230 | graphics/circuit_macros/examples/Antennas.m4 +2023/03/11 | 1615 | graphics/circuit_macros/examples/Arresters.m4 +2023/03/11 | 6270 | graphics/circuit_macros/examples/ASME_Y14-5.m4def +2023/03/11 | 2634 | graphics/circuit_macros/examples/Audio.m4 +2023/03/11 | 4638 | graphics/circuit_macros/examples/Ball.m4 +2023/03/11 | 1619 | graphics/circuit_macros/examples/Bip.m4 +2023/03/11 | 3198 | graphics/circuit_macros/examples/Btree.m4 +2023/03/11 | 3509 | graphics/circuit_macros/examples/Buttons.m4 +2023/03/11 | 991 | graphics/circuit_macros/examples/Byte.m4 +2023/03/11 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 +2023/03/11 | 1201 | graphics/circuit_macros/examples/Capacitors.m4 +2023/03/11 | 1222 | graphics/circuit_macros/examples/Chips.m4 +2023/03/11 | 724 | graphics/circuit_macros/examples/Connectors.m4 +2023/03/11 | 2351 | graphics/circuit_macros/examples/Conn.m4 +2023/03/11 | 27105 | graphics/circuit_macros/examples/Consumption.m4 +2023/03/11 | 3464 | graphics/circuit_macros/examples/Contact.m4 +2023/03/11 | 1585 | graphics/circuit_macros/examples/Contacts.m4 +2023/03/11 | 7034 | graphics/circuit_macros/examples/control.m4 +2023/03/11 | 2562 | graphics/circuit_macros/examples/Crow.m4 +2023/03/11 | 7734 | graphics/circuit_macros/examples/csc.m4 +2023/03/11 | 5889 | graphics/circuit_macros/examples/Csource.m4 +2023/03/11 | 460 | graphics/circuit_macros/examples/debug1.tex +2023/03/11 | 1959 | graphics/circuit_macros/examples/debug2.m4 +2023/03/11 | 655 | graphics/circuit_macros/examples/Decoder.m4 +2023/03/11 | 1485 | graphics/circuit_macros/examples/Demultiplexer.m4 +2023/03/11 | 654 | graphics/circuit_macros/examples/diamond.m4 +2023/03/11 | 6854 | graphics/circuit_macros/examples/Dini.m4 +2023/03/11 | 1787 | graphics/circuit_macros/examples/Diodes.m4 +2023/03/11 | 1955 | graphics/circuit_macros/examples/dpv/ABlogixDPV.m4 +2023/03/11 | 2528 | graphics/circuit_macros/examples/dpv/AdderDPV.m4 +2023/03/11 | 4340 | graphics/circuit_macros/examples/dpv/AlogixDPV.m4 +2023/03/11 | 538 | graphics/circuit_macros/examples/dpv/AmpTableDPV.m4 +2023/03/11 | 1090 | graphics/circuit_macros/examples/dpv/AntennasDPV.m4 +2023/03/11 | 1626 | graphics/circuit_macros/examples/dpv/ArrestersDPV.m4 +2023/03/11 | 1894 | graphics/circuit_macros/examples/dpv/ArrowFnDPV.m4 +2023/03/11 | 2720 | graphics/circuit_macros/examples/dpv/AudioDPV.m4 +2023/03/11 | 2989 | graphics/circuit_macros/examples/dpv/AutoencoderDPV.m4 +2023/03/11 | 1668 | graphics/circuit_macros/examples/dpv/Banking.m4 +2023/03/11 | 1812 | graphics/circuit_macros/examples/dpv/BipDPV.m4 +2023/03/11 | 4292 | graphics/circuit_macros/examples/dpv/BtreeDPV.m4 +2023/03/11 | 3567 | graphics/circuit_macros/examples/dpv/ButtonsDPV.m4 +2023/03/11 | 937 | graphics/circuit_macros/examples/dpv/ByteDPV.m4 +2023/03/11 | 6413 | graphics/circuit_macros/examples/dpv/CanLogicDPV.m4 +2023/03/11 | 1160 | graphics/circuit_macros/examples/dpv/CapacitorsDPV.m4 +2023/03/11 | 1214 | graphics/circuit_macros/examples/dpv/ChipsDPV.m4 +2023/03/11 | 2292 | graphics/circuit_macros/examples/dpv/ConnDPV.m4 +2023/03/11 | 715 | graphics/circuit_macros/examples/dpv/ConnectorsDPV.m4 +2023/03/11 | 3646 | graphics/circuit_macros/examples/dpv/ContactDPV.m4 +2023/03/11 | 1737 | graphics/circuit_macros/examples/dpv/ContactsDPV.m4 +2023/03/11 | 8006 | graphics/circuit_macros/examples/dpv/controlDPV.m4 +2023/03/11 | 793 | graphics/circuit_macros/examples/dpv/CountingDPV.m4 +2023/03/11 | 2525 | graphics/circuit_macros/examples/dpv/CrowDPV.m4 +2023/03/11 | 1874 | graphics/circuit_macros/examples/dpv/CrullerDPV.m4 +2023/03/11 | 7778 | graphics/circuit_macros/examples/dpv/cscDPV.m4 +2023/03/11 | 7418 | graphics/circuit_macros/examples/dpv/CsourceDPV.m4 +2023/03/11 | 745 | graphics/circuit_macros/examples/dpv/DecoderDPV.m4 +2023/03/11 | 1373 | graphics/circuit_macros/examples/dpv/DemultiplexerDPV.m4 +2023/03/11 | 609 | graphics/circuit_macros/examples/dpv/diamondDPV.m4 +2023/03/11 | 6854 | graphics/circuit_macros/examples/dpv/DiniDPV.m4 +2023/03/11 | 1647 | graphics/circuit_macros/examples/dpv/DiodesDPV.m4 +2023/03/11 | 1050 | graphics/circuit_macros/examples/dpv/DPVconfig.m4 +2023/03/11 | 1966 | graphics/circuit_macros/examples/dpv/DriveDPV.m4 +2023/03/11 | 4757 | graphics/circuit_macros/examples/dpv/EEPDPV.m4 +2023/03/11 | 1071 | graphics/circuit_macros/examples/dpv/EmarrowsDPV.m4 +2023/03/11 | 6285 | graphics/circuit_macros/examples/dpv/EscherDPV.m4 +2023/03/11 | 10871 | graphics/circuit_macros/examples/dpv/EVplugsDPV.m4 +2023/03/11 | 2443 | graphics/circuit_macros/examples/dpv/ex00DPV.m4 +2023/03/11 | 2629 | graphics/circuit_macros/examples/dpv/ex01DPV.m4 +2023/03/11 | 1093 | graphics/circuit_macros/examples/dpv/ex02DPV.m4 +2023/03/11 | 855 | graphics/circuit_macros/examples/dpv/ex03DPV.m4 +2023/03/11 | 1891 | graphics/circuit_macros/examples/dpv/ex04DPV.m4 +2023/03/11 | 3390 | graphics/circuit_macros/examples/dpv/ex05DPV.m4 +2023/03/11 | 2018 | graphics/circuit_macros/examples/dpv/ex06DPV.m4 +2023/03/11 | 2559 | graphics/circuit_macros/examples/dpv/ex08DPV.m4 +2023/03/11 | 4119 | graphics/circuit_macros/examples/dpv/ex09DPV.m4 +2023/03/11 | 1699 | graphics/circuit_macros/examples/dpv/ex10DPV.m4 +2023/03/11 | 2685 | graphics/circuit_macros/examples/dpv/ex11DPV.m4 +2023/03/11 | 3522 | graphics/circuit_macros/examples/dpv/ex12DPV.m4 +2023/03/11 | 966 | graphics/circuit_macros/examples/dpv/ex15DPV.m4 +2023/03/11 | 1893 | graphics/circuit_macros/examples/dpv/ex16DPV.m4 +2023/03/11 | 1204 | graphics/circuit_macros/examples/dpv/ex17DPV.m4 +2023/03/11 | 1065 | graphics/circuit_macros/examples/dpv/ex18DPV.m4 +2023/03/11 | 1882 | graphics/circuit_macros/examples/dpv/ex21DPV.m4 +2023/03/11 | 24807 | graphics/circuit_macros/examples/dpv/examplesDPV.htmx +2023/03/11 | 24811 | graphics/circuit_macros/examples/dpv/examplesDPVs.htmx +2023/03/11 | 8517 | graphics/circuit_macros/examples/dpv/expDPV.m4 +2023/03/11 | 1700 | graphics/circuit_macros/examples/dpv/EyeDPV.m4 +2023/03/11 | 5365 | graphics/circuit_macros/examples/dpv/fetDPV.m4 +2023/03/11 | 5174 | graphics/circuit_macros/examples/dpv/FlowDPV.m4 +2023/03/11 | 555 | graphics/circuit_macros/examples/dpv/FontsDPV.m4 +2023/03/11 | 1996 | graphics/circuit_macros/examples/dpv/FourbarDPV.m4 +2023/03/11 | 1230 | graphics/circuit_macros/examples/dpv/FusesDPV.m4 +2023/03/11 | 5228 | graphics/circuit_macros/examples/dpv/GeometryDPV.m4 +2023/03/11 | 1875 | graphics/circuit_macros/examples/dpv/GrayCodeDPV.m4 +2023/03/11 | 5469 | graphics/circuit_macros/examples/dpv/graysurfDPV.m4 +2023/03/11 | 810 | graphics/circuit_macros/examples/dpv/GroundsDPV.m4 +2023/03/11 | 1265 | graphics/circuit_macros/examples/dpv/HeadersDPV.m4 +2023/03/11 | 12711 | graphics/circuit_macros/examples/dpv/HeathkitDPV.m4 +2023/03/11 | 2171 | graphics/circuit_macros/examples/dpv/I2LDPV.m4 +2023/03/11 | 11601 | graphics/circuit_macros/examples/dpv/icsDPV.m4 +2023/03/11 | 4292 | graphics/circuit_macros/examples/dpv/InclepsDPV.m4 +2023/03/11 | 21384 | graphics/circuit_macros/examples/dpv/Incl.jpg +2023/03/11 | 1343 | graphics/circuit_macros/examples/dpv/InductorsDPV.m4 +2023/03/11 | 2051 | graphics/circuit_macros/examples/dpv/JackDPV.m4 +2023/03/11 | 10699 | graphics/circuit_macros/examples/dpv/keyboardDPV.m4 +2023/03/11 | 7203 | graphics/circuit_macros/examples/dpv/lcctDPV.m4 +2023/03/11 | 6216 | graphics/circuit_macros/examples/dpv/LgateDPV.m4 +2023/03/11 | 63 | graphics/circuit_macros/examples/dpv/local_init.m4 +2023/03/11 | 1931 | graphics/circuit_macros/examples/dpv/LogicDPV.m4 +2023/03/11 | 30451 | graphics/circuit_macros/examples/dpv/LoglogDPV.m4 +2023/03/11 | 6130 | graphics/circuit_macros/examples/dpv/Makefile +2023/03/11 | 3473 | graphics/circuit_macros/examples/dpv/MCDPV.m4 +2023/03/11 | 3489 | graphics/circuit_macros/examples/dpv/MixerDPV.m4 +2023/03/11 | 1585 | graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 +2023/03/11 | 1953 | graphics/circuit_macros/examples/dpv/MotorControlDPV.m4 +2023/03/11 | 1403 | graphics/circuit_macros/examples/dpv/MultiplexerDPV.m4 +2023/03/11 | 532 | graphics/circuit_macros/examples/dpv/NLGDPV.m4 +2023/03/11 | 1157 | graphics/circuit_macros/examples/dpv/NPDTDPV.m4 +2023/03/11 | 758 | graphics/circuit_macros/examples/dpv/Np.m4 +2023/03/11 | 1238 | graphics/circuit_macros/examples/dpv/NportDPV.m4 +2023/03/11 | 1034 | graphics/circuit_macros/examples/dpv/OpampDPV.m4 +2023/03/11 | 2551 | graphics/circuit_macros/examples/dpv/OptoisoDPV.m4 +2023/03/11 | 10238 | graphics/circuit_macros/examples/dpv/paletteDPV.m4 +2023/03/11 | 1781 | graphics/circuit_macros/examples/dpv/PconnDPV.m4 +2023/03/11 | 6156 | graphics/circuit_macros/examples/dpv/PlateDPV.m4 +2023/03/11 | 3778 | graphics/circuit_macros/examples/dpv/PushPullDPV.m4 +2023/03/11 | 2027 | graphics/circuit_macros/examples/dpv/pwrsupplyDPV.m4 +2023/03/11 | 947 | graphics/circuit_macros/examples/dpv/QuantumDPV.m4 +2023/03/11 | 901 | graphics/circuit_macros/examples/dpv/quickDPV.m4 +2023/03/11 | 3756 | graphics/circuit_macros/examples/dpv/randomDPV.m4 +2023/03/11 | 609 | graphics/circuit_macros/examples/dpv/README_svg +2023/03/11 | 7546 | graphics/circuit_macros/examples/dpv/RectifiersDPV.m4 +2023/03/11 | 3825 | graphics/circuit_macros/examples/dpv/recycleDPV.m4 +2023/03/11 | 2069 | graphics/circuit_macros/examples/dpv/relaycoilDPV.m4 +2023/03/11 | 1431 | graphics/circuit_macros/examples/dpv/RelayDPV.m4 +2023/03/11 | 1188 | graphics/circuit_macros/examples/dpv/ResistorsDPV.m4 +2023/03/11 | 5485 | graphics/circuit_macros/examples/dpv/roseDPV.m4 +2023/03/11 | 563 | graphics/circuit_macros/examples/dpv/RotboxDPV.m4 +2023/03/11 | 1837 | graphics/circuit_macros/examples/dpv/SchottkyDPV.m4 +2023/03/11 | 4761 | graphics/circuit_macros/examples/dpv/sfgDPV.m4 +2023/03/11 | 7494 | graphics/circuit_macros/examples/dpv/shapesDPV.m4 +2023/03/11 | 1313 | graphics/circuit_macros/examples/dpv/ShiftRDPV.m4 +2023/03/11 | 1331 | graphics/circuit_macros/examples/dpv/SierpinskiDPV.m4 +2023/03/11 | 419 | graphics/circuit_macros/examples/dpv/SixpoleDPV.m4 +2023/03/11 | 4376 | graphics/circuit_macros/examples/dpv/slddiagsDPV.m4 +2023/03/11 | 8810 | graphics/circuit_macros/examples/dpv/SmithchartDPV.m4 +2023/03/11 | 1907 | graphics/circuit_macros/examples/dpv/SourcesDPV.m4 +2023/03/11 | 417 | graphics/circuit_macros/examples/dpv/SQUIDDPV.m4 +2023/03/11 | 5132 | graphics/circuit_macros/examples/dpv/SwitchesDPV.m4 +2023/03/11 | 1055 | graphics/circuit_macros/examples/dpv/TgateDPV.m4 +2023/03/11 | 1444 | graphics/circuit_macros/examples/dpv/ThreeDPV.m4 +2023/03/11 | 3310 | graphics/circuit_macros/examples/dpv/thyristorDPV.m4 +2023/03/11 | 1612 | graphics/circuit_macros/examples/dpv/TimerDPV.m4 +2023/03/11 | 13505 | graphics/circuit_macros/examples/dpv/tstDPV.htmx +2023/03/11 | 1630 | graphics/circuit_macros/examples/dpv/TTLnandDPV.m4 +2023/03/11 | 3091 | graphics/circuit_macros/examples/dpv/TtreeDPV.m4 +2023/03/11 | 12478 | graphics/circuit_macros/examples/dpv/TubediagsDPV.m4 +2023/03/11 | 682 | graphics/circuit_macros/examples/dpv/ujtDPV.m4 +2023/03/11 | 23704 | graphics/circuit_macros/examples/dpv/UNODPV.m4 +2023/03/11 | 988 | graphics/circuit_macros/examples/dpv/VariableDPV.m4 +2023/03/11 | 2994 | graphics/circuit_macros/examples/dpv/WindingsDPV.m4 +2023/03/11 | 353 | graphics/circuit_macros/examples/dpv/windows.m4 +2023/03/11 | 3631 | graphics/circuit_macros/examples/dpv/wormDPV.m4 +2023/03/11 | 1559 | graphics/circuit_macros/examples/dpv/XformDPV.m4 +2023/03/11 | 1985 | graphics/circuit_macros/examples/dpv/XORDPV.m4 +2023/03/11 | 1546 | graphics/circuit_macros/examples/dpv/Xtest.m4 +2023/03/11 | 1966 | graphics/circuit_macros/examples/Drive.m4 +2023/03/11 | 4885 | graphics/circuit_macros/examples/EEP.m4 +2023/03/11 | 977 | graphics/circuit_macros/examples/Emarrows.m4 +2023/03/11 | 6282 | graphics/circuit_macros/examples/Escher.m4 +2023/03/11 | 10836 | graphics/circuit_macros/examples/EVplugs.m4 +2023/03/11 | 2412 | graphics/circuit_macros/examples/ex00.m4 +2023/03/11 | 2294 | graphics/circuit_macros/examples/ex01.m4 +2023/03/11 | 1100 | graphics/circuit_macros/examples/ex02.m4 +2023/03/11 | 673 | graphics/circuit_macros/examples/ex03.m4 +2023/03/11 | 1654 | graphics/circuit_macros/examples/ex04.m4 +2023/03/11 | 3510 | graphics/circuit_macros/examples/ex05.m4 +2023/03/11 | 1700 | graphics/circuit_macros/examples/ex06.m4 +2023/03/11 | 2556 | graphics/circuit_macros/examples/ex08.m4 +2023/03/11 | 4313 | graphics/circuit_macros/examples/ex09.m4 +2023/03/11 | 1492 | graphics/circuit_macros/examples/ex10.m4 +2023/03/11 | 2361 | graphics/circuit_macros/examples/ex11.m4 +2023/03/11 | 3339 | graphics/circuit_macros/examples/ex12.m4 +2023/03/11 | 1003 | graphics/circuit_macros/examples/ex15.m4 +2023/03/11 | 1865 | graphics/circuit_macros/examples/ex16.m4 +2023/03/11 | 1126 | graphics/circuit_macros/examples/ex17.m4 +2023/03/11 | 865 | graphics/circuit_macros/examples/ex18.m4 +2023/03/11 | 2000 | graphics/circuit_macros/examples/ex21.m4 +2023/03/11 | 1903610 | graphics/circuit_macros/examples/examples.pdf +2023/03/11 | 1766 | graphics/circuit_macros/examples/examples.tex +2023/03/11 | 8372 | graphics/circuit_macros/examples/exp.m4 +2023/03/11 | 1091 | graphics/circuit_macros/examples/extras/Ant.m4 +2023/03/11 | 1786 | graphics/circuit_macros/examples/extras/ArrowFn.m4 +2023/03/11 | 1612 | graphics/circuit_macros/examples/extras/ASMEbox.m4 +2023/03/11 | 771 | graphics/circuit_macros/examples/extras/Attention.m4 +2023/03/11 | 2517 | graphics/circuit_macros/examples/extras/Autoencoder.m4 +2023/03/11 | 917 | graphics/circuit_macros/examples/extras/birds.m4 +2023/03/11 | 1075 | graphics/circuit_macros/examples/extras/bistable.m4 +2023/03/11 | 4114 | graphics/circuit_macros/examples/extras/brace.m4 +2023/03/11 | 970 | graphics/circuit_macros/examples/extras/Bridge.m4 +2023/03/11 | 245 | graphics/circuit_macros/examples/extras/Ccurve.m4 +2023/03/11 | 1039 | graphics/circuit_macros/examples/extras/chaos.m4 +2023/03/11 | 7583 | graphics/circuit_macros/examples/extras/Chuck.m4 +2023/03/11 | 7823 | graphics/circuit_macros/examples/extras/Clocks.m4 +2023/03/11 | 1375 | graphics/circuit_macros/examples/extras/ControlLoop.m4 +2023/03/11 | 551 | graphics/circuit_macros/examples/extras/Counting.m4 +2023/03/11 | 1879 | graphics/circuit_macros/examples/extras/Cruller.m4 +2023/03/11 | 6003 | graphics/circuit_macros/examples/extras/CSlight.m4 +2023/03/11 | 980 | graphics/circuit_macros/examples/extras/Cylinder.m4 +2023/03/11 | 1217 | graphics/circuit_macros/examples/extras/Egg.m4 +2023/03/11 | 4002 | graphics/circuit_macros/examples/extras/Euro.m4 +2023/03/11 | 2086 | graphics/circuit_macros/examples/extras/Eye.m4 +2023/03/11 | 1880 | graphics/circuit_macros/examples/extras/Fefets.m4 +2023/03/11 | 765 | graphics/circuit_macros/examples/extras/FieldLines.m4 +2023/03/11 | 645 | graphics/circuit_macros/examples/extras/Floor.m4 +2023/03/11 | 1961 | graphics/circuit_macros/examples/extras/Flow2.m4 +2023/03/11 | 1990 | graphics/circuit_macros/examples/extras/Hexagon.m4 +2023/03/11 | 2385 | graphics/circuit_macros/examples/extras/Highgain.m4 +2023/03/11 | 558 | graphics/circuit_macros/examples/extras/hsv.m4 +2023/03/11 | 1668 | graphics/circuit_macros/examples/extras/IC10107.m4 +2023/03/11 | 489 | graphics/circuit_macros/examples/extras/Koch.m4 +2023/03/11 | 4501 | graphics/circuit_macros/examples/extras/Lyap.m4 +2023/03/11 | 6552 | graphics/circuit_macros/examples/extras/Makefile +2023/03/11 | 2846 | graphics/circuit_macros/examples/extras/Metamodel.m4 +2023/03/11 | 2167 | graphics/circuit_macros/examples/extras/Obliq.m4 +2023/03/11 | 3072 | graphics/circuit_macros/examples/extras/OneLine.m4 +2023/03/11 | 2777 | graphics/circuit_macros/examples/extras/OpAmpFilter.m4 +2023/03/11 | 1089 | graphics/circuit_macros/examples/extras/Optics.m4 +2023/03/11 | 1852 | graphics/circuit_macros/examples/extras/Orbits.m4 +2023/03/11 | 657 | graphics/circuit_macros/examples/extras/PerpTo.m4 +2023/03/11 | 1373 | graphics/circuit_macros/examples/extras/person.m4 +2023/03/11 | 666 | graphics/circuit_macros/examples/extras/Pipe.m4 +2023/03/11 | 5730 | graphics/circuit_macros/examples/extras/Planes.m4 +2023/03/11 | 1174 | graphics/circuit_macros/examples/extras/PPA.m4 +2023/03/11 | 410 | graphics/circuit_macros/examples/extras/RandomNodes.m4 +2023/03/11 | 272 | graphics/circuit_macros/examples/extras/README_extras +2023/03/11 | 1097 | graphics/circuit_macros/examples/extras/Region.m4 +2023/03/11 | 1443 | graphics/circuit_macros/examples/extras/Resolver.m4 +2023/03/11 | 365 | graphics/circuit_macros/examples/extras/rotellipse.m4 +2023/03/11 | 747 | graphics/circuit_macros/examples/extras/SampleFlow.m4 +2023/03/11 | 295 | graphics/circuit_macros/examples/extras/ShadeSector.m4 +2023/03/11 | 4661 | graphics/circuit_macros/examples/extras/Shadow.m4 +2023/03/11 | 3749 | graphics/circuit_macros/examples/extras/Shaky.m4 +2023/03/11 | 1906 | graphics/circuit_macros/examples/extras/SPM.m4 +2023/03/11 | 953 | graphics/circuit_macros/examples/extras/squiggle.m4 +2023/03/11 | 1279 | graphics/circuit_macros/examples/extras/Star.m4 +2023/03/11 | 1795 | graphics/circuit_macros/examples/extras/Stator.m4 +2023/03/11 | 359 | graphics/circuit_macros/examples/extras/TR_fill.m4 +2023/03/11 | 1916 | graphics/circuit_macros/examples/extras/venus.m4 +2023/03/11 | 10232 | graphics/circuit_macros/examples/extras/Views.m4 +2023/03/11 | 449 | graphics/circuit_macros/examples/extras/Wheat.m4 +2023/03/11 | 475 | graphics/circuit_macros/examples/extras/Wheel.m4 +2023/03/11 | 1511 | graphics/circuit_macros/examples/extras/Y14-5_example.m4 +2023/03/11 | 656 | graphics/circuit_macros/examples/extras/Zcos.m4 +2023/03/11 | 5311 | graphics/circuit_macros/examples/fet.m4 +2023/03/11 | 19770 | graphics/circuit_macros/examples/files.tex +2023/03/11 | 11255 | graphics/circuit_macros/examples/FlowchartDefs.m4def +2023/03/11 | 4792 | graphics/circuit_macros/examples/Flow.m4 +2023/03/11 | 1337 | graphics/circuit_macros/examples/Fuses.m4 +2023/03/11 | 5093 | graphics/circuit_macros/examples/Geometry.m4 +2023/03/11 | 1818 | graphics/circuit_macros/examples/GrayCode.m4 +2023/03/11 | 5486 | graphics/circuit_macros/examples/graysurf.m4 +2023/03/11 | 828 | graphics/circuit_macros/examples/Grounds.m4 +2023/03/11 | 1132 | graphics/circuit_macros/examples/Headers.m4 +2023/03/11 | 1458 | graphics/circuit_macros/examples/header.tex +2023/03/11 | 557 | graphics/circuit_macros/examples/heater.m4 +2023/03/11 | 13420 | graphics/circuit_macros/examples/Heathkit.m4 +2023/03/11 | 2068 | graphics/circuit_macros/examples/I2L.m4 +2023/03/11 | 11440 | graphics/circuit_macros/examples/ics.m4 +2023/03/11 | 32 | graphics/circuit_macros/examples/Incl.eps.bb +2023/03/11 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz +2023/03/11 | 772 | graphics/circuit_macros/examples/Incleps.m4 +2023/03/11 | 29772 | graphics/circuit_macros/examples/Incl.pdf +2023/03/11 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 +2023/03/11 | 1443 | graphics/circuit_macros/examples/Inductors.m4 +2023/03/11 | 2362 | graphics/circuit_macros/examples/Jack.m4 +2023/03/11 | 10699 | graphics/circuit_macros/examples/keyboard.m4 +2023/03/11 | 118060 | graphics/circuit_macros/examples/keyboard.pdf +2023/03/11 | 7127 | graphics/circuit_macros/examples/lcct.m4 +2023/03/11 | 41403 | graphics/circuit_macros/examples/Lettering.m4def +2023/03/11 | 2119 | graphics/circuit_macros/examples/Logic.m4 +2023/03/11 | 2304 | graphics/circuit_macros/examples/Loglog.m4 +2023/03/11 | 10104 | graphics/circuit_macros/examples/Makefile +2023/03/11 | 2986 | graphics/circuit_macros/examples/MC.m4 +2023/03/11 | 95150 | graphics/circuit_macros/examples/mf/cct.mf +2023/03/11 | 764 | graphics/circuit_macros/examples/mf/cct.tfm +2023/03/11 | 4615 | graphics/circuit_macros/examples/mf/font.m4 +2023/03/11 | 1529 | graphics/circuit_macros/examples/mf/Makefile +2023/03/11 | 1076 | graphics/circuit_macros/examples/mf/mftest +2023/03/11 | 3785 | graphics/circuit_macros/examples/Mixer.m4 +2023/03/11 | 1588 | graphics/circuit_macros/examples/MoreTable.m4 +2023/03/11 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 +2023/03/11 | 497 | graphics/circuit_macros/examples/mpost/examplesmpost.tex +2023/03/11 | 4465 | graphics/circuit_macros/examples/mpost/Makefile +2023/03/11 | 685 | graphics/circuit_macros/examples/mpost/mptest +2023/03/11 | 749 | graphics/circuit_macros/examples/mpost/README-mpost +2023/03/11 | 418 | graphics/circuit_macros/examples/mpost/tstmpost.tex +2023/03/11 | 1400 | graphics/circuit_macros/examples/Multiplexer.m4 +2023/03/11 | 499 | graphics/circuit_macros/examples/NLG.m4 +2023/03/11 | 1128 | graphics/circuit_macros/examples/NPDT.m4 +2023/03/11 | 1040 | graphics/circuit_macros/examples/Nport.m4 +2023/03/11 | 1433 | graphics/circuit_macros/examples/Opamp.m4 +2023/03/11 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 +2023/03/11 | 1997 | graphics/circuit_macros/examples/Pconn.m4 +2023/03/11 | 6254 | graphics/circuit_macros/examples/Plate.m4 +2023/03/11 | 715 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex +2023/03/11 | 4784 | graphics/circuit_macros/examples/psfrag/Makefile +2023/03/11 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt +2023/03/11 | 371 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex +2023/03/11 | 3954 | graphics/circuit_macros/examples/PushPull.m4 +2023/03/11 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 +2023/03/11 | 918 | graphics/circuit_macros/examples/Quantum.m4 +2023/03/11 | 774 | graphics/circuit_macros/examples/quick.m4 +2023/03/11 | 3727 | graphics/circuit_macros/examples/random.m4 +2023/03/11 | 3388 | graphics/circuit_macros/examples/README-examples +2023/03/11 | 7006 | graphics/circuit_macros/examples/Rectifiers.m4 +2023/03/11 | 3825 | graphics/circuit_macros/examples/recycle.m4 +2023/03/11 | 2086 | graphics/circuit_macros/examples/relaycoil.m4 +2023/03/11 | 1259 | graphics/circuit_macros/examples/Relay.m4 +2023/03/11 | 1147 | graphics/circuit_macros/examples/Resistors.m4 +2023/03/11 | 5485 | graphics/circuit_macros/examples/rose.m4 +2023/03/11 | 221 | graphics/circuit_macros/examples/rotate.tex +2023/03/11 | 1525 | graphics/circuit_macros/examples/rotatetext.m4 +2023/03/11 | 533 | graphics/circuit_macros/examples/Rotbox.m4 +2023/03/11 | 1778 | graphics/circuit_macros/examples/Schottky.m4 +2023/03/11 | 3991 | graphics/circuit_macros/examples/sfg.m4 +2023/03/11 | 1115 | graphics/circuit_macros/examples/shadowed.m4 +2023/03/11 | 7708 | graphics/circuit_macros/examples/shapes.m4 +2023/03/11 | 1406 | graphics/circuit_macros/examples/ShiftR.m4 +2023/03/11 | 1331 | graphics/circuit_macros/examples/Sierpinski.m4 +2023/03/11 | 419 | graphics/circuit_macros/examples/Sixpole.m4 +2023/03/11 | 8833 | graphics/circuit_macros/examples/Smithchart.m4 +2023/03/11 | 2165 | graphics/circuit_macros/examples/Sources.m4 +2023/03/11 | 380 | graphics/circuit_macros/examples/SQUID.m4 +2023/03/11 | 4782 | graphics/circuit_macros/examples/Switches.m4 +2023/03/11 | 591 | graphics/circuit_macros/examples/test.m4 +2023/03/11 | 416 | graphics/circuit_macros/examples/testpdf.tex +2023/03/11 | 1022 | graphics/circuit_macros/examples/Tgate.m4 +2023/03/11 | 1287 | graphics/circuit_macros/examples/Three.m4 +2023/03/11 | 3321 | graphics/circuit_macros/examples/thyristor.m4 +2023/03/11 | 219 | graphics/circuit_macros/examples/tst1.tex +2023/03/11 | 409 | graphics/circuit_macros/examples/tst.tex +2023/03/11 | 464 | graphics/circuit_macros/examples/tsttikz.tex +2023/03/11 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 +2023/03/11 | 9869 | graphics/circuit_macros/examples/tubedefs.m4 +2023/03/11 | 13294 | graphics/circuit_macros/examples/Tubediags.m4 +2023/03/11 | 660 | graphics/circuit_macros/examples/ujt.m4 +2023/03/11 | 23171 | graphics/circuit_macros/examples/UNO.m4 +2023/03/11 | 932 | graphics/circuit_macros/examples/Variable.m4 +2023/03/11 | 64 | graphics/circuit_macros/examples/Views.dms +2023/03/11 | 3346 | graphics/circuit_macros/examples/Windings.m4 +2023/03/11 | 353 | graphics/circuit_macros/examples/windows.m4 +2023/03/11 | 2801 | graphics/circuit_macros/examples/worm.m4 +2023/03/11 | 337 | graphics/circuit_macros/examples/xfig/Makefile +2023/03/11 | 21424 | graphics/circuit_macros/examples/xfig/xfiglib.fig +2023/03/11 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 +2023/03/11 | 1526 | graphics/circuit_macros/examples/Xform.m4 +2023/03/11 | 1823 | graphics/circuit_macros/examples/XOR.m4 +2023/03/11 | 1248 | graphics/circuit_macros/examples/xtras +2023/03/11 | 1019 | graphics/circuit_macros/gpic.m4 +2023/03/11 | 3794 | graphics/circuit_macros/INSTALL +2023/03/11 | 12765 | graphics/circuit_macros/lib3D.m4 +2023/03/11 | 186419 | graphics/circuit_macros/libcct.m4 +2023/03/11 | 91906 | graphics/circuit_macros/libgen.m4 +2023/03/11 | 47825 | graphics/circuit_macros/liblog.m4 +2023/03/11 | 32773 | graphics/circuit_macros/libSLD.m4 +2023/03/11 | 19176 | graphics/circuit_macros/Licence.txt +2023/03/11 | 1639 | graphics/circuit_macros/Makefile +2023/03/11 | 1114 | graphics/circuit_macros/mfpic.m4 +2023/03/11 | 1640 | graphics/circuit_macros/mpost.m4 +2023/03/11 | 2275 | graphics/circuit_macros/pdf.m4 +2023/03/11 | 2085 | graphics/circuit_macros/pgf.m4 +2023/03/11 | 2834 | graphics/circuit_macros/postscript.m4 +2023/03/11 | 706 | graphics/circuit_macros/psfrag.m4 +2023/03/11 | 2099 | graphics/circuit_macros/pstricks.m4 +2023/03/11 | 15834 | graphics/circuit_macros/README +2023/03/11 | 11995 | graphics/circuit_macros/svg.m4 +2023/03/11 | 1029 | graphics/circuit_macros/xfig.m4 +2023/03/11 | 3688386 | graphics/circuit_macros.zip 2018/09/22 | 49163 | graphics/coloremoji/coloremoji.sty 2018/09/22 | 15169 | graphics/coloremoji/emoji_images/hires/1F004.pdf 2018/09/22 | 24318 | graphics/coloremoji/emoji_images/hires/1F0CF.pdf @@ -201024,7 +201041,7 @@ 2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi 2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION 2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip -2023/03/06 | 115865963 | macros/context/latest/cont-tmf.zip +2023/03/10 | 113764270 | macros/context/latest/cont-tmf.zip 2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz 2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz 2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz @@ -223674,21 +223691,21 @@ 2007/09/21 | 3003 | macros/latex/contrib/hexgame/hexgame.tex 2007/09/21 | 302 | macros/latex/contrib/hexgame/README 2007/09/21 | 31262 | macros/latex/contrib/hexgame.zip -2022/12/07 | 557 | macros/latex/contrib/hfutexam/CHANGELOG.md -2022/12/06 | 92517 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf -2022/12/06 | 5092 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex -2022/12/07 | 13250 | macros/latex/contrib/hfutexam/hfutexam.cls -2022/12/05 | 70714 | macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf -2022/12/05 | 1623 | macros/latex/contrib/hfutexam/hfutexam_datizhi.tex -2022/12/07 | 205310 | macros/latex/contrib/hfutexam/hfutexam.pdf -2022/12/07 | 95064 | macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf -2022/12/04 | 3812 | macros/latex/contrib/hfutexam/hfutexam_shijuan.tex -2022/12/07 | 110469 | macros/latex/contrib/hfutexam/hfutexam_simple.pdf +2023/03/10 | 1062 | macros/latex/contrib/hfutexam/CHANGELOG.md +2023/03/10 | 94308 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf +2023/03/10 | 5088 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex +2023/03/11 | 11288 | macros/latex/contrib/hfutexam/hfutexam.cls +2023/03/10 | 71061 | macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf +2023/03/10 | 1612 | macros/latex/contrib/hfutexam/hfutexam_datizhi.tex +2023/03/10 | 205967 | macros/latex/contrib/hfutexam/hfutexam.pdf +2023/03/10 | 95264 | macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf +2023/03/10 | 3782 | macros/latex/contrib/hfutexam/hfutexam_shijuan.tex +2023/03/10 | 112375 | macros/latex/contrib/hfutexam/hfutexam_simple.pdf 2022/12/04 | 10530 | macros/latex/contrib/hfutexam/hfutexam_simple.tex -2022/12/07 | 12413 | macros/latex/contrib/hfutexam/hfutexam.tex +2023/03/10 | 12605 | macros/latex/contrib/hfutexam/hfutexam.tex 2022/09/18 | 19106 | macros/latex/contrib/hfutexam/LICENSE 2022/12/06 | 311 | macros/latex/contrib/hfutexam/README.md -2022/12/07 | 583621 | macros/latex/contrib/hfutexam.zip +2023/03/11 | 588845 | macros/latex/contrib/hfutexam.zip 2011/12/29 | 176 | macros/latex/contrib/hhtensor/ChangeLog 2003/11/15 | 153 | macros/latex/contrib/hhtensor/getversion.tex 2011/12/29 | 8296 | macros/latex/contrib/hhtensor/hhtensor.dtx @@ -231471,14 +231488,15 @@ 2017/04/21 | 1634 | macros/latex/contrib/phonrule/phonrule.sty 2017/04/21 | 492 | macros/latex/contrib/phonrule/README.md 2017/04/21 | 44782 | macros/latex/contrib/phonrule.zip -2023/03/02 | 1527 | macros/latex/contrib/photobook/LICENSE -2023/03/02 | 9234 | macros/latex/contrib/photobook/Makefile -2023/03/02 | 159132 | macros/latex/contrib/photobook/photobook.cls -2023/03/02 | 140491 | macros/latex/contrib/photobook/photobook.pdf -2023/03/02 | 1705 | macros/latex/contrib/photobook/README.md -2023/03/02 | 4212 | macros/latex/contrib/photobook/scripts/cls2tex.sh -2023/03/02 | 10553 | macros/latex/contrib/photobook/scripts/make-images.sh -2023/03/03 | 179263 | macros/latex/contrib/photobook.zip +2023/03/11 | 1527 | macros/latex/contrib/photobook/LICENSE +2023/03/11 | 9234 | macros/latex/contrib/photobook/Makefile +2023/03/11 | 161078 | macros/latex/contrib/photobook/photobook.cls +2023/03/11 | 140737 | macros/latex/contrib/photobook/photobook.pdf +2023/03/11 | 1705 | macros/latex/contrib/photobook/README.md +2023/03/11 | 4217 | macros/latex/contrib/photobook/scripts/cls2tex.sh +2023/03/11 | 18536 | macros/latex/contrib/photobook/scripts/make-spreads.sh +2023/03/11 | 13616 | macros/latex/contrib/photobook/scripts/README.md +2023/03/11 | 187449 | macros/latex/contrib/photobook.zip 2004/07/15 | 1773 | macros/latex/contrib/photo/Makefile 2004/07/15 | 26571 | macros/latex/contrib/photo/photo.dtx 1999/07/25 | 595 | macros/latex/contrib/photo/photo.ins @@ -276532,7 +276550,7 @@ 2019/04/03 | 3115 | support/adobemapping/cmap-resources/Adobe-GB1-5/CMap/UniGB-UTF8-V 2019/04/03 | 7820 | support/adobemapping/cmap-resources/Adobe-Identity-0/CMap/Identity-H 2019/04/03 | 2619 | support/adobemapping/cmap-resources/Adobe-Identity-0/CMap/Identity-V -2023/01/19 | 2691597 | support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt +2023/03/11 | 2691285 | support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt 2019/04/03 | 14796 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/78-EUC-H 2019/04/03 | 3222 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/78-EUC-V 2019/04/03 | 14673 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/78-H @@ -276575,12 +276593,12 @@ 2019/04/03 | 5124 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/RKSJ-H 2019/04/03 | 3229 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/RKSJ-V 2019/04/03 | 2688 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/Roman -2023/01/19 | 188305 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H -2023/01/19 | 5830 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V -2023/01/19 | 245525 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H -2023/01/19 | 6862 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V -2023/01/19 | 216537 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H -2023/01/19 | 6353 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V +2023/03/11 | 188254 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H +2023/03/11 | 5795 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V +2023/03/11 | 245474 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H +2023/03/11 | 6827 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V +2023/03/11 | 216486 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H +2023/03/11 | 6318 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V 2019/04/03 | 6729 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISPro-UCS2-HW-V 2019/04/03 | 6618 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISPro-UCS2-V 2019/04/03 | 7467 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISPro-UTF8-V @@ -276588,16 +276606,16 @@ 2019/04/03 | 2820 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UCS2-HW-H 2019/04/03 | 6591 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UCS2-HW-V 2019/04/03 | 6509 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UCS2-V -2023/01/19 | 188225 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H -2023/01/19 | 5806 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V -2023/01/19 | 245445 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H -2023/01/19 | 6838 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V -2023/01/19 | 216459 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H -2023/01/19 | 6331 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V -2023/01/19 | 245515 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H -2023/01/19 | 6828 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V -2023/01/19 | 245434 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H -2023/01/19 | 6804 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V +2023/03/11 | 188173 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H +2023/03/11 | 5771 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V +2023/03/11 | 245393 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H +2023/03/11 | 6803 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V +2023/03/11 | 216408 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H +2023/03/11 | 6296 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V +2023/03/11 | 245463 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H +2023/03/11 | 6793 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V +2023/03/11 | 245383 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H +2023/03/11 | 6769 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V 2019/04/03 | 3199 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/V 2019/04/03 | 3093 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/WP-Symbol 2018/12/16 | 276521 | support/adobemapping/cmap-resources/Adobe-Japan1-7/jisx0208-jp04.txt @@ -276630,7 +276648,7 @@ 2019/04/03 | 3130 | support/adobemapping/cmap-resources/Adobe-Korea1-2/CMap/UniKS-UTF32-V 2019/04/03 | 145845 | support/adobemapping/cmap-resources/Adobe-Korea1-2/CMap/UniKS-UTF8-H 2019/04/03 | 3076 | support/adobemapping/cmap-resources/Adobe-Korea1-2/CMap/UniKS-UTF8-V -2023/01/19 | 592367 | support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt +2023/03/11 | 592346 | support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt 2019/04/03 | 2879 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-0 2019/04/03 | 3012 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-1 2019/04/03 | 3512 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-2 @@ -276641,13 +276659,13 @@ 2019/04/03 | 4092 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-7 2019/04/03 | 4372 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-8 2019/04/03 | 4412 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/Adobe-KR-9 -2023/01/19 | 186571 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H -2023/01/19 | 250512 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H -2023/01/19 | 220026 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H +2023/03/11 | 186553 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H +2023/03/11 | 250494 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H +2023/03/11 | 220008 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H 2019/07/30 | 1453 | support/adobemapping/cmap-resources/LICENSE.md 2018/12/16 | 4666 | support/adobemapping/cmap-resources/Makefile -2020/09/12 | 21396 | support/adobemapping/cmap-resources/README.md -2023/01/19 | 6415 | support/adobemapping/cmap-resources/VERSIONS.txt +2023/03/11 | 21462 | support/adobemapping/cmap-resources/README.md +2023/03/11 | 6415 | support/adobemapping/cmap-resources/VERSIONS.txt 2019/04/03 | 1453 | support/adobemapping/mapping-resources-pdf/LICENSE.txt 2018/12/16 | 2350 | support/adobemapping/mapping-resources-pdf/Makefile 2019/04/03 | 106193 | support/adobemapping/mapping-resources-pdf/pdf2other/90ms-RKSJ-UCS2 @@ -276672,7 +276690,7 @@ 2019/04/03 | 14214 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Japan1-PS-V 2019/04/03 | 3039 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-CID 2019/04/03 | 16800 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Host -2023/01/19 | 12278 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac +2023/03/11 | 12368 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac 2019/04/03 | 16605 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-KSCms-UHC 2019/04/03 | 12452 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-KSCpc-EUC 2019/04/03 | 2647 | support/adobemapping/mapping-resources-pdf/pdf2other/B5pc-UCS2 @@ -276692,14 +276710,14 @@ 2019/04/03 | 189539 | support/adobemapping/mapping-resources-pdf/pdf2other/UCS2-GBpc-EUC 2019/04/03 | 188853 | support/adobemapping/mapping-resources-pdf/pdf2other/UCS2-KSCms-UHC 2019/04/03 | 147723 | support/adobemapping/mapping-resources-pdf/pdf2other/UCS2-KSCpc-EUC -2023/01/19 | 266531 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 -2023/01/19 | 221211 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 -2023/01/19 | 294111 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 +2023/03/11 | 266505 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 +2023/03/11 | 231844 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 +2023/03/11 | 284083 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 2019/04/03 | 146807 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Korea1-UCS2 -2023/01/19 | 203264 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 -2020/09/12 | 2048 | support/adobemapping/mapping-resources-pdf/README.md -2023/01/19 | 647 | support/adobemapping/README -2023/01/19 | 6645285 | support/adobemapping.zip +2023/03/11 | 203260 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 +2023/03/11 | 2133 | support/adobemapping/mapping-resources-pdf/README.md +2023/03/11 | 802 | support/adobemapping/README +2023/03/11 | 6643293 | support/adobemapping.zip 2023/01/27 | 1492 | support/albatross/doc/albatross.1 2023/01/27 | 86396 | support/albatross/doc/albatross-manual.pdf 2023/01/27 | 35236 | support/albatross/doc/albatross-manual.tex @@ -283644,7 +283662,7 @@ 2021/05/03 | 629 | support/TeX4ht/doc/README 2020/08/24 | 358454 | support/TeX4ht/doc/TeX4ht-doc.tex 2021/05/11 | 262 | support/TeX4ht/README -2023/03/08 | 218481 | support/TeX4ht/source/ChangeLog +2023/03/10 | 218724 | support/TeX4ht/source/ChangeLog 2021/05/03 | 1375 | support/TeX4ht/source/checklog.lua 2021/05/03 | 1189 | support/TeX4ht/source/common-code.tex 2021/05/03 | 2727 | support/TeX4ht/source/common-info.tex @@ -283656,7 +283674,7 @@ 2021/05/03 | 1121 | support/TeX4ht/source/README 2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua 2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex -2023/03/08 | 1154232 | support/TeX4ht/source/tex4ht-4ht.tex +2023/03/10 | 1154602 | support/TeX4ht/source/tex4ht-4ht.tex 2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex 2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex 2022/06/05 | 21307 | support/TeX4ht/source/tex4ht-cond4ht.tex @@ -288859,8 +288877,8 @@ 2021/06/03 | 167160 | systems/texlive/tlnet/archive/biblatex-cv.doc.r59433.tar.xz 2021/06/03 | 10060 | systems/texlive/tlnet/archive/biblatex-cv.r59433.tar.xz 2023/03/07 | 7330528 | systems/texlive/tlnet/archive/biblatex.doc.r66405.tar.xz -2019/02/28 | 1124296 | systems/texlive/tlnet/archive/biblatex-dw.doc.r42649.tar.xz -2019/02/28 | 16432 | systems/texlive/tlnet/archive/biblatex-dw.r42649.tar.xz +2023/03/11 | 1145632 | systems/texlive/tlnet/archive/biblatex-dw.doc.r66534.tar.xz +2023/03/11 | 16472 | systems/texlive/tlnet/archive/biblatex-dw.r66534.tar.xz 2019/02/28 | 2284 | systems/texlive/tlnet/archive/biblatex-enc.doc.r44627.tar.xz 2019/02/28 | 8476 | systems/texlive/tlnet/archive/biblatex-enc.r44627.tar.xz 2022/06/19 | 874536 | systems/texlive/tlnet/archive/biblatex-ext.doc.r63638.tar.xz @@ -291332,13 +291350,13 @@ 2022/03/02 | 1633908 | systems/texlive/tlnet/archive/dvisvgm.amd64-freebsd.r62332.tar.xz 2022/03/02 | 1797964 | systems/texlive/tlnet/archive/dvisvgm.amd64-netbsd.r62310.tar.xz 2022/04/21 | 1532360 | systems/texlive/tlnet/archive/dvisvgm.armhf-linux.r63092.tar.xz -2023/02/25 | 107332 | systems/texlive/tlnet/archive/dvisvgm.doc.r66119.tar.xz +2023/03/11 | 107332 | systems/texlive/tlnet/archive/dvisvgm.doc.r66534.tar.xz 2022/03/03 | 1765660 | systems/texlive/tlnet/archive/dvisvgm.i386-cygwin.r62359.tar.xz 2022/03/02 | 1584792 | systems/texlive/tlnet/archive/dvisvgm.i386-freebsd.r62332.tar.xz 2022/03/02 | 1889744 | systems/texlive/tlnet/archive/dvisvgm.i386-linux.r62330.tar.xz 2022/03/02 | 1778072 | systems/texlive/tlnet/archive/dvisvgm.i386-netbsd.r62310.tar.xz 2022/03/02 | 1936672 | systems/texlive/tlnet/archive/dvisvgm.i386-solaris.r62332.tar.xz -2023/02/25 | 880 | systems/texlive/tlnet/archive/dvisvgm.r66119.tar.xz +2023/03/11 | 880 | systems/texlive/tlnet/archive/dvisvgm.r66534.tar.xz 2022/03/05 | 2649428 | systems/texlive/tlnet/archive/dvisvgm.universal-darwin.r62421.tar.xz 2022/05/22 | 1518060 | systems/texlive/tlnet/archive/dvisvgm.win32.r63357.tar.xz 2022/03/03 | 1738740 | systems/texlive/tlnet/archive/dvisvgm.x86_64-cygwin.r62357.tar.xz @@ -296730,9 +296748,9 @@ 2022/10/30 | 314616 | systems/texlive/tlnet/archive/pdflscape.doc.r64851.tar.xz 2022/10/30 | 2612 | systems/texlive/tlnet/archive/pdflscape.r64851.tar.xz 2022/10/30 | 6508 | systems/texlive/tlnet/archive/pdflscape.source.r64851.tar.xz -2023/02/22 | 8709804 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r66028.tar.xz -2023/02/22 | 75792 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r66028.tar.xz -2023/02/22 | 137268 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r66028.tar.xz +2023/03/11 | 8714664 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r66534.tar.xz +2023/03/11 | 53640 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r66534.tar.xz +2023/03/11 | 137464 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r66534.tar.xz 2019/02/28 | 381552 | systems/texlive/tlnet/archive/pdfmarginpar.doc.r23492.tar.xz 2019/02/28 | 2424 | systems/texlive/tlnet/archive/pdfmarginpar.r23492.tar.xz 2022/12/22 | 222104 | systems/texlive/tlnet/archive/pdfmsym.doc.r65324.tar.xz @@ -299235,14 +299253,14 @@ 2022/02/27 | 108804 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r62206.tar.xz 2022/02/27 | 87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r62220.tar.xz 2022/04/21 | 69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r63092.tar.xz -2023/03/08 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r66459.tar.xz +2023/03/11 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r66531.tar.xz 2022/03/01 | 58328 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r62282.tar.xz 2022/02/27 | 93760 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r62206.tar.xz 2022/02/27 | 91280 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r62210.tar.xz 2022/02/27 | 76200 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r62220.tar.xz 2022/02/27 | 83964 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r62206.tar.xz -2023/03/08 | 1106552 | systems/texlive/tlnet/archive/tex4ht.r66459.tar.xz -2023/03/08 | 1447440 | systems/texlive/tlnet/archive/tex4ht.source.r66459.tar.xz +2023/03/11 | 1106580 | systems/texlive/tlnet/archive/tex4ht.r66531.tar.xz +2023/03/11 | 1444484 | systems/texlive/tlnet/archive/tex4ht.source.r66531.tar.xz 2022/02/28 | 184748 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r62258.tar.xz 2022/02/27 | 57768 | systems/texlive/tlnet/archive/tex4ht.win32.r62199.tar.xz 2022/03/01 | 58016 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r62279.tar.xz @@ -299496,7 +299514,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2023/03/10 | 424920 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66486.tar.xz +2023/03/11 | 424920 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66519.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 @@ -299520,7 +299538,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2023/03/10 | 113808 | systems/texlive/tlnet/archive/texlive-scripts.r66486.tar.xz +2023/03/11 | 113824 | systems/texlive/tlnet/archive/texlive-scripts.r66519.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2022/11/29 | 36264 | systems/texlive/tlnet/archive/texlive-scripts.win32.r65128.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -300862,9 +300880,9 @@ 2020/01/16 | 465604 | systems/texlive/tlnet/archive/widetable.doc.r53409.tar.xz 2020/01/16 | 1468 | systems/texlive/tlnet/archive/widetable.r53409.tar.xz 2020/01/16 | 9224 | systems/texlive/tlnet/archive/widetable.source.r53409.tar.xz -2022/08/28 | 843620 | systems/texlive/tlnet/archive/widows-and-orphans.doc.r64212.tar.xz -2022/08/28 | 2892 | systems/texlive/tlnet/archive/widows-and-orphans.r64212.tar.xz -2022/08/28 | 12312 | systems/texlive/tlnet/archive/widows-and-orphans.source.r64212.tar.xz +2023/03/11 | 816884 | systems/texlive/tlnet/archive/widows-and-orphans.doc.r66534.tar.xz +2023/03/11 | 2904 | systems/texlive/tlnet/archive/widows-and-orphans.r66534.tar.xz +2023/03/11 | 12324 | systems/texlive/tlnet/archive/widows-and-orphans.source.r66534.tar.xz 2019/02/28 | 792 | systems/texlive/tlnet/archive/williams.doc.r15878.tar.xz 2019/02/28 | 2472 | systems/texlive/tlnet/archive/williams.r15878.tar.xz 2021/09/29 | 24230688 | systems/texlive/tlnet/archive/willowtreebook.doc.r60638.tar.xz @@ -301391,16 +301409,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2022/07/17 | 124404 | systems/texlive/tlnet/install-tl -2023/03/10 | 5828937 | systems/texlive/tlnet/install-tl-unx.tar.gz -2023/03/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/03/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/03/11 | 5828961 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/03/11 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/03/11 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat -2023/03/10 | 20436070 | systems/texlive/tlnet/install-tl-windows.exe -2023/03/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/03/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/03/10 | 25513804 | systems/texlive/tlnet/install-tl.zip -2023/03/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/03/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/03/11 | 20436429 | systems/texlive/tlnet/install-tl-windows.exe +2023/03/11 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/03/11 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/03/11 | 25513824 | systems/texlive/tlnet/install-tl.zip +2023/03/11 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/03/11 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2022/04/03 | 1229 | systems/texlive/tlnet/README.md 2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022 2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -301410,7 +301428,7 @@ 2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2023/03/10 | 7329 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2023/03/11 | 7404 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/01/11 | 216583 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt @@ -301453,12 +301471,12 @@ 2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2023/03/10 | 18075312 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2023/03/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/03/11 | 18075223 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/03/11 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2023/03/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2023/03/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/03/10 | 2453232 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/03/11 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/03/11 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/03/11 | 2450208 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2022/09/14 | 58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2022/10/04 | 42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -304166,7 +304184,7 @@ 2023/02/18 | 94454 | systems/texlive/tlnet/tlpkg/translations/fr.po 2023/02/18 | 88047 | systems/texlive/tlnet/tlpkg/translations/it.po 2023/02/18 | 62994 | systems/texlive/tlnet/tlpkg/translations/ja.po -2023/03/10 | 47403 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2023/03/11 | 47403 | systems/texlive/tlnet/tlpkg/translations/messages.pot 2023/02/18 | 58359 | systems/texlive/tlnet/tlpkg/translations/nl.po 2023/02/18 | 67459 | systems/texlive/tlnet/tlpkg/translations/pl.po 2023/02/18 | 82899 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po @@ -311783,7 +311801,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2023/03/11 | 186 | timestamp +2023/03/12 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex dc9dd44c29..758f29ccb4 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 65f09f5dee..831f4be4f4 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,19 +1,583 @@ +2023/03/11 | 991 | graphics/circuit_macros/examples/Byte.m4 +2023/03/11 | 988 | graphics/circuit_macros/examples/dpv/VariableDPV.m4 +2023/03/11 | 9869 | graphics/circuit_macros/examples/tubedefs.m4 +2023/03/11 | 981 | graphics/circuit_macros/doc/EmarrowsMan.m4 +2023/03/11 | 980 | graphics/circuit_macros/examples/extras/Cylinder.m4 +2023/03/11 | 977 | graphics/circuit_macros/examples/Emarrows.m4 +2023/03/11 | 970 | graphics/circuit_macros/examples/extras/Bridge.m4 +2023/03/11 | 970 | graphics/circuit_macros/doc/Flowdiag.m4 +2023/03/11 | 966 | graphics/circuit_macros/examples/dpv/ex15DPV.m4 +2023/03/11 | 953 | graphics/circuit_macros/examples/extras/squiggle.m4 +2023/03/11 | 95150 | graphics/circuit_macros/examples/mf/cct.mf +2023/03/11 | 947 | graphics/circuit_macros/examples/dpv/QuantumDPV.m4 +2023/03/11 | 944 | graphics/circuit_macros/doc/VariableMan.m4 +2023/03/11 | 937 | graphics/circuit_macros/examples/dpv/ByteDPV.m4 +2023/03/11 | 932 | graphics/circuit_macros/examples/Variable.m4 +2023/03/11 | 9234 | macros/latex/contrib/photobook/Makefile +2023/03/11 | 91906 | graphics/circuit_macros/libgen.m4 +2023/03/11 | 918 | graphics/circuit_macros/examples/Quantum.m4 +2023/03/11 | 917 | graphics/circuit_macros/examples/extras/birds.m4 +2023/03/11 | 901 | graphics/circuit_macros/examples/dpv/quickDPV.m4 +2023/03/11 | 8833 | graphics/circuit_macros/examples/Smithchart.m4 +2023/03/11 | 8810 | graphics/circuit_macros/examples/dpv/SmithchartDPV.m4 +2023/03/11 | 880 | systems/texlive/tlnet/archive/dvisvgm.r66534.tar.xz +2023/03/11 | 8714664 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r66534.tar.xz +2023/03/11 | 865 | graphics/circuit_macros/examples/ex18.m4 +2023/03/11 | 858 | fonts/alchemist/README.md +2023/03/11 | 855 | graphics/circuit_macros/examples/dpv/ex03DPV.m4 +2023/03/11 | 8517 | graphics/circuit_macros/examples/dpv/expDPV.m4 +2023/03/11 | 8372 | graphics/circuit_macros/examples/exp.m4 +2023/03/11 | 835 | graphics/circuit_macros/doc/Opto.m4 +2023/03/11 | 831 | graphics/circuit_macros/doc/GroundsMan.m4 +2023/03/11 | 828 | graphics/circuit_macros/examples/Grounds.m4 +2023/03/11 | 816884 | systems/texlive/tlnet/archive/widows-and-orphans.doc.r66534.tar.xz +2023/03/11 | 810 | graphics/circuit_macros/examples/dpv/GroundsDPV.m4 +2023/03/11 | 802 | support/adobemapping/README +2023/03/11 | 801 | graphics/circuit_macros/doc/Potentiometers.m4 +2023/03/11 | 8006 | graphics/circuit_macros/examples/dpv/controlDPV.m4 +2023/03/11 | 793 | graphics/circuit_macros/examples/dpv/CountingDPV.m4 +2023/03/11 | 784 | graphics/circuit_macros/doc/MoreTableMan.m4 +2023/03/11 | 783 | graphics/circuit_macros/doc/Oblique.m4 +2023/03/11 | 7823 | graphics/circuit_macros/examples/extras/Clocks.m4 +2023/03/11 | 7778 | graphics/circuit_macros/examples/dpv/cscDPV.m4 +2023/03/11 | 774 | graphics/circuit_macros/examples/quick.m4 +2023/03/11 | 774 | graphics/circuit_macros/doc/quick.m4 +2023/03/11 | 7734 | graphics/circuit_macros/examples/csc.m4 +2023/03/11 | 772 | graphics/circuit_macros/examples/Incleps.m4 +2023/03/11 | 771 | graphics/circuit_macros/examples/extras/Attention.m4 +2023/03/11 | 7708 | graphics/circuit_macros/examples/shapes.m4 +2023/03/11 | 765 | graphics/circuit_macros/examples/extras/FieldLines.m4 +2023/03/11 | 764 | graphics/circuit_macros/examples/mf/cct.tfm +2023/03/11 | 758 | graphics/circuit_macros/examples/dpv/Np.m4 +2023/03/11 | 7583 | graphics/circuit_macros/examples/extras/Chuck.m4 +2023/03/11 | 7546 | graphics/circuit_macros/examples/dpv/RectifiersDPV.m4 +2023/03/11 | 749 | graphics/circuit_macros/examples/mpost/README-mpost +2023/03/11 | 7494 | graphics/circuit_macros/examples/dpv/shapesDPV.m4 +2023/03/11 | 747 | graphics/circuit_macros/examples/extras/SampleFlow.m4 +2023/03/11 | 745 | graphics/circuit_macros/examples/dpv/DecoderDPV.m4 +2023/03/11 | 7418 | graphics/circuit_macros/examples/dpv/CsourceDPV.m4 +2023/03/11 | 7404 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2023/03/11 | 7363 | graphics/circuit_macros/doc/SLDsMan.m4 +2023/03/11 | 724 | graphics/circuit_macros/examples/Connectors.m4 +2023/03/11 | 7203 | graphics/circuit_macros/examples/dpv/lcctDPV.m4 +2023/03/11 | 715 | graphics/circuit_macros/examples/psfrag/examplespsfrag.tex +2023/03/11 | 715 | graphics/circuit_macros/examples/dpv/ConnectorsDPV.m4 +2023/03/11 | 7127 | graphics/circuit_macros/examples/lcct.m4 +2023/03/11 | 709 | graphics/circuit_macros/examples/Inclpdf.m4 +2023/03/11 | 706 | graphics/circuit_macros/psfrag.m4 +2023/03/11 | 7034 | graphics/circuit_macros/examples/control.m4 +2023/03/11 | 7006 | graphics/circuit_macros/examples/Rectifiers.m4 +2023/03/11 | 685 | graphics/circuit_macros/examples/mpost/mptest +2023/03/11 | 6854 | graphics/circuit_macros/examples/dpv/DiniDPV.m4 +2023/03/11 | 6854 | graphics/circuit_macros/examples/Dini.m4 +2023/03/11 | 682 | graphics/circuit_macros/examples/dpv/ujtDPV.m4 +2023/03/11 | 6827 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V +2023/03/11 | 6803 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V +2023/03/11 | 6793 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V +2023/03/11 | 6769 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V +2023/03/11 | 673 | graphics/circuit_macros/examples/ex03.m4 +2023/03/11 | 666 | graphics/circuit_macros/examples/extras/Pipe.m4 +2023/03/11 | 6643293 | support/adobemapping.zip +2023/03/11 | 660 | graphics/circuit_macros/examples/ujt.m4 +2023/03/11 | 660 | graphics/circuit_macros/doc/ujtMan.m4 +2023/03/11 | 657 | graphics/circuit_macros/examples/extras/PerpTo.m4 +2023/03/11 | 656 | graphics/circuit_macros/examples/extras/Zcos.m4 +2023/03/11 | 655 | graphics/circuit_macros/examples/Decoder.m4 +2023/03/11 | 6552 | graphics/circuit_macros/examples/extras/Makefile +2023/03/11 | 654 | graphics/circuit_macros/examples/diamond.m4 +2023/03/11 | 64 | graphics/circuit_macros/examples/Views.dms +2023/03/11 | 645 | graphics/circuit_macros/examples/extras/Floor.m4 +2023/03/11 | 6415 | support/adobemapping/cmap-resources/VERSIONS.txt +2023/03/11 | 6413 | graphics/circuit_macros/examples/dpv/CanLogicDPV.m4 +2023/03/11 | 63 | graphics/circuit_macros/examples/dpv/local_init.m4 +2023/03/11 | 6371 | graphics/circuit_macros/examples/CanLogic.m4 +2023/03/11 | 6318 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V +2023/03/11 | 6296 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V +2023/03/11 | 6285 | graphics/circuit_macros/examples/dpv/EscherDPV.m4 +2023/03/11 | 6282 | graphics/circuit_macros/examples/Escher.m4 +2023/03/11 | 6270 | graphics/circuit_macros/examples/ASME_Y14-5.m4def +2023/03/11 | 6254 | graphics/circuit_macros/examples/Plate.m4 +2023/03/11 | 6216 | graphics/circuit_macros/examples/dpv/LgateDPV.m4 +2023/03/11 | 6156 | graphics/circuit_macros/examples/dpv/PlateDPV.m4 +2023/03/11 | 614 | graphics/circuit_macros/doc/BigResistor.m4 +2023/03/11 | 6130 | graphics/circuit_macros/examples/dpv/Makefile +2023/03/11 | 609 | graphics/circuit_macros/examples/dpv/README_svg +2023/03/11 | 609 | graphics/circuit_macros/examples/dpv/diamondDPV.m4 +2023/03/11 | 6003 | graphics/circuit_macros/examples/extras/CSlight.m4 +2023/03/11 | 5969 | graphics/circuit_macros/examples/xfig/xfiglib.m4 +2023/03/11 | 592346 | support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt +2023/03/11 | 591 | graphics/circuit_macros/examples/test.m4 +2023/03/11 | 5889 | graphics/circuit_macros/examples/Csource.m4 +2023/03/11 | 588845 | macros/latex/contrib/hfutexam.zip +2023/03/11 | 5828961 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/03/11 | 5795 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V +2023/03/11 | 5771 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V +2023/03/11 | 5730 | graphics/circuit_macros/examples/extras/Planes.m4 +2023/03/11 | 56 | graphics/circuit_macros/doc/opampex.m4 +2023/03/11 | 563 | graphics/circuit_macros/examples/dpv/RotboxDPV.m4 +2023/03/11 | 560 | graphics/circuit_macros/doc/heaterMan.m4 +2023/03/11 | 558 | graphics/circuit_macros/examples/extras/hsv.m4 +2023/03/11 | 557 | graphics/circuit_macros/examples/heater.m4 +2023/03/11 | 555 | graphics/circuit_macros/examples/dpv/FontsDPV.m4 +2023/03/11 | 551 | graphics/circuit_macros/examples/extras/Counting.m4 +2023/03/11 | 5486 | graphics/circuit_macros/examples/graysurf.m4 +2023/03/11 | 5485 | graphics/circuit_macros/examples/rose.m4 +2023/03/11 | 5485 | graphics/circuit_macros/examples/dpv/roseDPV.m4 +2023/03/11 | 5469 | graphics/circuit_macros/examples/dpv/graysurfDPV.m4 +2023/03/11 | 538 | graphics/circuit_macros/examples/dpv/AmpTableDPV.m4 +2023/03/11 | 5365 | graphics/circuit_macros/examples/dpv/fetDPV.m4 +2023/03/11 | 53640 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r66534.tar.xz +2023/03/11 | 535 | graphics/circuit_macros/doc/Tline.m4 +2023/03/11 | 533 | graphics/circuit_macros/examples/Rotbox.m4 +2023/03/11 | 532 | graphics/circuit_macros/examples/dpv/NLGDPV.m4 +2023/03/11 | 5315 | graphics/circuit_macros/doc/fetMan.m4 +2023/03/11 | 5311 | graphics/circuit_macros/examples/fet.m4 +2023/03/11 | 5228 | graphics/circuit_macros/examples/dpv/GeometryDPV.m4 +2023/03/11 | 5174 | graphics/circuit_macros/examples/dpv/FlowDPV.m4 +2023/03/11 | 5132 | graphics/circuit_macros/examples/dpv/SwitchesDPV.m4 +2023/03/11 | 50 | graphics/circuit_macros/doc/bitr.m4 +2023/03/11 | 5093 | graphics/circuit_macros/examples/Geometry.m4 +2023/03/11 | 5033 | graphics/circuit_macros/doc/Makefile +2023/03/11 | 499 | graphics/circuit_macros/examples/NLG.m4 +2023/03/11 | 499 | graphics/circuit_macros/doc/NLGMan.m4 +2023/03/11 | 497 | graphics/circuit_macros/examples/mpost/examplesmpost.tex +2023/03/11 | 494 | graphics/circuit_macros/examples/AmpTable.m4 +2023/03/11 | 494 | graphics/circuit_macros/doc/AmpTableMan.m4 +2023/03/11 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/03/11 | 489 | graphics/circuit_macros/examples/extras/Koch.m4 +2023/03/11 | 4885 | graphics/circuit_macros/examples/EEP.m4 +2023/03/11 | 483 | graphics/circuit_macros/doc/eboxdims.m4 +2023/03/11 | 4792 | graphics/circuit_macros/examples/Flow.m4 +2023/03/11 | 4784 | graphics/circuit_macros/examples/psfrag/Makefile +2023/03/11 | 4782 | graphics/circuit_macros/examples/Switches.m4 +2023/03/11 | 47825 | graphics/circuit_macros/liblog.m4 +2023/03/11 | 4780 | graphics/circuit_macros/doc/SwitchesMan.m4 +2023/03/11 | 4761 | graphics/circuit_macros/examples/dpv/sfgDPV.m4 +2023/03/11 | 475 | graphics/circuit_macros/examples/extras/Wheel.m4 +2023/03/11 | 4757 | graphics/circuit_macros/examples/dpv/EEPDPV.m4 +2023/03/11 | 47403 | systems/texlive/tlnet/tlpkg/translations/messages.pot +2023/03/11 | 4661 | graphics/circuit_macros/examples/extras/Shadow.m4 +2023/03/11 | 464 | graphics/circuit_macros/examples/tsttikz.tex +2023/03/11 | 4638 | graphics/circuit_macros/examples/Ball.m4 +2023/03/11 | 462 | graphics/circuit_macros/Copying +2023/03/11 | 4615 | graphics/circuit_macros/examples/mf/font.m4 +2023/03/11 | 460 | graphics/circuit_macros/examples/debug1.tex +2023/03/11 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/03/11 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/03/11 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/03/11 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/03/11 | 45323 | graphics/circuit_macros/examples/Incl.eps.gz +2023/03/11 | 4501 | graphics/circuit_macros/examples/extras/Lyap.m4 +2023/03/11 | 449 | graphics/circuit_macros/examples/extras/Wheat.m4 +2023/03/11 | 449 | graphics/circuit_macros/doc/woodchips.m4 +2023/03/11 | 4465 | graphics/circuit_macros/examples/mpost/Makefile +2023/03/11 | 4376 | graphics/circuit_macros/examples/dpv/slddiagsDPV.m4 +2023/03/11 | 4343 | graphics/circuit_macros/doc/Circuit_macros.bib +2023/03/11 | 4340 | graphics/circuit_macros/examples/dpv/AlogixDPV.m4 +2023/03/11 | 4313 | graphics/circuit_macros/examples/ex09.m4 +2023/03/11 | 43007 | fonts/alchemist/alchemist.tex +2023/03/11 | 4292 | graphics/circuit_macros/examples/dpv/InclepsDPV.m4 +2023/03/11 | 4292 | graphics/circuit_macros/examples/dpv/BtreeDPV.m4 +2023/03/11 | 424920 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66519.tar.xz +2023/03/11 | 421 | graphics/circuit_macros/doc/Sinus.m4 +2023/03/11 | 4217 | macros/latex/contrib/photobook/scripts/cls2tex.sh +2023/03/11 | 4205 | graphics/circuit_macros/examples/Alogix.m4 +2023/03/11 | 419 | graphics/circuit_macros/examples/Sixpole.m4 +2023/03/11 | 419 | graphics/circuit_macros/examples/dpv/SixpoleDPV.m4 +2023/03/11 | 418 | graphics/circuit_macros/examples/mpost/tstmpost.tex +2023/03/11 | 417 | graphics/circuit_macros/examples/dpv/SQUIDDPV.m4 +2023/03/11 | 416 | graphics/circuit_macros/examples/testpdf.tex +2023/03/11 | 41403 | graphics/circuit_macros/examples/Lettering.m4def +2023/03/11 | 4119 | graphics/circuit_macros/examples/dpv/ex09DPV.m4 +2023/03/11 | 4114 | graphics/circuit_macros/examples/extras/brace.m4 +2023/03/11 | 410 | graphics/circuit_macros/examples/extras/RandomNodes.m4 +2023/03/11 | 409 | graphics/circuit_macros/examples/tst.tex +2023/03/11 | 4050238 | biblio/ctan-bibdata.zip +2023/03/11 | 404 | graphics/circuit_macros/doc/Series.m4 +2023/03/11 | 4002 | graphics/circuit_macros/examples/extras/Euro.m4 +2023/03/11 | 3991 | graphics/circuit_macros/examples/sfg.m4 +2023/03/11 | 3954 | graphics/circuit_macros/examples/PushPull.m4 +2023/03/11 | 387 | graphics/circuit_macros/doc/lrarrows.m4 +2023/03/11 | 3825 | graphics/circuit_macros/examples/recycle.m4 +2023/03/11 | 3825 | graphics/circuit_macros/examples/dpv/recycleDPV.m4 +2023/03/11 | 380 | graphics/circuit_macros/examples/SQUID.m4 +2023/03/11 | 3794 | graphics/circuit_macros/INSTALL +2023/03/11 | 3785 | graphics/circuit_macros/examples/Mixer.m4 +2023/03/11 | 3778 | graphics/circuit_macros/examples/dpv/PushPullDPV.m4 +2023/03/11 | 3756 | graphics/circuit_macros/examples/dpv/randomDPV.m4 +2023/03/11 | 3749 | graphics/circuit_macros/examples/extras/Shaky.m4 +2023/03/11 | 3727 | graphics/circuit_macros/examples/random.m4 +2023/03/11 | 371 | graphics/circuit_macros/examples/psfrag/tstpsfrag.tex +2023/03/11 | 369 | graphics/circuit_macros/doc/sampleIC.m4 +2023/03/11 | 3688386 | graphics/circuit_macros.zip +2023/03/11 | 365 | graphics/circuit_macros/examples/extras/rotellipse.m4 +2023/03/11 | 3654013 | biblio/ctan-bibdata/ctan.pdf +2023/03/11 | 3646 | graphics/circuit_macros/examples/dpv/ContactDPV.m4 +2023/03/11 | 3631 | graphics/circuit_macros/examples/dpv/wormDPV.m4 +2023/03/11 | 359 | graphics/circuit_macros/examples/extras/TR_fill.m4 +2023/03/11 | 3567 | graphics/circuit_macros/examples/dpv/ButtonsDPV.m4 +2023/03/11 | 353 | graphics/circuit_macros/examples/windows.m4 +2023/03/11 | 353 | graphics/circuit_macros/examples/dpv/windows.m4 +2023/03/11 | 3522 | graphics/circuit_macros/examples/dpv/ex12DPV.m4 +2023/03/11 | 3510 | graphics/circuit_macros/examples/ex05.m4 +2023/03/11 | 3509 | graphics/circuit_macros/examples/Buttons.m4 +2023/03/11 | 3489 | graphics/circuit_macros/examples/dpv/MixerDPV.m4 +2023/03/11 | 3473 | graphics/circuit_macros/examples/dpv/MCDPV.m4 +2023/03/11 | 3464 | graphics/circuit_macros/examples/Contact.m4 +2023/03/11 | 3390 | graphics/circuit_macros/examples/dpv/ex05DPV.m4 +2023/03/11 | 3388 | graphics/circuit_macros/examples/README-examples +2023/03/11 | 337 | graphics/circuit_macros/examples/xfig/Makefile +2023/03/11 | 3346 | graphics/circuit_macros/examples/Windings.m4 +2023/03/11 | 3346 | graphics/circuit_macros/doc/WindingsMan.m4 +2023/03/11 | 3339 | graphics/circuit_macros/examples/ex12.m4 +2023/03/11 | 3326 | graphics/circuit_macros/doc/ContactMan.m4 +2023/03/11 | 3321 | graphics/circuit_macros/examples/thyristor.m4 +2023/03/11 | 3321 | graphics/circuit_macros/doc/thyristorMan.m4 +2023/03/11 | 3310 | graphics/circuit_macros/examples/dpv/thyristorDPV.m4 +2023/03/11 | 32 | graphics/circuit_macros/examples/Incl.eps.bb +2023/03/11 | 329 | graphics/circuit_macros/doc/FF.m4 +2023/03/11 | 32773 | graphics/circuit_macros/libSLD.m4 +2023/03/11 | 3198 | graphics/circuit_macros/examples/Btree.m4 +2023/03/11 | 317 | graphics/circuit_macros/examples/psfrag/README-psfrag.txt +2023/03/11 | 3091 | graphics/circuit_macros/examples/dpv/TtreeDPV.m4 +2023/03/11 | 3072 | graphics/circuit_macros/examples/extras/OneLine.m4 +2023/03/11 | 30451 | graphics/circuit_macros/examples/dpv/LoglogDPV.m4 +2023/03/11 | 3019 | graphics/circuit_macros/doc/Circuit_macros.tex +2023/03/11 | 2994 | graphics/circuit_macros/examples/dpv/WindingsDPV.m4 +2023/03/11 | 2989 | graphics/circuit_macros/examples/dpv/AutoencoderDPV.m4 +2023/03/11 | 2986 | graphics/circuit_macros/examples/MC.m4 +2023/03/11 | 29772 | graphics/circuit_macros/examples/Incl.pdf +2023/03/11 | 295 | graphics/circuit_macros/examples/extras/ShadeSector.m4 +2023/03/11 | 2912 | graphics/circuit_macros/doc/Workflow.m4 +2023/03/11 | 2904 | systems/texlive/tlnet/archive/widows-and-orphans.r66534.tar.xz +2023/03/11 | 2846 | graphics/circuit_macros/examples/extras/Metamodel.m4 +2023/03/11 | 284083 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 +2023/03/11 | 2834 | graphics/circuit_macros/postscript.m4 +2023/03/11 | 2801 | graphics/circuit_macros/examples/worm.m4 +2023/03/11 | 2777 | graphics/circuit_macros/examples/extras/OpAmpFilter.m4 +2023/03/11 | 2768681 | biblio/ctan-bibdata/ctan.bib +2023/03/11 | 272 | graphics/circuit_macros/examples/extras/README_extras +2023/03/11 | 2720 | graphics/circuit_macros/examples/dpv/AudioDPV.m4 +2023/03/11 | 27105 | graphics/circuit_macros/examples/Consumption.m4 +2023/03/11 | 26 | graphics/circuit_macros/doc/DCsymbol.m4 +2023/03/11 | 26 | graphics/circuit_macros/doc/ACsymbol.m4 +2023/03/11 | 269 | graphics/circuit_macros/doc/Loop.m4 +2023/03/11 | 2691285 | support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt +2023/03/11 | 2685 | graphics/circuit_macros/examples/dpv/ex11DPV.m4 +2023/03/11 | 266505 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 +2023/03/11 | 2634 | graphics/circuit_macros/examples/Audio.m4 +2023/03/11 | 2634 | graphics/circuit_macros/doc/AudioMan.m4 +2023/03/11 | 2629 | graphics/circuit_macros/examples/dpv/ex01DPV.m4 +2023/03/11 | 2562 | graphics/circuit_macros/examples/Crow.m4 +2023/03/11 | 2559 | graphics/circuit_macros/examples/dpv/ex08DPV.m4 +2023/03/11 | 2556 | graphics/circuit_macros/examples/ex08.m4 +2023/03/11 | 2551 | graphics/circuit_macros/examples/dpv/OptoisoDPV.m4 +2023/03/11 | 25513824 | systems/texlive/tlnet/install-tl.zip +2023/03/11 | 2528 | graphics/circuit_macros/examples/dpv/AdderDPV.m4 +2023/03/11 | 2525 | graphics/circuit_macros/examples/dpv/CrowDPV.m4 +2023/03/11 | 2517 | graphics/circuit_macros/examples/extras/Autoencoder.m4 +2023/03/11 | 250494 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H +2023/03/11 | 24811 | graphics/circuit_macros/examples/dpv/examplesDPVs.htmx +2023/03/11 | 24807 | graphics/circuit_macros/examples/dpv/examplesDPV.htmx +2023/03/11 | 245 | graphics/circuit_macros/examples/extras/Ccurve.m4 +2023/03/11 | 245474 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H +2023/03/11 | 245463 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H +2023/03/11 | 245393 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H +2023/03/11 | 245383 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H +2023/03/11 | 2450208 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/03/11 | 2443 | graphics/circuit_macros/examples/dpv/ex00DPV.m4 +2023/03/11 | 2442 | graphics/circuit_macros/examples/Optoiso.m4 +2023/03/11 | 2412 | graphics/circuit_macros/examples/ex00.m4 +2023/03/11 | 24034 | graphics/circuit_macros/dpictools.pic +2023/03/11 | 2402 | graphics/circuit_macros/examples/Adder.m4 +2023/03/11 | 2389 | graphics/circuit_macros/doc/Dac.m4 +2023/03/11 | 2385 | graphics/circuit_macros/examples/extras/Highgain.m4 +2023/03/11 | 23704 | graphics/circuit_macros/examples/dpv/UNODPV.m4 +2023/03/11 | 2362 | graphics/circuit_macros/examples/Jack.m4 +2023/03/11 | 2362 | graphics/circuit_macros/doc/JackMan.m4 +2023/03/11 | 2361 | graphics/circuit_macros/examples/ex11.m4 +2023/03/11 | 2353 | graphics/circuit_macros/doc/ConnMan.m4 +2023/03/11 | 2351 | graphics/circuit_macros/examples/Conn.m4 +2023/03/11 | 231844 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 +2023/03/11 | 23171 | graphics/circuit_macros/examples/UNO.m4 +2023/03/11 | 2304 | graphics/circuit_macros/examples/Loglog.m4 +2023/03/11 | 2294 | graphics/circuit_macros/examples/ex01.m4 +2023/03/11 | 2292 | graphics/circuit_macros/examples/dpv/ConnDPV.m4 +2023/03/11 | 2275 | graphics/circuit_macros/pdf.m4 +2023/03/11 | 2225 | graphics/circuit_macros/doc/SourcesMan.m4 +2023/03/11 | 221 | graphics/circuit_macros/examples/rotate.tex +2023/03/11 | 220008 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H +2023/03/11 | 219 | graphics/circuit_macros/examples/tst1.tex +2023/03/11 | 217 | graphics/circuit_macros/doc/stringdims.m4 +2023/03/11 | 2171 | graphics/circuit_macros/examples/dpv/I2LDPV.m4 +2023/03/11 | 2167 | graphics/circuit_macros/examples/extras/Obliq.m4 +2023/03/11 | 2165 | graphics/circuit_macros/examples/Sources.m4 +2023/03/11 | 216486 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H +2023/03/11 | 216408 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H +2023/03/11 | 21462 | support/adobemapping/cmap-resources/README.md +2023/03/11 | 2144 | fonts/alchemist/alchemist-ref.bib +2023/03/11 | 21424 | graphics/circuit_macros/examples/xfig/xfiglib.fig +2023/03/11 | 21384 | graphics/circuit_macros/examples/dpv/Incl.jpg +2023/03/11 | 2133 | support/adobemapping/mapping-resources-pdf/README.md +2023/03/11 | 2119 | graphics/circuit_macros/examples/Logic.m4 +2023/03/11 | 2119 | graphics/circuit_macros/doc/LogicMan.m4 +2023/03/11 | 2099 | graphics/circuit_macros/pstricks.m4 +2023/03/11 | 2086 | graphics/circuit_macros/examples/relaycoil.m4 +2023/03/11 | 2086 | graphics/circuit_macros/examples/extras/Eye.m4 +2023/03/11 | 2086 | graphics/circuit_macros/doc/relaycoilMan.m4 +2023/03/11 | 2085 | graphics/circuit_macros/pgf.m4 +2023/03/11 | 2069 | graphics/circuit_macros/examples/dpv/relaycoilDPV.m4 +2023/03/11 | 2068 | graphics/circuit_macros/examples/I2L.m4 +2023/03/11 | 2051 | graphics/circuit_macros/examples/dpv/JackDPV.m4 +2023/03/11 | 20436429 | systems/texlive/tlnet/install-tl-windows.exe +2023/03/11 | 203260 | support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 +2023/03/11 | 2027 | graphics/circuit_macros/examples/dpv/pwrsupplyDPV.m4 +2023/03/11 | 2018 | graphics/circuit_macros/examples/dpv/ex06DPV.m4 +2023/03/11 | 2014 | graphics/circuit_macros/examples/pwrsupply.m4 +2023/03/11 | 2013 | graphics/circuit_macros/doc/HybridPi.m4 +2023/03/11 | 2000 | graphics/circuit_macros/examples/ex21.m4 +2023/03/11 | 1997 | graphics/circuit_macros/examples/Pconn.m4 +2023/03/11 | 1996 | graphics/circuit_macros/examples/dpv/FourbarDPV.m4 +2023/03/11 | 1995 | graphics/circuit_macros/doc/Corners.m4 +2023/03/11 | 1990 | graphics/circuit_macros/examples/extras/Hexagon.m4 +2023/03/11 | 1985 | graphics/circuit_macros/examples/dpv/XORDPV.m4 +2023/03/11 | 1982 | graphics/circuit_macros/doc/PconnMan.m4 +2023/03/11 | 19770 | graphics/circuit_macros/examples/files.tex +2023/03/11 | 1975 | graphics/circuit_macros/doc/FlipFlop.m4 +2023/03/11 | 1966 | graphics/circuit_macros/examples/Drive.m4 +2023/03/11 | 1966 | graphics/circuit_macros/examples/dpv/DriveDPV.m4 +2023/03/11 | 1961 | graphics/circuit_macros/examples/extras/Flow2.m4 +2023/03/11 | 1959 | graphics/circuit_macros/examples/debug2.m4 +2023/03/11 | 1955 | graphics/circuit_macros/examples/dpv/ABlogixDPV.m4 +2023/03/11 | 1953 | graphics/circuit_macros/examples/dpv/MotorControlDPV.m4 +2023/03/11 | 1953 | graphics/circuit_macros/doc/Buffer.m4 +2023/03/11 | 1931 | graphics/circuit_macros/examples/dpv/LogicDPV.m4 +2023/03/11 | 1922 | graphics/circuit_macros/examples/MotorControl.m4 +2023/03/11 | 19176 | graphics/circuit_macros/Licence.txt +2023/03/11 | 1916 | graphics/circuit_macros/examples/extras/venus.m4 +2023/03/11 | 1907 | graphics/circuit_macros/examples/dpv/SourcesDPV.m4 +2023/03/11 | 1906 | graphics/circuit_macros/examples/extras/SPM.m4 +2023/03/11 | 1903610 | graphics/circuit_macros/examples/examples.pdf +2023/03/11 | 1894 | graphics/circuit_macros/examples/dpv/ArrowFnDPV.m4 +2023/03/11 | 1893 | graphics/circuit_macros/examples/dpv/ex16DPV.m4 +2023/03/11 | 1891 | graphics/circuit_macros/examples/dpv/ex04DPV.m4 +2023/03/11 | 1882 | graphics/circuit_macros/examples/dpv/ex21DPV.m4 +2023/03/11 | 188254 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H +2023/03/11 | 188173 | support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H +2023/03/11 | 1880 | graphics/circuit_macros/examples/extras/Fefets.m4 +2023/03/11 | 1879 | graphics/circuit_macros/examples/extras/Cruller.m4 +2023/03/11 | 1875 | graphics/circuit_macros/examples/dpv/GrayCodeDPV.m4 +2023/03/11 | 1874 | graphics/circuit_macros/examples/dpv/CrullerDPV.m4 +2023/03/11 | 187449 | macros/latex/contrib/photobook.zip +2023/03/11 | 1865 | graphics/circuit_macros/examples/ex16.m4 +2023/03/11 | 186553 | support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H +2023/03/11 | 186419 | graphics/circuit_macros/libcct.m4 +2023/03/11 | 1860 | graphics/circuit_macros/doc/bi_trans.m4 +2023/03/11 | 1857 | graphics/circuit_macros/doc/Composite.m4 +2023/03/11 | 18536 | macros/latex/contrib/photobook/scripts/make-spreads.sh +2023/03/11 | 1852 | graphics/circuit_macros/examples/extras/Orbits.m4 +2023/03/11 | 1837 | graphics/circuit_macros/examples/dpv/SchottkyDPV.m4 +2023/03/11 | 1823 | graphics/circuit_macros/examples/XOR.m4 +2023/03/11 | 1818 | graphics/circuit_macros/examples/GrayCode.m4 +2023/03/11 | 1812 | graphics/circuit_macros/examples/dpv/BipDPV.m4 +2023/03/11 | 18075223 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/03/11 | 1795 | graphics/circuit_macros/examples/extras/Stator.m4 +2023/03/11 | 1790 | graphics/circuit_macros/doc/DiodesMan.m4 +2023/03/11 | 1787 | graphics/circuit_macros/examples/Diodes.m4 +2023/03/11 | 1786 | graphics/circuit_macros/examples/extras/ArrowFn.m4 +2023/03/11 | 1781 | graphics/circuit_macros/examples/dpv/PconnDPV.m4 +2023/03/11 | 1778 | graphics/circuit_macros/examples/Schottky.m4 +2023/03/11 | 1766 | graphics/circuit_macros/examples/examples.tex +2023/03/11 | 1737 | graphics/circuit_macros/examples/dpv/ContactsDPV.m4 +2023/03/11 | 1730 | graphics/circuit_macros/examples/ABlogix.m4 +2023/03/11 | 1705 | macros/latex/contrib/photobook/README.md +2023/03/11 | 1700 | graphics/circuit_macros/examples/ex06.m4 +2023/03/11 | 1700 | graphics/circuit_macros/examples/dpv/EyeDPV.m4 +2023/03/11 | 1699 | graphics/circuit_macros/examples/dpv/ex10DPV.m4 +2023/03/11 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/03/11 | 1668 | graphics/circuit_macros/examples/extras/IC10107.m4 +2023/03/11 | 1668 | graphics/circuit_macros/examples/dpv/Banking.m4 +2023/03/11 | 165 | graphics/circuit_macros/doc/tranbody.m4 +2023/03/11 | 1654 | graphics/circuit_macros/examples/ex04.m4 +2023/03/11 | 1647 | graphics/circuit_macros/examples/dpv/DiodesDPV.m4 +2023/03/11 | 16472 | systems/texlive/tlnet/archive/biblatex-dw.r66534.tar.xz +2023/03/11 | 1640 | graphics/circuit_macros/mpost.m4 +2023/03/11 | 1639 | graphics/circuit_macros/Makefile +2023/03/11 | 1630 | graphics/circuit_macros/examples/dpv/TTLnandDPV.m4 +2023/03/11 | 1626 | graphics/circuit_macros/examples/dpv/ArrestersDPV.m4 +2023/03/11 | 1624 | graphics/circuit_macros/doc/ParSeries.m4 +2023/03/11 | 1619 | graphics/circuit_macros/examples/Bip.m4 +2023/03/11 | 1619 | graphics/circuit_macros/doc/BipMan.m4 +2023/03/11 | 1618 | graphics/circuit_macros/doc/ArrestersMan.m4 +2023/03/11 | 1615 | graphics/circuit_macros/examples/Arresters.m4 +2023/03/11 | 1612 | graphics/circuit_macros/examples/extras/ASMEbox.m4 +2023/03/11 | 1612 | graphics/circuit_macros/examples/dpv/TimerDPV.m4 +2023/03/11 | 161078 | macros/latex/contrib/photobook/photobook.cls +2023/03/11 | 1588 | graphics/circuit_macros/examples/MoreTable.m4 +2023/03/11 | 1585 | graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 +2023/03/11 | 1585 | graphics/circuit_macros/examples/Contacts.m4 +2023/03/11 | 1585 | graphics/circuit_macros/doc/ContactsMan.m4 +2023/03/11 | 15834 | graphics/circuit_macros/README +2023/03/11 | 1575 | graphics/circuit_macros/doc/mplex.m4 +2023/03/11 | 1559 | graphics/circuit_macros/examples/dpv/XformDPV.m4 +2023/03/11 | 1558 | graphics/circuit_macros/examples/TTLnand.m4 +2023/03/11 | 1546 | graphics/circuit_macros/examples/dpv/Xtest.m4 +2023/03/11 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/03/11 | 15328 | fonts/alchemist/alchemist.sty +2023/03/11 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/03/11 | 1529 | graphics/circuit_macros/examples/mf/Makefile +2023/03/11 | 1527 | macros/latex/contrib/photobook/LICENSE +2023/03/11 | 1526 | graphics/circuit_macros/examples/Xform.m4 +2023/03/11 | 1526 | graphics/circuit_macros/doc/XformMan.m4 +2023/03/11 | 1525 | graphics/circuit_macros/examples/rotatetext.m4 +2023/03/11 | 152586 | graphics/circuit_macros/doc/body.tex +2023/03/11 | 1511 | graphics/circuit_macros/examples/extras/Y14-5_example.m4 +2023/03/11 | 150 | graphics/circuit_macros/doc/Thermal.m4 +2023/03/11 | 1492 | graphics/circuit_macros/examples/ex10.m4 +2023/03/11 | 149124 | fonts/alchemist.zip +2023/03/11 | 1485 | graphics/circuit_macros/examples/Demultiplexer.m4 +2023/03/11 | 1485 | graphics/circuit_macros/doc/DemultiplexerMan.m4 +2023/03/11 | 1463 | graphics/circuit_macros/doc/Taps.m4 +2023/03/11 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/03/11 | 1458 | graphics/circuit_macros/examples/header.tex +2023/03/11 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/03/11 | 1444 | graphics/circuit_macros/examples/dpv/ThreeDPV.m4 +2023/03/11 | 1444484 | systems/texlive/tlnet/archive/tex4ht.source.r66531.tar.xz +2023/03/11 | 1443 | graphics/circuit_macros/examples/Inductors.m4 +2023/03/11 | 1443 | graphics/circuit_macros/examples/extras/Resolver.m4 +2023/03/11 | 1433 | graphics/circuit_macros/examples/Opamp.m4 +2023/03/11 | 1433 | graphics/circuit_macros/doc/OpampMan.m4 +2023/03/11 | 1431 | graphics/circuit_macros/examples/dpv/RelayDPV.m4 +2023/03/11 | 14279 | graphics/circuit_macros/darrow.m4 +2023/03/11 | 140737 | macros/latex/contrib/photobook/photobook.pdf +2023/03/11 | 1406 | graphics/circuit_macros/examples/ShiftR.m4 +2023/03/11 | 1406 | graphics/circuit_macros/doc/ShiftRMan.m4 +2023/03/11 | 1403 | graphics/circuit_macros/examples/dpv/MultiplexerDPV.m4 +2023/03/11 | 14038 | graphics/circuit_macros/CHANGES +2023/03/11 | 1400 | graphics/circuit_macros/examples/Multiplexer.m4 +2023/03/11 | 1400 | graphics/circuit_macros/doc/MultiplexerMan.m4 +2023/03/11 | 13 | graphics/circuit_macros/doc/Version.tex +2023/03/11 | 137 | graphics/circuit_macros/doc/opampexbody.m4 +2023/03/11 | 1375 | graphics/circuit_macros/examples/extras/ControlLoop.m4 +2023/03/11 | 137464 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r66534.tar.xz +2023/03/11 | 1373 | graphics/circuit_macros/examples/extras/person.m4 +2023/03/11 | 1373 | graphics/circuit_macros/examples/dpv/DemultiplexerDPV.m4 +2023/03/11 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r66531.tar.xz +2023/03/11 | 13616 | macros/latex/contrib/photobook/scripts/README.md +2023/03/11 | 1353 | graphics/circuit_macros/doc/FusesMan.m4 +2023/03/11 | 13505 | graphics/circuit_macros/examples/dpv/tstDPV.htmx +2023/03/11 | 1343 | graphics/circuit_macros/examples/dpv/InductorsDPV.m4 +2023/03/11 | 1342 | graphics/circuit_macros/doc/InductorsMan.m4 +2023/03/11 | 13420 | graphics/circuit_macros/examples/Heathkit.m4 +2023/03/11 | 1337 | graphics/circuit_macros/examples/Fuses.m4 +2023/03/11 | 1331 | graphics/circuit_macros/examples/Sierpinski.m4 +2023/03/11 | 1331 | graphics/circuit_macros/examples/dpv/SierpinskiDPV.m4 +2023/03/11 | 1329 | graphics/circuit_macros/doc/currents.m4 +2023/03/11 | 13294 | graphics/circuit_macros/examples/Tubediags.m4 +2023/03/11 | 131 | graphics/circuit_macros/doc/Axes.m4 +2023/03/11 | 1313 | graphics/circuit_macros/examples/dpv/ShiftRDPV.m4 +2023/03/11 | 130 | graphics/circuit_macros/doc/bitrbody.m4 +2023/03/11 | 130437 | fonts/alchemist/alchemist.pdf +2023/03/11 | 1292 | graphics/circuit_macros/doc/ConfigC.m4 +2023/03/11 | 1287 | graphics/circuit_macros/examples/Three.m4 +2023/03/11 | 12800 | fonts/alchemist/manual.sty +2023/03/11 | 1279 | graphics/circuit_macros/examples/extras/Star.m4 +2023/03/11 | 12765 | graphics/circuit_macros/lib3D.m4 +2023/03/11 | 12711 | graphics/circuit_macros/examples/dpv/HeathkitDPV.m4 +2023/03/11 | 1265 | graphics/circuit_macros/examples/dpv/HeadersDPV.m4 +2023/03/11 | 1259 | graphics/circuit_macros/examples/Relay.m4 +2023/03/11 | 1259 | graphics/circuit_macros/doc/RelayMan.m4 +2023/03/11 | 1258 | graphics/circuit_macros/doc/ConfigB.m4 +2023/03/11 | 1248 | graphics/circuit_macros/examples/xtras +2023/03/11 | 12478 | graphics/circuit_macros/examples/dpv/TubediagsDPV.m4 +2023/03/11 | 1238 | graphics/circuit_macros/examples/dpv/NportDPV.m4 +2023/03/11 | 12368 | support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac +2023/03/11 | 12324 | systems/texlive/tlnet/archive/widows-and-orphans.source.r66534.tar.xz +2023/03/11 | 1230 | graphics/circuit_macros/examples/dpv/FusesDPV.m4 +2023/03/11 | 1230 | graphics/circuit_macros/examples/Antennas.m4 +2023/03/11 | 1230 | graphics/circuit_macros/doc/AntennasMan.m4 +2023/03/11 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 +2023/03/11 | 1222 | graphics/circuit_macros/examples/Chips.m4 +2023/03/11 | 1217 | graphics/circuit_macros/examples/extras/Egg.m4 +2023/03/11 | 1214 | graphics/circuit_macros/examples/dpv/ChipsDPV.m4 +2023/03/11 | 1204 | graphics/circuit_macros/examples/dpv/ex17DPV.m4 +2023/03/11 | 1201 | graphics/circuit_macros/examples/Capacitors.m4 +2023/03/11 | 11995 | graphics/circuit_macros/svg.m4 +2023/03/11 | 1188 | graphics/circuit_macros/examples/dpv/ResistorsDPV.m4 +2023/03/11 | 1185 | graphics/circuit_macros/boxdims.sty +2023/03/11 | 118060 | graphics/circuit_macros/examples/keyboard.pdf +2023/03/11 | 1174 | graphics/circuit_macros/examples/extras/PPA.m4 +2023/03/11 | 1160 | graphics/circuit_macros/examples/dpv/CapacitorsDPV.m4 +2023/03/11 | 11601 | graphics/circuit_macros/examples/dpv/icsDPV.m4 +2023/03/11 | 1157 | graphics/circuit_macros/examples/dpv/NPDTDPV.m4 +2023/03/11 | 1151 | graphics/circuit_macros/doc/Darlington.m4 +2023/03/11 | 1149 | graphics/circuit_macros/doc/ResistorsMan.m4 +2023/03/11 | 1147 | graphics/circuit_macros/examples/Resistors.m4 +2023/03/11 | 1145632 | systems/texlive/tlnet/archive/biblatex-dw.doc.r66534.tar.xz +2023/03/11 | 11440 | graphics/circuit_macros/examples/ics.m4 +2023/03/11 | 113824 | systems/texlive/tlnet/archive/texlive-scripts.r66519.tar.xz +2023/03/11 | 1132 | graphics/circuit_macros/examples/Headers.m4 +2023/03/11 | 1132 | graphics/circuit_macros/doc/HeadersMan.m4 +2023/03/11 | 1128 | graphics/circuit_macros/examples/NPDT.m4 +2023/03/11 | 1128 | graphics/circuit_macros/doc/NPDTMan.m4 +2023/03/11 | 11288 | macros/latex/contrib/hfutexam/hfutexam.cls +2023/03/11 | 1126 | graphics/circuit_macros/examples/ex17.m4 +2023/03/11 | 11255 | graphics/circuit_macros/examples/FlowchartDefs.m4def +2023/03/11 | 1121 | graphics/circuit_macros/doc/ConfigA.m4 +2023/03/11 | 1115 | graphics/circuit_macros/examples/shadowed.m4 +2023/03/11 | 1114 | graphics/circuit_macros/mfpic.m4 +2023/03/11 | 1106580 | systems/texlive/tlnet/archive/tex4ht.r66531.tar.xz +2023/03/11 | 1100 | graphics/circuit_macros/examples/ex02.m4 +2023/03/11 | 1097 | graphics/circuit_macros/examples/extras/Region.m4 +2023/03/11 | 1093 | graphics/circuit_macros/examples/dpv/ex02DPV.m4 +2023/03/11 | 1091 | graphics/circuit_macros/examples/extras/Ant.m4 +2023/03/11 | 1090 | graphics/circuit_macros/examples/dpv/AntennasDPV.m4 +2023/03/11 | 1089 | graphics/circuit_macros/examples/extras/Optics.m4 +2023/03/11 | 10871 | graphics/circuit_macros/examples/dpv/EVplugsDPV.m4 +2023/03/11 | 10836 | graphics/circuit_macros/examples/EVplugs.m4 +2023/03/11 | 108134 | graphics/circuit_macros/doc/defines.tex +2023/03/11 | 1076 | graphics/circuit_macros/examples/mf/mftest +2023/03/11 | 1075 | graphics/circuit_macros/examples/extras/bistable.m4 +2023/03/11 | 1074 | graphics/circuit_macros/doc/bistableMan.m4 +2023/03/11 | 107332 | systems/texlive/tlnet/archive/dvisvgm.doc.r66534.tar.xz +2023/03/11 | 1071 | graphics/circuit_macros/examples/dpv/EmarrowsDPV.m4 +2023/03/11 | 10699 | graphics/circuit_macros/examples/keyboard.m4 +2023/03/11 | 10699 | graphics/circuit_macros/examples/dpv/keyboardDPV.m4 +2023/03/11 | 1065 | graphics/circuit_macros/examples/dpv/ex18DPV.m4 +2023/03/11 | 1063 | graphics/circuit_macros/doc/CapacitorsMan.m4 +2023/03/11 | 1055 | graphics/circuit_macros/examples/dpv/TgateDPV.m4 +2023/03/11 | 1050 | graphics/circuit_macros/examples/dpv/DPVconfig.m4 +2023/03/11 | 1040 | graphics/circuit_macros/examples/Nport.m4 +2023/03/11 | 1040 | graphics/circuit_macros/doc/NportMan.m4 +2023/03/11 | 1039 | graphics/circuit_macros/examples/extras/chaos.m4 +2023/03/11 | 1037622 | graphics/circuit_macros/doc/Circuit_macros.pdf +2023/03/11 | 1034 | graphics/circuit_macros/examples/dpv/OpampDPV.m4 +2023/03/11 | 1029 | graphics/circuit_macros/xfig.m4 +2023/03/11 | 10238 | graphics/circuit_macros/examples/dpv/paletteDPV.m4 +2023/03/11 | 10232 | graphics/circuit_macros/examples/extras/Views.m4 +2023/03/11 | 1022 | graphics/circuit_macros/examples/Tgate.m4 +2023/03/11 | 1022 | graphics/circuit_macros/doc/TgateMan.m4 +2023/03/11 | 1019 | graphics/circuit_macros/gpic.m4 +2023/03/11 | 1017 | graphics/circuit_macros/doc/arrowex.m4 +2023/03/11 | 10104 | graphics/circuit_macros/examples/Makefile +2023/03/11 | 1003 | graphics/circuit_macros/examples/ex15.m4 +2023/03/10 | 95264 | macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf +2023/03/10 | 94308 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf 2023/03/10 | 883760 | macros/latex/contrib/widows-and-orphans.zip 2023/03/10 | 835764 | systems/texlive/tlnet/archive/tugboat.doc.r66516.tar.xz 2023/03/10 | 835452 | systems/texlive/tlnet/archive/optex.r66516.tar.xz 2023/03/10 | 8310 | dviware/dvisvgm/configure.ac 2023/03/10 | 74764 | systems/texlive/tlnet/archive/latex-lab-dev.source.r66516.tar.xz 2023/03/10 | 7433 | dviware/dvisvgm/src/Makefile.am -2023/03/10 | 7329 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/03/10 | 722 | macros/latex/contrib/widows-and-orphans/changes.txt 2023/03/10 | 722240 | systems/texlive/tlnet/archive/latex-base-dev.source.r66516.tar.xz 2023/03/10 | 72197 | dviware/dvisvgm/doc/dvisvgm.1 +2023/03/10 | 71061 | macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf 2023/03/10 | 704244 | dviware/dvisvgm/configure 2023/03/10 | 6748 | dviware/dvisvgm/aminclude_static.am 2023/03/10 | 65340 | dviware/dvisvgm/doc/dvisvgm.txt.in 2023/03/10 | 61535 | dviware/dvisvgm/aclocal.m4 2023/03/10 | 584816 | macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf -2023/03/10 | 5828937 | systems/texlive/tlnet/install-tl-unx.tar.gz 2023/03/10 | 570 | dviware/dvisvgm/libs/defs.am 2023/03/10 | 56602 | dviware/dvisvgm/src/Makefile.in 2023/03/10 | 56108 | systems/texlive/tlnet/archive/babel-french.source.r66516.tar.xz @@ -22,25 +586,18 @@ 2023/03/10 | 5331152 | systems/texlive/tlnet/archive/latex-lab-dev.doc.r66516.tar.xz 2023/03/10 | 52357 | dviware/dvisvgm/src/PsSpecialHandler.cpp 2023/03/10 | 513436 | systems/texlive/tlnet/archive/babel-french.doc.r66516.tar.xz +2023/03/10 | 5088 | macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex 2023/03/10 | 4936 | dviware/dvisvgm/src/InputBuffer.hpp -2023/03/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2023/03/10 | 4836836 | systems/texlive/tlnet/archive/genealogytree.doc.r66516.tar.xz -2023/03/10 | 47403 | systems/texlive/tlnet/tlpkg/translations/messages.pot -2023/03/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/03/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2023/03/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/03/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/03/10 | 4521 | dviware/dvisvgm/config.h.in 2023/03/10 | 44340 | systems/texlive/tlnet/archive/kotex-oblivoir.r66516.tar.xz -2023/03/10 | 424920 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66486.tar.xz 2023/03/10 | 42332 | systems/texlive/tlnet/archive/tugboat.source.r66516.tar.xz 2023/03/10 | 42164 | dviware/dvisvgm/NEWS 2023/03/10 | 4181 | dviware/dvisvgm/src/InputReader.hpp 2023/03/10 | 41460 | macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx 2023/03/10 | 4060 | systems/texlive/tlnet/archive/babel-lithuanian.source.r66516.tar.xz -2023/03/10 | 4048478 | biblio/ctan-bibdata.zip +2023/03/10 | 3782 | macros/latex/contrib/hfutexam/hfutexam_shijuan.tex 2023/03/10 | 3754 | dviware/dvisvgm/src/InputBuffer.cpp -2023/03/10 | 3653738 | biblio/ctan-bibdata/ctan.pdf 2023/03/10 | 36485 | dviware/dvisvgm/Makefile.in 2023/03/10 | 36176 | systems/texlive/tlnet/archive/genealogytree.r66516.tar.xz 2023/03/10 | 3382949 | dviware/dvisvgm.zip @@ -50,51 +607,48 @@ 2023/03/10 | 3102 | macros/latex/contrib/widows-and-orphans/MANIFEST.md 2023/03/10 | 305364 | macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf 2023/03/10 | 30428 | systems/texlive/tlnet/archive/tugboat.r66516.tar.xz -2023/03/10 | 2768677 | biblio/ctan-bibdata/ctan.bib 2023/03/10 | 27432 | systems/texlive/tlnet/archive/latex-lab-dev.r66516.tar.xz 2023/03/10 | 26368 | systems/texlive/tlnet/archive/lua-typo.source.r66516.tar.xz 2023/03/10 | 2617 | dviware/dvisvgm/src/MD5HashFunction.hpp 2023/03/10 | 259825 | dviware/dvisvgm/tests/Makefile.in 2023/03/10 | 256916 | systems/texlive/tlnet/archive/lua-typo.doc.r66516.tar.xz 2023/03/10 | 2560 | systems/texlive/tlnet/archive/babel-lithuanian.r66516.tar.xz -2023/03/10 | 25513804 | systems/texlive/tlnet/install-tl.zip 2023/03/10 | 2480120 | systems/texlive/tlnet/archive/greek-fontenc.doc.r66516.tar.xz 2023/03/10 | 24766 | dviware/dvisvgm/libs/woff2/Makefile.in 2023/03/10 | 24613 | dviware/dvisvgm/src/fonts/Makefile.in -2023/03/10 | 2453232 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/03/10 | 24195 | dviware/dvisvgm/src/ttf/Makefile.in 2023/03/10 | 23307 | dviware/dvisvgm/src/optimizer/Makefile.in 2023/03/10 | 229952 | systems/texlive/tlnet/archive/latex-base-dev.r66516.tar.xz +2023/03/10 | 218724 | support/TeX4ht/source/ChangeLog 2023/03/10 | 21501 | dviware/dvisvgm/doc/Makefile.in 2023/03/10 | 209492 | systems/texlive/tlnet/archive/babel-lithuanian.doc.r66516.tar.xz 2023/03/10 | 20887 | dviware/dvisvgm/libs/potrace/Makefile.in +2023/03/10 | 205967 | macros/latex/contrib/hfutexam/hfutexam.pdf 2023/03/10 | 2053 | macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins 2023/03/10 | 20441 | dviware/dvisvgm/libs/clipper/Makefile.in -2023/03/10 | 20436070 | systems/texlive/tlnet/install-tl-windows.exe 2023/03/10 | 20058 | dviware/dvisvgm/libs/Makefile.in 2023/03/10 | 19734 | dviware/dvisvgm/libs/xxHash/Makefile.in 2023/03/10 | 19467 | dviware/dvisvgm/libs/md5/Makefile.in 2023/03/10 | 1818334 | macros/latex/contrib/biblatex-contrib/biblatex-dw.zip -2023/03/10 | 18075312 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2023/03/10 | 167 | macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.tex -2023/03/10 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/03/10 | 1612 | macros/latex/contrib/hfutexam/hfutexam_datizhi.tex 2023/03/10 | 15731 | dviware/dvisvgm/libs/boost/Makefile.in 2023/03/10 | 15719 | dviware/dvisvgm/libs/variant/Makefile.in 2023/03/10 | 15703 | dviware/dvisvgm/tests/Makefile.am 2023/03/10 | 15516 | systems/texlive/tlnet/archive/babel-french.r66516.tar.xz 2023/03/10 | 1545232 | systems/texlive/tlnet/archive/optex.doc.r66516.tar.xz -2023/03/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/03/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/03/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/03/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2023/03/10 | 13866 | dviware/dvisvgm/tests/data/Makefile.in 2023/03/10 | 137 | macros/latex/contrib/widows-and-orphans/todo.txt 2023/03/10 | 13054 | dviware/dvisvgm/src/Process.cpp +2023/03/10 | 12605 | macros/latex/contrib/hfutexam/hfutexam.tex 2023/03/10 | 123 | dviware/dvisvgm/libs/md5/Makefile.am 2023/03/10 | 12245 | dviware/dvisvgm/src/InputReader.cpp -2023/03/10 | 113808 | systems/texlive/tlnet/archive/texlive-scripts.r66486.tar.xz +2023/03/10 | 1154602 | support/TeX4ht/source/tex4ht-4ht.tex +2023/03/10 | 113764270 | macros/context/latest/cont-tmf.zip +2023/03/10 | 112375 | macros/latex/contrib/hfutexam/hfutexam_simple.pdf 2023/03/10 | 111 | macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.tex 2023/03/10 | 1117 | macros/latex/contrib/widows-and-orphans/README.md +2023/03/10 | 1062 | macros/latex/contrib/hfutexam/CHANGELOG.md 2023/03/10 | 10140 | systems/texlive/tlnet/archive/lua-typo.r66516.tar.xz 2023/03/09 | 99 | macros/latex-dev/base/ltpara-code.tex 2023/03/09 | 9926 | macros/latex-dev/base/ltnews21.tex @@ -851,7 +1405,6 @@ 2023/03/08 | 222705 | macros/latex/contrib/biblatex-ms/doc/examples/63-style-authortitle-icomp-biber-ms.pdf 2023/03/08 | 22051605 | biblio/biber-ms/biber-ms-linux/biber-ms-4.0-linux_x86_32.tar.gz 2023/03/08 | 2193 | macros/latex/contrib/biblatex-ms/latex/blx-natbib-ms.def -2023/03/08 | 218481 | support/TeX4ht/source/ChangeLog 2023/03/08 | 217634 | macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-biber-ms.pdf 2023/03/08 | 21707 | macros/latex/contrib/biblatex-ms/doc/examples/91-sorting-schemes-biber-ms.pdf 2023/03/08 | 216840 | macros/latex/contrib/biblatex-ms/doc/examples/40-style-alphabetic-bibtex-ms.pdf @@ -940,7 +1493,6 @@ 2023/03/08 | 147304 | macros/latex/contrib/biblatex-ms/doc/examples/52-style-authoryear-comp-bibtex-ms.pdf 2023/03/08 | 147304 | macros/latex/contrib/biblatex-ms/doc/examples/52-style-authoryear-comp-biber-ms.pdf 2023/03/08 | 145235 | macros/latex/contrib/tugboat/tugboat.dtx -2023/03/08 | 1447440 | systems/texlive/tlnet/archive/tex4ht.source.r66459.tar.xz 2023/03/08 | 1433 | support/light-latex-make/llmk-logo-code.tex 2023/03/08 | 143176 | macros/latex/contrib/biblatex-ms/doc/examples/65-style-authortitle-tcomp-bibtex-ms.pdf 2023/03/08 | 143176 | macros/latex/contrib/biblatex-ms/doc/examples/65-style-authortitle-tcomp-biber-ms.pdf @@ -948,7 +1500,6 @@ 2023/03/08 | 14145 | macros/latex/contrib/biblatex-ms/doc/examples/98-multiscript-biber-ms.pdf 2023/03/08 | 1412 | macros/latex/contrib/biblatex-ms/doc/examples/19-alphabetic-prefixed-ms.tex 2023/03/08 | 13922 | macros/latex/contrib/biblatex-ms/latex/blx-compat-ms.def -2023/03/08 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r66459.tar.xz 2023/03/08 | 135 | macros/latex/contrib/biblatex-ms/latex/lbx/portuges-ms.lbx 2023/03/08 | 1349 | macros/latex/contrib/biblatex-ms/doc/examples/65-style-authortitle-tcomp-ms.tex 2023/03/08 | 1343 | macros/latex/contrib/biblatex-ms/doc/examples/12-references-by-segment-ms.tex @@ -978,7 +1529,6 @@ 2023/03/08 | 1188 | macros/xetex/latex/xduts/xduts.ins 2023/03/08 | 117927 | biblio/biber-ms/base/documentation/utf8-macro-map.html 2023/03/08 | 1163 | macros/latex/contrib/biblatex-ms/latex/bbx/draft-ms.bbx -2023/03/08 | 1154232 | support/TeX4ht/source/tex4ht-4ht.tex 2023/03/08 | 114804 | support/light-latex-make/llmk.pdf 2023/03/08 | 112916 | macros/latex/contrib/biblatex-ms/doc/examples/18-numeric-hybrid-bibtex-ms.pdf 2023/03/08 | 112916 | macros/latex/contrib/biblatex-ms/doc/examples/18-numeric-hybrid-biber-ms.pdf @@ -986,7 +1536,6 @@ 2023/03/08 | 111947 | macros/latex/contrib/biblatex-ms/doc/examples/41-style-alphabetic-verb-biber-ms.pdf 2023/03/08 | 111762 | macros/latex/contrib/l3build/l3build.dtx 2023/03/08 | 11070 | macros/latex/contrib/l3build/l3build-install.lua -2023/03/08 | 1106552 | systems/texlive/tlnet/archive/tex4ht.r66459.tar.xz 2023/03/08 | 1100542 | macros/latex/contrib/biblatex-ms/doc/biblatex-ms.tex 2023/03/08 | 1091 | support/light-latex-make/LICENSE 2023/03/08 | 10808 | systems/texlive/tlnet/archive/colorist.r66450.tar.xz @@ -1285,7 +1834,6 @@ 2023/03/06 | 117796 | systems/texlive/tlnet/archive/siunitx.source.r66370.tar.xz 2023/03/06 | 116731 | macros/luatex/generic/minim-mp.zip 2023/03/06 | 11633 | language/hyphenation/dehyph-exptl/CHANGES -2023/03/06 | 115865963 | macros/context/latest/cont-tmf.zip 2023/03/06 | 111554 | macros/luatex/generic/minim-math/minim-math.pdf 2023/03/06 | 111274 | macros/luatex/generic/minim-pdf/minim-pdf.pdf 2023/03/06 | 1080481 | biblio/biber/base/source/biblatex-biber.tar.gz @@ -1368,13 +1916,11 @@ 2023/03/05 | 72880 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma 2023/03/05 | 722621 | language/korean/pmhanguljamo/doc/pmhanguljamo-kdoc.pdf 2023/03/05 | 71252 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2023/03/05 | 7110 | macros/jptex/latex/jlreq/README.md 2023/03/05 | 702434 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma 2023/03/05 | 7002 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid.tex 2023/03/05 | 7000 | macros/latex/contrib/biblatex/latex/cbx/verbose.cbx 2023/03/05 | 69 | macros/latex/contrib/biblatex/latex/biblatex.cfg 2023/03/05 | 69240 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2023/03/05 | 691844 | graphics/pgf/contrib/causets/causets.pdf 2023/03/05 | 68013 | macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib 2023/03/05 | 68013 | macros/latex/contrib/biblatex/bibtex/bib/biblatex/biblatex-examples.bib 2023/03/05 | 672163 | graphics/pgf/contrib/causets.zip @@ -1396,7 +1942,6 @@ 2023/03/05 | 600626 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma 2023/03/05 | 5888 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note.tex 2023/03/05 | 58871 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2023/03/05 | 58215 | graphics/pgf/contrib/causets/causets.tex 2023/03/05 | 57899 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma 2023/03/05 | 5780 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp.tex 2023/03/05 | 57457 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma @@ -1423,7 +1968,6 @@ 2023/03/05 | 505 | macros/latex/contrib/biblatex/doc/examples/95-customlists.bib 2023/03/05 | 5047 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose.tex 2023/03/05 | 49804 | macros/latex/contrib/biblatex/CHANGES.md -2023/03/05 | 49121 | macros/jptex/latex/jlreq/README-ja.md 2023/03/05 | 48949 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma 2023/03/05 | 48186 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma 2023/03/05 | 47877 | macros/latex/contrib/biblatex/latex/lbx/spanish.lbx @@ -1446,7 +1990,6 @@ 2023/03/05 | 426 | macros/latex/contrib/biblatex/doc/examples/97-annotations.bib 2023/03/05 | 42437 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma 2023/03/05 | 41699 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma -2023/03/05 | 4156 | graphics/pgf/contrib/causets/causet_tikz_example2.tex 2023/03/05 | 4032 | macros/latex/contrib/biblatex/latex/bbx/debug.bbx 2023/03/05 | 39965 | macros/latex/contrib/biblatex/latex/lbx/english.lbx 2023/03/05 | 39823 | macros/latex/contrib/biblatex/doc/examples/93-nameparts-biber.pdf @@ -1460,7 +2003,6 @@ 2023/03/05 | 3850 | macros/latex/contrib/biblatex/latex/cbx/authortitle-ibid.cbx 2023/03/05 | 37908 | language/korean/pmhanguljamo/doc/pmhanguljamo-doc.tex 2023/03/05 | 3786 | macros/latex/contrib/biblatex/latex/blx-unicode.def -2023/03/05 | 377049 | macros/jptex/latex/jlreq/jlreq-ja.pdf 2023/03/05 | 37452 | macros/latex/contrib/biblatex/latex/lbx/finnish.lbx 2023/03/05 | 37405 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma 2023/03/05 | 37253 | macros/latex/contrib/pagelayout/doc/example-graphic.pdf @@ -1525,7 +2067,6 @@ 2023/03/05 | 291276 | systems/texlive/tlnet/archive/sillypage.doc.r66350.tar.xz 2023/03/05 | 2899 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid.tex 2023/03/05 | 2893 | macros/latex/contrib/biblatex/latex/cbx/authortitle.cbx -2023/03/05 | 287623 | macros/jptex/latex/jlreq/jlreq.cls 2023/03/05 | 28761 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma 2023/03/05 | 287043 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma 2023/03/05 | 2833 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp.tex @@ -1552,7 +2093,6 @@ 2023/03/05 | 266542 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose-bibtex.pdf 2023/03/05 | 2649 | macros/unicodetex/latex/bithesis/contributing-zh.md 2023/03/05 | 264864 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-biber.pdf -2023/03/05 | 26440 | graphics/pgf/contrib/causets/causets.sty 2023/03/05 | 264322 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-bibtex.pdf 2023/03/05 | 26398 | macros/latex/contrib/biblatex/latex/lbx/icelandic.lbx 2023/03/05 | 2635 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse.tex @@ -1581,7 +2121,6 @@ 2023/03/05 | 2348 | macros/unicodetex/latex/bithesis/contributing.md 2023/03/05 | 2337 | macros/latex/contrib/opencolor/README.md 2023/03/05 | 2300789 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip -2023/03/05 | 2272 | graphics/pgf/contrib/causets/README.md 2023/03/05 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-bibtex.pdf 2023/03/05 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-biber.pdf 2023/03/05 | 2257 | macros/latex/contrib/biblatex/latex/cbx/alphabetic-verb.cbx @@ -1721,7 +2260,6 @@ 2023/03/05 | 12199 | macros/latex/contrib/pagelayout/scripts/textestvis 2023/03/05 | 121601 | macros/latex/contrib/pagelayout/doc/quickstart.pdf 2023/03/05 | 121120 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2023/03/05 | 120674 | macros/jptex/latex/jlreq/jlreq.pdf 2023/03/05 | 12036 | macros/latex/contrib/pagelayout/doc/example-grid.pdf 2023/03/05 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-bibtex.pdf 2023/03/05 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-biber.pdf @@ -1757,7 +2295,6 @@ 2023/03/05 | 105370 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma 2023/03/05 | 105054 | language/korean/pmhanguljamo/doc/pmhanguljamo-kdoc.tex 2023/03/05 | 10425 | macros/latex/contrib/biblatex/latex/cbx/numeric-comp.cbx -2023/03/05 | 1037 | graphics/pgf/contrib/causets/causet_tikz_example1.tex 2023/03/05 | 103794 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma 2023/03/05 | 103532 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma 2023/03/05 | 102 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ticomp.bbx @@ -1771,193 +2308,3 @@ 2023/03/05 | 101002 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template-biber.pdf 2023/03/05 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ibid.bbx 2023/03/05 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-comp.bbx -2023/03/04 | 99 | indexing/upmendex/source/tests/rule3.ist -2023/03/04 | 996 | macros/latex/contrib/siunitx/README.md -2023/03/04 | 98 | indexing/upmendex/source/version.h -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecB-4.ind -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecB-3.ind -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecB-0.ind -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecA-2.ind -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecA-1.ind -2023/03/04 | 96 | indexing/upmendex/source/tests/pprecA-0.ind -2023/03/04 | 9484 | indexing/upmendex/source/convert.c -2023/03/04 | 942 | indexing/upmendex/source/tests/romalpC-5.ind -2023/03/04 | 93 | systems/win32/TLW64/00README.TLW64 -2023/03/04 | 93 | indexing/upmendex/source/tests/rule2.ist -2023/03/04 | 93 | indexing/upmendex/source/tests/range3.ist -2023/03/04 | 93 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist -2023/03/04 | 92 | indexing/upmendex/source/tests/range2.ist -2023/03/04 | 9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx -2023/03/04 | 90 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist -2023/03/04 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx -2023/03/04 | 872 | indexing/upmendex/doc/samples/option/japanese.idx -2023/03/04 | 85 | indexing/upmendex/source/tests/romalpA-6.ind -2023/03/04 | 85 | indexing/upmendex/source/tests/romalpA-5.ind -2023/03/04 | 841 | indexing/upmendex/doc/samples/mdxsty02.ist -2023/03/04 | 807494 | indexing/upmendex/doc/upmendex-slide-ctan.pdf -2023/03/04 | 7892 | indexing/upmendex/source/main.c -2023/03/04 | 786 | indexing/upmendex/source/tests/romalpB-7.ind -2023/03/04 | 786 | indexing/upmendex/source/tests/romalpB-6.ind -2023/03/04 | 786 | indexing/upmendex/source/tests/romalpB-5.ind -2023/03/04 | 766 | indexing/upmendex/source/tests/uni.ind -2023/03/04 | 75 | indexing/upmendex/source/tests/rule1.ist -2023/03/04 | 71725 | macros/latex/contrib/siunitx/CHANGELOG.md -2023/03/04 | 714558 | indexing/upmendex/source/configure -2023/03/04 | 70 | indexing/upmendex/source/tests/range1.ist -2023/03/04 | 691123 | macros/latex/contrib/siunitx/siunitx.pdf -2023/03/04 | 68 | indexing/upmendex/source/tests/foo.idx -2023/03/04 | 686 | indexing/upmendex/doc/samples/multi.idx -2023/03/04 | 681 | indexing/upmendex/source/tests/romalpD.idx -2023/03/04 | 64 | indexing/upmendex/source/tests/uni.dict -2023/03/04 | 64 | indexing/upmendex/source/tests/attr1.ist -2023/03/04 | 641978 | macros/latex/contrib/siunitx/siunitx-code.pdf -2023/03/04 | 614 | indexing/upmendex/doc/samples/russian.idx -2023/03/04 | 6129 | indexing/upmendex/doc/samples/latex/city0.tex -2023/03/04 | 6046 | indexing/upmendex/source/kana.h -2023/03/04 | 58 | indexing/upmendex/source/tests/foo.ind -2023/03/04 | 5842 | indexing/upmendex/source/qsort.c -2023/03/04 | 5699532 | systems/texlive/tlnet/archive/newcomputermodern.r66338.tar.xz -2023/03/04 | 5544 | macros/latex/contrib/siunitx/siunitx-locale.dtx -2023/03/04 | 552 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist -2023/03/04 | 54007 | macros/latex/contrib/siunitx/siunitx-table.dtx -2023/03/04 | 5289 | macros/optex/pkg/tikz.opm -2023/03/04 | 4922 | indexing/upmendex/source/c-auto.in -2023/03/04 | 47731 | indexing/upmendex/source/Makefile.in -2023/03/04 | 4765 | indexing/upmendex/README.md -2023/03/04 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg -2023/03/04 | 463 | indexing/upmendex/doc/samples/german.idx -2023/03/04 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx -2023/03/04 | 44397 | indexing/upmendex/source/aclocal.m4 -2023/03/04 | 43 | indexing/upmendex/doc/samples/alphabet/mdxsty_es.ist -2023/03/04 | 435 | indexing/upmendex/source/tests/uni.idx -2023/03/04 | 435 | indexing/upmendex/source/exhanzi.h -2023/03/04 | 435 | indexing/upmendex/doc/samples/french.idx -2023/03/04 | 4245 | indexing/upmendex/source/tests/upmendex.test -2023/03/04 | 417 | indexing/upmendex/source/tests/rule.idx -2023/03/04 | 413 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist -2023/03/04 | 40 | indexing/upmendex/source/tests/pprec5.ist -2023/03/04 | 40 | indexing/upmendex/doc/samples/option/rule0.ist -2023/03/04 | 406 | indexing/upmendex/source/kp.h -2023/03/04 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx -2023/03/04 | 4011 | indexing/upmendex/doc/samples/latex/city1.tex -2023/03/04 | 400 | indexing/upmendex/source/qsort.h -2023/03/04 | 393 | indexing/upmendex/doc/samples/Makefile -2023/03/04 | 38 | indexing/upmendex/source/tests/locale2.ist -2023/03/04 | 385 | indexing/upmendex/doc/samples/latex/Makefile -2023/03/04 | 38160 | macros/latex/contrib/siunitx/siunitx-complex.dtx -2023/03/04 | 380941 | macros/texinfo/latest/texinfo.tex -2023/03/04 | 36 | indexing/upmendex/source/tests/pprec7.ist -2023/03/04 | 36 | indexing/upmendex/source/tests/pprec6.ist -2023/03/04 | 3687 | macros/latex/contrib/siunitx/siunitx.ins -2023/03/04 | 367 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist -2023/03/04 | 366 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist -2023/03/04 | 3611 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx -2023/03/04 | 36033 | indexing/upmendex/source/fwrite.c -2023/03/04 | 35994 | macros/latex/contrib/siunitx/siunitx-print.dtx -2023/03/04 | 340 | indexing/upmendex/doc/samples/greek.idx -2023/03/04 | 33867 | macros/latex/contrib/siunitx/siunitx-compound.dtx -2023/03/04 | 337 | indexing/upmendex/source/ac/withenable.ac -2023/03/04 | 3358 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx -2023/03/04 | 333 | indexing/upmendex/source/indexsty -2023/03/04 | 3278 | indexing/upmendex/source/tests/range.idx -2023/03/04 | 325 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh21.ist -2023/03/04 | 325 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist -2023/03/04 | 324932 | indexing/upmendex/man/upmendex.man1.pdf -2023/03/04 | 320849 | macros/latex/contrib/sillypage.zip -2023/03/04 | 31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx -2023/03/04 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg -2023/03/04 | 30280 | systems/texlive/tlnet/archive/photobook.r66336.tar.xz -2023/03/04 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx -2023/03/04 | 293 | indexing/upmendex/doc/samples/mdxsty01.ist -2023/03/04 | 2904 | macros/luatex/latex/lua-typo/README.md -2023/03/04 | 286 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist -2023/03/04 | 28270 | macros/latex/contrib/sillypage/sillywalk-map.pdf -2023/03/04 | 2780 | macros/latex/contrib/sillypage/sillypage.ins -2023/03/04 | 2746 | indexing/upmendex/doc/samples/latex/mlg0.ist -2023/03/04 | 2736668 | systems/texlive/tlnet/archive/simpleicons.r66337.tar.xz -2023/03/04 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty -2023/03/04 | 272 | indexing/upmendex/source/tests/uni.ist -2023/03/04 | 272 | indexing/upmendex/doc/samples/option/mdxsty_attr_default.ist -2023/03/04 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist -2023/03/04 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist -2023/03/04 | 2678 | indexing/upmendex/source/mendex.h -2023/03/04 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex -2023/03/04 | 261 | indexing/upmendex/doc/samples/alphabet/mdxsty_head2.ist -2023/03/04 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist -2023/03/04 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head3.ist -2023/03/04 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head1.ist -2023/03/04 | 2311 | indexing/upmendex/source/var.h -2023/03/04 | 2310 | indexing/upmendex/source/configure.ac -2023/03/04 | 22975 | indexing/upmendex/source/sort.c -2023/03/04 | 220111 | macros/latex/contrib/sillypage/sillypage.pdf -2023/03/04 | 2180 | indexing/upmendex/source/Makefile.am -2023/03/04 | 21746 | macros/latex/contrib/siunitx/siunitx.dtx -2023/03/04 | 2167 | indexing/upmendex/doc/samples/latex/mlg1.ist -2023/03/04 | 213 | indexing/upmendex/source/tests/pprecA.idx -2023/03/04 | 2104 | indexing/upmendex/source/tests/romalpC.idx -2023/03/04 | 207 | indexing/upmendex/source/tests/pprecB.idx -2023/03/04 | 2034 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx -2023/03/04 | 2006984 | systems/texlive/tlnet/archive/simpleicons.doc.r66337.tar.xz -2023/03/04 | 19620 | indexing/upmendex/source/hanzi.h -2023/03/04 | 19553 | indexing/upmendex/doc/upmendex.ja.txt -2023/03/04 | 19507 | indexing/upmendex/man/upmendex.1 -2023/03/04 | 1837 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist -2023/03/04 | 1837 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist -2023/03/04 | 1837 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist -2023/03/04 | 182 | indexing/upmendex/source/tests/pprec0.ist -2023/03/04 | 179 | indexing/upmendex/source/tests/pprec4.ist -2023/03/04 | 179 | indexing/upmendex/source/tests/pprec3.ist -2023/03/04 | 179 | indexing/upmendex/source/tests/pprec2.ist -2023/03/04 | 179 | indexing/upmendex/source/tests/pprec1.ist -2023/03/04 | 17944 | systems/texlive/tlnet/archive/tex4ebook.r66333.tar.xz -2023/03/04 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg -2023/03/04 | 170 | indexing/upmendex/source/tests/romalpD-7.ind -2023/03/04 | 170 | indexing/upmendex/source/tests/romalpD-6.ind -2023/03/04 | 170 | indexing/upmendex/source/tests/romalpD-5.ind -2023/03/04 | 16 | indexing/upmendex/source/tests/locale1.ist -2023/03/04 | 1697828 | macros/latex/contrib/babel-contrib/greek.zip -2023/03/04 | 1688 | systems/texlive/tlnet/archive/collection-publishers.r66335.tar.xz -2023/03/04 | 16772 | macros/latex/contrib/siunitx/siunitx-angle.dtx -2023/03/04 | 164 | indexing/upmendex/source/tests/romalpA.idx -2023/03/04 | 1628 | indexing/upmendex/source/tests/romalpB.idx -2023/03/04 | 1607 | indexing/upmendex/doc/samples/latex/haranoaji-uptex.map -2023/03/04 | 160377 | macros/latex/contrib/siunitx/siunitx.tex -2023/03/04 | 158 | indexing/upmendex/source/tests/uni1.ist -2023/03/04 | 1564645 | install/macros/latex/contrib/siunitx.tds.zip -2023/03/04 | 151760 | macros/latex/contrib/siunitx/siunitx-number.dtx -2023/03/04 | 15081 | indexing/upmendex/source/fread.c -2023/03/04 | 14969 | macros/latex/contrib/siunitx/siunitx-quantity.dtx -2023/03/04 | 1477 | indexing/upmendex/doc/samples/korean.idx -2023/03/04 | 1464 | systems/texlive/tlnet/archive/uvaletter.r66335.tar.xz -2023/03/04 | 1464 | indexing/upmendex/COPYRIGHT -2023/03/04 | 144884 | systems/texlive/tlnet/archive/photobook.doc.r66336.tar.xz -2023/03/04 | 1435 | indexing/upmendex/source/exvar.h -2023/03/04 | 14308796 | systems/texlive/tlnet/archive/newcomputermodern.doc.r66338.tar.xz -2023/03/04 | 141 | macros/latex/contrib/sillypage/sillypage-example.tex -2023/03/04 | 1417 | macros/latex/contrib/sillypage/README.md -2023/03/04 | 139 | indexing/upmendex/source/tests/uni2.ist -2023/03/04 | 1379 | indexing/upmendex/doc/samples/alphabet/Makefile -2023/03/04 | 1376 | indexing/upmendex/source/exkana.h -2023/03/04 | 13663 | indexing/upmendex/source/ChangeLog -2023/03/04 | 1348 | indexing/upmendex/source/tests/locale1.ind -2023/03/04 | 13105 | indexing/upmendex/source/styfile.c -2023/03/04 | 1274 | indexing/upmendex/source/tests/locale2-rule.ind -2023/03/04 | 1269440 | indexing/upmendex.zip -2023/03/04 | 1240 | indexing/upmendex/doc/samples/option/attri1.idx -2023/03/04 | 1231 | indexing/upmendex/doc/samples/mdxsty03.ist -2023/03/04 | 122488 | systems/texlive/tlnet/archive/uvaletter.doc.r66335.tar.xz -2023/03/04 | 1200 | indexing/upmendex/source/tests/rule.ind -2023/03/04 | 1200 | indexing/upmendex/source/tests/attr1.ind -2023/03/04 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx -2023/03/04 | 1190 | indexing/upmendex/source/kp.c -2023/03/04 | 117 | indexing/upmendex/source/tests/rule4.ist -2023/03/04 | 1169 | indexing/upmendex/source/tests/range2.ind -2023/03/04 | 10931 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx -2023/03/04 | 10848 | macros/latex/contrib/sillypage/sillypage.dtx -2023/03/04 | 1077 | indexing/upmendex/source/tests/range3.ind -2023/03/04 | 1077 | indexing/upmendex/source/tests/range1.ind -2023/03/04 | 1054 | indexing/upmendex/source/pageread.c -2023/03/04 | 104340 | macros/latex/contrib/sillypage/sillypage-example.pdf -2023/03/04 | 103304 | macros/latex/contrib/siunitx/siunitx-unit.dtx -2023/03/04 | 1029 | indexing/upmendex/doc/samples/option/Makefile -2023/03/04 | 101160 | systems/texlive/tlnet/archive/tex4ebook.doc.r66333.tar.xz diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index c6f25c800b..25f6d14944 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 11-03-2023, 02:02:58 +%% created at 12-03-2023, 02:01:23 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -926,7 +926,7 @@ title = {The \texttt{adobemapping} package}, subtitle = {Adobe cmap and pdfmapping files}, author = {{Adobe Systems Incorporated}}, - date = {2023-01-19}, + date = {2023-03-11}, version = {}, license = {bsd}, mirror = {https://mirror.ctan.org/support/adobemapping}, @@ -1354,6 +1354,17 @@ given (Unicode) glyph. It relies on .}, } +@manual{ctan-alchemist, + title = {The \texttt{alchemist} package}, + subtitle = {Typeset alchemist and astrological symbols}, + author = {Engelbert Buxbaum}, + date = {2023-03-11}, + version = {1.00}, + license = {gpl,lppl}, + mirror = {https://mirror.ctan.org/fonts/alchemist}, + url = {https://ctan.org/pkg/alchemist}, +} + @manual{ctan-alegreya, title = {The \texttt{alegreya} package}, subtitle = {Alegreya fonts with \LaTeX{} support}, @@ -12476,8 +12487,8 @@ title = {The \texttt{circuit-macros} package}, subtitle = {M4 macros for electric circuit diagrams}, author = {Dwight Aplevich}, - date = {2022-11-30}, - version = {10.1}, + date = {2023-03-11}, + version = {10.2}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/graphics/circuit_macros}, url = {https://ctan.org/pkg/circuit-macros}, @@ -31114,8 +31125,8 @@ title = {The \texttt{HFUTExam} package}, subtitle = {Exam class for Hefei University of Technology (China)}, author = {Shenxing Zhang}, - date = {2022-12-08}, - version = {1.6}, + date = {2023-03-11}, + version = {1.7}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/hfutexam}, url = {https://ctan.org/pkg/hfutexam}, @@ -52150,8 +52161,8 @@ title = {The \texttt{photobook} package}, subtitle = {A document class for typesetting photo books}, author = {Alex A. Naanou}, - date = {2023-03-03}, - version = {0.1.9}, + date = {2023-03-11}, + version = {0.1.10}, license = {bsd3}, mirror = {https://mirror.ctan.org/macros/latex/contrib/photobook}, url = {https://ctan.org/pkg/photobook}, diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf Binary files differindex a3e3fc986c..bb2be9e515 100644 --- a/biblio/ctan-bibdata/ctan.pdf +++ b/biblio/ctan-bibdata/ctan.pdf diff --git a/fonts/alchemist/README.md b/fonts/alchemist/README.md new file mode 100644 index 0000000000..8071db46d9 --- /dev/null +++ b/fonts/alchemist/README.md @@ -0,0 +1,16 @@ +Alchemist is copyright 2023 by Dr Engelbert Buxbaum +<engelbert_buxbaum@web.de> This file may be distributed and/or modified + 1. under the LaTeX Project Public License and/or + 2. under the GNU Public License. + +The alchemist-style makes accessible the alchemist and astrological symbols +in Unicode. It uses the Unifont (https://unifoundry.com/unifont/). Symbola +(https://fontlibrary.org/de/font/symbola) and Quivira +(https://www.fontspace.com/quivira-font-f13271) may also be suitable, but are +incomplete. + +Alchemist.pdf lists the available characters and gives a short introduction +to their meaning. The source is alchemist.tex, the literature in +alchemist-ref.bib, manual.sty is is used by alchemist.tex for correct +typesetting of scientific texts. These files are provided in the hope that +they may be useful, but without any warranties. diff --git a/fonts/alchemist/alchemist-ref.bib b/fonts/alchemist/alchemist-ref.bib new file mode 100644 index 0000000000..1c78d3aac2 --- /dev/null +++ b/fonts/alchemist/alchemist-ref.bib @@ -0,0 +1,62 @@ +@BOOK{Pla-40, + author = {{{\foreignlanguage{greek}{Πλάτων}} [Plátōn]}}, + sortname = {Plátōn}, + shortauthor = {Plátōn}, + title = {{{\foreignlanguage{greek}{Τίμαιος}} [Tímaios]}}, + sorttitle = {Tímaios}, + address = {Athens (GR)}, + date = {-0359}, % 360 BC, + related = {Pla-98}, + relatedtype = {translatedbyas}, + abstract = {gr. kosmology, 4 elements plus spirit}, +} + +@BOOK{Pla-98, + author = {{{\foreignlanguage{greek}{Πλάτων}} [Plátōn]}}, + translator = {Jowett, B.}, + editor = {Jowett, B.}, + title = {The Dialogues of Plato, in 5 vols}, + publisher = {Oxford University Press}, + address = {Oxford (UK)}, + date = {1892}, + edition = {3}, + url = {https://www.gutenberg.org/ebooks/1572}, +} + +@ARTICLE{Mic-21, + AUTHOR = {Michaleas, S.N. and Laios, K. and Tsoucalas, G. and Androutsos, G.}, + TITLE = {Theophrastus Bombastus Von Hohenheim (Paracelsus) \num{1493}-–\num{1541}: The eminent physician and pioneer of toxicology}, + DATE = {2021}, + JOURNAL = {Toxicol. Rep.}, + volume = {8}, + pages = {411-414}, + doi = {10.1016/j.toxrep.2021.02.012}, +} +@BOOK{Rip-71, + AUTHOR = {Ripley, Sir George}, + TITLE = {The Compound of Alchemy}, + date = {1471}, + PUBLISHER = {Ralph Rabbards}, + address = {London (UK)}, + isbn = {9781497945739}, + url = {https://quod.lib.umich.edu/e/eebo/A10786.0001.001?view=toc}, +} + +@BOOK{Jun-44, + AUTHOR = {Jung, C.G.}, + TITLE = {Psychologie und Alchemie}, + date = {1944}, + PUBLISHER = {Rascher Verlag}, + address = {Zürich (CH)}, +} + +@ARTICLE{Ale-81, + title = {Energy dependence of \isotope[209][]{Bi} fragmentation in relativistic nuclear collisions}, + author = {Aleklett, K. and Morrissey, D. J. and Loveland, W. and McGaughey, P. L. and Seaborg, G. T.}, + journal = {Phys. Rev. C}, + volume = {23}, + number = {3}, + pages = {1044-1046}, + date = {1981}, + doi = {10.1103/PhysRevC.23.1044}, +} diff --git a/fonts/alchemist/alchemist.pdf b/fonts/alchemist/alchemist.pdf Binary files differnew file mode 100644 index 0000000000..1b912ddb13 --- /dev/null +++ b/fonts/alchemist/alchemist.pdf diff --git a/fonts/alchemist/alchemist.sty b/fonts/alchemist/alchemist.sty new file mode 100644 index 0000000000..b37d18a4e3 --- /dev/null +++ b/fonts/alchemist/alchemist.sty @@ -0,0 +1,229 @@ + %% ============================================================================ + % !Mode:: "TeX:UK:UTF-8" + % !TEX program = XeLaTeX + % ----------------------------------------------------------------------------- + +% XeLaTeX layer for the alchemist symbols in UTF-8 +% copyright 2023 by Dr Engelbert Buxbaum <engelbert_buxbaum@web.de> +% This file may be shared under Gnu copyleft or under the LaTeX Project Public License. + +\ProvidesPackage{alchemist}[2023/02/26 v1.00 access to alchemist symbols] +\NeedsTeXFormat{LaTeX2e} + +\providefontfamily\AlchemistA{Unifont} +\providefontfamily\AlchemistB{Unifont Upper} + +% Concepts +\providecommand{\AlchemistQuintessence}{\AlchemistB \symbol{"1F700}} % aether +\providecommand{\AlchemistAir}{\AlchemistB \symbol{"1F701}} +\providecommand{\AlchemistFire}{\AlchemistB \symbol{"1F702}} +\providecommand{\AlchemistSoil}{\AlchemistB \symbol{"1F703}} +\providecommand{\AlchemistWater}{\AlchemistB \symbol{"1F704}} +\providecommand{\AlchemistSpirit}{\AlchemistB \symbol{"1F747}} +\providecommand{\AlchemistPhilosophersSulphur}{\AlchemistB \symbol{"1F70E}} +\providecommand{\AlchemistMateriaPrima}{\AlchemistA \symbol{"2721}} + +% Compounds +\providecommand{\AlchemistAquaFortis}{\AlchemistB \symbol{"1F705}} % HNO3 +\providecommand{\AlchemistAquaRegiaA}{\AlchemistB \symbol{"1F706}} % HNO3 + HCl +\providecommand{\AlchemistAquaRegiaB}{\AlchemistB \symbol{"1F707}} +\providecommand{\AlchemistAquaVitaeA}{\AlchemistB \symbol{"1F708}} % Ethanol, distilled spirit +\providecommand{\AlchemistAquaVitaeB}{\AlchemistB \symbol{"1F709}} +\providecommand{\AlchemistVinegar}{\AlchemistB \symbol{"1F70A}} % acetic acid +\providecommand{\AlchemistDistilledVinegarA}{\AlchemistB \symbol{"1F70B}} +\providecommand{\AlchemistDistilledVinegarB}{\AlchemistB \symbol{"1F70C}} +\providecommand{\AlchemistSublimateOfMercuryA}{\AlchemistB \symbol{"1F710}} % HgCl2 +\providecommand{\AlchemistSublimateOfMercuryB}{\AlchemistB \symbol{"1F711}} +\providecommand{\AlchemistSublimateOfMercuryC}{\AlchemistB \symbol{"1F712}} +\providecommand{\AlchemistCinnabar}{\AlchemistB \symbol{"1F713}} % Cinnabarit, HgS +\providecommand{\AlchemistSalt}{\AlchemistB \symbol{"1F714}} % NaCl +\providecommand{\AlchemistNitre}{\AlchemistB \symbol{"1F715}} % KNO3, salpeter +\providecommand{\AlchemistVitriolA}{\AlchemistB \symbol{"1F716}} % H2SO4 +\providecommand{\AlchemistVitriolB}{\AlchemistB \symbol{"1F717}} +\providecommand{\AlchemistRockSaltA}{\AlchemistB \symbol{"1F718}} % sal gemmae, impure NaCl +\providecommand{\AlchemistRockSaltB}{\AlchemistB \symbol{"1F719}} +\providecommand{\AlchemistIronOreA}{\AlchemistB \symbol{"1F71C}} +\providecommand{\AlchemistIronOreB}{\AlchemistB \symbol{"1F71D}} +\providecommand{\AlchemistCrocusOfIron}{\AlchemistB \symbol{"1F71E}} % crocus martis, rust +\providecommand{\AlchemistCopperOre}{\AlchemistB \symbol{"1F720}} +\providecommand{\AlchemistCrocusOfCopperA}{\AlchemistB \symbol{"1F723}} % CuO +\providecommand{\AlchemistCrocusOfCopperB}{\AlchemistB \symbol{"1F724}} +\providecommand{\AlchemistIronCopperOre}{\AlchemistB \symbol{"1F721}} +\providecommand{\AlchemistSublimateOfCopperA}{\AlchemistB \symbol{"1F71B}} % CuCl +\providecommand{\AlchemistSublimateOfCopperB}{\AlchemistB \symbol{"1F727}} +\providecommand{\AlchemistCopperAntimonateA}{\AlchemistB \symbol{"1F725}} % CuSb2O6 +\providecommand{\AlchemistCopperAntimonateB}{\AlchemistB \symbol{"1F726}} +\providecommand{\AlchemistVerdigris}{\AlchemistB \symbol{"1F728}} % patina on copper, acetate, hydroxyde, chloride +\providecommand{\AlchemistTinOre}{\AlchemistB \symbol{"1F729}} +\providecommand{\AlchemistLeadOre}{\AlchemistB \symbol{"1F72A}} +\providecommand{\AlchemistAntimonyOre}{\AlchemistB \symbol{"1F72B}} +\providecommand{\AlchemistSublimateOfAntimony}{\AlchemistB \symbol{"1F72C}} % Sb2O3, valentinite and senarmontite +\providecommand{\AlchemistSaltOfAntimony}{\AlchemistB \symbol{"1F72D}} % double salt SbF3 + NaF, mordant +\providecommand{\AlchemistSublimateOfSaltOfAntimony}{\AlchemistB \symbol{"1F72E}} +\providecommand{\AlchemistVinegarOfAntimony}{\AlchemistB \symbol{"1F72F}} % may be Sb(CH3COO)3, but this is unstable +\providecommand{\AlchemistRegulusA}{\AlchemistB \symbol{"1F732}} +\providecommand{\AlchemistRegulusB}{\AlchemistB \symbol{"1F733}} +\providecommand{\AlchemistRegulusC}{\AlchemistB \symbol{"1F734}} +\providecommand{\AlchemistRegulusD}{\AlchemistB \symbol{"1F735}} +\providecommand{\AlchemistAlkaliA}{\AlchemistB \symbol{"1F736}} +\providecommand{\AlchemistAlkaliB}{\AlchemistB \symbol{"1F737}} +\providecommand{\AlchemistMarcasite}{\AlchemistB \symbol{"1F738}} % iron pyrite, fools gold +\providecommand{\AlchemistSalAmmoniak}{\AlchemistB \symbol{"1F739}} % NH4Cl +\providecommand{\AlchemistRealgarA}{\AlchemistB \symbol{"1F73B}} % As4S4 +\providecommand{\AlchemistRealgarB}{\AlchemistB \symbol{"1F73C}} +\providecommand{\AlchemistAuripigment}{\AlchemistB \symbol{"1F73D}} % As2S3 +\providecommand{\AlchemistBismuthOre}{\AlchemistB \symbol{"1F73E}} % tin glass +\providecommand{\AlchemistTartarA}{\AlchemistB \symbol{"1F73F}} % potassium hydrogen tartrate +\providecommand{\AlchemistTartarB}{\AlchemistB \symbol{"1F740}} +\providecommand{\AlchemistQuicklime}{\AlchemistB \symbol{"1F741}} % CaO +\providecommand{\AlchemistBoraxA}{\AlchemistB \symbol{"1F742}} +\providecommand{\AlchemistBoraxB}{\AlchemistB \symbol{"1F743}} +\providecommand{\AlchemistBoraxC}{\AlchemistB \symbol{"1F744}} +\providecommand{\AlchemistAlum}{\AlchemistB \symbol{"1F745}} +\providecommand{\AlchemistLodestone}{\AlchemistB \symbol{"1F753}} % magnetite, Fe(II, III)oxyde +\providecommand{\AlchemistSoap}{\AlchemistB \symbol{"1F754}} +\providecommand{\AlchemistPotashes}{\AlchemistB \symbol{"1F758}} % K2CO3 +\providecommand{\AlchemistStratumSuperStratumA}{\AlchemistB \symbol{"1F75C}} +\providecommand{\AlchemistStratumSuperStratumB}{\AlchemistB \symbol{"1F75D}} +% Mixtures +\providecommand{\AlchemistBlackSulphur}{\AlchemistB \symbol{"1F70F}} % residue left after sublimation of sulphur +\providecommand{\AlchemistUrine}{\AlchemistB \symbol{"1F755}} +\providecommand{\AlchemistHorseDung}{\AlchemistB \symbol{"1F756}} +\providecommand{\AlchemistAshes}{\AlchemistB \symbol{"1F757}} +\providecommand{\AlchemistBrick}{\AlchemistB \symbol{"1F759}} +\providecommand{\AlchemistPowderedBrick}{\AlchemistB \symbol{"1F75A}} +\providecommand{\AlchemistAmalgam}{\AlchemistB \symbol{"1F75B}} % alloy of mercury +\providecommand{\AlchemistCaputMortuum}{\AlchemistB \symbol{"1F74E}} % slag left after a purification +\providecommand{\AlchemistOil}{\AlchemistB \symbol{"1F746}} +\providecommand{\AlchemistTincture}{\AlchemistB \symbol{"1F748}} % alcoholic extract +\providecommand{\AlchemistGum}{\AlchemistB \symbol{"1F749}} +\providecommand{\AlchemistWax}{\AlchemistB \symbol{"1F74A}} +\providecommand{\AlchemistPowder}{\AlchemistB \symbol{"1F74B}} +\providecommand{\AlchemistCalx}{\AlchemistB \symbol{"1F74C}} % oxydised residue, also CaO +\providecommand{\AlchemistTutty}{\AlchemistB \symbol{"1F74D}} % ZnO or ZnCO3 +% Elements +\providecommand{\AlchemistSulphur}{\AlchemistB \symbol{"1F70D}} +\providecommand{\AlchemistGoldA}{\AlchemistB \symbol{"1F71A}} +\providecommand{\AlchemistGoldB}{\AlchemistA \symbol{"2609}} % also sun +\providecommand{\AlchemistSilverA}{\AlchemistB \symbol{"1F71B}} +\providecommand{\AlchemistSilverB}{\AlchemistA \symbol{"263D}} % first quarter moon +\providecommand{\AlchemistSilverC}{\AlchemistA \symbol{"263E}} % Last quarter moon +\providecommand{\AlchemistRegulusOfAntimonyA}{\AlchemistB \symbol{"1F730}} % impure antimony +\providecommand{\AlchemistRegulusOfAntimonyB}{\AlchemistB \symbol{"1F731}} +\providecommand{\AlchemistRegulusOfIron}{\AlchemistB \symbol{"1F71F}} % antimony prepared from stibnite by reduction with iron +\providecommand{\AlchemistArsenic}{\AlchemistB \symbol{"1F73A}} +\providecommand{\AlchemistMercury}{\AlchemistA \symbol{"263F}} % also the planet +\providecommand{\AlchemistCopper}{\AlchemistA \symbol{"2640}} % also Venus +\providecommand{\AlchemistIron}{\AlchemistA \symbol{"2642}} % also Mars +\providecommand{\AlchemistTin}{\AlchemistA \symbol{"2643}} % also Jupiter +\providecommand{\AlchemistLead}{\AlchemistA \symbol{"2644}} % also Saturn +\providecommand{\AlchemistBismuth}{\AlchemistA \symbol{"2646}} % also Neptune + +% Tools +\providecommand{\AlchemistAlembicA}{\AlchemistB \symbol{"1F76A}} % distillation helmet +\providecommand{\AlchemistAlembicB}{\AlchemistA \symbol{"2697}} +\providecommand{\AlchemistAsclepius}{\AlchemistA \symbol{"2695}} % staff of Asclepius +\providecommand{\AlchemistCaduceusA}{\AlchemistB \symbol{"1F750}} % staff of Hermes +\providecommand{\AlchemistCaduceusB}{\AlchemistA \symbol{"2624}} +\providecommand{\AlchemistCrucibleA}{\AlchemistB \symbol{"1F765}} +\providecommand{\AlchemistCrucibleB}{\AlchemistB \symbol{"1F766}} +\providecommand{\AlchemistCrucibleC}{\AlchemistB \symbol{"1F767}} +\providecommand{\AlchemistCrucibleD}{\AlchemistB \symbol{"1F768}} +\providecommand{\AlchemistCrucibleE}{\AlchemistB \symbol{"1F769}} +\providecommand{\AlchemistBalneumMariae}{\AlchemistB \symbol{"1F76B}} % water bath used to heat for extended time, invented by Maria Prophetissa of Alexandria in the 1st century AD +\providecommand{\AlchemistRetort }{\AlchemistB \symbol{"1F76D}} +\providecommand{\AlchemistScepterOfJove }{\AlchemistB \symbol{"1F74F}} % bident +\providecommand{\AlchemistTrident }{\AlchemistB \symbol{"1F751}} +\providecommand{\AlchemistStarredTrident}{\AlchemistB \symbol{"1F752}} +\providecommand{\AlchemistVapourBath }{\AlchemistB \symbol{"1F76C}} +% Process +\providecommand{\AlchemistCalcination}{\AlchemistA \symbol{"2648}} % also aries +\providecommand{\AlchemistCeration}{\AlchemistA \symbol{"2650}} % also Sagittarius +\providecommand{\AlchemistCongelation}{\AlchemistA \symbol{"2649}} % also Taurus +\providecommand{\AlchemistDigestion}{\AlchemistA \symbol{"264C}} % also Leo +\providecommand{\AlchemistDistillationA}{\AlchemistB \symbol{"1F760}} +\providecommand{\AlchemistDistillationB}{\AlchemistA \symbol{"264D}} % also Virgo +\providecommand{\AlchemistDissolveA}{\AlchemistB \symbol{"1F761}} +\providecommand{\AlchemistDissolveB}{\AlchemistB \symbol{"1F762}} +\providecommand{\AlchemistFermentation}{\AlchemistA \symbol{"2651}} % also Capricorn +\providecommand{\AlchemistFixation}{\AlchemistA \symbol{"264A}} % also Gemini +\providecommand{\AlchemistMultiplication}{\AlchemistA \symbol{"2652}} % also Aquarius +\providecommand{\AlchemistPrecipitation}{\AlchemistB \symbol{"1F75F}} +\providecommand{\AlchemistProjection}{\AlchemistA \symbol{"2653}} % also Pisces +\providecommand{\AlchemistPurify}{\AlchemistB \symbol{"1F763}} +\providecommand{\AlchemistPutrefaction}{\AlchemistB \symbol{"1F764}} +\providecommand{\AlchemistSeparation}{\AlchemistA \symbol{"264F}} % also Scorpio +\providecommand{\AlchemistSolution}{\AlchemistA \symbol{"264B}} % also Cancer +\providecommand{\AlchemistSublimationA}{\AlchemistB \symbol{"1F75E}} +\providecommand{\AlchemistSublimationB}{\AlchemistA \symbol{"264E}} % also Libra +\providecommand{\AlchemistTincture}{\AlchemistB \symbol{"1F748}} % alcoholic extract + +% Time +\providecommand{\AlchemistHourA}{\AlchemistB \symbol{"1F76E}} +\providecommand{\AlchemistHourB}{\AlchemistA \symbol{"29D6}} +\providecommand{\AlchemistHourC}{\AlchemistA \symbol{"29D7}} +\providecommand{\AlchemistNight}{\AlchemistB \symbol{"1F76F}} +\providecommand{\AlchemistDayNight}{\AlchemistB \symbol{"1F770}} +\providecommand{\AlchemistMonth}{\AlchemistB \symbol{"1F771}} +% Measures +\providecommand{\AlchemistHalfDram}{\AlchemistB \symbol{"1F772}} % about 3.6 mL +\providecommand{\AlchemistHalfOunce}{\AlchemistB \symbol{"1F773}} % about 28--31 g +% Astrology +\providecommand{\AlchemistAscendingNode}{\AlchemistA \symbol{"260A}} +\providecommand{\AlchemistDescendingNode}{\AlchemistA \symbol{"260B}} +\providecommand{\AlchemistConjunction}{\AlchemistA \symbol{"260C}} +\providecommand{\AlchemistOpposition}{\AlchemistA \symbol{"260D}} +\providecommand{\AlchemistSextile}{\AlchemistA \symbol{"26B9}} +\providecommand{\AlchemistSemisextile}{\AlchemistA \symbol{"26BA}} +\providecommand{\AlchemistQuincunx}{\AlchemistA \symbol{"26BB}} +\providecommand{\AlchemistSesquiquadrate}{\AlchemistA \symbol{"26BC}} +\providecommand{\AlchemistLotOfFortune}{\AlchemistB \symbol{"1F774}} +\providecommand{\AlchemistOccultation}{\AlchemistB \symbol{"1F775}} % hiding one celestial body by another +\providecommand{\AlchemistLunarEclipse}{\AlchemistB \symbol{"1F776}} + +\providecommand{\AlchemistSun}{\AlchemistA \symbol{"2609}} % also gold +\providecommand{\AlchemistFirstQuarterMoon}{\AlchemistA \symbol{"263D}} % also silver +\providecommand{\AlchemistLastQuarterMoon}{\AlchemistA \symbol{"263E}} +\providecommand{\AlchemistBlackMoonLilith}{\AlchemistA \symbol{"26B8}} +\providecommand{\AlchemistMercury}{\AlchemistA \symbol{"263F}} % also the element mercury +\providecommand{\AlchemistVenus}{\AlchemistA \symbol{"2640}} % also copper +\providecommand{\AlchemistEarth}{\AlchemistA \symbol{"2641}} +\providecommand{\AlchemistMars}{\AlchemistA \symbol{"2642}} % also iron +\providecommand{\AlchemistJupiter}{\AlchemistA \symbol{"2643}} % also tin +\providecommand{\AlchemistSaturn}{\AlchemistA \symbol{"2644}} % also lead +\providecommand{\AlchemistUranus}{\AlchemistA \symbol{"2645}} +\providecommand{\AlchemistNeptune}{\AlchemistA \symbol{"2646}} % also bismuth +\providecommand{\AlchemistPlutoA}{\AlchemistA \symbol{"2647}} +\providecommand{\AlchemistPlutoB}{\AlchemistA \symbol{"2BD3}} + + +\providecommand{\AlchemistAries}{\AlchemistA \symbol{"2648}} % also calcination +\providecommand{\AlchemistTaurus}{\AlchemistA \symbol{"2649}} % also congelation +\providecommand{\AlchemistGemini}{\AlchemistA \symbol{"264A}} % also fixation +\providecommand{\AlchemistCancer}{\AlchemistA \symbol{"264B}} % also solution +\providecommand{\AlchemistLeo}{\AlchemistA \symbol{"264C}} % also digestion +\providecommand{\AlchemistVirgo}{\AlchemistA \symbol{"264D}} % also distillation +\providecommand{\AlchemistLibra}{\AlchemistA \symbol{"264E}} % also sublimation +\providecommand{\AlchemistScorpio}{\AlchemistA \symbol{"264F}} % also separation +\providecommand{\AlchemistSagittarius}{\AlchemistA \symbol{"2650}} % also ceration +\providecommand{\AlchemistCapricorn}{\AlchemistA \symbol{"2651}} % also fermentation +\providecommand{\AlchemistAquarius}{\AlchemistA \symbol{"2652}} % also multiplication +\providecommand{\AlchemistPisces}{\AlchemistA \symbol{"2653}} % also projection + +\providecommand{\AlchemistCeres}{\AlchemistA \symbol{"26B3}} +\providecommand{\AlchemistPallas}{\AlchemistA \symbol{"26B4}} +\providecommand{\AlchemistJuno}{\AlchemistA \symbol{"26B5}} +\providecommand{\AlchemistVesta}{\AlchemistA \symbol{"26B6}} +\providecommand{\AlchemistChiron}{\AlchemistA \symbol{"26B7}} +\providecommand{\AlchemistErisA}{\AlchemistA \symbol{"2BF0}} +\providecommand{\AlchemistErisB}{\AlchemistA \symbol{"2BF1}} +\providecommand{\AlchemistSedna}{\AlchemistA \symbol{"2BF2}} + +\providecommand{\AlchemistHaumea}{\AlchemistB \symbol{"1F77B}} % dwarf planet in Kuiperbelt +\providecommand{\AlchemistMakemake}{\AlchemistB \symbol{"1F77C}} +\providecommand{\AlchemistGonggong}{\AlchemistB \symbol{"1F77D}} +\providecommand{\AlchemistQuaoar}{\AlchemistB \symbol{"1F77E}} +\providecommand{\AlchemistOrcus}{\AlchemistB \symbol{"1F77F}} + +\providecommand{\AlchemistPentagram}{\AlchemistA \symbol{"26E4}} + diff --git a/fonts/alchemist/alchemist.tex b/fonts/alchemist/alchemist.tex new file mode 100644 index 0000000000..c1fce5ea1b --- /dev/null +++ b/fonts/alchemist/alchemist.tex @@ -0,0 +1,473 @@ + %% ============================================================================ + % !Mode:: "TeX:UK:UTF-8" + % !TEX program = XeLaTeX + % !BIB program = biblatex + % ----------------------------------------------------------------------------- +\documentclass[notitlepage,british]{scrartcl} + +\usepackage{manual} % the things usually needed in scientific texts +\usepackage{alchemist}% alchemist symbols of unicode + +\hypersetup{final=true, + pdfauthor={Engelbert Buxbaum}, + colorlinks=true, + citecolor=Blue,%bibliography, dark blue + linkcolor=Blue,%internal links, dark blue + urlcolor=DodgerBlue,%internet, middle blue + allbordercolors=White, + pdftitle={Alchemist symbols in Unicode}} + +\title{Alchemist symbols in Unicode} +\author{Engelbert Buxbaum} +\date{\today} + +\addbibresource{alchemist-ref.bib} + +\begin{document} +%\let\male\wasymale +%\let\female\wasyfemale + +\maketitle +\begin{refsection} + +The alchemist-style makes accessible alchemistic and astrological symbols in Unicode. It uses the Gnu Unifont \href{https://unifoundry.com/unifont/}{https://unifoundry.com/unifont/}, which has all required symbols. Unfortunately, the font is split into an upper and lower part. The Symbola-font (\href{https://fontlibrary.org/de/font/symbola}{https://fontlibrary.org/de/font/symbola}) and Quivira (\href{https://www.fontspace.com/quivira-font-f13271}{https://www.fontspace.com/quivira-font-f13271}) may also be suitable, but are incomplete. If you want to use them, set AlchemistA and AlchemistB to the same font. Quivira has a more handwritten look that may fit very well to the ancient character of the symbols. + +\section{Concepts} + +The symbols used by alchemists served as \Foreign{aide memoir} for the researchers themself and for communication, even across language barriers. At the same time, however, their meaning was hidden except to a small group of specially trained practitioners. + +Greek cosmology is described in the \foreignlanguage{greek}{Τίμαιος} (Tímaios) by \foreignlanguage{greek}{Πλάτων} \textsc{Plátōn} (ca. \num{428}--\num{348} BC) \parencite{Pla-40}, but goes back to earlier philosophers (\foreignlanguage{greek}{Ἐμπεδοκλῆς} Empedoklḗs ca. \num{490}--\num{430} BC, \foreignlanguage{greek}{Δημόκριτος} Dēmókritos ca. \num{460}--\num{370} BC). Assume a cube of some material, say, iron. This cube could be cut in halves, those halves into halves again, and so on. However, this is not possible \Foreign{ad infinitum}, but at some point one would reach a limit, where further division is no longer possible. These smallest possible particles are called atoms (from Greek \foreignlanguage{greek}{ἄτομος} átomos = undividable). There are \num{4} kinds of atoms, shaped like those \textsc{Platon}ic bodies constructed from triangles: tetrahedron, octahedron, icosahedron and cube. These different atomic shapes correspond to the 4 elements: the atoms of fire are tetrahedrons (prickly) , soil cubes (tessellates Euclidean space and causes the solidity of the soil), water icosahedras (flows out of the hands like little balls) and air octahedrons (smooth, can hardly be felt). Each of those elements embodies a particular combination of the primary qualities hot -- cold and wet -- dry: air is hot and wet, fire hot and dry, soil dry and cold and water wet and cold. Air is gaseous, water liquid and soil solid, fire is consuming. Fire represents the male, water the female principle, air and soil are transition elements. + +Each of the basic elements is also associated with one of the 4 bodily fluids that must be in balance to avoid disease, they also correspond to temperaments: blood -- air -- sanguinic, black gall -- soil -- melancholic, yellow gall -- fire -- choleric and slime -- water -- phlegmatic (humoral pathology, \foreignlanguage{greek}{Ἱπποκράτης} Hippokrates \num{460}--\num{370} BC, \foreignlanguage{greek}{Γαληνός} \textsc{Galenos}, \num{129}--\num{199} AD, \foreignlanguage{arabic}{أبو علي الحسين بن عبد الله ابن سينا} Abū Alī al-Husain ibn Abd Allāh ibn Sīnā (Avicenna) \num{980}--\num{1037} AD). + +The fifth platonic body -- dodecaeder -- is not composed of triangles, is considered the most noble and represents the cosmos or the spirit. + +Alchemy had three goals: +\begin{itemize} + \item{the preparation of chemicals, often in the context of practical purposes (\Foreign{e.g.}, metals and dyes). This is now handled by chemistry.} + \item{the preparation of medicines that can cure diseases. This is now dealt with by pharmacology.} + \item{the transmutation of base metals (like lead) into noble metals like silver and gold (Gr. \foreignlanguage{greek}{χρυσοποιία}, chrysopoeia = gold making). Today we understand that this requires the transformation of elements (nuclei with different number of protons), which is not possible by chemistry. Nuclear physics can do so in particle accelerators by bombarding bismuth with high energy atoms to kick out \num{4} protons and \num{6}--\num{9} neutrons from the \isotope[209][83]{Bi}-nuclei to produce a variety of \isotope[][79]{Au}-isotopes, of which only \isotope[197][79]{Au} is not radioactive \parencite{Ale-81}. Also, the process requires vast amounts of energy (worth about US\$ \num{5000} per \si{h}, for \SI{1}{d} to produce a few thousand gold atoms) and is thus not cost effective. For true alchemists, however, transmutation was only a symbol for obtaining spiritual enlightenment by liberating ones essence from the worldly personality.} +\end{itemize} + +Later authors added the quintessence, an eternal substance that forms the basis of the other elements. \Name{Philippus Theophrastus Aureolus Bombast von Hohenheim (Paracelsus)} \num{1493}--\num{1541} \parencite{Mic-21} replaced the 4 elements from antiquity with the \Foreign{tria prima} (original trias) mercury (volatile), sulfur (burning) and salt (stabilising). He didn't mean the substances we take from the lab shelf, but their ``philosophical'' equivalent. \Name{Paracelsus} based medicine on observation rather than philosophical book wisdom and explored the pharmaceutical use of minerals, complementing the plants suggested by \Name{Galenos}. He introduced the concept that substances toxic in higher doses may be curative in low (\Foreign{dosis facit venenum}, the dose makes the poison) and is the father of modern toxicology. In particular, he experimented with mercury against the ``French disease'' (syphilis), but the results were, at best, variable. It is thus not surprising that \Name{Paracelsus} died from chronic exposure to mercury vapours as attested by the \chemical{Hg}-concentration in his bones. + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F747 & \num{128839} & \AlchemistSpirit & Spirit & \\ + 1F700 & \num{128768} & \AlchemistQuintessence & Quintessence & aether \\ + 1F701 & \num{128769} & \AlchemistAir & Air & \\ + 1F702 & \num{128770} & \AlchemistFire & Fire & \\ + 1F703 & \num{128771} & \AlchemistSoil & Soil & \\ + 1F704 & \num{128772} & \AlchemistWater & Water & \\ + 1F70E & \num{128782} & \AlchemistPhilosophersSulphur & Philosopher's Sulphur & \\ + 2721 & \num{10017} & \AlchemistMateriaPrima & \Foreign{Materia prima} & \\ + \end{supertabular} +\end{landscape} + +\section{Compounds} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F705 & \num{128773} & \AlchemistAquaFortis & Aqua fortis & Nitric acid \chemical{HNO_3} \\ + 1F706 & \num{128774} & \AlchemistAquaRegiaA & Aqua regia 1 & 1 part nitric, 3 parts hydrochloric acid \chemical{NOCl} \\ + 1F707 & \num{128775} & \AlchemistAquaRegiaB & Aqua regia 2 & \\ + 1F708 & \num{128776} & \AlchemistAquaVitaeA & Aqua vitae 1 & Ethanol, distilled spirit \chemical{CH_3\single CH_2\single OH} \\ + 1F709 & \num{128777} & \AlchemistAquaVitaeB & Aqua vitae 2 & \\ + 1F70A & \num{128778} & \AlchemistVinegar & Vinegar & acetic acid \chemical{CH_3\single COOH} \\ + 1F70B & \num{128779} & \AlchemistDistilledVinegarA & distilled vinegar 1 & \\ + 1F70C & \num{128780} & \AlchemistDistilledVinegarB & distilled vinegar 2 & \\ + 1F710 & \num{128784} & \AlchemistSublimateOfMercuryA & Sublimate of mercury 1 & mercury(II)chloride \chemical{HgCl_2} \\ + 1F711 & \num{128785} & \AlchemistSublimateOfMercuryB & Sublimate of mercury 2 & \\ + 1F712 & \num{128786} & \AlchemistSublimateOfMercuryC & Sublimate of mercury 3 & \\ + 1F713 & \num{128787} & \AlchemistCinnabar & Cinnabar & mercury(II)sulphide \chemical{HgS} \\ + 1F714 & \num{128788} & \AlchemistSalt & Salt & sodium chloride \chemical{NaCl} \\ + 1F715 & \num{128789} & \AlchemistNitre & Nitre & salpeter, \chemical{KNO_3} \\ + 1F716 & \num{128790} & \AlchemistVitriolA & Vitriol 1 & sulphuric acid \chemical{H_2SO_4} \\ + 1F717 & \num{128791} & \AlchemistVitriolB & Vitriol 2 & \\ + 1F718 & \num{128792} & \AlchemistRockSaltA & Rock salt 1 & \textit{sal gemmae}, impure \chemical{NaCl} \\ + 1F713 & \num{128793} & \AlchemistRockSaltB & Rock salt 2 & \\ + 1F71C & \num{128796} & \AlchemistIronOreA & Iron ore 1 & \\ + 1F71D & \num{128797} & \AlchemistIronOreB & Iron ore 2 & \\ + 1F71E & \num{128798} & \AlchemistCrocusOfIron & Crocus of iron & \textit{crocus martis}, rust \\ + 1F720 & \num{128800} & \AlchemistCopperOre & Copper ore & \\ + 1F723 & \num{128803} & \AlchemistCrocusOfCopperA & Crocus of copper 1 & copper(II)oxyde \chemical{CuO} \\ + 1F724 & \num{128804} & \AlchemistCrocusOfCopperB & Crocus of copper 2 & \\ + 1F721 & \num{128801} & \AlchemistIronCopperOre & Iron copper ore & chalcopyrite \chemical{CuFeS_2} \\ + 1F71B & \num{128795} & \AlchemistSublimateOfCopperA & Sublimate of copper 1 & copper(I)chloride \chemical{CuCl} \\ + 1F71C & \num{128796} & \AlchemistSublimateOfCopperB & Sublimate of copper 2 & \\ + 1F725 & \num{128805} & \AlchemistCopperAntimonateA & Copper antimonate 1 & \chemical{CuSb_2O_6} \\ + 1F726 & \num{128806} & \AlchemistCopperAntimonateB & Copper antimonate 2 & \\ + 1F728 & \num{128808} & \AlchemistVerdigris & Verdigris & patina on copper (acetate, hydroxyde, chloride) \\ + 1F729 & \num{128809} & \AlchemistTinOre & Tin ore & Cassiterite \chemical{SnO_2} \\ + 1F72A & \num{128810} & \AlchemistLeadOre & Lead ore & Galena \chemical{PbS} \\ + 1F72B & \num{128811} & \AlchemistAntimonyOre & Antimony ore & stibnite \chemical{Sb_2S_3} \\ + 1F72C & \num{128812} & \AlchemistSublimateOfAntimony & Sublimate of antimony & senarmontite \chemical{Sb_4O_6} \\ + 1F72D & \num{128813} & \AlchemistSaltOfAntimony & Salt of antimony & Antimony sulphate \chemical{Sb_2(SO_4)_3} \\ + 1F72E & \num{128814} & \AlchemistSublimateOfSaltOfAntimony & Sublimate of salt of antimony & an antimony oxyde from decomposition of the sulphate? \\ + 1F72F & \num{128815} & \AlchemistVinegarOfAntimony & Vinegar of antimony & may be \chemical{Sb(CH_3COO)_3}, but this is unstable \\ + 1F736 & \num{128822} & \AlchemistAlkaliA & Alkali 1 & \Foreign{sal alkali} \chemical{Na_2CO_3} or \chemical{K_2CO_3} \\ + 1F737 & \num{128823} & \AlchemistAlkaliB & Alkali 2 & \\ + 1F738 & \num{128824} & \AlchemistMarcasite & Marcasite & \chemical{FeS_2} (originally included iron pyrite or fools gold) \\ + 1F739 & \num{128825} & \AlchemistSalAmmoniak & Sal ammoniak & ammonium chloride \chemical{NH_4Cl} \\ + 1F73B & \num{128827} & \AlchemistRealgarA & Realgar 1 & \chemical{As_4S_4} \\ + 1F73C & \num{128828} & \AlchemistRealgarB & Realgar 2 & \\ + 1F73D & \num{128829} & \AlchemistAuripigment & Auripigment & \chemical{As2S3} \\ + 1F73E & \num{128830} & \AlchemistBismuthOre & Bismuth ore & bismuthinite \chemical{Bi_2S_3} or bismite \chemical{Bi_2O_3}?\\ + 1F73F & \num{128831} & \AlchemistTartarA & Tartar1 & wine stone, potassium hydrogen tartrate \\ + 1F740 & \num{128832} & \AlchemistTartarB & Tartar2 & \\ + 1F741 & \num{128833} & \AlchemistQuicklime & Quicklime & calcium oxyde \chemical{CaO}\\ + 1F742 & \num{128834} & \AlchemistBoraxA & Borax 1 & \chemical{Na_2B_4O_7 \times 10 H_2O} \\ + 1F743 & \num{128835} & \AlchemistBoraxB & Borax 2 & \\ + 1F744 & \num{128836} & \AlchemistBoraxC & Borax 3 & \\ + 1F745 & \num{128837} & \AlchemistAlum & Alum & double salt like \chemical{KAl(SO_4)_2 \times 12 H_2O} \\ + 1F753 & \num{128851} & \AlchemistLodestone & Lodestone & magnetite, Fe(II, III)oxyde \\ + 1F758 & \num{128856} & \AlchemistPotashes & Potashes & \chemical{K_2CO_3} \\ + 1F75C & \num{128860} & \AlchemistStratumSuperStratumA & \textit{Stratum super stratum} 1 & layer over layer \\ + 1F75D & \num{128861} & \AlchemistStratumSuperStratumB & \textit{Stratum super stratum} 2 & \\ + \end{supertabular} +\end{landscape} + +\section{Mixtures} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F70F & \num{128863} & \AlchemistBlackSulphur & Black sulphur & residue left after sublimation of sulphur \\ + 1F754 & \num{128852} & \AlchemistSoap & Soap & sodium salt of mixed fatty acids \\ + 1F755 & \num{128853} & \AlchemistUrine & Urine & \\ + 1F756 & \num{128854} & \AlchemistHorseDung & Horse dung & \\ + 1F757 & \num{128855} & \AlchemistAshes & Ashes & \\ + 1F759 & \num{128857} & \AlchemistBrick & Brick & \\ + 1F75A & \num{128858} & \AlchemistPowderedBrick & powdered brick & \\ + 1F75B & \num{128859} & \AlchemistAmalgam & Amalgam & alloy of mercury \\ + 1F74E & \num{128862} & \AlchemistCaputMortuum & \textit{Caput mortuum} & slag left after a purification \\ + 1F746 & \num{128838} & \AlchemistOil & Oil & \\ + 1F749 & \num{128841} & \AlchemistGum & Gum & \\ + 1F74A & \num{128842} & \AlchemistWax & Wax & \\ + 1F74C & \num{128844} & \AlchemistCalx & Calx & oxydised residue, also \chemical{CaO} \\ + 1F74D & \num{128845} & \AlchemistTutty & Tutty & \chemical{ZnO} or \chemical{ZnCO_3} \\ + \end{supertabular} +\end{landscape} + +\section{Elements} + +The alchemist's idea about elements (atoms shaped like different \Name{Platon}ic bodies) was very different from ours (different number of protons in the nucleus). In the following, we list elements in our modern understanding. Even then, however, there can be misunderstandings. ``Regulus of antimony'' is quite clear, a drop of antimony left after purification. However, ``regulus of iron'' and ``regulus of copper'' also mean antimony, but made by reducing antimony oxyde with iron or copper, respectively. It was assumed that they were different because of the different synthetic route. + +The symbols for iron/Mars and copper/Venus are also used for male and female. + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 2646 & \num{9798} & \AlchemistBismuth & Bismuth & also planet Neptune \\ + 2640 & \num{9792} & \AlchemistCopper & Copper & also planet Venus \\ + 1F71A & \num{128794} & \AlchemistGoldA & Gold & \\ + 2609 & \num{9737} & \AlchemistGoldB & Gold & also sun \\ + 2642 & \num{9794} & \AlchemistIron & Iron & also planet Mars \\ + 2644 & \num{9796} & \AlchemistLead & Lead & also planet Saturn \\ + 1F730 & \num{128816} & \AlchemistRegulusOfAntimonyA & Regulus of Antimony 1 & impure antimony \\ + 1F731 & \num{128817} & \AlchemistRegulusOfAntimonyB & Regulus of Antimony 2 & \\ + 1F71F & \num{128799} & \AlchemistRegulusOfIron & Regulus of iron & antimony prepared from stibnite by reduction with iron \\ + 263F & \num{9791} & \AlchemistMercury & Mercury & also the planet mercury \\ + 1F71B & \num{128795} & \AlchemistSilverA & Silver 1 & \\ + 263D & \num{9789} & \AlchemistSilverB & Silver 2 & also first quarter moon \\ + 263E & \num{9790} & \AlchemistSilverC & Silver 3 & also last quarter moon \\ + 1F70D & \num{128781} & \AlchemistSulphur & Sulphur & \\ + 2643 & \num{9795} & \AlchemistTin & Tin & also planet Jupiter \\ + \end{supertabular} +\end{landscape} + +\section{Processes} + +As mentioned, the \Foreign{opus magnum} of gold making is really only an allegory of the journey to self-knowledge and, yes, eventually to god \parencite{Rip-71, Jun-44}: + +\begin{description} + \item[Calcination]{exposure of a sample to high, dry heat (roasting, even glowing). Many substances under these condition loose weight, turn white and become easy to grind. First (black) stage of the \Foreign{opus magnum}. The colour black represents chaos, and that what is hidden or buried, the \Foreign{materia prima} from which all other things may be obtained. Spiritually, calcination means burning off our attachments to the world: the desire for status, fame, wealth and identity. Our preconceived notions about ourself are put to the test by fire, in an existential crisis, in the \emph{dark night of the soul}.} + \item[Dissolution]{forming a \(\rightarrow\) solution. In the \Foreign{opus magnum}, the ashes obtained during calcination are dissolved in water, the symbol of the unconscious or hidden. Spiritually, we free ourselves from our inauthentic and acquired traits. The dissolution stage involves freeing repressed emotions from traumatic events that we have pushed down into our subconsciousness (dissolution of the ego \parencite{Jun-44}), and can be a cathartic step.} + \item[Separation]{is the 3rd stage of the \Foreign{opus magnum}, where the products of dissolution are filtered and separated. Whilst the first stages were associated with the elements fire and water, this one is associated with air. The pure essence is extracted from the mixture. Spiritually, we leave our acquired personality in form of engrained thought processes and emotional triggers to become our true, essential self. Collect all the things in you that are helpful for yourself and for others, and let go of everything else. After the turmoil of the first steps, we can now enjoy the stillness of being removed from all that is inauthentic and artificial. } + \item[Conjunction]{means bringing together the elements purified in the first three stages by fire, water and air in the sign of the soil. Spiritually, we bring what is left of us together to form a new, authentic personality. The conflict of dualities like body and soul, spirit and matter, conscious and unconscious are resolved. Feminine qualities like emotion and intuition join male like intellect and logic. } + \item[Fermentation]{exposure to microorganisms for longer time to achieve a chemical reaction and remove what is no longer needed. } + \item[Putrefaction]{leaving a sample undisturbed, often after adding the desired material (seed). Both fermentation and putrefaction form the 5th stage of the \Foreign{opus magnum}: the removal of the old, unauthentic self. This process can be painful, but we cannot see dawn before we have gone through the darkest of nights. } + \item[Distillation]{process of vaporising and then condensing a substance. The different boiling points of the components of a mixture are used for purification of the essence. In spiritual alchemy, our core identity is freed from any inferior elements. The ego is no longer dominating, so that the soul can be heard. } + \item[Coagulation]{old term for crystallisation. The result is the philosophers stone. Spiritually, the self comes together in a healing process. This is called \emph{rubedo}. This word also refers to the state achieved by the mage where he is fully attuned to the \Foreign{anima mundi}, the fountainhead of creation and source of the \Foreign{prima materia}. } +\end{description} + +Apart from the processes involved in the \Foreign{opus magnum}, the following methods were used by alchemists: +\begin{description} + \item[Ceration]{allowing a hard, dry substance to absorb water while it is heated (imbibition) for the purpose of softening it (from Latin \Foreign{cera} = wax). } + \item[Digestion]{heating a sample in an open vessel for long times, but without boiling it.} + \item[Fixation]{turning a volatile compound into a solid that is not affected by fire} + \item[Multiplication]{increasing the potency of an elixir or philosophers stone, often by repeating the process by which it was originally obtained} + \item[Precipitation]{letting a solid form from a solution and collecting it. } + \item[Projection]{process of transmuting base metals to gold using the philosopher's stone} + \item[Purify]{increasing the concentration of a particular substance, if possible close to \SI{100}{\%}. } + \item[Regulus formation]{getting the pure form of a metal (especially antimony) out of an ore. } + \item[Solution]{one component (solute) is homogenously dispersed in a second component (solvent, usually, but not necessarily, a liquid). } + \item[Sublimation]{heating a substance to turn it from the solid directly into the gaseous state and back, without forming a liquid first. The sublimate is called ``flower''.} + \item[Tincture]{extract in alcohol.} +\end{description} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 2648 & \num{9800} & \AlchemistCalcination & Calcination & also aries \\ + 2650 & \num{9802} & \AlchemistCeration & Ceration & also Sagittarius \\ + 2649 & \num{9801} & \AlchemistCongelation & Congelation & also Taurus \\ + 264C & \num{9804} & \AlchemistDigestion & Digestion & also Leo \\ + 1F761 & \num{128865} & \AlchemistDissolveA & Dissolve 1 & \\ + 1F762 & \num{128866} & \AlchemistDissolveB & Dissolve 2 & \\ + 1F760 & \num{128864} & \AlchemistDistillationA & Distillation 1 & \\ + 264D & \num{9805} & \AlchemistDistillationB & Distillation 2 & also Virgo \\ + 2651 & \num{9803} & \AlchemistFermentation & Fermentation & also Capricorn \\ + 264A & \num{9802} & \AlchemistFixation & Fixation & also Gemini \\ + 2652 & \num{9804} & \AlchemistMultiplication & Multiplication & also Aquarius \\ + 1F75F & \num{128863} & \AlchemistPrecipitation & Precipitation & \\ + 2653 & \num{9805} & \AlchemistProjection & Projection & also Pisces \\ + 1F763 & \num{128867} & \AlchemistPurify & Purify & \\ + 1F764 & \num{128868} & \AlchemistPutrefaction & Putrefaction & \\ + 1F732 & \num{128818} & \AlchemistRegulusA & Regulus 1 & smelting of metallic ore \\ + 1F733 & \num{128819} & \AlchemistRegulusB & Regulus 2 & \\ + 1F734 & \num{128820} & \AlchemistRegulusC & Regulus 3 & \\ + 1F735 & \num{128821} & \AlchemistRegulusD & Regulus 4 & \\ + 264F & \num{9807} & \AlchemistSeparation & Separation & also Scorpio \\ + 264B & \num{9803} & \AlchemistSolution & Solution & also Cancer \\ + 1F75E & \num{128862} & \AlchemistSublimationA & Sublimation 1 & \\ + 264E & \num{9806} & \AlchemistSublimationB & Sublimation 2 & also Libra \\ + 1F748 & \num{128840} & \AlchemistTincture & Tincture & alcoholic extract \\ + \end{supertabular} +\end{landscape} + +\section{Tools} + +\begin{description} + \item[Alembic]{from Greek \foreignlanguage{greek}{ἄμβιξ} ambix = beaker over Arabic \foreignlanguage{arabic}{الإنبيق} al-inbīq is a distillation head connecting two vessels. In the fist (cucurbit from \foreignlanguage{greek}{βῖκος} bîkos) a sample was heated, the second (receiver, from \foreignlanguage{greek}{φιάλη} phialē over Arabic \foreignlanguage{arabic}{قَابِلَة} qābila) received the vapours condensed in a connecting tube (Greek \foreignlanguage{greek}{σωλήν} sōlēn). Its invention is attributed to \Name{Maria Prophetissa} of Alexandria in the 1st century AD (variously also called \Name{Maria the Jewess} or \Name{Maria the Copt}). The bridge of modern chemical glassware is the closest equivalent.} + \item[Athanor]{furnance} + \item[Caduceus]{is the staff of Hermes (Gr.) = Mercury (Lat., god of traders and thieves) with two snakes and wings. It should not be mixed up with the staff of Asclepios (Son of Apollo) with one snake and no wings, which is a symbol of medicine. The astrological/alchemists sign of Mercury is an older version of the caduceus, with the snakes protruding from the staff.} + \item[Crucible]{a heat resistant ceramic vessel used to heat substances in fire. } + \item[Balneum Mariae ]{hot water bath invented by \Name{Maria Prophetissa} and still used to keep food warm in refectories and the like (\Foreign{bain de Marie}). It consists of an outer vessel half-filled with a hot fluid (usually water) and an inner vessel that is filled with the material to be kept warm and immersed in the fluid of the outer vessel. The material in the inner vessel is kept at a constant temperature, without hot or cold spots.} + \item[Retort]{(from Lat. \Foreign{retortus} = curved backward) glass vessel used by alchemists. Heating it was an art in itself, as the soda-lime glasses available at the time were liable to crack when heated unevenly. In the modern chemical industry, vessels of any shape and material used for pyrolysis are still called retort (production of shale oil, charcoal, recovery of \chemical{Hg} in gold mining). In the laboratory, the \Name{Liebig} condenser has largely replaced the retort. } + \item[Scepter of Jove]{or bident, a pitchfork-like instrument with two prongs, was used in Roman time for the consecration of a place struck by lightning. It is probably a symbol for Jupiter's lightning bolt. The name may be derived from the young sheep sacrificed in the ritual (so young as to have only two teeth). The bident is also the symbol for Hades (Pluto), the god of the underworld. } + \item[Staff of Asclepios]{Staff with a snake (allegedly a Aesculapian adder \Foreign{Zamenis longissimus} (\Name{Laurenti}, 1768), Colubridae) wound around it. Originally, the ``snake'' is probably a Guinea worm (\Foreign{Dracunculus medinensis} L., Dracunculidae), which already in ancient Egypt was removed from affected limbs by slowly pulling it out and winding it around a piece of wood. } + \item[Trident ]{is similar to the bident, but has three prongs. It is the symbol of Poseidon (Neptune), god of the seas. } + \item[Starred Trident ]{} + \item[Vapour bath ]{} +\end{description} + +It is noteworthy that there were female alchemists at a time when females were generally limited to ``kitchen, children and church'', and that the work of these female alchemists was highly respected by their male colleagues. \Name{Maria Prophetissa} and \Name{Cleopatra the Alchemist} (Alexandria, ca. 3rd century AD, not related to the Ptolemaic queens) may be the most well-known of them. + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F76A & \num{128874} & \AlchemistAlembicA & Alembic 1 & distillation head \\ + 2697 & \num{9879} & \AlchemistAlembicB & Alembic 2 & \\ + 2695 & \num{9877} & \AlchemistAsclepius & Staff of Asclepius & symbol of medicine \\ + 1F750 & \num{128848} & \AlchemistCaduceusA & Caduceus 1 & staff of Hermes = Mercury (with two snakes) \\ + 2624 & \num{9764} & \AlchemistCaduceusB & Caduceus 2 & \\ + 1F765 & \num{128869} & \AlchemistCrucibleA & Crucible 1 & ceramic, heat-resistant vessel \\ + 1F766 & \num{128870} & \AlchemistCrucibleB & Crucible 2 & \\ + 1F767 & \num{128871} & \AlchemistCrucibleC & Crucible 3 & \\ + 1F768 & \num{128872} & \AlchemistCrucibleD & Crucible 4 & \\ + 1F769 & \num{128873} & \AlchemistCrucibleE & Crucible 5 & \\ + 1F76B & \num{128875} & \AlchemistBalneumMariae & Balneum Mariae & water bath \\ + 1F76D & \num{128877} & \AlchemistRetort & Retort & glass vessel \\ + 1F74F & \num{128879} & \AlchemistScepterOfJove & Scepter of Jove & \\ + 1F751 & \num{128849} & \AlchemistTrident & Trident & \\ + 1F752 & \num{128850} & \AlchemistStarredTrident & Starred Trident & \\ + 1F76C & \num{128876} & \AlchemistVapourBath & Vapour bath & \\ + \end{supertabular} +\end{landscape} + + +\section{Astronomy and astrology} + +\subsection{Astrology} + +\begin{description} + \item[Regulus]{brightest star system (apparent magnitude of +1.35) in the constellation Leo (\textalpha\ Leonis). Actually consists of 4 stars, Regulus A is a blue-white main-sequence star, its companion has not been observed directly but is probably a white dwarf. Regulus B and C are main sequence stars.} + \item[Ascending node]{if the plane defined by the orbit of a celestial body has an angle (inclination) \(\neq 0\) to a reference plane, then the orbit intersects the reference plane in two points. The one crossed by the north-moving body is called the ascending node (Latin \Foreign{caput draconis} = dragon's head or Greek \foreignlanguage{greek}{αναβιβάζων} anabibazon). In astrology, these terms refer to the crossings of the orbit of the moon with the apparent orbit of the sun across the sky.} + \item[Descending note]{The node of the south-moving body (\Foreign{cauda draconis} = dragon's tail or \foreignlanguage{greek}{καταβιβάζων} catabibazon). } + \item[Conjunction]{is the apparent meeting of two celestial bodies as seen from earth (angle \(\pm 10°\)). For example, a conjunction of sun and moon is visible as solar eclipse. ``Great conjugation'' we call the meeting of Jupiter and Saturn, its occurance \num{7} BC may have been the biblical star of Bethlehem (Mt 2\textsubscript{2}).} + \item[Opposition]{is the situation where two celestial bodies appear (from the earth) to have an angle of \ang{180}. Usually, one of the bodies is the sun, the other then is visible during the entire night. A near opposition of moon and sun is called full moon, an exact opposition lunar eclipse. Planets have their smallest distance from the earth during their opposition. } + \item[Sextile]{two celestial bodies appear to have an angle of \ang{60}.} + \item[Semisextile]{two celestial bodies appear to have an angle of \ang{30}.} + \item[Quincunx]{two celestial bodies appear to have an angle of \ang{150}.} + \item[Sesquiquadrate]{two celestial bodies appear to have an angle of \ang{135}.} + \item[Lot of fortune]{ or lucky point (Lat. \Foreign{Pars Fortunae}), its exact meaning varies between ancient, arabic and western astrologers. } + \item[Occultation]{occurs when one object is hidden from the observer by a second moving between them. If the second object is too small to hide the first completely, we call this \emph{transit}. } + \item[Lunar eclipse]{moon becomes invisible because of an exact opposition with the sun (moon enters the shadow cast by the earth). } +\end{description} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F732 & \num{128818} & \AlchemistRegulusA & Regulus 1 & one of the brightest stars, also the process of smelting \\ + 1F733 & \num{128819} & \AlchemistRegulusB & Regulus 2 & \\ + 1F734 & \num{128820} & \AlchemistRegulusC & Regulus 3 & \\ + 1F735 & \num{128821} & \AlchemistRegulusD & Regulus 4 & \\ + 260A & \num{9738} & \AlchemistAscendingNode & AscendingNode & \\ + 260B & \num{9739} & \AlchemistDescendingNode & DescendingNode & \\ + 260C & \num{9740} & \AlchemistConjunction & Conjunction & \\ + 260D & \num{9741} & \AlchemistOpposition & Opposition & \\ + 26B9 & \num{9913} & \AlchemistSextile & Sextile & \\ + 26BA & \num{9914} & \AlchemistSemisextile & Semisextile & \\ + 26BB & \num{9915} & \AlchemistQuincunx & Quincunx & \\ + 26BC & \num{9916} & \AlchemistSesquiquadrate & Sesquiquadrate & \\ + 1F774 & \num{128884} & \AlchemistLotOfFortune & LotOfFortune & \\ + 1F775 & \num{128885} & \AlchemistOccultation & Occultation & hiding one celestial body by another \\ + 1F776 & \num{128886} & \AlchemistLunarEclipse & LunarEclipse & \\ + \end{supertabular} +\end{landscape} + +\subsubsection{Star signs} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 2648 & \num{9800} & \AlchemistAries & Aries & also calcination \\ + 2649 & \num{9801} & \AlchemistTaurus & Taurus & also congelation \\ + 264A & \num{9802} & \AlchemistGemini & Gemini & also fixation \\ + 264B & \num{9803} & \AlchemistCancer & Cancer & also solution \\ + 264C & \num{9804} & \AlchemistLeo & Leo & also digestion \\ + 264D & \num{9805} & \AlchemistVirgo & Virgo & also distillation \\ + 264E & \num{9806} & \AlchemistLibra & Libra & also sublimation \\ + 264F & \num{9807} & \AlchemistScorpio & Scorpio & also separation \\ + 2650 & \num{9808} & \AlchemistSagittarius & Sagittarius & also ceration \\ + 2651 & \num{9809} & \AlchemistCapricorn & Capricorn & also fermentation \\ + 2652 & \num{9810} & \AlchemistAquarius & Aquarius & also multiplication \\ + 2653 & \num{9811} & \AlchemistPisces & Pisces & also projection \\ + \end{supertabular} +\end{landscape} + + +\subsection{Solar system} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 2609 & \num{9737} & \AlchemistSun & Sun & also gold \\ + 263D & \num{9789} & \AlchemistFirstQuarterMoon & First quarter moon & also silver \\ + 263E & \num{9790} & \AlchemistLastQuarterMoon & Last quarter moon & \\ + 26B8 & \num{9912} & \AlchemistBlackMoonLilith & Black moon Lilith & 2nd focal point of lunar orbit \\ + 263F & \num{9791} & \AlchemistMercury & Mercury & also the element mercury \\ + 2640 & \num{9792} & \AlchemistVenus & Venus & also copper \\ + 2641 & \num{9793} & \AlchemistEarth & Earth & \\ + 2642 & \num{9794} & \AlchemistMars & Mars & also iron \\ + 2643 & \num{9795} & \AlchemistJupiter & Jupiter & also tin \\ + 2644 & \num{9796} & \AlchemistSaturn & Saturn & also lead \\ + 2645 & \num{9797} & \AlchemistUranus & Uranus & \\ + 2646 & \num{9798} & \AlchemistNeptune & Neptune & also bismuth \\ + 2647 & \num{9799} & \AlchemistPlutoA & Pluto 1 & \\ + 2BD3 & \num{11219} & \AlchemistPlutoB & Pluto 2 & \\ + \end{supertabular} +\end{landscape} + +\subsubsection{Dwarf planets} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F77B & \num{128891} & \AlchemistHaumea & Haumea & \\ + 1F77C & \num{128892} & \AlchemistMakemake & Makemake & \\ + 1F77D & \num{128893} & \AlchemistGonggong & Gonggong & \\ + 1F77E & \num{128894} & \AlchemistQuaoar & Quaoar & \\ + 1F77F & \num{128895} & \AlchemistOrcus & Orcus & \\ + 2BF0 & \num{11248} & \AlchemistErisA & Eris 1 & \\ + 2BF1 & \num{11249} & \AlchemistErisB & Eris 2 & \\ + 2BF2 & \num{11250} & \AlchemistSedna & Sedna & \\ + \end{supertabular} +\end{landscape} + +\subsubsection{Asteroids} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 26B3 & \num{9907} & \AlchemistCeres & Ceres & \\ + 26B4 & \num{9908} & \AlchemistPallas & Pallas & \\ + 26B5 & \num{9909} & \AlchemistJuno & Juno & \\ + 26B6 & \num{9910} & \AlchemistVesta & Vesta & \\ + 26B7 & \num{9911} & \AlchemistChiron & Chiron & \\ + \end{supertabular} +\end{landscape} + +\section{Measures} + +\begin{landscape} + \tablehead{ + \toprule + Hex & Decimal & Char & Name & Description \\ + \midrule } + \tabletail{\midrule \multicolumn{5}{r}{continued on next page} \\} + \tablelasttail{\bottomrule} + \begin{supertabular}{rrrll} + 1F76E & \num{128878} & \AlchemistHourA & Hour & \\ + 29D6 & \num{10710} & \AlchemistHourB & Hour & \\ + 29D7 & \num{10711} & \AlchemistHourC & Hour & \\ + 1F76F & \num{128879} & \AlchemistNight & Night & \\ + 1F770 & \num{128880} & \AlchemistDayNight & DayNight & \\ + 1F771 & \num{128881} & \AlchemistMonth & Month & \\ + 1F772 & \num{128882} & \AlchemistHalfDram & HalfDram & 1 dram \(\approx\) \SI{3.6}{mL} \\ + 1F773 & \num{128883} & \AlchemistHalfOunce & HalfOunce & 1 ounce \(\approx\) \num{28}--\SI{31}{g} \\ + \end{supertabular} +\end{landscape} + +\printbibliography[heading=subbibliography] + +\end{refsection} +\end{document} diff --git a/fonts/alchemist/manual.sty b/fonts/alchemist/manual.sty new file mode 100644 index 0000000000..b1efc2b694 --- /dev/null +++ b/fonts/alchemist/manual.sty @@ -0,0 +1,305 @@ +%% ============================================================================ + % !Mode:: "TeX:UK:UTF-8" + % !TEX program = XeLaTeX + % ----------------------------------------------------------------------------- + +% Private XeLaTeX style for scientific texts +% copyright 2019 by Dr Engelbert Buxbaum <engelbert_buxbaum@web.de> +% This file may be shared under Gnu copyleft or the LaTeX the Project Public License. + +\ProvidesPackage{manual}[2019/09/18 v1.01 standard packages for scientific texts] +\NeedsTeXFormat{LaTeX2e} + +\RequirePackage{kpfonts-otf} +\usepackage{polyglossia}%foreign language support + +\RequirePackage{acronym}%keep track of acronyms +%\RequirePackage{amssymb}%math symbols, not required with kpfonts-otf +\RequirePackage[backend=biber,bibencoding=UTF8,sorting=none,dateera=christian,style=numeric-comp]{biblatex}%bibliography +\RequirePackage{biochemistry-colors}%defines standard-conform colours for biochem entities +\RequirePackage{booktabs}%proper rules in tables +\RequirePackage{chemarrow}%arrows in chemical reactions +\RequirePackage{colortbl}%coloured background for tables +\RequirePackage{csquotes}%context-sensitive quotes, required for biblatex +\RequirePackage{css-colors}% defines web-safe colours +\RequirePackage{doi}%give DOIs as hyperlinks in bibliography +\RequirePackage{floatrow}%control float placement +\RequirePackage{fontspec}% font selecting commands +\RequirePackage{graphicx}%inclusion of images +\RequirePackage{hypcap} % anchors of captions +\RequirePackage[british]{isodate}%use international format for date and time +\RequirePackage{isotope}%correct typesetting of isotopes +\RequirePackage{letltxmacro}% change LaTeX commands with optional arguments +\RequirePackage{listings}%typeset computer code +\RequirePackage{lscape}%typeset wide material in lanscape mode +\RequirePackage{makeidx}%index generation +\RequirePackage{marvosym}%various symbols +\RequirePackage{mathbbol}%blackboard bold symbols (double line left) +\RequirePackage{mathtools}%extension of amsmath +\RequirePackage{media9}%include video or sound, currently doesn't work because flash-based +\RequirePackage{microtype}%micro-typesetting +\RequirePackage{multicol}%switching between one- and multicolumn +\RequirePackage{placeins}%allows FloatBarriers to be set +\RequirePackage{rotating}%rotate objects} sidewaystables/figures +\RequirePackage{siunitx}%correct typesetting of units +\RequirePackage[labelformat=empty,labelsep=none]{subfig}% several entries in one float +\RequirePackage{supertabular}%tables over several pages +\RequirePackage[breakable,skins,listings]{tcolorbox}%put text into coloured boxes +\RequirePackage[euler]{textgreek}%upright greek characters +\RequirePackage{ulem}%underlining and striking out +\RequirePackage{url}%typeset internet links (preloaded in beamer) +\RequirePackage{wasysym} +\RequirePackage{xcolor}%handle colours + +%\RequirePackage{pdfcomment}% use pdf annotations + +\RequirePackage{hyperref}%hyperrefs in PDF, must be last package called, preloaded in beamer +\hypersetup{final=true, + pdfauthor={Dr. Engelbert Buxbaum}, + colorlinks=true, + citecolor=Blue,%bibliography, dark blue + linkcolor=Blue,%internal links, dark blue + urlcolor=DodgerBlue,%internet, middle blue + allbordercolors=White} + +\newcommand{\EURO}{{\footnotesize{\EUR}}} % because \EUR is way too big + +\DeclareSIUnit\angstrom{\text{Å}} +\sisetup{% set-up for siunitx and XeTeX + print-unity-mantissa = false, + separate-uncertainty, + negative-color = red + } + +% special chars in listings environment under XeTeX +\lstset{literate=% + {Ö}{{\"O}}1 + {Ä}{{\"A}}1 + {Ü}{{\"U}}1 + {ß}{{\ss}}1 + {ü}{{\"u}}1 + {ä}{{\"a}}1 + {ö}{{\"o}}1 + {~}{{\textasciitilde}}1 + } + +\let\wasymale\male % start to undo overwriting of wasy by kpfonts_otf +\let\wasyfemale\female % complete after \begin{document} +% after \begin{document} add: +%\let\male\wasymale +%\let\female\wasyfemale + +\setmainlanguage{en-GB} +\setotherlanguage{arabic} +\setotherlanguage{russian} +\setotherlanguage{greek} + +\newfontfamily\arabicfont[Script=Arabic]{FreeSerif} +\newfontfamily\russianfont{FreeSerif} +\newfontfamily\greekfont{FreeSerif} + + +\newcommand{\Name}[1]{\textsc{#1}} % proper names +\newcommand{\Foreign}[1]{\textit{#1}} % words from foreign languages +\newcommand{\Species}[1]{\textit{#1}} % biological species + +% Fonts for math-entities +\newcommand{\skalar}[1]{\ensuremath{#1}} +\newcommand{\Vector}[1]{\ensuremath{\vec{\mathfrak{#1}}}} +\newcommand{\AbsVec}[1]{\ensuremath{\mathfrak{#1}}} +\newcommand{\arr}[1]{\ensuremath{\mathcal{#1}}} +\newcommand{\tensor}[1]{\textsf{\bfseries{#1}}} +\newcommand{\set}[1]{\ensuremath{\mathbb{#1}}} + +% move super- and subscripts to make them more readable +\makeatletter + \frozen@everymath={\check@mathfonts + \fontdimen16 \textfont2=\fontdimen17 \textfont2 + \the\everymath} + \frozen@everydisplay={\check@mathfonts + \fontdimen16 \textfont2=\fontdimen17 \textfont2 + \the\everymath} +\makeatother + +%% "closed" sqrt sign, https://tex.stackexchange.com/questions/29834/closed-square-root-symbol + +\LetLtxMacro{\OldSqrt}{\sqrt} +\newcommand{\ClosedSqrt}[1][\hphantom{3}]{\def\DHLindex{#1}\mathpalette\DHLhksqrt} +\makeatletter + \newcommand*\bold@name{bold} + \def\DHLhksqrt#1#2{% + \setbox0=\hbox{$#1\OldSqrt{#2\,}$}\dimen0=\ht0\relax% + \advance\dimen0-0.2\ht0\relax% size of the added box is still 0.2 times ht0 + \setbox2=\hbox{\vrule height\ht0 depth -\dimen0}% + {\hbox{$#1\expandafter\OldSqrt\expandafter[\DHLindex]{#2\,}$} + \lower\ifx\math@version\bold@name0.6pt\else0.4pt\fi\box2} + } + % root index positioning and added space at the end, mostly noticeable in inline math mode + \renewcommand*{\sqrt}[2][\ ]{\ClosedSqrt[\leftroot{-2}\uproot{1}#1]{#2}\kern0.1em} +\makeatother + +\DeclareMathOperator{\logit}{logit} +\DeclareMathOperator{\sgn}{sgn} +\DeclareMathOperator{\diag}{diag} +\DeclareMathOperator{\var}{var} +\DeclareMathOperator{\cov}{Cov} +\DeclareMathOperator{\trace}{tr} +\DeclareMathOperator{\abs}{abs} +\DeclareMathOperator{\rk}{rk} +\DeclareMathOperator{\svd}{svd} +\DeclareMathOperator{\median}{median} +\DeclareMathOperator{\dist}{dist} +\DeclareMathOperator{\ld}{ld} +\DeclareMathOperator{\modulo}{modulo} + +% physicochemical entities +\newcommand{\ph}{\Foreign{p}H} +\newcommand{\poh}{\Foreign{p}OH} +\newcommand{\pka}{\Foreign{p}K\textsubscript{a}} +\newcommand{\pkb}{\Foreign{p}K\textsubscript{b}} +\newcommand{\pkw}{\Foreign{p}K\textsubscript{w}} +\newcommand{\pkr}{\Foreign{p}K\textsubscript{r}} +\newcommand{\pI}{\Foreign{p}I} + +% Chemical formulas in text +\makeatletter + \DeclareRobustCommand{\single}{\raisebox{0.25ex}{$\m@th-$}} + \DeclareRobustCommand{\dotted}{\raisebox{0.6ex}{$\m@th.. $}} + \DeclareRobustCommand{\Lewis}{\raisebox{0.6ex}{$\m@th.$}} + \DeclareRobustCommand{\double}{\raisebox{0.25ex}{$\m@th=$}} + \DeclareRobustCommand{\triple}{\raisebox{0.25ex}{$\m@th\equiv$}} + \DeclareRobustCommand*{\Doth}{\LARGE{.}} + \DeclareRobustCommand{\radic}{\hspace{-0.1em}{\raisebox{1.4ex}{\Doth}}} + \DeclareRobustCommand{\chemical}[1]{% + {\(\m@th + \edef\resetfontdimens{\noexpand\)% + \fontdimen16 \textfont2=\the\fontdimen16 \textfont2 + \fontdimen17 \textfont2=\the\fontdimen17 \textfont2 \relax}% + \fontdimen16 \textfont2=2.7pt \fontdimen17 \textfont2=2.7pt + \mathsf{#1}% + \resetfontdimens}} +\makeatother +\renewcommand{\isotopestyle}{\mathsf}% if package isotope is used + +% use academic colours: philosophers blue, physicians green, lawyers red, theologists black +\newtcolorbox{advanced}[1]{colback=blue!5!white,colframe=blue!75!black,fonttitle=\bfseries,title=#1,breakable} +\newtcolorbox{medical}{colback=green!5!white,colframe=green!75!black,breakable} +\newtcolorbox{medtitle}[1]{colback=green!5!white,colframe=green!75!black,fonttitle=\bfseries,title=#1,breakable} +\newtcolorbox{rules}{colback=red!5!white,colframe=red!75!black,breakable} + +\lstloadlanguages{[Borland6]Pascal,R,[x86masm]assembler} +\lstset{backgroundcolor=\color{Cornsilk}, + language=[Borland6]Pascal, + alsolanguage=[x86masm]assembler, + alsolanguage=R, + extendedchars=false, % chars 128-255 not printed + breaklines=true, % long lines broken + breakatwhitespace=true, % ... but only at whitespace + numbers=left, numberstyle=\tiny, stepnumber=1, numbersep=0pt, + basicstyle=\ttfamily\small\color{black}, % print listing small monospaced + keywordstyle=\bfseries, + identifierstyle=\color{DarkRed}, % + morecomment=[l]{//}, % allow inline comments from Object Pascal + commentstyle=\color{Blue}, + stringstyle=\color{DodgerBlue}, + showstringspaces=false % no special string spaces + } +\defaultfontfeatures{Scale=MatchLowercase} +\setmonofont{Fantasque Sans Mono} % 0O, 1Il -~ clearly distinguished, Jany Belluz <jany.belluz@hotmail.fr> + +% definitions for biblatex http://www.khirevich.com/latex/biblatex/, https://3d.bk.tudelft.nl/hledoux/blog/fiddling-biblatex/, +% moewe94@live.de on comp.text.tex, https://tex.stackexchange.com/questions/211199/changing-the-position-of-the-editor-with-biblatex-inbook + +\DeclareNameAlias{sortname}{last-first} + +\renewcommand{\multinamedelim}{\addcomma\space} +\renewcommand{\finalnamedelim}{\addspace\&\space} + +\DefineBibliographyStrings{british}{% + andothers = {\textit{et\addabbrvspace al\adddot}}, + editor = {(ed\adddot):}, + editors = {(eds\adddot):}, + byeditor = {(ed\adddot):}, +} + +\DefineBibliographyStrings{german}{% + andothers = {\textit{et\addabbrvspace al\adddot}}, + editor = {(Hrsg.):}, + editors = {(Hrsg.):}, + byeditor = {(Hrsg.):}, +} + +%(ed.) after name list: + +\renewbibmacro*{byeditor+others}{% + \ifnameundef{editor} + {} + {\printnames[byeditor][1-1]{editor}% + \setunit{\addspace}% + \usebibmacro{byeditor+othersstrg}% + \clearname{editor}% + \newunit}% + \usebibmacro{byeditorx}% + \usebibmacro{bytranslator+others}} + +\renewcommand{\emph}[1]{\textnormal{\textit{#1}}} +\renewcommand*{\mkbibnamefamily}[1]{\textnormal{\textsc{#1}}} % +\renewcommand{\newunitpunct}{\addspace\midsentence} +\DeclareDelimFormat[bib]{nametitledelim}{\addcolon\space} %Doppelpunkt nach Namen, kein Punkt +\DeclareFieldFormat[article,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{\textnormal{#1}\addcomma} % keine Anführungszeichen um Titel und kursiv +\DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} % italic journal title, no comma +\DeclareFieldFormat[inbook,thesis]{title}{\mkbibemph{#1\addcomma}} % italic title with comma +\DeclareFieldFormat[article]{title}{#1\addcomma} % title of journal article is printed as normal text +\DeclareFieldFormat{titlecase}{#1} % keine übermäßig vielen Großbuchstaben im Titel +\DeclareFieldFormat[article]{volume}{\mkbibbold{#1}} % Volume in bold +\DeclareFieldFormat[article]{number}{#1} % issue textnormal +\DeclareFieldFormat{pages}{#1} % Kein Präfix der Seitenzahlen + +\renewbibmacro*{volume+number+eid}{% + \printfield{volume}% + \setunit{\addcolon}% + \printfield{number}% + } + +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldset=pagetotal, null] + } + } + } +\renewbibmacro{in:}{% + \ifentrytype{article}{}{\printtext{In\intitlepunct}} + } + +% ------ setup for document + +\floatsetup[table]{style=plaintop} +\setlength{\rotFPtop}{10pt plus 1fil} % quick fix for sidewaysfigures appearing to high, so that caption is cropped + +\frenchspacing + +\hyphenation{ATP-ase GTP-ase dia-be-tes phy-sio-logi-cal bio-lo-gy +pro-teo-ly-sis trans-cy-to-sis hy-dro-ly-sis telo-mere hy-dro-lysed +im-mu-no-glo-bu-lin Cali-for-nia mini-mum mini-ma phos-pha-ti-dyl pyro-phos-phate +phos-pho-pro-tein} + +\makeatletter % \provideenvironment in analogy to \providecommand, https://tex.stackexchange.com/questions/20687/does-newenvironment-have-a-provideenvironment-cousin-as-newcommand-has-prov +\def\provideenvironment{\@star@or@long\provide@environment} +\def\provide@environment#1{% + \@ifundefined{#1}% + {\def\reserved@a{\newenvironment{#1}}}% + {\def\reserved@a{\renewenvironment{dummy@environ}}}% + \reserved@a +} +\def\dummy@environ{} +\makeatother + +% Abstracts in book + scrbook +\providecommand\abstractname{Abstract}% doesn't change pre-existing command +\provideenvironment{abstract}[1]{% + \begin{center}\normalfont\bfseries\abstractname\end{center} + \begin{quotation} #1 \end{quotation} + }{% + \vspace{1cm} + } diff --git a/graphics/circuit_macros/CHANGES b/graphics/circuit_macros/CHANGES index 1b7b0c5e5f..1c34df35d8 100644 --- a/graphics/circuit_macros/CHANGES +++ b/graphics/circuit_macros/CHANGES @@ -1,5 +1,8 @@ CHANGES +Version 10.2: New options for tconn, heater, lamp, thermocouple. + New macro jumper. Include configuration file pdf.m4 in distribution. + Fixed examples/Makefile. Tweaked macros sl_ct, figures in the manual. Version 10.1: Simplified structure and cleanup of the examples directory. New options for em_arrows. Tweaked dot, cross. Version 10.0: New macros Between_, thyristor_t. Bugfix in inductor(,W). diff --git a/graphics/circuit_macros/Copying b/graphics/circuit_macros/Copying index 3cd17dd5b3..96f3a0ceed 100644 --- a/graphics/circuit_macros/Copying +++ b/graphics/circuit_macros/Copying @@ -1,4 +1,4 @@ -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/README b/graphics/circuit_macros/README index 618fb0c532..d3cd9aab5a 100644 --- a/graphics/circuit_macros/README +++ b/graphics/circuit_macros/README @@ -1,5 +1,5 @@ -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/darrow.m4 b/graphics/circuit_macros/darrow.m4 index 9ba4fa8688..98a98eac32 100644 --- a/graphics/circuit_macros/darrow.m4 +++ b/graphics/circuit_macros/darrow.m4 @@ -1,7 +1,7 @@ divert(-1) darrow.m4 Macros for double lines and arrows -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/doc/Circuit_macros.pdf b/graphics/circuit_macros/doc/Circuit_macros.pdf Binary files differindex c03b30f49c..5aba4c4ac4 100644 --- a/graphics/circuit_macros/doc/Circuit_macros.pdf +++ b/graphics/circuit_macros/doc/Circuit_macros.pdf diff --git a/graphics/circuit_macros/doc/ConnMan.m4 b/graphics/circuit_macros/doc/ConnMan.m4 index 204ad5d96a..aad37f00b2 100644 --- a/graphics/circuit_macros/doc/ConnMan.m4 +++ b/graphics/circuit_macros/doc/ConnMan.m4 @@ -1,5 +1,5 @@ .PS -# `Conn.m4' +# `ConnMan.m4' cct_init T:[ @@ -31,39 +31,44 @@ C: [ C1: ccoax `"\tt ccoax\vphantom{(}"' ht 11 pt__ at C1.s below thinlines_ - arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust - arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ht 11pt__ ljust + arrow <- down 0.05 left 0.15 from C1.C.w; "\sl C" rjust + arrow <- down 0.05 right 0.1 from C1.S.e; "\sl S" wid 0.1 ht 11pt__ ljust thicklines_ - C2: ccoax(at C1+(0,0.3),F) - `"\tt ccoax(,F)"' ht 11 pt__ wid 0.65 at C2.ne ljust - ] with .C1.sw at T.S2.se+(0.6,0.0) - -Y: [ - tconn(,O) - {`"\tt tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } - move to Here+(0.3,0) - P1: tconn(,>) - {`"\tt (,>)"' at last line.c+(0,-0.2)} - move to P1.end+(0.3,0) - tconn(,>>) - {`"\tt (,>{}>)"' at last line.c+(0,-0.2)} - move to P1.start+(0,linewid) - P3: tconn(,<) - {`"\tt tconn(,<)"' at last line.c+(0,-0.2)} - move to P3.end+(0.3,0) - tconn(,<<) - {`"\tt (,<{}<)"' at last line.c+(0,-0.2)} - -] with .sw at (C.e.x-0.4,T.s.y) + C2: ccoax(at C1+(0,0.4),F) + `"\tt ccoax(,F)"' ht 11 pt__ at C2.s below + ] with .w at T.e+(0.6,0.0) B: [ tbox(V_2) - { `"\tt tbox(V\_2)"' at last [].sw below ljust } - tbox(V_1,,,<) with .sw at last [].se+(0.75,0) + { `"\tt tbox(V\_2)"' at last [].s below } + tbox(V_1,,,<) at last []+(0,-0.4) { `"\tt tbox(V\_1,{,},<)"' at last [].s below } - tbox(V_1,,,<>) with .sw at last [].se+(0.75,0) + tbox(V_1,,,<>) at last []+(0,-0.4) { `"\tt tbox(V\_1,{,},<>)"' at last [].s below } -] with .nw at T.sw+(0,-0.2) +] with .w at C.e + (0.5,-0.1) + +Y: [ + P1: tconn(,O) + {`"\tt tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } + move to Here+(0.3,0) + P2: tconn(,>) + {`"\tt $\ldots$(,>)"' at last line.c+(0,-0.2)} + move to P2.end+(0.3,0) + P3: tconn(,>>) + {`"\tt $\ldots$(,>{}>)"' at last line.c+(0,-0.2)} + move to P3.end+(0.3,0) + P4: tconn(,<) + {`"\tt $\ldots$(,<)"' at last line.c+(0,-0.2)} + move to P4.end+(0.3,0) + P5: tconn(,<<) + {`"\tt $\ldots$(,<{}<)"' at last line.c+(0,-0.2)} + move to P5.end+(0.3,0) + P6: tconn(,A) + {`"\tt $\ldots$(,A)"' at last line.c+(0,-0.2)} + move to P6.end+(0.3,0) + P7: tconn(,M) + {`"\tt $\ldots$(,M)"' at last line.c+(0,-0.2)} +] with .nw at T.sw+(0,-0.35) .PE diff --git a/graphics/circuit_macros/doc/FusesMan.m4 b/graphics/circuit_macros/doc/FusesMan.m4 index bde24fac3e..dc9262f1e2 100644 --- a/graphics/circuit_macros/doc/FusesMan.m4 +++ b/graphics/circuit_macros/doc/FusesMan.m4 @@ -1,5 +1,5 @@ .PS -# `Fuses.m4' +# `FusesMan.m4' cct_init movewid = 0.25 @@ -23,17 +23,26 @@ movewid = 0.25 move cbreaker(,R); {"`{\tt cbreaker(,R)}'" at last line.c+(0,-0.25)} move - cbreaker(,{,}D); {"`{\tt $\ldots$(,{,}D)}'" at last line.c+(0,-0.25)} + cbreaker(,,D); {"`{\tt $\ldots$(,{,}D)}'" at last line.c+(0,-0.25)} move - cbreaker(,{,}T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.25)} + cbreaker(,,T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.25)} move - cbreaker(,{,}TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.25) } + cbreaker(,,TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.25) } } move down; right_ { fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} move - fuse(,HC,0.5,0.3) ; {"`{\tt (,HC,0.5,0.3)}'" at last line.c+(0,-0.25)} + fuse(,HC,0.5,0.3) ; {"`{\tt $\ldots$(,HC,0.5,0.3)}'" at last line.c+(0,-0.27)} + move + jumper ; {"`{\tt jumper}'" at last line.c+(0,-0.2) } + move + jumper(,CJBED) ; {"`{\tt $\ldots$(,CJBED)}'" at last line.c+(0,-0.2) } + move + jumper(,body=outlined "gray" shaded "gray";) + "`\tt $\ldots$(,body=outlined \"gray\" \textbackslash'" \ + at last line.start+(0,-20bp__) ljust \ + "`\tt \hphantom{body=}shaded \"gray\";)'" ljust } .PE diff --git a/graphics/circuit_macros/doc/Makefile b/graphics/circuit_macros/doc/Makefile index e7ba8ab061..6eb3e35e03 100644 --- a/graphics/circuit_macros/doc/Makefile +++ b/graphics/circuit_macros/doc/Makefile @@ -23,8 +23,8 @@ PICTEX = \ VariableMan.tex WindingsMan.tex Workflow.tex XformMan.tex \ arrowex.tex \ bitr.tex bi_trans.tex bistableMan.tex \ - currents.tex eboxdims.tex fbfilter.tex fetMan.tex lrarrows.tex \ - MoreTableMan.tex mplex.tex opampex.tex quick.tex \ + currents.tex eboxdims.tex fbfilter.tex fetMan.tex heaterMan.tex \ + lrarrows.tex MoreTableMan.tex mplex.tex opampex.tex quick.tex \ sampleIC.tex stringdims.tex thyristorMan.tex ujtMan.tex \ woodchips.tex @@ -37,6 +37,7 @@ BOXDIMS = AntennasMan.tex bi_trans.tex ConfigA.tex ConfigB.tex ConfigC.tex \ # BOXDIMS = $(PICTEX) LATEX = latex +LATEX = latex --quiet M4 = m4 -I $(LIBDIR) # If M4PATH has been set: M4 = m4 @@ -72,7 +73,7 @@ $(DOC).pdf: touch mode.tex -if grep -q tikz mode.tex ; then true ; else \ rm mode.tex; make MODE=tikz clean mode.tex ; fi - make MODE=pgf PIC="dpic -g" LATEX=pdflatex SFX=pdf \ + make MODE=pgf PIC="dpic -g" LATEX="pdflatex --quiet" SFX=pdf \ POST="; printf '\\\\vspace*{-0.5\\\\baselineskip}\\n'" \ $(DOC).pdf # This breaks internal links: @@ -81,7 +82,8 @@ $(DOC).pdf: $(DOC).ps: printf "\n $(DOC).ps:\n\n" - make MODE=pstricks PIC="dpic -p" LATEX=latex SFX=dvi POST="" $(DOC).dvi + make MODE=pstricks PIC="dpic -p" LATEX="latex --quiet" \ + SFX=dvi POST="" $(DOC).dvi dvips -t letter $(DOC) -o $(DOC).$(SFX): mode.tex citations $(PICTEX) diff --git a/graphics/circuit_macros/doc/MoreTableMan.m4 b/graphics/circuit_macros/doc/MoreTableMan.m4 index 32ca4bd281..9f736bfb40 100644 --- a/graphics/circuit_macros/doc/MoreTableMan.m4 +++ b/graphics/circuit_macros/doc/MoreTableMan.m4 @@ -5,15 +5,9 @@ cct_init movewid = 2 pt__ hm = 2.05 vm = 0.28 -{ right; {lamp ; move;"`{\tt lamp}'" ljust} - move right_ hm - {thermocouple ; move;"`{\tt thermocouple}'" ljust } -} move down 0.25; right_ { {memristor ; move;"`{\tt memristor}'" ljust} move right_ hm - {heater; move;"`{\tt heater}'" ljust} - move right_ hm {tline ; move;"`{\tt tline}'" ljust} } move down 0.25; right_ diff --git a/graphics/circuit_macros/doc/SLDsMan.m4 b/graphics/circuit_macros/doc/SLDsMan.m4 index 67cb2fa855..2e6efd811d 100644 --- a/graphics/circuit_macros/doc/SLDsMan.m4 +++ b/graphics/circuit_macros/doc/SLDsMan.m4 @@ -183,7 +183,8 @@ ifelse(1,1,` arrow <- from CTC.Tend down 10bp__ right 7bp__; "\sl Tend" below ljust "\sl Tc" at CTC.Tc ljust thicklines_ - BB: sl_busbar(right_ 3*dimen_,4,port=D) with .Start at Ref.start+(0,-dimen_*2) + BB: sl_busbar(right_ 3*dimen_,4,port=D) \ + with .Start at Ref.start+(0,-dimen_*1.75) "sl\_busbar(right\_ 3{\tt*}dimen\_,4,port=D)" ljust at BB.Start+(0,-15bp__) thinlines_ arrow up ds right ds/2 <- from BB.P1.ne chop dotrad_; "\sl P1" ljust @@ -207,9 +208,6 @@ ifelse(1,1,` "\sl BrI" at Tr32.BrI.n above "\sl BrO" at Tr32.BrO.n above "\sl Br" at Tr32.Br.w rjust -# "\sl C1" at Tr32.Body.C1.nw rjust -# "\sl C2" at Tr32.Body.C2.ne ljust -# "\sl C3" at Tr32.C3.se ljust ] #with .nw at Generators.sw+(0,-dimen_/2) command "}%" diff --git a/graphics/circuit_macros/doc/Version.tex b/graphics/circuit_macros/doc/Version.tex index e513216662..58fb6e89e5 100644 --- a/graphics/circuit_macros/doc/Version.tex +++ b/graphics/circuit_macros/doc/Version.tex @@ -1 +1 @@ -Version 10.1 +Version 10.2 diff --git a/graphics/circuit_macros/doc/body.tex b/graphics/circuit_macros/doc/body.tex index 934e7813d7..f89fe710fe 100644 --- a/graphics/circuit_macros/doc/body.tex +++ b/graphics/circuit_macros/doc/body.tex @@ -121,19 +121,10 @@ concepts applied here do not require \Mfour. Read this section to understand basic usage of \Mfour and macros. The contents of file {\tt quick.m4} and resulting diagram are shown in \FR{quick} to illustrate the language -% to show several ways for placing circuit elements, -%and to provide sufficient information for producing and the production of basic labeled circuits. \begin{figure}[ht] \parbox{\textwidth}{\small\verbatiminput{quick.m4}}% \hfill\llap{\raise-1.15in\hbox{\input quick }}% -% \hfill\llap{\raise-1.15in\hbox{\pdftooltip{\input quick }% -% {The file {\tt quick.m4} and resulting diagram. -% There are several ways of drawing the same picture; for example, -% nodes (such as {\tt Origin}) can be defined and circuit branches -% drawn between them; or absolute coordinates can be used (e.g., -% {\tt source(up\_ from (0,0) to (0,0.75))} ). Element sizes and styles -% can be varied as described in later sections.}}}% \vspace*{-\baselineskip}% \caption{The file {\tt quick.m4} and resulting diagram. There are several ways of drawing the same picture; for example, @@ -189,6 +180,7 @@ and invoke the {\tt-g} option of \dpic as follows: dpic -g quick.pic > quick.tex \vspace*\parsep} +\enlargethispage{\baselineskip} A configuration file ({\tt pstricks.m4} and {\tt pgf.m4} in the above examples) is {\em always} the first file to be given to \Mfour. Put the following or its equivalent in the document body: @@ -210,18 +202,19 @@ The essential line is \verb|\input quick| whether or not the {\tt figure} environment is used. The effect of the \Mfour command above is shown in \FR{ConfigA}. +\begin{figure}[H] +% \vspace*{-\baselineskip} + \input ConfigA + \caption{The command + {\tt m4 pstricks.m4 quick.m4 > quick.pic}. + \label{ConfigA}} + \end{figure} Configuration files {\tt pstricks.m4} or {\tt pgf.m4} cause library {\tt libgen.m4} to be read, thereby defining the macro {\tt cct\_init}. The diagram source file is then read and the circuit-element macros in {\tt libcct.m4} are defined during expansion of {\tt cct\_init}. -\begin{figure}[ht] - \input ConfigA - \caption{The command - {\tt m4 pstricks.m4 quick.m4 > quick.pic}. - \label{ConfigA}} - \end{figure} \subsubsection{Processing with \gpic\label{Processingwithgpic:}} If your printer driver understands \tpic specials and @@ -270,31 +263,16 @@ The \Mfour commands illustrated above can be shortened to \noindent by inserting {\tt include(pstricks.m4)} (assuming \PSTricks processing) -%or {\tt include(libgen.m4)} (assuming the default processor is to be used) {\em immediately} after the {\tt .PS} line, the effect of which -%The effect of the first include statement is shown in \FR{ConfigB}. However, if you then want to use \TPGF, the line must be changed to {\tt include(pgf.m4)}. -%and the second in \FR{ConfigC}. \begin{figure}[h!] \input{ConfigB} \caption{The command {\tt m4 quick.m4 > quick.pic}, with {\tt include(pstricks.m4)} preceding {\tt cct\_init}.} \label{ConfigB} \end{figure} -%\begin{figure}[h!] -% \input{ConfigC} -% \caption{The command {\tt m4 quick.m4 > quick.pic}, -% with {\tt include(libgen.m4)} preceding {\tt cct\_init}, causing -% the default configuration file to be read.} -% \label{ConfigC} -% \end{figure} - -%\item -%On some systems, setting the environment variable {\tt M4PATH} to {\sl -%installdir} allows the {\tt -I} {\sl installdir} option of \Mfour to -%be omitted, but it will be kept in following examples. \item In the absence of a need to examine the file {\tt quick.pic}, @@ -784,7 +762,7 @@ The first part of the source file for this figure is %as follows: on the left: -\begin{figure}[ht] +\begin{figure}[H] \parbox{2in}{\tt .PS\\ \hbox{}\quad cct\_init\\ \hbox{}\quad linewid = 2.0\\ \hbox{}\quad linethick\_(2.0)\\ R1: resistor} \raisebox{-0.3in}{\hbox{\input{BigResistor.tex}}} @@ -904,7 +882,7 @@ directional parameters to point up. Capacitors are illustrated in \FR{Capacitors}. See \SR{Composite:} for the {\tt variable} macro. -\begin{figure}[h!t] +\begin{figure}[H] \input CapacitorsMan \caption{The {\tt capacitor({\sl linespec, chars,} [R],{\sl height, width})} macro, and an example application of the {\tt variable} macro.} @@ -912,7 +890,7 @@ See \SR{Composite:} for the {\tt variable} macro. \end{figure} Basic inductors are illustrated in \FR{Inductors}. -\begin{figure}[h!] +\begin{figure}[H] \input InductorsMan \caption{Basic inductors created with the {\tt inductor({\sl linespec,} W|L, {\sl cycles,} M|P|K, {\sl loop wid})} @@ -923,13 +901,21 @@ Basic inductors are illustrated in \FR{Inductors}. \label{Inductors} \end{figure} -Some more basic elements are in \FR{MoreTable}, and amplifiers in \FR{AmpTable}. -\begin{figure}[h!t] +Some two-terminal elements often drawn with truncated leads are in +\FR{heaterMan}. +More basic elements are in \FR{MoreTable}, and amplifiers in \FR{AmpTable}. +\begin{figure}[H] + \input heaterMan + \caption{These elements have two terminals but are often drawn + with truncated leads.} + \label{heaterMan} + \end{figure} +\begin{figure}[H] \input MoreTableMan \caption{More two-terminal elements.} \label{MoreTable} \end{figure} -\begin{figure}[h!t] +\begin{figure}[H] \vspace*{-\baselineskip} \input AmpTableMan \caption{Amplifier, delay, and integrator.} @@ -939,7 +925,7 @@ Some more basic elements are in \FR{MoreTable}, and amplifiers in \FR{AmpTable}. \FR{Sources} shows sources, many of which contain internal symbols, and of which the {\tt AC} and {\tt S} options illustrate the need to draw a single cycle of a sinusoid or approximate sinusoid. -\begin{figure}[h!t] +\begin{figure}[H] \input SourcesMan \caption{Sources and source-like elements.} \label{Sources} @@ -960,15 +946,49 @@ and for power-system diagrams, macros and {\tt Ysymbol(at {\sl position, keys,} U|D|L|R|{\sl degrees})}, -%Diodes and fuses are shown in \FRS{Diodes} and \REF{Fuses}. Diodes are shown in \FR{Diodes}. -\begin{figure}[h!t] +\begin{figure}[H] \input DiodesMan \caption{The macro {\tt diode(\linespec, B|b|CR|D|L|LE[R]|P[R]|S|T|U|V|v|w|Z|{\sl chars}, [R][E])}. Appending {\tt K} to the second argument draws an open arrowhead.} \label{Diodes} \end{figure} +The arrows are drawn relative to the diode direction by the {\tt LE} +option. For absolute arrow directions, one can +define a wrapper (see \SR{Writing:}) for the {\tt diode} macro to draw arrows +at 45 degrees, for example: +\par +{\tt define(`myLED',`diode(`\$1'); em\_arrows(N,45) + with .Tail at last [].ne')} + +Switches with numerous controls are in \FR{Switches}, +and fuses, breakers, and jumpers in \FR{Fuses}. +\begin{figure}[H] + \input SwitchesMan + \caption{The + {\tt switch(\linespec,L|R,{\sl chars},L|B|D,{\sl attribs})} + macro is a wrapper for the macros + {\tt lswitch(\linespec,[L|R],[O|C][D][K][A])}, + {\tt bswitch(\linespec,[L|R],[O|C])}, + and the many-optioned + {\tt dswitch(\linespec,R,W[ud]B {\sl chars,text})} shown. + The switch is drawn in the current drawing direction. + A second-argument {\tt R} produces a mirror + image with respect to the drawing direction. + The separately defined macros {\tt Proxim} and {\tt Magn} + embellish switches in the bottom row.} + \label{Switches} + \end{figure} +\begin{figure}[H] + \input FusesMan + \caption{Variations of the macros + {\tt fuse(\linespec, A|dA|B|C|D|E|S|HB|HC|SB, {\sl wid}, {\sl ht}),} + {\tt cbreaker(\linespec,L|R,D|T|TS),} + and + {\tt jumper(\linespec,{\sl chars}|{\sl keys}).}} + \label{Fuses} + \end{figure} Most of the two-terminal elements are oriented; that is, they have a defined direction or polarity. Several element macros include an @@ -1009,61 +1029,10 @@ done by redefining {\tt dimen\_} globally as described in \SR{Circuitscaling:}. %{\tt resized(1.8,`diode',right\_ 0.4);} %{\tt resized(1.8,`reversed',`diode',right\_ 0.4)} -Fuses are shown in \FR{Fuses} -and switches with numerous controls in \FR{Switches}. -\begin{figure}[h!t] - \input FusesMan - \caption{Variations of the macros - {\tt fuse(\linespec, A|dA|B|C|D|E|S|HB|HC|SB, {\sl wid}, {\sl ht})} - and {\tt cbreaker(\linespec,L|R,D|T|TS)}.} - \label{Fuses} - \end{figure} - -%\enlargethispage{\baselineskip}% -\begin{figure}[h!t] -%\vspace*{-\baselineskip} - \input SwitchesMan - \caption{The - {\tt switch(\linespec,L|R,{\sl chars},L|B|D,{\sl attribs})} - macro is a wrapper for the macros - {\tt lswitch(\linespec,[L|R],[O|C][D][K][A])}, - {\tt bswitch(\linespec,[L|R],[O|C])}, - and the many-optioned - {\tt dswitch(\linespec,R,W[ud]B {\sl chars,text})} shown. - The switch is drawn in the current drawing direction. - A second-argument {\tt R} produces a mirror - image with respect to the drawing direction. - The separately defined macros {\tt Proxim} and {\tt Magn} - embellish switches in the bottom row.} - \label{Switches} - \end{figure} - -\pagebreak -\FR{Emarrows} contains radiation-effect arrows for embellishing two-terminal -and other macros. -\begin{figure}[h!t] - \input EmarrowsMan - \caption{Radiation arrows: {\tt em\_arrows({\sl type}|{\sl keys,% - angle, length})}} - \label{Emarrows} - \end{figure} -The arrow stems are named {\sl A1}, {\sl A2}, -and each pair is drawn in a \verb|[]| block, with -the names {\sl Head} and {\sl Tail} defined to -aid placement near another device. The second argument specifies -absolute angle in degrees (default 135 degrees). -The arrows are drawn relative to the diode direction by the {\tt LE} -option in \FR{Diodes}. For absolute arrow directions, one can -define a wrapper (see \SR{Writing:}) for the {\tt diode} macro to draw arrows -at 45 degrees, for example: -\par -{\tt define(`myLED',`diode(`\$1'); em\_arrows(N,45) - with .Tail at last [].ne')} - \FR{Arresters} shows a collection of surge-protection devices, or arresters, of which the {\tt E} and {\tt S} types may be either 2-terminal or as 3-terminal (composite) elements described in \SR{Composite:}. -\begin{figure}[ht] +\begin{figure}[H] \input ArrestersMan \caption{Variations of the {\tt arrester({\sl linespec, chars,} {\sl wid}[{\tt :}{\sl arrowhead ht}], @@ -1089,7 +1058,7 @@ thus, the following line draws the third resistor in \FR{Variable}: \par {\tt resistor(up\_ dimen\_); variable(,uN)} -\begin{figure}[ht] +\begin{figure}[H] \vspace*{-\baselineskip} \input VariableMan \caption{Illustrating @@ -1105,6 +1074,21 @@ thus, the following line draws the third resistor in \FR{Variable}: \label{Variable} \end{figure} +\pagebreak +\FR{Emarrows} contains radiation-effect arrows for embellishing two-terminal +and other macros. +\begin{figure}[H] + \input EmarrowsMan + \caption{Radiation arrows: {\tt em\_arrows({\sl type}|{\sl keys,% + angle, length})}} + \label{Emarrows} + \end{figure} +The arrow stems are named {\sl A1}, {\sl A2}, +and each pair is drawn in a \verb|[]| block, with +the names {\sl Head} and {\sl Tail} defined to +aid placement near another device. The second argument specifies +absolute angle in degrees (default 135 degrees). + \subsection{Branch-current arrows\label{Branchcurrent:}} Arrowheads and labels can be added to conductors using basic \pic statements. For example, the following line adds a labeled @@ -1116,8 +1100,7 @@ just been drawn. Many variations of this are possible: \enlargethispage{\baselineskip}% Macros have been defined to simplify labelling two-terminal elements, as shown in \FR{currents}. -\begin{figure}[ht] -% \ifpdf\vspace*{-0.5\baselineskip}\fi% +\begin{figure}[H] \input currents \caption{Illustrating {\tt b\_current, larrow,} and {\tt rarrow}. The drawing direction is to the right.} @@ -1184,7 +1167,7 @@ places the strings along the centre of the element, and the third along the right side. Labels beginning with {\tt sprintf} or a double quote are copied literally rather than assumed to be in math mode. A simple circuit example with labels is shown in \FR{Loop}. -\begin{figure}[h!t] +\begin{figure}[H] \vspace*{-\baselineskip} \parbox{4in}{\small \verbatiminput{Loop.m4}}% \hfill\raise-0.5in\hbox{\input Loop } @@ -1273,7 +1256,7 @@ The macro {\tt eleminit\_} in the two-terminal elements invokes to establish element length and direction. As shown in \FR{Oblique}, -\begin{figure}[h!t] +\begin{figure}[H] \vspace{-\baselineskip} \parbox{4.5in}{\small \verbatiminput{Oblique.m4}}% \hfill\raise-0.7in\llap{\hbox{\input Oblique }}% @@ -1316,7 +1299,7 @@ makes some geometries particularly simple. Thus, \noindent draws three elements in series as shown in the top line of \FR{Series}. -\begin{figure}[ht] +\begin{figure}[H] \vspace{-\baselineskip} \input Series \caption{Three ways of drawing basic elements in series.} @@ -1367,7 +1350,7 @@ producing the left circuit in \FR{ParSeries}: line from L.end to C.end \end{verbatim} -\begin{figure}[ht] +\begin{figure}[H] % \vspace*{-\baselineskip} \input ParSeries \vspace*{-\baselineskip} @@ -1425,7 +1408,7 @@ first draws a resistor along the specified line, then adds arrows for taps at fractional positions along the body, with default or specified length. A negative length draws the arrow from the right of the current drawing direction. -\begin{figure}[ht!] +\begin{figure}[H] \input Potentiometers \caption{Default and multiple-tap potentiometer.} \label{Potentiometers} @@ -1437,7 +1420,7 @@ The macro {\tt $\ldots$)}, shown in \FR{Taps}, will add taps to the immediately preceding two-terminal element. -\begin{figure}[ht] +\begin{figure}[H] \input Taps \caption{Macros for adding taps to two-terminal elements.} \label{Taps} @@ -1458,7 +1441,7 @@ drawn elements. A few composite symbols derived from two-terminal elements are shown in \FR{Composite}. -\begin{figure}[ht] +\begin{figure}[H] \vspace*{-0.5ex} % \vspace*{-\baselineskip} \input Composite @@ -1485,7 +1468,7 @@ This macro is one of several in which a temporary drawing direction is set using the {\tt setdir\_( U|D|L|R|{\sl degrees, default} R|L|U|D|{\sl degrees} )} macro and reset at the end using {\tt resetdir\_}. -\begin{figure}[ht!] +\begin{figure}[H] \input GroundsMan \caption{The {\tt ground( at }{\sl position}{\tt, @@ -1498,7 +1481,7 @@ The arguments of {\tt antenna(at }{\sl position}{\tt, T|{\sl stem length}, A|L|T|S|D|P|F, U|D|L|R|{\sl degrees})} shown in \FR{Antennas} are similar to those of {\tt ground}. -\begin{figure}[h!] +\begin{figure}[H] \input AntennasMan \caption{Antenna symbols, with macro arguments shown above and terminal names below.} @@ -1507,16 +1490,15 @@ shown in \FR{Antennas} are similar to those of {\tt ground}. \FR{Opamp} illustrates the macro {\tt opamp({\sl\linespec, - label, + label, size, chars})\label{OPAMP}}. -The element is enclosed in a block -containing the predefined internal locations shown. -\begin{figure}[ht] -% \ifpdf\vspace*{-0.5\baselineskip}\fi% +\begin{figure}[H] \input OpampMan \caption{Operational amplifiers. The {\tt P} option adds power connections. The second and third arguments can be used to place and rotate arbitrary text at {\tt In1} and {\tt In2}.} \label{Opamp} \end{figure} +The element is enclosed in a block +containing the predefined internal locations shown. These locations can be referenced in later commands, for example as ``{\tt last [].Out}.'' The first argument defines the direction and length of the opamp, but the @@ -1538,7 +1520,7 @@ using postprocessor commands (for example \PSTricks \verb|\rput|) as second and third arguments. The code in \FR{opampex} places an opamp with three connections. -\begin{figure}[h!b] +\begin{figure}[H] \parbox{4in}{\small \verbatiminput{opampexbody.m4}}% \quad\raise-0.2in\hbox{\input opampex }% \caption{A code fragment invoking the @@ -1546,11 +1528,10 @@ The code in \FR{opampex} places an opamp with three connections. \label{opampex} \end{figure} -\pagebreak \FR{Xform} shows variants of the transformer macro, which has predefined internal locations {\sl P1,} {\sl P2,} {\sl S1,} {\sl S2,} {\sl TP,} and {\sl TS.} -\begin{figure}[h!t] +\begin{figure}[H] \input XformMan \caption{The {\tt transformer(\linespec,L|R,{\sl np},% [A|P][W|L][D1|D2|D12|D21],{\sl ns})} @@ -1573,6 +1554,14 @@ A {\tt D1} puts phase dots at the {\sl P1, S1} end, {\tt D2} at the \FR{Audio} shows some audio devices, defined in {\tt []} blocks, with predefined internal locations as shown. +\begin{figure}[H] + \input AudioMan + \caption{Audio components: + {\tt speaker(U|D|L|R|{\sl degrees},{\sl size},{\sl type}), + bell, microphone, buzzer, + earphone}, with their internally named positions and components.} + \label{Audio} + \end{figure} The first argument specifies the device orientation. Thus, \par @@ -1581,24 +1570,13 @@ Thus, \noindent places an upward-facing speaker with input {\sl In2} at the current location. -\begin{figure}[ht] -% \ifpdf\vspace*{-\baselineskip}\fi% - \input AudioMan -% \ifpdf\vspace*{-\baselineskip}\fi% - \caption{Audio components: - {\tt speaker(U|D|L|R|{\sl degrees},{\sl size},{\sl type}), - bell, microphone, buzzer, - earphone}, with their internally named positions and components.} - \label{Audio} - \end{figure} + The {\tt nport({\sl box specs {\tt[;} other commands{\tt]}, nw, nn, ne, ns, space ratio, pin lgth, style})} macro is shown in \FR{Nport}. -\begin{figure}[ht] -% \ifpdf\vspace*{-\baselineskip}\fi +\begin{figure}[H] \input NportMan -% \ifpdf\vspace*{-\baselineskip}\fi \caption{The {\tt nport} macro draws a sequence of pairs of named pins on each side of a box. The pin names are shown. The default is a twoport. The {\tt nterm} macro draws single pins instead of pin pairs.} @@ -1644,9 +1622,8 @@ define(`nullor',`nport(`$1' \end{verbatim} The above example and the related gyrator macro are illustrated in -\FR{NLG}.\hfill\break - -\begin{figure}[ht] +\FR{NLG}. +\begin{figure}[H] \input NLGMan \caption{The {\tt nullor} example and the {\tt gyrator} macro are customizations of the {\tt nport} macro.} @@ -1658,8 +1635,8 @@ which contains predefined locations {\sl P, C, O} for the armature and normally closed and normally open terminals. An {\tt I} in the first argument draws open circles for contacts. -\begin{figure}[ht] -% \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% +\begin{figure}[H] + \vspace*{-\baselineskip} \input ContactMan \caption{The {\tt contact({\sl chars})} macro (default drawing direction right) @@ -1667,10 +1644,10 @@ An {\tt I} in the first argument draws open circles for contacts. \label{Contact} \end{figure} -\pagebreak +\enlargethispage{\baselineskip} The {\tt contacts({\sl poles, chars})} macro in \FR{Contacts} draws multiple contacts. -\begin{figure}[h!t] +\begin{figure}[H] \input ContactsMan \caption{The {\tt contacts({\sl poles, chars})} macro (drawing direction right).} @@ -1681,19 +1658,17 @@ For drawing relays, the macro {\tt relaycoil({\sl chars, wid, ht,} {\tt U|D|L|R|}{\sl degrees})} shown in \FR{relaycoil} provides a choice of connection points and actuator types. - -\begin{figure}[ht] -% \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% +\begin{figure}[H] \input relaycoilMan \vspace{-1ex} \caption{The {\tt relaycoil} macro.} \label{relaycoil} \end{figure} -The {\tt relay({\sl poles, chars})} macro in \FR{Relay} +The {\tt relay} macro in \FR{Relay} defines coil terminals {\sl V1, V2} and contact terminals {\sl P$_i$, C$_i$, O$_i$.} -\begin{figure}[ht] +\begin{figure}[H] \input RelayMan \vspace{-1ex} \caption{The {\tt relay({\sl poles, chars})} @@ -1701,9 +1676,19 @@ terminals {\sl P$_i$, C$_i$, O$_i$.} \label{Relay} \end{figure} +The double-throw switches shown in \FR{NPDT} are drawn in the +current drawing direction like the two-terminal elements, but are +composite elements that must be placed accordingly. +\begin{figure}[H] + \input NPDTMan + \caption{Multipole double-throw switches drawn by + {\tt NPDT({\sl npoles}, [R])}.} + \label{NPDT} + \end{figure} + The {\tt jack} and {\tt plug} macros and their defined points are illustrated in \FR{Jack}. -The first +The first argument of both macros establishes the drawing direction. \begin{figure}[H] \input JackMan \vspace{-1ex} @@ -1713,7 +1698,6 @@ The first \label{Jack} \end{figure} \noindent% -argument of both macros establishes the drawing direction. The second argument is a string of characters defining drawn components. An {\tt R} in the string specifies a right orientation with respect to the drawing direction. @@ -1726,24 +1710,26 @@ argument of both macros establishes the drawing direction. or {\tt S[M|B]} substrings add auxiliary contacts with specified make or break points. + A macro for drawing headers is in \FR{Headers}. -Some connectors are shown in \FR{Conn} and \FR{Pconn}. -The {\tt tstrip} macro allows ``{\sl key}{\tt =}{\sl value}{\tt ;}'' arguments -for width and height. -\begin{figure}[h!t] +\begin{figure}[H] \input HeadersMan \caption{Macro {\tt Header(1|2, {\sl rows, wid, ht, type})}.} \label{Headers} \end{figure} -\begin{figure}[h!t] + +Some connectors are shown in \FR{Conn} and \FR{Pconn}. +The {\tt tstrip} macro allows ``{\sl key}{\tt =}{\sl value}{\tt ;}'' arguments +for width and height. +\begin{figure}[H] \input ConnMan \caption{Macros {\tt tstrip(R|L|U|D|{\sl degrees}, {\sl chars})}, {\tt ccoax(at} {\sl location}, {\tt M|F, {\sl diameter})}, - {\tt tconn(\linespec, >|>>|<|<<|O[F], {\sl wid})}, and - {\tt tbox({\sl text, wid, ht}, <|>|<>,{\sl type})}. } + {\tt tbox({\sl text, wid, ht}, <|>|<>,{\sl type})}, and + {\tt tconn(\linespec, {\sl chars}|{\sl keys}, {\sl wid})}. } \label{Conn} \end{figure} -\begin{figure}[h!t] +\begin{figure}[H] \input PconnMan \caption{A small set of power connectors drawn by {\tt pconnex(R|L|U|D|}{\sl degrees, chars}{\tt)}. Each connector has @@ -1751,27 +1737,14 @@ for width and height. \label{Pconn} \end{figure} -The double-throw switches shown in \FR{NPDT} are drawn in the -current drawing direction like the two-terminal elements, but are -composite elements that must be placed accordingly. -\begin{figure}[h!t] -% \ifpdf{\vspace*{-1ex}}\fi% - \input NPDTMan - \caption{Multipole double-throw switches drawn by - {\tt NPDT({\sl npoles}, [R])}.} - \label{NPDT} - \end{figure} - A basic winding macro for magnetic-circuit sketches and similar figures is shown in \FR{Windings}. For simplicity, the complete spline is first drawn and then blanked in appropriate places using the background (core) color (\verb!lightgray! for example, default \verb!white!). -\begin{figure}[h!t] +\begin{figure}[H] \vspace*{-\baselineskip}% -% \ifpdf\vspace*{-2\baselineskip}\else \vspace{-\baselineskip}\fi \input WindingsMan -% \ifpdf\vspace*{-\baselineskip}\else\vspace*{-1ex}\fi \caption{The {\tt winding(L|R, diam, pitch, turns, core wid, core color)} macro draws a coil with axis along the current drawing direction. Terminals {\tt T1} and {\tt T2} are defined. @@ -1785,30 +1758,33 @@ is first drawn and then blanked in appropriate places using the background {\tt bi\_tr(\linespec,L|R,P,E)} which contains predefined internal locations {\sl E}, {\sl B}, {\sl C}. -The first argument defines the distance and direction from {\sl E} -\begin{figure}[ht] +\begin{figure}[H] + \vspace*{-1ex} \input BipMan \caption{Variants of bipolar transistor {\tt bi\_tr(\linespec,L|R,P,E)} (current direction upward).} \label{Bip} \end{figure} +The first argument defines the distance and direction from {\sl E} to {\sl C,} with location determined by the enclosing block as for other elements, and the base placed to the left or right of the current drawing direction according to the second argument. Setting the third argument to {\tt P} creates a PNP device instead of NPN, and setting the fourth to {\tt E} draws an envelope around the device. + \FR{Darlington} shows a composite macro with several optional internal elements. -\begin{figure}[h!t] +\begin{figure}[H] \input Darlington \caption{Macro {\tt Darlington(L|R,[E][P][B1][E1|R1][E2|R2][D][Z])}, drawing direction {\tt up\_}.} \label{Darlington} \end{figure} +\enlargethispage{\baselineskip} The code fragment example in \FR{bitr} places a bipolar transistor, connects a ground to the emitter, and connects a resistor to the collector. -\begin{figure}[h!t] +\begin{figure}[H] \quad\quad\parbox{4in}{\small \verbatiminput{bitrbody.m4}}% \quad\raise-0.4in\hbox{\input bitr }% \vspace{-\baselineskip} @@ -1821,7 +1797,7 @@ the macro {\tt bi\_trans(\linespec, L|R, {\sl chars}, E)}, which draws the components of the transistor according to the characters in its third argument. For example, multiple emitters and collectors can be specified as shown in \FR{bitrans}. -\begin{figure}[h!t] +\begin{figure}[H] \input bi_trans \caption{The {\tt bi\_trans(\linespec,L|R,{\sl chars},E)} macro. The sub-elements are specified by the third argument. The substring @@ -1830,16 +1806,16 @@ specified as shown in \FR{bitrans}. \label{bitrans} \end{figure} +\pagebreak A UJT macro with predefined internal locations {\sl B1,} {\sl B2,} and {\sl E} is shown in \FR{ujt}. -\begin{figure}[h!t] -% \ifpdf\vspace*{-\baselineskip}\else\vspace*{-0.5\baselineskip}\fi% +\begin{figure}[H] \input ujtMan -% \ifpdf\vspace*{-0.5\baselineskip}\fi% \caption{UJT devices, with current drawing direction {\tt up\_}. } \label{ujt} \end{figure} + The 3 or 4-terminal thyristor macro with predefined internal locations {\sl G} and {\sl T1,} {\sl T2,} or {\sl A,} {\sl K,} {\sl G,} and {\sl Ga} @@ -1870,17 +1846,16 @@ but require a third argument for the label for the compound block; thus, draws the element from position {\sl A} to position {\sl B} with label {\sl Q3}, and draws a line from {\sl G}. -\enlargethispage{\baselineskip} Some FETs with predefined internal locations {\sl S,} {\sl D,} and {\sl G} are also included, with similar arguments to those of {\tt bi\_tr,} as shown in \FR{fet}. -\begin{figure}[ht] +\begin{figure}[H] \vspace*{-\baselineskip} \input fetMan \caption{JFET, insulated-gate enhancement and depletion MOSFETs, simplified versions, graphene, and ferroelectric fets. These macros are wrappers that invoke the {\tt mosfet} - macro as shown in the middle and bottom rows. + macro as shown in the second and lower rows. The bottom-row examples show custom devices, the first defined by omitting the substrate connection, and the second defined using a wrapper macro.} @@ -1904,7 +1879,6 @@ temporarily for compatibility. This system allows considerable freedom in choosing or customizing components, as illustrated in \FR{fet}. -\enlargethispage{\baselineskip} The number of possible semiconductor symbols is very large, so these macros must be regarded as prototypes. Often an element is a minor modification of existing elements. @@ -1928,7 +1902,7 @@ optional argument ``{\tt at} {\sl location}'', the line-thickness macros, the {\tt fill\_} macro, and {\tt crossover}, which is a useful if archaic method to show non-touching conductor crossovers, as in \FR{bistable}. -\begin{figure}[h!t] +\begin{figure}[H] \input bistableMan % \vspace{-1ex} \caption{Bipolar transistor circuit, illustrating {\tt crossover} @@ -1967,7 +1941,7 @@ in \SR{Planarobjects:}. If two straight lines meet at an angle then, depending on the postprocessor, the corner may not be mitred or rounded unless the two lines belong to a multisegment line, as illustrated in \FR{Corners}. -\begin{figure}[ht] +\begin{figure}[H] \input Corners \caption{Producing mitred angles and corners.} \label{Corners} @@ -2015,8 +1989,8 @@ Repetitive actions can also be performed with the {\tt libgen} macro {\sl value2}, $\ldots$)} \noindent -which evaluates {\sl actions} for each instance of {\sl variable} set -to {\sl value1, value2, $\ldots$}. +which evaluates {\sl actions} and increments counter {\tt m4Lx} +for each instance of {\sl variable} set to {\sl value1, value2, $\ldots$} \xection{Logic gates\label{Logicgates:}} \FR{Logic} shows the basic logic gates included in @@ -2029,7 +2003,7 @@ By default, $N=2$ except for macros {\tt NOT\_gate} and {\tt BUFFER\_gate}, which have one input {\tt In1} unless they are given a first argument, which is treated as the line specification of a two-terminal element. -\begin{figure}[h!] +\begin{figure}[H] \vspace*{-0.5\baselineskip} \input LogicMan \caption{Basic logic gates. The input and output locations of @@ -2043,7 +2017,7 @@ two-terminal element. Input locations retain their positions relative to the gate body regardless of gate orientation, as in \FR{FF}. -\begin{figure}[ht] +\begin{figure}[H] \vspace*{-\baselineskip} \parbox{4.75in}{\small \verbatiminput{FF.m4}}% \input FF @@ -2051,9 +2025,11 @@ regardless of gate orientation, as in \FR{FF}. \caption{$SR$ flip-flop.} \label{FF} \end{figure} + +\pagebreak Beyond a default number (6) of inputs, the gates are given wings as in \FR{exVIII}. -\begin{figure}[h!t] +\begin{figure}[H] \input mplex \vspace*{-0.5\baselineskip} \caption{Eight-input multiplexer, showing a gate with wings.} @@ -2127,7 +2103,7 @@ If the first argument is non-blank however, then the buffer is drawn along an invisible line like a two-terminal element, which is convenient sometimes but requires internal locations of the block to be referenced using {\tt last []}, as shown in \FR{Buffer}. -\begin{figure}[h!t] +\begin{figure}[H] \vspace*{-\baselineskip} \input Buffer \caption{The {\tt BUFFER\_gate} and {\tt BUFFER\_gen} macros. @@ -2142,7 +2118,7 @@ the macro {\tt FlipFlop(D|T|RS|JK, {\sl label, boxspec, pinlength})}, which is a wrapper for the more general macro {\tt FlipFlopX(}{\sl boxspec, label, leftpins, toppins, rightpins, bottompins, pinlength}{\tt )}. -\begin{figure}[ht] +\begin{figure}[H] \input FlipFlop \caption{The {\tt FlipFlop} and {\tt FlipFlopX} macros, with variations.} \label{FlipFlops} @@ -2164,17 +2140,17 @@ a label, use {\tt lg\_bartxt(}{\sl label}{\tt)}. The {\sl pinopts} are {\tt [L|M|I|O][N][E]} as for the \verb|lg_pin| macro. Optional argument 7 is the pin length in drawing units. -\pagebreak + \FR{Multiplexer} shows a multiplexer block with variations, and \FR{Demultiplexer} shows the very similar demultiplexer. -\begin{figure}[h!t] +\begin{figure}[H] \input MultiplexerMan \caption{The {\tt Mux({\sl input count}, {\sl label}, [L][B|H|X][N[$n$]|S[$n$]][[N]OE],{\sl wid},{\sl ht})} macro.} \label{Multiplexer} \end{figure} -\begin{figure}[h!t] +\begin{figure}[H] \input DemultiplexerMan \caption{The {\tt Demux({\sl input count}, {\sl label}, [L][B|H|X][N[$n$]|S[$n$]][[N]OE],{\sl wid},{\sl ht})} macro.} @@ -2187,7 +2163,7 @@ For example, the following code defines the custom flipflops in \FR{ShiftR}. define(`customFF',`FlipFlopX(wid 10*L_unit ht FF_ht*L_unit,, :S;NE:CK;:R, N:PR, :Q;;ifelse(`$1',1,:lg_bartxt(Q)), N:CLR) ') \end{verbatim} -\begin{figure}[h!t] +\begin{figure}[H] \input ShiftRMan \caption{A 5-bit shift register.} \label{ShiftR} @@ -2201,10 +2177,8 @@ For hybrid applications, the \verb|dac| and \verb|adc| macros are illustrated in \FR{Dac}. The figure shows the default and predefined internal locations, the number of which can be specified as macro arguments. -\begin{figure}[ht] -% \ifpdf\vspace*{-\baselineskip}\fi% +\begin{figure}[H] \input Dac -% \ifpdf\vspace*{-\baselineskip}\fi% \caption{The {\tt dac({\sl width,height},nIn,nN,nOut,nS)} and {\tt adc({\sl width,height},nIn,nN,nOut,nS)} macros.} \label{Dac} @@ -2232,7 +2206,7 @@ To draw the left-side pins, for example, one can write \end{verbatim} \noindent and so on. -\begin{figure}[h!] +\begin{figure}[H] \parbox{\textwidth}{\small\verbatiminput{sampleIC.m4}}% \hfill\llap{\raise-0.15in\hbox{\input sampleIC }}% \vspace*{-\baselineskip}% @@ -2311,7 +2285,8 @@ that can be named as for normal two-terminal elements. There are four arguments for which defaults are provided as always. The transformers are shown in \FR{SLDTransformers} and other two-terminal elements in \FR{SLDTwoTerms}. -\begin{figure}[h!t] +\begin{figure}[H] + \vspace*{-\baselineskip} \SLDTransformers \caption{The SLD draft transformers drawn by {\tt sl\_transformer({\sl linespec, key-value pairs, @@ -2324,7 +2299,7 @@ elements in \FR{SLDTwoTerms}. The first argument is the linespec defining the direction and location of the element, e.g., {\tt sl\_transformer(right\_ {\sl expr}).} -\begin{figure}[h!t] +\begin{figure}[H] \SLDTwoTerms \caption{SLD two-terminal elements, drawing direction {\tt right\_}.} \label{SLDTwoTerms} @@ -2388,23 +2363,23 @@ and can be labelled like a normal two-terminal element. If, however, breakers are included using {\tt B: tt\_box(,{,},C,C)} then write, for example, {\tt llabel(,Box 15,{,},Body)} to place the label correctly. +\pagebreak \subsection{One-terminal and composite SLD elements\label{OneTermSLD:}} The one-terminal elements have two components: a stem with optional breaker or slash symbol, and a head. SLD generators are shown in \FR{SLDGenerators}, other one-terminal elements in \FR{SLDOneTerms}. -\begin{figure}[h!t] +\begin{figure}[H] \SLDGenerators \caption{SLD generators, drawing direction {\tt up\_}.} \label{SLDGenerators} \end{figure} -\begin{figure}[h!t] +\begin{figure}[H] \SLDOneTerms \caption{SLD one-terminal elements, drawing direction {\tt up\_}.} \label{SLDOneTerms} \end{figure} There are three arguments, as follows. - The first argument is a linespec which defines the location and drawing direction of the element stem. The second argument is a sequence of semicolon-separated key-value pairs @@ -2431,9 +2406,10 @@ internal positions. For {\tt sl\_busbar}, these are {\sl Start, End,} and {\sl P1, P2, $\ldots$ Pnp} where {\sl np} is the value of the second argument. -\begin{figure}[h!t] +\begin{figure}[H] + \vspace*{-\baselineskip} \SLDComposite - \caption{The {\tt sl\_busbar()} and two variants of {\tt sl\_ct}.} + \caption{The {\tt sl\_busbar()} and some transformer variants.} \label{SLDComposite} \end{figure} @@ -2601,11 +2577,12 @@ to defer macro expansion. Macro arguments are referenced inside a macro by number; thus {\tt \$1} refers to the first argument. A few examples will be given. +\pagebreak \Example{1} Custom two-terminal elements can often be defined by writing a wrapper for an existing element. For example, an enclosed thermal switch can be defined as shown in \FR{Thermal}. -\begin{figure}[ht] +\begin{figure}[H] \parbox{5in}{\tt define(`thermalsw',\hfill\break \hbox{}\space`dswitch(`\$1',`\$2',WDdBTh)\hfill\break \hbox{}\space\space circle rad distance(last [].T,last line.c) @@ -2620,22 +2597,22 @@ In the following, two macros are defined to simplify the repeated drawing of a series resistor and series inductor, and the macro {\tt tsection} defines a subcircuit that is replicated several times to generate \FR{Tline}. -\pagebreak + {\small \verbatiminput{Tline.m4}} -\begin{figure}[h!t] -% \ifpdf\vspace*{-\baselineskip}\fi% +\begin{figure}[H] \input Tline \caption{A lumped model of a transmission line, illustrating the use of custom macros.} \label{Tline} \end{figure} +\pagebreak \Example{3} \FR{HybridPi} shows an element that is composed of several basic elements and that can be drawn in any direction prespecified by {\tt Point\_({\sl degrees})}. The labels always appear in their natural horizontal orientation. -\begin{figure}[h!t] +\begin{figure}[H] \vspace*{-0.5ex} \input HybridPi \vspace*{-0.5ex} @@ -2682,11 +2659,12 @@ define(`hybrid_PI_BJT', `$2' ] ') \end{verbatim} +\pagebreak \Example{4} A number of elements have arguments meant explicitly for customization. \FR{Sinus} customizes the {\tt source} macro to show a cycle of a horizontal sinusoid with adjustable phase given by argument 2 in degrees, as might be wanted for a 3-phase circuit: -\begin{figure}[ht] +\begin{figure}[H] \hfill\input Sinus \vspace*{-0.5in} \begin{verbatim} @@ -2710,7 +2688,7 @@ power of the \verb|vec_()| and \verb|rvec_()| macros is not required. Suppose that an optoisolator is to be drawn with left-right or right-left orientation as shown in \FR{Opto}. %\vspace*{-0.5em} -\begin{figure}[h!b] +\begin{figure}[H] \input Opto \caption{Showing {\tt opto} and {\tt opto(BR)} with defined labels.} \label{Opto} @@ -2783,7 +2761,7 @@ F2: fbfilter(L,R,K_2,C_{23},R_3) with .In at F1.In ground(at F2.G) \end{verbatim} \vspace*{-0.5em} -\begin{figure}[ht] +\begin{figure}[H] \input fbfilter \caption{Showing the result of two invocations of the {\tt fbfilter} macro, with labels.} @@ -2895,7 +2873,7 @@ can generate the custom arrows shown below the three native arrows in \FR{arrowex}. The defined keys are {\tt type=}; {\tt lgth=}; {\tt wdth=}; {\tt shaft=}; and {\tt head=}. Many variations of these arrowheads are possible. -\begin{figure}[h!t] +\begin{figure}[H] \input arrowex \caption{The three \dpic native arrows and others generated by {\tt sarrow({\sl linespec}, {\sl keys})}.} @@ -2968,7 +2946,7 @@ This hackery is summarized below, with an example in \FR{stringdim}. The argument of {\tt s\_box} need not be text exclusively; it can be anything that produces a \TeX\ box, for example, \verb|\includegraphics|. \end{itemize} -\begin{figure}[h!t] +\begin{figure}[H] \parbox{3.5in}{\small\tt.PS\\ gen\_init\\ sinclude(Circuit\_macros.dim)\\ @@ -3091,7 +3069,7 @@ Objects can be taylored to their attached text by invoking The small source file in \FR{boxdims}, for example, produces the box in the figure. %\vspace*{-\baselineskip}% -\begin{figure}[ht] +\begin{figure}[H] \parbox{4.2in}{\small \input eboxdims.verb }% \hfill\llap{\raise-0.35in\hbox{\input eboxdims }}% \vspace{-\baselineskip} @@ -3114,7 +3092,7 @@ libgen.m4}, to convert points to drawing coordinates. Sometimes a label needs a plain background in order to blank out previously drawn components overlapped by the label, as shown on the left of \FR{fbox}. -\begin{figure}[h!b] +\begin{figure}[H] \input woodchips \vspace{-0.5\baselineskip} \caption{Illustrating the {\tt f\_box} macro.} @@ -3151,6 +3129,7 @@ evaluates to a position, with {\tt boxcoord(}{\sl object name}{\tt,0,0)} at the lower left corner of the object, and {\tt boxcoord(}{\sl object name}{\tt,1,1)} at its upper right. + \xection{\PSTricks and other tricks\label{Pstricks:}} This section applies only to a \pic processor (\dpic) that is capable of producing output compatible with @@ -3249,7 +3228,6 @@ The lines \noindent\verb|\end{scope}%| \vspace{\parsep} -\pagebreak This is accomplished, for example, by adapting the {\tt \bsl{}mtotex} macro of \SR{Simplifications:} as follows: @@ -3288,10 +3266,8 @@ formats, as shown in \FR{Workflow}. One of the easiest methods for producing web documents is to generate postscript as usual and to convert the result to pdf format with Adobe Distiller or equivalent. -\begin{figure}[h!t] -% \ifpdf\vspace*{-\baselineskip}\fi% +\begin{figure}[H] \input Workflow -% \ifpdf\vspace*{-\baselineskip}\fi% \caption{Output formats produced by \gpic {\tt -t} and \dpic. SVG output can be read by Inkscape or used directly in web documents.} \label{Workflow} @@ -3348,6 +3324,7 @@ as illustrated in \FR{Workflow} and in example files included with the distribution. The \latex drawing commands alone or with {\tt eepic} or {\tt pict2e} extensions are suitable only for simple diagrams. +\enlargethispage{\baselineskip} \xection{Developer's notes\label{Developersnotes:}} In the course of writing a book in the late 1980s when there was little available for creating line diagrams in \latex, I wished to eliminate @@ -3373,18 +3350,19 @@ locations to an external file to be used in overlaying text or other items on the diagram. The simple \pic\ language is but one of many available tools for creating -line graphics. Consequently, the main value of this distribution is -not necessarily in the use of a specific language but in the element -data encoded in the macros, which have been developed with reference -to standards and refined over decades, and which now total thousands -of lines. The learning curve of \pic\ compares well with other -possibilities, but some of the macros have become less readable as more -options and flexibility have been added, and if starting over today, -perhaps I would change some details. Compromises have been made in order -to retain reasonable compatibility with the various postprocessors. -No choice of tool is without compromise, and producing good graphics -seems to be time consuming, no matter how it is done, but the payoff -can be worth the effort. +line graphics. Consequently, the main value of this distribution +is not necessarily in the use of a specific language but in the +element data encoded in the macros, which have been developed with +reference to standards and refined over decades, and which now total +thousands of lines. The learning curve of \pic\ compares well with +other possibilities, but some of the macros have become less readable +as more options and flexibility have been added, and if starting +over today, perhaps I would change some details. Compromises have +been made to preserve the compatability of some of the older macros. +Compromises have also been made to retain reasonable compatibility with +the various postprocessors. No choice of tool is without compromise, +and producing good graphics seems to be time consuming, no matter how +it is done, but the payoff can be worth the effort. Instead of using \pic macros, I preferred the equally simple but more powerful \Mfour macro processor, and therefore \Mfour is required here, diff --git a/graphics/circuit_macros/doc/defines.tex b/graphics/circuit_macros/doc/defines.tex index c2b800e509..f806236197 100644 --- a/graphics/circuit_macros/doc/defines.tex +++ b/graphics/circuit_macros/doc/defines.tex @@ -377,18 +377,18 @@ \macrodef{clabel}{clabel}{({\sl label},{\sl label},{\sl label},[{\sl arg4}],% [{\sl block name}])} {cct} - {Triple label along the draing axis of the body of an element in the + {Triple label along the drawing axis of the body of an element in the current direction \seesect{Labels:}. Labels are placed at the beginning, centre, and end of the last {\tt []} block (or a named {\tt []} block). Each label is treated as math by default, but is - copied literally if it is in double quotes or defined by sprintf. + copied literally if it is in double quotes or sprintf. {\sl Arg4} can be {\tt above,} {\tt below,} {\tt left,} or {\tt right} to supplement the default relative position. The fifth argument is the optional name of the {\tt []} block to be labelled, - which is {\tt last []} by default} + which is {\tt last []} by default.} \macrodef{cm\_\_}{cm__}{} {gen} - {absolute centiimetres} + {absolute centimetres} \macrodef{consource}{consource}{(\linespec,V|I|v|i,R)} {cct} {voltage or current controlled source with alternate forms; @@ -984,9 +984,33 @@ n|e|s|w,{\sl length})} {gen} {Manhattan box with 45 degree hatching, e.g., {\tt hatchbox(outlined "blue",,dashed outlined "green" thick 0.4)}} -\macrodef{heater}{heater}{({\sl linespec, ndivisions, wid, ht})} - {cct} - {heater element\seesect{Twoterminal:}} +\macrodef{heater}{heater}{({\sl linespec, ndivisions|keys, wid, ht, + boxspec}|[E[R][T]])} + {cct} + {Heater element\seesect{Twoterminal:}. If arg 5 contains {\tt E,} + draws an {\tt heatere({\sl linespec, keys,} [R][T]),} + otherwise a + {\tt heatert({\sl linespec, nparts, wid, ht, boxspec})}} +\macrodef{heatere}{heatere}{({\sl linespec, keys,} [R][T])} + {cct} + {Heater element with curved sides\seesect{Twoterminal:}. + {\tt R} means right orientation; + {\tt T} truncates leads to the width of the body. + The {\sl keys} for the body are + {\tt lgth={\sl expr};} + {\tt wdth={\sl expr};} (default {\tt lgth*2/5}); + {\tt cycles={\sl expr};} + {\tt line={\sl attributes};} (e.g., {\tt dotted, dashed, outlined})} +\macrodef{heatert}{heatert}{({\sl linespec, nparts|keys, wid, ht, boxspec})} + {cct} + {Two-terminal rectangular heater element\seesect{Twoterminal:}. + The {\sl keys} for the body are + {\tt parts={\sl expr};} + {\tt lgth={\sl expr};} + {\tt wdth={\sl expr};} (default {\tt lgth*2/5}); + {\tt box={\sl body attributes};} + (e.g., {\tt dotted, dashed, outlined, shaded}). + Args 3--5 are unused if any key is given} \macrodef{hex\_digit}{hex_digit}{($n$)} {gen} {hexadecimal digit for $0 \leq n < 16$} @@ -1093,6 +1117,21 @@ n|e|s|w,{\sl length})} one or more {\tt L[M][B]} for L and auxiliary contacts with make or break points; {\tt S[M][B]} for S and auxiliary contacts \seesect{Composite:}} +\macrodef{jumper}{jumper}{({\sl linespec, chars}|{\sl keys})} + {cct} + { Two-terminal solder jumper with named body parts. + The {\sl chars} character sequence specifies the jumper components, + and normally begins with {\tt C} and ends with {\tt D.} The character + {\tt E} is an empty (blank) gap, {\tt J} is a filled gap, {\tt B} + is a box component. The components are named {\sl T1, T2, \ldots} + Examples: {\tt CED} is a simple open jumper (the default); {\tt CJD} + closed; {\tt CEBED} three-contact open; {\tt CJBED} three-contact + open and closed. + The {\sl keys} are: {\tt type=}{\sl chars} as previously; + {\tt body=}{\sl attributes} (e.g. {\tt fill\_(0.5)}); + {\tt wdth=}{\sl expr}; + {\tt name=}{\sl chars} (the body name)% +\seesect{Twoterminal:}} \Letter{K}% \macrodef{KelvinR}{KelvinR}{({\sl cycles},[R],{\sl cycle wid})} {cct} @@ -1102,9 +1141,9 @@ n|e|s|w,{\sl length})} \macrodef{L\_unit}{L_unit}{} {log} {logic-element grid size} -\macrodef{lamp}{lamp}{(\linespec, [R])} +\macrodef{lamp}{lamp}{(\linespec, [R][T])} {cct} - {Two-terminal incandescent lamp + {Two-terminal incandescent lamp. {\tt T} truncates leads to the body width. \seesect{Twoterminal:}} \macrodef{larrow}{larrow}{({\sl label},{\tt ->|<-},{\sl dist})} {cct} @@ -1284,18 +1323,24 @@ n|e|s|w,{\sl length})} {MOSFET left or right, included components defined by characters, envelope. arg 3 chars: - {\tt [u][d]B:} center bulk connection pin; {\tt D:} D pin and lead; - {\tt E:} dashed substrate; {\tt F:} solid-line substrate; {\tt - [u][d]G:} G pin to substrate at source; {\tt [u][d]H:} G pin to - substrate at center; {\tt L:} G pin to channel (obsolete); {\tt - [u][d]M:} G pin to channel; u: at drain end; d: at source end {\tt - [u][d]M{\sl n}:} multiple gates G0 to G{\sl n} {\tt Py:} parallel - diode; {\tt Pz:} parallel zener diode; {\tt Q:} connect B pin to - S pin; {\tt R:} thick channel; {\tt [u][d]S:} S pin and lead u: - arrow up; d: arrow down; {\tt [d]T:} G pin to center of channel - d: not circle; {\tt X:} XMOSFET terminal; {\tt Z:} simplified - complementary MOS - \seesect{Semiconductors:}} + {\tt [u][d]B:} center bulk connection pin; + {\tt D:} D pin and lead; + {\tt E:} dashed substrate; + {\tt F:} solid-line substrate; + {\tt [u][d]G:} G pin to substrate at source; + {\tt [u][d]H:} G pin to substrate at center; + {\tt L:} G pin to channel (obsolete); + {\tt [u][d]M:} G pin to channel, u: at drain end, d: at source end; + {\tt [u][d]M{\sl n}:} multiple gates G0 to G{\sl n}; + {\tt Py:} parallel diode; + {\tt Pz:} parallel zener diode; + {\tt Q:} connect B pin to S pin; + {\tt R:} thick channel; + {\tt [u][d]S:} S pin and lead u: arrow up, d: arrow down; + {\tt [d]T:} G pin to center of channel d: not circle; + {\tt X:} XMOSFET terminal; + {\tt Z:} simplified complementary MOS + \seesect{Semiconductors:}} \macrodef{Mux\_ht}{Mux_ht}{} {cct} {Mux height parameter in {\tt L\_unit}s} @@ -1688,7 +1733,7 @@ degrees})} is {\tt r=}{\sl val} then corners have radius {\sl val}. If arg4 is {\tt t=}{\sl val} then a spline with tension {\sl val} is used to draw a ``superellipse,'' and the bounding box is then only approximate. } -\macrodef{rotellipse}{rotellipse}{({\sl wid,ht,type})} +\macrodef{rotellipse}{rotellipse}{({\sl wid,ht,attributes})} {gen} {ellipse oriented in current direction in {\tt [ ]} block; e.g. {\tt Point\_(45); rotellipse(,{},dotted fill\_(0.9)).} Defined @@ -2388,22 +2433,30 @@ justification})} the point is forward, backward, or both with respect to the current drawing direction. \seesect{Composite:}} -\macrodef{tconn}{tconn}{({\sl linespec,}>|>>|<|<<|O[F],{\sl wid})} - {cct} - {Terminal connector, {\tt O}=circle; {\tt OF}=filled circle; - {\tt > or >>} output connector (default {\tt >}) ; {\tt < or << - input connector}; arg3 is arrowhead width or circle diameter +\macrodef{tconn}{tconn}{({\sl linespec, chars}|{\sl keys}, {\sl wid})} + {cct} + {Terminal connector drawn on a linespec, with head enclosed in a {\tt [ ]} + block. The permissible {\sl chars} are: + {\tt > | >> | < | << | A | AA | M | O | OF}. + Type {\tt O} draws a node (circle); {\tt OF} a filled circle. + Type {\tt M} is a black bar; {\tt A} is an open arc end; type {\tt AA} + a double open arc. Type {\tt >} (the default) is an arrow-like output + connector; {\tt <} and {\tt <<} input connectors. Arg 3 is arrowhead + width or circle diameter when key-value pairs are not used. + If keys are specified, they are {\tt type=}{\sl chars} as previously; + {\tt wdth=}{\sl expr}; {\tt lgth=}{\sl expr}; {\tt sep=}{\sl expr}; + {\tt head=}{\sl attributes except} {\tt lgth, wdth.} + The key {\tt sep=} is the double-head separation \seesect{Composite:}} \macrodef{tgate}{tgate}{({\sl linespec,} [B][R|L])} {cct} {transmission gate, {\tt B=} ebox type; {\tt L=} oriented left \seesect{Semiconductors:}} -\macrodef{thermocouple}{thermocouple}{({\sl linespec, wid, ht,} L|R)} +\macrodef{thermocouple}{thermocouple}{({\sl linespec, wid, ht,} L|R [T])} {cct} - { Thermocouple drawn to the left (by default) of the {\sl - linespec} - line. If the {\sl linespec} length equals {\sl wid} (default - {\tt dimen\_/5}), then only the two branches appear. {\tt R=} + { Thermocouple drawn to the left (by default) of the + {\sl linespec} line. A {\tt T} argument truncates the leads so + only the two branches appear. {\tt R=} right orientation. \seesect{Twoterminal:}} \macrodef{thicklines\_}{thicklines_}{({\sl number})} {gen} diff --git a/graphics/circuit_macros/doc/heaterMan.m4 b/graphics/circuit_macros/doc/heaterMan.m4 new file mode 100644 index 0000000000..da22dbabc6 --- /dev/null +++ b/graphics/circuit_macros/doc/heaterMan.m4 @@ -0,0 +1,26 @@ +.PS +# heaterMan.m4 +cct_init + +movewid = 2 pt__ +hm = 2.05 +right_ +{ + {lamp ; move; "`{\tt lamp}'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + move right_ 1.25 + {thermocouple ; move;" `{\tt thermocouple}'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + } +move down 0.25; right_ +{ + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + } + +.PE diff --git a/graphics/circuit_macros/dpictools.pic b/graphics/circuit_macros/dpictools.pic index 656c83a6c8..6118039658 100644 --- a/graphics/circuit_macros/dpictools.pic +++ b/graphics/circuit_macros/dpictools.pic @@ -3,7 +3,7 @@ # m4 macro NeedDpicTools or the pic statement copy "HOMELIB_/dpictools.pic" # when HOMELIB_ is defined or, generically, copy "<path>dpictools.pic" -# Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under # +# Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under # # the LaTeX Project Public Licence in file Licence.txt. The files of # # this distribution may be redistributed or modified provided that this # # copyright notice is included and provided that modifications are clearly # @@ -75,7 +75,7 @@ define posarray { define posarray2 { for i_array=3 to $+ do { exec sprintf("$1[%g,%g] : $%g",$2,i_array-2,i_array); }} -# Operations on 3-d vectors (could be generalized +# Operations on 3D vectors (could be generalized # except for cross): # $3 = $1 + $2 define sum3 { @@ -323,7 +323,7 @@ define rgbtocmyk { # postprocessor specified by dpic command-line # option; colorname then evaluates to a string define DefineRGBColor { -case(dpicopt, # The order of the following is defined in dpic source: +case(abs(dpicopt), # The order of the following is defined in dpic source: # MFpic: command sprintf("\mfpdefinecolor{_$1__}{rgb}{%g,%g,%g}",$2,$3,$4) define $1 {"_$1__"} , @@ -507,12 +507,21 @@ define Intersect_ {intersect_($1.start,$1.end,$2.start,$2.end)} # Nearest multiple of 90 define drawdir_ {(int(pmod($1+45,360)/90)*90)} -# vlength(x,y) 2-D vector length +# vlength(x,y) 2-D length define vlength {sqrt(abs(($1)^2+($2)^2))} # distance(Pos1,Pos2) distance between positions define distance {vlength(($1).x-($2).x,($1).y-($2).y)} +# linang(linear obj) angle of linear object +define linang {atan2($1.end.y-$1.start.y,$1.end.x-$1.start.x)} + +# posang(Position) angle of position wrt (0,0) +define posang {atan2(($1).y,($1).x)} + +# cangle(A,B,C) angle at B of line A to B to C +define cangle { (posang(($1-($2)))-posang(($3-($2)))) } + # For PGF, PSTricks, or SVG only: define dpshade { beginshade($1); $2; endshade } # like libgen shade() diff --git a/graphics/circuit_macros/examples/ASME_Y14-5.m4 b/graphics/circuit_macros/examples/ASME_Y14-5.m4def index 00b044b093..00b044b093 100644 --- a/graphics/circuit_macros/examples/ASME_Y14-5.m4 +++ b/graphics/circuit_macros/examples/ASME_Y14-5.m4def diff --git a/graphics/circuit_macros/examples/Autologix.m4 b/graphics/circuit_macros/examples/Autologix.m4 deleted file mode 100644 index 1e4774d9e5..0000000000 --- a/graphics/circuit_macros/examples/Autologix.m4 +++ /dev/null @@ -1,57 +0,0 @@ -.PS -# `Autologix.m4' -log_init - -A: [ -F: Autologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .nw at 2nd last [].sw+(0,-dimen_*2/3); - Not(x1)) - for_(1,4,1,`"\sl Out`'m4x" at F.Out`'m4x ljust') - Loopover_(`v_', `"\sl In$v_$" at F.In`'v_ above ',x0,x1,x3) -# for_(1,3,1,`"\sl In`'m4x=" at F.In`'m4x+(0,10pt__) above') - "\sl In$x2$" at F.Inx2 +(-10pt__,0) above -# "\sl In4=" at F.In4+(-10pt__,10pt__) above - for_(1,3,1,`"\sl In`'m4x" at F.In`'m4x') - "\sl In17" at F.In17 -G: Autologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .nw at 2nd last [].sw+(0,-dimen_*2/3); - Not(x1), - N) with .Out1 at F.Out1+(6*dimen_,0) - for_(1,4,1,`"\sl Out`'m4x" at G.Out`'m4x ljust') - "\sl In1" at G.In1 rjust - "\sl In2" at G.In2 rjust - "\sl In`'m4nargs" at G.In`'m4nargs rjust - "\tt\ldots ,N)" wid 0.25 at (G.Out2,G.Out4) rjust -] - -S: `"\def\tld{\char126}\shortstack[l]{\tt Autologix(\\\tt - \tt\quad{}And(Or(x3,x1,\tld{}x0),Nor(Or(x3,Not(x2),\tld{}x1,x0), - And(Or(x2,x1,\tld{}x0),Xor(x2,\tld{}x1))));\\ - \tt\quad{}\tld{}x0;\\ - \tt\quad{}And(\tld{}x0,Nand(\tld{}x1,x3))@ - with .nw at 2nd last [].sw+(0,-dimen\_*2/3);\\ - \tt\quad{}Not(x1))}"' \ - ht 58pt__ wid 520pt__ with .nw at A.sw+(0,-15pt__) - -B: [ -F: #utologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .ne at 2nd last [].se+(0,-dimen_*2/3); - Not(x1), - M) - for_(1,4,1,`"\sl Out`'m4x" at F.Out`'m4x rjust') - Loopover_(`v_', `"\sl In$v_$" at F.In`'v_ above ',x0,x1,x3) - "\sl In$x2$" at F.Inx2 +(10pt__,0) above - `"\tt\ldots @ with .ne at 2nd last [].se+(0,-dimen\_*2/3);Not(x1),M)"'\ - wid 200pt__ at F.s below -] with .n at S.s+(0,-0.1) - -.PE diff --git a/graphics/circuit_macros/examples/Blogix.m4 b/graphics/circuit_macros/examples/Blogix.m4 deleted file mode 100644 index b2d44c5222..0000000000 --- a/graphics/circuit_macros/examples/Blogix.m4 +++ /dev/null @@ -1,87 +0,0 @@ -.PS -# `Blogix.m4' -log_init - -linewid = 0.4 - -# A more complex expression - F: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1))))) - - Loopover_(`v_', `"$v_$" at F.In`'v_ above', x0,x1,x2,x3,x4) - "\sl Out" ljust at F.Out - `"{\tt \shortstack[l]{Autologix(And(Or(x3,x1,\~{}x0),\\ - \quad Nor(Or(x3,Not(x2),\~{}x1,x0),And(x4,Or(x2,x1,\~{}x0),%\ - Xor(x2,\~{}x1)))))}}"' wid 440pt__ ht 20pt__ \ - with .w at F.sw+(0,-0.25) -# Inputs on the left with vert offset in L_units -define(`Doff',LV;offset=25) - G: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))), - Doff*L_unit) \ - with .sw at F.Out+(0.2,-0.7) - - Loopover_(`v_', `"$v_$" wid 11pt__ at G.In`'v_ rjust ', x0,x1,x2,x3,x4) - "\sl Out" ljust at G.Out - "{\tt ...,Doff*L\_unit)}" at G.s+(0,-10pt__) - -# A more complex expression -define(`Eoff',R) - E: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))); - And(~x0,Nand(~x1,x3)), - Eoff) \ - with .nw at F.sw+(0,-1.5) - - Loopover_(`v_', `"$v_$" at E.In`'v_ above ', x0,x1,x2,x3,x4) - "\sl Out1" ljust at E.Out1 - "\sl Out2" ljust at E.Out2 - "{\tt ...,Eoff)}" at E.s+(0,-10pt__) - -# Inputs on the left with vert offset in L_units -define(`Foff',LRV;offset=17) - D: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))), - Foff*L_unit) \ - with .sw at E.Out1+(0.2,-0.5) - - Loopover_(`v_', `"$v_$" wid 11pt__ at D.In`'v_ rjust ', x0,x1,x2,x3,x4) - "\sl Out" ljust at D.Out - "{\tt ...,Foff)}" at D.s+(0,-10pt__) - -# Here's how to include an arbitrary circuit -# that isn't one of the standard gates. -# First, define the circuit with a name ending -# in _gate. Make sure its inputs are on the left -# and named In1, In2, ... and the output Out -# is on the right. -define(`SR_gate',`[ - S: NOR_gate - R: NOR_gate at S+(0,-L_unit*(AND_ht+4)) - w = (S.Out.x-R.In1.x)/3 - v = 2*L_unit - line right_ dimen_/2 from S.Out - Out: Here - TR: R.In1-(v,0) - line from S.Out+(v,0) down w*3/2 then left S.Out.x-TR.x+v down w \ - then to TR then to R.In1 - TS: S.In2-(v,0); - line from R.Out right v then up w*3/2 then left R.Out.x-TS.x+v up w \ - then to TS then to S.In2 - In1: S.In1 - In2: R.In2 ]') -# Now define the function by which the circuit -# will be invoked, with a preceding _: -define(`SRff',`_AutoGate(SR,$@)') - -# You're done. Here is an example: - F: Autologix(Or(y,SRff(And(x,y),Nand(x,y)))) \ - with .nw at 2nd last [].sw+(0,-0.5) - - "\sl Out" at F.Out ljust - "$x$" at F.Inx above - "$y$" at F.Iny above - `"{\tt Autologix(Or(y,SRff(And(x,y),Nand(x,y))))}"' wid 267pt__ ht 7pt__ \ - with .w at last [].sw+(0,-10pt__) - -.PE diff --git a/graphics/circuit_macros/examples/Conn.m4 b/graphics/circuit_macros/examples/Conn.m4 index 7229f0afee..6ccf5d5709 100644 --- a/graphics/circuit_macros/examples/Conn.m4 +++ b/graphics/circuit_macros/examples/Conn.m4 @@ -1,3 +1,4 @@ + .PS # `Conn.m4' cct_init @@ -31,38 +32,44 @@ C: [ C1: ccoax `"\tt ccoax\vphantom{(}"' ht 11 pt__ at C1.s below thinlines_ - arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust - arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ht 11pt__ ljust + arrow <- down 0.05 left 0.15 from C1.C.w; "\sl C" rjust + arrow <- down 0.05 right 0.1 from C1.S.e; "\sl S" wid 0.1 ht 11pt__ ljust thicklines_ - C2: ccoax(at C1+(0,0.3),F) - `"\tt ccoax(,F)"' ht 11 pt__ wid 0.65 at C2.ne ljust - ] with .C1.sw at T.S2.se+(0.6,0.0) + C2: ccoax(at C1+(0,0.4),F) + `"\tt ccoax(,F)"' ht 11 pt__ at C2.s below + ] with .w at T.e+(0.6,0.0) + +B: [ + tbox(V_2) + { `"\tt tbox(V\_2)"' at last [].s below } + tbox(V_1,,,<) at last []+(0,-0.4) + { `"\tt tbox(V\_1,{,},<)"' at last [].s below } + tbox(V_1,,,<>) at last []+(0,-0.4) + { `"\tt tbox(V\_1,{,},<>)"' at last [].s below } +] with .w at C.e + (0.5,-0.1) Y: [ - tconn(,O) + P1: tconn(,O) {`"\tt tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } move to Here+(0.3,0) - P1: tconn(,>) - {`"\tt (,>)"' at last line.c+(0,-0.2)} - move to P1.end+(0.3,0) - tconn(,>>) - {`"\tt (,>{}>)"' at last line.c+(0,-0.2)} - move to P1.start+(0,linewid) - P3: tconn(,<) - {`"\tt tconn(,<)"' at last line.c+(0,-0.2)} + P2: tconn(,>) + {`"\tt $\ldots$(,>)"' at last line.c+(0,-0.2)} + move to P2.end+(0.3,0) + P3: tconn(,>>) + {`"\tt $\ldots$(,>{}>)"' at last line.c+(0,-0.2)} move to P3.end+(0.3,0) - tconn(,<<) - {`"\tt (,<{}<)"' at last line.c+(0,-0.2)} + P4: tconn(,<) + {`"\tt $\ldots$(,<)"' at last line.c+(0,-0.2)} + move to P4.end+(0.3,0) + P5: tconn(,<<) + {`"\tt $\ldots$(,<{}<)"' at last line.c+(0,-0.2)} + move to P5.end+(0.3,0) + P6: tconn(,A) + {`"\tt $\ldots$(,A)"' at last line.c+(0,-0.2)} + move to P6.end+(0.3,0) + P7: tconn(,M) + {`"\tt $\ldots$(,M)"' at last line.c+(0,-0.2)} -] with .sw at (C.e.x-0.4,T.s.y) - -B: [ - tbox(V_2) - { `"\tt tbox(V\_2)"' at last [].sw below ljust } - tbox(V_1,,,<) with .sw at last [].se+(1.25,0) - { `"\tt tbox(V\_1,{,},<)"' at last [].s below } - tbox(V_1,,,<>) with .sw at last [].se+(1.25,0) - { `"\tt tbox(V\_1,{,},<>)"' at last [].s below } -] with .nw at T.sw+(0,-0.2) +] with .nw at T.sw+(0,-0.35) .PE diff --git a/graphics/circuit_macros/examples/Flow.m4 b/graphics/circuit_macros/examples/Flow.m4 index f117c082c3..7c514050f0 100644 --- a/graphics/circuit_macros/examples/Flow.m4 +++ b/graphics/circuit_macros/examples/Flow.m4 @@ -1,7 +1,9 @@ .PS # Flow.m4 gen_init -ifdef(`FlowchartDefs_',,`include(FlowchartDefs.m4)') +ifdef(`FlowchartDefs_',, + `sinclude(FlowchartDefs.m4def) + sinclude(../FlowchartDefs.m4def)') define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl diff --git a/graphics/circuit_macros/examples/FlowchartDefs.m4 b/graphics/circuit_macros/examples/FlowchartDefs.m4def index fc3dfca6a0..fc3dfca6a0 100644 --- a/graphics/circuit_macros/examples/FlowchartDefs.m4 +++ b/graphics/circuit_macros/examples/FlowchartDefs.m4def diff --git a/graphics/circuit_macros/examples/Fuses.m4 b/graphics/circuit_macros/examples/Fuses.m4 index bde24fac3e..2a01cfa3f2 100644 --- a/graphics/circuit_macros/examples/Fuses.m4 +++ b/graphics/circuit_macros/examples/Fuses.m4 @@ -19,21 +19,30 @@ movewid = 0.25 } move down; right_ { - cbreaker; {"`{\tt cbreaker}'" at last line.c+(0,-0.25)} + fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} + move + fuse(,HC,0.5,0.3) ; {"`{\tt $\ldots$(,HC,0.5,0.3)}'" at last line.c+(0,-0.27)} move - cbreaker(,R); {"`{\tt cbreaker(,R)}'" at last line.c+(0,-0.25)} + cbreaker; {"`{\tt cbreaker}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}D); {"`{\tt $\ldots$(,{,}D)}'" at last line.c+(0,-0.25)} + cbreaker(,R,D); {"`{\tt $\ldots$(,R,D)}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.25)} + cbreaker(,,T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.25) } + cbreaker(,,TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.2) } } move down; right_ { - fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} + jumper ; {"`{\tt jumper}'" at last line.c+(0,-0.2) } + move + jumper(,CJBED) ; {"`{\tt $\ldots$(,CJBED)}'" at last line.c+(0,-0.2) } + move + jumper(,body=outlined "gray" shaded "gray";) + {"`\tt $\ldots$(,body=outlined \"gray\" \textbackslash'" wid 172bp__ \ + with .w at (last line.start, last "") + "`\tt \hphantom{$\ldots$(,body=}shaded \"gray\";)'" \ + at last "".sw+(0,-10bp__) ljust } move - fuse(,HC,0.5,0.3) ; {"`{\tt (,HC,0.5,0.3)}'" at last line.c+(0,-0.25)} } .PE diff --git a/graphics/circuit_macros/examples/IntersectingPlanes.m4 b/graphics/circuit_macros/examples/IntersectingPlanes.m4 deleted file mode 100644 index 3ed9ab3bc3..0000000000 --- a/graphics/circuit_macros/examples/IntersectingPlanes.m4 +++ /dev/null @@ -1,84 +0,0 @@ -.PS -## IntersectingPlanes.m4 -## Projection of an object defined by 4-sided facets -threeD_init -NeedDpicTools - - setview( 10, 45) -# Define the object by its facets: -# size parameters - a = 3/2 - b = 0.4 -# depth - d = -1 -# line ends and intersections - A0: -a,-b - A1: a,-b - B0: Rot_(A0,120) - B1: Rot_(A1,120) - C0: Rot_(A0,240) - C1: Rot_(A1,240) - AB: intersect_(A0,A1,B0,B1) - BC: intersect_(B0,B1,C0,C1) - CA: intersect_(C0,C1,A0,A1) - - "A0" at project(0,A0.x,A0.y) rjust - "A1" at project(0,A1.x,A1.y) ljust - "B0" at project(0,B0.x,B0.y) ljust - "B1" at project(0,B1.x,B1.y) rjust - "C0" at project(0,C0.x,C0.y) ljust - "C1" at project(0,C1.x,C1.y) rjust -# facet location parameters -define(`facet',`$1.x,$1.y, $2.x,$2.y') -array2(ffc,1,facet(A0,CA)) -array2(ffc,2,facet(CA,A0)) -array2(ffc,3,facet(CA,AB)) -array2(ffc,4,facet(AB,CA)) -array2(ffc,5,facet(AB,A1)) -array2(ffc,6,facet(A1,AB)) - -array2(ffc,7,facet(AB,B0)) -array2(ffc,8,facet(B0,AB)) -array2(ffc,9,facet(BC,AB)) -array2(ffc,10,facet(AB,BC)) -array2(ffc,11,facet(B1,BC)) -array2(ffc,12,facet(BC,B1)) - -array2(ffc,13,facet(C0,BC)) -array2(ffc,14,facet(BC,C0)) -array2(ffc,15,facet(BC,CA)) -array2(ffc,16,facet(CA,BC)) -array2(ffc,17,facet(CA,C1)) -array2(ffc,18,facet(C1,CA)) -nfacets = 18 -# facet corners -define(`fSW',`0,ffc[($1,1)],ffc[($1,2)]') -define(`fNW',`d,ffc[($1,1)],ffc[($1,2)]') -define(`fSE',`0,ffc[($1,3)],ffc[($1,4)]') -define(`fNE',`d,ffc[($1,3)],ffc[($1,4)]') -# facet centre and normal -define(`Fcentre',`sprod3D(0.5,sum3D(fSW(i),fNE(i)))') -define(`Fnoarmal',`cross3D(diff3D(fSE($1),fSW($1)),diff3D(fNE($1),fSE($1)))') -# facet drawing routine -define(`drawfacet',` - Loopover_(`X', `X: project(m4xpand(f`'X)(`$1'));', SW,SE,NE,NW) - line from SW to SE then to NE then to NW then to SW shaded ifelse(`$3',, - "white", `rgbstring(`$3',ifelse(`$4',,`$3',`$4'),ifelse(`$5',,`$3',`$5'))') - ifelse(`$2',,,`sprintf("%g",$2) at 1/2 between NW and SE') ') - -# The rest is generic: sort visible facets by -# distance and plot (but with custom colors) - nvis = 0 - smax = 0 - for i=1 to nfacets do { - if dot3D(View3D,Fnoarmal(i)) >= 0 then { - nvis +=1 - s[nvis] = dot3D(View3D,Fcentre(i)) - smax = max(smax,s[nvis]) - ix[nvis] = i - } } - dpquicksort(s,1,nvis,ix) - - for i=1 to nvis do { drawfacet(ix[i],ix[i],sqrt(i/nvis),i/nvis) } - -.PE diff --git a/graphics/circuit_macros/examples/Lettering.m4def b/graphics/circuit_macros/examples/Lettering.m4def new file mode 100644 index 0000000000..bbc9f0e4ec --- /dev/null +++ b/graphics/circuit_macros/examples/Lettering.m4def @@ -0,0 +1,1158 @@ +divert(-1) +% Lettering.defs +% Lettering definitions + +define(`Letter_init', + `# Letter grid parameters + lu = 0.07 + define(`grthick',`0.4') + define(`letterlinethick',`(lu/0.07)*1.2') + define(`ft2',`(linethick/2)pt__') + linethick_(letterlinethick) + + ifelse(m4postprocessor,pstricks, + ` \newgray{gridgray}{0.75} + \newgray{lightgridgray}{0.80} + \newgray{linegray}{0.40}', + m4postprocessor,pgf, + ` \definecolor{gridgray}{rgb}{0.433,0.433,0.433} + \definecolor{lightgridgray}{rgb}{0.8,0.8,0.8} + \definecolor{linegray}{rgb}{0.231,0.231,0.231}', + m4postprocessor,mpost, + ` define(`gridgray',`0.433,0.433,0.433') + define(`lightgridgray',`0.8,0.8,0.8') + define(`linegray',`0.231,0.231,0.231')', +# else + ` define(`gridgray',`0.5 0.5 0.5') + define(`lightgridgray',`0.8 0.8 0.8') + define(`linegray',`0.3 0.3 0.3')') + ifpstricks(`command `"\makeatletter \def\psas@@c{setlinecap 0 0 moveto"' + command `" 0 0.1 L stroke 0 0 moveto } \makeatother"'') +`# Letter_init end' + ') + +# graph coordinate system +define(`gco',`(vscal_(lu,$1,$2))') + +% `Stroke arrow +% stroke(linespec,vert offset,label,<-,linelabel)' +define(`setstroke',`ifmpost( + `setrgb(0,0,0)', + `psset_(linecolor=black,arrows=-)')dnl + linethick_(0.3); arrowwid = 1.6pt__ ; arrowht = 3pt__') + +define(`stroke',`rpoint_(`$1') ; { setstroke + m4lth = linethick + ifelse((`$2'),(),,`if (`$2') != 0 then { move to rvec_(0,`$2') }') + ifelse(`$3',,,`ifelse(index(`$3',"),0,`{$3}',{"`$3'"})') + ifelse(`$5',,,`$5':)line ifelse(`$4',,->,`$4') to rvec_(rp_len,0) dnl + chop 3pt__ chop 0 + linethick_(m4lth) } +') + +# non-normalized line at 90 deg to line argument +define(`perp',`(`$1'.start.y-`$1'.end.y),(`$1'.end.x-`$1'.start.x) ') + +define(`grid', +` lthtmp = linethick; linethick = grthick + ifmpost(`setrgb(gridgray)',`psset_(linecolor=gridgray)') + for i=0 to $1 do { + { line up ($2)*lu from gco(i,0) } } + for j=0 to $2 do { + { line right ($1)*lu from gco(0,j) } } + psset_(`linecolor=black') + linethick = lthtmp ') + +define(`elarrow',`i = ifelse(`$7',,-1,`$7') + for theta = `$1' to `$2' by `$3' do { i = i+1 + V[i]: `$4'+((`$5')*cosd(theta),(`$6')*sind(theta)) } + fitcurve(V,i,->) ') + +define(`charA', +`[Origin: gco(0,0) `#' `charA' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(3,6)+(0,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(3,6)+(0,-ft2) to gco(6,0)+(-ft2,ft2) + L3t: line invis from gco(0,2)+(0,ft2) right lu + L3: line from Intersect_(L1,L3t) to Intersect_(L2,L3t) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu ,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu , lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charB', +`[Origin: gco(0,0) `#' `charB' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + mid = 3.3*lu-ft2 + topht = 6*lu-2*ft2-mid + L2: line right_ 5*lu-2*ft2-mid/2 + L5: arc ccw to Here+(0,mid) with .c at Here+(0,mid/2) + L3: line from (L1,Here) to Here + l4l = 4.5*lu-2*ft2-topht/2 + L4: line from L1.start right_ l4l + L7: arc cw to Here+(0,-topht) with .c at Here+(0,-topht/2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop 0,-lu*0.75,3) + move to L4.start+(0,.75*lu) + {"4"}; line right l4l chop 3pt__ chop 0 + arcd(Here-(0,.75*lu+topht/2),.75*lu+topht/2,90,-30) cw -> + "5" below ljust + arcd(L2.end+(0,mid/2),mid/2+0.75*lu,15,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charC', +`[Origin: gco(0,0) `#' `charC' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ifelse(`$1',,,`circle rad 3*lu-ft2 thick 0.3 dashed at gco(3,3)') + arcr(gco(3,3),3*lu-ft2,atan2(2.5,1.5),atan2(-2,2.0)) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(2.5,1.5)*rtod_) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charD', +`[Origin: gco(0,0) `#' `charD' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + lr = 3*lu-ft2 + L2: line right 5*lu-ft2-lr + arcd(Here+(0,lr),lr,-90,90) + line to L1.start + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3 chop lu/8,-lu*0.75,2) + move to L1.start+(0,.75*lu) + {"3"}; line right 5*lu-ft2-lr chop 3pt__ chop 0 + arcd(Here-(0,.75*lu+lr),.75*lu+lr,90,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charE', +`[Origin: gco(0,0) `#' `charE' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line right 5*lu-2*ft2 + L3: line from L1.start right 4.5*lu-2*ft2 + L4: line from gco(0,3.2)+(ft2,0) right 3*lu-2*ft2 + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/2 chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu/3,-lu*0.75,4) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charF', +`[Origin: gco(0,0) `#' `charF' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from L1.start right 5*lu-2*ft2 + L3: line from gco(0,3.2)+(ft2,0) right 3*lu-2*ft2 + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charG', +`[Origin: gco(0,0) `#' `charG' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ifelse(`$1',,,`circle rad 3*lu-ft2 thick 0.3 dashed at gco(3,3)') + L3: line from gco(3,3) to gco(5,3) then to gco(5,1) + arcr(gco(3,3),3*lu-ft2,atan2(2.5,1.5),atan2(-2,2.0)) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(2.5,1.5)*rtod_) cw -> + line from L3.start+(0,-.75*lu) right 1.2*lu chop .5*lu chop 0 + { "3" at last line.start rjust } + arrow down 1.2*lu ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charH', +`[Origin: gco(0,0) `#' `charH' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(5,6)+(0,-ft2) to gco(5,0)+(0,ft2) + L3: line from gco(0,3.2)+(ft2,0) to gco(5,3.2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charI', +`[Origin: gco(0,0) `#' `charI' + ifelse(`$1',,,`grid(1,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`charJ', +`[Origin: gco(0,0) `#' `charJ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + E: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + L1: line from (E.e,gco(0,6)+(ft2,-ft2)) to E.e + spline v to (E.e,E.s) then to (E.w,E.s) then to E.w + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + "2" at gco(-.5,1.5) + spline v -> from gco(-0.4,0.75) to gco(-0.2,-0.65) then to gco(5.65,-0.65) \ + then to gco(5.65,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charK', +`[Origin: gco(0,0) `#' `charK' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L3t:line ifelse(`$1',,invis,dashed) thick 0.3 from L1.start \ + to gco(5,0)+(-ft2,ft2) + L2: line from gco(4.5,6)+(0,-ft2) to gco(0,2)+(ft2,0) + L3: line from Intersect_(L3t,L2) to L3t.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*4/3 chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3, lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charL', +`[Origin: gco(0,0) `#' `charL' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charM', +`[Origin: gco(0,0) `#' `charM' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(6,6)+(-ft2,-ft2) to gco(6,0)+(-ft2,ft2) + L3: line from L1.start to gco(3,0)+(0,ft2) + L4: line from L2.start to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu*2, lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu*2,-lu*0.75,4) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charN', +`[Origin: gco(0,0) `#' `charN' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(5,6)+(0,-ft2) to gco(5,0)+(0,ft2) + L3: line from L1.start to L2.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*1.0 chop lu*1.5, lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charO', +`[Origin: gco(0,0) `#' `charO' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 3*lu-ft2 at gco(3,3) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(-2,2.1)*rtod_+5) cw -> ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charP', +`[Origin: gco(0,0) `#' `charP' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(0,3)+(ft2,0) right 5*lu-ft2-(3*lu-ft2)/2 + L3: line from L1.start right 5*lu-ft2-(3*lu-ft2)/2 + arcd(Here+(0,-(3*lu-ft2)/2),(3*lu-ft2)/2,-90,90) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu/3,-lu*0.75,2) + "3" at gco(0,6)+(0,lu*.75) + line to (L3.end,Here) chop lu/2 chop 0 + arcd(Here+(0,-4.5*lu/2),4.5*lu/2,90,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charQ', +`[Origin: gco(0,0) `#' `charQ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 3*lu-ft2 at gco(3,3) + rpoint_(from gco(3,3) to gco(5,0)) + ifelse(`$1',,,`{line dashed dashwid*0.8 thick 0.3 to rvec_(2*lu-ft2,0)}') + L3: line from rvec_(2*lu-ft2,0) to rvec_(4*lu-ft2,0) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(-2,2.1)*rtod_+5) cw -> + stroke(from L3.start to L3.end chop -lu/3 chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charR', +`[Origin: gco(0,0) `#' `charR' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(0,3)+(ft2,0) right 5*lu-ft2-(3*lu-ft2)/2 + Lt4: line thick 0.3 ifelse(`$1',,invis,dashed) from gco(1,6)+(-ft2,-ft2) \ + to gco(5,0)+(-ft2,ft2) + L4: line from Intersect_(Lt4,L2) to Lt4.end + L3: line from L1.start right 5*lu-ft2-(3*lu-ft2)/2 + arcd(Here+(0,-(3*lu-ft2)/2),(3*lu-ft2)/2,-90,90) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu,-lu*0.75,2) + stroke(from L4.start to L4.end chop lu chop lu*.5,-lu*0.75,4) + "3" at gco(0,6)+(0,lu*.75) + line to (L3.end,Here) chop lu/2 chop 0 + arcd(Here+(0,-4.5*lu/2),4.5*lu/2,90,-80) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charS', +`[Origin: gco(0,0) `#' `charS' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed at CH') + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed at CL') + i = 0 + V[i]: CH+(ah*cosd(20),bh*sind(20)) + for theta = 30 to 270 by 22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + for theta = 90-22.5 to -135 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + elarrow(120,40,-20,CH,2.75*lu,2.15*lu) + "2" at gco(2.0,4.5) above + i = -1 + for theta = 150 to 270 by 30 do { i = i+1 + V[i]: CH+(1.25*cosd(theta),0.65*sind(theta))*lu } + elarrow(60,-80,-20,CL,3.25*lu,2.35*lu,i) + "3" at gco(0,0) above rjust + elarrow(225,270,15,CL,3.25*lu,2.35*lu) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charT', +`[Origin: gco(0,0) `#' `charT' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(6,6)+(-ft2,-ft2) + L2: line from gco(3,6)+(0,-ft2) to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L2.start to L2.end chop lu*2/3 chop lu/3,-lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charU', +`[Origin: gco(0,0) `#' `charU' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + E: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + L1: line from (E.w,gco(0,6)+(ft2,-ft2)) to E.w + L2: line from (E.e,L1.start) to E.e + spline v to (E.e,E.s) then to (E.w,E.s) then to E.w + ifelse(`$1',,,` + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + "3" at gco(-.5,1.5) + spline v -> from gco(-0.4,0.75) to gco(-0.2,-0.65) then to gco(5.65,-0.65) \ + then to gco(5.65,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charV', +`[Origin: gco(0,0) `#' `charV' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(3,0)+(0,ft2) + L2: line to gco(6,6)+(-ft2,-ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu,-lu*0.75,1) + stroke(from L2.end to L2.start chop lu, lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charW', +`[Origin: gco(0,0) `#' `charW' + ifelse(`$1',,,`grid(8,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2: line from gco(4,6)+(0,-ft2) to L1.end + L3: line from L2.start to gco(6,0)+(0,ft2) + L4: line from gco(8,6)+(-ft2,-ft2) to L3.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu*1.5 chop lu*.5,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu*1.5,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*2 chop lu*.5,-lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu*1.5,-lu*0.75,4) ') + box invis wid 8*lu ht 6*lu with .sw at Origin]') + +define(`charX', +`[Origin: gco(0,0) `#' `charX' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,6)+(ft2,-ft2) to gco(6,0)+(-ft2,ft2) + L2: line from gco(5.5,6)+(-ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu, lu*0.75,1) + stroke(from L2.start to L2.end chop lu,-lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charY', +`[Origin: gco(0,0) `#' `charY' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(3,3)+(0,ft2) + L2: line from gco(6,6)+(-ft2,-ft2) to L1.end + L3: line to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu, lu*0.75,1) + stroke(from L2.start to L2.end chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charZ', +`[Origin: gco(0,0) `#' `charZ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,6)+(ft2,-ft2) to gco(5,6)+(-ft2,-ft2) + L2: line to gco(0,0)+(ft2,ft2) + L3: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L2.start to L2.end chop 1.5*lu chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char1', +`[Origin: gco(0,0) `#' `char1' + ifelse(`$1',,,`grid(1,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`char2', +`[Origin: gco(0,0) `#' `char2' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed at CH') + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed at CL') + i = 0 + V[i]: CH+(ah*cosd(160),bh*sind(160)) + for theta = 150 to -90+22.5 by -22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + fitcurve(V,i) + v = (sqrt(2)-1)*4/3 + spline v from V[i] to gco(2.8,3.0) then \ + to gco(1.5,2.6) then to gco(0,1.2)+(ft2,0) then to gco(0,0)+(ft2,ft2) + psset_(`arrows=c-c') dnl + L2: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + i = -1 + for theta = 120 to -60 by -20 do { i = i+1 + V[i]: CH+(2.75*cosd(theta),2.15*sind(theta))*lu } + i=i+1; V[i]: gco(2.6,2.1) + i=i+1; V[i]: gco(1.3,1.6) + i=i+1; V[i]: gco(0.95,0.5) + v = (sqrt(2)-1)*4/3 + spline v -> from V[0] to V[1] + for n = 2 to i do { continue to V[n] } + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char3', +`[Origin: gco(0,0) `#' `char3' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + H: ellipse ht 2*bh wid 2*ah thick 0.3 ifelse(`$1',,invis,dashed) at CH + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + L: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + i = 0 + V[i]: CH+(ah*cosd(160),bh*sind(160)) + for theta = 150 to -90 by -20 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + fitcurve(V,i) + line from H.s to (gco(2,3)+(ft2,0),H.s) + i = -1 + for theta = 90 to -135 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + elarrow(120,-20,-20,CH,2.75*lu,2.15*lu) + "2" at gco(4.6,3.5) + elarrow(40,-80,-10,CL,3.25*lu,2.35*lu) + "3" at gco(0,0) above rjust + i = 0 + V[i]: CL+(3.25*cosd(220),2.35*sind(220))*lu + elarrow(240,270,15,CL,3.25*lu,2.35*lu,0) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char4', +`[Origin: gco(0,0) `#' `char4' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(4,6)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + L2: line from L1.start to gco(0,1.5)+(ft2,-ft2) + L3: line to (gco(5,1.5)+(-ft2,0),Here) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3 chop 0, lu*.75,1) + stroke(from L2.start to L2.end chop lu chop lu/3,-lu*.75,2) + stroke(from L3.start to L3.end chop lu/3 chop lu/2,-lu*.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char5', +`[Origin: gco(0,0) `#' `char5' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(.5,6)+(0,-ft2) to gco(.5,3) + L4: line from L1.start to gco(4.5,6)+(-ft2,-ft2) + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + i = 0 + V[i]: L1.end + for theta = 125 to -135 by -25 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*.75,1) + stroke(from L4.start to L4.end chop lu/3 chop 0, lu*.75,4) + v = (sqrt(2)-1)*4/3 + "2" at gco(1.0,4.0) above + elarrow(110,-80,-10,CL,al+lu*.75,bl+lu*.75) + "3" at gco(0,0) above rjust + i = 0 + V[i]: CL+((al+0.75*lu)*cosd(220),(bl+.75*lu)*sind(220)) + elarrow(240,270,15,CL,al+lu*.75,bl+lu*.75,0) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char6', +`[Origin: gco(0,0) `#' `char6' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ifelse(`$1',,,`ellipse ht 2*bb wid 2*ab thick 0.3 dashed at Cb') + i = -1 + for theta = -315 to 180-22.5 by 22.5 do { i = i+1 + if (theta<=-90) then {X:Cb; x=ab; y=bb } \ + else {X: gco(2.5,2); x=ab; y=2*lu-ft2 } + V[i]: X+(x*cosd(theta),y*sind(theta)) } + fitcurve(V,i) + v = (sqrt(2)-1)*4/3 + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + x = ab+lu*.75; y = bb+lu*.75 + elarrow(90+22.5,270+22.5,22.5,Cb,x,y) + "3" at gco(3,6) above + elarrow(70,45,-12.5,Cb,x,y) + "2" at gco(1.2,3.8) above + elarrow(100,-50,-10,gco(2.5,2),ab+lu*.65,2*lu+lu*.65) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char7', +`[Origin: gco(0,0) `#' `char7' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(5,6)+(-ft2,-ft2) + { L1t: line invis to gco(1.3,0) + L2t: line invis up lu from gco(2,0)+(-ft2,0) } + psset_(`arrows=-') dnl + arcto(Intersect_(L1t,L2t),L2t.start,2.5*lu) + line to (Here,gco(2,0)) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L1t.start to 4th last line.end chop lu/3 chop 0, + lu*.75,2,thick 0.3,L1) + L2: line <- up arrowht from gco(2.75,0)+(-ft2,ft2) + move to L1.end + arcto(Intersect_(L1,L2),L2.start,(2.5-0.75)*lu,thick 0.3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char8', +`[Origin: gco(0,0) `#' `char8' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu + bh = 1.4*lu + CH: gco(2.5,6)+(0,-bh) + H: ellipse ht 2*bh wid 2*ah at CH + al = 2.5*lu + bl = 1.6*lu+ft2/2 + CL: gco(2.5,3.2)+(0,ft2)+(0,-bl) + L: ellipse ht 2*bl wid 2*al at CL + ifelse(`$1',,,` + setstroke + x = ah+lu*.75; y = bh+lu*.75 + "1" at gco(2,6) above + elarrow(110,205,15,CH,x,y) + "2" at gco(3,6) above + elarrow(70,-25,-15,CH,x,y) + x = al+lu*.75; y = bl+lu*.75 + "3" at gco(0.2,2.6) above + elarrow(150,260,10,CL,x,y) + "4" at gco(4.8,2.6) above + elarrow(30,-80,-10,CL,x,y) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char9', +`[Origin: gco(0,0) `#' `char9' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ifelse(`$1',,,`ellipse ht 2*bb wid 2*ab thick 0.3 dashed at Cb') + i = -1 + for theta = -135 to 360-22.5 by 22.5 do { i = i+1 + if (theta<=90) then {X:Cb; x=ab; y=bb } \ + else {X: gco(2.5,4); x=ab; y=2*lu-ft2 } + V[i]: X+(x*cosd(theta),y*sind(theta)) } + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + elarrow(90+22.5,270+22.5,22.5,X,3.15*lu-ft2,2.65*lu-ft2) + "2" at gco(3,6) above + elarrow(80,-80,-10,Cb,ab+lu*.65,bb+lu*.65) + "3" at gco(0,1) + elarrow(225,270,15,Cb,3.15*lu,3.65*lu) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char0', +`[Origin: gco(0,0) `#' `char0' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ellipse ht 2*bb wid 2*ab at Cb + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + elarrow(90+22.5,270,22.5,Cb,.65*lu+ab,.65*lu+bb) + "2" at gco(3,6) above + elarrow(70,-80,-10,Cb,ab+lu*.65,bb+lu*.65) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charAnd', +`[Origin: gco(0,0) `#' `fAnd' + ifelse(`$1',,,`grid(5,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + spline v from gco(5,0)+(-ft2,ft2) \ + to gco(4.605,0.312) to gco(1.443,4.038) \ + to gco(1.335,4.198) to gco(1.134,4.597) to gco(1.103,4.938) \ + to gco(1.143,5.252) to gco(1.358,5.605) to gco(1.702,5.797) \ + to gco(2.236,5.857) to gco(2.637,5.772) to gco(2.981,5.499) \ + to gco(3.157,5.132) to gco(3.087,4.565) to gco(2.746,4.189) \ + to gco(2.415,3.895) to gco(2.009,3.621) to gco(1.522,3.339) \ + to gco(1.157,3.095) to gco(0.671,2.769) to gco(0.435,2.520) \ + to gco(0.227,2.215) to gco(0.101,1.636) to gco(0.234,1.165) \ + to gco(0.373,0.926) to gco(0.512,0.738) to gco(0.918,0.443) \ + to gco(1.190,0.340) to gco(1.427,0.274) to gco(2.140,0.166) \ + to gco(2.617,0.164) to gco(3.031,0.216) to gco(3.616,0.395) \ + to gco(4.017,0.600) to gco(4.121,0.676) to gco(4.482,1.017) \ + to gco(4.637,1.302) to gco(4.753,1.532) to gco(4.863,1.875) + ifelse(`$1',,,` + setstroke + "1" at gco(1.4,6) above + spline -> from gco(1.0,6.2) to gco(.35,5.5) then to gco(.35,4) \ + then to gco(4.0,0) + "2" at gco(2.6,6) above + spline -> from gco(3.0,6.2) to gco(3.75,5.5) then to gco(3.75,3.9) \ + then to gco(1,2.4) then to gco(1,1.1) then to gco(2,.9) + "3" at gco(4.2,2.4) + spline -> from gco(4.1,1.8) to gco(3.8,1.3) then to gco(3,.9) \ + then to gco(2.2,.9) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charComma', +` circle fill_(0) rad ft2 at Here+(0,-3*lu+ft2) + move to last circle.c + arc cw from Here+(0,ft2) to Here+(0,-4*ft2) \ + with .c at Here+(-ft2,-1.5*ft2) + move to last circle+(ft2,-ft2+3*lu)') + +define(`charPeriod', +` circle fill_(0) rad ft2 at Here+(0,-3*lu+ft2) + move to last circle+(ft2,-ft2+3*lu)') + +define(`chara', +`[Origin: gco(0,0) `#' `chara' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + stroke(from L3.start to L3.end chop lu/3 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charb', +`[Origin: gco(0,0) `#' `charb' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,1) + "2" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "3" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`charc', +`[Origin: gco(0,0) `#' `charc' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2)') + psset_(`linecolor=linegray') dnl + arcr(gco(2,2),2*lu-ft2,atan2(1.7,1),atan2(-1,1.6)) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,-45) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,20) -> cw ht 0.75 * arrowht ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chard', +`[Origin: gco(0,0) `#' `chard' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,6)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + stroke(from L3.start to L3.end chop lu/3 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`chare', +`[Origin: gco(0,0) `#' `chare' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2)') + psset_(`linecolor=linegray') dnl + arcr(gco(2,2),2*lu-ft2,atan2(0.2,2),atan2(-1,1.6)) + L3: line from last arc.start to (gco(0.2,0).x, last arc.start.y) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,-45) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,20) -> cw ht 0.75 * arrowht ') + stroke(from L3.end to L3.start chop lu*1.5 chop lu/3,-lu*0.5,3) + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charf', +`[Origin: gco(0,0) `#' `charf' + psset_(`arrows=c-c,linecolor=linegray') dnl + L3: line from gco(0,4)+(ft2,0) to gco(2,4)+(-ft2,0) + L1: line from gco(1,0)+(0,ft2) to gco(1,4.8) + psset_(`linecolor=linegray') dnl + arc cw to gco(3,5.5)+(0,0) with .c at gco(2.12,4.8) + ifelse(`$1',,,` + setstroke + stroke(from L1.end to L1.start chop -lu/5 chop lu/3,-lu*0.75,1) + "2" at gco(1.5,4.6) + arcd(gco(2.12,4.8),0.6*lu,140,40) -> cw ht 0.75 * arrowht + stroke(from L3.start to L3.end chop lu*.5 chop 0,-lu*0.75,3) ') + box invis wid 3*lu ht 6*lu with .sw at Origin]') + +define(`charg', +`[Origin: gco(0,0) `#' `charg' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,0) ') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,0) + psset_(`linecolor=linegray') dnl + arcr(gco(2,0),2*lu-ft2,0,atan2(-1,-1.5)) cw + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + "4" at gco(0.7,-0.6) + arcd(gco(2,0),1.2*lu,-135,-45) -> ht 0.75 * arrowht + stroke(from L3.start to L3.end chop lu*0 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 6*lu with .sw at gco(0,-2)]') + +define(`charh', +`[Origin: gco(0,0) `#' `charh' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line to gco(4,0)+(-ft2,ft2) + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,1) + "2" at gco(1.0,2.4) + arcd(gco(2,2),1.2*lu,130,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/4) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`chari', +`[Origin: gco(0,0) `#' `chari' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,0)+(ft2,ft2) to gco(0,4)+(ft2,-ft2) + L2: line from gco(0,6)+(ft2,-ft2) to gco(0,5.5)+(ft2,0) + ifelse(`$1',,,` + setstroke + stroke(from L2.start to L2.end+(0,-lu*.2) chop -lu*.7 chop 0,-lu*0.5,) + "2" at last line.c+(0.1*lu,-0.2*lu) rjust + stroke(from L1.end to L1.start chop lu/3 chop 0,-lu*0.5,1) ') + box invis wid ft2*2 ht 6*lu with .sw at Origin]') + +define(`charj', +`[Origin: gco(0,0) `#' `charj' + psset_(`arrows=c-c,linecolor=linegray') dnl + L2: line from gco(2,6)+(0,-ft2) to gco(2,5.5) + L1: line from gco(2,4)+(0,-ft2) to gco(2,-0.8) + psset_(`linecolor=linegray') dnl + arc cw to gco(0,-1.5) with .c at gco(0.88,-0.8) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1,solid) + arcd(gco(0.88,-0.8),.62*lu,0,-135) cw -> ht 0.75*arrowht + stroke(from L2.start to L2.end+(0,-lu*.2) chop -lu*.7 chop 0,-lu*0.5,) + "2" at last line.c+(0.1*lu,-0.2*lu) rjust ') + box invis wid 2*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`chark', +`[Origin: gco(0,0) `#' `chark' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(3.4,4)+(0,-ft2) to gco(0,1.6)+(ft2,ft2) + L3t:line ifelse(`$1',,invis,dashed lu/2) thick 0.3 from gco(0,4)+(ft2,0) \ + to gco(4,0)+(-ft2,ft2) + L3: line from Intersect_(L2,L3t) to L3t.end + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + stroke(from L2.start to L2.end chop lu/2 ,-lu*0.6,2) + stroke(from L3.start to L3.end chop lu/2 ,-lu*0.6,3) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`charl', +`[Origin: gco(0,0) `#' `charl' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`charm', +`[Origin: gco(0,0) `#' `charm' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 1.5*lu-ft2/2 thick 0.3 dashed lu/2 \ + at gco(1.5,2.5)+(ft2/2,0) + circle outlined "linegray" rad 1.5*lu-ft2/2 thick 0.3 dashed lu/2 \ + at gco(4.5,2.5)+(-ft2/2,0) ') + psset_(`linecolor=linegray') dnl + arcd(gco(1.5,2.5)+(ft2/2,0),1.5*lu-ft2/2,180,0) cw + arcd(gco(4.5,2.5)+(-ft2/2,0),1.5*lu-ft2/2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line from gco(3,2.5) to gco(3,0)+(0,ft2) + line from gco(6,2.5)+(-ft2,0) to gco(6,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(0.9,2.2) + arcd(gco(1.5,2.5)+(ft2/2,0),0.75*lu-ft2/2,160,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) + "3" at gco(3.9,2.2) + arcd(gco(4.5,2.5)+(-ft2/2,0),0.75*lu-ft2/2,160,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) ') + box invis wid 6*lu ht 4*lu with .sw at Origin]') + +define(`charn', +`[Origin: gco(0,0) `#' `charn' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line from gco(4,2)+(-ft2,0) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(0.9,2.0) + arcd(gco(2,2),1.25*lu,150,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charo', +`[Origin: gco(0,0) `#' `charo' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charp', +`[Origin: gco(0,0) `#' `charp' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,-2)+(ft2,ft2) + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "3" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charq', +`[Origin: gco(0,0) `#' `charq' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(4,4)+(-ft2,-ft2) to gco(4,-2)+(-ft2,ft2) + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,3) + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charr', +`[Origin: gco(0,0) `#' `charr' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + psset_(`linecolor=linegray') dnl + arc cw from gco(0,3)+(ft2,0) to gco(2,3.85) rad 1.2*lu with .c at gco(1.5,2.5) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3,-lu*0.5,1) + "2" at gco(.6,2) above + arcd(gco(1.5,2.5),0.75*lu,140,60) -> cw ht 0.75 * arrowht ') + box invis wid 2*lu ht 4*lu with .sw at Origin]') + +define(`chars', +`[Origin: gco(0,0) `#' `chars' + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 1.6*lu + bh = (4*lu-ft2-2.1*lu)/2 #0.95*lu-ft2/2 + CH: gco(2.0,2.1)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed lu/2 at CH') + al = 2.0*lu-ft2 + bl = (2.1*lu-ft2)/2 + CL: gco(2.0,2.1)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed lu/2 at CL') + i = -1 + for theta = 0 to 270 by 22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + for theta = 90-22.5 to -180 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(0.5,3.5) above + elarrow(120,40,-20,CH,(ah+.6*lu),(bh+.6*lu)) + "2" at gco(1.5,3.2) + i = -1 + for theta = 150 to 270 by 30 do { i = i+1 + V[i]: CH+(lu*cosd(theta),lu*0.5*sind(theta)) } + fitcurve(V,i) + r = V[i].y-CL.y + elarrow(60,-80,-20,CL,2.5*lu,r,i) + "3" at gco(-.3,.9) + elarrow(210,270,15,CL,2.5*lu,r) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chart', +`[Origin: gco(0,0) `#' `chart' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(1,0)+(0,ft2) to gco(1,6)+(0,-ft2) + L2: line from gco(0,4)+(ft2,0) to gco(2,4)+(-ft2,0) + ifelse(`$1',,,` + setstroke + stroke(from L1.end to L1.start chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.5 chop 0,-lu*0.75,2) ') + box invis wid 2*lu ht 6*lu with .sw at Origin]') + +define(`charu', +`[Origin: gco(0,0) `#' `charu' + psset_(`arrows=c-c,linecolor=linegray') dnl + L2: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + line from gco(0,4)+(ft2,-ft2) to gco(0,2)+(ft2,0) + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) + ifelse(`$1',,,` + setstroke + stroke(from L2.start to L2.end chop lu/3 chop 0,lu*0.5,2) + "1" at gco(.9,2.0) + arcd(gco(2,2),1.25*lu,210,-30) -> ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charv', +`[Origin: gco(0,0) `#' `charv' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2: line to gco(4,4)+(-ft2,-ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/3,-lu*0.5,1) + stroke(from L2.end to L2.start chop lu*.6,-lu*0.5,2) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charw', +`[Origin: gco(0,0) `#' `charw' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(1.5,0)+(0,ft2) + L2: line to gco(3,4)+(0,-ft2) + L3: line to gco(4.5,0)+(0,ft2) + L4: line to gco(6,4)+(-ft2,-ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/3,-lu*0.5,1) + stroke(from L2.end to L2.start chop lu*.6 chop lu,-lu*0.5,2) + stroke(from L3.start to L3.end chop lu*1.5 chop lu/3,-lu*0.5,3) + stroke(from L4.end to L4.start chop lu*.6 chop lu,-lu*0.5,4) ') + box invis wid 6*lu ht 4*lu with .sw at Origin]') + +define(`charx', +`[Origin: gco(0,0) `#' `charx' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,4)+(0,-ft2) to gco(4,0)+(-ft2,ft2) + L2: line from gco(3.5,4)+(0,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3,-lu*0.6,1) + stroke(from L2.start to L2.end chop lu/3,lu*0.6,2) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chary', +`[Origin: gco(0,0) `#' `chary' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2x: gco(4,4)+(-ft2,-ft2) + L2: line from L2x to 1.37<L2x,L1.end> + C: Here-(perp(L2))/lin_leng(L2)*lu*1.1 + psset_(`linecolor=linegray') dnl + arcd(C,lu*1.1,-30,-105) cw + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/2,-lu*0.5,1) + stroke(from L2.start to L2.end chop lu*.6 chop 0,-lu*0.5,2,solid) + arcd(C,lu*.6,-30,-110) cw -> ht 0.75*arrowht ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charz', +`[Origin: gco(0,0) `#' `charz' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,4)+(ft2,-ft2) to gco(4,4)+(-ft2,-ft2) + L2: line to gco(0,0)+(ft2,ft2) + L3: line to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop lu,-lu*0.6,1) + stroke(from L2.start to L2.end chop lu,lu*0.6,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.6,3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`xpnd',$*) +define(`Letters', + `ifelse(`$1',,,` + ifelse(substr(`$1',0,1),|,`charComma',substr(`$1',0,1),.,`charPeriod', + `xpnd(char`'substr(`$1',0,1))') + ifelse(substr(`$1',1,1),,,`move lu*.75/2*(')ifelse(substr(`$1',1,1),,, + substr(`$1',1,1),8,17,substr(`$1',1,1),6,16,A`'substr(`$1',1,1),A ,3, + substr(`$1',1,1))ifelse(substr(`$1',1,1),,,`-1)') + Letters(substr(`$1',2)) ') ') + +divert(0)dnl diff --git a/graphics/circuit_macros/examples/Makefile b/graphics/circuit_macros/examples/Makefile index fd8ab4ea49..b6ccbe2942 100644 --- a/graphics/circuit_macros/examples/Makefile +++ b/graphics/circuit_macros/examples/Makefile @@ -15,8 +15,8 @@ # To test the file test.m4, type "make tst" if boxdims is used, otherwise # type "make tst1". In either case the file tst.ps is created. # -# There are a few extra examples in this directory. Process them one -# at a time, or type "make extras.pdf" +# There are more examples in the extras directory. Go to that +# directory and process them one at a time, or type "make". # # To debug a single diagram in a directory other than this examples # directory, copy this makefile and tst.tex to where you want to work, @@ -78,7 +78,8 @@ TEXPICS = \ Quantum.tex quick.tex \ random.tex Rectifiers.tex recycle.tex relaycoil.tex Relay.tex \ Resistors.tex Rotbox.tex \ - Schottky.tex sfg.tex shapes.tex ShiftR.tex Sierpinski.tex Sixpole.tex \ + Schottky.tex sfg.tex shadowed.tex shapes.tex ShiftR.tex Sierpinski.tex \ + Sixpole.tex \ Smithchart.tex Sources.tex SQUID.tex Switches.tex \ Tgate.tex Three.tex thyristor.tex TTLnand.tex Tubediags.tex \ UNO.tex ujt.tex Variable.tex Windings.tex worm.tex Xform.tex XOR.tex @@ -127,6 +128,8 @@ LTXFILE=printf "|documentclass[11pt]{article}\n\ .m4.tex: @touch $(DIMFILE) F_$*.dim $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 | $(PIC) $(MODE) > $*.tex +# $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 > $*.pic +# $(PIC) $(MODE) $*.pic > $*.tex .m4.dvi: @touch $(DIMFILE) F_$*.dim $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex @@ -209,16 +212,16 @@ $(DOC).pdf: clean pdfmode $(DOC).tex files.tex header.tex rose.pdf: rose.m4 m4 pdf.m4 rose.m4 | dpic -d > rose.pdf -paletteDPV.svg: paletteDPV.m4 - m4 svg.m4 paletteDPV.m4 | dpic -v > paletteDPV.svg - keyboard.svg: keyboard.m4 m4 svg.m4 keyboard.m4 | dpic -v > keyboard.svg keyboard.pdf: keyboard.svg - convert keyboard.svg keyboard.pdf + -conv=`which convert` ; if test "`basename $$conv`" = "convert" ; then \ + convert keyboard.svg keyboard.pdf ; \ + else printf '.PS\n "keyboard.pdf requires imagemagick convert"\n.PE\n' \ + | dpic -d > keyboard.pdf ; fi -pics: $(TEXPICS) rose.pdf keyboard.pdf +pics: rose.pdf keyboard.pdf $(TEXPICS) touch pics $(DOC).ps: psmode $(DOC).dvi @@ -264,43 +267,6 @@ gpic: echopics: @echo $(TEXPICS) -XTRASRC=printf "|documentclass[11pt]{article}\n\ -|usepackage[dvipsnames]{xcolor}\n\ -|usepackage{times,boxdims,siunitx,amssymb,tikz,geometry}\n\ -|geometry{margin=0.5cm}\n\ -|begin{document}\n" | $(BS) - -extras: - ( for file in `ls *.m4` ; do \ - fbase=`basename $$file .m4` ; \ - if test "`grep -L $$fbase files.tex`" = "files.tex" ; then \ - echo $$fbase ; \ - fi ; \ - done ) | sed -e '/Ball/d' \ - -e '/ASME_Y14-5/d' -e '/FlowchartDefs/d' -e '/tubedefs/d' \ - -e '/debug1/d' -e '/debug2/d' \ - -e '/paletteSVG/d' \ - -e '/Consumption/d' -e '/rotatetext/d' -e '/windows/d' \ - > extras - -XBOXDIMS = Chuck - -extras.pdf: extras - @$(XTRASRC) > extras.tex - touch extras.dim - -for file in `cat extras` ; do \ - $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ - printf "\n|input{$$file.tex}\n" | $(BS) >> extras.tex ; \ - printf "\n $$file.m4\n |pagebreak\n" | $(BS) >> extras.tex ; \ - done - printf "\n|end{document}\n" | $(BS) >> extras.tex - pdflatex extras - -for file in $(XBOXDIMS) ; do \ - rm -f $$file.tex ; \ - $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ - done - pdflatex extras - testall: (cd mf; make) (cd mpost; make) @@ -321,13 +287,11 @@ clobber: clean for file in `ls *.tex` ; do \ nm=`echo $$file | sed -e "s/\(.*\)\.tex/\1/"` ; \ if test -s $$nm.m4 ; then rm -f $$nm.pic $$nm.tex ; fi ; done + (cd dpv; make clobber) # @if test -f distmakefile ; then make -f distmakefile clobber ; fi clean: @printf "\n\n examples clean:\n\n" - -if test -f extras ; then \ - for file in `cat extras` ; do rm -f $$file.pic $$file.tex ; done ; fi - rm -f extras extras.* rm -f core boxdims.tar.gz pics rm -f *.dvi *.aux *.log *.toc *.blg *.eps *.tif *.epsi eps *-mfpic* *.svg rm -f fig*.tex $(TEXPICS) *.roff *.int *.pic gpic.m4 test.tex xxx* *.fig diff --git a/graphics/circuit_macros/examples/MoreTable.m4 b/graphics/circuit_macros/examples/MoreTable.m4 index ef8cd71824..3d90b71eb4 100644 --- a/graphics/circuit_macros/examples/MoreTable.m4 +++ b/graphics/circuit_macros/examples/MoreTable.m4 @@ -1,15 +1,44 @@ .PS -# MoreTable.m4 +# heater.m4 cct_init +Heater: [ + movewid = 2 pt__ + hm = 2.05 + right_ +{ + {lamp ; move; "`{\tt lamp}'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + move right_ 1.25 + {thermocouple ; move;" `{\tt thermocouple}'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + } + move down 0.4; right_ +{ + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + } + ] + +#.PE +#.PS +## MoreTable.m4 +#cct_init + +More: [ movewid = 2 pt__ hm = 2.05 vm = 0.28 -{ right; {lamp ; move;"`{\tt lamp}'" ljust} - move right_ hm - {thermocouple ; move;"`{\tt thermocouple}'" ljust } -} - move down 0.25; right_ +#{ right; {lamp ; move;"`{\tt lamp}'" ljust} +# move right_ hm +# {thermocouple ; move;"`{\tt thermocouple}'" ljust } +#} +# move down 0.25; right_ { {memristor ; move;"`{\tt memristor}'" ljust} move right_ hm {heater; move;"`{\tt heater}'" ljust} @@ -36,4 +65,5 @@ vm = 0.28 {xtal(,type=R;outerdiam=0.2) ; move ;"`{\tt xtal(,type=R)}'" ljust} } +] with .nw at Heater.sw+(0,-0.2) .PE diff --git a/graphics/circuit_macros/examples/Plate.m4 b/graphics/circuit_macros/examples/Plate.m4 index 14b6bbfbe3..b3a08a2439 100644 --- a/graphics/circuit_macros/examples/Plate.m4 +++ b/graphics/circuit_macros/examples/Plate.m4 @@ -5,7 +5,9 @@ # See the ASME Y14.5 standard, Figure 6-30. scale = 100/3 cct_init -ifdef(`ASME_Y14-5_',,`include(ASME_Y14-5.m4)') +ifdef(`ASME_Y14-5_',, + `sinclude(ASME_Y14-5.m4def) + sinclude(../ASME_Y14-5.m4def) ') ifsvg(`svg_font(sans-serif,10bp__)', `textht = 10bp__*2/3 ifpostscript(,latexcommand({\sf\small))') diff --git a/graphics/circuit_macros/examples/README-examples b/graphics/circuit_macros/examples/README-examples index bcd3bf3728..0d46f63d20 100644 --- a/graphics/circuit_macros/examples/README-examples +++ b/graphics/circuit_macros/examples/README-examples @@ -1,9 +1,9 @@ THIS DIRECTORY contains examples.tex, source files for the diagrams - that are imported when examples.tex is LaTeXed, some other example - diagrams, and a subdirectory for producing SVG files without invoking - LaTeX. To generate examples.pdf in a unix-like environment (versions - of unix, linux, cygwin, djgpp, ...): + that are imported when examples.tex is LaTeXed and a subdirectory for + producing SVG files without invoking LaTeX. To generate examples.pdf + in a unix-like environment (versions of unix, linux, cygwin, djgpp, + Mingw, ...): 1. Install the libraries as described in the top-level README file. @@ -30,7 +30,7 @@ SINGLE DIAGRAMS: To test one of the diagrams, say ex01.m4, type one of "make ex01.pdf" (uses pdflatex) "make ex01.png" (requires Imagemagick convert) "make ex01.tif" (requires Imagemagick convert) - "make ex01.svg" (requires Imagemagick convert, but see the svg folder) + "make ex01.svg" (requires Imagemagick convert, but see the dpv folder) DEBUGGING: To test and debug a single diagram, write it into test.m4. Type "make tst" to process the file, creating test.tex, which is imported into @@ -50,14 +50,14 @@ TiKz and PSTricks: By default, the dpic processor is invoked, producing either by LaTeX or PDFlatex, type "make" or "make examplespgf.ps" in the pgf subdirectory. -SVG: Look in the svg directory for examples, and type "make". +SVG: Look in the dpv directory for examples, and type "make". ALTERNATIVES: There are often several methods for producing similar - graphical results, particularly of text labels. Some of the diagrams - in this directory are slightly more complicated than required for Tikz - or PSTricks in order for them to work with other postprocessors. Dpic - output that does not produce LaTeX labels has to be treated separately - as, for example, in the svg directory. + graphical results, particularly of text labels. Some of the diagrams in + this directory are more complicated than required for Tikz or PSTricks + in order for them to work with other postprocessors. Dpic output + that does not produce LaTeX labels has to be treated separately as, + for example, in the dpv directory. METAPOST: To process the diagrams using MetaPost, look in the mpost subdirectory. To accommodate MetaPost, some of these sources use diff --git a/graphics/circuit_macros/examples/UNO.m4 b/graphics/circuit_macros/examples/UNO.m4 index 02e89ea13a..5a4e5381b7 100644 --- a/graphics/circuit_macros/examples/UNO.m4 +++ b/graphics/circuit_macros/examples/UNO.m4 @@ -56,18 +56,6 @@ define(`HeaderPin',` `rotbox(m4Hps,m4Hps,fill_(1))', `circle diam m4Hps fill_(1)') at last line.start ') -define(`brdge',`eleminit_(`$1') - define(`m4h',ifelse(`$2',,`sourcerad_',`($2)/2'))dnl - { line to rvec_(rp_len/2-m4h/2,0) - move to rvec_(m4h/2,0) - for m4ng=75 to 255 by 180 do {{ - m4fshade(0, arc cw from rvec_(Rect_(m4h/2,m4ng)) \ - to rvec_(Rect_(m4h/2,-m4ng)) \ - with .c at Here ) }} - line from rvec_(m4h/2,0) to rvec_(rp_len/2,0) } - { [box invis ht_ m4h wid_ m4h] at rvec_(rp_len/2,0) } - line to rvec_(rp_len,0) invis ') - define(`ATMEGA16U2',`[ Chip: box wid 10*lg_pinsep ht 25*lg_pinsep Loopover_(`x', @@ -168,7 +156,7 @@ divert(0)dnl rlabel(16,,"MHz"); dot XT2: dot(at last line.start-(2*del,0)); { "XT2" at last [].n above } - Br1: brdge(left_ from U3.Pin33.end to (XT2,U3.Pin33)) + Br1: jumper(left_ from U3.Pin33.end to (XT2,U3.Pin33)) rlabel(1,,2); llabel(,"GROUND") BRE: dot line to (Here,U3.Pin28) then to U3.Pin28.end @@ -354,7 +342,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep line from ZU4.Pin1.end to (RN1D-(1.5*del,0),ZU4.Pin1) then up 7*del continue to (ZU4.Chip.w,Here)+(del,0); BRB: dot - { line down_ 2*del; Br2: brdge(right_ dimen_) + { line down_ 2*del; Br2: jumper(right_ dimen_) llabel(1,,2); rlabel(,"RESET\_EN"); line up_ 2*del; dot } line right_ dimen_+del C5: capacitor(right_ dimen_); llabel(,"C5"); rlabel("100n"); dot diff --git a/graphics/circuit_macros/examples/Views.dms b/graphics/circuit_macros/examples/Views.dms new file mode 100644 index 0000000000..c92e42bac2 --- /dev/null +++ b/graphics/circuit_macros/examples/Views.dms @@ -0,0 +1,5 @@ +w[1]=58.0802 +w[2]=47.6604 +w[3]=46.9552 +w[4]=120.41 +w[5]=114.866 diff --git a/graphics/circuit_macros/examples/clock.m4 b/graphics/circuit_macros/examples/clock.m4 deleted file mode 100644 index 3431068d9b..0000000000 --- a/graphics/circuit_macros/examples/clock.m4 +++ /dev/null @@ -1,20 +0,0 @@ -.PS -# clock.m4 -gen_init - - linethick = 1.5 - arrowwid = 5 pt__ - - rgbfill(255/255,250/255,205/255, - Clock: circle rad 0.75 at (0,0) ) - - command "\newcounter{hour}" - for time=1 to 12 do { - sprintf("\setcounter{hour}{%g}\Roman{hour}",time) \ - at Rect_(Clock.rad*0.85,90-time*30) - } - line <-> from Rect_(Clock.rad*0.95,90-8.5*30) to Clock \ - then to Rect_(Clock.rad*0.7,90-3.5*30) - line thick 1 outline "red" from Clock to Rect_(Clock.rad*0.95,90-0.75*30) - -.PE diff --git a/graphics/circuit_macros/examples/dpv/ByteDPV.svg b/graphics/circuit_macros/examples/dpv/ByteDPV.svg deleted file mode 100644 index 317f9367f3..0000000000 --- a/graphics/circuit_macros/examples/dpv/ByteDPV.svg +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="460" height="215" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="459.2px" height="214.4px" - viewBox="0 0 459.2 214.4" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="121.066667" y="58.133333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="72.94">B0STDISBL (reset pin is enabled) </text> -<rect x="121.066667" y="77.333333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="92.14">WDTON (WDT not always on) </text> -<rect x="121.066667" y="96.533333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="111.34">SPIEN (allow serial programming) </text> -<rect x="121.066667" y="115.733333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="130.54">CKOPT (full output swing) </text> -<rect x="121.066667" y="134.933333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="149.74" ->EESAVE (don't preserve EEPB0OM over chip erase) </text> -<rect x="121.066667" y="154.133333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="168.94">BOOTSZ1 </text> -<rect x="121.066667" y="173.333333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="188.14">BOOTSZ0 </text> -<rect x="121.066667" y="192.533333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="207.34">BOOTB0ST (boot reset vector at 0x0000) </text> -<rect x="173.866667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="183.466667" y="15.34">1</text> -<rect x="154.666667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="164.266667" y="15.34">0</text> -<rect x="135.466667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="145.066667" y="15.34">0</text> -<rect x="116.266667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="125.866667" y="15.34">1</text> -<rect x="97.066667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="106.666667" y="15.34">0</text> -<rect x="77.866667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="87.466667" y="15.34">0</text> -<rect x="58.666667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="68.266667" y="15.34">1</text> -<rect x="39.466667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="49.066667" y="15.34">1</text> -<rect x="1.066667" y="0.533333" width="38.4" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="20.266667" y="15.34">0xc9</text> -<polygon stroke-width="0" fill="black" - points="114.346667,65.333333 121.066667,67.733333 -114.346667,70.133333" /> -<path d="M 183.466667,19.733333 - C 183.466667,20.533333 183.466667,21.333333 183.466667,22.133333 183.466667,23.733333 -171.466667,30.133333 147.466667,41.333333 123.466667,52.533333 -111.466667,59.733333 111.466667,62.933333 111.466667,66.133333 -112.802381,67.733333 115.47381,67.733333 116.809524,67.733333 118.145238,67.733333 -119.480953,67.733333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,84.533333 121.066667,86.933333 -114.346667,89.333333" /> -<path d="M 164.266667,19.733333 - C 164.266667,20.533333 164.266667,21.333333 164.266667,22.133333 164.266667,23.733333 -153.866667,30.133333 133.066667,41.333333 112.266667,52.533333 -101.866667,62.933333 101.866667,72.533333 101.866667,82.133333 -104.802381,86.933333 110.67381,86.933333 113.609524,86.933333 116.545238,86.933333 -119.480953,86.933333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,103.733333 121.066667,106.133333 -114.346667,108.533333" /> -<path d="M 145.066667,19.733333 - C 145.066667,20.533333 145.066667,21.333333 145.066667,22.133333 145.066667,23.733333 -136.266667,30.133333 118.666667,41.333333 101.066667,52.533333 -92.266667,66.133333 92.266667,82.133333 92.266667,98.133333 -96.802381,106.133333 105.87381,106.133333 110.409524,106.133333 114.945238,106.133333 -119.480953,106.133333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,122.933333 121.066667,125.333333 -114.346667,127.733333" /> -<path d="M 125.866667,19.733333 - C 125.866667,20.533333 125.866667,21.333333 125.866667,22.133333 125.866667,23.733333 -118.666667,30.133333 104.266667,41.333333 89.866667,52.533333 -82.666667,69.333333 82.666667,91.733333 82.666667,114.133333 -88.802381,125.333333 101.07381,125.333333 107.209524,125.333333 113.345238,125.333333 -119.480953,125.333333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,142.133333 121.066667,144.533333 -114.346667,146.933333" /> -<path d="M 106.666667,19.733333 - C 106.666667,20.533333 106.666667,21.333333 106.666667,22.133333 106.666667,23.733333 -101.066667,30.133333 89.866667,41.333333 78.666667,52.533333 -73.066667,72.533333 73.066667,101.333333 73.066667,130.133333 -80.802381,144.533333 96.27381,144.533333 104.009524,144.533333 111.745238,144.533333 -119.480953,144.533333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,161.333333 121.066667,163.733333 -114.346667,166.133333" /> -<path d="M 87.466667,19.733333 - C 87.466667,20.533333 87.466667,21.333333 87.466667,22.133333 87.466667,23.733333 -83.466667,30.133333 75.466667,41.333333 67.466667,52.533333 -63.466667,75.733333 63.466667,110.933333 63.466667,146.133333 -72.802381,163.733333 91.47381,163.733333 100.809524,163.733333 110.145238,163.733333 -119.480953,163.733333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,180.533333 121.066667,182.933333 -114.346667,185.333333" /> -<path d="M 68.266667,19.733333 - C 68.266667,20.533333 68.266667,21.333333 68.266667,22.133333 68.266667,23.733333 -65.866667,30.133333 61.066667,41.333333 56.266667,52.533333 -53.866667,78.933333 53.866667,120.533333 53.866667,162.133333 -64.802381,182.933333 86.67381,182.933333 97.609524,182.933333 108.545238,182.933333 -119.480953,182.933333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,199.733333 121.066667,202.133333 -114.346667,204.533333" /> -<path d="M 49.066667,19.733333 - C 49.066667,20.533333 49.066667,21.333333 49.066667,22.133333 49.066667,23.733333 -48.266667,30.133333 46.666667,41.333333 45.066667,52.533333 -44.266667,82.133333 44.266667,130.133333 44.266667,178.133333 -56.802381,202.133333 81.87381,202.133333 94.409524,202.133333 106.945238,202.133333 -119.480953,202.133333" /> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/ConnDPV.m4 b/graphics/circuit_macros/examples/dpv/ConnDPV.m4 index 9500cd8dd0..dd777f1fe4 100644 --- a/graphics/circuit_macros/examples/dpv/ConnDPV.m4 +++ b/graphics/circuit_macros/examples/dpv/ConnDPV.m4 @@ -3,65 +3,73 @@ cct_init(svg_font(sans-serif,10.5bp__)) T:[ + ifelse(ifmpost(T)`'ifpostscript(T),,`command "{\sf"') S1: tstrip(U) thinlines_ arrow <- left 0.15 from S1.L1; "L1" rjust arrow <- left 0.15 from S1.L4; "L4" wid 0.2 rjust - "..." at (0.5 between last "" and 2nd last "")+(-0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0,0.02) arrow <- right 0.25 from S1.R1; "R1" ljust arrow <- right 0.25 from S1.R4; "R4" ljust - "..." at (0.5 between last "" and 2nd last "")+(0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0.05,0.02) arrow <- right 0.15 up 0.10 from S1.T1; "T1" ljust arrow <- right 0.15 up 0.10 from S1.T4; "T4" ljust - "..." at (0.5 between last "" and 2nd last "")+(0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0.15,0.02) thicklines_ CS1: "`tstrip(U)'" at S1.s+(0,-0.15) - S2: tstrip(R,5,DO;wid=1.0;ht=0.25) with .sw at S1.se+(0.7,0.15) + S2: tstrip(R,5,DO;wid=1.0;ht=0.25) with .sw at S1.se+(0.8,0.15) thinlines_ arrow <- up 0.2 right 0.1 from S2.T1; "T1" above arrow <- up 0.2 right 0.1 from S2.T5; "T5" above "..." at 0.5 between last "" and 2nd last "" above - CS2: `"tstrip(R,5,"' ljust \ - `" DO;wid=1.0;ht=0.25)"' ljust at S2.sw+(-0.1,-0.2) + CS2: `"tstrip(R,5,"' ht 0.1 ljust \ + `"DO;wid=1.0;ht=0.25)"' ljust at S2.sw+(-0.1,-0.2) + ifelse(ifmpost(T)`'ifpostscript(T),,`command "}"') ] C: [ C1: ccoax - `"ccoax "' at C1.s below + `"ccoax"' at C1.s below thinlines_ - arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust - arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ljust + arrow <- down 0.05 left 0.15 from C1.C.w; "svg_it(C)" rjust + arrow <- down 0.05 right 0.1 from C1.S.e; "svg_it(S)" ljust thicklines_ - C2: ccoax(at C1+(0,0.3),F) - `"ccoax(,F)"' wid 0.65 at C2.ne ljust - ] with .C1.sw at T.S2.se+(0.6,0.0) + C2: ccoax(at C1+(0,0.4),F) + `"ccoax(,F)"' at C2.s below + ] with .w at T.e+(0.6,0.0) + +B: [ + tbox(V_2) + { "`tbox'(V`'svg_sub(2))" at last [].s below } + tbox(V_1,,,<) at last []+(0,-0.4) + { "`tbox'(V`'svg_sub(1),,,svg_lt)" at last [].s below } + tbox(V_1,,,<>) at last []+(0,-0.4) + { "`tbox'(V`'svg_sub(1),,,svg_lt`'svg_gt)" at last [].s below } +] with .w at C.e + (0.5,-0.1) Y: [ - tconn(,O) - {`"tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } + P1: tconn(,O) + {"`tconn'(,O)" at last line.c+(0,-0.2) wid 43 pt__ } move to Here+(0.3,0) - P1: tconn(,>) - {`"(,>)"' at last line.c+(0,-0.2)} - move to P1.end+(0.3,0) - tconn(,>>) - {`"(,>>)"' at last line.c+(0,-0.2)} - move to P1.start+(0,linewid) - P3: tconn(,<) - {`"tconn(,<)"' at last line.c+(0,-0.2)} + P2: tconn(,>) + {"...(,svg_gt)" at last line.c+(0,-0.2)} + move to P2.end+(0.3,0) + P3: tconn(,>>) + {"...(,svg_gt`'svg_gt)" at last line.c+(0,-0.2)} move to P3.end+(0.3,0) - tconn(,<<) - {`"(,<<)"' at last line.c+(0,-0.2)} + P4: tconn(,<) + {"...(,svg_lt)" at last line.c+(0,-0.2)} + move to P4.end+(0.3,0) + P5: tconn(,<<) + {"...(,svg_lt`'svg_lt)" at last line.c+(0,-0.2)} + move to P5.end+(0.3,0) + P6: tconn(,A) + {`"...(,A)"' at last line.c+(0,-0.2)} + move to P6.end+(0.3,0) + P7: tconn(,M) + {`"...(,M)"' at last line.c+(0,-0.2)} -] with .sw at (C.e.x-0.3,T.s.y) - -B: [ - tbox(V`'svg_sub(1)) - { `"tbox'(V`'svg_sub(1))" wid 47bp__ with .nw at last [].sw+(0,-4bp__) } - tbox(V`'svg_sub(2),,,<) with .sw at last [].se+(0.75,0) - { `"tbox'(V`'svg_sub(2)`,,,<)"' at last [].s below } - tbox(V`'svg_sub(3),,,<>) with .sw at last [].se+(0.75,0) - { `"tbox'(V`'svg_sub(3)`,,,<>)"' at last [].s below } -] with .nw at T.sw+(0,-0.2) +] with .nw at T.sw+(0,-0.35) command "</g>" # end font .PE diff --git a/graphics/circuit_macros/examples/dpv/ConnectorsDPV.pic b/graphics/circuit_macros/examples/dpv/ConnectorsDPV.pic deleted file mode 100644 index 1fe2aeabfa..0000000000 --- a/graphics/circuit_macros/examples/dpv/ConnectorsDPV.pic +++ /dev/null @@ -1,368 +0,0 @@ -.PS -# ConnectorsDPV.m4 -# log_init Version 10.1: SVG m4 macro settings. - - # gen_init Version 10.1: SVG m4 macro settings. - - - define rpoint__ { - rp_wid = last line.end.x-last line.start.x - rp_ht = last line.end.y-last line.start.y - rp_len = sqrt(abs((rp_wid)^2+(rp_ht)^2)); move to last line.start - rp_ang = atan2(rp_ht,rp_wid) } - - rtod_ = 57.295779513082323; dtor_ = 0.017453292519943295 - twopi_ = 6.2831853071795862; pi_ = (twopi_/2) - rp_ang = 0; right - - - linethick = 0.8 - arrowwid = 0.05*scale; arrowht = 0.1*scale - - - # gen_init end - - -# log_init end - - - -m4thtmp=textht; dptextratio=0.71; m4thtmp=textht; textht=(8.5*(scale/72))*dptextratio; -command "<g style=\"font-family:sans-serif\" ->" - - -#vg_rot_init(test) - -# svg_rot_init begin - if dpicopt > 0 then { copy "/cygdrive/d/Dwight/lib/dpictools.pic" } - - -# Extract from the .svg file the x= y= coordinates -# that appear after each transform="rotate(.." line - retcode = ( sh "awk -e \"/transform=\\"rotate/ { r=1 }; /x=\\".*y=\\"/ { if(r==1){ print; r=0 } }\" ConnectorsDPV.tmp | sed -e \"s/x=\\"\([0-9.]*\)\\" y=\\"\([0-9.]*\)\\".*/\1 \2/\" > ConnectorsDPV.cor" ) - if retcode != 0 then { print " - Awk failure. - Awk and sed are required by svg_rot to rotate svg text. - " } - svgrot_k = 0 - define svg_rotcoords { if "$1" != "" then { svgrot_k += 1 - svg_rx[svgrot_k] = $1; svg_ry[svgrot_k] = $2 } - } - copythru(svg_rotcoords, ConnectorsDPV.cor) - sh "rm -f ConnectorsDPV.tmp ConnectorsDPV.cor" - svgrot_i = 0 - - -# `svg_rot(degrees,"text",[at position]) -# Rotate text degrees ccw -# Requires svg_rot_init(filename) -# which uses both awk and sed. -# The source must be processed twice by m4 and dpic.' - define svg_rot { if retcode != 0 then {$2} else { - if "$1" != "" then { svg_rang = -($1) } else { svg_rang = -90 } - if svgrot_k != 0 then { svgrot_i +=1 - command sprintf("<g transform=\"rotate(%g %g %g)\">",svg_rang,\ - svg_rx[svgrot_i]+textht/2*sin((svg_rang)*dtor_),\ - svg_ry[svgrot_i]+textht/2*(1-cos((svg_rang)*dtor_))) }\ - else { command sprintf("<g transform=\"rotate(%g)\">",svg_rang) } - if "$3"=="" then { $2 } \ - else { $2 $3 - (sin((svg_rang)*dtor_),(cos((svg_rang)*dtor_)-1))*textht/2 } - command "</g>" } } - - -# svg_rot_init end - - -# ArduinoUno -# "Arduino Uno Rev 3" at last [].Connector.s below - Ar: [ - # - Connector: box wid 24*(linewid/10) ht 20*(3*(linewid/10)) -# - plen = 2*(linewid/10) -# -Pin6: line left plen from Connector.nw-(0,(5+1)*(3*(linewid/10))) - { "IOREF" ljust at last line.start } -Pin7: line left plen from Connector.nw-(0,(5+2)*(3*(linewid/10))) - { "RESET" ljust at last line.start } -Pin8: line left plen from Connector.nw-(0,(5+3)*(3*(linewid/10))) - { "<tspan font-style=\"italic\">+</tspan>3V3" ljust at last line.start } -Pin9: line left plen from Connector.nw-(0,(5+4)*(3*(linewid/10))) - { "<tspan font-style=\"italic\">+</tspan>5V" ljust at last line.start } -Pin10: line left plen from Connector.nw-(0,(5+5)*(3*(linewid/10))) - { "GND" ljust at last line.start } -Pin11: line left plen from Connector.nw-(0,(5+6)*(3*(linewid/10))) - { "GND" ljust at last line.start } -Pin12: line left plen from Connector.nw-(0,(5+7)*(3*(linewid/10))) - { "VIN" ljust at last line.start } - -Pin14: line left plen from Connector.nw-(0,(5+9)*(3*(linewid/10))) - { "A0" ljust at last line.start } -Pin15: line left plen from Connector.nw-(0,(5+10)*(3*(linewid/10))) - { "A1" ljust at last line.start } -Pin16: line left plen from Connector.nw-(0,(5+11)*(3*(linewid/10))) - { "A2" ljust at last line.start } -Pin17: line left plen from Connector.nw-(0,(5+12)*(3*(linewid/10))) - { "A3" ljust at last line.start } -Pin18: line left plen from Connector.nw-(0,(5+13)*(3*(linewid/10))) - { "A4" ljust at last line.start } -Pin19: line left plen from Connector.nw-(0,(5+14)*(3*(linewid/10))) - { "A5" ljust at last line.start } - -# -Pin21: line right plen from Connector.ne-(0,1*(3*(linewid/10))) - { "SCL" rjust at last line.start } -Pin20: line right plen from Connector.ne-(0,2*(3*(linewid/10))) - { "SDA" rjust at last line.start } -Pin19: line right plen from Connector.ne-(0,3*(3*(linewid/10))) - { "AREF" rjust at last line.start } -Pin18: line right plen from Connector.ne-(0,4*(3*(linewid/10))) - { "GND" rjust at last line.start } -Pin17: line right plen from Connector.ne-(0,5*(3*(linewid/10))) - { "~D13" rjust at last line.start } -Pin16: line right plen from Connector.ne-(0,6*(3*(linewid/10))) - { "D12" rjust at last line.start } -Pin15: line right plen from Connector.ne-(0,7*(3*(linewid/10))) - { "~D11" rjust at last line.start } -Pin14: line right plen from Connector.ne-(0,8*(3*(linewid/10))) - { "~D10" rjust at last line.start } -Pin13: line right plen from Connector.ne-(0,9*(3*(linewid/10))) - { "~D9" rjust at last line.start } -Pin12: line right plen from Connector.ne-(0,10*(3*(linewid/10))) - { "D8" rjust at last line.start } - -Pin10: line right plen from Connector.ne-(0,12*(3*(linewid/10))) - { "D7" rjust at last line.start } -Pin9: line right plen from Connector.ne-(0,13*(3*(linewid/10))) - { "~D6" rjust at last line.start } -Pin8: line right plen from Connector.ne-(0,14*(3*(linewid/10))) - { "~D5" rjust at last line.start } -Pin7: line right plen from Connector.ne-(0,15*(3*(linewid/10))) - { "D4" rjust at last line.start } -Pin6: line right plen from Connector.ne-(0,16*(3*(linewid/10))) - { "~D3" rjust at last line.start } -Pin5: line right plen from Connector.ne-(0,17*(3*(linewid/10))) - { "D2" rjust at last line.start } -Pin4: line right plen from Connector.ne-(0,18*(3*(linewid/10))) - { "TX D1" rjust at last line.start } -Pin3: line right plen from Connector.ne-(0,19*(3*(linewid/10))) - { "RX D0" rjust at last line.start } - -# - ] #with .sw at last [].se+(0.25,0) - "Arduino Leonardo" at last [].Connector.s below - - RPI: [ - # - GPIO: box wid 34*(linewid/10) ht 21*(3*(linewid/10)) - plen = 6*(linewid/10) -# -define A_LeftGPIO { - exec sprintf("Pin%g: line left plen from GPIO.nw-(0,%g)",\ - 2*($1)-1,($1)*(3*(linewid/10))) - { "$3" ljust at last line.start } - "$2" at last line.c above } -# -A_LeftGPIO(1,,3V3) -A_LeftGPIO(2,2,SDA1) -A_LeftGPIO(3,3,SCL1) -A_LeftGPIO(4,4,GPIO_GCLK) -A_LeftGPIO(5,,GND) -A_LeftGPIO(6,17,GPIO_GEN0) -A_LeftGPIO(7,27,GPIO_GEN2) -A_LeftGPIO(8,22,GPIO_GEN3) -A_LeftGPIO(9,,3V3) -A_LeftGPIO(10,10,SPI_MOSI) -A_LeftGPIO(11,9,SPI_MISO) -A_LeftGPIO(12,11,SPI_SCLK) -A_LeftGPIO(13,,GND) -A_LeftGPIO(14,,ID_SD) -A_LeftGPIO(15,5,) -A_LeftGPIO(16,6,) -A_LeftGPIO(17,13,) -A_LeftGPIO(18,19,) -A_LeftGPIO(19,26,) -A_LeftGPIO(20,,GND ) - -# -define A_RightGPIO { - exec sprintf("Pin%g: line right plen from GPIO.ne-(0,%g)",\ - 2*($1),($1)*(3*(linewid/10))) - { "$3" rjust at last line.start } - "$2" at last line.c above } -# -A_RightGPIO(1,,5V) -A_RightGPIO(2,,5V) -A_RightGPIO(3,,GND) -A_RightGPIO(4,14,TXD0) -A_RightGPIO(5,15,RXD0) -A_RightGPIO(6,18,GPIO_GEN1) -A_RightGPIO(7,,GND) -A_RightGPIO(8,23,GPIO_GEN4) -A_RightGPIO(9,24,GPIO_GEN5) -A_RightGPIO(10,,GND) -A_RightGPIO(11,25,GPIO_GEN6) -A_RightGPIO(12,8,SPI_CEO_N) -A_RightGPIO(13,7,SPI_CE1_N) -A_RightGPIO(14,,ID_SC) -A_RightGPIO(15,,GND) -A_RightGPIO(16,12,) -A_RightGPIO(17,,GND) -A_RightGPIO(18,16,) -A_RightGPIO(19,20,) -A_RightGPIO(20,21, ) - -# - ] with .sw at last [].se+(0.25,0) - "Raspberry Pi 4 GPIO" at last [].GPIO.s below - - HD: [ - # - Base:[line up 19*(3*(linewid/10))+16*(linewid/10)*2/3/2 then right 16*(linewid/10)*2/3 \ - then right 16*(linewid/10)/3 down 16*(linewid/10)/3 \ - then down 19*(3*(linewid/10))+16*(linewid/10)*2/3-2*16*(linewid/10)/3 then down 16*(linewid/10)/3 left 16*(linewid/10)/3 \ - then left 16*(linewid/10)*2/3 then to Here] - plen = 6*(linewid/10) -# - Pin1: line left plen from Base.nw-(0,16*(linewid/10)/3+(1-1/2)*(3*(linewid/10))) - {"HPD" ljust at last line.start} - "1" at last line.c above -Pin2: line left plen from Base.nw-(0,16*(linewid/10)/3+(2-1/2)*(3*(linewid/10))) - {"UTILITY" ljust at last line.start} - "2" at last line.c above -Pin3: line left plen from Base.nw-(0,16*(linewid/10)/3+(3-1/2)*(3*(linewid/10))) - {"D2<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "3" at last line.c above -Pin4: line left plen from Base.nw-(0,16*(linewid/10)/3+(4-1/2)*(3*(linewid/10))) - {"D2_SH" ljust at last line.start} - "4" at last line.c above -Pin5: line left plen from Base.nw-(0,16*(linewid/10)/3+(5-1/2)*(3*(linewid/10))) - {"D2<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "5" at last line.c above -Pin6: line left plen from Base.nw-(0,16*(linewid/10)/3+(6-1/2)*(3*(linewid/10))) - {"D1<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "6" at last line.c above -Pin7: line left plen from Base.nw-(0,16*(linewid/10)/3+(7-1/2)*(3*(linewid/10))) - {"D1_SH" ljust at last line.start} - "7" at last line.c above -Pin8: line left plen from Base.nw-(0,16*(linewid/10)/3+(8-1/2)*(3*(linewid/10))) - {"D1<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "8" at last line.c above -Pin9: line left plen from Base.nw-(0,16*(linewid/10)/3+(9-1/2)*(3*(linewid/10))) - {"D0<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "9" at last line.c above -Pin10: line left plen from Base.nw-(0,16*(linewid/10)/3+(10-1/2)*(3*(linewid/10))) - {"D0_SH" ljust at last line.start} - "10" at last line.c above -Pin11: line left plen from Base.nw-(0,16*(linewid/10)/3+(11-1/2)*(3*(linewid/10))) - {"D0<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "11" at last line.c above -Pin12: line left plen from Base.nw-(0,16*(linewid/10)/3+(12-1/2)*(3*(linewid/10))) - {"CLK<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "12" at last line.c above -Pin13: line left plen from Base.nw-(0,16*(linewid/10)/3+(13-1/2)*(3*(linewid/10))) - {"CLK_SH" ljust at last line.start} - "13" at last line.c above -Pin14: line left plen from Base.nw-(0,16*(linewid/10)/3+(14-1/2)*(3*(linewid/10))) - {"CLK<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "14" at last line.c above -Pin15: line left plen from Base.nw-(0,16*(linewid/10)/3+(15-1/2)*(3*(linewid/10))) - {"CEC" ljust at last line.start} - "15" at last line.c above -Pin16: line left plen from Base.nw-(0,16*(linewid/10)/3+(16-1/2)*(3*(linewid/10))) - {"GND" ljust at last line.start} - "16" at last line.c above -Pin17: line left plen from Base.nw-(0,16*(linewid/10)/3+(17-1/2)*(3*(linewid/10))) - {"SCL" ljust at last line.start} - "17" at last line.c above -Pin18: line left plen from Base.nw-(0,16*(linewid/10)/3+(18-1/2)*(3*(linewid/10))) - {"SDA" ljust at last line.start} - "18" at last line.c above -Pin19: line left plen from Base.nw-(0,16*(linewid/10)/3+(19-1/2)*(3*(linewid/10))) - {"<tspan font-style=\"italic\">+</tspan>5V" ljust at last line.start} - "19" at last line.c above - -L1: line from Base.nw+(16*(linewid/10)*2/3-(3*(linewid/10)),0) up plen - svg_rot(90,"21",at last line.c +(-4*(scale/72),0)) - svg_rot(90,"SH2",at last line.start + (4*(scale/72),-8*(scale/72))) - line from Base.nw+(16*(linewid/10)*2/3-2*(3*(linewid/10)),0) up plen - svg_rot(90,"20",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH1",at last line.start + (4*(scale/72),-8*(scale/72))) - line from Base.sw+(16*(linewid/10)*2/3-(3*(linewid/10)),0) down plen - svg_rot(90,"23",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH4",at last line.start + (4*(scale/72),14*(scale/72))) - line from Base.sw+(16*(linewid/10)*2/3-2*(3*(linewid/10)),0) down plen - svg_rot(90,"22",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH3",at last line.start + (4*(scale/72),14*(scale/72))) -# - ] with .nw at last [].ne+(0.25,0.5) - "Micro" rjust at HD.Base.sw "HDMI" rjust - - S: [ - # - Base: box wid 18*(linewid/10) ht 14*(3*(linewid/10)) rad 5/3*(3*(linewid/10)) - plen = 6*(linewid/10) -# - B12: line left plen from Base.n-(18*(linewid/10)/2,(1+0.5)*(3*(linewid/10))) - {"GND" ljust at last line.start} -B11: line left plen from Base.n-(18*(linewid/10)/2,(2+0.5)*(3*(linewid/10))) - {"RX1<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B10: line left plen from Base.n-(18*(linewid/10)/2,(3+0.5)*(3*(linewid/10))) - {"RX1<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B9: line left plen from Base.n-(18*(linewid/10)/2,(4+0.5)*(3*(linewid/10))) - {"VBUS" ljust at last line.start} -B8: line left plen from Base.n-(18*(linewid/10)/2,(5+0.5)*(3*(linewid/10))) - {"SBU2" ljust at last line.start} -B7: line left plen from Base.n-(18*(linewid/10)/2,(6+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B6: line left plen from Base.n-(18*(linewid/10)/2,(7+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B5: line left plen from Base.n-(18*(linewid/10)/2,(8+0.5)*(3*(linewid/10))) - {"CC2" ljust at last line.start} -B4: line left plen from Base.n-(18*(linewid/10)/2,(9+0.5)*(3*(linewid/10))) - {"VBUS" ljust at last line.start} -B3: line left plen from Base.n-(18*(linewid/10)/2,(10+0.5)*(3*(linewid/10))) - {"TX2<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B2: line left plen from Base.n-(18*(linewid/10)/2,(11+0.5)*(3*(linewid/10))) - {"TX2<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B1: line left plen from Base.n-(18*(linewid/10)/2,(12+0.5)*(3*(linewid/10))) - {"GND" ljust at last line.start} - -# - A1: line right plen from Base.n+(18*(linewid/10)/2,-(1+0.5)*(3*(linewid/10))) - {"GND" rjust at last line.start} -A2: line right plen from Base.n+(18*(linewid/10)/2,-(2+0.5)*(3*(linewid/10))) - {"TX1<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A3: line right plen from Base.n+(18*(linewid/10)/2,-(3+0.5)*(3*(linewid/10))) - {"TX1<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A4: line right plen from Base.n+(18*(linewid/10)/2,-(4+0.5)*(3*(linewid/10))) - {"VBUS" rjust at last line.start} -A5: line right plen from Base.n+(18*(linewid/10)/2,-(5+0.5)*(3*(linewid/10))) - {"CC1" rjust at last line.start} -A6: line right plen from Base.n+(18*(linewid/10)/2,-(6+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A7: line right plen from Base.n+(18*(linewid/10)/2,-(7+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A8: line right plen from Base.n+(18*(linewid/10)/2,-(8+0.5)*(3*(linewid/10))) - {"SBU1" rjust at last line.start} -A9: line right plen from Base.n+(18*(linewid/10)/2,-(9+0.5)*(3*(linewid/10))) - {"VBUS" rjust at last line.start} -A10: line right plen from Base.n+(18*(linewid/10)/2,-(10+0.5)*(3*(linewid/10))) - {"RX2<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A11: line right plen from Base.n+(18*(linewid/10)/2,-(11+0.5)*(3*(linewid/10))) - {"RX2<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A12: line right plen from Base.n+(18*(linewid/10)/2,-(12+0.5)*(3*(linewid/10))) - {"GND" rjust at last line.start} - -# - ] with .sw at (HD.e.x+0.25,RPI.s.y) - "USB-C Socket" at S.Base.s below - "B12" at S.B12.end above ljust - "B1" at S.B1.end above ljust - "A1" at S.A1.end above rjust - "A12" at S.A12.end above rjust - - command "</g>" - -.PE diff --git a/graphics/circuit_macros/examples/dpv/ConnectorsDPV.svg b/graphics/circuit_macros/examples/dpv/ConnectorsDPV.svg deleted file mode 100644 index 4b63a641be..0000000000 --- a/graphics/circuit_macros/examples/dpv/ConnectorsDPV.svg +++ /dev/null @@ -1,853 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="681" height="387" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="680px" height="385.6px" - viewBox="0 0 680 385.6" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="10.666667" y="62.933333" width="115.2" height="288" /> -<line x1="10.666667" y1="149.333333" x2="1.066667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="153.356667">IOREF</text> -<line x1="10.666667" y1="163.733333" x2="1.066667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="167.756667">RESET</text> -<line x1="10.666667" y1="178.133333" x2="1.066667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="182.156667"><tspan font-style="italic">+</tspan>3V3</text> -<line x1="10.666667" y1="192.533333" x2="1.066667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="196.556667"><tspan font-style="italic">+</tspan>5V</text> -<line x1="10.666667" y1="206.933333" x2="1.066667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="210.956667">GND</text> -<line x1="10.666667" y1="221.333333" x2="1.066667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="225.356667">GND</text> -<line x1="10.666667" y1="235.733333" x2="1.066667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="239.756667">VIN</text> -<line x1="10.666667" y1="264.533333" x2="1.066667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="268.556667">A0</text> -<line x1="10.666667" y1="278.933333" x2="1.066667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="282.956667">A1</text> -<line x1="10.666667" y1="293.333333" x2="1.066667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="297.356667">A2</text> -<line x1="10.666667" y1="307.733333" x2="1.066667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="311.756667">A3</text> -<line x1="10.666667" y1="322.133333" x2="1.066667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="326.156667">A4</text> -<line x1="10.666667" y1="336.533333" x2="1.066667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="340.556667">A5</text> -<line x1="125.866667" y1="77.333333" x2="135.466667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="81.356667">SCL</text> -<line x1="125.866667" y1="91.733333" x2="135.466667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="95.756667">SDA</text> -<line x1="125.866667" y1="106.133333" x2="135.466667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="110.156667">AREF</text> -<line x1="125.866667" y1="120.533333" x2="135.466667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="124.556667">GND</text> -<line x1="125.866667" y1="134.933333" x2="135.466667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="138.956667">~D13</text> -<line x1="125.866667" y1="149.333333" x2="135.466667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="153.356667">D12</text> -<line x1="125.866667" y1="163.733333" x2="135.466667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="167.756667">~D11</text> -<line x1="125.866667" y1="178.133333" x2="135.466667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="182.156667">~D10</text> -<line x1="125.866667" y1="192.533333" x2="135.466667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="196.556667">~D9</text> -<line x1="125.866667" y1="206.933333" x2="135.466667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="210.956667">D8</text> -<line x1="125.866667" y1="235.733333" x2="135.466667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="239.756667">D7</text> -<line x1="125.866667" y1="250.133333" x2="135.466667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="254.156667">~D6</text> -<line x1="125.866667" y1="264.533333" x2="135.466667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="268.556667">~D5</text> -<line x1="125.866667" y1="278.933333" x2="135.466667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="282.956667">D4</text> -<line x1="125.866667" y1="293.333333" x2="135.466667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="297.356667">~D3</text> -<line x1="125.866667" y1="307.733333" x2="135.466667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="311.756667">D2</text> -<line x1="125.866667" y1="322.133333" x2="135.466667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="326.156667">TX D1</text> -<line x1="125.866667" y1="336.533333" x2="135.466667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="340.556667">RX D0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="68.266667" y="361.646667">Arduino Leonardo</text> -<rect x="188.266667" y="48.533333" width="163.2" height="302.4" /> -<line x1="188.266667" y1="62.933333" x2="159.466667" y2="62.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="66.956667">3V3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="60.266667"></text> -<line x1="188.266667" y1="77.333333" x2="159.466667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="81.356667">SDA1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="74.666667">2</text> -<line x1="188.266667" y1="91.733333" x2="159.466667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="95.756667">SCL1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="89.066667">3</text> -<line x1="188.266667" y1="106.133333" x2="159.466667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="110.156667">GPIO_GCLK</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="103.466667">4</text> -<line x1="188.266667" y1="120.533333" x2="159.466667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="124.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="117.866667"></text> -<line x1="188.266667" y1="134.933333" x2="159.466667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="138.956667">GPIO_GEN0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="132.266667">17</text> -<line x1="188.266667" y1="149.333333" x2="159.466667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="153.356667">GPIO_GEN2</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="146.666667">27</text> -<line x1="188.266667" y1="163.733333" x2="159.466667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="167.756667">GPIO_GEN3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="161.066667">22</text> -<line x1="188.266667" y1="178.133333" x2="159.466667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="182.156667">3V3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="175.466667"></text> -<line x1="188.266667" y1="192.533333" x2="159.466667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="196.556667">SPI_MOSI</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="189.866667">10</text> -<line x1="188.266667" y1="206.933333" x2="159.466667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="210.956667">SPI_MISO</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="204.266667">9</text> -<line x1="188.266667" y1="221.333333" x2="159.466667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="225.356667">SPI_SCLK</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="218.666667">11</text> -<line x1="188.266667" y1="235.733333" x2="159.466667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="239.756667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="233.066667"></text> -<line x1="188.266667" y1="250.133333" x2="159.466667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="254.156667">ID_SD</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="247.466667"></text> -<line x1="188.266667" y1="264.533333" x2="159.466667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="268.556667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="261.866667">5</text> -<line x1="188.266667" y1="278.933333" x2="159.466667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="282.956667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="276.266667">6</text> -<line x1="188.266667" y1="293.333333" x2="159.466667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="297.356667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="290.666667">13</text> -<line x1="188.266667" y1="307.733333" x2="159.466667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="311.756667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="305.066667">19</text> -<line x1="188.266667" y1="322.133333" x2="159.466667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="326.156667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="319.466667">26</text> -<line x1="188.266667" y1="336.533333" x2="159.466667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="340.556667">GND </text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="333.866667"></text> -<line x1="351.466667" y1="62.933333" x2="380.266667" y2="62.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="66.956667">5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="60.266667"></text> -<line x1="351.466667" y1="77.333333" x2="380.266667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="81.356667">5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="74.666667"></text> -<line x1="351.466667" y1="91.733333" x2="380.266667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="95.756667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="89.066667"></text> -<line x1="351.466667" y1="106.133333" x2="380.266667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="110.156667">TXD0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="103.466667">14</text> -<line x1="351.466667" y1="120.533333" x2="380.266667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="124.556667">RXD0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="117.866667">15</text> -<line x1="351.466667" y1="134.933333" x2="380.266667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="138.956667">GPIO_GEN1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="132.266667">18</text> -<line x1="351.466667" y1="149.333333" x2="380.266667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="153.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="146.666667"></text> -<line x1="351.466667" y1="163.733333" x2="380.266667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="167.756667">GPIO_GEN4</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="161.066667">23</text> -<line x1="351.466667" y1="178.133333" x2="380.266667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="182.156667">GPIO_GEN5</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="175.466667">24</text> -<line x1="351.466667" y1="192.533333" x2="380.266667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="196.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="189.866667"></text> -<line x1="351.466667" y1="206.933333" x2="380.266667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="210.956667">GPIO_GEN6</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="204.266667">25</text> -<line x1="351.466667" y1="221.333333" x2="380.266667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="225.356667">SPI_CEO_N</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="218.666667">8</text> -<line x1="351.466667" y1="235.733333" x2="380.266667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="239.756667">SPI_CE1_N</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="233.066667">7</text> -<line x1="351.466667" y1="250.133333" x2="380.266667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="254.156667">ID_SC</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="247.466667"></text> -<line x1="351.466667" y1="264.533333" x2="380.266667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="268.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="261.866667"></text> -<line x1="351.466667" y1="278.933333" x2="380.266667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="282.956667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="276.266667">12</text> -<line x1="351.466667" y1="293.333333" x2="380.266667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="297.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="290.666667"></text> -<line x1="351.466667" y1="307.733333" x2="380.266667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="311.756667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="305.066667">16</text> -<line x1="351.466667" y1="322.133333" x2="380.266667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="326.156667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="319.466667">20</text> -<line x1="351.466667" y1="336.533333" x2="380.266667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="340.556667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="333.866667">21</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="269.866667" y="361.646667">Raspberry Pi 4 GPIO</text> -<polyline points="433.066667,328.533333 433.066667,29.333333 -484.266667,29.333333 -509.866667,54.933333 -509.866667,328.533333 -484.266667,354.133333 -433.066667,354.133333 -433.066667,328.533333" /> -<line x1="433.066667" y1="62.133333" x2="404.266667" y2="62.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="66.156667">HPD</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="59.466667">1</text> -<line x1="433.066667" y1="76.533333" x2="404.266667" y2="76.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="80.556667">UTILITY</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="73.866667">2</text> -<line x1="433.066667" y1="90.933333" x2="404.266667" y2="90.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="94.956667">D2<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="88.266667">3</text> -<line x1="433.066667" y1="105.333333" x2="404.266667" y2="105.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="109.356667">D2_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="102.666667">4</text> -<line x1="433.066667" y1="119.733333" x2="404.266667" y2="119.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="123.756667">D2<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="117.066667">5</text> -<line x1="433.066667" y1="134.133333" x2="404.266667" y2="134.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="138.156667">D1<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="131.466667">6</text> -<line x1="433.066667" y1="148.533333" x2="404.266667" y2="148.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="152.556667">D1_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="145.866667">7</text> -<line x1="433.066667" y1="162.933333" x2="404.266667" y2="162.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="166.956667">D1<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="160.266667">8</text> -<line x1="433.066667" y1="177.333333" x2="404.266667" y2="177.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="181.356667">D0<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="174.666667">9</text> -<line x1="433.066667" y1="191.733333" x2="404.266667" y2="191.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="195.756667">D0_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="189.066667">10</text> -<line x1="433.066667" y1="206.133333" x2="404.266667" y2="206.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="210.156667">D0<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="203.466667">11</text> -<line x1="433.066667" y1="220.533333" x2="404.266667" y2="220.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="224.556667">CLK<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="217.866667">12</text> -<line x1="433.066667" y1="234.933333" x2="404.266667" y2="234.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="238.956667">CLK_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="232.266667">13</text> -<line x1="433.066667" y1="249.333333" x2="404.266667" y2="249.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="253.356667">CLK<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="246.666667">14</text> -<line x1="433.066667" y1="263.733333" x2="404.266667" y2="263.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="267.756667">CEC</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="261.066667">15</text> -<line x1="433.066667" y1="278.133333" x2="404.266667" y2="278.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="282.156667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="275.466667">16</text> -<line x1="433.066667" y1="292.533333" x2="404.266667" y2="292.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="296.556667">SCL</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="289.866667">17</text> -<line x1="433.066667" y1="306.933333" x2="404.266667" y2="306.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="310.956667">SDA</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="304.266667">18</text> -<line x1="433.066667" y1="321.333333" x2="404.266667" y2="321.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="325.356667"><tspan font-style="italic">+</tspan>5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="318.666667">19</text> -<line x1="469.866667" y1="29.333333" x2="469.866667" y2="0.533333" /> -<g transform="rotate(-90 468.515 14.9752)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="468.556667" y="14.933333">21</text> -</g> -<g transform="rotate(-90 479.181 40.0419)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="479.223333" y="40">SH2</text> -</g> -<line x1="455.466667" y1="29.333333" x2="455.466667" y2="0.533333" /> -<g transform="rotate(-90 454.115 14.9752)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="454.156667" y="14.933333">20</text> -</g> -<g transform="rotate(-90 464.781 40.0419)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="464.823333" y="40">SH1</text> -</g> -<line x1="469.866667" y1="354.133333" x2="469.866667" y2="382.933333" /> -<g transform="rotate(-90 468.515 368.575)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="468.556667" y="368.533333">23</text> -</g> -<g transform="rotate(-90 479.181 335.509)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="479.223333" y="335.466667">SH4</text> -</g> -<line x1="455.466667" y1="354.133333" x2="455.466667" y2="382.933333" /> -<g transform="rotate(-90 454.115 368.575)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="454.156667" y="368.533333">22</text> -</g> -<g transform="rotate(-90 464.781 335.509)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="464.823333" y="335.466667">SH3</text> -</g> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="430.4" y="352.49">Micro</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="430.4" y="363.823333">HDMI</text> -<rect x="562.666667" y="149.333333" rx="24" ry="24" width="86.4" height="201.6" /> -<line x1="562.666667" y1="170.933333" x2="533.866667" y2="170.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="174.956667">GND</text> -<line x1="562.666667" y1="185.333333" x2="533.866667" y2="185.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="189.356667">RX1<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="199.733333" x2="533.866667" y2="199.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="203.756667">RX1<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="214.133333" x2="533.866667" y2="214.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="218.156667">VBUS</text> -<line x1="562.666667" y1="228.533333" x2="533.866667" y2="228.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="232.556667">SBU2</text> -<line x1="562.666667" y1="242.933333" x2="533.866667" y2="242.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="246.956667">D<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="257.333333" x2="533.866667" y2="257.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="261.356667">D<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="271.733333" x2="533.866667" y2="271.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="275.756667">CC2</text> -<line x1="562.666667" y1="286.133333" x2="533.866667" y2="286.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="290.156667">VBUS</text> -<line x1="562.666667" y1="300.533333" x2="533.866667" y2="300.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="304.556667">TX2<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="314.933333" x2="533.866667" y2="314.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="318.956667">TX2<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="329.333333" x2="533.866667" y2="329.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="333.356667">GND</text> -<line x1="649.066667" y1="170.933333" x2="677.866667" y2="170.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="174.956667">GND</text> -<line x1="649.066667" y1="185.333333" x2="677.866667" y2="185.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="189.356667">TX1<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="199.733333" x2="677.866667" y2="199.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="203.756667">TX1<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="214.133333" x2="677.866667" y2="214.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="218.156667">VBUS</text> -<line x1="649.066667" y1="228.533333" x2="677.866667" y2="228.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="232.556667">CC1</text> -<line x1="649.066667" y1="242.933333" x2="677.866667" y2="242.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="246.956667">D<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="257.333333" x2="677.866667" y2="257.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="261.356667">D<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="271.733333" x2="677.866667" y2="271.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="275.756667">SBU1</text> -<line x1="649.066667" y1="286.133333" x2="677.866667" y2="286.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="290.156667">VBUS</text> -<line x1="649.066667" y1="300.533333" x2="677.866667" y2="300.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="304.556667">RX2<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="314.933333" x2="677.866667" y2="314.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="318.956667">RX2<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="329.333333" x2="677.866667" y2="329.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="333.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="605.866667" y="361.646667">USB-C Socket</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="536.533333" y="168.266667">B12</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="536.533333" y="326.666667">B1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="675.2" y="168.266667">A1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="675.2" y="326.666667">A12</text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/CsourceDPV.svg b/graphics/circuit_macros/examples/dpv/CsourceDPV.svg deleted file mode 100644 index 81aa8f201d..0000000000 --- a/graphics/circuit_macros/examples/dpv/CsourceDPV.svg +++ /dev/null @@ -1,1175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="797" height="428" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="796.4px" height="426.730667px" - viewBox="0 0 796.4 426.730667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<polyline points="106.666667,4.698667 106.666667,16.698667 -110.666667,18.698667 -102.666667,22.698667 -110.666667,26.698667 -102.666667,30.698667 -110.666667,34.698667 -102.666667,38.698667 -106.666667,40.698667 -106.666667,52.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="112" y="26.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="114.666667" y="39.112">150Ω</text> -<circle fill="black" - cx="106.666667" cy="52.698667" r="1.92" /> -<polyline points="106.666667,52.698667 106.666667,62.298667 -107.022222,62.458667" /> -<polyline points="106.666667,100.698667 106.666667,91.098667 -107.022222,90.938667" /> -<line x1="125.866667" y1="67.098667" x2="125.866667" y2="86.298667" /> -<line x1="137.866667" y1="76.698667" x2="125.866667" y2="76.698667" /> -<line x1="106.666667" y1="62.298667" x2="125.866667" y2="70.938667" /> -<polygon stroke-width="0" fill="black" - points="114.8656,63.063959 121.066667,68.778667 -112.676989,67.92754" /> -<line x1="111.466667" y1="64.458667" x2="119.528667" y2="68.086567" /> -<line x1="106.666667" y1="91.098667" x2="125.866667" y2="82.458667" /> -<path d="M 137.866667,76.698667 - A 19.2 19.2 0 0 1 99.466667,76.698667" /> -<line x1="99.466667" y1="76.698667" x2="99.466667" y2="76.698667" /> -<path d="M 99.466667,76.698667 - A 19.2 19.2 0 0 1 137.866667,76.698667" /> -<line x1="137.866667" y1="76.698667" x2="137.866667" y2="76.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="74.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">13</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="98.133333" y="87.112">2N4236</text> -<line x1="106.666667" y1="100.698667" x2="106.666667" y2="323.898667" /> -<polyline points="106.666667,371.898667 106.666667,362.298667 -107.022222,362.138667" /> -<polyline points="106.666667,323.898667 106.666667,333.498667 -107.022222,333.658667" /> -<line x1="125.866667" y1="357.498667" x2="125.866667" y2="338.298667" /> -<line x1="137.866667" y1="347.898667" x2="125.866667" y2="347.898667" /> -<line x1="106.666667" y1="362.298667" x2="125.866667" y2="353.658667" /> -<polygon stroke-width="0" fill="black" - points="119.856345,359.28754 111.466667,360.138667 -117.667733,354.423959" /> -<line x1="113.004666" y1="359.446567" x2="121.066667" y2="355.818667" /> -<line x1="106.666667" y1="333.498667" x2="125.866667" y2="342.138667" /> -<path d="M 137.866667,347.898667 - A 19.2 19.2 0 0 0 99.466667,347.898667" /> -<line x1="99.466667" y1="347.898667" x2="99.466667" y2="347.898667" /> -<path d="M 99.466667,347.898667 - A 19.2 19.2 0 0 0 137.866667,347.898667" /> -<line x1="137.866667" y1="347.898667" x2="137.866667" y2="347.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="345.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">14</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="98.133333" y="358.312">2N4239</text> -<circle fill="black" - cx="106.666667" cy="371.898667" r="1.92" /> -<polyline points="106.666667,371.898667 44.266667,371.898667 -44.266667,323.898667" /> -<polyline points="44.266667,323.898667 44.266667,311.898667 -40.266667,309.898667 -48.266667,305.898667 -40.266667,301.898667 -48.266667,297.898667 -40.266667,293.898667 -48.266667,289.898667 -44.266667,287.898667 -44.266667,275.898667" /> -<polygon stroke-width="0" fill="black" - points="34.666667,297.498667 44.266667,299.898667 -34.666667,302.298667" /> -<line x1="24.266667" y1="299.898667" x2="42.067677" y2="299.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="49.6" y="297.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="52.266667" y="310.312">20kΩ</text> -<line x1="24.266667" y1="299.898667" x2="24.266667" y2="311.898667" /> -<line x1="32.266667" y1="311.898667" x2="16.266667" y2="311.898667" /> -<line x1="29.6" y1="314.898667" x2="18.933333" y2="314.898667" /> -<line x1="27.695238" y1="317.898667" x2="20.838095" y2="317.898667" /> -<polyline points="44.266667,275.898667 44.266667,52.698667 -106.666667,52.698667" /> -<circle fill="black" - cx="106.666667" cy="172.698667" r="1.92" /> -<line x1="106.666667" y1="172.698667" x2="20.266667" y2="172.698667" /> -<line x1="20.266667" y1="172.698667" x2="44.266667" y2="172.698667" /> -<polygon stroke-width="0" fill="black" - points="27.466667,170.298667 37.066667,172.698667 -27.466667,175.098667" /> -<line x1="27.466667" y1="172.698667" x2="34.867677" y2="172.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="32.266667" y="167.632" ->i<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<circle fill="white" - cx="20.266667" cy="172.698667" r="1.92" /> -<circle fill="white" - cx="20.266667" cy="220.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="182.476444">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="200.864" ->V<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="219.251556">-</text> -<line x1="20.266667" y1="222.618667" x2="20.266667" y2="232.698667" /> -<line x1="28.266667" y1="232.698667" x2="12.266667" y2="232.698667" /> -<line x1="25.6" y1="235.698667" x2="14.933333" y2="235.698667" /> -<line x1="23.695238" y1="238.698667" x2="16.838095" y2="238.698667" /> -<polyline points="106.666667,371.898667 106.666667,383.898667 -110.666667,385.898667 -102.666667,389.898667 -110.666667,393.898667 -102.666667,397.898667 -110.666667,401.898667 -102.666667,405.898667 -106.666667,407.898667 -106.666667,419.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="112" y="393.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="114.666667" y="406.312">150Ω</text> -<circle fill="black" - cx="106.666667" cy="244.698667" r="1.92" /> -<line x1="106.666667" y1="244.698667" x2="130.666667" y2="244.698667" /> -<polyline points="130.666667,232.698667 130.666667,208.698667 -178.666667,232.698667 -130.666667,256.698667 -130.666667,232.698667" /> -<line x1="178.666667" y1="232.698667" x2="190.666667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="135.980075" y="224.030933">-</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="135.980075" y="248.030933">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="154.666667" y="236.864" -><tspan font-style="italic">A<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176" y="259.162667">Nexus</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176" y="270.896">SQ-10A</text> -<polyline points="130.666667,220.698667 118.666667,220.698667 -118.666667,196.698667 -166.666667,196.698667" /> -<circle fill="black" - cx="166.666667" cy="196.698667" r="1.92" /> -<polyline points="166.666667,196.698667 166.666667,172.698667 -162.666667,170.698667 -170.666667,166.698667 -162.666667,162.698667 -170.666667,158.698667 -162.666667,154.698667 -170.666667,150.698667 -166.666667,148.698667 -166.666667,124.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="161.333333" y="158.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">14</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="158.666667" y="171.112">19kΩ</text> -<polyline points="166.666667,124.698667 166.666667,52.698667 -106.666667,52.698667" /> -<line x1="166.666667" y1="196.698667" x2="190.666667" y2="196.698667" /> -<circle fill="black" - cx="190.666667" cy="196.698667" r="1.92" /> -<line x1="190.666667" y1="196.698667" x2="190.666667" y2="232.698667" /> -<circle fill="black" - cx="190.666667" cy="232.698667" r="1.92" /> -<polyline points="190.666667,232.698667 190.666667,290.298667 -194.666667,292.298667 -186.666667,296.298667 -194.666667,300.298667 -186.666667,304.298667 -194.666667,308.298667 -186.666667,312.298667 -190.666667,314.298667 -190.666667,371.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="196" y="300.216" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">13</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="198.666667" y="312.712">91kΩ</text> -<line x1="190.666667" y1="371.898667" x2="106.666667" y2="371.898667" /> -<polyline points="190.666667,196.698667 202.666667,196.698667 -204.666667,192.698667 -208.666667,200.698667 -212.666667,192.698667 -216.666667,200.698667 -220.666667,192.698667 -224.666667,200.698667 -226.666667,196.698667 -238.666667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="201.333333" y="211.696" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="204" y="224.192">15kΩ</text> -<circle fill="black" - cx="238.666667" cy="196.698667" r="1.92" /> -<polyline points="238.666667,196.698667 238.666667,220.698667 -250.666667,220.698667" /> -<polyline points="250.666667,232.698667 250.666667,208.698667 -298.666667,232.698667 -250.666667,256.698667 -250.666667,232.698667" /> -<line x1="298.666667" y1="232.698667" x2="310.666667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="255.980075" y="224.030933">-</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="255.980075" y="248.030933">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="274.666667" y="236.864" -><tspan font-style="italic">A<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="296" y="259.162667">Nexus</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="296" y="270.896">SQ-10A</text> -<line x1="250.666667" y1="244.698667" x2="238.666667" y2="244.698667" /> -<line x1="238.666667" y1="244.698667" x2="238.666667" y2="256.698667" /> -<line x1="246.666667" y1="256.698667" x2="230.666667" y2="256.698667" /> -<line x1="244" y1="259.698667" x2="233.333333" y2="259.698667" /> -<line x1="242.095238" y1="262.698667" x2="235.238095" y2="262.698667" /> -<circle fill="black" - cx="310.666667" cy="232.698667" r="1.92" /> -<polyline points="357.466667,275.898667 357.466667,290.298667 -356.403985,290.298667" /> -<polyline points="357.466667,323.898667 357.466667,309.498667 -356.403985,309.498667" /> -<line x1="357.466667" y1="309.498667" x2="340.666667" y2="309.498667" /> -<line x1="340.666667" y1="287.898667" x2="340.666667" y2="311.898667" /> -<line x1="340.666667" y1="299.898667" x2="321.466667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="334.266667,302.565333 326.266667,299.898667 -334.266667,297.232" /> -<line x1="334.266667" y1="299.898667" x2="327.953215" y2="299.898667" /> -<line x1="357.466667" y1="290.298667" x2="340.666667" y2="290.298667" /> -<circle cx="340.666667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="313.466667" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="316.133333" y="280.064">2N5464</text> -<line x1="357.466667" y1="323.898667" x2="369.466667" y2="323.898667" /> -<polyline points="400.666667,347.898667 400.666667,338.298667 -400.311111,338.138667" /> -<polyline points="400.666667,299.898667 400.666667,309.498667 -400.311111,309.658667" /> -<line x1="381.466667" y1="333.498667" x2="381.466667" y2="314.298667" /> -<line x1="369.466667" y1="323.898667" x2="381.466667" y2="323.898667" /> -<line x1="400.666667" y1="338.298667" x2="381.466667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="389.6656,330.423959 395.866667,336.138667 -387.476989,335.28754" /> -<line x1="394.328667" y1="335.446567" x2="386.266667" y2="331.818667" /> -<line x1="400.666667" y1="309.498667" x2="381.466667" y2="318.138667" /> -<path d="M 369.466667,323.898667 - A 19.2 19.2 0 0 1 407.866667,323.898667" /> -<line x1="407.866667" y1="323.898667" x2="407.866667" y2="323.898667" /> -<path d="M 407.866667,323.898667 - A 19.2 19.2 0 1 1 369.466667,323.898667" /> -<line x1="369.466667" y1="323.898667" x2="369.466667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="406.533333" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="409.2" y="334.312">2N4239</text> -<circle fill="black" - cx="400.666667" cy="275.898667" r="1.92" /> -<polyline points="357.466667,275.898667 400.666667,275.898667 -400.666667,299.898667" /> -<polyline points="310.666667,232.698667 310.666667,299.898667 -321.466667,299.898667" /> -<line x1="400.666667" y1="347.898667" x2="400.666667" y2="419.898667" /> -<circle fill="black" - cx="400.666667" cy="419.898667" r="1.92" /> -<line x1="400.666667" y1="251.898667" x2="400.666667" y2="260.434565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,260.434565 -404.666667,260.434565 -400.666667,266.831427 -396.666667,260.434565 -400.666667,260.434565" /> -<polyline points="400.666667,260.434565 404.666667,260.434565 -400.666667,266.831427 -396.666667,260.434565 -400.666667,260.434565" /> -<line x1="396.277698" y1="267.362768" x2="405.055635" y2="267.362768" /> -<line x1="400.666667" y1="267.362768" x2="400.666667" y2="275.898667" /> -<line x1="400.666667" y1="235.898667" x2="400.666667" y2="244.434565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,244.434565 -404.666667,244.434565 -400.666667,250.831427 -396.666667,244.434565 -400.666667,244.434565" /> -<polyline points="400.666667,244.434565 404.666667,244.434565 -400.666667,250.831427 -396.666667,244.434565 -400.666667,244.434565" /> -<line x1="396.277698" y1="251.362768" x2="405.055635" y2="251.362768" /> -<line x1="400.666667" y1="251.362768" x2="400.666667" y2="259.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="240.330667">OMC-V</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="252.064" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="263.797333" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="357.466667,100.698667 357.466667,115.098667 -356.403985,115.098667" /> -<polyline points="357.466667,148.698667 357.466667,134.298667 -356.403985,134.298667" /> -<line x1="357.466667" y1="134.298667" x2="340.666667" y2="134.298667" /> -<line x1="340.666667" y1="112.698667" x2="340.666667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="332.666667,122.032 340.666667,124.698667 -332.666667,127.365333" /> -<line x1="321.466667" y1="124.698667" x2="338.980119" y2="124.698667" /> -<line x1="357.466667" y1="115.098667" x2="340.666667" y2="115.098667" /> -<circle cx="340.666667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="320.133333" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="322.8" y="164.1104">2N3819</text> -<line x1="357.466667" y1="100.698667" x2="369.466667" y2="100.698667" /> -<polyline points="400.666667,76.698667 400.666667,86.298667 -400.311111,86.458667" /> -<polyline points="400.666667,124.698667 400.666667,115.098667 -400.311111,114.938667" /> -<line x1="381.466667" y1="91.098667" x2="381.466667" y2="110.298667" /> -<line x1="369.466667" y1="100.698667" x2="381.466667" y2="100.698667" /> -<line x1="400.666667" y1="86.298667" x2="381.466667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="394.656345,91.92754 386.266667,92.778667 -392.467733,87.063959" /> -<line x1="395.866667" y1="88.458667" x2="387.804666" y2="92.086567" /> -<line x1="400.666667" y1="115.098667" x2="381.466667" y2="106.458667" /> -<path d="M 369.466667,100.698667 - A 19.2 19.2 0 0 0 407.866667,100.698667" /> -<line x1="407.866667" y1="100.698667" x2="407.866667" y2="100.698667" /> -<path d="M 407.866667,100.698667 - A 19.2 19.2 0 0 0 369.466667,100.698667" /> -<line x1="369.466667" y1="100.698667" x2="369.466667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="407.866667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="410.533333" y="111.112">2N4236</text> -<circle fill="black" - cx="400.666667" cy="148.698667" r="1.92" /> -<polyline points="357.466667,148.698667 400.666667,148.698667 -400.666667,124.698667" /> -<line x1="400.666667" y1="148.698667" x2="400.666667" y2="157.234565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,157.234565 -404.666667,157.234565 -400.666667,163.631427 -396.666667,157.234565 -400.666667,157.234565" /> -<polyline points="400.666667,157.234565 404.666667,157.234565 -400.666667,163.631427 -396.666667,157.234565 -400.666667,157.234565" /> -<line x1="396.277698" y1="164.162768" x2="405.055635" y2="164.162768" /> -<line x1="400.666667" y1="164.162768" x2="400.666667" y2="172.698667" /> -<line x1="400.666667" y1="164.698667" x2="400.666667" y2="173.234565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,173.234565 -404.666667,173.234565 -400.666667,179.631427 -396.666667,173.234565 -400.666667,173.234565" /> -<polyline points="400.666667,173.234565 404.666667,173.234565 -400.666667,179.631427 -396.666667,173.234565 -400.666667,173.234565" /> -<line x1="396.277698" y1="180.162768" x2="405.055635" y2="180.162768" /> -<line x1="400.666667" y1="180.162768" x2="400.666667" y2="188.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="169.130667" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="180.864" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="192.597333">OMC-V</text> -<circle fill="black" - cx="400.666667" cy="232.698667" r="1.92" /> -<line x1="400.666667" y1="232.698667" x2="400.666667" y2="188.698667" /> -<polyline points="321.466667,124.698667 310.666667,124.698667 -310.666667,232.698667" /> -<line x1="400.666667" y1="76.698667" x2="400.666667" y2="4.698667" /> -<circle fill="black" - cx="400.666667" cy="4.698667" r="1.92" /> -<circle fill="black" - cx="448.666667" cy="232.698667" r="1.92" /> -<polyline points="496.666667,275.898667 496.666667,290.298667 -495.603985,290.298667" /> -<polyline points="496.666667,323.898667 496.666667,309.498667 -495.603985,309.498667" /> -<line x1="496.666667" y1="309.498667" x2="479.866667" y2="309.498667" /> -<line x1="479.866667" y1="287.898667" x2="479.866667" y2="311.898667" /> -<line x1="479.866667" y1="299.898667" x2="460.666667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="473.466667,302.565333 465.466667,299.898667 -473.466667,297.232" /> -<line x1="473.466667" y1="299.898667" x2="467.153215" y2="299.898667" /> -<line x1="496.666667" y1="290.298667" x2="479.866667" y2="290.298667" /> -<circle cx="479.866667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="452.666667" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">7</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="455.333333" y="280.064">2N5464</text> -<line x1="496.666667" y1="323.898667" x2="508.666667" y2="323.898667" /> -<polyline points="539.866667,347.898667 539.866667,338.298667 -539.511111,338.138667" /> -<polyline points="539.866667,299.898667 539.866667,309.498667 -539.511111,309.658667" /> -<line x1="520.666667" y1="333.498667" x2="520.666667" y2="314.298667" /> -<line x1="508.666667" y1="323.898667" x2="520.666667" y2="323.898667" /> -<line x1="539.866667" y1="338.298667" x2="520.666667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="528.8656,330.423959 535.066667,336.138667 -526.676989,335.28754" /> -<line x1="533.528667" y1="335.446567" x2="525.466667" y2="331.818667" /> -<line x1="539.866667" y1="309.498667" x2="520.666667" y2="318.138667" /> -<path d="M 508.666667,323.898667 - A 19.2 19.2 0 0 1 547.066667,323.898667" /> -<line x1="547.066667" y1="323.898667" x2="547.066667" y2="323.898667" /> -<path d="M 547.066667,323.898667 - A 19.2 19.2 0 1 1 508.666667,323.898667" /> -<line x1="508.666667" y1="323.898667" x2="508.666667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.733333" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">8</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="548.4" y="334.312">2N4239</text> -<circle fill="black" - cx="539.866667" cy="275.898667" r="1.92" /> -<polyline points="496.666667,275.898667 539.866667,275.898667 -539.866667,299.898667" /> -<circle fill="black" - cx="539.866667" cy="347.898667" r="1.92" /> -<line x1="539.866667" y1="347.898667" x2="137.866667" y2="347.898667" /> -<polyline points="496.666667,100.698667 496.666667,115.098667 -495.603985,115.098667" /> -<polyline points="496.666667,148.698667 496.666667,134.298667 -495.603985,134.298667" /> -<line x1="496.666667" y1="134.298667" x2="479.866667" y2="134.298667" /> -<line x1="479.866667" y1="112.698667" x2="479.866667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="471.866667,122.032 479.866667,124.698667 -471.866667,127.365333" /> -<line x1="460.666667" y1="124.698667" x2="478.180119" y2="124.698667" /> -<line x1="496.666667" y1="115.098667" x2="479.866667" y2="115.098667" /> -<circle cx="479.866667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="459.333333" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="462" y="164.1104">2N3819</text> -<line x1="496.666667" y1="100.698667" x2="508.666667" y2="100.698667" /> -<polyline points="539.866667,76.698667 539.866667,86.298667 -539.511111,86.458667" /> -<polyline points="539.866667,124.698667 539.866667,115.098667 -539.511111,114.938667" /> -<line x1="520.666667" y1="91.098667" x2="520.666667" y2="110.298667" /> -<line x1="508.666667" y1="100.698667" x2="520.666667" y2="100.698667" /> -<line x1="539.866667" y1="86.298667" x2="520.666667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="533.856345,91.92754 525.466667,92.778667 -531.667733,87.063959" /> -<line x1="535.066667" y1="88.458667" x2="527.004666" y2="92.086567" /> -<line x1="539.866667" y1="115.098667" x2="520.666667" y2="106.458667" /> -<path d="M 508.666667,100.698667 - A 19.2 19.2 0 0 0 547.066667,100.698667" /> -<line x1="547.066667" y1="100.698667" x2="547.066667" y2="100.698667" /> -<path d="M 547.066667,100.698667 - A 19.2 19.2 0 0 0 508.666667,100.698667" /> -<line x1="508.666667" y1="100.698667" x2="508.666667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.066667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="549.733333" y="111.112">2N4236</text> -<circle fill="black" - cx="539.866667" cy="148.698667" r="1.92" /> -<polyline points="496.666667,148.698667 539.866667,148.698667 -539.866667,124.698667" /> -<circle fill="black" - cx="539.866667" cy="76.698667" r="1.92" /> -<line x1="539.866667" y1="76.698667" x2="137.866667" y2="76.698667" /> -<polyline points="460.666667,299.898667 448.666667,299.898667 -448.666667,124.698667 -460.666667,124.698667" /> -<polyline points="539.866667,148.698667 539.866667,160.698667 -543.866667,162.698667 -535.866667,166.698667 -543.866667,170.698667 -535.866667,174.698667 -543.866667,178.698667 -535.866667,182.698667 -539.866667,184.698667 -539.866667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="534.533333" y="170.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">11</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="531.866667" y="183.112">20Ω</text> -<line x1="539.866667" y1="275.898667" x2="539.866667" y2="257.762768" /> -<polyline stroke-width="0" fill="black" - points="539.866667,257.762768 -535.866667,257.762768 -539.866667,251.365906 -543.866667,257.762768 -539.866667,257.762768" /> -<polyline points="539.866667,257.762768 535.866667,257.762768 -539.866667,251.365906 -543.866667,257.762768 -539.866667,257.762768" /> -<polyline points="544.255635,252.834565 544.255635,250.834565 -535.477698,250.834565 -535.477698,248.834565" /> -<line x1="539.866667" y1="250.834565" x2="539.866667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="533.613024" y="251.48167" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="530.946357" y="263.97767">1N4729</text> -<line x1="539.866667" y1="232.698667" x2="539.866667" y2="196.698667" /> -<line x1="539.866667" y1="275.898667" x2="568.666667" y2="275.898667" /> -<line x1="568.666667" y1="281.898667" x2="568.666667" y2="269.898667" /> -<path d="M 573.466667,281.898667 - A 12 12 0 0 1 573.466667,269.898667" /> -<line x1="571.858972" y1="275.898667" x2="602.266667" y2="275.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="267.232" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="292.896">0.68μF</text> -<line x1="539.866667" y1="148.698667" x2="568.666667" y2="148.698667" /> -<line x1="568.666667" y1="154.698667" x2="568.666667" y2="142.698667" /> -<path d="M 573.466667,154.698667 - A 12 12 0 0 1 573.466667,142.698667" /> -<line x1="571.858972" y1="148.698667" x2="602.266667" y2="148.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="140.032" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="165.696">0.68μF</text> -<circle fill="black" - cx="602.266667" cy="148.698667" r="1.92" /> -<circle fill="black" - cx="602.266667" cy="196.698667" r="1.92" /> -<line x1="539.866667" y1="196.698667" x2="568.666667" y2="196.698667" /> -<line x1="568.666667" y1="202.698667" x2="568.666667" y2="190.698667" /> -<path d="M 573.466667,202.698667 - A 12 12 0 0 1 573.466667,190.698667" /> -<line x1="571.858972" y1="196.698667" x2="602.266667" y2="196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="188.032" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="213.696">0.1μF</text> -<line x1="539.866667" y1="196.698667" x2="238.666667" y2="196.698667" /> -<polyline points="238.666667,196.698667 238.666667,148.698667 -234.666667,146.698667 -242.666667,142.698667 -234.666667,138.698667 -242.666667,134.698667 -234.666667,130.698667 -242.666667,126.698667 -238.666667,124.698667 -238.666667,76.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="244" y="134.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="246.666667" y="147.112">100kΩ</text> -<circle fill="black" - cx="238.666667" cy="100.698667" r="1.92" /> -<line x1="238.666667" y1="100.698667" x2="214.666667" y2="100.698667" /> -<line x1="214.666667" y1="100.698667" x2="214.666667" y2="122.298667" /> -<line x1="208.666667" y1="122.298667" x2="220.666667" y2="122.298667" /> -<path d="M 208.666667,127.098667 - A 12 12 0 0 1 220.666667,127.098667" /> -<line x1="214.666667" y1="125.490972" x2="214.666667" y2="148.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.333333" y="122.616" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="204.666667" y="135.112">1μF</text> -<line x1="222.666667" y1="148.698667" x2="206.666667" y2="148.698667" /> -<line x1="220" y1="151.698667" x2="209.333333" y2="151.698667" /> -<line x1="218.095238" y1="154.698667" x2="211.238095" y2="154.698667" /> -<line x1="539.866667" y1="76.698667" x2="539.866667" y2="52.698667" /> -<polyline points="539.866667,52.698667 539.866667,40.698667 -535.866667,38.698667 -543.866667,34.698667 -535.866667,30.698667 -543.866667,26.698667 -535.866667,22.698667 -543.866667,18.698667 -539.866667,16.698667 -539.866667,4.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.2" y="26.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">9</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.866667" y="39.112">910Ω</text> -<circle fill="black" - cx="539.866667" cy="4.698667" r="1.92" /> -<polyline points="539.866667,347.898667 539.866667,371.898667 -543.866667,373.898667 -535.866667,377.898667 -543.866667,381.898667 -535.866667,385.898667 -543.866667,389.898667 -535.866667,393.898667 -539.866667,395.898667 -539.866667,419.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.2" y="381.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">10</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.866667" y="394.312">910Ω</text> -<circle fill="black" - cx="539.866667" cy="419.898667" r="1.92" /> -<line x1="238.666667" y1="76.698667" x2="238.666667" y2="52.698667" /> -<polyline points="238.666667,52.698667 262.666667,52.698667 -264.666667,48.698667 -268.666667,56.698667 -272.666667,48.698667 -276.666667,56.698667 -280.666667,48.698667 -284.666667,56.698667 -286.666667,52.698667 -310.666667,52.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="261.333333" y="34.869333" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="264" y="47.365333">100kΩ</text> -<polyline points="310.666667,52.698667 602.266667,52.698667 -602.266667,275.898667" /> -<polyline points="703.066667,275.898667 703.066667,290.298667 -704.129348,290.298667" /> -<polyline points="703.066667,323.898667 703.066667,309.498667 -704.129348,309.498667" /> -<line x1="703.066667" y1="309.498667" x2="719.866667" y2="309.498667" /> -<line x1="719.866667" y1="287.898667" x2="719.866667" y2="311.898667" /> -<line x1="719.866667" y1="299.898667" x2="739.066667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="726.266667,297.232 734.266667,299.898667 -726.266667,302.565333" /> -<line x1="726.266667" y1="299.898667" x2="732.580119" y2="299.898667" /> -<line x1="703.066667" y1="290.298667" x2="719.866667" y2="290.298667" /> -<circle cx="719.866667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="706" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">11</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="708.666667" y="280.064">2N5464</text> -<line x1="703.066667" y1="323.898667" x2="691.066667" y2="323.898667" /> -<polyline points="659.866667,347.898667 659.866667,338.298667 -660.222222,338.138667" /> -<polyline points="659.866667,299.898667 659.866667,309.498667 -660.222222,309.658667" /> -<line x1="679.066667" y1="333.498667" x2="679.066667" y2="314.298667" /> -<line x1="691.066667" y1="323.898667" x2="679.066667" y2="323.898667" /> -<line x1="659.866667" y1="338.298667" x2="679.066667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="673.056345,335.28754 664.666667,336.138667 -670.867733,330.423959" /> -<line x1="666.204666" y1="335.446567" x2="674.266667" y2="331.818667" /> -<line x1="659.866667" y1="309.498667" x2="679.066667" y2="318.138667" /> -<path d="M 691.066667,323.898667 - A 19.2 19.2 0 0 0 652.666667,323.898667" /> -<line x1="652.666667" y1="323.898667" x2="652.666667" y2="323.898667" /> -<path d="M 652.666667,323.898667 - A 19.2 19.2 0 0 0 691.066667,323.898667" /> -<line x1="691.066667" y1="323.898667" x2="691.066667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="654" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">10</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="651.333333" y="334.312">2N4239</text> -<circle fill="black" - cx="659.866667" cy="275.898667" r="1.92" /> -<polyline points="703.066667,275.898667 659.866667,275.898667 -659.866667,299.898667" /> -<line x1="659.866667" y1="347.898667" x2="659.866667" y2="419.898667" /> -<circle fill="black" - cx="659.866667" cy="419.898667" r="1.92" /> -<line x1="106.666667" y1="419.898667" x2="683.866667" y2="419.898667" /> -<circle fill="white" - cx="683.866667" cy="419.898667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="688.453333" y="424.064" -><tspan font-style="italic">-E<tspan font-size="70%" -dy="0.66ex" dx="">CC</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<line x1="659.866667" y1="275.898667" x2="659.866667" y2="257.762768" /> -<polyline stroke-width="0" fill="black" - points="659.866667,257.762768 -655.866667,257.762768 -659.866667,251.365906 -663.866667,257.762768 -659.866667,257.762768" /> -<polyline points="659.866667,257.762768 655.866667,257.762768 -659.866667,251.365906 -663.866667,257.762768 -659.866667,257.762768" /> -<polyline points="664.255635,252.834565 664.255635,250.834565 -655.477698,250.834565 -655.477698,248.834565" /> -<line x1="659.866667" y1="250.834565" x2="659.866667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="653.613024" y="251.48167" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="650.946357" y="263.97767">1N4728</text> -<polyline points="703.066667,100.698667 703.066667,115.098667 -704.129348,115.098667" /> -<polyline points="703.066667,148.698667 703.066667,134.298667 -704.129348,134.298667" /> -<line x1="703.066667" y1="134.298667" x2="719.866667" y2="134.298667" /> -<line x1="719.866667" y1="112.698667" x2="719.866667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="727.866667,127.365333 719.866667,124.698667 -727.866667,122.032" /> -<line x1="739.066667" y1="124.698667" x2="721.553215" y2="124.698667" /> -<line x1="703.066667" y1="115.098667" x2="719.866667" y2="115.098667" /> -<circle cx="719.866667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="704.666667" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">12</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="707.333333" y="164.1104">2N3819</text> -<line x1="703.066667" y1="100.698667" x2="691.066667" y2="100.698667" /> -<polyline points="659.866667,76.698667 659.866667,86.298667 -660.222222,86.458667" /> -<polyline points="659.866667,124.698667 659.866667,115.098667 -660.222222,114.938667" /> -<line x1="679.066667" y1="91.098667" x2="679.066667" y2="110.298667" /> -<line x1="691.066667" y1="100.698667" x2="679.066667" y2="100.698667" /> -<line x1="659.866667" y1="86.298667" x2="679.066667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="668.0656,87.063959 674.266667,92.778667 -665.876989,91.92754" /> -<line x1="664.666667" y1="88.458667" x2="672.728667" y2="92.086567" /> -<line x1="659.866667" y1="115.098667" x2="679.066667" y2="106.458667" /> -<path d="M 691.066667,100.698667 - A 19.2 19.2 0 0 1 652.666667,100.698667" /> -<line x1="652.666667" y1="100.698667" x2="652.666667" y2="100.698667" /> -<path d="M 652.666667,100.698667 - A 19.2 19.2 0 0 1 691.066667,100.698667" /> -<line x1="691.066667" y1="100.698667" x2="691.066667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="652.666667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">9</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="650" y="111.112">2N4236</text> -<circle fill="black" - cx="659.866667" cy="148.698667" r="1.92" /> -<polyline points="703.066667,148.698667 659.866667,148.698667 -659.866667,124.698667" /> -<line x1="659.866667" y1="76.698667" x2="659.866667" y2="4.698667" /> -<circle fill="black" - cx="659.866667" cy="4.698667" r="1.92" /> -<line x1="106.666667" y1="4.698667" x2="683.866667" y2="4.698667" /> -<circle fill="white" - cx="683.866667" cy="4.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="688.453333" y="8.864" -><tspan font-style="italic">E<tspan font-size="70%" -dy="0.66ex" dx="">CC</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="659.866667,148.698667 659.866667,160.698667 -663.866667,162.698667 -655.866667,166.698667 -663.866667,170.698667 -655.866667,174.698667 -663.866667,178.698667 -655.866667,182.698667 -659.866667,184.698667 -659.866667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="654.533333" y="170.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">12</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="651.866667" y="183.112">20Ω</text> -<circle fill="black" - cx="659.866667" cy="196.698667" r="1.92" /> -<line x1="659.866667" y1="196.698667" x2="602.266667" y2="196.698667" /> -<line x1="659.866667" y1="196.698667" x2="659.866667" y2="232.698667" /> -<circle fill="black" - cx="751.066667" cy="172.698667" r="1.92" /> -<polyline points="739.066667,124.698667 751.066667,124.698667 -751.066667,299.898667 -739.066667,299.898667" /> -<line x1="775.066667" y1="172.698667" x2="751.066667" y2="172.698667" /> -<polygon stroke-width="0" fill="black" - points="767.866667,175.098667 758.266667,172.698667 -767.866667,170.298667" /> -<line x1="767.866667" y1="172.698667" x2="760.465656" y2="172.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="763.066667" y="167.632" ->i<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<circle fill="white" - cx="775.066667" cy="172.698667" r="1.92" /> -<circle fill="white" - cx="775.066667" cy="220.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="182.476444">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="200.864" ->V<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="219.251556">-</text> -<line x1="775.066667" y1="222.618667" x2="775.066667" y2="232.698667" /> -<line x1="783.066667" y1="232.698667" x2="767.066667" y2="232.698667" /> -<line x1="780.4" y1="235.698667" x2="769.733333" y2="235.698667" /> -<line x1="778.495238" y1="238.698667" x2="771.638095" y2="238.698667" /> -<circle fill="black" - cx="751.066667" cy="232.698667" r="1.92" /> -<polyline points="751.066667,232.698667 717.466667,232.698667 -715.466667,236.698667 -711.466667,228.698667 -707.466667,236.698667 -703.466667,228.698667 -699.466667,236.698667 -695.466667,228.698667 -693.466667,232.698667 -659.866667,232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="692.133333" y="213.536" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">15</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="694.8" y="226.032">200Ω</text> -<line x1="659.866667" y1="232.698667" x2="400.666667" y2="232.698667" /> -<circle fill="black" - cx="400.666667" cy="232.698667" r="1.92" /> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/EEPDPV.svg b/graphics/circuit_macros/examples/dpv/EEPDPV.svg deleted file mode 100644 index 25ca2367dd..0000000000 --- a/graphics/circuit_macros/examples/dpv/EEPDPV.svg +++ /dev/null @@ -1,662 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="606" height="592" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="605.2px" height="590.666667px" - viewBox="0 0 605.2 590.666667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<circle fill="black" - cx="153.466667" cy="84.666667" r="1.92" /> -<line x1="153.466667" y1="84.666667" x2="153.466667" y2="56.666667" /> -<line x1="153.466667" y1="56.666667" x2="141.466667" y2="44.666667" /> -<line x1="153.466667" y1="40.666667" x2="153.466667" y2="12.666667" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="153.466667" y="10">Public supply</text> -<line stroke-width="2.133333" - x1="33.466667" y1="84.666667" x2="273.466667" y2="84.666667" /> -<circle fill="black" - cx="43.066667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="87.226667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="131.386667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="175.546667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="219.706667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="263.866667" cy="84.666667" r="1.92" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="36.133333" y="82"><tspan font-size="66%">20 kV</tspan></text> -<line x1="43.066667" y1="156.666667" x2="43.066667" y2="128.666667" /> -<line x1="43.066667" y1="128.666667" x2="31.066667" y2="116.666667" /> -<line x1="43.066667" y1="112.666667" x2="43.066667" y2="84.666667" /> -<line x1="87.226667" y1="156.666667" x2="87.226667" y2="128.666667" /> -<line x1="87.226667" y1="128.666667" x2="75.226667" y2="116.666667" /> -<line x1="87.226667" y1="112.666667" x2="87.226667" y2="84.666667" /> -<line x1="131.386667" y1="84.666667" x2="131.386667" y2="93.366667" /> -<circle cx="131.386667" cy="108.966667" r="15.6" /> -<circle cx="131.386667" cy="132.366667" r="15.6" /> -<line x1="131.386667" y1="147.966667" x2="131.386667" y2="156.666667" /> -<polyline points="131.386667,112.292204 125.626667,112.292204 -131.386667,102.315592 -137.146667,112.292204 -131.386667,112.292204" /> -<line x1="131.386667" y1="139.017742" x2="131.386667" y2="132.366667" /> -<polyline points="125.626667,129.041129 131.386667,132.366667 -137.146667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="133.786667,163.066667 131.386667,172.666667 -128.986667,163.066667" /> -<line x1="131.386667" y1="156.666667" x2="131.386667" y2="170.467677" /> -<line x1="175.546667" y1="84.666667" x2="175.546667" y2="93.366667" /> -<circle cx="175.546667" cy="108.966667" r="15.6" /> -<circle cx="175.546667" cy="132.366667" r="15.6" /> -<line x1="175.546667" y1="147.966667" x2="175.546667" y2="156.666667" /> -<polyline points="175.546667,112.292204 169.786667,112.292204 -175.546667,102.315592 -181.306667,112.292204 -175.546667,112.292204" /> -<line x1="175.546667" y1="139.017742" x2="175.546667" y2="132.366667" /> -<polyline points="169.786667,129.041129 175.546667,132.366667 -181.306667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="177.946667,163.066667 175.546667,172.666667 -173.146667,163.066667" /> -<line x1="175.546667" y1="156.666667" x2="175.546667" y2="170.467677" /> -<line x1="219.706667" y1="84.666667" x2="219.706667" y2="93.366667" /> -<circle cx="219.706667" cy="108.966667" r="15.6" /> -<circle cx="219.706667" cy="132.366667" r="15.6" /> -<line x1="219.706667" y1="147.966667" x2="219.706667" y2="156.666667" /> -<polyline points="219.706667,112.292204 213.946667,112.292204 -219.706667,102.315592 -225.466667,112.292204 -219.706667,112.292204" /> -<line x1="219.706667" y1="139.017742" x2="219.706667" y2="132.366667" /> -<polyline points="213.946667,129.041129 219.706667,132.366667 -225.466667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="222.106667,163.066667 219.706667,172.666667 -217.306667,163.066667" /> -<line x1="219.706667" y1="156.666667" x2="219.706667" y2="170.467677" /> -<line x1="263.866667" y1="156.666667" x2="263.866667" y2="128.666667" /> -<line x1="263.866667" y1="128.666667" x2="251.866667" y2="116.666667" /> -<line x1="263.866667" y1="112.666667" x2="263.866667" y2="84.666667" /> -<line stroke-width="2.133333" - x1="7.066667" y1="228.666667" x2="79.066667" y2="228.666667" /> -<circle fill="black" - cx="16.666667" cy="228.666667" r="1.92" /> -<circle fill="black" - cx="43.066667" cy="228.666667" r="1.92" /> -<circle fill="black" - cx="69.466667" cy="228.666667" r="1.92" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="9.733333" y="226"><tspan font-size="66%">20 kV</tspan></text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="43.066667" y="240.8"><tspan font-size="66%">1.25 MVA</tspan></text> -<line x1="43.066667" y1="228.666667" x2="43.066667" y2="200.666667" /> -<line x1="43.066667" y1="200.666667" x2="31.066667" y2="188.666667" /> -<line x1="43.066667" y1="184.666667" x2="43.066667" y2="156.666667" /> -<line x1="16.666667" y1="228.666667" x2="16.666667" y2="237.366667" /> -<circle cx="16.666667" cy="252.966667" r="15.6" /> -<circle cx="16.666667" cy="276.366667" r="15.6" /> -<line x1="16.666667" y1="291.966667" x2="16.666667" y2="300.666667" /> -<polyline points="16.666667,256.292204 10.906667,256.292204 -16.666667,246.315592 -22.426667,256.292204 -16.666667,256.292204" /> -<line x1="16.666667" y1="283.017742" x2="16.666667" y2="276.366667" /> -<polyline points="10.906667,273.041129 16.666667,276.366667 -22.426667,273.041129" /> -<line x1="69.466667" y1="300.666667" x2="69.466667" y2="272.666667" /> -<line x1="69.466667" y1="272.666667" x2="57.466667" y2="260.666667" /> -<line x1="69.466667" y1="256.666667" x2="69.466667" y2="228.666667" /> -<line stroke-width="2.133333" - x1="111.066667" y1="260.666667" x2="111.066667" y2="196.666667" /> -<line x1="111.066667" y1="228.666667" x2="131.766667" y2="228.666667" /> -<circle fill="lightgray" stroke="none" - cx="147.366667" cy="228.666667" r="15.6" /> -<circle fill="lightgray" stroke="none" - cx="170.766667" cy="228.666667" r="15.6" /> -<circle cx="147.366667" cy="228.666667" r="15.6" /> -<circle cx="170.766667" cy="228.666667" r="15.6" /> -<line x1="186.366667" y1="228.666667" x2="207.066667" y2="228.666667" /> -<polygon stroke-width="0" fill="black" - points="176.037229,208.301991 184.522511,203.210823 -179.431342,211.696104" /> -<line x1="133.610823" y1="254.122511" x2="182.96759" y2="204.765743" /> -<line stroke-width="2.133333" - x1="207.066667" y1="260.666667" x2="207.066667" y2="196.666667" /> -<line x1="207.066667" y1="251.066667" x2="183.066667" y2="251.066667" /> -<line x1="183.066667" y1="251.066667" x2="183.066667" y2="260.666667" /> -<line x1="175.066667" y1="260.666667" x2="191.066667" y2="260.666667" /> -<line x1="175.066667" y1="265.466667" x2="191.066667" y2="265.466667" /> -<line x1="183.066667" y1="265.466667" x2="183.066667" y2="275.066667" /> -<line x1="191.066667" y1="275.066667" x2="175.066667" y2="275.066667" /> -<line x1="188.4" y1="278.066667" x2="177.733333" y2="278.066667" /> -<line x1="186.495238" y1="281.066667" x2="179.638095" y2="281.066667" /> -<line x1="207.066667" y1="228.666667" x2="231.066667" y2="228.666667" /> -<line x1="231.066667" y1="228.666667" x2="231.066667" y2="251.066667" /> -<line x1="231.066667" y1="251.066667" x2="231.066667" y2="260.666667" /> -<line x1="223.066667" y1="260.666667" x2="239.066667" y2="260.666667" /> -<line x1="223.066667" y1="265.466667" x2="239.066667" y2="265.466667" /> -<line x1="231.066667" y1="265.466667" x2="231.066667" y2="275.066667" /> -<line x1="239.066667" y1="275.066667" x2="223.066667" y2="275.066667" /> -<line x1="236.4" y1="278.066667" x2="225.733333" y2="278.066667" /> -<line x1="234.495238" y1="281.066667" x2="227.638095" y2="281.066667" /> -<line x1="231.066667" y1="228.666667" x2="255.066667" y2="228.666667" /> -<polyline stroke-width="0" fill="lightgray" - points="375.066667,228.666667 -375.066667,223.866667 -255.066667,223.866667 -255.066667,233.466667 -375.066667,233.466667 -375.066667,228.666667" /> -<polyline points="375.066667,228.666667 375.066667,223.866667 -255.066667,223.866667 -255.066667,233.466667 -375.066667,233.466667 -375.066667,228.666667" /> -<line x1="375.066667" y1="228.666667" x2="399.066667" y2="228.666667" /> -<line x1="399.066667" y1="228.666667" x2="399.066667" y2="251.066667" /> -<line x1="399.066667" y1="251.066667" x2="399.066667" y2="260.666667" /> -<line x1="391.066667" y1="260.666667" x2="407.066667" y2="260.666667" /> -<line x1="391.066667" y1="265.466667" x2="407.066667" y2="265.466667" /> -<line x1="399.066667" y1="265.466667" x2="399.066667" y2="275.066667" /> -<line x1="407.066667" y1="275.066667" x2="391.066667" y2="275.066667" /> -<line x1="404.4" y1="278.066667" x2="393.733333" y2="278.066667" /> -<line x1="402.495238" y1="281.066667" x2="395.638095" y2="281.066667" /> -<line x1="399.066667" y1="228.666667" x2="423.066667" y2="228.666667" /> -<line stroke-width="2.133333" - x1="423.066667" y1="336.666667" x2="423.066667" y2="120.666667" /> -<line x1="423.066667" y1="327.066667" x2="459.066667" y2="327.066667" /> -<rect fill="rgb(217,166,33)" x="459.066667" y="312.666667" width="144" height="28.8" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="531.066667" y="331.8">Static Load</text> -<line x1="423.066667" y1="287.706667" x2="459.066667" y2="287.706667" /> -<rect fill="rgb(201,150,145)" x="459.066667" y="273.306667" width="144" height="28.8" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="531.066667" y="292.44">Electronic Load</text> -<circle fill="rgb(51,204,51)" cx="489.066667" cy="248.346667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="253.08">A/C</text> -<line x1="471.066667" y1="248.346667" x2="423.066667" y2="248.346667" /> -<circle fill="rgb(54,120,219)" cx="489.066667" cy="208.986667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="213.72">M</text> -<line x1="471.066667" y1="208.986667" x2="423.066667" y2="208.986667" /> -<circle fill="rgb(51,153,204)" cx="489.066667" cy="169.626667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="174.36">M</text> -<line x1="471.066667" y1="169.626667" x2="423.066667" y2="169.626667" /> -<circle fill="rgb(51,161,204)" cx="489.066667" cy="130.266667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="135">M</text> -<line x1="471.066667" y1="130.266667" x2="423.066667" y2="130.266667" /> -<circle fill="rgb(199,92,77)" cx="357.066667" cy="307.386667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="357.066667" y="312.12"><tspan font-size="66%">DER_A</tspan></text> -<line x1="375.066667" y1="307.386667" x2="423.066667" y2="307.386667" /> -<line x1="87.733333" y1="409.6" x2="96.733333" y2="409.6" /> -<line x1="96.733333" y1="409.6" x2="96.733333" y2="409.6" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="87.733333,409.6 -87.733333,414.1 -96.733333,414.1 -96.733333,405.1 -87.733333,405.1 -87.733333,409.6" /> -<polyline points="87.733333,409.6 87.733333,414.1 -96.733333,414.1 -96.733333,405.1 -87.733333,405.1 -87.733333,409.6" /> -<line x1="87.733333" y1="409.6" x2="87.733333" y2="409.6" /> -<circle fill="rgb(99,128,237)" cx="47.733333" cy="409.6" r="16" /> -<line x1="63.733333" y1="409.6" x2="87.733333" y2="409.6" /> -<polyline points="71.733333,432.528203 63.733333,432.528203 -71.733333,418.671797 -79.733333,432.528203 -71.733333,432.528203" /> -<line x1="87.733333" y1="409.6" x2="117.233333" y2="409.6" /> -<line x1="117.233333" y1="394" x2="117.233333" y2="394" /> -<line x1="117.233333" y1="394" x2="116.7" y2="394" /> -<path d="M 117.233333,394 - A 3.9 3.9 0 0 1 117.233333,401.8" /> -<line x1="117.233333" y1="401.8" x2="116.7" y2="401.8" /> -<path d="M 117.233333,401.8 - A 3.9 3.9 0 0 1 117.233333,409.6" /> -<line x1="117.233333" y1="409.6" x2="116.7" y2="409.6" /> -<path d="M 117.233333,409.6 - A 3.9 3.9 0 1 1 117.233333,417.4" /> -<line x1="117.233333" y1="417.4" x2="116.7" y2="417.4" /> -<path d="M 117.233333,417.4 - A 3.9 3.9 0 1 1 117.233333,425.2" /> -<line x1="117.233333" y1="425.2" x2="116.7" y2="425.2" /> -<line x1="117.233333" y1="425.2" x2="117.233333" y2="425.2" /> -<line x1="130.233333" y1="425.2" x2="130.233333" y2="425.2" /> -<line x1="130.233333" y1="425.2" x2="130.766667" y2="425.2" /> -<path d="M 130.233333,425.2 - A 3.9 3.9 0 0 1 130.233333,417.4" /> -<line x1="130.233333" y1="417.4" x2="130.766667" y2="417.4" /> -<path d="M 130.233333,417.4 - A 3.9 3.9 0 0 1 130.233333,409.6" /> -<line x1="130.233333" y1="409.6" x2="130.766667" y2="409.6" /> -<path d="M 130.233333,409.6 - A 3.9 3.9 0 0 1 130.233333,401.8" /> -<line x1="130.233333" y1="401.8" x2="130.766667" y2="401.8" /> -<path d="M 130.233333,401.8 - A 3.9 3.9 0 0 1 130.233333,394" /> -<line x1="130.233333" y1="394" x2="130.766667" y2="394" /> -<line x1="130.233333" y1="394" x2="130.233333" y2="394" /> -<line x1="130.233333" y1="409.6" x2="159.733333" y2="409.6" /> -<line stroke-width="2.133333" - x1="159.733333" y1="445.6" x2="159.733333" y2="373.6" /> -<line x1="159.733333" y1="383.2" x2="191.233333" y2="383.2" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="200.233333,383.2 -200.233333,378.7 -191.233333,378.7 -191.233333,387.7 -200.233333,387.7 -200.233333,383.2" /> -<polyline points="200.233333,383.2 200.233333,378.7 -191.233333,378.7 -191.233333,387.7 -200.233333,387.7 -200.233333,383.2" /> -<line x1="200.233333" y1="383.2" x2="231.733333" y2="383.2" /> -<line x1="231.733333" y1="383.2" x2="295.733333" y2="383.2" /> -<line x1="159.733333" y1="436" x2="191.233333" y2="436" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="200.233333,436 -200.233333,431.5 -191.233333,431.5 -191.233333,440.5 -200.233333,440.5 -200.233333,436" /> -<polyline points="200.233333,436 200.233333,431.5 -191.233333,431.5 -191.233333,440.5 -200.233333,440.5 -200.233333,436" /> -<line x1="200.233333" y1="436" x2="231.733333" y2="436" /> -<line x1="231.733333" y1="436" x2="231.733333" y2="455.5" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="231.733333,464.5 -236.233333,464.5 -236.233333,455.5 -227.233333,455.5 -227.233333,464.5 -231.733333,464.5" /> -<polyline points="231.733333,464.5 236.233333,464.5 -236.233333,455.5 -227.233333,455.5 -227.233333,464.5 -231.733333,464.5" /> -<line x1="231.733333" y1="464.5" x2="231.733333" y2="484" /> -<line stroke-width="2.133333" - x1="207.733333" y1="484" x2="255.733333" y2="484" /> -<line x1="231.733333" y1="484" x2="231.733333" y2="501.5" /> -<line x1="247.333333" y1="501.5" x2="247.333333" y2="501.5" /> -<line x1="247.333333" y1="501.5" x2="247.333333" y2="500.966667" /> -<path d="M 247.333333,501.5 - A 3.9 3.9 0 0 1 239.533333,501.5" /> -<line x1="239.533333" y1="501.5" x2="239.533333" y2="500.966667" /> -<path d="M 239.533333,501.5 - A 3.9 3.9 0 1 1 231.733333,501.5" /> -<line x1="231.733333" y1="501.5" x2="231.733333" y2="500.966667" /> -<path d="M 231.733333,501.5 - A 3.9 3.9 0 0 1 223.933333,501.5" /> -<line x1="223.933333" y1="501.5" x2="223.933333" y2="500.966667" /> -<path d="M 223.933333,501.5 - A 3.9 3.9 0 1 1 216.133333,501.5" /> -<line x1="216.133333" y1="501.5" x2="216.133333" y2="500.966667" /> -<line x1="216.133333" y1="501.5" x2="216.133333" y2="501.5" /> -<line x1="216.133333" y1="514.5" x2="216.133333" y2="514.5" /> -<line x1="216.133333" y1="514.5" x2="216.133333" y2="515.033333" /> -<path d="M 216.133333,514.5 - A 3.9 3.9 0 0 1 223.933333,514.5" /> -<line x1="223.933333" y1="514.5" x2="223.933333" y2="515.033333" /> -<path d="M 223.933333,514.5 - A 3.9 3.9 0 0 1 231.733333,514.5" /> -<line x1="231.733333" y1="514.5" x2="231.733333" y2="515.033333" /> -<path d="M 231.733333,514.5 - A 3.9 3.9 0 0 1 239.533333,514.5" /> -<line x1="239.533333" y1="514.5" x2="239.533333" y2="515.033333" /> -<path d="M 239.533333,514.5 - A 3.9 3.9 0 0 1 247.333333,514.5" /> -<line x1="247.333333" y1="514.5" x2="247.333333" y2="515.033333" /> -<line x1="247.333333" y1="514.5" x2="247.333333" y2="514.5" /> -<line x1="231.733333" y1="514.5" x2="231.733333" y2="532" /> -<line x1="231.733333" y1="532" x2="231.733333" y2="523" /> -<line x1="231.733333" y1="523" x2="231.733333" y2="523" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="231.733333,532 -236.233333,532 -236.233333,523 -227.233333,523 -227.233333,532 -231.733333,532" /> -<polyline points="231.733333,532 236.233333,532 -236.233333,523 -227.233333,523 -227.233333,532 -231.733333,532" /> -<line x1="231.733333" y1="532" x2="231.733333" y2="532" /> -<circle fill="rgb(99,128,237)" cx="231.733333" cy="572" r="16" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="231.733333" y="576.733333">SM</text> -<line x1="231.733333" y1="556" x2="231.733333" y2="532" /> -<line x1="263.066667" y1="577.547005" x2="263.066667" y2="568.309401" /> -<polyline points="255.066667,563.690599 263.066667,568.309401 -271.066667,563.690599" /> -<line x1="263.066667" y1="568.309401" x2="275.066667" y2="568.309401" /> -<line x1="274.533333" y1="568.309401" x2="275.6" y2="568.309401" /> -<line x1="275.066667" y1="568.309401" x2="275.066667" y2="576.309401" /> -<line x1="280.4" y1="576.309401" x2="269.733333" y2="576.309401" /> -<line x1="278.622222" y1="578.309401" x2="271.511111" y2="578.309401" /> -<line x1="277.352381" y1="580.309401" x2="272.780952" y2="580.309401" /> -<line x1="503.733333" y1="409.6" x2="494.733333" y2="409.6" /> -<line x1="494.733333" y1="409.6" x2="494.733333" y2="409.6" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="503.733333,409.6 -503.733333,405.1 -494.733333,405.1 -494.733333,414.1 -503.733333,414.1 -503.733333,409.6" /> -<polyline points="503.733333,409.6 503.733333,405.1 -494.733333,405.1 -494.733333,414.1 -503.733333,414.1 -503.733333,409.6" /> -<line x1="503.733333" y1="409.6" x2="503.733333" y2="409.6" /> -<circle fill="rgb(99,128,237)" cx="543.733333" cy="409.6" r="16" /> -<line x1="527.733333" y1="409.6" x2="503.733333" y2="409.6" /> -<line x1="519.733333" y1="432.528203" x2="519.733333" y2="423.290599" /> -<polyline points="511.733333,418.671797 519.733333,423.290599 -527.733333,418.671797" /> -<line x1="503.733333" y1="409.6" x2="474.233333" y2="409.6" /> -<line x1="474.233333" y1="425.2" x2="474.233333" y2="425.2" /> -<line x1="474.233333" y1="425.2" x2="474.766667" y2="425.2" /> -<path d="M 474.233333,425.2 - A 3.9 3.9 0 0 1 474.233333,417.4" /> -<line x1="474.233333" y1="417.4" x2="474.766667" y2="417.4" /> -<path d="M 474.233333,417.4 - A 3.9 3.9 0 1 1 474.233333,409.6" /> -<line x1="474.233333" y1="409.6" x2="474.766667" y2="409.6" /> -<path d="M 474.233333,409.6 - A 3.9 3.9 0 0 1 474.233333,401.8" /> -<line x1="474.233333" y1="401.8" x2="474.766667" y2="401.8" /> -<path d="M 474.233333,401.8 - A 3.9 3.9 0 0 1 474.233333,394" /> -<line x1="474.233333" y1="394" x2="474.766667" y2="394" /> -<line x1="474.233333" y1="394" x2="474.233333" y2="394" /> -<line x1="461.233333" y1="394" x2="461.233333" y2="394" /> -<line x1="461.233333" y1="394" x2="460.7" y2="394" /> -<path d="M 461.233333,394 - A 3.9 3.9 0 0 1 461.233333,401.8" /> -<line x1="461.233333" y1="401.8" x2="460.7" y2="401.8" /> -<path d="M 461.233333,401.8 - A 3.9 3.9 0 0 1 461.233333,409.6" /> -<line x1="461.233333" y1="409.6" x2="460.7" y2="409.6" /> -<path d="M 461.233333,409.6 - A 3.9 3.9 0 0 1 461.233333,417.4" /> -<line x1="461.233333" y1="417.4" x2="460.7" y2="417.4" /> -<path d="M 461.233333,417.4 - A 3.9 3.9 0 1 1 461.233333,425.2" /> -<line x1="461.233333" y1="425.2" x2="460.7" y2="425.2" /> -<line x1="461.233333" y1="425.2" x2="461.233333" y2="425.2" /> -<line x1="461.233333" y1="409.6" x2="431.733333" y2="409.6" /> -<line stroke-width="2.133333" - x1="431.733333" y1="445.6" x2="431.733333" y2="373.6" /> -<line x1="431.733333" y1="383.2" x2="400.233333" y2="383.2" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="391.233333,383.2 -391.233333,387.7 -400.233333,387.7 -400.233333,378.7 -391.233333,378.7 -391.233333,383.2" /> -<polyline points="391.233333,383.2 391.233333,387.7 -400.233333,387.7 -400.233333,378.7 -391.233333,378.7 -391.233333,383.2" /> -<line x1="391.233333" y1="383.2" x2="359.733333" y2="383.2" /> -<line x1="359.733333" y1="383.2" x2="295.733333" y2="383.2" /> -<line x1="431.733333" y1="436" x2="400.233333" y2="436" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="391.233333,436 -391.233333,440.5 -400.233333,440.5 -400.233333,431.5 -391.233333,431.5 -391.233333,436" /> -<polyline points="391.233333,436 391.233333,440.5 -400.233333,440.5 -400.233333,431.5 -391.233333,431.5 -391.233333,436" /> -<line x1="391.233333" y1="436" x2="359.733333" y2="436" /> -<line x1="359.733333" y1="436" x2="359.733333" y2="455.5" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="359.733333,464.5 -364.233333,464.5 -364.233333,455.5 -355.233333,455.5 -355.233333,464.5 -359.733333,464.5" /> -<polyline points="359.733333,464.5 364.233333,464.5 -364.233333,455.5 -355.233333,455.5 -355.233333,464.5 -359.733333,464.5" /> -<line x1="359.733333" y1="464.5" x2="359.733333" y2="484" /> -<line stroke-width="2.133333" - x1="383.733333" y1="484" x2="335.733333" y2="484" /> -<line x1="359.733333" y1="484" x2="359.733333" y2="501.5" /> -<line x1="375.333333" y1="501.5" x2="375.333333" y2="501.5" /> -<line x1="375.333333" y1="501.5" x2="375.333333" y2="500.966667" /> -<path d="M 375.333333,501.5 - A 3.9 3.9 0 0 1 367.533333,501.5" /> -<line x1="367.533333" y1="501.5" x2="367.533333" y2="500.966667" /> -<path d="M 367.533333,501.5 - A 3.9 3.9 0 1 1 359.733333,501.5" /> -<line x1="359.733333" y1="501.5" x2="359.733333" y2="500.966667" /> -<path d="M 359.733333,501.5 - A 3.9 3.9 0 0 1 351.933333,501.5" /> -<line x1="351.933333" y1="501.5" x2="351.933333" y2="500.966667" /> -<path d="M 351.933333,501.5 - A 3.9 3.9 0 1 1 344.133333,501.5" /> -<line x1="344.133333" y1="501.5" x2="344.133333" y2="500.966667" /> -<line x1="344.133333" y1="501.5" x2="344.133333" y2="501.5" /> -<line x1="344.133333" y1="514.5" x2="344.133333" y2="514.5" /> -<line x1="344.133333" y1="514.5" x2="344.133333" y2="515.033333" /> -<path d="M 344.133333,514.5 - A 3.9 3.9 0 0 1 351.933333,514.5" /> -<line x1="351.933333" y1="514.5" x2="351.933333" y2="515.033333" /> -<path d="M 351.933333,514.5 - A 3.9 3.9 0 0 1 359.733333,514.5" /> -<line x1="359.733333" y1="514.5" x2="359.733333" y2="515.033333" /> -<path d="M 359.733333,514.5 - A 3.9 3.9 0 0 1 367.533333,514.5" /> -<line x1="367.533333" y1="514.5" x2="367.533333" y2="515.033333" /> -<path d="M 367.533333,514.5 - A 3.9 3.9 0 0 1 375.333333,514.5" /> -<line x1="375.333333" y1="514.5" x2="375.333333" y2="515.033333" /> -<line x1="375.333333" y1="514.5" x2="375.333333" y2="514.5" /> -<line x1="359.733333" y1="514.5" x2="359.733333" y2="532" /> -<line x1="359.733333" y1="532" x2="359.733333" y2="523" /> -<line x1="359.733333" y1="523" x2="359.733333" y2="523" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="359.733333,532 -364.233333,532 -364.233333,523 -355.233333,523 -355.233333,532 -359.733333,532" /> -<polyline points="359.733333,532 364.233333,532 -364.233333,523 -355.233333,523 -355.233333,532 -359.733333,532" /> -<line x1="359.733333" y1="532" x2="359.733333" y2="532" /> -<circle fill="rgb(99,128,237)" cx="359.733333" cy="572" r="16" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="359.733333" y="576.733333">SM</text> -<line x1="359.733333" y1="556" x2="359.733333" y2="532" /> -<line x1="328.4" y1="577.547005" x2="328.4" y2="568.309401" /> -<polyline points="320.4,563.690599 328.4,568.309401 -336.4,563.690599" /> -<line x1="328.4" y1="568.309401" x2="316.4" y2="568.309401" /> -<line x1="316.933333" y1="568.309401" x2="315.866667" y2="568.309401" /> -<line x1="316.4" y1="568.309401" x2="316.4" y2="576.309401" /> -<line x1="321.733333" y1="576.309401" x2="311.066667" y2="576.309401" /> -<line x1="319.955556" y1="578.309401" x2="312.844444" y2="578.309401" /> -<line x1="318.685714" y1="580.309401" x2="314.114286" y2="580.309401" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="159.733333" y="370.933333">Bus 1</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="431.733333" y="370.933333">Bus 2</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="207.733333" y="481.333333">Bus 3</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="383.733333" y="481.333333">Bus 4</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="295.733333" y="380.533333" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 km 69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="210.4" y="418.066667" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 km</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="210.4" y="431.4">69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="338.4" y="418.066667" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 km</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="338.4" y="431.4">69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="1.066667" y="450.333333" ->G<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="1.066667" y="463.666667">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="543.733333" y="445" ->G<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="543.733333" y="458.333333">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="121.066667" y="456.6" ->T<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="121.066667" y="469.933333">13.8/69 kV Δ/Y</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="470.4" y="459.266667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="470.4" y="472.6">69/13.8 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="208.133333" y="506.066667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="208.133333" y="519.4">13.8/69 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.333333" y="506.066667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.333333" y="519.4">69/6.9 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.733333" y="570.066667" ->SM<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.733333" y="583.4">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.733333" y="570.066667" ->SM<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.733333" y="583.4">6.9 kV</text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/FlowDPV.m4 b/graphics/circuit_macros/examples/dpv/FlowDPV.m4 index e3543ae405..70fc877618 100644 --- a/graphics/circuit_macros/examples/dpv/FlowDPV.m4 +++ b/graphics/circuit_macros/examples/dpv/FlowDPV.m4 @@ -1,7 +1,7 @@ .PS # FlowDPV.m4 gen_init(svg_font(sans-serif,11bp__,2.5bp__)) -ifdef(`FlowchartDefs_',,`include(../FlowchartDefs.m4)') +ifdef(`FlowchartDefs_',,`include(../FlowchartDefs.m4def)') define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl diff --git a/graphics/circuit_macros/examples/dpv/FlowDPV.svg b/graphics/circuit_macros/examples/dpv/FlowDPV.svg deleted file mode 100644 index cda3c42bee..0000000000 --- a/graphics/circuit_macros/examples/dpv/FlowDPV.svg +++ /dev/null @@ -1,890 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="640" height="750" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="639.333333px" height="748.546667px" - viewBox="0 0 639.333333 748.546667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect fill="rgb(230,204,179)" stroke-width="1.333333" - x="10.933333" y="0.666667" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="58.933333" y="23.873333" -><tspan font-family="Courier">Fbox</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="68.533333,73.266667 -87.733333,85.866667 -49.333333,111.066667 -10.933333,85.866667 -49.333333,60.666667 -68.533333,73.266667" /> -<polyline stroke-width="1.333333" - points="68.533333,73.266667 87.733333,85.866667 -49.333333,111.066667 -10.933333,85.866667 -49.333333,60.666667 -68.533333,73.266667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="49.333333" y="91.073333" -><tspan font-family="Courier">Ftest</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="64.933333,135.066667 -118.933333,135.066667 -106.933333,171.066667 -10.933333,171.066667 -22.933333,135.066667 -64.933333,135.066667" /> -<polyline stroke-width="1.333333" - points="64.933333,135.066667 118.933333,135.066667 -106.933333,171.066667 -10.933333,171.066667 -22.933333,135.066667 -64.933333,135.066667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="64.933333" y="158.273333" -><tspan font-family="Courier">Fdata</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="58.933333,195.066667 -97.933333,195.066667 -106.933333,213.066667 -97.933333,231.066667 -19.933333,231.066667 -10.933333,213.066667 -19.933333,195.066667 -58.933333,195.066667" /> -<polyline stroke-width="1.333333" - points="58.933333,195.066667 97.933333,195.066667 -106.933333,213.066667 -97.933333,231.066667 -19.933333,231.066667 -10.933333,213.066667 -19.933333,195.066667 -58.933333,195.066667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="218.273333" -><tspan font-family="Courier">Fprep</tspan></text> -<path stroke-width="1.333333" - d="M 103.430524,291.398755 - A 48 48 0 0 0 103.430524,255.398755" /> -<circle stroke-width="0.666667" - cx="103.430524" cy="255.398755" r="0.332088" /> -<line stroke-width="1.333333" - x1="103.430524" y1="255.398755" x2="14.436142" y2="255.398755" /> -<circle stroke-width="0.666667" - cx="14.436142" cy="255.398755" r="0.332088" /> -<path stroke-width="1.333333" - d="M 14.436142,255.398755 - A 48 48 0 0 0 14.436142,291.398755" /> -<circle stroke-width="0.666667" - cx="14.436142" cy="291.398755" r="0.332088" /> -<line stroke-width="1.333333" - x1="14.436142" y1="291.398755" x2="103.430524" y2="291.398755" /> -<circle stroke-width="0.666667" - cx="103.430524" cy="291.398755" r="0.332088" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="278.605421" -><tspan font-family="Courier">Fkeying</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="58.933333,321.730843 -106.933333,315.730843 -106.933333,357.730843 -10.933333,357.730843 -10.933333,327.730843 -58.933333,321.730843" /> -<polyline stroke-width="1.333333" - points="58.933333,321.730843 106.933333,315.730843 -106.933333,357.730843 -10.933333,357.730843 -10.933333,327.730843 -58.933333,321.730843" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="344.937509" -><tspan font-family="Courier">Fkeyboard</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="106.933333,426.730843 -106.933333,381.730843 -10.933333,381.730843 -10.933333,426.730843" /> -<polyline stroke-width="1.333333" - points="106.933333,426.730843 106.933333,381.730843 -10.933333,381.730843 -10.933333,426.730843" /> -<path stroke-width="0" fill="rgb(230,204,179)" - d="M 10.933333,426.730843 - A 43.266615 43.266615 0 0 0 58.933333,426.730843" /> -<path stroke-width="1.333333" - d="M 10.933333,426.730843 - A 43.266615 43.266615 0 0 0 58.933333,426.730843" /> -<path stroke-width="0" fill="rgb(255,255,255)" - d="M 58.933333,426.730843 - A 43.266615 43.266615 0 0 1 106.933333,426.730843" /> -<path stroke-width="1.333333" - d="M 58.933333,426.730843 - A 43.266615 43.266615 0 0 1 106.933333,426.730843" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="404.937509" -><tspan font-family="Courier">Fdocument</tspan></text> -<path stroke-width="0" fill="rgb(189,212,230)" - d="M 88.933333,493.997458 - A 18 18 0 0 0 88.933333,457.997458" /> -<path stroke-width="1.333333" - d="M 88.933333,493.997458 - A 18 18 0 0 0 88.933333,457.997458" /> -<polyline stroke-width="0" fill="rgb(189,212,230)" - points="88.933333,457.997458 -10.933333,457.997458 -10.933333,493.997458 -88.933333,493.997458" /> -<polyline stroke-width="1.333333" - points="88.933333,457.997458 10.933333,457.997458 -10.933333,493.997458 -88.933333,493.997458" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="481.204125" -><tspan font-family="Courier">Fdelay</tspan></text> -<rect fill="rgb(171,224,176)" stroke-width="1.333333" - stroke="none" - x="28.933333" y="517.997458" width="69" height="36" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="10.933333,535.997458 -28.933333,517.997458 -28.933333,553.997458 -10.933333,535.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 97.933333,553.997458 - A 23.430749 23.430749 0 0 0 97.933333,517.997458" /> -<path stroke-width="1.333333" - d="M 97.933333,553.997458 - A 23.430749 23.430749 0 0 0 97.933333,517.997458" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="97.933333,517.997458 -28.933333,517.997458" /> -<line stroke-width="1.333333" - x1="97.933333" y1="517.997458" x2="28.933333" y2="517.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 28.933333,517.997458 - A 28.460499 28.460499 0 0 0 10.933333,535.997458" /> -<path stroke-width="1.333333" - d="M 28.933333,517.997458 - A 28.460499 28.460499 0 0 0 10.933333,535.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 10.933333,535.997458 - A 28.460499 28.460499 0 0 0 28.933333,553.997458" /> -<path stroke-width="1.333333" - d="M 10.933333,535.997458 - A 28.460499 28.460499 0 0 0 28.933333,553.997458" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="28.933333,553.997458 -97.933333,553.997458" /> -<line stroke-width="1.333333" - x1="28.933333" y1="553.997458" x2="97.933333" y2="553.997458" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="541.204125" -><tspan font-family="Courier">Fdisplay</tspan></text> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - stroke="none" - x="16.582801" y="578.329546" width="90.350532" height="36" /> -<path stroke-width="0" fill="rgb(217,191,217)" - d="M 16.582801,578.329546 - A 31.5 31.5 0 0 0 16.582801,614.329546" /> -<path stroke-width="1.333333" - d="M 16.582801,578.329546 - A 31.5 31.5 0 0 0 16.582801,614.329546" /> -<circle stroke-width="0.666667" - cx="16.582801" cy="614.329546" r="0.332088" /> -<line stroke-width="1.333333" - x1="16.582801" y1="614.329546" x2="106.933333" y2="614.329546" /> -<circle stroke-width="0.666667" - cx="106.933333" cy="614.329546" r="0.332088" /> -<path stroke-width="0" fill="white" - d="M 106.933333,614.329546 - A 31.5 31.5 0 0 1 106.933333,578.329546" /> -<path stroke-width="1.333333" - d="M 106.933333,614.329546 - A 31.5 31.5 0 0 1 106.933333,578.329546" /> -<circle stroke-width="0.666667" - cx="106.933333" cy="578.329546" r="0.332088" /> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="106.933333,578.329546 -16.582801,578.329546" /> -<line stroke-width="1.333333" - x1="106.933333" y1="578.329546" x2="16.582801" y2="578.329546" /> -<circle stroke-width="0.666667" - cx="16.582801" cy="578.329546" r="0.332088" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="601.536213" -><tspan font-family="Courier">Fstored</tspan></text> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="19.933333,638.661634 -10.933333,638.661634 -10.933333,674.661634 -28.933333,674.661634 -46.933333,656.661634 -28.933333,638.661634 -19.933333,638.661634" /> -<polyline stroke-width="1.333333" - points="19.933333,638.661634 10.933333,638.661634 -10.933333,674.661634 -28.933333,674.661634 -46.933333,656.661634 -28.933333,638.661634 -19.933333,638.661634" /> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="59.297294,643.933712 -52.933333,650.297673 -78.389177,675.753517 -91.1171,663.025595 -91.1171,637.569751 -65.661255,637.569751 -59.297294,643.933712" /> -<polyline stroke-width="1.333333" - points="59.297294,643.933712 52.933333,650.297673 -78.389177,675.753517 -91.1171,663.025595 -91.1171,637.569751 -65.661255,637.569751 -59.297294,643.933712" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="75.207197" y="658.68632">45</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="52.933333" y="634.776418" -><tspan font-family="Courier">Fconnect</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,27.013333 -221.333333,39.613333 -182.933333,64.813333 -144.533333,39.613333 -182.933333,14.413333 -202.133333,27.013333" /> -<polyline stroke-width="1.333333" - points="202.133333,27.013333 221.333333,39.613333 -182.933333,64.813333 -144.533333,39.613333 -182.933333,14.413333 -202.133333,27.013333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="44.82">Test 1</text> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - x="245.333333" y="21.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="44.82">Task 1</text> -<polygon stroke-width="0" fill="black" - points="295.733333,64.013333 293.333333,73.613333 -290.933333,64.013333" /> -<line stroke-width="1.333333" - x1="293.333333" y1="57.613333" x2="293.333333" y2="70.864596" /> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - x="245.333333" y="73.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="96.82">Task 1.5</text> -<polygon stroke-width="0" fill="black" - points="235.733333,37.213333 245.333333,39.613333 -235.733333,42.013333" /> -<polyline stroke-width="1.333333" - points="221.333333,39.613333 233.333333,39.613333 -233.333333,39.613333 -242.584596,39.613333" /> -<polygon stroke-width="0" fill="black" - points="185.333333,116.013333 182.933333,125.613333 -180.533333,116.013333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="64.813333" x2="182.933333" y2="122.864596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,138.213333 -221.333333,150.813333 -182.933333,176.013333 -144.533333,150.813333 -182.933333,125.613333 -202.133333,138.213333" /> -<polyline stroke-width="1.333333" - points="202.133333,138.213333 221.333333,150.813333 -182.933333,176.013333 -144.533333,150.813333 -182.933333,125.613333 -202.133333,138.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="156.02">Test 2</text> -<rect fill="rgb(33,179,171)" stroke-width="1.333333" - x="245.333333" y="132.813333" width="115.2" height="54" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="302.933333" y="157.686667">Task 2</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="302.933333" y="172.353333">is bigger</text> -<polygon stroke-width="0" fill="black" - points="235.733333,157.413333 245.333333,159.813333 -235.733333,162.213333" /> -<polyline stroke-width="1.333333" - points="221.333333,150.813333 233.333333,150.813333 -233.333333,159.813333 -242.584596,159.813333" /> -<polygon stroke-width="0" fill="black" - points="185.333333,193.213333 182.933333,202.813333 -180.533333,193.213333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="176.013333" x2="182.933333" y2="200.064596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,215.413333 -221.333333,228.013333 -182.933333,253.213333 -144.533333,228.013333 -182.933333,202.813333 -202.133333,215.413333" /> -<polyline stroke-width="1.333333" - points="202.133333,215.413333 221.333333,228.013333 -182.933333,253.213333 -144.533333,228.013333 -182.933333,202.813333 -202.133333,215.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="233.22">Test 3</text> -<rect fill="rgb(207,0,89)" stroke-width="1.333333" - x="245.333333" y="210.013333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="233.22">Task 3</text> -<polygon stroke-width="0" fill="black" - points="235.733333,225.613333 245.333333,228.013333 -235.733333,230.413333" /> -<polyline stroke-width="1.333333" - points="221.333333,228.013333 233.333333,228.013333 -233.333333,228.013333 -242.584596,228.013333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="253.213333" x2="182.933333" y2="269.213333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,89.213333 384.533333,91.613333 -374.933333,94.013333" /> -<line stroke-width="1.333333" - x1="341.333333" y1="91.613333" x2="381.784596" y2="91.613333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,157.413333 384.533333,159.813333 -374.933333,162.213333" /> -<line stroke-width="1.333333" - x1="360.533333" y1="159.813333" x2="381.784596" y2="159.813333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,225.613333 384.533333,228.013333 -374.933333,230.413333" /> -<line stroke-width="1.333333" - x1="341.333333" y1="228.013333" x2="381.784596" y2="228.013333" /> -<polygon stroke-width="0" fill="black" - points="192.533333,271.613333 182.933333,269.213333 -192.533333,266.813333" /> -<polyline stroke-width="1.333333" - points="384.533333,91.613333 384.533333,269.213333 -185.68207,269.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="179.6" y="11.08"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="179.6" y="282.96"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="387.866667" y="96.82"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="141.2" y="44.82"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="265.733333" y="285.36" -><tspan font-family="Courier">Fcase</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="468.533333,43.813333 -487.733333,56.413333 -449.333333,81.613333 -410.933333,56.413333 -449.333333,31.213333 -468.533333,43.813333" /> -<polyline stroke-width="1.333333" - points="468.533333,43.813333 487.733333,56.413333 -449.333333,81.613333 -410.933333,56.413333 -449.333333,31.213333 -468.533333,43.813333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="449.333333" y="61.62" -><tspan font-style="italic">i < n</tspan></text> -<polygon stroke-width="0" fill="black" - points="502.133333,54.013333 511.733333,56.413333 -502.133333,58.813333" /> -<line stroke-width="1.333333" - x1="487.733333" y1="56.413333" x2="508.984596" y2="56.413333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="511.733333" y="38.413333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="559.733333" y="61.62">Task</text> -<polygon stroke-width="0" fill="black" - points="458.933333,19.213333 449.333333,16.813333 -458.933333,14.413333" /> -<polyline stroke-width="1.333333" - points="559.733333,38.413333 559.733333,16.813333 -452.08207,16.813333" /> -<polygon stroke-width="0" fill="black" - points="451.733333,21.613333 449.333333,31.213333 -446.933333,21.613333" /> -<line stroke-width="1.333333" - x1="449.333333" y1="16.813333" x2="449.333333" y2="28.464596" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="491.066667" y="53.08">T</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="446" y="22.02"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="446" y="95.36"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="611.066667" y="61.62"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="407.6" y="61.62"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="509.333333" y="95.36" -><tspan font-family="Courier">Fwhiledo</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="434.933333" y="129.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="482.933333" y="152.82">Task</text> -<polygon stroke-width="0" fill="black" - points="485.333333,172.013333 482.933333,181.613333 -480.533333,172.013333" /> -<line stroke-width="1.333333" - x1="482.933333" y1="165.613333" x2="482.933333" y2="178.864596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="502.133333,194.213333 -521.333333,206.813333 -482.933333,232.013333 -444.533333,206.813333 -482.933333,181.613333 -502.133333,194.213333" /> -<polyline stroke-width="1.333333" - points="502.133333,194.213333 521.333333,206.813333 -482.933333,232.013333 -444.533333,206.813333 -482.933333,181.613333 -502.133333,194.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="482.933333" y="212.02" -><tspan font-style="italic">n > 5</tspan></text> -<polygon stroke-width="0" fill="black" - points="540.533333,150.013333 530.933333,147.613333 -540.533333,145.213333" /> -<polyline stroke-width="1.333333" - points="521.333333,206.813333 554.933333,206.813333 -554.933333,147.613333 -533.68207,147.613333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="524.666667" y="203.48">T</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="479.6" y="126.28"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="479.6" y="245.76"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="558.266667" y="152.82"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="431.6" y="152.82"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="557.333333" y="236.16" -><tspan font-family="Courier">Frepeatuntil</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="521.333333,273.413333 -540.533333,286.013333 -502.133333,311.213333 -463.733333,286.013333 -502.133333,260.813333 -521.333333,273.413333" /> -<polyline stroke-width="1.333333" - points="521.333333,273.413333 540.533333,286.013333 -502.133333,311.213333 -463.733333,286.013333 -502.133333,260.813333 -521.333333,273.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="502.133333" y="291.22" -><tspan font-style="italic">A < B</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="386.933333" y="311.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="434.933333" y="334.42">False</text> -<polygon stroke-width="0" fill="black" - points="437.333333,301.613333 434.933333,311.213333 -432.533333,301.613333" /> -<polyline stroke-width="1.333333" - points="463.733333,286.013333 434.933333,286.013333 -434.933333,308.464596" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="521.333333" y="311.213333" width="96" height="43.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="569.333333" y="338.02">True</text> -<polygon stroke-width="0" fill="black" - points="571.733333,301.613333 569.333333,311.213333 -566.933333,301.613333" /> -<polyline stroke-width="1.333333" - points="540.533333,286.013333 569.333333,286.013333 -569.333333,308.464596" /> -<polygon stroke-width="0" fill="black" - points="437.333333,360.813333 434.933333,370.413333 -432.533333,360.813333" /> -<line stroke-width="1.333333" - x1="434.933333" y1="347.213333" x2="434.933333" y2="367.664596" /> -<polygon stroke-width="0" fill="black" - points="571.733333,360.813333 569.333333,370.413333 -566.933333,360.813333" /> -<line stroke-width="1.333333" - x1="569.333333" y1="354.413333" x2="569.333333" y2="367.664596" /> -<line stroke-width="1.333333" - x1="569.333333" y1="370.413333" x2="434.933333" y2="370.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="498.8" y="257.48"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="498.8" y="384.16"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="620.666667" y="338.02"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="383.6" y="334.42"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="502.133333" y="398.56" -><tspan font-family="Courier">Fifthenelse</tspan></text> -<ellipse fill="rgb(173,255,46)" stroke-width="1.333333" - cx="164.533333" cy="324.413333" rx="36" ry="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="164.533333" y="329.62">Start</text> -<polygon stroke-width="0" fill="black" - points="214.933333,322.013333 224.533333,324.413333 -214.933333,326.813333" /> -<line stroke-width="1.333333" - x1="200.533333" y1="324.413333" x2="221.784596" y2="324.413333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="224.533333" y="306.413333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="272.533333" y="329.62">First task</text> -<polygon stroke-width="0" fill="black" - points="274.933333,356.813333 272.533333,366.413333 -270.133333,356.813333" /> -<line stroke-width="1.333333" - x1="272.533333" y1="342.413333" x2="272.533333" y2="363.664596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="291.733333,379.013333 -310.933333,391.613333 -272.533333,416.813333 -234.133333,391.613333 -272.533333,366.413333 -291.733333,379.013333" /> -<polyline stroke-width="1.333333" - points="291.733333,379.013333 310.933333,391.613333 -272.533333,416.813333 -234.133333,391.613333 -272.533333,366.413333 -291.733333,379.013333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="272.533333" y="396.82">Test 1</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="130.933333" y="416.813333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="178.933333" y="440.02">Task</text> -<polygon stroke-width="0" fill="black" - points="181.333333,459.213333 178.933333,468.813333 -176.533333,459.213333" /> -<line stroke-width="1.333333" - x1="178.933333" y1="452.813333" x2="178.933333" y2="466.064596" /> -<polyline stroke-width="0" fill="rgb(217,166,33)" - points="198.133333,481.413333 -217.333333,494.013333 -178.933333,519.213333 -140.533333,494.013333 -178.933333,468.813333 -198.133333,481.413333" /> -<polyline stroke-width="1.333333" - points="198.133333,481.413333 217.333333,494.013333 -178.933333,519.213333 -140.533333,494.013333 -178.933333,468.813333 -198.133333,481.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="178.933333" y="499.22" -><tspan font-style="italic">i ≥ 5</tspan></text> -<polygon stroke-width="0" fill="black" - points="236.533333,437.213333 226.933333,434.813333 -236.533333,432.413333" /> -<polyline stroke-width="1.333333" - points="217.333333,494.013333 250.933333,494.013333 -250.933333,434.813333 -229.68207,434.813333" /> -<polygon stroke-width="0" fill="black" - points="181.333333,407.213333 178.933333,416.813333 -176.533333,407.213333" /> -<polyline stroke-width="1.333333" - points="234.133333,391.613333 178.933333,391.613333 -178.933333,414.064596" /> -<polyline stroke-width="0" fill="rgb(217,166,33)" - points="426.133333,429.413333 -445.333333,442.013333 -406.933333,467.213333 -368.533333,442.013333 -406.933333,416.813333 -426.133333,429.413333" /> -<polyline stroke-width="1.333333" - points="426.133333,429.413333 445.333333,442.013333 -406.933333,467.213333 -368.533333,442.013333 -406.933333,416.813333 -426.133333,429.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.933333" y="447.22" -><tspan font-style="italic">A < B</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="291.733333" y="467.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="339.733333" y="490.42">Left</text> -<polygon stroke-width="0" fill="black" - points="342.133333,457.613333 339.733333,467.213333 -337.333333,457.613333" /> -<polyline stroke-width="1.333333" - points="368.533333,442.013333 339.733333,442.013333 -339.733333,464.464596" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="426.133333" y="467.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="474.133333" y="490.42">Right</text> -<polygon stroke-width="0" fill="black" - points="476.533333,457.613333 474.133333,467.213333 -471.733333,457.613333" /> -<polyline stroke-width="1.333333" - points="445.333333,442.013333 474.133333,442.013333 -474.133333,464.464596" /> -<polygon stroke-width="0" fill="black" - points="342.133333,509.613333 339.733333,519.213333 -337.333333,509.613333" /> -<line stroke-width="1.333333" - x1="339.733333" y1="503.213333" x2="339.733333" y2="516.464596" /> -<polygon stroke-width="0" fill="black" - points="476.533333,509.613333 474.133333,519.213333 -471.733333,509.613333" /> -<line stroke-width="1.333333" - x1="474.133333" y1="503.213333" x2="474.133333" y2="516.464596" /> -<line stroke-width="1.333333" - x1="474.133333" y1="519.213333" x2="339.733333" y2="519.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448.666667" y="438.68">T</text> -<polygon stroke-width="0" fill="black" - points="409.333333,407.213333 406.933333,416.813333 -404.533333,407.213333" /> -<polyline stroke-width="1.333333" - points="310.933333,391.613333 406.933333,391.613333 -406.933333,414.064596" /> -<polygon stroke-width="0" fill="black" - points="181.333333,525.613333 178.933333,535.213333 -176.533333,525.613333" /> -<line stroke-width="1.333333" - x1="178.933333" y1="519.213333" x2="178.933333" y2="532.464596" /> -<polygon stroke-width="0" fill="black" - points="409.333333,525.613333 406.933333,535.213333 -404.533333,525.613333" /> -<line stroke-width="1.333333" - x1="406.933333" y1="519.213333" x2="406.933333" y2="532.464596" /> -<line stroke-width="1.333333" - x1="406.933333" y1="535.213333" x2="178.933333" y2="535.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="314.266667" y="388.28">T</text> -<polygon stroke-width="0" fill="black" - points="274.933333,549.613333 272.533333,559.213333 -270.133333,549.613333" /> -<line stroke-width="1.333333" - x1="272.533333" y1="535.213333" x2="272.533333" y2="556.464596" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="285.466667" y="555.88" -><tspan font-style="italic">Compound statements</tspan></text> -<ellipse fill="green" stroke-width="1.333333" - cx="146.533333" cy="655.213333" rx="18" ry="12" /> -<polygon stroke-width="0" fill="black" - points="178.933333,652.813333 188.533333,655.213333 -178.933333,657.613333" /> -<line stroke-width="1.333333" - x1="164.533333" y1="655.213333" x2="185.784596" y2="655.213333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="188.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="236.533333" y="660.42">Planejamento</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="356.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="404.533333" y="660.42">Execução</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="660.42">Seleção</text> -<polyline stroke-width="0" fill="rgb(173,255,46)" - points="356.533333,583.213333 -392.533333,601.213333 -320.533333,637.213333 -248.533333,601.213333 -320.533333,565.213333 -356.533333,583.213333" /> -<polyline stroke-width="1.333333" - points="356.533333,583.213333 392.533333,601.213333 -320.533333,637.213333 -248.533333,601.213333 -320.533333,565.213333 -356.533333,583.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.533333" y="599.086667">Avaliação do</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.533333" y="613.753333">Planejamento</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="395.866667" y="597.88">Correto</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="245.2" y="597.88">Incompleto</text> -<polygon stroke-width="0" fill="black" - points="318.133333,646.813333 320.533333,637.213333 -322.933333,646.813333" /> -<polyline stroke-width="1.333333" - points="284.533333,655.213333 320.533333,655.213333 -320.533333,639.96207" /> -<polygon stroke-width="0" fill="black" - points="238.933333,627.613333 236.533333,637.213333 -234.133333,627.613333" /> -<polyline stroke-width="1.333333" - points="248.533333,601.213333 236.533333,601.213333 -236.533333,634.464596" /> -<polygon stroke-width="0" fill="black" - points="406.933333,627.613333 404.533333,637.213333 -402.133333,627.613333" /> -<polyline stroke-width="1.333333" - points="392.533333,601.213333 404.533333,601.213333 -404.533333,634.464596" /> -<polyline stroke-width="0" fill="rgb(173,255,46)" - points="524.533333,691.213333 -560.533333,709.213333 -488.533333,745.213333 -416.533333,709.213333 -488.533333,673.213333 -524.533333,691.213333" /> -<polyline stroke-width="1.333333" - points="524.533333,691.213333 560.533333,709.213333 -488.533333,745.213333 -416.533333,709.213333 -488.533333,673.213333 -524.533333,691.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="488.533333" y="707.086667">Avaliação da</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="488.533333" y="721.753333">Execução</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.866667" y="722.96">Correto</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="413.2" y="722.96">Incompleto</text> -<polygon stroke-width="0" fill="black" - points="490.933333,663.613333 488.533333,673.213333 -486.133333,663.613333" /> -<polyline stroke-width="1.333333" - points="452.533333,655.213333 488.533333,655.213333 -488.533333,670.464596" /> -<polygon stroke-width="0" fill="black" - points="402.133333,682.813333 404.533333,673.213333 -406.933333,682.813333" /> -<polyline stroke-width="1.333333" - points="416.533333,709.213333 404.533333,709.213333 -404.533333,675.96207" /> -<polygon stroke-width="0" fill="black" - points="570.133333,682.813333 572.533333,673.213333 -574.933333,682.813333" /> -<polyline stroke-width="1.333333" - points="560.533333,709.213333 572.533333,709.213333 -572.533333,675.96207" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="577.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="600.42">Extração</text> -<polygon stroke-width="0" fill="black" - points="570.133333,622.813333 572.533333,613.213333 -574.933333,622.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="637.213333" x2="572.533333" y2="615.96207" /> -<polygon stroke-width="0" fill="black" - points="570.133333,562.813333 572.533333,553.213333 -574.933333,562.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="577.213333" x2="572.533333" y2="555.96207" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="517.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="540.42">Conclusão</text> -<polygon stroke-width="0" fill="black" - points="570.133333,502.813333 572.533333,493.213333 -574.933333,502.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="517.213333" x2="572.533333" y2="495.96207" /> -<ellipse fill="red" stroke-width="1.333333" - cx="572.533333" cy="481.213333" rx="18" ry="12" /> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/FontsDPV.svg b/graphics/circuit_macros/examples/dpv/FontsDPV.svg deleted file mode 100644 index 52f9d53f63..0000000000 --- a/graphics/circuit_macros/examples/dpv/FontsDPV.svg +++ /dev/null @@ -1,204 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="551" height="676" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="550.4px" height="675.2px" - viewBox="0 0 550.4 675.2" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<rect x="1.066667" y="0.533333" width="547.2" height="672" /> -<g style="font-family:Arial" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="58.133333">Arial</text> -</g> -<g style="font-family:Arial" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="58.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Helvetica" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="106.133333">Helvetica</text> -</g> -<g style="font-family:Helvetica" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="106.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Times" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="154.133333">Times</text> -</g> -<g style="font-family:Times" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="154.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Courier" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="202.133333">Courier</text> -</g> -<g style="font-family:Courier" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="202.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Cursive" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="250.133333">Cursive</text> -</g> -<g style="font-family:Cursive" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="250.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Verdana" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="298.133333">Verdana</text> -</g> -<g style="font-family:Verdana" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="298.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Georgia" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="346.133333">Georgia</text> -</g> -<g style="font-family:Georgia" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="346.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Palatino" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="394.133333">Palatino</text> -</g> -<g style="font-family:Palatino" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="394.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Garamond" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="442.133333">Garamond</text> -</g> -<g style="font-family:Garamond" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="442.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Bookman" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="490.133333">Bookman</text> -</g> -<g style="font-family:Bookman" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="490.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Trebuchet MS" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="538.133333">Trebuchet MS</text> -</g> -<g style="font-family:Trebuchet MS" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="538.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Arial Black" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="586.133333">Arial Black</text> -</g> -<g style="font-family:Arial Black" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="586.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Impact" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="634.133333">Impact</text> -</g> -<g style="font-family:Impact" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="634.133333">ABCDEFG abcdefg</text> -</g> -<text font-size="13.090909pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="669.866667" ->Available fonts: these may be viewer-dependent</text> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/FusesDPV.m4 b/graphics/circuit_macros/examples/dpv/FusesDPV.m4 index f45d0461be..008a5cdc92 100644 --- a/graphics/circuit_macros/examples/dpv/FusesDPV.m4 +++ b/graphics/circuit_macros/examples/dpv/FusesDPV.m4 @@ -4,7 +4,8 @@ cct_init(svg_font(sans-serif,11bp__)) movewid = 0.25 - {fuse ; {"`fuse'" at last line.c+(0,-0.2)} + { + fuse ; {"`fuse'" at last line.c+(0,-0.2)} move fuse(,D) ; {"`fuse(,D)'" at last line.c+(0,-0.2)} move @@ -18,21 +19,28 @@ movewid = 0.25 } move down; right_ { - cbreaker; {"`cbreaker'" at last line.c+(0,-0.25)} + fuse(,HB) ; {"`fuse(,HB)'" at last line.c+(0,-0.2)} + move + fuse(,HC,0.5,0.3) ; {"`...(,HC,0.5,0.3)'" at last line.c+(0,-0.25)} move - cbreaker(,R); {"`cbreaker(,R)'" at last line.c+(0,-0.25)} + cbreaker; {"`cbreaker'" at last line.c+(0,-0.2)} move - cbreaker(,,D); {"`...(,,D)'" at last line.c+(0,-0.25)} + cbreaker(,R,D); {"`...(,R,D)'" at last line.c+(0,-0.2)} move - cbreaker(,,T); {"`...(,,T)'" at last line.c+(0,-0.25)} + cbreaker(,,T); {"`...(,,T)'" at last line.c+(0,-0.2)} move - cbreaker(,,TS); {"`...(,,TS)'" at last line.c+(0,-0.25)} + cbreaker(,,TS); {"`...(,,TS)'" at last line.c+(0,-0.2) } } move down; right_ { - fuse(,HB) ; {"`fuse(,HB)'" at last line.c+(0,-0.2)} + jumper ; {"`jumper'" at last line.c+(0,-0.2) } + move + jumper(,CJBED) ; {"`...(,CJBED)'" at last line.c+(0,-0.2) } move - fuse(,HC,0.5,0.3) ; {"`(,HC,0.5,0.3)'" ljust at last line.start+(0,-0.25)} + jumper(,body=outlined "gray" shaded "gray") + { "`...(,body=outlined \"gray\" 'svg_backsl" wid 122bp__ \ + with .w at (last line.start, last "") + "` shaded \"gray\")'" at last "".sw+(0,-10bp__) ljust } } command "</g>" # end font diff --git a/graphics/circuit_macros/examples/dpv/HeathkitDPV.svg b/graphics/circuit_macros/examples/dpv/HeathkitDPV.svg deleted file mode 100644 index bafdb74ce6..0000000000 --- a/graphics/circuit_macros/examples/dpv/HeathkitDPV.svg +++ /dev/null @@ -1,2010 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="852" height="607" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="851.2px" height="605.991072px" - viewBox="0 0 851.2 605.991072" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:Helvetica" -> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="594.055829" x2="17.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="25.066667" y1="594.055829" x2="25.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="33.066667" y1="594.055829" x2="33.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="41.066667" y1="594.055829" x2="41.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="49.066667" y1="594.055829" x2="49.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="57.066667" y1="594.055829" x2="57.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="65.066667" y1="594.055829" x2="65.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="73.066667" y1="594.055829" x2="73.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="81.066667" y1="594.055829" x2="81.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="89.066667" y1="594.055829" x2="89.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="97.066667" y1="594.055829" x2="97.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="105.066667" y1="594.055829" x2="105.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="113.066667" y1="594.055829" x2="113.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="121.066667" y1="594.055829" x2="121.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="129.066667" y1="594.055829" x2="129.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="137.066667" y1="594.055829" x2="137.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="145.066667" y1="594.055829" x2="145.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="153.066667" y1="594.055829" x2="153.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="161.066667" y1="594.055829" x2="161.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="169.066667" y1="594.055829" x2="169.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="177.066667" y1="594.055829" x2="177.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="185.066667" y1="594.055829" x2="185.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="193.066667" y1="594.055829" x2="193.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="201.066667" y1="594.055829" x2="201.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="209.066667" y1="594.055829" x2="209.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="217.066667" y1="594.055829" x2="217.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="225.066667" y1="594.055829" x2="225.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="233.066667" y1="594.055829" x2="233.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="241.066667" y1="594.055829" x2="241.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="249.066667" y1="594.055829" x2="249.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="257.066667" y1="594.055829" x2="257.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="265.066667" y1="594.055829" x2="265.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="273.066667" y1="594.055829" x2="273.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="281.066667" y1="594.055829" x2="281.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="289.066667" y1="594.055829" x2="289.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="297.066667" y1="594.055829" x2="297.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="305.066667" y1="594.055829" x2="305.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="313.066667" y1="594.055829" x2="313.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="321.066667" y1="594.055829" x2="321.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="329.066667" y1="594.055829" x2="329.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="337.066667" y1="594.055829" x2="337.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="345.066667" y1="594.055829" x2="345.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="353.066667" y1="594.055829" x2="353.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="361.066667" y1="594.055829" x2="361.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="369.066667" y1="594.055829" x2="369.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="377.066667" y1="594.055829" x2="377.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="385.066667" y1="594.055829" x2="385.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="393.066667" y1="594.055829" x2="393.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="401.066667" y1="594.055829" x2="401.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="409.066667" y1="594.055829" x2="409.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="417.066667" y1="594.055829" x2="417.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="425.066667" y1="594.055829" x2="425.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="433.066667" y1="594.055829" x2="433.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="441.066667" y1="594.055829" x2="441.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="449.066667" y1="594.055829" x2="449.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="457.066667" y1="594.055829" x2="457.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="465.066667" y1="594.055829" x2="465.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="473.066667" y1="594.055829" x2="473.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="481.066667" y1="594.055829" x2="481.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="489.066667" y1="594.055829" x2="489.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="497.066667" y1="594.055829" x2="497.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="505.066667" y1="594.055829" x2="505.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="513.066667" y1="594.055829" x2="513.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="521.066667" y1="594.055829" x2="521.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="529.066667" y1="594.055829" x2="529.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="537.066667" y1="594.055829" x2="537.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="545.066667" y1="594.055829" x2="545.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="553.066667" y1="594.055829" x2="553.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="561.066667" y1="594.055829" x2="561.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="569.066667" y1="594.055829" x2="569.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="577.066667" y1="594.055829" x2="577.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="585.066667" y1="594.055829" x2="585.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="593.066667" y1="594.055829" x2="593.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="601.066667" y1="594.055829" x2="601.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="609.066667" y1="594.055829" x2="609.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="617.066667" y1="594.055829" x2="617.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="625.066667" y1="594.055829" x2="625.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="633.066667" y1="594.055829" x2="633.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="641.066667" y1="594.055829" x2="641.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="649.066667" y1="594.055829" x2="649.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="657.066667" y1="594.055829" x2="657.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="665.066667" y1="594.055829" x2="665.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="673.066667" y1="594.055829" x2="673.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="681.066667" y1="594.055829" x2="681.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="689.066667" y1="594.055829" x2="689.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="697.066667" y1="594.055829" x2="697.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="705.066667" y1="594.055829" x2="705.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="713.066667" y1="594.055829" x2="713.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="721.066667" y1="594.055829" x2="721.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="729.066667" y1="594.055829" x2="729.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="737.066667" y1="594.055829" x2="737.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="745.066667" y1="594.055829" x2="745.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="753.066667" y1="594.055829" x2="753.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="761.066667" y1="594.055829" x2="761.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="769.066667" y1="594.055829" x2="769.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="777.066667" y1="594.055829" x2="777.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="785.066667" y1="594.055829" x2="785.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="793.066667" y1="594.055829" x2="793.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="801.066667" y1="594.055829" x2="801.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="809.066667" y1="594.055829" x2="809.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="817.066667" y1="594.055829" x2="817.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="825.066667" y1="594.055829" x2="825.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="833.066667" y1="594.055829" x2="833.066667" y2="18.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="17.066667" y="603.324405">0</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="97.066667" y="603.324405">10</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="603.324405">20</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="257.066667" y="603.324405">30</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="337.066667" y="603.324405">40</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="417.066667" y="603.324405">50</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="497.066667" y="603.324405">60</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="577.066667" y="603.324405">70</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="657.066667" y="603.324405">80</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="737.066667" y="603.324405">90</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="817.066667" y="603.324405">100</text> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="594.055829" x2="833.066667" y2="594.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="586.055829" x2="833.066667" y2="586.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="578.055829" x2="833.066667" y2="578.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="570.055829" x2="833.066667" y2="570.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="562.055829" x2="833.066667" y2="562.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="554.055829" x2="833.066667" y2="554.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="546.055829" x2="833.066667" y2="546.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="538.055829" x2="833.066667" y2="538.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="530.055829" x2="833.066667" y2="530.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="522.055829" x2="833.066667" y2="522.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="514.055829" x2="833.066667" y2="514.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="506.055829" x2="833.066667" y2="506.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="498.055829" x2="833.066667" y2="498.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="490.055829" x2="833.066667" y2="490.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="482.055829" x2="833.066667" y2="482.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="474.055829" x2="833.066667" y2="474.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="466.055829" x2="833.066667" y2="466.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="458.055829" x2="833.066667" y2="458.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="450.055829" x2="833.066667" y2="450.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="442.055829" x2="833.066667" y2="442.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="434.055829" x2="833.066667" y2="434.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="426.055829" x2="833.066667" y2="426.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="418.055829" x2="833.066667" y2="418.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="410.055829" x2="833.066667" y2="410.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="402.055829" x2="833.066667" y2="402.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="394.055829" x2="833.066667" y2="394.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="386.055829" x2="833.066667" y2="386.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="378.055829" x2="833.066667" y2="378.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="370.055829" x2="833.066667" y2="370.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="362.055829" x2="833.066667" y2="362.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="354.055829" x2="833.066667" y2="354.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="346.055829" x2="833.066667" y2="346.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="338.055829" x2="833.066667" y2="338.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="330.055829" x2="833.066667" y2="330.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="322.055829" x2="833.066667" y2="322.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="314.055829" x2="833.066667" y2="314.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="306.055829" x2="833.066667" y2="306.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="298.055829" x2="833.066667" y2="298.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="290.055829" x2="833.066667" y2="290.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="282.055829" x2="833.066667" y2="282.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="274.055829" x2="833.066667" y2="274.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="266.055829" x2="833.066667" y2="266.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="258.055829" x2="833.066667" y2="258.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="250.055829" x2="833.066667" y2="250.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="242.055829" x2="833.066667" y2="242.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="234.055829" x2="833.066667" y2="234.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="226.055829" x2="833.066667" y2="226.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="218.055829" x2="833.066667" y2="218.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="210.055829" x2="833.066667" y2="210.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="202.055829" x2="833.066667" y2="202.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="194.055829" x2="833.066667" y2="194.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="186.055829" x2="833.066667" y2="186.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="178.055829" x2="833.066667" y2="178.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="170.055829" x2="833.066667" y2="170.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="162.055829" x2="833.066667" y2="162.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="154.055829" x2="833.066667" y2="154.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="146.055829" x2="833.066667" y2="146.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="138.055829" x2="833.066667" y2="138.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="130.055829" x2="833.066667" y2="130.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="122.055829" x2="833.066667" y2="122.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="114.055829" x2="833.066667" y2="114.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="106.055829" x2="833.066667" y2="106.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="98.055829" x2="833.066667" y2="98.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="90.055829" x2="833.066667" y2="90.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="82.055829" x2="833.066667" y2="82.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="74.055829" x2="833.066667" y2="74.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="66.055829" x2="833.066667" y2="66.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="58.055829" x2="833.066667" y2="58.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="50.055829" x2="833.066667" y2="50.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="42.055829" x2="833.066667" y2="42.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="34.055829" x2="833.066667" y2="34.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="26.055829" x2="833.066667" y2="26.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="18.055829" x2="833.066667" y2="18.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="597.356784">0</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="517.356784">10</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="437.356784">20</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="357.356784">30</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="277.356784">40</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="197.356784">50</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="117.356784">60</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="37.356784">70</text> -<path stroke-width="0" stroke="white" - fill="white" - d="M 17.066667,10.055829 - C 17.066667,11.389162 17.066667,12.722496 17.066667,14.055829 17.066667,16.722496 -17.066667,37.255829 17.066667,75.655829 17.066667,114.055829 -44.266667,133.255829 98.666667,133.255829 153.066667,133.255829 -180.266667,152.455829 180.266667,190.855829 180.266667,229.255829 -207.466667,248.455829 261.866667,248.455829 316.266667,248.455829 -343.466667,267.655829 343.466667,306.055829 343.466667,344.455829 -370.666667,363.655829 425.066667,363.655829 479.466667,363.655829 -506.666667,382.855829 506.666667,421.255829 506.666667,459.655829 -533.866667,478.855829 588.266667,478.855829 642.666667,478.855829 -669.866667,498.055829 669.866667,536.455829 669.866667,574.855829 -697.066667,594.055829 751.466667,594.055829 805.866667,594.055829 -835.733333,594.055829 841.066667,594.055829 846.4,594.055829 -849.066667,591.389162 849.066667,586.055829 849.066667,580.722496 -849.066667,484.722496 849.066667,298.055829 849.066667,111.389162 -849.066667,16.722496 849.066667,14.055829 849.066667,11.389162 -847.733333,10.055829 845.066667,10.055829 843.733333,10.055829 842.4,10.055829 -841.066667,10.055829" /> -<path stroke="white" - d="M 17.066667,10.055829 - C 17.066667,11.389162 17.066667,12.722496 17.066667,14.055829 17.066667,16.722496 -17.066667,37.255829 17.066667,75.655829 17.066667,114.055829 -44.266667,133.255829 98.666667,133.255829 153.066667,133.255829 -180.266667,152.455829 180.266667,190.855829 180.266667,229.255829 -207.466667,248.455829 261.866667,248.455829 316.266667,248.455829 -343.466667,267.655829 343.466667,306.055829 343.466667,344.455829 -370.666667,363.655829 425.066667,363.655829 479.466667,363.655829 -506.666667,382.855829 506.666667,421.255829 506.666667,459.655829 -533.866667,478.855829 588.266667,478.855829 642.666667,478.855829 -669.866667,498.055829 669.866667,536.455829 669.866667,574.855829 -697.066667,594.055829 751.466667,594.055829 805.866667,594.055829 -835.733333,594.055829 841.066667,594.055829 846.4,594.055829 -849.066667,591.389162 849.066667,586.055829 849.066667,580.722496 -849.066667,484.722496 849.066667,298.055829 849.066667,111.389162 -849.066667,16.722496 849.066667,14.055829 849.066667,11.389162 -847.733333,10.055829 845.066667,10.055829 843.733333,10.055829 842.4,10.055829 -841.066667,10.055829" /> -<line x1="657.066667" y1="418.055829" x2="657.066667" y2="418.055829" /> -<line x1="657.066667" y1="418.055829" x2="656.533333" y2="418.055829" /> -<path d="M 657.066667,418.055829 - A 4 4 0 0 1 657.066667,426.055829" /> -<line x1="657.066667" y1="426.055829" x2="656.533333" y2="426.055829" /> -<path d="M 657.066667,426.055829 - A 4 4 0 1 1 657.066667,434.055829" /> -<line x1="657.066667" y1="434.055829" x2="656.533333" y2="434.055829" /> -<path d="M 657.066667,434.055829 - A 4 4 0 0 1 657.066667,442.055829" /> -<line x1="657.066667" y1="442.055829" x2="656.533333" y2="442.055829" /> -<path d="M 657.066667,442.055829 - A 4 4 0 0 1 657.066667,450.055829" /> -<line x1="657.066667" y1="450.055829" x2="656.533333" y2="450.055829" /> -<path d="M 657.066667,450.055829 - A 4 4 0 0 1 657.066667,458.055829" /> -<line x1="657.066667" y1="458.055829" x2="656.533333" y2="458.055829" /> -<path d="M 657.066667,458.055829 - A 4 4 0 0 1 657.066667,466.055829" /> -<line x1="657.066667" y1="466.055829" x2="656.533333" y2="466.055829" /> -<path d="M 657.066667,466.055829 - A 4 4 0 0 1 657.066667,474.055829" /> -<line x1="657.066667" y1="474.055829" x2="656.533333" y2="474.055829" /> -<path d="M 657.066667,474.055829 - A 4 4 0 1 1 657.066667,482.055829" /> -<line x1="657.066667" y1="482.055829" x2="656.533333" y2="482.055829" /> -<path d="M 657.066667,482.055829 - A 4 4 0 1 1 657.066667,490.055829" /> -<line x1="657.066667" y1="490.055829" x2="656.533333" y2="490.055829" /> -<path d="M 657.066667,490.055829 - A 4 4 0 1 1 657.066667,498.055829" /> -<line x1="657.066667" y1="498.055829" x2="656.533333" y2="498.055829" /> -<path d="M 657.066667,498.055829 - A 4 4 0 1 1 657.066667,506.055829" /> -<line x1="657.066667" y1="506.055829" x2="656.533333" y2="506.055829" /> -<path d="M 657.066667,506.055829 - A 4 4 0 1 1 657.066667,514.055829" /> -<line x1="657.066667" y1="514.055829" x2="656.533333" y2="514.055829" /> -<path d="M 657.066667,514.055829 - A 4 4 0 0 1 657.066667,522.055829" /> -<line x1="657.066667" y1="522.055829" x2="656.533333" y2="522.055829" /> -<line x1="657.066667" y1="522.055829" x2="657.066667" y2="522.055829" /> -<line x1="657.066667" y1="250.055829" x2="657.066667" y2="250.055829" /> -<line x1="657.066667" y1="250.055829" x2="656.533333" y2="250.055829" /> -<path d="M 657.066667,250.055829 - A 4 4 0 0 1 657.066667,258.055829" /> -<line x1="657.066667" y1="258.055829" x2="656.533333" y2="258.055829" /> -<path d="M 657.066667,258.055829 - A 4 4 0 1 1 657.066667,266.055829" /> -<line x1="657.066667" y1="266.055829" x2="656.533333" y2="266.055829" /> -<path d="M 657.066667,266.055829 - A 4 4 0 0 1 657.066667,274.055829" /> -<line x1="657.066667" y1="274.055829" x2="656.533333" y2="274.055829" /> -<path d="M 657.066667,274.055829 - A 4 4 0 0 1 657.066667,282.055829" /> -<line x1="657.066667" y1="282.055829" x2="656.533333" y2="282.055829" /> -<path d="M 657.066667,282.055829 - A 4 4 0 0 1 657.066667,290.055829" /> -<line x1="657.066667" y1="290.055829" x2="656.533333" y2="290.055829" /> -<path d="M 657.066667,290.055829 - A 4 4 0 0 1 657.066667,298.055829" /> -<line x1="657.066667" y1="298.055829" x2="656.533333" y2="298.055829" /> -<path d="M 657.066667,298.055829 - A 4 4 0 0 1 657.066667,306.055829" /> -<line x1="657.066667" y1="306.055829" x2="656.533333" y2="306.055829" /> -<path d="M 657.066667,306.055829 - A 4 4 0 1 1 657.066667,314.055829" /> -<line x1="657.066667" y1="314.055829" x2="656.533333" y2="314.055829" /> -<path d="M 657.066667,314.055829 - A 4 4 0 1 1 657.066667,322.055829" /> -<line x1="657.066667" y1="322.055829" x2="656.533333" y2="322.055829" /> -<path d="M 657.066667,322.055829 - A 4 4 0 1 1 657.066667,330.055829" /> -<line x1="657.066667" y1="330.055829" x2="656.533333" y2="330.055829" /> -<line x1="657.066667" y1="330.055829" x2="657.066667" y2="330.055829" /> -<line x1="657.066667" y1="154.055829" x2="657.066667" y2="154.055829" /> -<line x1="657.066667" y1="154.055829" x2="656.533333" y2="154.055829" /> -<path d="M 657.066667,154.055829 - A 4 4 0 0 1 657.066667,162.055829" /> -<line x1="657.066667" y1="162.055829" x2="656.533333" y2="162.055829" /> -<path d="M 657.066667,162.055829 - A 4 4 0 1 1 657.066667,170.055829" /> -<line x1="657.066667" y1="170.055829" x2="656.533333" y2="170.055829" /> -<path d="M 657.066667,170.055829 - A 4 4 0 0 1 657.066667,178.055829" /> -<line x1="657.066667" y1="178.055829" x2="656.533333" y2="178.055829" /> -<path d="M 657.066667,178.055829 - A 4 4 0 0 1 657.066667,186.055829" /> -<line x1="657.066667" y1="186.055829" x2="656.533333" y2="186.055829" /> -<path d="M 657.066667,186.055829 - A 4 4 0 0 1 657.066667,194.055829" /> -<line x1="657.066667" y1="194.055829" x2="656.533333" y2="194.055829" /> -<path d="M 657.066667,194.055829 - A 4 4 0 0 1 657.066667,202.055829" /> -<line x1="657.066667" y1="202.055829" x2="656.533333" y2="202.055829" /> -<path d="M 657.066667,202.055829 - A 4 4 0 0 1 657.066667,210.055829" /> -<line x1="657.066667" y1="210.055829" x2="656.533333" y2="210.055829" /> -<path d="M 657.066667,210.055829 - A 4 4 0 1 1 657.066667,218.055829" /> -<line x1="657.066667" y1="218.055829" x2="656.533333" y2="218.055829" /> -<path d="M 657.066667,218.055829 - A 4 4 0 1 1 657.066667,226.055829" /> -<line x1="657.066667" y1="226.055829" x2="656.533333" y2="226.055829" /> -<path d="M 657.066667,226.055829 - A 4 4 0 1 1 657.066667,234.055829" /> -<line x1="657.066667" y1="234.055829" x2="656.533333" y2="234.055829" /> -<line x1="663.2" y1="154.055829" x2="663.2" y2="234.055829" /> -<line x1="666.4" y1="154.055829" x2="666.4" y2="234.055829" /> -<line x1="657.066667" y1="234.055829" x2="657.066667" y2="234.055829" /> -<line x1="663.2" y1="234.055829" x2="663.2" y2="522.055829" /> -<line x1="666.4" y1="234.055829" x2="666.4" y2="522.055829" /> -<line stroke-dasharray="5.6,4" - x1="669.6" y1="154.055829" x2="669.6" y2="522.055829" /> -<line x1="669.6" y1="522.055829" x2="669.6" y2="534.855829" /> -<line x1="678.133333" y1="534.855829" x2="661.066667" y2="534.855829" /> -<line x1="675.288889" y1="538.055829" x2="663.911111" y2="538.055829" /> -<line x1="673.257143" y1="541.255829" x2="665.942857" y2="541.255829" /> -<line x1="675.733333" y1="266.055829" x2="675.733333" y2="266.055829" /> -<line x1="675.733333" y1="266.055829" x2="676.266667" y2="266.055829" /> -<path d="M 675.733333,266.055829 - A 4 4 0 0 1 675.733333,258.055829" /> -<line x1="675.733333" y1="258.055829" x2="676.266667" y2="258.055829" /> -<path d="M 675.733333,258.055829 - A 4 4 0 0 1 675.733333,250.055829" /> -<line x1="675.733333" y1="250.055829" x2="676.266667" y2="250.055829" /> -<path d="M 675.733333,250.055829 - A 4 4 0 0 1 675.733333,242.055829" /> -<line x1="675.733333" y1="242.055829" x2="676.266667" y2="242.055829" /> -<path d="M 675.733333,242.055829 - A 4 4 0 0 1 675.733333,234.055829" /> -<line x1="675.733333" y1="234.055829" x2="676.266667" y2="234.055829" /> -<path d="M 675.733333,234.055829 - A 4 4 0 0 1 675.733333,226.055829" /> -<line x1="675.733333" y1="226.055829" x2="676.266667" y2="226.055829" /> -<line x1="675.733333" y1="226.055829" x2="675.733333" y2="226.055829" /> -<line x1="675.733333" y1="322.055829" x2="675.733333" y2="322.055829" /> -<line x1="675.733333" y1="322.055829" x2="676.266667" y2="322.055829" /> -<path d="M 675.733333,322.055829 - A 4 4 0 0 1 675.733333,314.055829" /> -<line x1="675.733333" y1="314.055829" x2="676.266667" y2="314.055829" /> -<path d="M 675.733333,314.055829 - A 4 4 0 0 1 675.733333,306.055829" /> -<line x1="675.733333" y1="306.055829" x2="676.266667" y2="306.055829" /> -<path d="M 675.733333,306.055829 - A 4 4 0 0 1 675.733333,298.055829" /> -<line x1="675.733333" y1="298.055829" x2="676.266667" y2="298.055829" /> -<path d="M 675.733333,298.055829 - A 4 4 0 0 1 675.733333,290.055829" /> -<line x1="675.733333" y1="290.055829" x2="676.266667" y2="290.055829" /> -<path d="M 675.733333,290.055829 - A 4 4 0 0 1 675.733333,282.055829" /> -<line x1="675.733333" y1="282.055829" x2="676.266667" y2="282.055829" /> -<line x1="675.733333" y1="282.055829" x2="675.733333" y2="282.055829" /> -<rect stroke-width="2.666667" - stroke-dasharray="5.6,4" - x="137.066667" y="98.055829" width="464" height="440" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="345.066667" y="520.707552">POWER SUPPLY</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="345.066667" y="530.006016">CIRCUIT BOARD</text> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="297.066667" y1="538.055829" x2="297.066667" y2="506.055829" /> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="297.066667" y1="506.055829" x2="393.066667" y2="506.055829" /> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="393.066667" y1="506.055829" x2="393.066667" y2="538.055829" /> -<rect fill="white" - x="593.066667" y="514.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="525.356784">1</text> -<line x1="609.066667" y1="522.055829" x2="657.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="519.389162">RED</text> -<rect fill="white" - x="593.066667" y="410.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="421.356784">2</text> -<line x1="609.066667" y1="418.055829" x2="657.066667" y2="418.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="415.389162">RED</text> -<rect fill="white" - x="593.066667" y="322.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="333.356784">3</text> -<line x1="657.066667" y1="250.055829" x2="625.066667" y2="250.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="641.066667" y="247.389162">GRN</text> -<line x1="625.066667" y1="250.055829" x2="625.066667" y2="262.855829" /> -<line x1="633.6" y1="262.855829" x2="616.533333" y2="262.855829" /> -<line x1="630.755556" y1="266.055829" x2="619.377778" y2="266.055829" /> -<line x1="628.72381" y1="269.255829" x2="621.409524" y2="269.255829" /> -<line x1="609.066667" y1="330.055829" x2="657.066667" y2="330.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="327.389162">GRN</text> -<polygon stroke-width="0" fill="black" - points="653.302775,321.112933 649.066667,330.055829 -648.595988,320.171576" /> -<polygon stroke-width="0" fill="black" - points="644.830558,258.998725 649.066667,250.055829 -649.537345,259.940082" /> -<path d="M 649.497924,327.899542 - C 650.092714,324.92559 650.687505,321.951638 651.282295,318.977686 652.471876,313.029781 -651.733333,303.389162 649.066667,290.055829 646.4,276.722496 -645.661457,267.081877 646.851038,261.133972 647.445828,258.16002 648.040619,255.186068 -648.635409,252.212116" /> -<rect fill="white" - stroke="none" - x="629.066667" y="286.055829" width="24" height="8" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="641.066667" y="293.356784">6 VAC</text> -<rect fill="white" - x="593.066667" y="346.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="357.356784">4</text> -<line x1="609.066667" y1="354.055829" x2="633.066667" y2="354.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="621.066667" y="351.389162">BRN</text> -<polygon stroke-width="0" fill="black" - points="635.466667,363.655829 633.066667,370.055829 -630.666667,363.655829" /> -<line x1="633.066667" y1="354.055829" x2="633.066667" y2="368.536895" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="633.066667" y="376.707552">TO DIAL</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="633.066667" y="386.006016">LAMPS</text> -<rect fill="white" - x="593.066667" y="226.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="237.356784">5</text> -<line x1="609.066667" y1="234.055829" x2="657.066667" y2="234.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="231.389162">BLU</text> -<rect fill="white" - x="593.066667" y="146.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="157.356784">7</text> -<line x1="609.066667" y1="154.055829" x2="657.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="151.389162">BLU</text> -<rect fill="white" - x="593.066667" y="186.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="197.356784">6</text> -<line x1="609.066667" y1="194.055829" x2="657.066667" y2="194.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="191.389162">BLU-YEL</text> -<line x1="675.733333" y1="226.055829" x2="737.066667" y2="226.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="235.324405">BLK</text> -<circle fill="black" - cx="737.066667" cy="226.055829" r="2.048" /> -<line x1="675.733333" y1="266.055829" x2="737.066667" y2="266.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="263.389162">BLK-YEL</text> -<circle fill="black" - cx="737.066667" cy="266.055829" r="2.048" /> -<line x1="675.733333" y1="282.055829" x2="737.066667" y2="282.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="291.324405">BLK-GRN</text> -<circle fill="black" - cx="737.066667" cy="282.055829" r="2.048" /> -<line x1="675.733333" y1="322.055829" x2="737.066667" y2="322.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="319.389162">BLK-RED</text> -<circle fill="black" - cx="737.066667" cy="322.055829" r="2.048" /> -<line x1="737.066667" y1="322.055829" x2="745.066667" y2="322.055829" /> -<circle fill="black" - cx="745.066667" cy="322.055829" r="2.048" /> -<polyline points="737.066667,266.055829 745.066667,266.055829 -745.066667,330.055829" /> -<line x1="745.066667" y1="330.055829" x2="745.066667" y2="331.815829" /> -<path d="M 745.066667,331.815829 - A 5.12 5.12 0 0 1 745.066667,342.055829" /> -<circle fill="white" - cx="745.066667" cy="331.815829" r="2.048" /> -<path d="M 745.066667,342.055829 - A 5.12 5.12 0 0 0 745.066667,352.295829" /> -<line x1="745.066667" y1="352.295829" x2="745.066667" y2="354.055829" /> -<circle fill="white" - cx="745.066667" cy="352.295829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="705.066667" y="340.707552">3 A FUSE</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="705.066667" y="350.006016">SLOW BLOW</text> -<line x1="745.066667" y1="354.055829" x2="745.066667" y2="362.055829" /> -<circle fill="black" - cx="745.066667" cy="362.055829" r="2.048" /> -<rect x="768" y="352.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="355.655829" width="3.2" height="12.8" /> -<rect x="792" y="355.655829" width="3.2" height="12.8" /> -<line x1="768" y1="362.055829" x2="774.933333" y2="362.055829" /> -<line x1="802.133333" y1="362.055829" x2="795.2" y2="362.055829" /> -<line x1="768" y1="362.055829" x2="745.066667" y2="362.055829" /> -<circle fill="black" - cx="745.066667" cy="362.055829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="742.4" y="365.356784">A</text> -<line x1="802.133333" y1="362.055829" x2="825.066667" y2="362.055829" /> -<circle fill="black" - cx="825.066667" cy="362.055829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="827.733333" y="365.356784">B</text> -<rect x="768" y="464.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="467.655829" width="3.2" height="12.8" /> -<rect x="792" y="467.655829" width="3.2" height="12.8" /> -<line x1="768" y1="474.055829" x2="774.933333" y2="474.055829" /> -<line x1="802.133333" y1="474.055829" x2="795.2" y2="474.055829" /> -<line x1="768" y1="474.055829" x2="745.066667" y2="474.055829" /> -<circle fill="black" - cx="745.066667" cy="474.055829" r="2.048" /> -<line x1="802.133333" y1="474.055829" x2="825.066667" y2="474.055829" /> -<circle fill="black" - cx="825.066667" cy="474.055829" r="2.048" /> -<rect x="768" y="496.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="499.655829" width="3.2" height="12.8" /> -<rect x="792" y="499.655829" width="3.2" height="12.8" /> -<line x1="768" y1="506.055829" x2="774.933333" y2="506.055829" /> -<line x1="802.133333" y1="506.055829" x2="795.2" y2="506.055829" /> -<line x1="768" y1="506.055829" x2="745.066667" y2="506.055829" /> -<circle fill="black" - cx="745.066667" cy="506.055829" r="2.048" /> -<line x1="802.133333" y1="506.055829" x2="825.066667" y2="506.055829" /> -<circle fill="black" - cx="825.066667" cy="506.055829" r="2.048" /> -<line x1="768" y1="570.055829" x2="802.133333" y2="570.055829" /> -<path d="M 768,570.055829 - A 17.066667 17.066667 0 0 1 802.133333,570.055829" /> -<line x1="776.533333" y1="548.989162" x2="776.533333" y2="586.055829" /> -<line x1="793.6" y1="548.989162" x2="793.6" y2="586.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="804.8" y="566.174218">120 VAC</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="804.8" y="575.472683">50/60 Hz</text> -<circle cx="764.066667" cy="394.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="397.356784">1</text> -<circle cx="778.066667" cy="394.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="397.356784">4</text> -<circle cx="764.066667" cy="415.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="418.356784">2</text> -<circle cx="778.066667" cy="415.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="418.356784">5</text> -<circle cx="764.066667" cy="436.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="439.356784">3</text> -<circle cx="778.066667" cy="436.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="439.356784">6</text> -<line stroke-width="0.533333" - x1="785.066667" y1="414.844054" x2="791.854892" y2="408.055829" /> -<line stroke-width="0.533333" - x1="785.066667" y1="421.632279" x2="793.066667" y2="413.632279" /> -<line stroke-width="0.533333" - x1="785.066667" y1="428.420504" x2="793.066667" y2="420.420504" /> -<line stroke-width="0.533333" - x1="785.066667" y1="435.208729" x2="793.066667" y2="427.208729" /> -<line stroke-width="0.533333" - x1="785.066667" y1="441.996955" x2="793.066667" y2="433.996955" /> -<line stroke-width="0.533333" - x1="790.796017" y1="443.055829" x2="793.066667" y2="440.78518" /> -<line stroke-width="0.533333" - x1="785.066667" y1="408.055829" x2="785.066667" y2="408.055829" /> -<rect x="785.066667" y="408.055829" width="8" height="35" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="738.4" y="418.356784">POWER</text> -<polygon stroke-width="0" fill="black" - points="802.666667,410.655829 805.066667,401.055829 -807.466667,410.655829" /> -<line x1="805.066667" y1="429.055829" x2="805.066667" y2="403.254819" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="805.066667" y="398.389162">ON</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="805.066667" y="438.324405">OFF</text> -<polyline points="757.066667,394.055829 745.066667,394.055829 -745.066667,362.055829" /> -<polyline points="757.066667,415.055829 745.066667,415.055829 -745.066667,548.989162 -776.533333,548.989162" /> -<polyline points="793.6,548.989162 825.066667,548.989162 -825.066667,226.055829 -675.733333,226.055829" /> -<line x1="737.066667" y1="282.055829" x2="825.066667" y2="282.055829" /> -<circle fill="black" - cx="825.066667" cy="282.055829" r="2.048" /> -<rect fill="white" - x="569.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="577.066667" y="541.356784">25</text> -<polyline points="577.066667,546.055829 577.066667,557.255829 -581.333333,559.389162 -572.8,563.655829 -581.333333,567.922496 -572.8,572.189162 -581.333333,576.455829 -572.8,580.722496 -577.066667,582.855829 -577.066667,594.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="561.066667" y="568.707552">R516</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="561.066667" y="578.006016">22</text> -<line x1="585.6" y1="594.055829" x2="568.533333" y2="594.055829" /> -<line x1="582.755556" y1="597.255829" x2="571.377778" y2="597.255829" /> -<line x1="580.72381" y1="600.455829" x2="573.409524" y2="600.455829" /> -<circle fill="black" - cx="577.066667" cy="554.055829" r="2.048" /> -<line x1="577.066667" y1="554.055829" x2="617.066667" y2="554.055829" /> -<line x1="617.066667" y1="586.055829" x2="617.066667" y2="582.855829" /> -<circle cx="617.066667" cy="570.055829" r="12.8" /> -<line x1="617.066667" y1="582.855829" x2="617.066667" y2="578.589162" /> -<circle stroke-width="0.533333" - cx="617.066667" cy="578.589162" r="0.26567" /> -<path d="M 617.066667,578.589162 - A 6.4 6.4 0 0 0 617.066667,565.789162" /> -<path d="M 617.066667,565.789162 - A 4.266667 4.266667 0 0 0 617.066667,574.322496" /> -<path d="M 617.066667,574.322496 - A 6.4 6.4 0 0 0 617.066667,561.522496" /> -<circle stroke-width="0.533333" - cx="617.066667" cy="561.522496" r="0.26567" /> -<line x1="617.066667" y1="561.522496" x2="617.066667" y2="557.255829" /> -<line x1="617.066667" y1="557.255829" x2="617.066667" y2="554.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="564.05832">#49</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="573.356784">HI</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="582.655248">TEMP</text> -<line x1="617.066667" y1="586.055829" x2="577.066667" y2="586.055829" /> -<circle fill="black" - cx="577.066667" cy="586.055829" r="2.048" /> -<polygon stroke-width="0" fill="black" - points="581.978442,550.651196 577.066667,550.055829 -581.680759,548.269729" /> -<line stroke-width="0.533333" - x1="578.157671" y1="549.919454" x2="593.066667" y2="548.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="595.733333" y="551.356784">BRN</text> -<rect fill="white" - x="537.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="545.066667" y="541.356784">24</text> -<line x1="545.066667" y1="546.055829" x2="545.066667" y2="594.055829" /> -<line x1="553.6" y1="594.055829" x2="536.533333" y2="594.055829" /> -<line x1="550.755556" y1="597.255829" x2="539.377778" y2="597.255829" /> -<line x1="548.72381" y1="600.455829" x2="541.409524" y2="600.455829" /> -<rect fill="white" - x="225.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="233.066667" y="541.356784">23</text> -<line x1="233.066667" y1="546.055829" x2="233.066667" y2="594.055829" /> -<line x1="241.6" y1="594.055829" x2="224.533333" y2="594.055829" /> -<line x1="238.755556" y1="597.255829" x2="227.377778" y2="597.255829" /> -<line x1="236.72381" y1="600.455829" x2="229.409524" y2="600.455829" /> -<rect fill="white" - x="129.066667" y="506.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="517.356784">22</text> -<polyline points="145.066667,514.055829 164.266667,514.055829 -166.4,509.789162 -170.666667,518.322496 -174.933333,509.789162 -179.2,518.322496 -183.466667,509.789162 -187.733333,518.322496 -189.866667,514.055829 -209.066667,514.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="507.122496">R514</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="527.591072">680 K</text> -<circle fill="black" - cx="209.066667" cy="514.055829" r="2.048" /> -<line x1="209.066667" y1="514.055829" x2="209.066667" y2="526.855829" /> -<line x1="217.6" y1="526.855829" x2="200.533333" y2="526.855829" /> -<line x1="214.755556" y1="530.055829" x2="203.377778" y2="530.055829" /> -<line x1="212.72381" y1="533.255829" x2="205.409524" y2="533.255829" /> -<polyline points="209.066667,514.055829 233.066667,514.055829 -233.066667,530.055829" /> -<circle fill="black" - cx="545.066667" cy="470.055829" r="2.048" /> -<line x1="545.066667" y1="470.055829" x2="521.679456" y2="446.668618" /> -<polyline stroke-width="0" fill="black" - points="521.679456,446.668618 -518.662467,449.685607 -516.829592,441.818755 -524.696445,443.651629 -521.679456,446.668618" /> -<polyline points="521.679456,446.668618 518.662467,449.685607 -516.829592,441.818755 -524.696445,443.651629 -521.679456,446.668618" /> -<line x1="519.745909" y1="438.151009" x2="513.161846" y2="444.735071" /> -<line x1="516.453878" y1="441.44304" x2="493.066667" y2="418.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="521.733333" y="437.16278">D508</text> -<circle fill="black" - cx="493.066667" cy="418.055829" r="2.048" /> -<line x1="493.066667" y1="418.055829" x2="469.679456" y2="441.44304" /> -<polyline stroke-width="0" fill="black" - points="469.679456,441.44304 -472.696445,444.460029 -464.829592,446.292903 -466.662467,438.426051 -469.679456,441.44304" /> -<polyline points="469.679456,441.44304 472.696445,444.460029 -464.829592,446.292903 -466.662467,438.426051 -469.679456,441.44304" /> -<line x1="461.161846" y1="443.376587" x2="467.745909" y2="449.960649" /> -<line x1="464.453878" y1="446.668618" x2="441.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="464.4" y="437.16278">D506</text> -<circle fill="black" - cx="441.066667" cy="470.055829" r="2.048" /> -<line x1="545.066667" y1="470.055829" x2="521.679456" y2="493.44304" /> -<polyline stroke-width="0" fill="black" - points="521.679456,493.44304 -524.696445,496.460029 -516.829592,498.292903 -518.662467,490.426051 -521.679456,493.44304" /> -<polyline points="521.679456,493.44304 524.696445,496.460029 -516.829592,498.292903 -518.662467,490.426051 -521.679456,493.44304" /> -<line x1="513.161846" y1="495.376587" x2="519.745909" y2="501.960649" /> -<line x1="516.453878" y1="498.668618" x2="493.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="521.733333" y="509.550788">D509</text> -<circle fill="black" - cx="493.066667" cy="522.055829" r="2.048" /> -<line x1="493.066667" y1="522.055829" x2="469.679456" y2="498.668618" /> -<polyline stroke-width="0" fill="black" - points="469.679456,498.668618 -466.662467,501.685607 -464.829592,493.818755 -472.696445,495.651629 -469.679456,498.668618" /> -<polyline points="469.679456,498.668618 466.662467,501.685607 -464.829592,493.818755 -472.696445,495.651629 -469.679456,498.668618" /> -<line x1="467.745909" y1="490.151009" x2="461.161846" y2="496.735071" /> -<line x1="464.453878" y1="493.44304" x2="441.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="464.4" y="509.550788">D507</text> -<line x1="493.066667" y1="418.055829" x2="493.066667" y2="467.495829" /> -<line x1="486.666667" y1="467.495829" x2="499.466667" y2="467.495829" /> -<path d="M 486.666667,472.615829 - A 12.8 12.8 0 0 1 499.466667,472.615829" /> -<line x1="493.066667" y1="470.900954" x2="493.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="495.733333" y="464.829162">C507</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="495.733333" y="481.884405">.22</text> -<line x1="545.066667" y1="470.055829" x2="545.066667" y2="530.055829" /> -<line x1="493.066667" y1="418.055829" x2="593.066667" y2="418.055829" /> -<line x1="493.066667" y1="522.055829" x2="593.066667" y2="522.055829" /> -<polygon stroke-width="0" fill="black" - points="564.898508,512.932398 561.066667,522.055829 -560.154324,512.202524" /> -<polygon stroke-width="0" fill="black" - points="557.234826,427.17926 561.066667,418.055829 -561.97901,427.909135" /> -<path d="M 561.401039,519.88241 - C 562.011977,515.911313 562.622915,511.940216 563.233853,507.96912 564.455729,500.026926 -563.733333,487.389162 561.066667,470.055829 558.4,452.722496 -557.677605,440.084732 558.899481,432.142539 559.510419,428.171442 560.121357,424.200345 -560.732294,420.229248" /> -<rect fill="white" - stroke="none" - x="553.066667" y="462.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="561.066667" y="468.707552">57</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="561.066667" y="478.006016">VAC</text> -<rect fill="white" - x="129.066667" y="462.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="473.356784">21</text> -<line x1="145.066667" y1="470.055829" x2="441.066667" y2="470.055829" /> -<rect fill="white" - x="129.066667" y="486.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="497.356784">19</text> -<rect fill="white" - x="129.066667" y="438.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="449.356784">20</text> -<line x1="593.066667" y1="194.055829" x2="577.066667" y2="194.055829" /> -<line x1="577.066667" y1="194.055829" x2="577.066667" y2="206.855829" /> -<line x1="585.6" y1="206.855829" x2="568.533333" y2="206.855829" /> -<line x1="582.755556" y1="210.055829" x2="571.377778" y2="210.055829" /> -<line x1="580.72381" y1="213.255829" x2="573.409524" y2="213.255829" /> -<line x1="593.066667" y1="234.055829" x2="561.066667" y2="234.055829" /> -<circle fill="black" - cx="561.066667" cy="234.055829" r="2.048" /> -<line x1="561.066667" y1="234.055829" x2="561.066667" y2="247.495829" /> -<line x1="554.666667" y1="247.495829" x2="567.466667" y2="247.495829" /> -<path d="M 554.666667,252.615829 - A 12.8 12.8 0 0 1 567.466667,252.615829" /> -<line x1="561.066667" y1="250.900954" x2="561.066667" y2="266.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.733333" y="244.829162">C504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.733333" y="261.884405">.22</text> -<line x1="569.6" y1="266.055829" x2="552.533333" y2="266.055829" /> -<line x1="566.755556" y1="269.255829" x2="555.377778" y2="269.255829" /> -<line x1="564.72381" y1="272.455829" x2="557.409524" y2="272.455829" /> -<line x1="561.066667" y1="234.055829" x2="544.761708" y2="234.055829" /> -<polyline stroke-width="0" fill="black" - points="544.761708,234.055829 -544.761708,238.322496 -537.902966,234.055829 -544.761708,229.789162 -544.761708,234.055829" /> -<polyline points="544.761708,234.055829 544.761708,238.322496 -537.902966,234.055829 -544.761708,229.789162 -544.761708,234.055829" /> -<line x1="537.371625" y1="229.400194" x2="537.371625" y2="238.711464" /> -<line x1="537.371625" y1="234.055829" x2="521.066667" y2="234.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="541.066667" y="226.202186">D504</text> -<circle fill="black" - cx="521.066667" cy="234.055829" r="2.048" /> -<line x1="521.066667" y1="234.055829" x2="521.066667" y2="247.495829" /> -<line x1="514.666667" y1="247.495829" x2="527.466667" y2="247.495829" /> -<path d="M 514.666667,252.615829 - A 12.8 12.8 0 0 1 527.466667,252.615829" /> -<line x1="521.066667" y1="250.900954" x2="521.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="525.333333" y1="245.362496" x2="525.333333" y2="241.095829" /> -<line stroke-width="0.666667" - x1="527.466667" y1="243.229162" x2="523.2" y2="243.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="518.4" y="244.829162">C505</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="512" y="253.356784">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="518.4" y="261.884405">75 V</text> -<line x1="529.6" y1="266.055829" x2="512.533333" y2="266.055829" /> -<line x1="526.755556" y1="269.255829" x2="515.377778" y2="269.255829" /> -<line x1="524.72381" y1="272.455829" x2="517.409524" y2="272.455829" /> -<line x1="521.066667" y1="234.055829" x2="521.066667" y2="154.055829" /> -<circle fill="black" - cx="521.066667" cy="154.055829" r="2.048" /> -<line x1="561.066667" y1="154.055829" x2="544.761708" y2="154.055829" /> -<polyline stroke-width="0" fill="black" - points="544.761708,154.055829 -544.761708,158.322496 -537.902966,154.055829 -544.761708,149.789162 -544.761708,154.055829" /> -<polyline points="544.761708,154.055829 544.761708,158.322496 -537.902966,154.055829 -544.761708,149.789162 -544.761708,154.055829" /> -<line x1="537.371625" y1="149.400194" x2="537.371625" y2="158.711464" /> -<line x1="537.371625" y1="154.055829" x2="521.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="541.066667" y="146.202186">D503</text> -<line x1="561.066667" y1="154.055829" x2="593.066667" y2="154.055829" /> -<polygon stroke-width="0" fill="black" - points="568.409992,224.742281 565.066667,234.055829 -563.633813,224.264663" /> -<polygon stroke-width="0" fill="black" - points="561.723342,163.369377 565.066667,154.055829 -566.49952,163.846995" /> -<path d="M 565.285474,231.867753 - C 565.58234,228.899099 565.879205,225.930445 566.17607,222.961791 566.769801,217.024483 -566.4,207.389162 565.066667,194.055829 563.733333,180.722496 -563.363532,171.087175 563.957263,165.149867 564.254128,162.181213 564.550994,159.21256 -564.847859,156.243906" /> -<rect fill="white" - stroke="none" - x="541.066667" y="190.055829" width="32" height="8" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="557.066667" y="197.356784">100 VAC</text> -<line x1="498.297436" y1="338.671214" x2="498.297436" y2="358.363521" /> -<line x1="485.989744" y1="348.517368" x2="498.297436" y2="348.517368" /> -<line x1="517.989744" y1="333.748137" x2="498.297436" y2="342.609675" /> -<polygon stroke-width="0" fill="black" - points="511.825311,339.52134 503.220513,340.394291 -509.580581,334.533052" /> -<line x1="513.066667" y1="335.963521" x2="504.758512" y2="339.702191" /> -<line x1="517.989744" y1="363.286598" x2="498.297436" y2="354.42506" /> -<path d="M 485.989744,348.517368 - A 19.692308 19.692308 0 1 0 525.374359,348.517368" /> -<line x1="525.374359" y1="348.517368" x2="525.374359" y2="348.517368" /> -<path d="M 525.374359,348.517368 - A 19.692308 19.692308 0 0 0 485.989744,348.517368" /> -<line x1="485.989744" y1="348.517368" x2="485.989744" y2="348.517368" /> -<circle cx="521.066667" cy="330.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="521.066667" y="333.356784">E</text> -<circle cx="481.066667" cy="348.517368" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="481.066667" y="351.818322">B</text> -<circle cx="521.066667" cy="366.978906" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="521.066667" y="370.279861">C</text> -<polyline points="525.989744,366.978906 577.066667,366.978906 -577.066667,530.055829" /> -<line x1="481.066667" y1="353.440444" x2="481.066667" y2="362.055829" /> -<polyline points="481.066667,362.055829 481.066667,369.255829 -485.333333,371.389162 -476.8,375.655829 -485.333333,379.922496 -476.8,384.189162 -485.333333,388.455829 -476.8,392.722496 -481.066667,394.855829 -481.066667,402.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="380.707552">R513</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="390.006016">1500</text> -<line x1="489.6" y1="402.055829" x2="472.533333" y2="402.055829" /> -<line x1="486.755556" y1="405.255829" x2="475.377778" y2="405.255829" /> -<line x1="484.72381" y1="408.455829" x2="477.409524" y2="408.455829" /> -<polyline points="145.066667,494.055829 425.066667,494.055829 -425.066667,314.055829" /> -<polyline points="425.066667,314.055829 432.266667,314.055829 -434.4,309.789162 -438.666667,318.322496 -442.933333,309.789162 -447.2,318.322496 -451.466667,309.789162 -455.733333,318.322496 -457.866667,314.055829 -465.066667,314.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="307.122496">R511</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="327.591072">470</text> -<polyline points="465.066667,314.055829 521.066667,314.055829 -521.066667,325.132752" /> -<polyline points="145.066667,446.055829 441.066667,446.055829 -441.066667,402.055829" /> -<polyline points="441.066667,402.055829 441.066667,394.855829 -436.8,392.722496 -445.333333,388.455829 -436.8,384.189162 -445.333333,379.922496 -436.8,375.655829 -445.333333,371.389162 -441.066667,369.255829 -441.066667,362.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="376.05832">R512</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="385.356784">5600</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="394.655248">1 W</text> -<polyline points="441.066667,362.055829 441.066667,348.517368 -476.14359,348.517368" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="292.05832">Q503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="301.356784">S2091 HI TEMP</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="310.655248">CONTROL</text> -<line x1="561.066667" y1="330.055829" x2="547.223247" y2="330.055829" /> -<polyline stroke-width="0" fill="black" - points="547.223247,330.055829 -547.223247,334.322496 -540.364504,330.055829 -547.223247,325.789162 -547.223247,330.055829" /> -<polyline points="547.223247,330.055829 547.223247,334.322496 -540.364504,330.055829 -547.223247,325.789162 -547.223247,330.055829" /> -<line x1="539.833163" y1="325.400194" x2="539.833163" y2="334.711464" /> -<line x1="539.833163" y1="330.055829" x2="525.989744" y2="330.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="543.528205" y="322.202186">D505</text> -<line x1="561.066667" y1="330.055829" x2="593.066667" y2="330.055829" /> -<polyline points="593.066667,354.055829 577.066667,354.055829 -577.066667,330.055829" /> -<circle fill="black" - cx="577.066667" cy="330.055829" r="2.048" /> -<line x1="561.066667" y1="154.055829" x2="481.066667" y2="154.055829" /> -<circle fill="black" - cx="481.066667" cy="154.055829" r="2.048" /> -<rect fill="white" - x="473.066667" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="481.066667" y="101.356784">8</text> -<line x1="481.066667" y1="154.055829" x2="481.066667" y2="106.055829" /> -<polyline points="481.066667,154.055829 481.066667,161.255829 -485.333333,163.389162 -476.8,167.655829 -485.333333,171.922496 -476.8,176.189162 -485.333333,180.455829 -476.8,184.722496 -481.066667,186.855829 -481.066667,194.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="172.707552">R505</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="182.006016">12 K</text> -<circle fill="black" - cx="481.066667" cy="194.055829" r="2.048" /> -<line x1="481.066667" y1="194.055829" x2="481.066667" y2="227.495829" /> -<line x1="474.666667" y1="227.495829" x2="487.466667" y2="227.495829" /> -<path d="M 474.666667,232.615829 - A 12.8 12.8 0 0 1 487.466667,232.615829" /> -<line x1="481.066667" y1="230.900954" x2="481.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="485.333333" y1="225.362496" x2="485.333333" y2="221.095829" /> -<line stroke-width="0.666667" - x1="487.466667" y1="223.229162" x2="483.2" y2="223.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="478.4" y="224.829162">C503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="472" y="233.356784">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="478.4" y="241.884405">70 V</text> -<line x1="489.6" y1="266.055829" x2="472.533333" y2="266.055829" /> -<line x1="486.755556" y1="269.255829" x2="475.377778" y2="269.255829" /> -<line x1="484.72381" y1="272.455829" x2="477.409524" y2="272.455829" /> -<line x1="415.220513" y1="176.82506" x2="434.912821" y2="176.82506" /> -<line x1="425.066667" y1="189.132752" x2="425.066667" y2="176.82506" /> -<line x1="410.297436" y1="157.132752" x2="419.158974" y2="176.82506" /> -<polygon stroke-width="0" fill="black" - points="413.385771,170.660627 412.512821,162.055829 -418.37406,168.415897" /> -<line x1="413.20492" y1="163.593829" x2="416.94359" y2="171.901983" /> -<line x1="439.835897" y1="157.132752" x2="430.974359" y2="176.82506" /> -<path d="M 425.066667,189.132752 - A 19.692308 19.692308 0 0 0 425.066667,149.748137" /> -<line x1="425.066667" y1="149.748137" x2="425.066667" y2="149.748137" /> -<path d="M 425.066667,149.748137 - A 19.692308 19.692308 0 0 0 425.066667,189.132752" /> -<line x1="425.066667" y1="189.132752" x2="425.066667" y2="189.132752" /> -<circle cx="406.605128" cy="154.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="157.356784">E</text> -<circle cx="425.066667" cy="194.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="425.066667" y="197.356784">B</text> -<circle cx="443.528205" cy="154.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="443.528205" y="157.356784">C</text> -<line x1="448.451282" y1="154.055829" x2="481.066667" y2="154.055829" /> -<line x1="429.989744" y1="194.055829" x2="481.066667" y2="194.055829" /> -<polyline points="425.066667,198.978906 425.066667,219.717368 -429.333333,221.850701 -420.8,226.117368 -429.333333,230.384034 -420.8,234.650701 -429.333333,238.917368 -420.8,243.184034 -425.066667,245.317368 -425.066667,266.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="432" y="231.16909">R504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="432" y="240.467554">51 K</text> -<line x1="433.6" y1="266.055829" x2="416.533333" y2="266.055829" /> -<line x1="430.755556" y1="269.255829" x2="419.377778" y2="269.255829" /> -<line x1="428.72381" y1="272.455829" x2="421.409524" y2="272.455829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="119.409088">Q502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="128.707552">TA7311</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="138.006016">REGULATOR</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="147.30448">CONTROL</text> -<rect fill="white" - x="398.605128" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="101.356784">9</text> -<line x1="406.605128" y1="149.132752" x2="406.605128" y2="106.055829" /> -<rect fill="white" - x="345.066667" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="353.066667" y="101.356784">10</text> -<polyline points="401.682051,154.055829 390.174359,154.055829 -388.041026,158.322496 -383.774359,149.789162 -379.507692,158.322496 -375.241026,149.789162 -370.974359,158.322496 -366.707692,149.789162 -364.574359,154.055829 -353.066667,154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="377.374359" y="147.122496">R502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="377.374359" y="167.591072">150</text> -<circle fill="black" - cx="353.066667" cy="154.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="146.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="157.356784">11</text> -<rect fill="white" - x="129.066667" y="126.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="137.356784">14</text> -<rect fill="white" - x="129.066667" y="166.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="177.356784">12</text> -<rect fill="white" - x="129.066667" y="186.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="197.356784">13</text> -<polyline points="145.066667,194.055829 161.066667,194.055829 -161.066667,154.055829" /> -<circle fill="black" - cx="161.066667" cy="154.055829" r="2.048" /> -<line x1="145.066667" y1="174.055829" x2="161.066667" y2="174.055829" /> -<circle fill="black" - cx="161.066667" cy="174.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="210.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="221.356784">15</text> -<line x1="396.758974" y1="56.82506" x2="416.451282" y2="56.82506" /> -<line x1="406.605128" y1="69.132752" x2="406.605128" y2="56.82506" /> -<line x1="391.835897" y1="37.132752" x2="400.697436" y2="56.82506" /> -<polygon stroke-width="0" fill="black" - points="394.924233,50.660627 394.051282,42.055829 -399.912521,48.415897" /> -<line x1="394.743382" y1="43.593829" x2="398.482051" y2="51.901983" /> -<line x1="421.374359" y1="37.132752" x2="412.512821" y2="56.82506" /> -<path d="M 406.605128,69.132752 - A 19.692308 19.692308 0 0 0 406.605128,29.748137" /> -<line x1="406.605128" y1="29.748137" x2="406.605128" y2="29.748137" /> -<path d="M 406.605128,29.748137 - A 19.692308 19.692308 0 0 0 406.605128,69.132752" /> -<line x1="406.605128" y1="69.132752" x2="406.605128" y2="69.132752" /> -<circle cx="388.14359" cy="34.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="388.14359" y="37.356784">E</text> -<circle cx="406.605128" cy="74.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="77.356784">B</text> -<circle cx="425.066667" cy="34.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="425.066667" y="37.356784">C</text> -<line x1="406.605128" y1="78.978906" x2="406.605128" y2="90.055829" /> -<polyline points="429.989744,34.055829 481.066667,34.055829 -481.066667,90.055829" /> -<polyline points="383.220513,34.055829 353.066667,34.055829 -353.066667,90.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="7.135243">Q501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="16.433707">2N3055</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="25.732171">REGULATOR</text> -<line x1="145.066667" y1="134.055829" x2="353.066667" y2="134.055829" /> -<circle fill="black" - cx="353.066667" cy="134.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="306.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="317.356784">17</text> -<rect fill="white" - x="129.066667" y="282.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="293.356784">16</text> -<rect fill="white" - x="129.066667" y="330.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="341.356784">18</text> -<polyline points="145.066667,338.055829 161.066667,338.055829 -161.066667,314.055829" /> -<circle fill="black" - cx="161.066667" cy="314.055829" r="2.048" /> -<line x1="324.758974" y1="336.82506" x2="344.451282" y2="336.82506" /> -<line x1="334.605128" y1="349.132752" x2="334.605128" y2="336.82506" /> -<line x1="319.835897" y1="317.132752" x2="328.697436" y2="336.82506" /> -<polygon stroke-width="0" fill="black" - points="322.924233,330.660627 322.051282,322.055829 -327.912521,328.415897" /> -<line x1="322.743382" y1="323.593829" x2="326.482051" y2="331.901983" /> -<line x1="349.374359" y1="317.132752" x2="340.512821" y2="336.82506" /> -<path d="M 334.605128,349.132752 - A 19.692308 19.692308 0 0 0 334.605128,309.748137" /> -<line x1="334.605128" y1="309.748137" x2="334.605128" y2="309.748137" /> -<path d="M 334.605128,309.748137 - A 19.692308 19.692308 0 0 0 334.605128,349.132752" /> -<line x1="334.605128" y1="349.132752" x2="334.605128" y2="349.132752" /> -<circle cx="316.14359" cy="314.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="316.14359" y="317.356784">E</text> -<circle cx="334.605128" cy="354.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="334.605128" y="357.356784">B</text> -<circle cx="353.066667" cy="314.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="353.066667" y="317.356784">C</text> -<line x1="145.066667" y1="314.055829" x2="311.220513" y2="314.055829" /> -<line x1="334.605128" y1="358.978906" x2="334.605128" y2="362.055829" /> -<polyline points="334.605128,362.055829 334.605128,369.255829 -338.871795,371.389162 -330.338462,375.655829 -338.871795,379.922496 -330.338462,384.189162 -338.871795,388.455829 -330.338462,392.722496 -334.605128,394.855829 -334.605128,402.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="341.538462" y="380.707552">R508</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="341.538462" y="390.006016">680</text> -<line x1="343.138462" y1="402.055829" x2="326.071795" y2="402.055829" /> -<line x1="340.294017" y1="405.255829" x2="328.916239" y2="405.255829" /> -<line x1="338.262271" y1="408.455829" x2="330.947985" y2="408.455829" /> -<circle fill="black" - cx="353.066667" cy="218.055829" r="2.048" /> -<line x1="353.066667" y1="218.055829" x2="353.066667" y2="106.055829" /> -<polyline points="353.066667,218.055829 353.066667,225.255829 -357.333333,227.389162 -348.8,231.655829 -357.333333,235.922496 -348.8,240.189162 -357.333333,244.455829 -348.8,248.722496 -353.066667,250.855829 -353.066667,258.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="232.05832">225</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="241.356784">10 W</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="250.655248">5 %</text> -<line x1="353.066667" y1="258.055829" x2="353.066667" y2="309.132752" /> -<polyline points="353.066667,218.055829 325.866667,218.055829 -323.733333,222.322496 -319.466667,213.789162 -315.2,222.322496 -310.933333,213.789162 -306.666667,222.322496 -302.4,213.789162 -300.266667,218.055829 -273.066667,218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="211.122496">R503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="231.591072">290 10 W 5%</text> -<circle fill="black" - cx="273.066667" cy="218.055829" r="2.048" /> -<line x1="273.066667" y1="218.055829" x2="273.066667" y2="354.055829" /> -<polyline points="273.066667,354.055829 288.574359,354.055829 -290.707692,349.789162 -294.974359,358.322496 -299.241026,349.789162 -303.507692,358.322496 -307.774359,349.789162 -312.041026,358.322496 -314.174359,354.055829 -329.682051,354.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="301.374359" y="347.122496">R507</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="301.374359" y="367.591072">100</text> -<line x1="145.066667" y1="218.055829" x2="273.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="284.05832">Q504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="293.356784">40409</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="302.655248">REGULATOR</text> -<polyline points="353.066667,154.055829 325.866667,154.055829 -323.733333,158.322496 -319.466667,149.789162 -315.2,158.322496 -310.933333,149.789162 -306.666667,158.322496 -302.4,149.789162 -300.266667,154.055829 -273.066667,154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="147.122496">R501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="167.591072">390 5W 5%</text> -<line x1="273.066667" y1="154.055829" x2="145.066667" y2="154.055829" /> -<polyline points="145.066667,290.055829 164.266667,290.055829 -166.4,285.789162 -170.666667,294.322496 -174.933333,285.789162 -179.2,294.322496 -183.466667,285.789162 -187.733333,294.322496 -189.866667,290.055829 -209.066667,290.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="283.122496">R506</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="303.591072">82</text> -<line x1="209.066667" y1="290.055829" x2="209.066667" y2="314.055829" /> -<circle fill="black" - cx="209.066667" cy="314.055829" r="2.048" /> -<circle fill="black" - cx="209.066667" cy="154.055829" r="2.048" /> -<line x1="209.066667" y1="154.055829" x2="209.066667" y2="175.495829" /> -<line x1="202.666667" y1="175.495829" x2="215.466667" y2="175.495829" /> -<path d="M 202.666667,180.615829 - A 12.8 12.8 0 0 1 215.466667,180.615829" /> -<line x1="209.066667" y1="178.900954" x2="209.066667" y2="202.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="173.362496" x2="204.8" y2="169.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="171.229162" x2="202.666667" y2="171.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="172.829162">C501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="187.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="196.566016">30 V</text> -<line x1="217.6" y1="202.055829" x2="200.533333" y2="202.055829" /> -<line x1="214.755556" y1="205.255829" x2="203.377778" y2="205.255829" /> -<line x1="212.72381" y1="208.455829" x2="205.409524" y2="208.455829" /> -<circle fill="black" - cx="241.066667" cy="154.055829" r="2.048" /> -<line x1="241.066667" y1="202.055829" x2="241.066667" y2="181.750871" /> -<polyline stroke-width="0" fill="black" - points="241.066667,181.750871 -236.8,181.750871 -241.066667,174.892128 -245.333333,181.750871 -241.066667,181.750871" /> -<polyline points="241.066667,181.750871 236.8,181.750871 -241.066667,174.892128 -245.333333,181.750871 -241.066667,181.750871" /> -<polyline points="245.722302,176.494121 245.722302,174.360787 -236.411032,174.360787 -236.411032,172.227454" /> -<line x1="241.066667" y1="174.360787" x2="241.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="169.560787">ZD501</text> -<line x1="249.6" y1="202.055829" x2="232.533333" y2="202.055829" /> -<line x1="246.755556" y1="205.255829" x2="235.377778" y2="205.255829" /> -<line x1="244.72381" y1="208.455829" x2="237.409524" y2="208.455829" /> -<circle fill="black" - cx="209.066667" cy="218.055829" r="2.048" /> -<line x1="209.066667" y1="218.055829" x2="209.066667" y2="239.495829" /> -<line x1="202.666667" y1="239.495829" x2="215.466667" y2="239.495829" /> -<path d="M 202.666667,244.615829 - A 12.8 12.8 0 0 1 215.466667,244.615829" /> -<line x1="209.066667" y1="242.900954" x2="209.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="237.362496" x2="204.8" y2="233.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="235.229162" x2="202.666667" y2="235.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="236.829162">C502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="251.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="260.566016">30 V</text> -<line x1="217.6" y1="266.055829" x2="200.533333" y2="266.055829" /> -<line x1="214.755556" y1="269.255829" x2="203.377778" y2="269.255829" /> -<line x1="212.72381" y1="272.455829" x2="205.409524" y2="272.455829" /> -<circle fill="black" - cx="241.066667" cy="218.055829" r="2.048" /> -<line x1="241.066667" y1="266.055829" x2="241.066667" y2="245.750871" /> -<polyline stroke-width="0" fill="black" - points="241.066667,245.750871 -236.8,245.750871 -241.066667,238.892128 -245.333333,245.750871 -241.066667,245.750871" /> -<polyline points="241.066667,245.750871 236.8,245.750871 -241.066667,238.892128 -245.333333,245.750871 -241.066667,245.750871" /> -<polyline points="245.722302,240.494121 245.722302,238.360787 -236.411032,238.360787 -236.411032,236.227454" /> -<line x1="241.066667" y1="238.360787" x2="241.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="233.560787">ZD502</text> -<line x1="249.6" y1="266.055829" x2="232.533333" y2="266.055829" /> -<line x1="246.755556" y1="269.255829" x2="235.377778" y2="269.255829" /> -<line x1="244.72381" y1="272.455829" x2="237.409524" y2="272.455829" /> -<line x1="209.066667" y1="314.055829" x2="209.066667" y2="354.055829" /> -<line x1="209.066667" y1="354.055829" x2="209.066667" y2="375.495829" /> -<line x1="202.666667" y1="375.495829" x2="215.466667" y2="375.495829" /> -<path d="M 202.666667,380.615829 - A 12.8 12.8 0 0 1 215.466667,380.615829" /> -<line x1="209.066667" y1="378.900954" x2="209.066667" y2="402.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="373.362496" x2="204.8" y2="369.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="371.229162" x2="202.666667" y2="371.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="372.829162">C506</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="387.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="396.566016">30 V</text> -<line x1="217.6" y1="402.055829" x2="200.533333" y2="402.055829" /> -<line x1="214.755556" y1="405.255829" x2="203.377778" y2="405.255829" /> -<line x1="212.72381" y1="408.455829" x2="205.409524" y2="408.455829" /> -<line x1="129.066667" y1="514.055829" x2="105.066667" y2="514.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="511.389162">GRY</text> -<line x1="129.066667" y1="494.055829" x2="105.066667" y2="494.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="491.389162">VIOL</text> -<rect x="25.066667" y="484.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="502.707552">TO SIGNAL</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="512.006016">METER CIRCUIT</text> -<line x1="129.066667" y1="470.055829" x2="65.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="97.066667" y="467.389162">RED TO C508</text> -<line x1="129.066667" y1="446.055829" x2="65.066667" y2="446.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="97.066667" y="443.389162">VIOL</text> -<line x1="129.066667" y1="314.055829" x2="105.066667" y2="314.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="311.389162">RED</text> -<line x1="129.066667" y1="338.055829" x2="105.066667" y2="338.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="328.707552">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="338.006016">RED</text> -<rect x="25.066667" y="306.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="324.707552">12.7 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="334.006016">TO MULTIPLEX</text> -<line x1="129.066667" y1="290.055829" x2="105.066667" y2="290.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="287.389162">WHT</text> -<rect x="25.066667" y="258.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="272.05832">12 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="281.356784">TO FM TUNER</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="290.655248">SOURCE SWITCH</text> -<line x1="129.066667" y1="218.055829" x2="105.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="215.389162">ORG</text> -<rect x="25.066667" y="206.055829" width="80" height="24" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="216.707552">15 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="226.006016">TO FM TUNER</text> -<line x1="129.066667" y1="194.055829" x2="105.066667" y2="194.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="191.389162">BLU</text> -<line x1="129.066667" y1="174.055829" x2="105.066667" y2="174.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="164.707552">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="174.006016">RED</text> -<line x1="129.066667" y1="154.055829" x2="105.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="151.389162">RED</text> -<rect x="25.066667" y="150.055829" width="80" height="48" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="163.409088">27 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="172.707552">TO CONTROL</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="182.006016">PREAMP AND</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="191.30448">PWR AMPLIFIER</text> -<line x1="129.066667" y1="134.055829" x2="105.066667" y2="134.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="116.05832">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="125.356784">GRY-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="134.655248">GRN</text> -<rect x="25.066667" y="102.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="116.05832">50 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="125.356784">TO PHONO</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="134.655248">PREAMP</text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/Makefile b/graphics/circuit_macros/examples/dpv/Makefile index ff4933c464..30cd004402 100644 --- a/graphics/circuit_macros/examples/dpv/Makefile +++ b/graphics/circuit_macros/examples/dpv/Makefile @@ -1,8 +1,11 @@ +# +# LIBDIR = $$HOME/lib M4LIBS = svg.m4 DPVconfig.m4 M4LIBS = svg.m4 M4 = m4 # PDFCONVERT = pdf2svg +# The current dvisvgm outputs CRLF line endings PDFCONVERT = dvisvgm # To process a single file, copy it to test.m4 and type "make tst" @@ -32,7 +35,8 @@ DPIC = dpic touch F_$*.dim $(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic $(DPIC) -g $*.pic >> $*.tex - echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex +# echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex + echo "\documentclass[tikz]{standalone}" > F_$*.tex echo "\usepackage{boxdims,siunitx,amssymb}" >> F_$*.tex echo "\begin{document}" >> F_$*.tex echo "\input $*.tex" >> F_$*.tex @@ -42,9 +46,10 @@ DPIC = dpic $(DPIC) -g $*.pic >> $*.tex pdflatex --quiet F_$* if test "$(PDFCONVERT)" = "pdf2svg" ; then \ - pdf2svg F_$*.pdf $*.xsvg && cp $*.xsvg $*.svg ; \ + pdf2svg F_$*.pdf $*.xsvg && cat $*.xsvg | tr -d '\r' > $*.svg ; \ else \ - dvisvgm --pdf F_$*.pdf && mv F_$**.svg $*.svg ; cp $*.svg $*.xsvg ; \ + dvisvgm --pdf F_$*.pdf && cat F_$**.svg | tr -d '\r' > $*.svg ; \ + cp $*.svg $*.xsvg ; \ fi rm -f F_$** @@ -96,6 +101,7 @@ examplesDPV.html: examplesDPV.htmx Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ sed -e 's/Version XXX/Version '$$Version'/' examplesDPV.htmx \ | m4 > examplesDPV.html + rm -f quick.xsvg examplesDPVs.html: examplesDPVs.htmx cp ../quick.m4 . @@ -162,5 +168,4 @@ clean: @printf "\n" clobber: clean -# (cd dev; make clobber) rm -f test.m4 diff --git a/graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 b/graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 index 833dd21a65..d21555a241 100644 --- a/graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 +++ b/graphics/circuit_macros/examples/dpv/MoreTableDPV.m4 @@ -1,43 +1,69 @@ .PS # MoreTableDPV.m4 cct_init(svg_font(sans-serif,11pt__)) -textwid = 1.5 -movewid = 2 pt__ -hm = 2.1 -vm = 0.28 -hm = 2.05 -vm = 0.28 +Heater: [ + movewid = 2 pt__ + hm = 2.05 + right_ +{ + {lamp ; move; "`lamp'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`lamp(,T)'" ljust} + move right_ 1.25 + {thermocouple ; move;" `thermocouple'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`thermocouple(,,,T)'" ljust } + } + move down 0.4; right_ +{ + {heater; move;"`heater'" ljust} + move right_ hm + {heater(,,,,E); move;"`heater(,,,,E)'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`heater(,,,,ET)'" ljust} + } + ] -{ {memristor ; move;"`memristor '" ljust} - move right_ hm - {heater; move;"`heater '" ljust} - move right_ hm - {tline ; move;"`tline '" ljust} -} - move down 0.25; right_ -{ {pvcell ; move;"`pvcell '" ljust} - move right_ hm - {reed ; move ;"`reed '" ljust} - move right_ hm - {reed(,,,fill_(0.9),CR) ; move ; "`reed(,,,fill_(0.9),CR) '" ljust} -} - move down 0.25; right_ -{ {gap ; move ;"`gap '" ljust} - move right_ hm - {gap(,,A) ; move ;"`gap(,,A) '" ljust} - move right_ hm - {arrowline ; move;"`arrowline '" ljust} -} - move down 0.25; right_ -{ move down 0.10; right; {lamp ; move;"`lamp '" ljust} - move right_ hm - {thermocouple ; move;"`thermocouple '" ljust } -# move up 0.10 right_ hm -# {arrester ; move ;"`arrester '" ljust} - move right_ hm - {xtal ; move ;"`xtal '" ljust} -} +More: [ + textwid = 1.5 + movewid = 2 pt__ + hm = 2.1 + vm = 0.28 + + hm = 2.05 + vm = 0.28 + + { {memristor ; move;"`memristor '" ljust} + move right_ hm + {heater; move;"`heater '" ljust} + move right_ hm + {tline ; move;"`tline '" ljust} + } + move down 0.25; right_ + { {pvcell ; move;"`pvcell '" ljust} + move right_ hm + {reed ; move ;"`reed '" ljust} + move right_ hm + {reed(,,,fill_(0.9),CR) ; move ; "`reed(,,,fill_(0.9),CR) '" ljust} + } + move down 0.25; right_ + { {gap ; move ;"`gap '" ljust} + move right_ hm + {gap(,,A) ; move ;"`gap(,,A) '" ljust} + move right_ hm + {arrowline ; move;"`arrowline '" ljust} + } + move down 0.25; right_ + { move down 0.10; right; {lamp ; move;"`lamp '" ljust} + move right_ hm + {thermocouple ; move;"`thermocouple '" ljust } + # move up 0.10 right_ hm + # {arrester ; move ;"`arrester '" ljust} + move right_ hm + {xtal ; move ;"`xtal '" ljust} + } +] with .nw at Heater.sw+(0,-0.2) command "</g>" # end font .PE diff --git a/graphics/circuit_macros/examples/dpv/NportDPV.svg b/graphics/circuit_macros/examples/dpv/NportDPV.svg deleted file mode 100644 index c6968728c8..0000000000 --- a/graphics/circuit_macros/examples/dpv/NportDPV.svg +++ /dev/null @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="590" height="194" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="589.333333px" height="193.326667px" - viewBox="0 0 589.333333 193.326667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="49.333333" y="51.533333" width="72" height="48" /> -<line x1="49.333333" y1="63.533333" x2="37.333333" y2="63.533333" /> -<circle fill="black" - cx="37.333333" cy="63.533333" r="1.92" /> -<line x1="49.333333" y1="87.533333" x2="37.333333" y2="87.533333" /> -<circle fill="black" - cx="37.333333" cy="87.533333" r="1.92" /> -<line x1="121.333333" y1="63.533333" x2="133.333333" y2="63.533333" /> -<circle fill="black" - cx="133.333333" cy="63.533333" r="1.92" /> -<line x1="121.333333" y1="87.533333" x2="133.333333" y2="87.533333" /> -<circle fill="black" - cx="133.333333" cy="87.533333" r="1.92" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="34.666667" y="60.866667">W1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="34.666667" y="100.613333">W1b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="136" y="60.866667">E1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="136" y="100.613333">E1b</text> -<rect fill="rgb(230,230,230)" - x="241.333333" y="27.533333" width="168" height="96" /> -<line x1="241.333333" y1="51.533333" x2="229.333333" y2="51.533333" /> -<circle fill="black" - cx="229.333333" cy="51.533333" r="1.92" /> -<line x1="241.333333" y1="99.533333" x2="229.333333" y2="99.533333" /> -<circle fill="black" - cx="229.333333" cy="99.533333" r="1.92" /> -<line x1="265.333333" y1="27.533333" x2="265.333333" y2="15.533333" /> -<circle fill="black" - cx="265.333333" cy="15.533333" r="1.92" /> -<line x1="313.333333" y1="27.533333" x2="313.333333" y2="15.533333" /> -<circle fill="black" - cx="313.333333" cy="15.533333" r="1.92" /> -<line x1="337.333333" y1="27.533333" x2="337.333333" y2="15.533333" /> -<circle fill="black" - cx="337.333333" cy="15.533333" r="1.92" /> -<line x1="385.333333" y1="27.533333" x2="385.333333" y2="15.533333" /> -<circle fill="black" - cx="385.333333" cy="15.533333" r="1.92" /> -<line x1="409.333333" y1="37.133333" x2="421.333333" y2="37.133333" /> -<circle fill="black" - cx="421.333333" cy="37.133333" r="1.92" /> -<line x1="409.333333" y1="56.333333" x2="421.333333" y2="56.333333" /> -<circle fill="black" - cx="421.333333" cy="56.333333" r="1.92" /> -<line x1="409.333333" y1="65.933333" x2="421.333333" y2="65.933333" /> -<circle fill="black" - cx="421.333333" cy="65.933333" r="1.92" /> -<line x1="409.333333" y1="85.133333" x2="421.333333" y2="85.133333" /> -<circle fill="black" - cx="421.333333" cy="85.133333" r="1.92" /> -<line x1="409.333333" y1="94.733333" x2="421.333333" y2="94.733333" /> -<circle fill="black" - cx="421.333333" cy="94.733333" r="1.92" /> -<line x1="409.333333" y1="113.933333" x2="421.333333" y2="113.933333" /> -<circle fill="black" - cx="421.333333" cy="113.933333" r="1.92" /> -<line x1="254.25641" y1="123.533333" x2="254.25641" y2="135.533333" /> -<circle fill="black" - cx="254.25641" cy="135.533333" r="1.92" /> -<line x1="280.102564" y1="123.533333" x2="280.102564" y2="135.533333" /> -<circle fill="black" - cx="280.102564" cy="135.533333" r="1.92" /> -<line x1="293.025641" y1="123.533333" x2="293.025641" y2="135.533333" /> -<circle fill="black" - cx="293.025641" cy="135.533333" r="1.92" /> -<line x1="318.871795" y1="123.533333" x2="318.871795" y2="135.533333" /> -<circle fill="black" - cx="318.871795" cy="135.533333" r="1.92" /> -<line x1="331.794872" y1="123.533333" x2="331.794872" y2="135.533333" /> -<circle fill="black" - cx="331.794872" cy="135.533333" r="1.92" /> -<line x1="357.641026" y1="123.533333" x2="357.641026" y2="135.533333" /> -<circle fill="black" - cx="357.641026" cy="135.533333" r="1.92" /> -<line x1="370.564103" y1="123.533333" x2="370.564103" y2="135.533333" /> -<circle fill="black" - cx="370.564103" cy="135.533333" r="1.92" /> -<line x1="396.410256" y1="123.533333" x2="396.410256" y2="135.533333" /> -<circle fill="black" - cx="396.410256" cy="135.533333" r="1.92" /> -<a xlink:href="Np.svg" > - <g stroke="rgb(0,0,255)"> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="325.333333" y="80.74">n-port</text> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="226.666667" y="56.74">W1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="226.666667" y="104.74">W1b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="424" y="42.34">E1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="424" y="119.14">E3b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="265.333333" y="10.946667">N1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="313.333333" y="10.946667">N1b </text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="337.333333" y="10.946667"> N2a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="385.333333" y="10.946667">N2b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="254.25641" y="150.533333">S1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="396.410256" y="150.533333">S4b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="325.333333" y="150.34">...</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="435.733333" y="75.94">...</text> -<rect x="505.333333" y="59.533333" width="48" height="32" /> -<line x1="505.333333" y1="75.533333" x2="493.333333" y2="75.533333" /> -<circle fill="black" - cx="493.333333" cy="75.533333" r="1.92" /> -<line x1="553.333333" y1="75.533333" x2="565.333333" y2="75.533333" /> -<circle fill="black" - cx="565.333333" cy="75.533333" r="1.92" /> -<line x1="529.333333" y1="91.533333" x2="529.333333" y2="103.533333" /> -<circle fill="black" - cx="529.333333" cy="103.533333" r="1.92" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="490.666667" y="80.74">W1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="568" y="80.74">E1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="529.333333" y="118.533333">S1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="85.333333" y="133.54">nport</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="230.08" y="171.46" ->nport(wid 1.5 ht 1.75 fill_(0.9),1,2,3,4)</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="230.08" y="190.66">svgLink(Np.svg,"n-port" at Nport,B)</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="529.333333" y="139.46">nterm</text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/PlateDPV.m4 b/graphics/circuit_macros/examples/dpv/PlateDPV.m4 index e54235ebc5..7602aff219 100644 --- a/graphics/circuit_macros/examples/dpv/PlateDPV.m4 +++ b/graphics/circuit_macros/examples/dpv/PlateDPV.m4 @@ -4,7 +4,7 @@ # See the ASME Y14.5 standard, Figure 6-30. scale = 100/3 cct_init -include(../ASME_Y14-5.m4) +include(../ASME_Y14-5.m4def) ifsvg(`svg_font(sans-serif,9.5bp__)', `textht = 10bp__*2/3 iflatex(`command "{\sf"')') diff --git a/graphics/circuit_macros/examples/dpv/UNODPV.m4 b/graphics/circuit_macros/examples/dpv/UNODPV.m4 index 8cd5bf3898..86b5100f34 100644 --- a/graphics/circuit_macros/examples/dpv/UNODPV.m4 +++ b/graphics/circuit_macros/examples/dpv/UNODPV.m4 @@ -54,18 +54,6 @@ define(`HeaderPin',` `rotbox(m4Hps,m4Hps,fill_(1))', `circle diam m4Hps fill_(1)') at last line.start ') -define(`brdge',`eleminit_(`$1') - define(`m4h',ifelse(`$2',,`sourcerad_',`($2)/2'))dnl - { line to rvec_(rp_len/2-m4h/2,0) - move to rvec_(m4h/2,0) - for m4ng=75 to 255 by 180 do {{ - m4fshade(0, arc cw from rvec_(Rect_(m4h/2,m4ng)) \ - to rvec_(Rect_(m4h/2,-m4ng)) \ - with .c at Here ) }} - line from rvec_(m4h/2,0) to rvec_(rp_len/2,0) } - { [box invis ht_ m4h wid_ m4h] at rvec_(rp_len/2,0) } - line to rvec_(rp_len,0) invis ') - define(`ATMEGA16U2',`[ Chip: box wid 10*lg_pinsep ht 25*lg_pinsep Loopover_(`x', @@ -168,7 +156,7 @@ divert(0)dnl rlabel(16,,MHz); dot XT2: dot(at last line.start-(2*del,0)); { "XT2" at last [].n above } - Br1: brdge(left_ from U3.Pin33.end to (XT2,U3.Pin33)) + Br1: jumper(left_ from U3.Pin33.end to (XT2,U3.Pin33)) rlabel(1,,2); llabel(,GROUND) BRE: dot line to (Here,U3.Pin28) then to U3.Pin28.end @@ -220,7 +208,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep `Pin`'m4Lx: K.ne-(0,m4Lx/5*K.ht) "x" at Pin`'m4Lx ljust above', 1 XUSB, 2 D`'svg_it(-), 3 D`'svg_it(+), 4 UGND) - P_1: K.sw; {"P$`1'" at P_1 below rjust} + P_1: K.sw; {"P$`1'" wid 15bp__ at P_1 below rjust} P_2: K.s; {"P$`2'" at P_2 below ljust} ] with .Pin2 at Here; "X2" at USB.ne above rjust @@ -358,7 +346,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep line from ZU4.Pin1.end to (RN1D-(1.5*del,0),ZU4.Pin1) then up 7*del continue to (ZU4.Chip.w,Here)+(del,0); BRB: dot - { line down_ 2*del; Br2: brdge(right_ dimen_) + { line down_ 2*del; Br2: jumper(right_ dimen_) llabel(1,,2); rlabel(,RESET_EN); line up_ 2*del; dot } line right_ dimen_+del C5: capacitor(right_ dimen_); llabel(,C5); rlabel(100n); dot diff --git a/graphics/circuit_macros/examples/dpv/controlDPV.svg b/graphics/circuit_macros/examples/dpv/controlDPV.svg deleted file mode 100644 index bb24d97319..0000000000 --- a/graphics/circuit_macros/examples/dpv/controlDPV.svg +++ /dev/null @@ -1,745 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="512" height="1083" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="510.666667px" height="1081.788427px" - viewBox="0 0 510.666667 1081.788427" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:Times" -> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="48.266667"><tspan font-style="italic">r(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="29.866667,48.533333 39.466667,50.933333 -29.866667,53.333333" /> -<line x1="1.066667" y1="50.933333" x2="37.267677" y2="50.933333" /> -<circle cx="51.466667" cy="50.933333" r="12" /> -<line x1="63.466667" y1="50.933333" x2="101.866667" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="82.666667" y="48.266667"><tspan font-style="italic">e(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="130.666667,48.533333 140.266667,50.933333 -130.666667,53.333333" /> -<line x1="101.866667" y1="50.933333" x2="138.067677" y2="50.933333" /> -<rect x="140.266667" y="38.933333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="55.773333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">P</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="193.066667,48.533333 202.666667,50.933333 -193.066667,53.333333" /> -<line x1="176.266667" y1="50.933333" x2="200.467677" y2="50.933333" /> -<circle cx="214.666667" cy="50.933333" r="12" /> -<line x1="101.866667" y1="50.933333" x2="101.866667" y2="12.533333" /> -<polygon stroke-width="0" fill="black" - points="130.666667,10.133333 140.266667,12.533333 -130.666667,14.933333" /> -<line x1="101.866667" y1="12.533333" x2="138.067677" y2="12.533333" /> -<rect x="140.266667" y="0.533333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="17.373333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">D</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>s</text> -<line x1="176.266667" y1="12.533333" x2="214.666667" y2="12.533333" /> -<polygon stroke-width="0" fill="black" - points="217.066667,29.333333 214.666667,38.933333 -212.266667,29.333333" /> -<line x1="214.666667" y1="12.533333" x2="214.666667" y2="36.734344" /> -<line x1="101.866667" y1="50.933333" x2="101.866667" y2="89.333333" /> -<polygon stroke-width="0" fill="black" - points="130.666667,86.933333 140.266667,89.333333 -130.666667,91.733333" /> -<line x1="101.866667" y1="89.333333" x2="138.067677" y2="89.333333" /> -<rect x="140.266667" y="77.333333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="94.173333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">I</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>/s</text> -<line x1="176.266667" y1="89.333333" x2="214.666667" y2="89.333333" /> -<polygon stroke-width="0" fill="black" - points="212.266667,72.533333 214.666667,62.933333 -217.066667,72.533333" /> -<line x1="214.666667" y1="89.333333" x2="214.666667" y2="65.132323" /> -<polygon stroke-width="0" fill="black" - points="255.466667,48.533333 265.066667,50.933333 -255.466667,53.333333" /> -<line x1="226.666667" y1="50.933333" x2="262.867677" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="244.767172" y="48.266667"><tspan font-style="italic">u(s)</tspan></text> -<rect x="265.066667" y="26.933333" width="72" height="48" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="301.066667" y="55.773333"><tspan font-style="italic">G(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="365.866667,48.533333 375.466667,50.933333 -365.866667,53.333333" /> -<line x1="337.066667" y1="50.933333" x2="373.267677" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="372.8" y="45.609963"><tspan font-style="italic">y(s)</tspan></text> -<polyline points="356.266667,50.933333 356.266667,122.933333 -51.466667,122.933333" /> -<polygon stroke-width="0" fill="black" - points="49.066667,72.533333 51.466667,62.933333 -53.866667,72.533333" /> -<line x1="51.466667" y1="122.933333" x2="51.466667" y2="65.132323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="46.133333" y="70.44"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="141.92176" ->(a) <tspan font-style="italic">PID</tspan> control</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="15.733333" y="199.466667"><tspan font-style="italic">r</tspan></text> -<polygon stroke-width="0" fill="black" - points="41.866667,199.733333 51.466667,202.133333 -41.866667,204.533333" /> -<line x1="13.066667" y1="202.133333" x2="49.267677" y2="202.133333" /> -<circle fill="rgb(153,153,153)" - cx="61.066667" cy="202.133333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="63.733333" y="224.08" -> <tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="51.466667" y="199.466667"><tspan font-style="italic">+</tspan></text> -<rect fill="rgb(230,230,230)" - stroke="none" - x="99.466667" y="173.333333" width="297.6" height="115.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="102.133333" y="285.866667"><tspan font-style="italic">Plant</tspan></text> -<polygon stroke-width="0" fill="black" - points="99.466667,199.733333 109.066667,202.133333 -99.466667,204.533333" /> -<line x1="70.666667" y1="202.133333" x2="106.867677" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="92.533333" y="199.466667"><tspan font-style="italic">u</tspan></text> -<rect fill="rgb(153,153,153)" - x="109.066667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="123.466667" y="206.973333"><tspan font-style="italic">B</tspan></text> -<polygon stroke-width="0" fill="black" - points="166.666667,197.466667 176.266667,202.133333 -166.666667,206.8" /> -<line stroke-width="4" - x1="137.866667" y1="202.133333" x2="171.692025" y2="202.133333" /> -<circle fill="rgb(153,153,153)" - cx="185.866667" cy="202.133333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="188.533333" y="224.08" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176.266667" y="196.8">+</text> -<polygon stroke-width="0" fill="black" - points="224.266667,197.466667 233.866667,202.133333 -224.266667,206.8" /> -<line stroke-width="4" - x1="195.466667" y1="202.133333" x2="229.292025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="197.64"><tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="190.133333">.</text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="206.973333"><tspan font-style="italic">I/s</tspan></text> -<polygon stroke-width="0" fill="black" - points="349.066667,197.466667 358.666667,202.133333 -349.066667,206.8" /> -<line stroke-width="4" - x1="262.666667" y1="202.133333" x2="354.092025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="310.666667" y="197.64"><tspan font-style="bold">x</tspan></text> -<rect fill="rgb(153,153,153)" - x="358.666667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="373.066667" y="206.973333"><tspan font-style="italic">C</tspan></text> -<line stroke-width="4" - x1="387.466667" y1="202.133333" x2="425.866667" y2="202.133333" /> -<polygon stroke-width="0" fill="black" - points="454.666667,197.466667 464.266667,202.133333 -454.666667,206.8" /> -<line stroke-width="4" - x1="425.866667" y1="202.133333" x2="459.692025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="197.64"><tspan font-style="bold">y</tspan></text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="240.533333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="264.573333"><tspan font-style="italic">A</tspan></text> -<polygon stroke-width="0" fill="black" - points="272.266667,264.4 262.666667,259.733333 -272.266667,255.066667" /> -<polyline stroke-width="4" - points="267.241308,259.733333 301.066667,259.733333 -301.066667,202.133333" /> -<polygon stroke-width="0" fill="black" - points="181.2,221.333333 185.866667,211.733333 -190.533333,221.333333" /> -<polyline stroke-width="4" - points="233.866667,259.733333 185.866667,259.733333 -185.866667,216.307975" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="298.133333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="322.173333"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="58.666667,221.333333 61.066667,211.733333 -63.466667,221.333333" /> -<polyline points="233.866667,317.333333 61.066667,317.333333 -61.066667,213.932323" /> -<rect fill="rgb(230,230,230)" - stroke="none" - x="41.866667" y="346.133333" width="412.8" height="172.8" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="44.533333" y="516.266667" -><tspan font-style="italic">Observer</tspan></text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="379.773333"><tspan font-style="italic">I/s</tspan></text> -<polygon stroke-width="0" fill="black" - points="224.266667,370.266667 233.866667,374.933333 -224.266667,379.6" /> -<line stroke-width="4" - x1="229.292025" y1="374.933333" x2="195.466667" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="370.44"><tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="370.44">ˆ</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="358.093333">.</text> -<circle fill="rgb(153,153,153)" - cx="185.866667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="188.533333" y="396.88" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176.266667" y="369.6"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="166.666667,370.266667 176.266667,374.933333 -166.666667,379.6" /> -<line stroke-width="4" - x1="171.692025" y1="374.933333" x2="137.866667" y2="374.933333" /> -<circle fill="rgb(153,153,153)" - cx="128.266667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="130.933333" y="396.88" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.666667" y="369.6"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="109.066667,370.266667 118.666667,374.933333 -109.066667,379.6" /> -<line stroke-width="4" - x1="114.092025" y1="374.933333" x2="80.266667" y2="374.933333" /> -<rect fill="rgb(153,153,153)" - x="51.466667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="65.866667" y="379.773333"><tspan font-style="italic">B</tspan></text> -<polygon stroke-width="0" fill="black" - points="41.866667,372.533333 51.466667,374.933333 -41.866667,377.333333" /> -<polyline points="80.266667,202.133333 80.266667,173.333333 -3.466667,173.333333 -3.466667,374.933333 -49.267677,374.933333" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="413.333333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="437.373333"><tspan font-style="italic">A</tspan></text> -<line stroke-width="4" - x1="262.666667" y1="374.933333" x2="301.066667" y2="374.933333" /> -<polygon stroke-width="0" fill="black" - points="272.266667,322 262.666667,317.333333 -272.266667,312.666667" /> -<polygon stroke-width="0" fill="black" - points="272.266667,437.2 262.666667,432.533333 -272.266667,427.866667" /> -<polyline stroke-width="4" - points="267.241308,317.333333 301.066667,317.333333 -301.066667,432.533333 -267.241308,432.533333" /> -<polygon stroke-width="0" fill="black" - points="181.2,394.133333 185.866667,384.533333 -190.533333,394.133333" /> -<polyline stroke-width="4" - points="233.866667,432.533333 185.866667,432.533333 -185.866667,389.107975" /> -<rect fill="rgb(153,153,153)" - x="358.666667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="373.066667" y="379.773333"><tspan font-style="italic">C</tspan></text> -<polygon stroke-width="0" fill="black" - points="416.266667,370.266667 425.866667,374.933333 -416.266667,379.6" /> -<line stroke-width="4" - x1="387.466667" y1="374.933333" x2="421.292025" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.666667" y="370.44"><tspan font-style="bold">y</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.666667" y="370.44">ˆ</text> -<polygon stroke-width="0" fill="black" - points="349.066667,370.266667 358.666667,374.933333 -349.066667,379.6" /> -<line stroke-width="4" - x1="301.066667" y1="374.933333" x2="354.092025" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="329.866667" y="370.44"><tspan font-style="italic">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="329.866667" y="370.44">ˆ</text> -<circle fill="rgb(153,153,153)" - cx="435.466667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="438.133333" y="362.666667"><tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="425.866667" y="369.6"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="440.133333,355.733333 435.466667,365.333333 -430.8,355.733333" /> -<line stroke-width="4" - x1="435.466667" y1="360.758692" x2="435.466667" y2="202.133333" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="470.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="494.973333"><tspan font-style="italic">L</tspan></text> -<polygon stroke-width="0" fill="black" - points="272.266667,494.8 262.666667,490.133333 -272.266667,485.466667" /> -<polyline stroke-width="4" - points="435.466667,384.533333 435.466667,490.133333 -267.241308,490.133333" /> -<polygon stroke-width="0" fill="black" - points="123.6,394.133333 128.266667,384.533333 -132.933333,394.133333" /> -<polyline stroke-width="4" - points="233.866667,490.133333 128.266667,490.133333 -128.266667,389.107975" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="555.866667"><tspan font-style="italic">r</tspan></text> -<polygon stroke-width="0" fill="black" - points="29.866667,556.133333 39.466667,558.533333 -29.866667,560.933333" /> -<line x1="1.066667" y1="558.533333" x2="37.267677" y2="558.533333" /> -<circle cx="51.466667" cy="558.533333" r="12" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="48.8" y="582.88"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,580.133333 51.466667,570.533333 -53.866667,580.133333" /> -<line x1="51.466667" y1="572.732323" x2="51.466667" y2="589.733333" /> -<rect x="33.466667" y="589.733333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="606.573333"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,623.333333 51.466667,613.733333 -53.866667,623.333333" /> -<line x1="51.466667" y1="615.932323" x2="51.466667" y2="632.933333" /> -<line x1="51.466667" y1="632.933333" x2="89.866667" y2="632.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="70.666667" y="630.266667" -><tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan></text> -<rect x="89.866667" y="602.933333" width="192" height="60" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="105.466933" y="636.466533" -><tspan dx="0.987654ex"> </tspan><tspan dy="-1.2ex" -dx="0.493827ex"><tspan font-style="italic">d</tspan></tspan><tspan -dy=" 2.6ex" -dx="-1.48148ex"><tspan font-style="italic">dt</tspan></tspan><tspan -dy="-1.4ex" dx="0ex"> </tspan></text> -<line x1="106.693067" y1="632.933333" x2="119.599733" y2="632.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="122.2664" y="636.466533" -><tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan> <tspan font-style="italic">= (A-LC)</tspan> <tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan> -<tspan font-style="italic">+ Bu + L</tspan><tspan font-style="bold">y</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="92.533333" y="660.266667" -><tspan font-style="italic">Observer</tspan></text> -<polygon stroke-width="0" fill="black" - points="291.466667,620.333333 281.866667,617.933333 -291.466667,615.533333" /> -<line x1="284.065656" y1="617.933333" x2="301.066667" y2="617.933333" /> -<line x1="301.066667" y1="617.933333" x2="301.066667" y2="558.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.266667" y="555.866667"><tspan font-style="italic">u</tspan></text> -<polygon stroke-width="0" fill="black" - points="329.866667,556.133333 339.466667,558.533333 -329.866667,560.933333" /> -<line x1="63.466667" y1="558.533333" x2="337.267677" y2="558.533333" /> -<rect x="339.466667" y="528.533333" width="108" height="60" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="346.666933" y="552.595933" -><tspan dx="0.987654ex"> </tspan><tspan dy="-1.2ex" -dx="0.493827ex"><tspan font-style="italic">d</tspan></tspan><tspan -dy=" 2.6ex" -dx="-1.48148ex"><tspan font-style="italic">dt</tspan></tspan><tspan -dy="-1.4ex" dx="0ex"> </tspan></text> -<line x1="347.893067" y1="549.062733" x2="360.799733" y2="549.062733" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="363.4664" y="552.595933" -><tspan font-style="bold">x</tspan> <tspan font-style="italic">= A</tspan> <tspan font-style="bold">x</tspan> <tspan font-style="italic">+ Bu</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="366.133067" y="571.955933" -><tspan font-style="bold">y</tspan> <tspan font-style="italic">= C</tspan> <tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="342.133333" y="585.866667"><tspan font-style="italic">Plant</tspan></text> -<polygon stroke-width="0" fill="black" - points="476.266667,556.133333 485.866667,558.533333 -476.266667,560.933333" /> -<line x1="447.466667" y1="558.533333" x2="483.667677" y2="558.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="483.2" y="553.209963"><tspan font-style="italic">y</tspan></text> -<line x1="466.666667" y1="558.533333" x2="466.666667" y2="647.933333" /> -<polygon stroke-width="0" fill="black" - points="291.466667,650.333333 281.866667,647.933333 -291.466667,645.533333" /> -<line x1="466.666667" y1="647.933333" x2="284.065656" y2="647.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="681.92176" ->(b) Plant with feedback from a full-order observer</text> -<polygon stroke-width="0" fill="black" - points="29.866667,766.133333 39.466667,768.533333 -29.866667,770.933333" /> -<line x1="1.066667" y1="768.533333" x2="37.267677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="19.167172" y="765.866667" -><tspan font-style="italic">E<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<circle cx="51.466667" cy="768.533333" r="12" /> -<line x1="42.981385" y1="760.048052" x2="59.951948" y2="777.018615" /> -<line x1="42.981385" y1="777.018615" x2="59.951948" y2="760.048052" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="766.173333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="780.573333"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.666667" y="773.373333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="44.266667" y="773.373333"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="73.066667,766.133333 82.666667,768.533333 -73.066667,770.933333" /> -<line x1="63.466667" y1="768.533333" x2="80.467677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="71.967172" y="765.866667">ε</text> -<rect x="82.666667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="101.866667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="130.666667,766.133333 140.266667,768.533333 -130.666667,770.933333" /> -<line x1="121.066667" y1="768.533333" x2="138.067677" y2="768.533333" /> -<rect x="140.266667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="159.466667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="188.266667,766.133333 197.866667,768.533333 -188.266667,770.933333" /> -<line x1="178.666667" y1="768.533333" x2="195.667677" y2="768.533333" /> -<circle cx="209.866667" cy="768.533333" r="12" /> -<line x1="201.381385" y1="760.048052" x2="218.351948" y2="777.018615" /> -<line x1="201.381385" y1="777.018615" x2="218.351948" y2="760.048052" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="209.866667" y="766.173333"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="209.866667" y="780.573333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="217.066667" y="773.373333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="202.666667" y="773.373333"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="231.466667,766.133333 241.066667,768.533333 -231.466667,770.933333" /> -<line x1="221.866667" y1="768.533333" x2="238.867677" y2="768.533333" /> -<rect x="241.066667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="260.266667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="289.066667,766.133333 298.666667,768.533333 -289.066667,770.933333" /> -<line x1="279.466667" y1="768.533333" x2="296.467677" y2="768.533333" /> -<rect x="298.666667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="317.866667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<line x1="337.066667" y1="768.533333" x2="356.266667" y2="768.533333" /> -<polygon stroke-width="0" fill="black" - points="365.866667,766.133333 375.466667,768.533333 -365.866667,770.933333" /> -<line x1="356.266667" y1="768.533333" x2="373.267677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="375.466667" y="765.866667" -><tspan font-style="italic">S</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<rect x="269.866667" y="691.733333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="289.066667" y="715.773333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="317.866667,713.333333 308.266667,710.933333 -317.866667,708.533333" /> -<polyline points="356.266667,768.533333 356.266667,710.933333 -310.465656,710.933333" /> -<polygon stroke-width="0" fill="black" - points="212.266667,746.933333 209.866667,756.533333 -207.466667,746.933333" /> -<polyline points="269.866667,710.933333 209.866667,710.933333 -209.866667,754.334344" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="212.533333" y="742.173333" -><tspan font-style="italic">n</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<rect x="179.866667" y="806.933333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="199.066667" y="830.973333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="170.266667,828.533333 160.666667,826.133333 -170.266667,823.733333" /> -<line x1="179.866667" y1="826.133333" x2="162.865656" y2="826.133333" /> -<rect x="122.266667" y="806.933333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="141.466667" y="830.973333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="227.866667,828.533333 218.266667,826.133333 -227.866667,823.733333" /> -<polyline points="289.066667,768.533333 289.066667,826.133333 -220.465656,826.133333" /> -<polygon stroke-width="0" fill="black" - points="49.066667,790.133333 51.466667,780.533333 -53.866667,790.133333" /> -<polyline points="122.266667,826.133333 51.466667,826.133333 -51.466667,782.732323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="54.133333" y="804.573333" -><tspan font-style="italic">n</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="864.32176">(c) A multiblock example</text> -<rect x="19.066667" y="892.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="907.64">reference</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="922.306667"><tspan font-style="italic">R</tspan></text> -<polygon stroke-width="0" fill="black" - points="125.466667,907.733333 135.066667,910.133333 -125.466667,912.533333" /> -<line x1="83.866667" y1="910.133333" x2="132.867677" y2="910.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="109.466667" y="904.24" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">c</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>[ref]</text> -<rect x="135.066667" y="892.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="167.466667" y="907.64">"inverse"</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="167.466667" y="922.306667">of <tspan font-style="italic">G</tspan></text> -<polygon stroke-width="0" fill="black" - points="169.866667,966.533333 167.466667,976.133333 -165.066667,966.533333" /> -<line x1="167.466667" y1="928.133333" x2="167.466667" y2="973.934344" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" text-anchor="start" - x="170.133333" y="955.873838" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">m</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>[ref]</text> -<circle cx="167.466667" cy="988.133333" r="12" /> -<polygon stroke-width="0" fill="black" - points="208.266667,985.733333 217.866667,988.133333 -208.266667,990.533333" /> -<line x1="179.466667" y1="988.133333" x2="215.667677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="197.567172" y="985.466667"><tspan font-style="italic">e</tspan></text> -<rect x="217.866667" y="970.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="250.266667" y="985.64">stabilizer</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="250.266667" y="1000.306667"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="311.466667,985.733333 321.066667,988.133333 -311.466667,990.533333" /> -<line x1="282.666667" y1="988.133333" x2="318.867677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="300.767172" y="985.466667">δu</text> -<circle cx="333.066667" cy="988.133333" r="12" /> -<line x1="199.866667" y1="910.133333" x2="333.066667" y2="910.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="266.466667" y="907.466667" -><tspan font-style="italic">u</tspan>[ref]</text> -<polygon stroke-width="0" fill="black" - points="335.466667,966.533333 333.066667,976.133333 -330.666667,966.533333" /> -<line x1="333.066667" y1="910.133333" x2="333.066667" y2="973.934344" /> -<polygon stroke-width="0" fill="black" - points="373.866667,985.733333 383.466667,988.133333 -373.866667,990.533333" /> -<line x1="345.066667" y1="988.133333" x2="381.267677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="363.167172" y="985.466667"><tspan font-style="italic">u</tspan></text> -<rect x="383.466667" y="970.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="415.866667" y="985.64">plant</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="415.866667" y="1000.306667"><tspan font-style="italic">G</tspan></text> -<polygon stroke-width="0" fill="black" - points="418.266667,960.533333 415.866667,970.133333 -413.466667,960.533333" /> -<line x1="415.866667" y1="967.934344" x2="415.866667" y2="952.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="415.866667" y="949.466667" ->disturbance <tspan font-style="italic">z</tspan></text> -<polygon stroke-width="0" fill="black" - points="477.066667,976.733333 486.666667,979.133333 -477.066667,981.533333" /> -<line x1="448.266667" y1="979.133333" x2="484.467677" y2="979.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="489.333333" y="983.973333" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">c</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="477.066667,994.733333 486.666667,997.133333 -477.066667,999.533333" /> -<line x1="448.266667" y1="997.133333" x2="484.467677" y2="997.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="489.333333" y="1001.973333" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">m</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="165.066667,1009.733333 167.466667,1000.133333 -169.866667,1009.733333" /> -<polyline points="467.466667,997.133333 467.466667,1030.133333 -167.466667,1030.133333 -167.466667,1002.332323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="164.8" y="1012.48"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,937.733333 51.466667,928.133333 -53.866667,937.733333" /> -<line x1="51.466667" y1="930.332323" x2="51.466667" y2="976.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="990.573333" -><tspan font-style="italic">W</tspan> control input</text> -<polyline stroke-dasharray="5.6,4" - points="1.066667,874.133333 354.666667,874.133333 -354.666667,1060.133333" /> -<line stroke-dasharray="5.6,4" - x1="354.666667" y1="1060.133333" x2="135.066667" y2="1060.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="244.866667" y="1057.466667">Controller</text> -<line stroke-dasharray="5.6,4" - x1="135.066667" y1="1060.133333" x2="135.066667" y2="946.133333" /> -<polyline stroke-dasharray="5.6,4" - points="135.066667,946.133333 1.066667,946.133333 -1.066667,874.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="1079.12176" ->(d) Nonlinear feedforward (for performance) and small-signal feedback -(for stability)</text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/ex01DPV.svg b/graphics/circuit_macros/examples/dpv/ex01DPV.svg deleted file mode 100644 index 52d4f52e46..0000000000 --- a/graphics/circuit_macros/examples/dpv/ex01DPV.svg +++ /dev/null @@ -1,391 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="656" height="152" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="654.776185px" height="151.04px" - viewBox="0 0 654.776185 151.04" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<circle fill="black" - cx="61.066667" cy="2.453333" r="1.92" /> -<line x1="61.066667" y1="2.453333" x2="61.066667" y2="14.453333" /> -<polyline points="61.066667,38.453333 65.866667,38.453333 -65.866667,14.453333 -56.266667,14.453333 -56.266667,38.453333 -61.066667,38.453333" /> -<line x1="61.066667" y1="38.453333" x2="61.066667" y2="50.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="68.533333" y="31.423333" -><tspan font-style="normal">1 MΩ</tspan></text> -<polygon stroke-width="0" fill="black" - points="66.157835,17.968052 74.643117,12.876883 -69.551948,21.362165" /> -<line x1="47.490216" y1="40.029784" x2="73.088196" y2="14.431804" /> -<line x1="61.066667" y1="50.453333" x2="61.066667" y2="62.453333" /> -<polyline points="61.066667,86.453333 65.866667,86.453333 -65.866667,62.453333 -56.266667,62.453333 -56.266667,86.453333 -61.066667,86.453333" /> -<line x1="61.066667" y1="86.453333" x2="61.066667" y2="98.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="68.533333" y="79.423333" -><tspan font-style="normal">100 kΩ</tspan></text> -<line x1="61.066667" y1="98.453333" x2="61.066667" y2="117.653333" /> -<polyline stroke-width="0.533333" - points="61.066667,120.653333 65.866667,120.653333 -65.866667,117.653333 -56.266667,117.653333 -56.266667,120.653333 -61.066667,120.653333" /> -<polyline stroke-width="0" fill="black" - points="61.066667,124.253333 -65.866667,124.253333 -65.866667,127.253333 -56.266667,127.253333 -56.266667,124.253333 -61.066667,124.253333" /> -<polyline stroke-width="0.533333" - points="61.066667,124.253333 65.866667,124.253333 -65.866667,127.253333 -56.266667,127.253333 -56.266667,124.253333 -61.066667,124.253333" /> -<line x1="61.066667" y1="127.253333" x2="61.066667" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="63.733333" y="114.986667" -><tspan font-style="normal">220 μF</tspan></text> -<circle fill="black" - cx="61.066667" cy="146.453333" r="1.92" /> -<circle fill="black" - cx="125.066667" cy="2.453333" r="1.92" /> -<line x1="125.066667" y1="2.453333" x2="125.066667" y2="14.453333" /> -<polyline points="125.066667,38.453333 129.866667,38.453333 -129.866667,14.453333 -120.266667,14.453333 -120.266667,38.453333 -125.066667,38.453333" /> -<line x1="125.066667" y1="38.453333" x2="125.066667" y2="50.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="132.533333" y="31.423333" -><tspan font-style="normal">33 kΩ</tspan></text> -<line x1="125.066667" y1="50.453333" x2="125.066667" y2="98.453333" /> -<line x1="125.066667" y1="98.453333" x2="125.066667" y2="120.053333" /> -<line x1="117.066667" y1="120.053333" x2="133.066667" y2="120.053333" /> -<line x1="117.066667" y1="124.853333" x2="133.066667" y2="124.853333" /> -<line x1="125.066667" y1="124.853333" x2="125.066667" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="127.733333" y="117.386667" -><tspan font-style="normal">0.1 μF</tspan></text> -<circle fill="black" - cx="125.066667" cy="146.453333" r="1.92" /> -<rect x="170.4" y="38.453333" width="72" height="72" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="206.4" y="79.423333">555</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="103.423333">7</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="79.423333">6</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="55.423333">2</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="194.4" y="51.06">4</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="218.4" y="51.06">8</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="239.733333" y="79.423333">3</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="206.4" y="107.786667">1</text> -<line x1="194.4" y1="46.09" x2="194.4" y2="2.453333" /> -<circle fill="black" - cx="194.4" cy="2.453333" r="1.92" /> -<line x1="218.4" y1="46.09" x2="218.4" y2="2.453333" /> -<circle fill="black" - cx="218.4" cy="2.453333" r="1.92" /> -<line x1="206.4" y1="102.816667" x2="206.4" y2="146.453333" /> -<circle fill="black" - cx="206.4" cy="146.453333" r="1.92" /> -<line x1="173.066667" y1="50.453333" x2="125.066667" y2="50.453333" /> -<circle fill="black" - cx="125.066667" cy="50.453333" r="1.92" /> -<line x1="173.066667" y1="98.453333" x2="128.533333" y2="98.453333" /> -<path d="M 129.066667,98.453333 - A 4 4 0 0 0 121.066667,98.453333" /> -<line x1="121.6" y1="98.453333" x2="61.066667" y2="98.453333" /> -<circle fill="black" - cx="61.066667" cy="98.453333" r="1.92" /> -<polyline points="173.066667,74.453333 149.066667,74.453333 -149.066667,98.453333" /> -<circle fill="black" - cx="149.066667" cy="98.453333" r="1.92" /> -<line x1="239.733333" y1="74.453333" x2="271.733333" y2="74.453333" /> -<circle fill="black" - cx="271.733333" cy="74.453333" r="1.92" /> -<line x1="271.733333" y1="74.453333" x2="287.733333" y2="74.453333" /> -<line x1="302.818278" y1="85.12" x2="302.818278" y2="53.12" /> -<path d="M 302.818278,53.12 - A 16 16 0 0 0 302.818278,85.12" /> -<line x1="287.733333" y1="63.786667" x2="271.733333" y2="63.786667" /> -<line x1="271.733333" y1="2.453333" x2="271.733333" y2="29.655898" /> -<polygon stroke-width="0" fill="black" - points="284.89058,12.806313 291.624931,9.843199 -288.661817,16.57755" /> -<line x1="276.012013" y1="25.456117" x2="290.584435" y2="10.883695" /> -<polygon stroke-width="0" fill="black" - points="289.133221,17.048954 295.867571,14.08584 -292.904457,20.82019" /> -<line x1="280.254654" y1="29.698758" x2="294.827076" y2="15.126335" /> -<polyline stroke-width="0" fill="black" - points="271.733333,29.655898 -275.733333,29.655898 -271.733333,36.052761 -267.733333,29.655898 -271.733333,29.655898" /> -<polyline points="271.733333,29.655898 275.733333,29.655898 -271.733333,36.052761 -267.733333,29.655898 -271.733333,29.655898" /> -<line x1="267.344365" y1="36.584102" x2="276.122302" y2="36.584102" /> -<line x1="271.733333" y1="36.584102" x2="271.733333" y2="63.786667" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="295.733333" y="38.09">red</text> -<line x1="271.733333" y1="74.453333" x2="271.733333" y2="86.453333" /> -<polyline points="271.733333,110.453333 276.533333,110.453333 -276.533333,86.453333 -266.933333,86.453333 -266.933333,110.453333 -271.733333,110.453333" /> -<line x1="271.733333" y1="110.453333" x2="271.733333" y2="122.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="279.2" y="103.423333" -><tspan font-style="normal">470 Ω</tspan></text> -<line x1="271.733333" y1="122.453333" x2="271.733333" y2="130.989232" /> -<polygon stroke-width="0" fill="black" - points="284.89058,114.139647 291.624931,111.176533 -288.661817,117.910883" /> -<line x1="276.012013" y1="126.78945" x2="290.584435" y2="112.217028" /> -<polygon stroke-width="0" fill="black" - points="289.133221,118.382287 295.867571,115.419173 -292.904457,122.153524" /> -<line x1="280.254654" y1="131.032091" x2="294.827076" y2="116.459669" /> -<polyline stroke-width="0" fill="black" - points="271.733333,130.989232 -275.733333,130.989232 -271.733333,137.386094 -267.733333,130.989232 -271.733333,130.989232" /> -<polyline points="271.733333,130.989232 275.733333,130.989232 -271.733333,137.386094 -267.733333,130.989232 -271.733333,130.989232" /> -<line x1="267.344365" y1="137.917435" x2="276.122302" y2="137.917435" /> -<line x1="271.733333" y1="137.917435" x2="271.733333" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="303.733333" y="139.423333">green</text> -<line x1="271.733333" y1="146.453333" x2="13.066667" y2="146.453333" /> -<line x1="13.066667" y1="146.453333" x2="13.066667" y2="98.453333" /> -<line x1="13.066667" y1="98.453333" x2="13.066667" y2="84.453333" /> -<line x1="7.066667" y1="84.453333" x2="19.066667" y2="84.453333" /> -<line x1="1.066667" y1="80.453333" x2="25.066667" y2="80.453333" /> -<line x1="13.066667" y1="80.453333" x2="13.066667" y2="66.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="15.733333" y="77.786667"><tspan font-style="normal">9 V</tspan></text> -<line x1="13.066667" y1="66.453333" x2="13.066667" y2="42.453333" /> -<line x1="13.066667" y1="42.453333" x2="1.066667" y2="30.453333" /> -<line x1="13.066667" y1="26.453333" x2="13.066667" y2="2.453333" /> -<circle fill="white" - cx="13.066667" cy="42.453333" r="1.92" /> -<circle fill="white" - cx="13.066667" cy="26.453333" r="1.92" /> -<line x1="13.066667" y1="2.453333" x2="271.733333" y2="2.453333" /> -<line x1="409.333333" y1="148.373333" x2="409.333333" y2="112.373333" /> -<circle cx="409.333333" cy="94.373333" r="18" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="409.333333" y="107.349333">-</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="409.333333" y="89.349333"><tspan font-size="66%">+</tspan></text> -<line x1="409.333333" y1="76.373333" x2="409.333333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="388.666667" y="99.343333" ->v<tspan font-size="70%" -dy="0.66ex" dx="">s</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<line x1="409.333333" y1="40.373333" x2="433.333333" y2="40.373333" /> -<line x1="433.333333" y1="40.373333" x2="451.333333" y2="22.373333" /> -<path stroke-width="0" fill="black" - d="M 449.470811,37.717006 - L 447.129207,38.399081 - A 34.089485 34.089485 0 0 1 450.719998,45.032076 - A 34.089485 34.089485 0 0 0 451.812415,37.034932 - L 449.470811,37.717006" /> -<path d="M 450.333622,41.684181 - A 34.089485 34.089485 0 0 0 442.333333,24.784876" /> -<line x1="457.333333" y1="40.373333" x2="481.333333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="445.333333" y="56.105667">t = <tspan font-style="normal">0</tspan></text> -<polyline points="481.333333,40.373333 499.333333,40.373333 -502.333333,34.373333 -508.333333,46.373333 -514.333333,34.373333 -520.333333,46.373333 -526.333333,34.373333 -532.333333,46.373333 -535.333333,40.373333 -553.333333,40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="517.333333" y="31.706667" -><tspan font-style="normal">47 ohm</tspan></text> -<polygon stroke-width="0" fill="black" - points="486.933333,37.973333 496.533333,40.373333 -486.933333,42.773333" /> -<line x1="494.334344" y1="40.373333" x2="486.933333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="484.266667" y="33.706667" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">R</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="553.333333,40.373333 589.333333,40.373333 -589.333333,58.373333" /> -<line x1="625.333333" y1="58.373333" x2="625.333333" y2="73.963705" /> -<circle stroke-width="0.533333" - cx="625.333333" cy="73.963705" r="0.26567" /> -<path d="M 625.333333,73.963705 - A 7.2 7.2 0 1 1 622.860665,85.117192" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="85.117192" r="0.26567" /> -<path d="M 622.860665,85.117192 - A 7.2 7.2 0 1 1 622.860665,94.373333" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="94.373333" r="0.26567" /> -<path d="M 622.860665,94.373333 - A 7.2 7.2 0 1 1 622.860665,103.629475" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="103.629475" r="0.26567" /> -<path d="M 622.860665,103.629475 - A 7.2 7.2 0 1 1 625.333333,114.782962" /> -<circle stroke-width="0.533333" - cx="625.333333" cy="114.782962" r="0.26567" /> -<line x1="625.333333" y1="114.782962" x2="625.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="638.242851" y="99.343333">L</text> -<polygon stroke-width="0" fill="black" - points="627.733333,61.917192 625.333333,71.517192 -622.933333,61.917192" /> -<line x1="625.333333" y1="69.318202" x2="625.333333" y2="61.917192" /> -<line x1="553.333333" y1="58.373333" x2="553.333333" y2="90.773333" /> -<line x1="544.333333" y1="90.773333" x2="562.333333" y2="90.773333" /> -<path d="M 544.333333,97.973333 - A 18 18 0 0 1 562.333333,97.973333" /> -<line x1="553.333333" y1="95.561791" x2="553.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="550.666667" y="88.106667">+</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="541.666667" y="99.343333" ->v<tspan font-size="70%" -dy="0.66ex" dx="">C</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="550.666667" y="110.58">-</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="556" y="110.58">C</text> -<line x1="625.866667" y1="58.373333" x2="552.8" y2="58.373333" /> -<line x1="625.866667" y1="130.373333" x2="552.8" y2="130.373333" /> -<line x1="625.333333" y1="58.373333" x2="625.333333" y2="58.373333" /> -<line x1="625.333333" y1="130.373333" x2="625.333333" y2="130.373333" /> -<line x1="553.333333" y1="58.373333" x2="553.333333" y2="58.373333" /> -<line x1="553.333333" y1="130.373333" x2="553.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="630.666667" y="70.98" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">L</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="589.333333,130.373333 589.333333,148.373333 -409.333333,148.373333" /> -<path stroke-width="0" fill="black" - d="M 599.872248,78.914248 - L 598.753349,80.767553 - A 18 18 0 0 1 606.127562,85.373333 - A 18 18 0 0 0 600.991148,77.060943 - L 599.872248,78.914248" /> -<path d="M 606.127562,103.373333 - A 18 18 0 1 1 603.502794,81.885629" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="590.539105" y="99.343333" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<path stroke-width="0" fill="black" - d="M 509.303623,68.971919 - L 507.672194,70.593306 - A 36 36 0 0 1 514.921791,76.373333 - A 36 36 0 0 0 510.935053,67.350532 - L 509.303623,68.971919" /> -<path d="M 514.921791,112.373333 - A 36 36 0 1 1 512.508946,72.72551" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="483.744876" y="99.343333" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/examplesDPVs.html b/graphics/circuit_macros/examples/dpv/examplesDPVs.html deleted file mode 100644 index 8ce1912911..0000000000 --- a/graphics/circuit_macros/examples/dpv/examplesDPVs.html +++ /dev/null @@ -1,417 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<HTML> -<HEAD> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<!--meta http-equiv="Content-Script-Type" content="text/javascript"--> -<TITLE>SVG Examples: Circuit_macros Version 10.1</TITLE> -<meta name="keywords" content="HTML" -content='Circuit elements, basic circuits, logic circuits and other diagrams, -electric circuits, resistor, capacitor, inductor, diode, sources, amplifier, -integrator, fuse, switch, antenna, opamp, transformer, relay, contact, jack, -plug, FET, UJT, thyristor, bipolar transistor, nport, windings, timer, -optical isolator, rectifier, bistable, oscillator, CMOS, MOSFET, power supply, -NAND gate, controlled source, synchronous machine, digital circuit, signal-flow -graph, latch, decoder, flipflop, full adder, logic diagram, crossbar switch, -dimensioning, control system, graph, RGB colors, recursion, binary tree, -flowcharts, picture overlay, ASME Y14.5' > - -<style type="text/css"> -</style> -<link rel="shortcut icon" href="../Circuit_macros.ico" type="image/x-icon" /> -</HEAD> - -<!-- m4 macros: ------------------------------------------------------------ - - - - - - - ---------------------------------------------------------------------- --> - -<BODY> -<table cellpadding="0" cellspacing="0" - width="700px" border="0" align="center" ><tr><td> - -<H2>SVG Circuit_macros examples, Version 10.1</H2> - -<A HREF="../../index.html">Home</A> -> -<A HREF="examples.html">Examples</A> -> -<A HREF="examplesDPVs.html">dpv</A> - -<hr> - -<p> - This file shows a few diagrams in .svg format produced without the use of - LaTeX or equivalent. -The diagrams have been adapted from the Circuit_macros -examples in order to test the svg output of dpic. -To generate the equivalent for all the examples, go to the -examples/dpv directory and type "make". Typing "make examplesDPVs.html" -produces the selection shown here. -</p> -<p> -Generating svg line -art is straightforward but formatting text is not because TeX, LaTeX, -and related word processors do not produce svg directly. Either -less-sophisticated text formatting must be employed for svg or an - <A HREF="https://en.wikibooks.org/wiki/LaTeX/Export_To_Other_Formats"> - intermediate format</A> -such as pdf can be -produced, followed by an additional processing step to convert to svg. -Two possibilities for the latter are - <A HREF="https://www.ctan.org/pkg/dvisvgm">dvisvgm --pdf</A> -and - <A HREF="https://github.com/dawbarton/pdf2svg">pdf2svg</A>. -However, many circuit and similar diagrams intended for the web do not -require sophisticated labels; the examples shown below might -be representative. Compare them to those in - <A HREF="examples.html" TARGET="_blank">examples.html</A> -</p> -<p> - Click on the link to view the source of each diagram. -</p> -<hr> -<p> -There are other issues: -<ul> - <li> The default font face is not specified in all of these diagrams but is - inherited from the enclosing document, so the appearance of labels can - differ depending on the browser. Some of these diagrams set the font at - the beginning of the diagram source. - <li> Diagrams such as these contain text labels - that have to be treated differently from the LaTeX-compatible versions; - for example, - apparently there is no direct way to know the bounding box of arbitrary svg - text. - <!-- text, as discussed - <a href="http://www.aditus.nu/jpgraph/jpg_svg.php" TARGET="_blank">here,</a> - for example. --> - Consequently, text placement is approximate and may require - manual adjustment. - <li> Rather than patch the original source files for svg production, - edited copies have been used. The configuration file svg.m4 read by - m4 prior to libcct.m4 contains the following macros defined for svg. - Others could be defined to exercise some of the media capabilties - of svg. They are subject to change: - <ul> - <li> - <g style="font-family:monospace">svg_font(</g>font-face,nominal size[:dptextratio],textoffset, - dpic commands<g style="font-family:monospace">)</g>: - Change font face, size, textratio and dpic textoffset parameters. - Change font face and dpic <g style="font-family:monospace">textht</g>, <g style="font-family:monospace">dptextratio</g>, - and <g style="font-family:monospace">textoffset</g> parameters. - If arg4 is blank, the font is changed and - requires <g style="font-family:monospace">command "</g>"</g> to cancel the font change. - <br> - Note: - Nominal height = text height in drawing units; actual height = - nominal ht x <g style="font-family:monospace">dptextratio</g>. - <br> - Examples: <br> - <g style="font-family:monospace">svg_font(Times)</g><br> - <g style="font-family:monospace">svg_font(Times,14bp__)</g><br> - <g style="font-family:monospace">svg_font(sans-serif,14bp__:0.71)</g><br> - <g style="font-family:monospace">svg_font(Times,11bp__,1bp__,"text" at A)</g><br> - <g style="font-family:monospace">svg_font(font-family="Times")</g><br> - <g style="font-family:monospace">svg_font(font-family="Times" font-style="italic")</g><br> - <g style="font-family:monospace">svg_font(style="font-family:Times; font-style:italic")</g> - <li><g style="font-family:monospace"> svgfontratio(</g>font name<g style="font-family:monospace">)</g>; - Reasonable <g style="font-family:monospace">dptextratio</g> value for common fonts, used - by <g style="font-family:monospace">svg_font</g>. - <li><g style="font-family:monospace"> svg_tspan(</g>text attributes, text<g style="font-family:monospace">)</g>; - e.g. <g style="font-family:monospace">svg_tspan(font-style="italic" font-size="75%",XYZ)</g> - <li><g style="font-family:monospace"> svg_it(</g>text<g style="font-family:monospace">)</g>: for italics - <li><g style="font-family:monospace"> svg_tt(</g>text<g style="font-family:monospace">)</g>: for monospace (courier) - <li><g style="font-family:monospace"> svg_sf(</g>text<g style="font-family:monospace">)</g>: sans-serif (Helvetica) - <li><g style="font-family:monospace"> svg_norm(</g>text<g style="font-family:monospace">)</g>: for normal text - <li><g style="font-family:monospace"> svg_bf(</g>text<g style="font-family:monospace">)</g>: for bold face - <li><g style="font-family:monospace"> svg_small(</g>text, percent<g style="font-family:monospace">)</g>: - to set a smaller text size, default 66 - <li><g style="font-family:monospace"> svg_fsize(</g>text, percent<g style="font-family:monospace">)</g>: - for setting larger or smaller text size, default 100 - <li><g style="font-family:monospace"> svg_sub(</g>text, size percent, y displ, x displ<g style="font-family:monospace">)</g>: - subscript - <li><g style="font-family:monospace"> svg_ul(</g>text<g style="font-family:monospace">)</g>: underlined text - <li><g style="font-family:monospace"> svg_ol(</g>text<g style="font-family:monospace">)</g>: overlined text - <li><g style="font-family:monospace"> svg_sup(</g>text, size percent, y displ, x displ<g style="font-family:monospace">)</g>: - superscript - <li><g style="font-family:monospace"> svg_hat(</g>character<g style="font-family:monospace">)</g>: circumflex-accented character - <li><g style="font-family:monospace"> svg_frac(</g>numerator[:wid], denominator[:wid]<g style="font-family:monospace">)</g>: - basic fraction, wid in drawing units - <li><g style="font-family:monospace"> svg_rot(</g>degrees, "text" [at position]<g style="font-family:monospace">)</g>: - Rotate text degrees (default 90) ccw. - Requires <g style="font-family:monospace">svg_rot_init(</g>filename<g style="font-family:monospace">)</g> and the source - must be processed twice. - <li><g style="font-family:monospace"> svg_rot_init(</g>filename<g style="font-family:monospace">)</g>: - filename is the basename of the output of - <g style="font-family:monospace">dpic -v filename.pic > filename.svg<g style="font-family:monospace"> - <li><g style="font-family:monospace"> svg_symbol(</g>text<g style="font-family:monospace">)</g>: allow quoted pound sign in text, - e.g., <g style="font-family:monospace">svg_symbol(10&`#'176;)</g> produces 10° - <li><g style="font-family:monospace"> svgLink(</g>URL, drawing object, <g style="font-family:monospace">[B])</g>: - link to external file using - <a xlink:href=...>...</a> (default is - <g style="font-family:monospace">target="_blank"</g> unless - arg 3 = B) - <li><g style="font-family:monospace"> svgLinkString</g> as above but for strings attached to objects - <li> Greek and other symbols: - -<!-- - Reference: - https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references - and - https://www.toptal.com/designers/htmlarrows/math/ - --> -<table cellpadding="2" cellspacing="0" width="75%" > -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_alpha</g> <td align="left"> α -<td width="10%"> <g style="font-family:monospace"> svg_beta</g> <td align="left"> β -<td width="10%"> <g style="font-family:monospace"> svg_Gamma</g> <td align="left"> Γ -<td width="10%"> <g style="font-family:monospace"> svg_gamma</g> <td align="left"> γ -<td width="10%"> <g style="font-family:monospace"> svg_Delta</g> <td align="left"> Δ -<td width="10%"> <g style="font-family:monospace"> svg_delta</g> <td align="left"> δ -<td width="10%"> <g style="font-family:monospace"> svg_epsilon</g> <td align="left"> ε -<td width="10%"> <g style="font-family:monospace"> svg_zeta</g> <td align="left"> ζ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_eta</g> <td align="left"> η -<td width="10%"> <g style="font-family:monospace"> svg_Theta</g> <td align="left"> Θ -<td width="10%"> <g style="font-family:monospace"> svg_theta</g> <td align="left"> θ -<td width="10%"> <g style="font-family:monospace"> svg_iota</g> <td align="left"> ι -<td width="10%"> <g style="font-family:monospace"> svg_kappa</g> <td align="left"> κ -<td width="10%"> <g style="font-family:monospace"> svg_Lambda</g> <td align="left"> Λ -<td width="10%"> <g style="font-family:monospace"> svg_lambda</g> <td align="left"> λ -<td width="10%"> <g style="font-family:monospace"> svg_mu</g> <td align="left"> μ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_nu</g> <td align="left"> ν -<td width="10%"> <g style="font-family:monospace"> svg_Xi</g> <td align="left"> Ξ -<td width="10%"> <g style="font-family:monospace"> svg_xi</g> <td align="left"> ξ -<td width="10%"> <g style="font-family:monospace"> svg_Pi</g> <td align="left"> Π -<td width="10%"> <g style="font-family:monospace"> svg_pi</g> <td align="left"> π -<td width="10%"> <g style="font-family:monospace"> svg_rho</g> <td align="left"> ρ -<td width="10%"> <g style="font-family:monospace"> svg_Sigma</g> <td align="left"> Σ -<td width="10%"> <g style="font-family:monospace"> svg_sigma</g> <td align="left"> σ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_tau</g> <td align="left"> τ -<td width="10%"> <g style="font-family:monospace"> svg_upsilon</g> <td align="left"> υ -<td width="10%"> <g style="font-family:monospace"> svg_Phi</g> <td align="left"> Φ -<td width="10%"> <g style="font-family:monospace"> svg_phi</g> <td align="left"> φ -<td width="10%"> <g style="font-family:monospace"> svg_chi</g> <td align="left"> χ -<td width="10%"> <g style="font-family:monospace"> svg_Psi</g> <td align="left"> Ψ -<td width="10%"> <g style="font-family:monospace"> svg_psi</g> <td align="left"> ψ -<td width="10%"> <g style="font-family:monospace"> svg_Omega</g> <td align="left"> Ω -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_omega</g> <td align="left"> ω -<td width="10%"> <g style="font-family:monospace"> svg_micro</g> <td align="left"> μ -<td width="10%"> <g style="font-family:monospace"> svg_ohm</g> <td align="left"> Ω -<td width="10%"> <g style="font-family:monospace"> svg_lt</g> <td align="left"> < -<td width="10%"> <g style="font-family:monospace"> svg_gt</g> <td align="left"> > -<td width="10%"> <g style="font-family:monospace"> svg_leq</g> <td align="left"> ≤ -<td width="10%"> <g style="font-family:monospace"> svg_geq</g> <td align="left"> ≥ -<td width="10%"> <g style="font-family:monospace"> svg_prime</g> <td align="left"> ′ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_backsl</g> <td align="left"> \ -<td width="10%"> <g style="font-family:monospace"> svg_pound</g> <td align="left"> # -<td width="10%"> <g style="font-family:monospace"> svg_comma</g> <td align="left"> , -<td width="10%"> <g style="font-family:monospace"> svg_lparen</g> <td align="left"> ( -<td width="10%"> <g style="font-family:monospace"> svg_rparen</g> <td align="left"> ) -<td width="10%"> <g style="font-family:monospace"> svg_circ</g> <td align="left"> ˆ -<td width="10%"> <g style="font-family:monospace"> svg_deg</g> <td align="left"> ° -<td width="10%"> <g style="font-family:monospace"> svg_grave</g> <td align="left"> ` -</tr> -</table> -<table cellpadding="2" cellspacing="0" width="75%" > -<tr> -<td width="8%"> <g style="font-family:monospace"> svg_emsp</g> <td width="50px" align="left"> | | -<td width="8%"> <g style="font-family:monospace"> svg_ensp</g> <td width="50px" align="left"> | | -<td width="8%"> <g style="font-family:monospace"> svg_thinsp</g> <td width="50px" align="left"> | | -</tr> -</table> - - </ul> - <li> Inkscape: It may be efficient to define elements by macro and to - place them using a wysiwyg graphics editor. A draft page intended - for Inkscape is included. A reasonable variety of elements is defined - but many more could be added and they should be customized for - particular applications. Adjustments may also have to be made to - obtain the proper snap-to actions. - <li> Link experiments: Click on the resistor or source of quickDPV - to go to external - files in new windows. Click on "n-port" in NportDPV to replace the diagram - and then "back" to return. - <li> Some of the assumptions used to create this draft may be - naïve. - Comments are welcome. -</ul> - -<!-- -<embed pluginspage="http://www.adobe.com/svg/viewer/install/" /> ---> - -<hr> - -<table> -<tr> -<td width="50%"> -<p> -<IMG SRC="quickDPV.svg"> -<br><br> -Fig. 1 (<a href="quickDPV.txt" TYPE="text/plain" TARGET="_blank" - alt="quickDPV">quickDPV.m4</a>): -SVG produced by dpic   -</p> -</td> -<td> -<p> -<IMG SRC="quick.svg"> -<br><br> -(<a href="quick.txt" TYPE="text/plain" TARGET="_blank" - alt="quick">quick.m4</a>): -SVG produced from quick.pdf by dvisvgm   -</p> -</td> -</table> - -<hr> - - - -<p> - <IMG SRC="ConnectorsDPV.svg"> - <br><br> -Fig. 2 (<a - href="ConnectorsDPV.txt" TYPE="text/plain" TARGET="_blank" alt="ConnectorsDPV">ConnectorsDPV.m4</a>): -Some integrated circuits and connectors with simple geometry - and lists of labels   -</p> -<hr> - - - -<p> - <IMG SRC="NportDPV.svg"> - <br><br> -Fig. 3 (<a - href="NportDPV.txt" TYPE="text/plain" TARGET="_blank" alt="NportDPV">NportDPV.m4</a>): -The <g style="font-family:monospace">nport</g> and <g style="font-family:monospace">nterm</g> macros   -</p> -<hr> - - - -<p> - <IMG SRC="ex01DPV.svg"> - <br><br> -Fig. 4 (<a - href="ex01DPV.txt" TYPE="text/plain" TARGET="_blank" alt="ex01DPV">ex01DPV.m4</a>): -Two simple labeled circuits   -</p> -<hr> - - - -<p> - <IMG SRC="CsourceDPV.svg"> - <br><br> -Fig. 5 (<a - href="CsourceDPV.txt" TYPE="text/plain" TARGET="_blank" alt="CsourceDPV">CsourceDPV.m4</a>): -Realization of a controlled source - (illustrating stacked element labels)   -</p> -<hr> - - - -<p> - <IMG SRC="HeathkitDPV.svg"> - <br><br> -Fig. 6 (<a - href="HeathkitDPV.txt" TYPE="text/plain" TARGET="_blank" alt="HeathkitDPV">HeathkitDPV.m4</a>): -The power supply of a Heathkit AR-15 (Now, <i>that</i> - was a receiver!) with custom transformer and other elements, - drawn on a grid (partially shown) to aid in placement   -</p> -<hr> - - - -<p> - <IMG SRC="EEPDPV.svg"> - <br><br> -Fig. 7 (<a - href="EEPDPV.txt" TYPE="text/plain" TARGET="_blank" alt="EEPDPV">EEPDPV.m4</a>): -Part of a single-line diagram of a power distribution system - using draft elements   -</p> -<hr> - - - -<p> - <IMG SRC="controlDPV.svg"> - <br><br> -Fig. 8 (<a - href="controlDPV.txt" TYPE="text/plain" TARGET="_blank" alt="controlDPV">controlDPV.m4</a>): -Control-system block diagrams   -</p> -<hr> - - -<p> - <IMG SRC="ByteDPV.svg"> - <br><br> -Fig. 9 (<a - href="ByteDPV.txt" TYPE="text/plain" TARGET="_blank" alt="ByteDPV">ByteDPV.m4</a>): -Elementary splines   -</p> -<hr> - - - -<p> - <IMG SRC="FlowDPV.svg"> - <br><br> -Fig. 10 (<a - href="FlowDPV.txt" TYPE="text/plain" TARGET="_blank" alt="FlowDPV">FlowDPV.m4</a>): -A flowchart sampler   -</p> -<hr> - <!-- <p> - More flow-chart examples? Try - <a href="https://buraphakit.sourceforge.io/EFI/EFI_2019_S2_W13.shtml" - TARGET="_blank">here.</a> - </p> --> - - - - -<p> - <IMG SRC="paletteDPV.svg"> - <br><br> -Fig. 11 (<a - href="paletteDPV.txt" TYPE="text/plain" TARGET="_blank" alt="paletteDPV">paletteDPV.m4</a>): -A draft palette of a few elements for Inkscape using - a 1 mm grid   -</p> -<hr> - - -<p> - <IMG SRC="FontsDPV.svg"> - -</p> -<hr> - -</td> -</tr> -</table> -</BODY> -</HTML> diff --git a/graphics/circuit_macros/examples/dpv/paletteDPV.svg b/graphics/circuit_macros/examples/dpv/paletteDPV.svg deleted file mode 100644 index 51ccb1bc2c..0000000000 --- a/graphics/circuit_macros/examples/dpv/paletteDPV.svg +++ /dev/null @@ -1,2639 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="768" height="715" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="766.664567px" height="713.751181px" - viewBox="0 0 766.664567 713.751181" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<g> -<polyline points="76.657218,0.533333 76.657218,9.982152 -79.806824,11.556955 -73.507612,14.706562 -79.806824,17.856168 -73.507612,21.005774 -79.806824,24.155381 -73.507612,27.304987 -76.657218,28.87979 -76.657218,38.328609" /> -</g> -<g> -<polyline points="91.775328,9.982152 91.775328,9.982152 -94.924934,11.556955 -88.625722,14.706562 -94.924934,17.856168 -88.625722,21.005774 -94.924934,24.155381 -88.625722,27.304987 -91.775328,28.87979 -91.775328,28.87979" /> -</g> -<g> -<line x1="106.893438" y1="0.533333" x2="106.893438" y2="9.982152" /> -<polyline points="106.893438,28.87979 110.672966,28.87979 -110.672966,9.982152 -103.113911,9.982152 -103.113911,28.87979 -106.893438,28.87979" /> -<line x1="106.893438" y1="28.87979" x2="106.893438" y2="38.328609" /> -</g> -<g> -<polyline points="118.232021,0.533333 118.232021,9.982152 -124.531234,13.131759 -118.232021,16.281365 -124.531234,19.430971 -118.232021,22.580577 -124.531234,25.730184 -118.232021,28.87979 -118.232021,28.87979 -118.232021,38.328609" /> -</g> -<g> -<polyline points="137.129659,0.533333 137.129659,9.982152 -141.539108,9.982152 -141.539108,13.76168 -137.129659,13.76168 -137.129659,17.541207 -141.539108,17.541207 -141.539108,21.320735 -137.129659,21.320735 -137.129659,25.100262 -141.539108,25.100262 -141.539108,28.87979 -137.129659,28.87979 -137.129659,28.87979 -137.129659,38.328609" /> -</g> -<g> -<polyline points="152.247769,0.533333 152.247769,9.982152 -155.397375,11.556955 -149.098163,14.706562 -155.397375,17.856168 -149.098163,21.005774 -155.397375,24.155381 -149.098163,27.304987 -152.247769,28.87979 -152.247769,38.328609" /> -</g> -<g> -<line x1="167.365879" y1="0.533333" x2="167.365879" y2="8.717255" /> -<circle stroke-width="0.533333" - cx="167.365879" cy="8.717255" r="0.26567" /> -<path d="M 167.365879,8.717255 - A 3.779528 3.779528 0 1 1 166.067891,14.572104" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="14.572104" r="0.26567" /> -<path d="M 166.067891,14.572104 - A 3.779528 3.779528 0 1 1 166.067891,19.430971" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="19.430971" r="0.26567" /> -<path d="M 166.067891,19.430971 - A 3.779528 3.779528 0 1 1 166.067891,24.289838" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="24.289838" r="0.26567" /> -<path d="M 166.067891,24.289838 - A 3.779528 3.779528 0 1 1 167.365879,30.144687" /> -<circle stroke-width="0.533333" - cx="167.365879" cy="30.144687" r="0.26567" /> -<line x1="167.365879" y1="30.144687" x2="167.365879" y2="38.328609" /> -</g> -<g> -<line x1="186.263517" y1="0.533333" x2="186.263517" y2="8.717255" /> -<circle stroke-width="0.533333" - cx="186.263517" cy="8.717255" r="0.26567" /> -<path d="M 186.263517,8.717255 - A 3.779528 3.779528 0 1 1 184.965528,14.572104" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="14.572104" r="0.26567" /> -<path d="M 184.965528,14.572104 - A 3.779528 3.779528 0 1 1 184.965528,19.430971" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="19.430971" r="0.26567" /> -<path d="M 184.965528,19.430971 - A 3.779528 3.779528 0 1 1 184.965528,24.289838" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="24.289838" r="0.26567" /> -<path d="M 184.965528,24.289838 - A 3.779528 3.779528 0 1 1 186.263517,30.144687" /> -<circle stroke-width="0.533333" - cx="186.263517" cy="30.144687" r="0.26567" /> -<line x1="193.215145" y1="8.717255" x2="193.215145" y2="30.144687" /> -<line x1="195.57735" y1="8.717255" x2="195.57735" y2="30.144687" /> -<line x1="186.263517" y1="30.144687" x2="186.263517" y2="38.328609" /> -</g> -<g> -<line x1="208.940682" y1="0.533333" x2="208.940682" y2="9.982152" /> -<circle stroke-width="0.533333" - cx="208.940682" cy="9.982152" r="0.26567" /> -<path d="M 208.940682,9.982152 - C 211.539108,9.982152 213.665092,11.087664 213.665092,12.438845 213.665092,13.790026 212.176903,14.895538 210.358005,14.895538 208.539108,14.895538 207.050919,14.385302 207.050919,13.76168 207.050919,13.138058 208.539108,12.627822 210.358005,12.627822 212.176903,12.627822 213.665092,13.988451 213.665092,15.651444 213.665092,17.314436 212.176903,18.675066 210.358005,18.675066 208.539108,18.675066 207.050919,18.164829 207.050919,17.541207 207.050919,16.917585 208.539108,16.407349 210.358005,16.407349 212.176903,16.407349 213.665092,17.767979 213.665092,19.430971 213.665092,21.093963 212.176903,22.454593 210.358005,22.454593 208.539108,22.454593 207.050919,21.944357 207.050919,21.320735 207.050919,20.697113 208.539108,20.186877 210.358005,20.186877 212.176903,20.186877 213.665092,21.547507 213.665092,23.210499 213.665092,24.873491 212.176903,26.234121 210.358005,26.234121 208.539108,26.234121 207.050919,25.723885 207.050919,25.100262 207.050919,24.47664 208.539108,23.966404 210.358005,23.966404 212.176903,23.966404 213.665092,25.071916 213.665092,26.423097 213.665092,27.774278 211.539108,28.87979 208.940682,28.87979" /> -<circle stroke-width="0.533333" - cx="208.940682" cy="28.87979" r="0.26567" /> -<line x1="208.940682" y1="28.87979" x2="208.940682" y2="38.328609" /> -</g> -<g> -<line x1="227.83832" y1="0.533333" x2="227.83832" y2="9.982152" /> -<line x1="227.83832" y1="9.982152" x2="227.304987" y2="9.982152" /> -<path d="M 227.83832,9.982152 - A 2.362205 2.362205 0 0 1 227.83832,14.706562" /> -<line x1="227.83832" y1="14.706562" x2="227.304987" y2="14.706562" /> -<path d="M 227.83832,14.706562 - A 2.362205 2.362205 0 0 1 227.83832,19.430971" /> -<line x1="227.83832" y1="19.430971" x2="227.304987" y2="19.430971" /> -<path d="M 227.83832,19.430971 - A 2.362205 2.362205 0 1 1 227.83832,24.155381" /> -<line x1="227.83832" y1="24.155381" x2="227.304987" y2="24.155381" /> -<path d="M 227.83832,24.155381 - A 2.362205 2.362205 0 1 1 227.83832,28.87979" /> -<line x1="227.83832" y1="28.87979" x2="227.304987" y2="28.87979" /> -<line x1="227.83832" y1="28.87979" x2="227.83832" y2="38.328609" /> -</g> -<g> -<line x1="242.95643" y1="0.533333" x2="242.95643" y2="9.982152" /> -<line x1="242.95643" y1="9.982152" x2="242.423097" y2="9.982152" /> -<path d="M 242.95643,9.982152 - A 2.362205 2.362205 0 0 1 242.95643,14.706562" /> -<line x1="242.95643" y1="14.706562" x2="242.423097" y2="14.706562" /> -<path d="M 242.95643,14.706562 - A 2.362205 2.362205 0 0 1 242.95643,19.430971" /> -<line x1="242.95643" y1="19.430971" x2="242.423097" y2="19.430971" /> -<path d="M 242.95643,19.430971 - A 2.362205 2.362205 0 1 1 242.95643,24.155381" /> -<line x1="242.95643" y1="24.155381" x2="242.423097" y2="24.155381" /> -<path d="M 242.95643,24.155381 - A 2.362205 2.362205 0 1 1 242.95643,28.87979" /> -<line x1="242.95643" y1="28.87979" x2="242.423097" y2="28.87979" /> -<line x1="246.893438" y1="9.982152" x2="246.893438" y2="28.87979" /> -<line x1="249.255643" y1="9.982152" x2="249.255643" y2="28.87979" /> -<line x1="242.95643" y1="28.87979" x2="242.95643" y2="38.328609" /> -</g> -<g> -<line x1="265.633596" y1="0.533333" x2="265.633596" y2="17.541207" /> -<line x1="259.334383" y1="17.541207" x2="271.932808" y2="17.541207" /> -<line x1="259.334383" y1="21.320735" x2="271.932808" y2="21.320735" /> -<line x1="265.633596" y1="21.320735" x2="265.633596" y2="38.328609" /> -</g> -<g> -<line x1="288.310761" y1="0.533333" x2="288.310761" y2="17.541207" /> -<line x1="283.586352" y1="17.541207" x2="293.035171" y2="17.541207" /> -<path d="M 283.586352,21.320735 - A 9.448819 9.448819 0 0 1 293.035171,21.320735" /> -<line x1="288.310761" y1="20.054833" x2="288.310761" y2="38.328609" /> -</g> -<g> -<line x1="310.987927" y1="0.533333" x2="310.987927" y2="17.541207" /> -<polyline points="306.263517,21.320735 306.263517,17.541207 -315.712336,17.541207 -315.712336,21.320735" /> -<line x1="307.444619" y1="20.060892" x2="314.531234" y2="20.060892" /> -<line x1="310.987927" y1="20.060892" x2="310.987927" y2="38.328609" /> -</g> -<g> -<line x1="329.885564" y1="0.533333" x2="329.885564" y2="15.651444" /> -<polyline stroke-width="0.533333" - points="329.885564,18.013648 333.665092,18.013648 -333.665092,15.651444 -326.106037,15.651444 -326.106037,18.013648 -329.885564,18.013648" /> -<polyline stroke-width="0" fill="black" - points="329.885564,20.848294 -333.665092,20.848294 -333.665092,23.210499 -326.106037,23.210499 -326.106037,20.848294 -329.885564,20.848294" /> -<polyline stroke-width="0.533333" - points="329.885564,20.848294 333.665092,20.848294 -333.665092,23.210499 -326.106037,23.210499 -326.106037,20.848294 -329.885564,20.848294" /> -<line x1="329.885564" y1="23.210499" x2="329.885564" y2="38.328609" /> -</g> -<g> -<line x1="345.003675" y1="0.533333" x2="345.003675" y2="15.651444" /> -<polyline stroke-width="0" fill="black" - points="345.003675,18.013648 -348.783202,18.013648 -348.783202,15.651444 -341.224147,15.651444 -341.224147,18.013648 -345.003675,18.013648" /> -<polyline points="345.003675,18.013648 348.783202,18.013648 -348.783202,15.651444 -341.224147,15.651444 -341.224147,18.013648 -345.003675,18.013648" /> -<polyline stroke-width="0" fill="black" - points="345.003675,20.848294 -348.783202,20.848294 -348.783202,23.210499 -341.224147,23.210499 -341.224147,20.848294 -345.003675,20.848294" /> -<polyline points="345.003675,20.848294 348.783202,20.848294 -348.783202,23.210499 -341.224147,23.210499 -341.224147,20.848294 -345.003675,20.848294" /> -<line x1="345.003675" y1="23.210499" x2="345.003675" y2="38.328609" /> -</g> -<g> -<line x1="363.901312" y1="0.533333" x2="363.901312" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="363.901312,16.703332 -367.050919,16.703332 -363.901312,21.627269 -360.751706,16.703332 -363.901312,16.703332" /> -<polyline points="363.901312,16.703332 367.050919,16.703332 -363.901312,21.627269 -360.751706,16.703332 -363.901312,16.703332" /> -<line x1="360.362738" y1="22.15861" x2="367.439887" y2="22.15861" /> -<line x1="363.901312" y1="22.15861" x2="363.901312" y2="38.328609" /> -</g> -<g> -<line x1="386.578478" y1="0.533333" x2="386.578478" y2="16.703332" /> -<polyline points="386.578478,16.703332 389.728084,16.703332 -386.578478,21.627269 -383.428871,16.703332 -386.578478,16.703332" /> -<line x1="383.039903" y1="22.15861" x2="390.117052" y2="22.15861" /> -<line x1="386.578478" y1="22.15861" x2="386.578478" y2="38.328609" /> -</g> -<g> -<line x1="409.255643" y1="0.533333" x2="409.255643" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="409.255643,16.703332 -412.405249,16.703332 -409.255643,21.627269 -406.106037,16.703332 -409.255643,16.703332" /> -<polyline points="409.255643,16.703332 412.405249,16.703332 -409.255643,21.627269 -406.106037,16.703332 -409.255643,16.703332" /> -<polyline points="405.717068,20.583807 405.717068,22.15861 -412.794218,22.15861 -412.794218,23.733413" /> -<line x1="409.255643" y1="22.15861" x2="409.255643" y2="38.328609" /> -</g> -<g> -<line x1="431.932808" y1="0.533333" x2="431.932808" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="431.932808,16.703332 -435.082415,16.703332 -431.932808,21.627269 -428.783202,16.703332 -431.932808,16.703332" /> -<polyline points="431.932808,16.703332 435.082415,16.703332 -431.932808,21.627269 -428.783202,16.703332 -431.932808,16.703332" /> -<polyline points="429.833071,20.583807 428.394234,20.583807 -428.394234,22.15861 -435.471383,22.15861 -435.471383,23.733413 -434.032546,23.733413" /> -<line x1="431.932808" y1="22.15861" x2="431.932808" y2="38.328609" /> -</g> -<g> -<line x1="454.609974" y1="0.533333" x2="454.609974" y2="16.703332" /> -<polyline points="454.609974,16.703332 457.75958,16.703332 -454.609974,21.627269 -451.460367,16.703332 -454.609974,16.703332" /> -<line x1="454.609974" y1="16.703332" x2="454.609974" y2="22.15861" /> -<line x1="451.071399" y1="22.15861" x2="458.148549" y2="22.15861" /> -<line x1="454.609974" y1="22.15861" x2="454.609974" y2="38.328609" /> -</g> -<g> -<line x1="477.287139" y1="0.533333" x2="477.287139" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="477.287139,16.703332 -480.436745,16.703332 -477.287139,21.627269 -474.137533,16.703332 -477.287139,16.703332" /> -<polyline points="477.287139,16.703332 480.436745,16.703332 -477.287139,21.627269 -474.137533,16.703332 -477.287139,16.703332" /> -<line x1="473.748564" y1="22.15861" x2="480.825714" y2="22.15861" /> -<line x1="473.748564" y1="23.733413" x2="480.825714" y2="23.733413" /> -<line x1="477.287139" y1="23.733413" x2="477.287139" y2="38.328609" /> -</g> -<g> -<line x1="499.964304" y1="0.533333" x2="499.964304" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="499.964304,16.703332 -503.113911,16.703332 -499.964304,21.627269 -496.814698,16.703332 -499.964304,16.703332" /> -<polyline points="499.964304,16.703332 503.113911,16.703332 -499.964304,21.627269 -496.814698,16.703332 -499.964304,16.703332" /> -<line x1="496.42573" y1="22.15861" x2="503.502879" y2="22.15861" /> -<path d="M 496.42573,24.258348 - A 6.502428 6.502428 0 0 1 503.502879,24.258348" /> -<line x1="499.964304" y1="23.211198" x2="499.964304" y2="23.733413" /> -<line x1="499.964304" y1="23.733413" x2="499.964304" y2="38.328609" /> -</g> -<g> -<line x1="522.64147" y1="0.533333" x2="522.64147" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="522.64147,16.703332 -525.791076,16.703332 -522.64147,21.627269 -519.491864,16.703332 -522.64147,16.703332" /> -<polyline points="522.64147,16.703332 525.791076,16.703332 -522.64147,21.627269 -519.491864,16.703332 -522.64147,16.703332" /> -<polyline points="519.102895,20.583807 519.102895,22.15861 -526.180045,22.15861 -526.180045,20.583807" /> -<line x1="522.64147" y1="22.15861" x2="522.64147" y2="38.328609" /> -</g> -<g> -<line x1="545.318635" y1="0.533333" x2="545.318635" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="545.318635,16.703332 -548.468241,16.703332 -545.318635,21.627269 -542.169029,16.703332 -545.318635,16.703332" /> -<polyline points="545.318635,16.703332 548.468241,16.703332 -545.318635,21.627269 -542.169029,16.703332 -545.318635,16.703332" /> -<line x1="541.78006" y1="22.15861" x2="548.85721" y2="22.15861" /> -<line x1="541.78006" y1="20.583807" x2="541.78006" y2="23.733413" /> -<line x1="548.85721" y1="20.583807" x2="548.85721" y2="23.733413" /> -<line x1="545.318635" y1="22.15861" x2="545.318635" y2="38.328609" /> -</g> -<g> -<line x1="567.995801" y1="0.533333" x2="567.995801" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="571.145407,16.703332 -574.295013,16.703332 -571.145407,21.627269 -567.995801,16.703332 -571.145407,16.703332" /> -<polyline points="571.145407,16.703332 574.295013,16.703332 -571.145407,21.627269 -567.995801,16.703332 -571.145407,16.703332" /> -<line x1="561.307619" y1="22.15861" x2="574.683982" y2="22.15861" /> -<line x1="561.307619" y1="16.703332" x2="574.683982" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="564.846194,22.15861 -567.995801,22.15861 -564.846194,17.234673 -561.696588,22.15861 -564.846194,22.15861" /> -<polyline points="564.846194,22.15861 567.995801,22.15861 -564.846194,17.234673 -561.696588,22.15861 -564.846194,22.15861" /> -<line x1="567.995801" y1="22.15861" x2="567.995801" y2="38.328609" /> -</g> -<g> -<line x1="590.672966" y1="0.533333" x2="590.672966" y2="13.975693" /> -<polyline stroke-width="0" fill="black" - points="590.672966,13.975693 -593.822572,13.975693 -590.672966,18.89963 -587.52336,13.975693 -590.672966,13.975693" /> -<polyline points="590.672966,13.975693 593.822572,13.975693 -590.672966,18.89963 -587.52336,13.975693 -590.672966,13.975693" /> -<polyline points="587.134391,17.856168 587.134391,19.430971 -594.211541,19.430971 -594.211541,21.005774" /> -<polyline stroke-width="0" fill="black" - points="590.672966,24.886249 -593.822572,24.886249 -590.672966,19.962312 -587.52336,24.886249 -590.672966,24.886249" /> -<polyline points="590.672966,24.886249 593.822572,24.886249 -590.672966,19.962312 -587.52336,24.886249 -590.672966,24.886249" /> -<line x1="590.672966" y1="24.886249" x2="590.672966" y2="38.328609" /> -</g> -<g> -<line x1="613.350131" y1="0.533333" x2="613.350131" y2="16.703332" /> -<polygon stroke-width="0" fill="black" - points="623.710168,3.435942 629.012806,1.102782 -626.679646,6.40542" /> -<line x1="616.71917" y1="13.396418" x2="627.972311" y2="2.143277" /> -<polygon stroke-width="0" fill="black" - points="627.05083,6.776604 632.353468,4.443444 -630.020308,9.746082" /> -<line x1="620.059832" y1="16.73708" x2="631.312973" y2="5.483939" /> -<polyline stroke-width="0" fill="black" - points="613.350131,16.703332 -616.499738,16.703332 -613.350131,21.627269 -610.200525,16.703332 -613.350131,16.703332" /> -<polyline points="613.350131,16.703332 616.499738,16.703332 -613.350131,21.627269 -610.200525,16.703332 -613.350131,16.703332" /> -<line x1="609.811556" y1="22.15861" x2="616.888706" y2="22.15861" /> -<line x1="613.350131" y1="22.15861" x2="613.350131" y2="38.328609" /> -</g> -<g> -<circle cx="654.924934" cy="19.430971" r="13.228346" /> -</g> -<g> -<line x1="685.161155" y1="0.533333" x2="685.161155" y2="16.911286" /> -<line x1="682.011549" y1="16.911286" x2="688.310761" y2="16.911286" /> -<polyline points="685.161155,14.706562 689.885564,14.706562 -689.885564,24.155381 -680.436745,24.155381 -680.436745,14.706562 -685.161155,14.706562" /> -<line x1="682.011549" y1="21.950656" x2="688.310761" y2="21.950656" /> -<line x1="685.161155" y1="21.950656" x2="685.161155" y2="38.328609" /> -</g> -<circle fill="black" - cx="700.279265" cy="19.430971" r="1.511811" /> -<g> -<line x1="76.657218" y1="42.108136" x2="76.657218" y2="51.556955" /> -<circle cx="76.657218" cy="61.005774" r="9.448819" /> -<line x1="76.657218" y1="70.454593" x2="76.657218" y2="79.903412" /> -</g> -<g> -<line x1="106.893438" y1="42.108136" x2="106.893438" y2="51.556955" /> -<circle cx="106.893438" cy="61.005774" r="9.448819" /> -<polygon stroke-width="0" fill="black" - points="109.255643,58.64357 106.893438,68.092388 -104.531234,58.64357" /> -<line x1="106.893438" y1="53.91916" x2="106.893438" y2="65.893399" /> -<line x1="106.893438" y1="70.454593" x2="106.893438" y2="79.903412" /> -</g> -<g> -<line x1="137.129659" y1="42.108136" x2="137.129659" y2="51.556955" /> -<circle cx="137.129659" cy="61.005774" r="9.448819" /> -<line x1="127.68084" y1="61.005774" x2="146.578478" y2="61.005774" /> -<line x1="137.129659" y1="70.454593" x2="137.129659" y2="79.903412" /> -</g> -<g> -<line x1="167.365879" y1="42.108136" x2="167.365879" y2="51.556955" /> -<circle cx="167.365879" cy="61.005774" r="9.448819" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="167.365879" y="60.816798">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="167.365879" y="70.265617"><tspan font-size="66%">+</tspan></text> -<line x1="167.365879" y1="70.454593" x2="167.365879" y2="79.903412" /> -</g> -<g> -<line x1="197.6021" y1="42.108136" x2="197.6021" y2="51.556955" /> -<circle cx="197.6021" cy="61.005774" r="9.448819" /> -<line x1="197.6021" y1="51.556955" x2="197.6021" y2="70.454593" /> -<line x1="197.6021" y1="70.454593" x2="197.6021" y2="79.903412" /> -</g> -<g> -<line x1="227.83832" y1="42.108136" x2="227.83832" y2="51.556955" /> -<circle cx="227.83832" cy="61.005774" r="9.448819" /> -<path d="M 227.83832,61.005774 - A 3.319977 3.319977 0 0 0 221.539108,61.005774" /> -<path d="M 227.83832,61.005774 - A 3.319977 3.319977 0 0 0 234.137533,61.005774" /> -<line x1="227.83832" y1="70.454593" x2="227.83832" y2="79.903412" /> -</g> -<g> -<line x1="258.074541" y1="42.108136" x2="258.074541" y2="51.556955" /> -<circle cx="258.074541" cy="61.005774" r="9.448819" /> -<path d="M 251.775328,61.005774 - C 251.902222,60.873593 252.125763,60.643252 252.274064,60.491867 252.422366,60.340482 252.662034,60.106921 252.808781,59.970776 252.955528,59.834631 253.201024,59.631077 253.3565,59.516633 253.511975,59.40219 253.747259,59.253116 253.881434,59.18404 254.015609,59.114964 254.218606,59.030815 254.334334,58.996297 254.450062,58.96178 254.629424,58.925463 254.734501,58.915271 254.839579,58.90508 255.010289,58.90508 255.115367,58.915271 255.220445,58.925463 255.399807,58.96178 255.515535,58.996297 255.631263,59.030815 255.83426,59.114964 255.968435,59.18404 256.10261,59.253116 256.337894,59.40219 256.493369,59.516633 256.648845,59.631077 256.916416,59.855111 257.090338,60.016468 257.26426,60.177825 257.555467,60.465072 257.740039,60.657335 257.924612,60.849598 258.22447,61.16195 258.409042,61.354213 258.593615,61.546477 258.884821,61.833724 259.058744,61.995081 259.232666,62.156438 259.500237,62.380472 259.655712,62.494915 259.811188,62.609359 260.046472,62.758433 260.180647,62.827508 260.314822,62.896584 260.517819,62.980734 260.633547,63.015251 260.749275,63.049769 260.928636,63.086086 261.033714,63.096277 261.138792,63.106468 261.309502,63.106468 261.41458,63.096277 261.519658,63.086086 261.699019,63.049769 261.814747,63.015251 261.930475,62.980734 262.133472,62.896584 262.267647,62.827508 262.401822,62.758433 262.637106,62.609359 262.792582,62.494915 262.948057,62.380472 263.193553,62.176918 263.3403,62.040773 263.487047,61.904627 263.726716,61.671066 263.875017,61.519681 264.023318,61.368297 264.24686,61.137955 264.373753,61.005774" /> -<line x1="258.074541" y1="70.454593" x2="258.074541" y2="79.903412" /> -</g> -<g> -<line x1="288.310761" y1="42.108136" x2="288.310761" y2="51.556955" /> -<circle cx="288.310761" cy="61.005774" r="9.448819" /> -<line x1="294.992085" y1="54.32445" x2="281.629437" y2="67.687098" /> -<line x1="281.629437" y1="54.32445" x2="294.992085" y2="67.687098" /> -<line x1="288.310761" y1="70.454593" x2="288.310761" y2="79.903412" /> -</g> -<g> -<line x1="318.546982" y1="42.108136" x2="318.546982" y2="51.556955" /> -<circle cx="318.546982" cy="61.005774" r="9.448819" /> -<line x1="318.546982" y1="51.556955" x2="318.546982" y2="56.281365" /> -<line x1="313.822572" y1="56.281365" x2="323.271391" y2="56.281365" /> -<line x1="313.822572" y1="65.730184" x2="323.271391" y2="65.730184" /> -<line x1="318.546982" y1="70.454593" x2="318.546982" y2="65.730184" /> -<line x1="318.546982" y1="70.454593" x2="318.546982" y2="79.903412" /> -</g> -<g> -<line x1="348.783202" y1="42.108136" x2="348.783202" y2="51.556955" /> -<circle cx="348.783202" cy="61.005774" r="9.448819" /> -<polyline points="344.058793,63.367979 346.420997,63.367979 -346.420997,58.64357 -351.145407,58.64357 -351.145407,63.367979 -353.507612,63.367979" /> -<line x1="348.783202" y1="70.454593" x2="348.783202" y2="79.903412" /> -</g> -<g> -<line x1="379.019423" y1="42.108136" x2="379.019423" y2="51.556955" /> -<circle cx="379.019423" cy="61.005774" r="9.448819" /> -<polyline points="374.295013,61.005774 374.295013,57.856168 -379.019423,57.856168 -379.019423,64.155381 -383.743832,64.155381 -383.743832,61.005774" /> -<line x1="379.019423" y1="70.454593" x2="379.019423" y2="79.903412" /> -</g> -<g> -<line x1="409.255643" y1="42.108136" x2="409.255643" y2="51.556955" /> -<circle cx="409.255643" cy="61.005774" r="9.448819" /> -<polyline points="402.95643,64.155381 412.405249,56.281365 -412.405249,64.155381" /> -<line x1="409.255643" y1="70.454593" x2="409.255643" y2="79.903412" /> -</g> -<g> -<line x1="439.491864" y1="42.108136" x2="439.491864" y2="51.556955" /> -<circle cx="439.491864" cy="61.005774" r="9.448819" /> -<polyline points="432.405249,63.367979 437.129659,58.64357 -441.854068,63.367979 -446.578478,58.64357" /> -<line x1="439.491864" y1="70.454593" x2="439.491864" y2="79.903412" /> -</g> -<g> -<line x1="469.728084" y1="42.108136" x2="469.728084" y2="51.556955" /> -<circle cx="469.728084" cy="61.005774" r="9.448819" /> -<line x1="469.728084" y1="51.556955" x2="469.728084" y2="58.64357" /> -<circle stroke-width="0.533333" - cx="469.728084" cy="58.64357" r="0.26567" /> -<path d="M 469.728084,58.64357 - C 470.777953,58.774803 471.827822,58.906037 472.87769,59.03727 474.977428,59.299738 -476.027297,59.955906 476.027297,61.005774 476.027297,62.055643 -474.977428,62.711811 472.87769,62.974278 471.827822,63.105512 470.777953,63.236745 -469.728084,63.367979" /> -<circle stroke-width="0.533333" - cx="469.728084" cy="63.367979" r="0.26567" /> -<line x1="469.728084" y1="63.367979" x2="469.728084" y2="70.454593" /> -<line x1="469.728084" y1="70.454593" x2="469.728084" y2="79.903412" /> -</g> -<g> -<line x1="496.184777" y1="42.108136" x2="496.184777" y2="51.556955" /> -<path d="M 500.909186,61.005774 - C 500.909186,62.649869 500.413123,65.229396 499.728084,67.147507 499.043045,69.065617 497.554856,70.454593 496.184777,70.454593 494.814698,70.454593 493.326509,69.065617 492.64147,67.147507 491.95643,65.229396 491.460367,62.649869 491.460367,61.005774 491.460367,59.36168 491.95643,56.782152 492.64147,54.864042 493.326509,52.945932 494.814698,51.556955 496.184777,51.556955 497.554856,51.556955 499.043045,52.945932 499.728084,54.864042 500.413123,56.782152 500.909186,59.36168 500.909186,61.005774" /> -<line x1="496.184777" y1="70.454593" x2="496.184777" y2="79.903412" /> -</g> -<g> -<line x1="518.861942" y1="42.108136" x2="518.861942" y2="51.556955" /> -<path d="M 518.861942,61.005774 - C 519.649344,60.218373 520.436745,59.430971 521.224147,58.64357 522.79895,57.068766 -523.586352,55.493963 523.586352,53.91916 523.586352,52.344357 -522.011549,51.556955 518.861942,51.556955 515.712336,51.556955 -514.137533,52.344357 514.137533,53.91916 514.137533,55.493963 -514.924934,57.068766 516.499738,58.64357 517.287139,59.430971 518.074541,60.218373 -518.861942,61.005774" /> -<path d="M 518.861942,61.005774 - C 519.649344,61.793176 520.436745,62.580577 521.224147,63.367979 522.79895,64.942782 -523.586352,66.517585 523.586352,68.092388 523.586352,69.667192 -522.011549,70.454593 518.861942,70.454593 515.712336,70.454593 -514.137533,69.667192 514.137533,68.092388 514.137533,66.517585 -514.924934,64.942782 516.499738,63.367979 517.287139,62.580577 518.074541,61.793176 -518.861942,61.005774" /> -<line x1="518.861942" y1="70.454593" x2="518.861942" y2="79.903412" /> -</g> -<g> -<line x1="545.318635" y1="42.108136" x2="545.318635" y2="49.667192" /> -<polyline points="545.318635,49.667192 556.657218,61.005774 -545.318635,72.344357 -533.980052,61.005774 -545.318635,49.667192" /> -<line x1="545.318635" y1="72.344357" x2="545.318635" y2="79.903412" /> -</g> -<g> -<line x1="575.554856" y1="42.108136" x2="575.554856" y2="49.667192" /> -<polyline points="575.554856,49.667192 586.893438,61.005774 -575.554856,72.344357 -564.216273,61.005774 -575.554856,49.667192" /> -<polygon stroke-width="0" fill="black" - points="577.91706,60.060892 575.554856,69.509711 -573.192651,60.060892" /> -<line x1="575.554856" y1="52.501837" x2="575.554856" y2="67.310722" /> -<line x1="575.554856" y1="72.344357" x2="575.554856" y2="79.903412" /> -</g> -<g> -<line x1="605.791076" y1="42.108136" x2="605.791076" y2="49.667192" /> -<polyline points="605.791076,49.667192 617.129659,61.005774 -605.791076,72.344357 -594.452493,61.005774 -605.791076,49.667192" /> -<line x1="617.129659" y1="61.005774" x2="594.452493" y2="61.005774" /> -<line x1="605.791076" y1="72.344357" x2="605.791076" y2="79.903412" /> -</g> -<g> -<line x1="636.027297" y1="42.108136" x2="636.027297" y2="49.667192" /> -<polyline points="636.027297,49.667192 647.365879,61.005774 -636.027297,72.344357 -624.688714,61.005774 -636.027297,49.667192" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="636.027297" y="59.871916">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="636.027297" y="71.210499">+</text> -<line x1="636.027297" y1="72.344357" x2="636.027297" y2="79.903412" /> -</g> -<g> -<line x1="666.263517" y1="42.108136" x2="666.263517" y2="49.667192" /> -<polyline points="666.263517,49.667192 677.6021,61.005774 -666.263517,72.344357 -654.924934,61.005774 -666.263517,49.667192" /> -<line x1="666.263517" y1="49.667192" x2="666.263517" y2="72.344357" /> -<line x1="666.263517" y1="72.344357" x2="666.263517" y2="79.903412" /> -</g> -<g> -<line x1="696.499738" y1="42.108136" x2="696.499738" y2="44.470341" /> -<circle cx="696.499738" cy="53.91916" r="9.448819" /> -<path d="M 690.249931,61.005774 - A 9.448819 9.448819 0 1 0 702.749544,61.005774" /> -<line x1="696.499738" y1="77.541207" x2="696.499738" y2="79.903412" /> -</g> -<g> -<line x1="726.735958" y1="42.108136" x2="726.735958" y2="44.470341" /> -<circle cx="726.735958" cy="53.91916" r="9.448819" /> -<circle cx="726.735958" cy="68.092388" r="9.448819" /> -<line x1="726.735958" y1="77.541207" x2="726.735958" y2="79.903412" /> -</g> -<g> -<line x1="76.657218" y1="121.478215" x2="76.657218" y2="104.155381" /> -<line x1="71.932808" y1="104.155381" x2="81.381627" y2="104.155381" /> -<line x1="67.208399" y1="101.005774" x2="86.106037" y2="101.005774" /> -<line x1="76.657218" y1="101.005774" x2="76.657218" y2="83.68294" /> -</g> -<g> -<line x1="106.893438" y1="121.478215" x2="106.893438" y2="110.454593" /> -<line x1="102.169029" y1="110.454593" x2="111.617848" y2="110.454593" /> -<line x1="97.444619" y1="107.304987" x2="116.342257" y2="107.304987" /> -<line x1="102.169029" y1="104.155381" x2="111.617848" y2="104.155381" /> -<line x1="97.444619" y1="101.005774" x2="116.342257" y2="101.005774" /> -<line x1="102.169029" y1="97.856168" x2="111.617848" y2="97.856168" /> -<line x1="97.444619" y1="94.706562" x2="116.342257" y2="94.706562" /> -<line x1="106.893438" y1="94.706562" x2="106.893438" y2="83.68294" /> -</g> -<g> -<line x1="137.129659" y1="83.68294" x2="137.129659" y2="90.769554" /> -<polyline points="139.491864,93.431798 139.491864,90.769554 -134.767454,90.769554 -134.767454,93.431798" /> -<circle cx="137.129659" cy="102.580577" r="9.448819" /> -<polyline points="139.491864,111.729357 139.491864,114.391601 -134.767454,114.391601 -134.767454,111.729357" /> -<line x1="137.129659" y1="114.391601" x2="137.129659" y2="121.478215" /> -</g> -<g> -<line x1="159.806824" y1="83.210499" x2="159.806824" y2="92.659318" /> -<polyline points="159.806824,111.556955 163.586352,111.556955 -163.586352,92.659318 -156.027297,92.659318 -156.027297,111.556955 -159.806824,111.556955" /> -<polyline points="159.806824,92.659318 159.806824,95.68294 -161.696588,95.68294 -161.696588,98.706562 -157.91706,98.706562 -157.91706,101.730184 -161.696588,101.730184 -161.696588,104.753806 -159.806824,104.753806 -159.806824,107.777428" /> -<polyline stroke-width="0" fill="black" - points="159.806824,112.501837 -163.586352,112.501837 -163.586352,107.777428 -156.027297,107.777428 -156.027297,112.501837 -159.806824,112.501837" /> -<polyline points="159.806824,112.501837 163.586352,112.501837 -163.586352,107.777428 -156.027297,107.777428 -156.027297,112.501837 -159.806824,112.501837" /> -<line x1="159.806824" y1="112.501837" x2="159.806824" y2="121.950656" /> -</g> -<g> -<line x1="174.924934" y1="116.753806" x2="174.924934" y2="121.478215" /> -<line x1="174.924934" y1="83.68294" x2="174.924934" y2="89.982152" /> -<circle stroke-width="0.533333" - cx="174.924934" cy="89.982152" r="0.26567" /> -<line x1="171.775328" y1="89.982152" x2="171.775328" y2="115.179003" /> -<path d="M 171.775328,115.179003 - C 171.775328,116.048766 173.185407,116.753806 174.924934,116.753806 176.664462,116.753806 178.074541,116.048766 178.074541,115.179003" /> -<line x1="178.074541" y1="115.179003" x2="178.074541" y2="89.982152" /> -<path d="M 178.074541,89.982152 - C 178.074541,89.112388 176.664462,88.407349 174.924934,88.407349 173.185407,88.407349 171.775328,89.112388 171.775328,89.982152 171.775328,90.851916 173.185407,91.556955 174.924934,91.556955 176.664462,91.556955 178.074541,90.851916 178.074541,89.982152" /> -</g> -<g> -<line x1="190.043045" y1="83.68294" x2="190.043045" y2="95.021522" /> -<path d="M 190.043045,95.021522 - A 3.779528 3.779528 0 0 1 190.043045,102.580577" /> -<path d="M 190.043045,102.580577 - A 3.779528 3.779528 0 1 0 190.043045,110.139633" /> -<line x1="190.043045" y1="110.139633" x2="190.043045" y2="121.478215" /> -</g> -<g> -<line x1="205.161155" y1="83.68294" x2="205.161155" y2="95.021522" /> -<path d="M 205.161155,95.021522 - A 3.779528 3.779528 0 0 1 205.161155,102.580577" /> -<circle fill="white" - cx="205.161155" cy="95.021522" r="1.511811" /> -<path d="M 205.161155,102.580577 - A 3.779528 3.779528 0 1 0 205.161155,110.139633" /> -<line x1="205.161155" y1="110.139633" x2="205.161155" y2="121.478215" /> -<circle fill="white" - cx="205.161155" cy="110.139633" r="1.511811" /> -</g> -<g> -<line x1="220.279265" y1="83.68294" x2="220.279265" y2="95.021522" /> -<polyline points="220.279265,110.139633 224.058793,110.139633 -224.058793,95.021522 -216.499738,95.021522 -216.499738,110.139633 -220.279265,110.139633" /> -<line x1="220.279265" y1="95.021522" x2="220.279265" y2="121.478215" /> -</g> -<g> -<line x1="235.397375" y1="83.68294" x2="235.397375" y2="95.021522" /> -<polyline points="235.397375,110.139633 239.176903,110.139633 -239.176903,95.021522 -231.617848,95.021522 -231.617848,110.139633 -235.397375,110.139633" /> -<line x1="231.617848" y1="98.045144" x2="239.176903" y2="98.045144" /> -<line x1="231.617848" y1="107.11601" x2="239.176903" y2="107.11601" /> -<line x1="235.397375" y1="110.139633" x2="235.397375" y2="121.478215" /> -</g> -<g> -<line x1="250.515486" y1="83.68294" x2="250.515486" y2="95.021522" /> -<polyline points="250.515486,110.139633 254.295013,110.139633 -254.295013,95.021522 -246.735958,95.021522 -246.735958,110.139633 -250.515486,110.139633" /> -<polyline stroke-width="0" fill="black" - points="250.515486,98.045144 -254.295013,98.045144 -254.295013,95.021522 -246.735958,95.021522 -246.735958,98.045144 -250.515486,98.045144" /> -<polyline points="250.515486,98.045144 254.295013,98.045144 -254.295013,95.021522 -246.735958,95.021522 -246.735958,98.045144 -250.515486,98.045144" /> -<line x1="250.515486" y1="110.139633" x2="250.515486" y2="121.478215" /> -</g> -<g> -<line x1="269.413123" y1="83.68294" x2="269.413123" y2="89.982152" /> -<polyline points="269.413123,112.659318 273.192651,112.659318 -273.192651,92.501837 -265.633596,92.501837 -265.633596,112.659318 -269.413123,112.659318" /> -<polyline points="269.413123,115.179003 275.712336,115.179003 -275.712336,89.982152 -263.113911,89.982152 -263.113911,115.179003 -269.413123,115.179003" /> -<line x1="269.413123" y1="89.982152" x2="269.413123" y2="121.478215" /> -</g> -<g> -<line x1="292.090289" y1="83.68294" x2="292.090289" y2="89.982152" /> -<polyline points="292.090289,112.659318 295.869816,112.659318 -295.869816,92.501837 -288.310761,92.501837 -288.310761,112.659318 -292.090289,112.659318" /> -<line x1="295.869816" y1="96.533333" x2="288.310761" y2="96.533333" /> -<line x1="295.869816" y1="108.627822" x2="288.310761" y2="108.627822" /> -<polyline points="292.090289,115.179003 298.389501,115.179003 -298.389501,89.982152 -285.791076,89.982152 -285.791076,115.179003 -292.090289,115.179003" /> -<line x1="292.090289" y1="115.179003" x2="292.090289" y2="121.478215" /> -</g> -<g> -<line x1="307.208399" y1="83.68294" x2="307.208399" y2="96.281365" /> -<path d="M 309.570604,95.100262 - A 9.350394 9.350394 0 0 1 309.570604,110.060892" /> -<line x1="307.208399" y1="108.87979" x2="307.208399" y2="121.478215" /> -</g> -<g> -<line x1="326.106037" y1="83.68294" x2="326.106037" y2="96.281365" /> -<circle fill="white" - cx="326.106037" cy="96.281365" r="1.511811" /> -<path d="M 329.980052,95.100262 - A 9.350394 9.350394 0 0 1 329.980052,110.060892" /> -<line x1="326.106037" y1="108.87979" x2="326.106037" y2="121.478215" /> -<circle fill="white" - cx="326.106037" cy="108.87979" r="1.511811" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="358.680721,96.901452 367.032375,91.890459 -362.021383,100.242114" /> -<line x1="345.652139" y1="113.270696" x2="365.477455" y2="93.44538" /> -</g> -<g> -<line x1="378.832721" y1="114.105861" x2="400.212958" y2="92.725625" /> -<line x1="398.542627" y1="91.055294" x2="401.883289" y2="94.395956" /> -</g> -<g> -<line x1="413.683635" y1="113.270696" x2="435.063872" y2="91.890459" /> -</g> -<g> -<polyline points="471.441824,91.890459 450.061588,113.270696 -445.337178,113.270696" /> -</g> -<g> -<polyline points="481.715131,115.6329 503.095368,94.252664 -503.095368,89.528254" /> -</g> -<g> -<line x1="512.855307" y1="104.807685" x2="517.309523" y2="100.353469" /> -</g> -<g> -<polyline points="527.932808,104.848294 527.932808,102.580577 -532.468241,102.580577 -532.468241,100.312861" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="547.393702,103.406728 545.060541,98.10409 -550.363179,100.437251" /> -<line x1="557.354177" y1="110.397726" x2="546.101037" y2="99.144586" /> -<polygon stroke-width="0" fill="black" - points="550.734364,100.066066 548.401203,94.763428 -553.703841,97.096589" /> -<line x1="560.694839" y1="107.057064" x2="549.441699" y2="95.803924" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="577.629923,103.406728 575.296762,98.10409 -580.5994,100.437251" /> -<line x1="587.590398" y1="110.397726" x2="576.337257" y2="99.144586" /> -<polygon stroke-width="0" fill="black" - points="580.970584,100.066066 578.637424,94.763428 -583.940062,97.096589" /> -<line x1="590.93106" y1="107.057064" x2="579.677919" y2="95.803924" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="607.110237,102.650823 604.777077,97.348185 -610.079715,99.681346" /> -<line x1="617.070713" y1="109.641821" x2="605.817572" y2="98.38868" /> -<polygon stroke-width="0" fill="black" - points="610.450899,99.310161 608.117739,94.007523 -613.420377,96.340684" /> -<line x1="620.411375" y1="106.301159" x2="609.158234" y2="95.048018" /> -<circle fill="black" - cx="617.070713" cy="109.641821" r="1.511811" /> -<circle fill="black" - cx="620.411375" cy="106.301159" r="1.511811" /> -</g> -<g> -<path d="M 648.062839,110.090227 - A 2.099738 2.099738 0 0 1 645.093361,107.12075" /> -<path d="M 645.093361,107.12075 - A 2.099738 2.099738 0 0 0 642.123884,104.151272" /> -<path d="M 642.123884,104.151272 - A 2.099738 2.099738 0 1 1 639.154407,101.181795" /> -<circle stroke-width="0.533333" - cx="639.154407" cy="101.181795" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="637.147889,102.144754 635.769203,97.796591 -640.117366,99.175277" /> -<line x1="639.154407" y1="101.181795" x2="636.588472" y2="98.61586" /> -<path d="M 651.403501,106.749565 - A 2.099738 2.099738 0 0 1 648.434023,103.780088" /> -<path d="M 648.434023,103.780088 - A 2.099738 2.099738 0 1 0 645.464546,100.81061" /> -<path d="M 645.464546,100.81061 - A 2.099738 2.099738 0 0 1 642.495069,97.841133" /> -<circle stroke-width="0.533333" - cx="642.495069" cy="97.841133" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="640.488551,98.804092 639.109865,94.455929 -643.458028,95.834615" /> -<line x1="642.495069" y1="97.841133" x2="639.929134" y2="95.275198" /> -</g> -<g> -<path d="M 677.543154,109.641821 - A 2.099738 2.099738 0 0 1 674.573676,106.672344" /> -<path d="M 674.573676,106.672344 - A 2.099738 2.099738 0 0 0 671.604199,103.702866" /> -<path d="M 671.604199,103.702866 - A 2.099738 2.099738 0 1 1 668.634722,100.733389" /> -<circle stroke-width="0.533333" - cx="668.634722" cy="100.733389" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="666.628204,101.696348 665.249518,97.348185 -669.597681,98.726871" /> -<line x1="668.634722" y1="100.733389" x2="666.068787" y2="98.167454" /> -<path d="M 680.883816,106.301159 - A 2.099738 2.099738 0 0 1 677.914338,103.331682" /> -<path d="M 677.914338,103.331682 - A 2.099738 2.099738 0 1 0 674.944861,100.362204" /> -<path d="M 674.944861,100.362204 - A 2.099738 2.099738 0 0 1 671.975384,97.392727" /> -<circle stroke-width="0.533333" - cx="671.975384" cy="97.392727" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="669.968866,98.355686 668.59018,94.007523 -672.938343,95.386209" /> -<line x1="671.975384" y1="97.392727" x2="669.409449" y2="94.826792" /> -<circle fill="black" - cx="677.543154" cy="109.641821" r="1.511811" /> -<circle fill="black" - cx="680.883816" cy="106.301159" r="1.511811" /> -</g> -<g> -<polyline points="701.949596,107.59157 695.268272,100.910246 -695.268272,103.879724" /> -<polyline points="705.290258,104.250908 698.608934,97.569584 -698.608934,100.539062" /> -</g> -<g> -<polyline points="723.870856,106.835665 717.189532,100.154341 -717.189532,103.123818" /> -<polyline points="727.211518,103.495003 720.530194,96.813679 -720.530194,99.783156" /> -<circle fill="black" - cx="723.870856" cy="106.835665" r="1.511811" /> -<circle fill="black" - cx="727.211518" cy="103.495003" r="1.511811" /> -</g> -<g> -<line x1="76.657218" y1="125.257743" x2="76.657218" y2="134.706562" /> -<line x1="82.95643" y1="134.706562" x2="70.358005" y2="134.706562" /> -<line x1="80.856693" y1="137.068766" x2="72.457743" y2="137.068766" /> -<line x1="79.35688" y1="139.430971" x2="73.957555" y2="139.430971" /> -</g> -<g> -<line x1="105.633596" y1="130.454593" x2="93.035171" y2="130.454593" /> -<line x1="103.533858" y1="132.816798" x2="95.134908" y2="132.816798" /> -<line x1="102.034046" y1="135.179003" x2="96.634721" y2="135.179003" /> -</g> -<g> -<line x1="127.365879" y1="125.730184" x2="127.365879" y2="135.179003" /> -<polyline points="130.515486,139.903412 133.665092,135.179003 -121.066667,135.179003 -117.91706,139.903412" /> -<line x1="127.365879" y1="135.179003" x2="124.216273" y2="139.903412" /> -</g> -<g> -<line x1="152.247769" y1="128.092388" x2="152.247769" y2="137.541207" /> -<line stroke-width="2.133333" - x1="156.447244" y1="137.541207" x2="148.048294" y2="137.541207" /> -</g> -<g> -<line x1="174.924934" y1="123.367979" x2="174.924934" y2="132.816798" /> -<polyline points="174.924934,132.816798 181.224147,132.816798 -174.924934,142.265617 -168.625722,132.816798 -174.924934,132.816798" /> -</g> -<g> -<line x1="201.381627" y1="124.549081" x2="201.381627" y2="133.9979" /> -<path d="M 193.19871,141.084514 - A 9.448819 9.448819 0 1 1 209.564544,141.084514" /> -<line x1="207.68084" y1="133.9979" x2="195.082415" y2="133.9979" /> -<line x1="205.581102" y1="136.360105" x2="197.182152" y2="136.360105" /> -<line x1="204.08129" y1="138.72231" x2="198.681965" y2="138.72231" /> -</g> -<g> -<line x1="231.617848" y1="122.186877" x2="231.617848" y2="131.635696" /> -<circle cx="231.617848" cy="133.9979" r="9.448819" /> -<line x1="237.91706" y1="131.635696" x2="225.318635" y2="131.635696" /> -<line x1="235.817323" y1="133.9979" x2="227.418373" y2="133.9979" /> -<line x1="234.31751" y1="136.360105" x2="228.918185" y2="136.360105" /> -</g> -<g> -<line x1="250.515486" y1="140.690814" x2="252.405249" y2="140.690814" /> -<line x1="252.405249" y1="140.690814" x2="252.405249" y2="141.224147" /> -<path d="M 252.405249,140.690814 - A 2.362205 2.362205 0 0 1 257.129659,140.690814" /> -<line x1="257.129659" y1="140.690814" x2="257.129659" y2="141.224147" /> -<path d="M 257.129659,140.690814 - A 2.362205 2.362205 0 0 1 261.854068,140.690814" /> -<line x1="261.854068" y1="140.690814" x2="261.854068" y2="141.224147" /> -<path d="M 261.854068,140.690814 - A 2.362205 2.362205 0 1 1 266.578478,140.690814" /> -<line x1="266.578478" y1="140.690814" x2="266.578478" y2="141.224147" /> -<path d="M 266.578478,140.690814 - A 2.362205 2.362205 0 1 1 271.302887,140.690814" /> -<line x1="271.302887" y1="140.690814" x2="271.302887" y2="141.224147" /> -<line x1="271.302887" y1="140.690814" x2="273.192651" y2="140.690814" /> -<line x1="252.405249" y1="135.179003" x2="271.302887" y2="135.179003" /> -<line x1="252.405249" y1="130.454593" x2="271.302887" y2="130.454593" /> -<line x1="273.192651" y1="124.942782" x2="271.302887" y2="124.942782" /> -<line x1="271.302887" y1="124.942782" x2="271.302887" y2="124.409449" /> -<path d="M 271.302887,124.942782 - A 2.362205 2.362205 0 0 1 266.578478,124.942782" /> -<line x1="266.578478" y1="124.942782" x2="266.578478" y2="124.409449" /> -<path d="M 266.578478,124.942782 - A 2.362205 2.362205 0 0 1 261.854068,124.942782" /> -<line x1="261.854068" y1="124.942782" x2="261.854068" y2="124.409449" /> -<path d="M 261.854068,124.942782 - A 2.362205 2.362205 0 0 1 257.129659,124.942782" /> -<line x1="257.129659" y1="124.942782" x2="257.129659" y2="124.409449" /> -<path d="M 257.129659,124.942782 - A 2.362205 2.362205 0 0 1 252.405249,124.942782" /> -<line x1="252.405249" y1="124.942782" x2="252.405249" y2="124.409449" /> -<line x1="252.405249" y1="124.942782" x2="250.515486" y2="124.942782" /> -</g> -<g> -<line x1="280.751706" y1="140.690814" x2="291.145407" y2="140.690814" /> -<line x1="291.145407" y1="140.690814" x2="291.145407" y2="141.224147" /> -<path d="M 291.145407,140.690814 - A 2.362205 2.362205 0 0 1 295.869816,140.690814" /> -<line x1="295.869816" y1="140.690814" x2="295.869816" y2="141.224147" /> -<path d="M 295.869816,140.690814 - A 2.362205 2.362205 0 0 1 300.594226,140.690814" /> -<line x1="300.594226" y1="140.690814" x2="300.594226" y2="141.224147" /> -<line x1="300.594226" y1="140.690814" x2="310.987927" y2="140.690814" /> -<line x1="286.420997" y1="135.179003" x2="305.318635" y2="135.179003" /> -<line x1="286.420997" y1="130.454593" x2="305.318635" y2="130.454593" /> -<line x1="310.987927" y1="124.942782" x2="305.318635" y2="124.942782" /> -<line x1="305.318635" y1="124.942782" x2="305.318635" y2="124.409449" /> -<path d="M 305.318635,124.942782 - A 2.362205 2.362205 0 0 1 300.594226,124.942782" /> -<line x1="300.594226" y1="124.942782" x2="300.594226" y2="124.409449" /> -<path d="M 300.594226,124.942782 - A 2.362205 2.362205 0 0 1 295.869816,124.942782" /> -<line x1="295.869816" y1="124.942782" x2="295.869816" y2="124.409449" /> -<path d="M 295.869816,124.942782 - A 2.362205 2.362205 0 0 1 291.145407,124.942782" /> -<line x1="291.145407" y1="124.942782" x2="291.145407" y2="124.409449" /> -<path d="M 291.145407,124.942782 - A 2.362205 2.362205 0 0 1 286.420997,124.942782" /> -<line x1="286.420997" y1="124.942782" x2="286.420997" y2="124.409449" /> -<line x1="286.420997" y1="124.942782" x2="280.751706" y2="124.942782" /> -</g> -<g> -<line x1="320.792697" y1="143.705434" x2="320.792697" y2="143.705434" /> -<circle stroke-width="0.533333" - cx="320.792697" cy="143.705434" r="0.26567" /> -<path d="M 320.792697,143.705434 - A 3.779528 3.779528 0 1 1 326.647546,145.003423" /> -<circle stroke-width="0.533333" - cx="326.647546" cy="145.003423" r="0.26567" /> -<path d="M 326.647546,145.003423 - A 3.779528 3.779528 0 1 1 331.506413,145.003423" /> -<circle stroke-width="0.533333" - cx="331.506413" cy="145.003423" r="0.26567" /> -<path d="M 331.506413,145.003423 - A 3.779528 3.779528 0 1 1 336.36528,145.003423" /> -<circle stroke-width="0.533333" - cx="336.36528" cy="145.003423" r="0.26567" /> -<path d="M 336.36528,145.003423 - A 3.779528 3.779528 0 1 1 341.224147,145.003423" /> -<circle stroke-width="0.533333" - cx="341.224147" cy="145.003423" r="0.26567" /> -<path d="M 341.224147,145.003423 - A 3.779528 3.779528 0 1 1 346.083014,145.003423" /> -<circle stroke-width="0.533333" - cx="346.083014" cy="145.003423" r="0.26567" /> -<path d="M 346.083014,145.003423 - A 3.779528 3.779528 0 1 1 350.941881,145.003423" /> -<circle stroke-width="0.533333" - cx="350.941881" cy="145.003423" r="0.26567" /> -<path d="M 350.941881,145.003423 - A 3.779528 3.779528 0 1 1 355.800748,145.003423" /> -<circle stroke-width="0.533333" - cx="355.800748" cy="145.003423" r="0.26567" /> -<path d="M 355.800748,145.003423 - A 3.779528 3.779528 0 1 1 361.655597,143.705434" /> -<circle stroke-width="0.533333" - cx="361.655597" cy="143.705434" r="0.26567" /> -<line x1="361.655597" y1="143.705434" x2="361.655597" y2="143.705434" /> -<line x1="320.792697" y1="135.179003" x2="361.655597" y2="135.179003" /> -<line x1="320.792697" y1="130.454593" x2="361.655597" y2="130.454593" /> -<line x1="352.291975" y1="121.928162" x2="351.937863" y2="121.928162" /> -<circle stroke-width="0.533333" - cx="351.937863" cy="121.928162" r="0.26567" /> -<path d="M 351.937863,121.928162 - A 3.779528 3.779528 0 1 1 346.083014,120.630173" /> -<circle stroke-width="0.533333" - cx="346.083014" cy="120.630173" r="0.26567" /> -<path d="M 346.083014,120.630173 - A 3.779528 3.779528 0 1 1 341.224147,120.630173" /> -<circle stroke-width="0.533333" - cx="341.224147" cy="120.630173" r="0.26567" /> -<path d="M 341.224147,120.630173 - A 3.779528 3.779528 0 1 1 336.36528,120.630173" /> -<circle stroke-width="0.533333" - cx="336.36528" cy="120.630173" r="0.26567" /> -<path d="M 336.36528,120.630173 - A 3.779528 3.779528 0 1 1 330.510431,121.928162" /> -<circle stroke-width="0.533333" - cx="330.510431" cy="121.928162" r="0.26567" /> -<line x1="330.510431" y1="121.928162" x2="330.156319" y2="121.928162" /> -</g> -<g> -<line x1="372.87769" y1="139.903412" x2="375.239895" y2="139.903412" /> -<circle stroke-width="0.533333" - cx="375.239895" cy="139.903412" r="0.26567" /> -<path d="M 375.239895,139.903412 - C 375.239895,137.304987 376.345407,135.179003 377.696588,135.179003 379.047769,135.179003 380.153281,136.667192 380.153281,138.486089 380.153281,140.304987 379.643045,141.793176 379.019423,141.793176 378.395801,141.793176 377.885564,140.304987 377.885564,138.486089 377.885564,136.667192 379.246194,135.179003 380.909186,135.179003 382.572178,135.179003 383.932808,136.667192 383.932808,138.486089 383.932808,140.304987 383.422572,141.793176 382.79895,141.793176 382.175328,141.793176 381.665092,140.304987 381.665092,138.486089 381.665092,136.667192 383.025722,135.179003 384.688714,135.179003 386.351706,135.179003 387.712336,136.667192 387.712336,138.486089 387.712336,140.304987 387.2021,141.793176 386.578478,141.793176 385.954856,141.793176 385.444619,140.304987 385.444619,138.486089 385.444619,136.667192 386.805249,135.179003 388.468241,135.179003 390.131234,135.179003 391.491864,136.667192 391.491864,138.486089 391.491864,140.304987 390.981627,141.793176 390.358005,141.793176 389.734383,141.793176 389.224147,140.304987 389.224147,138.486089 389.224147,136.667192 390.584777,135.179003 392.247769,135.179003 393.910761,135.179003 395.271391,136.667192 395.271391,138.486089 395.271391,140.304987 394.761155,141.793176 394.137533,141.793176 393.513911,141.793176 393.003675,140.304987 393.003675,138.486089 393.003675,136.667192 394.364304,135.179003 396.027297,135.179003 397.690289,135.179003 399.050919,136.667192 399.050919,138.486089 399.050919,140.304987 398.540682,141.793176 397.91706,141.793176 397.293438,141.793176 396.783202,140.304987 396.783202,138.486089 396.783202,136.667192 398.143832,135.179003 399.806824,135.179003 401.469816,135.179003 402.830446,136.667192 402.830446,138.486089 402.830446,140.304987 402.32021,141.793176 401.696588,141.793176 401.072966,141.793176 400.56273,140.304987 400.56273,138.486089 400.56273,136.667192 401.92336,135.179003 403.586352,135.179003 405.249344,135.179003 406.609974,136.667192 406.609974,138.486089 406.609974,140.304987 406.099738,141.793176 405.476115,141.793176 404.852493,141.793176 404.342257,140.304987 404.342257,138.486089 404.342257,136.667192 405.702887,135.179003 407.365879,135.179003 409.028871,135.179003 410.389501,136.667192 410.389501,138.486089 410.389501,140.304987 409.879265,141.793176 409.255643,141.793176 408.632021,141.793176 408.121785,140.304987 408.121785,138.486089 408.121785,136.667192 409.227297,135.179003 410.578478,135.179003 411.929659,135.179003 413.035171,137.304987 413.035171,139.903412" /> -<circle stroke-width="0.533333" - cx="413.035171" cy="139.903412" r="0.26567" /> -<line x1="413.035171" y1="139.903412" x2="415.397375" y2="139.903412" /> -<line x1="415.397375" y1="125.730184" x2="403.586352" y2="125.730184" /> -<circle stroke-width="0.533333" - cx="403.586352" cy="125.730184" r="0.26567" /> -<path d="M 403.586352,125.730184 - C 403.586352,128.328609 402.48084,130.454593 401.129659,130.454593 399.778478,130.454593 398.672966,128.966404 398.672966,127.147507 398.672966,125.328609 399.183202,123.84042 399.806824,123.84042 400.430446,123.84042 400.940682,125.328609 400.940682,127.147507 400.940682,128.966404 399.580052,130.454593 397.91706,130.454593 396.254068,130.454593 394.893438,128.966404 394.893438,127.147507 394.893438,125.328609 395.403675,123.84042 396.027297,123.84042 396.650919,123.84042 397.161155,125.328609 397.161155,127.147507 397.161155,128.966404 395.800525,130.454593 394.137533,130.454593 392.474541,130.454593 391.113911,128.966404 391.113911,127.147507 391.113911,125.328609 391.624147,123.84042 392.247769,123.84042 392.871391,123.84042 393.381627,125.328609 393.381627,127.147507 393.381627,128.966404 392.020997,130.454593 390.358005,130.454593 388.695013,130.454593 387.334383,128.966404 387.334383,127.147507 387.334383,125.328609 387.844619,123.84042 388.468241,123.84042 389.091864,123.84042 389.6021,125.328609 389.6021,127.147507 389.6021,128.966404 388.496588,130.454593 387.145407,130.454593 385.794226,130.454593 384.688714,128.328609 384.688714,125.730184" /> -<circle stroke-width="0.533333" - cx="384.688714" cy="125.730184" r="0.26567" /> -<line x1="384.688714" y1="125.730184" x2="372.87769" y2="125.730184" /> -</g> -<g> -<line x1="467.482368" y1="124.751561" x2="467.482368" y2="124.751561" /> -<circle stroke-width="0.533333" - cx="467.482368" cy="124.751561" r="0.26567" /> -<path d="M 467.482368,124.751561 - A 3.779528 3.779528 0 1 1 461.62752,123.453572" /> -<circle stroke-width="0.533333" - cx="461.62752" cy="123.453572" r="0.26567" /> -<path d="M 461.62752,123.453572 - A 3.779528 3.779528 0 1 1 456.768653,123.453572" /> -<circle stroke-width="0.533333" - cx="456.768653" cy="123.453572" r="0.26567" /> -<path d="M 456.768653,123.453572 - A 3.779528 3.779528 0 1 1 451.909786,123.453572" /> -<circle stroke-width="0.533333" - cx="451.909786" cy="123.453572" r="0.26567" /> -<path d="M 451.909786,123.453572 - A 3.779528 3.779528 0 1 1 447.050919,123.453572" /> -<circle stroke-width="0.533333" - cx="447.050919" cy="123.453572" r="0.26567" /> -<path d="M 447.050919,123.453572 - A 3.779528 3.779528 0 1 1 442.192052,123.453572" /> -<circle stroke-width="0.533333" - cx="442.192052" cy="123.453572" r="0.26567" /> -<path d="M 442.192052,123.453572 - A 3.779528 3.779528 0 1 1 437.333185,123.453572" /> -<circle stroke-width="0.533333" - cx="437.333185" cy="123.453572" r="0.26567" /> -<path d="M 437.333185,123.453572 - A 3.779528 3.779528 0 1 1 432.474318,123.453572" /> -<circle stroke-width="0.533333" - cx="432.474318" cy="123.453572" r="0.26567" /> -<path d="M 432.474318,123.453572 - A 3.779528 3.779528 0 1 1 426.619469,124.751561" /> -<circle stroke-width="0.533333" - cx="426.619469" cy="124.751561" r="0.26567" /> -<line x1="426.619469" y1="124.751561" x2="426.619469" y2="124.751561" /> -<line x1="426.619469" y1="140.882035" x2="436.337203" y2="140.882035" /> -<circle stroke-width="0.533333" - cx="436.337203" cy="140.882035" r="0.26567" /> -<path d="M 436.337203,140.882035 - A 3.779528 3.779528 0 1 1 442.192052,142.180024" /> -<circle stroke-width="0.533333" - cx="442.192052" cy="142.180024" r="0.26567" /> -<path d="M 442.192052,142.180024 - A 3.779528 3.779528 0 1 1 447.050919,142.180024" /> -<circle stroke-width="0.533333" - cx="447.050919" cy="142.180024" r="0.26567" /> -<path d="M 447.050919,142.180024 - A 3.779528 3.779528 0 1 1 451.909786,142.180024" /> -<circle stroke-width="0.533333" - cx="451.909786" cy="142.180024" r="0.26567" /> -<path d="M 451.909786,142.180024 - A 3.779528 3.779528 0 1 1 457.764634,140.882035" /> -<circle stroke-width="0.533333" - cx="457.764634" cy="140.882035" r="0.26567" /> -<line x1="457.764634" y1="140.882035" x2="467.482368" y2="140.882035" /> -</g> -<g> -<line x1="57.75958" y1="155.493963" x2="70.358005" y2="155.493963" /> -<line x1="70.358005" y1="155.493963" x2="79.806824" y2="146.045144" /> -<line x1="82.95643" y1="155.493963" x2="95.554856" y2="155.493963" /> -</g> -<g> -<line x1="103.113911" y1="155.493963" x2="115.712336" y2="155.493963" /> -<line x1="115.712336" y1="155.493963" x2="125.161155" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 121.038343,148.986605 - L 120.07383,149.827001 - A 17.612747 17.612747 0 0 0 118.15787,146.367105 - A 17.612747 17.612747 0 0 1 122.002855,148.146209 - L 121.038343,148.986605" /> -<path d="M 125.017606,157.134733 - A 17.612747 17.612747 0 0 0 120.663154,148.600606" /> -<line x1="128.310761" y1="155.493963" x2="140.909186" y2="155.493963" /> -</g> -<g> -<line x1="148.468241" y1="155.493963" x2="161.066667" y2="155.493963" /> -<line x1="161.066667" y1="155.493963" x2="170.515486" y2="146.045144" /> -<line x1="173.665092" y1="155.493963" x2="186.263517" y2="155.493963" /> -<circle fill="white" - cx="161.066667" cy="155.493963" r="1.511811" /> -<circle fill="white" - cx="173.665092" cy="155.493963" r="1.511811" /> -</g> -<g> -<line x1="193.822572" y1="155.493963" x2="206.420997" y2="155.493963" /> -<line x1="206.420997" y1="155.493963" x2="215.869816" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 211.747004,148.986605 - L 210.782491,149.827001 - A 17.612747 17.612747 0 0 0 208.866532,146.367105 - A 17.612747 17.612747 0 0 1 212.711517,148.146209 - L 211.747004,148.986605" /> -<path d="M 215.726267,157.134733 - A 17.612747 17.612747 0 0 0 211.371816,148.600606" /> -<line x1="219.019423" y1="155.493963" x2="231.617848" y2="155.493963" /> -<circle fill="white" - cx="206.420997" cy="155.493963" r="1.511811" /> -<circle fill="white" - cx="219.019423" cy="155.493963" r="1.511811" /> -</g> -<g> -<line x1="239.176903" y1="155.493963" x2="251.775328" y2="155.493963" /> -<line x1="251.775328" y1="155.493963" x2="261.224147" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 260.246445,154.099566 - L 259.017256,154.45761 - A 17.894743 17.894743 0 0 1 260.902186,157.939498 - A 17.894743 17.894743 0 0 0 261.475633,153.741522 - L 260.246445,154.099566" /> -<path d="M 260.36947,154.625363 - A 17.894743 17.894743 0 0 0 256.499738,147.311046" /> -<line x1="264.373753" y1="155.493963" x2="276.972178" y2="155.493963" /> -</g> -<g> -<line x1="284.531234" y1="155.493963" x2="297.129659" y2="155.493963" /> -<line x1="297.129659" y1="155.493963" x2="306.578478" y2="146.045144" /> -<line x1="309.728084" y1="155.493963" x2="322.326509" y2="155.493963" /> -</g> -<g> -<line x1="329.885564" y1="155.493963" x2="342.48399" y2="155.493963" /> -<line x1="342.48399" y1="155.493963" x2="351.932808" y2="146.045144" /> -<line x1="355.082415" y1="155.493963" x2="367.68084" y2="155.493963" /> -</g> -<g> -<line x1="400.436745" y1="155.493963" x2="413.035171" y2="155.493963" /> -<line x1="375.239895" y1="155.493963" x2="387.83832" y2="155.493963" /> -<line x1="387.83832" y1="155.493963" x2="402.011549" y2="148.407349" /> -</g> -<g> -<line x1="445.791076" y1="157.383727" x2="458.389501" y2="157.383727" /> -<line x1="420.594226" y1="157.383727" x2="433.192651" y2="157.383727" /> -<line x1="433.192651" y1="157.383727" x2="447.365879" y2="150.297113" /> -<line x1="445.791076" y1="157.383727" x2="445.791076" y2="149.509711" /> -</g> -<g> -<line x1="491.145407" y1="153.604199" x2="503.743832" y2="153.604199" /> -<line x1="465.948556" y1="153.604199" x2="478.546982" y2="153.604199" /> -<line x1="478.546982" y1="153.604199" x2="492.72021" y2="146.517585" /> -<circle fill="white" - cx="491.145407" cy="153.604199" r="1.511811" /> -</g> -<g> -<line x1="536.499738" y1="153.604199" x2="549.098163" y2="153.604199" /> -<line x1="511.302887" y1="153.604199" x2="523.901312" y2="153.604199" /> -<line x1="523.901312" y1="153.604199" x2="538.074541" y2="146.517585" /> -<polyline points="525.672966,152.718373 524.885564,151.14357 -531.972178,147.600262 -533.546982,150.749869 -526.460367,154.293176 -525.672966,152.718373" /> -</g> -<g> -<line x1="581.854068" y1="155.493963" x2="594.452493" y2="155.493963" /> -<line x1="556.657218" y1="155.493963" x2="569.255643" y2="155.493963" /> -<line x1="569.255643" y1="155.493963" x2="583.428871" y2="148.407349" /> -<line x1="581.854068" y1="155.493963" x2="581.854068" y2="147.619948" /> -<polyline points="571.027297,154.608136 570.239895,153.033333 -577.326509,149.490026 -578.901312,152.639633 -571.814698,156.18294 -571.027297,154.608136" /> -</g> -<g> -<line x1="627.208399" y1="157.383727" x2="639.806824" y2="157.383727" /> -<line x1="602.011549" y1="157.383727" x2="614.609974" y2="157.383727" /> -<line x1="614.609974" y1="157.383727" x2="628.783202" y2="150.297113" /> -<polyline points="619.039108,155.16916 622.779265,149.362073 -624.354068,152.51168" /> -</g> -<g> -<line x1="672.56273" y1="157.383727" x2="685.161155" y2="157.383727" /> -<line x1="647.365879" y1="157.383727" x2="659.964304" y2="157.383727" /> -<line x1="659.964304" y1="157.383727" x2="674.137533" y2="150.297113" /> -<line x1="672.56273" y1="157.383727" x2="672.56273" y2="149.509711" /> -<polyline points="664.393438,155.16916 668.133596,149.362073 -669.708399,152.51168" /> -</g> -<g> -<line x1="82.95643" y1="178.171129" x2="95.554856" y2="178.171129" /> -<line x1="57.75958" y1="178.171129" x2="70.358005" y2="178.171129" /> -<line x1="70.358005" y1="178.171129" x2="84.531234" y2="171.084514" /> -</g> -<g> -<line x1="128.310761" y1="178.171129" x2="140.909186" y2="178.171129" /> -<line x1="103.113911" y1="178.171129" x2="115.712336" y2="178.171129" /> -<line x1="115.712336" y1="178.171129" x2="129.885564" y2="185.257743" /> -<line stroke-dasharray="6.614173,4.724409" - x1="122.79895" y1="181.714436" x2="122.79895" y2="162.816798" /> -<line x1="128.310761" y1="178.171129" x2="128.310761" y2="186.045144" /> -</g> -<g> -<line x1="173.665092" y1="185.730184" x2="186.263517" y2="185.730184" /> -<line x1="148.468241" y1="185.730184" x2="161.066667" y2="185.730184" /> -<line x1="161.066667" y1="185.730184" x2="175.239895" y2="178.64357" /> -<line stroke-dasharray="2.755906,1.968504" - x1="168.153281" y1="182.186877" x2="168.153281" y2="175.100262" /> -<polyline points="168.153281,175.100262 163.428871,172.738058 -168.153281,170.375853" /> -<line stroke-dasharray="2.755906,1.968504" - x1="168.153281" y1="170.375853" x2="168.153281" y2="163.289239" /> -</g> -<g> -<line x1="219.019423" y1="185.730184" x2="231.617848" y2="185.730184" /> -<line x1="193.822572" y1="185.730184" x2="206.420997" y2="185.730184" /> -<line x1="206.420997" y1="185.730184" x2="220.594226" y2="178.64357" /> -<line stroke-dasharray="6.614173,4.724409" - x1="213.507612" y1="182.186877" x2="213.507612" y2="163.289239" /> -<line x1="209.570604" y1="163.289239" x2="217.444619" y2="163.289239" /> -</g> -<g> -<line x1="264.373753" y1="185.730184" x2="276.972178" y2="185.730184" /> -<line x1="239.176903" y1="185.730184" x2="251.775328" y2="185.730184" /> -<line x1="251.775328" y1="185.730184" x2="265.948556" y2="178.64357" /> -<line stroke-dasharray="6.614173,4.724409" - x1="258.861942" y1="182.186877" x2="258.861942" y2="163.289239" /> -<line stroke-dasharray="2.755906,1.968504" - x1="258.861942" y1="182.186877" x2="258.861942" y2="175.100262" /> -<polyline points="258.861942,175.100262 254.137533,172.738058 -258.861942,170.375853" /> -<line stroke-dasharray="2.755906,1.968504" - x1="258.861942" y1="170.375853" x2="258.861942" y2="163.289239" /> -<polyline points="254.924934,167.226247 254.924934,163.289239 -262.79895,163.289239 -262.79895,167.226247" /> -</g> -<g> -<line x1="309.728084" y1="187.619948" x2="322.326509" y2="187.619948" /> -<line x1="284.531234" y1="187.619948" x2="297.129659" y2="187.619948" /> -<line x1="297.129659" y1="187.619948" x2="311.302887" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="304.216273" y1="184.07664" x2="304.216273" y2="165.179003" /> -<polyline points="300.279265,161.241995 300.279265,165.179003 -308.153281,165.179003 -308.153281,161.241995" /> -</g> -<g> -<line x1="355.082415" y1="187.619948" x2="367.68084" y2="187.619948" /> -<line x1="329.885564" y1="187.619948" x2="342.48399" y2="187.619948" /> -<line x1="342.48399" y1="187.619948" x2="356.657218" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="349.570604" y1="184.07664" x2="349.570604" y2="165.179003" /> -<polyline points="345.633596,169.11601 345.633596,165.179003 -353.507612,165.179003 -353.507612,161.241995" /> -</g> -<g> -<line x1="400.436745" y1="187.619948" x2="413.035171" y2="187.619948" /> -<line x1="375.239895" y1="187.619948" x2="387.83832" y2="187.619948" /> -<line x1="387.83832" y1="187.619948" x2="402.011549" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="394.924934" y1="184.07664" x2="394.924934" y2="165.179003" /> -<line x1="390.987927" y1="165.179003" x2="398.861942" y2="165.179003" /> -<path d="M 398.861942,165.179003 - A 4.591301 4.591301 0 0 0 390.987927,165.179003" /> -</g> -<g> -<line x1="445.791076" y1="187.619948" x2="458.389501" y2="187.619948" /> -<line x1="420.594226" y1="187.619948" x2="433.192651" y2="187.619948" /> -<line x1="433.192651" y1="187.619948" x2="447.365879" y2="180.533333" /> -<line x1="439.098163" y1="184.667192" x2="439.098163" y2="165.769554" /> -<line x1="441.460367" y1="183.486089" x2="441.460367" y2="165.952271" /> -<path d="M 445.003675,163.498708 - A 6.149803 6.149803 0 0 1 435.554856,163.498708" /> -</g> -<g> -<line x1="491.145407" y1="185.730184" x2="503.743832" y2="185.730184" /> -<line x1="465.948556" y1="185.730184" x2="478.546982" y2="185.730184" /> -<line x1="478.546982" y1="185.730184" x2="492.72021" y2="178.64357" /> -<line x1="484.452493" y1="182.777428" x2="484.452493" y2="163.87979" /> -<line x1="486.814698" y1="181.596325" x2="486.814698" y2="164.062507" /> -<path d="M 490.358005,166.333353 - A 6.149803 6.149803 0 0 0 480.909186,166.333353" /> -</g> -<g> -<line x1="536.499738" y1="187.619948" x2="549.098163" y2="187.619948" /> -<line x1="511.302887" y1="187.619948" x2="523.901312" y2="187.619948" /> -<line x1="523.901312" y1="187.619948" x2="538.074541" y2="180.533333" /> -<line x1="529.806824" y1="184.667192" x2="529.806824" y2="165.769554" /> -<line x1="532.169029" y1="183.486089" x2="532.169029" y2="165.952271" /> -<path d="M 535.712336,163.498708 - A 6.149803 6.149803 0 0 1 526.263517,163.498708" /> -<path d="M 535.712336,168.223117 - A 6.149803 6.149803 0 0 0 526.263517,168.223117" /> -</g> -<g> -<line x1="82.95643" y1="208.407349" x2="95.554856" y2="208.407349" /> -<line x1="57.75958" y1="208.407349" x2="70.358005" y2="208.407349" /> -<line x1="70.358005" y1="208.407349" x2="84.531234" y2="201.320735" /> -<polyline points="86.106037,206.580577 82.95643,208.407349 -86.106037,210.234121" /> -</g> -<g> -<line x1="128.310761" y1="208.407349" x2="140.909186" y2="208.407349" /> -<line x1="103.113911" y1="208.407349" x2="115.712336" y2="208.407349" /> -<line x1="115.712336" y1="208.407349" x2="129.885564" y2="201.320735" /> -<polyline points="129.885564,208.407349 128.310761,208.407349 -131.460367,206.580577" /> -</g> -<g> -<line x1="173.665092" y1="206.517585" x2="186.263517" y2="206.517585" /> -<line x1="148.468241" y1="206.517585" x2="161.066667" y2="206.517585" /> -<line x1="161.066667" y1="206.517585" x2="175.239895" y2="199.430971" /> -<polyline points="175.239895,206.517585 173.665092,206.517585 -176.814698,208.344357" /> -</g> -<g> -<line x1="219.019423" y1="208.407349" x2="231.617848" y2="208.407349" /> -<line x1="193.822572" y1="208.407349" x2="206.420997" y2="208.407349" /> -<line x1="206.420997" y1="208.407349" x2="220.594226" y2="201.320735" /> -<polyline points="220.452493,201.391601 220.594226,201.320735 -222.354909,204.842102" /> -</g> -<g> -<line x1="264.373753" y1="210.297113" x2="276.972178" y2="210.297113" /> -<line x1="239.176903" y1="210.297113" x2="251.775328" y2="210.297113" /> -<line x1="251.775328" y1="210.297113" x2="265.948556" y2="203.210499" /> -<polyline points="265.806824,203.281365 265.948556,203.210499 -264.187873,199.689132" /> -</g> -<g> -<line x1="309.728084" y1="210.297113" x2="322.326509" y2="210.297113" /> -<line x1="284.531234" y1="210.297113" x2="297.129659" y2="210.297113" /> -<line x1="297.129659" y1="210.297113" x2="311.302887" y2="203.210499" /> -<polyline points="311.161155,203.281365 311.302887,203.210499 -313.063571,206.731866" /> -<line x1="309.728084" y1="210.297113" x2="309.728084" y2="202.423097" /> -</g> -<g> -<polyline points="329.885564,195.493963 338.068482,209.667192 -346.251399,195.493963" /> -<line x1="338.068482" y1="195.493963" x2="338.068482" y2="215.966404" /> -</g> -<g> -<polyline points="358.861942,217.856168 358.861942,211.556955 -352.56273,211.556955 -352.56273,195.808924 -368.310761,195.808924 -368.310761,208.407349 -355.712336,208.407349 -355.712336,192.659318 -371.460367,192.659318 -371.460367,211.556955 -365.161155,211.556955 -365.161155,217.856168" /> -</g> -<g> -<polyline points="387.20234,209.667192 379.019423,195.493963 -395.385257,195.493963 -387.20234,209.667192" /> -<line x1="387.20234" y1="195.493963" x2="387.20234" y2="215.966404" /> -</g> -<g> -<polyline points="412.72021,221.635696 412.72021,215.336483 -401.696588,204.312861 -415.869816,190.139633 -430.043045,204.312861 -419.019423,215.336483 -419.019423,221.635696" /> -</g> -<g> -<polyline points="445.791076,214.07664 445.791076,195.179003 -439.491864,195.179003" /> -<polyline points="452.090289,214.07664 452.090289,195.179003 -458.389501,195.179003" /> -</g> -<g> -<line x1="478.546982" y1="208.407349" x2="478.546982" y2="206.307612" /> -<line x1="484.846194" y1="206.307612" x2="472.247769" y2="206.307612" /> -<line x1="491.145407" y1="203.158005" x2="465.948556" y2="203.158005" /> -</g> -<g> -<polyline points="499.964304,195.493963 499.964304,209.667192 -516.330139,209.667192 -516.330139,195.493963" /> -<line x1="508.147222" y1="195.493963" x2="508.147222" y2="215.966404" /> -</g> -<g> -<line x1="53.035171" y1="234.864042" x2="57.75958" y2="234.864042" /> -<polyline points="95.554856,234.864042 57.75958,215.966404 -57.75958,253.76168 -95.554856,234.864042 -100.279265,234.864042" /> -</g> -<g> -<polyline points="116.342257,215.966404 106.893438,215.966404 -106.893438,253.76168 -116.342257,253.76168" /> -<polyline points="154.137533,234.864042 116.342257,215.966404 -116.342257,253.76168 -154.137533,234.864042 -154.137533,234.864042" /> -</g> -<g> -<line x1="163.586352" y1="234.864042" x2="171.460367" y2="234.864042" /> -<polyline points="180.279265,248.092388 171.460367,248.092388 -171.460367,221.635696 -180.279265,221.635696" /> -<path d="M 180.279265,221.635696 - A 13.228346 13.228346 0 0 1 180.279265,248.092388" /> -<line x1="193.507612" y1="234.864042" x2="201.381627" y2="234.864042" /> -</g> -<g> -<polyline points="208.940682,234.864042 208.940682,215.966404 -246.735958,234.864042 -208.940682,253.76168 -208.940682,234.864042" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="214.25409" y="229.950656">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="214.25409" y="248.848294">+</text> -</g> -<g> -<polyline points="254.295013,234.864042 254.295013,215.966404 -282.64147,230.139633 -282.64147,239.588451 -254.295013,253.76168 -254.295013,234.864042" /> -<line x1="282.64147" y1="234.864042" x2="292.090289" y2="234.864042" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="259.608421" y="229.950656">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="259.608421" y="248.848294">+</text> -</g> -<g> -<line x1="299.649344" y1="234.864042" x2="309.098163" y2="234.864042" /> -<polyline points="327.995801,234.864042 309.098163,225.415223 -309.098163,244.312861 -327.995801,234.864042 -337.444619,234.864042" /> -</g> -<g> -<polyline points="349.728084,225.415223 345.003675,225.415223 -345.003675,244.312861 -349.728084,244.312861" /> -<polyline points="368.625722,234.864042 349.728084,225.415223 -349.728084,244.312861 -368.625722,234.864042 -382.79895,234.864042" /> -</g> -<g> -<line x1="390.358005" y1="234.864042" x2="403.743832" y2="234.864042" /> -<polyline points="408.153281,241.478215 403.743832,241.478215 -403.743832,228.249869 -408.153281,228.249869" /> -<path d="M 408.153281,228.249869 - A 6.614173 6.614173 0 0 1 408.153281,241.478215" /> -<line x1="414.767454" y1="234.864042" x2="428.153281" y2="234.864042" /> -</g> -<g> -<polyline points="435.712336,235.11601 435.712336,222.517585 -460.909186,235.11601 -435.712336,247.714436 -435.712336,235.11601" /> -<line x1="460.909186" y1="235.11601" x2="467.208399" y2="235.11601" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="441.025744" y="233.352231">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="441.025744" y="245.950656">+</text> -</g> -<g> -<polyline points="473.507612,235.11601 473.507612,222.517585 -492.405249,231.966404 -492.405249,238.265617 -473.507612,247.714436 -473.507612,235.11601" /> -<line x1="492.405249" y1="235.11601" x2="498.704462" y2="235.11601" /> -<line x1="498.704462" y1="235.11601" x2="505.003675" y2="235.11601" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="478.82102" y="233.352231">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="478.82102" y="245.950656">+</text> -</g> -<g> -<polyline points="81.381627,336.596325 81.381627,327.147507 -71.932808,327.147507 -71.932808,346.045144 -81.381627,346.045144 -81.381627,336.596325" /> -<line x1="71.932808" y1="336.596325" x2="59.334383" y2="336.596325" /> -<line x1="81.381627" y1="336.596325" x2="93.980052" y2="336.596325" /> -<circle fill="white" - cx="67.52336" cy="305.415223" r="1.511811" /> -<line x1="69.035171" y1="305.415223" x2="86.420997" y2="305.415223" /> -<polygon stroke-width="0" fill="black" - points="86.420997,299.11601 83.271391,305.415223 -80.121785,299.11601" /> -<polyline points="83.271391,304.222654 83.271391,295.966404 -90.830446,295.966404" /> -<polygon stroke-width="0" fill="black" - points="80.121785,316.438845 83.271391,310.139633 -86.420997,316.438845" /> -<polyline points="83.271391,311.332202 83.271391,319.588451 -90.830446,319.588451" /> -<circle fill="white" - cx="67.52336" cy="272.344357" r="1.511811" /> -<line x1="69.035171" y1="272.344357" x2="86.420997" y2="272.344357" /> -<polygon stroke-width="0" fill="black" - points="86.420997,266.045144 83.271391,272.344357 -80.121785,266.045144" /> -<polyline points="83.271391,271.151787 83.271391,262.895538 -90.830446,262.895538" /> -<polygon stroke-width="0" fill="black" - points="80.121785,283.367979 83.271391,277.068766 -86.420997,283.367979" /> -<polyline points="83.271391,278.261336 83.271391,286.517585 -90.830446,286.517585" /> -<line stroke-dasharray="6.614173,4.724409" - x1="77.728084" y1="309.194751" x2="77.728084" y2="268.564829" /> -</g> -<g> -<polyline points="125.161155,327.462467 125.161155,318.013648 -115.712336,318.013648 -115.712336,336.911286 -125.161155,336.911286 -125.161155,327.462467" /> -<line x1="115.712336" y1="327.462467" x2="103.113911" y2="327.462467" /> -<line x1="125.161155" y1="327.462467" x2="137.75958" y2="327.462467" /> -<circle fill="white" - cx="111.302887" cy="296.281365" r="1.511811" /> -<line x1="112.814698" y1="296.281365" x2="130.200525" y2="296.281365" /> -<polygon stroke-width="0" fill="black" - points="123.901312,307.304987 127.050919,301.005774 -130.200525,307.304987" /> -<polyline points="127.050919,302.198344 127.050919,310.454593 -134.609974,310.454593" /> -<circle fill="white" - cx="111.302887" cy="272.659318" r="1.511811" /> -<line x1="112.814698" y1="272.659318" x2="130.200525" y2="272.659318" /> -<polygon stroke-width="0" fill="black" - points="123.901312,283.68294 127.050919,277.383727 -130.200525,283.68294" /> -<polyline points="127.050919,278.576297 127.050919,286.832546 -134.609974,286.832546" /> -<line stroke-dasharray="6.614173,4.724409" - x1="121.507612" y1="300.060892" x2="121.507612" y2="268.87979" /> -</g> -<g> -<polyline points="166.735958,322.423097 166.735958,312.974278 -157.287139,312.974278 -157.287139,331.871916 -166.735958,331.871916 -166.735958,322.423097" /> -<line x1="157.287139" y1="322.423097" x2="144.688714" y2="322.423097" /> -<line x1="166.735958" y1="322.423097" x2="179.334383" y2="322.423097" /> -<circle fill="white" - cx="152.87769" cy="305.415223" r="1.511811" /> -<line x1="154.389501" y1="305.415223" x2="171.775328" y2="305.415223" /> -<polygon stroke-width="0" fill="black" - points="171.775328,299.11601 168.625722,305.415223 -165.476115,299.11601" /> -<polyline points="168.625722,304.222654 168.625722,295.966404 -176.184777,295.966404" /> -<circle fill="white" - cx="152.87769" cy="286.517585" r="1.511811" /> -<line x1="154.389501" y1="286.517585" x2="171.775328" y2="286.517585" /> -<polygon stroke-width="0" fill="black" - points="171.775328,280.218373 168.625722,286.517585 -165.476115,280.218373" /> -<polyline points="168.625722,285.325016 168.625722,277.068766 -176.184777,277.068766" /> -<line stroke-dasharray="6.614173,4.724409" - x1="163.082415" y1="309.194751" x2="163.082415" y2="282.738058" /> -</g> -<g> -<polyline points="208.310761,320.060892 208.310761,310.612073 -198.861942,310.612073 -198.861942,329.509711 -208.310761,329.509711 -208.310761,320.060892" /> -<line x1="198.861942" y1="320.060892" x2="186.263517" y2="320.060892" /> -<line x1="208.310761" y1="320.060892" x2="220.909186" y2="320.060892" /> -<circle fill="white" - cx="194.452493" cy="288.87979" r="1.511811" /> -<line x1="195.964304" y1="288.87979" x2="213.350131" y2="288.87979" /> -<polygon stroke-width="0" fill="black" - points="213.350131,282.580577 210.200525,288.87979 -207.050919,282.580577" /> -<polyline points="210.200525,287.68722 210.200525,279.430971 -217.75958,279.430971" /> -<polygon stroke-width="0" fill="black" - points="207.050919,299.903412 210.200525,293.604199 -213.350131,299.903412" /> -<polyline points="210.200525,294.796769 210.200525,303.053018 -217.75958,303.053018" /> -</g> -<g> -<circle fill="white" - cx="229.350131" cy="300.533333" r="1.511811" /> -<line x1="230.861942" y1="300.533333" x2="248.247769" y2="300.533333" /> -<polygon stroke-width="0" fill="black" - points="248.247769,294.234121 245.098163,300.533333 -241.948556,294.234121" /> -<polyline points="245.098163,299.340764 245.098163,291.084514 -252.657218,291.084514" /> -<polygon stroke-width="0" fill="black" - points="241.948556,311.556955 245.098163,305.257743 -248.247769,311.556955" /> -<polyline points="245.098163,306.450312 245.098163,314.706562 -252.657218,314.706562" /> -</g> -<g> -<circle fill="white" - cx="263.365879" cy="294.990026" r="1.511811" /> -<line x1="264.87769" y1="294.990026" x2="282.263517" y2="294.990026" /> -<polygon stroke-width="0" fill="black" - points="275.964304,306.013648 279.113911,299.714436 -282.263517,306.013648" /> -<polyline points="279.113911,300.907005 279.113911,309.163255 -286.672966,309.163255" /> -</g> -<g> -<circle fill="white" - cx="297.381627" cy="308.438845" r="1.511811" /> -<line x1="298.893438" y1="308.438845" x2="316.279265" y2="308.438845" /> -<polygon stroke-width="0" fill="black" - points="316.279265,302.139633 313.129659,308.438845 -309.980052,302.139633" /> -<polyline points="313.129659,307.246276 313.129659,298.990026 -320.688714,298.990026" /> -</g> -<g> -<circle cx="76.657218" cy="362.990026" r="10.96063" /> -</g> -<g> -<line x1="107.83832" y1="370.927034" x2="107.83832" y2="355.808924" /> -<line x1="98.389501" y1="363.367979" x2="107.83832" y2="363.367979" /> -<line x1="122.95643" y1="374.706562" x2="107.83832" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="114.294174,368.506004 119.176903,373.005774 -112.570857,372.335596" /> -<line x1="117.638903" y1="372.313675" x2="111.617848" y2="369.604199" /> -<line x1="122.95643" y1="352.029396" x2="107.83832" y2="358.832546" /> -</g> -<g> -<line x1="151.302887" y1="370.927034" x2="151.302887" y2="355.808924" /> -<line x1="160.751706" y1="363.367979" x2="151.302887" y2="363.367979" /> -<line x1="136.184777" y1="374.706562" x2="151.302887" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="146.57035,372.335596 139.964304,373.005774 -144.847034,368.506004" /> -<line x1="141.502304" y1="372.313675" x2="147.52336" y2="369.604199" /> -<line x1="136.184777" y1="352.029396" x2="151.302887" y2="358.832546" /> -</g> -<g> -<line x1="183.428871" y1="370.927034" x2="183.428871" y2="355.808924" /> -<line x1="173.980052" y1="363.367979" x2="183.428871" y2="363.367979" /> -<line x1="198.546982" y1="374.706562" x2="183.428871" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="192.091128,374.10397 187.208399,369.604199 -193.814444,370.274378" /> -<line x1="194.767454" y1="373.005774" x2="188.746398" y2="370.296299" /> -<line x1="198.546982" y1="352.029396" x2="183.428871" y2="358.832546" /> -</g> -<g> -<line x1="226.893438" y1="370.927034" x2="226.893438" y2="355.808924" /> -<line x1="236.342257" y1="363.367979" x2="226.893438" y2="363.367979" /> -<line x1="211.775328" y1="374.706562" x2="226.893438" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="216.507865,370.274378 223.113911,369.604199 -218.231181,374.10397" /> -<line x1="215.554856" y1="373.005774" x2="221.575911" y2="370.296299" /> -<line x1="211.775328" y1="352.029396" x2="226.893438" y2="358.832546" /> -</g> -<g> -<line x1="275.082415" y1="355.703937" x2="261.854068" y2="355.703937" /> -<line x1="261.854068" y1="372.711811" x2="261.854068" y2="353.814173" /> -<polygon stroke-width="0" fill="black" - points="255.554856,368.72231 261.854068,370.822047 -255.554856,372.921785" /> -<line x1="248.625722" y1="370.822047" x2="260.16752" y2="370.822047" /> -<line x1="275.082415" y1="370.822047" x2="261.854068" y2="370.822047" /> -</g> -<g> -<line x1="286.420997" y1="355.703937" x2="299.649344" y2="355.703937" /> -<line x1="299.649344" y1="372.711811" x2="299.649344" y2="353.814173" /> -<polygon stroke-width="0" fill="black" - points="305.948556,372.921785 299.649344,370.822047 -305.948556,368.72231" /> -<line x1="312.87769" y1="370.822047" x2="301.335892" y2="370.822047" /> -<line x1="286.420997" y1="370.822047" x2="299.649344" y2="370.822047" /> -</g> -<g> -<line x1="350.672966" y1="355.703937" x2="337.444619" y2="355.703937" /> -<line x1="337.444619" y1="372.711811" x2="337.444619" y2="353.814173" /> -<line x1="337.444619" y1="370.822047" x2="324.216273" y2="370.822047" /> -<polygon stroke-width="0" fill="black" - points="332.405249,372.921785 326.106037,370.822047 -332.405249,368.72231" /> -<line x1="332.405249" y1="370.822047" x2="327.792585" y2="370.822047" /> -<line x1="350.672966" y1="370.822047" x2="337.444619" y2="370.822047" /> -</g> -<g> -<line x1="362.011549" y1="355.703937" x2="375.239895" y2="355.703937" /> -<line x1="375.239895" y1="372.711811" x2="375.239895" y2="353.814173" /> -<line x1="375.239895" y1="370.822047" x2="388.468241" y2="370.822047" /> -<polygon stroke-width="0" fill="black" - points="380.279265,368.72231 386.578478,370.822047 -380.279265,372.921785" /> -<line x1="380.279265" y1="370.822047" x2="384.89193" y2="370.822047" /> -<line x1="362.011549" y1="370.822047" x2="375.239895" y2="370.822047" /> -</g> -<g> -<line x1="426.263517" y1="363.367979" x2="413.035171" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="422.79895,365.467717 416.499738,363.367979 -422.79895,361.268241" /> -<line x1="422.79895" y1="363.367979" x2="418.186286" y2="363.367979" /> -<line x1="426.263517" y1="355.808924" x2="413.035171" y2="355.808924" /> -<line x1="413.035171" y1="372.816798" x2="413.035171" y2="367.147507" /> -<line x1="413.035171" y1="365.257743" x2="413.035171" y2="361.478215" /> -<line x1="413.035171" y1="359.588451" x2="413.035171" y2="353.91916" /> -<polyline points="409.255643,355.808924 409.255643,370.927034 -399.806824,370.927034" /> -<polyline points="425.200835,363.367979 426.263517,363.367979 -426.263517,370.927034 -425.200835,370.927034" /> -<line x1="426.263517" y1="370.927034" x2="413.035171" y2="370.927034" /> -</g> -<g> -<line x1="437.6021" y1="363.367979" x2="450.830446" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="441.066667,361.268241 447.365879,363.367979 -441.066667,365.467717" /> -<line x1="441.066667" y1="363.367979" x2="445.679331" y2="363.367979" /> -<line x1="437.6021" y1="355.808924" x2="450.830446" y2="355.808924" /> -<line x1="450.830446" y1="372.816798" x2="450.830446" y2="367.147507" /> -<line x1="450.830446" y1="365.257743" x2="450.830446" y2="361.478215" /> -<line x1="450.830446" y1="359.588451" x2="450.830446" y2="353.91916" /> -<polyline points="454.609974,355.808924 454.609974,370.927034 -464.058793,370.927034" /> -<polyline points="438.664781,363.367979 437.6021,363.367979 -437.6021,370.927034 -438.664781,370.927034" /> -<line x1="437.6021" y1="370.927034" x2="450.830446" y2="370.927034" /> -</g> -<g> -<line x1="501.854068" y1="363.367979" x2="488.625722" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="492.090289,361.268241 498.389501,363.367979 -492.090289,365.467717" /> -<line x1="496.702953" y1="363.367979" x2="492.090289" y2="363.367979" /> -<line x1="501.854068" y1="355.808924" x2="488.625722" y2="355.808924" /> -<line x1="488.625722" y1="372.816798" x2="488.625722" y2="367.147507" /> -<line x1="488.625722" y1="365.257743" x2="488.625722" y2="361.478215" /> -<line x1="488.625722" y1="359.588451" x2="488.625722" y2="353.91916" /> -<polyline points="484.846194,355.808924 484.846194,370.927034 -475.397375,370.927034" /> -<polyline points="500.791387,363.367979 501.854068,363.367979 -501.854068,370.927034 -500.791387,370.927034" /> -<line x1="501.854068" y1="370.927034" x2="488.625722" y2="370.927034" /> -</g> -<g> -<line x1="513.192651" y1="363.367979" x2="526.420997" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="522.95643,365.467717 516.657218,363.367979 -522.95643,361.268241" /> -<line x1="518.343766" y1="363.367979" x2="522.95643" y2="363.367979" /> -<line x1="513.192651" y1="355.808924" x2="526.420997" y2="355.808924" /> -<line x1="526.420997" y1="372.816798" x2="526.420997" y2="367.147507" /> -<line x1="526.420997" y1="365.257743" x2="526.420997" y2="361.478215" /> -<line x1="526.420997" y1="359.588451" x2="526.420997" y2="353.91916" /> -<polyline points="530.200525,355.808924 530.200525,370.927034 -539.649344,370.927034" /> -<polyline points="514.255333,363.367979 513.192651,363.367979 -513.192651,370.927034 -514.255333,370.927034" /> -<line x1="513.192651" y1="370.927034" x2="526.420997" y2="370.927034" /> -</g> -<g> -<line x1="577.444619" y1="363.367979" x2="564.216273" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="573.980052,365.467717 567.68084,363.367979 -573.980052,361.268241" /> -<line x1="573.980052" y1="363.367979" x2="569.367388" y2="363.367979" /> -<line x1="577.444619" y1="355.808924" x2="564.216273" y2="355.808924" /> -<line x1="564.216273" y1="372.816798" x2="564.216273" y2="353.91916" /> -<polyline points="560.436745,355.808924 560.436745,370.927034 -550.987927,370.927034" /> -<polyline points="576.381938,363.367979 577.444619,363.367979 -577.444619,370.927034 -576.381938,370.927034" /> -<line x1="577.444619" y1="370.927034" x2="564.216273" y2="370.927034" /> -</g> -<g> -<line x1="588.783202" y1="363.367979" x2="602.011549" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="592.247769,361.268241 598.546982,363.367979 -592.247769,365.467717" /> -<line x1="592.247769" y1="363.367979" x2="596.860434" y2="363.367979" /> -<line x1="588.783202" y1="355.808924" x2="602.011549" y2="355.808924" /> -<line x1="602.011549" y1="372.816798" x2="602.011549" y2="353.91916" /> -<polyline points="605.791076,355.808924 605.791076,370.927034 -615.239895,370.927034" /> -<polyline points="589.845884,363.367979 588.783202,363.367979 -588.783202,370.927034 -589.845884,370.927034" /> -<line x1="588.783202" y1="370.927034" x2="602.011549" y2="370.927034" /> -</g> -<g> -<line x1="653.035171" y1="363.367979" x2="639.806824" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="643.271391,361.268241 649.570604,363.367979 -643.271391,365.467717" /> -<line x1="647.884056" y1="363.367979" x2="643.271391" y2="363.367979" /> -<line x1="653.035171" y1="355.808924" x2="639.806824" y2="355.808924" /> -<line x1="639.806824" y1="372.816798" x2="639.806824" y2="353.91916" /> -<polyline points="636.027297,355.808924 636.027297,370.927034 -626.578478,370.927034" /> -<polyline points="651.972489,363.367979 653.035171,363.367979 -653.035171,370.927034 -651.972489,370.927034" /> -<line x1="653.035171" y1="370.927034" x2="639.806824" y2="370.927034" /> -</g> -<g> -<line x1="664.373753" y1="363.367979" x2="677.6021" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="674.137533,365.467717 667.83832,363.367979 -674.137533,361.268241" /> -<line x1="669.524868" y1="363.367979" x2="674.137533" y2="363.367979" /> -<line x1="664.373753" y1="355.808924" x2="677.6021" y2="355.808924" /> -<line x1="677.6021" y1="372.816798" x2="677.6021" y2="353.91916" /> -<polyline points="681.381627,355.808924 681.381627,370.927034 -690.830446,370.927034" /> -<polyline points="665.436435,363.367979 664.373753,363.367979 -664.373753,370.927034 -665.436435,370.927034" /> -<line x1="664.373753" y1="370.927034" x2="677.6021" y2="370.927034" /> -</g> -<g> -<line x1="73.822572" y1="397.383727" x2="73.822572" y2="382.265617" /> -<line x1="88.940682" y1="401.163255" x2="73.822572" y2="394.360105" /> -<polygon stroke-width="0" fill="black" - points="80.278426,394.962697 85.161155,399.462467 -78.555109,398.792289" /> -<line x1="83.623155" y1="398.770367" x2="77.6021" y2="396.060892" /> -<line x1="88.940682" y1="378.486089" x2="73.822572" y2="385.289239" /> -<line x1="64.373753" y1="389.824672" x2="71.176903" y2="389.824672" /> -<line x1="71.176903" y1="397.383727" x2="71.176903" y2="382.265617" /> -</g> -<g> -<line x1="127.68084" y1="397.383727" x2="114.452493" y2="397.383727" /> -<line x1="114.452493" y1="399.273491" x2="114.452493" y2="380.375853" /> -<line x1="114.452493" y1="382.265617" x2="127.68084" y2="382.265617" /> -<line x1="101.224147" y1="382.265617" x2="114.452493" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="108.371464,383.931423 112.79895,388.87979 -106.28794,387.577588" /> -<line x1="101.224147" y1="382.265617" x2="111.334616" y2="388.043028" /> -</g> -<g> -<line x1="165.476115" y1="397.383727" x2="152.247769" y2="397.383727" /> -<line x1="152.247769" y1="399.273491" x2="152.247769" y2="380.375853" /> -<line x1="152.247769" y1="382.265617" x2="165.476115" y2="382.265617" /> -<line x1="139.019423" y1="382.265617" x2="152.247769" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="145.100452,388.158866 140.672966,383.210499 -147.183976,384.512701" /> -<line x1="152.247769" y1="389.824672" x2="142.1373" y2="384.047261" /> -</g> -<g> -<line x1="181.891072" y1="376.596325" x2="181.891072" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="181.891072,387.097033 -185.040678,387.097033 -181.891072,392.02097 -178.741466,387.097033 -181.891072,387.097033" /> -<polyline points="181.891072,387.097033 185.040678,387.097033 -181.891072,392.02097 -178.741466,387.097033 -181.891072,387.097033" /> -<line x1="178.352497" y1="392.552311" x2="185.429647" y2="392.552311" /> -<line x1="183.465875" y1="392.552311" x2="186.615482" y2="398.007589" /> -<line x1="181.891072" y1="392.552311" x2="181.891072" y2="403.053018" /> -</g> -<g> -<line x1="205.161155" y1="376.596325" x2="205.161155" y2="387.097033" /> -<line x1="205.161155" y1="387.097033" x2="209.885564" y2="395.27995" /> -<polyline stroke-width="0" fill="black" - points="208.310761,387.097033 -211.460367,387.097033 -208.310761,392.02097 -205.161155,387.097033 -208.310761,387.097033" /> -<polyline points="208.310761,387.097033 211.460367,387.097033 -208.310761,392.02097 -205.161155,387.097033 -208.310761,387.097033" /> -<line x1="198.472974" y1="392.552311" x2="211.849336" y2="392.552311" /> -<line x1="198.472974" y1="387.097033" x2="211.849336" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="202.011549,392.552311 -205.161155,392.552311 -202.011549,387.628374 -198.861942,392.552311 -202.011549,392.552311" /> -<polyline points="202.011549,392.552311 205.161155,392.552311 -202.011549,387.628374 -198.861942,392.552311 -202.011549,392.552311" /> -<line x1="205.161155" y1="392.552311" x2="205.161155" y2="403.053018" /> -</g> -<g> -<line x1="227.83832" y1="376.596325" x2="227.83832" y2="387.097033" /> -<line x1="227.83832" y1="387.097033" x2="232.56273" y2="395.27995" /> -<polyline stroke-width="0" fill="black" - points="230.987927,387.097033 -234.137533,387.097033 -230.987927,392.02097 -227.83832,387.097033 -230.987927,387.097033" /> -<polyline points="230.987927,387.097033 234.137533,387.097033 -230.987927,392.02097 -227.83832,387.097033 -230.987927,387.097033" /> -<line x1="221.150139" y1="392.552311" x2="234.526501" y2="392.552311" /> -<line x1="221.150139" y1="387.097033" x2="234.526501" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="224.688714,392.552311 -227.83832,392.552311 -224.688714,387.628374 -221.539108,392.552311 -224.688714,392.552311" /> -<polyline points="224.688714,392.552311 227.83832,392.552311 -224.688714,387.628374 -221.539108,392.552311 -224.688714,392.552311" /> -<line x1="227.83832" y1="392.552311" x2="227.83832" y2="403.053018" /> -</g> -<g> -<line x1="249.922568" y1="376.596325" x2="249.922568" y2="387.097033" /> -<polyline points="249.922568,387.097033 253.072175,387.097033 -249.922568,392.02097 -246.772962,387.097033 -249.922568,387.097033" /> -<line x1="246.383993" y1="392.552311" x2="253.461143" y2="392.552311" /> -<line x1="251.497371" y1="392.552311" x2="254.646978" y2="398.007589" /> -<line x1="249.922568" y1="392.552311" x2="249.922568" y2="403.053018" /> -</g> -<g> -<line x1="272.599734" y1="376.596325" x2="272.599734" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="272.599734,387.097033 -275.74934,387.097033 -272.599734,392.02097 -269.450127,387.097033 -272.599734,387.097033" /> -<polyline points="272.599734,387.097033 275.74934,387.097033 -272.599734,392.02097 -269.450127,387.097033 -272.599734,387.097033" /> -<line x1="269.061159" y1="392.552311" x2="276.138308" y2="392.552311" /> -<line x1="274.174537" y1="392.552311" x2="277.324143" y2="398.007589" /> -<line x1="272.599734" y1="392.552311" x2="272.599734" y2="403.053018" /> -</g> -<g> -<line x1="316.657218" y1="382.16063" x2="303.428871" y2="382.16063" /> -<line x1="303.428871" y1="399.168504" x2="303.428871" y2="380.270866" /> -<polygon stroke-width="0" fill="black" - points="297.129659,395.179003 303.428871,397.27874 -297.129659,399.378478" /> -<line x1="290.200525" y1="397.27874" x2="301.742323" y2="397.27874" /> -<line x1="316.657218" y1="397.27874" x2="303.428871" y2="397.27874" /> -</g> -<g> -<line x1="354.452493" y1="389.824672" x2="341.224147" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="350.987927,391.924409 344.688714,389.824672 -350.987927,387.724934" /> -<line x1="350.987927" y1="389.824672" x2="346.375262" y2="389.824672" /> -<line x1="354.452493" y1="382.265617" x2="341.224147" y2="382.265617" /> -<line x1="341.224147" y1="399.273491" x2="341.224147" y2="393.604199" /> -<line x1="341.224147" y1="391.714436" x2="341.224147" y2="387.934908" /> -<line x1="341.224147" y1="386.045144" x2="341.224147" y2="380.375853" /> -<polyline points="337.444619,382.265617 337.444619,397.383727 -327.995801,397.383727" /> -<polyline points="353.389812,389.824672 354.452493,389.824672 -354.452493,397.383727 -353.389812,397.383727" /> -<line x1="354.452493" y1="397.383727" x2="341.224147" y2="397.383727" /> -</g> -<g> -<line x1="393.192651" y1="382.16063" x2="379.964304" y2="382.16063" /> -<line x1="379.964304" y1="399.168504" x2="379.964304" y2="380.270866" /> -<line x1="393.192651" y1="397.27874" x2="379.964304" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="383.428871,395.179003 389.728084,397.27874 -383.428871,399.378478" /> -<line x1="388.041536" y1="397.27874" x2="383.428871" y2="397.27874" /> -<line x1="376.184777" y1="397.27874" x2="376.184777" y2="382.16063" /> -<line x1="376.184777" y1="389.719685" x2="364.846194" y2="389.719685" /> -</g> -<g> -<line x1="430.043045" y1="389.824672" x2="416.814698" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="420.279265,387.724934 426.578478,389.824672 -420.279265,391.924409" /> -<line x1="424.89193" y1="389.824672" x2="420.279265" y2="389.824672" /> -<line x1="430.043045" y1="382.265617" x2="416.814698" y2="382.265617" /> -<line x1="416.814698" y1="399.273491" x2="416.814698" y2="393.604199" /> -<line x1="416.814698" y1="391.714436" x2="416.814698" y2="387.934908" /> -<line x1="416.814698" y1="386.045144" x2="416.814698" y2="380.375853" /> -<polyline points="413.035171,382.265617 413.035171,397.383727 -403.586352,397.383727" /> -<polyline points="428.980363,389.824672 430.043045,389.824672 -430.043045,397.383727 -428.980363,397.383727" /> -<line x1="430.043045" y1="397.383727" x2="416.814698" y2="397.383727" /> -</g> -<g> -<line x1="468.783202" y1="382.16063" x2="455.554856" y2="382.16063" /> -<line x1="455.554856" y1="399.168504" x2="455.554856" y2="380.270866" /> -<line x1="468.783202" y1="397.27874" x2="455.554856" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="465.318635,399.378478 459.019423,397.27874 -465.318635,395.179003" /> -<line x1="465.318635" y1="397.27874" x2="460.705971" y2="397.27874" /> -<line x1="451.775328" y1="397.27874" x2="451.775328" y2="382.16063" /> -<line x1="451.775328" y1="389.719685" x2="440.436745" y2="389.719685" /> -</g> -<g> -<line x1="505.633596" y1="389.824672" x2="492.405249" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="502.169029,391.924409 495.869816,389.824672 -502.169029,387.724934" /> -<line x1="502.169029" y1="389.824672" x2="497.556364" y2="389.824672" /> -<line x1="505.633596" y1="382.265617" x2="492.405249" y2="382.265617" /> -<line x1="492.405249" y1="399.273491" x2="492.405249" y2="380.375853" /> -<polyline points="488.625722,382.265617 488.625722,397.383727 -479.176903,397.383727" /> -<polyline points="504.570914,389.824672 505.633596,389.824672 -505.633596,397.383727 -504.570914,397.383727" /> -<line x1="505.633596" y1="397.383727" x2="492.405249" y2="397.383727" /> -</g> -<g> -<line x1="544.373753" y1="382.16063" x2="531.145407" y2="382.16063" /> -<line x1="531.145407" y1="399.168504" x2="531.145407" y2="380.270866" /> -<line stroke-width="2.133333" - x1="532.739429" y1="397.27874" x2="532.739429" y2="382.16063" /> -<line x1="544.373753" y1="397.27874" x2="531.145407" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="534.609974,395.179003 540.909186,397.27874 -534.609974,399.378478" /> -<line x1="539.222638" y1="397.27874" x2="534.609974" y2="397.27874" /> -<line x1="527.365879" y1="397.27874" x2="527.365879" y2="382.16063" /> -<line x1="527.365879" y1="389.719685" x2="516.027297" y2="389.719685" /> -</g> -<g> -<line x1="581.224147" y1="389.824672" x2="567.995801" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="571.460367,387.724934 577.75958,389.824672 -571.460367,391.924409" /> -<line x1="576.073032" y1="389.824672" x2="571.460367" y2="389.824672" /> -<line x1="581.224147" y1="382.265617" x2="567.995801" y2="382.265617" /> -<line x1="567.995801" y1="399.273491" x2="567.995801" y2="380.375853" /> -<polyline points="564.216273,382.265617 564.216273,397.383727 -554.767454,397.383727" /> -<polyline points="580.161465,389.824672 581.224147,389.824672 -581.224147,397.383727 -580.161465,397.383727" /> -<line x1="581.224147" y1="397.383727" x2="567.995801" y2="397.383727" /> -</g> -<g> -<line x1="619.964304" y1="382.16063" x2="606.735958" y2="382.16063" /> -<line x1="606.735958" y1="399.168504" x2="606.735958" y2="380.270866" /> -<line stroke-width="2.133333" - x1="608.32998" y1="397.27874" x2="608.32998" y2="382.16063" /> -<line x1="619.964304" y1="397.27874" x2="606.735958" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="616.499738,399.378478 610.200525,397.27874 -616.499738,395.179003" /> -<line x1="616.499738" y1="397.27874" x2="611.887073" y2="397.27874" /> -<line x1="602.95643" y1="397.27874" x2="602.95643" y2="382.16063" /> -<line x1="602.95643" y1="389.719685" x2="591.617848" y2="389.719685" /> -</g> -<g> -<line x1="656.814698" y1="382.16063" x2="643.586352" y2="382.16063" /> -<line x1="643.586352" y1="399.168504" x2="643.586352" y2="380.270866" /> -<polygon stroke-width="0" fill="black" - points="637.287139,395.179003 643.586352,397.27874 -637.287139,399.378478" /> -<line x1="630.358005" y1="397.27874" x2="641.899804" y2="397.27874" /> -<line x1="656.814698" y1="397.27874" x2="643.586352" y2="397.27874" /> -</g> -<g> -<line x1="694.609974" y1="382.16063" x2="681.381627" y2="382.16063" /> -<line x1="681.381627" y1="399.168504" x2="681.381627" y2="380.270866" /> -<line x1="681.381627" y1="397.27874" x2="668.153281" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="676.342257,399.378478 670.043045,397.27874 -676.342257,395.179003" /> -<line x1="676.342257" y1="397.27874" x2="671.729593" y2="397.27874" /> -<line x1="694.609974" y1="397.27874" x2="681.381627" y2="397.27874" /> -</g> -<g> -<line x1="733.350131" y1="382.265617" x2="720.121785" y2="382.265617" /> -<line x1="720.121785" y1="399.273491" x2="720.121785" y2="380.375853" /> -<line x1="720.121785" y1="389.824672" x2="705.003675" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="715.082415,391.924409 708.783202,389.824672 -715.082415,387.724934" /> -<line x1="715.082415" y1="389.824672" x2="710.46975" y2="389.824672" /> -<line x1="733.350131" y1="397.383727" x2="720.121785" y2="397.383727" /> -</g> -<g> -<line x1="57.75958" y1="421.424712" x2="71.20194" y2="421.424712" /> -<polyline points="71.20194,421.424712 71.20194,418.275106 -76.125877,421.424712 -71.20194,424.574318 -71.20194,421.424712" /> -<polyline points="82.112496,421.424712 82.112496,418.275106 -77.188559,421.424712 -82.112496,424.574318 -82.112496,421.424712" /> -<line x1="82.112496" y1="421.424712" x2="95.554856" y2="421.424712" /> -<circle stroke-width="1.874452" - cx="76.657218" cy="419.606286" r="1.36382" /> -<line x1="76.657218" y1="418.242466" x2="76.657218" y2="413.241795" /> -<line x1="76.657218" y1="421.424712" x2="76.657218" y2="426.87999" /> -</g> -<g> -<line x1="103.113911" y1="416.281365" x2="112.56273" y2="416.281365" /> -<polyline points="131.460367,416.281365 131.460367,412.501837 -112.56273,412.501837 -112.56273,420.060892 -131.460367,420.060892 -131.460367,416.281365" /> -<line x1="131.460367" y1="416.281365" x2="140.909186" y2="416.281365" /> -<line x1="122.011549" y1="420.060892" x2="122.011549" y2="427.619948" /> -</g> -<g> -<line x1="148.468241" y1="421.635696" x2="161.066667" y2="421.635696" /> -<polyline points="161.066667,421.635696 173.665092,415.336483 -173.665092,427.934908 -161.066667,421.635696" /> -<polyline points="173.665092,421.635696 161.066667,415.336483 -161.066667,427.934908 -173.665092,421.635696" /> -<circle stroke-width="1.874452" - cx="167.365879" cy="416.386352" r="1.574803" /> -<line x1="167.365879" y1="414.811549" x2="167.365879" y2="409.03727" /> -<line x1="167.365879" y1="424.785302" x2="167.365879" y2="431.084514" /> -<line x1="173.665092" y1="421.635696" x2="186.263517" y2="421.635696" /> -</g> -<g> -<polyline points="80.436745,484.312861 50.200525,484.312861 -50.200525,438.95853 -80.436745,438.95853" /> -<path d="M 80.436745,438.95853 - A 22.677165 22.677165 0 0 1 80.436745,484.312861" /> -</g> -<g> -<line x1="128.844094" y1="439.062628" x2="110.672966" y2="439.062628" /> -<path d="M 111.106986,438.854432 - A 52.913386 52.913386 0 0 1 111.206299,484.416959" /> -<line x1="110.672966" y1="484.416959" x2="128.844094" y2="484.416959" /> -<path d="M 128.844094,439.062628 - A 38.775153 38.775153 0 0 1 164.119685,461.739794" /> -<path d="M 128.844094,484.416959 - A 38.775153 38.775153 0 0 0 164.119685,461.739794" /> -</g> -<g> -<polyline points="201.381627,484.312861 171.145407,484.312861 -171.145407,438.95853 -201.381627,438.95853" /> -<path d="M 201.381627,438.95853 - A 22.677165 22.677165 0 0 1 201.381627,484.312861" /> -<circle cx="227.83832" cy="461.635696" r="3.779528" /> -</g> -<g> -<line x1="257.348031" y1="439.062628" x2="239.176903" y2="439.062628" /> -<path d="M 239.610923,438.854432 - A 52.913386 52.913386 0 0 1 239.710236,484.416959" /> -<line x1="239.176903" y1="484.416959" x2="257.348031" y2="484.416959" /> -<path d="M 257.348031,439.062628 - A 38.775153 38.775153 0 0 1 292.623622,461.739794" /> -<path d="M 257.348031,484.416959 - A 38.775153 38.775153 0 0 0 292.623622,461.739794" /> -<circle cx="296.40315" cy="461.739794" r="3.779528" /> -</g> -<g> -<path d="M 307.208399,439.062628 - A 52.913386 52.913386 0 0 1 307.208399,484.416959" /> -<line x1="332.405249" y1="439.062628" x2="314.234121" y2="439.062628" /> -<path d="M 314.668141,438.854432 - A 52.913386 52.913386 0 0 1 314.767454,484.416959" /> -<line x1="314.234121" y1="484.416959" x2="332.405249" y2="484.416959" /> -<path d="M 332.405249,439.062628 - A 38.775153 38.775153 0 0 1 367.68084,461.739794" /> -<path d="M 332.405249,484.416959 - A 38.775153 38.775153 0 0 0 367.68084,461.739794" /> -</g> -<g> -<path d="M 375.239895,439.062628 - A 52.913386 52.913386 0 0 1 375.239895,484.416959" /> -<line x1="400.436745" y1="439.062628" x2="382.265617" y2="439.062628" /> -<path d="M 382.699637,438.854432 - A 52.913386 52.913386 0 0 1 382.79895,484.416959" /> -<line x1="382.265617" y1="484.416959" x2="400.436745" y2="484.416959" /> -<path d="M 400.436745,439.062628 - A 38.775153 38.775153 0 0 1 435.712336,461.739794" /> -<path d="M 400.436745,484.416959 - A 38.775153 38.775153 0 0 0 435.712336,461.739794" /> -<circle cx="439.491864" cy="461.739794" r="3.779528" /> -</g> -<g> -<polyline points="477.287139,461.635696 450.830446,476.753806 -450.830446,446.517585 -477.287139,461.635696" /> -</g> -<g> -<polyline points="511.302887,461.635696 484.846194,476.753806 -484.846194,446.517585 -511.302887,461.635696" /> -<circle cx="515.082415" cy="461.635696" r="3.779528" /> -</g> -<g> -<line x1="526.420997" y1="461.635696" x2="531.526721" y2="461.635696" /> -<line x1="526.420997" y1="446.517585" x2="529.321018" y2="446.517585" /> -<line x1="526.420997" y1="476.753806" x2="529.321018" y2="476.753806" /> -<line x1="526.420997" y1="454.07664" x2="530.984005" y2="454.07664" /> -<line x1="526.420997" y1="469.194751" x2="530.984005" y2="469.194751" /> -</g> -<g> -<line x1="537.75958" y1="461.635696" x2="542.865304" y2="461.635696" /> -<line x1="537.75958" y1="446.517585" x2="540.659601" y2="446.517585" /> -<line x1="537.75958" y1="476.753806" x2="540.659601" y2="476.753806" /> -</g> -<g> -<line x1="549.098163" y1="446.517585" x2="551.998184" y2="446.517585" /> -<line x1="549.098163" y1="476.753806" x2="551.998184" y2="476.753806" /> -</g> -<g> -<line x1="560.436745" y1="461.635696" x2="565.542469" y2="461.635696" /> -</g> -<g> -<polyline points="76.657218,501.950656 94.474082,489.352231 -94.474082,539.745932 -76.657218,527.147507" /> -<polyline points="76.657218,514.549081 76.657218,501.950656 -58.840354,501.950656 -58.840354,527.147507 -76.657218,527.147507 -76.657218,514.549081" /> -</g> -<g> -<polyline points="120.930775,508.249869 129.839206,503.525459 -129.839206,525.572703 -120.930775,520.848294" /> -<polyline points="120.930775,514.549081 120.930775,501.950656 -103.113911,501.950656 -103.113911,527.147507 -120.930775,527.147507 -120.930775,514.549081" /> -</g> -<g> -<polyline points="156.027297,514.549081 156.027297,505.100262 -137.129659,505.100262 -137.129659,523.9979 -156.027297,523.9979 -156.027297,514.549081" /> -<circle cx="165.476115" cy="514.549081" r="9.448819" /> -</g> -<g> -<line x1="201.381627" y1="523.9979" x2="201.381627" y2="505.100262" /> -<circle cx="191.932808" cy="514.549081" r="9.448819" /> -</g> -<g> -<polyline points="227.83832,514.549081 227.83832,505.100262 -208.940682,505.100262 -208.940682,523.9979 -227.83832,523.9979 -227.83832,514.549081" /> -<line x1="227.83832" y1="505.100262" x2="232.729389" y2="523.353979" /> -</g> -<g> -<line x1="251.775328" y1="527.147507" x2="251.775328" y2="501.950656" /> -<path d="M 251.775328,501.950656 - A 12.598425 12.598425 0 0 0 251.775328,527.147507" /> -</g> -<g> -<polyline points="270.672966,514.549081 270.672966,505.100262 -258.074541,505.100262 -258.074541,523.9979 -270.672966,523.9979 -270.672966,514.549081" /> -<line stroke-width="2.133333" - x1="271.735647" y1="527.147507" x2="271.735647" y2="501.950656" /> -</g> -<g> -<circle cx="288.310761" cy="520.218373" r="7.559055" /> -<circle cx="326.106037" cy="520.218373" r="7.559055" /> -<path d="M 289.822572,512.812042 - A 18.897638 18.897638 0 0 1 324.594226,512.812042" /> -</g> -<g> -<rect x="352.184777" y="491.871916" width="75.590551" height="45.354331" /> -<line x1="352.184777" y1="503.210499" x2="342.735958" y2="503.210499" /> -<circle fill="black" - cx="342.735958" cy="503.210499" r="1.511811" /> -<line x1="352.184777" y1="525.887664" x2="342.735958" y2="525.887664" /> -<circle fill="black" - cx="342.735958" cy="525.887664" r="1.511811" /> -<line x1="427.775328" y1="503.210499" x2="437.224147" y2="503.210499" /> -<circle fill="black" - cx="437.224147" cy="503.210499" r="1.511811" /> -<line x1="427.775328" y1="525.887664" x2="437.224147" y2="525.887664" /> -<circle fill="black" - cx="437.224147" cy="525.887664" r="1.511811" /> -</g> -<g> -<rect x="458.011549" y="496.470341" width="37.795276" height="25.19685" /> -<line x1="458.011549" y1="509.068766" x2="448.56273" y2="509.068766" /> -<circle fill="black" - cx="448.56273" cy="509.068766" r="1.511811" /> -<line x1="495.806824" y1="509.068766" x2="505.255643" y2="509.068766" /> -<circle fill="black" - cx="505.255643" cy="509.068766" r="1.511811" /> -<line x1="476.909186" y1="521.667192" x2="476.909186" y2="531.11601" /> -<circle fill="black" - cx="476.909186" cy="531.11601" r="1.511811" /> -</g> -<g> -<rect x="31.302887" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="35.082415" y="584.470341"><tspan font-size="75%">D</tspan></text> -<line x1="31.302887" y1="578.80105" x2="1.066667" y2="578.80105" /> -<polyline points="31.302887,650.612073 37.849221,646.832546 -31.302887,643.053018" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="41.628748" y="652.501837"><tspan font-size="75%">CK</tspan></text> -<line x1="31.302887" y1="646.832546" x2="1.066667" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.232021" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="122.011549" y1="578.80105" x2="152.247769" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.232021" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="122.011549" y1="646.832546" x2="152.247769" y2="646.832546" /> -</g> -<g> -<rect x="190.043045" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="193.822572" y="584.470341"><tspan font-size="75%">T</tspan></text> -<line x1="190.043045" y1="578.80105" x2="159.806824" y2="578.80105" /> -<polyline points="190.043045,650.612073 196.589378,646.832546 -190.043045,643.053018" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="200.368906" y="652.501837"><tspan font-size="75%">CK</tspan></text> -<line x1="190.043045" y1="646.832546" x2="159.806824" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="276.972178" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="280.751706" y1="578.80105" x2="310.987927" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="276.972178" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="280.751706" y1="646.832546" x2="310.987927" y2="646.832546" /> -</g> -<g> -<rect x="348.783202" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="352.56273" y="584.470341"><tspan font-size="75%">R</tspan></text> -<line x1="348.783202" y1="578.80105" x2="318.546982" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="352.56273" y="652.501837"><tspan font-size="75%">S</tspan></text> -<line x1="348.783202" y1="646.832546" x2="318.546982" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="435.712336" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="439.491864" y1="578.80105" x2="469.728084" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="435.712336" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="439.491864" y1="646.832546" x2="469.728084" y2="646.832546" /> -</g> -<g> -<rect x="507.52336" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="511.302887" y="573.131759"><tspan font-size="75%">J</tspan></text> -<line x1="507.52336" y1="567.462467" x2="477.287139" y2="567.462467" /> -<polyline points="507.52336,616.596325 514.069693,612.816798 -507.52336,609.03727" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="517.849221" y="618.486089"><tspan font-size="75%">CK</tspan></text> -<circle cx="503.743832" cy="612.816798" r="3.779528" /> -<line x1="499.964304" y1="612.816798" x2="477.287139" y2="612.816798" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="511.302887" y="663.84042"><tspan font-size="75%">K</tspan></text> -<line x1="507.52336" y1="658.171129" x2="477.287139" y2="658.171129" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="552.87769" y="559.903412"><tspan font-size="75%">CLR</tspan></text> -<circle cx="552.87769" cy="541.005774" r="3.779528" /> -<line x1="552.87769" y1="537.226247" x2="552.87769" y2="514.549081" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="594.452493" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="598.232021" y1="578.80105" x2="628.468241" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="594.452493" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="598.232021" y1="646.832546" x2="628.468241" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="552.87769" y="677.068766"><tspan font-size="75%">PR</tspan></text> -<circle cx="552.87769" cy="684.627822" r="3.779528" /> -<line x1="552.87769" y1="688.407349" x2="552.87769" y2="711.084514" /> -</g> -</g> -</g></svg> diff --git a/graphics/circuit_macros/examples/dpv/quick.m4 b/graphics/circuit_macros/examples/dpv/quick.m4 deleted file mode 100644 index 7de2399601..0000000000 --- a/graphics/circuit_macros/examples/dpv/quick.m4 +++ /dev/null @@ -1,16 +0,0 @@ -.PS # Pic input begins with .PS -cct_init # Read in macro definitions and set defaults -elen = 0.75 # Variables are allowed; default units are inches -Origin: Here # Position names are capitalized - source(up_ elen); llabel(-,v_s,+) - resistor(right_ elen); rlabel(,R,) - dot - { # Save the current position and direction - capacitor(down_ to (Here,Origin)) #(Here,Origin) = (Here.x,Origin.y) - rlabel(+,v,-); llabel(,C,) - dot - } # Restore position and direction - line right_ elen*2/3 - inductor(down_ Here.y-Origin.y); rlabel(,L,); b_current(i) - line to Origin -.PE # Pic input ends diff --git a/graphics/circuit_macros/examples/dpv/quick.pic b/graphics/circuit_macros/examples/dpv/quick.pic deleted file mode 100644 index 1f06d07e48..0000000000 --- a/graphics/circuit_macros/examples/dpv/quick.pic +++ /dev/null @@ -1,124 +0,0 @@ -.PS # Pic input begins with .PS -# cct_init Version 10.1: TikZ PGF m4 macro settings. - - # gen_init Version 10.1: TikZ PGF m4 macro settings. - - - define rpoint__ { - rp_wid = last line.end.x-last line.start.x - rp_ht = last line.end.y-last line.start.y - rp_len = sqrt(abs((rp_wid)^2+(rp_ht)^2)); move to last line.start - rp_ang = atan2(rp_ht,rp_wid) } - - rtod_ = 57.295779513082323; dtor_ = 0.017453292519943295 - twopi_ = 6.2831853071795862; pi_ = (twopi_/2) - rp_ang = 0; right - - - linethick = 0.8 - arrowwid = 0.05*scale; arrowht = 0.1*scale - - - # gen_init end - - - -# cct_init end - # Read in macro definitions and set defaults -elen = 0.75 # Variables are allowed; default units are inches -Origin: Here # Position names are capitalized - line invis up elen - rpoint__ - - - { line to Here+(((rp_len/2-(0.25*linewid))*(cos(rp_ang))),((rp_len/2-(0.25*linewid))*(sin(rp_ang)))) - move to Here+((((0.25*linewid))*(cos(rp_ang))),(((0.25*linewid))*(sin(rp_ang)))) - { Src_C: circle rad (0.25*linewid) at Here } - - line from Here+((((0.25*linewid))*(cos(rp_ang))),(((0.25*linewid))*(sin(rp_ang)))) \ - to Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - {[box invis wid (0.25*linewid)*2 ht (0.25*linewid)*2] at Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis ; {"$ -$" \ - at last [].s rjust below }; {"$ v_s$" \ - at last [].w rjust }; {"$ +$" \ - at last [].n rjust above }; - line invis right elen - rpoint__ - - - if linewid/6/4*6*2 > rp_len then { line invis to Here+(((linewid/6/4*6*2)*(cos(rp_ang))),((linewid/6/4*6*2)*(sin(rp_ang)))) - rpoint__ - - } - M4_xyO: last line.c - { line from last line.start to M4_xyO+(((((linewid/6/4)*(-6)))*(cos(rp_ang))),((((linewid/6/4)*(-6)))*(sin(rp_ang))))\ - then to M4_xyO+((((((linewid/6/4)*(-5)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(-5)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((((linewid/6/4)*(-3)))*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(-3)))*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ -then to M4_xyO+(((((-(linewid/6/4)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),((((-(linewid/6/4)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((linewid/6/4)*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((linewid/6/4)*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ -then to M4_xyO+((((((linewid/6/4)*(3)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(3)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((((linewid/6/4)*(5)))*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(5)))*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ - then to M4_xyO+(((((linewid/6/4)*(6)))*(cos(rp_ang))),((((linewid/6/4)*(6)))*(sin(rp_ang)))) \ - then to last line.end - [box invis ht linewid/6/4*2*2 wid linewid/6/4*6*2] at 2nd last line.c - } - - - -# - line invis from 2nd last line.start to 2nd last line.end ; {"$ R$" \ - at last [].s below }; - [ circle rad (0.04*linewid) fill 0 ] at Here - move to last [] - { # Save the current position and direction - line invis down to (Here,Origin) - rpoint__ - - - { line to Here+(((rp_len/2-linewid/3*0.3/2)*(cos(rp_ang))),((rp_len/2-linewid/3*0.3/2)*(sin(rp_ang)))) - {line from Here+(((-linewid/3/2)*((-sin(rp_ang)))),((-linewid/3/2)*(cos(rp_ang)))) \ - to Here+(((linewid/3/2)*((-sin(rp_ang)))),((linewid/3/2)*(cos(rp_ang))))} - - move to Here+(((linewid/3*0.3)*(cos(rp_ang))),((linewid/3*0.3)*(sin(rp_ang)))) - {line from Here+(((-linewid/3/2)*((-sin(rp_ang)))),((-linewid/3/2)*(cos(rp_ang)))) \ - to Here+(((linewid/3/2)*((-sin(rp_ang)))),((linewid/3/2)*(cos(rp_ang))))} - line to Here+(((rp_len/2-linewid/3*0.3/2)*(cos(rp_ang))),((rp_len/2-linewid/3*0.3/2)*(sin(rp_ang)))) - - - - - - - - } - - {[box invis wid linewid/3 ht linewid/3*0.3 ] at Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis #(Here,Origin) = (Here.x,Origin.y) - {"$ +$" \ - at last [].n rjust above }; {"$ v$" \ - at last [].l rjust }; {"$ -$" \ - at last [].s rjust below }; ; {"$ C$" \ - at last [].e ljust }; - [ circle rad (0.04*linewid) fill 0 ] at Here - move to last [] - } # Restore position and direction - line right elen*2/3 - line invis down Here.y-Origin.y - rpoint__ - - - { line to Here+((((rp_len-4*linewid/16*2)/2)*(cos(rp_ang))),(((rp_len-4*linewid/16*2)/2)*(sin(rp_ang)))) - {M4coil: [ S: Here; - {line to Here+(((-(linethick *(scale/72)/2))*((-sin(rp_ang)))),((-(linethick *(scale/72)/2))*(cos(rp_ang))))}; - for m4i=1 to 4 do { - arc cw from Here to Here+(((linewid/16*2)*(cos(rp_ang))),((linewid/16*2)*(sin(rp_ang)))) with .c at Here+(((linewid/16)*(cos(rp_ang))),((linewid/16)*(sin(rp_ang)))) - {line to Here+(((-(linethick *(scale/72)/2))*((-sin(rp_ang)))),((-(linethick *(scale/72)/2))*(cos(rp_ang))))} } ] with .S at Here } - - line from Here+(((4*linewid/16*2)*(cos(rp_ang))),((4*linewid/16*2)*(sin(rp_ang)))) to Here+((((rp_len+4*linewid/16*2)/2)*(cos(rp_ang))),(((rp_len+4*linewid/16*2)/2)*(sin(rp_ang)))) } - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis ; {"$ L$" \ - at last [].l rjust }; ; - { move to last line.start+(((((rp_len-last [].ht)/2*2/3+arrowht/3))*(cos(rp_ang))),((((rp_len-last [].ht)/2*2/3+arrowht/3))*(sin(rp_ang)))) - arrow <- to Here+(((-arrowht)*(cos(rp_ang))),((-arrowht)*(sin(rp_ang)))) "$ i$" \ - ljust} - line to Origin -.PE # Pic input ends diff --git a/graphics/circuit_macros/examples/dpv/quick.svg b/graphics/circuit_macros/examples/dpv/quick.svg deleted file mode 100644 index b07cccbda8..0000000000 --- a/graphics/circuit_macros/examples/dpv/quick.svg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- This file was generated by dvisvgm 2.9.1 --> -<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='121.2pt' height='59.24pt' viewBox='0 -59.24 121.2 59.24'> -<g id='page1'> -<g transform='matrix(1 0 0 -1 0 0)'> -<path d='M22.929688 1.839844V19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M31.92578 28.8398C31.92578 33.8125 27.89844 37.8398 22.929688 37.8398C17.95703 37.8398 13.92969 33.8125 13.92969 28.8398C13.92969 23.8711 17.95703 19.8398 22.929688 19.8398C27.89844 19.8398 31.92578 23.8711 31.92578 28.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M22.929688 37.8398V55.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M20.2234 14.79893C20.39277 14.79893 20.57215 14.79893 20.57215 14.99831C20.57215 15.19737 20.39277 15.19737 20.2234 15.19737H14.83434C14.66496 15.19737 14.485898 15.19737 14.485898 14.99831C14.485898 14.79893 14.66496 14.79893 14.83434 14.79893H20.2234Z'/> -<path d='M7.98188 31.14761C7.98188 31.68543 7.72282 31.8448 7.54344 31.8448C7.29438 31.8448 7.05532 31.58574 7.05532 31.36668C7.05532 31.2373 7.10532 31.1773 7.21469 31.06793C7.42407 30.86855 7.55344 30.6098 7.55344 30.25105C7.55344 29.83261 6.94594 27.551676 5.78032 27.551676C5.27251 27.551676 5.04344 27.900113 5.04344 28.418238C5.04344 28.97605 5.31219 29.70324 5.62094 30.53011C5.69063 30.69918 5.74063 30.83886 5.74063 31.02793C5.74063 31.47636 5.42188 31.8448 4.92376 31.8448C3.987506 31.8448 3.608756 30.40043 3.608756 30.31074C3.608756 30.21136 3.708444 30.21136 3.728444 30.21136C3.828131 30.21136 3.838131 30.23105 3.887819 30.39043C4.176569 31.39668 4.60501 31.62574 4.89376 31.62574C4.97344 31.62574 5.14282 31.62574 5.14282 31.30699C5.14282 31.05793 5.04344 30.78886 4.97344 30.6098C4.53532 29.45418 4.40563 28.99605 4.40563 28.56761C4.40563 27.491676 5.28251 27.332301 5.74063 27.332301C7.41407 27.332301 7.98188 30.62949 7.98188 31.14761Z'/> -<path d='M11.15622 28.57052C10.97497 28.52865 10.86309 28.3824 10.86309 28.24271C10.86309 28.0824 11.00278 28.01959 11.09341 28.01959C11.16309 28.01959 11.42809 28.06146 11.42809 28.41709C11.42809 28.87052 10.92591 29.02396 10.50059 29.02396C9.41247 29.02396 9.21716 28.22177 9.21716 28.00552C9.21716 27.74771 9.36372 27.58021 9.46122 27.49646C9.64247 27.35709 9.76809 27.32896 10.24934 27.24552C10.39591 27.2174 10.84247 27.13365 10.84247 26.784899C10.84247 26.666462 10.76559 26.401462 10.47278 26.227087C10.20059 26.073649 9.85872 26.073649 9.77528 26.073649C9.49622 26.073649 9.098719 26.136462 8.938094 26.366462C9.16841 26.394274 9.32184 26.568649 9.32184 26.763962C9.32184 26.938337 9.19622 27.02209 9.049656 27.02209C8.847469 27.02209 8.645281 26.861774 8.645281 26.554899C8.645281 26.136462 9.091531 25.878337 9.76809 25.878337C11.05153 25.878337 11.28872 26.757087 11.28872 27.02927C11.28872 27.67084 10.58434 27.79646 10.32622 27.84521C10.26341 27.85927 10.08903 27.88709 10.04716 27.90115C9.78903 27.9499 9.66341 28.09646 9.66341 28.2499C9.66341 28.41021 9.78903 28.59865 9.94247 28.69615C10.13091 28.8149 10.37497 28.82865 10.49372 28.82865C10.63997 28.82865 11.00278 28.80771 11.15622 28.57052Z'/> -<path d='M17.73309 42.48097H20.51246C20.65184 42.48097 20.84121 42.48097 20.84121 42.68034C20.84121 42.8794 20.65184 42.8794 20.51246 42.8794H17.73309V45.66878C17.73309 45.80815 17.73309 45.99753 17.53402 45.99753C17.33465 45.99753 17.33465 45.80815 17.33465 45.66878V42.8794H14.545586C14.406211 42.8794 14.216836 42.8794 14.216836 42.68034C14.216836 42.48097 14.406211 42.48097 14.545586 42.48097H17.33465V39.691903C17.33465 39.552528 17.33465 39.363153 17.53402 39.363153C17.73309 39.363153 17.73309 39.552528 17.73309 39.691903V42.48097Z'/> -<path d='M22.929688 55.8398H40.9297L42.4297 58.8398L45.4297 52.8398L48.4297 58.8398L51.4297 52.8398L54.4297 58.8398L57.4297 52.8398L58.9297 55.8398H76.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M49.84228 50.62824C49.90228 50.86731 49.93197 50.96699 50.12134 50.99668C50.21103 51.00668 50.52978 51.00668 50.72884 51.00668C51.43634 51.00668 52.54197 51.00668 52.54197 50.02043C52.54197 49.68199 52.38259 48.99449 51.99416 48.60606C51.73509 48.34699 51.20697 48.02824 50.31072 48.02824H49.19509L49.84228 50.62824ZM51.27697 47.89887C52.28291 48.11793 53.46822 48.81512 53.46822 49.82137C53.46822 50.67793 52.57166 51.31543 51.26697 51.31543H48.42791C48.22884 51.31543 48.13916 51.31543 48.13916 51.11637C48.13916 51.00668 48.22884 51.00668 48.41791 51.00668C48.43791 51.00668 48.62728 51.00668 48.79634 50.98668C48.97572 50.96699 49.06541 50.95699 49.06541 50.82731C49.06541 50.78762 49.05541 50.75762 49.02572 50.63824L47.69072 45.288869C47.59134 44.900432 47.57134 44.820744 46.784469 44.820744C46.605094 44.820744 46.515407 44.820744 46.515407 44.621682C46.515407 44.511994 46.634782 44.511994 46.654782 44.511994C46.933844 44.511994 47.63103 44.541994 47.91009 44.541994C48.18884 44.541994 48.89603 44.511994 49.17509 44.511994C49.25478 44.511994 49.37416 44.511994 49.37416 44.711369C49.37416 44.820744 49.28447 44.820744 49.09541 44.820744C48.72666 44.820744 48.44791 44.820744 48.44791 45.000119C48.44791 45.059807 48.46791 45.109807 48.47759 45.169494L49.13509 47.80918H50.32072C51.22697 47.80918 51.40634 47.25137 51.40634 46.90262C51.40634 46.75324 51.32666 46.44449 51.26697 46.21543C51.19728 45.93637 51.10759 45.56793 51.10759 45.368557C51.10759 44.292932 52.30291 44.292932 52.43228 44.292932C53.27916 44.292932 53.62759 45.298869 53.62759 45.438244C53.62759 45.55793 53.51822 45.55793 53.50822 45.55793C53.41853 45.55793 53.39853 45.488244 53.37853 45.418557C53.12978 44.681369 52.70134 44.511994 52.47228 44.511994C52.14353 44.511994 52.07384 44.731057 52.07384 45.119494C52.07384 45.428557 52.13353 45.93637 52.17322 46.25512C52.19322 46.39481 52.21322 46.58387 52.21322 46.72324C52.21322 47.49043 51.54572 47.79918 51.27697 47.89887Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398V30.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 30.6406H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 27.0391H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 27.0391V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M71.73309 35.27992H74.51246C74.65184 35.27992 74.84121 35.27992 74.84121 35.4793C74.84121 35.67836 74.65184 35.67836 74.51246 35.67836H71.73309V38.46774C71.73309 38.60711 71.73309 38.79649 71.53402 38.79649C71.33465 38.79649 71.33465 38.60711 71.33465 38.46774V35.67836H68.545586C68.406211 35.67836 68.216836 35.67836 68.216836 35.4793C68.216836 35.27992 68.406211 35.27992 68.545586 35.27992H71.33465V32.490861C71.33465 32.351486 71.33465 32.162111 71.53402 32.162111C71.73309 32.162111 71.73309 32.351486 71.73309 32.490861V35.27992Z'/> -<path d='M68.88389 30.40063C68.88389 30.93844 68.62483 31.09782 68.44545 31.09782C68.19639 31.09782 67.95733 30.83876 67.95733 30.61969C67.95733 30.49032 68.00733 30.43032 68.1167 30.32094C68.32608 30.12157 68.45545 29.86282 68.45545 29.50407C68.45545 29.08563 67.84795 26.804694 66.68233 26.804694C66.17451 26.804694 65.94545 27.153131 65.94545 27.671256C65.94545 28.22907 66.2142 28.95626 66.52295 29.78313C66.59264 29.95219 66.64264 30.09188 66.64264 30.28094C66.64264 30.72938 66.32389 31.09782 65.82576 31.09782C64.889513 31.09782 64.510763 29.65344 64.510763 29.56376C64.510763 29.46438 64.610451 29.46438 64.630451 29.46438C64.730138 29.46438 64.740138 29.48407 64.789826 29.64344C65.078576 30.64969 65.50701 30.87876 65.79576 30.87876C65.87545 30.87876 66.04483 30.87876 66.04483 30.56001C66.04483 30.31094 65.94545 30.04188 65.87545 29.86282C65.43733 28.70719 65.30764 28.24907 65.30764 27.82063C65.30764 26.744694 66.18451 26.585319 66.64264 26.585319C68.31608 26.585319 68.88389 29.88251 68.88389 30.40063Z'/> -<path d='M74.2234 21.99998C74.39277 21.99998 74.57215 21.99998 74.57215 22.19935C74.57215 22.39841 74.39277 22.39841 74.2234 22.39841H68.83434C68.66496 22.39841 68.485898 22.39841 68.485898 22.19935C68.485898 21.99998 68.66496 21.99998 68.83434 21.99998H74.2234Z'/> -<path d='M92.01759 32.35915C92.01759 32.38884 91.99759 32.45884 91.9079 32.45884C91.8779 32.45884 91.86822 32.44884 91.75853 32.33915L91.06134 31.57228C90.97165 31.71165 90.51322 32.45884 89.40759 32.45884C87.18634 32.45884 84.945091 30.25728 84.945091 27.94634C84.945091 26.302592 86.1204 25.216967 87.64447 25.216967C88.51103 25.216967 89.26822 25.615405 89.79603 26.07353C90.72259 26.8904 90.89197 27.79697 90.89197 27.82666C90.89197 27.92634 90.79228 27.92634 90.77228 27.92634C90.71259 27.92634 90.6629 27.90634 90.6429 27.82666C90.55322 27.5379 90.32415 26.83072 89.63665 26.252905C88.94947 25.695092 88.32197 25.525717 87.80384 25.525717C86.90728 25.525717 85.85165 26.04353 85.85165 27.59759C85.85165 28.1654 86.06072 29.77915 87.05665 30.94447C87.66447 31.65197 88.60072 32.14978 89.48728 32.14978C90.50353 32.14978 91.09103 31.38291 91.09103 30.22728C91.09103 29.82884 91.06134 29.81884 91.06134 29.71947C91.06134 29.61978 91.17072 29.61978 91.21072 29.61978C91.34009 29.61978 91.34009 29.63978 91.39009 29.81884L92.01759 32.35915Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398H112.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 55.8398V37.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398C113.7344 37.8398 114.4766 37.4102 114.8789 36.7148C115.2773 36.0195 115.2773 35.1602 114.8789 34.4648C114.4766 33.7695 113.7344 33.3398 112.9297 33.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398C113.7344 33.3398 114.4766 32.9102 114.8789 32.2148C115.2773 31.5195 115.2773 30.6602 114.8789 29.9648C114.4766 29.2695 113.7344 28.8398 112.9297 28.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398C113.7344 28.8398 114.4766 28.4102 114.8789 27.7148C115.2773 27.0195 115.2773 26.1602 114.8789 25.4648C114.4766 24.7695 113.7344 24.3398 112.9297 24.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398C113.7344 24.3398 114.4766 23.9102 114.8789 23.2148C115.2773 22.5195 115.2773 21.6602 114.8789 20.9648C114.4766 20.2695 113.7344 19.8398 112.9297 19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M107.9536 31.46259C108.04297 31.82103 108.07297 31.93072 109.00922 31.93072C109.30828 31.93072 109.38797 31.93072 109.38797 32.12009C109.38797 32.23947 109.27828 32.23947 109.2286 32.23947C108.89985 32.23947 108.08297 32.20978 107.75422 32.20978C107.45547 32.20978 106.72828 32.23947 106.42953 32.23947C106.35953 32.23947 106.24016 32.23947 106.24016 32.0404C106.24016 31.93072 106.32985 31.93072 106.51891 31.93072C106.53891 31.93072 106.72828 31.93072 106.89766 31.91072C107.07703 31.89103 107.16641 31.88103 107.16641 31.75134C107.16641 31.71165 107.15672 31.68166 107.12672 31.56228L105.79203 26.212905C105.69235 25.824467 105.67235 25.74478 104.885471 25.74478C104.716096 25.74478 104.616409 25.74478 104.616409 25.545717C104.616409 25.43603 104.706096 25.43603 104.885471 25.43603H109.49735C109.73641 25.43603 109.74641 25.43603 109.80641 25.605405L110.59328 27.75697C110.63297 27.86666 110.63297 27.88634 110.63297 27.89634C110.63297 27.93634 110.60328 28.00603 110.5136 28.00603C110.42391 28.00603 110.41391 27.95634 110.34422 27.79697C110.00547 26.8804 109.56703 25.74478 107.84391 25.74478H106.90766C106.76797 25.74478 106.74828 25.74478 106.68828 25.75478C106.58891 25.76478 106.55891 25.77478 106.55891 25.854467C106.55891 25.884155 106.55891 25.904155 106.6086 26.08353L107.9536 31.46259Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z' stroke='#000' fill='none' stroke-width='.5' stroke-miterlimit='10'/> -<path d='M112.9297 43.0898V48.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M117.27603 48.80461C117.27603 49.00398 117.13634 49.16336 116.90728 49.16336C116.63853 49.16336 116.36947 48.90429 116.36947 48.63555C116.36947 48.44617 116.50884 48.27679 116.7479 48.27679C116.97697 48.27679 117.27603 48.50586 117.27603 48.80461ZM116.51884 45.05929C116.63853 45.34836 116.63853 45.36805 116.7379 45.63711C116.81759 45.83617 116.86759 45.97586 116.86759 46.16492C116.86759 46.61336 116.54884 46.98179 116.05072 46.98179C115.114466 46.98179 114.735716 45.53742 114.735716 45.44773C114.735716 45.34836 114.835404 45.34836 114.855404 45.34836C114.955091 45.34836 114.965091 45.36805 115.014779 45.52742C115.283841 46.46398 115.68228 46.76273 116.02072 46.76273C116.1004 46.76273 116.26978 46.76273 116.26978 46.44398C116.26978 46.23461 116.20009 46.02555 116.1604 45.92586C116.08072 45.66711 115.63228 44.51148 115.4729 44.08305C115.373216 43.82398 115.243841 43.495545 115.243841 43.28617C115.243841 42.818045 115.58259 42.469295 116.06072 42.469295C116.99697 42.469295 117.36572 43.91367 117.36572 44.00336C117.36572 44.10304 117.27603 44.10304 117.24603 44.10304C117.14634 44.10304 117.14634 44.07305 117.09665 43.92367C116.91728 43.29617 116.58853 42.68867 116.08072 42.68867C115.91134 42.68867 115.84165 42.788045 115.84165 43.01742C115.84165 43.26617 115.90134 43.405858 116.1304 44.01336L116.51884 45.05929Z'/> -<path d='M112.9297 1.839844H22.929688' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -</g> -</g> -</svg> diff --git a/graphics/circuit_macros/examples/dpv/quick.tex b/graphics/circuit_macros/examples/dpv/quick.tex deleted file mode 100644 index e59bd8597f..0000000000 --- a/graphics/circuit_macros/examples/dpv/quick.tex +++ /dev/null @@ -1,188 +0,0 @@ -\begin{tikzpicture}[scale=2.54]% -% dpic version 2022.12.01 option -g for TikZ and PGF 1.01 -\ifx\dpiclw\undefined\newdimen\dpiclw\fi -\global\def\dpicdraw{\draw[line width=\dpiclw]} -\global\def\dpicstop{;} -\dpiclw=0.8bp -\dpiclw=0.8bp -\dpicdraw (0,0) - --(0,0.25)\dpicstop -\dpicdraw (0,0.375) circle (0.049213in)\dpicstop -\dpicdraw (0,0.5) - --(0,0.75)\dpicstop -\draw (0,0.25) node[below left=-2bp]{$ -$}; -\draw (-0.125,0.375) node[left=-2bp]{$ v_s$}; -\draw (0,0.5) node[above left=-2bp]{$ +$}; -\dpicdraw (0,0.75) - --(0.25,0.75) - --(0.270833,0.791667) - --(0.3125,0.708333) - --(0.354167,0.791667) - --(0.395833,0.708333) - --(0.4375,0.791667) - --(0.479167,0.708333) - --(0.5,0.75) - --(0.75,0.75)\dpicstop -\draw (0.375,0.708333) node[below=-2bp]{$ R$}; -\dpicdraw[fill=black](0.75,0.75) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(0.75,0.4)\dpicstop -\dpicdraw (0.666667,0.4) - --(0.833333,0.4)\dpicstop -\dpicdraw (0.666667,0.35) - --(0.833333,0.35)\dpicstop -\dpicdraw (0.75,0.35) - --(0.75,0)\dpicstop -\draw (0.75,0.4) node[above left=-2bp]{$ +$}; -\draw (0.666667,0.375) node[left=-2bp]{$ v$}; -\draw (0.75,0.35) node[below left=-2bp]{$ -$}; -\draw (0.833333,0.375) node[right=-2bp]{$ C$}; -\dpicdraw[fill=black](0.75,0) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(1.25,0.75)\dpicstop -\dpicdraw (1.25,0.75) - --(1.25,0.5)\dpicstop -\dpicdraw (1.25,0.5) - --(1.244444,0.5)\dpicstop -\dpicdraw (1.25,0.5) - ..controls (1.261165,0.5) and (1.271481,0.494044) - ..(1.277063,0.484375) - ..controls (1.282646,0.474706) and (1.282646,0.462794) - ..(1.277063,0.453125) - ..controls (1.271481,0.443456) and (1.261165,0.4375) - ..(1.25,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - --(1.244444,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - ..controls (1.261165,0.4375) and (1.271481,0.431544) - ..(1.277063,0.421875) - ..controls (1.282646,0.412206) and (1.282646,0.400294) - ..(1.277063,0.390625) - ..controls (1.271481,0.380956) and (1.261165,0.375) - ..(1.25,0.375)\dpicstop -\dpicdraw (1.25,0.375) - --(1.244444,0.375)\dpicstop -\dpicdraw (1.25,0.375) - ..controls (1.261165,0.375) and (1.271481,0.369044) - ..(1.277063,0.359375) - ..controls (1.282646,0.349706) and (1.282646,0.337794) - ..(1.277063,0.328125) - ..controls (1.271481,0.318456) and (1.261165,0.3125) - ..(1.25,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - --(1.244444,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - ..controls (1.261165,0.3125) and (1.271481,0.306544) - ..(1.277063,0.296875) - ..controls (1.282646,0.287206) and (1.282646,0.275294) - ..(1.277063,0.265625) - ..controls (1.271481,0.255956) and (1.261165,0.25) - ..(1.25,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.244444,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.25,0)\dpicstop -\draw (1.244444,0.375) node[left=-2bp]{$ L$}; -\filldraw[line width=0bp](1.225,0.65) - --(1.25,0.55) - --(1.275,0.65) --cycle\dpicstop -\dpicdraw (1.25,0.572906) - --(1.25,0.65)\dpicstop -\draw (1.25,0.611453) node[right=-2bp]{$ i$}; -\dpicdraw (1.25,0) - --(0,0)\dpicstop -\end{tikzpicture}% -\begin{tikzpicture}[scale=2.54]% -% dpic version 2022.12.01 option -g for TikZ and PGF 1.01 -\ifx\dpiclw\undefined\newdimen\dpiclw\fi -\global\def\dpicdraw{\draw[line width=\dpiclw]} -\global\def\dpicstop{;} -\dpiclw=0.8bp -\dpiclw=0.8bp -\dpicdraw (0,0) - --(0,0.25)\dpicstop -\dpicdraw (0,0.375) circle (0.049213in)\dpicstop -\dpicdraw (0,0.5) - --(0,0.75)\dpicstop -\draw (0,0.25) node[below left=-2bp]{$ -$}; -\draw (-0.125,0.375) node[left=-2bp]{$ v_s$}; -\draw (0,0.5) node[above left=-2bp]{$ +$}; -\dpicdraw (0,0.75) - --(0.25,0.75) - --(0.270833,0.791667) - --(0.3125,0.708333) - --(0.354167,0.791667) - --(0.395833,0.708333) - --(0.4375,0.791667) - --(0.479167,0.708333) - --(0.5,0.75) - --(0.75,0.75)\dpicstop -\draw (0.375,0.708333) node[below=-2bp]{$ R$}; -\dpicdraw[fill=black](0.75,0.75) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(0.75,0.4)\dpicstop -\dpicdraw (0.666667,0.4) - --(0.833333,0.4)\dpicstop -\dpicdraw (0.666667,0.35) - --(0.833333,0.35)\dpicstop -\dpicdraw (0.75,0.35) - --(0.75,0)\dpicstop -\draw (0.75,0.4) node[above left=-2bp]{$ +$}; -\draw (0.666667,0.375) node[left=-2bp]{$ v$}; -\draw (0.75,0.35) node[below left=-2bp]{$ -$}; -\draw (0.833333,0.375) node[right=-2bp]{$ C$}; -\dpicdraw[fill=black](0.75,0) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(1.25,0.75)\dpicstop -\dpicdraw (1.25,0.75) - --(1.25,0.5)\dpicstop -\dpicdraw (1.25,0.5) - --(1.244444,0.5)\dpicstop -\dpicdraw (1.25,0.5) - ..controls (1.261165,0.5) and (1.271481,0.494044) - ..(1.277063,0.484375) - ..controls (1.282646,0.474706) and (1.282646,0.462794) - ..(1.277063,0.453125) - ..controls (1.271481,0.443456) and (1.261165,0.4375) - ..(1.25,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - --(1.244444,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - ..controls (1.261165,0.4375) and (1.271481,0.431544) - ..(1.277063,0.421875) - ..controls (1.282646,0.412206) and (1.282646,0.400294) - ..(1.277063,0.390625) - ..controls (1.271481,0.380956) and (1.261165,0.375) - ..(1.25,0.375)\dpicstop -\dpicdraw (1.25,0.375) - --(1.244444,0.375)\dpicstop -\dpicdraw (1.25,0.375) - ..controls (1.261165,0.375) and (1.271481,0.369044) - ..(1.277063,0.359375) - ..controls (1.282646,0.349706) and (1.282646,0.337794) - ..(1.277063,0.328125) - ..controls (1.271481,0.318456) and (1.261165,0.3125) - ..(1.25,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - --(1.244444,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - ..controls (1.261165,0.3125) and (1.271481,0.306544) - ..(1.277063,0.296875) - ..controls (1.282646,0.287206) and (1.282646,0.275294) - ..(1.277063,0.265625) - ..controls (1.271481,0.255956) and (1.261165,0.25) - ..(1.25,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.244444,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.25,0)\dpicstop -\draw (1.244444,0.375) node[left=-2bp]{$ L$}; -\filldraw[line width=0bp](1.225,0.65) - --(1.25,0.55) - --(1.275,0.65) --cycle\dpicstop -\dpicdraw (1.25,0.572906) - --(1.25,0.65)\dpicstop -\draw (1.25,0.611453) node[right=-2bp]{$ i$}; -\dpicdraw (1.25,0) - --(0,0)\dpicstop -\end{tikzpicture}% diff --git a/graphics/circuit_macros/examples/dpv/quick.xsvg b/graphics/circuit_macros/examples/dpv/quick.xsvg deleted file mode 100644 index b07cccbda8..0000000000 --- a/graphics/circuit_macros/examples/dpv/quick.xsvg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- This file was generated by dvisvgm 2.9.1 --> -<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='121.2pt' height='59.24pt' viewBox='0 -59.24 121.2 59.24'> -<g id='page1'> -<g transform='matrix(1 0 0 -1 0 0)'> -<path d='M22.929688 1.839844V19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M31.92578 28.8398C31.92578 33.8125 27.89844 37.8398 22.929688 37.8398C17.95703 37.8398 13.92969 33.8125 13.92969 28.8398C13.92969 23.8711 17.95703 19.8398 22.929688 19.8398C27.89844 19.8398 31.92578 23.8711 31.92578 28.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M22.929688 37.8398V55.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M20.2234 14.79893C20.39277 14.79893 20.57215 14.79893 20.57215 14.99831C20.57215 15.19737 20.39277 15.19737 20.2234 15.19737H14.83434C14.66496 15.19737 14.485898 15.19737 14.485898 14.99831C14.485898 14.79893 14.66496 14.79893 14.83434 14.79893H20.2234Z'/> -<path d='M7.98188 31.14761C7.98188 31.68543 7.72282 31.8448 7.54344 31.8448C7.29438 31.8448 7.05532 31.58574 7.05532 31.36668C7.05532 31.2373 7.10532 31.1773 7.21469 31.06793C7.42407 30.86855 7.55344 30.6098 7.55344 30.25105C7.55344 29.83261 6.94594 27.551676 5.78032 27.551676C5.27251 27.551676 5.04344 27.900113 5.04344 28.418238C5.04344 28.97605 5.31219 29.70324 5.62094 30.53011C5.69063 30.69918 5.74063 30.83886 5.74063 31.02793C5.74063 31.47636 5.42188 31.8448 4.92376 31.8448C3.987506 31.8448 3.608756 30.40043 3.608756 30.31074C3.608756 30.21136 3.708444 30.21136 3.728444 30.21136C3.828131 30.21136 3.838131 30.23105 3.887819 30.39043C4.176569 31.39668 4.60501 31.62574 4.89376 31.62574C4.97344 31.62574 5.14282 31.62574 5.14282 31.30699C5.14282 31.05793 5.04344 30.78886 4.97344 30.6098C4.53532 29.45418 4.40563 28.99605 4.40563 28.56761C4.40563 27.491676 5.28251 27.332301 5.74063 27.332301C7.41407 27.332301 7.98188 30.62949 7.98188 31.14761Z'/> -<path d='M11.15622 28.57052C10.97497 28.52865 10.86309 28.3824 10.86309 28.24271C10.86309 28.0824 11.00278 28.01959 11.09341 28.01959C11.16309 28.01959 11.42809 28.06146 11.42809 28.41709C11.42809 28.87052 10.92591 29.02396 10.50059 29.02396C9.41247 29.02396 9.21716 28.22177 9.21716 28.00552C9.21716 27.74771 9.36372 27.58021 9.46122 27.49646C9.64247 27.35709 9.76809 27.32896 10.24934 27.24552C10.39591 27.2174 10.84247 27.13365 10.84247 26.784899C10.84247 26.666462 10.76559 26.401462 10.47278 26.227087C10.20059 26.073649 9.85872 26.073649 9.77528 26.073649C9.49622 26.073649 9.098719 26.136462 8.938094 26.366462C9.16841 26.394274 9.32184 26.568649 9.32184 26.763962C9.32184 26.938337 9.19622 27.02209 9.049656 27.02209C8.847469 27.02209 8.645281 26.861774 8.645281 26.554899C8.645281 26.136462 9.091531 25.878337 9.76809 25.878337C11.05153 25.878337 11.28872 26.757087 11.28872 27.02927C11.28872 27.67084 10.58434 27.79646 10.32622 27.84521C10.26341 27.85927 10.08903 27.88709 10.04716 27.90115C9.78903 27.9499 9.66341 28.09646 9.66341 28.2499C9.66341 28.41021 9.78903 28.59865 9.94247 28.69615C10.13091 28.8149 10.37497 28.82865 10.49372 28.82865C10.63997 28.82865 11.00278 28.80771 11.15622 28.57052Z'/> -<path d='M17.73309 42.48097H20.51246C20.65184 42.48097 20.84121 42.48097 20.84121 42.68034C20.84121 42.8794 20.65184 42.8794 20.51246 42.8794H17.73309V45.66878C17.73309 45.80815 17.73309 45.99753 17.53402 45.99753C17.33465 45.99753 17.33465 45.80815 17.33465 45.66878V42.8794H14.545586C14.406211 42.8794 14.216836 42.8794 14.216836 42.68034C14.216836 42.48097 14.406211 42.48097 14.545586 42.48097H17.33465V39.691903C17.33465 39.552528 17.33465 39.363153 17.53402 39.363153C17.73309 39.363153 17.73309 39.552528 17.73309 39.691903V42.48097Z'/> -<path d='M22.929688 55.8398H40.9297L42.4297 58.8398L45.4297 52.8398L48.4297 58.8398L51.4297 52.8398L54.4297 58.8398L57.4297 52.8398L58.9297 55.8398H76.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M49.84228 50.62824C49.90228 50.86731 49.93197 50.96699 50.12134 50.99668C50.21103 51.00668 50.52978 51.00668 50.72884 51.00668C51.43634 51.00668 52.54197 51.00668 52.54197 50.02043C52.54197 49.68199 52.38259 48.99449 51.99416 48.60606C51.73509 48.34699 51.20697 48.02824 50.31072 48.02824H49.19509L49.84228 50.62824ZM51.27697 47.89887C52.28291 48.11793 53.46822 48.81512 53.46822 49.82137C53.46822 50.67793 52.57166 51.31543 51.26697 51.31543H48.42791C48.22884 51.31543 48.13916 51.31543 48.13916 51.11637C48.13916 51.00668 48.22884 51.00668 48.41791 51.00668C48.43791 51.00668 48.62728 51.00668 48.79634 50.98668C48.97572 50.96699 49.06541 50.95699 49.06541 50.82731C49.06541 50.78762 49.05541 50.75762 49.02572 50.63824L47.69072 45.288869C47.59134 44.900432 47.57134 44.820744 46.784469 44.820744C46.605094 44.820744 46.515407 44.820744 46.515407 44.621682C46.515407 44.511994 46.634782 44.511994 46.654782 44.511994C46.933844 44.511994 47.63103 44.541994 47.91009 44.541994C48.18884 44.541994 48.89603 44.511994 49.17509 44.511994C49.25478 44.511994 49.37416 44.511994 49.37416 44.711369C49.37416 44.820744 49.28447 44.820744 49.09541 44.820744C48.72666 44.820744 48.44791 44.820744 48.44791 45.000119C48.44791 45.059807 48.46791 45.109807 48.47759 45.169494L49.13509 47.80918H50.32072C51.22697 47.80918 51.40634 47.25137 51.40634 46.90262C51.40634 46.75324 51.32666 46.44449 51.26697 46.21543C51.19728 45.93637 51.10759 45.56793 51.10759 45.368557C51.10759 44.292932 52.30291 44.292932 52.43228 44.292932C53.27916 44.292932 53.62759 45.298869 53.62759 45.438244C53.62759 45.55793 53.51822 45.55793 53.50822 45.55793C53.41853 45.55793 53.39853 45.488244 53.37853 45.418557C53.12978 44.681369 52.70134 44.511994 52.47228 44.511994C52.14353 44.511994 52.07384 44.731057 52.07384 45.119494C52.07384 45.428557 52.13353 45.93637 52.17322 46.25512C52.19322 46.39481 52.21322 46.58387 52.21322 46.72324C52.21322 47.49043 51.54572 47.79918 51.27697 47.89887Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398V30.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 30.6406H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 27.0391H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 27.0391V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M71.73309 35.27992H74.51246C74.65184 35.27992 74.84121 35.27992 74.84121 35.4793C74.84121 35.67836 74.65184 35.67836 74.51246 35.67836H71.73309V38.46774C71.73309 38.60711 71.73309 38.79649 71.53402 38.79649C71.33465 38.79649 71.33465 38.60711 71.33465 38.46774V35.67836H68.545586C68.406211 35.67836 68.216836 35.67836 68.216836 35.4793C68.216836 35.27992 68.406211 35.27992 68.545586 35.27992H71.33465V32.490861C71.33465 32.351486 71.33465 32.162111 71.53402 32.162111C71.73309 32.162111 71.73309 32.351486 71.73309 32.490861V35.27992Z'/> -<path d='M68.88389 30.40063C68.88389 30.93844 68.62483 31.09782 68.44545 31.09782C68.19639 31.09782 67.95733 30.83876 67.95733 30.61969C67.95733 30.49032 68.00733 30.43032 68.1167 30.32094C68.32608 30.12157 68.45545 29.86282 68.45545 29.50407C68.45545 29.08563 67.84795 26.804694 66.68233 26.804694C66.17451 26.804694 65.94545 27.153131 65.94545 27.671256C65.94545 28.22907 66.2142 28.95626 66.52295 29.78313C66.59264 29.95219 66.64264 30.09188 66.64264 30.28094C66.64264 30.72938 66.32389 31.09782 65.82576 31.09782C64.889513 31.09782 64.510763 29.65344 64.510763 29.56376C64.510763 29.46438 64.610451 29.46438 64.630451 29.46438C64.730138 29.46438 64.740138 29.48407 64.789826 29.64344C65.078576 30.64969 65.50701 30.87876 65.79576 30.87876C65.87545 30.87876 66.04483 30.87876 66.04483 30.56001C66.04483 30.31094 65.94545 30.04188 65.87545 29.86282C65.43733 28.70719 65.30764 28.24907 65.30764 27.82063C65.30764 26.744694 66.18451 26.585319 66.64264 26.585319C68.31608 26.585319 68.88389 29.88251 68.88389 30.40063Z'/> -<path d='M74.2234 21.99998C74.39277 21.99998 74.57215 21.99998 74.57215 22.19935C74.57215 22.39841 74.39277 22.39841 74.2234 22.39841H68.83434C68.66496 22.39841 68.485898 22.39841 68.485898 22.19935C68.485898 21.99998 68.66496 21.99998 68.83434 21.99998H74.2234Z'/> -<path d='M92.01759 32.35915C92.01759 32.38884 91.99759 32.45884 91.9079 32.45884C91.8779 32.45884 91.86822 32.44884 91.75853 32.33915L91.06134 31.57228C90.97165 31.71165 90.51322 32.45884 89.40759 32.45884C87.18634 32.45884 84.945091 30.25728 84.945091 27.94634C84.945091 26.302592 86.1204 25.216967 87.64447 25.216967C88.51103 25.216967 89.26822 25.615405 89.79603 26.07353C90.72259 26.8904 90.89197 27.79697 90.89197 27.82666C90.89197 27.92634 90.79228 27.92634 90.77228 27.92634C90.71259 27.92634 90.6629 27.90634 90.6429 27.82666C90.55322 27.5379 90.32415 26.83072 89.63665 26.252905C88.94947 25.695092 88.32197 25.525717 87.80384 25.525717C86.90728 25.525717 85.85165 26.04353 85.85165 27.59759C85.85165 28.1654 86.06072 29.77915 87.05665 30.94447C87.66447 31.65197 88.60072 32.14978 89.48728 32.14978C90.50353 32.14978 91.09103 31.38291 91.09103 30.22728C91.09103 29.82884 91.06134 29.81884 91.06134 29.71947C91.06134 29.61978 91.17072 29.61978 91.21072 29.61978C91.34009 29.61978 91.34009 29.63978 91.39009 29.81884L92.01759 32.35915Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398H112.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 55.8398V37.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398C113.7344 37.8398 114.4766 37.4102 114.8789 36.7148C115.2773 36.0195 115.2773 35.1602 114.8789 34.4648C114.4766 33.7695 113.7344 33.3398 112.9297 33.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398C113.7344 33.3398 114.4766 32.9102 114.8789 32.2148C115.2773 31.5195 115.2773 30.6602 114.8789 29.9648C114.4766 29.2695 113.7344 28.8398 112.9297 28.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398C113.7344 28.8398 114.4766 28.4102 114.8789 27.7148C115.2773 27.0195 115.2773 26.1602 114.8789 25.4648C114.4766 24.7695 113.7344 24.3398 112.9297 24.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398C113.7344 24.3398 114.4766 23.9102 114.8789 23.2148C115.2773 22.5195 115.2773 21.6602 114.8789 20.9648C114.4766 20.2695 113.7344 19.8398 112.9297 19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M107.9536 31.46259C108.04297 31.82103 108.07297 31.93072 109.00922 31.93072C109.30828 31.93072 109.38797 31.93072 109.38797 32.12009C109.38797 32.23947 109.27828 32.23947 109.2286 32.23947C108.89985 32.23947 108.08297 32.20978 107.75422 32.20978C107.45547 32.20978 106.72828 32.23947 106.42953 32.23947C106.35953 32.23947 106.24016 32.23947 106.24016 32.0404C106.24016 31.93072 106.32985 31.93072 106.51891 31.93072C106.53891 31.93072 106.72828 31.93072 106.89766 31.91072C107.07703 31.89103 107.16641 31.88103 107.16641 31.75134C107.16641 31.71165 107.15672 31.68166 107.12672 31.56228L105.79203 26.212905C105.69235 25.824467 105.67235 25.74478 104.885471 25.74478C104.716096 25.74478 104.616409 25.74478 104.616409 25.545717C104.616409 25.43603 104.706096 25.43603 104.885471 25.43603H109.49735C109.73641 25.43603 109.74641 25.43603 109.80641 25.605405L110.59328 27.75697C110.63297 27.86666 110.63297 27.88634 110.63297 27.89634C110.63297 27.93634 110.60328 28.00603 110.5136 28.00603C110.42391 28.00603 110.41391 27.95634 110.34422 27.79697C110.00547 26.8804 109.56703 25.74478 107.84391 25.74478H106.90766C106.76797 25.74478 106.74828 25.74478 106.68828 25.75478C106.58891 25.76478 106.55891 25.77478 106.55891 25.854467C106.55891 25.884155 106.55891 25.904155 106.6086 26.08353L107.9536 31.46259Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z' stroke='#000' fill='none' stroke-width='.5' stroke-miterlimit='10'/> -<path d='M112.9297 43.0898V48.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M117.27603 48.80461C117.27603 49.00398 117.13634 49.16336 116.90728 49.16336C116.63853 49.16336 116.36947 48.90429 116.36947 48.63555C116.36947 48.44617 116.50884 48.27679 116.7479 48.27679C116.97697 48.27679 117.27603 48.50586 117.27603 48.80461ZM116.51884 45.05929C116.63853 45.34836 116.63853 45.36805 116.7379 45.63711C116.81759 45.83617 116.86759 45.97586 116.86759 46.16492C116.86759 46.61336 116.54884 46.98179 116.05072 46.98179C115.114466 46.98179 114.735716 45.53742 114.735716 45.44773C114.735716 45.34836 114.835404 45.34836 114.855404 45.34836C114.955091 45.34836 114.965091 45.36805 115.014779 45.52742C115.283841 46.46398 115.68228 46.76273 116.02072 46.76273C116.1004 46.76273 116.26978 46.76273 116.26978 46.44398C116.26978 46.23461 116.20009 46.02555 116.1604 45.92586C116.08072 45.66711 115.63228 44.51148 115.4729 44.08305C115.373216 43.82398 115.243841 43.495545 115.243841 43.28617C115.243841 42.818045 115.58259 42.469295 116.06072 42.469295C116.99697 42.469295 117.36572 43.91367 117.36572 44.00336C117.36572 44.10304 117.27603 44.10304 117.24603 44.10304C117.14634 44.10304 117.14634 44.07305 117.09665 43.92367C116.91728 43.29617 116.58853 42.68867 116.08072 42.68867C115.91134 42.68867 115.84165 42.788045 115.84165 43.01742C115.84165 43.26617 115.90134 43.405858 116.1304 44.01336L116.51884 45.05929Z'/> -<path d='M112.9297 1.839844H22.929688' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -</g> -</g> -</svg> diff --git a/graphics/circuit_macros/examples/dpv/quickDPV.svg b/graphics/circuit_macros/examples/dpv/quickDPV.svg deleted file mode 100644 index c648e2d998..0000000000 --- a/graphics/circuit_macros/examples/dpv/quickDPV.svg +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="182" height="82" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="180.8px" height="81.12px" - viewBox="0 0 180.8 81.12" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<a xlink:href="SourcesDPV.svg" target="_blank"> - <g stroke="rgb(0,0,255)"> -<line x1="39.466667" y1="76.533333" x2="39.466667" y2="52.533333" /> -<circle cx="39.466667" cy="40.533333" r="12" /> -<line x1="39.466667" y1="28.533333" x2="39.466667" y2="4.533333" /> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="36.8" y="64.88">-</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="24.8" y="45.373333" -><tspan font-style="italic">v<tspan font-size="70%" -dy="0.66ex" dx="">s</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="36.8" y="25.866667">+</text> -<a xlink:href="ResistorsDPV.svg" target="_blank"> - <g stroke="rgb(0,0,255)"> -<polyline points="39.466667,4.533333 63.466667,4.533333 -65.466667,0.533333 -69.466667,8.533333 -73.466667,0.533333 -77.466667,8.533333 -81.466667,0.533333 -85.466667,8.533333 -87.466667,4.533333 -111.466667,4.533333" /> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="75.466667" y="20.88"><tspan font-style="italic">R</tspan></text> -<circle fill="black" - cx="111.466667" cy="4.533333" r="1.92" /> -<line x1="111.466667" y1="4.533333" x2="111.466667" y2="38.133333" /> -<line x1="103.466667" y1="38.133333" x2="119.466667" y2="38.133333" /> -<line x1="103.466667" y1="42.933333" x2="119.466667" y2="42.933333" /> -<line x1="111.466667" y1="42.933333" x2="111.466667" y2="76.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="108.8" y="35.466667">+</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="45.373333"><tspan font-style="italic">v</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="108.8" y="55.28">-</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="122.133333" y="45.373333"><tspan font-style="italic">C</tspan></text> -<circle fill="black" - cx="111.466667" cy="76.533333" r="1.92" /> -<line x1="111.466667" y1="4.533333" x2="159.466667" y2="4.533333" /> -<line x1="159.466667" y1="4.533333" x2="159.466667" y2="28.533333" /> -<line x1="159.466667" y1="28.533333" x2="158.933333" y2="28.533333" /> -<path d="M 159.466667,28.533333 - A 3 3 0 1 1 159.466667,34.533333" /> -<line x1="159.466667" y1="34.533333" x2="158.933333" y2="34.533333" /> -<path d="M 159.466667,34.533333 - A 3 3 0 1 1 159.466667,40.533333" /> -<line x1="159.466667" y1="40.533333" x2="158.933333" y2="40.533333" /> -<path d="M 159.466667,40.533333 - A 3 3 0 0 1 159.466667,46.533333" /> -<line x1="159.466667" y1="46.533333" x2="158.933333" y2="46.533333" /> -<path d="M 159.466667,46.533333 - A 3 3 0 1 1 159.466667,52.533333" /> -<line x1="159.466667" y1="52.533333" x2="158.933333" y2="52.533333" /> -<line x1="159.466667" y1="52.533333" x2="159.466667" y2="76.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="156.266667" y="45.373333"><tspan font-style="italic">L</tspan></text> -<polygon stroke-width="0" fill="black" - points="161.866667,14.133333 159.466667,23.733333 -157.066667,14.133333" /> -<line x1="159.466667" y1="21.534344" x2="159.466667" y2="14.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" text-anchor="start" - x="162.133333" y="22.673838"><tspan font-style="italic">i</tspan></text> -<line x1="159.466667" y1="76.533333" x2="39.466667" y2="76.533333" /> -</g></svg> diff --git a/graphics/circuit_macros/examples/examples.pdf b/graphics/circuit_macros/examples/examples.pdf Binary files differindex a567ad9081..ac0892249d 100644 --- a/graphics/circuit_macros/examples/examples.pdf +++ b/graphics/circuit_macros/examples/examples.pdf diff --git a/graphics/circuit_macros/examples/extras/ASMEbox.m4 b/graphics/circuit_macros/examples/extras/ASMEbox.m4 new file mode 100644 index 0000000000..6dc9d02d8a --- /dev/null +++ b/graphics/circuit_macros/examples/extras/ASMEbox.m4 @@ -0,0 +1,55 @@ +.PS +# ASME_Y14-5.m4 +# https://en.wikipedia.org/wiki/Geometric_dimensioning_and_tolerancing +cct_init +sinclude(ASME_Y14-5.m4def) +sinclude(../ASME_Y14-5.m4def) +ifsvg(`svg_font(sans-serif,12bp__,3bp__)', +`textht = 11bp__*2/3 + iflatex(`command "{\sf"')') + + boxht = 7.5/0.5*textht + boxwid = 15/7.5 * boxht + circlerad = 2.3/0.5*textht*0.5 + thicklines_(1) +# ASME Y14.5 specs: + arrowht = textht*0.8 + arrowwid = textht*0.6 + + Box: box + Circle: circle at Box.c; {CM: move from Circle.se down textht right textht} +thinlines_ +CLU: ctrline( up_ Box.ht with .c at Box.c, Box.ht/2 ) +CLH: ctrline( right Box.ht with .c at Box.c, Box.ht/2 ) + + dimension_(from Box.nw to Box.n,Box.ht/6) + thicklines_(1) + {Y14_frame("10") with .s at AS_C+(0,textht/2)} + thinlines_ + line from 3rd last line.start to CLU.end + dimension_(from Box.w to Box.nw,Box.ht/6) + thicklines_(1) + {Y14_frame("5") with .e at AS_C+(-textht/2,0)} + thinlines_ + line from 4th last line.start to CLH.start + +thicklines_ + DA: Y14_frame("A") at Box.ne+(-textht*1.5,textht*5) + datumarrow(from DA.s to (DA,Box.n)) + DB: Y14_frame("B") at Box.sw+(-textht*5,textht*2) + datumarrow(from DB.e to (Box.w,DB)) + + F: Y14_frame(Y14_pos_, + Y14_dia_;"0.03";"(M)", + "A","B","C") with .w at Box.se+(-textht*4,-textht*2) + G: Y14_frame(Y14_fla_,Y14_cyl_,Y14_lin_, + Y14_sur_,Y14_per_,Y14_ang_, + Y14_par_) with .nw at F.sw+(0,-0.1) + H: Y14_frame(Y14_pos_,Y14_cir_,Y14_tot_,Y14_dia_) \ + with .nw at G.sw+(0,-0.1) + + { CB: move left textht from F.w } + arrow <- from Circle.se to Intersect_(CM,CB) then to F.w + +command iflatex(`"}"',ifsvg(`"</g>"')) +.PE diff --git a/graphics/circuit_macros/examples/extras/Ant.m4 b/graphics/circuit_macros/examples/extras/Ant.m4 new file mode 100644 index 0000000000..f4a22226a2 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Ant.m4 @@ -0,0 +1,30 @@ +.PS +# Ant.m4 (Langton's ant) +# https://tex.stackexchange.com/questions/361838/how-to-create-a-langtons-ant-in-latex/361891 +# https://en.wikipedia.org/wiki/Langton%27s_ant +gen_init +NeedDpicTools + picwid = 5 + D: (0,0); DD: (1,0); t[D] = 0 + minx = 0; miny = 0; maxx = 0; maxy = 0 + for i = 0 to 10500 do { + if (t[D]%2) == 0 then { DD: (-DD.y,DD.x) } else { DD: (DD.y,-DD.x) } + t[D] += 1 + D: D+DD + if D.x > maxx then { maxx = D.x; for y = miny to maxy do { t[maxx,y] = 0 }} \ + else { if D.x < minx then { + minx = D.x; for y = miny to maxy do { t[minx,y] = 0 }}} + if D.y > maxy then { maxy = D.y; for x = minx to maxx do { t[x,maxy] = 0 }} \ + else { if D.y < miny then { + miny = D.y; for x = minx to maxx do { t[x,miny] = 0 }}} + } + boxwid = picwid/(maxx-minx) + boxht = picwid/(maxy-miny) + if boxht > boxwid then { boxht = boxwid } else { boxwid = boxht } + circlerad = boxht/2 + hue = 240; val = 1 + for i = minx to maxx do { for j = miny to maxy do { + if t[i,j]!=0 then { sat = (t[i,j]%20)/20 + hsvtorgb(hue,sat,val,r,g,b) + circle colored rgbstring(r,g,b) at (-i,j)*boxwid } }} +.PE diff --git a/graphics/circuit_macros/examples/ArrowFn.m4 b/graphics/circuit_macros/examples/extras/ArrowFn.m4 index f8ca152722..f8ca152722 100644 --- a/graphics/circuit_macros/examples/ArrowFn.m4 +++ b/graphics/circuit_macros/examples/extras/ArrowFn.m4 diff --git a/graphics/circuit_macros/examples/Attention.m4 b/graphics/circuit_macros/examples/extras/Attention.m4 index 7f0b7127c7..7f0b7127c7 100644 --- a/graphics/circuit_macros/examples/Attention.m4 +++ b/graphics/circuit_macros/examples/extras/Attention.m4 diff --git a/graphics/circuit_macros/examples/Autoencoder.m4 b/graphics/circuit_macros/examples/extras/Autoencoder.m4 index 92a81ac950..92a81ac950 100644 --- a/graphics/circuit_macros/examples/Autoencoder.m4 +++ b/graphics/circuit_macros/examples/extras/Autoencoder.m4 diff --git a/graphics/circuit_macros/examples/extras/Bridge.m4 b/graphics/circuit_macros/examples/extras/Bridge.m4 new file mode 100644 index 0000000000..7471792239 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Bridge.m4 @@ -0,0 +1,35 @@ +.PS +# Bridge.m4 +cct_init +linewid = 1.5 + down_ + AC: source(up_ elen_,S) + line right_ elen_ + dlen = linewid*2/3 +Bridge: [ + N: Here; S: Here+(0,-2*dlen); E: N+(dlen,-dlen); W: N+(-dlen,-dlen) + diode(from N to E) + diode(from S to E) + diode(from W to N) + diode(from W to S) + ] at (Here,AC) + + line from Bridge.N to last line.end + line from Bridge.S to (Bridge.S,AC.start) + Gr: line to AC.start + line from Bridge.E right_ dlen + G: gap(down_ Bridge.ht/2+dimen_/4,1); llabel(+,,-) + line from Bridge.W left_ dlen/4 + crossover(to (Here,G.end),,Gr) + line to G.end chop 0 chop dotrad_ + + [ L: line right_ linewid/3 + sinusoid( linewid/6,twopi_/linewid*4,-pi_/2,0,linewid/8) with .End at L + sinusoid( linewid/6,twopi_/linewid*4,-pi_/2,0,linewid/8) with .Start at L + ] at G + R: resistor(down_ G.len from G.start+(dimen_/2,0)); llabel(,R) + arrow wid arrowwid*2 from R.start to 0.5<R.start,G.start> + arrow wid arrowwid*2 from R.end to 0.5<R.end,G.end> + + +.PE diff --git a/graphics/circuit_macros/examples/CSlight.m4 b/graphics/circuit_macros/examples/extras/CSlight.m4 index 720e74f9e2..720e74f9e2 100644 --- a/graphics/circuit_macros/examples/CSlight.m4 +++ b/graphics/circuit_macros/examples/extras/CSlight.m4 diff --git a/graphics/circuit_macros/examples/Ccurve.m4 b/graphics/circuit_macros/examples/extras/Ccurve.m4 index 4aed3fb1ab..6f3b537aac 100644 --- a/graphics/circuit_macros/examples/Ccurve.m4 +++ b/graphics/circuit_macros/examples/extras/Ccurve.m4 @@ -1,6 +1,7 @@ .PS # Ccurve.m4 gen_init +scale = 1.5 # Gosper C curve `define' c_curve {if $3==0 then { continue by ($1,$2) } else { diff --git a/graphics/circuit_macros/examples/Chuck.m4 b/graphics/circuit_macros/examples/extras/Chuck.m4 index 2c5dfb76f3..df83a8ce0e 100644 --- a/graphics/circuit_macros/examples/Chuck.m4 +++ b/graphics/circuit_macros/examples/extras/Chuck.m4 @@ -61,11 +61,6 @@ scale = 25.4*2 tic = 3.6bp__ command "{\sf" -#psset_(linecolor=white) -#command "\color{white}" - -#include(Lettering.m4) -#Letter_init define(`visible_thick',`linethick_(visibleth)') define(`hidden_thick',`linethick_(hiddenth)') diff --git a/graphics/circuit_macros/examples/AntiqueClock.m4 b/graphics/circuit_macros/examples/extras/Clocks.m4 index c77950fe00..2c8cd097da 100644 --- a/graphics/circuit_macros/examples/AntiqueClock.m4 +++ b/graphics/circuit_macros/examples/extras/Clocks.m4 @@ -140,6 +140,90 @@ ifpgf(\rotatebox{%g}{%g}))",`$'2,`$'3) } ]') Clock1: AntiqueClock - Clock2: AntiqueClock(4,50,07,2) at Clock1.e+(1.5,0) +# Clock2: AntiqueClock(4,50,07,2) at Clock1.e+(1.5,0) + Clock2: AntiqueClock(4,50,07,2) with .nw at Clock1.ne+(0.5,0) + Clock3: [ + linethick = 1.5 + arrowwid = 5 pt__ + + rgbfill(255/255,250/255,205/255, + Clock: circle rad 0.75 at (0,0) ) + + command "\newcounter{hour}" + for time=1 to 12 do { + sprintf("\setcounter{hour}{%g}\Roman{hour}",time) \ + at Rect_(Clock.rad*0.85,90-time*30) + } + line <-> from Rect_(Clock.rad*0.95,90-8.5*30) to Clock \ + then to Rect_(Clock.rad*0.7,90-3.5*30) + line thick 1 outline "red" from Clock to Rect_(Clock.rad*0.95,90-0.75*30) + ] with .s at (Clock2,Clock1.s) + +define(`htod',`(90-(`$1')/12*360)') + +# clock1(h:m[:s],diam,color) +define(`ClockA',`[ + clockdiam = ifelse(`$2',,`40 mm__',`$2') + clockrad = clockdiam/2 + stacksplit_(`HMS',ifelse(`$1',,10:10,`$1'),:) + s = HMS; popdef(`HMS') + m = HMS; popdef(`HMS') + ifdef(`HMS',`h = HMS',`h = m; m = s') + C: circle rad clockrad thick 2 shaded ifelse(`$3',,"cyan",`$3') at (0,0) + for t = 1 to 12 do { + if pmod(t,3)==0 then { ticlen = clockrad/5; ticthk = 2 } \ + else { ticlen = clockrad/10; ticthk = 1 } + line thick ticthk from Rect_(clockrad,htod(t)) \ + to Rect_(clockrad-ticlen,htod(t)) + sprintf("\large\sf %g",t) at Rect_(clockrad*3.5/5,htod(t)) + } + line thick 3 from C to Rect_(clockrad*2/5,htod(h+m/60)) + line thick 3 from C to Rect_(clockrad*3/5,htod(m/60*12)) + round(at C, 3) + ifdef(`HMS',`line thick 0.7 outlined "red" from C \ + to Rect_(clockrad*3.5/5,htod(s/60*12)) chop -5bp__ chop 0') + popdef(`HMS') ]') + +[ +CA: ClockA(11:10:35,,"blue!20") + ClockA(10:10,,"blue!20!black!30") + ClockA(10:10:23,,"blue!20!black!30!green!40") + ClockA(10:10,,rgbstring(0.2,0.2,0.7)) + +# calls DrawRoutineName(frac,r,g,b) +# clock2(h:m[:s],diam,color,rim thickness) +define(`ClockB',`[ + clockdiam = ifelse(`$2',,`60 mm__',`$2') + clockrad = clockdiam/2 + stacksplit_(`HMS',ifelse(`$1',,10:10,`$1'),:) + s = HMS; popdef(`HMS') + m = HMS; popdef(`HMS') + ifdef(`HMS',`h = HMS',`h = m; m = s') + rimwd = ifelse(`$4',,9 pt__,`$4') + rimwid = rimwd/(1 pt__) + n = 4 +C: (0,0) + ClockA(`$1',clockdiam-rimwd*2,"green!20") at C +Q:circle diam clockdiam-rimwd thick rimwid \ + outlined rgbstring(0.7,0.7,0.7) at C + Nx: Q.n+(0,Q.thick pt__/2) + +define rimcirc { +#print sprintf("%g: %g,%g,%g",$`'1,$`'2,$`'3,$`'4) + circle diam clockdiam-rimwd thick rimwid/(n+1) \ + outlined rgbstring($`'2,$`'3,$`'4) with .n at Nx-(0,rimwd/(n+1)/2) + Nx : last circle.n+(0,last circle.thick pt__/2) } + + v = 0.1 + ShadeObject(rimcirc, n, + 0,v,v,v, + 1/(n-1),v,v,v, + 1,1,1,1) at C + popdef(`HMS') ]') + +# ClockA(10:10:35,,"green!20") + w = last [].wid + ClockB(10:10:35,w,) with .nw at CA.sw+(10bp__,-0.2) + ] with .nw at 1st [].sw+(0,-0.2) .PE diff --git a/graphics/circuit_macros/examples/extras/ControlLoop.m4 b/graphics/circuit_macros/examples/extras/ControlLoop.m4 new file mode 100644 index 0000000000..6fd915401b --- /dev/null +++ b/graphics/circuit_macros/examples/extras/ControlLoop.m4 @@ -0,0 +1,40 @@ +.PS +# ControlLoop.m4 +# https://tex.stackexchange.com/questions/636839/how-to-draw-multi-blocks-block-diagram +gen_init +scale = 25.4 + + boxwid = 18 + boxrad = 3 + define summer { $1: circle diam 10 fill_(0.8) + { line from $1.ne to $1.sw; line from $1.nw to $1.se } + { "$+$" at $1.nw rjust } } + + TPG: box ht 22 shaded "Peach" "Transient" "Profile" "Generator" + arrow <- left_ 8 from TPG.w "r" above + arrow right_ 10 from TPG.e+(0,TPG.ht/4) "$r_1$" above + summer(S1) + line right_ 10 from TPG.e+(0,-TPG.ht/4) "$r_2$" above + arrow right_ S1.diam + summer(S2) + arrow right_ 10 from S2.e "$e_2$" above + arrow from S1.e to (Here,S1) "$e_1$" above + NLSF: box ht 22 "Nonlinear" "State Error" "Feedback" shaded "lime" \ + with .w at (Here,TPG) + arrow right_ 10 "$u_o$" below + summer(S3) + {ESO: box ht 30 shaded "Goldenrod" "Extended" "State" "Observer" \ + with .w at (Here.x+5,NLSF.s.y-15) } + arrow right_ 40 + P: box ht 15 shaded "blue!50!white!50" "Plant" + arrow right_ 10 "$y$" above + arrow <- right_ 10 from ESO.e+(0,-ESO.ht/4) "$y$" above + line to (2nd last arrow,Here) then to 2nd last arrow + arrow <- right_ 10 from ESO.e+(0,ESO.ht/4) "$u$" above; corner + line to (Here,P) + for_(1,3,1, + `arrow from ESO.w+(0,ESO.ht*(m4x-2)/3) left_ ESO.w.x-S`'m4x.x then to S`'m4x.s + "$z_`'m4x$" at last arrow.start-(5,0) above + "$-$" at last arrow.end rjust below ') + +.PE diff --git a/graphics/circuit_macros/examples/Counting.m4 b/graphics/circuit_macros/examples/extras/Counting.m4 index 18002ba99f..18002ba99f 100644 --- a/graphics/circuit_macros/examples/Counting.m4 +++ b/graphics/circuit_macros/examples/extras/Counting.m4 diff --git a/graphics/circuit_macros/examples/Cruller.m4 b/graphics/circuit_macros/examples/extras/Cruller.m4 index d2c215ae13..d2c215ae13 100644 --- a/graphics/circuit_macros/examples/Cruller.m4 +++ b/graphics/circuit_macros/examples/extras/Cruller.m4 diff --git a/graphics/circuit_macros/examples/extras/Cylinder.m4 b/graphics/circuit_macros/examples/extras/Cylinder.m4 new file mode 100644 index 0000000000..abe9a9bac7 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Cylinder.m4 @@ -0,0 +1,43 @@ +.PS +# Cylinder.m4 +gen_init(SIdefaults) # lengths are in mm + +define(`cylinder',`[ angle = ifelse(`$3',,20,`$3') + w = ifelse(`$1',,boxwid,`$1') + h = ifelse(`$2',,boxht,`$2') + B: ellipse wid w ht sind(angle)*w + S: box invis wid w ht h fill_(1) with .s at B + line from S.nw to S.sw + line from S.ne to S.se + T: ellipse wid w ht sind(angle)*w at B+(0,h) + ]') + +define Cylinder { [ dtor = atan2(1,0)/90 + if "$1"=="" then { w = boxwid } else { w = $1 } + if "$2"=="" then { h = boxht } else { h = $2 } + if "$3"=="" then { angle = 20 } else { angle = $3 } + B: ellipse wid w ht sin(angle*dtor)*w + S: box invis wid w ht h fill 1 with .s at B + line from S.nw to S.sw + line from S.ne to S.se + T: ellipse wid w ht sin(angle*dtor)*w at B+(0,h) + ] } + +M4: [ + cylinder + move + cylinder(,,15) + move + cylinder(3,50) + ] +"M4 macro" at last [].s below + +Pic: [ + Cylinder + move + Cylinder(,,15) + move + Cylinder(3,50) + ] with .w at M4.e+(5,0) +"pic macro" at last [].s below +.PE diff --git a/graphics/circuit_macros/examples/extras/Egg.m4 b/graphics/circuit_macros/examples/extras/Egg.m4 new file mode 100644 index 0000000000..3cab249877 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Egg.m4 @@ -0,0 +1,42 @@ +.PS +# Egg.m4 +# https://tex.stackexchange.com/questions/74168/how-can-i-draw-an-egg-using-tikz +threeD_init +NeedDpicTools + +define Eggshape { (0.78*cos(($2)/4)*sin($2),-cos($2))*($1) } # -pi < arg2 < pi + + size = 2 + npts = 41 + + HL: Eggshape(size*0.4,-pi_*3/4) # Highlight + P: Eggshape(size,pi_/4) + d = zabs(P) + nlines = int(d/lthick*1.5) + # This way of blending colors is not the + # simplest for a single postprocessor but it + # works for multiple postprocessors, e.g. SVG +define(`Orange',`1, 0.5, 0') +define(`Gray', `0.5, 0.5, 0.5') +define(`White', `1, 1, 1') +define(`eggblend', + `sum3D(sprod3D($1,Orange), + sum3D(sprod3D($2,White), + sprod3D($3,Gray)))') + +define(`normalize',`($1)/($1+$2+$3), ($2)/($1+$2+$3), ($3)/($1+$2+$3)') + +define EggLine { + for i=0 to npts do { + P[i]: HL*(1-($1))+Eggshape(size*($1),i/npts*twopi_-pi_) } + fitcurve(P,npts,outlined rgbstring($2,$3,$4)) + } + + ShadeObject(EggLine, nlines, + 0, eggblend(normalize(0.3, 1, 0)), + 0.2, eggblend(normalize(0.5, 0.5, 0)), + 0.5, eggblend(normalize(0.5, 0.4, 0.2)), + 1, eggblend(normalize(0.5, 0, 0.7)) + ) + +.PE diff --git a/graphics/circuit_macros/examples/Euro.m4 b/graphics/circuit_macros/examples/extras/Euro.m4 index 26230facbe..26230facbe 100644 --- a/graphics/circuit_macros/examples/Euro.m4 +++ b/graphics/circuit_macros/examples/extras/Euro.m4 diff --git a/graphics/circuit_macros/examples/Eye.m4 b/graphics/circuit_macros/examples/extras/Eye.m4 index 1251afca09..1251afca09 100644 --- a/graphics/circuit_macros/examples/Eye.m4 +++ b/graphics/circuit_macros/examples/extras/Eye.m4 diff --git a/graphics/circuit_macros/examples/extras/Fefets.m4 b/graphics/circuit_macros/examples/extras/Fefets.m4 new file mode 100644 index 0000000000..04d624de35 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Fefets.m4 @@ -0,0 +1,75 @@ +.PS +# https://github.com/circuitikz/circuitikz/issues/515 +# `Fefets.m4' +cct_init + +textht = 0.1 +define(`rmove',0.75) + +Row1: [ + J: Fe_fet(right_ dimen_) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(up_ dimen_) + {`"{\tt (up\_ dimen\_)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(left_ dimen_) + {`"{\tt (left\_ dimen\_)}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S ljust + "$D$" at J.D rjust } + move right_ + J: Fe_fet(down_ dimen_) + {`"{\tt (down\_ dimen\_)}"' at J.s+(0,-0.15) below + "$G$" at J.G ljust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] +Row2: [ + J: Fe_fet(right_ dimen_,R) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(up_ dimen_,R) + {`"{\tt (up\_ dimen\_,R)}"' at J.s+(0,-0.15) below + "$G$" at J.G ljust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(left_ dimen_,R) + {`"{\tt (left\_ dimen\_,R)}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S ljust + "$D$" at J.D rjust } + move right_ + J: Fe_fet(down_ dimen_,R) + {`"{\tt (down\_ dimen\_,R)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] with .nw at last [].sw+(0,-0.5) +Row3: [ + J: Fe_fet(right_ dimen_) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(right_ dimen_,,TEDQSuB) + {`"{\tt $\;$ Fe\_fet(,,TEDSQuB)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] with .nw at last [].sw+(0,-0.5) +#Row4: [ +# ] with .nw at last [].sw+(0,-0.5) + +.PE diff --git a/graphics/circuit_macros/examples/extras/FieldLines.m4 b/graphics/circuit_macros/examples/extras/FieldLines.m4 new file mode 100644 index 0000000000..0832e20d92 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/FieldLines.m4 @@ -0,0 +1,24 @@ +.PS +# https://tex.stackexchange.com/questions/593866/magnetic-field-with-2-coils +cct_init(SIdefaults) + + setdir_(R) + W1: winding(,20,5,8,10) + line dn_ 10 from W1.T1; dot(,,1) + line dn_ 10 from W1.T2; dot(,,1) + W2: winding(,20,5,8,10) with .w_ at W1.e_+vec_(10,0) + line dn_ 10 from W2.T1; dot(,,1) + line dn_ 10 from W2.T2; dot(,,1) + for i=2 to -2 by -1 do { + spline 0.55 \ + from W2.e_+vec_(30,10/4*i*3) \ + to W2.e_+vec_(25,10/4*i*2) \ + then to W2.e_+vec_(0,10/4*i) \ + then to W1.w_+vec_(0,10/4*i) \ + then to W1.w_+vec_(-25,10/4*i*2) \ + then to W1.w_+vec_(-30,10/4*i*3) + arrow wid 2 ht 2 dn_ i*0.66 rt_ 2 at W1.w_+vec_(-25,10/4*i*2.35) + arrow wid 2 ht 2 up__ i*0.66 rt_ 2 at W2.e_+vec_(25,10/4*i*2.35) + } + +.PE diff --git a/graphics/circuit_macros/examples/Floor.m4 b/graphics/circuit_macros/examples/extras/Floor.m4 index 0f3076174a..0f3076174a 100644 --- a/graphics/circuit_macros/examples/Floor.m4 +++ b/graphics/circuit_macros/examples/extras/Floor.m4 diff --git a/graphics/circuit_macros/examples/extras/Flow2.m4 b/graphics/circuit_macros/examples/extras/Flow2.m4 new file mode 100644 index 0000000000..6f8e2affbf --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Flow2.m4 @@ -0,0 +1,47 @@ +.PS +# https://tex.stackexchange.com/questions/661461/flowchart-with-overlapping-of-the-rows +sinclude(FlowchartDefs.m4def) +sinclude(../FlowchartDefs.m4def) + +down_ + smallsep = boxht/3 + testw = fboxwid*7/4 + testh = fboxht*9/4 + Start: Fbox("Start",,rad boxht/8 shaded "red!30") + arrow down_ smallsep "False" ljust + Input: Fdata(`"Input: $f(), a, b, \epsilon$"',wid boxwid*5/4,, + shaded "blue!30") + arrow down_ smallsep + Formula1: Fbox(`"$c=(a+b)/2$"',,shaded "orange!30") + arrow down_ smallsep + Test1: Ftest("if:" `"$f(a)*f(b) > 0$" "\vphantom{\vrule height6pt}"', + wid testw ht testh, shaded "green!30") + A2: arrow down_ smallsep "False" ljust + Test2: Ftest("while:" `"$f(c)\neq 0 \;\&$" "$|f(b)-f(a)| > \delta$" \ + "\vphantom{\vrule height6pt}"',wid testw ht testh, shaded "green!30") + arrow down_ smallsep "True" ljust + Formula2: Fbox(`"$c=(a+b)/2$"',,shaded "orange!30") + arrow down_ smallsep + Test3: Ftest("if:" `"$f(a)*f(c) < 0$" "\vphantom{\vrule height6pt}"', + wid testw ht testh, shaded "green!30") + { arrow from Test3.W left_ boxht*2/3 "True" below + Formula3: Fbox(`"$b=c$"',,shaded "orange!30") + arrow from Formula3.N to (Formula3.N,A2) } + arrow down_ smallsep "False" ljust then left Test3.x-Formula3.E.x + Formula4: Fbox(`"$a=c$"',,shaded "orange!30") with .E at Here + { arrow from Formula4.W left_ Formula4.W.x-Formula3.W.x + smallsep \ + then up_ A2.y-Formula4.y then to A2 } + down_ + Output: Fdata(`"Output: $H, v, t$"',wid boxwid*5/4,,shaded "blue!30") \ + with .N at (Test1.E+(3*smallsep,0),Formula4.N) + { arrow from Test1.E right_ Output.N.x-Test1.E.x "True" above \ + then to Output.N + arrow from Test2.E right_ Output.N.x-Test1.E.x "False" above } + arrow down_ smallsep + Plot: Fbox(,wid boxwid*5/4,shaded "orange!30") + { ["Plot:" ljust "H on T and V on T" ljust] with .w at Plot.W+(3bp__,0) } + arrow down_ smallsep + Stop: Fbox("Stop",,rad boxht/8 shaded "red!30") + + +.PE diff --git a/graphics/circuit_macros/examples/extras/Hexagon.m4 b/graphics/circuit_macros/examples/extras/Hexagon.m4 new file mode 100644 index 0000000000..c70e865be3 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Hexagon.m4 @@ -0,0 +1,64 @@ +.PS +# Hexagon.m4 +# https://tex.stackexchange.com/questions/640000/how-to-draw-hexagonal-lattice-with-links-and-string-using-latex?noredirect=1&lq=1 +gen_init + scale = 4 + circlerad = 1/4 + s3 = sqrt(3) + +define cline { line $1 + { if "$2"=="" then { circle thick 0.8 at last line fill_(1) } \ + else { circle thick 0.8 at last line $2 } } } + +define topline { + cline(from $1 up s3 right 1) + cline(right 2) + cline(down s3 right 1) + } + +define botline { + cline(from $1 down s3 right 1) + cline(right 2) + cline(up s3 right 1) + cline(right 2) + } + +define hexagon { line $2 from $1 \ + for_(1,6,1,`to $1+(2,0)+(Rect_(2,180-m4x*60)) \') + move to $1 + (2,0) + for i=1 to 6 do {{circle $3 at Here+(Rect_(s3,210-i*60))}} + if "$4"!="" then {$4 at $1+(2,0)} + } + + + nrows = 4 + ncols = 3 +for i=1 to nrows do { + for j=1 to ncols do { topline((3+(j-1)*6,-s3*(2*i-1))) + topline((0+(j-1)*6,-s3*2*i)) } + cline(from (6*ncols,-2*i*s3) up s3 right 1) + if i != nrows then { cline(from (0,-2*i*s3) down s3 right 1) } \ + else { for j=1 to ncols do { botline(((j-1)*6,-2*nrows*s3)) } } + } + linethick = 2 + cline(from (3,-s3) outlined "red" down_ s3 right_ 1,fill_(0)) + { "$\sigma^x$" at last circle.w rjust } + { "\large $I$" above ljust } + { cline(right_ 2 outlined "red",fill_(0)) + { "$\sigma^x$" at last circle.n above ljust } } + cline(left_ 1 down_ s3 outlined "red",fill_(0)) + { "$\sigma^x$" at last circle.e ljust } + + hexagon((12,-4*s3),thick 2 outlined "blue",shaded "white",) + for a=90 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.25,a)) }} + for a=30 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.75,a)) }} + for a=150 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.75,a)) }} + hexagon(( 3,-7*s3),thick 2 outlined "red" shaded "gray",shaded "black", + "\large $p$") + for a=30 to 360 by 60 do {{ + "\large $\sigma^z$" at (5,-7*s3)+(Rect_(2.5,a)) }} + +.PE diff --git a/graphics/circuit_macros/examples/extras/Highgain.m4 b/graphics/circuit_macros/examples/extras/Highgain.m4 new file mode 100644 index 0000000000..06bc62985e --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Highgain.m4 @@ -0,0 +1,80 @@ +.PS +# Highgain+.m4 +sinclude(tst.dim) +s_init(Highgain) +darrow_init + +fillval = 0.8 +circlerad = 0.35/2 +linewid = linewid*3/4 + +command " +\newcommand{\Ds}{D(s)} +\newcommand{\Gs}{G(s)} +\newcommand{\Hs}{H(s)} +\newcommand{\Ms}{M(s)} +\newcommand{\Ns}{N(s)} +\newcommand{\Ps}{P(s)} +\newcommand{\Qs}{Q(s)} +\newcommand{\Rs}{R(s)} +\newcommand{\Ss}{S(s)} +\newcommand{\Us}{U(s)} +\newcommand{\Ys}{Y(s)} +\newcommand{\Xs}{X(s)} +\newcommand {\mat}[1]{\left[\matrix{#1}\right]} +\newcommand {\adj}{\mathop{\hbox{adj}}\nolimits} +\newcommand {\coldim}{\mathop{\hbox{col dim}}\nolimits} +\newcommand {\colrank}{\mathop{\hbox{column rank}}\nolimits} +\newcommand {\column}{\mathop{\hbox{column}}\nolimits} +\newcommand {\diag}{\mathop{\hbox{diag}}\nolimits} +\newcommand {\trace}{\mathop{\hbox{trace}}\nolimits} +\newcommand {\image}{\mathop{\hbox{image}}\nolimits} +\newcommand {\kernel}{\mathop{\hbox{kernel}}\nolimits} +\newcommand {\opsim}[1]{\mathinner{\raise-.5ex\hbox{\scriptsize #1}\atop% + \raise1.5ex\hbox{$\sim$}}} +\newcommand {\order}{\mathop{\hbox{order}}\nolimits} +\newcommand {\rank}{\mathop{\hbox{rank}}\nolimits} +\newcommand {\rowdim}{\mathop{\hbox{row dim}}\nolimits} +\newcommand {\rowimage}{\mathop{\hbox{row image}}\nolimits} +\newcommand {\row}{\mathop{\hbox{row}}\nolimits} +\newcommand {\rowrank}{\mathop{\hbox{row rank}}\nolimits} +\newcommand {\zeros}{\mathop{\hbox{zeros}}\nolimits} +" + +define(`vectorsize', + `{"$\phantom{\displaystyle `$1'}% + \atop{{\displaystyle /}\atop{\displaystyle `$1'}}$"\ + `$2' }') + +[ +R: darrow(right linewid,,,,,,|-) + { s_box($R$) dabove(at R.start+(5pt__,0)) } +Sum: circle invis "$\sum$" + darrow(right_ linewid*5/4) + { s_box($E$) dabove(at last line) } + vectorsize(p,at 1/4 along_(last line)) +Gain: shadebox(box "$G = \diag\mat{g_i}$" wid boxwid*1.5 ht boxht*0.75 ) + darrow(,,,,,,!-) + { s_box($U^{\prime}$) dabove(at last line) } +Compensator: shadebox(box wid boxwid*1.5 "\sl Compensator" "$K(s)$") + darrow(right_ linewid*5/4,,,,,,!-) + vectorsize(m,at 1/4 along_(last line)) + { s_box($U$) dabove(at last line) } +Plant: shadebox(box "\sl Plant" "$H(s)$" ) + dline(right_ linewid*3/4 from Plant.e,,,,!-) + vectorsize(p,at last line) +Y: dtee(R) + {s_box($Y$) dabove} + darrow(right_ linewid*2/3,t) + + dline(down boxht from Y,t) + dright + dline(to (Sum,Here),,t) + dright + darrow(to Sum.s) + "$-$" at Here+(0.10,-0.05) + + circle at Sum +] +# blockbox(N) +.PE diff --git a/graphics/circuit_macros/examples/IC10107.m4 b/graphics/circuit_macros/examples/extras/IC10107.m4 index 5203f67376..5203f67376 100644 --- a/graphics/circuit_macros/examples/IC10107.m4 +++ b/graphics/circuit_macros/examples/extras/IC10107.m4 diff --git a/graphics/circuit_macros/examples/Koch.m4 b/graphics/circuit_macros/examples/extras/Koch.m4 index faa46dfff8..faa46dfff8 100644 --- a/graphics/circuit_macros/examples/Koch.m4 +++ b/graphics/circuit_macros/examples/extras/Koch.m4 diff --git a/graphics/circuit_macros/examples/Lyap.m4 b/graphics/circuit_macros/examples/extras/Lyap.m4 index e01d365fc0..e01d365fc0 100644 --- a/graphics/circuit_macros/examples/Lyap.m4 +++ b/graphics/circuit_macros/examples/extras/Lyap.m4 diff --git a/graphics/circuit_macros/examples/extras/Makefile b/graphics/circuit_macros/examples/extras/Makefile new file mode 100644 index 0000000000..5fba20547c --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Makefile @@ -0,0 +1,211 @@ +# Extras Makefile +# +# Type "make" to generate extras.pdf containing examples. +# The examples are in no particular order (well, they are in ls order). +# Type "make clean; make extras.ps" to invoke latex intead of pdflatex. +# Type "make <diag>.ps" to make a postscript file from <diag>.m4 +# It may be necessary to type "make clean" before this or any of the following: +# Type "make <diag>.eps" to make an .eps file from <diag>.m4 +# Type "make <diag>.svg" to make an .svg file from <diag>.m4 using pdf2svg +# The following require ImageMagick convert: +# Type "make <diag>.png" to make a .png file from <diag>.m4 +# Type "make <diag>.tif" to make a .tif file from <diag>.m4 +# +# To test the file test.m4, type "make tst" if boxdims is used, otherwise +# type "make tst1". In either case the file tst.ps is created. +# +# To debug a single diagram in a directory other than this examples +# directory, copy this makefile and tst.tex to where you want to work, +# redefine LIBDIR (below) appropriately, and type "make <diag>.xxx" +# where xxx is one of ps, eps, png, or pdf + +######################################################################### + +# Circuit_macro directory, change this if necessary: +# LIBDIR = $$HOME/lib +LIBDIR = .. + +# The dpic processor: +PIC = dpic + +#MODE = -p +MODE = -g + +#CONF = pstricks.m4 +CONF = pgf.m4 + +# Convert options +EPSOPTS = +PNGOPTS = -quiet -density 400 -scale 25% -alpha Remove + +# M4 = m4 -I $(LIBDIR) +# If environment variable M4PATH has been set to the installation directory: +M4 = m4 + +DOC = extras + +# Files that have to be processed twice: +BOXDIMS = + +######################################################################### + +DVIPSOPTS = -G0 -t letter +DIMFILE = $(DOC).dim +BS = tr '|' '\134' + +# Might be needed (change latex commands to $(LTX) ) +# LTX = latex --shell-escape +LTX = pdflatex --shell-escape + +XTRASRC=printf "|documentclass[11pt]{article}\n\ +|usepackage[dvipsnames]{xcolor}\n\ +|usepackage{times,boxdims,siunitx,amssymb,tikz}\n\ +|setlength{|textwidth}{8in} |setlength{|textheight}{10.5in}\n\ +|setlength{|hoffset}{-2cm} |setlength{|voffset}{-3cm}\n\ +|begin{document}\n" | $(BS) + +PDFLTXSRC=printf "|documentclass[11pt]{standalone}\n\ +|usepackage{times,boxdims,siunitx,amssymb,tikz,geometry}\n\ +|geometry{paperwidth=15in,paperheight=14in,margin=1in}\n\ +|pagestyle{empty}|thispagestyle{empty}\n\ +|begin{document}|noindent|input{"$*".tex}|end{document}\n" | $(BS) + +LTXFILE=printf "|documentclass[11pt]{article}\n\ +|usepackage[dvipsnames]{xcolor}\n\ +|usepackage{times,boxdims,graphicx,pstricks}\n\ +|usepackage{siunitx}\n\ +|setlength{|textwidth}{28cm}|setlength{|textheight}{28cm}\n\ +|setlength{|oddsidemargin}{0pt}|setlength{|evensidemargin}{0pt}\n\ +|setlength{|hoffset}{-1cm}\n\ +|pagestyle{empty}|thispagestyle{empty}\n\ +|newbox|graph\n\ +|begin{document}\n\ +|noindent|input{"$*".tex}|box|graph\n\ +|end{document}\n" | $(BS) + +.SUFFIXES: .ps .dvi .tex .m4 .pic .eps .png .pdf .svg .tif .gif +.m4.pic: + @touch $(DIMFILE) F_$*.dim + $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 > $*.pic +.m4.tex: + @touch $(DIMFILE) F_$*.dim + $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 | $(PIC) $(MODE) > $*.tex +.m4.dvi: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + touch F_$*.dim $(DIMFILE) + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + latex --quiet F_$* + mv F_$*.dvi $*.dvi + rm -f F_* +.dvi.ps: + dvips $(DVIPSOPTS) $* -o $*.ps + chmod 644 $*.ps +.m4.ps: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + dvips $(DVIPSOPTS) F_$* -o $*.ps + chmod 644 $*.ps + rm -f F_* +.m4.eps: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + latex --quiet F_$* + dvips F_$* -T128cm,28cm -o $*.ps +# Recent changes to PSTricks(?) have clashed with the use of TeXtoEPS +# so use ps2epsi + ps2epsi $*.ps $*.epsi + sed -e '/%%Pages:/d' -e '/BeginPreview/,$$d' $*.epsi \ + | tr '\015' '\012' > $*.eps + sed -e '1,/EndPreview/d' $*.epsi >> $*.eps + rm -f F_* +.m4.pdf: + @touch $(DIMFILE) F_$*.dim + $(M4) pgf.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -g > $*.tex + @$(PDFLTXSRC) > F_$*.tex + pdflatex --quiet F_$* + $(M4) pgf.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -g > $*.tex + pdflatex --quiet F_$* + mv F_$*.pdf $*.pdf + rm -f F_* +.m4.png: + make $*.pdf + convert $(PNGOPTS) $*.pdf $*.png + @if test -f $*.png.0 ; then mv $*.png.0 $*.png ; fi +# rm $*.pdf +.m4.gif: + make $*.pdf + convert $(GIFOPTS) $*.pdf $*.gif +# rm $*.pdf +.m4.tif: + make $*.pdf + convert $(EPSOPTS) $*.pdf $*.tif + @if test -f $*.tif.0 ; then mv $*.tif.0 $*.tif ; fi +# rm $*.pdf +.m4.svg: + make $*.pdf + dvisvgm --pdf $*.pdf $*.svg + chmod 644 $*.svg +# rm $*.pdf + + +######################################################################### + +$(DOC).pdf: + @$(XTRASRC) > extras.tex + touch extras.dim + -for fl in `ls *.m4` ; do \ + file=`basename $$fl .m4` ; \ + echo $$file.m4 ; \ + $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ + printf "\n\n|parbox{|textwidth}{\n" | $(BS) >> extras.tex ; \ + printf "|input{$$file.tex}\n" | $(BS) >> extras.tex ; \ + printf "\n $$file.m4\n}\n|vspace{|baselineskip}" \ + | sed -e 's/_/|_/g' | $(BS) >> extras.tex ; \ + done + printf "\n|end{document}\n" | $(BS) >> extras.tex + pdflatex extras + -for file in $(XBOXDIMS) ; do \ + rm -f $$file.tex ; \ + $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ + done + pdflatex extras + +$(DOC).ps: psmode $(DOC).dvi + +psmode: + printf "|usepackage{pstricks,pst-grad}\n" | $(BS) > mode.tex + +pdfmode: + printf "|usepackage{tikz}\n" | $(BS) > mode.tex + +$(DOC).dvi: $(DOC).tex files.tex header.tex psmode + touch $(DOC).dim + make CONF=pstricks.m4 MODE=-p DIMFILE=$(DOC).dim pics + cp $(LIBDIR)/doc/Version.tex . + latex $(DOC) + rm -f $(BOXDIMS) ${BOXDIMS:%.tex=%.pic} $(DOC).dvi + make CONF=pstricks.m4 MODE=-p DIMFILE=$(DOC).dim $(BOXDIMS) + latex $(DOC) + +tst: + @$(LTXFILE) | sed -e 's/{\.tex}/{test.tex}/' > tst.tex + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + rm -f test.tex test.pic + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +tst1: + @$(LTXFILE) | sed -e 's/{\.tex}/{test.tex}/' > tst.tex + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +clean: + rm -f *.ps *.pdf *.tex *.dim *.pic *.log *.dms *.aux diff --git a/graphics/circuit_macros/examples/Metamodel.m4 b/graphics/circuit_macros/examples/extras/Metamodel.m4 index e5d1ba0b1c..e5d1ba0b1c 100644 --- a/graphics/circuit_macros/examples/Metamodel.m4 +++ b/graphics/circuit_macros/examples/extras/Metamodel.m4 diff --git a/graphics/circuit_macros/examples/extras/Obliq.m4 b/graphics/circuit_macros/examples/extras/Obliq.m4 new file mode 100644 index 0000000000..0c71c6569e --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Obliq.m4 @@ -0,0 +1,72 @@ +.PS +threeD_init +scale = 2.54 + +divert(-1) + `ProjectObliq(x,y,z,x scale,degrees) + oblique projection + arg4= x scale (default 1/2)' +define(`ProjectObliq',`(`$2'-dnl +(`$1')ifelse(`$4',,/2,*(`$4'))*cosd(ifelse(`$5',,obliqueangle_,(`$5'))),dnl +`$3'-(`$1')ifelse(`$4',,/2,*(`$4'))*sind(ifelse(`$5',,obliqueangle_,(`$5'))))') +define(`obliqueangle_',45) + +divert(0)dnl + +define(`Pr',`ProjectObliq(`$1',`$2',`$3')') + + d = 2 +define(`cube',`[ # w, h, d, scale, degrees + define(`cubewd',ifelse(`$1',,linewid,`$1'))dnl + define(`cubeht',ifelse(`$2',,cubewd,`$2'))dnl + define(`cubedp',ifelse(`$3',,cubewd,`$3'))dnl + for_(0,7,1,`P`'binary_(m4x,3): \ + Pr(ifelse(eval(m4x/4),1,cubedp,0), + ifelse(eval((m4x%4)/2),1,cubewd,0), + ifelse(eval(m4x%2),1,cubeht,0))') +# {command "{\small" +# for_(0,7,1,`"binary_(m4x,3)" at P`'binary_(m4x,3)') +# command "}" +# } + {"000" at P000} + if obliqueangle_ > 0 then { + line dashed from P100 to P000 chop linethick bp__ * 2 chop 0 + line dashed from P010 to P000 chop linethick bp__ * 2 chop 0 + line dashed from P001 to P000 chop linethick bp__ * 2 chop 0 + line from P101 to P001 + line to P011 + line to P111 + line to P101 + line to P100 + line to P110 + line to P010 + line to P011 + line from P110 to P111 + } else { + line dashed from P101 to P001 chop linethick bp__ * 2 chop 0 + line dashed from P011 to P001 chop linethick bp__ * 2 chop 0 + line dashed from P000 to P001 chop linethick bp__ * 2 chop 0 + line from P100 to P101 + line to P111 + line to P110 + line to P100 + line to P000 + line to P010 + line to P011 + line to P111 + line from P010 to P110 + } + ]') + + Cube: cube(1,2,3) +# +##{arrow from Cube.P001 to 3/2 between Cube.P000 and Cube.P001; "$z$" ljust } +##{arrow from Cube.P010 to 3/2 between Cube.P000 and Cube.P010; "$y$" below } +##{arrow from Cube.P100 to 3/2 between Cube.P000 and Cube.P100; "$x$" ljust } + + move define(`obliqueangle_',30); cube(1,2,3) + move define(`obliqueangle_',15); cube(1,2,3) + move define(`obliqueangle_',-15); cube(1,2,3) + move define(`obliqueangle_',-30); cube(1,2,3) + +.PE diff --git a/graphics/circuit_macros/examples/extras/OneLine.m4 b/graphics/circuit_macros/examples/extras/OneLine.m4 new file mode 100644 index 0000000000..7b451b366a --- /dev/null +++ b/graphics/circuit_macros/examples/extras/OneLine.m4 @@ -0,0 +1,67 @@ +.PS +# OneLine.m4 +# https://tex.stackexchange.com/questions/191598/electric-network-one-line-diagrams/325717#325717 +cct_init +include(libSLD.m4) +First: [ + xgap = 0.6 + dim1 = 1; dim2 = 0.75 ; dim3=0.5 + X: box fill_(0.9) wid 1 "Xingu" "\SI{500}{\kV}" + { "$R_0=\SI{1,682}{\ohm}$" at X.sw below ljust } + sl_transformer(right_ dim2,type=S); rlabel(,\SI{18}{\percent},) + {[Ysymbol;Ysymbol(at last []+(last [].wid,0))] with .s at last [].n+(0,2bp__)} + { B1: line thick 3*linethick up 0.4 with .c at Here + "$s$" wid 0.1 ht 0.1 above } + { arrow right 0.2 from last line.c+(0.1,-0.1) } + { "$I^s$" at last line.start below } + line right 3.0 "$l=\SI{2600}{\km}$" wid 0.1 ht 0.1 above + { B2: line thick 3*linethick up 0.4 with .c at Here; "$r$" above } + sl_transformer(right_ dim2,type=S); rlabel(,\SI{18}{\percent},) + {[Ysymbol;Ysymbol(at last []+(last [].wid,0))] with .s at last [].n+(0,2bp__)} + NI: box fill_(0.9) wid 1 "Nova Igua\c{c}u" "\SI{500}{\kV}" + "$Z_0=a+b$" at NI.sw below ljust + RELE: box wid dimen_/2 ht dimen_/2 with .w at B1+(0.6,0.3) + line left 0.15 from 1/4 between RELE.nw and RELE.sw; "$V^s$" rjust + line left 0.15 from 3/4 between RELE.nw and RELE.sw; "$I^s$" rjust + ] +Second: [ + lstem = dimen_*3/4 + asep = dimen_/3 + sl_grid(U,lgth=dimen_;wdth=dimen_) + sl_transformer(down_ dimen_*7/4,type=S;name=Tr) + llabel(,"$\SI{400}{kVA}$" ljust "$\SI{4}{\percent}$" ljust,,,Tr) + Bus: sl_busbar(right_ dimen_*12, 5) with .P3 at Here +# +define(`loadstring',`[ L: line invis down_ dimen_*5 + line from L.start down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $5 m" ljust } + { sl_load(left_ lstem); "\sf $1" at Head.w rjust } + { r_text(90,`\sf\scriptsize NAYY 4x150 mm$^2$', at Here+(-7bp__,0)) } + line down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $6 m" ljust } + { sl_load(left_ lstem); "\sf $2" at Head.w rjust } + { box wid dimen_/3 ht dimen_/3 at Here } + line down_ L.len/8-3bp__ + { ACsymbol(at Here+(0,-3bp__),,,2:RA) } + line down_ L.len/8+3bp__ from last line.end chop 6bp__ chop 0; dot + ifelse(`$7',,, + `{ arrow <-> up_ L.len/4 from Here+(asep,0) "\sf $7 m" ljust }') + { sl_load(left_ lstem); "\sf $3" at Head.w rjust } + line down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $8 m" ljust } + { sl_load(left_ lstem); Q:"\sf $4" at Head.w rjust } + { box wid dimen_/3 ht dimen_/3 at Here } ]') +# + loadstring(1,2,27,28, 21,21,,21) with .L.start at Bus.P1 + move left_ 13bp__ from last [].Q + loadstring(1,2,15,16, 29,29,,29) with .L.start at Bus.P2 + loadstring(1,2, 8, 9, 40,40,,40) with .L.start at Bus.P3 + loadstring(1,2, 3, 4, 64,64,64,64) with .L.start at Bus.P4 + line down_ last [].L.len/2 from Bus.P5; dot + { r_text(90,`\sf\scriptsize NAYY 4x150 mm$^2$', at last line.c+(-7bp__,0)) } + { arrow <-> down_ last line.len at last line+(asep,0) + "\sf 102 m" wid 30.4 bp__ ljust at last arrow } + { sl_load(left_ lstem)} + ] with .nw at First.sw+(0,-dimen_/2) +#showbox_ +.PE diff --git a/graphics/circuit_macros/examples/OpAmpFilter.m4 b/graphics/circuit_macros/examples/extras/OpAmpFilter.m4 index db1ce2778d..8e8f82c980 100644 --- a/graphics/circuit_macros/examples/OpAmpFilter.m4 +++ b/graphics/circuit_macros/examples/extras/OpAmpFilter.m4 @@ -3,9 +3,6 @@ cct_init command "{\small\sf" -divert(-1) -divert(0)dnl - define(`SpecOpAmp',`$1: [ right_ lwtmp = linewid; linewid = 1*scale H: opamp @@ -14,21 +11,21 @@ divert(0)dnl "$4" at H.E below ljust "V${-}$" at H.E1 below line up_ dimen_/3 from H.E1 "4" rjust; dot(,,1) - "$\hbox{V}_{\hbox{CC}}$" above rjust at last [].n + "$\hbox{V}_{\hbox{CC}}$" rjust at last [].w "V${+}$" at H.E2 above line down_ dimen_/3 from H.E2 "11" ljust; dot(,,1) - "${-}\hbox{V}_{\hbox{CC}}$" below ljust at last [].s + "${-}\hbox{V}_{\hbox{CC}}$" ljust at last [].e linewid = lwtmp ifelse($1,U1,,`line left_ jog from H.In2 then down_ jog/2; zground ') "$1" at H.S below ljust In1: H.In1; In2: H.In2; Out: H.Out D: dot(at Out) - V: circle diam 12bp__ "V" at Out+(dimen_/3,dimen_/3) + V: circle diam 12bp__ "V" at Out+(dimen_/4,dimen_/3) "V$_{\hbox{\scriptsize $5}}$" at V.n above open_arrow(from V to D chop last circle.rad chop dotrad_) ] ') define(`zground',`ground(`$1',,S); "0" at Here+(dimen_/6,-dimen_/2)') - cscale = 3/2 + cscale = 5/4 linewid = linewid*cscale jog = dimen_*0.3 vstep = dimen_*5/4 @@ -39,12 +36,12 @@ divert(0)dnl R2: resistor(right_ elen_*3/4 from U2.Out); llabel(,"R2"); rlabel(,"1`\,'k") dot; line right_ jog SpecOpAmp(U3,9,10,8,lp) with .In1 at Here - SpecOpAmp(U4,13,12,14,n) with .Out at U3.Out+(0,-dimen_*3.0) + SpecOpAmp(U4,13,12,14,n) with .Out at U3.Out+(0,-dimen_*3.05) line up vstep from U4.Out - Rf: resistor(left_); rlabel(,R_f); llabel(,"1`\,'k") + Rf: resistor(left_); rlabel(,"R$_{\hbox{f}}$"); llabel(,"1`\,'k") line to (U4.In1,Here)-(jog,0) then to U4.In1-(jog,0); dot - line from U3.Out down_ vstep then left_ jog - RL: resistor; rlabel(,RL); llabel(,"100") + line from U3.Out down_ vstep+5bp__ then left_ jog + RL: resistor; rlabel(,"RL"); llabel(,"100") line to (U4.In1-(2*jog,0),Here) then to U4.In1-(2*jog,0); dot line from U1.Out to (U1.Out,Here); right_ R42: resistor(to U4.In1); llabel(,"R42"); rlabel(,"1`\,'k") diff --git a/graphics/circuit_macros/examples/extras/Optics.m4 b/graphics/circuit_macros/examples/extras/Optics.m4 new file mode 100644 index 0000000000..d4fadd4465 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Optics.m4 @@ -0,0 +1,31 @@ +.PS +# Optics.m4 +# https://tex.stackexchange.com/questions/623201/geometrical-optics +gen_init +scale = 2.54 + + textoffset = 4pt__ + O: dot(at (0,0)) ; "\Large $O$" below rjust + L: line thick 1 right_ 14 with .c at O + S: dot(at (1.8,0)) ; "\Large $S$" below rjust + r = 7 + C: dot(at (S.x-r,0)) ; "\Large $C$" below + F: dot(at (-1.8,0)) ; "\Large $F$" below + I: dot(at (4,0)) ; "\Large $I$" below + arrow dashed from I up_ 3.2 ; It: Here + AS: C.x+sqrt(r^2-3.7^2),3.7 + Arc: arc thick 1 cw from AS to (AS.x,-AS.y) rad r with .c at C + for y=-AS.y to AS.y+0.001 by 0.1 do { line thick 0.4 right 0.5 up 0.1 \ + from (C.x+sqrt(r^2-y^2),y) } + M: move from C to It + A1: arrow outlined "red" from C to LCintersect(M,C,r,R) chop -2 chop 0 + arrow outlined "red" dashed to It chop 0 chop -3 + N: move from It to F + arrow <- outlined "red" dashed from It to LCintersect(N,C,r) chop -2 chop 0 + P: move down_ 1 from A1.start + arrow outlined "red" from last arrow.end to Intersect_(P,N) + Q: move up 1 from O + arrow from O to Intersect_(Q,M) + arrow outlined "red" to (C.x+sqrt(r^2-Here.y^2),Here.y) + +.PE diff --git a/graphics/circuit_macros/examples/Orbits.m4 b/graphics/circuit_macros/examples/extras/Orbits.m4 index ef85d27935..ef85d27935 100644 --- a/graphics/circuit_macros/examples/Orbits.m4 +++ b/graphics/circuit_macros/examples/extras/Orbits.m4 diff --git a/graphics/circuit_macros/examples/PPA.m4 b/graphics/circuit_macros/examples/extras/PPA.m4 index 8d25901310..8d25901310 100644 --- a/graphics/circuit_macros/examples/PPA.m4 +++ b/graphics/circuit_macros/examples/extras/PPA.m4 diff --git a/graphics/circuit_macros/examples/extras/PerpTo.m4 b/graphics/circuit_macros/examples/extras/PerpTo.m4 new file mode 100644 index 0000000000..410ce9605f --- /dev/null +++ b/graphics/circuit_macros/examples/extras/PerpTo.m4 @@ -0,0 +1,26 @@ +.PS +# PerpTo.m4 +# https://tex.stackexchange.com/questions/666411/repetitive-perpendiculars-in-a-right-angle-triangle +gen_init + + O: (0,0) + A: (5,0) + B: (0,3) + +define drawperp { #( depth, O, A, B ) +[ d = $1; O[d]: $2; A[d]: $3; B[d]: $4 + P[d]: PerpTo(O[d],A[d],B[d]) + if d > 0 then { + exec sprintf("drawperp(%g,P[%g],O[%g],A[%g]) with .O[%g] at P[%g]",\ + d-1,d,d,d,d-1,d) + exec sprintf("drawperp(%g,P[%g],B[%g],O[%g]) with .O[%g] at P[%g]",\ + d-1,d,d,d,d-1,d) + } + line outlined graystring((depth-d)/depth) from O[d] to P[d] + ] } + + depth = 6 + drawperp(depth,O,A,B) with .O[depth] at O + line from O to A then to B then to O + +.PE diff --git a/graphics/circuit_macros/examples/extras/Pipe.m4 b/graphics/circuit_macros/examples/extras/Pipe.m4 new file mode 100644 index 0000000000..0d6512478c --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Pipe.m4 @@ -0,0 +1,40 @@ +.PS +# How about ladder diagrams? +gen_init +NeedDpicTools + + { for x=0 to 5 do { line up 5 from (x,0) } } + { for y=0 to 5 do { line right 5 from (0,y) } } + posarray(A, + (1,0.5), + (4,0.5), + (4.5,1), + (4.5,3), + (4,3.5), + (3.5,3), + (3,2.5), + (1,2.5), + (0.5,3), + (0.5,4), + (1,4.5), + (4,4.5)) + P[0]: 1,0.5 + P[1]: 4.5,0.5 + P[2]: 4.5,3.5 + P[3]: 3.5,3.5 + P[4]: 3.5,2.5 + P[5]: 0.5,2.5 + P[6]: 0.5,4.5 + P[7]: 4,4.5 + + r = 0.4 + define(`curve', + ` move to P[0] + for i_c=1 to 6 do { arcto(P[i_c],P[i_c+1],r,`$1') } + line to P[7] `$1'') + + lw = 0.3/(1bp__) + lt = 1.8 + for i=0 to 6 do { + curve(thick lw-lt*i outlined rgbstring(0.1+i/10,0.1+i/10,0.1+i/10))} +.PE diff --git a/graphics/circuit_macros/examples/extras/Planes.m4 b/graphics/circuit_macros/examples/extras/Planes.m4 new file mode 100644 index 0000000000..9344bd2dda --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Planes.m4 @@ -0,0 +1,175 @@ +.PS +# Planes.m4 +threeD_init +NeedDpicTools + +# These 3D diagrams are like many others: define the surface facets, +# use normal vectors to determine visibility, sort and plot the visible +# facets from back to front. + +# Store a point as x_[i], y_[i], z_[i] +define(`mktriple',` + x_[$1] = $2 + y_[$1] = $3 + z_[$1] = $4') +# Recover point coordinates +define(`triple',`x_[$1], y_[$1], z_[$1]') + +define(`facetnormal',`cross3D( + diff3D(triple($1*3+1),triple($1*3)), + diff3D(triple($1*3+2),triple($1*3+1)))') + +define(`facetcenter',`sprod3D(0.5,sum3D(triple($1*3),triple($1*3+2)))') + +# Create npositive, arrays dcosine[1..npositive] +# and index ix[1..npositive] of sorted facets +# Uses macros facetnormal(i) and facetcenter(i) +define(`processfacets',` + npositive = 0 + for i=1 to `$1' do { + mktriple(0,facetnormal(i)) + dx = dot3D(triple(0),View3D) + if dx > 0 then { + dcosine[i] = dx/length3D(triple(0)) # direction cosine normal wrt View3D + npositive +=1 + dist[npositive] = dot3D(facetcenter(i),View3D) # distance + ix[npositive] = i + } + } + dpquicksort(dist,1,npositive,ix) ') + +ifelse(1,1,` +Threeplanes: [ +# Size parameters + a = 3/2 + b = 0.4 + d = 1 +# Define intersecting lines in the plane + A0: -a,-b + A1: a,-b + B0: Rot_(A0,120) + B1: Rot_(A1,120) + C0: Rot_(A0,240) + C1: Rot_(A1,240) + +# Intersections +define(`lintersect',`intersect_(`$1'0,`$1'1,`$2'0,`$2'1)') + AB: lintersect(A,B) + BC: lintersect(B,C) + CA: lintersect(C,A) + +# Facets are rectangles here; store 3 corners +define(`mkfacet',` + mktriple((`$1')*3, 0,`$2'.x,`$2'.y) + mktriple((`$1')*3+1, 0,`$3'.x,`$3'.y) + mktriple((`$1')*3+2,-d,`$3'.x,`$3'.y) + ') +# Define the facets + mkfacet(m4inx,A0,CA) mkfacet(m4inx,CA,A0) + mkfacet(m4inx,CA,AB) mkfacet(m4inx,AB,CA) + mkfacet(m4inx,AB,A1) mkfacet(m4inx,A1,AB) + + mkfacet(m4inx,B0,AB) mkfacet(m4inx,AB,B0) + mkfacet(m4inx,AB,BC) mkfacet(m4inx,BC,AB) + mkfacet(m4inx,BC,B1) mkfacet(m4inx,B1,BC) + + mkfacet(m4inx,C0,BC) mkfacet(m4inx,BC,C0) + mkfacet(m4inx,BC,CA) mkfacet(m4inx,CA,BC) + mkfacet(m4inx,CA,C1) mkfacet(m4inx,C1,CA) + nfacets = m4x + +# Wierd color +define(`colr',`ifelse(`$1',,"white", + `rgbstring(`$1',ifelse(`$2',,`$1',`$2'),ifelse(`$3',,`$1',`$3'))')') + +# Recover the 4th corner and draw +define(`drawfacet',` + NW_facet: project(triple(($1)*3)) + NE_facet: project(triple(($1)*3+1)) + SE_facet: project(triple(($1)*3+2)) + SW_facet: project(x_[($1)*3+2],y_[($1)*3],z_[($1)*3]) + N_facet: 0.5 between NW_facet and NE_facet + line from N_facet to NE_facet then to SE_facet then to SW_facet \ + then to NW_facet then to N_facet shaded colr(`$2',`$3',`$4') +# fill_(ifelse(`$2',,1,`(1-`$2')')) + ') + +# View angles azimuth, elevation, rotation (degrees) + setview( 10, 40 ) + +# Draw facets, shading with view cosines + processfacets(nfacets) + for i=1 to npositive do { drawfacet(ix[i],max(0,1-2*dcosine[ix[i]]), + dcosine[ix[i]], + dcosine[ix[i]]) +# for i=1 to npositive do { drawfacet(ix[i],dcosine[ix[i]]) + } + +] # Threeplanes +') + +# Bowl +# vertx_(facet_no,vertex_no) + define vertx_ { ($1-1)*nvertices + $2 } + +# Normal vector to a facet +define(`facetnormal',`cross3D( + diff3D(triple(vertx_($1,2)),triple(vertx_($1,1))), + diff3D(triple(vertx_($1,4)),triple(vertx_($1,1))))') + +# Facet center +define(`facetcenter',`sprod3D(1/4,sum3D( + sum3D(triple(vertx_(`$1',1)),triple(vertx_(`$1',2))), + sum3D(triple(vertx_(`$1',3)),triple(vertx_(`$1',4)))))') + +define(`drawplane',` + NW_plane: project(triple(vertx_($1,1))) + SW_plane: project(triple(vertx_($1,2))) + SE_plane: project(triple(vertx_($1,3))) + NE_plane: project(triple(vertx_($1,4))) + N_plane: 0.5 between NW_plane and NE_plane + shd = (`$2')^(1/4) + line from N_plane to NE_plane then to SE_plane then to SW_plane \ + then to NW_plane then to N_plane \ + fill_(ifelse(`$2',,1,shd)) outlined rgbstring(shd,shd,shd) +# line from NW_plane to NE_plane + line from SW_plane to SE_plane + ') + +ifelse(1,1,` + nvertices = 4 # vertices per facet +Bowl: [ + elevation = 30 + setview( 0, 30 ) + nplanes = 40 + bigradius = 2 + smallradius = 1 + cupht = 1.5 + thin = smallradius/10 +# Define the facet corners + for i=1 to nplanes do { + mktriple(vertx_(i,1),rot3Dz((i-1)/nplanes*twopi_,bigradius,0,0)) + mktriple(vertx_(i,2),rot3Dz((i-1)/nplanes*twopi_,smallradius,0,-cupht)) + mktriple(vertx_(i,3),rot3Dz((i )/nplanes*twopi_,smallradius,0,-cupht)) + mktriple(vertx_(i,4),rot3Dz((i )/nplanes*twopi_,bigradius,0,0)) + mktriple(vertx_(nplanes+i,1),triple(vertx_(i,4))) + mktriple(vertx_(nplanes+i,2),triple(vertx_(i,3))) + mktriple(vertx_(nplanes+i,3),triple(vertx_(i,2))) + mktriple(vertx_(nplanes+i,4),triple(vertx_(i,1))) + } +# for i=1 to nplanes do { +# mktriple(vertx_(i,1),rot3Dz((i-1)/nplanes*twopi_,bigradius,0,0)) +# mktriple(vertx_(i,2),rot3Dz((i-1)/nplanes*twopi_,smallradius,0,-cupht)) +# mktriple(vertx_(i,3),rot3Dz((i-1)/nplanes*twopi_,smallradius-thin,0,-cupht)) +# mktriple(vertx_(i,4),rot3Dz((i-1)/nplanes*twopi_,bigradius-thin,0,0)) +# } +# Find the visible facets and sort + processfacets(nplanes*2) + + for i=1 to npositive do { drawplane(ix[i],dcosine[ix[i]]) } + ellipse wid 2*bigradius ht 2*bigradius*sin(elevation*dtor_) at project(0,0,0) + +] #with .sw at Threeplanes.se +') + +.PE diff --git a/graphics/circuit_macros/examples/extras/README_extras b/graphics/circuit_macros/examples/extras/README_extras new file mode 100644 index 0000000000..140802fb68 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/README_extras @@ -0,0 +1,6 @@ + +THIS DIRECTORY contains a Makefile and .m4 sources for diagrams +not included in the examples files. Type "make" and, to clean up, +"make clean". This directory is assumed to be a subdirectory of +the examples directory in order to include the necessary definition +files. diff --git a/graphics/circuit_macros/examples/extras/RandomNodes.m4 b/graphics/circuit_macros/examples/extras/RandomNodes.m4 new file mode 100644 index 0000000000..f14973204f --- /dev/null +++ b/graphics/circuit_macros/examples/extras/RandomNodes.m4 @@ -0,0 +1,19 @@ +.PS +# RandomNodes.m4 +gen_init +NeedDpicTools + + scale = 2.54 + n = 300 + msiz = 4.90*2 + maxdist = 1.0 + + box wid msiz ht msiz with .sw at (0,0) + for i=1 to n do { X[i] : (rand(), rand())*msiz } + for i=1 to n-1 do { for j=i+1 to n do { + if distance(X[i],X[j]) <= maxdist then { + line outlined "green" from X[i] to X[j] + } } } + for i=1 to n do { circle rad dotrad_ at X[i] shaded "green" } + +.PE diff --git a/graphics/circuit_macros/examples/extras/Region.m4 b/graphics/circuit_macros/examples/extras/Region.m4 new file mode 100644 index 0000000000..e4cde35491 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Region.m4 @@ -0,0 +1,38 @@ +.PS +# Region.m4 +# https://tex.stackexchange.com/questions/606088/how-can-i-plot-in-latex +gen_init + + grsize = 3.3 + maxaxis = 4.5 + define Grid { (($1+maxaxis)/(2*maxaxis)*grsize-grsize/2,\ + ($2+maxaxis)/(2*maxaxis)*grsize-grsize/2) } + +thinlines_ + box wid grsize ht grsize with .c at (0,0) + tic = 0.05 + for x=-maxaxis to maxaxis by 0.5 do { + line up tic from Grid(x,-maxaxis) + y = abs(x) + { if y/2 == int(y/2+0.5) then { sprintf("%g",x) at last line.start below } } + line down tic from Grid(x,maxaxis) + line right tic from Grid(-maxaxis,x) + { if y/2 == int(y/2+0.5) then { sprintf("%g",x) at last line.start rjust } } + line left tic from Grid(maxaxis,x) + } +thicklines_ + + n = 10 + ylim = 3 + for i=0 to n do { y = i/n*ylim + P[i]: Grid(sqrt(1+y^2),y) + P[-i]:( P[i].x,-P[i].y) + Q[i]: (-P[i].x, P[i].y) + Q[-i]:(-P[i].x,-P[i].y) } + rgbfill(0.6,0.6,0.8, + fitcurve(P,n,,-n) + line to (P[n].x,P[n].x) then to (Q[-n].x,Q[-n].x) then to Q[-n] + fitcurve(Q,n,,-n) + line to (Q[n].x,-Q[n].x) then to (P[-n].x,-P[-n].x) then to P[-n] ) + +.PE diff --git a/graphics/circuit_macros/examples/Resolver.m4 b/graphics/circuit_macros/examples/extras/Resolver.m4 index b6ca93047a..b6ca93047a 100644 --- a/graphics/circuit_macros/examples/Resolver.m4 +++ b/graphics/circuit_macros/examples/extras/Resolver.m4 diff --git a/graphics/circuit_macros/examples/SPM.m4 b/graphics/circuit_macros/examples/extras/SPM.m4 index 0b3fdb642c..0b3fdb642c 100644 --- a/graphics/circuit_macros/examples/SPM.m4 +++ b/graphics/circuit_macros/examples/extras/SPM.m4 diff --git a/graphics/circuit_macros/examples/SampleFlow.m4 b/graphics/circuit_macros/examples/extras/SampleFlow.m4 index 077a0ba6e3..077a0ba6e3 100644 --- a/graphics/circuit_macros/examples/SampleFlow.m4 +++ b/graphics/circuit_macros/examples/extras/SampleFlow.m4 diff --git a/graphics/circuit_macros/examples/ShadeSector.m4 b/graphics/circuit_macros/examples/extras/ShadeSector.m4 index 0632fdb14f..0632fdb14f 100644 --- a/graphics/circuit_macros/examples/ShadeSector.m4 +++ b/graphics/circuit_macros/examples/extras/ShadeSector.m4 diff --git a/graphics/circuit_macros/examples/extras/Shadow.m4 b/graphics/circuit_macros/examples/extras/Shadow.m4 new file mode 100644 index 0000000000..1ad65d8eb4 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Shadow.m4 @@ -0,0 +1,129 @@ +.PS +# Shadow.m4 +gen_init +NeedDpicTools +s_init(HSV) + +divert(-1) + `shadowellipse(options,text) + Draws a shadowed ellipse + with gradient from white at the top to + hsv-specified color at the bottom + Default is uniform lightgray shade + Arg 2 is a text label written at the center' +define(`shadowellipse',`[ Orig: Here + m4shadow_keys(`$1') + [ + ellipse wid m4wid ht m4ht invis shaded m4shadow ] wid 0 ht 0 \ + at (m4shadowthick+m4thick bp__/2,-(m4shadowthick+m4thick bp__/2)) +# at ((m4shadowthick)/2,-(m4shadowthick)/2) +ifelse(m4hue,,,` + define pElBshade { v = m4ht*($`'1) + if v < m4rad then { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-v)^2) } \ + else { if v < m4ht-m4rad then { h = m4wid/2 } \ + else { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-(m4ht-v))^2) } } + line from (-h,v) to (h,v) thick m4thick outlined rgbstring($`'2,$`'3,$`'4) + } + nsteps = rnd(m4ht/(m4thick bp__)*1.1) + hsvtorgb(m4hue,m4sat,m4val,r,g,b) + ShadeObject(pElBshade,nsteps, + 0, r, g, b, + 1, 1, 1, 1) with .c at Orig ') + Ellipse: ellipse ht m4ht wid m4wid thick m4thick outline m4outlined \ + at Orig ifelse(m4hue,,shaded m4shaded) + ifelse(`$2',,,`m4lstring(`$2',"`$2'") at Ellipse') + `$3']') + `shadowbox(options,text) Draws a shadowed box + with gradient from white at the top to + hsv-specified color at the bottom + Default is uniform lightgray shade + Arg 2 is a text label written at the center' +define(`shadowbox',`[ Orig: Here + m4shadow_keys(`$1') + [ + box invis rad m4rad ht m4ht wid m4wid shaded m4shadow ] wid 0 ht 0 \ + at (m4shadowthick+m4thick bp__/2,-(m4shadowthick+m4thick bp__/2)) +# box rad m4rad+m4thick bp__/2+m4shadowthick/2 ht m4ht wid m4wid \ +# thick m4shadowthick/(1bp__) outlined m4shadow ] wid 0 ht 0 \ +# at ((m4shadowthick+m4thick bp__)/2,-(m4shadowthick+m4thick bp__)/2) +ifelse(m4hue,,,` + define pBxBshade { v = m4ht*($`'1) + if v < m4rad then { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-v)^2) } \ + else { if v < m4ht-m4rad then { h = m4wid/2 } \ + else { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-(m4ht-v))^2) } } + line from (-h,v) to (h,v) thick m4thick outlined rgbstring($`'2,$`'3,$`'4) + } + nsteps = rnd(m4ht/(m4thick bp__)*1.1) + hsvtorgb(m4hue,m4sat,m4val,r,g,b) + ShadeObject(pBxBshade,nsteps, + 0, r, g, b, + 1, 1, 1, 1) with .c at Orig ') + Box: box rad m4rad ht m4ht wid m4wid thick m4thick outline m4outlined \ + at Orig ifelse(m4hue,,shaded m4shaded) + ifelse(`$2',,,`m4lstring(`$2',"`$2'") at Box') + `$3']') +define(`m4shadow_keys', +# Box size parameters +`setkey_(`$1',ht,boxht)dnl + setkey_(`$1',wid,boxwid)dnl + setkey_(`$1',rad,boxht/8)dnl + setkey_(`$1',thick,linethick)dnl +# Shadow thickness + setkey_(`$1',shadowthick,2*lthick)dnl +# HSV color for gradient shading + setkey_(`$1',hue)dnl Default is blank for a shade fill; + setkey_(`$1',sat,1)dnl + setkey_(`$1',val,1)dnl +# Named colors + setkey_(`$1',shaded,"lightgray",N)dnl + setkey_(`$1',outlined,"gray",N)dnl + setkey_(`$1',shadow,"lightgray",N)dnl +') + +divert(0)dnl + +w = 0.3 +boxwid = w +dh = 30 +# Hue from 0 to 360 +T:[ for i=0 to 361 by dh do { shadowbox(hue=i) } ] + { s_box(hue=0) at T.w rjust; s_box(hue=360) at T.e ljust } + { for i=0 to 361 by dh do { s_box("%g",i) at T.nw+(w/2+i/dh*w,0) above } } + { s_box(hue) at T.n+(0,12bp__) above } + +# Hue from 0 to 360; sat=0.5; val=0.5 +Ta:[ for i=0 to 361 by dh do { shadowbox(hue=i;sat=0.5;val=0.5) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{sat=0.5\\val=0.5}') at Ta.w rjust } + +# Hue = 0; sat=0 to 1 +U:[ for i=0 to 361 by dh do { shadowbox(hue=0;sat=i/360) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{hue=0\\sat=0}') at U.w rjust + s_box(sat=1) at U.e ljust } + +# Hue = 0; val=0 to 1 +V:[ for i=0 to 361 by dh do { shadowbox(hue=0;val=i/360) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{hue=0\\val=0}') at V.w rjust + s_box(val=1) at V.e ljust } + +# Miscellaneous +W:[ + shadowbox + DefineRGBColor(verylight,0.95,0.95,0.95); shadowbox(shaded=verylight) + shadowbox(hue=0;val=0) + DefineHSVColor(cx,110,0.5,0.5); shadowbox(shaded=cx) + shadowbox(shaded="yellow") + DefineHSVColor(lx,120,0.4,0.5); shadowbox(hue=120;sat=0.3;val=0.2;shadow=lx) + ] with .nw at last [].sw + +ellipsewid = w +#linethick = 5 +X:[ + shadowellipse(shadowthick=lthick) + ellipse thick 5 + ellipse thick 5 shaded "gray" + ] with .nw at last [].sw+(0,-0.1) + +.PE diff --git a/graphics/circuit_macros/examples/Shaky.m4 b/graphics/circuit_macros/examples/extras/Shaky.m4 index 81364cf515..81364cf515 100644 --- a/graphics/circuit_macros/examples/Shaky.m4 +++ b/graphics/circuit_macros/examples/extras/Shaky.m4 diff --git a/graphics/circuit_macros/examples/extras/Star.m4 b/graphics/circuit_macros/examples/extras/Star.m4 new file mode 100644 index 0000000000..0817236d19 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Star.m4 @@ -0,0 +1,38 @@ +.PS +# Star.m4 +# https://tex.stackexchange.com/questions/605132/how-can-i-insert-a-nine-pointed-star-in-a-latex-document +gen_init + +# star(keys) +# keys: size=expr; +# points=expr; +# angle=expr; last convex vertex ang +# depth=expr; inner vertex fraction +# line=attributes; +define(`star',`[ pushkeys_(`$1', + `size:linewid; points:5; angle:90; depth:1/(m4points-1); line::N') + dang = 360/m4points + T: (Rect_(m4size/2*m4depth,m4angle+dang/2)) # concave inner vertex + S: 1/2 between T and (Rect_(m4size/2,m4angle)) + U: (Rect_(m4size/2,m4angle+dang)) # convex outer vertex + line m4line from S to T then to U + for i=1 to m4points-1 do { + T: (Rect_(m4size/2*m4depth,m4angle+i*dang+dang/2)) + U: (Rect_(m4size/2,m4angle+(i+1)*dang)) + continue to T then to U } + continue to S; popdef(`size',`points',`angle',`depth',`m4line')]') + +linewid = linewid*2 +ifelse(1,1,` +star +star(size=1) +star(points=4) +star(depth=1/4) +star(line=outlined "red") +star(points=8) +star(points=9;line=outlined "red" shaded "magenta") +') +#for_(3,8,1,` +#star(points=m4x;line=outlined "red" shaded "magenta")') + +.PE diff --git a/graphics/circuit_macros/examples/Stator.m4 b/graphics/circuit_macros/examples/extras/Stator.m4 index fc74a111e7..fc74a111e7 100644 --- a/graphics/circuit_macros/examples/Stator.m4 +++ b/graphics/circuit_macros/examples/extras/Stator.m4 diff --git a/graphics/circuit_macros/examples/extras/TR_fill.m4 b/graphics/circuit_macros/examples/extras/TR_fill.m4 new file mode 100644 index 0000000000..bf3fae888c --- /dev/null +++ b/graphics/circuit_macros/examples/extras/TR_fill.m4 @@ -0,0 +1,17 @@ +.PS +# TR_fill.m4 +# https://tex.stackexchange.com/questions/654117/fill-parts-of-a-shape +gen_init + + B: (0,0); "B" at B below + C: (5,0); "C" at C below + A: Cintersect(B,4,C,3); "A" at A above + line from B to C then to A then to B + RightAngle(B,A,C,0.25) + + rgbfill(0.5,0.5,0.5, + arc from A to B rad 2 + arc cw to C rad 2.5 + arc to A rad 1.5 ) + +.PE diff --git a/graphics/circuit_macros/examples/extras/Views.m4 b/graphics/circuit_macros/examples/extras/Views.m4 new file mode 100644 index 0000000000..c02c9a4817 --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Views.m4 @@ -0,0 +1,304 @@ +.PS +# Views.m4 +threeD_init + +sinclude(Lettering.m4def) +sinclude(../Lettering.m4def) +Letter_init + +define(`textwidth',5.5) + +`# Perspective transformations +# mult4( matrix, vector, vector ) + define mult4 { for i=1 to 4 do { + $3[i] = 0 + for j=1 to 4 do { $3[i] = $3[i] + $1[(j-1)*4+i]*$2[j] }}} +# eye4 make unit matrix + define eye4 { for i=1 to 4 do { for j=1 to 4 do { $1[(j-1)*4+i] = 0 }}} +# rotx4( theta, vector, vector ) + define rotx4 { $3[1] = $2[1] + $3[2] = cos($1)*$2[2]-sin($1)*$2[3] + $3[3] = sin($1)*$2[2]+cos($1)*$2[3] + $3[4] = $2[4] } +# roty4( theta, vector, vector ) + define roty4 { $3[1] = cos($1)*$2[1]-sin($1)*$2[3] + $3[2] = $2[2] + $3[3] = sin($1)*$2[1]+cos($1)*$2[3] + $3[4] = $2[4] } +# rotz4( theta, vector, vector ) + define rotz4 { $3[1] = cos($1)*$2[1]-sin($1)*$2[2] + $3[2] = sin($1)*$2[1]+cos($1)*$2[2] + $3[3] = $2[3] + $3[4] = $2[4] } +# add4( vector, vector, vector ) + define add4 { + if (($1[4]==0) && ($2[4]==0)) then { + for i=1 to 4 do { $3[i] = $1[i]+$2[i] } } \ + else { if $1[4]==0 then { for i=1 to 4 do { $3[i] = $1[i] } } \ + else { if $2[4]==0 then { for i=1 to 4 do { $3[i] = $2[i] } } \ + else { for i=1 to 3 do { $3[i] = $1[i]/$1[4]+$2[i]/$2[4] }; $3[4] = 1 } + } } } + +# vec4( x,y,z, vector ) + define vec4 { $4[1] = $1; $4[2] = $2; $4[3] = $3; $4[4] = 1 } +# copy4( vector, vector ) + define copy4 { $2[1] = $1[1]; $2[2] = $1[2]; $2[3] = $1[3]; $2[4] = $1[4] } +# pr4( vector, label ) + define pr4 { if $1[4]==0 then { print "Divide by zero" } \ + else { $2: pr($1[1]/$1[4],$1[2]/$1[4],$1[3]/$1[4]) }} + + define print4 { print sprintf("%g,%g,%g,%g",$1[1],$1[2],$1[3],$1[4]) } +' +# Basic dimensions + u = 1*27/28.7*0.7 ifdef(`xsnotes',`*1.14') + a = 2*u + b = 1*u + c = 1.2*u + d = c*1/2 + e = c/3 + f = u*1/4 + r = c/3 + + visibleth = 1.2 + dimensionth = 0.4 + hiddenth = dimensionth + linethick_(visibleth) + +# Iso diagram viewing angle +dazim = 45 +delev = -30 +setview(dazim,delev) + +define(`pr',`(project(`$3',`$1',`$2'))') +define(`xpnd',$1) + + define(`X0', `0,0,0') + define(`X1', `0,b,0') + define(`X2', `a,b,0') + define(`X3', `a,0,0') + define(`X4', `0,0,c') + define(`X5', `0,b,c') + define(`X6', `a,b,c') + define(`X7', `a,0,c') + define(`X8', `-e,0,c/2-f/2') + define(`X9', `-e,d,c/2-f/2') + define(`X10',`0,d,c/2-f/2') + define(`X11',`0,0,c/2-f/2') + define(`X12',`-e,0,c/2+f/2') + define(`X13',`-e,d,c/2+f/2') + define(`X14',`0,d,c/2+f/2') + define(`X15',`0,0,c/2+f/2') + define(`X16',`0,b*1.25,c') + define(`X17',`a/4,b*1.25,c') + define(`X18',`a/4,b,c') + define(`X19',`0,b,c/2') + define(`X20',`a/4,b,c/2') + define(`xn',20) + + define(`ncirc',18) + dt = 360/ncirc + tx = a*2/3; ty = b; tz = c/2 + define(`TR',`tx,ty,tz') + +define(`loopX',`ifelse(eval(`$1'>=0),1, + `define(`X'eval(`$1'+xn+1),`tx+r*cosd(`$1'*dt),ty,tz+r*sind(`$1'*dt)') + loopX(eval($1-1))')') + + loopX(ncirc) + +define(`loopTT',`ifelse(eval(`$1'>=0),1, + `TT[`$1']: ifelse(`$3',0,`pr(X$2)',`Y$2') + loopTT(eval(`$1'-1),eval(`$2'-1),`$3')')') + +define(`drawobj',` + line from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) to pr(xpnd(`$1'2)) + line to pr(xpnd(`$1'3)) to pr(xpnd(`$1'0)) + line from pr(xpnd(`$1'0)) to pr(xpnd(`$1'11)) to pr(xpnd(`$1'8)) \ + to pr(xpnd(`$1'12)) to pr(xpnd(`$1'13)) + line to pr(xpnd(`$1'9)) to pr(xpnd(`$1'8)) + line from pr(xpnd(`$1'13)) to pr(xpnd(`$1'14)) to pr(xpnd(`$1'10)) + line to pr(xpnd(`$1'9)) + line from pr(xpnd(`$1'10)) to pr(xpnd(`$1'11)) + ifelse(`$2',0, + `shade(0.92,line width 0 from pr(xpnd(`$1'1)) to pr(xpnd(`$1'5)) \ + to pr(xpnd(`$1'6)) to pr(xpnd(`$1'2)) to pr(xpnd(`$1'1))) + perspective(X1,Z) + ellipse fill_(0.7) ht 2*r*tmx[2]/tmx[4]/b wid 2*r at pr(TR) + shade(1,line width 0 from pr(xpnd(`$1'19)) to pr(xpnd(`$1'16)) \ + to pr(xpnd(`$1'17)) to pr(xpnd(`$1'20)) to pr(xpnd(`$1'19))) + shade(0.7,line width 0 from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) \ + to pr(xpnd(`$1'2)) to pr(xpnd(`$1'3)) to pr(xpnd(`$1'0))) + shade(0.6,line width 0 from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) \ + to pr(xpnd(`$1'19)) to pr(xpnd(`$1'16)) to pr(xpnd(`$1'4)) \ + to pr(xpnd(`$1'0))) + shade(0.9,line width 0 from pr(xpnd(`$1'13)) to pr(xpnd(`$1'14)) \ + to pr(xpnd(`$1'10)) to pr(xpnd(`$1'9)) to pr(xpnd(`$1'13))) + shade(0.7,line width 0 from pr(xpnd(`$1'8)) to pr(xpnd(`$1'9)) \ + to pr(xpnd(`$1'10)) to pr(xpnd(`$1'11)) to pr(xpnd(`$1'8))) + shade(0.6,line width 0 from pr(xpnd(`$1'8)) to pr(xpnd(`$1'9)) \ + to pr(xpnd(`$1'13)) to pr(xpnd(`$1'12)) to pr(xpnd(`$1'8))) + A: line invis from pr(xpnd(`$1'4)) to pr(xpnd(`$1'0)) + B: line invis from pr(xpnd(`$1'12)) to pr(xpnd(`$1'13)) + line from Intersect_(A,B) to pr(xpnd(`$1'4)) + line from pr(xpnd(`$1'4)) to pr(xpnd(`$1'16))', + + `A: line invis from pr(xpnd(`$1'4)) to pr(xpnd(`$1'16)) + B: line invis from pr(xpnd(`$1'14)) to pr(xpnd(`$1'13)) + line from Intersect_(A,B) to pr(xpnd(`$1'16)) + line thick dimensionth from pr(xpnd(`$1'2)) to -0.5 between \ + pr(xpnd(`$1'2)) and pr(xpnd(`$1'1)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'3)) to -0.5 between \ + pr(xpnd(`$1'3)) and pr(xpnd(`$1'0)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'5)) to -1.0 between \ + pr(xpnd(`$1'5)) and pr(xpnd(`$1'1)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'4)) to -1.0 between \ + pr(xpnd(`$1'4)) and pr(xpnd(`$1'0)) chop .1 chop 0.05 + loopTT(ncirc,eval(xn+ncirc+1),`$2') + fitcurve(TT,ncirc) + ') + line from pr(xpnd(`$1'16)) to pr(xpnd(`$1'19)) \ + to pr(xpnd(`$1'20)) to pr(xpnd(`$1'17)) to pr(xpnd(`$1'16)) + line from pr(xpnd(`$1'19)) to pr(xpnd(`$1'1)) + A: line invis from pr(xpnd(`$1'5)) to pr(xpnd(`$1'6)) + B: line invis from pr(xpnd(`$1'17)) to pr(xpnd(`$1'20)) + line from Intersect_(A,B) to pr(xpnd(`$1'6)) + line from pr(xpnd(`$1'6)) to pr(xpnd(`$1'2)) + ') + + dp = 1.0*a + s4f = 1.6 + fth = 180*dtor_ + +# perspective(x,y,z,position) +`define perspective { + vec4($3,$1,$2,tmp) + roty4(180*dtor_,tmp,tmx) + rotz4(90*dtor_,tmx,tmp) + rotx4(-90*dtor_,tmp,tmx) + roty4(-45*dtor_,tmx,tmp) + tmp[4] = tmp[3]/dp+tmp[4] + rotx4(55*dtor_,tmp,tmx) + $4: (tmx[1]/tmx[4],tmx[2]/tmx[4]) + } +' +lu = 0.1/6 * 0.8 + +# Handle forward referencing of lettering guide line lengths + nguides = 0 + sh "touch Views.dms" + for i=1 to 10 do { w[i] = 1 } + copy "Views.dms" + sh "rm -f Views.dms" + +define(`guideletter',`[ nguides += 1 + line thick grthick from (0,0) right w[nguides]*lu outlined "lightgridgray" + line thick grthick from (0,-6*lu) right w[nguides]*lu outlined "lightgridgray" + T: $1 with .nw at (0,0) + print sprintf("w[%g]=%g",nguides,T.wid/lu) >> "Views.dms" +]') + +define(`pfront',`(`$1',`$2')') +define(`ptop',`(`$1',`$3')') +define(`pside',`(-(`$3'),`$2')') + sep = 0.6*u +define(`centreline',`rpoint_(ifelse(`$1',,`to rvec_(linewid,0)',`$1')) + line thick dimensionth to rvec_(rp_len/2-.08,0) + move to rvec_(.03,0) + line thick dimensionth to rvec_(.1,0) + move to rvec_(.03,0) + line thick dimensionth to rvec_(rp_len/2-.08,0)') + +Orthographics: [ +Top: [ + line from ptop(X1) to ptop(X5) to ptop(X6) to ptop(X2) to ptop(X1) + line from ptop(X17) to ptop(X20) to ptop(X19) + line from ptop(X10) to ptop(X9) to ptop(X13) to ptop(X14) + circle rad r at ptop(TR) + centreline(from ptop(TR)+(0,r) down 2*r chop -.1) + centreline(from ptop(TR)+(-r,0) right 2*r chop -.1) + W: ptop(X9) + E: ptop(X2) + ] +Front: [ + line from pfront(X0) to pfront(X1) to pfront(X2) to pfront(X3) to pfront(X0) + line from pfront(X0) to pfront(X8) to pfront(X9) to pfront(X10) + line from pfront(X19) to pfront(X16) to pfront(X17) to pfront(X20) + line thick hiddenth dashed from pfront(TR)+(-r,0) down b + line thick hiddenth dashed from pfront(TR)+( r,0) down b + centreline(from pfront(TR) down b chop -.1) + W: pfront(X9) + E: pfront(X2) + N: pfront(X16) + S: pfront(X8) + ] with .nw at Top.sw+(0,-sep) + +Side: [ + line from pside(X0) to pside(X4) to pside(X16) to pside(X19) to pside(X1) \ + to pside(X0) to pside(X4) + line from pside(X12) to pside(X13) to pside(X9) to pside(X8) + line thick hiddenth dashed from pside(X5) to pside(X19) + line thick hiddenth dashed from pside(TR)+(-r,0) down b + line thick hiddenth dashed from pside(TR)+( r,0) down b + centreline(from pside(TR) down b chop -.1) + N: pside(X16) + S: pside(X0) + ] with .ne at Front.nw+(-sep,0) + +if 1 then { + linethick_(0.8) + guideletter([Letters(`F R O N T8V I5E1W')]) with .n at Front.s+(0,-.05) + guideletter([Letters(`S4I5D4E8V I5E1W')]) with .n at Side.s+(0,-.05) + guideletter([Letters(`T O4P8V I5E1W')]) with .n at Top.s+(0,-.10) + linethick_(visibleth) +} + + line thick dimensionth from Side.N to Front.N chop 0.05 + line thick dimensionth from Side.S to Front.S chop 0.05 + line thick dimensionth from Top.W to Front.W chop 0.05 + line thick dimensionth from Top.E to Front.E chop 0.05 + + ] # End Orthographics + +define(`looppersp',`ifelse(eval(`$1'>=0),1,`perspective(xpnd(X`$1'),Z`$1') + Y`$1': (cos(fth)*Z`$1'.x-sin(fth)*Z`$1'.y,\ + sin(fth)*Z`$1'.x+cos(fth)*Z`$1'.y)*s4f + looppersp(eval($1-1))')') + +if 1 then { +Perspective: [ + pushdef(`pr',`$1') + right_ + looppersp(eval(xn+ncirc+1)) + drawobj(Y,1) + popdef(`pr') +# ] with .sw at Isometric.ne+(-3.5*sep,0) + ] with .se at Orthographics.sw+(-1.5*sep,0) + + linethick_(0.8) + guideletter([[Letters(T2W O)]; move right lu; line right 4*lu; move right lu + [Letters(P O4I5N T8P E R S P E C T I V E)]])\ + with .w at Perspective.s+(.2*u,0) + linethick_(visibleth) +} + +if 1 then { +# Pictorials: +Isometric: [ + drawobj(X,0) +# command "{\small" +# define(`loopprt',`ifelse(eval(`$1'>=0),1,`"`$1'" at pr(X$1) +# loopprt(eval($1-1))')') +# loopprt(xn) +# for i=0 to ncirc do { sprintf("%g",i) at TT[i] } +# command "}%" +#] with .sw at (Orthographics.e+(-textwidth,0),Orthographics.Side.sw+(0,0.1)) +#] at Orthographics.nw + ] with .s at Perspective.n+(0,0.2) + + linethick_(0.8) + guideletter([Letters(`S4H2A2D E D8I S O M5E2T2R5I C8V I5E1W')])\ + with .w at Isometric.s+(.2*u,0) #(0,-.2) + linethick_(visibleth) +} + +.PE diff --git a/graphics/circuit_macros/examples/Wheat.m4 b/graphics/circuit_macros/examples/extras/Wheat.m4 index c70fa8fc74..c70fa8fc74 100644 --- a/graphics/circuit_macros/examples/Wheat.m4 +++ b/graphics/circuit_macros/examples/extras/Wheat.m4 diff --git a/graphics/circuit_macros/examples/extras/Wheel.m4 b/graphics/circuit_macros/examples/extras/Wheel.m4 new file mode 100644 index 0000000000..934c4c46db --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Wheel.m4 @@ -0,0 +1,20 @@ +.PS +# Wheel.m4 +# https://tex.stackexchange.com/questions/605178/drawing-a-directed-wheel-graph-with-tikz +gen_init + + linethick = 1.6 + nnodes = 9 + brad = 2 + srad = circlerad/2 + P: circle rad srad at (1,0.5) fill_(0.75) + A: Rect_(brad,90+360/nnodes) + for i=1 to nnodes do { + B: circle invis shaded "lightgray" at Rect_(brad,90-(i-1)/nnodes*360) \ + sprintf("\Huge %g",i) + line from B to P chop circlerad chop srad + line from B to A chop + A: B + } + +.PE diff --git a/graphics/circuit_macros/examples/extras/Y14-5_example.m4 b/graphics/circuit_macros/examples/extras/Y14-5_example.m4 new file mode 100644 index 0000000000..cb4397516c --- /dev/null +++ b/graphics/circuit_macros/examples/extras/Y14-5_example.m4 @@ -0,0 +1,53 @@ +.PS +# Y14-5_example.m4 +# https://en.wikipedia.org/wiki/Geometric_dimensioning_and_tolerancing +cct_init +textht = 11bp__*2/3 +command "{\sf" +sinclude(ASME_Y14-5.m4def) +sinclude(../ASME_Y14-5.m4def) + + boxht = 7.5/0.5*textht + boxwid = 15/7.5 * boxht + circlerad = 2.3/0.5*textht*0.5 + thicklines_(1) + arrowht = textht*0.8 + arrowwid = textht*0.6 + + Box: box + Circle: circle at Box.c; {CM: move from Circle.se down textht right textht} +thinlines_ +CLV: ctrline( up_ Box.ht with .c at Box.c, Box.ht/2 ) +CLH: ctrline( right Box.ht with .c at Box.c, Box.ht/2 ) + + dimension_(from Box.nw to Box.n,Box.ht/6) + thicklines_(1) + {Y14_frame("10") with .s at AS_C+(0,textht/2)} + thinlines_ + line from 3rd last line.start to CLV.end + dimension_(from Box.w to Box.nw,Box.ht/6) + thicklines_(1) + {Y14_frame("5") with .e at AS_C+(-textht/2,0)} + thinlines_ + line from 4th last line.start to CLH.start + +thicklines_ + DA: Y14_frame("A") at Box.ne+(-textht*1.5,textht*5) + datumarrow(from DA.s to (DA,Box.n)) + DB: Y14_frame("B") at Box.sw+(-textht*5,textht*2) + datumarrow(from DB.e to (Box.w,DB)) + + F: Y14_frame(Y14_pos_, + Y14_dia_;"0.03";"(M)", + "A","B","C") with .w at Box.se+(-textht*4,-textht*2) + G: Y14_frame(Y14_fla_,Y14_cyl_,Y14_lin_, + Y14_sur_,Y14_per_,Y14_ang_, + Y14_par_) with .nw at F.sw+(0,-0.1) + H: Y14_frame(Y14_pos_,Y14_cir_,Y14_tot_,Y14_dia_) \ + with .nw at G.sw+(0,-0.1) + + { CB: move left textht from F.w } + arrow <- from Circle.se to Intersect_(CM,CB) then to F.w + + command "}" +.PE diff --git a/graphics/circuit_macros/examples/Zcos.m4 b/graphics/circuit_macros/examples/extras/Zcos.m4 index cbf63fd8f3..cbf63fd8f3 100644 --- a/graphics/circuit_macros/examples/Zcos.m4 +++ b/graphics/circuit_macros/examples/extras/Zcos.m4 diff --git a/graphics/circuit_macros/examples/birds.m4 b/graphics/circuit_macros/examples/extras/birds.m4 index 4b42ea35af..4b42ea35af 100644 --- a/graphics/circuit_macros/examples/birds.m4 +++ b/graphics/circuit_macros/examples/extras/birds.m4 diff --git a/graphics/circuit_macros/examples/bistable.m4 b/graphics/circuit_macros/examples/extras/bistable.m4 index ac49023863..ac49023863 100644 --- a/graphics/circuit_macros/examples/bistable.m4 +++ b/graphics/circuit_macros/examples/extras/bistable.m4 diff --git a/graphics/circuit_macros/examples/brace.m4 b/graphics/circuit_macros/examples/extras/brace.m4 index 3cf80f8763..b0089fe96d 100644 --- a/graphics/circuit_macros/examples/brace.m4 +++ b/graphics/circuit_macros/examples/extras/brace.m4 @@ -4,6 +4,33 @@ gen_init NeedDpicTools divert(-1) + `bracket(linespec, end depth, + thickness, end thickness, attributes) + Square bracket along linespec + default depth is linewid/5 + attributes = eg + thick 0.4 outlined "string" shaded "string" + (default black)' +define(`bracket',`rpoint_(ifelse(`$1',,`to rvec_(linewid,0)',`$1')) + M4brS: last line.start; M4brE: last line.end + [ brdepth = ifelse(`$2',,linewid/5,`($2)') + brthick = ifelse(`$3',,brdepth/6,`($3)') + endthick = ifelse(`$4',,brthick/3,`($4)') + define(`m4brackattribs', + `ifelse(`$5',,`thick 0.4 shaded rgbstring(0,0,0)',`$5')')dnl + {line m4brackattribs \ + from M4brS+vec_(0,brdepth) to M4brS+vec_(0,brdepth+brthick) \ + then to M4brE+vec_(0,brdepth+brthick) \ + then to M4brE \ + then to M4brE+vec_(-endthick,0) \ + then to M4brE+vec_(-endthick,brdepth) \ + then to M4brS+vec_( endthick,brdepth) \ + then to M4brS+vec_( endthick,0) \ + then to M4brS \ + then to M4brS+vec_(0,brdepth) } + S: M4brS + ] with .S at Here') + `brace(linespec,depth,arm thickness,attributes) Curly brace along linespec default depth is linewid/5 @@ -57,11 +84,9 @@ R1: [ x = i/n y = minht*(1-x)+maxht*x hsvtorgb(x*hmax,1,1,r,g,b) - brace(from (-i*del,-y/2) up y,,,thick 0.4 \ - shaded rgbstring(r,g,b)) - brace(from ((i+1)*del,y/2) down y,,,thick 0.4 \ - outlined rgbstring(r,g,b) \ - shaded rgbstring(r,g,b)) + brace(from ( -i*del,-y/2) up y,,,thick 0.4 shaded rgbstring(r,g,b)) + brace(from ((i+1)*del, y/2) down y,,,thick 0.4 \ + outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) } ] R2: [ @@ -69,12 +94,22 @@ R2: [ x = i/n y = minht*(1-x)+maxht*x hsvtorgb(x*hmax,1,1,r,g,b) - brace(from (-i*del,-y/2) up y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ - shaded rgbstring(r,g,b)) - brace(from ((i+1)*del,y/2) down y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ - outlined rgbstring(r,g,b) \ + brace(from ( -i*del,-y/2) up y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ shaded rgbstring(r,g,b)) + brace(from ((i+1)*del, y/2) down y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ + outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) } ] with .n at R1.s+(0,-0.2) +R3: [ + for i=0 to n-1 do { + x = i/n + y = minht*(1-x)+maxht*x + hsvtorgb(x*hmax,1,1,r,g,b) + bracket(from ( -i*del,-y/2) up y, 5bp__+x*20bp__, 2bp__+x*13bp__,, + thick 0.4 shaded rgbstring(r,g,b)) + bracket(from ((i+1)*del, y/2) down y, 5bp__+x*20bp__, 2bp__+x*13bp__,, + thick 0.4 outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) + } + ] with .n at R2.s+(0,-0.2) .PE diff --git a/graphics/circuit_macros/examples/chaos.m4 b/graphics/circuit_macros/examples/extras/chaos.m4 index 17ae070e58..17ae070e58 100644 --- a/graphics/circuit_macros/examples/chaos.m4 +++ b/graphics/circuit_macros/examples/extras/chaos.m4 diff --git a/graphics/circuit_macros/examples/extras/hsv.m4 b/graphics/circuit_macros/examples/extras/hsv.m4 new file mode 100644 index 0000000000..662184dd7d --- /dev/null +++ b/graphics/circuit_macros/examples/extras/hsv.m4 @@ -0,0 +1,26 @@ +.PS +# hsv.m4 +gen_init +NeedDpicTools + +define grid { (($2)*boxwid,($1)*boxht) } +r = 0 +g = 0 +b = 1 +rgbtohsv(r,g,b,h,s,v) +nstep = 4 +{ for j=0 to nstep do { + sprintf("%g",j/nstep) at ((0.5+j)*boxwid,-boxht/2) below } } + { "S" at ((0.5+nstep/2)*boxwid, -boxht) } +{ for i=0 to nstep do { sprintf("%g",i/nstep) at (-boxht/3,(i)*boxht) } } + { "V" at (-boxht,(nstep/2)*boxht) \ + "or" \ + "L" } +right_ +for v = 0 to nstep do { + { for s = 0 to nstep do { hsvtorgb(h,s/nstep,v/nstep,r,g,b) + box shaded rgbstring(r,g,b) } } + move up_ boxht; right_ } + + +.PE diff --git a/graphics/circuit_macros/examples/person.m4 b/graphics/circuit_macros/examples/extras/person.m4 index 5f5a9cb8bd..4fdf09d387 100644 --- a/graphics/circuit_macros/examples/person.m4 +++ b/graphics/circuit_macros/examples/extras/person.m4 @@ -4,14 +4,13 @@ gen_init divert(-1) `person( - height=val;width=val;fill="colorname") - e.g. person(height=1;fill="gray")' -define(`person',`[ setkey_(`$1',height,linewid) - setkey_(`$1',width,m4height*2/5)dnl - setkey_(`$1',fill,"black",N)dnl - bodywid = m4width/2 + hght=expr;wdth=expr;fill="colorname") + e.g. person(hght=1;fill="gray")' +define(`person', + `[ pushkeys_(`$1',hght:linewid;wdth:m4hght*2/5;fill:"black":N)dnl + bodywid = m4wdth/2 bodyrad = bodywid/8 - bodyht = (m4height - bodywid - bodywid/16 + bodyrad*2)/2 + bodyht = (m4hght - bodywid - bodywid/16 + bodyrad*2)/2 tmplth = linethick; linethick = 0 Head: circle diam bodywid colored m4fill Body: box rad bodyrad ht bodyht wid bodywid colored m4fill \ @@ -23,9 +22,7 @@ define(`person',`[ setkey_(`$1',height,linewid) Legleft: box wid bodywid/2.5 rad armwid/2 ht Body.ht colored m4fill \ with .n at (Body.w,Body.s)+(bodywid/5,bodyrad*2) Legright: box same with .n at (Body.e,Body.s)+(-bodywid/5,bodyrad*2) - linethick_(tmplth) - popdef(`m4height',`m4fill')dnl - ]') + linethick_(tmplth) popdef(`m4hght',`m4wdth',`m4fill') ]') divert(0)dnl @@ -35,14 +32,14 @@ divert(0)dnl setrgb(0.54,0.81,0.94,babyblue) person(fill="babyblue") move - person(width=linewid*3/4;fill="babyblue") + person(wdth=linewid*3/4;fill="babyblue") move - person(width=linewid;fill="babyblue") + person(wdth=linewid;fill="babyblue") move person move resetrgb - person(height=1;fill="gray") + person(hght=1;fill="gray") line up linewid with .c at last [].e+(linewid/10,0) .PE diff --git a/graphics/circuit_macros/examples/rotellipse.m4 b/graphics/circuit_macros/examples/extras/rotellipse.m4 index a49ce308b3..a49ce308b3 100644 --- a/graphics/circuit_macros/examples/rotellipse.m4 +++ b/graphics/circuit_macros/examples/extras/rotellipse.m4 diff --git a/graphics/circuit_macros/examples/squiggle.m4 b/graphics/circuit_macros/examples/extras/squiggle.m4 index 671ae2addd..671ae2addd 100644 --- a/graphics/circuit_macros/examples/squiggle.m4 +++ b/graphics/circuit_macros/examples/extras/squiggle.m4 diff --git a/graphics/circuit_macros/examples/venus.m4 b/graphics/circuit_macros/examples/extras/venus.m4 index 676cd98143..676cd98143 100644 --- a/graphics/circuit_macros/examples/venus.m4 +++ b/graphics/circuit_macros/examples/extras/venus.m4 diff --git a/graphics/circuit_macros/examples/files.tex b/graphics/circuit_macros/examples/files.tex index 4a90ac0332..8ca2c08f76 100644 --- a/graphics/circuit_macros/examples/files.tex +++ b/graphics/circuit_macros/examples/files.tex @@ -179,7 +179,7 @@ \bfig{ \centerline{\getpic{Chips}} - \caption{IC package outlines + \caption{IC package outlines and examples \src{Chips.m4}.} } @@ -565,6 +565,14 @@ \src{Rotbox.m4}.} } +\ifmpost\else\ifpostscript\else\bfig{ + \centerline{\getpic{shadowed}} + \caption{The macro + {\tt shadowed(box|circle|ellipse|line,[at {\sl position}],{\sl keys})} + shadowed object + \src{shadowed.m4}.} + }\fi\fi + \bfig{ \centerline{\getpic{ex06}} \caption{Crosshatching @@ -648,18 +656,20 @@ \src{csc.m4}.} } -\ifpostscript\bfig{% For psfrag - \includegraphics[width=\textwidth]{rose.eps} %\centerline{\getpic{rose}} - \caption{The left object, used for testing {\tt dipic,} is redrawn from - a detail of the set design for the musical {\it Dracula.} This - consumes much \LaTeX\ main memory but can be produced directly - as pdf using \hbox{\tt dpic -d}, as svg using \hbox{\tt dpic -v}, - or as postscript using \hbox{\tt dpic -r} since no text formatting - is required. The right object adjusts the size of dots to produce - a halftone effect +\ifpostscript% +\bfig{% For psfrag +\includegraphics[width=\textwidth]{rose.eps} %\centerline{\getpic{rose}}%ignore% + \caption{The left object, used for testing {\tt dipic,} is redrawn from%ignore% + a detail of the set design for the musical {\it Dracula.} This %ignore% + consumes much \LaTeX\ main memory but can be produced directly %ignore% + as pdf using \hbox{\tt dpic -d}, as svg using \hbox{\tt dpic -v}, %ignore% + or as postscript using \hbox{\tt dpic -r} since no text formatting%ignore% + is required. The right object adjusts the size of dots to produce%ignore% + a halftone effect %ignore% \src{rose.m4}.} - }\else% -\ifmpost\else\bfig{% + } +\else\ifmpost\else% +\bfig{% Not psfrag \includegraphics[width=\textwidth]{rose.pdf} %\centerline{\getpic{rose}} \caption{The left object, used for testing {\tt dipic,} is redrawn from a detail of the set design for the musical {\it Dracula.} This @@ -669,7 +679,8 @@ is required. The right object adjusts the size of dots to produce a halftone effect \src{rose.m4}.} - }\fi\fi + } +\fi\fi \bfig{ \centerline{\getpic{diamond}} diff --git a/graphics/circuit_macros/examples/heater.m4 b/graphics/circuit_macros/examples/heater.m4 new file mode 100644 index 0000000000..d3f0f8ee33 --- /dev/null +++ b/graphics/circuit_macros/examples/heater.m4 @@ -0,0 +1,26 @@ +.PS +# heater.m4 +cct_init + +movewid = 2 pt__ +hm = 2.05 +right_ +{ + {lamp ; move; "`{\tt lamp}'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + move right_ 1.25 + {thermocouple ; move;" `{\tt thermocouple}'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + } +move down 0.25; right_ +{ + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + } + +.PE diff --git a/graphics/circuit_macros/examples/keyboard.pdf b/graphics/circuit_macros/examples/keyboard.pdf Binary files differindex 94548b033a..0d5fa829b8 100644 --- a/graphics/circuit_macros/examples/keyboard.pdf +++ b/graphics/circuit_macros/examples/keyboard.pdf diff --git a/graphics/circuit_macros/examples/mf/cct.mf b/graphics/circuit_macros/examples/mf/cct.mf index e134c95c63..fd626e6be7 100644 --- a/graphics/circuit_macros/examples/mf/cct.mf +++ b/graphics/circuit_macros/examples/mf/cct.mf @@ -1,5 +1,5 @@ % cct.mf, generated by Mfpic, v1.10 2012/12/03, -% from TeX source "font" on 2022/11/28 at 18:39 +% from TeX source "font" on 2023/03/10 at 23:35 numeric mfpicversion; mfpicversion := 110; if unknown mode: mode := localfont; fi if unknown mag: mag := 1000/1000; fi @@ -2505,10 +2505,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.074188,-0.014308),22.529508,35.422548,0.233002); +arcplr ((-0.075317,-0.012706),21.601282,34.940662,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.043984,-0.100954),72.077452,58.261852,0.233002); +arcplr ((0.043548,-0.100813),71.96482,57.676312,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2517,7 +2517,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.022091,-0.067162),11.25,45.13128,0.233002); +arcplr ((-0.022091,-0.067162),11.25,49.625848,0.233002); store (curpath) drawn @@ -2561,10 +2561,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.014308,0.074188),-67.470492,-54.577452,0.233002); +arcplr ((-0.012706,0.075317),-68.398718,-55.059338,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.100954,-0.043984),-17.922548,-31.738148,0.233002); +arcplr ((-0.100813,-0.043548),-18.03518,-32.323688,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2573,7 +2573,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.067162,0.022091),-78.75,-44.86872,0.233002); +arcplr ((-0.067162,0.022091),-78.75,-40.374152,0.233002); store (curpath) drawn @@ -2617,10 +2617,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.074188,0.014308),-157.470492,-144.577452,0.233002); +arcplr ((0.075317,0.012706),-158.398718,-145.059338,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.043984,0.100954),-107.922548,-121.738148,0.233002); +arcplr ((-0.043548,0.100813),-108.03518,-122.323688,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2629,7 +2629,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.022091,0.067162),-168.75,-134.86872,0.233002); +arcplr ((0.022091,0.067162),-168.75,-130.374152,0.233002); store (curpath) drawn @@ -2673,10 +2673,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.014308,-0.074188),112.529508,125.422548,0.233002); +arcplr ((0.012706,-0.075317),111.601282,124.940662,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.100954,0.043984),162.077452,148.261852,0.233002); +arcplr ((0.100813,0.043548),161.96482,147.676312,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2685,7 +2685,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.067162,-0.022091),101.25,135.13128,0.233002); +arcplr ((0.067162,-0.022091),101.25,139.625848,0.233002); store (curpath) drawn @@ -2729,10 +2729,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.0153,-0.121331),34.780608,22.077452,0.236733); +arcplr ((-0.014561,-0.123133),35.685526,22.548869,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.025038,0.02723),-14.577452,-0.979566,0.236733); +arcplr ((-0.025156,0.026775),-14.463672,-0.407722,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2741,7 +2741,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.032152,-0.047835),12.233526,41.25,0.236733); +arcplr ((-0.032152,-0.047835),7.809161,41.25,0.236733); store (curpath) drawn @@ -2785,10 +2785,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.121331,0.0153),-55.219392,-67.922548,0.236733); +arcplr ((-0.123133,0.014561),-54.314474,-67.451131,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.02723,0.025038),-104.577452,-90.979566,0.236733); +arcplr ((0.026775,0.025156),-104.463672,-90.407722,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2797,7 +2797,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.047835,0.032152),-77.766474,-48.75,0.236733); +arcplr ((-0.047835,0.032152),-82.190839,-48.75,0.236733); store (curpath) drawn @@ -2841,10 +2841,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.0153,0.121331),-145.219392,-157.922548,0.236733); +arcplr ((0.014561,0.123133),-144.314474,-157.451131,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.025038,-0.02723),165.422548,179.020434,0.236733); +arcplr ((0.025156,-0.026775),165.536328,179.592278,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2853,7 +2853,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.032152,0.047835),-167.766474,-138.75,0.236733); +arcplr ((0.032152,0.047835),-172.190839,-138.75,0.236733); store (curpath) drawn @@ -2897,10 +2897,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.121331,-0.0153),124.780608,112.077452,0.236733); +arcplr ((0.123133,-0.014561),125.685526,112.548869,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.02723,-0.025038),75.422548,89.020434,0.236733); +arcplr ((-0.026775,-0.025156),75.536328,89.592278,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2909,7 +2909,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.047835,-0.032152),102.233526,131.25,0.236733); +arcplr ((0.047835,-0.032152),97.809161,131.25,0.236733); store (curpath) drawn diff --git a/graphics/circuit_macros/examples/mpost/Makefile b/graphics/circuit_macros/examples/mpost/Makefile index bef3268c06..978e1e3592 100644 --- a/graphics/circuit_macros/examples/mpost/Makefile +++ b/graphics/circuit_macros/examples/mpost/Makefile @@ -96,7 +96,7 @@ $(DOC).ps: $(DOC).dvi EXL = exlinks $(DOC).dvi: $(DOC).tex -if test "$(DOC)" = "examplesmpost" ; then make exlinks dims; fi - make $(FIGS) + make $(FIGS) rose.pdf $(LATEX) $(DOC) -if test -n "$(BOXDIMS)" ; then rm -f dims; \ for box in $(BOXDIMS) ; do rm -f $$box.1; done; \ @@ -109,9 +109,12 @@ dims: figs: $(EXL) $(FIGS) +rose.pdf: ../rose.m4 + m4 pdf.m4 ../rose.m4 | dpic -d > rose.pdf + exlinks: @echo "" - @echo 'Ignore "cannot create ... exists" warnings.' + @echo 'Ignore "cannot create ... exists and file.1 not found" warnings.' -@if test ! -f ex11.m4 ; then \ ls ../*.m4 | sed -e 's/^/ln -s /' -e '/test.m4/d' | sh;\ fi @@ -133,7 +136,7 @@ tst1: test.1 tstmpost.tex dvips tstmpost clean: - rm -f stamp-* $(FIGS) *.pic mp*.tex + rm -f stamp-* $(FIGS) *.pic mp*.tex rose.pdf -if /usr/bin/test -f exlinks ; then \ ls -l *.m4 *.bb *.gz | grep '\->' | \ sed -e 's/^.* \([^ ][^ ]*\) ->.*$$/rm -f \1/' | sh; fi diff --git a/graphics/circuit_macros/examples/paletteSVG.m4 b/graphics/circuit_macros/examples/paletteSVG.m4 deleted file mode 100644 index 4c5a40f038..0000000000 --- a/graphics/circuit_macros/examples/paletteSVG.m4 +++ /dev/null @@ -1,336 +0,0 @@ -.PS -# This is the source for a prototype svg library of electric circuit -# elements. Each element is a compound svg object with corners on grid points. -# -# Processing svg.m4 and this file thought dpic -v gives -# output that can be read into Inkscape. -# -define(`SIdefaults',` - scale = 25.4 - arcrad = 5 - arrowht = 2.5 - arrowwid = arrowht/2 - boxht = 12 - boxrad = 0 - boxwid = 20 - circlerad = 5 - dashwid = 1.5 - ellipseht = 12 - ellipsewid = 16 - lineht = 12 - linewid = 12 - moveht = 12 - movewid = 12 - textht = ifsvg(3,0) - textoffset = 1 - textwid = 0 -') - -log_init(svg_font(sans-serif,11bp__)) -SIdefaults - - # Assume dpic scale is in mm -gunit = 1 # Inkscape grid dimension -divert(-1) -define(`elen_',`(10*gunit)') # default 2-terminal element length -define(`dimen_',`(10*gunit)')# reference dimension for element bodies -define(`L_unit',`(2*gunit)') # logic gate grid size -define(`N_diam',1) # L_unit size of `not' circles - - # grid round and chop -define(`g_round',`(int((`$1')/gunit+100000.5 )-100000)*gunit') -define(`g_chop', `(int((`$1')/gunit+100000.9999)-100000)*gunit') - # snap to grid -define(`g_snap',`(g_round((`$1').x),g_round((`$1').y))') - -# Box containing an element. The element must be in a box that is -# intersected by a horizontal or vertical line from entry to exit. -define(`Gridbox',`[ command "<g>" - S: Here; `$1'; F: Here - if S.y == F.y then { - move from (max(S.x,F.x),F.y+g_chop(last[].n.y-F.y)) \ - to (min(S.x,F.x),F.y-g_chop(F.y-last[].s.y)) } \ - else { - move from (F.x+g_chop(last[].e.x-F.x),max(S.y,F.y)) \ - to (F.x-g_chop(F.x-last[].w.x),min(S.y,F.y)) } - command "</g>" ] ') - -# Place compound object corners at grid intersections -define(`Below', - `with .n at g_snap(ifelse(`$1',,`last []',`$1').s)-(0,2*gunit)') -define(`Right', - `with .w at g_snap(ifelse(`$1',,`last []',`$1').e)+(2*gunit,0)') - -# for debug -define(`prpos',`print (`$1').x/gunit,(`$1').y/gunit') -divert(0)dnl - -[ - -rpoint_(down_ elen_) -A:Gridbox( resistor ) - Gridbox( resistor(down_ dimen_*1/2) ) Right - Gridbox( resistor(,,E) ) Right - Gridbox( resistor(,,Q) ) Right - Gridbox( resistor(,,H) ) Right - Gridbox( resistor(,,N) ) Right - Gridbox( inductor(,W) ) Right - Gridbox( inductor(,W,,M) ) Right - Gridbox( inductor(,L) ) Right - Gridbox( inductor ) Right - Gridbox( inductor(,,,M) ) Right - Gridbox( capacitor ) Right - Gridbox( capacitor(,C) ) Right - Gridbox( capacitor(,P) ) Right - Gridbox( capacitor(,E) ) Right - Gridbox( capacitor(,K) ) Right - Gridbox( diode ) Right - Gridbox( diode(,K) ) Right - Gridbox( diode(,Z) ) Right - Gridbox( diode(,S) ) Right - Gridbox( diode(,L) ) Right - Gridbox( diode(,V) ) Right - Gridbox( diode(,v) ) Right - Gridbox( diode(,T) ) Right - Gridbox( diode(,CR) ) Right - Gridbox( diode(,D) ) Right - Gridbox( diode(,B) ) Right - Gridbox( diode(,LE) ) Right - Gridbox( [circle diam dimen_*0.7] ) Right - Gridbox( xtal ) Right - dot(at g_snap(last [].e+(2*gunit,0))) - -A:Gridbox( source ) Below(A) - Gridbox( source(,I) ) Right - Gridbox( source(,i) ) Right - Gridbox( source(,V) ) Right - Gridbox( source(,v) ) Right - Gridbox( source(,AC) ) Right - Gridbox( source(,S) ) Right - Gridbox( source(,X) ) Right - Gridbox( source(,F) ) Right - Gridbox( source(,P) ) Right - Gridbox( source(,U) ) Right - Gridbox( source(,R) ) Right - Gridbox( source(,T) ) Right - Gridbox( source(,L) ) Right - Gridbox( nullator ) Right - Gridbox( norator ) Right - Gridbox( consource ) Right - Gridbox( consource(,I) ) Right - Gridbox( consource(,i) ) Right - Gridbox( consource(,V) ) Right - Gridbox( consource(,v) ) Right - Gridbox( source(,Q) ) Right - Gridbox( source(,G) ) Right - -A:Gridbox( battery(up_ elen_) ) Below(A) - Gridbox( battery(up_ elen_,3) ) Right - Gridbox( ttmotor ) Right - Gridbox( memristor ) Right - Gridbox( tline ) Right - Gridbox( fuse ) Right - Gridbox( fuse(,D) ) Right - Gridbox( fuse(,B) ) Right - Gridbox( fuse(,C) ) Right - Gridbox( fuse(,S) ) Right - Gridbox( fuse(,HB) ) Right - Gridbox( fuse(,HC) ) Right - Gridbox( cbreaker ) Right - Gridbox( cbreaker(,,D) ) Right - Gridbox([variable(`[]',A)]) Right - Gridbox([variable(`[]',P)]) Right - Gridbox([variable(`[]',L)]) Right - Gridbox([variable(`[]',N)]) Right - Gridbox([variable(`[]',uN)]) Right - Gridbox([line to Here+(Rect_(dimen_/6,45))]) Right - Gridbox([line up dimen_*0.06 then right dimen_*0.12 \ - then up dimen_*0.06]) Right - Gridbox([em_arrows]) Right - Gridbox([em_arrows(N)]) Right - Gridbox([em_arrows(ND)]) Right - Gridbox([em_arrows(I)]) Right - Gridbox([em_arrows(ID)]) Right - Gridbox([em_arrows(E)]) Right - Gridbox([em_arrows(ED)]) Right - -A:Gridbox( [right_; ground] ) Below(A) - Gridbox( [right_; ground(,T)] ) Right - Gridbox( [right_; ground(,,F)] ) Right - Gridbox( [right_; ground(,,E)] ) Right - Gridbox( [right_; ground(,,S)] ) Right - Gridbox( [right_; ground(,,L)] ) Right - Gridbox( [right_; ground(,,P)] ) Right - Gridbox( transformer(right_ 6*gunit,L) ) Right - Gridbox( transformer(right_ 8*gunit,,2,8) ) Right - Gridbox( transformer(,,8,W,4) ) Right - Gridbox( transformer(,,9,AL) ) Right - Gridbox( transformer(,R,8,AW) ) Right - - rpoint_(right_) -A:Gridbox( switch ) Below(A) - Gridbox( switch(,,O) ) Right - Gridbox( switch(,,D) ) Right - Gridbox( switch(,,OD) ) Right - Gridbox( switch(,,C) ) Right - Gridbox( switch(,,B) ) Right - Gridbox( switch(,C,B) ) Right - Gridbox( dswitch ) Right - Gridbox( dswitch(,,WBK) ) Right - Gridbox( dswitch(,,WBuD) ) Right - Gridbox( dswitch(,,WBF) ) Right - Gridbox( dswitch(,,WBKF) ) Right - Gridbox( dswitch(,,WBL) ) Right - Gridbox( dswitch(,,WBKL) ) Right - -A:Gridbox( dswitch(,,WBT) ) Below(A) - Gridbox( dswitch(,,WdBKC) ) Right - Gridbox( dswitch(,,WBM) ) Right - Gridbox( dswitch(,,WBCO) ) Right - Gridbox( dswitch(,,WBCMP) ) Right - Gridbox( dswitch(,,WBCY) ) Right - Gridbox( dswitch(,,WBCZ) ) Right - Gridbox( dswitch(,,WBCE) ) Right - Gridbox( dswitch(,,WBRH) ) Right - Gridbox( dswitch(,,WBRdH) ) Right - Gridbox( dswitch(,,WBRHH) ) Right - -A:Gridbox( dswitch(,,WBMMR) ) Below(A) - Gridbox( dswitch(,,WBMM) ) Right - Gridbox( dswitch(,,WBMR) ) Right - Gridbox( dswitch(,,WBEL) ) Right - Gridbox( dswitch(,,WBLE) ) Right - Gridbox( dswitch(,,WBKEL) ) Right - Gridbox( antenna ) Right - Gridbox( antenna(,,L) ) Right - Gridbox( antenna(,,T) ) Right - Gridbox( antenna(,,S) ) Right - Gridbox( antenna(,,D) ) Right - Gridbox( antenna(,,P) ) Right - Gridbox( antenna(,,F) ) Right - -A:Gridbox( amp(right_ elen_*10/8) ) Below(A) -D1:Gridbox( integrator ) Right - Gridbox( delay ) Right - Gridbox( opamp ) Right - Gridbox( opamp(,,,,T) ) Right - Gridbox( amp(,dimen_/2) ) Right - Gridbox( integrator(,dimen_/2) ) Right - Gridbox( delay(,delay_rad_) ) Right - Gridbox( opamp(,,,dimen_*2/3) ) Right - Gridbox( opamp(,,,dimen_*2/3,T) ) Right - -right_ -A:Gridbox( relay(2) ) Below(A) - Gridbox( relay(2,O) ) Right - Gridbox( relay(2,C) ) Right - Gridbox( relay ) Right - Gridbox( contact ) Right - Gridbox( contact(O) ) Right - Gridbox( contact(C) ) Right - -up_ -A:Gridbox( [circle rad 29/10*gunit] ) Below(A) - Gridbox( bi_tr ) Right - Gridbox( bi_tr(,R) ) Right - Gridbox( bi_tr(,,P) ) Right - Gridbox( bi_tr(,R,P) ) Right - - Gridbox( j_fet ) Right - Gridbox( j_fet(,R) ) Right - Gridbox( j_fet(,,P,) ) Right - Gridbox( j_fet(,R,P,) ) Right - Gridbox( e_fet(,,,) ) Right - Gridbox( e_fet(,R,,) ) Right - - Gridbox( e_fet(,,P,) ) Right - Gridbox( e_fet(,R,P,) ) Right - Gridbox( d_fet(,,,) ) Right - Gridbox( d_fet(,R,,) ) Right - Gridbox( d_fet(,,P,) ) Right - Gridbox( d_fet(,R,P,) ) Right - -A:Gridbox( igbt ) Below(A) - Gridbox( ujt ) Right - Gridbox( ujt(,,P) ) Right -rpoint_(down_) - Gridbox( thyristor ) Right - Gridbox( thyristor(,B) ) Right - Gridbox( thyristor(,BG) ) Right - Gridbox( thyristor(,A) ) Right - Gridbox( thyristor(,C) ) Right -rpoint_(up_) - Gridbox( j_fet ) Right - Gridbox( e_fet ) Right - Gridbox( e_fet(,,,S) ) Right - Gridbox( e_fet(,,P) ) Right - Gridbox( e_fet(,,P,S) ) Right - Gridbox( d_fet ) Right - Gridbox( d_fet(,,,S) ) Right - Gridbox( d_fet(,,P,) ) Right - Gridbox( d_fet(,,P,S) ) Right - Gridbox( j_fet ) Right - Gridbox( j_fet(,,P) ) Right - Gridbox( mosfet(,,uHSDF) ) Right - -rpoint_(right_) -A:Gridbox( tgate ) Below(A) - Gridbox( tgate(,B) ) Right - Gridbox( ptrans ) Right - -A:Gridbox( AND_gate ) Below(A) - Gridbox( OR_gate ) Right - Gridbox( NAND_gate ) Right - Gridbox( NOR_gate ) Right - Gridbox( XOR_gate ) Right - Gridbox( NXOR_gate ) Right - Gridbox( BUFFER_gate ) Right - Gridbox( NOT_gate ) Right - -# input lines for OR-like gates. -define(`OR_inlgth',`(-sqrt(OR_rad^2-G_hht^2)+sqrt(OR_rad^2-`$1'^2))*L_unit') - - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)} - {line right_ OR_inlgth(1) from Here+svec_(0,1)} - {line same from Here-svec_(0,1)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)}] ) Right - -right_ -A:Gridbox( speaker ) Below(A) - Gridbox( speaker(,,H) ) Right - Gridbox( bell ) Right - Gridbox( microphone ) Right - Gridbox( buzzer ) Right - Gridbox( buzzer(,,C) ) Right - Gridbox( earphone ) Right - Gridbox( earphone(,,C) ) Right - Gridbox( nport ) Right - Gridbox( nterm ) Right - -A:Gridbox( FlipFlop(D) ) Below(A) - Gridbox( FlipFlop(T) ) Right - Gridbox( FlipFlop(RS)) Right - Gridbox( FlipFlop(JK)) Right - - ] with .nw at (0,0) - -#"A draft palette of a few elements for Inkscape using a 1 mm grid" \ -# ljust below at last [].sw - - command "</g>" # end font -.PE diff --git a/graphics/circuit_macros/examples/shadowed.m4 b/graphics/circuit_macros/examples/shadowed.m4 new file mode 100644 index 0000000000..b0bf0afa15 --- /dev/null +++ b/graphics/circuit_macros/examples/shadowed.m4 @@ -0,0 +1,49 @@ +.PS +gen_init +divert(-1) + +divert(0)dnl + +Boxes: [ +shadebox(box "s{}hadebox",lthick*4/(1bp__)) + +move +#{print "B"} +B: shadowed(,, + shadowthick=lthick*4;attrib=fill_(0.95) "box") + +move +#{print "B1"} +B1: shadowed(,, + rad=0bp__; shadowthick=lthick*4; shadowcolor="lightgray"; shadowangle=-60; \ + attrib=fill_(0.85) "box") + +move +#{print "R"} +R: shadowed(box,, rad=6bp__; shadowthick=lthick*4; \ + attrib=wid boxht*2 shaded "orange" outlined "red" thick 2 \ + `"\tt box\char44\char44" "\tt rad=6bp\_\_"') +] + +Others:[ +#{print "C"} +C: shadowed(circle,, + shadowthick=lthick*4;shadowcolor="blue";\ + attrib=outlined "green" shaded "green" diam 0.75 "circle") + +move +#{print "E"} + E: shadowed(ellipse,, + shadowthick=lthick*4; attrib=ht boxwid wid boxht shaded "yellow" \ + dashed "ellipse") + +move right movewid*3/2 then down moveht/2; right_ + b = boxht + F: shadowed(line,, + attrib=left b then up b right b then down b right b then to Here \ + shaded "orange" outlined "red" thick 3;shadowthick=4.5bp__;\ + shadowangle=45) + "line" at F.n+(0,-0.3) +] with .nw at Boxes.sw+(0,-moveht) + +.PE diff --git a/graphics/circuit_macros/examples/snake.m4 b/graphics/circuit_macros/examples/snake.m4 deleted file mode 100644 index 39f2b7d1d1..0000000000 --- a/graphics/circuit_macros/examples/snake.m4 +++ /dev/null @@ -1,21 +0,0 @@ -.PS -# snake.m4 -gen_init -scale = 2 -rmax = 0.8 -rmin = 0.2 -fact = 0.75 -wd = 0.15 -[ -shade(0.8, - for r = rmax to rmin by *fact do { - arc cw rad r to Here+(r+r,0) - arc ccw rad r-wd to Here+(2*(r-wd),0) } - line right wd - for r = r to rmax by *1/fact do { - arc cw rad r to Here-(r+r,0) - arc ccw rad r-wd to Here-(2*(r-wd),0) } - line to (0,0) - ) -] with .sw at 2,2 -.PE diff --git a/graphics/circuit_macros/examples/xfig/xfiglib.fig b/graphics/circuit_macros/examples/xfig/xfiglib.fig index ce3f289160..53db089ade 100644 --- a/graphics/circuit_macros/examples/xfig/xfiglib.fig +++ b/graphics/circuit_macros/examples/xfig/xfiglib.fig @@ -6,7 +6,7 @@ Letter 100.00 Single -2 -# dpic version 2022.12.01 option -x for Fig 3.2 +# dpic version 2023.03.01 option -x for Fig 3.2 1200 2 6 0 0 3975 5025 6 0 0 3975 5025 @@ -195,9 +195,11 @@ Single 1125 1425 1125 1275 1 3 0 1 0 -1 0 -1 -1 0 1 0.0 1125 1125 150 150 1275 1125 1275 1125 6 1025 1089 1225 1161 +6 1025 1089 1225 1161 5 1 0 1 0 -1 0 -1 -1 0 0 1 0 0 1075 1142 1125 1125 1075 1089 1025 1125 5 1 0 1 0 -1 0 -1 -1 0 0 1 0 0 1175 1108 1125 1125 1175 1161 1225 1125 -6 +-6 2 1 0 1 0 -1 0 -1 -1 0 0 0 0 0 0 2 1125 975 1125 825 -6 diff --git a/graphics/circuit_macros/examples/xtras b/graphics/circuit_macros/examples/xtras new file mode 100644 index 0000000000..d2211aa5f5 --- /dev/null +++ b/graphics/circuit_macros/examples/xtras @@ -0,0 +1,61 @@ +mv ASMEbox.m4 extras +mv Ant.m4 extras +mv ArrowFn.m4 extras +mv Attention.m4 extras +mv Autoencoder.m4 extras +mv Bridge.m4 extras +mv CSlight.m4 extras +mv Ccurve.m4 extras +mv Chuck.m4 extras +mv Clocks.m4 extras +mv ControlLoop.m4 extras +mv Counting.m4 extras +mv Cruller.m4 extras +mv Cylinder.m4 extras +mv Egg.m4 extras +mv Euro.m4 extras +mv Eye.m4 extras +mv Fefets.m4 extras +mv FieldLines.m4 extras +mv Floor.m4 extras +mv Flow2.m4 extras +mv Hexagon.m4 extras +mv Highgain.m4 extras +mv IC10107.m4 extras +mv Koch.m4 extras +mv Lyap.m4 extras +mv Metamodel.m4 extras +mv Obliq.m4 extras +mv OneLine.m4 extras +mv OpAmpFilter.m4 extras +mv Optics.m4 extras +mv Orbits.m4 extras +mv PPA.m4 extras +mv PerpTo.m4 extras +mv Pipe.m4 extras +mv Planes.m4 extras +mv RandomNodes.m4 extras +mv Region.m4 extras +mv Resolver.m4 extras +mv SPM.m4 extras +mv SampleFlow.m4 extras +mv ShadeSector.m4 extras +mv Shadow.m4 extras +mv Shaky.m4 extras +mv Star.m4 extras +mv Stator.m4 extras +mv TR_fill.m4 extras +mv Views.m4 extras +mv Wheat.m4 extras +mv Wheel.m4 extras +mv Y14-5_example.m4 extras +mv Zcos.m4 extras +mv birds.m4 extras +mv bistable.m4 extras +mv brace.m4 extras +mv chaos.m4 extras +mv hsv.m4 extras +mv person.m4 extras +mv rotellipse.m4 extras +mv squiggle.m4 extras +mv venus.m4 extras diff --git a/graphics/circuit_macros/gpic.m4 b/graphics/circuit_macros/gpic.m4 index 818f37c305..109f941e7b 100644 --- a/graphics/circuit_macros/gpic.m4 +++ b/graphics/circuit_macros/gpic.m4 @@ -1,7 +1,7 @@ divert(-1) gpic.m4 Initialization for gpic. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/lib3D.m4 b/graphics/circuit_macros/lib3D.m4 index 6b27b92816..040866aa45 100644 --- a/graphics/circuit_macros/lib3D.m4 +++ b/graphics/circuit_macros/lib3D.m4 @@ -3,7 +3,7 @@ lib3D.m4 Macros for rotation, projection, and other operations on argument triples representing 3D vectors or colors. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/libSLD.m4 b/graphics/circuit_macros/libSLD.m4 index ff1c01cb96..5555e03131 100644 --- a/graphics/circuit_macros/libSLD.m4 +++ b/graphics/circuit_macros/libSLD.m4 @@ -2,7 +2,7 @@ divert(-1) libSLD.m4 Draft macros for single-line diagram elements -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * @@ -628,8 +628,8 @@ define(`sl_ct',`[ Origin: Here pushkeys_(`$2', type:L:N; scale:1; grnd::N ) dnl define(`m4scf',`(m4scale*1.2)')dnl setdir_(`$3',R) - ifinstr(m4type,L, - `L: inductor(to vec_(2*dimen_/8*m4scf,0) with .c at Origin,,2); C: L.c + ifinstr(m4type,L,`define(`m4lw',`dimen_/8*m4scf')dnl + L: inductor(to vec_(2*m4lw,0) with .c at Origin,,2,,m4lw); C: L.c pushkey_(`$2',stemlgth,dimen_/5)dnl line from L.start to L.start+vec_(0,-m4stemlgth) Tstart: Here diff --git a/graphics/circuit_macros/libcct.m4 b/graphics/circuit_macros/libcct.m4 index 3a3e1f398a..cf73ba0567 100644 --- a/graphics/circuit_macros/libcct.m4 +++ b/graphics/circuit_macros/libcct.m4 @@ -1,7 +1,7 @@ divert(-1) libcct.m4 -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * @@ -1070,40 +1070,71 @@ define(`pvcell',`eleminit_(`$1') move to rvec_(m4wd,0); line to rvec_(max(0,rp_len/2-m4wd/2),0) } line invis to rvec_(rp_len,0)') - `heater( linespec, nparts, wid, ht )' -define(`heater',`eleminit_(`$1') - define(`m4hn',ifelse(`$2',,4,`$2'))dnl - define(`m4wd',ifelse(`$3',,`dimen_/2',`($3)'))dnl - define(`m4ht',ifelse(`$4',,`dimen_/5',`($4)'))dnl - { line to rvec_(max(0,rp_len/2-m4wd/2),0) - {[lbox(m4wd,m4ht)] at rvec_(m4wd/2,0)} - for m4ix=1 to m4hn-1 do { - {line from rvec_(m4ix*m4wd/(m4hn),m4ht/2) \ - to rvec_(m4ix*m4wd/(m4hn),-m4ht/2)}} - line from rvec_(m4wd,0) \ - to rvec_(max(0,rp_len/2+m4wd/2),0) } - line invis to rvec_(rp_len,0)') - - `thermocouple(linespec, wid, ht, L|R) - R=right orientation' -define(`thermocouple',`eleminit_(`$1') - define(`m4wd',ifelse(`$2',,`dimen_/5',`($2)'))dnl - define(`m4ht',ifelse(`$3',,`dimen_/2',`($3)'))dnl - define(`m4ths',`ifinstr(`$4',R,-)')dnl - {line to rvec_(max(0,rp_len/2-m4wd/2),0) \ - then to rvec_(max(0,rp_len/2-m4wd/2),m4ths`'(m4ht-m4wd/2)) \ - then to rvec_(rp_len/2,m4ths`'m4ht) \ - then to rvec_(max(0,rp_len/2-m4wd/2)+m4wd,m4ths`'(m4ht-m4wd/2)) \ - then to rvec_(max(0,rp_len/2-m4wd/2)+m4wd,0) \ - then to rvec_(rp_len,0)} - { dot(at rvec_(rp_len/2,m4ths`'m4ht)) } - {[box invis ht_ m4ht wid_ m4wd] at rvec_(rp_len/2,m4ths`'m4ht/2)} - line to rvec_(rp_len,0) invis ') - - `lamp(linespec,[R])' -define(`lamp',`define(`m4ng',ifinstr(`$2',R,-))define(`m4hw',`dimen_/10')dnl -define(`m4dp',(m4ng`'m4hw/2))define(`m4ht',(m4ng`'dimen_/8))dnl -eleminit_(`$1') + `heater( linespec, nparts|keys, wid, ht, + boxspec|[E[R][T]] ) + If arg5 contains E, draws an + heatere(linespec,keys,[R][T]) otherwise a + heatert(linespec,nparts,wid,ht,boxspec)' +define(`heater',`ifinstr(`$5',E, + `heatere(`$1',`$2',`$5')', + `heatert($@)')') + + `heatere( linespec, keys, [R|T] ) + R: right orientation + T: truncates leads to the width of the body + keys: (for body) + lgth=expr; + wdth=expr; (default lgth*2/5) + cycles=expr; + line=attributes' +define(`heatere', +`pushkeys_(`$2',`lgth:dimen_/2; wdth:m4lgth*2/5; cycles:3; line::N;')dnl + ifinstr(`$3',R,`pushdef(`m4ng',-)pushdef(`m4cw')pushdef(`m4ccw',cw)', + `pushdef(`m4ng') pushdef(`m4cw',cw)pushdef(`m4ccw')')dnl + eleminit_(ifinstr(`$3',T,m4wdth,`$1')) + { line to rvec_(rp_len/2-m4wdth/2,0); round + {[S: Here; r = m4lgth/(4*m4cycles+1) + arc m4cw m4line to rvec_(r,m4ng`'r) with .c at rvec_(r,0) + for i=1 to m4cycles do { arc m4ccw m4line to rvec_(0,m4ng`'2*r) \ + with .c at rvec_(0,m4ng`'r) + arc m4cw m4line to rvec_(0,m4ng`'2*r) with .c at rvec_(0,m4ng`'r) } + line m4line to rvec_(m4wdth-2*r,0) + for i=1 to m4cycles do {arc m4cw m4line to rvec_(0,m4ng`'(-2*r)) \ + with .c at rvec_(0,m4ng`'(-r)) + arc m4ccw m4line to rvec_(0,m4ng`'(-2*r)) with .c at rvec_(0,m4ng`'(-r)) } + arc m4cw m4line to rvec_(r,m4ng`'(-r)) with .c at rvec_(0,m4ng`'(-r)); round + ] with .S at Here } + line from rvec_(m4wdth,0) to rvec_(rp_len/2+m4wdth/2,0) } + line invis to rvec_(rp_len,0)dnl + popdef(`m4lgth',`m4wdth',`m4cycles',`m4line',`m4ng',`m4cw',`m4ccw') ') + + `heatert(linespec, nparts|keys, wid,ht,boxspec) + keys: parts=expr; + lgth=expr; + wdth=expr; + box=attributes; + args 3-5 unused if any key is given + arg5= body attributes' +define(`heatert',`eleminit_(`$1') + ifelse(regexp(`$2',`parts=\|lgth=\|wdth=\|box='),-1, dnl not very elegant + `pushdef(`m4parts',ifelse(`$2',,4,`$2'))dnl + pushdef(`m4lgth',ifelse(`$3',,`dimen_/2',`($3)'))dnl + pushdef(`m4wdth',ifelse(`$4',,`dimen_/5',`($4)'))dnl + pushdef(`m4box',`$5')', + `pushkeys_(`$2',`parts:4; lgth:dimen_/2; wdth:dimen_/5; box::N')')dnl + { line to rvec_(max(0,rp_len/2-m4lgth/2),0) + {[lbox(m4lgth,m4wdth,m4box)] at rvec_(m4lgth/2,0)} + for m4ix=1 to m4parts-1 do { + {line from rvec_(m4ix*m4lgth/(m4parts),m4wdth/2) \ + to rvec_(m4ix*m4lgth/(m4parts),-m4wdth/2) m4box}} + line from rvec_(m4lgth,0) \ + to rvec_(max(0,rp_len/2+m4lgth/2),0) } + line invis to rvec_(rp_len,0) popdef(`m4parts',`m4lgth',`m4wdth',`m4box')') + + `lamp(linespec,[R][T])' +define(`lamp',`pushdef(`m4ng',`ifinstr(`$2',R,-)')pushdef(`m4hw',`dimen_/10')dnl +pushdef(`m4dp',(m4ng`'m4hw/2))pushdef(`m4ht',(m4ng`'dimen_/8))dnl +eleminit_(ifinstr(`$2',T,m4hw*2,`$1')) { line to rvec_(rp_len/2-m4hw,0) \ then to rvec_(rp_len/2-m4hw,m4ng`'dimen_/3.2) spline ifdpic(ctension_) to rvec_(0,m4ht) \ @@ -1116,7 +1147,24 @@ eleminit_(`$1') line to rvec_(0,-(m4ng`'dimen_/3.2)) \ then to rvec_(rp_len/2-m4hw,-(m4ng`'dimen_/3.2)) } { [ circle rad dimen_/5 ] at rvec_(rp_len/2,m4ng`'dimen_/3.2) } - line invis to rvec_(rp_len,0) ') + line invis to rvec_(rp_len,0) popdef(`m4ng',`m4hw',`m4dp',`m4ht') ') + + `thermocouple(linespec, wid, ht, L|R [T]) + T=truncated leads; + R=right orientation' +define(`thermocouple',`pushdef(`m4wd',ifelse(`$2',,`dimen_/5',`($2)'))dnl + eleminit_(ifinstr(`$4',T,m4wd,`$1')) + pushdef(`m4ht',ifelse(`$3',,`dimen_/2',`($3)'))dnl + pushdef(`m4ths',`ifinstr(`$4',R,-)')dnl + {line to rvec_(max(0,rp_len/2-m4wd/2),0) \ + then to rvec_(max(0,rp_len/2-m4wd/2),m4ths`'(m4ht-m4wd/2)) \ + then to rvec_(rp_len/2,m4ths`'m4ht) \ + then to rvec_(max(0,rp_len/2-m4wd/2)+m4wd,m4ths`'(m4ht-m4wd/2)) \ + then to rvec_(max(0,rp_len/2-m4wd/2)+m4wd,0) \ + then to rvec_(rp_len,0)} + { dot(at rvec_(rp_len/2,m4ths`'m4ht)) } + {[box invis ht_ m4ht wid_ m4wd] at rvec_(rp_len/2,m4ths`'m4ht/2)} + line to rvec_(rp_len,0) invis popdef(`m4wd',`m4ht',`m4ths')') `cbreaker( linespec, L|R, D|Th|TS, body name ) circuit breaker to left or right of linespec, @@ -1164,6 +1212,45 @@ define(`mbreaker',`eleminit_(`$1') define(`m4R',`ifelse(`$2',R,-)') wid_ m4h+dimen_/16] at rvec_(m4h/2,m4R`'(m4ht/2)) } line to rvec_(rp_len,0) invis ') + `jumper(linespec,chars|keys) + Two-terminal solder jumper with named body parts. + chars: character sequence normally beginning + with C and ending with D specifying the jumper + components and their attribs: C is first, D last, + E is empty (blank) gap, J is filled gap, B is + box component. + The components are named T1, T2, ... + e.g. CED is a simple open jumper (default); + CJD closed; CEBED three-contact open; + CJBED three-contact open and closed. + keys: + type=chars as above; + body=attributes; (e.g. fill_(0.5)) + wdth=expr; + name=chars; body name' +define(`jumper',`eleminit_(`$1') + pushkeys_(`$2',`type:m4typ:N; body:fill_(0):N; wdth:dimen_/5; name::N;')dnl + ifelse(m4type,m4typ, + `poppushdef(`m4type',`ifelse(`$2',,CED,`ifinstr(`$2',=,CED,`$2')')')')dnl + pushdef(`m4r',m4wdth/2) pushdef(`m4lgth',`m4r*len(m4type)')dnl + { line to rvec_(rp_len/2-m4lgth/2,0) + { line from rvec_(m4lgth,0) to rvec_(rp_len/2+m4lgth/2,0) } + {ifelse(m4name,,,m4name:) [ S: Here + for_(1,len(m4type),1,`define(`m4ch',`substr(m4type,decr(m4x),1)')dnl + T`'m4x: ifelse(m4ch,C, + `[ arc to rvec_(0,-m4wdth) with .c at rvec_(0,-m4r) m4body + round(,,m4body); L: line to rvec_(0,m4wdth) m4body; round(,,m4body) + ] with .L.c at rvec_(m4r,0); move to last [].L.c ', + m4ch,J,`rotbox(m4r,m4r,m4body)', + m4ch,B,`rotbox(m4r,m4wdth,m4body)', + m4ch,E,`move to rvec_(m4r,0)', + m4ch,D,`[ arc to rvec_(0,m4wdth) with .c at rvec_(0,m4r) m4body + round(,,m4body); L: line to rvec_(0,-m4wdth) m4body; round(,,m4body) + ] with .L.c at Here; move to T`'m4x.L.c+vec_(m4r,0)')') + ] with .S at Here } } + line invis to rvec_(rp_len,0) undefine(`m4ch') dnl + popdef(`m4type',`m4body',`m4wdth',`m4name',`m4r',`m4lgth') ') + `gap( linespec,fill,A ) Gap with filled dots e.g. gap(down_ linewid/2,1); rlabel(+,v_1,-) @@ -1986,9 +2073,8 @@ define(`m4gen_d',`{dnl sep=expr; arrow separation angle=degrees; absolute direction' define(`em_arrows',`[ - pushkeys_(`$1',`type:m4nul:N; angle:ifelse(`$2',,135,`($2)')*dtor_')dnl - ifelse(m4type,m4nul, - `popdef(`m4type')pushdef(`m4type',`ifelse(`$1',,N,`$1')')')dnl + pushkeys_(`$1',`type:m4typ:N; angle:ifelse(`$2',,135,`($2)')*dtor_')dnl + ifelse(m4type,m4typ,`poppushdef(`m4type',`ifelse(`$1',,N,`$1')')')dnl arrowhead = em_arrowhead sc_draw(`m4type',N, `pushkeys_(`$1',lgth:ifelse(`$3',,dimen_*0.46,`$3'); sep:em_arrowwid*9/8)dnl @@ -3201,37 +3287,67 @@ define(`ccoax',`[define(`m4cd',ifelse(`$3',,`dimen_*0.4',`$3'))dnl C: circle diam m4cd/3 fill_(ifinstr(`$2',F,1,0)) at S `$4'] with .c ifelse(`$1',,`at Here',`$1')') - `tconn( linespec, >|>>|<|<<|O[F], wid) - terminal connector - O=node (circle); OF=filled circle - > (default) or >> =output - < or << =input - arg3 is arrowhead width or circle diam' + `tconn( linespec, chars|keys, wid) + terminal connector with head in a [] block + chars: + O=node (circle); OF=filled circle + > (default) | >> | < | << | A | AA | M + A or AA signify arc or double arc + M signifies male bar contact + arg3 is head width or circle diam + keys: + type=chars as above; + wdth=expr; head width; + lgth=expr; type M head length; + sep=expr; double head separation + head=attributes; except lgth, wdth' define(`tconn', - `define(`m4ph',`ifelse(`$3',,`dimen_/6',`($3)/2')')dnl - define(`m4ps',`dimen_/8') define(`m4cd',`ifelse(`$3',,`dimen_/5',`$3')')dnl - eleminit_(`$1',dimen_*3/4) - M4Ss: last line.start; M4Se: last line.end - ifelse(ifinstr(`$2',0,O,`$2'),O, - `{circle diam m4cd ifinstr(`$2',OF,`fill_(0)') ifinstr(`$2',0F,`fill_(0)') \ - at (m4cd)/2/distance(M4Ss,M4Se) between M4Se and M4Ss} - {line to last line.end chop 0 chop m4cd}', - `$2',<<, - `{line to last line.end chop 0 chop m4ps+m4ph - {line from rvec_(m4ph,m4ph) to Here then to rvec_(m4ph,-m4ph)} - move to rvec_(m4ps,0) - line from rvec_(m4ph,m4ph) to Here then to rvec_(m4ph,-m4ph)}', - `$2',<, - `{line to last line.end chop 0 chop m4ph - line from rvec_(m4ph,m4ph) to Here then to rvec_(m4ph,-m4ph)}', - `$2',>>, - `{line to last line.end chop 0 chop m4ps - {line from rvec_(-m4ph,m4ph) to Here then to rvec_(-m4ph,-m4ph)} - move to rvec_(m4ps,0) - line from rvec_(-m4ph,m4ph) to Here then to rvec_(-m4ph,-m4ph)}', + `pushkeys_(`$2', + `type:m4typ:N; lgth:m4nl; wdth:dimen_/6; sep:dimen_/8; head::N') + ifelse(m4type,m4typ,`poppushdef(`m4type',ifelse(`$2',,>,`$2'))')dnl + ifelse(m4lgth,(m4nl),`poppushdef(`m4lgth',ifelse(`$3',,(dimen_/2),`($3)/2'))') + eleminit_(`$1',dimen_*3/4) + M4Ss: last line.start; M4Se: last line.end + ifelse(ifinstr(m4type,0,O,`ifinstr(m4type,OF,O,m4type)'),O, + `{popdef(`m4wdth')pushdef(`m4wdth',ifelse(`$3',,dimen_/5,`$3'))dnl + line to last line.end chop 0 chop m4wdth + [circle diam m4wdth ifinstr(m4type,OF,`fill_(0)') m4head] \ + at rvec_(m4wdth/2,0)}', + m4type,AA, + `{line to last line.end chop 0 chop m4sep+m4wdth + [{A: arc from rvec_(0,m4wdth) to rvec_(0,-m4wdth) with .c at Here m4head} + arc from rvec_(m4sep,m4wdth) to rvec_(m4sep,-m4wdth) \ + with .c at rvec_(m4sep,0) m4head] with .A.c at rvec_(m4wdth,0) }', + m4type,A, + `{line to last line.end chop 0 chop m4wdth + [A:arc from rvec_(0,m4wdth) to rvec_(0,-m4wdth) with .c at Here m4head] \ + with .A.c at rvec_(m4wdth,0) }', + m4type,<<, + `{line to last line.end chop 0 chop m4sep+m4wdth + [S: Here; {line from rvec_(m4wdth,m4wdth) to S \ + then to rvec_(m4wdth,-m4wdth) m4head}; move to rvec_(m4sep,0) + line from rvec_(m4wdth,m4wdth) to Here then to rvec_(m4wdth,-m4wdth) \ + m4head ] with .S at Here }', + m4type,<, + `{line to last line.end chop 0 chop m4wdth + [S: Here; line from rvec_(m4wdth,m4wdth) to S \ + then to rvec_(m4wdth,-m4wdth) m4head] with .S at Here }', + m4type,>>, + `{line to last line.end chop 0 chop m4sep + [S: Here; {line from rvec_(-m4wdth,m4wdth) to S \ + then to rvec_(-m4wdth,-m4wdth) m4head}; move to rvec_(m4sep,0) + line from rvec_(-m4wdth,m4wdth) to Here then to rvec_(-m4wdth,-m4wdth) \ + m4head ] with .S at Here }', + m4type,M, + `{line to last line.end chop 0 chop m4lgth + [ S: Here; NW: rvec_(0,m4wdth/2); SW: rvec_(0,-m4wdth/2) + NE: rvec_(m4lgth,m4wdth/2); SE: rvec_(m4lgth,-m4wdth/2) + L: line thick 0 to NW then to NE then to SE then to SW then to Here \ + ifelse(m4head,,fill_(0),m4head) ] with .S at Here}', `{line to last line.end - line from rvec_(-m4ph,m4ph) to Here then to rvec_(-m4ph,-m4ph)}') - line invis to M4Se') + [S: Here; line from rvec_(-m4wdth,m4wdth) to S \ + then to rvec_(-m4wdth,-m4wdth) m4head ] with .S at Here }') + line invis to M4Se popdef(`m4type',`m4lgth',`m4wdth',`m4sep',`m4head') ') `tbox( text,wid,ht,<|>|<>,type ) Pointed terminal box. @@ -3497,13 +3613,15 @@ define(`ACsymbol',`[ Origin: Here pushdef(`m4amp',`ifelse(`$3',,`m4range/6',`($3)/2')')dnl for_(1,m4n,1,`move to Origin+vec_(0,((m4n+1)/2-m4x)*m4range/3) ifinstr(ifgpic(A,`$4'),A, - `{ arc ccw to rvec_(-m4range/2,0) \ - with .c at rvec_(-m4range/4,-max(m4range/4-m4amp,0)) } - { arc ccw to rvec_( m4range/2,0) \ - with .c at rvec_( m4range/4, max(m4range/4-m4amp,0)) }', - `{ sinusoid(m4amp,twopi_/m4range,pi_/2,-m4range/2,m4range/2) \ + `{ S`'m4x: [ Origin: Here + { arc ccw to rvec_(-m4range/2,0) \ + with .c at rvec_(-m4range/4,-max(m4range/4-m4amp,0)) } + { arc ccw to rvec_( m4range/2,0) \ + with .c at rvec_( m4range/4, max(m4range/4-m4amp,0)) }] dnl + with .Origin at Here }', + `{ S`'m4x: sinusoid(m4amp,twopi_/m4range,pi_/2,-m4range/2,m4range/2) dnl with .Origin at Here } ')') - `$5'; resetdir_ popdef(`m4amp',`m4n',`m4ACd',`m4range')] \ + `$5'; resetdir_ popdef(`m4amp',`m4n',`m4ACd',`m4range')] dnl with .Origin ifelse(`$1',,`at Here',`$1')') `Deltasymbol(at position, keys, U|D|L|R|degrees) diff --git a/graphics/circuit_macros/libgen.m4 b/graphics/circuit_macros/libgen.m4 index 6846782197..b62c7d3fa8 100644 --- a/graphics/circuit_macros/libgen.m4 +++ b/graphics/circuit_macros/libgen.m4 @@ -2,7 +2,7 @@ divert(-1) libgen.m4 Base macros for dpic and gpic diagrams -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * @@ -186,7 +186,7 @@ define(`latexcommand', `$2')') define(`m4announceprocessor',`dnl Do not change the format of the next line: -`#' `$1' Version 10.1: ifelse(m4picprocessor,gpic,`Gpic', +`#' `$1' Version 10.2: ifelse(m4picprocessor,gpic,`Gpic', m4postprocessor,pstricks,`PSTricks', m4postprocessor,pgf,`TikZ PGF', m4postprocessor,mfpic,`Mfpic', @@ -425,7 +425,7 @@ stackexec_(`m4stp__',`$1')') define(`m4msg',`syscmd(echo "$@" >/dev/stderr)') `Dump stack to the terminal during m4 execution' define(`m4stackmsg',`stackexec_(`$1',`m4Btmp', -`syscmd(echo $1 >/dev/console)')dnl +`syscmd(echo $1 >/dev/stderr)')dnl stackexec_(`m4Btmp',`$1')') `Macro error message to the terminal' define(`M4ErrorMsg',`m4msg(*** Macro ERROR: @@ -855,6 +855,10 @@ popdef(`m4xt')') define(`key_prefix',`m4') # Could be locally redefined + `poppushdef(`name',`new def') + Short for popdef(`name')pushdef(`name',`new def')' +define(`poppushdef',`popdef(`$1')pushdef(`$1',`$2')') + `pushkeys_(string,keysequence,keysep,itemsep) Invoke pushkey_ on a sequence of terms. Arg 2 is a sequence of terms separated by @@ -1121,7 +1125,7 @@ define(`rotbox',`[ Line: line from E to NE then to NW then to SW then to SE then to E `$3' ') popdef(`m4bw2',`m4bh2') `$5' ]') - `rotellipse(wid,ht,type) + `rotellipse(wid,ht,attributes) ellipse oriented in current direction and enclosed in a [] block, e.g. Point_(45); rotellipse(,,dotted fill_(0.9))' @@ -1144,7 +1148,7 @@ define(`rotellipse', `ellipsearc(wid,ht,startrads,endrads, rotangle,cw|ccw,linetype) e.g. ellipsearc(2,1,0,pi_,pi_/4,,dashed) - arg5 is the angle of the wid axis + arg5 is the angle of the ellipse wid axis Internal locations Start, End, C' define(`ellipsearc',`[ C: (0,0) a_earc = ifelse(`$1',,ellipsewid,`($1)')/2 @@ -1515,11 +1519,11 @@ define(`Equidist3',` `$4': intersect_(M4tmp_P1,M4tmp_T1,M4tmp_P2,M4tmp_T2) ifelse(`$5',,,`$5 = distance(`$4',`$1');') ') - `Cintersect(Pos1,rad1,Pos2,rad2,[R]) + `Cintersect(Ctr1,rad1,Ctr2,rad2,[R]) Upper (lower if arg5=R) intersection of - circles at Pos1 and Pos2, radius rad1 and rad2 + circles at Ctr1 and Ctr2, radius rad1 and rad2 Supercedes obsolete cintersect which is kept - for consistnecy' + for consistency' define(`Cintersect', `define(`m4Cr1',`ifelse(`$2',,circlerad,(`$2'))')dnl define(`m4Cr2',`ifelse(`$4',,circlerad,(`$4'))')dnl @@ -1792,8 +1796,8 @@ define(`graystring',`rgbstring(`$1',`$1',`$1')') evaluates to a string for use in `outlined string' or `shaded string' (mpost,PSTricks,pdf,tikz-pgf,postscript,svg - only)' - `The 1: after rgb is a divisor for the values + only) + The 1: after rgb is a divisor for the values (xcolor manual p 16)' ifelse( m4postprocessor,pstricks,`define(`rgbstring',`ifelse(`$2',,`"$1"', diff --git a/graphics/circuit_macros/liblog.m4 b/graphics/circuit_macros/liblog.m4 index d25ba888e7..52e2d116b2 100644 --- a/graphics/circuit_macros/liblog.m4 +++ b/graphics/circuit_macros/liblog.m4 @@ -1,7 +1,7 @@ divert(-1) liblog.m4 Logic gates -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/mfpic.m4 b/graphics/circuit_macros/mfpic.m4 index 0b54325003..d82447b136 100644 --- a/graphics/circuit_macros/mfpic.m4 +++ b/graphics/circuit_macros/mfpic.m4 @@ -1,7 +1,7 @@ divert(-1) mfpic.m4 Initialization for mfpic. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/mpost.m4 b/graphics/circuit_macros/mpost.m4 index 8afea451bc..47a54c6c8d 100644 --- a/graphics/circuit_macros/mpost.m4 +++ b/graphics/circuit_macros/mpost.m4 @@ -1,7 +1,7 @@ divert(-1) mpost.m4 Initialization for metapost. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/pdf.m4 b/graphics/circuit_macros/pdf.m4 new file mode 100644 index 0000000000..a9f2da0997 --- /dev/null +++ b/graphics/circuit_macros/pdf.m4 @@ -0,0 +1,59 @@ +divert(-1) + pdf.m4 Initialization for pdf output. + +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * +* the LaTeX Project Public Licence in file Licence.txt. The files of * +* this distribution may be redistributed or modified provided that this * +* copyright notice is included and provided that modifications are clearly * +* marked to distinguish them from this distribution. There is no warranty * +* whatsoever for these files. * + +define(`m4picprocessor',dpic) +define(`m4postprocessor',pdf) + +ifdef(`libgen_',,`include(libgen.m4)divert(-1)')dnl + + Color utilities +define(`setrgb',`pushdef(`r_',`$1')pushdef(`g_',`$2')pushdef(`b_',`$3')dnl +pushdef(`m4cl_',ifelse(`$4',,lcspec,`$4'))dnl + command sprintf(" %7.5f %7.5f %7.5f rg",r_,g_,b_)') + +define(`resetrgb',`popdef(`m4cl_')popdef(`r_')popdef(`g_')popdef(`b_')dnl + ifdef(`r_', + `command sprintf(" %7.5f %7.5f %7.5f rg",r_,g_,b_)', + `command " 0 g"') ') + + `rgbdraw(color triple, drawing commands)' +define(`rgbdraw',`setrgb(`$1',`$2',`$3') + shift(shift(shift($@))) + resetrgb') + + Define some primary colors +define(`defineRGBprimaries',` +define(`white',`1 1 1')dnl +define(`lightgrey',`0.75 0.75 0.75')dnl +define(`lightgray',`0.75 0.75 0.75')dnl +define(`grey',`0.5 0.5 0.5')dnl +define(`gray',`0.5 0.5 0.5')dnl +define(`darkgrey',`0.25 0.25 0.25')dnl +define(`darkgray',`0.25 0.25 0.25')dnl +define(`black',`0 0 0')dnl +define(`red',`1 0 0')dnl +define(`green',`0 1 0')dnl +define(`blue',`0 0 1')dnl +define(`cyan',`0 1 1')dnl +define(`magenta',`1 0 1')dnl +define(`yellow',`1 1 0') ') + +define(`thinlines_',`linethick = 0.4 + arrowwid = 0.04*scale; arrowht = 0.2/3*scale;') +define(`thicklines_',`linethick = 0.8 + arrowwid = 0.05*scale; arrowht = 0.1*scale;') + `linethick_(x) + set line width to x pt (default 0.8) + and scale arrowhead parameters' +define(`linethick_',`linethick = ifelse(`$1',,`0.8',`$1'); dnl + arrowwid = ifelse(`$1',,`0.05',linethick/16)*scale; dnl + arrowht = ifelse(`$1',,`0.1',linethick/8)*scale;') + +divert(0)dnl diff --git a/graphics/circuit_macros/pgf.m4 b/graphics/circuit_macros/pgf.m4 index 20d2cc6a62..1f13d582e1 100644 --- a/graphics/circuit_macros/pgf.m4 +++ b/graphics/circuit_macros/pgf.m4 @@ -1,7 +1,7 @@ divert(-1) pgf.m4 Initialization for Tikz-pgf. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/postscript.m4 b/graphics/circuit_macros/postscript.m4 index e150f62095..f5d052943d 100644 --- a/graphics/circuit_macros/postscript.m4 +++ b/graphics/circuit_macros/postscript.m4 @@ -1,7 +1,7 @@ divert(-1) postscript.m4 Initialization for Postscript output. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/psfrag.m4 b/graphics/circuit_macros/psfrag.m4 index d35847525e..3ab0bf0090 100644 --- a/graphics/circuit_macros/psfrag.m4 +++ b/graphics/circuit_macros/psfrag.m4 @@ -2,7 +2,7 @@ divert(-1) psfrag.m4 Initialization for dpic -f processing: Postscript with psfrag strings -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/pstricks.m4 b/graphics/circuit_macros/pstricks.m4 index 906714005e..8c16babd1c 100644 --- a/graphics/circuit_macros/pstricks.m4 +++ b/graphics/circuit_macros/pstricks.m4 @@ -1,7 +1,7 @@ divert(-1) pstricks.m4 Initialization for PSTricks. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/svg.m4 b/graphics/circuit_macros/svg.m4 index 63dca4a8ce..3e2479539b 100644 --- a/graphics/circuit_macros/svg.m4 +++ b/graphics/circuit_macros/svg.m4 @@ -1,7 +1,7 @@ divert(-1) svg.m4 Initialization for svg output. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/graphics/circuit_macros/xfig.m4 b/graphics/circuit_macros/xfig.m4 index 6c56dc1fbf..966da643fd 100644 --- a/graphics/circuit_macros/xfig.m4 +++ b/graphics/circuit_macros/xfig.m4 @@ -1,7 +1,7 @@ divert(-1) xfig.m4 Initialization for xfig. -* Circuit_macros Version 10.1, copyright (c) 2022 J. D. Aplevich under * +* Circuit_macros Version 10.2, copyright (c) 2023 J. D. Aplevich under * * the LaTeX Project Public Licence in file Licence.txt. The files of * * this distribution may be redistributed or modified provided that this * * copyright notice is included and provided that modifications are clearly * diff --git a/macros/latex/contrib/hfutexam/CHANGELOG.md b/macros/latex/contrib/hfutexam/CHANGELOG.md index 6a7de473b7..1e2dd6ee64 100644 --- a/macros/latex/contrib/hfutexam/CHANGELOG.md +++ b/macros/latex/contrib/hfutexam/CHANGELOG.md @@ -1,5 +1,14 @@ # 更新日志 +## [1.7] - 2023/03/10 ++ 精简了文档类的代码。 ++ 将伪粗体权重统一设置为3以更接近Word的加粗效果。 ++ 调整了标题文字的空格分布。 ++ 为`\XiZhuRenQianMing`命令添加了可选参数，以调节该图像的宽度，默认为`5em`. ++ 加入了命令`\hfutstretch`，为标题中带下划线文字两侧空格长度与各分项之间空格长度的比例，默认为`1.5`. ++ 为简易模式的各个部分添加了书签。 ++ 重新调整了标题的字体和位置。 + ## [1.6] - 2022/12/07 + `\fillblank`的默认高度现在均为`0.5cm`. diff --git a/macros/latex/contrib/hfutexam/hfutexam.cls b/macros/latex/contrib/hfutexam/hfutexam.cls index 8131526917..a8eb76dae0 100644 --- a/macros/latex/contrib/hfutexam/hfutexam.cls +++ b/macros/latex/contrib/hfutexam/hfutexam.cls @@ -7,37 +7,26 @@ % 编译模式： XeLaTeX % 你可以任意修改或再次分发该文件 \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{hfutexam}[2022/12/07 v1.6 HFUTExam document class by Zhang Shenxing] -% 文档选项 shijuan, datizhi, cankaodaan, simple -\newif\ifHFUT@ShiJuan -\newif\ifHFUT@DaTiZhi -\newif\ifHFUT@CanKaoDaAn -\newif\ifHFUT@Simple -\newcommand{\setalltypefalse}{% - \HFUT@ShiJuanfalse% - \HFUT@DaTiZhifalse% - \HFUT@CanKaoDaAnfalse% - \HFUT@Simplefalse -} -\setalltypefalse\HFUT@ShiJuantrue -\DeclareOption{datizhi}{\setalltypefalse\HFUT@DaTiZhitrue} -\DeclareOption{cankaodaan}{\setalltypefalse\HFUT@CanKaoDaAntrue} -\DeclareOption{simple}{\setalltypefalse\HFUT@Simpletrue} -% 文档选项 nofangzheng -\newif\ifHFUT@Fandol\HFUT@Fandoltrue -\DeclareOption{nofangzheng}{\HFUT@Fandolfalse} +\ProvidesClass{hfutexam}[2023/03/10 v1.7 HFUTExam document class by Zhang Shenxing] +% 文档选项 +\newif\ifhfut@ShiJuan\hfut@ShiJuantrue +\newif\ifhfut@DaTiZhi\hfut@DaTiZhifalse +\newif\ifhfut@Simple\hfut@Simplefalse +\newif\ifhfut@Fandol\hfut@Fandoltrue +\DeclareOption{datizhi}{\hfut@ShiJuanfalse\hfut@DaTiZhitrue\hfut@Simplefalse} +\DeclareOption{cankaodaan}{\hfut@ShiJuanfalse\hfut@DaTiZhitrue\hfut@Simplefalse} +\DeclareOption{simple}{\hfut@ShiJuanfalse\hfut@DaTiZhifalse\hfut@Simpletrue } +\DeclareOption{nofangzheng}{\hfut@Fandolfalse} % 默认使用方正字体 % 基于 ctexart 文档类 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}} \ProcessOptions\relax -\ifHFUT@Simple\else\PassOptionsToClass{twocolumn}{ctexart}\fi +\ifhfut@Simple\else\PassOptionsToClass{twocolumn}{ctexart}\fi \ProcessOptions\relax \LoadClass[12pt,oneside]{ctexart} % 页面设置 -\RequirePackage{amsmath,amssymb,amsthm} -\RequirePackage{graphicx} -\RequirePackage{enumitem} -\RequirePackage{geometry} -\ifHFUT@Simple +\RequirePackage{amsmath,amssymb,amsthm, graphicx, enumitem, fancyhdr, lastpage, etoolbox, geometry, tikz, zref-savepos} +\RequirePackage[normalem]{ulem} +\ifhfut@Simple \geometry{a4paper,scale=0.8} \else \geometry{ @@ -46,24 +35,33 @@ left=3.17cm, right=3.17cm, voffset=2.2cm, - headheight=77pt, + headheight=78pt, headsep=12pt, footskip=1cm } + \setlength\columnsep{0.8cm} % 分栏间距 + \columnseprule=0.5pt % 分栏线宽度 \fi % 试卷信息 -\newcommand{\BiaoTi}[1]{\gdef\HFUT@BiaoTi{#1}} -\newcommand{\XueNian}[2]{\gdef\HFUT@XueNians{#1}\gdef\HFUT@XueNiane{#2}} -\newcommand{\XueQi}[1]{\gdef\HFUT@XueQi{#1}} -\newcommand{\KeChengDaiMa}[1]{\gdef\HFUT@KeChengDaiMa{#1}} -\newcommand{\KeChengMingCheng}[1]{\gdef\HFUT@KeChengMingCheng{#1}} -\newcommand{\XueFen}[1]{\gdef\HFUT@XueFen{#1}} -\newcommand{\KeChengXingZhi}[1]{\gdef\HFUT@KeChengXingZhi{#1}} -\newcommand{\KaoShiXingShi}[1]{\gdef\HFUT@KaoShiXingShi{#1}} -\newcommand{\ZhuanYeBanJi}[1]{\gdef\HFUT@ZhuanYeBanJi{#1}} -\newcommand{\KaoShiRiQi}[1]{\gdef\HFUT@KaoShiRiQi{#1}} -\newcommand{\MingTiJiaoShi}[1]{\gdef\HFUT@MingTiJiaoShi{#1}} -\newcommand{\XiZhuRenQianMing}[1]{\gdef\HFUT@XiZhuRenQianMing{#1}} +\newcommand{\hfutstretch}{1.5} % 下划线内两侧空格长度除以条目之间空格长度 +\newcommand{\hfutul}[1]{\uline{\hspace{\stretch{\hfutstretch}}#1\hspace{\stretch{\hfutstretch}}}} +\newcommand{\hfutrule}[1]{\rule{#1}{0mm}} +\newcommand{\hfutboxyes}{{\raisebox{-0.5mm}{\LARGE$\checkmark\hspace{-18pt}\square$}}} +\newcommand{\hfutboxno}{{\raisebox{-0.5mm}{\LARGE$\square$}}} +\newcommand{\XueNian}[2]{\gdef\hfut@XueNian{{\hfutFontTimes #1}～{\hfutFontTimes #2}}} +\newcommand{\BiaoTi}[1]{\gdef\hfut@BiaoTi{#1}} +\newcommand{\XueQi}[1]{\gdef\hfut@XueQi{#1}} +\newcommand{\XueFen}[1]{\gdef\hfut@XueFen{#1}} +\newcommand{\KeChengXingZhi}[1]{\gdef\hfut@KeChengXingZhi{#1}} +\newcommand{\KaoShiXingShi}[1]{\gdef\hfut@KaoShiXingShi{#1}} +\newcommand{\KeChengDaiMa}[1]{\gdef\hfut@KeChengDaiMa{#1}} +\newcommand{\KeChengMingCheng}[1]{\gdef\hfut@KeChengMingCheng{#1}} +\newcommand{\ZhuanYeBanJi}[1]{\gdef\hfut@ZhuanYeBanJi{#1}} +\newcommand{\KaoShiRiQi}[1]{\gdef\hfut@KaoShiRiQi{#1}} +\newcommand{\MingTiJiaoShi}[1]{\gdef\hfut@MingTiJiaoShi{#1}} +\newcommand{\XiZhuRenQianMing}[2][5em]{\gdef\hfut@XiZhuRenQianMing{% + \tikz[overlay]\node at (1.5,0.22) {\ifx#2\@empty\else\includegraphics[width=#1]{#2}\fi};% + \uline{\hspace{0.5em}\hfutrule{#1}\hspace{0.5em}}}} \BiaoTi{} \XueNian{}{} \XueQi{} @@ -77,144 +75,110 @@ \MingTiJiaoShi{} \XiZhuRenQianMing{} % 粗字体设定 -\newfontfamily\timesnewroman[AutoFakeBold={1.5}]{Times New Roman} % 粗罗马 -\ifHFUT@Fandol - \setCJKfamilyfont{titlesongti}[AutoFakeBold={1.5}]{FZXiaoBiaoSong-B05S} % 粗方正小标宋 - \newfontfamily\entitlesongti[AutoFakeBold={1.5}]{FZXiaoBiaoSong-B05S} - \setCJKfamilyfont{titlefangsong}[AutoFakeBold={1.5}]{FZFangSong-Z02S} % 粗方正仿宋 - \newfontfamily\entitlefangsong[AutoFakeBold={1.5}]{FZFangSong-Z02S} +\newfontfamily\hfutFontTimes[AutoFakeBold={3}]{Times New Roman} % 粗罗马 +\ifhfut@Fandol + \setCJKfamilyfont{hfutFontTitle}[AutoFakeBold={3}]{FZXiaoBiaoSong-B05S} % 粗方正小标宋 + \newfontfamily\hfutFontTitleEn[AutoFakeBold={3}]{FZXiaoBiaoSong-B05S} + \setCJKfamilyfont{hfutFontHead}[AutoFakeBold={3}]{FZFangSong-Z02S} % 粗方正仿宋 + \newfontfamily\hfutFontHeadEn[AutoFakeBold={3}]{FZFangSong-Z02S} \else - \setCJKfamilyfont{titlesongti}[AutoFakeBold={4}]{NSimSun} % 粗新宋体 - \newfontfamily\entitlesongti[AutoFakeBold={4}]{NSimSun} - \setCJKfamilyfont{titlefangsong}[AutoFakeBold={1.5}]{FangSong} % 粗仿宋 - \newfontfamily\entitlefangsong[AutoFakeBold={1.5}]{FangSong} + \setCJKfamilyfont{hfutFontTitle}[AutoFakeBold={3}]{NSimSun} % 粗新宋体 + \newfontfamily\hfutFontTitleEn[AutoFakeBold={3}]{NSimSun} + \setCJKfamilyfont{hfutFontHead}[AutoFakeBold={3}]{FangSong} % 粗仿宋 + \newfontfamily\hfutFontHeadEn[AutoFakeBold={3}]{FangSong} \fi -\newcommand{\titlesongti}{\entitlesongti\CJKfamily{titlesongti}} -\newcommand{\titlefangsong}{\entitlefangsong\CJKfamily{titlefangsong}} -\setCJKfamilyfont{xinsongti}[AutoFakeBold={1.5}]{NSimSun} % 粗新宋体 -\newfontfamily\enxinsongti[AutoFakeBold={1.5}]{NSimSun} -\newcommand{\xinsongti}{\enxinsongti\CJKfamily{xinsongti}} -\setCJKfamilyfont{cusongti}[AutoFakeBold={1.5}]{SimSun} % 粗宋体 -\newcommand{\cusongti}{\CJKfamily{cusongti}} +\newcommand{\hfutFontTitle}{\CJKfamily{hfutFontTitle}\hfutFontTitleEn} +\newcommand{\hfutFontHead}{\hfutFontHeadEn\CJKfamily{hfutFontHead}} % 重新设定字体大小 -\renewcommand{\LARGE}{\fontsize{21}{21}} -\renewcommand{\large}{\fontsize{14}{14}} -\renewcommand{\normalsize}{\fontsize{12}{12}} -\renewcommand{\small}{\fontsize{10.5}{10.5}} +\renewcommand{\LARGE}{\fontsize{21pt}{25.2pt}} +\renewcommand{\large}{\fontsize{14pt}{21pt}} +\renewcommand{\small}{\fontsize{10.5pt}{12.6pt}} % 缩进 \setlength{\parindent}{0em} \renewcommand{\indent}{\hspace*{2em}} -% 分栏 -\setlength\columnsep{0.8cm} % 分栏间距 -\columnseprule=0.5pt % 分栏线宽度 % 页眉页脚 -\RequirePackage{fancyhdr} -\RequirePackage{lastpage} -\RequirePackage{etoolbox} -\renewcommand\headrulewidth{0.5pt} % 页眉线宽度 -\renewcommand\footrulewidth{0.5pt} % 页脚线宽度 \pagestyle{fancy} \fancyhf{} -\newcommand{\boxyes}{{\raisebox{-0.5mm}{\LARGE$\checkmark\hspace{-1.2em}\square$}}} -\newcommand{\boxno}{{\raisebox{-0.5mm}{\LARGE$\square$}}} -\newcommand{\filltitle}[2]{\uline{\makebox[#1]{#2}}} -\newlength{\ltitle} -\settowidth{\ltitle}{\HFUT@BiaoTi} -\ifHFUT@ShiJuan%试卷页眉页脚 - \fancyhead[C]{% - \hfill\bfseries\LARGE\titlesongti\ifdimcomp\ltitle>{0.5\linewidth}{\HFUT@BiaoTi}{\makebox[0.5\linewidth][s]{\HFUT@BiaoTi}}\hfill% - \large\cusongti 共\filltitle{1.5em}{\timesnewroman\pageref{LastPage}}页第\filltitle{1.5em}{\timesnewroman\thepage}页\\\vspace{5pt}% - \timesnewroman\HFUT@XueNians\titlefangsong～\timesnewroman\HFUT@XueNiane\titlefangsong 学年第\filltitle{2em}{\HFUT@XueQi}学期\hfill% - 课程代码\filltitle{5em}{\HFUT@KeChengDaiMa}\hfill% - 课程名称\filltitle{12em}{\HFUT@KeChengMingCheng}\hfill% - 学分\filltitle{2.5em}{\HFUT@XueFen}\hfill% - 课程性质: 必修\ifdefstring{\HFUT@KeChengXingZhi}{必修}{\boxyes}{\boxno}% - 选修\ifdefstring{\HFUT@KeChengXingZhi}{选修}{\boxyes}{\boxno}% - 限修\ifdefstring{\HFUT@KeChengXingZhi}{限修}{\boxyes}{\boxno}\hfill% - 考试形式: 开卷\ifdefstring{\HFUT@KaoShiXingShi}{开卷}{\boxyes}{\boxno}% - 闭卷\ifdefstring{\HFUT@KaoShiXingShi}{闭卷}{\boxyes}{\boxno}\\\vspace{2pt}% - 专业班级（教学班）\filltitle{11em}{\HFUT@ZhuanYeBanJi}\hfill% - 考试日期\filltitle{16em}{\HFUT@KaoShiRiQi}\hfill% - 命题教师\fillblank[5.5em][0.6cm]{\HFUT@MingTiJiaoShi}\hfill% - 系（所或教研室）主任审批签名% - \begin{tikzpicture}[overlay,xshift=3.25em,yshift=0.15cm]% - \node at (0,0) {\ifx\HFUT@XiZhuRenQianMing\@empty\else\includegraphics[height=0.9cm]{\HFUT@XiZhuRenQianMing}\fi};% - \end{tikzpicture}% - \filltitle{6.5em}{}\vspace{4pt}% +\newcommand{\hfutpage}{{\hfutFontTimes\thepage}} +\newcommand{\hfutlastpage}{{\hfutFontTimes\pageref*{LastPage}}} +\ifhfut@ShiJuan % 试卷页眉页脚 + \renewcommand\headrulewidth{0.5pt} + \renewcommand\footrulewidth{0.5pt} + \setCJKfamilyfont{hfutFontSimSun}[AutoFakeBold={3}]{SimSun} % 粗宋体 + \fancyhead[C]{\bfseries\large\hfutFontHead\hfutrule{6em} + \hfill\makebox[280mm][s]{\LARGE\hfutFontTitle~\hfut@BiaoTi~} + \hfill{\CJKfamily{hfutFontSimSun} 共\uline{\makebox[1.5em]{\hfutlastpage}}页第\uline{\makebox[1.5em]{\hfutpage}}页} + + \vspace{6pt}% + \hfut@XueNian{}学年第\uline{\hfill\hfut@XueQi\hfill}学期 + \hfill 课程代码\hfutul{\hfut@KeChengDaiMa} + \hfill 课程名称\hfutul{\hfut@KeChengMingCheng} + \hfill 学分\uline{\hfill\hfut@XueFen\hfill} + \hfill 课程性质: % + 必修\ifdefstring{\hfut@KeChengXingZhi}{必修}{\hfutboxyes}{\hfutboxno}% + 选修\ifdefstring{\hfut@KeChengXingZhi}{选修}{\hfutboxyes}{\hfutboxno}% + 限修\ifdefstring{\hfut@KeChengXingZhi}{限修}{\hfutboxyes}{\hfutboxno} + \hfill 考试形式: % + 开卷\ifdefstring{\hfut@KaoShiXingShi}{开卷}{\hfutboxyes}{\hfutboxno}% + 闭卷\ifdefstring{\hfut@KaoShiXingShi}{闭卷}{\hfutboxyes}{\hfutboxno} + + \vspace{6pt}% + 专业班级（教学班）\hfutul{\hfut@ZhuanYeBanJi} + \hfill 考试日期\hfutul{\hfut@KaoShiRiQi} + \hfill 命题教师\hfutul{\hfut@MingTiJiaoShi} + \hfill 系（所或教研室）主任审批签名\hfut@XiZhuRenQianMing% } \fancyfoot[C]{\small\vspace{0.5\baselineskip}命题教师注意事项: 1. 主考教师必须于考试一周前将“试卷A”、“试卷B”经教研室主任审批签字后送教务科印刷。\hspace{1em}% 2. 请命题教师用黑色水笔工整地书写题目或用A4纸横式打印贴在试卷版芯中。 } \fi -\ifHFUT@DaTiZhi%答题纸页眉页脚 - \fancyhead[C]{% - \bfseries\LARGE\xinsongti\scalebox{2.0}[1.0]{% - \ifdimcomp\ltitle>{0.35\linewidth}{\HFUT@BiaoTi}{\makebox[0.35\linewidth][s]{\HFUT@BiaoTi}}% - }\\\vspace{8pt}% - \large\timesnewroman\HFUT@XueNians\titlefangsong～\timesnewroman\HFUT@XueNiane\titlefangsong 学年第\filltitle{2em}{\HFUT@XueQi}学期\hfill% - 课程代码\filltitle{6.5em}{\HFUT@KeChengDaiMa}\hfill% - 课程名称\filltitle{13em}{\HFUT@KeChengMingCheng}\hfill% - 命题教师\filltitle{7em}{\HFUT@MingTiJiaoShi}\hfill% - 系主任审批% - \begin{tikzpicture}[overlay,xshift=3.5em,yshift=0.2cm]% - \node at (0,0) {\ifx\HFUT@XiZhuRenQianMing\@empty\else\includegraphics[height=0.9cm]{\HFUT@XiZhuRenQianMing}\fi};% - \end{tikzpicture}% - \filltitle{7em}{}\\\vspace{2pt}% - 教学班级\filltitle{10.5em}{}\hfill% - 学生姓名\fillblank[8em][0.6cm]{}\hfill% - 学号\filltitle{8em}{}\hfill% - 考试日期\filltitle{16em}{\HFUT@KaoShiRiQi}\hfill% - 成绩\filltitle{6.3em}{}\vspace{4pt}% - } - \fancyfoot[C]{\small\vspace{0.5\baselineskip} - 第 \timesnewroman\thepage 页~共 \timesnewroman\pageref{LastPage} 页 +\ifhfut@DaTiZhi % 答题纸页眉页脚 + \renewcommand\headrulewidth{0.5pt} + \renewcommand\footrulewidth{0.5pt} + \fancyhead[C]{\bfseries\large\hfutFontHead + \makebox[\linewidth][s]{\LARGE\hfutFontTitle~\hfut@BiaoTi~} + + \vspace{6pt}% + \hfut@XueNian{}学年第\uline{\hfill\hfut@XueQi\hfill}学期 + \hfill 课程代码\hfutul{\hfut@KeChengDaiMa} + \hfill 课程名称\hfutul{\hfut@KeChengMingCheng} + \hfill 命题教师\hfutul{\hfut@MingTiJiaoShi} + \hfill 系（所或教研室）主任审批签名\hfut@XiZhuRenQianMing% + + \vspace{6pt}% + 教学班级\hfutul{\hfutrule{10em}} + \hfill 学生姓名\hfutul{\hfutrule{10em}} + \hfill 学号\hfutul{\hfutrule{8em}} + \hfill 考试日期\hfutul{\hfut@KaoShiRiQi} + \hfill 成绩\hfutul{\hfutrule{6em}}% } + \fancyfoot[C]{\small\vspace{0.5\baselineskip}第~\hfutpage~页~~共~\hfutlastpage~页} \fi -\ifHFUT@CanKaoDaAn%参考答案页眉页脚 - \fancyhead[C]{% - \bfseries\LARGE\titlesongti\ifdimcomp\ltitle>{0.6\linewidth}{\HFUT@BiaoTi}{\makebox[0.6\linewidth][s]{\HFUT@BiaoTi}}\\\vspace{5pt}% - \large\timesnewroman\HFUT@XueNians\titlefangsong～\timesnewroman\HFUT@XueNiane\titlefangsong 学年第\filltitle{2em}{\HFUT@XueQi}学期\hfill% - 课程代码\filltitle{6.5em}{\HFUT@KeChengDaiMa}\hfill% - 课程名称\filltitle{13em}{\HFUT@KeChengMingCheng}\hfill% - 命题教师\filltitle{7em}{\HFUT@MingTiJiaoShi}\hfill% - 系主任审批% - \begin{tikzpicture}[overlay,xshift=3.5em,yshift=0.2cm]% - \node at (0,0) {\ifx\HFUT@XiZhuRenQianMing\@empty\else\includegraphics[height=0.9cm]{\HFUT@XiZhuRenQianMing}\fi};% - \end{tikzpicture}% - \filltitle{7em}{}\\\vspace{2pt}% - 教学班级\filltitle{10.5em}{}\hfill% - 学生姓名\fillblank[8em][0.6cm]{}\hfill% - 学号\filltitle{8em}{}\hfill% - 考试日期\filltitle{16em}{\HFUT@KaoShiRiQi}\hfill% - 成绩\filltitle{6.3em}{}\vspace{4pt}% - } - \fancyfoot[C]{\small\vspace{0.5\baselineskip} - 第 \timesnewroman\thepage 页~共 \timesnewroman\pageref{LastPage} 页 - } -\fi -\ifHFUT@Simple%简单模式页眉页脚 +\ifhfut@Simple % 简单模式页眉页脚 + \RequirePackage{hyperref} \renewcommand\headrulewidth{0pt} \renewcommand\footrulewidth{0pt} \renewcommand{\maketitle}{% - \begin{center} - \bfseries\LARGE\titlesongti% - \ifdimcomp\ltitle>{0.9\linewidth}{\HFUT@BiaoTi}{\makebox[0.9\linewidth][s]{\HFUT@BiaoTi}}\\% - \makebox[0.75\linewidth]{\large\timesnewroman\HFUT@XueNians\titlefangsong～\timesnewroman\HFUT@XueNiane\titlefangsong 学年% - 第{\HFUT@XueQi}学期\hfill\HFUT@KeChengMingCheng(\HFUT@KeChengDaiMa)} + \pdfbookmark{\hfut@BiaoTi}{hfutBiaoTi\thepage} + \begin{center}\bfseries + \makebox[\linewidth][s]{\LARGE\hfutFontTitle~\hfut@BiaoTi~} + + \vspace{6pt}% + \makebox[\linewidth]{\large\hfutFontHead~ + \hfill \hfut@XueNian{}学年第\hfut@XueQi{}学期 + \hspace{\stretch{3}} \hfut@KeChengMingCheng(\hfut@KeChengDaiMa) + \hfill~ + } \end{center} } - \fancyfoot[C]{\small\vspace{0.5\baselineskip} - 第 \timesnewroman\thepage 页~共 \timesnewroman\pageref{LastPage} 页 - } + \fancyfoot[C]{\small{}第~\hfutpage~页~~共~\hfutlastpage~页} \fi % 题号加粗 \renewcommand{\labelenumi}{{\bfseries \theenumi.}} % 题干 \newcommand\tigan[1]{\noindent{\large\textbf{#1}}} % 打分栏 -\RequirePackage{tikz} -\usetikzlibrary{overlay-beamer-styles} \newcommand\scorebox{% \vspace{0.5\baselineskip}\noindent% \begin{tikzpicture}[overlay,xshift=13.8cm,yshift=-1.6cm]% @@ -240,8 +204,7 @@ \newlength{\lquar} \newlength{\lhalf} \newlength{\lfull} -\RequirePackage[normalem]{ulem} -\NewDocumentCommand\fillblank{O{3.5cm} O{0.5cm} m}{% +\NewDocumentCommand\fillblank{O{35mm} O{5mm} m}{% \settodepth{\ltemp}{#3}% \uline{\makebox[#1]{\rule{0pt}{#2}\raisebox{\ltemp}{#3}}}% } @@ -298,9 +261,7 @@ \draw (0.9,0.5) node {#2} (0.9,1.5) node {\textbf{#1}};% \end{tikzpicture}% } -% 得分点命令 -% https://ask.latexstudio.net/ask/question/7557.html -\RequirePackage{zref-savepos} +% 得分点命令 https://ask.latexstudio.net/ask/question/7557.html \makeatletter \ExplSyntaxOn \zref@require@unique diff --git a/macros/latex/contrib/hfutexam/hfutexam.pdf b/macros/latex/contrib/hfutexam/hfutexam.pdf Binary files differindex a470ca1a02..69731d6fbc 100644 --- a/macros/latex/contrib/hfutexam/hfutexam.pdf +++ b/macros/latex/contrib/hfutexam/hfutexam.pdf diff --git a/macros/latex/contrib/hfutexam/hfutexam.tex b/macros/latex/contrib/hfutexam/hfutexam.tex index dc0f9769ab..0579704f5a 100644 --- a/macros/latex/contrib/hfutexam/hfutexam.tex +++ b/macros/latex/contrib/hfutexam/hfutexam.tex @@ -2,7 +2,7 @@ %% 示例所需的自定义命令 \newcommand{\diff}{\,\mathrm{d}} -\usetikzlibrary{arrows.meta, overlay-beamer-styles} +\usetikzlibrary{arrows.meta} \newfontfamily\couriernew{Courier New} \usepackage{enumitem} \usepackage{tcolorbox} @@ -12,11 +12,11 @@ \definecolor{lightgrey}{rgb}{0.9,0.9,0.9} \definecolor{frenchplum}{RGB}{190,20,83} \lstset{language=[LaTeX]TeX, - basicstyle=\couriernew, - texcsstyle=*\color{winered}, + basicstyle=\couriernew\color{blue}, + rulecolor=\color{black}, + texcsstyle=*\color{red}, mathescape, breaklines=true, - keywordstyle=\color{winered}, commentstyle=\color{green!70!black}, stringstyle=\color{green!50!blue}, frame=single, @@ -24,14 +24,14 @@ framerule=0.5pt, columns=flexible, backgroundcolor=\color{black!5}, - morekeywords={\diff, \maketitle, \titlesep, \BiaoTi, \XueNian, \XueQi, \KeChengDaiMa, \KeChengMingCheng, \XueFen, \KeChengXingZhi, \KaoShiXingShi, \ZhuanYeBanJi, \KaoShiRiQi, \MingTiJiaoShi, \XiZhuRenQianMing, \tigan, \scorebox, \score, \Score, \fillblank, \xx, \notice, \xuanzeti, \yihang, \erhang, \sihang, XeLaTeX}, - keywordstyle=\color{winered}, - morekeywords=[2]{hfutexam, shijuan, datizhi, cankaodaan, simple, nofangzheng, flalign, 5cm, enumerate, align}, - keywordstyle=[2]\color{blue}, + morekeywords={\diff, \maketitle, \titlesep, \BiaoTi, \XueNian, \XueQi, \KeChengDaiMa, \KeChengMingCheng, \XueFen, \KeChengXingZhi, \KaoShiXingShi, \ZhuanYeBanJi, \KaoShiRiQi, \MingTiJiaoShi, \XiZhuRenQianMing, \tigan, \scorebox, \score, \Score, \fillblank, \xx, \notice, \xuanzeti, \yihang, \erhang, \sihang, XeLaTeX, \hfutstretch}, + keywordstyle=\color{red}, + % morekeywords=[2]{hfutexam, shijuan, datizhi, cankaodaan, simple, nofangzheng, flalign, 5cm, enumerate, align}, + % keywordstyle=[2]\color{blue}, } \tcbset{ colback=white, - colframe=blue, + colframe=black, boxrule=0.5pt, arc=0pt, } @@ -56,7 +56,7 @@ \tigan{一、模板选项} \indent -本模板 (2022/12/07 v1.6) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式. +本模板 (2023/03/10 v1.7) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式. 使用时, 只需在文档开头写上 \begin{lstlisting} \documentclass[shijuan]{hfutexam} @@ -67,10 +67,10 @@ \indent 可使用的选项为: \lstinline|shijuan| (试卷), \lstinline|datizhi| (答题纸), \lstinline|cankaodaan| (参考答案) 和 \lstinline|simple| (简易模式). 如果留空则为默认值 \lstinline|shijuan| (试卷). \begin{enumerate} -\item 试卷/答题纸/参考答案三个选项下页面会设置为 A3 大小, 三种情形的页眉页脚显示的内容以及标题的文字间隔有所不同. +\item 试卷/答题纸/参考答案三个选项下页面会设置为 A3 大小的双栏模式, 相应的标题、页眉和页脚内容有所不同. \item 简易模式选项下页面会设置为 A4 大小, 页眉页脚也较为简单. 此时需要使用命令 \lstinline|\maketitle| 来生成标题. 一般用于保存(多张)试卷的内容，或者便于打印使用. -\item 标题默认使用方正字体, 因此请在使用前先安装字体: {\bfseries\titlesongti 方正小标宋}和{\bfseries\titlefangsong 方正仿宋}(右键选择为所有用户安装), 否则请使用选项 \lstinline|nofangzheng| (采用新宋体和仿宋代替). +\item 标题默认使用方正字体, 因此请在使用前先安装字体: {\bfseries\hfutFontTitle 方正小标宋}和{\bfseries\hfutFontHead 方正仿宋}(右键选择为所有用户安装), 否则请使用选项 \lstinline|nofangzheng| (采用新宋体和仿宋代替). \end{enumerate} \tigan{二、试卷信息} @@ -91,37 +91,38 @@ \ZhuanYeBanJi{少数民族预科班} % 专业班级, 一般不需要填写 \KaoShiRiQi{2022年6月18日8:00-10:00} % 考试日期 \MingTiJiaoShi{集体} % 命题教师 -\XiZhuRenQianMing{dengbing.png} % 系主任签名 +\XiZhuRenQianMing[5em]{dengbing.png} % 系主任签名的对应图片 \end{lstlisting} -其中系主任签名处需要填写相应的图片名, 若不设置或设置为空则不显示. +\indent 若不设置系主任签名或设置为空则不显示, 它的可选参数表示该图片的显示宽度, 默认为 \lstinline|5em|. 其它选项默认均为空, 可根据需要只填部分内容. -\newpage -\tigan{三、命令} +\tigan{三、解答题} \begin{enumerate} -\item \lstinline|\tigan{三、命令}| 用于生成题干, 字体相对较大, 且为黑体. 小题建议使用~{\color{blue}\lstinline|enumerate|} 环境来生成. +\item \lstinline|\hfutstretch{1.5}| 用于设置标题中\uline{带下划线文字两侧空格}与\uline{各分项之间空格}的宽度比, 默认为\lstinline|1.5|. +\item \lstinline|\tigan{三、解答题}| 用于生成题干, 为14pt黑体. 小题用~{\color{blue}\lstinline|enumerate|} 环境来生成. \item \hspace{-8mm}\scorebox\hspace{8mm}\lstinline|\scorebox| 用于生成打分框, 请放置在答题纸一行的开头使用. \vspace{-2mm} \item \lstinline|\notice| 用于生成答题纸提示信息, 请放置在答题纸的正文开始处. \item 答题纸中可能需要设置一定高度的空白, 使用命令 \lstinline|\hspace{5cm}| 之类的命令即可. 也可以使用 \lstinline|\newpage| 换到新的一页(或分栏). +\item 文档默认无缩进, 可在需要处使用命令 \lstinline|\indent| 生成. \end{enumerate} \tigan{填空题相关} \begin{enumerate}[resume] -\item \lstinline|\fillblank[长度][最低高度]{内容}| 用于生成填空题的空白, 内容可以为空. 其中长度默认值是~{\color{blue}{\lstinline|3.5cm|}}, 最低高度默认值是~{\color{blue}{\lstinline|0.5cm|}}. +\item \lstinline|\fillblank[长度][最低高度]{内容}| 用于生成填空题的空白, 内容可以为空. 其中长度默认值是~{\color{blue}{\lstinline|35mm|}}, 最低高度默认值是~{\color{blue}{\lstinline|5mm|}}. \end{enumerate} \textit{\color{blue}{填空题示例:}} \begin{lstlisting} -\textbf{请将你的答案对应填在横线上：}\\[0.5cm] +\textbf{请将你的答案对应填在横线上：}\\[5mm] \textbf{1.} \fillblank{}, \textbf{2.} \fillblank[5cm]{}, \textbf{3.} \fillblank{}. \end{lstlisting} \begin{tcolorbox} -\textbf{请将你的答案对应填在横线上：}\\[0.5cm] +\textbf{请将你的答案对应填在横线上：}\\[5mm] \textbf{1.} \fillblank{}, \textbf{2.} \fillblank[5cm]{}, \textbf{3.} \fillblank{}. @@ -130,8 +131,8 @@ \tigan{选择题相关} \begin{enumerate}[resume] \item \lstinline|\xx{选项}{选项}{选项}{选项}| 用于生成选择题的选项, 直接在选择题题干后使用即可. 该命令会自动根据选项长度设置行数. 只支持四个选项, 选项会自动带上 ABCD. -\item 如果想要手动改变每行显示的选项数, 可使用命令 \lstinline|\xx[每行显示的选项数]{选项}{选项}{选项}{选项}|, 每行只能显示 1, 2 或 4 个选项. -\item \lstinline|\xuanzeti{题号}{答案}| 用于生成答题纸选择题的答题区域, 或参考答案选择题的答案区域. +\item 该命令具有可选参数: \lstinline|\xx[每行显示的选项数]{选项}{选项}{选项}{选项}|, 每行只能显示 1, 2 或 4 个选项. +\item \lstinline|\xuanzeti{题号}{答案}| 用于生成答题纸或参考答案中选择题的答题区域. \end{enumerate} \textit{\color{blue}{选择题示例:}} @@ -175,7 +176,6 @@ \xuanzeti{1}{}\xuanzeti{2}{}\xuanzeti{3}{}\xuanzeti{4}{} \end{tcolorbox} -\newpage \tigan{得分点相关} \begin{enumerate}[resume] \item \lstinline|\score{数值}| 用于在参考答案一行结尾处生成得分点的虚线.\score2 @@ -186,8 +186,8 @@ \begin{lstlisting} \[\int e^x\diff x=e^x+C. \Score{(4分, 缺少常数得2分)}\] \begin{align*} -\int\sin x\diff x&=-\cos x+C, \Score{(4分, 缺少常数得2分)}\\ -\int_0^\pi(1+\sin x)\diff x&=\pi+2. \score5 + \int\sin x\diff x&=-\cos x+C, \Score{(4分, 缺少常数得2分)}\\ + \int_0^\pi(1+\sin x)\diff x&=\pi+2. \score5 \end{align*} \end{lstlisting} diff --git a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf Binary files differindex 330e2c8ed7..5be4a7f7c1 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf +++ b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.pdf diff --git a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex index e9ca966fc3..c4e8f069b9 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex +++ b/macros/latex/contrib/hfutexam/hfutexam_cankaodaan.tex @@ -1,4 +1,4 @@ -\documentclass[cankaodaan,blue]{hfutexam} +\documentclass[cankaodaan]{hfutexam} \usepackage{extarrows} \newcommand{\diff}{\,\mathrm{d}} @@ -14,7 +14,7 @@ \ZhuanYeBanJi{少数民族预科班} \KaoShiRiQi{2022年6月18日8:00-10:00} \MingTiJiaoShi{集体} -%\XiZhuRenQianMing{dengbing.png} +% \XiZhuRenQianMing{dengbing.png} \tigan{一、填空题（每小题3分，共18分）} diff --git a/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf b/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf Binary files differindex c1fdcc715a..28f58baf36 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf +++ b/macros/latex/contrib/hfutexam/hfutexam_datizhi.pdf diff --git a/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex b/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex index c0d3d1fa84..31e1b3576f 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex +++ b/macros/latex/contrib/hfutexam/hfutexam_datizhi.tex @@ -2,24 +2,24 @@ \newcommand{\diff}{\,\mathrm{d}} \begin{document} -\BiaoTi{合肥工业大学考试专用答卷纸（A）} -\XueNian{2021}{2022} -\XueQi{二} -\KeChengDaiMa{034Y01} -\KeChengMingCheng{数学（下）} -\XueFen{5} +\BiaoTi{合肥工业大学考试专用答题纸（A）} +\XueQi{一} +\XueNian{2022}{2023} +\KeChengDaiMa{1400261B} +\KeChengMingCheng{复变函数与积分变换} +\XueFen{2.5} \KeChengXingZhi{必修} \KaoShiXingShi{闭卷} -\ZhuanYeBanJi{少数民族预科班} -\KaoShiRiQi{2022年6月18日8:00-10:00} +\ZhuanYeBanJi{} +\KaoShiRiQi{2022年11月26日19:00-21:00} \MingTiJiaoShi{集体} -%\XiZhuRenQianMing{dengbing.png} - +% 注意事项 \notice -%\scorebox 为打分框, 必须放在行首 -\scorebox\tigan{一、填空题（每小题3分，共18分）} +% \scorebox 为打分框, 必须放在行首 +\scorebox +\tigan{一、填空题（每小题3分，共18分）} \textbf{请将你的答案对应填在横线上：}\\[0.5cm] \textbf{1.} \fillblank{}, @@ -29,7 +29,8 @@ \textbf{5.} \fillblank{}, \textbf{6.} \fillblank{}. -\scorebox\tigan{二、选择题（每小题3分，共18分）} +\scorebox +\tigan{二、选择题（每小题3分，共18分）} \textbf{请将你所选择的字母 A, B, C, D 之一对应填在下列表格里：} @@ -43,29 +44,37 @@ \tigan{三、解答题（每小题8分，共64分）} -\scorebox\textbf{1. （8分）【解】} +\scorebox +\textbf{1. （8分）【解】} % \vspace 用于生成一定高度的空白, \newpage 直接换页 \vspace{3cm} -\scorebox\textbf{2. （8分）【解】} +\scorebox +\textbf{2. （8分）【解】} \newpage -\scorebox\textbf{3. （8分）【解】} +\scorebox +\textbf{3. （8分）【解】} \vspace{7cm} -\scorebox\textbf{4. （8分）【解】} +\scorebox +\textbf{4. （8分）【解】} \newpage -\scorebox\textbf{5. （8分）【解】} +\scorebox +\textbf{5. （8分）【解】} \vspace{7cm} -\scorebox\textbf{6. （8分）【证明】} +\scorebox +\textbf{6. （8分）【证明】} \newpage -\scorebox\textbf{7. （8分）【证明】} +\scorebox +\textbf{7. （8分）【证明】} \vspace{7cm} -\scorebox\textbf{8. （8分）【解】} +\scorebox +\textbf{8. （8分）【解】} \end{document} diff --git a/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf b/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf Binary files differindex b8e5045e71..35222d2cab 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf +++ b/macros/latex/contrib/hfutexam/hfutexam_shijuan.pdf diff --git a/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex b/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex index e4a5617329..9be69f2a92 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex +++ b/macros/latex/contrib/hfutexam/hfutexam_shijuan.tex @@ -1,6 +1,6 @@ \documentclass{hfutexam} \newcommand{\diff}{\,\mathrm{d}} -\usetikzlibrary{arrows.meta, overlay-beamer-styles} +\usetikzlibrary{arrows.meta} \begin{document} \BiaoTi{合肥工业大学试卷（A）} @@ -12,10 +12,9 @@ \KeChengXingZhi{必修} \KaoShiXingShi{闭卷} \ZhuanYeBanJi{少数民族预科班} -\KaoShiRiQi{2022年6月18日8:00-10:00} +\KaoShiRiQi{2022年2月29日8:00-10:00} \MingTiJiaoShi{集体} -\XiZhuRenQianMing{} -% \XiZhuRenQianMing{dengbing.png} +% \XiZhuRenQianMing[4em]{dengbing.png} \tigan{一、填空题（每题3分，共18分）} \begin{enumerate} @@ -37,15 +36,15 @@ \item 设 $f(x)=\arctan\dfrac1{x(x-1)^2}$, 则 $x=0$ 是 $f(x)$ 的(~~~~). \xx{可去间断点}{跳跃间断点}{第二类间断点}{连续点} \item -\begin{tikzpicture}[overlay,xshift=13cm,yshift=-3.5cm] -\draw[-Stealth,thick](-3,0)--(3,0); -\draw[-Stealth,thick](0,-1)--(0,3); -\draw[very thick,smooth,domain=-55:55] plot ({\x/50-1.3}, {tan(\x)*tan(\x)}); -\draw[very thick,smooth,domain=0.15:2] plot ({\x}, {-ln(\x)}); -\draw - (-0.3,-0.3) node {$O$} - (2.8,-0.3) node {$x$} - (-0.3,2.8) node {$y$}; +\begin{tikzpicture}[overlay,xshift=130mm,yshift=-35mm] + \draw[-Stealth,thick](-3,0)--(3,0); + \draw[-Stealth,thick](0,-1)--(0,3); + \draw[very thick,smooth,domain=-55:55] plot ({\x/50-1.3}, {tan(\x)*tan(\x)}); + \draw[very thick,smooth,domain=0.15:2] plot ({\x}, {-ln(\x)}); + \draw + (-0.3,-0.3) node {$O$} + (2.8,-0.3) node {$x$} + (-0.3,2.8) node {$y$}; \end{tikzpicture} 设 $f(x)$ 是定义在 $(-\infty,+\infty)$ 上的连续函数, 且 $f'(x)$ 的图像如下图所示, 则 $f(x)$ 有(~~~~). % 手动设置为每行1个 diff --git a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf Binary files differindex b7008d98fe..157e0a4c4f 100644 --- a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf +++ b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls index c5e4f8d925..8f9da6cf24 100644 --- a/macros/latex/contrib/photobook/photobook.cls +++ b/macros/latex/contrib/photobook/photobook.cls @@ -33,6 +33,8 @@ % to edit it directly, edit the source instead. % % +% XXC FEATURE image spread: add ability to push image sides outward to +% account for gutter.,, % XXX revise \clearcaption / \captionclearpage... % XXX unify API -- see CellContent env... % XXX make this loadable both as a class and as a package... @@ -65,14 +67,17 @@ % - \CopyrightNotice % - ... % - info +% XXX DOC add notes about external libs section: +% - textpos +% cell/cell* depend on absolute mode being set globally % % %---------------------------------------------------------------------- %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the %%% code and the generated docs... -\edef\photobook@FILEVERSION{v0.1.9} -\edef\photobook@FILEDATE{2023-03-01} +\edef\photobook@FILEVERSION{v0.1.10} +\edef\photobook@FILEDATE{2023-03-11} %% \documentclass{ltxdoc} @@ -705,6 +710,8 @@ \newlength\coverflap \setlength\coverflap{\photobook@coverflap} +\newlength\photobook@coverflap@active + %% \DescribeMacro{\jacketwrap=<len>} %% \DescribeMacro{\jacketflap=<len>} %% \DescribeMacro{\jacketflapfront=<len>} @@ -721,6 +728,11 @@ \newlength\jacketflapback \setlength\jacketflapback{\photobook@jacketflapback} +\newlength\photobook@jacketwrap@active +\newlength\photobook@jacketflap@active +\newlength\photobook@jacketflapfront@active +\newlength\photobook@jacketflapback@active + %% \DescribeMacro{\blockwidth=<len>} %% \DescribeMacro{\blockheight=<len>} % @@ -987,17 +999,28 @@ \def\pdfpagelayout{SinglePage}\fi \else \def\pdfpagelayout{\photobook@pdfpagelayout}\fi - % items to ignore in different layouts... - \ifcoverlayout\else - \setlength\coverflap{0pt}\fi - \ifjacketlayout\else - \setlength\jacketwrap{0pt} - \setlength\jacketflap{0pt}\fi - % flaps... - \ifdim\jacketflapfront=0pt - \setlength\jacketflapfront{\jacketflap}\fi - \ifdim\jacketflapback=0pt - \setlength\jacketflapback{\jacketflap}\fi + % keep user settings but respect the current layout... + \ifcoverlayout + \setlength\photobook@coverflap@active{\coverflap} + \else + \setlength\photobook@coverflap@active{0pt}\fi + \ifjacketlayout + \setlength\photobook@jacketwrap@active{\jacketwrap} + \setlength\photobook@jacketflap@active{\jacketflap} + % flaps... + \ifdim\jacketflapfront=0pt + \setlength\photobook@jacketflapfront@active{\photobook@jacketflap@active} + \else + \setlength\photobook@jacketflapfront@active{\jacketflapfront}\fi + \ifdim\jacketflapback=0pt + \setlength\photobook@jacketflapback@active{\photobook@jacketflap@active} + \else + \setlength\photobook@jacketflapback@active{\jacketflapback}\fi + \else + \setlength\photobook@jacketwrap@active{0pt} + \setlength\photobook@jacketflap@active{0pt} + \setlength\photobook@jacketflapfront@active{0pt} + \setlength\photobook@jacketflapback@active{0pt}\fi % block size... \ifdim\blockwidth=0pt % layout: block... @@ -1041,7 +1064,7 @@ \pagestyle{empty}% \setsepchar{,}% \readlist*\pagefoldpanels{% - \the\jacketflapback, + \the\photobook@jacketflapback@active, \the\jacketwrap, \the\dimexpr \coverboardgrow @@ -1053,7 +1076,7 @@ \coverboardgrow + \pageblockwidth \relax, \the\jacketwrap, - \the\jacketflapfront}% + \the\photobook@jacketflapfront@active}% \photobook@setpagefold{out} \setlength\blockwidth{ \dimexpr @@ -1062,8 +1085,8 @@ + \spinewidth + 2\spinefold + 2\jacketwrap - + \jacketflapfront - + \jacketflapback \relax}\fi + + \photobook@jacketflapfront@active + + \photobook@jacketflapback@active \relax}\fi % layout: endpaper... \ifendpaperlayout \pagestyle{empty}% @@ -1386,6 +1409,7 @@ %% packed in. %% \newenvironment{page}{% + % XXX do we need \null here??? \null% \ignorespaces% }{% @@ -1695,6 +1719,14 @@ % %% >> \begin{cell*}{<left>, <top>}{<width>}{<height>} ... \end{cell*} %% +%% |cell| and |cell*| are absolutely positioned either relative to +%% the current page or to the closest savecell. +%% +% XXX should this have an explicit absolute/relative option??? +% XXX handle textpos's absolute option internally (+arg) ??? +% - save external state +% - set internal state +% - reset bac to saved % XXX SYNTAX: place the second arg in braces... % \begin{cell*}(<left>, <top>){<width>}{<height>} %\newenvironment{cell*}[3]{% @@ -1772,6 +1804,11 @@ %% |\gsavecell{..}| is the same as |\savecell{..}| but creates a global %% cell. %% +%% Note that both |\gsavecell{..}| and |\savecell{..}| make the nested +%% |cell| and |cell*| position relative to the cell and not the page. +%% This is done by setting |\TPoptions{absolute=false}| for the cell +%% content which will also affect |textpos|'s macros. +%% % XXX can/should we make this an env??? % XXX should this be split into \newsavecell{..} and \scell{..} ??? % XXX can we use root cells inside this??? @@ -3793,15 +3830,15 @@ \newenvironment{frontcover}{% \begin{cell*}{ \bleed - + \jacketflapback - + \coverflap - + \jacketwrap + + \photobook@jacketflapback@active + + \photobook@coverflap@active + + \photobook@jacketwrap@active + \coverboardgrow + \pageblockwidth + 2\spinefold + \spinewidth, \bleed - + \coverflap }% + + \photobook@coverflap@active }% { \pageblockwidth + \coverboardgrow }% { \pageblockheight + 2\coverboardgrow }% }{% @@ -3810,11 +3847,11 @@ \newenvironment{backcover}{% \begin{cell*}{ \bleed - + \jacketflapback - + \coverflap - + \jacketwrap, + + \photobook@jacketflapback@active + + \photobook@coverflap@active + + \photobook@jacketwrap@active, \bleed - + \coverflap }% + + \photobook@coverflap@active }% { \pageblockwidth + \coverboardgrow }% { \pageblockheight + 2\coverboardgrow }% }{% @@ -3826,14 +3863,14 @@ \newenvironment{spine}{% \begin{cell*}{ \bleed - + \jacketflapback - + \coverflap - + \jacketwrap + + \photobook@jacketflapback@active + + \photobook@coverflap@active + + \photobook@jacketwrap@active + \coverboardgrow + \pageblockwidth + \spinefold, \bleed - + \coverflap }% + + \photobook@coverflap@active }% { \spinewidth }% { \pageblockheight + 2\coverboardgrow }% }{% @@ -3854,15 +3891,15 @@ \newenvironment{frontflap}{% \begin{cell*}{ \bleed - + \jacketflapback - + 2\jacketwrap + + \photobook@jacketflapback@active + + 2\photobook@jacketwrap@active + 2\coverboardgrow + 2\pageblockwidth + 2\spinefold + \spinewidth, \bleed - + \coverflap }% - { \jacketflapfront }% + + \photobook@coverflap@active }% + { \photobook@jacketflapfront@active }% { \pageblockheight + 2\coverboardgrow }% }{% \end{cell*}} @@ -3871,8 +3908,8 @@ \begin{cell*}{ \bleed, \bleed - + \coverflap }% - { \jacketflapback }% + + \photobook@coverflap@active }% + { \photobook@jacketflapback@active }% { \pageblockheight + 2\coverboardgrow }% }{% \end{cell*}} diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf Binary files differindex c10cb7eba2..64778bbbf3 100644 --- a/macros/latex/contrib/photobook/photobook.pdf +++ b/macros/latex/contrib/photobook/photobook.pdf diff --git a/macros/latex/contrib/photobook/scripts/README.md b/macros/latex/contrib/photobook/scripts/README.md new file mode 100644 index 0000000000..5970cfbb72 --- /dev/null +++ b/macros/latex/contrib/photobook/scripts/README.md @@ -0,0 +1,423 @@ + +Support scripts +=============== + +<!-- TOC depthfrom:2 --> + +- [make-spreads.sh](#make-imagessh) + - [The process](#the-process) + - [Automatic template inferenceing](#automatic-template-inferenceing) + - [Manual template selection](#manual-template-selection) + - [Template tweaking](#template-tweaking) + - [Manual spread layouts](#manual-spread-layouts) + - [Templates](#templates) + - [Image captions](#image-captions) + - [Environment variables and configuration](#environment-variables-and-configuration) +- [cls2tex.sh](#cls2texsh) + +<!-- /TOC --> + + +--- + +`make-spreads.sh` +---------------- + +Generate LaTeX block of pages from a directory tree. + +This was initially intended as a means to convert the exported directory +tree from an image viewer where image/text sequencing was done, but it +can also be used standalone. + +Goals: +- Decouple layout, sequencing, images, processing and different texts + to enable different people to work on them independently and in + parallel, +- Simplify editing the page/spread sequence, +- Automate the build process. + + +A typical project tree: +``` +book/ +├── templates/ . . . . . . . . . . . . Global templates. +│ ├── imagepage.tex . . . . . . . . . Single page image template, +│ ├── textpage.tex . . . . . . . . . Single page text template, +│ │ These are used to build spreads +│ │ when no explicit template matches. +│ ├── blank-image.tex +│ ├── image-blank.tex +│ ├── image-image.tex +│ ├── fullbleed.tex +│ └── ... +├── spreads/ . . . . . . . . . . . . . . Main block layout. +│ ├── 00/ . . . . . . . . . . . . . . A basic spread. +│ │ ├── tweaks.tex The spread template is built +│ │ └── 0-DSC02432.jpg automatically with tweaks.tex +│ │ prepended. +│ ├── 01/ +│ │ ├── 0-DSC02439.jpg +│ │ └── 1-intro.txt +│ ├── 02/ +│ │ ├── fullbleed.tpl . . . . . . . Explicitly use a global template. +│ │ └── 1-DSC02511.jpg +│ ├── 03/ +│ │ ├── 0-DSC02509-0.jpg +│ │ └── 1-DSC02506-0.jpg +│ └── ... +├── captions/ . . . . . . . . . . . . . Image captions. +│ ├── DSC02432.txt +│ ├── DSC02439.txt +│ ├── DSC02511.txt +│ └── ... +├── setup.tex . . . . . . . . . . . . . Book block setup. +│ This is included by all top level +│ .tex files like block.tex, +│ cover.tex, ...etc. +├── block.tex . . . . . . . . . . . . . Block skeletal layout. +│ This usually includes the titles, +│ technical pages and sources the +│ ./block-pages.tex. +├── block-pages.tex . . . . . . . . . . The generated block content. +├── cover.tex . . . . . . . . . . . . . Cover layout. +├── jacket.tex . . . . . . . . . . . . Dust jacket layout. +└── ... +``` + +<!-- XXX +For a live example see: ../examples/book --> + +Generate the block: +```shell +$ make-spreads.sh ./pages > block-pages.tex +``` + +Note that `make-spreads.sh` does not force a specific layout outside of +the `pages` directory, all paths are configurable. The way the root +files are structured in this example is just one way to organize a +book's source code with minimal code duplication. + + +For runtime help see: +```shell +$ make-spreads.sh --help +``` + + +### The process + +<!-- XXX spreads vs. pages --> + +The system is designed to minimize the effort in laying out pages, so +when designing a book the focus should be on global templates and on +helping `make-spreads.sh` build them rather than trying to layout each +spread individually. + +There are several ways to arrive at a book layout starting from the +concept, through the edit, sequencing, structuring and the graphic +design, we here will focus on the stage of the process where a body of +work is starting to look like a book. + +When starting work on a layout it is good to at least have a basic +understanding of the book's: +- structure and how it may change, +- core templates, +- exceptions from the above. + +In most cases all of the above will change in one way or another during +the project's lifespan, and the main goal of this stage is to make this +change as simple as possible -- it's all about providing the freedom to +make changes instead of growing work invested and thus making change +more and more expensive. + +The first question is what is the _structure_ of the book we are making? +Will it have chapters? How many? Text? how much, how should it be +structured? How are we going to deal with the title? How are we going +to present the images, full bleed, no bleeds, small, big, one per page +or multiple images, ...etc.? At this stage this is about the presentation +the flow of the work and not about the actual design. How many typical +spreads (i.e. spread templates) should it have? A good number should be +small-ish, for example 3-4 spread templates is a good number, if you +count 10+ then you might be overcomplicating tings, but note, there are +no rules, a book where each spread is individually and manually layed out +may work as well as a book with just a single template spread, but in +general for a photo book the focus is on the project and the layout +should work with it without overwhelming it. + +Have answers, good, now it's time to build those mock layouts and make +them into basic templates. + +It would be simplest to start work with the basic templates provided by +`photobook` (see: ../examples/spread templates/templates/) and rework +them when or if needed. + +The templates are split into two levels: +- Page templates + These are typical pages that makeup a spread, usually an + image page (`imagepage.tex`), a text page (`textpage.tex`), and an + optional empty page (`emptypage.tex`), `make-spreads.sh` can combine + them to build spreads automatically. +- Spread templates + These typeset a spread and can be either automatically inferred from + the structure or manually selected. + + +#### Automatic template inferencing + +If no explicit template is defined (see next section) `make-spreads.sh` +will try and infer a template based on the number of images in the +spread directory, if that is not possible the it will build a spread +from page templates based on the sequence of first two image/text files. + +For example with the default settings and the templates defined above: + +``` +├── 01/ +│ ├── 0-DSC02439.jpg +│ └── 1-intro.txt +``` + +Will use `imagepage.tex` and `textpage.tex` templates to build the spread, +while the following: + +``` +├── 03/ +│ ├── 0-DSC02509-0.jpg +│ └── 1-DSC02506-0.jpg +``` + +Will use `image-image.tex`. + +Note that if a spread template is not found `make-spreads.sh` fallback to +page templates, e.g. if we delete `image-image.tex` then `imagepage.tex` +will be used for both pages of the spread instead. + +If only one image/text file is provided then `make-spreads.sh` will set it +on the right page of the spread using the appropriate page template and +leave the left page blank. + +<!-- XXX do we need a `blankpage.tex` template??? --> + + +#### Manual template selection + +A template can be selected manually by providing a file in the form: + +```bnf +<template-name>.tpl +``` + +The content of this file is ignored and `templates/<template-name>.tex` +will be used for that spread. + +Example: +``` +├── 02/ +│ ├── fullbleed.tpl +│ └── 1-DSC02511.jpg +``` + +Here `templates/fullbleed.tex` will be used. + + +#### Template tweaking + +If the file `tweaks.tex` is present in the spread directory its contents +are included in the built block at the start of that spread. + +This can be useful to _tweak_ the spread, for example to set page/font +color, tweak image positioning in some of the `photobook`'s template +spread macros (see: tweaking section in photobook.pdf). + +Example: +``` +├── 00/ +│ ├── tweaks.tex +│ └── 0-DSC02432.jpg +``` + +Note that this can both apply to a single spread as well as a set of +spreads, of example page or text colors are not reset automatically +and will affect all subsequent spreads until manually reset (in a +different spread's `tweaks.tex` file), while `photobook`'s tweaks apply +only to a single page. + + +#### Manual spread layouts + +If `layout.tex` is present it will be included as the page layout/template. + +Any paths in the `layout.tex` should be relative to the location the +built block .tex file will be located, usually to the project root. + + +### Templates + +A template is a LaTeX file with zero or more special fields defined. + +Field types: +- `${IMAGE}` / `${IMAGE<number>}` + Filled with image path. +- `${CAPTION}` / `${CAPTION<number>}` + Filled with caption file content +- `${TEXT}` / `${TEXT<number>}` + Filled with text file content + +Each field can be used more than once, the field value will be copied to +each instance. + +Multiple fields of the same type can be provided and each will be filled +with corresponding data in order, e.g. the third image filed will get +the third image path. Note that we are talking of field order and not +field number, this removes the need to constantly keep the field/file +numbers matched when adding and removing files/fields, all one needs to +do is keep the order the same. + +If a field is not filled it will be empty in the resulting `.tex`. + +Example template `templates/fullbleed.tex`: +``` +\ImageSpreadFill{${CAPTION}}{${IMAGE0}} +``` + + +### Image captions + +In general image captions are decoupled from the main layout to enable +writers and editors to work on them externally. + +```bnf +captions/ +├── <image-name>.txt +└── ... +``` + +The captions folder name/location is controlled by the `$CAPTION_DIR` +environment variable. + + +Inline captions are also supported: +```bnf +pages/ +├── <spread>/ +│ ├── ... +│ ├── 00-<image-name>.<ext> +│ ├── 00-<image-name>.txt . . . . . . Local image caption +│ └── ... +└── ... +``` +An inline caption must have the same filename as the corresponding image +but with a .txt extension. + + +### Environment variables and configuration + +All the configuration options can be given in a configuration file as +well as environment variables. + +<!-- XXX this is not true at the moment, not sure if this is a bug or a feature... +Environment variables take precedence over the configuration file. --> + +The default `make-images.cfg` would look something like: +```shell +# if non-empty make-spreads.sh will add image paths to pdf notes... +ANOTATE_IMAGE_PATHS= + +# file extensions to treat as text (separated with "|") +TEXT_FORMATS=txt + +# file extensions to treat as images (separated with "|") +IMAGE_FORMATS=jpeg|jpg|png|pdf|svg|eps + +# default directory spread definitions are located in... +SPREADS_DIR=spreads/ + +# if non-empty link link images to matching ones from this directory... +IMAGE_HIRES_DIR= + +# directory where external captions are stored... +CAPTION_DIR=captions/ + +# root template directory... +TEMPLATE_DIR=templates/ + +# empty page template... +EMPTY_PAGE=emptypage + +# text page template... +TEXT_PAGE=textpage + +# image page template... +IMAGE_PAGE=imagepage + +# spread templates... +IMAGE_SPREAD=( + # + # +------- number of found images + # / +-- template name + # / / + [0]=text-spread + [2]=image-image +) +``` + + +--- + +`cls2tex.sh` +------------ + +Extract the documentation from photobook.cls which is used to build the +photobook.pdf reference manual. + +```shell +$ cls2tex.sh --help +``` + +The `--help` says it all: +``` +Generate docs from latex package/class + +Usage: + cls2tex.sh [OPTIONS] [[INPUT] OUTPUT] + +Options: + -h | --help Show this message and exit + -p | --prefix PREFIX + Set the doc comment PREFIX (default: "%") + -s | --strip Strip docs out + -n | --no-msg Don't add the "generated with" message to output + +This will: + - read the INPUT + - keep lines starting with \def\<module-name>@[A-Z]\+ + - keep lines starting with '%%' + - %%%%% Text -> \subsection(Text) + - %%%% Text -> \section(Text) + - %% >> code -> \begin{verbatim}code\end{verbatim} + - write the result to OUTPUT + +If no OUTPUT is given cls2tex.sh will write to stdout. If no INPUT +is given cls2tex.sh will read stdin. + +PREFIX can replace the second "%" in the above patterns to make it +possible to integrate multiple layers of documentation in one file +and to integrate them in various ways, for example, in the photobook +document class documentation "M" prefix is used to indicate +meta-command docs, this enables us to document them in the relevant +location (i.e. at the implementation) in source but move the docs to +a unified location in docs, effectively decoupling the source and doc +structure when needed. + +Strip mode is the reverse of of the default, it will strip out docs +and empty lines, keeping only the actual code and code comments. + +NOTE: stripping will not remove non-doc comments. +NOTE: the idea of keeping latex docs in a latex file is far simpler + than all the stuff crammed into .dtx, at least for my needs: + - keep the code readable + - keep the docs readable + in both the repo and in installed form, so .dtx is not used. +``` + + diff --git a/macros/latex/contrib/photobook/scripts/cls2tex.sh b/macros/latex/contrib/photobook/scripts/cls2tex.sh index 8ec15ebf45..d7e6c1013e 100755 --- a/macros/latex/contrib/photobook/scripts/cls2tex.sh +++ b/macros/latex/contrib/photobook/scripts/cls2tex.sh @@ -31,7 +31,7 @@ printhelp(){ echo " - %% >> code -> \\begin{verbatim}code\\end{verbatim}" echo " - write the result to OUTPUT" echo - echo "If no OUTPUT is given $SCRIPT_NAME will read stdout. If no INPUT" + echo "If no OUTPUT is given $SCRIPT_NAME will write to stdout. If no INPUT" echo "is given $SCRIPT_NAME will read stdin." echo echo "PREFIX can replace the second \"%\" in the above patterns to make it" @@ -132,11 +132,12 @@ if [ -z $STRIP_DOC ] ; then > "$OUTPUT" cat "$INPUT" \ | egrep '(^%'$PREFIX'|^\\edef\\'$MODULE'@[A-Z][A-Z]+)' \ - | sed 's/^\(\\edef\\\)'$MODULE'@/%'$PREFIX'\1/' \ - | sed 's/%'$PREFIX'%%%% \(.*\)/%'$PREFIX'\\subsubsection{\1}\\label{subsubsec:\1}/' \ - | sed 's/%'$PREFIX'%%% \(.*\)/%'$PREFIX'\\subsection{\1}\\label{subsec:\1}/' \ - | sed 's/%'$PREFIX'%% \(.*\)/%'$PREFIX'\\section{\1}\\label{sec:\1}/' \ - | sed 's/%'$PREFIX'\s\+>>\s\+\(.*\)/%'$PREFIX'\\begin{verbatim} \1 \\end{verbatim}/' \ + | sed \ + -e 's/^\(\\edef\\\)'$MODULE'@/%'$PREFIX'\1/' \ + -e 's/%'$PREFIX'%%%% \(.*\)/%'$PREFIX'\\subsubsection{\1}\\label{subsubsec:\1}/' \ + -e 's/%'$PREFIX'%%% \(.*\)/%'$PREFIX'\\subsection{\1}\\label{subsec:\1}/' \ + -e 's/%'$PREFIX'%% \(.*\)/%'$PREFIX'\\section{\1}\\label{sec:\1}/' \ + -e 's/%'$PREFIX'\s\+>>\s\+\(.*\)/%'$PREFIX'\\begin{verbatim} \1 \\end{verbatim}/' \ | cut -c 3- - \ >> "$OUTPUT" @@ -153,4 +154,4 @@ fi #---------------------------------------------------------------------- -# vim:set ts=4 sw=4 nowrap : +# vim:set ts=4 sw=4 nowrap : diff --git a/macros/latex/contrib/photobook/scripts/make-images.sh b/macros/latex/contrib/photobook/scripts/make-images.sh deleted file mode 100644 index bfec27d978..0000000000 --- a/macros/latex/contrib/photobook/scripts/make-images.sh +++ /dev/null @@ -1,450 +0,0 @@ -#!/bin/bash -shopt -s nullglob extglob - -#---------------------------------------------------------------------- -# -# Template structure: -# templates/ -# imagepage.tex -# textpage.tex -# ... -# $IMAGE_DIR/ -# $spread/ -# tweaks.tex -# template tweaks. -# loaded before the templates are handled. -# layout.tex -# manual layout of spread. -# if given rest of directory contents are -# ignored. -# fields: -# ${IMAGE0} -# ${CAPTION0} -# ${IMAGE1} -# ${CAPTION1} -# NOTE: if images are included, hi-res source -# substitution is not done here. -# <spread-template-name>.tpl -# indicates the spread template to use. -# if given the rest of the .tex files in -# directory are ignored. -# resolves to: -# templates/<spread-template-name>.tex -# fields: -# ${IMAGE0} -# ${CAPTION0} -# ${IMAGE1} -# ${CAPTION1} -# imagepage.tex -# image page template. -# fields: -# ${IMAGE} -# ${CAPTION} -# textpage.tex -# text page template. -# fields: -# ${TEXT} -# <spread-template-name>-imagepage.tpl -# <spread-template-name>-textpage.tpl -# indicates the image/text page template to use. -# ignored if explicit templates are given. -# image fields: -# ${IMAGE} -# ${CAPTION} -# text fields: -# ${TEXT} -# 00-<image>.png -# image. -# if $IMAGE_HIRES_DIR is set then this will -# resolve to: -# $IMAGE_HIRES_DIR/<image> -# XXX hi-res substitution currently disabled. -# 01-<text>.txt -# text. -# ... -# ... -# -# -# -# Env variables: -# IMAGE_HIRES_DIR=<path> -# sets the path to which the hi-res images are resolved. -# -# -# -# -# XXX TODO: -# - revise printed comments... -# - add real arg handling... -# - add abbility to apply template to a specific page in spread... -# ...something like: -# <template-name>-left.tpl -# <template-name>-right.tpl -# - add multiple images/captions... -# -# -# -#---------------------------------------------------------------------- - -# defaults... - -CFG_FILE=`basename $0`.cfg - -TEMPLATE_PATH=templates/ - -IMAGE_DIR=pages/ - -#IMAGE_HIRES_DIR= - - -# Default timplates -#SINGLE_IMAGE=blank-image -SINGLE_IMAGE=imagebleedleft -DOUBLE_IMAGE=image-image - - -# load config... -[ -e $CFG_FILE ] && source $CFG_FILE - - - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -printhelp(){ - echo "Usage: `basename $0` [ARGUMENTS] [PATH]" - echo " `basename $0` [ARGUMENTS] PATH FROM [COUNT]" - echo - echo "Generate LaTeX layout from directory structure." - echo - echo "Arguments:" - echo " -h --help - print this help and exit." - echo " --templates=PATH" - echo " - path to search for templates (default: $TEMPLATE_PATH)." - echo " --single-image-tpl=NAME" - echo " - single image default template (default: $SINGLE_IMAGE)." - echo " --double-image-tpl=NAME" - echo " - double image default template (default: $DOUBLE_IMAGE)." - echo - echo "Parameters:" - echo " PATH - path to root pages directory (default: $IMAGE_DIR)" - echo " FROM - spread to start from (default: 0)" - echo " COUNT - number of spreads to generate (default: 1)" - echo - echo "Environment:" - echo " \$IMAGE_HIRES_DIR " - echo " - source directory for replacement hi-res images." - echo " \$ANOTATE_IMAGE_PATHS " - echo " - if true add image paths in anotations." - echo - echo "Configuration defaults can be stored in a config file: $CFG_FILE" - echo - echo "NOTE: COUNT is relevant iff FROM is given, otherwise all available " - echo " spreads are generated." - echo - echo "Examples:" - echo " $ `basename $0` ./pages > pages.tex" - echo " - generate a layout fron the contents of ./pages" - echo - echo " $ IMAGE_HIRES_DIR=images/hi-res `basename $0` ./pages" - echo " - generate a layout fron the contents of ./pages and " - echo " replaceing local images with images in ./images/hi-res" - echo -} - - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# handle arguments... - -while true ; do - case $1 in - -h|--help) - printhelp - exit - ;; - - --templates) - TEMPLATE_PATH=$2 - shift - shift - ;; - --single-image-tpl) - SINGLE_IMAGE=$2 - shift - shift - ;; - --double-image-tpl) - DOUBLE_IMAGE=$2 - shift - shift - ;; - - # handle unknown options... - -*|--*) - echo "Error: unknown option \"$1\"" - exit - ;; - - *) - break - ;; - esac -done - - -if [ -z $1 ] ; then - IMAGE_DIR=pages/ -else - IMAGE_DIR=$1/ -fi - - -# calculate spread index range... -# XXX add support for negative indexing... -FROM=$2 -COUNT=$( [ -z $3 ] && echo 1 || echo $3 ) -STOP=$(( FROM + COUNT )) - - - -#---------------------------------------------------------------------- - -# XXX should we report images w/o captions??? -getCaption(){ - local C=`basename "${1%.*}"` - #C="${C/[0-9]-}" - C="captions/${C}.txt" - - if [ -e "${C}" ] ; then - C=`cat "${C}" | sed 's/\\\/\\\\\\\/g'` - else - C="" - fi - - echo ${C[*]} -} - -getTemplate(){ - local SPREAD=$1 - local TYPE=$2 - local TEMPLATE=($SPREAD/*-$TYPE.tex) - if [ -z $TEMPLATE ] ; then - TEMPLATE=($SPREAD/*-$TYPE.tpl) - if ! [ -z $TEMPLATE ] ; then - TEMPLATE=${TEMPLATE/$SPREAD\//} - TEMPLATE=${TEMPLATE/[0-9]-/} - TEMPLATE="$TEMPLATE_PATH/${TEMPLATE[0]%-${TYPE}.*}.tex" - fi - fi - if [ -z $TEMPLATE ] ; then - TEMPLATE="$TEMPLATE_PATH/${TYPE}.tex" - fi - echo $TEMPLATE -} - -anotatePath(){ - if [ -z "$1" ] || [ -z "$ANOTATE_IMAGE_PATHS" ] ; then - return - fi - path=$(basename ${1%.*}) - # NOTE: did not figure out how to make a verbatim comment in latex - # so here we are, doing it in shell... - path=${path//_/\\_} - #echo "\\pdfmargincomment{Image: $path}%" - echo "\\pdfcommentcell{Image: $path}%" -} - - -#---------------------------------------------------------------------- - - -echo %---------------------------------------------------------------------- -echo % -echo % WARNING: This file is auto-generated by make-images.sh and will be -echo "% overwritten on next run..." -echo % -echo "% Image source (preview): \"$IMAGE_DIR\"" -echo "% Image source (hi-res): \"$IMAGE_HIRES_DIR\"" -echo % -echo %---------------------------------------------------------------------- -echo % -#echo % set image source directory... -#echo "\\graphicspath{{${IMAGE_DIR}}}" -#echo % -#echo %---------------------------------------------------------------------- -#echo % -# -#cd ${IMAGE_DIR} - -l=$(ls "$IMAGE_DIR/" | wc -l) -c=0 - -for spread in "${IMAGE_DIR}"/* ; do - # skip non-spreads... - if ! [ -d "$spread" ] ; then - continue - fi - - c=$(( c + 1 )) - - # if $FROM is given print only stuff in range... - [ -z $FROM ] \ - || if (( $(( c - 1 )) < $FROM )) || (( $c > $STOP )) ; then - continue - fi - - # if we are building only a specific spread... - ##if ! [ -z $SPREAD ] && [[ "$spread" != "$IMAGE_DIR/$SPREAD" ]]; then - ## continue - ##fi - - if ! [ -z $SKIP_FIRST ] ; then - echo % - echo % - echo % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fi - SKIP_FIRST=1 - # skip temporarily disabled... - if [ -z ${spread/-*/} ] ; then - echo "% spread: ${spread/-/}: skipped..." | tee >(cat >&2) - echo % - continue - else - printf "Spread ($c/$l): ${spread/-/} \r" >&2 - echo "% spread: ${spread/-/}" - fi - - - # auto layout / templates... - # NOTE: to use a specific template just `touch <template-name>.tpl` - # in the spread directory... - - # layout tweaks... - tweaks=($spread/*tweak.tex) - if ! [ -z ${tweaks} ] ; then - echo "% tweaks: ${tweaks[0]}" - cat ${tweaks[0]} - fi - - - # NOTE: we also get *.txt files here... - items=($spread/*.!(tex|tpl|bak)) - - # get hi-res image paths... - if ! [ -z $IMAGE_HIRES_DIR ] ; then - C=0 - for img in "${items[@]}" ; do - # skip non-images... - if [[ "$img" == "${img/.txt/}" ]] ; then - #new="../$IMAGE_HIRES_DIR/`basename ${img/[0-9]-/}`" - new="$IMAGE_HIRES_DIR/`basename ${img/[0-9]-/}`" - # ignore file ext for availability test... - # NOTE: the first match may be an unsupported format... - new="${new%.*}" - new=($new.*) - if [ -e "${new[0]}" ] ; then - items[$C]=${new[0]} - else - echo % - echo "% WARNING: hi-res image not found for: \"${img}\" -> \"${new}\"" | tee >(cat >&2) - echo % - fi - fi - C=$(( C + 1 )) - done - fi - - - # manual layout... - layout=($spread/*layout.tex) - if ! [ -z $layout ] ; then - TEMPLATE=${layout[0]} - - # templates and partial templates... - else - # spread template... - TEMPLATE=($spread/*.tpl) - # skip page template refs: *-imagepage.tpl / *-textpage.tpl - # XXX this will also eat 0-imagepage.tpl / 20-textpage.tpl -- do a better pattern... - if ! [ -z $TEMPLATE ] ; then - TEMPLATE=(`ls "$spread/"*.tpl | egrep -v '.*-(imagepage|textpage)\.tpl'`) - fi - # no template explicitly defined -> match auto-template... - AUTO= - if [ -z $layout ] && [ -z $TEMPLATE ] ; then - AUTO=" (auto)" - if [ ${#items[@]} == 1 ] ; then - TEMPLATE=$SINGLE_IMAGE - - # multiple items... - else - C=0 - for img in "${items[@]}" ; do - C=$(( C + 1 )) - P=`[ $C == 1 ] && echo "left" || echo "right"` - - # image... - if [ "${img/.txt/}" == "${img}" ] ; then - echo % - echo "% $P page (image)..." - TEMPLATE=`getTemplate "$spread" "imagepage"` - echo % page template: $TEMPLATE - anotatePath "${img}" - CAPTION=`getCaption "${img}"` - cat "${TEMPLATE}" \ - | sed "s%\${IMAGE0\?}%${img%.*}%" \ - | sed "s%\${CAPTION0\?}%${CAPTION}%" - - # text... - else - echo % - echo "% $P page (text)..." - TEMPLATE=`getTemplate "$spread" "textpage"` - echo % page template: $TEMPLATE - cat "${TEMPLATE}" \ - | sed "s%\${TEXT}%${img}%" - fi - - # reset for next page... - TEMPLATE= - # only two pages at a time... - [ $C == 2 ] && break - done - fi - fi - # formatting done... - [ -z $TEMPLATE ] && continue - - # format... - TEMPLATE=${TEMPLATE/$spread\//} - TEMPLATE=${TEMPLATE/[0-9]-/} - # get... - TEMPLATE="$TEMPLATE_PATH/${TEMPLATE[0]%.*}.tex" - fi - - # captions... - CAPTION0=`getCaption "${items[0]}"` - CAPTION1=`getCaption "${items[1]}"` - - echo "% template: (template${AUTO}: $TEMPLATE)" - anotatePath "${items[0]}" - - # fill the template... - cat "${TEMPLATE}" \ - | sed "s%\${IMAGE0\?}%${items[0]%.*}%" \ - | sed "s%\${CAPTION0\?}%${CAPTION0}%" \ - | sed "s%\${IMAGE1}%${items[1]%.*}%" \ - | sed "s%\${CAPTION1}%${CAPTION1}%" -done - -echo % -echo % -echo % -echo %---------------------------------------------------------------------- -echo - -echo "Spread created: $c of $l " >&2 - - - -#---------------------------------------------------------------------- -# vim:set ts=4 sw=4 : diff --git a/macros/latex/contrib/photobook/scripts/make-spreads.sh b/macros/latex/contrib/photobook/scripts/make-spreads.sh new file mode 100644 index 0000000000..57be2ff448 --- /dev/null +++ b/macros/latex/contrib/photobook/scripts/make-spreads.sh @@ -0,0 +1,756 @@ +#!/bin/bash +shopt -s nullglob extglob + +#---------------------------------------------------------------------- +# +# TIP: It is better to think of a visual book as a set of spreads +# rather than a set of pages, hence the focus on spreads in the +# code below. +# The main unit of a "visual" book is a spread, it's the thing +# you see when you hold the book open, and the main workflow +# when building a book is creating spreads and ordering them so +# a single page is almost never treated as an independent unit. +# TIP: it is not recommended to use too many templates, the layout +# should be and feel structured and this structure should not be +# too complex for the average reader to get comfortable in. +# +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# Template structure: +# templates/ +# spread.tex +# imagepage.tex +# textpage.tex +# ... +# captions/ +# <image>.txt +# image caption. +# this is separated to decouple caption writing from the +# changes to the layout/sequencing and this drastically +# simplify the work with writers. +# For this reason this takes priority over local captions (XXX revise). +# ... +# $SPREADS_DIR/ +# $spread/ +# tweaks.tex +# template tweaks. +# loaded before the templates are handled. +# layout.tex +# manual layout of spread. +# if given rest of directory contents are +# ignored. +# fields: +# ${IMAGE0} +# replaced with image path +# ${CAPTION0} +# replaced with content of caption file if found +# and empty otherwise. +# ${TEXT0} +# replaced with the content of a text file if +# found and empty otherwise. +# ... +# NOTE: if images are included, hi-res source +# substitution is not done here. +# NOTE: fields are ordered and matched according to their +# position and not their number, e.g. in the following +# sequence: +# IMAGE, IMAGE10, IMAGE20, .., +# CAPTION2, CAPTION7, CAPTION12, .. +# IMAGE10 will be filled with the second found image +# and CAPTION7 will be filled with the second found +# caption. +# <spread-template-name>.tpl +# indicates the spread template to use. +# if given the rest of the .tex files in +# directory are ignored. +# resolves to: +# templates/<spread-template-name>.tex +# fields: +# ${IMAGE0} +# ${CAPTION0} +# ${TEXT0} +# ... +# imagepage.tex +# image page template. +# fields: +# ${IMAGE} +# ${CAPTION} +# ${TEXT0} +# ... +# textpage.tex +# text page template. +# fields: +# ${TEXT} +# ... +# <spread-template-name>-imagepage.tpl +# <spread-template-name>-textpage.tpl +# indicates the image/text page template to use. +# ignored if explicit templates are given. +# fields: +# ${IMAGE} +# ${CAPTION} +# ${TEXT} +# ... +# 00-<image>.png +# image. +# if $IMAGE_HIRES_DIR is set then this will +# resolve to: +# $IMAGE_HIRES_DIR/<image> +# supported formats: +# .jpeg, .png, .pdf, .svg, .eps +# (see $IMAGE_FORMATS) +# 00-<image>.txt +# local image caption text. +# NOTE: this must be named the same as the image. +# 01-<text>.txt +# text. +# ... +# ... +# +# +# Env variables: +# ANOTATE_IMAGE_PATHS= +# TEXT_FORMATS=<ext>|.. +# IMAGE_FORMATS=<ext>|.. +# SPREADS_DIR=<path> +# IMAGE_HIRES_DIR=<path> +# sets the path to which the hi-res images are resolved. +# CAPTION_DIR=<path> +# TEMPLATE_DIR=<path> +# EMPTY_PAGE=<name> +# TEXT_PAGE=<name> +# IMAGE_PAGE=<name> +# IMAGE_SPREAD=<array> +# +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# XXX +# +# +# +#---------------------------------------------------------------------- + +# load config... +CONFIG=${CONFIG:=$(basename ${0%.*}).cfg} +[ -e $CONFIG ] \ + && source "$CONFIG" + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# defaults... +# NOTE: all of these options can be either set in the $CONFIG file or +# set in the script env. +# NOTE: env takes priority over $CONFIG + +# if set add pdf annotations of paths to each image... +ANOTATE_IMAGE_PATHS=${ANOTATE_IMAGE_PATHS:=} + +# supported formats/extensions... +TEXT_FORMATS=${TEXT_FORMATS:=txt} +IMAGE_FORMATS=${IMAGE_FORMATS:=jpeg|jpg|png|pdf|svg|eps} + +SPREADS_DIR=${SPREADS_DIR:=spreads/} +IMAGE_HIRES_DIR=${IMAGE_HIRES_DIR:=} +CAPTION_DIR=${CAPTION_DIR:=captions/} +TEMPLATE_DIR=${TEMPLATE_DIR:=templates/} + +# Default templates +# NOTE: if a template is not found we will try and build a spread from +# page components... + +# page templates... +EMPTY_PAGE=${EMPTY_PAGE:=emptypage} +TEXT_PAGE=${TEXT_PAGE:=textpage} +IMAGE_PAGE=${IMAGE_PAGE:=imagepage} + +# dynamic spread templates... +# NOTE: the index here corresponds to the number of images found in a +# spread directory... +if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then + IMAGE_SPREAD=( + [0]=text-spread + [2]=image-image + ) +fi + + + +#---------------------------------------------------------------------- + +printhelp(){ + echo "Usage: `basename $0` [ARGUMENTS] [PATH]" + echo " `basename $0` [ARGUMENTS] PATH INDEX" + echo " `basename $0` [ARGUMENTS] PATH FROM COUNT" + echo + echo "Generate LaTeX layout from directory structure." + echo + echo "Arguments:" + echo " -h --help - print this help and exit." + echo " -a --annotate" + echo " - add annotations with image paths to pages." + echo " --templates=PATH" + echo " - path to search for templates (default: $TEMPLATE_DIR)." + echo " --single-image-tpl=NAME" + echo " - single image default template (default: ${IMAGE_SPREAD[1]})." + echo " --double-image-tpl=NAME" + echo " - double image default template (default: ${IMAGE_SPREAD[2]})." + echo " --text-spread-tpl=NAME" + echo " - text spread default template (default: ${IMAGE_SPREAD[0]})." + echo " --captions=PATH" + echo " - path to search for captions (default: $CAPTION_DIR)." + echo + echo "Parameters:" + echo " PATH - path to root pages directory (default: $SPREADS_DIR)" + echo " INDEX - index of spread to generate" + echo " FROM - spread to start from" + echo " COUNT - number of spreads to generate" + echo + echo "Environment:" + echo " \$IMAGE_HIRES_DIR " + echo " - source directory for replacement hi-res images." + echo " \$ANOTATE_IMAGE_PATHS " + echo " - if true add image paths in anotations." + echo " \$CONFIG - sets the config file name (default: $CONFIG)" + echo " \$TEXT_FORMATS " + echo " - list of file extensions treated as text (default: $TEXT_FORMATS)." + echo " \$IMAGE_FORMATS " + echo " - list of file extensions treated as images" + echo " (default: $IMAGE_FORMATS)." + echo + echo "Configuration defaults can be stored in a config file: $CONFIG" + echo + echo "NOTE: COUNT is relevant iff FROM is given, otherwise all available " + echo " spreads are generated." + echo + echo "Examples:" + echo " $ `basename $0` ./pages > pages.tex" + echo " - generate a layout fron the contents of ./pages" + echo + echo " $ IMAGE_HIRES_DIR=images/hi-res `basename $0` ./pages" + echo " - generate a layout fron the contents of ./pages and " + echo " replaceing local images with images in ./images/hi-res" + echo +} + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# handle arguments... + +while true ; do + case $1 in + -h|--help) + printhelp + exit + ;; + -a|--annotate) + ANOTATE_IMAGE_PATHS=1 + shift + ;; + + --templates) + TEMPLATE_DIR=$2 + shift + shift + ;; + --single-image-tpl) + IMAGE_SPREAD[1]=$2 + shift + shift + ;; + --double-image-tpl) + IMAGE_SPREAD[2]=$2 + shift + shift + ;; + --text-spread-tpl) + IMAGE_SPREAD[0]=$2 + shift + shift + ;; + --captions) + CAPTION_DIR=$2 + shift + shift + ;; + + # handle unknown options... + -*|--*) + echo "Error: unknown option \"$1\"" + exit + ;; + + *) + break + ;; + esac +done + + +if [ -z $1 ] ; then + SPREADS_DIR=pages/ +else + SPREADS_DIR=$1/ +fi + + +# calculate spread index range... +# XXX add support for negative indexing... +FROM=$2 +COUNT=$( [ -z $3 ] && echo 1 || echo $3 ) +STOP=$(( FROM + COUNT )) + + +# prep format regexps... +TEXT_FORMATS='.*\.('$TEXT_FORMATS')$' +IMAGE_FORMATS='.*\.('$IMAGE_FORMATS')$' + + + +#---------------------------------------------------------------------- + +# Get image caption... +# usage: +# getCaption SPREAD IMAGE +getCaption(){ + local spread=$1 + local name=`basename "${2%.*}"` + + local captions=( + "$CAPTION_DIR/${name}.txt" + "${spread}/${name}.txt" + ) + + local caption + for caption in "${captions[@]}" ; do + if [ -e "${caption}" ] ; then + echo ${caption} + return + fi + done +} + + +# Read/print caption text... +# usage: +# readCaption PATH +readCaption(){ + [ -z "$1" ] \ + && return 1 + cat "$1" \ + | sed -e 's/\\/\\\\\\/g' +} + + +# Get template... +# usage: +# getTemplate SPREAD TYPE +# +getTemplate(){ + local SPREAD=$1 + local TYPE=$2 + local TEMPLATE=($SPREAD/*-$TYPE.tex) + if [ -z $TEMPLATE ] ; then + TEMPLATE=($SPREAD/*-$TYPE.tpl) + if ! [ -z $TEMPLATE ] ; then + TEMPLATE=${TEMPLATE/$SPREAD\//} + TEMPLATE=${TEMPLATE/[0-9]-/} + TEMPLATE="$TEMPLATE_DIR/${TEMPLATE[0]%-${TYPE}.*}.tex" + fi + fi + if [ -z $TEMPLATE ] ; then + TEMPLATE="$TEMPLATE_DIR/${TYPE}.tex" + fi + if ! [ -e $TEMPLATE ] ; then + return + fi + echo $TEMPLATE +} + + +# Get template slots (cached)... +# usage: +# templateSlots TEMPLATE +declare -A TEMPLATE_INDEX +templateSlots(){ + # cache the vars... + #if [ ${TEMPLATE_INDEX[$1]+_} ] ; then + if [ -z ${TEMPLATE_INDEX[$1]} ] ; then + TEMPLATE_INDEX[$1]=$(cat "$1" \ + | grep -o '\${[A-Z0-9_]\+}' \ + | sed 's/\${\(.*\)}/\1/g' \ + | sort -V) + fi + echo ${TEMPLATE_INDEX[$1]} +} + + +# Populate template image/text slots +# usage: +# populateTemplate SPREAD TEMPLATE ITEMS... +# +populateTemplate(){ + local spread="$1" + local tpl="$2" + [ -e "$tpl" ] \ + || return 1 + local slots=( $(templateSlots "${tpl}") ) + local text=$(cat "${tpl}") + + # items/img/txt... + shift 2 + local items=("$@") + if [ ${#items[@]} = 0 ] ; then + items=( $spread/* ) + fi + local img=() + local txt=() + local elem + for elem in "${items[@]}" ; do + if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then + img+=("$elem") + elif [[ "$elem" =~ $TEXT_FORMATS ]] ; then + txt+=("$elem") + fi + done + + local var + local val + local index=() + local captions=() + local name + # pass 1: images... + # NOTE: we are doing this in three passes as caption and image slots + # can be included in the template in any order but the captions + # need all the images to be fully populated/indexed (passes 1 + # and 2), and text is done as a separate pass to prevent it + # from competing with captions. + local i=0 + for var in ${slots[@]} ; do + name=${var//[0-9]/} + if ! [ ${name} = "IMAGE" ] ; then + continue + fi + + val=${img[$i]} + # index images for caption retrieval... + index[${var/$name/}]="$val" + # warn if no image found for slot... + if [ -z ${val} ] ; then + echo % + { + echo "% WARNING: image #${i} requested but not found" + echo "% in: ${tpl}" + echo "% by: ${spread}" + } | tee >(cat >&2) + echo % + fi + i=$(( i + 1 )) + + val=${val//\//\\/} + text=$(echo -e "${text}" | \ + sed "s/\${${var}}/${val%.*}/g") + done + + # pass 2: captions... + for var in ${slots[@]} ; do + name=${var//[0-9]/} + if ! [ ${name} = "CAPTION" ] ; then + continue + fi + + # get global caption... + val=$(getCaption "$spread" "${index[${var/$name/}]}" "${txt[@]}") + + if [ -n "${val}" ] ; then + # clear the used texts... (XXX test) + for i in "${!txt[@]}" ; do + [ "$val" = "${txt[$i]}" ] \ + && unset "txt[$i]" + done + val=$(readCaption "${val}") + fi + + text=$(echo -e "${text}" | \ + sed "s/\${${var}}/${val}/g") + done + + # pass 3: texts... + for var in ${slots[@]} ; do + name=${var//[0-9]/} + if [ ${name} = "CAPTION" ] || [ ${name} = "IMAGE" ] ; then + continue + fi + + val= + for i in ${!txt[@]} ; do + # NOTE: we do not care as much if not text is found... + val=${txt[$i]} + unset "txt[$i]" + # we only need the first text... + break + done + + val=${val//\//\\/} + text=$(echo -e "${text}" | \ + sed "s/\${${var}}/${val}/g") + done + + # print out the filled template... + echo % template: $tpl + echo -e "${text}" + return 0 +} + + +# Handle/print spread... +# usage: +# handleSpread SPREAD +# +# closure: $IMAGE_HIRES_DIR, $IMAGE_SPREAD +handleSpread(){ + local spread="$1" + # skip non-spreads... + [ -d "$spread" ] \ + || return 1 + + # auto layout / templates... + # NOTE: to use a specific template just `touch <template-name>.tpl` + # in the spread directory... + + # layout tweaks... + local tweaks=($spread/*tweak.tex) + if ! [ -z ${tweaks} ] ; then + echo "% tweaks: ${tweaks[0]}" + cat ${tweaks[0]} + fi + + # collect images and text... + # NOTE: we are filling these manually to support configurable + # image/text patterns... + local img=() + local txt=() + local items=() + for elem in "$spread"/* ; do + if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then + img+=("$elem") + items+=("$elem") + elif [[ "$elem" =~ $TEXT_FORMATS ]] ; then + txt+=("$elem") + items+=("$elem") + fi + done + + # get hi-res image paths... + if ! [ -z $IMAGE_HIRES_DIR ] ; then + local C=0 + for image in "${img[@]}" ; do + # skip non-images... + local new="$IMAGE_HIRES_DIR/`basename ${image/[0-9]-/}`" + # ignore file ext for availability test... + # NOTE: the first match may be an unsupported format... + new="${new%.*}" + new=($new.*) + if [ -e "${new[0]}" ] ; then + img[$C]=${new[0]} + else + echo % + echo "% WARNING: hi-res image not found for: \"${image}\" -> \"${new}\"" \ + | tee >(cat >&2) + echo % + fi + C=$(( C + 1 )) + done + fi + + # manual layout... + local template + local layout=( $spread/*layout.tex ) + if ! [ -z $layout ] ; then + template=${layout[0]} + + # templates and partial templates... + else + local template=( $spread/*.tpl ) + # skip page template refs: *-imagepage.tpl / *-textpage.tpl + # XXX this will also eat 0-imagepage.tpl / 20-textpage.tpl -- do a better pattern... + if ! [ -z $template ] ; then + template=(`ls "$spread/"*.tpl \ + | egrep -v '.*-('${IMAGE_PAGE}'|'${TEXT_PAGE}')\.tpl'`) + fi + # no template explicitly defined -> match auto-template... + if [ -z $layout ] && [ -z $template ] ; then + # N images... + if [ -z $template ] && [ -n "${IMAGE_SPREAD[${#img[@]}]}" ] ; then + template=$(getTemplate "$spread" "${IMAGE_SPREAD[${#img[@]}]}") + fi + # build spread from pages... + if [ -z $template ] ; then + local C=0 + local P + local elem + # only one page in spread... + # NOTE since the right page is more important we prioritize + # it over the left page, placing the blank left... + if [ ${#items[@]} = 1 ] ; then + C=1 + echo "%" + echo "% empty page..." + template=$(getTemplate "$spread" "$EMPTY_PAGE") + if [ -z "$teplate" ] ; then + echo "\\null" + echo "\\newpage" + else + cat "${template}" + fi + fi + for elem in "${items[@]}" ; do + C=$(( C + 1 )) + P=$([ $C == 1 ] \ + && echo "left" \ + || echo "right") + + # XXX need to use populateTemplate here... + # ...to do this need to somehow remove the used + # slots/files from list... + + # image... + if [[ "$elem" =~ $IMAGE_FORMATS ]] ; then + echo % + echo "% $P page (image)..." + template=`getTemplate "$spread" "$IMAGE_PAGE"` + echo % template: $template + anotatePath "${elem}" + local caption=$(getCaption "$spread" "${elem}") + caption=$(readCaption "$caption") + cat "${template}" \ + | sed -e "s%\${IMAGE0\?}%${elem%.*}%" \ + -e "s%\${CAPTION0\?}%${caption}%" + # text... + else + echo % + echo "% $P page (text)..." + template=$(getTemplate "$spread" "$TEXT_PAGE") + echo % template: $template + cat "${template}" \ + | sed "s%\${TEXT}%${elem}%" + fi + # reset for next page... + template= + # ignore the rest of the items when we are done + # creating two pages... + [ $C == 2 ] \ + && return 0 + done + fi + fi + # formatting done... + [ -z $template ] \ + && return 0 + + # format template path... + template=${template/$spread\//} + template=${template/[0-9]-/} + # get... + template="${template[0]%.*}.tex" + if ! [ -e "$template" ] ; then + template="$TEMPLATE_DIR/${template[0]%.*}.tex" + fi + fi + + populateTemplate "$spread" "$template" "${img[@]}" "${txt[@]}" + + return 0 +} + + +# Add pdf notes with image path used in template +# usage: +# anotatePath PATH +# +anotatePath(){ + if [ -z "$1" ] || [ -z "$ANOTATE_IMAGE_PATHS" ] ; then + return + fi + path=$(basename ${1%.*}) + # NOTE: did not figure out how to make a verbatim comment in latex + # so here we are, doing it in shell... + path=${path//_/\\_} + #echo "\\pdfmargincomment{Image: $path}%" + echo "\\pdfcommentcell{Image: $path}%" +} + + + +#---------------------------------------------------------------------- +# generate the template... + +echo %---------------------------------------------------------------------- +echo % +echo % WARNING: This file is auto-generated by make-spreads.sh and will be +echo "% overwritten on next run..." +echo % +echo "% Image source (preview): \"$SPREADS_DIR\"" +echo "% Image source (hi-res): \"$IMAGE_HIRES_DIR\"" +echo % +echo %---------------------------------------------------------------------- +echo % + +l=$(ls "$SPREADS_DIR/" | wc -l) +c=0 +d=0 +SPREADS=("$(ls "${SPREADS_DIR}" | sort -n)") +for spread in ${SPREADS[@]} ; do + spread="${SPREADS_DIR}/${spread}" + + # skip non-spreads... + if ! [ -d "$spread" ] ; then + l=$(( l - 1 )) + continue + # skip temporarily disabled... + elif [[ "${spread}" =~ [\\\/]-.*$ ]] ; then + SKIP_FIRST=1 + echo "% spread: ${spread}: skipped..." | tee >(cat >&2) + continue + fi + + c=$(( c + 1 )) + + # if $FROM is given print only stuff in range... + [ -z $FROM ] \ + || if (( $(( c - 1 )) < $FROM )) || (( $c > $STOP )) ; then + continue + fi + + # if we are building only a specific spread... + ##if ! [ -z $SPREAD ] && [[ "$spread" != "$SPREADS_DIR/$SPREAD" ]]; then + ## continue + ##fi + + if ! [ -z $SKIP_FIRST ] ; then + echo % + echo % + echo % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fi + SKIP_FIRST=1 + + printf "Spread ($c/$l): ${spread} \r" >&2 + echo "% spread: ${spread}" + handleSpread "$spread" + + d=$(( d + 1 )) +done + +echo % +echo % +echo % +echo %---------------------------------------------------------------------- +echo + +echo "Spread created: $d of $l " >&2 + + + +#---------------------------------------------------------------------- +# vim:set ts=4 sw=4 nowrap : diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index f172361dba..474e3c98d6 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,10 @@ +2023-03-10 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (xr.4ht, xr-hyper.4ht, cleveref.4ht): fixed clash + between Cleveref and Xr. + https://github.com/michal-h21/make4ht/issues/113 + https://tex.stackexchange.com/q/678730/2891 + 2023-03-07 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (physics.4ht): fixed MathML issues with the Physics diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 4d36f3a472..ffc1469088 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1304 2023-03-07 12:50:09Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1305 2023-03-10 16:01:24Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -3631,7 +3631,7 @@ definitions. \<cleveref.4ht\><<< % cleveref.4ht (|version), generated from |jobname.tex -% Copyright 2018-2022 TeX Users Group +% Copyright 2018-2023 TeX Users Group |<TeX4ht license text|> |<cleveref refstepcounter|> @@ -3692,6 +3692,7 @@ Support for links from the \Verb|\cref| command. \fi \def\:tempa#1#2{\bgroup% \def\rEfLiNK##1##2{\Link{##1}{}}% + \def\XRrEfLiNK[##1]##2##3{\Link[##1]{##2}{}}% handle links from Xr and Xr-hyper \expandafter\expandafter\expandafter\@firstoffive\csname r@#2\endcsname{}{}{}{}{}% \cref@getlabel{#2}{\@templabel}% #1{\@templabel}{}{}% @@ -3845,7 +3846,7 @@ before \''\begin{document}'. \<xr.4ht\><<< % xr.4ht (|version), generated from |jobname.tex -% Copyright |CopyYear.1997. Eitan M. Gurari +% Copyright 1997-2023 TeX Users Group |<TeX4ht copywrite|> |<fix xr|> |<fix xr-nonhyper|> @@ -3933,11 +3934,17 @@ For xref file \`'-'. The if acts on \`')F1F-' to get the file name. Where the \`'x' got into the picture? Did \''\aXrefFile' introduced it? where? +We must also test for references with the @cref suffix - these are automatically +created by Cleveref and contain meta info about reference types. + \<xr newlabel\><<< -\expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}% +\regex_match:nnTF{@cref}{#2}% we must handle cleveref meta references +{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{#3}}% +{\expandafter\xdef\csname r@\XR@prefix#2\endcsname{\XR:rEfLiNK #3}}% >>> \<fix xr\><<< +\ExplSyntaxOn \long\def\XR@test#1#2#3#4\XR@{% \ifx#1\newlabel |<xr newlabel|>% @@ -3946,6 +3953,7 @@ got into the picture? Did \''\aXrefFile' introduced it? where? \fi\fi \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} +\ExplSyntaxOff >>> %%%%%%%%%%%%%%%%%%%%% @@ -3954,7 +3962,7 @@ got into the picture? Did \''\aXrefFile' introduced it? where? \<xr-hyper.4ht\><<< % xr-hyper.4ht (|version), generated from |jobname.tex -% Copyright |CopyYear.2003. Eitan M. Gurari +% Copyright 2003-2023 TeX Users Group |<TeX4ht copywrite|> |<fix xr|> |<fix xr-hyper|> diff --git a/support/adobemapping/README b/support/adobemapping/README index d375593f0a..0b596c1569 100644 --- a/support/adobemapping/README +++ b/support/adobemapping/README @@ -3,8 +3,11 @@ This directory contains the CMap and PDF Mapping resources distributed by Adobe, excluding the ones which are deprecated. -This bundle was uploaded to CTAN by Hironobu Yamashita on 2023-01-19, -based on cmap-resources 20230118 and mapping-resources-pdf 20230118. +This bundle was uploaded to CTAN by Hironobu Yamashita on 2023-03-11, +based on cmap-resources 20190730 and mapping-resources-pdf 20190401. +The latest upstream releases (both 20230118) have some issues when +combined with current TL programs (notably dvipdfmx), so we include +the older versions. If questions about this redistribution, email tex-live@tug.org. If questions or suggestions relating to the actual content of the files, see: diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H index 11b725a80d..f8a14d10a8 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS-UTF16-H) %%Title: (UniJIS-UTF16-H Adobe Japan1 7) -%%Version: 1.027 +%%Version: 1.026 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS-UTF16-H def -/CMapVersion 1.027 def +/CMapVersion 1.026 def /CMapType 1 def /XUID [1 10 25611] def @@ -13098,8 +13098,6 @@ endcidchar <9fcc> 20156 <a7b5> 15909 <ab53> 15911 -<d82cdd32> 12269 -<d82cdd55> 12271 <d83cdd00> 8061 <d83cde02> 10985 <d83cde37> 11024 @@ -13149,11 +13147,11 @@ endcidchar <d843df5f> 17391 <d844de01> 17414 <d844de3d> 13953 +<d844de55> 17415 +<d844de74> 17421 endcidchar 100 begincidchar -<d844de55> 17415 -<d844de74> 17421 <d844de7b> 17417 <d844ded7> 17429 <d844dee4> 17428 @@ -13252,11 +13250,11 @@ endcidchar <d84fddfa> 17943 <d84fdf7e> 17983 <d850dc4b> 20168 +<d850dc96> 17998 +<d850dd03> 18003 endcidchar 100 begincidchar -<d850dc96> 17998 -<d850dd03> 18003 <d850ddc6> 18015 <d850ddfe> 18018 <d850deee> 14282 @@ -13355,11 +13353,11 @@ endcidchar <d85cdd39> 18574 <d85cdfda> 18611 <d85cdfdb> 18610 +<d85cdffe> 18617 +<d85ddc10> 18620 endcidchar 100 begincidchar -<d85cdffe> 18617 -<d85ddc10> 18620 <d85ddc49> 18624 <d85dde14> 18638 <d85dde15> 18637 @@ -13458,11 +13456,11 @@ endcidchar <d86ddf53> 20088 <d86ddf5a> 20096 <d86ddf5c> 20097 +<d86ddf65> 20247 +<d86ddf76> 20114 endcidchar 100 begincidchar -<d86ddf65> 20247 -<d86ddf76> 20114 <d86ddf77> 13782 <d86ddf7c> 20125 <d86ddf82> 20141 @@ -13530,7 +13528,6 @@ endcidchar <d87eddde> 20066 <d87edddf> 14069 <d87eddf4> 15269 -<d884df50> 19130 <f87a> 15447 <f87f> 15448 <f909> 13739 @@ -13561,12 +13558,12 @@ endcidchar <fa16> 8548 <fa17> 8571 <fa1b> 8583 -endcidchar - -100 begincidchar <fa1c> 8587 <fa1d> 8590 <fa1e> 8599 +endcidchar + +100 begincidchar <fa1f> 8610 <fa22> 8622 <fa23> 8630 @@ -13664,12 +13661,12 @@ endcidchar <ff3b> 678 <ff3c> 664 <ff3d> 679 -endcidchar - -12 begincidchar <ff3e> 648 <ff3f> 650 <ff40> 646 +endcidchar + +9 begincidchar <ff5b> 680 <ff5c> 667 <ff5d> 681 diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V index f18f11e82e..38defb79cd 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF16-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS-UTF16-H) %%BeginResource: CMap (UniJIS-UTF16-V) %%Title: (UniJIS-UTF16-V Adobe Japan1 7) -%%Version: 1.009 +%%Version: 1.008 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS-UTF16-V def -/CMapVersion 1.009 def +/CMapVersion 1.008 def /CMapType 1 def /XUID [1 10 25612] def @@ -167,7 +167,7 @@ end def <308e> 7927 endcidchar -86 begincidchar +84 begincidchar <309b> 8272 <309c> 8271 <30a0> 16331 @@ -240,8 +240,6 @@ endcidchar <337d> 12042 <337e> 12041 <337f> 8324 -<d82cdd32> 12270 -<d82cdd55> 12272 <ff0c> 8268 <ff0e> 8274 <ff1a> 12101 diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H index bdf61a04a2..9a27792a31 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS-UTF32-H) %%Title: (UniJIS-UTF32-H Adobe Japan1 7) -%%Version: 1.027 +%%Version: 1.026 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS-UTF32-H def -/CMapVersion 1.027 def +/CMapVersion 1.026 def /CMapType 1 def /XUID [1 10 25539] def @@ -13241,8 +13241,6 @@ endcidchar <0000ffe4> 8005 <0000ffe5> 711 <0000ffe8> 323 -<0001b132> 12269 -<0001b155> 12271 <0001f100> 8061 <0001f202> 10985 <0001f237> 11024 @@ -13250,11 +13248,11 @@ endcidchar <0002000b> 13839 <00020089> 17233 <0002008a> 14108 +<000200a2> 17240 +<000200a4> 17243 endcidchar 100 begincidchar -<000200a2> 17240 -<000200a4> 17243 <000200b0> 14209 <000200f5> 20057 <00020158> 20075 @@ -13353,11 +13351,11 @@ endcidchar <000231f5> 17743 <00023372> 17761 <000233cc> 14140 +<000233d0> 17768 +<000233d2> 17764 endcidchar 100 begincidchar -<000233d0> 17768 -<000233d2> 17764 <000233d3> 17763 <000233d5> 17770 <000233da> 17772 @@ -13456,11 +13454,11 @@ endcidchar <00025ec2> 18327 <00025ed8> 18325 <00025ee8> 18329 +<00025f23> 18330 +<00025f5c> 18332 endcidchar 100 begincidchar -<00025f23> 18330 -<00025f5c> 18332 <00025fd4> 18339 <00025fe0> 18338 <00025ffb> 18345 @@ -13559,11 +13557,11 @@ endcidchar <00028e36> 18890 <00028e89> 18893 <00028eeb> 18895 +<00028ef6> 7673 +<00028f32> 18897 endcidchar 100 begincidchar -<00028ef6> 7673 -<00028f32> 18897 <00028ff8> 18903 <000292a0> 18917 <000292b1> 18918 @@ -13662,11 +13660,11 @@ endcidchar <0002f903> 13768 <0002f90b> 13801 <0002f90f> 13932 -endcidchar - -12 begincidchar <0002f91a> 13916 <0002f920> 7839 +endcidchar + +9 begincidchar <0002f921> 13809 <0002f945> 13357 <0002f947> 13854 @@ -13676,7 +13674,6 @@ endcidchar <0002f9de> 20066 <0002f9df> 14069 <0002f9f4> 15269 -<00031350> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V index e9a3b9eed6..21be2e3d04 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF32-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS-UTF32-H) %%BeginResource: CMap (UniJIS-UTF32-V) %%Title: (UniJIS-UTF32-V Adobe Japan1 7) -%%Version: 1.009 +%%Version: 1.008 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS-UTF32-V def -/CMapVersion 1.009 def +/CMapVersion 1.008 def /CMapType 1 def /XUID [1 10 25610] def @@ -167,7 +167,7 @@ end def <0000308e> 7927 endcidchar -86 begincidchar +84 begincidchar <0000309b> 8272 <0000309c> 8271 <000030a0> 16331 @@ -252,8 +252,6 @@ endcidchar <0000ff5d> 7906 <0000ff5e> 7894 <0000ffe3> 7889 -<0001b132> 12270 -<0001b155> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H index 82ed8d1e66..bf19018db1 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS-UTF8-H) %%Title: (UniJIS-UTF8-H Adobe Japan1 7) -%%Version: 13.027 +%%Version: 13.026 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS-UTF8-H def -/CMapVersion 13.027 def +/CMapVersion 13.026 def /CMapType 1 def /XUID [1 10 25359] def @@ -13276,8 +13276,6 @@ endcidchar <efbfa4> 8005 <efbfa5> 711 <efbfa8> 323 -<f09b84b2> 12269 -<f09b8595> 12271 <f09f8480> 8061 <f09f8882> 10985 <f09f88b7> 11024 @@ -13356,11 +13354,11 @@ endcidchar <f0a1b69c> 17552 <f0a1b6a1> 17551 <f0a1b6b7> 17559 +<f0a1b7a0> 17561 +<f0a1b8b3> 17562 endcidchar 100 begincidchar -<f0a1b7a0> 17561 -<f0a1b8b3> 17562 <f0a1b8b4> 16845 <f0a1bc9e> 17575 <f0a1bdb6> 17582 @@ -13459,11 +13457,11 @@ endcidchar <f0a5878d> 18193 <f0a587a5> 18192 <f0a5889e> 18195 +<f0a5898c> 18197 +<f0a590ae> 18209 endcidchar 100 begincidchar -<f0a5898c> 18197 -<f0a590ae> 18209 <f0a5928e> 17005 <f0a59399> 18217 <f0a5948e> 17009 @@ -13562,11 +13560,11 @@ endcidchar <f0a88a82> 18745 <f0a88bb3> 18747 <f0a88f8d> 17146 +<f0a8908c> 18754 +<f0a89195> 18757 endcidchar 100 begincidchar -<f0a8908c> 18754 -<f0a89195> 18757 <f0a895ab> 18770 <f0a89b97> 18784 <f0a89bba> 18787 @@ -13665,11 +13663,11 @@ endcidchar <f0afa095> 20061 <f0afa098> 7817 <f0afa09a> 13954 -endcidchar - -41 begincidchar <f0afa0a2> 13684 <f0afa0a8> 13807 +endcidchar + +38 begincidchar <f0afa0ac> 14109 <f0afa0b3> 13719 <f0afa0bf> 13815 @@ -13708,7 +13706,6 @@ endcidchar <f0afa79e> 20066 <f0afa79f> 14069 <f0afa7b4> 15269 -<f0b18d90> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V index 5e673f2303..791d2905ae 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS-UTF8-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS-UTF8-H) %%BeginResource: CMap (UniJIS-UTF8-V) %%Title: (UniJIS-UTF8-V Adobe Japan1 7) -%%Version: 13.009 +%%Version: 13.008 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS-UTF8-V def -/CMapVersion 13.009 def +/CMapVersion 13.008 def /CMapType 1 def /XUID [1 10 25440] def @@ -167,7 +167,7 @@ end def <e3828e> 7927 endcidchar -87 begincidchar +85 begincidchar <e3829b> 8272 <e3829c> 8271 <e382a0> 16331 @@ -253,8 +253,6 @@ endcidchar <efbd9d> 7906 <efbd9e> 7894 <efbfa3> 7889 -<f09b84b2> 12270 -<f09b8595> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H index 296c2ab8d6..190e1844f4 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS2004-UTF16-H) %%Title: (UniJIS2004-UTF16-H Adobe Japan1 7) -%%Version: 1.022 +%%Version: 1.021 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS2004-UTF16-H def -/CMapVersion 1.022 def +/CMapVersion 1.021 def /CMapType 1 def /XUID [1 10 25619] def @@ -13102,8 +13102,6 @@ endcidchar <9fcc> 20156 <a7b5> 15909 <ab53> 15911 -<d82cdd32> 12269 -<d82cdd55> 12271 <d83cdd00> 8061 <d83cde02> 10985 <d83cde37> 11024 @@ -13149,11 +13147,11 @@ endcidchar <d843dde1> 17373 <d843de64> 17388 <d843de6d> 17380 +<d843de95> 17379 +<d843df5f> 17391 endcidchar 100 begincidchar -<d843de95> 17379 -<d843df5f> 17391 <d844de01> 17414 <d844de3d> 13953 <d844de55> 17415 @@ -13252,11 +13250,11 @@ endcidchar <d84fdd0e> 18394 <d84fdd40> 17942 <d84fddd3> 17945 +<d84fddf9> 17944 +<d84fddfa> 17943 endcidchar 100 begincidchar -<d84fddf9> 17944 -<d84fddfa> 17943 <d84fdf7e> 17983 <d850dc4b> 20168 <d850dc96> 17998 @@ -13355,11 +13353,11 @@ endcidchar <d85bdf94> 18544 <d85bdff8> 18553 <d85cdcf4> 17103 +<d85cdd0d> 18571 +<d85cdd39> 18574 endcidchar 100 begincidchar -<d85cdd0d> 18571 -<d85cdd39> 18574 <d85cdfda> 18611 <d85cdfdb> 18610 <d85cdffe> 18617 @@ -13458,11 +13456,11 @@ endcidchar <d869deb2> 19129 <d86adde6> 14145 <d86ddf46> 13780 +<d86ddf51> 13866 +<d86ddf53> 20088 endcidchar 100 begincidchar -<d86ddf51> 13866 -<d86ddf53> 20088 <d86ddf5a> 20096 <d86ddf5c> 20097 <d86ddf65> 20247 @@ -13534,7 +13532,6 @@ endcidchar <d87eddde> 20066 <d87edddf> 14069 <d87eddf4> 15269 -<d884df50> 19130 <f87a> 15447 <f87f> 15448 <f909> 13739 @@ -13561,12 +13558,12 @@ endcidchar <fa12> 8481 <fa13> 8497 <fa14> 8499 -endcidchar - -100 begincidchar <fa15> 20307 <fa16> 8548 <fa17> 8571 +endcidchar + +100 begincidchar <fa1b> 8583 <fa1c> 8587 <fa1d> 8590 @@ -13664,12 +13661,12 @@ endcidchar <ff0f> 663 <ff1c> 699 <ff1d> 697 -endcidchar - -18 begincidchar <ff1e> 700 <ff1f> 641 <ff20> 719 +endcidchar + +15 begincidchar <ff3b> 678 <ff3c> 664 <ff3d> 679 diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V index 441af72004..dabbabdf22 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF16-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS2004-UTF16-H) %%BeginResource: CMap (UniJIS2004-UTF16-V) %%Title: (UniJIS2004-UTF16-V Adobe Japan1 7) -%%Version: 1.007 +%%Version: 1.006 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS2004-UTF16-V def -/CMapVersion 1.007 def +/CMapVersion 1.006 def /CMapType 1 def /XUID [1 10 25630] def @@ -167,7 +167,7 @@ end def <308e> 7927 endcidchar -86 begincidchar +84 begincidchar <309b> 8272 <309c> 8271 <30a0> 16331 @@ -240,8 +240,6 @@ endcidchar <337d> 12042 <337e> 12041 <337f> 8324 -<d82cdd32> 12270 -<d82cdd55> 12272 <ff0c> 8268 <ff0e> 8274 <ff1a> 12101 diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H index 723328206a..78b15e4452 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS2004-UTF32-H) %%Title: (UniJIS2004-UTF32-H Adobe Japan1 7) -%%Version: 1.022 +%%Version: 1.021 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS2004-UTF32-H def -/CMapVersion 1.022 def +/CMapVersion 1.021 def /CMapType 1 def /XUID [1 10 25617] def @@ -13247,14 +13247,12 @@ endcidchar <0000ffe4> 8005 <0000ffe5> 711 <0000ffe8> 323 -<0001b132> 12269 -<0001b155> 12271 <0001f100> 8061 +<0001f202> 10985 +<0001f237> 11024 endcidchar 100 begincidchar -<0001f202> 10985 -<0001f237> 11024 <0001f79c> 12244 <0002000b> 13839 <00020089> 17233 @@ -13353,11 +13351,11 @@ endcidchar <00022de1> 17710 <00022e42> 20124 <00022feb> 20130 +<000231b6> 17744 +<000231c3> 17742 endcidchar 100 begincidchar -<000231b6> 17744 -<000231c3> 17742 <000231c4> 16888 <000231f5> 17743 <00023372> 17761 @@ -13456,11 +13454,11 @@ endcidchar <00025c64> 18303 <00025da1> 17033 <00025e2e> 18318 +<00025e56> 18319 +<00025e62> 18322 endcidchar 100 begincidchar -<00025e56> 18319 -<00025e62> 18322 <00025e65> 18320 <00025ec2> 18327 <00025ed8> 18325 @@ -13559,11 +13557,11 @@ endcidchar <00028cdd> 7641 <00028d10> 18882 <00028d71> 18883 +<00028dfb> 18885 +<00028e17> 14256 endcidchar 100 begincidchar -<00028dfb> 18885 -<00028e17> 14256 <00028e1f> 18886 <00028e36> 18890 <00028e89> 18893 @@ -13662,11 +13660,11 @@ endcidchar <0002f8dc> 7695 <0002f8e1> 14291 <0002f8e5> 20065 -endcidchar - -18 begincidchar <0002f8ea> 13679 <0002f8ed> 7665 +endcidchar + +15 begincidchar <0002f8fc> 13656 <0002f903> 13768 <0002f90b> 13801 @@ -13682,7 +13680,6 @@ endcidchar <0002f9de> 20066 <0002f9df> 14069 <0002f9f4> 15269 -<00031350> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V index ca94536899..642a180ca0 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF32-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS2004-UTF32-H) %%BeginResource: CMap (UniJIS2004-UTF32-V) %%Title: (UniJIS2004-UTF32-V Adobe Japan1 7) -%%Version: 1.007 +%%Version: 1.006 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS2004-UTF32-V def -/CMapVersion 1.007 def +/CMapVersion 1.006 def /CMapType 1 def /XUID [1 10 25618] def @@ -167,7 +167,7 @@ end def <0000308e> 7927 endcidchar -86 begincidchar +84 begincidchar <0000309b> 8272 <0000309c> 8271 <000030a0> 16331 @@ -252,8 +252,6 @@ endcidchar <0000ff5d> 7906 <0000ff5e> 7894 <0000ffe3> 7889 -<0001b132> 12270 -<0001b155> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H index 0169f03647..5351865092 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJIS2004-UTF8-H) %%Title: (UniJIS2004-UTF8-H Adobe Japan1 7) -%%Version: 1.022 +%%Version: 1.021 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJIS2004-UTF8-H def -/CMapVersion 1.022 def +/CMapVersion 1.021 def /CMapType 1 def /XUID [1 10 25631] def @@ -13282,8 +13282,6 @@ endcidchar <efbfa4> 8005 <efbfa5> 711 <efbfa8> 323 -<f09b84b2> 12269 -<f09b8595> 12271 <f09f8480> 8061 <f09f8882> 10985 <f09f88b7> 11024 @@ -13356,11 +13354,11 @@ endcidchar <f0a1b196> 17539 <f0a1b4ad> 17544 <f0a1b585> 17545 +<f0a1b5a2> 17547 +<f0a1b5b8> 17546 endcidchar 100 begincidchar -<f0a1b5a2> 17547 -<f0a1b5b8> 17546 <f0a1b692> 17556 <f0a1b69c> 17552 <f0a1b6a1> 17551 @@ -13459,11 +13457,11 @@ endcidchar <f0a4ba8b> 18170 <f0a4bfb2> 20059 <f0a5818a> 18181 +<f0a58195> 18183 +<f0a584a2> 18185 endcidchar 100 begincidchar -<f0a58195> 18183 -<f0a584a2> 18185 <f0a586a9> 18190 <f0a5878d> 18193 <f0a587a5> 18192 @@ -13562,11 +13560,11 @@ endcidchar <f0a7b6a0> 18716 <f0a7b890> 18718 <f0a7beb7> 13898 +<f0a8828a> 18727 +<f0a882bb> 18733 endcidchar 100 begincidchar -<f0a8828a> 18727 -<f0a882bb> 18733 <f0a889b7> 17140 <f0a88a82> 18745 <f0a88bb3> 18747 @@ -13665,11 +13663,11 @@ endcidchar <f0ad9584> 13834 <f0ae89b8> 14187 <f0ae95a9> 13863 -endcidchar - -47 begincidchar <f0ae9baa> 14226 <f0afa084> 15388 +endcidchar + +44 begincidchar <f0afa08f> 7814 <f0afa095> 20061 <f0afa098> 7817 @@ -13714,7 +13712,6 @@ endcidchar <f0afa79e> 20066 <f0afa79f> 14069 <f0afa7b4> 15269 -<f0b18d90> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V index c4f75c08a0..6e62396cd5 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJIS2004-UTF8-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJIS2004-UTF8-H) %%BeginResource: CMap (UniJIS2004-UTF8-V) %%Title: (UniJIS2004-UTF8-V Adobe Japan1 7) -%%Version: 1.007 +%%Version: 1.006 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJIS2004-UTF8-V def -/CMapVersion 1.007 def +/CMapVersion 1.006 def /CMapType 1 def /XUID [1 10 25632] def @@ -167,7 +167,7 @@ end def <e3828e> 7927 endcidchar -87 begincidchar +85 begincidchar <e3829b> 8272 <e3829c> 8271 <e382a0> 16331 @@ -253,8 +253,6 @@ endcidchar <efbd9d> 7906 <efbd9e> 7894 <efbfa3> 7889 -<f09b84b2> 12270 -<f09b8595> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H index ebe76f629d..99bdb24897 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJISX0213-UTF32-H) %%Title: (UniJISX0213-UTF32-H Adobe Japan1 7) -%%Version: 1.026 +%%Version: 1.025 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJISX0213-UTF32-H def -/CMapVersion 1.026 def +/CMapVersion 1.025 def /CMapType 1 def /XUID [1 10 25614] def @@ -13234,8 +13234,6 @@ endcidchar <0000ffe4> 8005 <0000ffe5> 711 <0000ffe8> 323 -<0001b132> 12269 -<0001b155> 12271 <0001f100> 8061 <0001f202> 10985 <0001f237> 11024 @@ -13250,11 +13248,11 @@ endcidchar <00020158> 20075 <000201a2> 13857 <00020213> 17259 +<0002032b> 17282 +<00020371> 17291 endcidchar 100 begincidchar -<0002032b> 17282 -<00020371> 17291 <00020381> 17289 <000203f9> 17295 <0002044a> 17297 @@ -13353,11 +13351,11 @@ endcidchar <000233da> 17772 <000233df> 17774 <000233e4> 17769 +<000233fe> 15422 +<0002344a> 17782 endcidchar 100 begincidchar -<000233fe> 15422 -<0002344a> 17782 <0002344b> 17784 <00023451> 17783 <00023465> 17788 @@ -13456,11 +13454,11 @@ endcidchar <00025ffb> 18345 <0002600c> 18344 <00026017> 18352 +<00026060> 18355 +<000260ed> 18365 endcidchar 100 begincidchar -<00026060> 18355 -<000260ed> 18365 <00026222> 13691 <0002626a> 14189 <00026270> 18385 @@ -13559,11 +13557,11 @@ endcidchar <000292b1> 18918 <00029490> 18935 <000295cf> 18944 +<0002967f> 13849 +<000296f0> 18959 endcidchar 100 begincidchar -<0002967f> 13849 -<000296f0> 18959 <00029719> 18962 <00029750> 18966 <000298c6> 18983 @@ -13662,14 +13660,13 @@ endcidchar <0002f947> 13854 <0002f96c> 14180 <0002f995> 13670 -endcidchar - -5 begincidchar <0002f9d0> 14068 <0002f9de> 20066 +endcidchar + +2 begincidchar <0002f9df> 14069 <0002f9f4> 15269 -<00031350> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V index a7b8d41a6a..c2222c677e 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX0213-UTF32-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJISX0213-UTF32-H) %%BeginResource: CMap (UniJISX0213-UTF32-V) %%Title: (UniJISX0213-UTF32-V Adobe Japan1 7) -%%Version: 1.009 +%%Version: 1.008 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJISX0213-UTF32-V def -/CMapVersion 1.009 def +/CMapVersion 1.008 def /CMapType 1 def /XUID [1 10 25615] def @@ -167,7 +167,7 @@ end def <000030a1> 7928 endcidchar -82 begincidchar +80 begincidchar <000030a3> 7929 <000030a5> 7930 <000030a7> 7931 @@ -248,8 +248,6 @@ endcidchar <0000ff5d> 7906 <0000ff5e> 7894 <0000ffe3> 7889 -<0001b132> 12270 -<0001b155> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H index 069d6991ea..6206685a8b 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniJISX02132004-UTF32-H) %%Title: (UniJISX02132004-UTF32-H Adobe Japan1 7) -%%Version: 1.021 +%%Version: 1.020 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniJISX02132004-UTF32-H def -/CMapVersion 1.021 def +/CMapVersion 1.020 def /CMapType 1 def /XUID [1 10 25633] def @@ -13240,8 +13240,6 @@ endcidchar <0000ffe4> 8005 <0000ffe5> 711 <0000ffe8> 323 -<0001b132> 12269 -<0001b155> 12271 <0001f100> 8061 <0001f202> 10985 <0001f237> 11024 @@ -13250,11 +13248,11 @@ endcidchar <00020089> 17233 <0002008a> 14108 <000200a2> 17240 +<000200a4> 17243 +<000200b0> 14209 endcidchar 100 begincidchar -<000200a4> 17243 -<000200b0> 14209 <000200f5> 20057 <00020158> 20075 <000201a2> 13857 @@ -13353,11 +13351,11 @@ endcidchar <00023372> 17761 <000233cc> 14140 <000233d0> 17768 +<000233d2> 17764 +<000233d3> 17763 endcidchar 100 begincidchar -<000233d2> 17764 -<000233d3> 17763 <000233d5> 17770 <000233da> 17772 <000233df> 17774 @@ -13456,11 +13454,11 @@ endcidchar <00025ed8> 18325 <00025ee8> 18329 <00025f23> 18330 +<00025f5c> 18332 +<00025fd4> 18339 endcidchar 100 begincidchar -<00025f5c> 18332 -<00025fd4> 18339 <00025fe0> 18338 <00025ffb> 18345 <0002600c> 18344 @@ -13559,11 +13557,11 @@ endcidchar <00028e89> 18893 <00028eeb> 18895 <00028ef6> 7673 +<00028f32> 18897 +<00028ff8> 18903 endcidchar 100 begincidchar -<00028f32> 18897 -<00028ff8> 18903 <000292a0> 18917 <000292b1> 18918 <00029490> 18935 @@ -13662,11 +13660,11 @@ endcidchar <0002f90b> 13801 <0002f90f> 13932 <0002f91a> 13916 -endcidchar - -11 begincidchar <0002f920> 7839 <0002f921> 13809 +endcidchar + +8 begincidchar <0002f945> 13357 <0002f947> 13854 <0002f96c> 14180 @@ -13675,7 +13673,6 @@ endcidchar <0002f9de> 20066 <0002f9df> 14069 <0002f9f4> 15269 -<00031350> 19130 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V index bf6f0a7caa..e6d2c74e12 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/CMap/UniJISX02132004-UTF32-V @@ -5,9 +5,9 @@ %%IncludeResource: CMap (UniJISX02132004-UTF32-H) %%BeginResource: CMap (UniJISX02132004-UTF32-V) %%Title: (UniJISX02132004-UTF32-V Adobe Japan1 7) -%%Version: 1.007 +%%Version: 1.006 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -23,8 +23,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -57,7 +57,7 @@ begincmap end def /CMapName /UniJISX02132004-UTF32-V def -/CMapVersion 1.007 def +/CMapVersion 1.006 def /CMapType 1 def /XUID [1 10 25634] def @@ -167,7 +167,7 @@ end def <000030a1> 7928 endcidchar -82 begincidchar +80 begincidchar <000030a3> 7929 <000030a5> 7930 <000030a7> 7931 @@ -248,8 +248,6 @@ endcidchar <0000ff5d> 7906 <0000ff5e> 7894 <0000ffe3> 7889 -<0001b132> 12270 -<0001b155> 12272 endcidchar 37 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt b/support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt index 4aead36837..2d4b144742 100644 --- a/support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt +++ b/support/adobemapping/cmap-resources/Adobe-Japan1-7/cid2code.txt @@ -1,4 +1,4 @@ -# cid2code.txt (Version 05/18/2022) +# cid2code.txt (Version 07/30/2019) # # The data in this table contains 32 tab-delimited columns of # information. The contents of this file supplement "The @@ -105,36 +105,36 @@ # files is recommended.) # # o Column 20: Character codes for the "UniJIS-UTF8-H" and -# "UniJIS-UTF8-V" CMaps (Unicode 15.0 UTF-8 encoding, proportional +# "UniJIS-UTF8-V" CMaps (Unicode 13.0 UTF-8 encoding, proportional # Latin characters). # # o Column 21: Character codes for the "UniJIS-UTF16-H" and -# "UniJIS-UTF16-V" CMaps (Unicode 15.0 UTF-16 encoding, proportional +# "UniJIS-UTF16-V" CMaps (Unicode 13.0 UTF-16 encoding, proportional # Latin characters). # # o Column 22: Character codes for the "UniJIS-UTF32-H" and -# "UniJIS-UTF32-V" CMaps (Unicode 15.0 UTF-32 encoding, proportional +# "UniJIS-UTF32-V" CMaps (Unicode 13.0 UTF-32 encoding, proportional # Latin characters). # # o Column 23: Character codes for the "UniJIS2004-UTF8-H" and -# "UniJIS2004-UTF8-V" CMaps (Unicode 15.0 UTF-8 encoding, proportional +# "UniJIS2004-UTF8-V" CMaps (Unicode 13.0 UTF-8 encoding, proportional # Latin characters, JIS X 0213:2004 prototypical glyphs as the default). # # o Column 24: Character codes for the "UniJIS2004-UTF16-H" and -# "UniJIS2004-UTF16-V" CMaps (Unicode 15.0 UTF-16 encoding, proportional +# "UniJIS2004-UTF16-V" CMaps (Unicode 13.0 UTF-16 encoding, proportional # Latin characters, JIS X 0213:2004 prototypical glyphs as the default). # # o Column 25: Character codes for the "UniJIS2004-UTF32-H" and -# "UniJIS2004-UTF32-V" CMaps (Unicode 15.0 UTF-32 encoding, proportional +# "UniJIS2004-UTF32-V" CMaps (Unicode 13.0 UTF-32 encoding, proportional # Latin characters, JIS X 0213:2004 prototypical glyphs as the default). # # o Column 26: Character codes for the "UniJISX0213-UTF32-H" and -# "UniJISX0213-UTF32-V" CMaps (Unicode 15.0 UTF-32 encoding, +# "UniJISX0213-UTF32-V" CMaps (Unicode 13.0 UTF-32 encoding, # proportional Latin characters, some proportional JIS X 0208:1997 # characters). # # o Column 27: Character codes for the "UniJISX02132004-UTF32-H" and -# "UniJISX02132004-UTF32-V" CMaps (Unicode 15.0 UTF-32 encoding, +# "UniJISX02132004-UTF32-V" CMaps (Unicode 13.0 UTF-32 encoding, # proportional Latin characters, some proportional JIS X 0208:1997 # characters, JIS X 0213:2004 prototypical glyphs as the default). # @@ -12697,10 +12697,10 @@ CID H RKSJ EUC 83pv-RKSJ Add Add-RKSJ Ext Ext-RKSJ NWP 90pv-RKSJ 90ms-RKSJ 90msp 12266 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 12267 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 12268 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -12269 * * * * * * * * * * * * * * * * * * f09b84b2 d82cdd32 0001b132 f09b84b2 d82cdd32 0001b132 0001b132 0001b132 * * * * * -12270 * * * * * * * * * * * * * * * * * * f09b84b2v d82cdd32v 0001b132v f09b84b2v d82cdd32v 0001b132v 0001b132v 0001b132v * * * * * -12271 * * * * * * * * * * * * * * * * * * f09b8595 d82cdd55 0001b155 f09b8595 d82cdd55 0001b155 0001b155 0001b155 * * * * * -12272 * * * * * * * * * * * * * * * * * * f09b8595v d82cdd55v 0001b155v f09b8595v d82cdd55v 0001b155v 0001b155v 0001b155v * * * * * +12269 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +12270 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +12271 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +12272 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 12273 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 12274 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 12275 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -19558,7 +19558,7 @@ CID H RKSJ EUC 83pv-RKSJ Add Add-RKSJ Ext Ext-RKSJ NWP 90pv-RKSJ 90ms-RKSJ 90msp 19127 * * * * * * * * * * * * * * * * * * e9bdad 9f6d 00009f6d e9bdad 9f6d 00009f6d 00009f6d 00009f6d * * * * * 19128 * * * * * * * * * * * * * * * * * * e9bdb0 9f70 00009f70 e9bdb0 9f70 00009f70 00009f70 00009f70 * * * * * 19129 * * * * * * * * * * * * * * * * * * f0aa9ab2 d869deb2 0002a6b2 f0aa9ab2 d869deb2 0002a6b2 0002a6b2 0002a6b2 * * * * * -19130 * * * * * * * * * * * * * * * * * * e2baac,f0b18d90 2eac,d884df50 00002eac,00031350 e2baac,f0b18d90 2eac,d884df50 00002eac,00031350 00002eac,00031350 00002eac,00031350 * * * * * +19130 * * * * * * * * * * * * * * * * * * e2baac 2eac 00002eac e2baac 2eac 00002eac 00002eac 00002eac * * * * * 19131 * * * * * * * * * * * * * * * * * * e39894 3614 00003614 e39894 3614 00003614 00003614 00003614 * * * * * 19132 * * * * * * * * * * * * * * * * * * e3a2ad 38ad 000038ad e3a2ad 38ad 000038ad 000038ad 000038ad * * * * * 19133 * * * * * * * * * * * * * * * * * * e3b78c 3dcc 00003dcc e3b78c 3dcc 00003dcc 00003dcc 00003dcc * * * * * diff --git a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H index 7f0904446c..d47b5f6a86 100644 --- a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H +++ b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF16-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniAKR-UTF16-H) %%Title: (UniAKR-UTF16-H Adobe KR 9) -%%Version: 1.003 +%%Version: 1.002 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -21,8 +21,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniAKR-UTF16-H def -/CMapVersion 1.003 def +/CMapVersion 1.002 def /CMapType 1 def /WMode 0 def @@ -8257,7 +8257,6 @@ endcidchar <d870dd15> 22458 <d871dfd3> 22459 <d879dd69> 22460 -<d881df29> 22461 <f900> 18067 <f901> 15913 <f902> 18186 @@ -8306,10 +8305,10 @@ endcidchar <f92d> 14368 <f92e> 14527 <f92f> 14615 +<f930> 15724 endcidchar 100 begincidchar -<f930> 15724 <f931> 16155 <f932> 16629 <f933> 16954 @@ -8409,10 +8408,10 @@ endcidchar <f991> 15713 <f992> 16448 <f993> 16577 +<f994> 16797 endcidchar 100 begincidchar -<f994> 16797 <f995> 17089 <f996> 17340 <f997> 17451 @@ -8512,10 +8511,10 @@ endcidchar <f9f5> 16351 <f9f6> 17548 <f9f7> 17155 +<f9f8> 17175 endcidchar -27 begincidchar -<f9f8> 17175 +26 begincidchar <f9f9> 17238 <f9fa> 16666 <f9fb> 16544 diff --git a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H index 82b117b4f1..b5f7d8d3c2 100644 --- a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H +++ b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF32-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniAKR-UTF32-H) %%Title: (UniAKR-UTF32-H Adobe KR 9) -%%Version: 1.003 +%%Version: 1.002 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -21,8 +21,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniAKR-UTF32-H def -/CMapVersion 1.003 def +/CMapVersion 1.002 def /CMapType 1 def /WMode 0 def @@ -8508,7 +8508,7 @@ endcidchar <00025e44> 22434 endcidchar -27 begincidchar +26 begincidchar <00026057> 22435 <000265a4> 22436 <000267d8> 22437 @@ -8535,7 +8535,6 @@ endcidchar <0002c115> 22458 <0002c7d3> 22459 <0002e569> 22460 -<00030729> 22461 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H index 0853d1182d..9448f2833b 100644 --- a/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H +++ b/support/adobemapping/cmap-resources/Adobe-KR-9/CMap/UniAKR-UTF8-H @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (UniAKR-UTF8-H) %%Title: (UniAKR-UTF8-H Adobe KR 9) -%%Version: 1.003 +%%Version: 1.002 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2022 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -21,8 +21,8 @@ %%Copyright: provided with the distribution. %%Copyright: %%Copyright: Neither the name of Adobe nor the names of its contributors -%%Copyright: may be used to endorse or promote products derived from this -%%Copyright: software without specific prior written permission. +%%Copyright: may be used to endorse or promote products derived from +%%Copyright: this software without specific prior written permission. %%Copyright: %%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND %%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, @@ -53,7 +53,7 @@ begincmap end def /CMapName /UniAKR-UTF8-H def -/CMapVersion 1.003 def +/CMapVersion 1.002 def /CMapType 1 def /WMode 0 def @@ -8515,7 +8515,7 @@ endcidchar <efa7b5> 16351 endcidchar -90 begincidchar +89 begincidchar <efa7b6> 17548 <efa7b7> 17155 <efa7b8> 17175 @@ -8605,7 +8605,6 @@ endcidchar <f0ac8495> 22458 <f0ac9f93> 22459 <f0ae95a9> 22460 -<f0b09ca9> 22461 endcidchar 100 begincidrange diff --git a/support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt b/support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt index 7213ca0ad8..e6583ecb5d 100644 --- a/support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt +++ b/support/adobemapping/cmap-resources/Adobe-KR-9/cid2code.txt @@ -1,4 +1,4 @@ -# cid2code.txt (Version 2022-02-28) +# cid2code.txt (Version 2018-07-19) # # The data in this table contains four tab-delimited columns of # information. The contents of this file supplement "The Adobe-KR-9 @@ -22,13 +22,13 @@ # information about character set and encoding: # # o Column 2: Character codes for the "UniAKR-UTF8-H" CMap resource -# (Unicode Version 13.0 UTF-8 encoding). +# (Unicode Version 11.0 UTF-8 encoding). # # o Column 3: Character codes for the "UniAKR-UTF16-H" CMap resource -# (Unicode Version 13.0 UTF-16 encoding). +# (Unicode Version 11.0 UTF-16 encoding). # # o Column 4: Character codes for the "UniAKR-UTF32-H" CMap resource -# (Unicode Version 13.0 UTF-32 encoding). +# (Unicode Version 11.0 UTF-32 encoding). # CID UniAKR-UTF8 UniAKR-UTF16 UniAKR-UTF32 0 * * * @@ -22492,7 +22492,7 @@ CID UniAKR-UTF8 UniAKR-UTF16 UniAKR-UTF32 22458 f0ac8495 d870dd15 0002c115 22459 f0ac9f93 d871dfd3 0002c7d3 22460 f0ae95a9 d879dd69 0002e569 -22461 f0b09ca9 d881df29 00030729 +22461 * * * 22462 * * * 22463 * * * 22464 * * * diff --git a/support/adobemapping/cmap-resources/README.md b/support/adobemapping/cmap-resources/README.md index 0deee62808..3c96ed60ec 100644 --- a/support/adobemapping/cmap-resources/README.md +++ b/support/adobemapping/cmap-resources/README.md @@ -350,4 +350,4 @@ To learn more about CMap resources, please reference [Adobe Tech Note #5099](htt ## Getting Involved -Suggest changes by submitting an [Issue](https://github.com/adobe-type-tools/cmap-resources/issues). +Send suggestions for changes to the CMap Resources project maintainer, [Dr. Ken Lunde](mailto:lunde@adobe.com?subject=[GitHub]%20CMap%20Resources), for consideration. diff --git a/support/adobemapping/cmap-resources/VERSIONS.txt b/support/adobemapping/cmap-resources/VERSIONS.txt index 1804391e6b..edc4a2702e 100644 --- a/support/adobemapping/cmap-resources/VERSIONS.txt +++ b/support/adobemapping/cmap-resources/VERSIONS.txt @@ -129,25 +129,25 @@ UniJIS-UCS2-H (CMapVersion=12.006) UniJIS-UCS2-HW-H (CMapVersion=12.005) UniJIS-UCS2-HW-V (CMapVersion=12.006) UniJIS-UCS2-V (CMapVersion=12.006) -UniJIS-UTF16-H (CMapVersion=1.027) -UniJIS-UTF16-V (CMapVersion=1.009) -UniJIS-UTF32-H (CMapVersion=1.027) -UniJIS-UTF32-V (CMapVersion=1.009) -UniJIS-UTF8-H (CMapVersion=13.027) -UniJIS-UTF8-V (CMapVersion=13.009) -UniJIS2004-UTF16-H (CMapVersion=1.022) -UniJIS2004-UTF16-V (CMapVersion=1.007) -UniJIS2004-UTF32-H (CMapVersion=1.022) -UniJIS2004-UTF32-V (CMapVersion=1.007) -UniJIS2004-UTF8-H (CMapVersion=1.022) -UniJIS2004-UTF8-V (CMapVersion=1.007) +UniJIS-UTF16-H (CMapVersion=1.026) +UniJIS-UTF16-V (CMapVersion=1.008) +UniJIS-UTF32-H (CMapVersion=1.026) +UniJIS-UTF32-V (CMapVersion=1.008) +UniJIS-UTF8-H (CMapVersion=13.026) +UniJIS-UTF8-V (CMapVersion=13.008) +UniJIS2004-UTF16-H (CMapVersion=1.021) +UniJIS2004-UTF16-V (CMapVersion=1.006) +UniJIS2004-UTF32-H (CMapVersion=1.021) +UniJIS2004-UTF32-V (CMapVersion=1.006) +UniJIS2004-UTF8-H (CMapVersion=1.021) +UniJIS2004-UTF8-V (CMapVersion=1.006) UniJISPro-UCS2-HW-V (CMapVersion=1.005) UniJISPro-UCS2-V (CMapVersion=1.005) UniJISPro-UTF8-V (CMapVersion=1.005) -UniJISX0213-UTF32-H (CMapVersion=1.026) -UniJISX0213-UTF32-V (CMapVersion=1.009) -UniJISX02132004-UTF32-H (CMapVersion=1.021) -UniJISX02132004-UTF32-V (CMapVersion=1.007) +UniJISX0213-UTF32-H (CMapVersion=1.025) +UniJISX0213-UTF32-V (CMapVersion=1.008) +UniJISX02132004-UTF32-H (CMapVersion=1.020) +UniJISX02132004-UTF32-V (CMapVersion=1.006) V (CMapVersion=12.005) WP-Symbol (CMapVersion=10.006) @@ -202,6 +202,6 @@ Adobe-KR-6 (CMapVersion=1.002) Adobe-KR-7 (CMapVersion=1.002) Adobe-KR-8 (CMapVersion=1.002) Adobe-KR-9 (CMapVersion=1.002) -UniAKR-UTF16-H (CMapVersion=1.003) -UniAKR-UTF32-H (CMapVersion=1.003) -UniAKR-UTF8-H (CMapVersion=1.003) +UniAKR-UTF16-H (CMapVersion=1.002) +UniAKR-UTF32-H (CMapVersion=1.002) +UniAKR-UTF8-H (CMapVersion=1.002) diff --git a/support/adobemapping/mapping-resources-pdf/README.md b/support/adobemapping/mapping-resources-pdf/README.md index 1b41bf5470..bf84b4bcdc 100644 --- a/support/adobemapping/mapping-resources-pdf/README.md +++ b/support/adobemapping/mapping-resources-pdf/README.md @@ -17,4 +17,4 @@ Mapping resources for PDF should not be confused with [CMap resources](https://g ## Getting Involved -Suggest changes by submitting an [Issue](https://github.com/adobe-type-tools/mapping-resources-pdf/issues). +Send suggestions for changes to the Mapping Resources for PDF project maintainer, [Dr. Ken Lunde](mailto:lunde@adobe.com?subject=[GitHub]%20Mapping%20Resources%20for%20PDF), for consideration. diff --git a/support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac b/support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac index d3ba9dee0b..e5e7054189 100644 --- a/support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac +++ b/support/adobemapping/mapping-resources-pdf/pdf2other/Adobe-Korea1-H-Mac @@ -3,7 +3,7 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (Adobe-Korea1-H-Mac) %%Title: (Adobe-Korea1-H-Mac Adobe KSCpc-EUC 0) -%%Version: 1.006 +%%Version: 1.005 %%Copyright: ----------------------------------------------------------- %%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: @@ -539,3 +539,11 @@ end %%EndResource %%EOF + +endcmap +CMapName currentdict /CMap defineresource pop +end +end + +%%EndResource +%%EOF diff --git a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 index d8265ce72b..b7eaebaa49 100644 --- a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 +++ b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-CNS1-UCS2 @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (Adobe-CNS1-UCS2) %%Title: (Adobe-CNS1-UCS2 Adobe CNS1 7) -%%Version: 15.000 +%%Version: 14.001 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2020 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -54,7 +54,7 @@ end def /CMapName /Adobe-CNS1-UCS2 def -/CMapVersion 15.000 def +/CMapVersion 14.001 def /CMapType 2 def /XUID [1 10 25335 1212] def @@ -79,7 +79,7 @@ endcodespacerange <006b> <ff1f> <006c> <ff01> <006d> <fe30> -<006e> <2026> +<006e> <22ef> <006f> <2025> <0073> <00b7> <0078> <ff5c> @@ -115,7 +115,7 @@ endcodespacerange <00c0> <25bc> <00c1> <32a3> <00c2> <2105> -<00c3> <00af> +<00c3> <203e> <00c4> <ffe3> <00c5> <ff3f> <00c6> <02cd> @@ -132,7 +132,7 @@ endcodespacerange <00dc> <221e> <00dd> <2252> <00de> <2261> -<00e4> <ff5e> +<00e4> <223c> <00e7> <22a5> <00e8> <2220> <00e9> <221f> @@ -146,7 +146,7 @@ endcodespacerange <00f1> <2640> <00f2> <2642> <00f3> <2295> -<00f4> <2299> +<00f4> <2609> <00f5> <2191> <00f6> <2193> <00f7> <2192> @@ -160,7 +160,7 @@ endcodespacerange <0101> <ff0f> <0102> <ff3c> <0103> <ff04> -<0104> <ffe5> +<0104> <00a5> <0105> <3012> <0108> <ff05> <0109> <ff20> @@ -12567,12 +12567,11 @@ endbfchar <354d> <9f98> <354e> <fe19> <354f> <223c> -<3550> <2002> <35af> <fe33> <35b0> <2574> <35b1> <fe34> <35b2> <fe4f> -<35b3> <00a8> +<35b3> <0308> <35b4> <ff3e> <35b9> <fffd> <35bd> <30fc> @@ -12629,13 +12628,13 @@ endbfchar <36db> <fffd> <36dc> <fffd> <36dd> <fffd> +<36de> <fffd> endbfchar 100 beginbfchar -<36de> <fffd> <36df> <fffd> <36e0> <fffd> -<36e1> <ffe2> +<36e1> <00ac> <36e2> <ffe4> <36e3> <ff07> <36e4> <ff02> @@ -12732,10 +12731,10 @@ endbfchar <3744> <54b2> <3745> <d857dc01> <3746> <7b0b> +<3747> <7b55> endbfchar 100 beginbfchar -<3747> <7b55> <3748> <7b29> <3749> <d854df0e> <374a> <d857dcfe> @@ -12835,10 +12834,10 @@ endbfchar <37ac> <6a53> <37ad> <d852de65> <37ae> <d852de95> +<37af> <447a> endbfchar 100 beginbfchar -<37af> <447a> <37b0> <8229> <37b1> <d85ade52> <37b2> <d84fdd7e> @@ -12853,7 +12852,7 @@ endbfchar <37bb> <d84fddf8> <37bc> <82aa> <37bd> <691b> -<37be> <82b3fe00> +<37be> <d87edd94> <37bf> <41db> <37c0> <854b> <37c1> <82d0> @@ -12938,10 +12937,10 @@ endbfchar <3810> <87da> <3811> <880f> <3812> <5661> +<3813> <866c> endbfchar 100 beginbfchar -<3813> <866c> <3814> <6856> <3815> <460f> <3818> <d85ddde0> @@ -12990,7 +12989,7 @@ endbfchar <3845> <8c9b> <3846> <d85fdd54> <3847> <d85fdd8f> -<3848> <8cabfe00> +<3848> <d87eddd4> <3849> <3725> <384a> <d85fdd53> <384b> <8cd6> @@ -13041,10 +13040,10 @@ endbfchar <3878> <d85edebe> <3879> <9061> <387a> <d861dd6c> +<387b> <d861de0b> endbfchar 100 beginbfchar -<387b> <d861de0b> <387c> <90a8> <387d> <d861df13> <387e> <90c4> @@ -13144,10 +13143,10 @@ endbfchar <38dc> <97ee> <38dd> <741c> <38de> <d865dc33> +<38df> <fffd> endbfchar 100 beginbfchar -<38df> <fffd> <38e0> <97f5> <38e1> <d865dc1d> <38e2> <d85edd7a> @@ -13247,10 +13246,10 @@ endbfchar <3940> <9f02> <3941> <9f08> <3942> <4b96> +<3943> <9424> endbfchar 100 beginbfchar -<3943> <9424> <3944> <d85bdda2> <3945> <9f17> <3946> <d87ede1b> @@ -13350,10 +13349,10 @@ endbfchar <39a4> <569e> <39a5> <d859deb1> <39a6> <5692> +<39a7> <d843dfdf> endbfchar 100 beginbfchar -<39a7> <d843dfdf> <39a8> <d842dfa8> <39a9> <d843de0d> <39aa> <fffd> @@ -13453,10 +13452,10 @@ endbfchar <3a08> <363e> <3a09> <58cb> <3a0a> <5a99> +<3a0b> <d862de46> endbfchar 100 beginbfchar -<3a0b> <d862de46> <3a0c> <d845defa> <3a0d> <d845df6f> <3a0e> <d845df10> @@ -13556,10 +13555,10 @@ endbfchar <3a6e> <3bf4> <3a6f> <d84cdc8e> <3a70> <d84cdead> +<3a71> <d852dd89> endbfchar 100 beginbfchar -<3a71> <d852dd89> <3a72> <d84cdeab> <3a73> <550d> <3a74> <d84cdee0> @@ -13659,10 +13658,10 @@ endbfchar <3ad2> <d84fdef8> <3ad3> <d84dde5f> <3ad4> <d852de4a> +<3ad5> <d852dd17> endbfchar 100 beginbfchar -<3ad5> <d852dd17> <3ad6> <d857dfe1> <3ad7> <3f06> <3ad8> <3eb1> @@ -13762,10 +13761,10 @@ endbfchar <3b38> <5a0d> <3b39> <d840de5b> <3b3a> <78f0> +<3b3b> <5a2a> endbfchar 100 beginbfchar -<3b3b> <5a2a> <3b3c> <d856dfc6> <3b3d> <7afe> <3b3e> <41f9> @@ -13843,7 +13842,7 @@ endbfchar <3b86> <5ae4> <3b87> <d846dcd8> <3b88> <86a0> -<3b89> <8728fe00> +<3b89> <d87eddbc> <3b8a> <d84fdd8f> <3b8b> <882d> <3b8c> <d85ddc22> @@ -13865,10 +13864,10 @@ endbfchar <3b9c> <d862ddf9> <3b9d> <3ead> <3b9e> <84a3> +<3b9f> <46f5> endbfchar 100 beginbfchar -<3b9f> <46f5> <3ba0> <46cf> <3ba1> <37f2> <3ba2> <8a3d> @@ -13968,10 +13967,10 @@ endbfchar <3c00> <d862dfc5> <3c01> <d852deb2> <3c02> <981f> +<3c03> <d865dcda> endbfchar 100 beginbfchar -<3c03> <d865dcda> <3c04> <92f6> <3c05> <d865ddd7> <3c06> <91e5> @@ -14071,10 +14070,10 @@ endbfchar <3c64> <9277> <3c65> <944d> <3c66> <4fe4> +<3c67> <3440> endbfchar 100 beginbfchar -<3c67> <3440> <3c68> <9064> <3c69> <d855dd5d> <3c6a> <783d> @@ -14174,10 +14173,10 @@ endbfchar <3cc8> <56a4> <3cc9> <d841de1a> <3cca> <d842dfeb> +<3ccb> <d843dcb8> endbfchar 100 beginbfchar -<3ccb> <d843dcb8> <3ccc> <5502> <3ccd> <79c4> <3cce> <d845dffa> @@ -14277,10 +14276,10 @@ endbfchar <3d2c> <83ed> <3d2d> <d85bdc80> <3d2e> <d85cdc53> +<3d2f> <d845dfdb> endbfchar 100 beginbfchar -<3d2f> <d845dfdb> <3d30> <5989> <3d31> <5a82> <3d32> <d845dfb3> @@ -14321,7 +14320,7 @@ endbfchar <3d55> <d850dfe9> <3d56> <3da5> <3d57> <6cdf> -<3d58> <52c7fe01> +<3d58> <d87edc25> <3d59> <59eb> <3d5a> <5f5c> <3d5b> <d84cdf00> @@ -14380,10 +14379,10 @@ endbfchar <3d92> <82fd> <3d93> <89a5> <3d94> <8fa0> +<3d95> <97b8> endbfchar 100 beginbfchar -<3d95> <97b8> <3d96> <9847> <3d97> <9abd> <3d98> <5fb1> @@ -14460,7 +14459,7 @@ endbfchar <3ddf> <d855dfe1> <3de0> <6195> <3de1> <5a27> -<3de2> <6649fe00> +<3de2> <d87edccd> <3de3> <d87edc06> <3de4> <d851dd21> <3de5> <4e6a> @@ -14483,10 +14482,10 @@ endbfchar <3df6> <7983> <3df7> <5d2c> <3df8> <d84ddd19> +<3df9> <fffd> endbfchar 100 beginbfchar -<3df9> <fffd> <3dfa> <46d0> <3dfb> <753b> <3dfc> <8865> @@ -14586,10 +14585,10 @@ endbfchar <3e5a> <3deb> <3e5b> <d84fdcb7> <3e5c> <d858de58> +<3e5d> <56bf> endbfchar 100 beginbfchar -<3e5d> <56bf> <3e5e> <8e0e> <3e5f> <5b6d> <3e60> <63de> @@ -14689,10 +14688,10 @@ endbfchar <3ebe> <40fa> <3ebf> <9c5d> <3ec0> <651f> +<3ec1> <48f3> endbfchar 100 beginbfchar -<3ec1> <48f3> <3ec2> <d851dfe0> <3ec3> <d867dd7c> <3ec4> <fffd> @@ -14792,10 +14791,10 @@ endbfchar <3f22> <9c2e> <3f23> <9f5a> <3f24> <5573> +<3f25> <5bc3> endbfchar 100 beginbfchar -<3f25> <5bc3> <3f26> <4ffd> <3f27> <9e98> <3f28> <4ff2> @@ -14895,10 +14894,10 @@ endbfchar <3f86> <6282> <3f87> <d860df7d> <3f88> <8e28> +<3f89> <8e75> endbfchar 100 beginbfchar -<3f89> <8e75> <3f8a> <7ad3> <3f8b> <7a3e> <3f8c> <78d8> @@ -14998,10 +14997,10 @@ endbfchar <3fea> <d859dfcc> <3feb> <7553> <3fec> <87a9> +<3fed> <87ce> endbfchar 100 beginbfchar -<3fed> <87ce> <3fee> <81c8> <3fef> <878c> <3ff0> <8a49> @@ -15101,10 +15100,10 @@ endbfchar <404e> <3cdc> <404f> <51d3> <4050> <d852dea6> +<4051> <51b3> endbfchar 100 beginbfchar -<4051> <51b3> <4052> <fffd> <4053> <fffd> <4054> <51ed> @@ -15204,10 +15203,10 @@ endbfchar <40b2> <d850dc3a> <40b3> <4552> <40b4> <d851dc35> +<40b5> <66b3> endbfchar 100 beginbfchar -<40b5> <66b3> <40b6> <d844dcb4> <40b7> <5637> <40b8> <66cd> @@ -15307,10 +15306,10 @@ endbfchar <4116> <5b9d> <4117> <4d10> <4118> <5c05> +<4119> <d846df44> endbfchar 100 beginbfchar -<4119> <d846df44> <411a> <5c13> <411b> <73ce> <411c> <5c14> @@ -15360,7 +15359,7 @@ endbfchar <4148> <941b> <4149> <5f0d> <414a> <d840ddc1> -<414b> <5f22fe00> +<414b> <d87edc94> <414c> <3ade> <414d> <d844df3a> <414e> <5f3a> @@ -15402,7 +15401,7 @@ endbfchar <4172> <5aa0> <4173> <6164> <4174> <6142> -<4175> <6148fe00> +<4175> <d87edca6> <4176> <d85bded2> <4177> <6181> <4178> <51f4> @@ -15410,10 +15409,10 @@ endbfchar <417a> <6187> <417b> <5baa> <417c> <d84fdfb7> +<417d> <d84adc5f> endbfchar 100 beginbfchar -<417d> <d84adc5f> <417e> <61d3> <417f> <d862df9d> <4180> <d866dd5d> @@ -15513,10 +15512,10 @@ endbfchar <41e2> <3b80> <41e3> <67ac> <41e4> <6961> +<41e5> <d862de4a> endbfchar 100 beginbfchar -<41e5> <d862de4a> <41e6> <42fc> <41e7> <6936> <41e8> <6998> @@ -15616,10 +15615,10 @@ endbfchar <4246> <6f9f> <4247> <d850dd44> <4248> <6fd3> +<4249> <d850dc91> endbfchar 100 beginbfchar -<4249> <d850dc91> <424a> <d850dd55> <424b> <d850dc39> <424c> <d84fdff0> @@ -15719,10 +15718,10 @@ endbfchar <42ae> <d852de8c> <42af> <d850dd5f> <42b0> <d852de79> +<42b1> <d862df8f> endbfchar 100 beginbfchar -<42b1> <d862df8f> <42b2> <5b46> <42b3> <d863dc03> <42b4> <d846dc9e> @@ -15822,10 +15821,10 @@ endbfchar <4312> <8e46> <4313> <d853ddb8> <4314> <d865dce5> +<4315> <fffd> endbfchar 100 beginbfchar -<4315> <fffd> <4316> <d860dcbe> <4317> <777a> <4318> <d84bdc38> @@ -15925,10 +15924,10 @@ endbfchar <4376> <3992> <4377> <3a06> <4378> <d860de9b> +<4379> <3578> endbfchar 100 beginbfchar -<4379> <3578> <437a> <d857de49> <437b> <d848dcc7> <437c> <fffd> @@ -16019,7 +16018,7 @@ endbfchar <43d1> <3fd7> <43d2> <fffd> <43d3> <7680> -<43d4> <d853df5c> +<43d4> <768c> <43d5> <40a8> <43d6> <7839> <43d7> <4103> @@ -16028,10 +16027,10 @@ endbfchar <43da> <7ced> <43db> <7f93> <43dc> <7fae> +<43dd> <fffd> endbfchar 100 beginbfchar -<43dd> <fffd> <43de> <82ff> <43df> <585f> <43e0> <86b2> @@ -16087,7 +16086,7 @@ endbfchar <44df> <f538> <44e0> <5902> <44e1> <d846dfc1> -<44e2> <5c6efe01> +<44e2> <d87edc78> <44e3> <9751> <44e4> <d840dc86> <44e5> <4e5b> @@ -16131,10 +16130,10 @@ endbfchar <450b> <d863de0f> <450c> <97e6> <450d> <9875> +<450e> <98ce> endbfchar 100 beginbfchar -<450e> <98ce> <450f> <98de> <4510> <9963> <4511> <d866dc10> @@ -16142,7 +16141,7 @@ endbfchar <4513> <9e1f> <4514> <9ec4> <4515> <6b6f> -<4516> <9f9cfe00> +<4516> <f907> <4517> <4e37> <4518> <d840dc87> <4519> <961d> @@ -16234,10 +16233,10 @@ endbfchar <457c> <d867ddf6> <457d> <d85cdc0e> <457e> <9e0a> +<457f> <d868dd33> endbfchar 100 beginbfchar -<457f> <d868dd33> <4580> <35c1> <4581> <6e9a> <4582> <823e> @@ -16337,10 +16336,10 @@ endbfchar <45e2> <54cc> <45e3> <82c4> <45e4> <55b9> +<45e5> <d867dec3> endbfchar 100 beginbfchar -<45e5> <d867dec3> <45e6> <9c26> <45e7> <9ab6> <45e8> <d84bddee> @@ -16440,10 +16439,10 @@ endbfchar <464a> <65ff> <464b> <6653> <464c> <3af2> +<464d> <6692> endbfchar 100 beginbfchar -<464d> <6692> <464e> <3b22> <464f> <6716> <4650> <3b42> @@ -16543,10 +16542,10 @@ endbfchar <46b0> <d861debc> <46b1> <d861dd01> <46b2> <3af0> +<46b3> <708f> endbfchar 100 beginbfchar -<46b3> <708f> <46b4> <d849de7a> <46b5> <d85adda8> <46b6> <d850de4b> @@ -16646,10 +16645,10 @@ endbfchar <4716> <7851> <4717> <7866> <4718> <8448> +<4719> <d855dd35> endbfchar 100 beginbfchar -<4719> <d855dd35> <471a> <7933> <471b> <7932> <471c> <4109> @@ -16749,10 +16748,10 @@ endbfchar <477e> <8cd4> <477f> <8cf2> <4780> <8d1c> +<4781> <4798> endbfchar 100 beginbfchar -<4781> <4798> <4782> <8dc3> <4783> <47ed> <4784> <8e3a> @@ -16852,14 +16851,14 @@ endbfchar <47e4> <d841de76> <47e5> <d845deba> <47e6> <5757> +<47e7> <7173> endbfchar 100 beginbfchar -<47e7> <7173> <47e8> <d842dec2> <47e9> <d842decd> <47ea> <d842dfbf> -<47eb> <5406fe00> +<47eb> <d87edc3b> <47ec> <d842dfcb> <47ed> <549e> <47ee> <d842dffb> @@ -16955,10 +16954,10 @@ endbfchar <4848> <d850df96> <4849> <d851dc04> <484a> <d851dcd6> +<484b> <5788> endbfchar 100 beginbfchar -<484b> <5788> <484c> <d851de74> <484d> <d851df2f> <484e> <d852dc12> @@ -17058,10 +17057,10 @@ endbfchar <48ae> <8fd0> <48af> <d865dce7> <48b0> <d865ddb0> +<48b1> <d865ddb8> endbfchar 100 beginbfchar -<48b1> <d865ddb8> <48b2> <d865df32> <48b3> <d866dcd1> <48b4> <d866dd49> @@ -17161,10 +17160,10 @@ endbfchar <4912> <d84cdcda> <4913> <d844dea9> <4914> <57a7> +<4915> <d852dd63> endbfchar 100 beginbfchar -<4915> <d852dd63> <4916> <d85cdcae> <4917> <d845df6c> <4918> <d85cdd64> @@ -17182,7 +17181,7 @@ endbfchar <4924> <717a> <4925> <d852de77> <4926> <d862de5a> -<4927> <54a2fe00> +<4927> <d87edc40> <4928> <d846dc3b> <4929> <d858dd59> <492a> <d84cdff5> @@ -17264,10 +17263,10 @@ endbfchar <4976> <0251> <4977> <0113> <4978> <00e9> +<4979> <011b> endbfchar 100 beginbfchar -<4979> <011b> <497a> <00e8> <497b> <012b> <497c> <00ed> @@ -17367,10 +17366,10 @@ endbfchar <49dc> <5fc2> <49dd> <d849df12> <49de> <658b> +<49df> <d84cdff9> endbfchar 100 beginbfchar -<49df> <d84cdff9> <49e0> <6919> <49e1> <6a43> <49e2> <d84fdc63> @@ -17470,10 +17469,10 @@ endbfchar <4a42> <d847dd5e> <4a43> <5aa4> <4a44> <3625> +<4a45> <d867deb0> endbfchar 100 beginbfchar -<4a45> <d867deb0> <4a46> <5ad1> <4a47> <5bb7> <4a48> <5cfc> @@ -17573,10 +17572,10 @@ endbfchar <4aa6> <9218> <4aa7> <79d0> <4aa8> <7a32> +<4aa9> <6660> endbfchar -66 beginbfchar -<4aa9> <6660> +65 beginbfchar <4aaa> <6a29> <4aab> <889d> <4aac> <744c> @@ -17676,7 +17675,7 @@ endbfchar <00df> <00e3> <fe62> <00e5> <00e6> <2229> <00f9> <00fa> <2196> -<0106> <0107> <ffe0> +<0106> <0107> <00a2> <010c> <010e> <fe69> <0110> <0112> <339c> <0115> <0116> <338e> @@ -18241,7 +18240,7 @@ endbfrange <352d> <352e> <9a66> <3539> <353a> <9480> <3547> <3548> <7069> -<3551> <35ae> <0021> +<3550> <35ae> <0020> <35b5> <35b6> <30fd> <35b7> <35b8> <309d> <35ba> <35bc> <3005> @@ -18266,7 +18265,7 @@ endbfrange <3d6b> <3d6c> <8fbb> <41b2> <41b3> <d84cddf7> <41b5> <41b6> <d84cdda4> -<4250> <4251> <d850dd56> +<4250> <4251> <e251> <4259> <425a> <70d5> <4400> <445e> <0020> <4462> <44c0> <0020> diff --git a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 index 72d9a1fe4d..6faf818ed4 100644 --- a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 +++ b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-GB1-UCS2 @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (Adobe-GB1-UCS2) %%Title: (Adobe-GB1-UCS2 Adobe GB1 5) -%%Version: 9.000 +%%Version: 8.004 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2020 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /Adobe-GB1-UCS2 def -/CMapVersion 9.000 def +/CMapVersion 8.004 def /CMapType 2 def /XUID [1 10 25335 1212] def @@ -65,10988 +65,10980 @@ end def endcodespacerange 100 beginbfchar -<0000> <fffd> -<0063> <00b7> -<0064> <02c9> -<0065> <02c7> -<0066> <00a8> -<0067> <3003> -<0068> <3005> -<0069> <2014> -<006a> <ff5e> -<006b> <2016> -<006c> <2026> -<007f> <00b1> -<0080> <00d7> -<0081> <00f7> -<0082> <2236> -<0085> <2211> -<0086> <220f> -<0087> <222a> -<0088> <2229> -<0089> <2208> -<008a> <2237> -<008b> <221a> -<008c> <22a5> -<008d> <2225> -<008e> <2220> -<008f> <2312> -<0090> <2299> -<0091> <222b> -<0092> <222e> -<0093> <2261> -<0094> <224c> -<0095> <2248> -<0096> <223d> -<0097> <221d> -<0098> <2260> -<009d> <221e> -<009e> <2235> -<009f> <2234> -<00a0> <2642> -<00a1> <2640> -<00a2> <00b0> -<00a5> <2103> -<00a6> <ff04> -<00a7> <00a4> -<00aa> <2030> -<00ab> <00a7> -<00ac> <2116> -<00ad> <2606> -<00ae> <2605> -<00af> <25cb> -<00b0> <25cf> -<00b1> <25ce> -<00b2> <25c7> -<00b3> <25c6> -<00b4> <25a1> -<00b5> <25a0> -<00b6> <25b3> -<00b7> <25b2> -<00b8> <203b> -<00b9> <2192> -<00bc> <2193> -<00bd> <3013> -<0109> <ffe5> -<0163> <ffe3> -<023d> <ff0c> -<023e> <3002> -<023f> <3001> -<0242> <ff01> -<0243> <ff1f> -<0254> <ff5b> -<0255> <ff5d> -<0256> <2014> -<0257> <2026> -<0258> <ff3f> -<0259> <fe34> -<0260> <0401> -<0281> <0451> -<029c> <0101> -<029d> <00e1> -<029e> <01ce> -<029f> <00e0> -<02a0> <0113> -<02a1> <00e9> -<02a2> <011b> -<02a3> <00e8> -<02a4> <012b> -<02a5> <00ed> -<02a6> <01d0> -<02a7> <00ec> -<02a8> <014d> -<02a9> <00f3> -<02aa> <01d2> -<02ab> <00f2> -<02ac> <016b> -<02ad> <00fa> -<02ae> <01d4> -<02af> <00f9> -<02b0> <01d6> -<02b1> <01d8> -<02b2> <01da> +<0000> <fffd> +<0063> <00b7> +<0064> <02c9> +<0065> <02c7> +<0066> <00a8> +<0067> <3003> +<0068> <3005> +<0069> <2014> +<006a> <ff5e> +<006b> <2016> +<006c> <22ef> +<007f> <00b1> +<0080> <00d7> +<0081> <00f7> +<0082> <2236> +<0085> <2211> +<0086> <220f> +<0087> <222a> +<0088> <2229> +<0089> <2208> +<008a> <2237> +<008b> <221a> +<008c> <22a5> +<008d> <2225> +<008e> <2220> +<008f> <2312> +<0090> <2299> +<0091> <222b> +<0092> <222e> +<0093> <2261> +<0094> <224c> +<0095> <2248> +<0096> <223d> +<0097> <221d> +<0098> <2260> +<009d> <221e> +<009e> <2235> +<009f> <2234> +<00a0> <2642> +<00a1> <2640> +<00a2> <00b0> +<00a5> <2103> +<00a6> <ff04> +<00a7> <00a4> +<00aa> <2030> +<00ab> <00a7> +<00ac> <2116> +<00ad> <2606> +<00ae> <2605> +<00af> <25cb> +<00b0> <25cf> +<00b1> <25ce> +<00b2> <25c7> +<00b3> <25c6> +<00b4> <25a1> +<00b5> <25a0> +<00b6> <25b3> +<00b7> <25b2> +<00b8> <203b> +<00b9> <2192> +<00bc> <2193> +<00bd> <3013> +<0109> <ffe5> +<0163> <ffe3> +<023d> <ff0c> +<023e> <3002> +<023f> <3001> +<0242> <ff01> +<0243> <ff1f> +<0256> <fe31> +<0257> <2026> +<0260> <0401> +<0281> <0451> +<029c> <0101> +<029d> <00e1> +<029e> <01ce> +<029f> <00e0> +<02a0> <0113> +<02a1> <00e9> +<02a2> <011b> +<02a3> <00e8> +<02a4> <012b> +<02a5> <00ed> +<02a6> <01d0> +<02a7> <00ec> +<02a8> <014d> +<02a9> <00f3> +<02aa> <01d2> +<02ab> <00f2> +<02ac> <016b> +<02ad> <00fa> +<02ae> <01d4> +<02af> <00f9> +<02b0> <01d6> +<02b1> <01d8> +<02b2> <01da> +<02b3> <01dc> +<02b4> <00fc> +<02b5> <00ea> +<02b6> <0251> endbfchar 100 beginbfchar -<02b3> <01dc> -<02b4> <00fc> -<02b5> <00ea> -<02b6> <0251> -<02b7> <1e3f> -<02b8> <0144> -<02b9> <0148> -<02ba> <01f9> -<02bb> <0261> -<02e1> <3127> -<038c> <0101> -<038d> <00e1> -<038e> <01ce> -<038f> <00e0> -<0390> <0113> -<0391> <00e9> -<0392> <011b> -<0393> <00e8> -<0394> <012b> -<0395> <00ed> -<0396> <01d0> -<0397> <00ec> -<0398> <014d> -<0399> <00f3> -<039a> <01d2> -<039b> <00f2> -<039c> <016b> -<039d> <00fa> -<039e> <01d4> -<039f> <00f9> -<03a0> <01d6> -<03a1> <01d8> -<03a2> <01da> -<03a3> <01dc> -<03a4> <00fc> -<03a5> <00ea> -<03a6> <0251> -<03a7> <1e3f> -<03a8> <0144> -<03a9> <0148> -<03aa> <01f9> -<03ab> <0261> -<03ac> <554a> -<03ad> <963f> -<03ae> <57c3> -<03af> <6328> -<03b0> <54ce> -<03b1> <5509> -<03b2> <54c0> -<03b3> <7691> -<03b4> <764c> -<03b5> <853c> -<03b6> <77ee> -<03b7> <827e> -<03b8> <788d> -<03b9> <7231> -<03ba> <9698> -<03bb> <978d> -<03bc> <6c28> -<03bd> <5b89> -<03be> <4ffa> -<03bf> <6309> -<03c0> <6697> -<03c1> <5cb8> -<03c2> <80fa> -<03c3> <6848> -<03c4> <80ae> -<03c5> <6602> -<03c6> <76ce> -<03c7> <51f9> -<03c8> <6556> -<03c9> <71ac> -<03ca> <7ff1> -<03cb> <8884> -<03cc> <50b2> -<03cd> <5965> -<03ce> <61ca> -<03cf> <6fb3> -<03d0> <82ad> -<03d1> <634c> -<03d2> <6252> -<03d3> <53ed> -<03d4> <5427> -<03d5> <7b06> -<03d6> <516b> -<03d7> <75a4> -<03d8> <5df4> -<03d9> <62d4> -<03da> <8dcb> -<03db> <9776> -<03dc> <628a> -<03dd> <8019> -<03de> <575d> -<03df> <9738> -<03e0> <7f62> -<03e1> <7238> -<03e2> <767d> -<03e3> <67cf> -<03e4> <767e> -<03e5> <6446> +<02b7> <1e3f> +<02b8> <0144> +<02b9> <0148> +<02ba> <01f9> +<02bb> <0261> +<02e1> <e7cd> +<038c> <0101> +<038d> <00e1> +<038e> <01ce> +<038f> <00e0> +<0390> <0113> +<0391> <00e9> +<0392> <011b> +<0393> <00e8> +<0394> <012b> +<0395> <00ed> +<0396> <01d0> +<0397> <00ec> +<0398> <014d> +<0399> <00f3> +<039a> <01d2> +<039b> <00f2> +<039c> <016b> +<039d> <00fa> +<039e> <01d4> +<039f> <00f9> +<03a0> <01d6> +<03a1> <01d8> +<03a2> <01da> +<03a3> <01dc> +<03a4> <00fc> +<03a5> <00ea> +<03a6> <0251> +<03a7> <1e3f> +<03a8> <0144> +<03a9> <0148> +<03aa> <01f9> +<03ab> <0261> +<03ac> <554a> +<03ad> <963f> +<03ae> <57c3> +<03af> <6328> +<03b0> <54ce> +<03b1> <5509> +<03b2> <54c0> +<03b3> <7691> +<03b4> <764c> +<03b5> <853c> +<03b6> <77ee> +<03b7> <827e> +<03b8> <788d> +<03b9> <7231> +<03ba> <9698> +<03bb> <978d> +<03bc> <6c28> +<03bd> <5b89> +<03be> <4ffa> +<03bf> <6309> +<03c0> <6697> +<03c1> <5cb8> +<03c2> <80fa> +<03c3> <6848> +<03c4> <80ae> +<03c5> <6602> +<03c6> <76ce> +<03c7> <51f9> +<03c8> <6556> +<03c9> <71ac> +<03ca> <7ff1> +<03cb> <8884> +<03cc> <50b2> +<03cd> <5965> +<03ce> <61ca> +<03cf> <6fb3> +<03d0> <82ad> +<03d1> <634c> +<03d2> <6252> +<03d3> <53ed> +<03d4> <5427> +<03d5> <7b06> +<03d6> <516b> +<03d7> <75a4> +<03d8> <5df4> +<03d9> <62d4> +<03da> <8dcb> +<03db> <9776> +<03dc> <628a> +<03dd> <8019> +<03de> <575d> +<03df> <9738> +<03e0> <7f62> +<03e1> <7238> +<03e2> <767d> +<03e3> <67cf> +<03e4> <767e> +<03e5> <6446> +<03e6> <4f70> +<03e7> <8d25> +<03e8> <62dc> +<03e9> <7a17> endbfchar 100 beginbfchar -<03e6> <4f70> -<03e7> <8d25> -<03e8> <62dc> -<03e9> <7a17> -<03ea> <6591> -<03eb> <73ed> -<03ec> <642c> -<03ed> <6273> -<03ee> <822c> -<03ef> <9881> -<03f0> <677f> -<03f1> <7248> -<03f2> <626e> -<03f3> <62cc> -<03f4> <4f34> -<03f5> <74e3> -<03f6> <534a> -<03f7> <529e> -<03f8> <7eca> -<03f9> <90a6> -<03fa> <5e2e> -<03fb> <6886> -<03fc> <699c> -<03fd> <8180> -<03fe> <7ed1> -<03ff> <68d2> -<0400> <78c5> -<0401> <868c> -<0402> <9551> -<0403> <508d> -<0404> <8c24> -<0405> <82de> -<0406> <80de> -<0407> <5305> -<0408> <8912> -<0409> <5265> -<040a> <8584> -<040b> <96f9> -<040c> <4fdd> -<040d> <5821> -<040e> <9971> -<040f> <5b9d> -<0410> <62b1> -<0411> <62a5> -<0412> <66b4> -<0413> <8c79> -<0414> <9c8d> -<0415> <7206> -<0416> <676f> -<0417> <7891> -<0418> <60b2> -<0419> <5351> -<041a> <5317> -<041b> <8f88> -<041c> <80cc> -<041d> <8d1d> -<041e> <94a1> -<041f> <500d> -<0420> <72c8> -<0421> <5907> -<0422> <60eb> -<0423> <7119> -<0424> <88ab> -<0425> <5954> -<0426> <82ef> -<0427> <672c> -<0428> <7b28> -<0429> <5d29> -<042a> <7ef7> -<042b> <752d> -<042c> <6cf5> -<042d> <8e66> -<042e> <8ff8> -<042f> <903c> -<0430> <9f3b> -<0431> <6bd4> -<0432> <9119> -<0433> <7b14> -<0434> <5f7c> -<0435> <78a7> -<0436> <84d6> -<0437> <853d> -<0438> <6bd5> -<0439> <6bd9> -<043a> <6bd6> -<043b> <5e01> -<043c> <5e87> -<043d> <75f9> -<043e> <95ed> -<043f> <655d> -<0440> <5f0a> -<0441> <5fc5> -<0442> <8f9f> -<0443> <58c1> -<0444> <81c2> -<0445> <907f> -<0446> <965b> -<0447> <97ad> -<0448> <8fb9> -<0449> <7f16> +<03ea> <6591> +<03eb> <73ed> +<03ec> <642c> +<03ed> <6273> +<03ee> <822c> +<03ef> <9881> +<03f0> <677f> +<03f1> <7248> +<03f2> <626e> +<03f3> <62cc> +<03f4> <4f34> +<03f5> <74e3> +<03f6> <534a> +<03f7> <529e> +<03f8> <7eca> +<03f9> <90a6> +<03fa> <5e2e> +<03fb> <6886> +<03fc> <699c> +<03fd> <8180> +<03fe> <7ed1> +<03ff> <68d2> +<0400> <78c5> +<0401> <868c> +<0402> <9551> +<0403> <508d> +<0404> <8c24> +<0405> <82de> +<0406> <80de> +<0407> <5305> +<0408> <8912> +<0409> <5265> +<040a> <8584> +<040b> <96f9> +<040c> <4fdd> +<040d> <5821> +<040e> <9971> +<040f> <5b9d> +<0410> <62b1> +<0411> <62a5> +<0412> <66b4> +<0413> <8c79> +<0414> <9c8d> +<0415> <7206> +<0416> <676f> +<0417> <7891> +<0418> <60b2> +<0419> <5351> +<041a> <5317> +<041b> <8f88> +<041c> <80cc> +<041d> <8d1d> +<041e> <94a1> +<041f> <500d> +<0420> <72c8> +<0421> <5907> +<0422> <60eb> +<0423> <7119> +<0424> <88ab> +<0425> <5954> +<0426> <82ef> +<0427> <672c> +<0428> <7b28> +<0429> <5d29> +<042a> <7ef7> +<042b> <752d> +<042c> <6cf5> +<042d> <8e66> +<042e> <8ff8> +<042f> <903c> +<0430> <9f3b> +<0431> <6bd4> +<0432> <9119> +<0433> <7b14> +<0434> <5f7c> +<0435> <78a7> +<0436> <84d6> +<0437> <853d> +<0438> <6bd5> +<0439> <6bd9> +<043a> <6bd6> +<043b> <5e01> +<043c> <5e87> +<043d> <75f9> +<043e> <95ed> +<043f> <655d> +<0440> <5f0a> +<0441> <5fc5> +<0442> <8f9f> +<0443> <58c1> +<0444> <81c2> +<0445> <907f> +<0446> <965b> +<0447> <97ad> +<0448> <8fb9> +<0449> <7f16> +<044a> <8d2c> +<044b> <6241> +<044c> <4fbf> +<044d> <53d8> endbfchar 100 beginbfchar -<044a> <8d2c> -<044b> <6241> -<044c> <4fbf> -<044d> <53d8> -<044e> <535e> -<0451> <8fab> -<0452> <904d> -<0453> <6807> -<0454> <5f6a> -<0455> <8198> -<0456> <8868> -<0457> <9cd6> -<0458> <618b> -<0459> <522b> -<045a> <762a> -<045b> <5f6c> -<045c> <658c> -<045d> <6fd2> -<045e> <6ee8> -<045f> <5bbe> -<0460> <6448> -<0461> <5175> -<0462> <51b0> -<0463> <67c4> -<0464> <4e19> -<0465> <79c9> -<0466> <997c> -<0467> <70b3> -<0468> <75c5> -<0469> <5e76> -<046a> <73bb> -<046b> <83e0> -<046c> <64ad> -<046d> <62e8> -<046e> <94b5> -<046f> <6ce2> -<0470> <535a> -<0471> <52c3> -<0472> <640f> -<0473> <94c2> -<0474> <7b94> -<0475> <4f2f> -<0476> <5e1b> -<0477> <8236> -<0478> <8116> -<0479> <818a> -<047a> <6e24> -<047b> <6cca> -<047c> <9a73> -<047d> <6355> -<047e> <535c> -<047f> <54fa> -<0480> <8865> -<0481> <57e0> -<0482> <4e0d> -<0483> <5e03> -<0484> <6b65> -<0485> <7c3f> -<0486> <90e8> -<0487> <6016> -<0488> <64e6> -<0489> <731c> -<048a> <88c1> -<048b> <6750> -<048c> <624d> -<048d> <8d22> -<048e> <776c> -<048f> <8e29> -<0490> <91c7> -<0491> <5f69> -<0492> <83dc> -<0493> <8521> -<0494> <9910> -<0495> <53c2> -<0496> <8695> -<0497> <6b8b> -<0498> <60ed> -<0499> <60e8> -<049a> <707f> -<049b> <82cd> -<049c> <8231> -<049d> <4ed3> -<049e> <6ca7> -<049f> <85cf> -<04a0> <64cd> -<04a1> <7cd9> -<04a2> <69fd> -<04a3> <66f9> -<04a4> <8349> -<04a5> <5395> -<04a6> <7b56> -<04a7> <4fa7> -<04a8> <518c> -<04a9> <6d4b> -<04aa> <5c42> -<04ab> <8e6d> -<04ac> <63d2> -<04ad> <53c9> -<04ae> <832c> -<04af> <8336> +<044e> <535e> +<0451> <8fab> +<0452> <904d> +<0453> <6807> +<0454> <5f6a> +<0455> <8198> +<0456> <8868> +<0457> <9cd6> +<0458> <618b> +<0459> <522b> +<045a> <762a> +<045b> <5f6c> +<045c> <658c> +<045d> <6fd2> +<045e> <6ee8> +<045f> <5bbe> +<0460> <6448> +<0461> <5175> +<0462> <51b0> +<0463> <67c4> +<0464> <4e19> +<0465> <79c9> +<0466> <997c> +<0467> <70b3> +<0468> <75c5> +<0469> <5e76> +<046a> <73bb> +<046b> <83e0> +<046c> <64ad> +<046d> <62e8> +<046e> <94b5> +<046f> <6ce2> +<0470> <535a> +<0471> <52c3> +<0472> <640f> +<0473> <94c2> +<0474> <7b94> +<0475> <4f2f> +<0476> <5e1b> +<0477> <8236> +<0478> <8116> +<0479> <818a> +<047a> <6e24> +<047b> <6cca> +<047c> <9a73> +<047d> <6355> +<047e> <535c> +<047f> <54fa> +<0480> <8865> +<0481> <57e0> +<0482> <4e0d> +<0483> <5e03> +<0484> <6b65> +<0485> <7c3f> +<0486> <90e8> +<0487> <6016> +<0488> <64e6> +<0489> <731c> +<048a> <88c1> +<048b> <6750> +<048c> <624d> +<048d> <8d22> +<048e> <776c> +<048f> <8e29> +<0490> <91c7> +<0491> <5f69> +<0492> <83dc> +<0493> <8521> +<0494> <9910> +<0495> <53c2> +<0496> <8695> +<0497> <6b8b> +<0498> <60ed> +<0499> <60e8> +<049a> <707f> +<049b> <82cd> +<049c> <8231> +<049d> <4ed3> +<049e> <6ca7> +<049f> <85cf> +<04a0> <64cd> +<04a1> <7cd9> +<04a2> <69fd> +<04a3> <66f9> +<04a4> <8349> +<04a5> <5395> +<04a6> <7b56> +<04a7> <4fa7> +<04a8> <518c> +<04a9> <6d4b> +<04aa> <5c42> +<04ab> <8e6d> +<04ac> <63d2> +<04ad> <53c9> +<04ae> <832c> +<04af> <8336> +<04b0> <67e5> +<04b1> <78b4> +<04b2> <643d> +<04b3> <5bdf> endbfchar 100 beginbfchar -<04b0> <67e5> -<04b1> <78b4> -<04b2> <643d> -<04b3> <5bdf> -<04b4> <5c94> -<04b5> <5dee> -<04b6> <8be7> -<04b7> <62c6> -<04b8> <67f4> -<04b9> <8c7a> -<04ba> <6400> -<04bb> <63ba> -<04bc> <8749> -<04bd> <998b> -<04be> <8c17> -<04bf> <7f20> -<04c0> <94f2> -<04c1> <4ea7> -<04c2> <9610> -<04c3> <98a4> -<04c4> <660c> -<04c5> <7316> -<04c6> <573a> -<04c7> <5c1d> -<04c8> <5e38> -<04c9> <957f> -<04ca> <507f> -<04cb> <80a0> -<04cc> <5382> -<04cd> <655e> -<04ce> <7545> -<04cf> <5531> -<04d0> <5021> -<04d1> <8d85> -<04d2> <6284> -<04d3> <949e> -<04d4> <671d> -<04d5> <5632> -<04d6> <6f6e> -<04d7> <5de2> -<04d8> <5435> -<04d9> <7092> -<04da> <8f66> -<04db> <626f> -<04dc> <64a4> -<04dd> <63a3> -<04de> <5f7b> -<04df> <6f88> -<04e0> <90f4> -<04e1> <81e3> -<04e2> <8fb0> -<04e3> <5c18> -<04e4> <6668> -<04e5> <5ff1> -<04e6> <6c89> -<04e7> <9648> -<04e8> <8d81> -<04e9> <886c> -<04ea> <6491> -<04eb> <79f0> -<04ec> <57ce> -<04ed> <6a59> -<04ee> <6210> -<04ef> <5448> -<04f0> <4e58> -<04f1> <7a0b> -<04f2> <60e9> -<04f3> <6f84> -<04f4> <8bda> -<04f5> <627f> -<04f6> <901e> -<04f7> <9a8b> -<04f8> <79e4> -<04f9> <5403> -<04fa> <75f4> -<04fb> <6301> -<04fc> <5319> -<04fd> <6c60> -<04fe> <8fdf> -<04ff> <5f1b> -<0500> <9a70> -<0501> <803b> -<0502> <9f7f> -<0503> <4f88> -<0504> <5c3a> -<0505> <8d64> -<0506> <7fc5> -<0507> <65a5> -<0508> <70bd> -<0509> <5145> -<050a> <51b2> -<050b> <866b> -<050c> <5d07> -<050d> <5ba0> -<050e> <62bd> -<050f> <916c> -<0510> <7574> -<0511> <8e0c> -<0512> <7a20> -<0513> <6101> +<04b4> <5c94> +<04b5> <5dee> +<04b6> <8be7> +<04b7> <62c6> +<04b8> <67f4> +<04b9> <8c7a> +<04ba> <6400> +<04bb> <63ba> +<04bc> <8749> +<04bd> <998b> +<04be> <8c17> +<04bf> <7f20> +<04c0> <94f2> +<04c1> <4ea7> +<04c2> <9610> +<04c3> <98a4> +<04c4> <660c> +<04c5> <7316> +<04c6> <573a> +<04c7> <5c1d> +<04c8> <5e38> +<04c9> <957f> +<04ca> <507f> +<04cb> <80a0> +<04cc> <5382> +<04cd> <655e> +<04ce> <7545> +<04cf> <5531> +<04d0> <5021> +<04d1> <8d85> +<04d2> <6284> +<04d3> <949e> +<04d4> <671d> +<04d5> <5632> +<04d6> <6f6e> +<04d7> <5de2> +<04d8> <5435> +<04d9> <7092> +<04da> <8f66> +<04db> <626f> +<04dc> <64a4> +<04dd> <63a3> +<04de> <5f7b> +<04df> <6f88> +<04e0> <90f4> +<04e1> <81e3> +<04e2> <8fb0> +<04e3> <5c18> +<04e4> <6668> +<04e5> <5ff1> +<04e6> <6c89> +<04e7> <9648> +<04e8> <8d81> +<04e9> <886c> +<04ea> <6491> +<04eb> <79f0> +<04ec> <57ce> +<04ed> <6a59> +<04ee> <6210> +<04ef> <5448> +<04f0> <4e58> +<04f1> <7a0b> +<04f2> <60e9> +<04f3> <6f84> +<04f4> <8bda> +<04f5> <627f> +<04f6> <901e> +<04f7> <9a8b> +<04f8> <79e4> +<04f9> <5403> +<04fa> <75f4> +<04fb> <6301> +<04fc> <5319> +<04fd> <6c60> +<04fe> <8fdf> +<04ff> <5f1b> +<0500> <9a70> +<0501> <803b> +<0502> <9f7f> +<0503> <4f88> +<0504> <5c3a> +<0505> <8d64> +<0506> <7fc5> +<0507> <65a5> +<0508> <70bd> +<0509> <5145> +<050a> <51b2> +<050b> <866b> +<050c> <5d07> +<050d> <5ba0> +<050e> <62bd> +<050f> <916c> +<0510> <7574> +<0511> <8e0c> +<0512> <7a20> +<0513> <6101> +<0514> <7b79> +<0515> <4ec7> +<0516> <7ef8> +<0517> <7785> endbfchar 100 beginbfchar -<0514> <7b79> -<0515> <4ec7> -<0516> <7ef8> -<0517> <7785> -<0518> <4e11> -<0519> <81ed> -<051a> <521d> -<051b> <51fa> -<051c> <6a71> -<051d> <53a8> -<051e> <8e87> -<051f> <9504> -<0520> <96cf> -<0521> <6ec1> -<0522> <9664> -<0523> <695a> -<0524> <7840> -<0525> <50a8> -<0526> <77d7> -<0527> <6410> -<0528> <89e6> -<0529> <5904> -<052a> <63e3> -<052b> <5ddd> -<052c> <7a7f> -<052d> <693d> -<052e> <4f20> -<052f> <8239> -<0530> <5598> -<0531> <4e32> -<0532> <75ae> -<0533> <7a97> -<0534> <5e62> -<0535> <5e8a> -<0536> <95ef> -<0537> <521b> -<0538> <5439> -<0539> <708a> -<053a> <6376> -<053b> <9524> -<053c> <5782> -<053d> <6625> -<053e> <693f> -<053f> <9187> -<0540> <5507> -<0541> <6df3> -<0542> <7eaf> -<0543> <8822> -<0544> <6233> -<0545> <7ef0> -<0546> <75b5> -<0547> <8328> -<0548> <78c1> -<0549> <96cc> -<054a> <8f9e> -<054b> <6148> -<054c> <74f7> -<054d> <8bcd> -<054e> <6b64> -<054f> <523a> -<0550> <8d50> -<0551> <6b21> -<0552> <806a> -<0553> <8471> -<0554> <56f1> -<0555> <5306> -<0556> <4ece> -<0557> <4e1b> -<0558> <51d1> -<0559> <7c97> -<055a> <918b> -<055b> <7c07> -<055c> <4fc3> -<055d> <8e7f> -<055e> <7be1> -<055f> <7a9c> -<0560> <6467> -<0561> <5d14> -<0562> <50ac> -<0563> <8106> -<0564> <7601> -<0565> <7cb9> -<0566> <6dec> -<0567> <7fe0> -<0568> <6751> -<0569> <5b58> -<056a> <5bf8> -<056b> <78cb> -<056c> <64ae> -<056d> <6413> -<056e> <63aa> -<056f> <632b> -<0570> <9519> -<0571> <642d> -<0572> <8fbe> -<0573> <7b54> -<0574> <7629> -<0575> <6253> -<0576> <5927> -<0577> <5446> +<0518> <4e11> +<0519> <81ed> +<051a> <521d> +<051b> <51fa> +<051c> <6a71> +<051d> <53a8> +<051e> <8e87> +<051f> <9504> +<0520> <96cf> +<0521> <6ec1> +<0522> <9664> +<0523> <695a> +<0524> <7840> +<0525> <50a8> +<0526> <77d7> +<0527> <6410> +<0528> <89e6> +<0529> <5904> +<052a> <63e3> +<052b> <5ddd> +<052c> <7a7f> +<052d> <693d> +<052e> <4f20> +<052f> <8239> +<0530> <5598> +<0531> <4e32> +<0532> <75ae> +<0533> <7a97> +<0534> <5e62> +<0535> <5e8a> +<0536> <95ef> +<0537> <521b> +<0538> <5439> +<0539> <708a> +<053a> <6376> +<053b> <9524> +<053c> <5782> +<053d> <6625> +<053e> <693f> +<053f> <9187> +<0540> <5507> +<0541> <6df3> +<0542> <7eaf> +<0543> <8822> +<0544> <6233> +<0545> <7ef0> +<0546> <75b5> +<0547> <8328> +<0548> <78c1> +<0549> <96cc> +<054a> <8f9e> +<054b> <6148> +<054c> <74f7> +<054d> <8bcd> +<054e> <6b64> +<054f> <523a> +<0550> <8d50> +<0551> <6b21> +<0552> <806a> +<0553> <8471> +<0554> <56f1> +<0555> <5306> +<0556> <4ece> +<0557> <4e1b> +<0558> <51d1> +<0559> <7c97> +<055a> <918b> +<055b> <7c07> +<055c> <4fc3> +<055d> <8e7f> +<055e> <7be1> +<055f> <7a9c> +<0560> <6467> +<0561> <5d14> +<0562> <50ac> +<0563> <8106> +<0564> <7601> +<0565> <7cb9> +<0566> <6dec> +<0567> <7fe0> +<0568> <6751> +<0569> <5b58> +<056a> <5bf8> +<056b> <78cb> +<056c> <64ae> +<056d> <6413> +<056e> <63aa> +<056f> <632b> +<0570> <9519> +<0571> <642d> +<0572> <8fbe> +<0573> <7b54> +<0574> <7629> +<0575> <6253> +<0576> <5927> +<0577> <5446> +<0578> <6b79> +<0579> <50a3> +<057a> <6234> +<057b> <5e26> endbfchar 100 beginbfchar -<0578> <6b79> -<0579> <50a3> -<057a> <6234> -<057b> <5e26> -<057c> <6b86> -<057d> <4ee3> -<057e> <8d37> -<057f> <888b> -<0580> <5f85> -<0581> <902e> -<0582> <6020> -<0583> <803d> -<0584> <62c5> -<0585> <4e39> -<0586> <5355> -<0587> <90f8> -<0588> <63b8> -<0589> <80c6> -<058a> <65e6> -<058b> <6c2e> -<058c> <4f46> -<058d> <60ee> -<058e> <6de1> -<058f> <8bde> -<0590> <5f39> -<0591> <86cb> -<0592> <5f53> -<0593> <6321> -<0594> <515a> -<0595> <8361> -<0596> <6863> -<0597> <5200> -<0598> <6363> -<0599> <8e48> -<059a> <5012> -<059b> <5c9b> -<059c> <7977> -<059d> <5bfc> -<059e> <5230> -<059f> <7a3b> -<05a0> <60bc> -<05a1> <9053> -<05a2> <76d7> -<05a3> <5fb7> -<05a4> <5f97> -<05a5> <7684> -<05a6> <8e6c> -<05a7> <706f> -<05a8> <767b> -<05a9> <7b49> -<05aa> <77aa> -<05ab> <51f3> -<05ac> <9093> -<05ad> <5824> -<05ae> <4f4e> -<05af> <6ef4> -<05b0> <8fea> -<05b1> <654c> -<05b2> <7b1b> -<05b3> <72c4> -<05b4> <6da4> -<05b5> <7fdf> -<05b6> <5ae1> -<05b7> <62b5> -<05b8> <5e95> -<05b9> <5730> -<05ba> <8482> -<05bb> <7b2c> -<05bc> <5e1d> -<05bd> <5f1f> -<05be> <9012> -<05bf> <7f14> -<05c0> <98a0> -<05c1> <6382> -<05c2> <6ec7> -<05c3> <7898> -<05c4> <70b9> -<05c5> <5178> -<05c6> <975b> -<05c7> <57ab> -<05c8> <7535> -<05c9> <4f43> -<05ca> <7538> -<05cb> <5e97> -<05cc> <60e6> -<05cd> <5960> -<05ce> <6dc0> -<05cf> <6bbf> -<05d0> <7889> -<05d1> <53fc> -<05d2> <96d5> -<05d3> <51cb> -<05d4> <5201> -<05d5> <6389> -<05d6> <540a> -<05d7> <9493> -<05d8> <8c03> -<05d9> <8dcc> -<05da> <7239> -<05db> <789f> +<057c> <6b86> +<057d> <4ee3> +<057e> <8d37> +<057f> <888b> +<0580> <5f85> +<0581> <902e> +<0582> <6020> +<0583> <803d> +<0584> <62c5> +<0585> <4e39> +<0586> <5355> +<0587> <90f8> +<0588> <63b8> +<0589> <80c6> +<058a> <65e6> +<058b> <6c2e> +<058c> <4f46> +<058d> <60ee> +<058e> <6de1> +<058f> <8bde> +<0590> <5f39> +<0591> <86cb> +<0592> <5f53> +<0593> <6321> +<0594> <515a> +<0595> <8361> +<0596> <6863> +<0597> <5200> +<0598> <6363> +<0599> <8e48> +<059a> <5012> +<059b> <5c9b> +<059c> <7977> +<059d> <5bfc> +<059e> <5230> +<059f> <7a3b> +<05a0> <60bc> +<05a1> <9053> +<05a2> <76d7> +<05a3> <5fb7> +<05a4> <5f97> +<05a5> <7684> +<05a6> <8e6c> +<05a7> <706f> +<05a8> <767b> +<05a9> <7b49> +<05aa> <77aa> +<05ab> <51f3> +<05ac> <9093> +<05ad> <5824> +<05ae> <4f4e> +<05af> <6ef4> +<05b0> <8fea> +<05b1> <654c> +<05b2> <7b1b> +<05b3> <72c4> +<05b4> <6da4> +<05b5> <7fdf> +<05b6> <5ae1> +<05b7> <62b5> +<05b8> <5e95> +<05b9> <5730> +<05ba> <8482> +<05bb> <7b2c> +<05bc> <5e1d> +<05bd> <5f1f> +<05be> <9012> +<05bf> <7f14> +<05c0> <98a0> +<05c1> <6382> +<05c2> <6ec7> +<05c3> <7898> +<05c4> <70b9> +<05c5> <5178> +<05c6> <975b> +<05c7> <57ab> +<05c8> <7535> +<05c9> <4f43> +<05ca> <7538> +<05cb> <5e97> +<05cc> <60e6> +<05cd> <5960> +<05ce> <6dc0> +<05cf> <6bbf> +<05d0> <7889> +<05d1> <53fc> +<05d2> <96d5> +<05d3> <51cb> +<05d4> <5201> +<05d5> <6389> +<05d6> <540a> +<05d7> <9493> +<05d8> <8c03> +<05d9> <8dcc> +<05da> <7239> +<05db> <789f> +<05dc> <8776> +<05dd> <8fed> +<05de> <8c0d> +<05df> <53e0> endbfchar 100 beginbfchar -<05dc> <8776> -<05dd> <8fed> -<05de> <8c0d> -<05df> <53e0> -<05e0> <4e01> -<05e1> <76ef> -<05e2> <53ee> -<05e3> <9489> -<05e4> <9876> -<05e5> <9f0e> -<05e6> <952d> -<05e7> <5b9a> -<05e8> <8ba2> -<05e9> <4e22> -<05ea> <4e1c> -<05eb> <51ac> -<05ec> <8463> -<05ed> <61c2> -<05ee> <52a8> -<05ef> <680b> -<05f0> <4f97> -<05f1> <606b> -<05f2> <51bb> -<05f3> <6d1e> -<05f4> <515c> -<05f5> <6296> -<05f6> <6597> -<05f7> <9661> -<05f8> <8c46> -<05f9> <9017> -<05fa> <75d8> -<05fb> <90fd> -<05fc> <7763> -<05fd> <6bd2> -<05fe> <728a> -<05ff> <72ec> -<0600> <8bfb> -<0601> <5835> -<0602> <7779> -<0603> <8d4c> -<0604> <675c> -<0605> <9540> -<0606> <809a> -<0607> <5ea6> -<0608> <6e21> -<0609> <5992> -<060a> <7aef> -<060b> <77ed> -<060c> <953b> -<060d> <6bb5> -<060e> <65ad> -<060f> <7f0e> -<0610> <5806> -<0611> <5151> -<0612> <961f> -<0613> <5bf9> -<0614> <58a9> -<0615> <5428> -<0616> <8e72> -<0617> <6566> -<0618> <987f> -<0619> <56e4> -<061a> <949d> -<061b> <76fe> -<061c> <9041> -<061d> <6387> -<061e> <54c6> -<061f> <591a> -<0620> <593a> -<0621> <579b> -<0622> <8eb2> -<0623> <6735> -<0624> <8dfa> -<0625> <8235> -<0626> <5241> -<0627> <60f0> -<0628> <5815> -<0629> <86fe> -<062a> <5ce8> -<062b> <9e45> -<062c> <4fc4> -<062d> <989d> -<062e> <8bb9> -<062f> <5a25> -<0630> <6076> -<0631> <5384> -<0632> <627c> -<0633> <904f> -<0634> <9102> -<0635> <997f> -<0636> <6069> -<0637> <800c> -<0638> <513f> -<0639> <8033> -<063a> <5c14> -<063b> <9975> -<063c> <6d31> -<063d> <4e8c> -<063e> <8d30> -<063f> <53d1> +<05e0> <4e01> +<05e1> <76ef> +<05e2> <53ee> +<05e3> <9489> +<05e4> <9876> +<05e5> <9f0e> +<05e6> <952d> +<05e7> <5b9a> +<05e8> <8ba2> +<05e9> <4e22> +<05ea> <4e1c> +<05eb> <51ac> +<05ec> <8463> +<05ed> <61c2> +<05ee> <52a8> +<05ef> <680b> +<05f0> <4f97> +<05f1> <606b> +<05f2> <51bb> +<05f3> <6d1e> +<05f4> <515c> +<05f5> <6296> +<05f6> <6597> +<05f7> <9661> +<05f8> <8c46> +<05f9> <9017> +<05fa> <75d8> +<05fb> <90fd> +<05fc> <7763> +<05fd> <6bd2> +<05fe> <728a> +<05ff> <72ec> +<0600> <8bfb> +<0601> <5835> +<0602> <7779> +<0603> <8d4c> +<0604> <675c> +<0605> <9540> +<0606> <809a> +<0607> <5ea6> +<0608> <6e21> +<0609> <5992> +<060a> <7aef> +<060b> <77ed> +<060c> <953b> +<060d> <6bb5> +<060e> <65ad> +<060f> <7f0e> +<0610> <5806> +<0611> <5151> +<0612> <961f> +<0613> <5bf9> +<0614> <58a9> +<0615> <5428> +<0616> <8e72> +<0617> <6566> +<0618> <987f> +<0619> <56e4> +<061a> <949d> +<061b> <76fe> +<061c> <9041> +<061d> <6387> +<061e> <54c6> +<061f> <591a> +<0620> <593a> +<0621> <579b> +<0622> <8eb2> +<0623> <6735> +<0624> <8dfa> +<0625> <8235> +<0626> <5241> +<0627> <60f0> +<0628> <5815> +<0629> <86fe> +<062a> <5ce8> +<062b> <9e45> +<062c> <4fc4> +<062d> <989d> +<062e> <8bb9> +<062f> <5a25> +<0630> <6076> +<0631> <5384> +<0632> <627c> +<0633> <904f> +<0634> <9102> +<0635> <997f> +<0636> <6069> +<0637> <800c> +<0638> <513f> +<0639> <8033> +<063a> <5c14> +<063b> <9975> +<063c> <6d31> +<063d> <4e8c> +<063e> <8d30> +<063f> <53d1> +<0640> <7f5a> +<0641> <7b4f> +<0642> <4f10> +<0643> <4e4f> endbfchar 100 beginbfchar -<0640> <7f5a> -<0641> <7b4f> -<0642> <4f10> -<0643> <4e4f> -<0644> <9600> -<0645> <6cd5> -<0646> <73d0> -<0647> <85e9> -<0648> <5e06> -<0649> <756a> -<064a> <7ffb> -<064b> <6a0a> -<064c> <77fe> -<064d> <9492> -<064e> <7e41> -<064f> <51e1> -<0650> <70e6> -<0651> <53cd> -<0652> <8fd4> -<0653> <8303> -<0654> <8d29> -<0655> <72af> -<0656> <996d> -<0657> <6cdb> -<0658> <574a> -<0659> <82b3> -<065a> <65b9> -<065b> <80aa> -<065c> <623f> -<065d> <9632> -<065e> <59a8> -<065f> <4eff> -<0660> <8bbf> -<0661> <7eba> -<0662> <653e> -<0663> <83f2> -<0664> <975e> -<0665> <5561> -<0666> <98de> -<0667> <80a5> -<0668> <532a> -<0669> <8bfd> -<066a> <5420> -<066b> <80ba> -<066c> <5e9f> -<066d> <6cb8> -<066e> <8d39> -<066f> <82ac> -<0670> <915a> -<0671> <5429> -<0672> <6c1b> -<0673> <5206> -<0674> <7eb7> -<0675> <575f> -<0676> <711a> -<0677> <6c7e> -<0678> <7c89> -<0679> <594b> -<067a> <4efd> -<067b> <5fff> -<067c> <6124> -<067d> <7caa> -<067e> <4e30> -<067f> <5c01> -<0680> <67ab> -<0681> <8702> -<0682> <5cf0> -<0683> <950b> -<0684> <98ce> -<0685> <75af> -<0686> <70fd> -<0687> <9022> -<0688> <51af> -<0689> <7f1d> -<068a> <8bbd> -<068b> <5949> -<068c> <51e4> -<068d> <4f5b> -<068e> <5426> -<068f> <592b> -<0690> <6577> -<0691> <80a4> -<0692> <5b75> -<0693> <6276> -<0694> <62c2> -<0695> <8f90> -<0696> <5e45> -<0697> <6c1f> -<0698> <7b26> -<0699> <4f0f> -<069a> <4fd8> -<069b> <670d> -<069c> <6d6e> -<069d> <6daa> -<069e> <798f> -<069f> <88b1> -<06a0> <5f17> -<06a1> <752b> -<06a2> <629a> -<06a3> <8f85> +<0644> <9600> +<0645> <6cd5> +<0646> <73d0> +<0647> <85e9> +<0648> <5e06> +<0649> <756a> +<064a> <7ffb> +<064b> <6a0a> +<064c> <77fe> +<064d> <9492> +<064e> <7e41> +<064f> <51e1> +<0650> <70e6> +<0651> <53cd> +<0652> <8fd4> +<0653> <8303> +<0654> <8d29> +<0655> <72af> +<0656> <996d> +<0657> <6cdb> +<0658> <574a> +<0659> <82b3> +<065a> <65b9> +<065b> <80aa> +<065c> <623f> +<065d> <9632> +<065e> <59a8> +<065f> <4eff> +<0660> <8bbf> +<0661> <7eba> +<0662> <653e> +<0663> <83f2> +<0664> <975e> +<0665> <5561> +<0666> <98de> +<0667> <80a5> +<0668> <532a> +<0669> <8bfd> +<066a> <5420> +<066b> <80ba> +<066c> <5e9f> +<066d> <6cb8> +<066e> <8d39> +<066f> <82ac> +<0670> <915a> +<0671> <5429> +<0672> <6c1b> +<0673> <5206> +<0674> <7eb7> +<0675> <575f> +<0676> <711a> +<0677> <6c7e> +<0678> <7c89> +<0679> <594b> +<067a> <4efd> +<067b> <5fff> +<067c> <6124> +<067d> <7caa> +<067e> <4e30> +<067f> <5c01> +<0680> <67ab> +<0681> <8702> +<0682> <5cf0> +<0683> <950b> +<0684> <98ce> +<0685> <75af> +<0686> <70fd> +<0687> <9022> +<0688> <51af> +<0689> <7f1d> +<068a> <8bbd> +<068b> <5949> +<068c> <51e4> +<068d> <4f5b> +<068e> <5426> +<068f> <592b> +<0690> <6577> +<0691> <80a4> +<0692> <5b75> +<0693> <6276> +<0694> <62c2> +<0695> <8f90> +<0696> <5e45> +<0697> <6c1f> +<0698> <7b26> +<0699> <4f0f> +<069a> <4fd8> +<069b> <670d> +<069c> <6d6e> +<069d> <6daa> +<069e> <798f> +<069f> <88b1> +<06a0> <5f17> +<06a1> <752b> +<06a2> <629a> +<06a3> <8f85> +<06a4> <4fef> +<06a5> <91dc> +<06a6> <65a7> +<06a7> <812f> endbfchar 100 beginbfchar -<06a4> <4fef> -<06a5> <91dc> -<06a6> <65a7> -<06a7> <812f> -<06a8> <8151> -<06a9> <5e9c> -<06aa> <8150> -<06ab> <8d74> -<06ac> <526f> -<06ad> <8986> -<06ae> <8d4b> -<06af> <590d> -<06b0> <5085> -<06b1> <4ed8> -<06b2> <961c> -<06b3> <7236> -<06b4> <8179> -<06b5> <8d1f> -<06b6> <5bcc> -<06b7> <8ba3> -<06b8> <9644> -<06b9> <5987> -<06ba> <7f1a> -<06bb> <5490> -<06bc> <5676> -<06bd> <560e> -<06be> <8be5> -<06bf> <6539> -<06c0> <6982> -<06c1> <9499> -<06c2> <76d6> -<06c3> <6e89> -<06c4> <5e72> -<06c5> <7518> -<06c6> <6746> -<06c7> <67d1> -<06c8> <7aff> -<06c9> <809d> -<06ca> <8d76> -<06cb> <611f> -<06cc> <79c6> -<06cd> <6562> -<06ce> <8d63> -<06cf> <5188> -<06d0> <521a> -<06d1> <94a2> -<06d2> <7f38> -<06d3> <809b> -<06d4> <7eb2> -<06d5> <5c97> -<06d6> <6e2f> -<06d7> <6760> -<06d8> <7bd9> -<06d9> <768b> -<06da> <9ad8> -<06db> <818f> -<06dc> <7f94> -<06dd> <7cd5> -<06de> <641e> -<06df> <9550> -<06e0> <7a3f> -<06e1> <544a> -<06e2> <54e5> -<06e3> <6b4c> -<06e4> <6401> -<06e5> <6208> -<06e6> <9e3d> -<06e7> <80f3> -<06e8> <7599> -<06e9> <5272> -<06ea> <9769> -<06eb> <845b> -<06ec> <683c> -<06ed> <86e4> -<06ee> <9601> -<06ef> <9694> -<06f0> <94ec> -<06f1> <4e2a> -<06f2> <5404> -<06f3> <7ed9> -<06f4> <6839> -<06f5> <8ddf> -<06f6> <8015> -<06f7> <66f4> -<06f8> <5e9a> -<06f9> <7fb9> -<06fa> <57c2> -<06fb> <803f> -<06fc> <6897> -<06fd> <5de5> -<06fe> <653b> -<06ff> <529f> -<0700> <606d> -<0701> <9f9a> -<0702> <4f9b> -<0703> <8eac> -<0704> <516c> -<0705> <5bab> -<0706> <5f13> -<0707> <5de9> +<06a8> <8151> +<06a9> <5e9c> +<06aa> <8150> +<06ab> <8d74> +<06ac> <526f> +<06ad> <8986> +<06ae> <8d4b> +<06af> <590d> +<06b0> <5085> +<06b1> <4ed8> +<06b2> <961c> +<06b3> <7236> +<06b4> <8179> +<06b5> <8d1f> +<06b6> <5bcc> +<06b7> <8ba3> +<06b8> <9644> +<06b9> <5987> +<06ba> <7f1a> +<06bb> <5490> +<06bc> <5676> +<06bd> <560e> +<06be> <8be5> +<06bf> <6539> +<06c0> <6982> +<06c1> <9499> +<06c2> <76d6> +<06c3> <6e89> +<06c4> <5e72> +<06c5> <7518> +<06c6> <6746> +<06c7> <67d1> +<06c8> <7aff> +<06c9> <809d> +<06ca> <8d76> +<06cb> <611f> +<06cc> <79c6> +<06cd> <6562> +<06ce> <8d63> +<06cf> <5188> +<06d0> <521a> +<06d1> <94a2> +<06d2> <7f38> +<06d3> <809b> +<06d4> <7eb2> +<06d5> <5c97> +<06d6> <6e2f> +<06d7> <6760> +<06d8> <7bd9> +<06d9> <768b> +<06da> <9ad8> +<06db> <818f> +<06dc> <7f94> +<06dd> <7cd5> +<06de> <641e> +<06df> <9550> +<06e0> <7a3f> +<06e1> <544a> +<06e2> <54e5> +<06e3> <6b4c> +<06e4> <6401> +<06e5> <6208> +<06e6> <9e3d> +<06e7> <80f3> +<06e8> <7599> +<06e9> <5272> +<06ea> <9769> +<06eb> <845b> +<06ec> <683c> +<06ed> <86e4> +<06ee> <9601> +<06ef> <9694> +<06f0> <94ec> +<06f1> <4e2a> +<06f2> <5404> +<06f3> <7ed9> +<06f4> <6839> +<06f5> <8ddf> +<06f6> <8015> +<06f7> <66f4> +<06f8> <5e9a> +<06f9> <7fb9> +<06fa> <57c2> +<06fb> <803f> +<06fc> <6897> +<06fd> <5de5> +<06fe> <653b> +<06ff> <529f> +<0700> <606d> +<0701> <9f9a> +<0702> <4f9b> +<0703> <8eac> +<0704> <516c> +<0705> <5bab> +<0706> <5f13> +<0707> <5de9> +<0708> <6c5e> +<0709> <62f1> +<070a> <8d21> +<070b> <5171> endbfchar 100 beginbfchar -<0708> <6c5e> -<0709> <62f1> -<070a> <8d21> -<070b> <5171> -<070c> <94a9> -<070d> <52fe> -<070e> <6c9f> -<070f> <82df> -<0710> <72d7> -<0711> <57a2> -<0712> <6784> -<0713> <8d2d> -<0714> <591f> -<0715> <8f9c> -<0716> <83c7> -<0717> <5495> -<0718> <7b8d> -<0719> <4f30> -<071a> <6cbd> -<071b> <5b64> -<071c> <59d1> -<071d> <9f13> -<071e> <53e4> -<071f> <86ca> -<0720> <9aa8> -<0721> <8c37> -<0722> <80a1> -<0723> <6545> -<0724> <987e> -<0725> <56fa> -<0726> <96c7> -<0727> <522e> -<0728> <74dc> -<0729> <5250> -<072a> <5be1> -<072b> <6302> -<072c> <8902> -<072d> <4e56> -<072e> <62d0> -<072f> <602a> -<0730> <68fa> -<0731> <5173> -<0732> <5b98> -<0733> <51a0> -<0734> <89c2> -<0735> <7ba1> -<0736> <9986> -<0737> <7f50> -<0738> <60ef> -<0739> <704c> -<073a> <8d2f> -<073b> <5149> -<073c> <5e7f> -<073d> <901b> -<073e> <7470> -<073f> <89c4> -<0740> <572d> -<0741> <7845> -<0742> <5f52> -<0743> <9f9f> -<0744> <95fa> -<0745> <8f68> -<0746> <9b3c> -<0747> <8be1> -<0748> <7678> -<0749> <6842> -<074a> <67dc> -<074b> <8dea> -<074c> <8d35> -<074d> <523d> -<074e> <8f8a> -<074f> <6eda> -<0750> <68cd> -<0751> <9505> -<0752> <90ed> -<0753> <56fd> -<0754> <679c> -<0755> <88f9> -<0756> <8fc7> -<0757> <54c8> -<0758> <9ab8> -<0759> <5b69> -<075a> <6d77> -<075b> <6c26> -<075c> <4ea5> -<075d> <5bb3> -<075e> <9a87> -<075f> <9163> -<0760> <61a8> -<0761> <90af> -<0762> <97e9> -<0763> <542b> -<0764> <6db5> -<0765> <5bd2> -<0766> <51fd> -<0767> <558a> -<0768> <7f55> -<0769> <7ff0> -<076a> <64bc> -<076b> <634d> +<070c> <94a9> +<070d> <52fe> +<070e> <6c9f> +<070f> <82df> +<0710> <72d7> +<0711> <57a2> +<0712> <6784> +<0713> <8d2d> +<0714> <591f> +<0715> <8f9c> +<0716> <83c7> +<0717> <5495> +<0718> <7b8d> +<0719> <4f30> +<071a> <6cbd> +<071b> <5b64> +<071c> <59d1> +<071d> <9f13> +<071e> <53e4> +<071f> <86ca> +<0720> <9aa8> +<0721> <8c37> +<0722> <80a1> +<0723> <6545> +<0724> <987e> +<0725> <56fa> +<0726> <96c7> +<0727> <522e> +<0728> <74dc> +<0729> <5250> +<072a> <5be1> +<072b> <6302> +<072c> <8902> +<072d> <4e56> +<072e> <62d0> +<072f> <602a> +<0730> <68fa> +<0731> <5173> +<0732> <5b98> +<0733> <51a0> +<0734> <89c2> +<0735> <7ba1> +<0736> <9986> +<0737> <7f50> +<0738> <60ef> +<0739> <704c> +<073a> <8d2f> +<073b> <5149> +<073c> <5e7f> +<073d> <901b> +<073e> <7470> +<073f> <89c4> +<0740> <572d> +<0741> <7845> +<0742> <5f52> +<0743> <9f9f> +<0744> <95fa> +<0745> <8f68> +<0746> <9b3c> +<0747> <8be1> +<0748> <7678> +<0749> <6842> +<074a> <67dc> +<074b> <8dea> +<074c> <8d35> +<074d> <523d> +<074e> <8f8a> +<074f> <6eda> +<0750> <68cd> +<0751> <9505> +<0752> <90ed> +<0753> <56fd> +<0754> <679c> +<0755> <88f9> +<0756> <8fc7> +<0757> <54c8> +<0758> <9ab8> +<0759> <5b69> +<075a> <6d77> +<075b> <6c26> +<075c> <4ea5> +<075d> <5bb3> +<075e> <9a87> +<075f> <9163> +<0760> <61a8> +<0761> <90af> +<0762> <97e9> +<0763> <542b> +<0764> <6db5> +<0765> <5bd2> +<0766> <51fd> +<0767> <558a> +<0768> <7f55> +<0769> <7ff0> +<076a> <64bc> +<076b> <634d> +<076c> <65f1> +<076d> <61be> +<076e> <608d> +<076f> <710a> endbfchar 100 beginbfchar -<076c> <65f1> -<076d> <61be> -<076e> <608d> -<076f> <710a> -<0770> <6c57> -<0771> <6c49> -<0772> <592f> -<0773> <676d> -<0774> <822a> -<0775> <58d5> -<0776> <568e> -<0777> <8c6a> -<0778> <6beb> -<0779> <90dd> -<077a> <597d> -<077b> <8017> -<077c> <53f7> -<077d> <6d69> -<077e> <5475> -<077f> <559d> -<0780> <8377> -<0781> <83cf> -<0782> <6838> -<0783> <79be> -<0784> <548c> -<0785> <4f55> -<0786> <5408> -<0787> <76d2> -<0788> <8c89> -<0789> <9602> -<078a> <6cb3> -<078b> <6db8> -<078c> <8d6b> -<078d> <8910> -<078e> <9e64> -<078f> <8d3a> -<0790> <563f> -<0791> <9ed1> -<0792> <75d5> -<0793> <5f88> -<0794> <72e0> -<0795> <6068> -<0796> <54fc> -<0797> <4ea8> -<0798> <6a2a> -<0799> <8861> -<079a> <6052> -<079b> <8f70> -<079c> <54c4> -<079d> <70d8> -<079e> <8679> -<079f> <9e3f> -<07a0> <6d2a> -<07a1> <5b8f> -<07a2> <5f18> -<07a3> <7ea2> -<07a4> <5589> -<07a5> <4faf> -<07a6> <7334> -<07a7> <543c> -<07a8> <539a> -<07a9> <5019> -<07aa> <540e> -<07ab> <547c> -<07ac> <4e4e> -<07ad> <5ffd> -<07ae> <745a> -<07af> <58f6> -<07b0> <846b> -<07b1> <80e1> -<07b2> <8774> -<07b3> <72d0> -<07b4> <7cca> -<07b5> <6e56> -<07b6> <5f27> -<07b7> <864e> -<07b8> <552c> -<07b9> <62a4> -<07ba> <4e92> -<07bb> <6caa> -<07bc> <6237> -<07bd> <82b1> -<07be> <54d7> -<07bf> <534e> -<07c0> <733e> -<07c1> <6ed1> -<07c2> <753b> -<07c3> <5212> -<07c4> <5316> -<07c5> <8bdd> -<07c6> <69d0> -<07c7> <5f8a> -<07c8> <6000> -<07c9> <6dee> -<07ca> <574f> -<07cb> <6b22> -<07cc> <73af> -<07cd> <6853> -<07ce> <8fd8> -<07cf> <7f13> +<0770> <6c57> +<0771> <6c49> +<0772> <592f> +<0773> <676d> +<0774> <822a> +<0775> <58d5> +<0776> <568e> +<0777> <8c6a> +<0778> <6beb> +<0779> <90dd> +<077a> <597d> +<077b> <8017> +<077c> <53f7> +<077d> <6d69> +<077e> <5475> +<077f> <559d> +<0780> <8377> +<0781> <83cf> +<0782> <6838> +<0783> <79be> +<0784> <548c> +<0785> <4f55> +<0786> <5408> +<0787> <76d2> +<0788> <8c89> +<0789> <9602> +<078a> <6cb3> +<078b> <6db8> +<078c> <8d6b> +<078d> <8910> +<078e> <9e64> +<078f> <8d3a> +<0790> <563f> +<0791> <9ed1> +<0792> <75d5> +<0793> <5f88> +<0794> <72e0> +<0795> <6068> +<0796> <54fc> +<0797> <4ea8> +<0798> <6a2a> +<0799> <8861> +<079a> <6052> +<079b> <8f70> +<079c> <54c4> +<079d> <70d8> +<079e> <8679> +<079f> <9e3f> +<07a0> <6d2a> +<07a1> <5b8f> +<07a2> <5f18> +<07a3> <7ea2> +<07a4> <5589> +<07a5> <4faf> +<07a6> <7334> +<07a7> <543c> +<07a8> <539a> +<07a9> <5019> +<07aa> <540e> +<07ab> <547c> +<07ac> <4e4e> +<07ad> <5ffd> +<07ae> <745a> +<07af> <58f6> +<07b0> <846b> +<07b1> <80e1> +<07b2> <8774> +<07b3> <72d0> +<07b4> <7cca> +<07b5> <6e56> +<07b6> <5f27> +<07b7> <864e> +<07b8> <552c> +<07b9> <62a4> +<07ba> <4e92> +<07bb> <6caa> +<07bc> <6237> +<07bd> <82b1> +<07be> <54d7> +<07bf> <534e> +<07c0> <733e> +<07c1> <6ed1> +<07c2> <753b> +<07c3> <5212> +<07c4> <5316> +<07c5> <8bdd> +<07c6> <69d0> +<07c7> <5f8a> +<07c8> <6000> +<07c9> <6dee> +<07ca> <574f> +<07cb> <6b22> +<07cc> <73af> +<07cd> <6853> +<07ce> <8fd8> +<07cf> <7f13> +<07d0> <6362> +<07d1> <60a3> +<07d2> <5524> +<07d3> <75ea> endbfchar 100 beginbfchar -<07d0> <6362> -<07d1> <60a3> -<07d2> <5524> -<07d3> <75ea> -<07d4> <8c62> -<07d5> <7115> -<07d6> <6da3> -<07d7> <5ba6> -<07d8> <5e7b> -<07d9> <8352> -<07da> <614c> -<07db> <9ec4> -<07dc> <78fa> -<07dd> <8757> -<07de> <7c27> -<07df> <7687> -<07e0> <51f0> -<07e1> <60f6> -<07e2> <714c> -<07e3> <6643> -<07e4> <5e4c> -<07e5> <604d> -<07e6> <8c0e> -<07e7> <7070> -<07e8> <6325> -<07e9> <8f89> -<07ea> <5fbd> -<07eb> <6062> -<07ec> <86d4> -<07ed> <56de> -<07ee> <6bc1> -<07ef> <6094> -<07f0> <6167> -<07f1> <5349> -<07f2> <60e0> -<07f3> <6666> -<07f4> <8d3f> -<07f5> <79fd> -<07f6> <4f1a> -<07f7> <70e9> -<07f8> <6c47> -<07f9> <8bb3> -<07fa> <8bf2> -<07fb> <7ed8> -<07fc> <8364> -<07fd> <660f> -<07fe> <5a5a> -<07ff> <9b42> -<0800> <6d51> -<0801> <6df7> -<0802> <8c41> -<0803> <6d3b> -<0804> <4f19> -<0805> <706b> -<0806> <83b7> -<0807> <6216> -<0808> <60d1> -<0809> <970d> -<080a> <8d27> -<080b> <7978> -<080c> <51fb> -<080d> <573e> -<080e> <57fa> -<080f> <673a> -<0810> <7578> -<0811> <7a3d> -<0812> <79ef> -<0813> <7b95> -<0814> <808c> -<0815> <9965> -<0816> <8ff9> -<0817> <6fc0> -<0818> <8ba5> -<0819> <9e21> -<081a> <59ec> -<081b> <7ee9> -<081c> <7f09> -<081d> <5409> -<081e> <6781> -<081f> <68d8> -<0820> <8f91> -<0821> <7c4d> -<0822> <96c6> -<0823> <53ca> -<0824> <6025> -<0825> <75be> -<0826> <6c72> -<0827> <5373> -<0828> <5ac9> -<0829> <7ea7> -<082a> <6324> -<082b> <51e0> -<082c> <810a> -<082d> <5df1> -<082e> <84df> -<082f> <6280> -<0830> <5180> -<0831> <5b63> -<0832> <4f0e> -<0833> <796d> +<07d4> <8c62> +<07d5> <7115> +<07d6> <6da3> +<07d7> <5ba6> +<07d8> <5e7b> +<07d9> <8352> +<07da> <614c> +<07db> <9ec4> +<07dc> <78fa> +<07dd> <8757> +<07de> <7c27> +<07df> <7687> +<07e0> <51f0> +<07e1> <60f6> +<07e2> <714c> +<07e3> <6643> +<07e4> <5e4c> +<07e5> <604d> +<07e6> <8c0e> +<07e7> <7070> +<07e8> <6325> +<07e9> <8f89> +<07ea> <5fbd> +<07eb> <6062> +<07ec> <86d4> +<07ed> <56de> +<07ee> <6bc1> +<07ef> <6094> +<07f0> <6167> +<07f1> <5349> +<07f2> <60e0> +<07f3> <6666> +<07f4> <8d3f> +<07f5> <79fd> +<07f6> <4f1a> +<07f7> <70e9> +<07f8> <6c47> +<07f9> <8bb3> +<07fa> <8bf2> +<07fb> <7ed8> +<07fc> <8364> +<07fd> <660f> +<07fe> <5a5a> +<07ff> <9b42> +<0800> <6d51> +<0801> <6df7> +<0802> <8c41> +<0803> <6d3b> +<0804> <4f19> +<0805> <706b> +<0806> <83b7> +<0807> <6216> +<0808> <60d1> +<0809> <970d> +<080a> <8d27> +<080b> <7978> +<080c> <51fb> +<080d> <573e> +<080e> <57fa> +<080f> <673a> +<0810> <7578> +<0811> <7a3d> +<0812> <79ef> +<0813> <7b95> +<0814> <808c> +<0815> <9965> +<0816> <8ff9> +<0817> <6fc0> +<0818> <8ba5> +<0819> <9e21> +<081a> <59ec> +<081b> <7ee9> +<081c> <7f09> +<081d> <5409> +<081e> <6781> +<081f> <68d8> +<0820> <8f91> +<0821> <7c4d> +<0822> <96c6> +<0823> <53ca> +<0824> <6025> +<0825> <75be> +<0826> <6c72> +<0827> <5373> +<0828> <5ac9> +<0829> <7ea7> +<082a> <6324> +<082b> <51e0> +<082c> <810a> +<082d> <5df1> +<082e> <84df> +<082f> <6280> +<0830> <5180> +<0831> <5b63> +<0832> <4f0e> +<0833> <796d> +<0834> <5242> +<0835> <60b8> +<0836> <6d4e> +<0837> <5bc4> endbfchar 100 beginbfchar -<0834> <5242> -<0835> <60b8> -<0836> <6d4e> -<0837> <5bc4> -<0838> <5bc2> -<0839> <8ba1> -<083a> <8bb0> -<083b> <65e2> -<083c> <5fcc> -<083d> <9645> -<083e> <5993> -<083f> <7ee7> -<0840> <7eaa> -<0841> <5609> -<0842> <67b7> -<0843> <5939> -<0844> <4f73> -<0845> <5bb6> -<0846> <52a0> -<0847> <835a> -<0848> <988a> -<0849> <8d3e> -<084a> <7532> -<084b> <94be> -<084c> <5047> -<084d> <7a3c> -<084e> <4ef7> -<084f> <67b6> -<0850> <9a7e> -<0851> <5ac1> -<0852> <6b7c> -<0853> <76d1> -<0854> <575a> -<0855> <5c16> -<0856> <7b3a> -<0857> <95f4> -<0858> <714e> -<0859> <517c> -<085a> <80a9> -<085b> <8270> -<085c> <5978> -<085d> <7f04> -<085e> <8327> -<085f> <68c0> -<0860> <67ec> -<0861> <78b1> -<0862> <7877> -<0863> <62e3> -<0864> <6361> -<0865> <7b80> -<0866> <4fed> -<0867> <526a> -<0868> <51cf> -<0869> <8350> -<086a> <69db> -<086b> <9274> -<086c> <8df5> -<086d> <8d31> -<086e> <89c1> -<086f> <952e> -<0870> <7bad> -<0871> <4ef6> -<0872> <5065> -<0873> <8230> -<0874> <5251> -<0875> <996f> -<0876> <6e10> -<0877> <6e85> -<0878> <6da7> -<0879> <5efa> -<087a> <50f5> -<087b> <59dc> -<087c> <5c06> -<087d> <6d46> -<087e> <6c5f> -<087f> <7586> -<0880> <848b> -<0881> <6868> -<0882> <5956> -<0883> <8bb2> -<0884> <5320> -<0885> <9171> -<0886> <964d> -<0887> <8549> -<0888> <6912> -<0889> <7901> -<088a> <7126> -<088b> <80f6> -<088c> <4ea4> -<088d> <90ca> -<088e> <6d47> -<088f> <9a84> -<0890> <5a07> -<0891> <56bc> -<0892> <6405> -<0893> <94f0> -<0894> <77eb> -<0895> <4fa5> -<0896> <811a> -<0897> <72e1> +<0838> <5bc2> +<0839> <8ba1> +<083a> <8bb0> +<083b> <65e2> +<083c> <5fcc> +<083d> <9645> +<083e> <5993> +<083f> <7ee7> +<0840> <7eaa> +<0841> <5609> +<0842> <67b7> +<0843> <5939> +<0844> <4f73> +<0845> <5bb6> +<0846> <52a0> +<0847> <835a> +<0848> <988a> +<0849> <8d3e> +<084a> <7532> +<084b> <94be> +<084c> <5047> +<084d> <7a3c> +<084e> <4ef7> +<084f> <67b6> +<0850> <9a7e> +<0851> <5ac1> +<0852> <6b7c> +<0853> <76d1> +<0854> <575a> +<0855> <5c16> +<0856> <7b3a> +<0857> <95f4> +<0858> <714e> +<0859> <517c> +<085a> <80a9> +<085b> <8270> +<085c> <5978> +<085d> <7f04> +<085e> <8327> +<085f> <68c0> +<0860> <67ec> +<0861> <78b1> +<0862> <7877> +<0863> <62e3> +<0864> <6361> +<0865> <7b80> +<0866> <4fed> +<0867> <526a> +<0868> <51cf> +<0869> <8350> +<086a> <69db> +<086b> <9274> +<086c> <8df5> +<086d> <8d31> +<086e> <89c1> +<086f> <952e> +<0870> <7bad> +<0871> <4ef6> +<0872> <5065> +<0873> <8230> +<0874> <5251> +<0875> <996f> +<0876> <6e10> +<0877> <6e85> +<0878> <6da7> +<0879> <5efa> +<087a> <50f5> +<087b> <59dc> +<087c> <5c06> +<087d> <6d46> +<087e> <6c5f> +<087f> <7586> +<0880> <848b> +<0881> <6868> +<0882> <5956> +<0883> <8bb2> +<0884> <5320> +<0885> <9171> +<0886> <964d> +<0887> <8549> +<0888> <6912> +<0889> <7901> +<088a> <7126> +<088b> <80f6> +<088c> <4ea4> +<088d> <90ca> +<088e> <6d47> +<088f> <9a84> +<0890> <5a07> +<0891> <56bc> +<0892> <6405> +<0893> <94f0> +<0894> <77eb> +<0895> <4fa5> +<0896> <811a> +<0897> <72e1> +<0898> <89d2> +<0899> <997a> +<089a> <7f34> +<089b> <7ede> endbfchar 100 beginbfchar -<0898> <89d2> -<0899> <997a> -<089a> <7f34> -<089b> <7ede> -<089c> <527f> -<089d> <6559> -<089e> <9175> -<089f> <8f7f> -<08a0> <8f83> -<08a1> <53eb> -<08a2> <7a96> -<08a3> <63ed> -<08a4> <63a5> -<08a5> <7686> -<08a6> <79f8> -<08a7> <8857> -<08a8> <9636> -<08a9> <622a> -<08aa> <52ab> -<08ab> <8282> -<08ac> <6854> -<08ad> <6770> -<08ae> <6377> -<08af> <776b> -<08b0> <7aed> -<08b1> <6d01> -<08b2> <7ed3> -<08b3> <89e3> -<08b4> <59d0> -<08b5> <6212> -<08b6> <85c9> -<08b7> <82a5> -<08b8> <754c> -<08b9> <501f> -<08ba> <4ecb> -<08bb> <75a5> -<08bc> <8beb> -<08bd> <5c4a> -<08be> <5dfe> -<08bf> <7b4b> -<08c0> <65a4> -<08c1> <91d1> -<08c2> <4eca> -<08c3> <6d25> -<08c4> <895f> -<08c5> <7d27> -<08c6> <9526> -<08c7> <4ec5> -<08c8> <8c28> -<08c9> <8fdb> -<08ca> <9773> -<08cb> <664b> -<08cc> <7981> -<08cd> <8fd1> -<08ce> <70ec> -<08cf> <6d78> -<08d0> <5c3d> -<08d1> <52b2> -<08d2> <8346> -<08d3> <5162> -<08d4> <830e> -<08d5> <775b> -<08d6> <6676> -<08d7> <9cb8> -<08d8> <4eac> -<08d9> <60ca> -<08da> <7cbe> -<08db> <7cb3> -<08dc> <7ecf> -<08dd> <4e95> -<08de> <8b66> -<08df> <666f> -<08e0> <9888> -<08e1> <9759> -<08e2> <5883> -<08e3> <656c> -<08e4> <955c> -<08e5> <5f84> -<08e6> <75c9> -<08e7> <9756> -<08e8> <7adf> -<08e9> <7ade> -<08ea> <51c0> -<08eb> <70af> -<08ec> <7a98> -<08ed> <63ea> -<08ee> <7a76> -<08ef> <7ea0> -<08f0> <7396> -<08f1> <97ed> -<08f2> <4e45> -<08f3> <7078> -<08f4> <4e5d> -<08f5> <9152> -<08f6> <53a9> -<08f7> <6551> -<08f8> <65e7> -<08f9> <81fc> -<08fa> <8205> -<08fb> <548e> +<089c> <527f> +<089d> <6559> +<089e> <9175> +<089f> <8f7f> +<08a0> <8f83> +<08a1> <53eb> +<08a2> <7a96> +<08a3> <63ed> +<08a4> <63a5> +<08a5> <7686> +<08a6> <79f8> +<08a7> <8857> +<08a8> <9636> +<08a9> <622a> +<08aa> <52ab> +<08ab> <8282> +<08ac> <6854> +<08ad> <6770> +<08ae> <6377> +<08af> <776b> +<08b0> <7aed> +<08b1> <6d01> +<08b2> <7ed3> +<08b3> <89e3> +<08b4> <59d0> +<08b5> <6212> +<08b6> <85c9> +<08b7> <82a5> +<08b8> <754c> +<08b9> <501f> +<08ba> <4ecb> +<08bb> <75a5> +<08bc> <8beb> +<08bd> <5c4a> +<08be> <5dfe> +<08bf> <7b4b> +<08c0> <65a4> +<08c1> <91d1> +<08c2> <4eca> +<08c3> <6d25> +<08c4> <895f> +<08c5> <7d27> +<08c6> <9526> +<08c7> <4ec5> +<08c8> <8c28> +<08c9> <8fdb> +<08ca> <9773> +<08cb> <664b> +<08cc> <7981> +<08cd> <8fd1> +<08ce> <70ec> +<08cf> <6d78> +<08d0> <5c3d> +<08d1> <52b2> +<08d2> <8346> +<08d3> <5162> +<08d4> <830e> +<08d5> <775b> +<08d6> <6676> +<08d7> <9cb8> +<08d8> <4eac> +<08d9> <60ca> +<08da> <7cbe> +<08db> <7cb3> +<08dc> <7ecf> +<08dd> <4e95> +<08de> <8b66> +<08df> <666f> +<08e0> <9888> +<08e1> <9759> +<08e2> <5883> +<08e3> <656c> +<08e4> <955c> +<08e5> <5f84> +<08e6> <75c9> +<08e7> <9756> +<08e8> <7adf> +<08e9> <7ade> +<08ea> <51c0> +<08eb> <70af> +<08ec> <7a98> +<08ed> <63ea> +<08ee> <7a76> +<08ef> <7ea0> +<08f0> <7396> +<08f1> <97ed> +<08f2> <4e45> +<08f3> <7078> +<08f4> <4e5d> +<08f5> <9152> +<08f6> <53a9> +<08f7> <6551> +<08f8> <65e7> +<08f9> <81fc> +<08fa> <8205> +<08fb> <548e> +<08fc> <5c31> +<08fd> <759a> +<08fe> <97a0> +<08ff> <62d8> endbfchar 100 beginbfchar -<08fc> <5c31> -<08fd> <759a> -<08fe> <97a0> -<08ff> <62d8> -<0900> <72d9> -<0901> <75bd> -<0902> <5c45> -<0903> <9a79> -<0904> <83ca> -<0905> <5c40> -<0906> <5480> -<0907> <77e9> -<0908> <4e3e> -<0909> <6cae> -<090a> <805a> -<090b> <62d2> -<090c> <636e> -<090d> <5de8> -<090e> <5177> -<090f> <8ddd> -<0910> <8e1e> -<0911> <952f> -<0912> <4ff1> -<0913> <53e5> -<0914> <60e7> -<0915> <70ac> -<0916> <5267> -<0917> <6350> -<0918> <9e43> -<0919> <5a1f> -<091a> <5026> -<091b> <7737> -<091c> <5377> -<091d> <7ee2> -<091e> <6485> -<091f> <652b> -<0920> <6289> -<0921> <6398> -<0922> <5014> -<0923> <7235> -<0924> <89c9> -<0925> <51b3> -<0926> <8bc0> -<0927> <7edd> -<0928> <5747> -<0929> <83cc> -<092a> <94a7> -<092b> <519b> -<092c> <541b> -<092d> <5cfb> -<092e> <4fca> -<092f> <7ae3> -<0930> <6d5a> -<0931> <90e1> -<0932> <9a8f> -<0933> <5580> -<0934> <5496> -<0935> <5361> -<0936> <54af> -<0937> <5f00> -<0938> <63e9> -<0939> <6977> -<093a> <51ef> -<093b> <6168> -<093c> <520a> -<093d> <582a> -<093e> <52d8> -<093f> <574e> -<0940> <780d> -<0941> <770b> -<0942> <5eb7> -<0943> <6177> -<0944> <7ce0> -<0945> <625b> -<0946> <6297> -<0947> <4ea2> -<0948> <7095> -<0949> <8003> -<094a> <62f7> -<094b> <70e4> -<094c> <9760> -<094d> <5777> -<094e> <82db> -<094f> <67ef> -<0950> <68f5> -<0951> <78d5> -<0952> <9897> -<0953> <79d1> -<0954> <58f3> -<0955> <54b3> -<0956> <53ef> -<0957> <6e34> -<0958> <514b> -<0959> <523b> -<095a> <5ba2> -<095b> <8bfe> -<095c> <80af> -<095d> <5543> -<095e> <57a6> -<095f> <6073> +<0900> <72d9> +<0901> <75bd> +<0902> <5c45> +<0903> <9a79> +<0904> <83ca> +<0905> <5c40> +<0906> <5480> +<0907> <77e9> +<0908> <4e3e> +<0909> <6cae> +<090a> <805a> +<090b> <62d2> +<090c> <636e> +<090d> <5de8> +<090e> <5177> +<090f> <8ddd> +<0910> <8e1e> +<0911> <952f> +<0912> <4ff1> +<0913> <53e5> +<0914> <60e7> +<0915> <70ac> +<0916> <5267> +<0917> <6350> +<0918> <9e43> +<0919> <5a1f> +<091a> <5026> +<091b> <7737> +<091c> <5377> +<091d> <7ee2> +<091e> <6485> +<091f> <652b> +<0920> <6289> +<0921> <6398> +<0922> <5014> +<0923> <7235> +<0924> <89c9> +<0925> <51b3> +<0926> <8bc0> +<0927> <7edd> +<0928> <5747> +<0929> <83cc> +<092a> <94a7> +<092b> <519b> +<092c> <541b> +<092d> <5cfb> +<092e> <4fca> +<092f> <7ae3> +<0930> <6d5a> +<0931> <90e1> +<0932> <9a8f> +<0933> <5580> +<0934> <5496> +<0935> <5361> +<0936> <54af> +<0937> <5f00> +<0938> <63e9> +<0939> <6977> +<093a> <51ef> +<093b> <6168> +<093c> <520a> +<093d> <582a> +<093e> <52d8> +<093f> <574e> +<0940> <780d> +<0941> <770b> +<0942> <5eb7> +<0943> <6177> +<0944> <7ce0> +<0945> <625b> +<0946> <6297> +<0947> <4ea2> +<0948> <7095> +<0949> <8003> +<094a> <62f7> +<094b> <70e4> +<094c> <9760> +<094d> <5777> +<094e> <82db> +<094f> <67ef> +<0950> <68f5> +<0951> <78d5> +<0952> <9897> +<0953> <79d1> +<0954> <58f3> +<0955> <54b3> +<0956> <53ef> +<0957> <6e34> +<0958> <514b> +<0959> <523b> +<095a> <5ba2> +<095b> <8bfe> +<095c> <80af> +<095d> <5543> +<095e> <57a6> +<095f> <6073> +<0960> <5751> +<0961> <542d> +<0962> <7a7a> +<0963> <6050> endbfchar 100 beginbfchar -<0960> <5751> -<0961> <542d> -<0962> <7a7a> -<0963> <6050> -<0964> <5b54> -<0965> <63a7> -<0966> <62a0> -<0967> <53e3> -<0968> <6263> -<0969> <5bc7> -<096a> <67af> -<096b> <54ed> -<096c> <7a9f> -<096d> <82e6> -<096e> <9177> -<096f> <5e93> -<0970> <88e4> -<0971> <5938> -<0972> <57ae> -<0973> <630e> -<0974> <8de8> -<0975> <80ef> -<0976> <5757> -<0977> <7b77> -<0978> <4fa9> -<0979> <5feb> -<097a> <5bbd> -<097b> <6b3e> -<097c> <5321> -<097d> <7b50> -<097e> <72c2> -<097f> <6846> -<0980> <77ff> -<0981> <7736> -<0982> <65f7> -<0983> <51b5> -<0984> <4e8f> -<0985> <76d4> -<0986> <5cbf> -<0987> <7aa5> -<0988> <8475> -<0989> <594e> -<098a> <9b41> -<098b> <5080> -<098c> <9988> -<098d> <6127> -<098e> <6e83> -<098f> <5764> -<0990> <6606> -<0991> <6346> -<0992> <56f0> -<0993> <62ec> -<0994> <6269> -<0995> <5ed3> -<0996> <9614> -<0997> <5783> -<0998> <62c9> -<0999> <5587> -<099a> <8721> -<099b> <814a> -<099c> <8fa3> -<099d> <5566> -<099e> <83b1> -<099f> <6765> -<09a0> <8d56> -<09a1> <84dd> -<09a2> <5a6a> -<09a3> <680f> -<09a4> <62e6> -<09a5> <7bee> -<09a6> <9611> -<09a7> <5170> -<09a8> <6f9c> -<09a9> <8c30> -<09aa> <63fd> -<09ab> <89c8> -<09ac> <61d2> -<09ad> <7f06> -<09ae> <70c2> -<09af> <6ee5> -<09b0> <7405> -<09b1> <6994> -<09b2> <72fc> -<09b3> <5eca> -<09b4> <90ce> -<09b5> <6717> -<09b6> <6d6a> -<09b7> <635e> -<09b8> <52b3> -<09b9> <7262> -<09ba> <8001> -<09bb> <4f6c> -<09bc> <59e5> -<09bd> <916a> -<09be> <70d9> -<09bf> <6d9d> -<09c0> <52d2> -<09c1> <4e50> -<09c2> <96f7> -<09c3> <956d> +<0964> <5b54> +<0965> <63a7> +<0966> <62a0> +<0967> <53e3> +<0968> <6263> +<0969> <5bc7> +<096a> <67af> +<096b> <54ed> +<096c> <7a9f> +<096d> <82e6> +<096e> <9177> +<096f> <5e93> +<0970> <88e4> +<0971> <5938> +<0972> <57ae> +<0973> <630e> +<0974> <8de8> +<0975> <80ef> +<0976> <5757> +<0977> <7b77> +<0978> <4fa9> +<0979> <5feb> +<097a> <5bbd> +<097b> <6b3e> +<097c> <5321> +<097d> <7b50> +<097e> <72c2> +<097f> <6846> +<0980> <77ff> +<0981> <7736> +<0982> <65f7> +<0983> <51b5> +<0984> <4e8f> +<0985> <76d4> +<0986> <5cbf> +<0987> <7aa5> +<0988> <8475> +<0989> <594e> +<098a> <9b41> +<098b> <5080> +<098c> <9988> +<098d> <6127> +<098e> <6e83> +<098f> <5764> +<0990> <6606> +<0991> <6346> +<0992> <56f0> +<0993> <62ec> +<0994> <6269> +<0995> <5ed3> +<0996> <9614> +<0997> <5783> +<0998> <62c9> +<0999> <5587> +<099a> <8721> +<099b> <814a> +<099c> <8fa3> +<099d> <5566> +<099e> <83b1> +<099f> <6765> +<09a0> <8d56> +<09a1> <84dd> +<09a2> <5a6a> +<09a3> <680f> +<09a4> <62e6> +<09a5> <7bee> +<09a6> <9611> +<09a7> <5170> +<09a8> <6f9c> +<09a9> <8c30> +<09aa> <63fd> +<09ab> <89c8> +<09ac> <61d2> +<09ad> <7f06> +<09ae> <70c2> +<09af> <6ee5> +<09b0> <7405> +<09b1> <6994> +<09b2> <72fc> +<09b3> <5eca> +<09b4> <90ce> +<09b5> <6717> +<09b6> <6d6a> +<09b7> <635e> +<09b8> <52b3> +<09b9> <7262> +<09ba> <8001> +<09bb> <4f6c> +<09bc> <59e5> +<09bd> <916a> +<09be> <70d9> +<09bf> <6d9d> +<09c0> <52d2> +<09c1> <4e50> +<09c2> <96f7> +<09c3> <956d> +<09c4> <857e> +<09c5> <78ca> +<09c6> <7d2f> +<09c7> <5121> endbfchar 100 beginbfchar -<09c4> <857e> -<09c5> <78ca> -<09c6> <7d2f> -<09c7> <5121> -<09c8> <5792> -<09c9> <64c2> -<09ca> <808b> -<09cb> <7c7b> -<09cc> <6cea> -<09cd> <68f1> -<09ce> <695e> -<09cf> <51b7> -<09d0> <5398> -<09d1> <68a8> -<09d2> <7281> -<09d3> <9ece> -<09d4> <7bf1> -<09d5> <72f8> -<09d6> <79bb> -<09d7> <6f13> -<09d8> <7406> -<09d9> <674e> -<09da> <91cc> -<09db> <9ca4> -<09dc> <793c> -<09dd> <8389> -<09de> <8354> -<09df> <540f> -<09e0> <6817> -<09e1> <4e3d> -<09e2> <5389> -<09e3> <52b1> -<09e4> <783e> -<09e5> <5386> -<09e6> <5229> -<09e7> <5088> -<09e8> <4f8b> -<09e9> <4fd0> -<09ea> <75e2> -<09eb> <7acb> -<09ec> <7c92> -<09ed> <6ca5> -<09ee> <96b6> -<09ef> <529b> -<09f0> <7483> -<09f1> <54e9> -<09f2> <4fe9> -<09f3> <8054> -<09f4> <83b2> -<09f5> <8fde> -<09f6> <9570> -<09f7> <5ec9> -<09f8> <601c> -<09f9> <6d9f> -<09fa> <5e18> -<09fb> <655b> -<09fc> <8138> -<09fd> <94fe> -<09fe> <604b> -<09ff> <70bc> -<0a00> <7ec3> -<0a01> <7cae> -<0a02> <51c9> -<0a03> <6881> -<0a04> <7cb1> -<0a05> <826f> -<0a06> <4e24> -<0a07> <8f86> -<0a08> <91cf> -<0a09> <667e> -<0a0a> <4eae> -<0a0b> <8c05> -<0a0c> <64a9> -<0a0d> <804a> -<0a0e> <50da> -<0a0f> <7597> -<0a10> <71ce> -<0a11> <5be5> -<0a12> <8fbd> -<0a13> <6f66> -<0a14> <4e86> -<0a15> <6482> -<0a16> <9563> -<0a17> <5ed6> -<0a18> <6599> -<0a19> <5217> -<0a1a> <88c2> -<0a1b> <70c8> -<0a1c> <52a3> -<0a1d> <730e> -<0a1e> <7433> -<0a1f> <6797> -<0a20> <78f7> -<0a21> <9716> -<0a22> <4e34> -<0a23> <90bb> -<0a24> <9cde> -<0a25> <6dcb> -<0a26> <51db> -<0a27> <8d41> +<09c8> <5792> +<09c9> <64c2> +<09ca> <808b> +<09cb> <7c7b> +<09cc> <6cea> +<09cd> <68f1> +<09ce> <695e> +<09cf> <51b7> +<09d0> <5398> +<09d1> <68a8> +<09d2> <7281> +<09d3> <9ece> +<09d4> <7bf1> +<09d5> <72f8> +<09d6> <79bb> +<09d7> <6f13> +<09d8> <7406> +<09d9> <674e> +<09da> <91cc> +<09db> <9ca4> +<09dc> <793c> +<09dd> <8389> +<09de> <8354> +<09df> <540f> +<09e0> <6817> +<09e1> <4e3d> +<09e2> <5389> +<09e3> <52b1> +<09e4> <783e> +<09e5> <5386> +<09e6> <5229> +<09e7> <5088> +<09e8> <4f8b> +<09e9> <4fd0> +<09ea> <75e2> +<09eb> <7acb> +<09ec> <7c92> +<09ed> <6ca5> +<09ee> <96b6> +<09ef> <529b> +<09f0> <7483> +<09f1> <54e9> +<09f2> <4fe9> +<09f3> <8054> +<09f4> <83b2> +<09f5> <8fde> +<09f6> <9570> +<09f7> <5ec9> +<09f8> <601c> +<09f9> <6d9f> +<09fa> <5e18> +<09fb> <655b> +<09fc> <8138> +<09fd> <94fe> +<09fe> <604b> +<09ff> <70bc> +<0a00> <7ec3> +<0a01> <7cae> +<0a02> <51c9> +<0a03> <6881> +<0a04> <7cb1> +<0a05> <826f> +<0a06> <4e24> +<0a07> <8f86> +<0a08> <91cf> +<0a09> <667e> +<0a0a> <4eae> +<0a0b> <8c05> +<0a0c> <64a9> +<0a0d> <804a> +<0a0e> <50da> +<0a0f> <7597> +<0a10> <71ce> +<0a11> <5be5> +<0a12> <8fbd> +<0a13> <6f66> +<0a14> <4e86> +<0a15> <6482> +<0a16> <9563> +<0a17> <5ed6> +<0a18> <6599> +<0a19> <5217> +<0a1a> <88c2> +<0a1b> <70c8> +<0a1c> <52a3> +<0a1d> <730e> +<0a1e> <7433> +<0a1f> <6797> +<0a20> <78f7> +<0a21> <9716> +<0a22> <4e34> +<0a23> <90bb> +<0a24> <9cde> +<0a25> <6dcb> +<0a26> <51db> +<0a27> <8d41> +<0a28> <541d> +<0a29> <62ce> +<0a2a> <73b2> +<0a2b> <83f1> endbfchar 100 beginbfchar -<0a28> <541d> -<0a29> <62ce> -<0a2a> <73b2> -<0a2b> <83f1> -<0a2c> <96f6> -<0a2d> <9f84> -<0a2e> <94c3> -<0a2f> <4f36> -<0a30> <7f9a> -<0a31> <51cc> -<0a32> <7075> -<0a33> <9675> -<0a34> <5cad> -<0a35> <9886> -<0a36> <53e6> -<0a37> <4ee4> -<0a38> <6e9c> -<0a39> <7409> -<0a3a> <69b4> -<0a3b> <786b> -<0a3c> <998f> -<0a3d> <7559> -<0a3e> <5218> -<0a3f> <7624> -<0a40> <6d41> -<0a41> <67f3> -<0a42> <516d> -<0a43> <9f99> -<0a44> <804b> -<0a45> <5499> -<0a46> <7b3c> -<0a47> <7abf> -<0a48> <9686> -<0a49> <5784> -<0a4a> <62e2> -<0a4b> <9647> -<0a4c> <697c> -<0a4d> <5a04> -<0a4e> <6402> -<0a4f> <7bd3> -<0a50> <6f0f> -<0a51> <964b> -<0a52> <82a6> -<0a53> <5362> -<0a54> <9885> -<0a55> <5e90> -<0a56> <7089> -<0a57> <63b3> -<0a58> <5364> -<0a59> <864f> -<0a5a> <9c81> -<0a5b> <9e93> -<0a5c> <788c> -<0a5d> <9732> -<0a5e> <8def> -<0a5f> <8d42> -<0a60> <9e7f> -<0a61> <6f5e> -<0a62> <7984> -<0a63> <5f55> -<0a64> <9646> -<0a65> <622e> -<0a66> <9a74> -<0a67> <5415> -<0a68> <94dd> -<0a69> <4fa3> -<0a6a> <65c5> -<0a6b> <5c65> -<0a6c> <5c61> -<0a6d> <7f15> -<0a6e> <8651> -<0a6f> <6c2f> -<0a70> <5f8b> -<0a71> <7387> -<0a72> <6ee4> -<0a73> <7eff> -<0a74> <5ce6> -<0a75> <631b> -<0a76> <5b6a> -<0a77> <6ee6> -<0a78> <5375> -<0a79> <4e71> -<0a7a> <63a0> -<0a7b> <7565> -<0a7c> <62a1> -<0a7d> <8f6e> -<0a7e> <4f26> -<0a7f> <4ed1> -<0a80> <6ca6> -<0a81> <7eb6> -<0a82> <8bba> -<0a83> <841d> -<0a84> <87ba> -<0a85> <7f57> -<0a86> <903b> -<0a87> <9523> -<0a88> <7ba9> -<0a89> <9aa1> -<0a8a> <88f8> -<0a8b> <843d> +<0a2c> <96f6> +<0a2d> <9f84> +<0a2e> <94c3> +<0a2f> <4f36> +<0a30> <7f9a> +<0a31> <51cc> +<0a32> <7075> +<0a33> <9675> +<0a34> <5cad> +<0a35> <9886> +<0a36> <53e6> +<0a37> <4ee4> +<0a38> <6e9c> +<0a39> <7409> +<0a3a> <69b4> +<0a3b> <786b> +<0a3c> <998f> +<0a3d> <7559> +<0a3e> <5218> +<0a3f> <7624> +<0a40> <6d41> +<0a41> <67f3> +<0a42> <516d> +<0a43> <9f99> +<0a44> <804b> +<0a45> <5499> +<0a46> <7b3c> +<0a47> <7abf> +<0a48> <9686> +<0a49> <5784> +<0a4a> <62e2> +<0a4b> <9647> +<0a4c> <697c> +<0a4d> <5a04> +<0a4e> <6402> +<0a4f> <7bd3> +<0a50> <6f0f> +<0a51> <964b> +<0a52> <82a6> +<0a53> <5362> +<0a54> <9885> +<0a55> <5e90> +<0a56> <7089> +<0a57> <63b3> +<0a58> <5364> +<0a59> <864f> +<0a5a> <9c81> +<0a5b> <9e93> +<0a5c> <788c> +<0a5d> <9732> +<0a5e> <8def> +<0a5f> <8d42> +<0a60> <9e7f> +<0a61> <6f5e> +<0a62> <7984> +<0a63> <5f55> +<0a64> <9646> +<0a65> <622e> +<0a66> <9a74> +<0a67> <5415> +<0a68> <94dd> +<0a69> <4fa3> +<0a6a> <65c5> +<0a6b> <5c65> +<0a6c> <5c61> +<0a6d> <7f15> +<0a6e> <8651> +<0a6f> <6c2f> +<0a70> <5f8b> +<0a71> <7387> +<0a72> <6ee4> +<0a73> <7eff> +<0a74> <5ce6> +<0a75> <631b> +<0a76> <5b6a> +<0a77> <6ee6> +<0a78> <5375> +<0a79> <4e71> +<0a7a> <63a0> +<0a7b> <7565> +<0a7c> <62a1> +<0a7d> <8f6e> +<0a7e> <4f26> +<0a7f> <4ed1> +<0a80> <6ca6> +<0a81> <7eb6> +<0a82> <8bba> +<0a83> <841d> +<0a84> <87ba> +<0a85> <7f57> +<0a86> <903b> +<0a87> <9523> +<0a88> <7ba9> +<0a89> <9aa1> +<0a8a> <88f8> +<0a8b> <843d> +<0a8c> <6d1b> +<0a8d> <9a86> +<0a8e> <7edc> +<0a8f> <5988> endbfchar 100 beginbfchar -<0a8c> <6d1b> -<0a8d> <9a86> -<0a8e> <7edc> -<0a8f> <5988> -<0a90> <9ebb> -<0a91> <739b> -<0a92> <7801> -<0a93> <8682> -<0a94> <9a6c> -<0a95> <9a82> -<0a96> <561b> -<0a97> <5417> -<0a98> <57cb> -<0a99> <4e70> -<0a9a> <9ea6> -<0a9b> <5356> -<0a9c> <8fc8> -<0a9d> <8109> -<0a9e> <7792> -<0a9f> <9992> -<0aa0> <86ee> -<0aa1> <6ee1> -<0aa2> <8513> -<0aa3> <66fc> -<0aa4> <6162> -<0aa5> <6f2b> -<0aa6> <8c29> -<0aa7> <8292> -<0aa8> <832b> -<0aa9> <76f2> -<0aaa> <6c13> -<0aab> <5fd9> -<0aac> <83bd> -<0aad> <732b> -<0aae> <8305> -<0aaf> <951a> -<0ab0> <6bdb> -<0ab1> <77db> -<0ab2> <94c6> -<0ab3> <536f> -<0ab4> <8302> -<0ab5> <5192> -<0ab6> <5e3d> -<0ab7> <8c8c> -<0ab8> <8d38> -<0ab9> <4e48> -<0aba> <73ab> -<0abb> <679a> -<0abc> <6885> -<0abd> <9176> -<0abe> <9709> -<0abf> <7164> -<0ac0> <6ca1> -<0ac1> <7709> -<0ac2> <5a92> -<0ac3> <9541> -<0ac4> <6bcf> -<0ac5> <7f8e> -<0ac6> <6627> -<0ac7> <5bd0> -<0ac8> <59b9> -<0ac9> <5a9a> -<0aca> <95e8> -<0acb> <95f7> -<0acc> <4eec> -<0acd> <840c> -<0ace> <8499> -<0acf> <6aac> -<0ad0> <76df> -<0ad1> <9530> -<0ad2> <731b> -<0ad3> <68a6> -<0ad4> <5b5f> -<0ad5> <772f> -<0ad6> <919a> -<0ad7> <9761> -<0ad8> <7cdc> -<0ad9> <8ff7> -<0ada> <8c1c> -<0adb> <5f25> -<0adc> <7c73> -<0add> <79d8> -<0ade> <89c5> -<0adf> <6ccc> -<0ae0> <871c> -<0ae1> <5bc6> -<0ae2> <5e42> -<0ae3> <68c9> -<0ae4> <7720> -<0ae5> <7ef5> -<0ae6> <5195> -<0ae7> <514d> -<0ae8> <52c9> -<0ae9> <5a29> -<0aea> <7f05> -<0aeb> <9762> -<0aec> <82d7> -<0aed> <63cf> -<0aee> <7784> -<0aef> <85d0> +<0a90> <9ebb> +<0a91> <739b> +<0a92> <7801> +<0a93> <8682> +<0a94> <9a6c> +<0a95> <9a82> +<0a96> <561b> +<0a97> <5417> +<0a98> <57cb> +<0a99> <4e70> +<0a9a> <9ea6> +<0a9b> <5356> +<0a9c> <8fc8> +<0a9d> <8109> +<0a9e> <7792> +<0a9f> <9992> +<0aa0> <86ee> +<0aa1> <6ee1> +<0aa2> <8513> +<0aa3> <66fc> +<0aa4> <6162> +<0aa5> <6f2b> +<0aa6> <8c29> +<0aa7> <8292> +<0aa8> <832b> +<0aa9> <76f2> +<0aaa> <6c13> +<0aab> <5fd9> +<0aac> <83bd> +<0aad> <732b> +<0aae> <8305> +<0aaf> <951a> +<0ab0> <6bdb> +<0ab1> <77db> +<0ab2> <94c6> +<0ab3> <536f> +<0ab4> <8302> +<0ab5> <5192> +<0ab6> <5e3d> +<0ab7> <8c8c> +<0ab8> <8d38> +<0ab9> <4e48> +<0aba> <73ab> +<0abb> <679a> +<0abc> <6885> +<0abd> <9176> +<0abe> <9709> +<0abf> <7164> +<0ac0> <6ca1> +<0ac1> <7709> +<0ac2> <5a92> +<0ac3> <9541> +<0ac4> <6bcf> +<0ac5> <7f8e> +<0ac6> <6627> +<0ac7> <5bd0> +<0ac8> <59b9> +<0ac9> <5a9a> +<0aca> <95e8> +<0acb> <95f7> +<0acc> <4eec> +<0acd> <840c> +<0ace> <8499> +<0acf> <6aac> +<0ad0> <76df> +<0ad1> <9530> +<0ad2> <731b> +<0ad3> <68a6> +<0ad4> <5b5f> +<0ad5> <772f> +<0ad6> <919a> +<0ad7> <9761> +<0ad8> <7cdc> +<0ad9> <8ff7> +<0ada> <8c1c> +<0adb> <5f25> +<0adc> <7c73> +<0add> <79d8> +<0ade> <89c5> +<0adf> <6ccc> +<0ae0> <871c> +<0ae1> <5bc6> +<0ae2> <5e42> +<0ae3> <68c9> +<0ae4> <7720> +<0ae5> <7ef5> +<0ae6> <5195> +<0ae7> <514d> +<0ae8> <52c9> +<0ae9> <5a29> +<0aea> <7f05> +<0aeb> <9762> +<0aec> <82d7> +<0aed> <63cf> +<0aee> <7784> +<0aef> <85d0> +<0af0> <79d2> +<0af1> <6e3a> +<0af2> <5e99> +<0af3> <5999> endbfchar 100 beginbfchar -<0af0> <79d2> -<0af1> <6e3a> -<0af2> <5e99> -<0af3> <5999> -<0af4> <8511> -<0af5> <706d> -<0af6> <6c11> -<0af7> <62bf> -<0af8> <76bf> -<0af9> <654f> -<0afa> <60af> -<0afb> <95fd> -<0afc> <660e> -<0afd> <879f> -<0afe> <9e23> -<0aff> <94ed> -<0b00> <540d> -<0b01> <547d> -<0b02> <8c2c> -<0b05> <8611> -<0b06> <6a21> -<0b07> <819c> -<0b08> <78e8> -<0b09> <6469> -<0b0a> <9b54> -<0b0b> <62b9> -<0b0c> <672b> -<0b0d> <83ab> -<0b0e> <58a8> -<0b0f> <9ed8> -<0b10> <6cab> -<0b11> <6f20> -<0b12> <5bde> -<0b13> <964c> -<0b14> <8c0b> -<0b15> <725f> -<0b16> <67d0> -<0b17> <62c7> -<0b18> <7261> -<0b19> <4ea9> -<0b1a> <59c6> -<0b1b> <6bcd> -<0b1c> <5893> -<0b1d> <66ae> -<0b1e> <5e55> -<0b1f> <52df> -<0b20> <6155> -<0b21> <6728> -<0b22> <76ee> -<0b23> <7766> -<0b24> <7267> -<0b25> <7a46> -<0b26> <62ff> -<0b27> <54ea> -<0b28> <5450> -<0b29> <94a0> -<0b2a> <90a3> -<0b2b> <5a1c> -<0b2c> <7eb3> -<0b2d> <6c16> -<0b2e> <4e43> -<0b2f> <5976> -<0b30> <8010> -<0b31> <5948> -<0b32> <5357> -<0b33> <7537> -<0b34> <96be> -<0b35> <56ca> -<0b36> <6320> -<0b37> <8111> -<0b38> <607c> -<0b39> <95f9> -<0b3a> <6dd6> -<0b3b> <5462> -<0b3c> <9981> -<0b3d> <5185> -<0b3e> <5ae9> -<0b3f> <80fd> -<0b40> <59ae> -<0b41> <9713> -<0b42> <502a> -<0b43> <6ce5> -<0b44> <5c3c> -<0b45> <62df> -<0b46> <4f60> -<0b47> <533f> -<0b48> <817b> -<0b49> <9006> -<0b4a> <6eba> -<0b4b> <852b> -<0b4c> <62c8> -<0b4d> <5e74> -<0b4e> <78be> -<0b4f> <64b5> -<0b50> <637b> -<0b51> <5ff5> -<0b52> <5a18> -<0b53> <917f> -<0b54> <9e1f> -<0b55> <5c3f> +<0af4> <8511> +<0af5> <706d> +<0af6> <6c11> +<0af7> <62bf> +<0af8> <76bf> +<0af9> <654f> +<0afa> <60af> +<0afb> <95fd> +<0afc> <660e> +<0afd> <879f> +<0afe> <9e23> +<0aff> <94ed> +<0b00> <540d> +<0b01> <547d> +<0b02> <8c2c> +<0b05> <8611> +<0b06> <6a21> +<0b07> <819c> +<0b08> <78e8> +<0b09> <6469> +<0b0a> <9b54> +<0b0b> <62b9> +<0b0c> <672b> +<0b0d> <83ab> +<0b0e> <58a8> +<0b0f> <9ed8> +<0b10> <6cab> +<0b11> <6f20> +<0b12> <5bde> +<0b13> <964c> +<0b14> <8c0b> +<0b15> <725f> +<0b16> <67d0> +<0b17> <62c7> +<0b18> <7261> +<0b19> <4ea9> +<0b1a> <59c6> +<0b1b> <6bcd> +<0b1c> <5893> +<0b1d> <66ae> +<0b1e> <5e55> +<0b1f> <52df> +<0b20> <6155> +<0b21> <6728> +<0b22> <76ee> +<0b23> <7766> +<0b24> <7267> +<0b25> <7a46> +<0b26> <62ff> +<0b27> <54ea> +<0b28> <5450> +<0b29> <94a0> +<0b2a> <90a3> +<0b2b> <5a1c> +<0b2c> <7eb3> +<0b2d> <6c16> +<0b2e> <4e43> +<0b2f> <5976> +<0b30> <8010> +<0b31> <5948> +<0b32> <5357> +<0b33> <7537> +<0b34> <96be> +<0b35> <56ca> +<0b36> <6320> +<0b37> <8111> +<0b38> <607c> +<0b39> <95f9> +<0b3a> <6dd6> +<0b3b> <5462> +<0b3c> <9981> +<0b3d> <5185> +<0b3e> <5ae9> +<0b3f> <80fd> +<0b40> <59ae> +<0b41> <9713> +<0b42> <502a> +<0b43> <6ce5> +<0b44> <5c3c> +<0b45> <62df> +<0b46> <4f60> +<0b47> <533f> +<0b48> <817b> +<0b49> <9006> +<0b4a> <6eba> +<0b4b> <852b> +<0b4c> <62c8> +<0b4d> <5e74> +<0b4e> <78be> +<0b4f> <64b5> +<0b50> <637b> +<0b51> <5ff5> +<0b52> <5a18> +<0b53> <917f> +<0b54> <9e1f> +<0b55> <5c3f> +<0b56> <634f> +<0b57> <8042> +<0b58> <5b7d> +<0b59> <556e> endbfchar 100 beginbfchar -<0b56> <634f> -<0b57> <8042> -<0b58> <5b7d> -<0b59> <556e> -<0b5a> <954a> -<0b5b> <954d> -<0b5c> <6d85> -<0b5d> <60a8> -<0b5e> <67e0> -<0b5f> <72de> -<0b60> <51dd> -<0b61> <5b81> -<0b62> <62e7> -<0b63> <6cde> -<0b64> <725b> -<0b65> <626d> -<0b66> <94ae> -<0b67> <7ebd> -<0b68> <8113> -<0b69> <6d53> -<0b6a> <519c> -<0b6b> <5f04> -<0b6c> <5974> -<0b6d> <52aa> -<0b6e> <6012> -<0b6f> <5973> -<0b70> <6696> -<0b71> <8650> -<0b72> <759f> -<0b73> <632a> -<0b74> <61e6> -<0b75> <7cef> -<0b76> <8bfa> -<0b77> <54e6> -<0b78> <6b27> -<0b79> <9e25> -<0b7a> <6bb4> -<0b7b> <85d5> -<0b7c> <5455> -<0b7d> <5076> -<0b7e> <6ca4> -<0b7f> <556a> -<0b80> <8db4> -<0b81> <722c> -<0b82> <5e15> -<0b83> <6015> -<0b84> <7436> -<0b85> <62cd> -<0b86> <6392> -<0b87> <724c> -<0b88> <5f98> -<0b89> <6e43> -<0b8a> <6d3e> -<0b8b> <6500> -<0b8c> <6f58> -<0b8d> <76d8> -<0b8e> <78d0> -<0b8f> <76fc> -<0b90> <7554> -<0b91> <5224> -<0b92> <53db> -<0b93> <4e53> -<0b94> <5e9e> -<0b95> <65c1> -<0b96> <802a> -<0b97> <80d6> -<0b98> <629b> -<0b99> <5486> -<0b9a> <5228> -<0b9b> <70ae> -<0b9c> <888d> -<0b9d> <8dd1> -<0b9e> <6ce1> -<0b9f> <5478> -<0ba0> <80da> -<0ba1> <57f9> -<0ba2> <88f4> -<0ba3> <8d54> -<0ba4> <966a> -<0ba5> <914d> -<0ba6> <4f69> -<0ba7> <6c9b> -<0ba8> <55b7> -<0ba9> <76c6> -<0baa> <7830> -<0bab> <62a8> -<0bac> <70f9> -<0bad> <6f8e> -<0bae> <5f6d> -<0baf> <84ec> -<0bb0> <68da> -<0bb1> <787c> -<0bb2> <7bf7> -<0bb3> <81a8> -<0bb4> <670b> -<0bb5> <9e4f> -<0bb6> <6367> -<0bb7> <78b0> -<0bb8> <576f> -<0bb9> <7812> +<0b5a> <954a> +<0b5b> <954d> +<0b5c> <6d85> +<0b5d> <60a8> +<0b5e> <67e0> +<0b5f> <72de> +<0b60> <51dd> +<0b61> <5b81> +<0b62> <62e7> +<0b63> <6cde> +<0b64> <725b> +<0b65> <626d> +<0b66> <94ae> +<0b67> <7ebd> +<0b68> <8113> +<0b69> <6d53> +<0b6a> <519c> +<0b6b> <5f04> +<0b6c> <5974> +<0b6d> <52aa> +<0b6e> <6012> +<0b6f> <5973> +<0b70> <6696> +<0b71> <8650> +<0b72> <759f> +<0b73> <632a> +<0b74> <61e6> +<0b75> <7cef> +<0b76> <8bfa> +<0b77> <54e6> +<0b78> <6b27> +<0b79> <9e25> +<0b7a> <6bb4> +<0b7b> <85d5> +<0b7c> <5455> +<0b7d> <5076> +<0b7e> <6ca4> +<0b7f> <556a> +<0b80> <8db4> +<0b81> <722c> +<0b82> <5e15> +<0b83> <6015> +<0b84> <7436> +<0b85> <62cd> +<0b86> <6392> +<0b87> <724c> +<0b88> <5f98> +<0b89> <6e43> +<0b8a> <6d3e> +<0b8b> <6500> +<0b8c> <6f58> +<0b8d> <76d8> +<0b8e> <78d0> +<0b8f> <76fc> +<0b90> <7554> +<0b91> <5224> +<0b92> <53db> +<0b93> <4e53> +<0b94> <5e9e> +<0b95> <65c1> +<0b96> <802a> +<0b97> <80d6> +<0b98> <629b> +<0b99> <5486> +<0b9a> <5228> +<0b9b> <70ae> +<0b9c> <888d> +<0b9d> <8dd1> +<0b9e> <6ce1> +<0b9f> <5478> +<0ba0> <80da> +<0ba1> <57f9> +<0ba2> <88f4> +<0ba3> <8d54> +<0ba4> <966a> +<0ba5> <914d> +<0ba6> <4f69> +<0ba7> <6c9b> +<0ba8> <55b7> +<0ba9> <76c6> +<0baa> <7830> +<0bab> <62a8> +<0bac> <70f9> +<0bad> <6f8e> +<0bae> <5f6d> +<0baf> <84ec> +<0bb0> <68da> +<0bb1> <787c> +<0bb2> <7bf7> +<0bb3> <81a8> +<0bb4> <670b> +<0bb5> <9e4f> +<0bb6> <6367> +<0bb7> <78b0> +<0bb8> <576f> +<0bb9> <7812> +<0bba> <9739> +<0bbb> <6279> +<0bbc> <62ab> +<0bbd> <5288> endbfchar 100 beginbfchar -<0bba> <9739> -<0bbb> <6279> -<0bbc> <62ab> -<0bbd> <5288> -<0bbe> <7435> -<0bbf> <6bd7> -<0bc0> <5564> -<0bc1> <813e> -<0bc2> <75b2> -<0bc3> <76ae> -<0bc4> <5339> -<0bc5> <75de> -<0bc6> <50fb> -<0bc7> <5c41> -<0bc8> <8b6c> -<0bc9> <7bc7> -<0bca> <504f> -<0bcb> <7247> -<0bcc> <9a97> -<0bcd> <98d8> -<0bce> <6f02> -<0bcf> <74e2> -<0bd0> <7968> -<0bd1> <6487> -<0bd2> <77a5> -<0bd3> <62fc> -<0bd4> <9891> -<0bd5> <8d2b> -<0bd6> <54c1> -<0bd7> <8058> -<0bd8> <4e52> -<0bd9> <576a> -<0bda> <82f9> -<0bdb> <840d> -<0bdc> <5e73> -<0bdd> <51ed> -<0bde> <74f6> -<0bdf> <8bc4> -<0be0> <5c4f> -<0be1> <5761> -<0be2> <6cfc> -<0be3> <9887> -<0be4> <5a46> -<0be5> <7834> -<0be6> <9b44> -<0be7> <8feb> -<0be8> <7c95> -<0be9> <5256> -<0bea> <6251> -<0beb> <94fa> -<0bec> <4ec6> -<0bed> <8386> -<0bee> <8461> -<0bef> <83e9> -<0bf0> <84b2> -<0bf1> <57d4> -<0bf2> <6734> -<0bf3> <5703> -<0bf4> <666e> -<0bf5> <6d66> -<0bf6> <8c31> -<0bf7> <66dd> -<0bf8> <7011> -<0bf9> <671f> -<0bfa> <6b3a> -<0bfb> <6816> -<0bfc> <621a> -<0bfd> <59bb> -<0bfe> <4e03> -<0bff> <51c4> -<0c00> <6f06> -<0c01> <67d2> -<0c02> <6c8f> -<0c03> <5176> -<0c04> <68cb> -<0c05> <5947> -<0c06> <6b67> -<0c07> <7566> -<0c08> <5d0e> -<0c09> <8110> -<0c0a> <9f50> -<0c0b> <65d7> -<0c0c> <7948> -<0c0d> <7941> -<0c0e> <9a91> -<0c0f> <8d77> -<0c10> <5c82> -<0c11> <4e5e> -<0c12> <4f01> -<0c13> <542f> -<0c14> <5951> -<0c15> <780c> -<0c16> <5668> -<0c17> <6c14> -<0c18> <8fc4> -<0c19> <5f03> -<0c1a> <6c7d> -<0c1b> <6ce3> -<0c1c> <8bab> -<0c1d> <6390> +<0bbe> <7435> +<0bbf> <6bd7> +<0bc0> <5564> +<0bc1> <813e> +<0bc2> <75b2> +<0bc3> <76ae> +<0bc4> <5339> +<0bc5> <75de> +<0bc6> <50fb> +<0bc7> <5c41> +<0bc8> <8b6c> +<0bc9> <7bc7> +<0bca> <504f> +<0bcb> <7247> +<0bcc> <9a97> +<0bcd> <98d8> +<0bce> <6f02> +<0bcf> <74e2> +<0bd0> <7968> +<0bd1> <6487> +<0bd2> <77a5> +<0bd3> <62fc> +<0bd4> <9891> +<0bd5> <8d2b> +<0bd6> <54c1> +<0bd7> <8058> +<0bd8> <4e52> +<0bd9> <576a> +<0bda> <82f9> +<0bdb> <840d> +<0bdc> <5e73> +<0bdd> <51ed> +<0bde> <74f6> +<0bdf> <8bc4> +<0be0> <5c4f> +<0be1> <5761> +<0be2> <6cfc> +<0be3> <9887> +<0be4> <5a46> +<0be5> <7834> +<0be6> <9b44> +<0be7> <8feb> +<0be8> <7c95> +<0be9> <5256> +<0bea> <6251> +<0beb> <94fa> +<0bec> <4ec6> +<0bed> <8386> +<0bee> <8461> +<0bef> <83e9> +<0bf0> <84b2> +<0bf1> <57d4> +<0bf2> <6734> +<0bf3> <5703> +<0bf4> <666e> +<0bf5> <6d66> +<0bf6> <8c31> +<0bf7> <66dd> +<0bf8> <7011> +<0bf9> <671f> +<0bfa> <6b3a> +<0bfb> <6816> +<0bfc> <621a> +<0bfd> <59bb> +<0bfe> <4e03> +<0bff> <51c4> +<0c00> <6f06> +<0c01> <67d2> +<0c02> <6c8f> +<0c03> <5176> +<0c04> <68cb> +<0c05> <5947> +<0c06> <6b67> +<0c07> <7566> +<0c08> <5d0e> +<0c09> <8110> +<0c0a> <9f50> +<0c0b> <65d7> +<0c0c> <7948> +<0c0d> <7941> +<0c0e> <9a91> +<0c0f> <8d77> +<0c10> <5c82> +<0c11> <4e5e> +<0c12> <4f01> +<0c13> <542f> +<0c14> <5951> +<0c15> <780c> +<0c16> <5668> +<0c17> <6c14> +<0c18> <8fc4> +<0c19> <5f03> +<0c1a> <6c7d> +<0c1b> <6ce3> +<0c1c> <8bab> +<0c1d> <6390> +<0c1e> <6070> +<0c1f> <6d3d> +<0c20> <7275> +<0c21> <6266> endbfchar 100 beginbfchar -<0c1e> <6070> -<0c1f> <6d3d> -<0c20> <7275> -<0c21> <6266> -<0c22> <948e> -<0c23> <94c5> -<0c24> <5343> -<0c25> <8fc1> -<0c26> <7b7e> -<0c27> <4edf> -<0c28> <8c26> -<0c29> <4e7e> -<0c2a> <9ed4> -<0c2b> <94b1> -<0c2c> <94b3> -<0c2d> <524d> -<0c2e> <6f5c> -<0c2f> <9063> -<0c30> <6d45> -<0c31> <8c34> -<0c32> <5811> -<0c33> <5d4c> -<0c34> <6b20> -<0c35> <6b49> -<0c36> <67aa> -<0c37> <545b> -<0c38> <8154> -<0c39> <7f8c> -<0c3a> <5899> -<0c3b> <8537> -<0c3c> <5f3a> -<0c3d> <62a2> -<0c3e> <6a47> -<0c3f> <9539> -<0c40> <6572> -<0c41> <6084> -<0c42> <6865> -<0c43> <77a7> -<0c44> <4e54> -<0c45> <4fa8> -<0c46> <5de7> -<0c47> <9798> -<0c48> <64ac> -<0c49> <7fd8> -<0c4a> <5ced> -<0c4b> <4fcf> -<0c4c> <7a8d> -<0c4d> <5207> -<0c4e> <8304> -<0c4f> <4e14> -<0c50> <602f> -<0c51> <7a83> -<0c52> <94a6> -<0c53> <4fb5> -<0c54> <4eb2> -<0c55> <79e6> -<0c56> <7434> -<0c57> <52e4> -<0c58> <82b9> -<0c59> <64d2> -<0c5a> <79bd> -<0c5b> <5bdd> -<0c5c> <6c81> -<0c5d> <9752> -<0c5e> <8f7b> -<0c5f> <6c22> -<0c60> <503e> -<0c61> <537f> -<0c62> <6e05> -<0c63> <64ce> -<0c64> <6674> -<0c65> <6c30> -<0c66> <60c5> -<0c67> <9877> -<0c68> <8bf7> -<0c69> <5e86> -<0c6a> <743c> -<0c6b> <7a77> -<0c6c> <79cb> -<0c6d> <4e18> -<0c6e> <90b1> -<0c6f> <7403> -<0c70> <6c42> -<0c71> <56da> -<0c72> <914b> -<0c73> <6cc5> -<0c74> <8d8b> -<0c75> <533a> -<0c76> <86c6> -<0c77> <66f2> -<0c78> <8eaf> -<0c79> <5c48> -<0c7a> <9a71> -<0c7b> <6e20> -<0c7c> <53d6> -<0c7d> <5a36> -<0c7e> <9f8b> -<0c7f> <8da3> -<0c80> <53bb> -<0c81> <5708> +<0c22> <948e> +<0c23> <94c5> +<0c24> <5343> +<0c25> <8fc1> +<0c26> <7b7e> +<0c27> <4edf> +<0c28> <8c26> +<0c29> <4e7e> +<0c2a> <9ed4> +<0c2b> <94b1> +<0c2c> <94b3> +<0c2d> <524d> +<0c2e> <6f5c> +<0c2f> <9063> +<0c30> <6d45> +<0c31> <8c34> +<0c32> <5811> +<0c33> <5d4c> +<0c34> <6b20> +<0c35> <6b49> +<0c36> <67aa> +<0c37> <545b> +<0c38> <8154> +<0c39> <7f8c> +<0c3a> <5899> +<0c3b> <8537> +<0c3c> <5f3a> +<0c3d> <62a2> +<0c3e> <6a47> +<0c3f> <9539> +<0c40> <6572> +<0c41> <6084> +<0c42> <6865> +<0c43> <77a7> +<0c44> <4e54> +<0c45> <4fa8> +<0c46> <5de7> +<0c47> <9798> +<0c48> <64ac> +<0c49> <7fd8> +<0c4a> <5ced> +<0c4b> <4fcf> +<0c4c> <7a8d> +<0c4d> <5207> +<0c4e> <8304> +<0c4f> <4e14> +<0c50> <602f> +<0c51> <7a83> +<0c52> <94a6> +<0c53> <4fb5> +<0c54> <4eb2> +<0c55> <79e6> +<0c56> <7434> +<0c57> <52e4> +<0c58> <82b9> +<0c59> <64d2> +<0c5a> <79bd> +<0c5b> <5bdd> +<0c5c> <6c81> +<0c5d> <9752> +<0c5e> <8f7b> +<0c5f> <6c22> +<0c60> <503e> +<0c61> <537f> +<0c62> <6e05> +<0c63> <64ce> +<0c64> <6674> +<0c65> <6c30> +<0c66> <60c5> +<0c67> <9877> +<0c68> <8bf7> +<0c69> <5e86> +<0c6a> <743c> +<0c6b> <7a77> +<0c6c> <79cb> +<0c6d> <4e18> +<0c6e> <90b1> +<0c6f> <7403> +<0c70> <6c42> +<0c71> <56da> +<0c72> <914b> +<0c73> <6cc5> +<0c74> <8d8b> +<0c75> <533a> +<0c76> <86c6> +<0c77> <66f2> +<0c78> <8eaf> +<0c79> <5c48> +<0c7a> <9a71> +<0c7b> <6e20> +<0c7c> <53d6> +<0c7d> <5a36> +<0c7e> <9f8b> +<0c7f> <8da3> +<0c80> <53bb> +<0c81> <5708> +<0c82> <98a7> +<0c83> <6743> +<0c84> <919b> +<0c85> <6cc9> endbfchar 100 beginbfchar -<0c82> <98a7> -<0c83> <6743> -<0c84> <919b> -<0c85> <6cc9> -<0c86> <5168> -<0c87> <75ca> -<0c88> <62f3> -<0c89> <72ac> -<0c8a> <5238> -<0c8b> <529d> -<0c8c> <7f3a> -<0c8d> <7094> -<0c8e> <7638> -<0c8f> <5374> -<0c90> <9e4a> -<0c91> <69b7> -<0c92> <786e> -<0c93> <96c0> -<0c94> <88d9> -<0c95> <7fa4> -<0c96> <7136> -<0c97> <71c3> -<0c98> <5189> -<0c99> <67d3> -<0c9a> <74e4> -<0c9b> <58e4> -<0c9c> <6518> -<0c9d> <56b7> -<0c9e> <8ba9> -<0c9f> <9976> -<0ca0> <6270> -<0ca1> <7ed5> -<0ca2> <60f9> -<0ca3> <70ed> -<0ca4> <58ec> -<0ca5> <4ec1> -<0ca6> <4eba> -<0ca7> <5fcd> -<0ca8> <97e7> -<0ca9> <4efb> -<0caa> <8ba4> -<0cab> <5203> -<0cac> <598a> -<0cad> <7eab> -<0cae> <6254> -<0caf> <4ecd> -<0cb0> <65e5> -<0cb1> <620e> -<0cb2> <8338> -<0cb3> <84c9> -<0cb4> <8363> -<0cb5> <878d> -<0cb6> <7194> -<0cb7> <6eb6> -<0cb8> <5bb9> -<0cb9> <7ed2> -<0cba> <5197> -<0cbb> <63c9> -<0cbc> <67d4> -<0cbd> <8089> -<0cbe> <8339> -<0cbf> <8815> -<0cc0> <5112> -<0cc1> <5b7a> -<0cc2> <5982> -<0cc3> <8fb1> -<0cc4> <4e73> -<0cc5> <6c5d> -<0cc6> <5165> -<0cc7> <8925> -<0cc8> <8f6f> -<0cc9> <962e> -<0cca> <854a> -<0ccb> <745e> -<0ccc> <9510> -<0ccd> <95f0> -<0cce> <6da6> -<0ccf> <82e5> -<0cd0> <5f31> -<0cd1> <6492> -<0cd2> <6d12> -<0cd3> <8428> -<0cd4> <816e> -<0cd5> <9cc3> -<0cd6> <585e> -<0cd7> <8d5b> -<0cd8> <4e09> -<0cd9> <53c1> -<0cda> <4f1e> -<0cdb> <6563> -<0cdc> <6851> -<0cdd> <55d3> -<0cde> <4e27> -<0cdf> <6414> -<0ce0> <9a9a> -<0ce1> <626b> -<0ce2> <5ac2> -<0ce3> <745f> -<0ce4> <8272> -<0ce5> <6da9> +<0c86> <5168> +<0c87> <75ca> +<0c88> <62f3> +<0c89> <72ac> +<0c8a> <5238> +<0c8b> <529d> +<0c8c> <7f3a> +<0c8d> <7094> +<0c8e> <7638> +<0c8f> <5374> +<0c90> <9e4a> +<0c91> <69b7> +<0c92> <786e> +<0c93> <96c0> +<0c94> <88d9> +<0c95> <7fa4> +<0c96> <7136> +<0c97> <71c3> +<0c98> <5189> +<0c99> <67d3> +<0c9a> <74e4> +<0c9b> <58e4> +<0c9c> <6518> +<0c9d> <56b7> +<0c9e> <8ba9> +<0c9f> <9976> +<0ca0> <6270> +<0ca1> <7ed5> +<0ca2> <60f9> +<0ca3> <70ed> +<0ca4> <58ec> +<0ca5> <4ec1> +<0ca6> <4eba> +<0ca7> <5fcd> +<0ca8> <97e7> +<0ca9> <4efb> +<0caa> <8ba4> +<0cab> <5203> +<0cac> <598a> +<0cad> <7eab> +<0cae> <6254> +<0caf> <4ecd> +<0cb0> <65e5> +<0cb1> <620e> +<0cb2> <8338> +<0cb3> <84c9> +<0cb4> <8363> +<0cb5> <878d> +<0cb6> <7194> +<0cb7> <6eb6> +<0cb8> <5bb9> +<0cb9> <7ed2> +<0cba> <5197> +<0cbb> <63c9> +<0cbc> <67d4> +<0cbd> <8089> +<0cbe> <8339> +<0cbf> <8815> +<0cc0> <5112> +<0cc1> <5b7a> +<0cc2> <5982> +<0cc3> <8fb1> +<0cc4> <4e73> +<0cc5> <6c5d> +<0cc6> <5165> +<0cc7> <8925> +<0cc8> <8f6f> +<0cc9> <962e> +<0cca> <854a> +<0ccb> <745e> +<0ccc> <9510> +<0ccd> <95f0> +<0cce> <6da6> +<0ccf> <82e5> +<0cd0> <5f31> +<0cd1> <6492> +<0cd2> <6d12> +<0cd3> <8428> +<0cd4> <816e> +<0cd5> <9cc3> +<0cd6> <585e> +<0cd7> <8d5b> +<0cd8> <4e09> +<0cd9> <53c1> +<0cda> <4f1e> +<0cdb> <6563> +<0cdc> <6851> +<0cdd> <55d3> +<0cde> <4e27> +<0cdf> <6414> +<0ce0> <9a9a> +<0ce1> <626b> +<0ce2> <5ac2> +<0ce3> <745f> +<0ce4> <8272> +<0ce5> <6da9> +<0ce6> <68ee> +<0ce7> <50e7> +<0ce8> <838e> +<0ce9> <7802> endbfchar 100 beginbfchar -<0ce6> <68ee> -<0ce7> <50e7> -<0ce8> <838e> -<0ce9> <7802> -<0cea> <6740> -<0ceb> <5239> -<0cec> <6c99> -<0ced> <7eb1> -<0cee> <50bb> -<0cef> <5565> -<0cf0> <715e> -<0cf1> <7b5b> -<0cf2> <6652> -<0cf3> <73ca> -<0cf4> <82eb> -<0cf5> <6749> -<0cf6> <5c71> -<0cf7> <5220> -<0cf8> <717d> -<0cf9> <886b> -<0cfa> <95ea> -<0cfb> <9655> -<0cfc> <64c5> -<0cfd> <8d61> -<0cfe> <81b3> -<0cff> <5584> -<0d00> <6c55> -<0d01> <6247> -<0d02> <7f2e> -<0d03> <5892> -<0d04> <4f24> -<0d05> <5546> -<0d06> <8d4f> -<0d07> <664c> -<0d08> <4e0a> -<0d09> <5c1a> -<0d0a> <88f3> -<0d0b> <68a2> -<0d0c> <634e> -<0d0d> <7a0d> -<0d0e> <70e7> -<0d0f> <828d> -<0d10> <52fa> -<0d11> <97f6> -<0d12> <5c11> -<0d13> <54e8> -<0d14> <90b5> -<0d15> <7ecd> -<0d16> <5962> -<0d17> <8d4a> -<0d18> <86c7> -<0d1b> <8d66> -<0d1c> <6444> -<0d1d> <5c04> -<0d1e> <6151> -<0d1f> <6d89> -<0d20> <793e> -<0d21> <8bbe> -<0d22> <7837> -<0d23> <7533> -<0d24> <547b> -<0d25> <4f38> -<0d26> <8eab> -<0d27> <6df1> -<0d28> <5a20> -<0d29> <7ec5> -<0d2a> <795e> -<0d2b> <6c88> -<0d2c> <5ba1> -<0d2d> <5a76> -<0d2e> <751a> -<0d2f> <80be> -<0d30> <614e> -<0d31> <6e17> -<0d32> <58f0> -<0d33> <751f> -<0d34> <7525> -<0d35> <7272> -<0d36> <5347> -<0d37> <7ef3> -<0d38> <7701> -<0d39> <76db> -<0d3a> <5269> -<0d3b> <80dc> -<0d3c> <5723> -<0d3d> <5e08> -<0d3e> <5931> -<0d3f> <72ee> -<0d40> <65bd> -<0d41> <6e7f> -<0d42> <8bd7> -<0d43> <5c38> -<0d44> <8671> -<0d45> <5341> -<0d46> <77f3> -<0d47> <62fe> -<0d48> <65f6> -<0d49> <4ec0> -<0d4a> <98df> -<0d4b> <8680> +<0cea> <6740> +<0ceb> <5239> +<0cec> <6c99> +<0ced> <7eb1> +<0cee> <50bb> +<0cef> <5565> +<0cf0> <715e> +<0cf1> <7b5b> +<0cf2> <6652> +<0cf3> <73ca> +<0cf4> <82eb> +<0cf5> <6749> +<0cf6> <5c71> +<0cf7> <5220> +<0cf8> <717d> +<0cf9> <886b> +<0cfa> <95ea> +<0cfb> <9655> +<0cfc> <64c5> +<0cfd> <8d61> +<0cfe> <81b3> +<0cff> <5584> +<0d00> <6c55> +<0d01> <6247> +<0d02> <7f2e> +<0d03> <5892> +<0d04> <4f24> +<0d05> <5546> +<0d06> <8d4f> +<0d07> <664c> +<0d08> <4e0a> +<0d09> <5c1a> +<0d0a> <88f3> +<0d0b> <68a2> +<0d0c> <634e> +<0d0d> <7a0d> +<0d0e> <70e7> +<0d0f> <828d> +<0d10> <52fa> +<0d11> <97f6> +<0d12> <5c11> +<0d13> <54e8> +<0d14> <90b5> +<0d15> <7ecd> +<0d16> <5962> +<0d17> <8d4a> +<0d18> <86c7> +<0d1b> <8d66> +<0d1c> <6444> +<0d1d> <5c04> +<0d1e> <6151> +<0d1f> <6d89> +<0d20> <793e> +<0d21> <8bbe> +<0d22> <7837> +<0d23> <7533> +<0d24> <547b> +<0d25> <4f38> +<0d26> <8eab> +<0d27> <6df1> +<0d28> <5a20> +<0d29> <7ec5> +<0d2a> <795e> +<0d2b> <6c88> +<0d2c> <5ba1> +<0d2d> <5a76> +<0d2e> <751a> +<0d2f> <80be> +<0d30> <614e> +<0d31> <6e17> +<0d32> <58f0> +<0d33> <751f> +<0d34> <7525> +<0d35> <7272> +<0d36> <5347> +<0d37> <7ef3> +<0d38> <7701> +<0d39> <76db> +<0d3a> <5269> +<0d3b> <80dc> +<0d3c> <5723> +<0d3d> <5e08> +<0d3e> <5931> +<0d3f> <72ee> +<0d40> <65bd> +<0d41> <6e7f> +<0d42> <8bd7> +<0d43> <5c38> +<0d44> <8671> +<0d45> <5341> +<0d46> <77f3> +<0d47> <62fe> +<0d48> <65f6> +<0d49> <4ec0> +<0d4a> <98df> +<0d4b> <8680> +<0d4c> <5b9e> +<0d4d> <8bc6> +<0d4e> <53f2> +<0d4f> <77e2> endbfchar 100 beginbfchar -<0d4c> <5b9e> -<0d4d> <8bc6> -<0d4e> <53f2> -<0d4f> <77e2> -<0d50> <4f7f> -<0d51> <5c4e> -<0d52> <9a76> -<0d53> <59cb> -<0d54> <5f0f> -<0d55> <793a> -<0d56> <58eb> -<0d57> <4e16> -<0d58> <67ff> -<0d59> <4e8b> -<0d5a> <62ed> -<0d5b> <8a93> -<0d5c> <901d> -<0d5d> <52bf> -<0d5e> <662f> -<0d5f> <55dc> -<0d60> <566c> -<0d61> <9002> -<0d62> <4ed5> -<0d63> <4f8d> -<0d64> <91ca> -<0d65> <9970> -<0d66> <6c0f> -<0d67> <5e02> -<0d68> <6043> -<0d69> <5ba4> -<0d6a> <89c6> -<0d6b> <8bd5> -<0d6c> <6536> -<0d6d> <624b> -<0d6e> <9996> -<0d6f> <5b88> -<0d70> <5bff> -<0d71> <6388> -<0d72> <552e> -<0d73> <53d7> -<0d74> <7626> -<0d75> <517d> -<0d76> <852c> -<0d77> <67a2> -<0d78> <68b3> -<0d79> <6b8a> -<0d7a> <6292> -<0d7b> <8f93> -<0d7c> <53d4> -<0d7d> <8212> -<0d7e> <6dd1> -<0d7f> <758f> -<0d80> <4e66> -<0d81> <8d4e> -<0d82> <5b70> -<0d83> <719f> -<0d84> <85af> -<0d85> <6691> -<0d86> <66d9> -<0d87> <7f72> -<0d88> <8700> -<0d89> <9ecd> -<0d8a> <9f20> -<0d8b> <5c5e> -<0d8c> <672f> -<0d8d> <8ff0> -<0d8e> <6811> -<0d8f> <675f> -<0d90> <620d> -<0d91> <7ad6> -<0d92> <5885> -<0d93> <5eb6> -<0d94> <6570> -<0d95> <6f31> -<0d96> <6055> -<0d97> <5237> -<0d98> <800d> -<0d99> <6454> -<0d9a> <8870> -<0d9b> <7529> -<0d9c> <5e05> -<0d9d> <6813> -<0d9e> <62f4> -<0d9f> <971c> -<0da0> <53cc> -<0da1> <723d> -<0da2> <8c01> -<0da3> <6c34> -<0da4> <7761> -<0da5> <7a0e> -<0da6> <542e> -<0da7> <77ac> -<0da8> <987a> -<0da9> <821c> -<0daa> <8bf4> -<0dab> <7855> -<0dac> <6714> -<0dad> <70c1> -<0dae> <65af> -<0daf> <6495> +<0d50> <4f7f> +<0d51> <5c4e> +<0d52> <9a76> +<0d53> <59cb> +<0d54> <5f0f> +<0d55> <793a> +<0d56> <58eb> +<0d57> <4e16> +<0d58> <67ff> +<0d59> <4e8b> +<0d5a> <62ed> +<0d5b> <8a93> +<0d5c> <901d> +<0d5d> <52bf> +<0d5e> <662f> +<0d5f> <55dc> +<0d60> <566c> +<0d61> <9002> +<0d62> <4ed5> +<0d63> <4f8d> +<0d64> <91ca> +<0d65> <9970> +<0d66> <6c0f> +<0d67> <5e02> +<0d68> <6043> +<0d69> <5ba4> +<0d6a> <89c6> +<0d6b> <8bd5> +<0d6c> <6536> +<0d6d> <624b> +<0d6e> <9996> +<0d6f> <5b88> +<0d70> <5bff> +<0d71> <6388> +<0d72> <552e> +<0d73> <53d7> +<0d74> <7626> +<0d75> <517d> +<0d76> <852c> +<0d77> <67a2> +<0d78> <68b3> +<0d79> <6b8a> +<0d7a> <6292> +<0d7b> <8f93> +<0d7c> <53d4> +<0d7d> <8212> +<0d7e> <6dd1> +<0d7f> <758f> +<0d80> <4e66> +<0d81> <8d4e> +<0d82> <5b70> +<0d83> <719f> +<0d84> <85af> +<0d85> <6691> +<0d86> <66d9> +<0d87> <7f72> +<0d88> <8700> +<0d89> <9ecd> +<0d8a> <9f20> +<0d8b> <5c5e> +<0d8c> <672f> +<0d8d> <8ff0> +<0d8e> <6811> +<0d8f> <675f> +<0d90> <620d> +<0d91> <7ad6> +<0d92> <5885> +<0d93> <5eb6> +<0d94> <6570> +<0d95> <6f31> +<0d96> <6055> +<0d97> <5237> +<0d98> <800d> +<0d99> <6454> +<0d9a> <8870> +<0d9b> <7529> +<0d9c> <5e05> +<0d9d> <6813> +<0d9e> <62f4> +<0d9f> <971c> +<0da0> <53cc> +<0da1> <723d> +<0da2> <8c01> +<0da3> <6c34> +<0da4> <7761> +<0da5> <7a0e> +<0da6> <542e> +<0da7> <77ac> +<0da8> <987a> +<0da9> <821c> +<0daa> <8bf4> +<0dab> <7855> +<0dac> <6714> +<0dad> <70c1> +<0dae> <65af> +<0daf> <6495> +<0db0> <5636> +<0db1> <601d> +<0db2> <79c1> +<0db3> <53f8> endbfchar 100 beginbfchar -<0db0> <5636> -<0db1> <601d> -<0db2> <79c1> -<0db3> <53f8> -<0db4> <4e1d> -<0db5> <6b7b> -<0db6> <8086> -<0db7> <5bfa> -<0db8> <55e3> -<0db9> <56db> -<0dba> <4f3a> -<0dbb> <4f3c> -<0dbc> <9972> -<0dbd> <5df3> -<0dbe> <677e> -<0dbf> <8038> -<0dc0> <6002> -<0dc1> <9882> -<0dc2> <9001> -<0dc3> <5b8b> -<0dc4> <8bbc> -<0dc5> <8bf5> -<0dc6> <641c> -<0dc7> <8258> -<0dc8> <64de> -<0dc9> <55fd> -<0dca> <82cf> -<0dcb> <9165> -<0dcc> <4fd7> -<0dcd> <7d20> -<0dce> <901f> -<0dcf> <7c9f> -<0dd0> <50f3> -<0dd1> <5851> -<0dd2> <6eaf> -<0dd3> <5bbf> -<0dd4> <8bc9> -<0dd5> <8083> -<0dd6> <9178> -<0dd7> <849c> -<0dd8> <7b97> -<0dd9> <867d> -<0dda> <968b> -<0ddb> <968f> -<0ddc> <7ee5> -<0ddd> <9ad3> -<0dde> <788e> -<0ddf> <5c81> -<0de0> <7a57> -<0de1> <9042> -<0de2> <96a7> -<0de3> <795f> -<0de4> <5b59> -<0de5> <635f> -<0de6> <7b0b> -<0de7> <84d1> -<0de8> <68ad> -<0de9> <5506> -<0dea> <7f29> -<0deb> <7410> -<0dec> <7d22> -<0ded> <9501> -<0dee> <6240> -<0def> <584c> -<0df0> <4ed6> -<0df1> <5b83> -<0df2> <5979> -<0df3> <5854> -<0df4> <736d> -<0df5> <631e> -<0df6> <8e4b> -<0df7> <8e0f> -<0df8> <80ce> -<0df9> <82d4> -<0dfa> <62ac> -<0dfb> <53f0> -<0dfc> <6cf0> -<0dfd> <915e> -<0dfe> <592a> -<0dff> <6001> -<0e00> <6c70> -<0e01> <574d> -<0e02> <644a> -<0e03> <8d2a> -<0e04> <762b> -<0e05> <6ee9> -<0e06> <575b> -<0e07> <6a80> -<0e08> <75f0> -<0e09> <6f6d> -<0e0a> <8c2d> -<0e0b> <8c08> -<0e0c> <5766> -<0e0d> <6bef> -<0e0e> <8892> -<0e0f> <78b3> -<0e10> <63a2> -<0e11> <53f9> -<0e12> <70ad> -<0e13> <6c64> +<0db4> <4e1d> +<0db5> <6b7b> +<0db6> <8086> +<0db7> <5bfa> +<0db8> <55e3> +<0db9> <56db> +<0dba> <4f3a> +<0dbb> <4f3c> +<0dbc> <9972> +<0dbd> <5df3> +<0dbe> <677e> +<0dbf> <8038> +<0dc0> <6002> +<0dc1> <9882> +<0dc2> <9001> +<0dc3> <5b8b> +<0dc4> <8bbc> +<0dc5> <8bf5> +<0dc6> <641c> +<0dc7> <8258> +<0dc8> <64de> +<0dc9> <55fd> +<0dca> <82cf> +<0dcb> <9165> +<0dcc> <4fd7> +<0dcd> <7d20> +<0dce> <901f> +<0dcf> <7c9f> +<0dd0> <50f3> +<0dd1> <5851> +<0dd2> <6eaf> +<0dd3> <5bbf> +<0dd4> <8bc9> +<0dd5> <8083> +<0dd6> <9178> +<0dd7> <849c> +<0dd8> <7b97> +<0dd9> <867d> +<0dda> <968b> +<0ddb> <968f> +<0ddc> <7ee5> +<0ddd> <9ad3> +<0dde> <788e> +<0ddf> <5c81> +<0de0> <7a57> +<0de1> <9042> +<0de2> <96a7> +<0de3> <795f> +<0de4> <5b59> +<0de5> <635f> +<0de6> <7b0b> +<0de7> <84d1> +<0de8> <68ad> +<0de9> <5506> +<0dea> <7f29> +<0deb> <7410> +<0dec> <7d22> +<0ded> <9501> +<0dee> <6240> +<0def> <584c> +<0df0> <4ed6> +<0df1> <5b83> +<0df2> <5979> +<0df3> <5854> +<0df4> <736d> +<0df5> <631e> +<0df6> <8e4b> +<0df7> <8e0f> +<0df8> <80ce> +<0df9> <82d4> +<0dfa> <62ac> +<0dfb> <53f0> +<0dfc> <6cf0> +<0dfd> <915e> +<0dfe> <592a> +<0dff> <6001> +<0e00> <6c70> +<0e01> <574d> +<0e02> <644a> +<0e03> <8d2a> +<0e04> <762b> +<0e05> <6ee9> +<0e06> <575b> +<0e07> <6a80> +<0e08> <75f0> +<0e09> <6f6d> +<0e0a> <8c2d> +<0e0b> <8c08> +<0e0c> <5766> +<0e0d> <6bef> +<0e0e> <8892> +<0e0f> <78b3> +<0e10> <63a2> +<0e11> <53f9> +<0e12> <70ad> +<0e13> <6c64> +<0e14> <5858> +<0e15> <642a> +<0e16> <5802> +<0e17> <68e0> endbfchar 100 beginbfchar -<0e14> <5858> -<0e15> <642a> -<0e16> <5802> -<0e17> <68e0> -<0e18> <819b> -<0e19> <5510> -<0e1a> <7cd6> -<0e1b> <5018> -<0e1c> <8eba> -<0e1d> <6dcc> -<0e1e> <8d9f> -<0e1f> <70eb> -<0e20> <638f> -<0e21> <6d9b> -<0e22> <6ed4> -<0e23> <7ee6> -<0e24> <8404> -<0e25> <6843> -<0e26> <9003> -<0e27> <6dd8> -<0e28> <9676> -<0e29> <8ba8> -<0e2a> <5957> -<0e2b> <7279> -<0e2c> <85e4> -<0e2d> <817e> -<0e2e> <75bc> -<0e2f> <8a8a> -<0e30> <68af> -<0e31> <5254> -<0e32> <8e22> -<0e33> <9511> -<0e34> <63d0> -<0e35> <9898> -<0e36> <8e44> -<0e37> <557c> -<0e38> <4f53> -<0e39> <66ff> -<0e3a> <568f> -<0e3b> <60d5> -<0e3c> <6d95> -<0e3d> <5243> -<0e3e> <5c49> -<0e3f> <5929> -<0e40> <6dfb> -<0e41> <586b> -<0e42> <7530> -<0e43> <751c> -<0e44> <606c> -<0e45> <8214> -<0e46> <8146> -<0e47> <6311> -<0e48> <6761> -<0e49> <8fe2> -<0e4a> <773a> -<0e4b> <8df3> -<0e4c> <8d34> -<0e4d> <94c1> -<0e4e> <5e16> -<0e4f> <5385> -<0e50> <542c> -<0e51> <70c3> -<0e52> <6c40> -<0e53> <5ef7> -<0e54> <505c> -<0e55> <4ead> -<0e56> <5ead> -<0e57> <633a> -<0e58> <8247> -<0e59> <901a> -<0e5a> <6850> -<0e5b> <916e> -<0e5c> <77b3> -<0e5d> <540c> -<0e5e> <94dc> -<0e5f> <5f64> -<0e60> <7ae5> -<0e61> <6876> -<0e62> <6345> -<0e63> <7b52> -<0e64> <7edf> -<0e65> <75db> -<0e66> <5077> -<0e67> <6295> -<0e68> <5934> -<0e69> <900f> -<0e6a> <51f8> -<0e6b> <79c3> -<0e6c> <7a81> -<0e6d> <56fe> -<0e6e> <5f92> -<0e6f> <9014> -<0e70> <6d82> -<0e71> <5c60> -<0e72> <571f> -<0e73> <5410> -<0e74> <5154> -<0e75> <6e4d> -<0e76> <56e2> -<0e77> <63a8> +<0e18> <819b> +<0e19> <5510> +<0e1a> <7cd6> +<0e1b> <5018> +<0e1c> <8eba> +<0e1d> <6dcc> +<0e1e> <8d9f> +<0e1f> <70eb> +<0e20> <638f> +<0e21> <6d9b> +<0e22> <6ed4> +<0e23> <7ee6> +<0e24> <8404> +<0e25> <6843> +<0e26> <9003> +<0e27> <6dd8> +<0e28> <9676> +<0e29> <8ba8> +<0e2a> <5957> +<0e2b> <7279> +<0e2c> <85e4> +<0e2d> <817e> +<0e2e> <75bc> +<0e2f> <8a8a> +<0e30> <68af> +<0e31> <5254> +<0e32> <8e22> +<0e33> <9511> +<0e34> <63d0> +<0e35> <9898> +<0e36> <8e44> +<0e37> <557c> +<0e38> <4f53> +<0e39> <66ff> +<0e3a> <568f> +<0e3b> <60d5> +<0e3c> <6d95> +<0e3d> <5243> +<0e3e> <5c49> +<0e3f> <5929> +<0e40> <6dfb> +<0e41> <586b> +<0e42> <7530> +<0e43> <751c> +<0e44> <606c> +<0e45> <8214> +<0e46> <8146> +<0e47> <6311> +<0e48> <6761> +<0e49> <8fe2> +<0e4a> <773a> +<0e4b> <8df3> +<0e4c> <8d34> +<0e4d> <94c1> +<0e4e> <5e16> +<0e4f> <5385> +<0e50> <542c> +<0e51> <70c3> +<0e52> <6c40> +<0e53> <5ef7> +<0e54> <505c> +<0e55> <4ead> +<0e56> <5ead> +<0e57> <633a> +<0e58> <8247> +<0e59> <901a> +<0e5a> <6850> +<0e5b> <916e> +<0e5c> <77b3> +<0e5d> <540c> +<0e5e> <94dc> +<0e5f> <5f64> +<0e60> <7ae5> +<0e61> <6876> +<0e62> <6345> +<0e63> <7b52> +<0e64> <7edf> +<0e65> <75db> +<0e66> <5077> +<0e67> <6295> +<0e68> <5934> +<0e69> <900f> +<0e6a> <51f8> +<0e6b> <79c3> +<0e6c> <7a81> +<0e6d> <56fe> +<0e6e> <5f92> +<0e6f> <9014> +<0e70> <6d82> +<0e71> <5c60> +<0e72> <571f> +<0e73> <5410> +<0e74> <5154> +<0e75> <6e4d> +<0e76> <56e2> +<0e77> <63a8> +<0e78> <9893> +<0e79> <817f> +<0e7a> <8715> +<0e7b> <892a> endbfchar 100 beginbfchar -<0e78> <9893> -<0e79> <817f> -<0e7a> <8715> -<0e7b> <892a> -<0e7c> <9000> -<0e7d> <541e> -<0e7e> <5c6f> -<0e7f> <81c0> -<0e80> <62d6> -<0e81> <6258> -<0e82> <8131> -<0e83> <9e35> -<0e84> <9640> -<0e85> <9a6e> -<0e86> <9a7c> -<0e87> <692d> -<0e88> <59a5> -<0e89> <62d3> -<0e8a> <553e> -<0e8b> <6316> -<0e8c> <54c7> -<0e8d> <86d9> -<0e8e> <6d3c> -<0e8f> <5a03> -<0e90> <74e6> -<0e91> <889c> -<0e92> <6b6a> -<0e93> <5916> -<0e94> <8c4c> -<0e95> <5f2f> -<0e96> <6e7e> -<0e97> <73a9> -<0e98> <987d> -<0e99> <4e38> -<0e9a> <70f7> -<0e9b> <5b8c> -<0e9c> <7897> -<0e9d> <633d> -<0e9e> <665a> -<0e9f> <7696> -<0ea0> <60cb> -<0ea1> <5b9b> -<0ea2> <5a49> -<0ea3> <4e07> -<0ea4> <8155> -<0ea5> <6c6a> -<0ea6> <738b> -<0ea7> <4ea1> -<0ea8> <6789> -<0ea9> <7f51> -<0eaa> <5f80> -<0eab> <65fa> -<0eac> <671b> -<0ead> <5fd8> -<0eae> <5984> -<0eaf> <5a01> -<0eb0> <5dcd> -<0eb1> <5fae> -<0eb2> <5371> -<0eb3> <97e6> -<0eb4> <8fdd> -<0eb5> <6845> -<0eb6> <56f4> -<0eb7> <552f> -<0eb8> <60df> -<0eb9> <4e3a> -<0eba> <6f4d> -<0ebb> <7ef4> -<0ebc> <82c7> -<0ebd> <840e> -<0ebe> <59d4> -<0ebf> <4f1f> -<0ec0> <4f2a> -<0ec1> <5c3e> -<0ec2> <7eac> -<0ec3> <672a> -<0ec4> <851a> -<0ec5> <5473> -<0ec6> <754f> -<0ec7> <80c3> -<0ec8> <5582> -<0ec9> <9b4f> -<0eca> <4f4d> -<0ecb> <6e2d> -<0ecc> <8c13> -<0ecd> <5c09> -<0ece> <6170> -<0ecf> <536b> -<0ed0> <761f> -<0ed1> <6e29> -<0ed2> <868a> -<0ed3> <6587> -<0ed4> <95fb> -<0ed5> <7eb9> -<0ed6> <543b> -<0ed7> <7a33> -<0ed8> <7d0a> -<0ed9> <95ee> -<0eda> <55e1> -<0edb> <7fc1> +<0e7c> <9000> +<0e7d> <541e> +<0e7e> <5c6f> +<0e7f> <81c0> +<0e80> <62d6> +<0e81> <6258> +<0e82> <8131> +<0e83> <9e35> +<0e84> <9640> +<0e85> <9a6e> +<0e86> <9a7c> +<0e87> <692d> +<0e88> <59a5> +<0e89> <62d3> +<0e8a> <553e> +<0e8b> <6316> +<0e8c> <54c7> +<0e8d> <86d9> +<0e8e> <6d3c> +<0e8f> <5a03> +<0e90> <74e6> +<0e91> <889c> +<0e92> <6b6a> +<0e93> <5916> +<0e94> <8c4c> +<0e95> <5f2f> +<0e96> <6e7e> +<0e97> <73a9> +<0e98> <987d> +<0e99> <4e38> +<0e9a> <70f7> +<0e9b> <5b8c> +<0e9c> <7897> +<0e9d> <633d> +<0e9e> <665a> +<0e9f> <7696> +<0ea0> <60cb> +<0ea1> <5b9b> +<0ea2> <5a49> +<0ea3> <4e07> +<0ea4> <8155> +<0ea5> <6c6a> +<0ea6> <738b> +<0ea7> <4ea1> +<0ea8> <6789> +<0ea9> <7f51> +<0eaa> <5f80> +<0eab> <65fa> +<0eac> <671b> +<0ead> <5fd8> +<0eae> <5984> +<0eaf> <5a01> +<0eb0> <5dcd> +<0eb1> <5fae> +<0eb2> <5371> +<0eb3> <97e6> +<0eb4> <8fdd> +<0eb5> <6845> +<0eb6> <56f4> +<0eb7> <552f> +<0eb8> <60df> +<0eb9> <4e3a> +<0eba> <6f4d> +<0ebb> <7ef4> +<0ebc> <82c7> +<0ebd> <840e> +<0ebe> <59d4> +<0ebf> <4f1f> +<0ec0> <4f2a> +<0ec1> <5c3e> +<0ec2> <7eac> +<0ec3> <672a> +<0ec4> <851a> +<0ec5> <5473> +<0ec6> <754f> +<0ec7> <80c3> +<0ec8> <5582> +<0ec9> <9b4f> +<0eca> <4f4d> +<0ecb> <6e2d> +<0ecc> <8c13> +<0ecd> <5c09> +<0ece> <6170> +<0ecf> <536b> +<0ed0> <761f> +<0ed1> <6e29> +<0ed2> <868a> +<0ed3> <6587> +<0ed4> <95fb> +<0ed5> <7eb9> +<0ed6> <543b> +<0ed7> <7a33> +<0ed8> <7d0a> +<0ed9> <95ee> +<0eda> <55e1> +<0edb> <7fc1> +<0edc> <74ee> +<0edd> <631d> +<0ede> <8717> +<0edf> <6da1> endbfchar 100 beginbfchar -<0edc> <74ee> -<0edd> <631d> -<0ede> <8717> -<0edf> <6da1> -<0ee0> <7a9d> -<0ee1> <6211> -<0ee2> <65a1> -<0ee3> <5367> -<0ee4> <63e1> -<0ee5> <6c83> -<0ee6> <5deb> -<0ee7> <545c> -<0ee8> <94a8> -<0ee9> <4e4c> -<0eea> <6c61> -<0eeb> <8bec> -<0eec> <5c4b> -<0eed> <65e0> -<0eee> <829c> -<0eef> <68a7> -<0ef0> <543e> -<0ef1> <5434> -<0ef2> <6bcb> -<0ef3> <6b66> -<0ef4> <4e94> -<0ef5> <6342> -<0ef6> <5348> -<0ef7> <821e> -<0ef8> <4f0d> -<0ef9> <4fae> -<0efa> <575e> -<0efb> <620a> -<0efc> <96fe> -<0efd> <6664> -<0efe> <7269> -<0eff> <52ff> -<0f00> <52a1> -<0f01> <609f> -<0f02> <8bef> -<0f03> <6614> -<0f04> <7199> -<0f05> <6790> -<0f06> <897f> -<0f07> <7852> -<0f08> <77fd> -<0f09> <6670> -<0f0a> <563b> -<0f0b> <5438> -<0f0c> <9521> -<0f0d> <727a> -<0f0e> <7a00> -<0f0f> <606f> -<0f10> <5e0c> -<0f11> <6089> -<0f12> <819d> -<0f13> <5915> -<0f14> <60dc> -<0f15> <7184> -<0f16> <70ef> -<0f17> <6eaa> -<0f18> <6c50> -<0f19> <7280> -<0f1a> <6a84> -<0f1b> <88ad> -<0f1c> <5e2d> -<0f1d> <4e60> -<0f1e> <5ab3> -<0f1f> <559c> -<0f20> <94e3> -<0f21> <6d17> -<0f22> <7cfb> -<0f23> <9699> -<0f24> <620f> -<0f25> <7ec6> -<0f26> <778e> -<0f27> <867e> -<0f28> <5323> -<0f29> <971e> -<0f2a> <8f96> -<0f2b> <6687> -<0f2c> <5ce1> -<0f2d> <4fa0> -<0f2e> <72ed> -<0f2f> <4e0b> -<0f30> <53a6> -<0f31> <590f> -<0f32> <5413> -<0f33> <6380> -<0f34> <9528> -<0f35> <5148> -<0f36> <4ed9> -<0f37> <9c9c> -<0f38> <7ea4> -<0f39> <54b8> -<0f3a> <8d24> -<0f3b> <8854> -<0f3c> <8237> -<0f3d> <95f2> -<0f3e> <6d8e> -<0f3f> <5f26> +<0ee0> <7a9d> +<0ee1> <6211> +<0ee2> <65a1> +<0ee3> <5367> +<0ee4> <63e1> +<0ee5> <6c83> +<0ee6> <5deb> +<0ee7> <545c> +<0ee8> <94a8> +<0ee9> <4e4c> +<0eea> <6c61> +<0eeb> <8bec> +<0eec> <5c4b> +<0eed> <65e0> +<0eee> <829c> +<0eef> <68a7> +<0ef0> <543e> +<0ef1> <5434> +<0ef2> <6bcb> +<0ef3> <6b66> +<0ef4> <4e94> +<0ef5> <6342> +<0ef6> <5348> +<0ef7> <821e> +<0ef8> <4f0d> +<0ef9> <4fae> +<0efa> <575e> +<0efb> <620a> +<0efc> <96fe> +<0efd> <6664> +<0efe> <7269> +<0eff> <52ff> +<0f00> <52a1> +<0f01> <609f> +<0f02> <8bef> +<0f03> <6614> +<0f04> <7199> +<0f05> <6790> +<0f06> <897f> +<0f07> <7852> +<0f08> <77fd> +<0f09> <6670> +<0f0a> <563b> +<0f0b> <5438> +<0f0c> <9521> +<0f0d> <727a> +<0f0e> <7a00> +<0f0f> <606f> +<0f10> <5e0c> +<0f11> <6089> +<0f12> <819d> +<0f13> <5915> +<0f14> <60dc> +<0f15> <7184> +<0f16> <70ef> +<0f17> <6eaa> +<0f18> <6c50> +<0f19> <7280> +<0f1a> <6a84> +<0f1b> <88ad> +<0f1c> <5e2d> +<0f1d> <4e60> +<0f1e> <5ab3> +<0f1f> <559c> +<0f20> <94e3> +<0f21> <6d17> +<0f22> <7cfb> +<0f23> <9699> +<0f24> <620f> +<0f25> <7ec6> +<0f26> <778e> +<0f27> <867e> +<0f28> <5323> +<0f29> <971e> +<0f2a> <8f96> +<0f2b> <6687> +<0f2c> <5ce1> +<0f2d> <4fa0> +<0f2e> <72ed> +<0f2f> <4e0b> +<0f30> <53a6> +<0f31> <590f> +<0f32> <5413> +<0f33> <6380> +<0f34> <9528> +<0f35> <5148> +<0f36> <4ed9> +<0f37> <9c9c> +<0f38> <7ea4> +<0f39> <54b8> +<0f3a> <8d24> +<0f3b> <8854> +<0f3c> <8237> +<0f3d> <95f2> +<0f3e> <6d8e> +<0f3f> <5f26> +<0f40> <5acc> +<0f41> <663e> +<0f42> <9669> +<0f43> <73b0> endbfchar 100 beginbfchar -<0f40> <5acc> -<0f41> <663e> -<0f42> <9669> -<0f43> <73b0> -<0f44> <732e> -<0f45> <53bf> -<0f46> <817a> -<0f47> <9985> -<0f48> <7fa1> -<0f49> <5baa> -<0f4a> <9677> -<0f4b> <9650> -<0f4c> <7ebf> -<0f4d> <76f8> -<0f4e> <53a2> -<0f4f> <9576> -<0f50> <9999> -<0f51> <7bb1> -<0f52> <8944> -<0f53> <6e58> -<0f54> <4e61> -<0f55> <7fd4> -<0f56> <7965> -<0f57> <8be6> -<0f58> <60f3> -<0f59> <54cd> -<0f5a> <4eab> -<0f5b> <9879> -<0f5c> <5df7> -<0f5d> <6a61> -<0f5e> <50cf> -<0f5f> <5411> -<0f60> <8c61> -<0f61> <8427> -<0f62> <785d> -<0f63> <9704> -<0f64> <524a> -<0f65> <54ee> -<0f66> <56a3> -<0f67> <9500> -<0f68> <6d88> -<0f69> <5bb5> -<0f6a> <6dc6> -<0f6b> <6653> -<0f6c> <5c0f> -<0f6d> <5b5d> -<0f6e> <6821> -<0f6f> <8096> -<0f70> <5578> -<0f71> <7b11> -<0f72> <6548> -<0f73> <6954> -<0f74> <4e9b> -<0f75> <6b47> -<0f76> <874e> -<0f77> <978b> -<0f78> <534f> -<0f79> <631f> -<0f7a> <643a> -<0f7b> <90aa> -<0f7c> <659c> -<0f7d> <80c1> -<0f7e> <8c10> -<0f7f> <5199> -<0f80> <68b0> -<0f81> <5378> -<0f82> <87f9> -<0f83> <61c8> -<0f84> <6cc4> -<0f85> <6cfb> -<0f86> <8c22> -<0f87> <5c51> -<0f88> <85aa> -<0f89> <82af> -<0f8a> <950c> -<0f8b> <6b23> -<0f8c> <8f9b> -<0f8d> <65b0> -<0f8e> <5ffb> -<0f8f> <5fc3> -<0f90> <4fe1> -<0f91> <8845> -<0f92> <661f> -<0f93> <8165> -<0f94> <7329> -<0f95> <60fa> -<0f96> <5174> -<0f97> <5211> -<0f98> <578b> -<0f99> <5f62> -<0f9a> <90a2> -<0f9b> <884c> -<0f9c> <9192> -<0f9d> <5e78> -<0f9e> <674f> -<0f9f> <6027> -<0fa0> <59d3> -<0fa1> <5144> -<0fa2> <51f6> -<0fa3> <80f8> +<0f44> <732e> +<0f45> <53bf> +<0f46> <817a> +<0f47> <9985> +<0f48> <7fa1> +<0f49> <5baa> +<0f4a> <9677> +<0f4b> <9650> +<0f4c> <7ebf> +<0f4d> <76f8> +<0f4e> <53a2> +<0f4f> <9576> +<0f50> <9999> +<0f51> <7bb1> +<0f52> <8944> +<0f53> <6e58> +<0f54> <4e61> +<0f55> <7fd4> +<0f56> <7965> +<0f57> <8be6> +<0f58> <60f3> +<0f59> <54cd> +<0f5a> <4eab> +<0f5b> <9879> +<0f5c> <5df7> +<0f5d> <6a61> +<0f5e> <50cf> +<0f5f> <5411> +<0f60> <8c61> +<0f61> <8427> +<0f62> <785d> +<0f63> <9704> +<0f64> <524a> +<0f65> <54ee> +<0f66> <56a3> +<0f67> <9500> +<0f68> <6d88> +<0f69> <5bb5> +<0f6a> <6dc6> +<0f6b> <6653> +<0f6c> <5c0f> +<0f6d> <5b5d> +<0f6e> <6821> +<0f6f> <8096> +<0f70> <5578> +<0f71> <7b11> +<0f72> <6548> +<0f73> <6954> +<0f74> <4e9b> +<0f75> <6b47> +<0f76> <874e> +<0f77> <978b> +<0f78> <534f> +<0f79> <631f> +<0f7a> <643a> +<0f7b> <90aa> +<0f7c> <659c> +<0f7d> <80c1> +<0f7e> <8c10> +<0f7f> <5199> +<0f80> <68b0> +<0f81> <5378> +<0f82> <87f9> +<0f83> <61c8> +<0f84> <6cc4> +<0f85> <6cfb> +<0f86> <8c22> +<0f87> <5c51> +<0f88> <85aa> +<0f89> <82af> +<0f8a> <950c> +<0f8b> <6b23> +<0f8c> <8f9b> +<0f8d> <65b0> +<0f8e> <5ffb> +<0f8f> <5fc3> +<0f90> <4fe1> +<0f91> <8845> +<0f92> <661f> +<0f93> <8165> +<0f94> <7329> +<0f95> <60fa> +<0f96> <5174> +<0f97> <5211> +<0f98> <578b> +<0f99> <5f62> +<0f9a> <90a2> +<0f9b> <884c> +<0f9c> <9192> +<0f9d> <5e78> +<0f9e> <674f> +<0f9f> <6027> +<0fa0> <59d3> +<0fa1> <5144> +<0fa2> <51f6> +<0fa3> <80f8> +<0fa4> <5308> +<0fa5> <6c79> +<0fa6> <96c4> +<0fa7> <718a> endbfchar 100 beginbfchar -<0fa4> <5308> -<0fa5> <6c79> -<0fa6> <96c4> -<0fa7> <718a> -<0fa8> <4f11> -<0fa9> <4fee> -<0faa> <7f9e> -<0fab> <673d> -<0fac> <55c5> -<0fad> <9508> -<0fae> <79c0> -<0faf> <8896> -<0fb0> <7ee3> -<0fb1> <589f> -<0fb2> <620c> -<0fb3> <9700> -<0fb4> <865a> -<0fb5> <5618> -<0fb6> <987b> -<0fb7> <5f90> -<0fb8> <8bb8> -<0fb9> <84c4> -<0fba> <9157> -<0fbb> <53d9> -<0fbc> <65ed> -<0fbd> <5e8f> -<0fbe> <755c> -<0fbf> <6064> -<0fc0> <7d6e> -<0fc1> <5a7f> -<0fc2> <7eea> -<0fc3> <7eed> -<0fc4> <8f69> -<0fc5> <55a7> -<0fc6> <5ba3> -<0fc7> <60ac> -<0fc8> <65cb> -<0fc9> <7384> -<0fca> <9009> -<0fcb> <7663> -<0fcc> <7729> -<0fcd> <7eda> -<0fce> <9774> -<0fcf> <859b> -<0fd0> <5b66> -<0fd1> <7a74> -<0fd2> <96ea> -<0fd3> <8840> -<0fd4> <52cb> -<0fd5> <718f> -<0fd6> <5faa> -<0fd7> <65ec> -<0fd8> <8be2> -<0fd9> <5bfb> -<0fda> <9a6f> -<0fdb> <5de1> -<0fdc> <6b89> -<0fdd> <6c5b> -<0fde> <8bad> -<0fdf> <8baf> -<0fe0> <900a> -<0fe1> <8fc5> -<0fe2> <538b> -<0fe3> <62bc> -<0fe4> <9e26> -<0fe5> <9e2d> -<0fe6> <5440> -<0fe7> <4e2b> -<0fe8> <82bd> -<0fe9> <7259> -<0fea> <869c> -<0feb> <5d16> -<0fec> <8859> -<0fed> <6daf> -<0fee> <96c5> -<0fef> <54d1> -<0ff0> <4e9a> -<0ff1> <8bb6> -<0ff2> <7109> -<0ff3> <54bd> -<0ff4> <9609> -<0ff5> <70df> -<0ff6> <6df9> -<0ff7> <76d0> -<0ff8> <4e25> -<0ff9> <7814> -<0ffa> <8712> -<0ffb> <5ca9> -<0ffc> <5ef6> -<0ffd> <8a00> -<0ffe> <989c> -<0fff> <960e> -<1000> <708e> -<1001> <6cbf> -<1002> <5944> -<1003> <63a9> -<1004> <773c> -<1005> <884d> -<1006> <6f14> -<1007> <8273> +<0fa8> <4f11> +<0fa9> <4fee> +<0faa> <7f9e> +<0fab> <673d> +<0fac> <55c5> +<0fad> <9508> +<0fae> <79c0> +<0faf> <8896> +<0fb0> <7ee3> +<0fb1> <589f> +<0fb2> <620c> +<0fb3> <9700> +<0fb4> <865a> +<0fb5> <5618> +<0fb6> <987b> +<0fb7> <5f90> +<0fb8> <8bb8> +<0fb9> <84c4> +<0fba> <9157> +<0fbb> <53d9> +<0fbc> <65ed> +<0fbd> <5e8f> +<0fbe> <755c> +<0fbf> <6064> +<0fc0> <7d6e> +<0fc1> <5a7f> +<0fc2> <7eea> +<0fc3> <7eed> +<0fc4> <8f69> +<0fc5> <55a7> +<0fc6> <5ba3> +<0fc7> <60ac> +<0fc8> <65cb> +<0fc9> <7384> +<0fca> <9009> +<0fcb> <7663> +<0fcc> <7729> +<0fcd> <7eda> +<0fce> <9774> +<0fcf> <859b> +<0fd0> <5b66> +<0fd1> <7a74> +<0fd2> <96ea> +<0fd3> <8840> +<0fd4> <52cb> +<0fd5> <718f> +<0fd6> <5faa> +<0fd7> <65ec> +<0fd8> <8be2> +<0fd9> <5bfb> +<0fda> <9a6f> +<0fdb> <5de1> +<0fdc> <6b89> +<0fdd> <6c5b> +<0fde> <8bad> +<0fdf> <8baf> +<0fe0> <900a> +<0fe1> <8fc5> +<0fe2> <538b> +<0fe3> <62bc> +<0fe4> <9e26> +<0fe5> <9e2d> +<0fe6> <5440> +<0fe7> <4e2b> +<0fe8> <82bd> +<0fe9> <7259> +<0fea> <869c> +<0feb> <5d16> +<0fec> <8859> +<0fed> <6daf> +<0fee> <96c5> +<0fef> <54d1> +<0ff0> <4e9a> +<0ff1> <8bb6> +<0ff2> <7109> +<0ff3> <54bd> +<0ff4> <9609> +<0ff5> <70df> +<0ff6> <6df9> +<0ff7> <76d0> +<0ff8> <4e25> +<0ff9> <7814> +<0ffa> <8712> +<0ffb> <5ca9> +<0ffc> <5ef6> +<0ffd> <8a00> +<0ffe> <989c> +<0fff> <960e> +<1000> <708e> +<1001> <6cbf> +<1002> <5944> +<1003> <63a9> +<1004> <773c> +<1005> <884d> +<1006> <6f14> +<1007> <8273> +<1008> <5830> +<1009> <71d5> +<100a> <538c> +<100b> <781a> endbfchar 100 beginbfchar -<1008> <5830> -<1009> <71d5> -<100a> <538c> -<100b> <781a> -<100c> <96c1> -<100d> <5501> -<100e> <5f66> -<100f> <7130> -<1010> <5bb4> -<1011> <8c1a> -<1012> <9a8c> -<1013> <6b83> -<1014> <592e> -<1015> <9e2f> -<1016> <79e7> -<1017> <6768> -<1018> <626c> -<1019> <4f6f> -<101a> <75a1> -<101b> <7f8a> -<101c> <6d0b> -<101d> <9633> -<101e> <6c27> -<101f> <4ef0> -<1020> <75d2> -<1021> <517b> -<1022> <6837> -<1023> <6f3e> -<1024> <9080> -<1025> <8170> -<1026> <5996> -<1027> <7476> -<1028> <6447> -<1029> <5c27> -<102a> <9065> -<102b> <7a91> -<102c> <8c23> -<102d> <59da> -<102e> <54ac> -<102f> <8200> -<1030> <836f> -<1031> <8981> -<1032> <8000> -<1033> <6930> -<1034> <564e> -<1035> <8036> -<1036> <7237> -<1037> <91ce> -<1038> <51b6> -<1039> <4e5f> -<103a> <9875> -<103b> <6396> -<103c> <4e1a> -<103d> <53f6> -<103e> <66f3> -<103f> <814b> -<1040> <591c> -<1041> <6db2> -<1042> <4e00> -<1043> <58f9> -<1044> <533b> -<1045> <63d6> -<1046> <94f1> -<1047> <4f9d> -<1048> <4f0a> -<1049> <8863> -<104a> <9890> -<104b> <5937> -<104c> <9057> -<104d> <79fb> -<104e> <4eea> -<104f> <80f0> -<1050> <7591> -<1051> <6c82> -<1052> <5b9c> -<1053> <59e8> -<1054> <5f5d> -<1055> <6905> -<1056> <8681> -<1057> <501a> -<1058> <5df2> -<1059> <4e59> -<105a> <77e3> -<105b> <4ee5> -<105c> <827a> -<105d> <6291> -<105e> <6613> -<105f> <9091> -<1060> <5c79> -<1061> <4ebf> -<1062> <5f79> -<1063> <81c6> -<1064> <9038> -<1065> <8084> -<1066> <75ab> -<1067> <4ea6> -<1068> <88d4> -<1069> <610f> -<106a> <6bc5> -<106b> <5fc6> +<100c> <96c1> +<100d> <5501> +<100e> <5f66> +<100f> <7130> +<1010> <5bb4> +<1011> <8c1a> +<1012> <9a8c> +<1013> <6b83> +<1014> <592e> +<1015> <9e2f> +<1016> <79e7> +<1017> <6768> +<1018> <626c> +<1019> <4f6f> +<101a> <75a1> +<101b> <7f8a> +<101c> <6d0b> +<101d> <9633> +<101e> <6c27> +<101f> <4ef0> +<1020> <75d2> +<1021> <517b> +<1022> <6837> +<1023> <6f3e> +<1024> <9080> +<1025> <8170> +<1026> <5996> +<1027> <7476> +<1028> <6447> +<1029> <5c27> +<102a> <9065> +<102b> <7a91> +<102c> <8c23> +<102d> <59da> +<102e> <54ac> +<102f> <8200> +<1030> <836f> +<1031> <8981> +<1032> <8000> +<1033> <6930> +<1034> <564e> +<1035> <8036> +<1036> <7237> +<1037> <91ce> +<1038> <51b6> +<1039> <4e5f> +<103a> <9875> +<103b> <6396> +<103c> <4e1a> +<103d> <53f6> +<103e> <66f3> +<103f> <814b> +<1040> <591c> +<1041> <6db2> +<1042> <4e00> +<1043> <58f9> +<1044> <533b> +<1045> <63d6> +<1046> <94f1> +<1047> <4f9d> +<1048> <4f0a> +<1049> <8863> +<104a> <9890> +<104b> <5937> +<104c> <9057> +<104d> <79fb> +<104e> <4eea> +<104f> <80f0> +<1050> <7591> +<1051> <6c82> +<1052> <5b9c> +<1053> <59e8> +<1054> <5f5d> +<1055> <6905> +<1056> <8681> +<1057> <501a> +<1058> <5df2> +<1059> <4e59> +<105a> <77e3> +<105b> <4ee5> +<105c> <827a> +<105d> <6291> +<105e> <6613> +<105f> <9091> +<1060> <5c79> +<1061> <4ebf> +<1062> <5f79> +<1063> <81c6> +<1064> <9038> +<1065> <8084> +<1066> <75ab> +<1067> <4ea6> +<1068> <88d4> +<1069> <610f> +<106a> <6bc5> +<106b> <5fc6> +<106c> <4e49> +<106d> <76ca> +<106e> <6ea2> +<106f> <8be3> endbfchar 100 beginbfchar -<106c> <4e49> -<106d> <76ca> -<106e> <6ea2> -<106f> <8be3> -<1070> <8bae> -<1071> <8c0a> -<1072> <8bd1> -<1073> <5f02> -<1074> <7ffc> -<1075> <7fcc> -<1076> <7ece> -<1077> <8335> -<1078> <836b> -<1079> <56e0> -<107a> <6bb7> -<107b> <97f3> -<107c> <9634> -<107d> <59fb> -<107e> <541f> -<107f> <94f6> -<1080> <6deb> -<1081> <5bc5> -<1082> <996e> -<1083> <5c39> -<1084> <5f15> -<1085> <9690> -<1086> <5370> -<1087> <82f1> -<1088> <6a31> -<1089> <5a74> -<108a> <9e70> -<108b> <5e94> -<108c> <7f28> -<108d> <83b9> -<1090> <8367> -<1091> <8747> -<1092> <8fce> -<1093> <8d62> -<1094> <76c8> -<1095> <5f71> -<1096> <9896> -<1097> <786c> -<1098> <6620> -<1099> <54df> -<109a> <62e5> -<109b> <4f63> -<109c> <81c3> -<109d> <75c8> -<109e> <5eb8> -<109f> <96cd> -<10a0> <8e0a> -<10a1> <86f9> -<10a2> <548f> -<10a3> <6cf3> -<10a4> <6d8c> -<10a5> <6c38> -<10a6> <607f> -<10a7> <52c7> -<10a8> <7528> -<10a9> <5e7d> -<10aa> <4f18> -<10ab> <60a0> -<10ac> <5fe7> -<10ad> <5c24> -<10ae> <7531> -<10af> <90ae> -<10b0> <94c0> -<10b1> <72b9> -<10b2> <6cb9> -<10b3> <6e38> -<10b4> <9149> -<10b5> <6709> -<10b6> <53cb> -<10b7> <53f3> -<10b8> <4f51> -<10b9> <91c9> -<10ba> <8bf1> -<10bb> <53c8> -<10bc> <5e7c> -<10bd> <8fc2> -<10be> <6de4> -<10bf> <4e8e> -<10c0> <76c2> -<10c1> <6986> -<10c2> <865e> -<10c3> <611a> -<10c4> <8206> -<10c5> <4f59> -<10c6> <4fde> -<10c7> <903e> -<10c8> <9c7c> -<10c9> <6109> -<10ca> <6e1d> -<10cb> <6e14> -<10cc> <9685> -<10cd> <4e88> -<10ce> <5a31> -<10cf> <96e8> -<10d0> <4e0e> -<10d1> <5c7f> +<1070> <8bae> +<1071> <8c0a> +<1072> <8bd1> +<1073> <5f02> +<1074> <7ffc> +<1075> <7fcc> +<1076> <7ece> +<1077> <8335> +<1078> <836b> +<1079> <56e0> +<107a> <6bb7> +<107b> <97f3> +<107c> <9634> +<107d> <59fb> +<107e> <541f> +<107f> <94f6> +<1080> <6deb> +<1081> <5bc5> +<1082> <996e> +<1083> <5c39> +<1084> <5f15> +<1085> <9690> +<1086> <5370> +<1087> <82f1> +<1088> <6a31> +<1089> <5a74> +<108a> <9e70> +<108b> <5e94> +<108c> <7f28> +<108d> <83b9> +<1090> <8367> +<1091> <8747> +<1092> <8fce> +<1093> <8d62> +<1094> <76c8> +<1095> <5f71> +<1096> <9896> +<1097> <786c> +<1098> <6620> +<1099> <54df> +<109a> <62e5> +<109b> <4f63> +<109c> <81c3> +<109d> <75c8> +<109e> <5eb8> +<109f> <96cd> +<10a0> <8e0a> +<10a1> <86f9> +<10a2> <548f> +<10a3> <6cf3> +<10a4> <6d8c> +<10a5> <6c38> +<10a6> <607f> +<10a7> <52c7> +<10a8> <7528> +<10a9> <5e7d> +<10aa> <4f18> +<10ab> <60a0> +<10ac> <5fe7> +<10ad> <5c24> +<10ae> <7531> +<10af> <90ae> +<10b0> <94c0> +<10b1> <72b9> +<10b2> <6cb9> +<10b3> <6e38> +<10b4> <9149> +<10b5> <6709> +<10b6> <53cb> +<10b7> <53f3> +<10b8> <4f51> +<10b9> <91c9> +<10ba> <8bf1> +<10bb> <53c8> +<10bc> <5e7c> +<10bd> <8fc2> +<10be> <6de4> +<10bf> <4e8e> +<10c0> <76c2> +<10c1> <6986> +<10c2> <865e> +<10c3> <611a> +<10c4> <8206> +<10c5> <4f59> +<10c6> <4fde> +<10c7> <903e> +<10c8> <9c7c> +<10c9> <6109> +<10ca> <6e1d> +<10cb> <6e14> +<10cc> <9685> +<10cd> <4e88> +<10ce> <5a31> +<10cf> <96e8> +<10d0> <4e0e> +<10d1> <5c7f> +<10d2> <79b9> +<10d3> <5b87> +<10d4> <8bed> +<10d5> <7fbd> endbfchar 100 beginbfchar -<10d2> <79b9> -<10d3> <5b87> -<10d4> <8bed> -<10d5> <7fbd> -<10d6> <7389> -<10d7> <57df> -<10d8> <828b> -<10d9> <90c1> -<10da> <5401> -<10db> <9047> -<10dc> <55bb> -<10dd> <5cea> -<10de> <5fa1> -<10df> <6108> -<10e0> <6b32> -<10e1> <72f1> -<10e2> <80b2> -<10e3> <8a89> -<10e4> <6d74> -<10e5> <5bd3> -<10e6> <88d5> -<10e7> <9884> -<10e8> <8c6b> -<10e9> <9a6d> -<10ea> <9e33> -<10eb> <6e0a> -<10ec> <51a4> -<10ed> <5143> -<10ee> <57a3> -<10ef> <8881> -<10f0> <539f> -<10f1> <63f4> -<10f2> <8f95> -<10f3> <56ed> -<10f4> <5458> -<10f5> <5706> -<10f6> <733f> -<10f7> <6e90> -<10f8> <7f18> -<10f9> <8fdc> -<10fa> <82d1> -<10fb> <613f> -<10fc> <6028> -<10fd> <9662> -<10fe> <66f0> -<10ff> <7ea6> -<1100> <8d8a> -<1101> <8dc3> -<1102> <94a5> -<1103> <5cb3> -<1104> <7ca4> -<1105> <6708> -<1106> <60a6> -<1107> <9605> -<1108> <8018> -<1109> <4e91> -<110a> <90e7> -<110b> <5300> -<110c> <9668> -<110d> <5141> -<110e> <8fd0> -<110f> <8574> -<1110> <915d> -<1111> <6655> -<1112> <97f5> -<1113> <5b55> -<1114> <531d> -<1115> <7838> -<1116> <6742> -<1117> <683d> -<1118> <54c9> -<1119> <707e> -<111a> <5bb0> -<111b> <8f7d> -<111c> <518d> -<111d> <5728> -<111e> <54b1> -<111f> <6512> -<1120> <6682> -<1121> <8d5e> -<1122> <8d43> -<1123> <810f> -<1124> <846c> -<1125> <906d> -<1126> <7cdf> -<1127> <51ff> -<1128> <85fb> -<1129> <67a3> -<112a> <65e9> -<112b> <6fa1> -<112c> <86a4> -<112d> <8e81> -<112e> <566a> -<112f> <9020> -<1130> <7682> -<1131> <7076> -<1132> <71e5> -<1133> <8d23> -<1134> <62e9> -<1135> <5219> +<10d6> <7389> +<10d7> <57df> +<10d8> <828b> +<10d9> <90c1> +<10da> <5401> +<10db> <9047> +<10dc> <55bb> +<10dd> <5cea> +<10de> <5fa1> +<10df> <6108> +<10e0> <6b32> +<10e1> <72f1> +<10e2> <80b2> +<10e3> <8a89> +<10e4> <6d74> +<10e5> <5bd3> +<10e6> <88d5> +<10e7> <9884> +<10e8> <8c6b> +<10e9> <9a6d> +<10ea> <9e33> +<10eb> <6e0a> +<10ec> <51a4> +<10ed> <5143> +<10ee> <57a3> +<10ef> <8881> +<10f0> <539f> +<10f1> <63f4> +<10f2> <8f95> +<10f3> <56ed> +<10f4> <5458> +<10f5> <5706> +<10f6> <733f> +<10f7> <6e90> +<10f8> <7f18> +<10f9> <8fdc> +<10fa> <82d1> +<10fb> <613f> +<10fc> <6028> +<10fd> <9662> +<10fe> <66f0> +<10ff> <7ea6> +<1100> <8d8a> +<1101> <8dc3> +<1102> <94a5> +<1103> <5cb3> +<1104> <7ca4> +<1105> <6708> +<1106> <60a6> +<1107> <9605> +<1108> <8018> +<1109> <4e91> +<110a> <90e7> +<110b> <5300> +<110c> <9668> +<110d> <5141> +<110e> <8fd0> +<110f> <8574> +<1110> <915d> +<1111> <6655> +<1112> <97f5> +<1113> <5b55> +<1114> <531d> +<1115> <7838> +<1116> <6742> +<1117> <683d> +<1118> <54c9> +<1119> <707e> +<111a> <5bb0> +<111b> <8f7d> +<111c> <518d> +<111d> <5728> +<111e> <54b1> +<111f> <6512> +<1120> <6682> +<1121> <8d5e> +<1122> <8d43> +<1123> <810f> +<1124> <846c> +<1125> <906d> +<1126> <7cdf> +<1127> <51ff> +<1128> <85fb> +<1129> <67a3> +<112a> <65e9> +<112b> <6fa1> +<112c> <86a4> +<112d> <8e81> +<112e> <566a> +<112f> <9020> +<1130> <7682> +<1131> <7076> +<1132> <71e5> +<1133> <8d23> +<1134> <62e9> +<1135> <5219> +<1136> <6cfd> +<1137> <8d3c> +<1138> <600e> +<1139> <589e> endbfchar 100 beginbfchar -<1136> <6cfd> -<1137> <8d3c> -<1138> <600e> -<1139> <589e> -<113a> <618e> -<113b> <66fe> -<113c> <8d60> -<113d> <624e> -<113e> <55b3> -<113f> <6e23> -<1140> <672d> -<1141> <8f67> -<1142> <94e1> -<1143> <95f8> -<1144> <7728> -<1145> <6805> -<1146> <69a8> -<1147> <548b> -<1148> <4e4d> -<1149> <70b8> -<114a> <8bc8> -<114b> <6458> -<114c> <658b> -<114d> <5b85> -<114e> <7a84> -<114f> <503a> -<1150> <5be8> -<1151> <77bb> -<1152> <6be1> -<1153> <8a79> -<1154> <7c98> -<1155> <6cbe> -<1156> <76cf> -<1157> <65a9> -<1158> <8f97> -<1159> <5d2d> -<115a> <5c55> -<115b> <8638> -<115c> <6808> -<115d> <5360> -<115e> <6218> -<115f> <7ad9> -<1160> <6e5b> -<1161> <7efd> -<1162> <6a1f> -<1163> <7ae0> -<1164> <5f70> -<1165> <6f33> -<1166> <5f20> -<1167> <638c> -<1168> <6da8> -<1169> <6756> -<116a> <4e08> -<116b> <5e10> -<116c> <8d26> -<116d> <4ed7> -<116e> <80c0> -<116f> <7634> -<1170> <969c> -<1171> <62db> -<1172> <662d> -<1173> <627e> -<1174> <6cbc> -<1175> <8d75> -<1176> <7167> -<1177> <7f69> -<1178> <5146> -<1179> <8087> -<117a> <53ec> -<117b> <906e> -<117c> <6298> -<117d> <54f2> -<117e> <86f0> -<117f> <8f99> -<1180> <8005> -<1181> <9517> -<1182> <8517> -<1183> <8fd9> -<1184> <6d59> -<1185> <73cd> -<1186> <659f> -<1187> <771f> -<1188> <7504> -<1189> <7827> -<118a> <81fb> -<118b> <8d1e> -<118c> <9488> -<118d> <4fa6> -<118e> <6795> -<118f> <75b9> -<1190> <8bca> -<1191> <9707> -<1192> <632f> -<1193> <9547> -<1194> <9635> -<1195> <84b8> -<1196> <6323> -<1197> <7741> -<1198> <5f81> -<1199> <72f0> +<113a> <618e> +<113b> <66fe> +<113c> <8d60> +<113d> <624e> +<113e> <55b3> +<113f> <6e23> +<1140> <672d> +<1141> <8f67> +<1142> <94e1> +<1143> <95f8> +<1144> <7728> +<1145> <6805> +<1146> <69a8> +<1147> <548b> +<1148> <4e4d> +<1149> <70b8> +<114a> <8bc8> +<114b> <6458> +<114c> <658b> +<114d> <5b85> +<114e> <7a84> +<114f> <503a> +<1150> <5be8> +<1151> <77bb> +<1152> <6be1> +<1153> <8a79> +<1154> <7c98> +<1155> <6cbe> +<1156> <76cf> +<1157> <65a9> +<1158> <8f97> +<1159> <5d2d> +<115a> <5c55> +<115b> <8638> +<115c> <6808> +<115d> <5360> +<115e> <6218> +<115f> <7ad9> +<1160> <6e5b> +<1161> <7efd> +<1162> <6a1f> +<1163> <7ae0> +<1164> <5f70> +<1165> <6f33> +<1166> <5f20> +<1167> <638c> +<1168> <6da8> +<1169> <6756> +<116a> <4e08> +<116b> <5e10> +<116c> <8d26> +<116d> <4ed7> +<116e> <80c0> +<116f> <7634> +<1170> <969c> +<1171> <62db> +<1172> <662d> +<1173> <627e> +<1174> <6cbc> +<1175> <8d75> +<1176> <7167> +<1177> <7f69> +<1178> <5146> +<1179> <8087> +<117a> <53ec> +<117b> <906e> +<117c> <6298> +<117d> <54f2> +<117e> <86f0> +<117f> <8f99> +<1180> <8005> +<1181> <9517> +<1182> <8517> +<1183> <8fd9> +<1184> <6d59> +<1185> <73cd> +<1186> <659f> +<1187> <771f> +<1188> <7504> +<1189> <7827> +<118a> <81fb> +<118b> <8d1e> +<118c> <9488> +<118d> <4fa6> +<118e> <6795> +<118f> <75b9> +<1190> <8bca> +<1191> <9707> +<1192> <632f> +<1193> <9547> +<1194> <9635> +<1195> <84b8> +<1196> <6323> +<1197> <7741> +<1198> <5f81> +<1199> <72f0> +<119a> <4e89> +<119b> <6014> +<119c> <6574> +<119d> <62ef> endbfchar 100 beginbfchar -<119a> <4e89> -<119b> <6014> -<119c> <6574> -<119d> <62ef> -<119e> <6b63> -<119f> <653f> -<11a0> <5e27> -<11a1> <75c7> -<11a2> <90d1> -<11a3> <8bc1> -<11a4> <829d> -<11a5> <679d> -<11a6> <652f> -<11a7> <5431> -<11a8> <8718> -<11a9> <77e5> -<11aa> <80a2> -<11ab> <8102> -<11ac> <6c41> -<11ad> <4e4b> -<11ae> <7ec7> -<11af> <804c> -<11b0> <76f4> -<11b1> <690d> -<11b2> <6b96> -<11b3> <6267> -<11b4> <503c> -<11b5> <4f84> -<11b6> <5740> -<11b7> <6307> -<11b8> <6b62> -<11b9> <8dbe> -<11ba> <53ea> -<11bb> <65e8> -<11bc> <7eb8> -<11bd> <5fd7> -<11be> <631a> -<11bf> <63b7> -<11c2> <7f6e> -<11c3> <5e1c> -<11c4> <5cd9> -<11c5> <5236> -<11c6> <667a> -<11c7> <79e9> -<11c8> <7a1a> -<11c9> <8d28> -<11ca> <7099> -<11cb> <75d4> -<11cc> <6ede> -<11cd> <6cbb> -<11ce> <7a92> -<11cf> <4e2d> -<11d0> <76c5> -<11d1> <5fe0> -<11d2> <949f> -<11d3> <8877> -<11d4> <7ec8> -<11d5> <79cd> -<11d6> <80bf> -<11d7> <91cd> -<11d8> <4ef2> -<11d9> <4f17> -<11da> <821f> -<11db> <5468> -<11dc> <5dde> -<11dd> <6d32> -<11de> <8bcc> -<11df> <7ca5> -<11e0> <8f74> -<11e1> <8098> -<11e2> <5e1a> -<11e3> <5492> -<11e4> <76b1> -<11e5> <5b99> -<11e6> <663c> -<11e7> <9aa4> -<11e8> <73e0> -<11e9> <682a> -<11ea> <86db> -<11eb> <6731> -<11ec> <732a> -<11ed> <8bf8> -<11ee> <8bdb> -<11ef> <9010> -<11f0> <7af9> -<11f1> <70db> -<11f2> <716e> -<11f3> <62c4> -<11f4> <77a9> -<11f5> <5631> -<11f6> <4e3b> -<11f7> <8457> -<11f8> <67f1> -<11f9> <52a9> -<11fa> <86c0> -<11fb> <8d2e> -<11fc> <94f8> -<11fd> <7b51> -<11fe> <4f4f> -<11ff> <6ce8> +<119e> <6b63> +<119f> <653f> +<11a0> <5e27> +<11a1> <75c7> +<11a2> <90d1> +<11a3> <8bc1> +<11a4> <829d> +<11a5> <679d> +<11a6> <652f> +<11a7> <5431> +<11a8> <8718> +<11a9> <77e5> +<11aa> <80a2> +<11ab> <8102> +<11ac> <6c41> +<11ad> <4e4b> +<11ae> <7ec7> +<11af> <804c> +<11b0> <76f4> +<11b1> <690d> +<11b2> <6b96> +<11b3> <6267> +<11b4> <503c> +<11b5> <4f84> +<11b6> <5740> +<11b7> <6307> +<11b8> <6b62> +<11b9> <8dbe> +<11ba> <53ea> +<11bb> <65e8> +<11bc> <7eb8> +<11bd> <5fd7> +<11be> <631a> +<11bf> <63b7> +<11c2> <7f6e> +<11c3> <5e1c> +<11c4> <5cd9> +<11c5> <5236> +<11c6> <667a> +<11c7> <79e9> +<11c8> <7a1a> +<11c9> <8d28> +<11ca> <7099> +<11cb> <75d4> +<11cc> <6ede> +<11cd> <6cbb> +<11ce> <7a92> +<11cf> <4e2d> +<11d0> <76c5> +<11d1> <5fe0> +<11d2> <949f> +<11d3> <8877> +<11d4> <7ec8> +<11d5> <79cd> +<11d6> <80bf> +<11d7> <91cd> +<11d8> <4ef2> +<11d9> <4f17> +<11da> <821f> +<11db> <5468> +<11dc> <5dde> +<11dd> <6d32> +<11de> <8bcc> +<11df> <7ca5> +<11e0> <8f74> +<11e1> <8098> +<11e2> <5e1a> +<11e3> <5492> +<11e4> <76b1> +<11e5> <5b99> +<11e6> <663c> +<11e7> <9aa4> +<11e8> <73e0> +<11e9> <682a> +<11ea> <86db> +<11eb> <6731> +<11ec> <732a> +<11ed> <8bf8> +<11ee> <8bdb> +<11ef> <9010> +<11f0> <7af9> +<11f1> <70db> +<11f2> <716e> +<11f3> <62c4> +<11f4> <77a9> +<11f5> <5631> +<11f6> <4e3b> +<11f7> <8457> +<11f8> <67f1> +<11f9> <52a9> +<11fa> <86c0> +<11fb> <8d2e> +<11fc> <94f8> +<11fd> <7b51> +<11fe> <4f4f> +<11ff> <6ce8> +<1200> <795d> +<1201> <9a7b> +<1202> <6293> +<1203> <722a> endbfchar 100 beginbfchar -<1200> <795d> -<1201> <9a7b> -<1202> <6293> -<1203> <722a> -<1204> <62fd> -<1205> <4e13> -<1206> <7816> -<1207> <8f6c> -<1208> <64b0> -<1209> <8d5a> -<120a> <7bc6> -<120b> <6869> -<120c> <5e84> -<120d> <88c5> -<120e> <5986> -<120f> <649e> -<1210> <58ee> -<1211> <72b6> -<1212> <690e> -<1213> <9525> -<1214> <8ffd> -<1215> <8d58> -<1216> <5760> -<1217> <7f00> -<1218> <8c06> -<1219> <51c6> -<121a> <6349> -<121b> <62d9> -<121c> <5353> -<121d> <684c> -<121e> <7422> -<121f> <8301> -<1220> <914c> -<1221> <5544> -<1222> <7740> -<1223> <707c> -<1224> <6d4a> -<1225> <5179> -<1226> <54a8> -<1227> <8d44> -<1228> <59ff> -<1229> <6ecb> -<122a> <6dc4> -<122b> <5b5c> -<122c> <7d2b> -<122d> <4ed4> -<122e> <7c7d> -<122f> <6ed3> -<1230> <5b50> -<1231> <81ea> -<1232> <6e0d> -<1233> <5b57> -<1234> <9b03> -<1235> <68d5> -<1236> <8e2a> -<1237> <5b97> -<1238> <7efc> -<1239> <603b> -<123a> <7eb5> -<123b> <90b9> -<123c> <8d70> -<123d> <594f> -<123e> <63cd> -<123f> <79df> -<1240> <8db3> -<1241> <5352> -<1242> <65cf> -<1243> <7956> -<1244> <8bc5> -<1245> <963b> -<1246> <7ec4> -<1247> <94bb> -<1248> <7e82> -<1249> <5634> -<124a> <9189> -<124b> <6700> -<124c> <7f6a> -<124d> <5c0a> -<124e> <9075> -<124f> <6628> -<1250> <5de6> -<1251> <4f50> -<1252> <67de> -<1253> <505a> -<1254> <4f5c> -<1255> <5750> -<1256> <5ea7> -<1257> <4e8d> -<1258> <4e0c> -<1259> <5140> -<125a> <4e10> -<125b> <5eff> -<125c> <5345> -<125d> <4e15> -<125e> <4e98> -<125f> <4e1e> -<1260> <9b32> -<1261> <5b6c> -<1262> <5669> -<1263> <4e28> +<1204> <62fd> +<1205> <4e13> +<1206> <7816> +<1207> <8f6c> +<1208> <64b0> +<1209> <8d5a> +<120a> <7bc6> +<120b> <6869> +<120c> <5e84> +<120d> <88c5> +<120e> <5986> +<120f> <649e> +<1210> <58ee> +<1211> <72b6> +<1212> <690e> +<1213> <9525> +<1214> <8ffd> +<1215> <8d58> +<1216> <5760> +<1217> <7f00> +<1218> <8c06> +<1219> <51c6> +<121a> <6349> +<121b> <62d9> +<121c> <5353> +<121d> <684c> +<121e> <7422> +<121f> <8301> +<1220> <914c> +<1221> <5544> +<1222> <7740> +<1223> <707c> +<1224> <6d4a> +<1225> <5179> +<1226> <54a8> +<1227> <8d44> +<1228> <59ff> +<1229> <6ecb> +<122a> <6dc4> +<122b> <5b5c> +<122c> <7d2b> +<122d> <4ed4> +<122e> <7c7d> +<122f> <6ed3> +<1230> <5b50> +<1231> <81ea> +<1232> <6e0d> +<1233> <5b57> +<1234> <9b03> +<1235> <68d5> +<1236> <8e2a> +<1237> <5b97> +<1238> <7efc> +<1239> <603b> +<123a> <7eb5> +<123b> <90b9> +<123c> <8d70> +<123d> <594f> +<123e> <63cd> +<123f> <79df> +<1240> <8db3> +<1241> <5352> +<1242> <65cf> +<1243> <7956> +<1244> <8bc5> +<1245> <963b> +<1246> <7ec4> +<1247> <94bb> +<1248> <7e82> +<1249> <5634> +<124a> <9189> +<124b> <6700> +<124c> <7f6a> +<124d> <5c0a> +<124e> <9075> +<124f> <6628> +<1250> <5de6> +<1251> <4f50> +<1252> <67de> +<1253> <505a> +<1254> <4f5c> +<1255> <5750> +<1256> <5ea7> +<1257> <4e8d> +<1258> <4e0c> +<1259> <5140> +<125a> <4e10> +<125b> <5eff> +<125c> <5345> +<125d> <4e15> +<125e> <4e98> +<125f> <4e1e> +<1260> <9b32> +<1261> <5b6c> +<1262> <5669> +<1263> <4e28> +<1264> <79ba> +<1265> <4e3f> +<1266> <5315> +<1267> <4e47> endbfchar 100 beginbfchar -<1264> <79ba> -<1265> <4e3f> -<1266> <5315> -<1267> <4e47> -<1268> <592d> -<1269> <723b> -<126a> <536e> -<126b> <6c10> -<126c> <56df> -<126d> <80e4> -<126e> <9997> -<126f> <6bd3> -<1270> <777e> -<1271> <9f17> -<1272> <4e36> -<1273> <4e9f> -<1274> <9f10> -<1275> <4e5c> -<1276> <4e69> -<1277> <4e93> -<1278> <8288> -<1279> <5b5b> -<127a> <556c> -<127b> <560f> -<127c> <4ec4> -<127d> <538d> -<127e> <539d> -<127f> <53a3> -<1280> <53a5> -<1281> <53ae> -<1282> <9765> -<1283> <8d5d> -<1284> <531a> -<1285> <53f5> -<1286> <5326> -<1287> <532e> -<1288> <533e> -<1289> <8d5c> -<128a> <5366> -<128b> <5363> -<128c> <5202> -<128d> <5208> -<128e> <520e> -<128f> <522d> -<1290> <5233> -<1293> <524c> -<1294> <525e> -<1295> <5261> -<1296> <525c> -<1297> <84af> -<1298> <527d> -<1299> <5282> -<129a> <5281> -<129b> <5290> -<129c> <5293> -<129d> <5182> -<129e> <7f54> -<129f> <4ebb> -<12a0> <4ec3> -<12a1> <4ec9> -<12a2> <4ec2> -<12a3> <4ee8> -<12a4> <4ee1> -<12a5> <4eeb> -<12a6> <4ede> -<12a7> <4f1b> -<12a8> <4ef3> -<12a9> <4f22> -<12aa> <4f64> -<12ab> <4ef5> -<12ac> <4f25> -<12ad> <4f27> -<12ae> <4f09> -<12af> <4f2b> -<12b0> <4f5e> -<12b1> <4f67> -<12b2> <6538> -<12b3> <4f5a> -<12b4> <4f5d> -<12b5> <4f5f> -<12b6> <4f57> -<12b7> <4f32> -<12b8> <4f3d> -<12b9> <4f76> -<12ba> <4f74> -<12bb> <4f91> -<12bc> <4f89> -<12bd> <4f83> -<12be> <4f8f> -<12bf> <4f7e> -<12c0> <4f7b> -<12c1> <4faa> -<12c2> <4f7c> -<12c3> <4fac> -<12c4> <4f94> -<12c5> <4fe6> -<12c6> <4fe8> -<12c7> <4fea> -<12c8> <4fc5> -<12c9> <4fda> +<1268> <592d> +<1269> <723b> +<126a> <536e> +<126b> <6c10> +<126c> <56df> +<126d> <80e4> +<126e> <9997> +<126f> <6bd3> +<1270> <777e> +<1271> <9f17> +<1272> <4e36> +<1273> <4e9f> +<1274> <9f10> +<1275> <4e5c> +<1276> <4e69> +<1277> <4e93> +<1278> <8288> +<1279> <5b5b> +<127a> <556c> +<127b> <560f> +<127c> <4ec4> +<127d> <538d> +<127e> <539d> +<127f> <53a3> +<1280> <53a5> +<1281> <53ae> +<1282> <9765> +<1283> <8d5d> +<1284> <531a> +<1285> <53f5> +<1286> <5326> +<1287> <532e> +<1288> <533e> +<1289> <8d5c> +<128a> <5366> +<128b> <5363> +<128c> <5202> +<128d> <5208> +<128e> <520e> +<128f> <522d> +<1290> <5233> +<1293> <524c> +<1294> <525e> +<1295> <5261> +<1296> <525c> +<1297> <84af> +<1298> <527d> +<1299> <5282> +<129a> <5281> +<129b> <5290> +<129c> <5293> +<129d> <5182> +<129e> <7f54> +<129f> <4ebb> +<12a0> <4ec3> +<12a1> <4ec9> +<12a2> <4ec2> +<12a3> <4ee8> +<12a4> <4ee1> +<12a5> <4eeb> +<12a6> <4ede> +<12a7> <4f1b> +<12a8> <4ef3> +<12a9> <4f22> +<12aa> <4f64> +<12ab> <4ef5> +<12ac> <4f25> +<12ad> <4f27> +<12ae> <4f09> +<12af> <4f2b> +<12b0> <4f5e> +<12b1> <4f67> +<12b2> <6538> +<12b3> <4f5a> +<12b4> <4f5d> +<12b5> <4f5f> +<12b6> <4f57> +<12b7> <4f32> +<12b8> <4f3d> +<12b9> <4f76> +<12ba> <4f74> +<12bb> <4f91> +<12bc> <4f89> +<12bd> <4f83> +<12be> <4f8f> +<12bf> <4f7e> +<12c0> <4f7b> +<12c1> <4faa> +<12c2> <4f7c> +<12c3> <4fac> +<12c4> <4f94> +<12c5> <4fe6> +<12c6> <4fe8> +<12c7> <4fea> +<12c8> <4fc5> +<12c9> <4fda> +<12ca> <4fe3> +<12cb> <4fdc> +<12cc> <4fd1> +<12cd> <4fdf> endbfchar 100 beginbfchar -<12ca> <4fe3> -<12cb> <4fdc> -<12cc> <4fd1> -<12cd> <4fdf> -<12ce> <4ff8> -<12cf> <5029> -<12d0> <504c> -<12d1> <4ff3> -<12d2> <502c> -<12d3> <500f> -<12d4> <502e> -<12d5> <502d> -<12d6> <4ffe> -<12d7> <501c> -<12d8> <500c> -<12d9> <5025> -<12da> <5028> -<12db> <507e> -<12dc> <5043> -<12dd> <5055> -<12de> <5048> -<12df> <504e> -<12e0> <506c> -<12e1> <507b> -<12e2> <50a5> -<12e3> <50a7> -<12e4> <50a9> -<12e5> <50ba> -<12e6> <50d6> -<12e7> <5106> -<12e8> <50ed> -<12e9> <50ec> -<12ea> <50e6> -<12eb> <50ee> -<12ec> <5107> -<12ed> <510b> -<12ee> <4edd> -<12ef> <6c3d> -<12f0> <4f58> -<12f1> <4f65> -<12f2> <4fce> -<12f3> <9fa0> -<12f4> <6c46> -<12f5> <7c74> -<12f6> <516e> -<12f7> <5dfd> -<12f8> <9ec9> -<12f9> <9998> -<12fa> <5181> -<12fb> <5914> -<12fc> <52f9> -<12fd> <530d> -<12fe> <8a07> -<12ff> <5310> -<1300> <51eb> -<1301> <5919> -<1302> <5155> -<1303> <4ea0> -<1304> <5156> -<1305> <4eb3> -<1306> <886e> -<1307> <88a4> -<1308> <4eb5> -<1309> <8114> -<130a> <88d2> -<130b> <7980> -<130c> <5b34> -<130d> <8803> -<130e> <7fb8> -<130f> <51ab> -<1310> <51b1> -<1311> <51bd> -<1312> <51bc> -<1313> <51c7> -<1314> <5196> -<1315> <51a2> -<1316> <51a5> -<1317> <8ba0> -<131a> <8baa> -<131d> <8bb7> -<1320> <8bcb> -<1321> <8bcf> -<1322> <8bce> -<1326> <8bd6> -<1329> <8bdc> -<132c> <8be4> -<132f> <8bee> -<1330> <8bf0> -<1331> <8bf3> -<1332> <8bf6> -<1333> <8bf9> -<1334> <8bfc> -<1337> <8c02> -<1338> <8c04> -<1339> <8c07> -<133a> <8c0c> -<133b> <8c0f> -<1341> <8c19> -<1342> <8c1b> -<1343> <8c18> +<12ce> <4ff8> +<12cf> <5029> +<12d0> <504c> +<12d1> <4ff3> +<12d2> <502c> +<12d3> <500f> +<12d4> <502e> +<12d5> <502d> +<12d6> <4ffe> +<12d7> <501c> +<12d8> <500c> +<12d9> <5025> +<12da> <5028> +<12db> <507e> +<12dc> <5043> +<12dd> <5055> +<12de> <5048> +<12df> <504e> +<12e0> <506c> +<12e1> <507b> +<12e2> <50a5> +<12e3> <50a7> +<12e4> <50a9> +<12e5> <50ba> +<12e6> <50d6> +<12e7> <5106> +<12e8> <50ed> +<12e9> <50ec> +<12ea> <50e6> +<12eb> <50ee> +<12ec> <5107> +<12ed> <510b> +<12ee> <4edd> +<12ef> <6c3d> +<12f0> <4f58> +<12f1> <4f65> +<12f2> <4fce> +<12f3> <9fa0> +<12f4> <6c46> +<12f5> <7c74> +<12f6> <516e> +<12f7> <5dfd> +<12f8> <9ec9> +<12f9> <9998> +<12fa> <5181> +<12fb> <5914> +<12fc> <52f9> +<12fd> <530d> +<12fe> <8a07> +<12ff> <5310> +<1300> <51eb> +<1301> <5919> +<1302> <5155> +<1303> <4ea0> +<1304> <5156> +<1305> <4eb3> +<1306> <886e> +<1307> <88a4> +<1308> <4eb5> +<1309> <8114> +<130a> <88d2> +<130b> <7980> +<130c> <5b34> +<130d> <8803> +<130e> <7fb8> +<130f> <51ab> +<1310> <51b1> +<1311> <51bd> +<1312> <51bc> +<1313> <51c7> +<1314> <5196> +<1315> <51a2> +<1316> <51a5> +<1317> <8ba0> +<131a> <8baa> +<131d> <8bb7> +<1320> <8bcb> +<1321> <8bcf> +<1322> <8bce> +<1326> <8bd6> +<1329> <8bdc> +<132c> <8be4> +<132f> <8bee> +<1330> <8bf0> +<1331> <8bf3> +<1332> <8bf6> +<1333> <8bf9> +<1334> <8bfc> +<1337> <8c02> +<1338> <8c04> +<1339> <8c07> +<133a> <8c0c> +<133b> <8c0f> +<1341> <8c19> +<1342> <8c1b> +<1343> <8c18> +<1344> <8c1d> +<1348> <8c25> +<1349> <8c27> +<1352> <5369> endbfchar 100 beginbfchar -<1344> <8c1d> -<1348> <8c25> -<1349> <8c27> -<1352> <5369> -<1353> <537a> -<1354> <961d> -<1355> <9622> -<1356> <9621> -<1357> <9631> -<1358> <962a> -<1359> <963d> -<135a> <963c> -<135b> <9642> -<135c> <9649> -<135d> <9654> -<135e> <965f> -<135f> <9667> -<1360> <966c> -<1361> <9672> -<1362> <9674> -<1363> <9688> -<1364> <968d> -<1365> <9697> -<1366> <96b0> -<1367> <9097> -<1368> <909b> -<1369> <909d> -<136a> <9099> -<136b> <90ac> -<136c> <90a1> -<136d> <90b4> -<136e> <90b3> -<136f> <90b6> -<1370> <90ba> -<1371> <90b8> -<1372> <90b0> -<1373> <90cf> -<1374> <90c5> -<1375> <90be> -<1376> <90d0> -<1377> <90c4> -<1378> <90c7> -<1379> <90d3> -<137a> <90e6> -<137b> <90e2> -<137c> <90dc> -<137d> <90d7> -<137e> <90db> -<137f> <90eb> -<1380> <90ef> -<1381> <90fe> -<1382> <9104> -<1383> <9122> -<1384> <911e> -<1385> <9123> -<1386> <9131> -<1387> <912f> -<1388> <9139> -<1389> <9143> -<138a> <9146> -<138b> <520d> -<138c> <5942> -<138d> <52a2> -<1390> <52be> -<1391> <54ff> -<1392> <52d0> -<1393> <52d6> -<1394> <52f0> -<1395> <53df> -<1396> <71ee> -<1397> <77cd> -<1398> <5ef4> -<1399> <51f5> -<139a> <51fc> -<139b> <9b2f> -<139c> <53b6> -<139d> <5f01> -<139e> <755a> -<139f> <5def> -<13a0> <574c> -<13a1> <57a9> -<13a2> <57a1> -<13a3> <587e> -<13a4> <58bc> -<13a5> <58c5> -<13a6> <58d1> -<13a7> <5729> -<13a8> <572c> -<13a9> <572a> -<13aa> <5733> -<13ab> <5739> -<13ae> <575c> -<13af> <573b> -<13b0> <5742> -<13b1> <5769> -<13b2> <5785> -<13b3> <576b> -<13b4> <5786> -<13b5> <577c> -<13b6> <577b> +<1353> <537a> +<1354> <961d> +<1355> <9622> +<1356> <9621> +<1357> <9631> +<1358> <962a> +<1359> <963d> +<135a> <963c> +<135b> <9642> +<135c> <9649> +<135d> <9654> +<135e> <965f> +<135f> <9667> +<1360> <966c> +<1361> <9672> +<1362> <9674> +<1363> <9688> +<1364> <968d> +<1365> <9697> +<1366> <96b0> +<1367> <9097> +<1368> <909b> +<1369> <909d> +<136a> <9099> +<136b> <90ac> +<136c> <90a1> +<136d> <90b4> +<136e> <90b3> +<136f> <90b6> +<1370> <90ba> +<1371> <90b8> +<1372> <90b0> +<1373> <90cf> +<1374> <90c5> +<1375> <90be> +<1376> <90d0> +<1377> <90c4> +<1378> <90c7> +<1379> <90d3> +<137a> <90e6> +<137b> <90e2> +<137c> <90dc> +<137d> <90d7> +<137e> <90db> +<137f> <90eb> +<1380> <90ef> +<1381> <90fe> +<1382> <9104> +<1383> <9122> +<1384> <911e> +<1385> <9123> +<1386> <9131> +<1387> <912f> +<1388> <9139> +<1389> <9143> +<138a> <9146> +<138b> <520d> +<138c> <5942> +<138d> <52a2> +<1390> <52be> +<1391> <54ff> +<1392> <52d0> +<1393> <52d6> +<1394> <52f0> +<1395> <53df> +<1396> <71ee> +<1397> <77cd> +<1398> <5ef4> +<1399> <51f5> +<139a> <51fc> +<139b> <9b2f> +<139c> <53b6> +<139d> <5f01> +<139e> <755a> +<139f> <5def> +<13a0> <574c> +<13a1> <57a9> +<13a2> <57a1> +<13a3> <587e> +<13a4> <58bc> +<13a5> <58c5> +<13a6> <58d1> +<13a7> <5729> +<13a8> <572c> +<13a9> <572a> +<13aa> <5733> +<13ab> <5739> +<13ae> <575c> +<13af> <573b> +<13b0> <5742> +<13b1> <5769> +<13b2> <5785> +<13b3> <576b> +<13b4> <5786> +<13b5> <577c> +<13b6> <577b> +<13b7> <5768> +<13b8> <576d> +<13b9> <5776> +<13ba> <5773> endbfchar 100 beginbfchar -<13b7> <5768> -<13b8> <576d> -<13b9> <5776> -<13ba> <5773> -<13bb> <57ad> -<13bc> <57a4> -<13bd> <578c> -<13be> <57b2> -<13bf> <57cf> -<13c0> <57a7> -<13c1> <57b4> -<13c2> <5793> -<13c3> <57a0> -<13c4> <57d5> -<13c5> <57d8> -<13c6> <57da> -<13c7> <57d9> -<13c8> <57d2> -<13c9> <57b8> -<13ca> <57f4> -<13cb> <57ef> -<13cc> <57f8> -<13cd> <57e4> -<13ce> <57dd> -<13cf> <580b> -<13d0> <580d> -<13d1> <57fd> -<13d2> <57ed> -<13d3> <5800> -<13d4> <581e> -<13d5> <5819> -<13d6> <5844> -<13d7> <5820> -<13d8> <5865> -<13d9> <586c> -<13da> <5881> -<13db> <5889> -<13dc> <589a> -<13dd> <5880> -<13de> <99a8> -<13df> <9f19> -<13e0> <61ff> -<13e1> <8279> -<13e2> <827d> -<13e3> <827f> -<13e4> <828f> -<13e5> <828a> -<13e6> <82a8> -<13e7> <8284> -<13e8> <828e> -<13e9> <8291> -<13ea> <8297> -<13eb> <8299> -<13ec> <82ab> -<13ed> <82b8> -<13ee> <82be> -<13ef> <82b0> -<13f0> <82c8> -<13f1> <82ca> -<13f2> <82e3> -<13f3> <8298> -<13f4> <82b7> -<13f5> <82ae> -<13f8> <82c1> -<13f9> <82a9> -<13fa> <82b4> -<13fb> <82a1> -<13fc> <82aa> -<13fd> <829f> -<13fe> <82c4> -<13ff> <82ce> -<1400> <82a4> -<1401> <82e1> -<1402> <8309> -<1403> <82f7> -<1404> <82e4> -<1405> <830f> -<1406> <8307> -<1407> <82dc> -<1408> <82f4> -<1409> <82d2> -<140a> <82d8> -<140b> <830c> -<140c> <82fb> -<140d> <82d3> -<140e> <8311> -<140f> <831a> -<1410> <8306> -<1413> <82e0> -<1414> <82d5> -<1415> <831c> -<1416> <8351> -<1419> <8308> -<141a> <8392> -<141b> <833c> -<141c> <8334> -<141d> <8331> -<141e> <839b> -<141f> <835e> -<1420> <832f> +<13bb> <57ad> +<13bc> <57a4> +<13bd> <578c> +<13be> <57b2> +<13bf> <57cf> +<13c0> <57a7> +<13c1> <57b4> +<13c2> <5793> +<13c3> <57a0> +<13c4> <57d5> +<13c5> <57d8> +<13c6> <57da> +<13c7> <57d9> +<13c8> <57d2> +<13c9> <57b8> +<13ca> <57f4> +<13cb> <57ef> +<13cc> <57f8> +<13cd> <57e4> +<13ce> <57dd> +<13cf> <580b> +<13d0> <580d> +<13d1> <57fd> +<13d2> <57ed> +<13d3> <5800> +<13d4> <581e> +<13d5> <5819> +<13d6> <5844> +<13d7> <5820> +<13d8> <5865> +<13d9> <586c> +<13da> <5881> +<13db> <5889> +<13dc> <589a> +<13dd> <5880> +<13de> <99a8> +<13df> <9f19> +<13e0> <61ff> +<13e1> <8279> +<13e2> <827d> +<13e3> <827f> +<13e4> <828f> +<13e5> <828a> +<13e6> <82a8> +<13e7> <8284> +<13e8> <828e> +<13e9> <8291> +<13ea> <8297> +<13eb> <8299> +<13ec> <82ab> +<13ed> <82b8> +<13ee> <82be> +<13ef> <82b0> +<13f0> <82c8> +<13f1> <82ca> +<13f2> <82e3> +<13f3> <8298> +<13f4> <82b7> +<13f5> <82ae> +<13f8> <82c1> +<13f9> <82a9> +<13fa> <82b4> +<13fb> <82a1> +<13fc> <82aa> +<13fd> <829f> +<13fe> <82c4> +<13ff> <82ce> +<1400> <82a4> +<1401> <82e1> +<1402> <8309> +<1403> <82f7> +<1404> <82e4> +<1405> <830f> +<1406> <8307> +<1407> <82dc> +<1408> <82f4> +<1409> <82d2> +<140a> <82d8> +<140b> <830c> +<140c> <82fb> +<140d> <82d3> +<140e> <8311> +<140f> <831a> +<1410> <8306> +<1413> <82e0> +<1414> <82d5> +<1415> <831c> +<1416> <8351> +<1419> <8308> +<141a> <8392> +<141b> <833c> +<141c> <8334> +<141d> <8331> +<141e> <839b> +<141f> <835e> +<1420> <832f> +<1421> <834f> +<1422> <8347> +<1423> <8343> +<1424> <835f> endbfchar 100 beginbfchar -<1421> <834f> -<1422> <8347> -<1423> <8343> -<1424> <835f> -<1425> <8340> -<1426> <8317> -<1427> <8360> -<1428> <832d> -<1429> <833a> -<142a> <8333> -<142b> <8366> -<142c> <8365> -<142d> <8368> -<142e> <831b> -<142f> <8369> -<1430> <836c> -<1431> <836a> -<1434> <83b0> -<1435> <8378> -<1438> <83a0> -<1439> <83aa> -<143a> <8393> -<143b> <839c> -<143c> <8385> -<143d> <837c> -<143e> <83b6> -<143f> <83a9> -<1440> <837d> -<1441> <83b8> -<1442> <837b> -<1443> <8398> -<1444> <839e> -<1445> <83a8> -<1446> <83ba> -<1447> <83bc> -<1448> <83c1> -<1449> <8401> -<144a> <83e5> -<144b> <83d8> -<144c> <5807> -<144d> <8418> -<144e> <840b> -<144f> <83dd> -<1450> <83fd> -<1451> <83d6> -<1452> <841c> -<1453> <8438> -<1454> <8411> -<1455> <8406> -<1456> <83d4> -<1457> <83df> -<1458> <840f> -<1459> <8403> -<145c> <83ea> -<145d> <83c5> -<145e> <83c0> -<145f> <8426> -<1460> <83f0> -<1461> <83e1> -<1462> <845c> -<1463> <8451> -<1464> <845a> -<1465> <8459> -<1466> <8473> -<1469> <847a> -<146a> <8489> -<146b> <8478> -<146c> <843c> -<146d> <8446> -<146e> <8469> -<146f> <8476> -<1470> <848c> -<1471> <848e> -<1472> <8431> -<1473> <846d> -<1474> <84c1> -<1475> <84cd> -<1476> <84d0> -<1477> <84e6> -<1478> <84bd> -<1479> <84d3> -<147a> <84ca> -<147b> <84bf> -<147c> <84ba> -<147d> <84e0> -<147e> <84a1> -<147f> <84b9> -<1480> <84b4> -<1481> <8497> -<1482> <84e5> -<1483> <84e3> -<1484> <850c> -<1485> <750d> -<1486> <8538> -<1487> <84f0> -<1488> <8539> -<1489> <851f> -<148a> <853a> -<148b> <8556> -<148c> <853b> +<1425> <8340> +<1426> <8317> +<1427> <8360> +<1428> <832d> +<1429> <833a> +<142a> <8333> +<142b> <8366> +<142c> <8365> +<142d> <8368> +<142e> <831b> +<142f> <8369> +<1430> <836c> +<1431> <836a> +<1434> <83b0> +<1435> <8378> +<1438> <83a0> +<1439> <83aa> +<143a> <8393> +<143b> <839c> +<143c> <8385> +<143d> <837c> +<143e> <83b6> +<143f> <83a9> +<1440> <837d> +<1441> <83b8> +<1442> <837b> +<1443> <8398> +<1444> <839e> +<1445> <83a8> +<1446> <83ba> +<1447> <83bc> +<1448> <83c1> +<1449> <8401> +<144a> <83e5> +<144b> <83d8> +<144c> <5807> +<144d> <8418> +<144e> <840b> +<144f> <83dd> +<1450> <83fd> +<1451> <83d6> +<1452> <841c> +<1453> <8438> +<1454> <8411> +<1455> <8406> +<1456> <83d4> +<1457> <83df> +<1458> <840f> +<1459> <8403> +<145c> <83ea> +<145d> <83c5> +<145e> <83c0> +<145f> <8426> +<1460> <83f0> +<1461> <83e1> +<1462> <845c> +<1463> <8451> +<1464> <845a> +<1465> <8459> +<1466> <8473> +<1469> <847a> +<146a> <8489> +<146b> <8478> +<146c> <843c> +<146d> <8446> +<146e> <8469> +<146f> <8476> +<1470> <848c> +<1471> <848e> +<1472> <8431> +<1473> <846d> +<1474> <84c1> +<1475> <84cd> +<1476> <84d0> +<1477> <84e6> +<1478> <84bd> +<1479> <84d3> +<147a> <84ca> +<147b> <84bf> +<147c> <84ba> +<147d> <84e0> +<147e> <84a1> +<147f> <84b9> +<1480> <84b4> +<1481> <8497> +<1482> <84e5> +<1483> <84e3> +<1484> <850c> +<1485> <750d> +<1486> <8538> +<1487> <84f0> +<1488> <8539> +<1489> <851f> +<148a> <853a> +<148b> <8556> +<148c> <853b> +<148d> <84ff> +<148e> <84fc> +<148f> <8559> +<1490> <8548> endbfchar 100 beginbfchar -<148d> <84ff> -<148e> <84fc> -<148f> <8559> -<1490> <8548> -<1491> <8568> -<1492> <8564> -<1493> <855e> -<1494> <857a> -<1495> <77a2> -<1496> <8543> -<1497> <8572> -<1498> <857b> -<1499> <85a4> -<149a> <85a8> -<149b> <8587> -<149c> <858f> -<149d> <8579> -<149e> <85ae> -<149f> <859c> -<14a0> <8585> -<14a1> <85b9> -<14a2> <85b7> -<14a3> <85b0> -<14a4> <85d3> -<14a5> <85c1> -<14a6> <85dc> -<14a7> <85ff> -<14a8> <8627> -<14a9> <8605> -<14aa> <8629> -<14ab> <8616> -<14ac> <863c> -<14ad> <5efe> -<14ae> <5f08> -<14af> <593c> -<14b0> <5941> -<14b1> <8037> -<14b2> <5955> -<14b3> <595a> -<14b4> <5958> -<14b5> <530f> -<14b6> <5c22> -<14b7> <5c25> -<14b8> <5c2c> -<14b9> <5c34> -<14ba> <624c> -<14bb> <626a> -<14bc> <629f> -<14bd> <62bb> -<14be> <62ca> -<14bf> <62da> -<14c0> <62d7> -<14c1> <62ee> -<14c2> <6322> -<14c3> <62f6> -<14c4> <6339> -<14c5> <634b> -<14c6> <6343> -<14c7> <63ad> -<14c8> <63f6> -<14c9> <6371> -<14ca> <637a> -<14cb> <638e> -<14cc> <63b4> -<14cd> <636d> -<14ce> <63ac> -<14cf> <638a> -<14d0> <6369> -<14d1> <63ae> -<14d2> <63bc> -<14d3> <63f2> -<14d4> <63f8> -<14d5> <63e0> -<14d6> <63ff> -<14d7> <63c4> -<14d8> <63de> -<14d9> <63ce> -<14da> <6452> -<14db> <63c6> -<14dc> <63be> -<14dd> <6445> -<14de> <6441> -<14df> <640b> -<14e0> <641b> -<14e1> <6420> -<14e2> <640c> -<14e3> <6426> -<14e4> <6421> -<14e5> <645e> -<14e6> <6484> -<14e7> <646d> -<14e8> <6496> -<14e9> <647a> -<14ec> <6499> -<14ed> <64ba> -<14ee> <64c0> -<14ef> <64d0> -<14f0> <64d7> -<14f1> <64e4> -<14f2> <64e2> +<1491> <8568> +<1492> <8564> +<1493> <855e> +<1494> <857a> +<1495> <77a2> +<1496> <8543> +<1497> <8572> +<1498> <857b> +<1499> <85a4> +<149a> <85a8> +<149b> <8587> +<149c> <858f> +<149d> <8579> +<149e> <85ae> +<149f> <859c> +<14a0> <8585> +<14a1> <85b9> +<14a2> <85b7> +<14a3> <85b0> +<14a4> <85d3> +<14a5> <85c1> +<14a6> <85dc> +<14a7> <85ff> +<14a8> <8627> +<14a9> <8605> +<14aa> <8629> +<14ab> <8616> +<14ac> <863c> +<14ad> <5efe> +<14ae> <5f08> +<14af> <593c> +<14b0> <5941> +<14b1> <8037> +<14b2> <5955> +<14b3> <595a> +<14b4> <5958> +<14b5> <530f> +<14b6> <5c22> +<14b7> <5c25> +<14b8> <5c2c> +<14b9> <5c34> +<14ba> <624c> +<14bb> <626a> +<14bc> <629f> +<14bd> <62bb> +<14be> <62ca> +<14bf> <62da> +<14c0> <62d7> +<14c1> <62ee> +<14c2> <6322> +<14c3> <62f6> +<14c4> <6339> +<14c5> <634b> +<14c6> <6343> +<14c7> <63ad> +<14c8> <63f6> +<14c9> <6371> +<14ca> <637a> +<14cb> <638e> +<14cc> <63b4> +<14cd> <636d> +<14ce> <63ac> +<14cf> <638a> +<14d0> <6369> +<14d1> <63ae> +<14d2> <63bc> +<14d3> <63f2> +<14d4> <63f8> +<14d5> <63e0> +<14d6> <63ff> +<14d7> <63c4> +<14d8> <63de> +<14d9> <63ce> +<14da> <6452> +<14db> <63c6> +<14dc> <63be> +<14dd> <6445> +<14de> <6441> +<14df> <640b> +<14e0> <641b> +<14e1> <6420> +<14e2> <640c> +<14e3> <6426> +<14e4> <6421> +<14e5> <645e> +<14e6> <6484> +<14e7> <646d> +<14e8> <6496> +<14e9> <647a> +<14ec> <6499> +<14ed> <64ba> +<14ee> <64c0> +<14ef> <64d0> +<14f0> <64d7> +<14f1> <64e4> +<14f2> <64e2> +<14f3> <6509> +<14f4> <6525> +<14f5> <652e> +<14f6> <5f0b> endbfchar 100 beginbfchar -<14f3> <6509> -<14f4> <6525> -<14f5> <652e> -<14f6> <5f0b> -<14f7> <5fd2> -<14f8> <7519> -<14f9> <5f11> -<14fa> <535f> -<14fb> <53f1> -<14fc> <53fd> -<14fd> <53e9> -<14fe> <53e8> -<14ff> <53fb> -<1500> <5412> -<1501> <5416> -<1502> <5406> -<1503> <544b> -<1507> <5456> -<1508> <5443> -<1509> <5421> -<150a> <5457> -<150b> <5459> -<150c> <5423> -<150d> <5432> -<150e> <5482> -<150f> <5494> -<1510> <5477> -<1511> <5471> -<1512> <5464> -<1515> <5484> -<1516> <5476> -<1517> <5466> -<1518> <549d> -<1519> <54d0> -<151a> <54ad> -<151b> <54c2> -<151c> <54b4> -<151d> <54d2> -<151e> <54a7> -<151f> <54a6> -<1522> <5472> -<1523> <54a3> -<1524> <54d5> -<1525> <54bb> -<1526> <54bf> -<1527> <54cc> -<152a> <54dc> -<152d> <54a4> -<152e> <54dd> -<152f> <54cf> -<1530> <54de> -<1531> <551b> -<1532> <54e7> -<1533> <5520> -<1534> <54fd> -<1535> <5514> -<1536> <54f3> -<1539> <550f> -<153a> <5511> -<153b> <5527> -<153c> <552a> -<153d> <5567> -<153e> <558f> -<153f> <55b5> -<1540> <5549> -<1541> <556d> -<1542> <5541> -<1543> <5555> -<1544> <553f> -<1545> <5550> -<1546> <553c> -<1547> <5537> -<1548> <5556> -<154c> <5533> -<154d> <5530> -<154e> <555c> -<154f> <558b> -<1550> <55d2> -<1551> <5583> -<1552> <55b1> -<1553> <55b9> -<1554> <5588> -<1555> <5581> -<1556> <559f> -<1557> <557e> -<1558> <55d6> -<1559> <5591> -<155a> <557b> -<155b> <55df> -<155e> <5594> -<155f> <5599> -<1560> <55ea> -<1561> <55f7> -<1562> <55c9> -<1563> <561f> -<1564> <55d1> -<1567> <55d4> -<1568> <55e6> -<1569> <55dd> -<156a> <55c4> +<14f7> <5fd2> +<14f8> <7519> +<14f9> <5f11> +<14fa> <535f> +<14fb> <53f1> +<14fc> <53fd> +<14fd> <53e9> +<14fe> <53e8> +<14ff> <53fb> +<1500> <5412> +<1501> <5416> +<1502> <5406> +<1503> <544b> +<1507> <5456> +<1508> <5443> +<1509> <5421> +<150a> <5457> +<150b> <5459> +<150c> <5423> +<150d> <5432> +<150e> <5482> +<150f> <5494> +<1510> <5477> +<1511> <5471> +<1512> <5464> +<1515> <5484> +<1516> <5476> +<1517> <5466> +<1518> <549d> +<1519> <54d0> +<151a> <54ad> +<151b> <54c2> +<151c> <54b4> +<151d> <54d2> +<151e> <54a7> +<151f> <54a6> +<1522> <5472> +<1523> <54a3> +<1524> <54d5> +<1525> <54bb> +<1526> <54bf> +<1527> <54cc> +<152a> <54dc> +<152d> <54a4> +<152e> <54dd> +<152f> <54cf> +<1530> <54de> +<1531> <551b> +<1532> <54e7> +<1533> <5520> +<1534> <54fd> +<1535> <5514> +<1536> <54f3> +<1539> <550f> +<153a> <5511> +<153b> <5527> +<153c> <552a> +<153d> <5567> +<153e> <558f> +<153f> <55b5> +<1540> <5549> +<1541> <556d> +<1542> <5541> +<1543> <5555> +<1544> <553f> +<1545> <5550> +<1546> <553c> +<1547> <5537> +<1548> <5556> +<154c> <5533> +<154d> <5530> +<154e> <555c> +<154f> <558b> +<1550> <55d2> +<1551> <5583> +<1552> <55b1> +<1553> <55b9> +<1554> <5588> +<1555> <5581> +<1556> <559f> +<1557> <557e> +<1558> <55d6> +<1559> <5591> +<155a> <557b> +<155b> <55df> +<155e> <5594> +<155f> <5599> +<1560> <55ea> +<1561> <55f7> +<1562> <55c9> +<1563> <561f> +<1564> <55d1> +<1567> <55d4> +<1568> <55e6> +<1569> <55dd> +<156a> <55c4> +<156b> <55ef> +<156c> <55e5> +<1571> <55e8> +<1572> <55f5> endbfchar 100 beginbfchar -<156b> <55ef> -<156c> <55e5> -<1571> <55e8> -<1572> <55f5> -<1573> <55e4> -<1574> <8f94> -<1575> <561e> -<1576> <5608> -<1577> <560c> -<1578> <5601> -<1579> <5624> -<157a> <5623> -<157b> <55fe> -<157c> <5600> -<157d> <5627> -<157e> <562d> -<157f> <5658> -<1580> <5639> -<1581> <5657> -<1582> <562c> -<1583> <564d> -<1584> <5662> -<1585> <5659> -<1586> <565c> -<1587> <564c> -<1588> <5654> -<1589> <5686> -<158a> <5664> -<158b> <5671> -<158c> <566b> -<158f> <5685> -<1590> <5693> -<1591> <56af> -<1592> <56d4> -<1593> <56d7> -<1594> <56dd> -<1595> <56e1> -<1596> <56f5> -<1597> <56eb> -<1598> <56f9> -<1599> <56ff> -<159a> <5704> -<159b> <570a> -<159c> <5709> -<159d> <571c> -<159e> <5e0f> -<159f> <5e19> -<15a0> <5e14> -<15a1> <5e11> -<15a2> <5e31> -<15a5> <5e37> -<15a6> <5e44> -<15a7> <5e54> -<15a8> <5e5b> -<15a9> <5e5e> -<15aa> <5e61> -<15ab> <5c8c> -<15ac> <5c7a> -<15ad> <5c8d> -<15ae> <5c90> -<15af> <5c96> -<15b0> <5c88> -<15b3> <5c91> -<15b4> <5c9a> -<15b5> <5c9c> -<15b6> <5cb5> -<15b7> <5ca2> -<15b8> <5cbd> -<15b9> <5cac> -<15ba> <5cab> -<15bb> <5cb1> -<15bc> <5ca3> -<15bd> <5cc1> -<15be> <5cb7> -<15bf> <5cc4> -<15c0> <5cd2> -<15c1> <5ce4> -<15c2> <5ccb> -<15c3> <5ce5> -<15c6> <5d27> -<15c7> <5d26> -<15c8> <5d2e> -<15c9> <5d24> -<15ca> <5d1e> -<15cb> <5d06> -<15cc> <5d1b> -<15cd> <5d58> -<15ce> <5d3e> -<15cf> <5d34> -<15d0> <5d3d> -<15d1> <5d6c> -<15d2> <5d5b> -<15d3> <5d6f> -<15d4> <5d5d> -<15d5> <5d6b> -<15d6> <5d4b> -<15d7> <5d4a> -<15d8> <5d69> -<15d9> <5d74> -<15da> <5d82> +<1573> <55e4> +<1574> <8f94> +<1575> <561e> +<1576> <5608> +<1577> <560c> +<1578> <5601> +<1579> <5624> +<157a> <5623> +<157b> <55fe> +<157c> <5600> +<157d> <5627> +<157e> <562d> +<157f> <5658> +<1580> <5639> +<1581> <5657> +<1582> <562c> +<1583> <564d> +<1584> <5662> +<1585> <5659> +<1586> <565c> +<1587> <564c> +<1588> <5654> +<1589> <5686> +<158a> <5664> +<158b> <5671> +<158c> <566b> +<158f> <5685> +<1590> <5693> +<1591> <56af> +<1592> <56d4> +<1593> <56d7> +<1594> <56dd> +<1595> <56e1> +<1596> <56f5> +<1597> <56eb> +<1598> <56f9> +<1599> <56ff> +<159a> <5704> +<159b> <570a> +<159c> <5709> +<159d> <571c> +<159e> <5e0f> +<159f> <5e19> +<15a0> <5e14> +<15a1> <5e11> +<15a2> <5e31> +<15a5> <5e37> +<15a6> <5e44> +<15a7> <5e54> +<15a8> <5e5b> +<15a9> <5e5e> +<15aa> <5e61> +<15ab> <5c8c> +<15ac> <5c7a> +<15ad> <5c8d> +<15ae> <5c90> +<15af> <5c96> +<15b0> <5c88> +<15b3> <5c91> +<15b4> <5c9a> +<15b5> <5c9c> +<15b6> <5cb5> +<15b7> <5ca2> +<15b8> <5cbd> +<15b9> <5cac> +<15ba> <5cab> +<15bb> <5cb1> +<15bc> <5ca3> +<15bd> <5cc1> +<15be> <5cb7> +<15bf> <5cc4> +<15c0> <5cd2> +<15c1> <5ce4> +<15c2> <5ccb> +<15c3> <5ce5> +<15c6> <5d27> +<15c7> <5d26> +<15c8> <5d2e> +<15c9> <5d24> +<15ca> <5d1e> +<15cb> <5d06> +<15cc> <5d1b> +<15cd> <5d58> +<15ce> <5d3e> +<15cf> <5d34> +<15d0> <5d3d> +<15d1> <5d6c> +<15d2> <5d5b> +<15d3> <5d6f> +<15d4> <5d5d> +<15d5> <5d6b> +<15d6> <5d4b> +<15d7> <5d4a> +<15d8> <5d69> +<15d9> <5d74> +<15da> <5d82> +<15db> <5d99> +<15dc> <5d9d> +<15dd> <8c73> +<15de> <5db7> endbfchar 100 beginbfchar -<15db> <5d99> -<15dc> <5d9d> -<15dd> <8c73> -<15de> <5db7> -<15df> <5dc5> -<15e0> <5f73> -<15e1> <5f77> -<15e2> <5f82> -<15e3> <5f87> -<15e4> <5f89> -<15e5> <5f8c> -<15e6> <5f95> -<15e7> <5f99> -<15e8> <5f9c> -<15e9> <5fa8> -<15ea> <5fad> -<15eb> <5fb5> -<15ec> <5fbc> -<15ed> <8862> -<15ee> <5f61> -<15ef> <72ad> -<15f0> <72b0> -<15f1> <72b4> -<15f4> <72c3> -<15f5> <72c1> -<15f6> <72ce> -<15f7> <72cd> -<15f8> <72d2> -<15f9> <72e8> -<15fa> <72ef> -<15fb> <72e9> -<15fc> <72f2> -<15fd> <72f4> -<15fe> <72f7> -<15ff> <7301> -<1600> <72f3> -<1601> <7303> -<1604> <7317> -<1605> <7313> -<1606> <7321> -<1607> <730a> -<1608> <731e> -<1609> <731d> -<160a> <7315> -<160b> <7322> -<160c> <7339> -<160d> <7325> -<160e> <732c> -<160f> <7338> -<1610> <7331> -<1611> <7350> -<1612> <734d> -<1613> <7357> -<1614> <7360> -<1615> <736c> -<1616> <736f> -<1617> <737e> -<1618> <821b> -<1619> <5925> -<161a> <98e7> -<161b> <5924> -<161c> <5902> -<161d> <9963> -<1624> <9974> -<1625> <9977> -<1626> <997d> -<1627> <9980> -<1628> <9984> -<1629> <9987> -<162a> <998a> -<162b> <998d> -<1631> <5e80> -<1632> <5e91> -<1633> <5e8b> -<1634> <5e96> -<1635> <5ea5> -<1636> <5ea0> -<1637> <5eb9> -<1638> <5eb5> -<1639> <5ebe> -<163a> <5eb3> -<163b> <8d53> -<163c> <5ed2> -<163d> <5ed1> -<163e> <5edb> -<163f> <5ee8> -<1640> <5eea> -<1641> <81ba> -<1642> <5fc4> -<1643> <5fc9> -<1644> <5fd6> -<1645> <5fcf> -<1646> <6003> -<1647> <5fee> -<1648> <6004> -<1649> <5fe1> -<164a> <5fe4> -<164b> <5ffe> -<164e> <5fea> -<164f> <5fed> +<15df> <5dc5> +<15e0> <5f73> +<15e1> <5f77> +<15e2> <5f82> +<15e3> <5f87> +<15e4> <5f89> +<15e5> <5f8c> +<15e6> <5f95> +<15e7> <5f99> +<15e8> <5f9c> +<15e9> <5fa8> +<15ea> <5fad> +<15eb> <5fb5> +<15ec> <5fbc> +<15ed> <8862> +<15ee> <5f61> +<15ef> <72ad> +<15f0> <72b0> +<15f1> <72b4> +<15f4> <72c3> +<15f5> <72c1> +<15f6> <72ce> +<15f7> <72cd> +<15f8> <72d2> +<15f9> <72e8> +<15fa> <72ef> +<15fb> <72e9> +<15fc> <72f2> +<15fd> <72f4> +<15fe> <72f7> +<15ff> <7301> +<1600> <72f3> +<1601> <7303> +<1604> <7317> +<1605> <7313> +<1606> <7321> +<1607> <730a> +<1608> <731e> +<1609> <731d> +<160a> <7315> +<160b> <7322> +<160c> <7339> +<160d> <7325> +<160e> <732c> +<160f> <7338> +<1610> <7331> +<1611> <7350> +<1612> <734d> +<1613> <7357> +<1614> <7360> +<1615> <736c> +<1616> <736f> +<1617> <737e> +<1618> <821b> +<1619> <5925> +<161a> <98e7> +<161b> <5924> +<161c> <5902> +<161d> <9963> +<1624> <9974> +<1625> <9977> +<1626> <997d> +<1627> <9980> +<1628> <9984> +<1629> <9987> +<162a> <998a> +<162b> <998d> +<1631> <5e80> +<1632> <5e91> +<1633> <5e8b> +<1634> <5e96> +<1635> <5ea5> +<1636> <5ea0> +<1637> <5eb9> +<1638> <5eb5> +<1639> <5ebe> +<163a> <5eb3> +<163b> <8d53> +<163c> <5ed2> +<163d> <5ed1> +<163e> <5edb> +<163f> <5ee8> +<1640> <5eea> +<1641> <81ba> +<1642> <5fc4> +<1643> <5fc9> +<1644> <5fd6> +<1645> <5fcf> +<1646> <6003> +<1647> <5fee> +<1648> <6004> +<1649> <5fe1> +<164a> <5fe4> +<164b> <5ffe> +<164e> <5fea> +<164f> <5fed> +<1650> <5ff8> +<1651> <6019> +<1652> <6035> +<1653> <6026> endbfchar 100 beginbfchar -<1650> <5ff8> -<1651> <6019> -<1652> <6035> -<1653> <6026> -<1654> <601b> -<1655> <600f> -<1656> <600d> -<1657> <6029> -<1658> <602b> -<1659> <600a> -<165a> <603f> -<165b> <6021> -<165e> <607b> -<165f> <607a> -<1660> <6042> -<1661> <606a> -<1662> <607d> -<1663> <6096> -<1664> <609a> -<1665> <60ad> -<1666> <609d> -<1667> <6083> -<1668> <6092> -<1669> <608c> -<166a> <609b> -<166b> <60ec> -<166c> <60bb> -<166d> <60b1> -<166e> <60dd> -<166f> <60d8> -<1670> <60c6> -<1671> <60da> -<1672> <60b4> -<1673> <6120> -<1674> <6126> -<1675> <6115> -<1676> <6123> -<1677> <60f4> -<1678> <6100> -<1679> <610e> -<167a> <612b> -<167b> <614a> -<167c> <6175> -<167d> <61ac> -<167e> <6194> -<167f> <61a7> -<1680> <61b7> -<1681> <61d4> -<1682> <61f5> -<1683> <5fdd> -<1684> <96b3> -<1685> <95e9> -<1686> <95eb> -<1687> <95f1> -<1688> <95f3> -<168b> <95fc> -<168c> <95fe> -<168f> <9606> -<1690> <9608> -<1695> <960f> -<1696> <9612> -<169c> <4e2c> -<169d> <723f> -<169e> <6215> -<169f> <6c35> -<16a0> <6c54> -<16a1> <6c5c> -<16a2> <6c4a> -<16a3> <6ca3> -<16a4> <6c85> -<16a5> <6c90> -<16a6> <6c94> -<16a7> <6c8c> -<16aa> <6c74> -<16ab> <6c76> -<16ac> <6c86> -<16ad> <6ca9> -<16ae> <6cd0> -<16af> <6cd4> -<16b0> <6cad> -<16b3> <6cf1> -<16b4> <6cd7> -<16b5> <6cb2> -<16b6> <6ce0> -<16b7> <6cd6> -<16b8> <6cfa> -<16b9> <6ceb> -<16ba> <6cee> -<16bb> <6cb1> -<16bc> <6cd3> -<16bd> <6cef> -<16be> <6cfe> -<16bf> <6d39> -<16c0> <6d27> -<16c1> <6d0c> -<16c2> <6d43> -<16c3> <6d48> -<16c4> <6d07> -<16c5> <6d04> -<16c6> <6d19> +<1654> <601b> +<1655> <600f> +<1656> <600d> +<1657> <6029> +<1658> <602b> +<1659> <600a> +<165a> <603f> +<165b> <6021> +<165e> <607b> +<165f> <607a> +<1660> <6042> +<1661> <606a> +<1662> <607d> +<1663> <6096> +<1664> <609a> +<1665> <60ad> +<1666> <609d> +<1667> <6083> +<1668> <6092> +<1669> <608c> +<166a> <609b> +<166b> <60ec> +<166c> <60bb> +<166d> <60b1> +<166e> <60dd> +<166f> <60d8> +<1670> <60c6> +<1671> <60da> +<1672> <60b4> +<1673> <6120> +<1674> <6126> +<1675> <6115> +<1676> <6123> +<1677> <60f4> +<1678> <6100> +<1679> <610e> +<167a> <612b> +<167b> <614a> +<167c> <6175> +<167d> <61ac> +<167e> <6194> +<167f> <61a7> +<1680> <61b7> +<1681> <61d4> +<1682> <61f5> +<1683> <5fdd> +<1684> <96b3> +<1685> <95e9> +<1686> <95eb> +<1687> <95f1> +<1688> <95f3> +<168b> <95fc> +<168c> <95fe> +<168f> <9606> +<1690> <9608> +<1695> <960f> +<1696> <9612> +<169c> <4e2c> +<169d> <723f> +<169e> <6215> +<169f> <6c35> +<16a0> <6c54> +<16a1> <6c5c> +<16a2> <6c4a> +<16a3> <6ca3> +<16a4> <6c85> +<16a5> <6c90> +<16a6> <6c94> +<16a7> <6c8c> +<16aa> <6c74> +<16ab> <6c76> +<16ac> <6c86> +<16ad> <6ca9> +<16ae> <6cd0> +<16af> <6cd4> +<16b0> <6cad> +<16b3> <6cf1> +<16b4> <6cd7> +<16b5> <6cb2> +<16b6> <6ce0> +<16b7> <6cd6> +<16b8> <6cfa> +<16b9> <6ceb> +<16ba> <6cee> +<16bb> <6cb1> +<16bc> <6cd3> +<16bd> <6cef> +<16be> <6cfe> +<16bf> <6d39> +<16c0> <6d27> +<16c1> <6d0c> +<16c2> <6d43> +<16c3> <6d48> +<16c4> <6d07> +<16c5> <6d04> +<16c6> <6d19> +<16c7> <6d0e> +<16c8> <6d2b> +<16c9> <6d4d> +<16ca> <6d2e> endbfchar 100 beginbfchar -<16c7> <6d0e> -<16c8> <6d2b> -<16c9> <6d4d> -<16ca> <6d2e> -<16cb> <6d35> -<16cc> <6d1a> -<16cd> <6d4f> -<16ce> <6d52> -<16cf> <6d54> -<16d0> <6d33> -<16d1> <6d91> -<16d2> <6d6f> -<16d3> <6d9e> -<16d4> <6da0> -<16d5> <6d5e> -<16d8> <6d5c> -<16d9> <6d60> -<16da> <6d7c> -<16db> <6d63> -<16dc> <6e1a> -<16dd> <6dc7> -<16de> <6dc5> -<16df> <6dde> -<16e0> <6e0e> -<16e1> <6dbf> -<16e2> <6de0> -<16e3> <6e11> -<16e4> <6de6> -<16e5> <6ddd> -<16e6> <6dd9> -<16e7> <6e16> -<16e8> <6dab> -<16e9> <6e0c> -<16ea> <6dae> -<16eb> <6e2b> -<16ec> <6e6e> -<16ed> <6e4e> -<16ee> <6e6b> -<16ef> <6eb2> -<16f0> <6e5f> -<16f1> <6e86> -<16f4> <6e32> -<16f5> <6e25> -<16f6> <6e44> -<16f7> <6edf> -<16f8> <6eb1> -<16f9> <6e98> -<16fa> <6ee0> -<16fb> <6f2d> -<16fc> <6ee2> -<16fd> <6ea5> -<16fe> <6ea7> -<16ff> <6ebd> -<1700> <6ebb> -<1701> <6eb7> -<1702> <6ed7> -<1703> <6eb4> -<1704> <6ecf> -<1705> <6e8f> -<1706> <6ec2> -<1707> <6e9f> -<1708> <6f62> -<170b> <6f24> -<170c> <6f15> -<170d> <6ef9> -<170e> <6f2f> -<170f> <6f36> -<1710> <6f4b> -<1711> <6f74> -<1712> <6f2a> -<1713> <6f09> -<1714> <6f29> -<1715> <6f89> -<1716> <6f8d> -<1717> <6f8c> -<1718> <6f78> -<1719> <6f72> -<171a> <6f7c> -<171b> <6f7a> -<171c> <6fd1> -<171d> <6fc9> -<171e> <6fa7> -<171f> <6fb9> -<1720> <6fb6> -<1721> <6fc2> -<1722> <6fe1> -<1723> <6fee> -<1724> <6fde> -<1725> <6fe0> -<1726> <6fef> -<1727> <701a> -<1728> <7023> -<1729> <701b> -<172a> <7039> -<172b> <7035> -<172c> <704f> -<172d> <705e> -<172e> <5b80> -<172f> <5b84> -<1730> <5b95> +<16cb> <6d35> +<16cc> <6d1a> +<16cd> <6d4f> +<16ce> <6d52> +<16cf> <6d54> +<16d0> <6d33> +<16d1> <6d91> +<16d2> <6d6f> +<16d3> <6d9e> +<16d4> <6da0> +<16d5> <6d5e> +<16d8> <6d5c> +<16d9> <6d60> +<16da> <6d7c> +<16db> <6d63> +<16dc> <6e1a> +<16dd> <6dc7> +<16de> <6dc5> +<16df> <6dde> +<16e0> <6e0e> +<16e1> <6dbf> +<16e2> <6de0> +<16e3> <6e11> +<16e4> <6de6> +<16e5> <6ddd> +<16e6> <6dd9> +<16e7> <6e16> +<16e8> <6dab> +<16e9> <6e0c> +<16ea> <6dae> +<16eb> <6e2b> +<16ec> <6e6e> +<16ed> <6e4e> +<16ee> <6e6b> +<16ef> <6eb2> +<16f0> <6e5f> +<16f1> <6e86> +<16f4> <6e32> +<16f5> <6e25> +<16f6> <6e44> +<16f7> <6edf> +<16f8> <6eb1> +<16f9> <6e98> +<16fa> <6ee0> +<16fb> <6f2d> +<16fc> <6ee2> +<16fd> <6ea5> +<16fe> <6ea7> +<16ff> <6ebd> +<1700> <6ebb> +<1701> <6eb7> +<1702> <6ed7> +<1703> <6eb4> +<1704> <6ecf> +<1705> <6e8f> +<1706> <6ec2> +<1707> <6e9f> +<1708> <6f62> +<170b> <6f24> +<170c> <6f15> +<170d> <6ef9> +<170e> <6f2f> +<170f> <6f36> +<1710> <6f4b> +<1711> <6f74> +<1712> <6f2a> +<1713> <6f09> +<1714> <6f29> +<1715> <6f89> +<1716> <6f8d> +<1717> <6f8c> +<1718> <6f78> +<1719> <6f72> +<171a> <6f7c> +<171b> <6f7a> +<171c> <6fd1> +<171d> <6fc9> +<171e> <6fa7> +<171f> <6fb9> +<1720> <6fb6> +<1721> <6fc2> +<1722> <6fe1> +<1723> <6fee> +<1724> <6fde> +<1725> <6fe0> +<1726> <6fef> +<1727> <701a> +<1728> <7023> +<1729> <701b> +<172a> <7039> +<172b> <7035> +<172c> <704f> +<172d> <705e> +<172e> <5b80> +<172f> <5b84> +<1730> <5b95> +<1731> <5b93> +<1732> <5ba5> +<1733> <5bb8> +<1734> <752f> endbfchar 100 beginbfchar -<1731> <5b93> -<1732> <5ba5> -<1733> <5bb8> -<1734> <752f> -<1735> <9a9e> -<1736> <6434> -<1737> <5be4> -<1738> <5bee> -<1739> <8930> -<173a> <5bf0> -<173b> <8e47> -<173c> <8b07> -<173d> <8fb6> -<173e> <8fd3> -<173f> <8fd5> -<1740> <8fe5> -<1741> <8fee> -<1742> <8fe4> -<1743> <8fe9> -<1744> <8fe6> -<1745> <8ff3> -<1746> <8fe8> -<1747> <9005> -<1748> <9004> -<1749> <900b> -<174a> <9026> -<174b> <9011> -<174c> <900d> -<174d> <9016> -<174e> <9021> -<1751> <902d> -<1752> <902f> -<1753> <9044> -<1756> <9050> -<1757> <9068> -<1758> <9058> -<1759> <9062> -<175a> <905b> -<175b> <66b9> -<175c> <9074> -<175d> <907d> -<175e> <9082> -<175f> <9088> -<1760> <9083> -<1761> <908b> -<1762> <5f50> -<1763> <5f57> -<1764> <5f56> -<1765> <5f58> -<1766> <5c3b> -<1767> <54ab> -<1768> <5c50> -<1769> <5c59> -<176a> <5b71> -<176b> <5c63> -<176c> <5c66> -<176d> <7fbc> -<176e> <5f2a> -<176f> <5f29> -<1770> <5f2d> -<1771> <8274> -<1772> <5f3c> -<1773> <9b3b> -<1774> <5c6e> -<1775> <5981> -<1776> <5983> -<1777> <598d> -<177a> <59a3> -<177b> <5997> -<177c> <59ca> -<177d> <59ab> -<177e> <599e> -<177f> <59a4> -<1780> <59d2> -<1781> <59b2> -<1782> <59af> -<1783> <59d7> -<1784> <59be> -<1787> <59dd> -<1788> <5a08> -<1789> <59e3> -<178a> <59d8> -<178b> <59f9> -<178c> <5a0c> -<178d> <5a09> -<178e> <5a32> -<178f> <5a34> -<1790> <5a11> -<1791> <5a23> -<1792> <5a13> -<1793> <5a40> -<1794> <5a67> -<1795> <5a4a> -<1796> <5a55> -<1797> <5a3c> -<1798> <5a62> -<1799> <5a75> -<179a> <80ec> -<179b> <5aaa> -<179c> <5a9b> +<1735> <9a9e> +<1736> <6434> +<1737> <5be4> +<1738> <5bee> +<1739> <8930> +<173a> <5bf0> +<173b> <8e47> +<173c> <8b07> +<173d> <8fb6> +<173e> <8fd3> +<173f> <8fd5> +<1740> <8fe5> +<1741> <8fee> +<1742> <8fe4> +<1743> <8fe9> +<1744> <8fe6> +<1745> <8ff3> +<1746> <8fe8> +<1747> <9005> +<1748> <9004> +<1749> <900b> +<174a> <9026> +<174b> <9011> +<174c> <900d> +<174d> <9016> +<174e> <9021> +<1751> <902d> +<1752> <902f> +<1753> <9044> +<1756> <9050> +<1757> <9068> +<1758> <9058> +<1759> <9062> +<175a> <905b> +<175b> <66b9> +<175c> <9074> +<175d> <907d> +<175e> <9082> +<175f> <9088> +<1760> <9083> +<1761> <908b> +<1762> <5f50> +<1763> <5f57> +<1764> <5f56> +<1765> <5f58> +<1766> <5c3b> +<1767> <54ab> +<1768> <5c50> +<1769> <5c59> +<176a> <5b71> +<176b> <5c63> +<176c> <5c66> +<176d> <7fbc> +<176e> <5f2a> +<176f> <5f29> +<1770> <5f2d> +<1771> <8274> +<1772> <5f3c> +<1773> <9b3b> +<1774> <5c6e> +<1775> <5981> +<1776> <5983> +<1777> <598d> +<177a> <59a3> +<177b> <5997> +<177c> <59ca> +<177d> <59ab> +<177e> <599e> +<177f> <59a4> +<1780> <59d2> +<1781> <59b2> +<1782> <59af> +<1783> <59d7> +<1784> <59be> +<1787> <59dd> +<1788> <5a08> +<1789> <59e3> +<178a> <59d8> +<178b> <59f9> +<178c> <5a0c> +<178d> <5a09> +<178e> <5a32> +<178f> <5a34> +<1790> <5a11> +<1791> <5a23> +<1792> <5a13> +<1793> <5a40> +<1794> <5a67> +<1795> <5a4a> +<1796> <5a55> +<1797> <5a3c> +<1798> <5a62> +<1799> <5a75> +<179a> <80ec> +<179b> <5aaa> +<179c> <5a9b> +<179d> <5a77> +<179e> <5a7a> +<179f> <5abe> +<17a0> <5aeb> endbfchar 100 beginbfchar -<179d> <5a77> -<179e> <5a7a> -<179f> <5abe> -<17a0> <5aeb> -<17a1> <5ab2> -<17a2> <5ad2> -<17a3> <5ad4> -<17a4> <5ab8> -<17a5> <5ae0> -<17a6> <5ae3> -<17a7> <5af1> -<17a8> <5ad6> -<17a9> <5ae6> -<17aa> <5ad8> -<17ab> <5adc> -<17ac> <5b09> -<17ad> <5b17> -<17ae> <5b16> -<17af> <5b32> -<17b0> <5b37> -<17b1> <5b40> -<17b2> <5c15> -<17b3> <5c1c> -<17b4> <5b5a> -<17b5> <5b65> -<17b6> <5b73> -<17b7> <5b51> -<17b8> <5b53> -<17b9> <5b62> -<17ba> <9a75> -<17bd> <9a7a> -<17be> <9a7f> -<17bf> <9a7d> -<17c2> <9a85> -<17c3> <9a88> -<17c4> <9a8a> -<17c5> <9a90> -<17c8> <9a96> -<17c9> <9a98> -<17d1> <9aa5> -<17d2> <9aa7> -<17d3> <7e9f> -<17d4> <7ea1> -<17d5> <7ea3> -<17d6> <7ea5> -<17d9> <7ead> -<17da> <7eb0> -<17db> <7ebe> -<17df> <7ec9> -<17e2> <7ed0> -<17e3> <7ed4> -<17e4> <7ed7> -<17e5> <7edb> -<17e8> <7ee8> -<17e9> <7eeb> -<17ee> <7f0d> -<17ef> <7ef6> -<17f2> <7efe> -<17fa> <7f0f> -<17fd> <7f17> -<17fe> <7f19> -<17ff> <7f1c> -<1800> <7f1b> -<1801> <7f1f> -<1812> <7f35> -<1813> <5e7a> -<1814> <757f> -<1815> <5ddb> -<1816> <753e> -<1817> <9095> -<1818> <738e> -<1819> <7391> -<181a> <73ae> -<181b> <73a2> -<181c> <739f> -<181d> <73cf> -<181e> <73c2> -<181f> <73d1> -<1820> <73b7> -<1821> <73b3> -<1822> <73c0> -<1823> <73c9> -<1824> <73c8> -<1825> <73e5> -<1826> <73d9> -<1827> <987c> -<1828> <740a> -<1829> <73e9> -<182a> <73e7> -<182b> <73de> -<182c> <73ba> -<182d> <73f2> -<182e> <740f> -<182f> <742a> -<1830> <745b> -<1831> <7426> -<1832> <7425> -<1833> <7428> -<1834> <7430> -<1835> <742e> +<17a1> <5ab2> +<17a2> <5ad2> +<17a3> <5ad4> +<17a4> <5ab8> +<17a5> <5ae0> +<17a6> <5ae3> +<17a7> <5af1> +<17a8> <5ad6> +<17a9> <5ae6> +<17aa> <5ad8> +<17ab> <5adc> +<17ac> <5b09> +<17ad> <5b17> +<17ae> <5b16> +<17af> <5b32> +<17b0> <5b37> +<17b1> <5b40> +<17b2> <5c15> +<17b3> <5c1c> +<17b4> <5b5a> +<17b5> <5b65> +<17b6> <5b73> +<17b7> <5b51> +<17b8> <5b53> +<17b9> <5b62> +<17ba> <9a75> +<17bd> <9a7a> +<17be> <9a7f> +<17bf> <9a7d> +<17c2> <9a85> +<17c3> <9a88> +<17c4> <9a8a> +<17c5> <9a90> +<17c8> <9a96> +<17c9> <9a98> +<17d1> <9aa5> +<17d2> <9aa7> +<17d3> <7e9f> +<17d4> <7ea1> +<17d5> <7ea3> +<17d6> <7ea5> +<17d9> <7ead> +<17da> <7eb0> +<17db> <7ebe> +<17df> <7ec9> +<17e2> <7ed0> +<17e3> <7ed4> +<17e4> <7ed7> +<17e5> <7edb> +<17e8> <7ee8> +<17e9> <7eeb> +<17ee> <7f0d> +<17ef> <7ef6> +<17f2> <7efe> +<17fa> <7f0f> +<17fd> <7f17> +<17fe> <7f19> +<17ff> <7f1c> +<1800> <7f1b> +<1801> <7f1f> +<1812> <7f35> +<1813> <5e7a> +<1814> <757f> +<1815> <5ddb> +<1816> <753e> +<1817> <9095> +<1818> <738e> +<1819> <7391> +<181a> <73ae> +<181b> <73a2> +<181c> <739f> +<181d> <73cf> +<181e> <73c2> +<181f> <73d1> +<1820> <73b7> +<1821> <73b3> +<1822> <73c0> +<1823> <73c9> +<1824> <73c8> +<1825> <73e5> +<1826> <73d9> +<1827> <987c> +<1828> <740a> +<1829> <73e9> +<182a> <73e7> +<182b> <73de> +<182c> <73ba> +<182d> <73f2> +<182e> <740f> +<182f> <742a> +<1830> <745b> +<1831> <7426> +<1832> <7425> +<1833> <7428> +<1834> <7430> +<1835> <742e> +<1836> <742c> +<1837> <741b> +<1838> <741a> +<1839> <7441> endbfchar 100 beginbfchar -<1836> <742c> -<1837> <741b> -<1838> <741a> -<1839> <7441> -<183a> <745c> -<183b> <7457> -<183c> <7455> -<183d> <7459> -<183e> <7477> -<183f> <746d> -<1840> <747e> -<1841> <749c> -<1842> <748e> -<1845> <7487> -<1846> <748b> -<1847> <749e> -<184a> <7490> -<184b> <74a7> -<184c> <74d2> -<184d> <74ba> -<1851> <674c> -<1852> <6753> -<1853> <675e> -<1854> <6748> -<1855> <6769> -<1856> <67a5> -<1857> <6787> -<1858> <676a> -<1859> <6773> -<185a> <6798> -<185b> <67a7> -<185c> <6775> -<185d> <67a8> -<185e> <679e> -<185f> <67ad> -<1860> <678b> -<1861> <6777> -<1862> <677c> -<1863> <67f0> -<1864> <6809> -<1865> <67d8> -<1866> <680a> -<1867> <67e9> -<1868> <67b0> -<1869> <680c> -<186a> <67d9> -<186b> <67b5> -<186c> <67da> -<186d> <67b3> -<186e> <67dd> -<186f> <6800> -<1870> <67c3> -<1871> <67b8> -<1872> <67e2> -<1873> <680e> -<1874> <67c1> -<1875> <67fd> -<187a> <684e> -<187b> <6862> -<187c> <6844> -<187d> <6864> -<187e> <6883> -<187f> <681d> -<1880> <6855> -<1881> <6866> -<1882> <6841> -<1883> <6867> -<1884> <6840> -<1885> <683e> -<1886> <684a> -<1887> <6849> -<1888> <6829> -<1889> <68b5> -<188a> <688f> -<188b> <6874> -<188c> <6877> -<188d> <6893> -<188e> <686b> -<188f> <68c2> -<1890> <696e> -<1891> <68fc> -<1894> <68f9> -<1895> <6924> -<1896> <68f0> -<1897> <690b> -<1898> <6901> -<1899> <6957> -<189a> <68e3> -<189b> <6910> -<189c> <6971> -<189d> <6939> -<189e> <6960> -<189f> <6942> -<18a0> <695d> -<18a1> <6984> -<18a2> <696b> -<18a3> <6980> -<18a4> <6998> -<18a5> <6978> -<18a6> <6934> +<183a> <745c> +<183b> <7457> +<183c> <7455> +<183d> <7459> +<183e> <7477> +<183f> <746d> +<1840> <747e> +<1841> <749c> +<1842> <748e> +<1845> <7487> +<1846> <748b> +<1847> <749e> +<184a> <7490> +<184b> <74a7> +<184c> <74d2> +<184d> <74ba> +<1851> <674c> +<1852> <6753> +<1853> <675e> +<1854> <6748> +<1855> <6769> +<1856> <67a5> +<1857> <6787> +<1858> <676a> +<1859> <6773> +<185a> <6798> +<185b> <67a7> +<185c> <6775> +<185d> <67a8> +<185e> <679e> +<185f> <67ad> +<1860> <678b> +<1861> <6777> +<1862> <677c> +<1863> <67f0> +<1864> <6809> +<1865> <67d8> +<1866> <680a> +<1867> <67e9> +<1868> <67b0> +<1869> <680c> +<186a> <67d9> +<186b> <67b5> +<186c> <67da> +<186d> <67b3> +<186e> <67dd> +<186f> <6800> +<1870> <67c3> +<1871> <67b8> +<1872> <67e2> +<1873> <680e> +<1874> <67c1> +<1875> <67fd> +<187a> <684e> +<187b> <6862> +<187c> <6844> +<187d> <6864> +<187e> <6883> +<187f> <681d> +<1880> <6855> +<1881> <6866> +<1882> <6841> +<1883> <6867> +<1884> <6840> +<1885> <683e> +<1886> <684a> +<1887> <6849> +<1888> <6829> +<1889> <68b5> +<188a> <688f> +<188b> <6874> +<188c> <6877> +<188d> <6893> +<188e> <686b> +<188f> <68c2> +<1890> <696e> +<1891> <68fc> +<1894> <68f9> +<1895> <6924> +<1896> <68f0> +<1897> <690b> +<1898> <6901> +<1899> <6957> +<189a> <68e3> +<189b> <6910> +<189c> <6971> +<189d> <6939> +<189e> <6960> +<189f> <6942> +<18a0> <695d> +<18a1> <6984> +<18a2> <696b> +<18a3> <6980> +<18a4> <6998> +<18a5> <6978> +<18a6> <6934> +<18a7> <69cc> +<18aa> <69ce> +<18ab> <6989> +<18ac> <6966> endbfchar 100 beginbfchar -<18a7> <69cc> -<18aa> <69ce> -<18ab> <6989> -<18ac> <6966> -<18ad> <6963> -<18ae> <6979> -<18af> <699b> -<18b0> <69a7> -<18b1> <69bb> -<18b2> <69ab> -<18b3> <69ad> -<18b4> <69d4> -<18b5> <69b1> -<18b6> <69c1> -<18b7> <69ca> -<18b8> <69df> -<18b9> <6995> -<18ba> <69e0> -<18bb> <698d> -<18bc> <69ff> -<18bd> <6a2f> -<18be> <69ed> -<18c1> <6a65> -<18c2> <69f2> -<18c3> <6a44> -<18c4> <6a3e> -<18c5> <6aa0> -<18c6> <6a50> -<18c7> <6a5b> -<18c8> <6a35> -<18c9> <6a8e> -<18ca> <6a79> -<18cb> <6a3d> -<18cc> <6a28> -<18cd> <6a58> -<18ce> <6a7c> -<18cf> <6a91> -<18d0> <6a90> -<18d1> <6aa9> -<18d2> <6a97> -<18d3> <6aab> -<18d4> <7337> -<18d5> <7352> -<18d8> <6b87> -<18d9> <6b84> -<18dc> <6b8d> -<18df> <6ba1> -<18e0> <6baa> -<18e1> <8f6b> -<18e2> <8f6d> -<18e8> <8f78> -<18e9> <8f77> -<18ec> <8f7c> -<18ed> <8f7e> -<18f0> <8f84> -<18f1> <8f87> -<18f2> <8f8b> -<18f6> <8f98> -<18f7> <8f9a> -<18f8> <8ece> -<18f9> <620b> -<18fa> <6217> -<18fb> <621b> -<18fc> <621f> -<18fd> <6222> -<18fe> <6221> -<18ff> <6225> -<1900> <6224> -<1901> <622c> -<1902> <81e7> -<1903> <74ef> -<1904> <74f4> -<1905> <74ff> -<1906> <750f> -<1907> <7511> -<1908> <7513> -<1909> <6534> -<190d> <660a> -<190e> <6619> -<190f> <6772> -<1910> <6603> -<1911> <6615> -<1912> <6600> -<1913> <7085> -<1914> <66f7> -<1915> <661d> -<1916> <6634> -<1917> <6631> -<1918> <6636> -<1919> <6635> -<191a> <8006> -<191b> <665f> -<191c> <6654> -<191d> <6641> -<191e> <664f> -<191f> <6656> -<1920> <6661> -<1921> <6657> -<1922> <6677> -<1923> <6684> +<18ad> <6963> +<18ae> <6979> +<18af> <699b> +<18b0> <69a7> +<18b1> <69bb> +<18b2> <69ab> +<18b3> <69ad> +<18b4> <69d4> +<18b5> <69b1> +<18b6> <69c1> +<18b7> <69ca> +<18b8> <69df> +<18b9> <6995> +<18ba> <69e0> +<18bb> <698d> +<18bc> <69ff> +<18bd> <6a2f> +<18be> <69ed> +<18c1> <6a65> +<18c2> <69f2> +<18c3> <6a44> +<18c4> <6a3e> +<18c5> <6aa0> +<18c6> <6a50> +<18c7> <6a5b> +<18c8> <6a35> +<18c9> <6a8e> +<18ca> <6a79> +<18cb> <6a3d> +<18cc> <6a28> +<18cd> <6a58> +<18ce> <6a7c> +<18cf> <6a91> +<18d0> <6a90> +<18d1> <6aa9> +<18d2> <6a97> +<18d3> <6aab> +<18d4> <7337> +<18d5> <7352> +<18d8> <6b87> +<18d9> <6b84> +<18dc> <6b8d> +<18df> <6ba1> +<18e0> <6baa> +<18e1> <8f6b> +<18e2> <8f6d> +<18e8> <8f78> +<18e9> <8f77> +<18ec> <8f7c> +<18ed> <8f7e> +<18f0> <8f84> +<18f1> <8f87> +<18f2> <8f8b> +<18f6> <8f98> +<18f7> <8f9a> +<18f8> <8ece> +<18f9> <620b> +<18fa> <6217> +<18fb> <621b> +<18fc> <621f> +<18fd> <6222> +<18fe> <6221> +<18ff> <6225> +<1900> <6224> +<1901> <622c> +<1902> <81e7> +<1903> <74ef> +<1904> <74f4> +<1905> <74ff> +<1906> <750f> +<1907> <7511> +<1908> <7513> +<1909> <6534> +<190d> <660a> +<190e> <6619> +<190f> <6772> +<1910> <6603> +<1911> <6615> +<1912> <6600> +<1913> <7085> +<1914> <66f7> +<1915> <661d> +<1916> <6634> +<1917> <6631> +<1918> <6636> +<1919> <6635> +<191a> <8006> +<191b> <665f> +<191c> <6654> +<191d> <6641> +<191e> <664f> +<191f> <6656> +<1920> <6661> +<1921> <6657> +<1922> <6677> +<1923> <6684> +<1924> <668c> +<1925> <66a7> +<1926> <669d> +<1927> <66be> endbfchar 100 beginbfchar -<1924> <668c> -<1925> <66a7> -<1926> <669d> -<1927> <66be> -<192a> <66e6> -<192b> <66e9> -<192e> <8d36> -<192f> <8d3b> -<1930> <8d3d> -<1931> <8d40> -<1936> <8d47> -<1937> <8d4d> -<1938> <8d55> -<1939> <8d59> -<193a> <89c7> -<1942> <726e> -<1943> <729f> -<1944> <725d> -<1945> <7266> -<1946> <726f> -<1949> <7284> -<194a> <728b> -<194b> <728d> -<194c> <728f> -<194d> <7292> -<194e> <6308> -<194f> <6332> -<1950> <63b0> -<1951> <643f> -<1952> <64d8> -<1953> <8004> -<1954> <6bea> -<1955> <6bf3> -<1956> <6bfd> -<1957> <6bf5> -<1958> <6bf9> -<1959> <6c05> -<195a> <6c07> -<195b> <6c06> -<195c> <6c0d> -<195d> <6c15> -<1961> <6c21> -<1962> <6c29> -<1963> <6c24> -<1964> <6c2a> -<1965> <6c32> -<1966> <6535> -<1967> <6555> -<1968> <656b> -<1969> <724d> -<196a> <7252> -<196b> <7256> -<196c> <7230> -<196d> <8662> -<196e> <5216> -<196f> <809f> -<1970> <809c> -<1971> <8093> -<1972> <80bc> -<1973> <670a> -<1974> <80bd> -<1975> <80b1> -<1976> <80ab> -<1977> <80ad> -<1978> <80b4> -<1979> <80b7> -<197e> <80db> -<197f> <80c2> -<1980> <80c4> -<1981> <80d9> -<1982> <80cd> -<1983> <80d7> -<1984> <6710> -<1985> <80dd> -<1986> <80eb> -<1987> <80f1> -<1988> <80f4> -<1989> <80ed> -<198c> <80f2> -<198d> <80fc> -<198e> <6715> -<198f> <8112> -<1990> <8c5a> -<1991> <8136> -<1992> <811e> -<1993> <812c> -<1994> <8118> -<1995> <8132> -<1996> <8148> -<1997> <814c> -<1998> <8153> -<1999> <8174> -<199c> <8171> -<199d> <8160> -<199e> <8169> -<19a1> <816d> -<19a2> <8167> -<19a3> <584d> -<19a4> <5ab5> -<19a5> <8188> +<192a> <66e6> +<192b> <66e9> +<192e> <8d36> +<192f> <8d3b> +<1930> <8d3d> +<1931> <8d40> +<1936> <8d47> +<1937> <8d4d> +<1938> <8d55> +<1939> <8d59> +<193a> <89c7> +<1942> <726e> +<1943> <729f> +<1944> <725d> +<1945> <7266> +<1946> <726f> +<1949> <7284> +<194a> <728b> +<194b> <728d> +<194c> <728f> +<194d> <7292> +<194e> <6308> +<194f> <6332> +<1950> <63b0> +<1951> <643f> +<1952> <64d8> +<1953> <8004> +<1954> <6bea> +<1955> <6bf3> +<1956> <6bfd> +<1957> <6bf5> +<1958> <6bf9> +<1959> <6c05> +<195a> <6c07> +<195b> <6c06> +<195c> <6c0d> +<195d> <6c15> +<1961> <6c21> +<1962> <6c29> +<1963> <6c24> +<1964> <6c2a> +<1965> <6c32> +<1966> <6535> +<1967> <6555> +<1968> <656b> +<1969> <724d> +<196a> <7252> +<196b> <7256> +<196c> <7230> +<196d> <8662> +<196e> <5216> +<196f> <809f> +<1970> <809c> +<1971> <8093> +<1972> <80bc> +<1973> <670a> +<1974> <80bd> +<1975> <80b1> +<1976> <80ab> +<1977> <80ad> +<1978> <80b4> +<1979> <80b7> +<197e> <80db> +<197f> <80c2> +<1980> <80c4> +<1981> <80d9> +<1982> <80cd> +<1983> <80d7> +<1984> <6710> +<1985> <80dd> +<1986> <80eb> +<1987> <80f1> +<1988> <80f4> +<1989> <80ed> +<198c> <80f2> +<198d> <80fc> +<198e> <6715> +<198f> <8112> +<1990> <8c5a> +<1991> <8136> +<1992> <811e> +<1993> <812c> +<1994> <8118> +<1995> <8132> +<1996> <8148> +<1997> <814c> +<1998> <8153> +<1999> <8174> +<199c> <8171> +<199d> <8160> +<199e> <8169> +<19a1> <816d> +<19a2> <8167> +<19a3> <584d> +<19a4> <5ab5> +<19a5> <8188> +<19a6> <8182> +<19a7> <8191> +<19a8> <6ed5> +<19a9> <81a3> endbfchar 100 beginbfchar -<19a6> <8182> -<19a7> <8191> -<19a8> <6ed5> -<19a9> <81a3> -<19aa> <81aa> -<19ab> <81cc> -<19ac> <6726> -<19ad> <81ca> -<19ae> <81bb> -<19af> <81c1> -<19b0> <81a6> -<19b1> <6b24> -<19b2> <6b37> -<19b3> <6b39> -<19b4> <6b43> -<19b5> <6b46> -<19b6> <6b59> -<19ba> <98d5> -<19bd> <6bb3> -<19be> <5f40> -<19bf> <6bc2> -<19c0> <89f3> -<19c1> <6590> -<19c2> <9f51> -<19c3> <6593> -<19c4> <65bc> -<19c5> <65c6> -<19c6> <65c4> -<19c7> <65c3> -<19c8> <65cc> -<19c9> <65ce> -<19ca> <65d2> -<19cb> <65d6> -<19cc> <7080> -<19cd> <709c> -<19ce> <7096> -<19cf> <709d> -<19d0> <70bb> -<19d1> <70c0> -<19d2> <70b7> -<19d3> <70ab> -<19d4> <70b1> -<19d5> <70e8> -<19d6> <70ca> -<19d7> <7110> -<19d8> <7113> -<19d9> <7116> -<19da> <712f> -<19db> <7131> -<19dc> <7173> -<19dd> <715c> -<19de> <7168> -<19df> <7145> -<19e0> <7172> -<19e1> <714a> -<19e2> <7178> -<19e3> <717a> -<19e4> <7198> -<19e5> <71b3> -<19e6> <71b5> -<19e7> <71a8> -<19e8> <71a0> -<19e9> <71e0> -<19ea> <71d4> -<19eb> <71e7> -<19ec> <71f9> -<19ed> <721d> -<19ee> <7228> -<19ef> <706c> -<19f0> <7118> -<19f1> <7166> -<19f2> <71b9> -<19f3> <623e> -<19f4> <623d> -<19f5> <6243> -<19f8> <793b> -<19f9> <7940> -<19fa> <7946> -<19fb> <7949> -<19fe> <7953> -<19ff> <795a> -<1a00> <7962> -<1a01> <7957> -<1a02> <7960> -<1a03> <796f> -<1a04> <7967> -<1a05> <797a> -<1a06> <7985> -<1a07> <798a> -<1a08> <799a> -<1a09> <79a7> -<1a0a> <79b3> -<1a0b> <5fd1> -<1a0c> <5fd0> -<1a0d> <603c> -<1a0e> <605d> -<1a0f> <605a> -<1a10> <6067> -<1a11> <6041> -<1a12> <6059> +<19aa> <81aa> +<19ab> <81cc> +<19ac> <6726> +<19ad> <81ca> +<19ae> <81bb> +<19af> <81c1> +<19b0> <81a6> +<19b1> <6b24> +<19b2> <6b37> +<19b3> <6b39> +<19b4> <6b43> +<19b5> <6b46> +<19b6> <6b59> +<19ba> <98d5> +<19bd> <6bb3> +<19be> <5f40> +<19bf> <6bc2> +<19c0> <89f3> +<19c1> <6590> +<19c2> <9f51> +<19c3> <6593> +<19c4> <65bc> +<19c5> <65c6> +<19c6> <65c4> +<19c7> <65c3> +<19c8> <65cc> +<19c9> <65ce> +<19ca> <65d2> +<19cb> <65d6> +<19cc> <7080> +<19cd> <709c> +<19ce> <7096> +<19cf> <709d> +<19d0> <70bb> +<19d1> <70c0> +<19d2> <70b7> +<19d3> <70ab> +<19d4> <70b1> +<19d5> <70e8> +<19d6> <70ca> +<19d7> <7110> +<19d8> <7113> +<19d9> <7116> +<19da> <712f> +<19db> <7131> +<19dc> <7173> +<19dd> <715c> +<19de> <7168> +<19df> <7145> +<19e0> <7172> +<19e1> <714a> +<19e2> <7178> +<19e3> <717a> +<19e4> <7198> +<19e5> <71b3> +<19e6> <71b5> +<19e7> <71a8> +<19e8> <71a0> +<19e9> <71e0> +<19ea> <71d4> +<19eb> <71e7> +<19ec> <71f9> +<19ed> <721d> +<19ee> <7228> +<19ef> <706c> +<19f0> <7118> +<19f1> <7166> +<19f2> <71b9> +<19f3> <623e> +<19f4> <623d> +<19f5> <6243> +<19f8> <793b> +<19f9> <7940> +<19fa> <7946> +<19fb> <7949> +<19fe> <7953> +<19ff> <795a> +<1a00> <7962> +<1a01> <7957> +<1a02> <7960> +<1a03> <796f> +<1a04> <7967> +<1a05> <797a> +<1a06> <7985> +<1a07> <798a> +<1a08> <799a> +<1a09> <79a7> +<1a0a> <79b3> +<1a0b> <5fd1> +<1a0c> <5fd0> +<1a0d> <603c> +<1a0e> <605d> +<1a0f> <605a> +<1a10> <6067> +<1a11> <6041> +<1a12> <6059> +<1a13> <6063> +<1a14> <60ab> +<1a15> <6106> +<1a16> <610d> endbfchar 100 beginbfchar -<1a13> <6063> -<1a14> <60ab> -<1a15> <6106> -<1a16> <610d> -<1a17> <615d> -<1a18> <61a9> -<1a19> <619d> -<1a1a> <61cb> -<1a1b> <61d1> -<1a1c> <6206> -<1a1d> <8080> -<1a1e> <807f> -<1a1f> <6c93> -<1a20> <6cf6> -<1a21> <6dfc> -<1a22> <77f6> -<1a23> <77f8> -<1a24> <7800> -<1a25> <7809> -<1a28> <7811> -<1a29> <65ab> -<1a2a> <782d> -<1a30> <781f> -<1a31> <783c> -<1a32> <7825> -<1a33> <782c> -<1a34> <7823> -<1a35> <7829> -<1a36> <784e> -<1a37> <786d> -<1a3a> <7826> -<1a3b> <7850> -<1a3c> <7847> -<1a3d> <784c> -<1a3e> <786a> -<1a3f> <789b> -<1a40> <7893> -<1a41> <789a> -<1a42> <7887> -<1a43> <789c> -<1a44> <78a1> -<1a45> <78a3> -<1a46> <78b2> -<1a47> <78b9> -<1a48> <78a5> -<1a49> <78d4> -<1a4a> <78d9> -<1a4b> <78c9> -<1a4c> <78ec> -<1a4d> <78f2> -<1a4e> <7905> -<1a4f> <78f4> -<1a50> <7913> -<1a51> <7924> -<1a52> <791e> -<1a53> <7934> -<1a54> <9f9b> -<1a55> <9ef9> -<1a58> <76f1> -<1a59> <7704> -<1a5a> <770d> -<1a5b> <76f9> -<1a5e> <771a> -<1a5f> <7722> -<1a60> <7719> -<1a61> <772d> -<1a62> <7726> -<1a63> <7735> -<1a64> <7738> -<1a67> <7747> -<1a68> <7743> -<1a69> <775a> -<1a6a> <7768> -<1a6b> <7762> -<1a6c> <7765> -<1a6d> <777f> -<1a6e> <778d> -<1a6f> <777d> -<1a70> <7780> -<1a71> <778c> -<1a72> <7791> -<1a75> <77b0> -<1a76> <77b5> -<1a77> <77bd> -<1a78> <753a> -<1a79> <7540> -<1a7a> <754e> -<1a7b> <754b> -<1a7c> <7548> -<1a7d> <755b> -<1a7e> <7572> -<1a7f> <7579> -<1a80> <7583> -<1a81> <7f58> -<1a82> <7f61> -<1a83> <7f5f> -<1a84> <8a48> -<1a85> <7f68> -<1a86> <7f74> -<1a87> <7f71> +<1a17> <615d> +<1a18> <61a9> +<1a19> <619d> +<1a1a> <61cb> +<1a1b> <61d1> +<1a1c> <6206> +<1a1d> <8080> +<1a1e> <807f> +<1a1f> <6c93> +<1a20> <6cf6> +<1a21> <6dfc> +<1a22> <77f6> +<1a23> <77f8> +<1a24> <7800> +<1a25> <7809> +<1a28> <7811> +<1a29> <65ab> +<1a2a> <782d> +<1a30> <781f> +<1a31> <783c> +<1a32> <7825> +<1a33> <782c> +<1a34> <7823> +<1a35> <7829> +<1a36> <784e> +<1a37> <786d> +<1a3a> <7826> +<1a3b> <7850> +<1a3c> <7847> +<1a3d> <784c> +<1a3e> <786a> +<1a3f> <789b> +<1a40> <7893> +<1a41> <789a> +<1a42> <7887> +<1a43> <789c> +<1a44> <78a1> +<1a45> <78a3> +<1a46> <78b2> +<1a47> <78b9> +<1a48> <78a5> +<1a49> <78d4> +<1a4a> <78d9> +<1a4b> <78c9> +<1a4c> <78ec> +<1a4d> <78f2> +<1a4e> <7905> +<1a4f> <78f4> +<1a50> <7913> +<1a51> <7924> +<1a52> <791e> +<1a53> <7934> +<1a54> <9f9b> +<1a55> <9ef9> +<1a58> <76f1> +<1a59> <7704> +<1a5a> <770d> +<1a5b> <76f9> +<1a5e> <771a> +<1a5f> <7722> +<1a60> <7719> +<1a61> <772d> +<1a62> <7726> +<1a63> <7735> +<1a64> <7738> +<1a67> <7747> +<1a68> <7743> +<1a69> <775a> +<1a6a> <7768> +<1a6b> <7762> +<1a6c> <7765> +<1a6d> <777f> +<1a6e> <778d> +<1a6f> <777d> +<1a70> <7780> +<1a71> <778c> +<1a72> <7791> +<1a75> <77b0> +<1a76> <77b5> +<1a77> <77bd> +<1a78> <753a> +<1a79> <7540> +<1a7a> <754e> +<1a7b> <754b> +<1a7c> <7548> +<1a7d> <755b> +<1a7e> <7572> +<1a7f> <7579> +<1a80> <7583> +<1a81> <7f58> +<1a82> <7f61> +<1a83> <7f5f> +<1a84> <8a48> +<1a85> <7f68> +<1a86> <7f74> +<1a87> <7f71> +<1a88> <7f79> +<1a89> <7f81> +<1a8a> <7f7e> +<1a8b> <76cd> endbfchar 100 beginbfchar -<1a88> <7f79> -<1a89> <7f81> -<1a8a> <7f7e> -<1a8b> <76cd> -<1a8c> <76e5> -<1a8d> <8832> -<1a91> <948b> -<1a92> <948a> -<1a97> <9494> -<1a98> <9497> -<1a99> <9495> -<1a9f> <94ab> -<1aa0> <94aa> -<1aa1> <94ad> -<1aa2> <94ac> -<1aa5> <94b2> -<1aa6> <94b4> -<1aae> <94bf> -<1aaf> <94c4> -<1abd> <94d9> -<1abe> <94d8> -<1abf> <94db> -<1ac3> <94e2> -<1ac8> <94ea> -<1ac9> <94e9> -<1aca> <94eb> -<1ad0> <94f7> -<1ad1> <94f9> -<1ad4> <94ff> -<1ad5> <9503> -<1ad6> <9502> -<1ae3> <9518> -<1ae4> <951b> -<1ae8> <9522> -<1aeb> <9529> -<1aec> <952c> -<1aef> <9534> -<1af3> <953c> -<1af6> <9542> -<1af7> <9535> -<1afb> <9549> -<1afc> <954c> -<1aff> <9552> -<1b06> <955b> -<1b09> <955d> -<1b15> <956f> -<1b19> <953a> -<1b1a> <77e7> -<1b1b> <77ec> -<1b1c> <96c9> -<1b1d> <79d5> -<1b1e> <79ed> -<1b1f> <79e3> -<1b20> <79eb> -<1b21> <7a06> -<1b22> <5d47> -<1b23> <7a03> -<1b24> <7a02> -<1b25> <7a1e> -<1b26> <7a14> -<1b27> <7a39> -<1b28> <7a37> -<1b29> <7a51> -<1b2a> <9ecf> -<1b2b> <99a5> -<1b2c> <7a70> -<1b2d> <7688> -<1b2e> <768e> -<1b2f> <7693> -<1b30> <7699> -<1b31> <76a4> -<1b32> <74de> -<1b33> <74e0> -<1b34> <752c> -<1b35> <9e20> -<1b36> <9e22> -<1b3c> <9e32> -<1b3d> <9e31> -<1b3e> <9e36> -<1b3f> <9e38> -<1b40> <9e37> -<1b43> <9e3e> -<1b46> <9e44> -<1b4d> <9e4e> -<1b4e> <9e51> -<1b4f> <9e55> -<1b50> <9e57> -<1b54> <9e5e> -<1b55> <9e63> -<1b5d> <9e71> -<1b5e> <9e6d> -<1b5f> <9e73> -<1b60> <7592> -<1b61> <7594> -<1b62> <7596> -<1b63> <75a0> -<1b64> <759d> -<1b65> <75ac> -<1b66> <75a3> -<1b69> <75b8> +<1a8c> <76e5> +<1a8d> <8832> +<1a91> <948b> +<1a92> <948a> +<1a97> <9494> +<1a98> <9497> +<1a99> <9495> +<1a9f> <94ab> +<1aa0> <94aa> +<1aa1> <94ad> +<1aa2> <94ac> +<1aa5> <94b2> +<1aa6> <94b4> +<1aae> <94bf> +<1aaf> <94c4> +<1abd> <94d9> +<1abe> <94d8> +<1abf> <94db> +<1ac3> <94e2> +<1ac8> <94ea> +<1ac9> <94e9> +<1aca> <94eb> +<1ad0> <94f7> +<1ad1> <94f9> +<1ad4> <94ff> +<1ad5> <9503> +<1ad6> <9502> +<1ae3> <9518> +<1ae4> <951b> +<1ae8> <9522> +<1aeb> <9529> +<1aec> <952c> +<1aef> <9534> +<1af3> <953c> +<1af6> <9542> +<1af7> <9535> +<1afb> <9549> +<1afc> <954c> +<1aff> <9552> +<1b06> <955b> +<1b09> <955d> +<1b15> <956f> +<1b19> <953a> +<1b1a> <77e7> +<1b1b> <77ec> +<1b1c> <96c9> +<1b1d> <79d5> +<1b1e> <79ed> +<1b1f> <79e3> +<1b20> <79eb> +<1b21> <7a06> +<1b22> <5d47> +<1b23> <7a03> +<1b24> <7a02> +<1b25> <7a1e> +<1b26> <7a14> +<1b27> <7a39> +<1b28> <7a37> +<1b29> <7a51> +<1b2a> <9ecf> +<1b2b> <99a5> +<1b2c> <7a70> +<1b2d> <7688> +<1b2e> <768e> +<1b2f> <7693> +<1b30> <7699> +<1b31> <76a4> +<1b32> <74de> +<1b33> <74e0> +<1b34> <752c> +<1b35> <9e20> +<1b36> <9e22> +<1b3c> <9e32> +<1b3d> <9e31> +<1b3e> <9e36> +<1b3f> <9e38> +<1b40> <9e37> +<1b43> <9e3e> +<1b46> <9e44> +<1b4d> <9e4e> +<1b4e> <9e51> +<1b4f> <9e55> +<1b50> <9e57> +<1b54> <9e5e> +<1b55> <9e63> +<1b5d> <9e71> +<1b5e> <9e6d> +<1b5f> <9e73> +<1b60> <7592> +<1b61> <7594> +<1b62> <7596> +<1b63> <75a0> +<1b64> <759d> +<1b65> <75ac> +<1b66> <75a3> +<1b69> <75b8> +<1b6a> <75c4> +<1b6b> <75b1> +<1b6c> <75b0> +<1b6d> <75c3> endbfchar 100 beginbfchar -<1b6a> <75c4> -<1b6b> <75b1> -<1b6c> <75b0> -<1b6d> <75c3> -<1b6e> <75c2> -<1b6f> <75d6> -<1b70> <75cd> -<1b71> <75e3> -<1b72> <75e8> -<1b73> <75e6> -<1b74> <75e4> -<1b75> <75eb> -<1b76> <75e7> -<1b77> <7603> -<1b78> <75f1> -<1b79> <75fc> -<1b7a> <75ff> -<1b7b> <7610> -<1b7c> <7600> -<1b7d> <7605> -<1b7e> <760c> -<1b7f> <7617> -<1b80> <760a> -<1b81> <7625> -<1b82> <7618> -<1b83> <7615> -<1b84> <7619> -<1b85> <761b> -<1b86> <763c> -<1b87> <7622> -<1b88> <7620> -<1b89> <7640> -<1b8a> <762d> -<1b8b> <7630> -<1b8c> <763f> -<1b8d> <7635> -<1b8e> <7643> -<1b8f> <763e> -<1b90> <7633> -<1b91> <764d> -<1b92> <765e> -<1b93> <7654> -<1b94> <765c> -<1b95> <7656> -<1b96> <766b> -<1b97> <766f> -<1b98> <7fca> -<1b99> <7ae6> -<1b9c> <7a80> -<1b9d> <7a86> -<1b9e> <7a88> -<1b9f> <7a95> -<1ba0> <7aa6> -<1ba1> <7aa0> -<1ba2> <7aac> -<1ba3> <7aa8> -<1ba4> <7aad> -<1ba5> <7ab3> -<1ba6> <8864> -<1ba7> <8869> -<1ba8> <8872> -<1ba9> <887d> -<1baa> <887f> -<1bab> <8882> -<1bac> <88a2> -<1bad> <88c6> -<1bae> <88b7> -<1baf> <88bc> -<1bb0> <88c9> -<1bb1> <88e2> -<1bb2> <88ce> -<1bb3> <88e3> -<1bb4> <88e5> -<1bb5> <88f1> -<1bb6> <891a> -<1bb7> <88fc> -<1bb8> <88e8> -<1bb9> <88fe> -<1bba> <88f0> -<1bbb> <8921> -<1bbc> <8919> -<1bbd> <8913> -<1bbe> <891b> -<1bbf> <890a> -<1bc0> <8934> -<1bc1> <892b> -<1bc2> <8936> -<1bc3> <8941> -<1bc4> <8966> -<1bc5> <897b> -<1bc6> <758b> -<1bc7> <80e5> -<1bc8> <76b2> -<1bc9> <76b4> -<1bca> <77dc> -<1bcb> <8012> -<1bcc> <8014> -<1bcd> <8016> -<1bce> <801c> -<1bcf> <8020> +<1b6e> <75c2> +<1b6f> <75d6> +<1b70> <75cd> +<1b71> <75e3> +<1b72> <75e8> +<1b73> <75e6> +<1b74> <75e4> +<1b75> <75eb> +<1b76> <75e7> +<1b77> <7603> +<1b78> <75f1> +<1b79> <75fc> +<1b7a> <75ff> +<1b7b> <7610> +<1b7c> <7600> +<1b7d> <7605> +<1b7e> <760c> +<1b7f> <7617> +<1b80> <760a> +<1b81> <7625> +<1b82> <7618> +<1b83> <7615> +<1b84> <7619> +<1b85> <761b> +<1b86> <763c> +<1b87> <7622> +<1b88> <7620> +<1b89> <7640> +<1b8a> <762d> +<1b8b> <7630> +<1b8c> <763f> +<1b8d> <7635> +<1b8e> <7643> +<1b8f> <763e> +<1b90> <7633> +<1b91> <764d> +<1b92> <765e> +<1b93> <7654> +<1b94> <765c> +<1b95> <7656> +<1b96> <766b> +<1b97> <766f> +<1b98> <7fca> +<1b99> <7ae6> +<1b9c> <7a80> +<1b9d> <7a86> +<1b9e> <7a88> +<1b9f> <7a95> +<1ba0> <7aa6> +<1ba1> <7aa0> +<1ba2> <7aac> +<1ba3> <7aa8> +<1ba4> <7aad> +<1ba5> <7ab3> +<1ba6> <8864> +<1ba7> <8869> +<1ba8> <8872> +<1ba9> <887d> +<1baa> <887f> +<1bab> <8882> +<1bac> <88a2> +<1bad> <88c6> +<1bae> <88b7> +<1baf> <88bc> +<1bb0> <88c9> +<1bb1> <88e2> +<1bb2> <88ce> +<1bb3> <88e3> +<1bb4> <88e5> +<1bb5> <88f1> +<1bb6> <891a> +<1bb7> <88fc> +<1bb8> <88e8> +<1bb9> <88fe> +<1bba> <88f0> +<1bbb> <8921> +<1bbc> <8919> +<1bbd> <8913> +<1bbe> <891b> +<1bbf> <890a> +<1bc0> <8934> +<1bc1> <892b> +<1bc2> <8936> +<1bc3> <8941> +<1bc4> <8966> +<1bc5> <897b> +<1bc6> <758b> +<1bc7> <80e5> +<1bc8> <76b2> +<1bc9> <76b4> +<1bca> <77dc> +<1bcb> <8012> +<1bcc> <8014> +<1bcd> <8016> +<1bce> <801c> +<1bcf> <8020> +<1bd0> <8022> +<1bd4> <8029> +<1bd5> <8028> +<1bd6> <8031> endbfchar 100 beginbfchar -<1bd0> <8022> -<1bd4> <8029> -<1bd5> <8028> -<1bd6> <8031> -<1bd7> <800b> -<1bd8> <8035> -<1bd9> <8043> -<1bda> <8046> -<1bdb> <804d> -<1bdc> <8052> -<1bdd> <8069> -<1bde> <8071> -<1bdf> <8983> -<1be0> <9878> -<1be1> <9880> -<1be2> <9883> -<1be3> <9889> -<1be6> <988f> -<1be7> <9894> -<1bf0> <864d> -<1bf1> <8654> -<1bf2> <866c> -<1bf3> <866e> -<1bf4> <867f> -<1bf5> <867a> -<1bf6> <867c> -<1bf7> <867b> -<1bf8> <86a8> -<1bf9> <868d> -<1bfa> <868b> -<1bfb> <86ac> -<1bfc> <869d> -<1bfd> <86a7> -<1bfe> <86a3> -<1bff> <86aa> -<1c00> <8693> -<1c01> <86a9> -<1c02> <86b6> -<1c03> <86c4> -<1c04> <86b5> -<1c05> <86ce> -<1c06> <86b0> -<1c07> <86ba> -<1c08> <86b1> -<1c09> <86af> -<1c0a> <86c9> -<1c0b> <86cf> -<1c0c> <86b4> -<1c0d> <86e9> -<1c10> <86ed> -<1c11> <86f3> -<1c12> <86d0> -<1c13> <8713> -<1c14> <86de> -<1c15> <86f4> -<1c16> <86df> -<1c17> <86d8> -<1c18> <86d1> -<1c19> <8703> -<1c1a> <8707> -<1c1b> <86f8> -<1c1c> <8708> -<1c1d> <870a> -<1c1e> <870d> -<1c1f> <8709> -<1c20> <8723> -<1c21> <873b> -<1c22> <871e> -<1c23> <8725> -<1c24> <872e> -<1c25> <871a> -<1c26> <873e> -<1c27> <8748> -<1c28> <8734> -<1c29> <8731> -<1c2a> <8729> -<1c2b> <8737> -<1c2c> <873f> -<1c2d> <8782> -<1c2e> <8722> -<1c31> <877b> -<1c32> <8760> -<1c33> <8770> -<1c34> <874c> -<1c35> <876e> -<1c36> <878b> -<1c37> <8753> -<1c38> <8763> -<1c39> <877c> -<1c3a> <8764> -<1c3b> <8759> -<1c3c> <8765> -<1c3d> <8793> -<1c3e> <87af> -<1c3f> <87a8> -<1c40> <87d2> -<1c41> <87c6> -<1c42> <8788> -<1c43> <8785> -<1c44> <87ad> +<1bd7> <800b> +<1bd8> <8035> +<1bd9> <8043> +<1bda> <8046> +<1bdb> <804d> +<1bdc> <8052> +<1bdd> <8069> +<1bde> <8071> +<1bdf> <8983> +<1be0> <9878> +<1be1> <9880> +<1be2> <9883> +<1be3> <9889> +<1be6> <988f> +<1be7> <9894> +<1bf0> <864d> +<1bf1> <8654> +<1bf2> <866c> +<1bf3> <866e> +<1bf4> <867f> +<1bf5> <867a> +<1bf6> <867c> +<1bf7> <867b> +<1bf8> <86a8> +<1bf9> <868d> +<1bfa> <868b> +<1bfb> <86ac> +<1bfc> <869d> +<1bfd> <86a7> +<1bfe> <86a3> +<1bff> <86aa> +<1c00> <8693> +<1c01> <86a9> +<1c02> <86b6> +<1c03> <86c4> +<1c04> <86b5> +<1c05> <86ce> +<1c06> <86b0> +<1c07> <86ba> +<1c08> <86b1> +<1c09> <86af> +<1c0a> <86c9> +<1c0b> <86cf> +<1c0c> <86b4> +<1c0d> <86e9> +<1c10> <86ed> +<1c11> <86f3> +<1c12> <86d0> +<1c13> <8713> +<1c14> <86de> +<1c15> <86f4> +<1c16> <86df> +<1c17> <86d8> +<1c18> <86d1> +<1c19> <8703> +<1c1a> <8707> +<1c1b> <86f8> +<1c1c> <8708> +<1c1d> <870a> +<1c1e> <870d> +<1c1f> <8709> +<1c20> <8723> +<1c21> <873b> +<1c22> <871e> +<1c23> <8725> +<1c24> <872e> +<1c25> <871a> +<1c26> <873e> +<1c27> <8748> +<1c28> <8734> +<1c29> <8731> +<1c2a> <8729> +<1c2b> <8737> +<1c2c> <873f> +<1c2d> <8782> +<1c2e> <8722> +<1c31> <877b> +<1c32> <8760> +<1c33> <8770> +<1c34> <874c> +<1c35> <876e> +<1c36> <878b> +<1c37> <8753> +<1c38> <8763> +<1c39> <877c> +<1c3a> <8764> +<1c3b> <8759> +<1c3c> <8765> +<1c3d> <8793> +<1c3e> <87af> +<1c3f> <87a8> +<1c40> <87d2> +<1c41> <87c6> +<1c42> <8788> +<1c43> <8785> +<1c44> <87ad> +<1c45> <8797> +<1c46> <8783> +<1c47> <87ab> +<1c48> <87e5> endbfchar 100 beginbfchar -<1c45> <8797> -<1c46> <8783> -<1c47> <87ab> -<1c48> <87e5> -<1c49> <87ac> -<1c4a> <87b5> -<1c4b> <87b3> -<1c4c> <87cb> -<1c4d> <87d3> -<1c4e> <87bd> -<1c4f> <87d1> -<1c50> <87c0> -<1c51> <87ca> -<1c52> <87db> -<1c53> <87ea> -<1c54> <87e0> -<1c55> <87ee> -<1c56> <8816> -<1c57> <8813> -<1c58> <87fe> -<1c59> <880a> -<1c5a> <881b> -<1c5b> <8821> -<1c5c> <8839> -<1c5d> <883c> -<1c5e> <7f36> -<1c5f> <7f42> -<1c62> <8210> -<1c63> <7afa> -<1c64> <7afd> -<1c65> <7b08> -<1c68> <7b15> -<1c69> <7b0a> -<1c6a> <7b2b> -<1c6b> <7b0f> -<1c6c> <7b47> -<1c6d> <7b38> -<1c6e> <7b2a> -<1c6f> <7b19> -<1c70> <7b2e> -<1c71> <7b31> -<1c72> <7b20> -<1c73> <7b25> -<1c74> <7b24> -<1c75> <7b33> -<1c76> <7b3e> -<1c77> <7b1e> -<1c78> <7b58> -<1c79> <7b5a> -<1c7a> <7b45> -<1c7b> <7b75> -<1c7c> <7b4c> -<1c7d> <7b5d> -<1c7e> <7b60> -<1c7f> <7b6e> -<1c80> <7b7b> -<1c81> <7b62> -<1c82> <7b72> -<1c83> <7b71> -<1c84> <7b90> -<1c87> <7bb8> -<1c88> <7bac> -<1c89> <7b9d> -<1c8a> <7ba8> -<1c8b> <7b85> -<1c8c> <7baa> -<1c8d> <7b9c> -<1c8e> <7ba2> -<1c8f> <7bab> -<1c90> <7bb4> -<1c91> <7bd1> -<1c92> <7bc1> -<1c93> <7bcc> -<1c94> <7bdd> -<1c95> <7bda> -<1c98> <7bea> -<1c99> <7c0c> -<1c9a> <7bfe> -<1c9b> <7bfc> -<1c9c> <7c0f> -<1c9d> <7c16> -<1c9e> <7c0b> -<1c9f> <7c1f> -<1ca0> <7c2a> -<1ca1> <7c26> -<1ca2> <7c38> -<1ca3> <7c41> -<1ca4> <7c40> -<1ca5> <81fe> -<1ca8> <8204> -<1ca9> <81ec> -<1caa> <8844> -<1cae> <822d> -<1caf> <822f> -<1cb0> <8228> -<1cb1> <822b> -<1cb2> <8238> -<1cb3> <823b> -<1cb6> <823e> -<1cb7> <8244> +<1c49> <87ac> +<1c4a> <87b5> +<1c4b> <87b3> +<1c4c> <87cb> +<1c4d> <87d3> +<1c4e> <87bd> +<1c4f> <87d1> +<1c50> <87c0> +<1c51> <87ca> +<1c52> <87db> +<1c53> <87ea> +<1c54> <87e0> +<1c55> <87ee> +<1c56> <8816> +<1c57> <8813> +<1c58> <87fe> +<1c59> <880a> +<1c5a> <881b> +<1c5b> <8821> +<1c5c> <8839> +<1c5d> <883c> +<1c5e> <7f36> +<1c5f> <7f42> +<1c62> <8210> +<1c63> <7afa> +<1c64> <7afd> +<1c65> <7b08> +<1c68> <7b15> +<1c69> <7b0a> +<1c6a> <7b2b> +<1c6b> <7b0f> +<1c6c> <7b47> +<1c6d> <7b38> +<1c6e> <7b2a> +<1c6f> <7b19> +<1c70> <7b2e> +<1c71> <7b31> +<1c72> <7b20> +<1c73> <7b25> +<1c74> <7b24> +<1c75> <7b33> +<1c76> <7b3e> +<1c77> <7b1e> +<1c78> <7b58> +<1c79> <7b5a> +<1c7a> <7b45> +<1c7b> <7b75> +<1c7c> <7b4c> +<1c7d> <7b5d> +<1c7e> <7b60> +<1c7f> <7b6e> +<1c80> <7b7b> +<1c81> <7b62> +<1c82> <7b72> +<1c83> <7b71> +<1c84> <7b90> +<1c87> <7bb8> +<1c88> <7bac> +<1c89> <7b9d> +<1c8a> <7ba8> +<1c8b> <7b85> +<1c8c> <7baa> +<1c8d> <7b9c> +<1c8e> <7ba2> +<1c8f> <7bab> +<1c90> <7bb4> +<1c91> <7bd1> +<1c92> <7bc1> +<1c93> <7bcc> +<1c94> <7bdd> +<1c95> <7bda> +<1c98> <7bea> +<1c99> <7c0c> +<1c9a> <7bfe> +<1c9b> <7bfc> +<1c9c> <7c0f> +<1c9d> <7c16> +<1c9e> <7c0b> +<1c9f> <7c1f> +<1ca0> <7c2a> +<1ca1> <7c26> +<1ca2> <7c38> +<1ca3> <7c41> +<1ca4> <7c40> +<1ca5> <81fe> +<1ca8> <8204> +<1ca9> <81ec> +<1caa> <8844> +<1cae> <822d> +<1caf> <822f> +<1cb0> <8228> +<1cb1> <822b> +<1cb2> <8238> +<1cb3> <823b> +<1cb6> <823e> +<1cb7> <8244> +<1cb8> <8249> +<1cb9> <824b> +<1cba> <824f> +<1cbb> <825a> endbfchar 100 beginbfchar -<1cb8> <8249> -<1cb9> <824b> -<1cba> <824f> -<1cbb> <825a> -<1cbc> <825f> -<1cbd> <8268> -<1cbe> <887e> -<1cbf> <8885> -<1cc0> <8888> -<1cc1> <88d8> -<1cc2> <88df> -<1cc3> <895e> -<1cc4> <7f9d> -<1cc5> <7f9f> -<1cc6> <7fa7> -<1cc9> <7fb2> -<1cca> <7c7c> -<1ccb> <6549> -<1ccc> <7c91> -<1ccd> <7c9d> -<1cce> <7c9c> -<1ccf> <7c9e> -<1cd0> <7ca2> -<1cd1> <7cb2> -<1cd4> <7cc1> -<1cd5> <7cc7> -<1cd8> <7cc8> -<1cd9> <7cc5> -<1cda> <7cd7> -<1cdb> <7ce8> -<1cdc> <826e> -<1cdd> <66a8> -<1cde> <7fbf> -<1cdf> <7fce> -<1ce0> <7fd5> -<1ce1> <7fe5> -<1ce2> <7fe1> -<1ce3> <7fe6> -<1ce4> <7fe9> -<1ce5> <7fee> -<1ce6> <7ff3> -<1ce7> <7cf8> -<1ce8> <7d77> -<1ce9> <7da6> -<1cea> <7dae> -<1ceb> <7e47> -<1cec> <7e9b> -<1ced> <9eb8> -<1cee> <9eb4> -<1cef> <8d73> -<1cf0> <8d84> -<1cf1> <8d94> -<1cf2> <8d91> -<1cf3> <8db1> -<1cf4> <8d67> -<1cf5> <8d6d> -<1cf6> <8c47> -<1cf7> <8c49> -<1cf8> <914a> -<1cf9> <9150> -<1cfc> <9164> -<1cfd> <9162> -<1cfe> <9161> -<1cff> <9170> -<1d00> <9169> -<1d01> <916f> -<1d04> <9172> -<1d05> <9174> -<1d06> <9179> -<1d07> <918c> -<1d08> <9185> -<1d09> <9190> -<1d0a> <918d> -<1d0b> <9191> -<1d0e> <91aa> -<1d12> <91b5> -<1d13> <91b4> -<1d14> <91ba> -<1d15> <8c55> -<1d16> <9e7e> -<1d17> <8db8> -<1d18> <8deb> -<1d19> <8e05> -<1d1a> <8e59> -<1d1b> <8e69> -<1d1c> <8db5> -<1d1d> <8dbf> -<1d1e> <8dbc> -<1d1f> <8dba> -<1d20> <8dc4> -<1d23> <8dda> -<1d24> <8dde> -<1d27> <8ddb> -<1d28> <8dc6> -<1d29> <8dec> -<1d2c> <8de3> -<1d2d> <8df9> -<1d2e> <8dfb> -<1d2f> <8de4> -<1d30> <8e09> +<1cbc> <825f> +<1cbd> <8268> +<1cbe> <887e> +<1cbf> <8885> +<1cc0> <8888> +<1cc1> <88d8> +<1cc2> <88df> +<1cc3> <895e> +<1cc4> <7f9d> +<1cc5> <7f9f> +<1cc6> <7fa7> +<1cc9> <7fb2> +<1cca> <7c7c> +<1ccb> <6549> +<1ccc> <7c91> +<1ccd> <7c9d> +<1cce> <7c9c> +<1ccf> <7c9e> +<1cd0> <7ca2> +<1cd1> <7cb2> +<1cd4> <7cc1> +<1cd5> <7cc7> +<1cd8> <7cc8> +<1cd9> <7cc5> +<1cda> <7cd7> +<1cdb> <7ce8> +<1cdc> <826e> +<1cdd> <66a8> +<1cde> <7fbf> +<1cdf> <7fce> +<1ce0> <7fd5> +<1ce1> <7fe5> +<1ce2> <7fe1> +<1ce3> <7fe6> +<1ce4> <7fe9> +<1ce5> <7fee> +<1ce6> <7ff3> +<1ce7> <7cf8> +<1ce8> <7d77> +<1ce9> <7da6> +<1cea> <7dae> +<1ceb> <7e47> +<1cec> <7e9b> +<1ced> <9eb8> +<1cee> <9eb4> +<1cef> <8d73> +<1cf0> <8d84> +<1cf1> <8d94> +<1cf2> <8d91> +<1cf3> <8db1> +<1cf4> <8d67> +<1cf5> <8d6d> +<1cf6> <8c47> +<1cf7> <8c49> +<1cf8> <914a> +<1cf9> <9150> +<1cfc> <9164> +<1cfd> <9162> +<1cfe> <9161> +<1cff> <9170> +<1d00> <9169> +<1d01> <916f> +<1d04> <9172> +<1d05> <9174> +<1d06> <9179> +<1d07> <918c> +<1d08> <9185> +<1d09> <9190> +<1d0a> <918d> +<1d0b> <9191> +<1d0e> <91aa> +<1d12> <91b5> +<1d13> <91b4> +<1d14> <91ba> +<1d15> <8c55> +<1d16> <9e7e> +<1d17> <8db8> +<1d18> <8deb> +<1d19> <8e05> +<1d1a> <8e59> +<1d1b> <8e69> +<1d1c> <8db5> +<1d1d> <8dbf> +<1d1e> <8dbc> +<1d1f> <8dba> +<1d20> <8dc4> +<1d23> <8dda> +<1d24> <8dde> +<1d27> <8ddb> +<1d28> <8dc6> +<1d29> <8dec> +<1d2c> <8de3> +<1d2d> <8df9> +<1d2e> <8dfb> +<1d2f> <8de4> +<1d30> <8e09> +<1d31> <8dfd> +<1d32> <8e14> +<1d33> <8e1d> +<1d34> <8e1f> endbfchar 100 beginbfchar -<1d31> <8dfd> -<1d32> <8e14> -<1d33> <8e1d> -<1d34> <8e1f> -<1d35> <8e2c> -<1d36> <8e2e> -<1d37> <8e23> -<1d38> <8e2f> -<1d39> <8e3a> -<1d3a> <8e40> -<1d3b> <8e39> -<1d3c> <8e35> -<1d3d> <8e3d> -<1d3e> <8e31> -<1d3f> <8e49> -<1d44> <8e4a> -<1d45> <8e70> -<1d46> <8e76> -<1d47> <8e7c> -<1d48> <8e6f> -<1d49> <8e74> -<1d4a> <8e85> -<1d4b> <8e8f> -<1d4c> <8e94> -<1d4d> <8e90> -<1d4e> <8e9c> -<1d4f> <8e9e> -<1d50> <8c78> -<1d51> <8c82> -<1d52> <8c8a> -<1d53> <8c85> -<1d54> <8c98> -<1d55> <8c94> -<1d56> <659b> -<1d57> <89d6> -<1d58> <89de> -<1d59> <89da> -<1d5a> <89dc> -<1d5b> <89e5> -<1d5c> <89eb> -<1d5d> <89ef> -<1d5e> <8a3e> -<1d5f> <8b26> -<1d60> <9753> -<1d61> <96e9> -<1d62> <96f3> -<1d63> <96ef> -<1d64> <9706> -<1d65> <9701> -<1d66> <9708> -<1d67> <970f> -<1d68> <970e> -<1d69> <972a> -<1d6a> <972d> -<1d6b> <9730> -<1d6c> <973e> -<1d6d> <9f80> -<1d6e> <9f83> -<1d75> <9f8c> -<1d76> <9efe> -<1d77> <9f0b> -<1d78> <9f0d> -<1d79> <96b9> -<1d7c> <96ce> -<1d7d> <96d2> -<1d7e> <77bf> -<1d7f> <96e0> -<1d80> <928e> -<1d81> <92ae> -<1d82> <92c8> -<1d83> <933e> -<1d84> <936a> -<1d85> <93ca> -<1d86> <938f> -<1d87> <943e> -<1d88> <946b> -<1d89> <9c7f> -<1d8a> <9c82> -<1d8f> <7a23> -<1d90> <9c8b> -<1d91> <9c8e> -<1da4> <9cab> -<1dc6> <9cdf> -<1dc7> <9ce2> -<1dc8> <977c> -<1dc9> <9785> -<1dcc> <9794> -<1dcd> <97af> -<1dce> <97ab> -<1dcf> <97a3> -<1dd0> <97b2> -<1dd1> <97b4> -<1dd2> <9ab1> -<1dd3> <9ab0> -<1dd4> <9ab7> -<1dd5> <9e58> -<1dd6> <9ab6> -<1dd7> <9aba> -<1dd8> <9abc> -<1dd9> <9ac1> +<1d35> <8e2c> +<1d36> <8e2e> +<1d37> <8e23> +<1d38> <8e2f> +<1d39> <8e3a> +<1d3a> <8e40> +<1d3b> <8e39> +<1d3c> <8e35> +<1d3d> <8e3d> +<1d3e> <8e31> +<1d3f> <8e49> +<1d44> <8e4a> +<1d45> <8e70> +<1d46> <8e76> +<1d47> <8e7c> +<1d48> <8e6f> +<1d49> <8e74> +<1d4a> <8e85> +<1d4b> <8e8f> +<1d4c> <8e94> +<1d4d> <8e90> +<1d4e> <8e9c> +<1d4f> <8e9e> +<1d50> <8c78> +<1d51> <8c82> +<1d52> <8c8a> +<1d53> <8c85> +<1d54> <8c98> +<1d55> <8c94> +<1d56> <659b> +<1d57> <89d6> +<1d58> <89de> +<1d59> <89da> +<1d5a> <89dc> +<1d5b> <89e5> +<1d5c> <89eb> +<1d5d> <89ef> +<1d5e> <8a3e> +<1d5f> <8b26> +<1d60> <9753> +<1d61> <96e9> +<1d62> <96f3> +<1d63> <96ef> +<1d64> <9706> +<1d65> <9701> +<1d66> <9708> +<1d67> <970f> +<1d68> <970e> +<1d69> <972a> +<1d6a> <972d> +<1d6b> <9730> +<1d6c> <973e> +<1d6d> <9f80> +<1d6e> <9f83> +<1d75> <9f8c> +<1d76> <9efe> +<1d77> <9f0b> +<1d78> <9f0d> +<1d79> <96b9> +<1d7c> <96ce> +<1d7d> <96d2> +<1d7e> <77bf> +<1d7f> <96e0> +<1d80> <928e> +<1d81> <92ae> +<1d82> <92c8> +<1d83> <933e> +<1d84> <936a> +<1d85> <93ca> +<1d86> <938f> +<1d87> <943e> +<1d88> <946b> +<1d89> <9c7f> +<1d8a> <9c82> +<1d8f> <7a23> +<1d90> <9c8b> +<1d91> <9c8e> +<1da4> <9cab> +<1dc6> <9cdf> +<1dc7> <9ce2> +<1dc8> <977c> +<1dc9> <9785> +<1dcc> <9794> +<1dcd> <97af> +<1dce> <97ab> +<1dcf> <97a3> +<1dd0> <97b2> +<1dd1> <97b4> +<1dd2> <9ab1> +<1dd3> <9ab0> +<1dd4> <9ab7> +<1dd5> <9e58> +<1dd6> <9ab6> +<1dd7> <9aba> +<1dd8> <9abc> +<1dd9> <9ac1> +<1dda> <9ac0> +<1ddb> <9ac5> +<1ddc> <9ac2> +<1ddf> <9ad1> endbfchar 100 beginbfchar -<1dda> <9ac0> -<1ddb> <9ac5> -<1ddc> <9ac2> -<1ddf> <9ad1> -<1de0> <9b45> -<1de1> <9b43> -<1de2> <9b47> -<1de3> <9b49> -<1de4> <9b48> -<1de5> <9b4d> -<1de6> <9b51> -<1de7> <98e8> -<1de8> <990d> -<1de9> <992e> -<1dea> <9955> -<1deb> <9954> -<1dec> <9adf> -<1ded> <9ae1> -<1dee> <9ae6> -<1def> <9aef> -<1df0> <9aeb> -<1df1> <9afb> -<1df2> <9aed> -<1df3> <9af9> -<1df4> <9b08> -<1df5> <9b0f> -<1df6> <9b13> -<1df7> <9b1f> -<1df8> <9b23> -<1dfb> <7e3b> -<1dfc> <9e82> -<1dff> <9e8b> -<1e00> <9e92> -<1e01> <93d6> -<1e02> <9e9d> -<1e03> <9e9f> -<1e07> <9ee0> -<1e08> <9edf> -<1e09> <9ee2> -<1e0a> <9ee9> -<1e0b> <9ee7> -<1e0c> <9ee5> -<1e0d> <9eea> -<1e0e> <9eef> -<1e0f> <9f22> -<1e10> <9f2c> -<1e11> <9f2f> -<1e12> <9f39> -<1e13> <9f37> -<1e16> <9f44> -<1e17> <3007> -<1e18> <ff5e> -<1e19> <2016> -<1e1a> <3013> -<1e1b> <ff0e> -<1e1c> <ff1d> -<1e1d> <ff3b> -<1e1e> <ff3d> -<1e1f> <ffe3> -<1e20> <00fc> -<1e21> <00a9> -<1e22> <2122> -<1e23> <2026> -<1e24> <2002> -<1e25> <769a> -<1e26> <85f9> -<1e27> <7919> -<1e28> <611b> -<1e29> <9aaf> -<1e2a> <8956> -<1e2b> <58e9> -<1e2c> <7f77> -<1e2d> <64fa> -<1e2e> <6557> -<1e2f> <9812> -<1e30> <8fa6> -<1e31> <7d46> -<1e32> <5e6b> -<1e33> <7d81> -<1e34> <938a> -<1e35> <8b17> -<1e36> <98fd> -<1e37> <5bf6> -<1e38> <5831> -<1e39> <9b91> -<1e3a> <8f29> -<1e3b> <8c9d> -<1e3c> <92c7> -<1e3d> <72fd> -<1e3e> <5099> -<1e3f> <618a> -<1e40> <7db3> -<1e41> <7b46> -<1e42> <7562> -<1e43> <6583> -<1e44> <5e63> -<1e45> <9589> -<1e46> <908a> -<1e47> <7de8> -<1e48> <8cb6> +<1de0> <9b45> +<1de1> <9b43> +<1de2> <9b47> +<1de3> <9b49> +<1de4> <9b48> +<1de5> <9b4d> +<1de6> <9b51> +<1de7> <98e8> +<1de8> <990d> +<1de9> <992e> +<1dea> <9955> +<1deb> <9954> +<1dec> <9adf> +<1ded> <9ae1> +<1dee> <9ae6> +<1def> <9aef> +<1df0> <9aeb> +<1df1> <9afb> +<1df2> <9aed> +<1df3> <9af9> +<1df4> <9b08> +<1df5> <9b0f> +<1df6> <9b13> +<1df7> <9b1f> +<1df8> <9b23> +<1dfb> <7e3b> +<1dfc> <9e82> +<1dff> <9e8b> +<1e00> <9e92> +<1e01> <93d6> +<1e02> <9e9d> +<1e03> <9e9f> +<1e07> <9ee0> +<1e08> <9edf> +<1e09> <9ee2> +<1e0a> <9ee9> +<1e0b> <9ee7> +<1e0c> <9ee5> +<1e0d> <9eea> +<1e0e> <9eef> +<1e0f> <9f22> +<1e10> <9f2c> +<1e11> <9f2f> +<1e12> <9f39> +<1e13> <9f37> +<1e16> <9f44> +<1e17> <3007> +<1e18> <ff5e> +<1e19> <2016> +<1e1a> <3013> +<1e1b> <ff0e> +<1e1c> <ff1d> +<1e1d> <ff3b> +<1e1e> <ff3d> +<1e1f> <ffe3> +<1e20> <00fc> +<1e21> <00a9> +<1e22> <2122> +<1e23> <2026> +<1e24> <0020> +<1e25> <769a> +<1e26> <85f9> +<1e27> <7919> +<1e28> <611b> +<1e29> <9aaf> +<1e2a> <8956> +<1e2b> <58e9> +<1e2c> <7f77> +<1e2d> <64fa> +<1e2e> <6557> +<1e2f> <9812> +<1e30> <8fa6> +<1e31> <7d46> +<1e32> <5e6b> +<1e33> <7d81> +<1e34> <938a> +<1e35> <8b17> +<1e36> <98fd> +<1e37> <5bf6> +<1e38> <5831> +<1e39> <9b91> +<1e3a> <8f29> +<1e3b> <8c9d> +<1e3c> <92c7> +<1e3d> <72fd> +<1e3e> <5099> +<1e3f> <618a> +<1e40> <7db3> +<1e41> <7b46> +<1e42> <7562> +<1e43> <6583> +<1e44> <5e63> +<1e45> <9589> +<1e46> <908a> +<1e47> <7de8> +<1e48> <8cb6> +<1e49> <8b8a> +<1e4a> <8faf> +<1e4b> <8fae> +<1e4c> <6a19> endbfchar 100 beginbfchar -<1e49> <8b8a> -<1e4a> <8faf> -<1e4b> <8fae> -<1e4c> <6a19> -<1e4d> <9c49> -<1e4e> <765f> -<1e4f> <7015> -<1e50> <6ff1> -<1e51> <8cd3> -<1e52> <64ef> -<1e53> <9905> -<1e54> <64a5> -<1e55> <9262> -<1e56> <9251> -<1e57> <99c1> -<1e58> <88dc> -<1e59> <8ca1> -<1e5a> <53c3> -<1e5b> <8836> -<1e5c> <6b98> -<1e5d> <615a> -<1e5e> <6158> -<1e5f> <71e6> -<1e60> <84bc> -<1e61> <8259> -<1e62> <5009> -<1e63> <6ec4> -<1e64> <53a0> -<1e65> <5074> -<1e66> <6e2c> -<1e67> <5c64> -<1e68> <8a6b> -<1e69> <6519> -<1e6a> <647b> -<1e6b> <87ec> -<1e6c> <995e> -<1e6d> <8b92> -<1e6e> <7e8f> -<1e6f> <93df> -<1e70> <7523> -<1e71> <95e1> -<1e72> <986b> -<1e73> <5834> -<1e74> <5617> -<1e75> <9577> -<1e76> <511f> -<1e77> <8178> -<1e78> <5ee0> -<1e79> <66a2> -<1e7a> <9214> -<1e7b> <8eca> -<1e7c> <5fb9> -<1e7d> <5875> -<1e7e> <9673> -<1e7f> <896f> -<1e80> <7a31> -<1e81> <61f2> -<1e82> <8aa0> -<1e83> <9a01> -<1e84> <9072> -<1e85> <99b3> -<1e86> <9f52> -<1e87> <71be> -<1e88> <885d> -<1e89> <87f2> -<1e8a> <5bf5> -<1e8b> <7587> -<1e8c> <8e8a> -<1e8d> <7c4c> -<1e8e> <7da2> -<1e8f> <919c> -<1e90> <92e4> -<1e91> <96db> -<1e92> <790e> -<1e93> <5132> -<1e94> <89f8> -<1e95> <8655> -<1e96> <50b3> -<1e97> <7621> -<1e98> <95d6> -<1e99> <5275> -<1e9a> <9318> -<1e9b> <7d14> -<1e9c> <7dbd> -<1e9d> <8fad> -<1e9e> <8a5e> -<1e9f> <8cdc> -<1ea0> <8070> -<1ea1> <5f9e> -<1ea2> <53e2> -<1ea3> <8ea5> -<1ea4> <7ac4> -<1ea5> <932f> -<1ea6> <9054> -<1ea7> <5e36> -<1ea8> <8cb8> -<1ea9> <64d4> -<1eaa> <55ae> -<1eab> <9132> -<1eac> <64a3> +<1e4d> <9c49> +<1e4e> <765f> +<1e4f> <7015> +<1e50> <6ff1> +<1e51> <8cd3> +<1e52> <64ef> +<1e53> <9905> +<1e54> <64a5> +<1e55> <9262> +<1e56> <9251> +<1e57> <99c1> +<1e58> <88dc> +<1e59> <8ca1> +<1e5a> <53c3> +<1e5b> <8836> +<1e5c> <6b98> +<1e5d> <615a> +<1e5e> <6158> +<1e5f> <71e6> +<1e60> <84bc> +<1e61> <8259> +<1e62> <5009> +<1e63> <6ec4> +<1e64> <53a0> +<1e65> <5074> +<1e66> <6e2c> +<1e67> <5c64> +<1e68> <8a6b> +<1e69> <6519> +<1e6a> <647b> +<1e6b> <87ec> +<1e6c> <995e> +<1e6d> <8b92> +<1e6e> <7e8f> +<1e6f> <93df> +<1e70> <7523> +<1e71> <95e1> +<1e72> <986b> +<1e73> <5834> +<1e74> <5617> +<1e75> <9577> +<1e76> <511f> +<1e77> <8178> +<1e78> <5ee0> +<1e79> <66a2> +<1e7a> <9214> +<1e7b> <8eca> +<1e7c> <5fb9> +<1e7d> <5875> +<1e7e> <9673> +<1e7f> <896f> +<1e80> <7a31> +<1e81> <61f2> +<1e82> <8aa0> +<1e83> <9a01> +<1e84> <9072> +<1e85> <99b3> +<1e86> <9f52> +<1e87> <71be> +<1e88> <885d> +<1e89> <87f2> +<1e8a> <5bf5> +<1e8b> <7587> +<1e8c> <8e8a> +<1e8d> <7c4c> +<1e8e> <7da2> +<1e8f> <919c> +<1e90> <92e4> +<1e91> <96db> +<1e92> <790e> +<1e93> <5132> +<1e94> <89f8> +<1e95> <8655> +<1e96> <50b3> +<1e97> <7621> +<1e98> <95d6> +<1e99> <5275> +<1e9a> <9318> +<1e9b> <7d14> +<1e9c> <7dbd> +<1e9d> <8fad> +<1e9e> <8a5e> +<1e9f> <8cdc> +<1ea0> <8070> +<1ea1> <5f9e> +<1ea2> <53e2> +<1ea3> <8ea5> +<1ea4> <7ac4> +<1ea5> <932f> +<1ea6> <9054> +<1ea7> <5e36> +<1ea8> <8cb8> +<1ea9> <64d4> +<1eaa> <55ae> +<1eab> <9132> +<1eac> <64a3> +<1ead> <81bd> +<1eae> <619a> +<1eaf> <8a95> +<1eb0> <5f48> endbfchar 100 beginbfchar -<1ead> <81bd> -<1eae> <619a> -<1eaf> <8a95> -<1eb0> <5f48> -<1eb1> <7576> -<1eb2> <64cb> -<1eb3> <9ee8> -<1eb4> <8569> -<1eb5> <6a94> -<1eb6> <6417> -<1eb7> <5cf6> -<1eb8> <79b1> -<1eb9> <5c0e> -<1eba> <71c8> -<1ebb> <9127> -<1ebc> <6575> -<1ebd> <6ecc> -<1ebe> <905e> -<1ebf> <7de0> -<1ec0> <985b> -<1ec1> <9ede> -<1ec2> <588a> -<1ec3> <96fb> -<1ec4> <6fb1> -<1ec5> <91e3> -<1ec6> <8abf> -<1ec7> <8adc> -<1ec8> <91d8> -<1ec9> <9802> -<1eca> <9320> -<1ecb> <8a02> -<1ecc> <6771> -<1ecd> <52d5> -<1ece> <68df> -<1ecf> <51cd> -<1ed0> <9b25> -<1ed1> <72a2> -<1ed2> <7368> -<1ed3> <8b80> -<1ed4> <8ced> -<1ed5> <934d> -<1ed6> <935b> -<1ed7> <65b7> -<1ed8> <7dde> -<1ed9> <968a> -<1eda> <5c0d> -<1edb> <5678> -<1edc> <9813> -<1edd> <920d> -<1ede> <596a> -<1edf> <58ae> -<1ee0> <9d5d> -<1ee1> <984d> -<1ee2> <8a1b> -<1ee3> <60e1> -<1ee4> <9913> -<1ee5> <5152> -<1ee6> <723e> -<1ee7> <990c> -<1ee8> <8cb3> -<1ee9> <767c> -<1eea> <7f70> -<1eeb> <95a5> -<1eec> <792c> -<1eed> <91e9> -<1eee> <7169> -<1eef> <7bc4> -<1ef0> <8ca9> -<1ef1> <98ef> -<1ef2> <8a2a> -<1ef3> <7d21> -<1ef4> <98db> -<1ef5> <8ab9> -<1ef6> <5ee2> -<1ef7> <8cbb> -<1ef8> <7d1b> -<1ef9> <58b3> -<1efa> <596e> -<1efb> <61a4> -<1efc> <7cde> -<1efd> <8c50> -<1efe> <6953> -<1eff> <92d2> -<1f00> <98a8> -<1f01> <760b> -<1f02> <99ae> -<1f03> <7e2b> -<1f04> <8af7> -<1f05> <9cf3> -<1f06> <819a> -<1f07> <8f3b> -<1f08> <64ab> -<1f09> <8f14> -<1f0a> <8ce6> -<1f0b> <5fa9> -<1f0c> <8ca0> -<1f0d> <8a03> -<1f0e> <5a66> -<1f0f> <7e1b> -<1f10> <8a72> +<1eb1> <7576> +<1eb2> <64cb> +<1eb3> <9ee8> +<1eb4> <8569> +<1eb5> <6a94> +<1eb6> <6417> +<1eb7> <5cf6> +<1eb8> <79b1> +<1eb9> <5c0e> +<1eba> <71c8> +<1ebb> <9127> +<1ebc> <6575> +<1ebd> <6ecc> +<1ebe> <905e> +<1ebf> <7de0> +<1ec0> <985b> +<1ec1> <9ede> +<1ec2> <588a> +<1ec3> <96fb> +<1ec4> <6fb1> +<1ec5> <91e3> +<1ec6> <8abf> +<1ec7> <8adc> +<1ec8> <91d8> +<1ec9> <9802> +<1eca> <9320> +<1ecb> <8a02> +<1ecc> <6771> +<1ecd> <52d5> +<1ece> <68df> +<1ecf> <51cd> +<1ed0> <9b25> +<1ed1> <72a2> +<1ed2> <7368> +<1ed3> <8b80> +<1ed4> <8ced> +<1ed5> <934d> +<1ed6> <935b> +<1ed7> <65b7> +<1ed8> <7dde> +<1ed9> <968a> +<1eda> <5c0d> +<1edb> <5678> +<1edc> <9813> +<1edd> <920d> +<1ede> <596a> +<1edf> <58ae> +<1ee0> <9d5d> +<1ee1> <984d> +<1ee2> <8a1b> +<1ee3> <60e1> +<1ee4> <9913> +<1ee5> <5152> +<1ee6> <723e> +<1ee7> <990c> +<1ee8> <8cb3> +<1ee9> <767c> +<1eea> <7f70> +<1eeb> <95a5> +<1eec> <792c> +<1eed> <91e9> +<1eee> <7169> +<1eef> <7bc4> +<1ef0> <8ca9> +<1ef1> <98ef> +<1ef2> <8a2a> +<1ef3> <7d21> +<1ef4> <98db> +<1ef5> <8ab9> +<1ef6> <5ee2> +<1ef7> <8cbb> +<1ef8> <7d1b> +<1ef9> <58b3> +<1efa> <596e> +<1efb> <61a4> +<1efc> <7cde> +<1efd> <8c50> +<1efe> <6953> +<1eff> <92d2> +<1f00> <98a8> +<1f01> <760b> +<1f02> <99ae> +<1f03> <7e2b> +<1f04> <8af7> +<1f05> <9cf3> +<1f06> <819a> +<1f07> <8f3b> +<1f08> <64ab> +<1f09> <8f14> +<1f0a> <8ce6> +<1f0b> <5fa9> +<1f0c> <8ca0> +<1f0d> <8a03> +<1f0e> <5a66> +<1f0f> <7e1b> +<1f10> <8a72> +<1f11> <9223> +<1f12> <84cb> +<1f13> <5e79> +<1f14> <8d95> endbfchar 100 beginbfchar -<1f11> <9223> -<1f12> <84cb> -<1f13> <5e79> -<1f14> <8d95> -<1f15> <8d1b> -<1f16> <5ca1> -<1f17> <525b> -<1f18> <92fc> -<1f19> <7db1> -<1f1a> <5d17> -<1f1b> <93ac> -<1f1c> <64f1> -<1f1d> <9d3f> -<1f1e> <95a3> -<1f1f> <927b> -<1f20> <500b> -<1f21> <7d66> -<1f22> <9f94> -<1f23> <978f> -<1f24> <8ca2> -<1f25> <920e> -<1f26> <6e9d> -<1f27> <69cb> -<1f28> <8cfc> -<1f29> <8831> -<1f2a> <9867> -<1f2b> <526e> -<1f2c> <95dc> -<1f2d> <89c0> -<1f2e> <9928> -<1f2f> <6163> -<1f30> <8cab> -<1f31> <5ee3> -<1f32> <898f> -<1f33> <6b78> -<1f34> <9f9c> -<1f35> <95a8> -<1f36> <8ecc> -<1f37> <8a6d> -<1f38> <6ac3> -<1f39> <8cb4> -<1f3a> <528a> -<1f3b> <8f25> -<1f3c> <934b> -<1f3d> <570b> -<1f3e> <904e> -<1f3f> <99ed> -<1f40> <97d3> -<1f41> <6f22> -<1f42> <865f> -<1f43> <95a1> -<1f44> <9db4> -<1f45> <8cc0> -<1f46> <8f5f> -<1f47> <9d3b> -<1f48> <7d05> -<1f49> <58fa> -<1f4a> <8b77> -<1f4b> <6eec> -<1f4c> <5629> -<1f4d> <83ef> -<1f4e> <756b> -<1f4f> <5283> -<1f50> <8a71> -<1f51> <61f7> -<1f52> <58de> -<1f53> <6b61> -<1f54> <74b0> -<1f55> <9084> -<1f56> <7de9> -<1f57> <8b0a> -<1f58> <63ee> -<1f59> <8f1d> -<1f5a> <8cc4> -<1f5b> <7a62> -<1f5c> <6703> -<1f5d> <71f4> -<1f5e> <532f> -<1f5f> <8af1> -<1f60> <8aa8> -<1f61> <7e6a> -<1f62> <8477> -<1f63> <6e3e> -<1f64> <7372> -<1f65> <8ca8> -<1f66> <798d> -<1f67> <64ca> -<1f68> <6a5f> -<1f69> <7a4d> -<1f6a> <9951> -<1f6b> <8b4f> -<1f6c> <9dc4> -<1f6d> <7e3e> -<1f6e> <7ddd> -<1f6f> <6975> -<1f70> <8f2f> -<1f71> <7d1a> -<1f72> <64e0> -<1f73> <5e7e> -<1f74> <858a> +<1f15> <8d1b> +<1f16> <5ca1> +<1f17> <525b> +<1f18> <92fc> +<1f19> <7db1> +<1f1a> <5d17> +<1f1b> <93ac> +<1f1c> <64f1> +<1f1d> <9d3f> +<1f1e> <95a3> +<1f1f> <927b> +<1f20> <500b> +<1f21> <7d66> +<1f22> <9f94> +<1f23> <978f> +<1f24> <8ca2> +<1f25> <920e> +<1f26> <6e9d> +<1f27> <69cb> +<1f28> <8cfc> +<1f29> <8831> +<1f2a> <9867> +<1f2b> <526e> +<1f2c> <95dc> +<1f2d> <89c0> +<1f2e> <9928> +<1f2f> <6163> +<1f30> <8cab> +<1f31> <5ee3> +<1f32> <898f> +<1f33> <6b78> +<1f34> <9f9c> +<1f35> <95a8> +<1f36> <8ecc> +<1f37> <8a6d> +<1f38> <6ac3> +<1f39> <8cb4> +<1f3a> <528a> +<1f3b> <8f25> +<1f3c> <934b> +<1f3d> <570b> +<1f3e> <904e> +<1f3f> <99ed> +<1f40> <97d3> +<1f41> <6f22> +<1f42> <865f> +<1f43> <95a1> +<1f44> <9db4> +<1f45> <8cc0> +<1f46> <8f5f> +<1f47> <9d3b> +<1f48> <7d05> +<1f49> <58fa> +<1f4a> <8b77> +<1f4b> <6eec> +<1f4c> <5629> +<1f4d> <83ef> +<1f4e> <756b> +<1f4f> <5283> +<1f50> <8a71> +<1f51> <61f7> +<1f52> <58de> +<1f53> <6b61> +<1f54> <74b0> +<1f55> <9084> +<1f56> <7de9> +<1f57> <8b0a> +<1f58> <63ee> +<1f59> <8f1d> +<1f5a> <8cc4> +<1f5b> <7a62> +<1f5c> <6703> +<1f5d> <71f4> +<1f5e> <532f> +<1f5f> <8af1> +<1f60> <8aa8> +<1f61> <7e6a> +<1f62> <8477> +<1f63> <6e3e> +<1f64> <7372> +<1f65> <8ca8> +<1f66> <798d> +<1f67> <64ca> +<1f68> <6a5f> +<1f69> <7a4d> +<1f6a> <9951> +<1f6b> <8b4f> +<1f6c> <9dc4> +<1f6d> <7e3e> +<1f6e> <7ddd> +<1f6f> <6975> +<1f70> <8f2f> +<1f71> <7d1a> +<1f72> <64e0> +<1f73> <5e7e> +<1f74> <858a> +<1f75> <5291> +<1f76> <6fdf> +<1f77> <8a08> +<1f78> <8a18> endbfchar 100 beginbfchar -<1f75> <5291> -<1f76> <6fdf> -<1f77> <8a08> -<1f78> <8a18> -<1f79> <969b> -<1f7a> <7e7c> -<1f7b> <7d00> -<1f7c> <593e> -<1f7d> <83a2> -<1f7e> <9830> -<1f7f> <8cc8> -<1f80> <9240> -<1f81> <50f9> -<1f82> <99d5> -<1f83> <6bb2> -<1f84> <76e3> -<1f85> <5805> -<1f86> <7b8b> -<1f87> <9593> -<1f88> <8271> -<1f89> <7dd8> -<1f8a> <7e6d> -<1f8b> <6aa2> -<1f8c> <9e7c> -<1f8d> <63c0> -<1f8e> <64bf> -<1f8f> <7c21> -<1f90> <5109> -<1f91> <85a6> -<1f92> <6abb> -<1f93> <9452> -<1f94> <8e10> -<1f95> <8ce4> -<1f96> <898b> -<1f97> <9375> -<1f98> <8266> -<1f99> <528d> -<1f9a> <991e> -<1f9b> <6f38> -<1f9c> <6ffa> -<1f9d> <6f97> -<1f9e> <5c07> -<1f9f> <6f3f> -<1fa0> <8523> -<1fa1> <69f3> -<1fa2> <596c> -<1fa3> <8b1b> -<1fa4> <91ac> -<1fa5> <81a0> -<1fa6> <6f86> -<1fa7> <9a55> -<1fa8> <5b0c> -<1fa9> <652a> -<1faa> <9278> -<1fab> <77ef> -<1fac> <50e5> -<1fad> <9903> -<1fae> <7e73> -<1faf> <7d5e> -<1fb0> <8f4e> -<1fb1> <8f03> -<1fb2> <968e> -<1fb3> <7bc0> -<1fb4> <6f54> -<1fb5> <7d50> -<1fb6> <8aa1> -<1fb7> <7dca> -<1fb8> <9326> -<1fb9> <50c5> -<1fba> <8b39> -<1fbb> <9032> -<1fbc> <71fc> -<1fbd> <76e1> -<1fbe> <52c1> -<1fbf> <8396> -<1fc0> <9be8> -<1fc1> <9a5a> -<1fc2> <7d93> -<1fc3> <9838> -<1fc4> <93e1> -<1fc5> <5f91> -<1fc6> <75d9> -<1fc7> <7af6> -<1fc8> <7cfe> -<1fc9> <820a> -<1fca> <99d2> -<1fcb> <8209> -<1fcc> <64da> -<1fcd> <92f8> -<1fce> <61fc> -<1fcf> <5287> -<1fd0> <9d51> -<1fd1> <7d79> -<1fd2> <89ba> -<1fd3> <8a23> -<1fd4> <7d76> -<1fd5> <921e> -<1fd6> <8ecd> -<1fd7> <99ff> -<1fd8> <958b> +<1f79> <969b> +<1f7a> <7e7c> +<1f7b> <7d00> +<1f7c> <593e> +<1f7d> <83a2> +<1f7e> <9830> +<1f7f> <8cc8> +<1f80> <9240> +<1f81> <50f9> +<1f82> <99d5> +<1f83> <6bb2> +<1f84> <76e3> +<1f85> <5805> +<1f86> <7b8b> +<1f87> <9593> +<1f88> <8271> +<1f89> <7dd8> +<1f8a> <7e6d> +<1f8b> <6aa2> +<1f8c> <9e7c> +<1f8d> <63c0> +<1f8e> <64bf> +<1f8f> <7c21> +<1f90> <5109> +<1f91> <85a6> +<1f92> <6abb> +<1f93> <9452> +<1f94> <8e10> +<1f95> <8ce4> +<1f96> <898b> +<1f97> <9375> +<1f98> <8266> +<1f99> <528d> +<1f9a> <991e> +<1f9b> <6f38> +<1f9c> <6ffa> +<1f9d> <6f97> +<1f9e> <5c07> +<1f9f> <6f3f> +<1fa0> <8523> +<1fa1> <69f3> +<1fa2> <596c> +<1fa3> <8b1b> +<1fa4> <91ac> +<1fa5> <81a0> +<1fa6> <6f86> +<1fa7> <9a55> +<1fa8> <5b0c> +<1fa9> <652a> +<1faa> <9278> +<1fab> <77ef> +<1fac> <50e5> +<1fad> <9903> +<1fae> <7e73> +<1faf> <7d5e> +<1fb0> <8f4e> +<1fb1> <8f03> +<1fb2> <968e> +<1fb3> <7bc0> +<1fb4> <6f54> +<1fb5> <7d50> +<1fb6> <8aa1> +<1fb7> <7dca> +<1fb8> <9326> +<1fb9> <50c5> +<1fba> <8b39> +<1fbb> <9032> +<1fbc> <71fc> +<1fbd> <76e1> +<1fbe> <52c1> +<1fbf> <8396> +<1fc0> <9be8> +<1fc1> <9a5a> +<1fc2> <7d93> +<1fc3> <9838> +<1fc4> <93e1> +<1fc5> <5f91> +<1fc6> <75d9> +<1fc7> <7af6> +<1fc8> <7cfe> +<1fc9> <820a> +<1fca> <99d2> +<1fcb> <8209> +<1fcc> <64da> +<1fcd> <92f8> +<1fce> <61fc> +<1fcf> <5287> +<1fd0> <9d51> +<1fd1> <7d79> +<1fd2> <89ba> +<1fd3> <8a23> +<1fd4> <7d76> +<1fd5> <921e> +<1fd6> <8ecd> +<1fd7> <99ff> +<1fd8> <958b> +<1fd9> <51f1> +<1fda> <9846> +<1fdb> <6bbb> +<1fdc> <8ab2> endbfchar 100 beginbfchar -<1fd9> <51f1> -<1fda> <9846> -<1fdb> <6bbb> -<1fdc> <8ab2> -<1fdd> <58be> -<1fde> <61c7> -<1fdf> <6473> -<1fe0> <5eab> -<1fe1> <8932> -<1fe2> <8a87> -<1fe3> <584a> -<1fe4> <5108> -<1fe5> <5bec> -<1fe6> <7926> -<1fe7> <66e0> -<1fe8> <8667> -<1fe9> <5dcb> -<1fea> <7aba> -<1feb> <994b> -<1fec> <6f70> -<1fed> <64f4> -<1fee> <95ca> -<1fef> <881f> -<1ff0> <81d8> -<1ff1> <840a> -<1ff2> <4f86> -<1ff3> <8cf4> -<1ff4> <85cd> -<1ff5> <6b04> -<1ff6> <6514> -<1ff7> <7c43> -<1ff8> <95cc> -<1ff9> <862d> -<1ffa> <703e> -<1ffb> <8b95> -<1ffc> <652c> -<1ffd> <89bd> -<1ffe> <61f6> -<1fff> <7e9c> -<2000> <721b> -<2001> <6feb> -<2002> <6488> -<2003> <52de> -<2004> <6f87> -<2005> <6a02> -<2006> <9433> -<2007> <58d8> -<2008> <985e> -<2009> <7c6c> -<200a> <96e2> -<200b> <7055> -<200c> <88cf> -<200d> <9bc9> -<200e> <79ae> -<200f> <9e97> -<2010> <53b2> -<2011> <52f5> -<2012> <792b> -<2013> <6b77> -<2014> <701d> -<2015> <96b8> -<2016> <5006> -<2017> <806f> -<2018> <84ee> -<2019> <9023> -<201a> <942e> -<201b> <6190> -<201c> <6f23> -<201d> <7c3e> -<201e> <6582> -<201f> <81c9> -<2020> <93c8> -<2021> <6200> -<2022> <7149> -<2023> <7df4> -<2024> <7ce7> -<2025> <5169> -<2026> <8f1b> -<2027> <8ad2> -<2028> <7642> -<2029> <907c> -<202a> <9410> -<202b> <7375> -<202c> <81e8> -<202d> <9130> -<202e> <9c57> -<202f> <8cc3> -<2030> <9f61> -<2031> <9234> -<2032> <9748> -<2033> <5dba> -<2034> <9818> -<2035> <993e> -<2036> <5289> -<2037> <9f8d> -<2038> <807e> -<2039> <56a8> -<203a> <7c60> -<203b> <58df> -<203c> <650f> +<1fdd> <58be> +<1fde> <61c7> +<1fdf> <6473> +<1fe0> <5eab> +<1fe1> <8932> +<1fe2> <8a87> +<1fe3> <584a> +<1fe4> <5108> +<1fe5> <5bec> +<1fe6> <7926> +<1fe7> <66e0> +<1fe8> <8667> +<1fe9> <5dcb> +<1fea> <7aba> +<1feb> <994b> +<1fec> <6f70> +<1fed> <64f4> +<1fee> <95ca> +<1fef> <881f> +<1ff0> <81d8> +<1ff1> <840a> +<1ff2> <4f86> +<1ff3> <8cf4> +<1ff4> <85cd> +<1ff5> <6b04> +<1ff6> <6514> +<1ff7> <7c43> +<1ff8> <95cc> +<1ff9> <862d> +<1ffa> <703e> +<1ffb> <8b95> +<1ffc> <652c> +<1ffd> <89bd> +<1ffe> <61f6> +<1fff> <7e9c> +<2000> <721b> +<2001> <6feb> +<2002> <6488> +<2003> <52de> +<2004> <6f87> +<2005> <6a02> +<2006> <9433> +<2007> <58d8> +<2008> <985e> +<2009> <7c6c> +<200a> <96e2> +<200b> <7055> +<200c> <88cf> +<200d> <9bc9> +<200e> <79ae> +<200f> <9e97> +<2010> <53b2> +<2011> <52f5> +<2012> <792b> +<2013> <6b77> +<2014> <701d> +<2015> <96b8> +<2016> <5006> +<2017> <806f> +<2018> <84ee> +<2019> <9023> +<201a> <942e> +<201b> <6190> +<201c> <6f23> +<201d> <7c3e> +<201e> <6582> +<201f> <81c9> +<2020> <93c8> +<2021> <6200> +<2022> <7149> +<2023> <7df4> +<2024> <7ce7> +<2025> <5169> +<2026> <8f1b> +<2027> <8ad2> +<2028> <7642> +<2029> <907c> +<202a> <9410> +<202b> <7375> +<202c> <81e8> +<202d> <9130> +<202e> <9c57> +<202f> <8cc3> +<2030> <9f61> +<2031> <9234> +<2032> <9748> +<2033> <5dba> +<2034> <9818> +<2035> <993e> +<2036> <5289> +<2037> <9f8d> +<2038> <807e> +<2039> <56a8> +<203a> <7c60> +<203b> <58df> +<203c> <650f> +<203d> <96b4> +<203e> <6a13> +<203f> <5a41> +<2040> <645f> endbfchar 100 beginbfchar -<203d> <96b4> -<203e> <6a13> -<203f> <5a41> -<2040> <645f> -<2041> <7c0d> -<2042> <8606> -<2043> <76e7> -<2044> <9871> -<2045> <5eec> -<2046> <7210> -<2047> <64c4> -<2048> <6ef7> -<2049> <865c> -<204a> <9b6f> -<204b> <8cc2> -<204c> <9332> -<204d> <9678> -<204e> <9a62> -<204f> <92c1> -<2050> <5c62> -<2051> <7e37> -<2052> <616e> -<2053> <6ffe> -<2054> <7dd1> -<2055> <5dd2> -<2056> <6523> -<2057> <5b7f> -<2058> <7064> -<2059> <4e82> -<205a> <6384> -<205b> <8f2a> -<205c> <502b> -<205d> <4f96> -<205e> <6dea> -<205f> <7db8> -<2060> <8ad6> -<2061> <863f> -<2062> <7f85> -<2063> <908f> -<2064> <947c> -<2065> <7c6e> -<2066> <9a3e> -<2067> <99f1> -<2068> <7d61> -<2069> <5abd> -<206a> <746a> -<206b> <78bc> -<206c> <879e> -<206d> <99ac> -<206e> <99e1> -<206f> <55ce> -<2070> <8cb7> -<2071> <9ea5> -<2072> <8ce3> -<2073> <9081> -<2074> <779e> -<2075> <9945> -<2076> <883b> -<2077> <6eff> -<2078> <8b3e> -<2079> <9328> -<207a> <925a> -<207b> <8cbf> -<207c> <9382> -<207d> <9580> -<207e> <60b6> -<207f> <5011> -<2080> <9333> -<2081> <5922> -<2082> <8b0e> -<2083> <5f4c> -<2084> <8993> -<2085> <7dbf> -<2086> <7dec> -<2087> <5edf> -<2088> <6ec5> -<2089> <61ab> -<208a> <95a9> -<208b> <9cf4> -<208c> <9298> -<208d> <8b2c> -<208e> <8b00> -<208f> <755d> -<2090> <9209> -<2091> <7d0d> -<2092> <96e3> -<2093> <6493> -<2094> <8166> -<2095> <60f1> -<2096> <9b27> -<2097> <9912> -<2098> <64ec> -<2099> <81a9> -<209a> <6506> -<209b> <91c0> -<209c> <9ce5> -<209d> <8076> -<209e> <5699> -<209f> <9477> -<20a0> <93b3> +<2041> <7c0d> +<2042> <8606> +<2043> <76e7> +<2044> <9871> +<2045> <5eec> +<2046> <7210> +<2047> <64c4> +<2048> <6ef7> +<2049> <865c> +<204a> <9b6f> +<204b> <8cc2> +<204c> <9332> +<204d> <9678> +<204e> <9a62> +<204f> <92c1> +<2050> <5c62> +<2051> <7e37> +<2052> <616e> +<2053> <6ffe> +<2054> <7dd1> +<2055> <5dd2> +<2056> <6523> +<2057> <5b7f> +<2058> <7064> +<2059> <4e82> +<205a> <6384> +<205b> <8f2a> +<205c> <502b> +<205d> <4f96> +<205e> <6dea> +<205f> <7db8> +<2060> <8ad6> +<2061> <863f> +<2062> <7f85> +<2063> <908f> +<2064> <947c> +<2065> <7c6e> +<2066> <9a3e> +<2067> <99f1> +<2068> <7d61> +<2069> <5abd> +<206a> <746a> +<206b> <78bc> +<206c> <879e> +<206d> <99ac> +<206e> <99e1> +<206f> <55ce> +<2070> <8cb7> +<2071> <9ea5> +<2072> <8ce3> +<2073> <9081> +<2074> <779e> +<2075> <9945> +<2076> <883b> +<2077> <6eff> +<2078> <8b3e> +<2079> <9328> +<207a> <925a> +<207b> <8cbf> +<207c> <9382> +<207d> <9580> +<207e> <60b6> +<207f> <5011> +<2080> <9333> +<2081> <5922> +<2082> <8b0e> +<2083> <5f4c> +<2084> <8993> +<2085> <7dbf> +<2086> <7dec> +<2087> <5edf> +<2088> <6ec5> +<2089> <61ab> +<208a> <95a9> +<208b> <9cf4> +<208c> <9298> +<208d> <8b2c> +<208e> <8b00> +<208f> <755d> +<2090> <9209> +<2091> <7d0d> +<2092> <96e3> +<2093> <6493> +<2094> <8166> +<2095> <60f1> +<2096> <9b27> +<2097> <9912> +<2098> <64ec> +<2099> <81a9> +<209a> <6506> +<209b> <91c0> +<209c> <9ce5> +<209d> <8076> +<209e> <5699> +<209f> <9477> +<20a0> <93b3> +<20a1> <6ab8> +<20a2> <7370> +<20a3> <5be7> +<20a4> <64f0> endbfchar 100 beginbfchar -<20a1> <6ab8> -<20a2> <7370> -<20a3> <5be7> -<20a4> <64f0> -<20a5> <6fd8> -<20a6> <9215> -<20a7> <7d10> -<20a8> <81bf> -<20a9> <6fc3> -<20aa> <8fb2> -<20ab> <7627> -<20ac> <8afe> -<20ad> <6b50> -<20ae> <9dd7> -<20af> <6bc6> -<20b0> <5614> -<20b1> <6f1a> -<20b2> <76e4> -<20b3> <9f90> -<20b4> <8ce0> -<20b5> <5674> -<20b6> <9d6c> -<20b7> <9a19> -<20b8> <98c4> -<20b9> <983b> -<20ba> <8ca7> -<20bb> <860b> -<20bc> <6191> -<20bd> <8a55> -<20be> <6f51> -<20bf> <9817> -<20c0> <64b2> -<20c1> <92ea> -<20c2> <50d5> -<20c3> <6a38> -<20c4> <8b5c> -<20c5> <81cd> -<20c6> <9f4a> -<20c7> <9a0e> -<20c8> <8c48> -<20c9> <5553> -<20ca> <6c23> -<20cb> <8a16> -<20cc> <727d> -<20cd> <91fa> -<20ce> <925b> -<20cf> <9077> -<20d0> <7c3d> -<20d1> <8b19> -<20d2> <9322> -<20d3> <9257> -<20d4> <6dfa> -<20d5> <8b74> -<20d6> <5879> -<20d7> <69cd> -<20d8> <55c6> -<20d9> <58bb> -<20da> <8594> -<20db> <6436> -<20dc> <936c> -<20dd> <6a4b> -<20de> <55ac> -<20df> <50d1> -<20e0> <7ff9> -<20e1> <7ac5> -<20e2> <7aca> -<20e3> <6b3d> -<20e4> <89aa> -<20e5> <5be2> -<20e6> <8f15> -<20e7> <6c2b> -<20e8> <50be> -<20e9> <9803> -<20ea> <8acb> -<20eb> <6176> -<20ec> <74ca> -<20ed> <7aae> -<20ee> <8da8> -<20ef> <5340> -<20f0> <8ec0> -<20f1> <9a45> -<20f2> <9f72> -<20f3> <9874> -<20f4> <6b0a> -<20f5> <52f8> -<20f6> <9d72> -<20f7> <78ba> -<20f8> <8b93> -<20f9> <9952> -<20fa> <64fe> -<20fb> <7e5e> -<20fc> <71b1> -<20fd> <97cc> -<20fe> <8a8d> -<20ff> <7d09> -<2100> <69ae> -<2101> <7d68> -<2102> <8edf> -<2103> <92ed> -<2104> <958f> +<20a5> <6fd8> +<20a6> <9215> +<20a7> <7d10> +<20a8> <81bf> +<20a9> <6fc3> +<20aa> <8fb2> +<20ab> <7627> +<20ac> <8afe> +<20ad> <6b50> +<20ae> <9dd7> +<20af> <6bc6> +<20b0> <5614> +<20b1> <6f1a> +<20b2> <76e4> +<20b3> <9f90> +<20b4> <8ce0> +<20b5> <5674> +<20b6> <9d6c> +<20b7> <9a19> +<20b8> <98c4> +<20b9> <983b> +<20ba> <8ca7> +<20bb> <860b> +<20bc> <6191> +<20bd> <8a55> +<20be> <6f51> +<20bf> <9817> +<20c0> <64b2> +<20c1> <92ea> +<20c2> <50d5> +<20c3> <6a38> +<20c4> <8b5c> +<20c5> <81cd> +<20c6> <9f4a> +<20c7> <9a0e> +<20c8> <8c48> +<20c9> <5553> +<20ca> <6c23> +<20cb> <8a16> +<20cc> <727d> +<20cd> <91fa> +<20ce> <925b> +<20cf> <9077> +<20d0> <7c3d> +<20d1> <8b19> +<20d2> <9322> +<20d3> <9257> +<20d4> <6dfa> +<20d5> <8b74> +<20d6> <5879> +<20d7> <69cd> +<20d8> <55c6> +<20d9> <58bb> +<20da> <8594> +<20db> <6436> +<20dc> <936c> +<20dd> <6a4b> +<20de> <55ac> +<20df> <50d1> +<20e0> <7ff9> +<20e1> <7ac5> +<20e2> <7aca> +<20e3> <6b3d> +<20e4> <89aa> +<20e5> <5be2> +<20e6> <8f15> +<20e7> <6c2b> +<20e8> <50be> +<20e9> <9803> +<20ea> <8acb> +<20eb> <6176> +<20ec> <74ca> +<20ed> <7aae> +<20ee> <8da8> +<20ef> <5340> +<20f0> <8ec0> +<20f1> <9a45> +<20f2> <9f72> +<20f3> <9874> +<20f4> <6b0a> +<20f5> <52f8> +<20f6> <9d72> +<20f7> <78ba> +<20f8> <8b93> +<20f9> <9952> +<20fa> <64fe> +<20fb> <7e5e> +<20fc> <71b1> +<20fd> <97cc> +<20fe> <8a8d> +<20ff> <7d09> +<2100> <69ae> +<2101> <7d68> +<2102> <8edf> +<2103> <92ed> +<2104> <958f> +<2105> <6f64> +<2106> <7051> +<2107> <85a9> +<2108> <9c13> endbfchar 100 beginbfchar -<2105> <6f64> -<2106> <7051> -<2107> <85a9> -<2108> <9c13> -<2109> <8cfd> -<210a> <5098> -<210b> <55aa> -<210c> <9a37> -<210d> <6383> -<210e> <6f80> -<210f> <6bba> -<2110> <7d17> -<2111> <7be9> -<2112> <66ec> -<2113> <9583> -<2114> <965d> -<2115> <8d0d> -<2116> <7e55> -<2117> <50b7> -<2118> <8cde> -<2119> <71d2> -<211a> <7d39> -<211b> <8cd2> -<211c> <6368> -<211d> <651d> -<211e> <61fe> -<211f> <8a2d> -<2120> <7d33> -<2121> <5be9> -<2122> <5b38> -<2123> <814e> -<2124> <6ef2> -<2125> <8072> -<2126> <7e69> -<2127> <52dd> -<2128> <8056> -<2129> <5e2b> -<212a> <7345> -<212b> <6fd5> -<212c> <8a69> -<212d> <6642> -<212e> <8755> -<212f> <5be6> -<2130> <8b58> -<2131> <99db> -<2132> <52e2> -<2133> <9069> -<2134> <91cb> -<2135> <98fe> -<2136> <8996> -<2137> <8a66> -<2138> <58fd> -<2139> <7378> -<213a> <6a1e> -<213b> <8f38> -<213c> <66f8> -<213d> <8d16> -<213e> <5c6c> -<213f> <8853> -<2140> <6a39> -<2141> <7aea> -<2142> <6578> -<2143> <5e25> -<2144> <96d9> -<2145> <8ab0> -<2146> <9806> -<2147> <8aac> -<2148> <78a9> -<2149> <720d> -<214a> <7d72> -<214b> <98fc> -<214c> <9b06> -<214d> <8073> -<214e> <616b> -<214f> <980c> -<2150> <8a1f> -<2151> <8aa6> -<2152> <64fb> -<2153> <8607> -<2154> <8a34> -<2155> <8085> -<2156> <96d6> -<2157> <96a8> -<2158> <7d8f> -<2159> <6b72> -<215a> <5b6b> -<215b> <640d> -<215c> <7e2e> -<215d> <7463> -<215e> <9396> -<215f> <737a> -<2160> <64bb> -<2161> <81fa> -<2162> <614b> -<2163> <6524> -<2164> <8caa> -<2165> <7671> -<2166> <7058> -<2167> <58c7> -<2168> <8b5a> +<2109> <8cfd> +<210a> <5098> +<210b> <55aa> +<210c> <9a37> +<210d> <6383> +<210e> <6f80> +<210f> <6bba> +<2110> <7d17> +<2111> <7be9> +<2112> <66ec> +<2113> <9583> +<2114> <965d> +<2115> <8d0d> +<2116> <7e55> +<2117> <50b7> +<2118> <8cde> +<2119> <71d2> +<211a> <7d39> +<211b> <8cd2> +<211c> <6368> +<211d> <651d> +<211e> <61fe> +<211f> <8a2d> +<2120> <7d33> +<2121> <5be9> +<2122> <5b38> +<2123> <814e> +<2124> <6ef2> +<2125> <8072> +<2126> <7e69> +<2127> <52dd> +<2128> <8056> +<2129> <5e2b> +<212a> <7345> +<212b> <6fd5> +<212c> <8a69> +<212d> <6642> +<212e> <8755> +<212f> <5be6> +<2130> <8b58> +<2131> <99db> +<2132> <52e2> +<2133> <9069> +<2134> <91cb> +<2135> <98fe> +<2136> <8996> +<2137> <8a66> +<2138> <58fd> +<2139> <7378> +<213a> <6a1e> +<213b> <8f38> +<213c> <66f8> +<213d> <8d16> +<213e> <5c6c> +<213f> <8853> +<2140> <6a39> +<2141> <7aea> +<2142> <6578> +<2143> <5e25> +<2144> <96d9> +<2145> <8ab0> +<2146> <9806> +<2147> <8aac> +<2148> <78a9> +<2149> <720d> +<214a> <7d72> +<214b> <98fc> +<214c> <9b06> +<214d> <8073> +<214e> <616b> +<214f> <980c> +<2150> <8a1f> +<2151> <8aa6> +<2152> <64fb> +<2153> <8607> +<2154> <8a34> +<2155> <8085> +<2156> <96d6> +<2157> <96a8> +<2158> <7d8f> +<2159> <6b72> +<215a> <5b6b> +<215b> <640d> +<215c> <7e2e> +<215d> <7463> +<215e> <9396> +<215f> <737a> +<2160> <64bb> +<2161> <81fa> +<2162> <614b> +<2163> <6524> +<2164> <8caa> +<2165> <7671> +<2166> <7058> +<2167> <58c7> +<2168> <8b5a> +<2169> <8ac7> +<216a> <5606> +<216b> <6e6f> +<216c> <71d9> endbfchar 100 beginbfchar -<2169> <8ac7> -<216a> <5606> -<216b> <6e6f> -<216c> <71d9> -<216d> <6fe4> -<216e> <7e27> -<216f> <8a0e> -<2170> <9a30> -<2171> <8b04> -<2172> <92bb> -<2173> <984c> -<2174> <9ad4> -<2175> <689d> -<2176> <8cbc> -<2177> <9435> -<2178> <5ef3> -<2179> <807d> -<217a> <70f4> -<217b> <9285> -<217c> <7d71> -<217d> <982d> -<217e> <5716> -<217f> <5857> -<2180> <5718> -<2181> <983d> -<2182> <9d15> -<2183> <99b1> -<2184> <99dd> -<2185> <6a62> -<2186> <7aaa> -<2187> <896a> -<2188> <5f4e> -<2189> <7063> -<218a> <9811> -<218b> <842c> -<218c> <7db2> -<218d> <97cb> -<218e> <9055> -<218f> <570d> -<2190> <7232> -<2191> <6ff0> -<2192> <7dad> -<2193> <8466> -<2194> <5049> -<2195> <50de> -<2196> <7def> -<2197> <8b02> -<2198> <885b> -<2199> <805e> -<219a> <7d0b> -<219b> <7a69> -<219c> <554f> -<219d> <64be> -<219e> <8778> -<219f> <6e26> -<21a0> <7aa9> -<21a1> <55da> -<21a2> <93a2> -<21a3> <70cf> -<21a4> <8aa3> -<21a5> <7121> -<21a6> <856a> -<21a7> <5862> -<21a8> <9727> -<21a9> <52d9> -<21aa> <8aa4> -<21ab> <932b> -<21ac> <72a7> -<21ad> <8972> -<21ae> <7fd2> -<21af> <9291> -<21b0> <6232> -<21b1> <7d30> -<21b2> <8766> -<21b3> <8f44> -<21b4> <5cfd> -<21b5> <4fe0> -<21b6> <72f9> -<21b7> <5687> -<21b8> <9341> -<21b9> <9bae> -<21ba> <7e96> -<21bb> <8ce2> -<21bc> <929c> -<21bd> <9591> -<21be> <986f> -<21bf> <96aa> -<21c0> <73fe> -<21c1> <737b> -<21c2> <7e23> -<21c3> <9921> -<21c4> <61b2> -<21c5> <7dab> -<21c6> <9472> -<21c7> <9109> -<21c8> <8a73> -<21c9> <97ff> -<21ca> <9805> -<21cb> <856d> -<21cc> <56c2> +<216d> <6fe4> +<216e> <7e27> +<216f> <8a0e> +<2170> <9a30> +<2171> <8b04> +<2172> <92bb> +<2173> <984c> +<2174> <9ad4> +<2175> <689d> +<2176> <8cbc> +<2177> <9435> +<2178> <5ef3> +<2179> <807d> +<217a> <70f4> +<217b> <9285> +<217c> <7d71> +<217d> <982d> +<217e> <5716> +<217f> <5857> +<2180> <5718> +<2181> <983d> +<2182> <9d15> +<2183> <99b1> +<2184> <99dd> +<2185> <6a62> +<2186> <7aaa> +<2187> <896a> +<2188> <5f4e> +<2189> <7063> +<218a> <9811> +<218b> <842c> +<218c> <7db2> +<218d> <97cb> +<218e> <9055> +<218f> <570d> +<2190> <7232> +<2191> <6ff0> +<2192> <7dad> +<2193> <8466> +<2194> <5049> +<2195> <50de> +<2196> <7def> +<2197> <8b02> +<2198> <885b> +<2199> <805e> +<219a> <7d0b> +<219b> <7a69> +<219c> <554f> +<219d> <64be> +<219e> <8778> +<219f> <6e26> +<21a0> <7aa9> +<21a1> <55da> +<21a2> <93a2> +<21a3> <70cf> +<21a4> <8aa3> +<21a5> <7121> +<21a6> <856a> +<21a7> <5862> +<21a8> <9727> +<21a9> <52d9> +<21aa> <8aa4> +<21ab> <932b> +<21ac> <72a7> +<21ad> <8972> +<21ae> <7fd2> +<21af> <9291> +<21b0> <6232> +<21b1> <7d30> +<21b2> <8766> +<21b3> <8f44> +<21b4> <5cfd> +<21b5> <4fe0> +<21b6> <72f9> +<21b7> <5687> +<21b8> <9341> +<21b9> <9bae> +<21ba> <7e96> +<21bb> <8ce2> +<21bc> <929c> +<21bd> <9591> +<21be> <986f> +<21bf> <96aa> +<21c0> <73fe> +<21c1> <737b> +<21c2> <7e23> +<21c3> <9921> +<21c4> <61b2> +<21c5> <7dab> +<21c6> <9472> +<21c7> <9109> +<21c8> <8a73> +<21c9> <97ff> +<21ca> <9805> +<21cb> <856d> +<21cc> <56c2> +<21cd> <92b7> +<21ce> <66c9> +<21cf> <562f> +<21d0> <5354> endbfchar 100 beginbfchar -<21cd> <92b7> -<21ce> <66c9> -<21cf> <562f> -<21d0> <5354> -<21d1> <633e> -<21d2> <8105> -<21d3> <8ae7> -<21d4> <5beb> -<21d5> <7009> -<21d6> <8b1d> -<21d7> <92c5> -<21d8> <91c1> -<21d9> <8208> -<21da> <92b9> -<21db> <7d89> -<21dc> <9808> -<21dd> <8a31> -<21de> <7dd2> -<21df> <7e8c> -<21e0> <8ed2> -<21e1> <61f8> -<21e2> <9078> -<21e3> <766c> -<21e4> <7d62> -<21e5> <5b78> -<21e6> <52db> -<21e7> <8a62> -<21e8> <5c0b> -<21e9> <99b4> -<21ea> <8a13> -<21eb> <8a0a> -<21ec> <905c> -<21ed> <58d3> -<21ee> <9d09> -<21ef> <9d28> -<21f0> <555e> -<21f1> <4e9e> -<21f2> <8a1d> -<21f3> <95b9> -<21f4> <9e7d> -<21f5> <56b4> -<21f6> <9854> -<21f7> <95bb> -<21f8> <8277> -<21f9> <53ad> -<21fa> <786f> -<21fb> <8afa> -<21fc> <9a57> -<21fd> <9d26> -<21fe> <694a> -<21ff> <63da> -<2200> <760d> -<2201> <967d> -<2202> <7662> -<2203> <990a> -<2204> <6a23> -<2205> <582f> -<2206> <8b21> -<2207> <85e5> -<2208> <723a> -<2209> <9801> -<220a> <696d> -<220b> <8449> -<220c> <91ab> -<220d> <92a5> -<220e> <9824> -<220f> <907a> -<2210> <5100> -<2211> <87fb> -<2212> <85dd> -<2213> <5104> -<2214> <61b6> -<2215> <7fa9> -<2216> <8a63> -<2217> <8b70> -<2218> <8abc> -<2219> <8b6f> -<221a> <7e79> -<221b> <852d> -<221c> <9670> -<221d> <9280> -<221e> <98f2> -<221f> <96b1> -<2220> <6afb> -<2221> <5b30> -<2222> <9df9> -<2223> <61c9> -<2224> <7e93> -<2225> <7469> -<2226> <87a2> -<2227> <71df> -<2228> <7192> -<2229> <8805> -<222a> <8d0f> -<222b> <7a4e> -<222c> <55b2> -<222d> <64c1> -<222e> <50ad> -<222f> <7670> -<2230> <8e34> +<21d1> <633e> +<21d2> <8105> +<21d3> <8ae7> +<21d4> <5beb> +<21d5> <7009> +<21d6> <8b1d> +<21d7> <92c5> +<21d8> <91c1> +<21d9> <8208> +<21da> <92b9> +<21db> <7d89> +<21dc> <9808> +<21dd> <8a31> +<21de> <7dd2> +<21df> <7e8c> +<21e0> <8ed2> +<21e1> <61f8> +<21e2> <9078> +<21e3> <766c> +<21e4> <7d62> +<21e5> <5b78> +<21e6> <52db> +<21e7> <8a62> +<21e8> <5c0b> +<21e9> <99b4> +<21ea> <8a13> +<21eb> <8a0a> +<21ec> <905c> +<21ed> <58d3> +<21ee> <9d09> +<21ef> <9d28> +<21f0> <555e> +<21f1> <4e9e> +<21f2> <8a1d> +<21f3> <95b9> +<21f4> <9e7d> +<21f5> <56b4> +<21f6> <9854> +<21f7> <95bb> +<21f8> <8277> +<21f9> <53ad> +<21fa> <786f> +<21fb> <8afa> +<21fc> <9a57> +<21fd> <9d26> +<21fe> <694a> +<21ff> <63da> +<2200> <760d> +<2201> <967d> +<2202> <7662> +<2203> <990a> +<2204> <6a23> +<2205> <582f> +<2206> <8b21> +<2207> <85e5> +<2208> <723a> +<2209> <9801> +<220a> <696d> +<220b> <8449> +<220c> <91ab> +<220d> <92a5> +<220e> <9824> +<220f> <907a> +<2210> <5100> +<2211> <87fb> +<2212> <85dd> +<2213> <5104> +<2214> <61b6> +<2215> <7fa9> +<2216> <8a63> +<2217> <8b70> +<2218> <8abc> +<2219> <8b6f> +<221a> <7e79> +<221b> <852d> +<221c> <9670> +<221d> <9280> +<221e> <98f2> +<221f> <96b1> +<2220> <6afb> +<2221> <5b30> +<2222> <9df9> +<2223> <61c9> +<2224> <7e93> +<2225> <7469> +<2226> <87a2> +<2227> <71df> +<2228> <7192> +<2229> <8805> +<222a> <8d0f> +<222b> <7a4e> +<222c> <55b2> +<222d> <64c1> +<222e> <50ad> +<222f> <7670> +<2230> <8e34> +<2231> <512a> +<2232> <6182> +<2233> <90f5> +<2234> <923e> endbfchar 100 beginbfchar -<2231> <512a> -<2232> <6182> -<2233> <90f5> -<2234> <923e> -<2235> <7336> -<2236> <8a98> -<2237> <8f3f> -<2238> <9918> -<2239> <9b5a> -<223a> <6f01> -<223b> <8207> -<223c> <5dbc> -<223d> <8a9e> -<223e> <9b31> -<223f> <7344> -<2240> <8b7d> -<2241> <9810> -<2242> <99ad> -<2243> <9d1b> -<2244> <6df5> -<2245> <8f45> -<2246> <5712> -<2247> <54e1> -<2248> <5713> -<2249> <7de3> -<224a> <9060> -<224b> <9858> -<224c> <7d04> -<224d> <8e8d> -<224e> <9470> -<224f> <95b2> -<2250> <96f2> -<2251> <9116> -<2252> <9695> -<2253> <904b> -<2254> <85f4> -<2255> <9196> -<2256> <6688> -<2257> <96dc> -<2258> <8f09> -<2259> <6522> -<225a> <66ab> -<225b> <8d0a> -<225c> <8d1c> -<225d> <81df> -<225e> <947f> -<225f> <68d7> -<2260> <7ac8> -<2261> <8cac> -<2262> <64c7> -<2263> <5247> -<2264> <6fa4> -<2265> <8cca> -<2266> <8d08> -<2267> <8ecb> -<2268> <9358> -<2269> <9598> -<226a> <8a50> -<226b> <9f4b> -<226c> <50b5> -<226d> <6c08> -<226e> <76de> -<226f> <65ac> -<2270> <8f3e> -<2271> <5d84> -<2272> <68e7> -<2273> <6230> -<2274> <7dbb> -<2275> <5f35> -<2276> <6f32> -<2277> <5e33> -<2278> <8cec> -<2279> <8139> -<227a> <8d99> -<227b> <87c4> -<227c> <8f4d> -<227d> <937a> -<227e> <9019> -<227f> <8c9e> -<2280> <91dd> -<2281> <5075> -<2282> <8a3a> -<2283> <93ae> -<2284> <9663> -<2285> <5e40> -<2286> <7665> -<2287> <912d> -<2288> <8b49> -<2289> <7e54> -<228a> <8077> -<228b> <57f7> -<228c> <8879> -<228d> <7d19> -<228e> <646f> -<228f> <64f2> -<2290> <5e5f> -<2291> <8cea> -<2292> <6eef> -<2293> <9418> -<2294> <7d42> +<2235> <7336> +<2236> <8a98> +<2237> <8f3f> +<2238> <9918> +<2239> <9b5a> +<223a> <6f01> +<223b> <8207> +<223c> <5dbc> +<223d> <8a9e> +<223e> <9b31> +<223f> <7344> +<2240> <8b7d> +<2241> <9810> +<2242> <99ad> +<2243> <9d1b> +<2244> <6df5> +<2245> <8f45> +<2246> <5712> +<2247> <54e1> +<2248> <5713> +<2249> <7de3> +<224a> <9060> +<224b> <9858> +<224c> <7d04> +<224d> <8e8d> +<224e> <9470> +<224f> <95b2> +<2250> <96f2> +<2251> <9116> +<2252> <9695> +<2253> <904b> +<2254> <85f4> +<2255> <9196> +<2256> <6688> +<2257> <96dc> +<2258> <8f09> +<2259> <6522> +<225a> <66ab> +<225b> <8d0a> +<225c> <8d1c> +<225d> <81df> +<225e> <947f> +<225f> <68d7> +<2260> <7ac8> +<2261> <8cac> +<2262> <64c7> +<2263> <5247> +<2264> <6fa4> +<2265> <8cca> +<2266> <8d08> +<2267> <8ecb> +<2268> <9358> +<2269> <9598> +<226a> <8a50> +<226b> <9f4b> +<226c> <50b5> +<226d> <6c08> +<226e> <76de> +<226f> <65ac> +<2270> <8f3e> +<2271> <5d84> +<2272> <68e7> +<2273> <6230> +<2274> <7dbb> +<2275> <5f35> +<2276> <6f32> +<2277> <5e33> +<2278> <8cec> +<2279> <8139> +<227a> <8d99> +<227b> <87c4> +<227c> <8f4d> +<227d> <937a> +<227e> <9019> +<227f> <8c9e> +<2280> <91dd> +<2281> <5075> +<2282> <8a3a> +<2283> <93ae> +<2284> <9663> +<2285> <5e40> +<2286> <7665> +<2287> <912d> +<2288> <8b49> +<2289> <7e54> +<228a> <8077> +<228b> <57f7> +<228c> <8879> +<228d> <7d19> +<228e> <646f> +<228f> <64f2> +<2290> <5e5f> +<2291> <8cea> +<2292> <6eef> +<2293> <9418> +<2294> <7d42> +<2295> <7a2e> +<2296> <816b> +<2297> <8846> +<2298> <8b05> endbfchar 100 beginbfchar -<2295> <7a2e> -<2296> <816b> -<2297> <8846> -<2298> <8b05> -<2299> <8ef8> -<229a> <76ba> -<229b> <665d> -<229c> <9a5f> -<229d> <8af8> -<229e> <8a85> -<229f> <71ed> -<22a0> <77da> -<22a1> <56d1> -<22a2> <8caf> -<22a3> <9444> -<22a4> <7bc9> -<22a5> <99d0> -<22a6> <5c08> -<22a7> <78da> -<22a8> <8f49> -<22a9> <8cfa> -<22aa> <6a01> -<22ab> <838a> -<22ac> <88dd> -<22ad> <599d> -<22ae> <58ef> -<22af> <72c0> -<22b0> <9310> -<22b1> <8d05> -<22b2> <589c> -<22b3> <7db4> -<22b4> <8ac4> -<22b5> <6e96> -<22b6> <6fc1> -<22b7> <8cc7> -<22b8> <6f2c> -<22b9> <7d9c> -<22ba> <7e3d> -<22bb> <7e31> -<22bc> <9112> -<22bd> <8a5b> -<22be> <7d44> -<22bf> <947d> -<22c0> <55c7> -<22c1> <5399> -<22c2> <53b4> -<22c3> <9768> -<22c4> <8d0b> -<22c5> <532d> -<22c6> <5331> -<22c7> <8cfe> -<22c8> <5244> -<22c9> <528c> -<22ca> <5274> -<22cb> <50b4> -<22cc> <5000> -<22cd> <5096> -<22ce> <5115> -<22cf> <5102> -<22d0> <5114> -<22d1> <513c> -<22d2> <5137> -<22d3> <50e8> -<22d4> <50c2> -<22d5> <513b> -<22d6> <5110> -<22d7> <513a> -<22d8> <50c9> -<22d9> <7cf4> -<22da> <9ecc> -<22db> <56c5> -<22dc> <9cec> -<22dd> <893b> -<22de> <81e0> -<22df> <8a01> -<22e0> <8a10> -<22e1> <8a0c> -<22e2> <8a15> -<22e3> <8b33> -<22e4> <8a4e> -<22e5> <8a25> -<22e6> <8a41> -<22e7> <8a36> -<22e8> <8a46> -<22e9> <8a54> -<22ea> <8a58> -<22eb> <8a52> -<22ec> <8a86> -<22ed> <8a84> -<22ee> <8a7f> -<22ef> <8a70> -<22f0> <8a7c> -<22f1> <8a75> -<22f2> <8a6c> -<22f3> <8a6e> -<22f4> <8acd> -<22f5> <8ae2> -<22f6> <8a61> -<22f7> <8a9a> -<22f8> <8aa5> +<2299> <8ef8> +<229a> <76ba> +<229b> <665d> +<229c> <9a5f> +<229d> <8af8> +<229e> <8a85> +<229f> <71ed> +<22a0> <77da> +<22a1> <56d1> +<22a2> <8caf> +<22a3> <9444> +<22a4> <7bc9> +<22a5> <99d0> +<22a6> <5c08> +<22a7> <78da> +<22a8> <8f49> +<22a9> <8cfa> +<22aa> <6a01> +<22ab> <838a> +<22ac> <88dd> +<22ad> <599d> +<22ae> <58ef> +<22af> <72c0> +<22b0> <9310> +<22b1> <8d05> +<22b2> <589c> +<22b3> <7db4> +<22b4> <8ac4> +<22b5> <6e96> +<22b6> <6fc1> +<22b7> <8cc7> +<22b8> <6f2c> +<22b9> <7d9c> +<22ba> <7e3d> +<22bb> <7e31> +<22bc> <9112> +<22bd> <8a5b> +<22be> <7d44> +<22bf> <947d> +<22c0> <55c7> +<22c1> <5399> +<22c2> <53b4> +<22c3> <9768> +<22c4> <8d0b> +<22c5> <532d> +<22c6> <5331> +<22c7> <8cfe> +<22c8> <5244> +<22c9> <528c> +<22ca> <5274> +<22cb> <50b4> +<22cc> <5000> +<22cd> <5096> +<22ce> <5115> +<22cf> <5102> +<22d0> <5114> +<22d1> <513c> +<22d2> <5137> +<22d3> <50e8> +<22d4> <50c2> +<22d5> <513b> +<22d6> <5110> +<22d7> <513a> +<22d8> <50c9> +<22d9> <7cf4> +<22da> <9ecc> +<22db> <56c5> +<22dc> <9cec> +<22dd> <893b> +<22de> <81e0> +<22df> <8a01> +<22e0> <8a10> +<22e1> <8a0c> +<22e2> <8a15> +<22e3> <8b33> +<22e4> <8a4e> +<22e5> <8a25> +<22e6> <8a41> +<22e7> <8a36> +<22e8> <8a46> +<22e9> <8a54> +<22ea> <8a58> +<22eb> <8a52> +<22ec> <8a86> +<22ed> <8a84> +<22ee> <8a7f> +<22ef> <8a70> +<22f0> <8a7c> +<22f1> <8a75> +<22f2> <8a6c> +<22f3> <8a6e> +<22f4> <8acd> +<22f5> <8ae2> +<22f6> <8a61> +<22f7> <8a9a> +<22f8> <8aa5> +<22fb> <8acf> +<22fc> <8ad1> +<22fd> <8ac9> +<22fe> <8adb> endbfchar 100 beginbfchar -<22fb> <8acf> -<22fc> <8ad1> -<22fd> <8ac9> -<22fe> <8adb> -<22ff> <8ad7> -<2300> <8ac2> -<2301> <8ab6> -<2302> <8af6> -<2303> <8aeb> -<2304> <8b14> -<2305> <8b01> -<2306> <8ae4> -<2307> <8aed> -<2308> <8afc> -<2309> <8af3> -<230a> <8ae6> -<230b> <8aee> -<230c> <8ade> -<230d> <8b28> -<230e> <8b9c> -<230f> <8b16> -<2310> <8b1a> -<2311> <8b10> -<2312> <8b2b> -<2313> <8b2d> -<2314> <8b56> -<2315> <8b59> -<2316> <8b4e> -<2317> <8b9e> -<2318> <8b6b> -<2319> <8b96> -<231a> <9658> -<231b> <913a> -<231c> <9114> -<231d> <9134> -<231e> <90df> -<231f> <9136> -<2320> <9106> -<2321> <9148> -<2322> <82bb> -<2323> <52f1> -<2324> <5df0> -<2325> <580a> -<2326> <58d9> -<2327> <58e2> -<2328> <58e0> -<2329> <58da> -<232a> <57e1> -<232b> <584f> -<232c> <5816> -<232d> <5852> -<232e> <581d> -<232f> <5864> -<2330> <858c> -<2331> <8553> -<2332> <85f6> -<2333> <83a7> -<2334> <8407> -<2335> <84ef> -<2336> <82e7> -<2337> <8622> -<2338> <8526> -<2339> <584b> -<233a> <7162> -<233b> <8558> -<233c> <84fd> -<233d> <854e> -<233e> <8588> -<233f> <85ba> -<2340> <7296> -<2341> <6ece> -<2342> <8541> -<2343> <85ce> -<2344> <8552> -<2345> <84c0> -<2346> <8452> -<2347> <8464> -<2348> <8494> -<2349> <8435> -<234a> <859f> -<234b> <8555> -<234c> <9daf> -<234d> <8493> -<234e> <7e08> -<234f> <8546> -<2350> <8562> -<2351> <851e> -<2352> <9a40> -<2353> <863a> -<2354> <93a3> -<2355> <8577> -<2356> <861e> -<2357> <85fa> -<2358> <8604> -<2359> <85ea> -<235a> <861a> -<235b> <5969> -<235c> <5c37> -<235d> <636b> -<235e> <6476> +<22ff> <8ad7> +<2300> <8ac2> +<2301> <8ab6> +<2302> <8af6> +<2303> <8aeb> +<2304> <8b14> +<2305> <8b01> +<2306> <8ae4> +<2307> <8aed> +<2308> <8afc> +<2309> <8af3> +<230a> <8ae6> +<230b> <8aee> +<230c> <8ade> +<230d> <8b28> +<230e> <8b9c> +<230f> <8b16> +<2310> <8b1a> +<2311> <8b10> +<2312> <8b2b> +<2313> <8b2d> +<2314> <8b56> +<2315> <8b59> +<2316> <8b4e> +<2317> <8b9e> +<2318> <8b6b> +<2319> <8b96> +<231a> <9658> +<231b> <913a> +<231c> <9114> +<231d> <9134> +<231e> <90df> +<231f> <9136> +<2320> <9106> +<2321> <9148> +<2322> <82bb> +<2323> <52f1> +<2324> <5df0> +<2325> <580a> +<2326> <58d9> +<2327> <58e2> +<2328> <58e0> +<2329> <58da> +<232a> <57e1> +<232b> <584f> +<232c> <5816> +<232d> <5852> +<232e> <581d> +<232f> <5864> +<2330> <858c> +<2331> <8553> +<2332> <85f6> +<2333> <83a7> +<2334> <8407> +<2335> <84ef> +<2336> <82e7> +<2337> <8622> +<2338> <8526> +<2339> <584b> +<233a> <7162> +<233b> <8558> +<233c> <84fd> +<233d> <854e> +<233e> <8588> +<233f> <85ba> +<2340> <7296> +<2341> <6ece> +<2342> <8541> +<2343> <85ce> +<2344> <8552> +<2345> <84c0> +<2346> <8452> +<2347> <8464> +<2348> <8494> +<2349> <8435> +<234a> <859f> +<234b> <8555> +<234c> <9daf> +<234d> <8493> +<234e> <7e08> +<234f> <8546> +<2350> <8562> +<2351> <851e> +<2352> <9a40> +<2353> <863a> +<2354> <93a3> +<2355> <8577> +<2356> <861e> +<2357> <85fa> +<2358> <8604> +<2359> <85ea> +<235a> <861a> +<235b> <5969> +<235c> <5c37> +<235d> <636b> +<235e> <6476> +<235f> <649f> +<2360> <6451> +<2361> <645c> +<2362> <64b3> endbfchar 100 beginbfchar -<235f> <649f> -<2360> <6451> -<2361> <645c> -<2362> <64b3> -<2363> <6504> -<2364> <6516> -<2365> <64f7> -<2366> <64fc> -<2367> <651b> -<2368> <5630> -<2369> <5638> -<236a> <56c8> -<236b> <56a6> -<236c> <5504> -<236d> <54bc> -<236e> <5680> -<236f> <565d> -<2370> <5660> -<2371> <5635> -<2372> <55f6> -<2373> <5666> -<2374> <5672> -<2375> <568c> -<2376> <5665> -<2377> <561c> -<2378> <562e> -<2379> <55e9> -<237a> <5616> -<237b> <56c0> -<237c> <560d> -<237d> <56b3> -<237e> <56c1> -<237f> <566f> -<2380> <8f61> -<2381> <56b6> -<2382> <5695> -<2383> <5707> -<2384> <5e43> -<2385> <5e6c> -<2386> <5e58> -<2387> <5e57> -<2388> <5d87> -<2389> <5cf4> -<238a> <5d50> -<238b> <5d2c> -<238c> <5da7> -<238d> <5da0> -<238e> <5d97> -<238f> <5d0d> -<2390> <5db8> -<2391> <5d81> -<2392> <5dd4> -<2393> <5fa0> -<2394> <7377> -<2395> <7341> -<2396> <736a> -<2397> <733b> -<2398> <736b> -<2399> <7380> -<239a> <737c> -<239b> <98e0> -<239c> <9933> -<239d> <98e9> -<239e> <993c> -<23a1> <98ed> -<23a2> <98f4> -<23a3> <9909> -<23a4> <9911> -<23a5> <991b> -<23a6> <9937> -<23a7> <993f> -<23a8> <9943> -<23ac> <994c> -<23ad> <9962> -<23ae> <5ee1> -<23af> <8ce1> -<23b0> <61fa> -<23b1> <61ae> -<23b2> <616a> -<23b3> <613e> -<23b4> <60b5> -<23b5> <6134> -<23b6> <61cc> -<23b7> <615f> -<23b8> <61e8> -<23b9> <60fb> -<23ba> <6137> -<23bb> <60f2> -<23bc> <6173> -<23bd> <611c> -<23be> <6192> -<23bf> <9582> -<23c0> <9586> -<23c1> <95c8> -<23c2> <958e> -<23c3> <9594> -<23c4> <958c> -<23c5> <95e5> -<23c6> <95ad> -<23c7> <95ab> +<2363> <6504> +<2364> <6516> +<2365> <64f7> +<2366> <64fc> +<2367> <651b> +<2368> <5630> +<2369> <5638> +<236a> <56c8> +<236b> <56a6> +<236c> <5504> +<236d> <54bc> +<236e> <5680> +<236f> <565d> +<2370> <5660> +<2371> <5635> +<2372> <55f6> +<2373> <5666> +<2374> <5672> +<2375> <568c> +<2376> <5665> +<2377> <561c> +<2378> <562e> +<2379> <55e9> +<237a> <5616> +<237b> <56c0> +<237c> <560d> +<237d> <56b3> +<237e> <56c1> +<237f> <566f> +<2380> <8f61> +<2381> <56b6> +<2382> <5695> +<2383> <5707> +<2384> <5e43> +<2385> <5e6c> +<2386> <5e58> +<2387> <5e57> +<2388> <5d87> +<2389> <5cf4> +<238a> <5d50> +<238b> <5d2c> +<238c> <5da7> +<238d> <5da0> +<238e> <5d97> +<238f> <5d0d> +<2390> <5db8> +<2391> <5d81> +<2392> <5dd4> +<2393> <5fa0> +<2394> <7377> +<2395> <7341> +<2396> <736a> +<2397> <733b> +<2398> <736b> +<2399> <7380> +<239a> <737c> +<239b> <98e0> +<239c> <9933> +<239d> <98e9> +<239e> <993c> +<23a1> <98ed> +<23a2> <98f4> +<23a3> <9909> +<23a4> <9911> +<23a5> <991b> +<23a6> <9937> +<23a7> <993f> +<23a8> <9943> +<23ac> <994c> +<23ad> <9962> +<23ae> <5ee1> +<23af> <8ce1> +<23b0> <61fa> +<23b1> <61ae> +<23b2> <616a> +<23b3> <613e> +<23b4> <60b5> +<23b5> <6134> +<23b6> <61cc> +<23b7> <615f> +<23b8> <61e8> +<23b9> <60fb> +<23ba> <6137> +<23bb> <60f2> +<23bc> <6173> +<23bd> <611c> +<23be> <6192> +<23bf> <9582> +<23c0> <9586> +<23c1> <95c8> +<23c2> <958e> +<23c3> <9594> +<23c4> <958c> +<23c5> <95e5> +<23c6> <95ad> +<23c7> <95ab> +<23c8> <9b2e> +<23c9> <95ac> +<23ca> <95be> +<23cb> <95b6> endbfchar 100 beginbfchar -<23c8> <9b2e> -<23c9> <95ac> -<23ca> <95be> -<23cb> <95b6> -<23cc> <9b29> -<23cd> <95bf> -<23ce> <95bd> -<23cf> <95bc> -<23d0> <95c3> -<23d1> <95cb> -<23d2> <95d4> -<23d3> <95d0> -<23d4> <95d5> -<23d5> <95de> -<23d6> <7043> -<23d7> <6f59> -<23d8> <7027> -<23d9> <7018> -<23da> <6ffc> -<23db> <6d87> -<23dc> <6d79> -<23dd> <6e5e> -<23de> <6fae> -<23df> <700f> -<23e0> <6ef8> -<23e1> <6f6f> -<23e2> <6df6> -<23e3> <6f7f> -<23e4> <7006> -<23e5> <6fa0> -<23e6> <700b> -<23e7> <7067> -<23e8> <7044> -<23e9> <7005> -<23ea> <6f77> -<23eb> <7020> -<23ec> <701f> -<23ed> <7032> -<23ee> <7028> -<23ef> <705d> -<23f0> <9a2b> -<23f1> <9087> -<23f2> <9015> -<23f3> <9090> -<23f4> <5c68> -<23f5> <5f33> -<23f6> <5af5> -<23f7> <5ad7> -<23f8> <5b00> -<23f9> <5a6d> -<23fa> <5b08> -<23fb> <5b4c> -<23fc> <5aa7> -<23fd> <5afb> -<23fe> <5b0b> -<23ff> <5b21> -<2400> <5b2a> -<2401> <5b19> -<2402> <99d4> -<2403> <99df> -<2404> <99d9> -<2405> <9a36> -<2406> <9a5b> -<2407> <99d1> -<2408> <99d8> -<2409> <9a4d> -<240a> <9a4a> -<240b> <99e2> -<240c> <9a6a> -<240d> <9a0f> -<240e> <9a0d> -<240f> <9a05> -<2410> <9a42> -<2411> <9a2d> -<2412> <9a16> -<2413> <9a41> -<2414> <9a2e> -<2415> <9a38> -<2418> <9a4f> -<2419> <9a65> -<241a> <9a64> -<241b> <7cf9> -<241c> <7d06> -<241d> <7d02> -<2420> <7e8a> -<2421> <7d1c> -<2422> <7d15> -<2423> <7d13> -<2424> <7d3a> -<2425> <7d32> -<2426> <7d31> -<2427> <7e10> -<2428> <7d3c> -<2429> <7d40> -<242a> <7d3f> -<242b> <7d5d> -<242c> <7d4e> -<242d> <7d73> -<242e> <7d86> -<242f> <7d83> +<23cc> <9b29> +<23cd> <95bf> +<23ce> <95bd> +<23cf> <95bc> +<23d0> <95c3> +<23d1> <95cb> +<23d2> <95d4> +<23d3> <95d0> +<23d4> <95d5> +<23d5> <95de> +<23d6> <7043> +<23d7> <6f59> +<23d8> <7027> +<23d9> <7018> +<23da> <6ffc> +<23db> <6d87> +<23dc> <6d79> +<23dd> <6e5e> +<23de> <6fae> +<23df> <700f> +<23e0> <6ef8> +<23e1> <6f6f> +<23e2> <6df6> +<23e3> <6f7f> +<23e4> <7006> +<23e5> <6fa0> +<23e6> <700b> +<23e7> <7067> +<23e8> <7044> +<23e9> <7005> +<23ea> <6f77> +<23eb> <7020> +<23ec> <701f> +<23ed> <7032> +<23ee> <7028> +<23ef> <705d> +<23f0> <9a2b> +<23f1> <9087> +<23f2> <9015> +<23f3> <9090> +<23f4> <5c68> +<23f5> <5f33> +<23f6> <5af5> +<23f7> <5ad7> +<23f8> <5b00> +<23f9> <5a6d> +<23fa> <5b08> +<23fb> <5b4c> +<23fc> <5aa7> +<23fd> <5afb> +<23fe> <5b0b> +<23ff> <5b21> +<2400> <5b2a> +<2401> <5b19> +<2402> <99d4> +<2403> <99df> +<2404> <99d9> +<2405> <9a36> +<2406> <9a5b> +<2407> <99d1> +<2408> <99d8> +<2409> <9a4d> +<240a> <9a4a> +<240b> <99e2> +<240c> <9a6a> +<240d> <9a0f> +<240e> <9a0d> +<240f> <9a05> +<2410> <9a42> +<2411> <9a2d> +<2412> <9a16> +<2413> <9a41> +<2414> <9a2e> +<2415> <9a38> +<2418> <9a4f> +<2419> <9a65> +<241a> <9a64> +<241b> <7cf9> +<241c> <7d06> +<241d> <7d02> +<2420> <7e8a> +<2421> <7d1c> +<2422> <7d15> +<2423> <7d13> +<2424> <7d3a> +<2425> <7d32> +<2426> <7d31> +<2427> <7e10> +<2428> <7d3c> +<2429> <7d40> +<242a> <7d3f> +<242b> <7d5d> +<242c> <7d4e> +<242d> <7d73> +<242e> <7d86> +<242f> <7d83> +<2430> <7d88> +<2431> <7dbe> +<2432> <7dba> +<2433> <7dcb> endbfchar 100 beginbfchar -<2430> <7d88> -<2431> <7dbe> -<2432> <7dba> -<2433> <7dcb> -<2434> <7dd4> -<2435> <7dc4> -<2436> <7d9e> -<2437> <7dac> -<2438> <7db9> -<2439> <7da3> -<243a> <7db0> -<243b> <7dc7> -<243c> <7dd9> -<243d> <7dd7> -<243e> <7df9> -<243f> <7df2> -<2440> <7e62> -<2441> <7de6> -<2442> <7df6> -<2443> <7df1> -<2444> <7e0b> -<2445> <7de1> -<2446> <7e09> -<2447> <7e1d> -<2448> <7e1f> -<2449> <7e1e> -<244a> <7e2d> -<244b> <7e0a> -<244c> <7e11> -<244d> <7e7d> -<244e> <7e39> -<244f> <7e35> -<2450> <7e32> -<2451> <7e46> -<2452> <7e45> -<2453> <7e88> -<2454> <7e5a> -<2455> <7e52> -<2456> <7e6e> -<2457> <7e7e> -<2458> <7e70> -<2459> <7e6f> -<245a> <7e98> -<245b> <74a3> -<245c> <744b> -<245d> <74cf> -<245e> <980a> -<245f> <74bd> -<2460> <743f> -<2461> <7489> -<2462> <74a6> -<2463> <74d4> -<2464> <74da> -<2465> <97d9> -<2466> <97de> -<2467> <97dc> -<2468> <69aa> -<2469> <6aea> -<246a> <6898> -<246b> <68d6> -<246c> <6a05> -<246d> <689f> -<246e> <6adb> -<246f> <6af3> -<2470> <6ae8> -<2471> <6adf> -<2472> <6a89> -<2473> <690f> -<2474> <6a48> -<2475> <6968> -<2476> <69bf> -<2477> <6a3a> -<2478> <6a9c> -<2479> <6b12> -<247a> <6b1e> -<247b> <6add> -<247c> <69e7> -<247d> <6b0f> -<247e> <6b16> -<247f> <6aec> -<2480> <6ada> -<2481> <6af8> -<2482> <6ab3> -<2483> <6ae7> -<2484> <6aa3> -<2485> <6ad3> -<2486> <6ade> -<2487> <6ba4> -<2488> <6b9e> -<2489> <6bae> -<248a> <6bab> -<248b> <6baf> -<248c> <8ed4> -<248d> <8edb> -<248e> <8ef2> -<248f> <8efb> -<2490> <8f64> -<2491> <8ef9> -<2492> <8efc> -<2493> <8eeb> +<2434> <7dd4> +<2435> <7dc4> +<2436> <7d9e> +<2437> <7dac> +<2438> <7db9> +<2439> <7da3> +<243a> <7db0> +<243b> <7dc7> +<243c> <7dd9> +<243d> <7dd7> +<243e> <7df9> +<243f> <7df2> +<2440> <7e62> +<2441> <7de6> +<2442> <7df6> +<2443> <7df1> +<2444> <7e0b> +<2445> <7de1> +<2446> <7e09> +<2447> <7e1d> +<2448> <7e1f> +<2449> <7e1e> +<244a> <7e2d> +<244b> <7e0a> +<244c> <7e11> +<244d> <7e7d> +<244e> <7e39> +<244f> <7e35> +<2450> <7e32> +<2451> <7e46> +<2452> <7e45> +<2453> <7e88> +<2454> <7e5a> +<2455> <7e52> +<2456> <7e6e> +<2457> <7e7e> +<2458> <7e70> +<2459> <7e6f> +<245a> <7e98> +<245b> <74a3> +<245c> <744b> +<245d> <74cf> +<245e> <980a> +<245f> <74bd> +<2460> <743f> +<2461> <7489> +<2462> <74a6> +<2463> <74d4> +<2464> <74da> +<2465> <97d9> +<2466> <97de> +<2467> <97dc> +<2468> <69aa> +<2469> <6aea> +<246a> <6898> +<246b> <68d6> +<246c> <6a05> +<246d> <689f> +<246e> <6adb> +<246f> <6af3> +<2470> <6ae8> +<2471> <6adf> +<2472> <6a89> +<2473> <690f> +<2474> <6a48> +<2475> <6968> +<2476> <69bf> +<2477> <6a3a> +<2478> <6a9c> +<2479> <6b12> +<247a> <6b1e> +<247b> <6add> +<247c> <69e7> +<247d> <6b0f> +<247e> <6b16> +<247f> <6aec> +<2480> <6ada> +<2481> <6af8> +<2482> <6ab3> +<2483> <6ae7> +<2484> <6aa3> +<2485> <6ad3> +<2486> <6ade> +<2487> <6ba4> +<2488> <6b9e> +<2489> <6bae> +<248a> <6bab> +<248b> <6baf> +<248c> <8ed4> +<248d> <8edb> +<248e> <8ef2> +<248f> <8efb> +<2490> <8f64> +<2491> <8ef9> +<2492> <8efc> +<2493> <8eeb> +<2494> <8ee4> +<2495> <8f62> +<2496> <8efa> +<2497> <8efe> endbfchar 100 beginbfchar -<2494> <8ee4> -<2495> <8f62> -<2496> <8efa> -<2497> <8efe> -<2498> <8f0a> -<2499> <8f07> -<249a> <8f05> -<249b> <8f12> -<249c> <8f26> -<249f> <8f1c> -<24a0> <8f33> -<24a1> <8f46> -<24a2> <8f54> -<24a3> <6214> -<24a4> <6227> -<24a5> <750c> -<24a6> <66c7> -<24a7> <66c4> -<24a8> <6689> -<24a9> <66d6> -<24aa> <8cc1> -<24ab> <8cb0> -<24ac> <8cba> -<24ad> <8cbd> -<24ae> <8d04> -<24af> <8cb2> -<24b0> <8cc5> -<24b1> <8d10> -<24b2> <8cd1> -<24b3> <8cda> -<24b4> <8cd5> -<24b5> <8ceb> -<24b6> <8ce7> -<24b7> <8cfb> -<24b8> <8998> -<24b9> <89ac> -<24ba> <89a1> -<24bb> <89bf> -<24bc> <89a6> -<24bd> <89af> -<24be> <89b2> -<24bf> <89b7> -<24c0> <6bff> -<24c1> <6c0c> -<24c2> <6c2c> -<24c3> <7258> -<24c4> <6727> -<24c5> <8156> -<24c6> <81da> -<24c7> <811b> -<24c8> <81be> -<24c9> <8161> -<24ca> <81cf> -<24cb> <6b5f> -<24ce> <98b6> -<24cf> <98bc> -<24d0> <98c6> -<24d1> <98c8> -<24d2> <8f42> -<24d3> <9f4f> -<24d4> <6595> -<24d5> <716c> -<24d6> <7152> -<24d7> <7197> -<24d8> <71c1> -<24d9> <71dc> -<24da> <71fe> -<24db> <79b0> -<24dc> <798e> -<24dd> <79aa> -<24de> <61df> -<24df> <6164> -<24e0> <61e3> -<24e1> <6207> -<24e2> <6fa9> -<24e3> <78ef> -<24e4> <78ad> -<24e5> <7868> -<24e6> <78b8> -<24e7> <792a> -<24e8> <7931> -<24e9> <7864> -<24ea> <78fd> -<24eb> <78e7> -<24ec> <78e3> -<24ed> <9f95> -<24ee> <7798> -<24ef> <775e> -<24f0> <77bc> -<24f1> <7f86> -<24f2> <7f88> -<24f6> <91d9> -<24f7> <91d7> -<24f8> <91d5> -<24f9> <91f7> -<24fa> <91e7> -<24fb> <91e4> -<24fc> <9346> -<24fd> <91f5> -<24fe> <91f9> +<2498> <8f0a> +<2499> <8f07> +<249a> <8f05> +<249b> <8f12> +<249c> <8f26> +<249f> <8f1c> +<24a0> <8f33> +<24a1> <8f46> +<24a2> <8f54> +<24a3> <6214> +<24a4> <6227> +<24a5> <750c> +<24a6> <66c7> +<24a7> <66c4> +<24a8> <6689> +<24a9> <66d6> +<24aa> <8cc1> +<24ab> <8cb0> +<24ac> <8cba> +<24ad> <8cbd> +<24ae> <8d04> +<24af> <8cb2> +<24b0> <8cc5> +<24b1> <8d10> +<24b2> <8cd1> +<24b3> <8cda> +<24b4> <8cd5> +<24b5> <8ceb> +<24b6> <8ce7> +<24b7> <8cfb> +<24b8> <8998> +<24b9> <89ac> +<24ba> <89a1> +<24bb> <89bf> +<24bc> <89a6> +<24bd> <89af> +<24be> <89b2> +<24bf> <89b7> +<24c0> <6bff> +<24c1> <6c0c> +<24c2> <6c2c> +<24c3> <7258> +<24c4> <6727> +<24c5> <8156> +<24c6> <81da> +<24c7> <811b> +<24c8> <81be> +<24c9> <8161> +<24ca> <81cf> +<24cb> <6b5f> +<24ce> <98b6> +<24cf> <98bc> +<24d0> <98c6> +<24d1> <98c8> +<24d2> <8f42> +<24d3> <9f4f> +<24d4> <6595> +<24d5> <716c> +<24d6> <7152> +<24d7> <7197> +<24d8> <71c1> +<24d9> <71dc> +<24da> <71fe> +<24db> <79b0> +<24dc> <798e> +<24dd> <79aa> +<24de> <61df> +<24df> <6164> +<24e0> <61e3> +<24e1> <6207> +<24e2> <6fa9> +<24e3> <78ef> +<24e4> <78ad> +<24e5> <7868> +<24e6> <78b8> +<24e7> <792a> +<24e8> <7931> +<24e9> <7864> +<24ea> <78fd> +<24eb> <78e7> +<24ec> <78e3> +<24ed> <9f95> +<24ee> <7798> +<24ef> <775e> +<24f0> <77bc> +<24f1> <7f86> +<24f2> <7f88> +<24f6> <91d9> +<24f7> <91d7> +<24f8> <91d5> +<24f9> <91f7> +<24fa> <91e7> +<24fb> <91e4> +<24fc> <9346> +<24fd> <91f5> +<24fe> <91f9> +<24ff> <9208> +<2500> <9226> +<2501> <9245> +<2502> <9211> endbfchar 100 beginbfchar -<24ff> <9208> -<2500> <9226> -<2501> <9245> -<2502> <9211> -<2503> <9210> -<2504> <9201> -<2505> <9227> -<2506> <9204> -<2507> <9225> -<2508> <9200> -<2509> <923a> -<250a> <9266> -<250b> <9237> -<250c> <9233> -<250d> <9255> -<250e> <923d> -<250f> <9238> -<2510> <925e> -<2513> <923f> -<2514> <9460> -<2515> <9230> -<2516> <9249> -<2517> <9248> -<2518> <924d> -<2519> <922e> -<251a> <9239> -<251b> <9438> -<251c> <92ac> -<251d> <92a0> -<251e> <927a> -<251f> <92aa> -<2520> <92ee> -<2521> <92cf> -<2522> <9403> -<2523> <92e3> -<2524> <943a> -<2525> <92b1> -<2526> <92a6> -<2527> <93a7> -<2528> <9296> -<2529> <92cc> -<252a> <92a9> -<252b> <93f5> -<252c> <9293> -<252d> <927f> -<252e> <93a9> -<252f> <929a> -<2530> <931a> -<2531> <92ab> -<2532> <9283> -<2533> <940b> -<2534> <92a8> -<2535> <92a3> -<2536> <9412> -<2537> <9338> -<2538> <92f1> -<2539> <93d7> -<253a> <92e5> -<253b> <92f0> -<253c> <92ef> -<253d> <92e8> -<253e> <92bc> -<253f> <92dd> -<2540> <92f6> -<2543> <92c3> -<2544> <92df> -<2545> <92e6> -<2546> <9312> -<2547> <9306> -<2548> <9369> -<2549> <931b> -<254a> <9340> -<254b> <9301> -<254c> <9315> -<254d> <932e> -<254e> <9343> -<2551> <931f> -<2552> <9319> -<2553> <9365> -<2554> <9347> -<2555> <9376> -<2556> <9354> -<2557> <9364> -<2558> <93aa> -<2559> <9370> -<255a> <9384> -<255b> <93e4> -<255c> <93d8> -<255d> <9428> -<255e> <9387> -<255f> <93cc> -<2560> <9398> -<2561> <93b8> -<2562> <93bf> -<2563> <93a6> -<2564> <93b0> -<2565> <93b5> -<2566> <944c> -<2567> <93e2> -<256a> <93cd> +<2503> <9210> +<2504> <9201> +<2505> <9227> +<2506> <9204> +<2507> <9225> +<2508> <9200> +<2509> <923a> +<250a> <9266> +<250b> <9237> +<250c> <9233> +<250d> <9255> +<250e> <923d> +<250f> <9238> +<2510> <925e> +<2513> <923f> +<2514> <9460> +<2515> <9230> +<2516> <9249> +<2517> <9248> +<2518> <924d> +<2519> <922e> +<251a> <9239> +<251b> <9438> +<251c> <92ac> +<251d> <92a0> +<251e> <927a> +<251f> <92aa> +<2520> <92ee> +<2521> <92cf> +<2522> <9403> +<2523> <92e3> +<2524> <943a> +<2525> <92b1> +<2526> <92a6> +<2527> <93a7> +<2528> <9296> +<2529> <92cc> +<252a> <92a9> +<252b> <93f5> +<252c> <9293> +<252d> <927f> +<252e> <93a9> +<252f> <929a> +<2530> <931a> +<2531> <92ab> +<2532> <9283> +<2533> <940b> +<2534> <92a8> +<2535> <92a3> +<2536> <9412> +<2537> <9338> +<2538> <92f1> +<2539> <93d7> +<253a> <92e5> +<253b> <92f0> +<253c> <92ef> +<253d> <92e8> +<253e> <92bc> +<253f> <92dd> +<2540> <92f6> +<2543> <92c3> +<2544> <92df> +<2545> <92e6> +<2546> <9312> +<2547> <9306> +<2548> <9369> +<2549> <931b> +<254a> <9340> +<254b> <9301> +<254c> <9315> +<254d> <932e> +<254e> <9343> +<2551> <931f> +<2552> <9319> +<2553> <9365> +<2554> <9347> +<2555> <9376> +<2556> <9354> +<2557> <9364> +<2558> <93aa> +<2559> <9370> +<255a> <9384> +<255b> <93e4> +<255c> <93d8> +<255d> <9428> +<255e> <9387> +<255f> <93cc> +<2560> <9398> +<2561> <93b8> +<2562> <93bf> +<2563> <93a6> +<2564> <93b0> +<2565> <93b5> +<2566> <944c> +<2567> <93e2> +<256a> <93cd> +<256b> <93de> +<256c> <93c3> +<256d> <93c7> +<256e> <93d1> endbfchar 100 beginbfchar -<256b> <93de> -<256c> <93c3> -<256d> <93c7> -<256e> <93d1> -<256f> <9414> -<2570> <941d> -<2571> <93f7> -<2572> <9465> -<2573> <9413> -<2574> <946d> -<2575> <9420> -<2576> <9479> -<2577> <93f9> -<2578> <9419> -<2579> <944a> -<257a> <9432> -<257b> <943f> -<257c> <9454> -<257d> <9463> -<257e> <937e> -<257f> <7a61> -<2580> <9ce9> -<2581> <9cf6> -<2582> <9d07> -<2583> <9d06> -<2584> <9d23> -<2585> <9d87> -<2586> <9e15> -<2587> <9d1d> -<2588> <9d1f> -<2589> <9de5> -<258a> <9d2f> -<258b> <9dd9> -<258c> <9d30> -<258d> <9d42> -<258e> <9e1e> -<258f> <9d53> -<2590> <9e1d> -<2591> <9d60> -<2592> <9d52> -<2593> <9df3> -<2594> <9d5c> -<2595> <9d61> -<2596> <9d93> -<2597> <9d6a> -<2598> <9d6f> -<2599> <9d89> -<259a> <9d98> -<259b> <9d9a> -<259c> <9dc0> -<259d> <9da5> -<259e> <9da9> -<259f> <9dc2> -<25a0> <9dbc> -<25a1> <9e1a> -<25a2> <9dd3> -<25a3> <9dda> -<25a4> <9def> -<25a5> <9de6> -<25a6> <9df2> -<25a7> <9df8> -<25a8> <9e0c> -<25a9> <9dfa> -<25aa> <9e1b> -<25ab> <7664> -<25ac> <7658> -<25ad> <7667> -<25ae> <7602> -<25b1> <7649> -<25b2> <761e> -<25b3> <763b> -<25b6> <7669> -<25b7> <7672> -<25b8> <7ac7> -<25b9> <7ab6> -<25ba> <8960> -<25bb> <8933> -<25bc> <895d> -<25bd> <8947> -<25be> <8938> -<25bf> <8964> -<25c0> <76b8> -<25c1> <802e> -<25c2> <802c> -<25c3> <8079> -<25c4> <8075> -<25c5> <9807> -<25c8> <9821> -<25c9> <981c> -<25ca> <6f41> -<25cb> <9826> -<25cc> <9837> -<25cd> <984e> -<25ce> <9853> -<25cf> <9873> -<25d0> <9862> -<25d1> <9859> -<25d2> <9865> -<25d3> <986c> -<25d4> <9870> +<256f> <9414> +<2570> <941d> +<2571> <93f7> +<2572> <9465> +<2573> <9413> +<2574> <946d> +<2575> <9420> +<2576> <9479> +<2577> <93f9> +<2578> <9419> +<2579> <944a> +<257a> <9432> +<257b> <943f> +<257c> <9454> +<257d> <9463> +<257e> <937e> +<257f> <7a61> +<2580> <9ce9> +<2581> <9cf6> +<2582> <9d07> +<2583> <9d06> +<2584> <9d23> +<2585> <9d87> +<2586> <9e15> +<2587> <9d1d> +<2588> <9d1f> +<2589> <9de5> +<258a> <9d2f> +<258b> <9dd9> +<258c> <9d30> +<258d> <9d42> +<258e> <9e1e> +<258f> <9d53> +<2590> <9e1d> +<2591> <9d60> +<2592> <9d52> +<2593> <9df3> +<2594> <9d5c> +<2595> <9d61> +<2596> <9d93> +<2597> <9d6a> +<2598> <9d6f> +<2599> <9d89> +<259a> <9d98> +<259b> <9d9a> +<259c> <9dc0> +<259d> <9da5> +<259e> <9da9> +<259f> <9dc2> +<25a0> <9dbc> +<25a1> <9e1a> +<25a2> <9dd3> +<25a3> <9dda> +<25a4> <9def> +<25a5> <9de6> +<25a6> <9df2> +<25a7> <9df8> +<25a8> <9e0c> +<25a9> <9dfa> +<25aa> <9e1b> +<25ab> <7664> +<25ac> <7658> +<25ad> <7667> +<25ae> <7602> +<25b1> <7649> +<25b2> <761e> +<25b3> <763b> +<25b6> <7669> +<25b7> <7672> +<25b8> <7ac7> +<25b9> <7ab6> +<25ba> <8960> +<25bb> <8933> +<25bc> <895d> +<25bd> <8947> +<25be> <8938> +<25bf> <8964> +<25c0> <76b8> +<25c1> <802e> +<25c2> <802c> +<25c3> <8079> +<25c4> <8075> +<25c5> <9807> +<25c8> <9821> +<25c9> <981c> +<25ca> <6f41> +<25cb> <9826> +<25cc> <9837> +<25cd> <984e> +<25ce> <9853> +<25cf> <9873> +<25d0> <9862> +<25d1> <9859> +<25d2> <9865> +<25d3> <986c> +<25d4> <9870> +<25d5> <87e3> +<25d6> <8806> +<25d7> <8706> +<25d8> <8823> endbfchar 100 beginbfchar -<25d5> <87e3> -<25d6> <8806> -<25d7> <8706> -<25d8> <8823> -<25d9> <87f6> -<25da> <86fa> -<25db> <87ef> -<25dc> <8784> -<25dd> <8810> -<25de> <87c8> -<25df> <8811> -<25e0> <87bb> -<25e1> <87ce> -<25e2> <7f4c> -<25e3> <7be4> -<25e4> <7b67> -<25e5> <7c69> -<25e6> <7bf3> -<25e7> <7c00> -<25e8> <7bcb> -<25e9> <7c5c> -<25ea> <7c1e> -<25eb> <7c2b> -<25ec> <7c23> -<25ed> <7c6a> -<25ee> <7c5f> -<25ef> <8264> -<25f0> <826b> -<25f1> <88ca> -<25f2> <7fa5> -<25f3> <7cf2> -<25f4> <7cf6> -<25f5> <7cdd> -<25f6> <7e36> -<25f7> <9ea9> -<25f8> <8db2> -<25f9> <91c5> -<25fa> <91c3> -<25fb> <9e7a> -<25fc> <8e89> -<25fd> <8e4c> -<25fe> <8e92> -<25ff> <8e7a> -<2600> <8e55> -<2601> <8e9a> -<2602> <8e8b> -<2603> <8e93> -<2604> <8e91> -<2605> <8ea1> -<2606> <8e63> -<2607> <8eaa> -<2608> <8ea6> -<2609> <89f4> -<260a> <89f6> -<260b> <975a> -<260c> <9742> -<260d> <973d> -<260e> <9744> -<260f> <9f54> -<2610> <9f5f> -<2611> <9f59> -<2612> <9f60> -<2613> <9f5c> -<2614> <9f66> -<2615> <9f6c> -<2616> <9f6a> -<2617> <9f77> -<2618> <9efd> -<2619> <9eff> -<261a> <9f09> -<261b> <8b8e> -<261c> <947e> -<261d> <93e8> -<261e> <9b77> -<261f> <9b74> -<2620> <9b81> -<2621> <9b83> -<2622> <9b8e> -<2623> <9c78> -<2624> <7a4c> -<2625> <9b92> -<2626> <9c5f> -<2627> <9b90> -<2628> <9bad> -<2629> <9b9a> -<262a> <9baa> -<262b> <9b9e> -<262c> <9c6d> -<262d> <9bab> -<262e> <9b9d> -<262f> <9c58> -<2630> <9bc1> -<2631> <9c7a> -<2632> <9c31> -<2633> <9c39> -<2634> <9c23> -<2635> <9c37> -<2636> <9bc0> -<2637> <9bca> -<2638> <9bc7> +<25d9> <87f6> +<25da> <86fa> +<25db> <87ef> +<25dc> <8784> +<25dd> <8810> +<25de> <87c8> +<25df> <8811> +<25e0> <87bb> +<25e1> <87ce> +<25e2> <7f4c> +<25e3> <7be4> +<25e4> <7b67> +<25e5> <7c69> +<25e6> <7bf3> +<25e7> <7c00> +<25e8> <7bcb> +<25e9> <7c5c> +<25ea> <7c1e> +<25eb> <7c2b> +<25ec> <7c23> +<25ed> <7c6a> +<25ee> <7c5f> +<25ef> <8264> +<25f0> <826b> +<25f1> <88ca> +<25f2> <7fa5> +<25f3> <7cf2> +<25f4> <7cf6> +<25f5> <7cdd> +<25f6> <7e36> +<25f7> <9ea9> +<25f8> <8db2> +<25f9> <91c5> +<25fa> <91c3> +<25fb> <9e7a> +<25fc> <8e89> +<25fd> <8e4c> +<25fe> <8e92> +<25ff> <8e7a> +<2600> <8e55> +<2601> <8e9a> +<2602> <8e8b> +<2603> <8e93> +<2604> <8e91> +<2605> <8ea1> +<2606> <8e63> +<2607> <8eaa> +<2608> <8ea6> +<2609> <89f4> +<260a> <89f6> +<260b> <975a> +<260c> <9742> +<260d> <973d> +<260e> <9744> +<260f> <9f54> +<2610> <9f5f> +<2611> <9f59> +<2612> <9f60> +<2613> <9f5c> +<2614> <9f66> +<2615> <9f6c> +<2616> <9f6a> +<2617> <9f77> +<2618> <9efd> +<2619> <9eff> +<261a> <9f09> +<261b> <8b8e> +<261c> <947e> +<261d> <93e8> +<261e> <9b77> +<261f> <9b74> +<2620> <9b81> +<2621> <9b83> +<2622> <9b8e> +<2623> <9c78> +<2624> <7a4c> +<2625> <9b92> +<2626> <9c5f> +<2627> <9b90> +<2628> <9bad> +<2629> <9b9a> +<262a> <9baa> +<262b> <9b9e> +<262c> <9c6d> +<262d> <9bab> +<262e> <9b9d> +<262f> <9c58> +<2630> <9bc1> +<2631> <9c7a> +<2632> <9c31> +<2633> <9c39> +<2634> <9c23> +<2635> <9c37> +<2636> <9bc0> +<2637> <9bca> +<2638> <9bc7> +<2639> <9bfd> +<263a> <9bd6> +<263d> <9be1> +<263e> <9be4> endbfchar 100 beginbfchar -<2639> <9bfd> -<263a> <9bd6> -<263d> <9be1> -<263e> <9be4> -<263f> <9be7> -<2640> <9bdd> -<2641> <9be2> -<2642> <9bf0> -<2643> <9bdb> -<2644> <9bf4> -<2645> <9bd4> -<2646> <9c5d> -<2647> <9c08> -<2648> <9c10> -<2649> <9c0d> -<264a> <9c12> -<264b> <9c09> -<264c> <9bff> -<264d> <9c20> -<264e> <9c32> -<264f> <9c2d> -<2650> <9c28> -<2651> <9c25> -<2652> <9c29> -<2653> <9c33> -<2654> <9c3e> -<2655> <9c48> -<2656> <9c3b> -<2657> <9c35> -<2658> <9c45> -<2659> <9c56> -<265a> <9c54> -<265b> <9c52> -<265c> <9c67> -<265d> <97c3> -<265e> <97bd> -<265f> <97c9> -<2660> <9dbb> -<2661> <9acf> -<2662> <9ad6> -<2663> <9ad5> -<2664> <9b58> -<2665> <9b4e> -<2666> <9957> -<2667> <995c> -<2668> <9b22> -<2669> <9ef7> -<266a> <9ef2> -<266b> <896c> -<266c> <95c6> -<266d> <9336> -<266e> <5f46> -<266f> <8514> -<2670> <7e94> -<2671> <9f63> -<2672> <5679> -<2673> <9f15> -<2674> <5641> -<2675> <9aee> -<2676> <8907> -<2677> <7a40> -<2678> <98b3> -<2679> <95a4> -<267a> <9b0d> -<267b> <8ff4> -<267c> <5f59> -<267d> <7a6b> -<267e> <98e2> -<267f> <50a2> -<2680> <8591> -<2681> <5118> -<2682> <6372> -<2683> <524b> -<2684> <774f> -<2685> <7e8d> -<2686> <66c6> -<2687> <77ad> -<2688> <9e75> -<2689> <56c9> -<268a> <9ef4> -<268b> <6fdb> -<268c> <61de> -<268d> <77c7> -<268e> <7030> -<268f> <9eb5> -<2690> <884a> -<2691> <95e2> -<2692> <97c6> -<2693> <7c64> -<2694> <7e34> -<2695> <97a6> -<2696> <9eaf> -<2697> <56cc> -<2698> <98b1> -<2699> <6aaf> -<269a> <7f4e> -<269b> <7cf0> -<269c> <4fc2> -<269d> <7e6b> -<269e> <9e79> +<263f> <9be7> +<2640> <9bdd> +<2641> <9be2> +<2642> <9bf0> +<2643> <9bdb> +<2644> <9bf4> +<2645> <9bd4> +<2646> <9c5d> +<2647> <9c08> +<2648> <9c10> +<2649> <9c0d> +<264a> <9c12> +<264b> <9c09> +<264c> <9bff> +<264d> <9c20> +<264e> <9c32> +<264f> <9c2d> +<2650> <9c28> +<2651> <9c25> +<2652> <9c29> +<2653> <9c33> +<2654> <9c3e> +<2655> <9c48> +<2656> <9c3b> +<2657> <9c35> +<2658> <9c45> +<2659> <9c56> +<265a> <9c54> +<265b> <9c52> +<265c> <9c67> +<265d> <97c3> +<265e> <97bd> +<265f> <97c9> +<2660> <9dbb> +<2661> <9acf> +<2662> <9ad6> +<2663> <9ad5> +<2664> <9b58> +<2665> <9b4e> +<2666> <9957> +<2667> <995c> +<2668> <9b22> +<2669> <9ef7> +<266a> <9ef2> +<266b> <896c> +<266c> <95c6> +<266d> <9336> +<266e> <5f46> +<266f> <8514> +<2670> <7e94> +<2671> <9f63> +<2672> <5679> +<2673> <9f15> +<2674> <5641> +<2675> <9aee> +<2676> <8907> +<2677> <7a40> +<2678> <98b3> +<2679> <95a4> +<267a> <9b0d> +<267b> <8ff4> +<267c> <5f59> +<267d> <7a6b> +<267e> <98e2> +<267f> <50a2> +<2680> <8591> +<2681> <5118> +<2682> <6372> +<2683> <524b> +<2684> <774f> +<2685> <7e8d> +<2686> <66c6> +<2687> <77ad> +<2688> <9e75> +<2689> <56c9> +<268a> <9ef4> +<268b> <6fdb> +<268c> <61de> +<268d> <77c7> +<268e> <7030> +<268f> <9eb5> +<2690> <884a> +<2691> <95e2> +<2692> <97c6> +<2693> <7c64> +<2694> <7e34> +<2695> <97a6> +<2696> <9eaf> +<2697> <56cc> +<2698> <98b1> +<2699> <6aaf> +<269a> <7f4e> +<269b> <7cf0> +<269c> <4fc2> +<269d> <7e6b> +<269e> <9e79> +<269f> <56ae> +<26a0> <9b1a> +<26a1> <846f> +<26a2> <79a6> endbfchar 100 beginbfchar -<269f> <56ae> -<26a0> <9b1a> -<26a1> <846f> -<26a2> <79a6> -<26a3> <7c72> -<26a4> <9ad2> -<26a5> <96bb> -<26a6> <7dfb> -<26a7> <88fd> -<26a8> <7843> -<26b5> <02d9> -<26b6> <2013> -<26b7> <2015> -<26b8> <2025> -<26b9> <2035> -<26ba> <2105> -<26bb> <2109> -<26c0> <2215> -<26c1> <221f> -<26c2> <2223> -<26c3> <2252> -<26c6> <22bf> -<26ff> <25e2> -<2703> <2609> -<2704> <2295> -<2705> <3012> -<2711> <32a3> -<2717> <33a1> -<2718> <33c4> -<2719> <33ce> -<271c> <33d5> -<271d> <2025> -<271e> <ffe2> -<271f> <ffe4> -<2720> <2121> -<2721> <3231> -<2722> <2010> -<2723> <30fc> -<2728> <3006> -<274b> <303e> -<2758> <4e02> -<275c> <4e0f> -<275d> <4e12> -<275e> <4e17> -<2762> <4e23> -<2763> <4e26> -<2764> <4e29> -<2767> <4e31> -<2768> <4e33> -<2769> <4e35> -<276a> <4e37> -<276b> <4e3c> -<276f> <4e44> -<2770> <4e46> -<2771> <4e4a> -<2772> <4e51> -<2773> <4e55> -<2774> <4e57> -<2783> <4e72> -<2794> <4e87> -<2795> <4e8a> -<2796> <4e90> -<2799> <4e99> -<279c> <4ea3> -<279d> <4eaa> -<27a1> <4eb4> -<27a9> <4ec8> -<27aa> <4ecc> -<27ad> <4ed2> -<27b1> <4ee0> -<27b2> <4ee2> -<27b5> <4ee9> -<27b9> <4ef1> -<27ba> <4ef4> -<27be> <4efc> -<27bf> <4efe> -<27c0> <4f00> -<27d1> <4f21> -<27d2> <4f23> -<27d8> <4f31> -<27d9> <4f33> -<27da> <4f35> -<27db> <4f37> -<27dc> <4f39> -<27dd> <4f3b> -<27eb> <4f52> -<27ec> <4f54> -<27ed> <4f56> -<27f0> <4f66> -<27f1> <4f68> -<27f8> <4f75> -<27fd> <4f7d> -<2800> <4f82> -<2801> <4f85> -<2802> <4f87> -<2803> <4f8a> -<2804> <4f8c> -<2805> <4f8e> -<2806> <4f90> -<2809> <4f95> +<26a3> <7c72> +<26a4> <9ad2> +<26a5> <96bb> +<26a6> <7dfb> +<26a7> <88fd> +<26a8> <7843> +<26b5> <02d9> +<26b6> <2013> +<26b7> <2015> +<26b8> <2025> +<26b9> <2035> +<26ba> <2105> +<26bb> <2109> +<26c0> <2215> +<26c1> <221f> +<26c2> <2223> +<26c3> <2252> +<26c6> <22bf> +<26ff> <25e2> +<2703> <2609> +<2704> <2295> +<2705> <3012> +<2711> <32a3> +<2717> <33a1> +<2718> <33c4> +<2719> <33ce> +<271c> <33d5> +<271d> <fe30> +<271e> <ffe2> +<271f> <ffe4> +<2720> <2121> +<2721> <3231> +<2722> <2010> +<2723> <30fc> +<2728> <3006> +<274b> <303e> +<2758> <4e02> +<275c> <4e0f> +<275d> <4e12> +<275e> <4e17> +<2762> <4e23> +<2763> <4e26> +<2764> <4e29> +<2767> <4e31> +<2768> <4e33> +<2769> <4e35> +<276a> <4e37> +<276b> <4e3c> +<276f> <4e44> +<2770> <4e46> +<2771> <4e4a> +<2772> <4e51> +<2773> <4e55> +<2774> <4e57> +<2783> <4e72> +<2794> <4e87> +<2795> <4e8a> +<2796> <4e90> +<2799> <4e99> +<279c> <4ea3> +<279d> <4eaa> +<27a1> <4eb4> +<27a9> <4ec8> +<27aa> <4ecc> +<27ad> <4ed2> +<27b1> <4ee0> +<27b2> <4ee2> +<27b5> <4ee9> +<27b9> <4ef1> +<27ba> <4ef4> +<27be> <4efc> +<27bf> <4efe> +<27c0> <4f00> +<27d1> <4f21> +<27d2> <4f23> +<27d8> <4f31> +<27d9> <4f33> +<27da> <4f35> +<27db> <4f37> +<27dc> <4f39> +<27dd> <4f3b> +<27eb> <4f52> +<27ec> <4f54> +<27ed> <4f56> +<27f0> <4f66> +<27f1> <4f68> +<27f8> <4f75> +<27fd> <4f7d> +<2800> <4f82> +<2801> <4f85> +<2802> <4f87> +<2803> <4f8a> +<2804> <4f8c> +<2805> <4f8e> +<2806> <4f90> +<2809> <4f95> +<280d> <4f9c> +<2812> <4fa4> +<2813> <4fab> +<2814> <4fad> endbfchar 100 beginbfchar -<280d> <4f9c> -<2812> <4fa4> -<2813> <4fab> -<2814> <4fad> -<2831> <4fd9> -<2832> <4fdb> -<2833> <4fe2> -<2836> <4fe7> -<2839> <4ff0> -<283a> <4ff2> -<283f> <4ff9> -<2843> <4fff> -<284b> <500a> -<284c> <500e> -<284d> <5010> -<284e> <5013> -<2852> <501b> -<2855> <5020> -<2859> <5027> -<2865> <503b> -<2866> <503d> -<2870> <504d> -<287a> <505b> -<28a7> <5097> -<28b0> <50a4> -<28b1> <50a6> -<28b8> <50b6> -<28ca> <50d0> -<28e1> <50f4> -<28e5> <50fa> -<28ea> <5101> -<28eb> <5103> -<28ec> <5105> -<28ed> <510a> -<28f2> <5111> -<28f3> <5113> -<28fc> <5120> -<2914> <5142> -<2915> <5147> -<2916> <514a> -<2917> <514c> -<291b> <5153> -<291f> <515b> -<2929> <516a> -<292a> <516f> -<292b> <5172> -<292c> <517a> -<293b> <5198> -<293c> <519a> -<2940> <51a1> -<2941> <51a3> -<2949> <51b4> -<2952> <51c5> -<2953> <51c8> -<2954> <51ca> -<2955> <51ce> -<2956> <51d0> -<2960> <51dc> -<296b> <51ec> -<296c> <51ee> -<296d> <51f2> -<296e> <51f4> -<296f> <51f7> -<2970> <51fe> -<2973> <5209> -<297b> <521c> -<2984> <522a> -<2985> <522c> -<2986> <522f> -<298b> <523c> -<298c> <523e> -<2995> <5255> -<299a> <525d> -<29a0> <5266> -<29a1> <5268> -<29a7> <5273> -<29af> <527e> -<29b0> <5280> -<29b4> <528b> -<29b7> <5292> -<29bf> <529c> -<29d1> <52c0> -<29d2> <52c2> -<29d6> <52c8> -<29d7> <52ca> -<29dc> <52d1> -<29df> <52d7> -<29e0> <52da> -<29e1> <52dc> -<29e4> <52e3> -<29fc> <5307> -<2a00> <530c> -<2a01> <530e> -<2a06> <5318> -<2a0b> <5322> -<2a13> <5330> -<2a1d> <5342> -<2a1e> <5344> -<2a1f> <5346> -<2a23> <5350> +<2831> <4fd9> +<2832> <4fdb> +<2833> <4fe2> +<2836> <4fe7> +<2839> <4ff0> +<283a> <4ff2> +<283f> <4ff9> +<2843> <4fff> +<284b> <500a> +<284c> <500e> +<284d> <5010> +<284e> <5013> +<2852> <501b> +<2855> <5020> +<2859> <5027> +<2865> <503b> +<2866> <503d> +<2870> <504d> +<287a> <505b> +<28a7> <5097> +<28b0> <50a4> +<28b1> <50a6> +<28b8> <50b6> +<28ca> <50d0> +<28e1> <50f4> +<28e5> <50fa> +<28ea> <5101> +<28eb> <5103> +<28ec> <5105> +<28ed> <510a> +<28f2> <5111> +<28f3> <5113> +<28fc> <5120> +<2914> <5142> +<2915> <5147> +<2916> <514a> +<2917> <514c> +<291b> <5153> +<291f> <515b> +<2929> <516a> +<292a> <516f> +<292b> <5172> +<292c> <517a> +<293b> <5198> +<293c> <519a> +<2940> <51a1> +<2941> <51a3> +<2949> <51b4> +<2952> <51c5> +<2953> <51c8> +<2954> <51ca> +<2955> <51ce> +<2956> <51d0> +<2960> <51dc> +<296b> <51ec> +<296c> <51ee> +<296d> <51f2> +<296e> <51f4> +<296f> <51f7> +<2970> <51fe> +<2973> <5209> +<297b> <521c> +<2984> <522a> +<2985> <522c> +<2986> <522f> +<298b> <523c> +<298c> <523e> +<2995> <5255> +<299a> <525d> +<29a0> <5266> +<29a1> <5268> +<29a7> <5273> +<29af> <527e> +<29b0> <5280> +<29b4> <528b> +<29b7> <5292> +<29bf> <529c> +<29d1> <52c0> +<29d2> <52c2> +<29d6> <52c8> +<29d7> <52ca> +<29dc> <52d1> +<29df> <52d7> +<29e0> <52da> +<29e1> <52dc> +<29e4> <52e3> +<29fc> <5307> +<2a00> <530c> +<2a01> <530e> +<2a06> <5318> +<2a0b> <5322> +<2a13> <5330> +<2a1d> <5342> +<2a1e> <5344> +<2a1f> <5346> +<2a23> <5350> +<2a26> <535b> +<2a27> <535d> +<2a28> <5365> +<2a29> <5368> endbfchar 100 beginbfchar -<2a26> <535b> -<2a27> <535d> -<2a28> <5365> -<2a29> <5368> -<2a2a> <536a> -<2a2d> <5372> -<2a2e> <5376> -<2a2f> <5379> -<2a36> <5383> -<2a39> <538a> -<2a45> <539e> -<2a46> <53a1> -<2a47> <53a4> -<2a48> <53a7> -<2a4f> <53b3> -<2a50> <53b5> -<2a58> <53c0> -<2a62> <53d5> -<2a63> <53da> -<2a67> <53e1> -<2a68> <53e7> -<2a69> <53f4> -<2a6a> <53fa> -<2a6e> <5402> -<2a6f> <5405> -<2a70> <5407> -<2a71> <540b> -<2a72> <5414> -<2a76> <541c> -<2a77> <5422> -<2a7a> <542a> -<2a7b> <5430> -<2a7c> <5433> -<2a7f> <543a> -<2a80> <543d> -<2a81> <543f> -<2a86> <5447> -<2a87> <5449> -<2a8c> <5451> -<2a8d> <545a> -<2a93> <5463> -<2a94> <5465> -<2a95> <5467> -<2a9e> <5474> -<2aa3> <5481> -<2aa4> <5483> -<2aa5> <5485> -<2aaa> <548d> -<2aab> <5491> -<2aac> <5493> -<2aaf> <549c> -<2ab5> <54a5> -<2ab6> <54ae> -<2ab7> <54b0> -<2ab8> <54b2> -<2abe> <54be> -<2abf> <54c3> -<2ac0> <54c5> -<2ac3> <54d6> -<2ac4> <54d8> -<2ac5> <54db> -<2ac6> <54e0> -<2ad5> <54fb> -<2ad6> <54fe> -<2ad7> <5500> -<2ada> <5505> -<2adb> <5508> -<2aed> <5521> -<2af2> <552b> -<2af3> <552d> -<2af4> <5532> -<2afc> <553d> -<2afd> <5540> -<2afe> <5542> -<2aff> <5545> -<2b08> <5554> -<2b0e> <555d> -<2b15> <556b> -<2b1e> <557d> -<2b1f> <557f> -<2b25> <5590> -<2b2d> <559e> -<2b37> <55ab> -<2b38> <55ad> -<2b3b> <55b4> -<2b3c> <55b6> -<2b3d> <55b8> -<2b3e> <55ba> -<2b3f> <55bc> -<2b45> <55c8> -<2b4a> <55d5> -<2b4e> <55db> -<2b4f> <55de> -<2b50> <55e0> -<2b51> <55e2> -<2b52> <55e7> -<2b57> <55f4> -<2b5d> <55ff> -<2b62> <5607> -<2b69> <5615> +<2a2a> <536a> +<2a2d> <5372> +<2a2e> <5376> +<2a2f> <5379> +<2a36> <5383> +<2a39> <538a> +<2a45> <539e> +<2a46> <53a1> +<2a47> <53a4> +<2a48> <53a7> +<2a4f> <53b3> +<2a50> <53b5> +<2a58> <53c0> +<2a62> <53d5> +<2a63> <53da> +<2a67> <53e1> +<2a68> <53e7> +<2a69> <53f4> +<2a6a> <53fa> +<2a6e> <5402> +<2a6f> <5405> +<2a70> <5407> +<2a71> <540b> +<2a72> <5414> +<2a76> <541c> +<2a77> <5422> +<2a7a> <542a> +<2a7b> <5430> +<2a7c> <5433> +<2a7f> <543a> +<2a80> <543d> +<2a81> <543f> +<2a86> <5447> +<2a87> <5449> +<2a8c> <5451> +<2a8d> <545a> +<2a93> <5463> +<2a94> <5465> +<2a95> <5467> +<2a9e> <5474> +<2aa3> <5481> +<2aa4> <5483> +<2aa5> <5485> +<2aaa> <548d> +<2aab> <5491> +<2aac> <5493> +<2aaf> <549c> +<2ab5> <54a5> +<2ab6> <54ae> +<2ab7> <54b0> +<2ab8> <54b2> +<2abe> <54be> +<2abf> <54c3> +<2ac0> <54c5> +<2ac3> <54d6> +<2ac4> <54d8> +<2ac5> <54db> +<2ac6> <54e0> +<2ad5> <54fb> +<2ad6> <54fe> +<2ad7> <5500> +<2ada> <5505> +<2adb> <5508> +<2aed> <5521> +<2af2> <552b> +<2af3> <552d> +<2af4> <5532> +<2afc> <553d> +<2afd> <5540> +<2afe> <5542> +<2aff> <5545> +<2b08> <5554> +<2b0e> <555d> +<2b15> <556b> +<2b1e> <557d> +<2b1f> <557f> +<2b25> <5590> +<2b2d> <559e> +<2b37> <55ab> +<2b38> <55ad> +<2b3b> <55b4> +<2b3c> <55b6> +<2b3d> <55b8> +<2b3e> <55ba> +<2b3f> <55bc> +<2b45> <55c8> +<2b4a> <55d5> +<2b4e> <55db> +<2b4f> <55de> +<2b50> <55e0> +<2b51> <55e2> +<2b52> <55e7> +<2b57> <55f4> +<2b5d> <55ff> +<2b62> <5607> +<2b69> <5615> +<2b6c> <561d> +<2b72> <5628> +<2b75> <5633> +<2b76> <5637> endbfchar 100 beginbfchar -<2b6c> <561d> -<2b72> <5628> -<2b75> <5633> -<2b76> <5637> -<2b77> <563a> -<2b7b> <5640> -<2b91> <5661> -<2b92> <5663> -<2b93> <5667> -<2b96> <5670> -<2b97> <5673> -<2b98> <5675> -<2b99> <5677> -<2b9a> <567a> -<2ba6> <568d> -<2baa> <5694> -<2bb9> <56a7> -<2bc2> <56b5> -<2bce> <56cb> -<2bd9> <56dc> -<2bda> <56e3> -<2be1> <56ec> -<2bee> <5705> -<2bef> <570c> -<2bf6> <5717> -<2bff> <5724> -<2c03> <572b> -<2c0d> <573f> -<2c0e> <5741> -<2c15> <574b> -<2c1f> <5765> -<2c20> <5767> -<2c21> <576c> -<2c22> <576e> -<2c44> <57a5> -<2c45> <57a8> -<2c46> <57aa> -<2c47> <57ac> -<2c4b> <57b3> -<2c63> <57d3> -<2c68> <57de> -<2c73> <57ee> -<2c7e> <5801> -<2c83> <580c> -<2c8f> <581f> -<2cb0> <584e> -<2cb1> <5850> -<2cb2> <5853> -<2cbd> <5863> -<2cd2> <587f> -<2cd3> <5882> -<2cd4> <5884> -<2ce4> <589b> -<2ce5> <589d> -<2cfd> <58bd> -<2d03> <58c6> -<2d0d> <58d2> -<2d0e> <58d4> -<2d14> <58e1> -<2d15> <58e3> -<2d1a> <58ea> -<2d1b> <58ed> -<2d28> <5903> -<2d30> <590e> -<2d37> <591b> -<2d3c> <5923> -<2d3d> <5926> -<2d3e> <5928> -<2d3f> <592c> -<2d40> <5930> -<2d45> <593b> -<2d46> <593d> -<2d49> <5943> -<2d4c> <594a> -<2d4f> <5950> -<2d52> <5959> -<2d58> <5961> -<2d5e> <596b> -<2d5f> <596d> -<2d64> <5975> -<2d65> <5977> -<2d6c> <5985> -<2d6d> <5989> -<2d76> <5998> -<2d8a> <59ba> -<2d9d> <59d9> -<2d9e> <59db> -<2da4> <59e4> -<2db6> <59fa> -<2dba> <5a00> -<2dbb> <5a02> -<2dc2> <5a12> -<2dce> <5a24> -<2dd9> <5a33> -<2dda> <5a35> -<2e00> <5a65> -<2e3e> <5ab4> -<2e54> <5ad3> -<2e55> <5ad5> -<2e5c> <5ae2> +<2b77> <563a> +<2b7b> <5640> +<2b91> <5661> +<2b92> <5663> +<2b93> <5667> +<2b96> <5670> +<2b97> <5673> +<2b98> <5675> +<2b99> <5677> +<2b9a> <567a> +<2ba6> <568d> +<2baa> <5694> +<2bb9> <56a7> +<2bc2> <56b5> +<2bce> <56cb> +<2bd9> <56dc> +<2bda> <56e3> +<2be1> <56ec> +<2bee> <5705> +<2bef> <570c> +<2bf6> <5717> +<2bff> <5724> +<2c03> <572b> +<2c0d> <573f> +<2c0e> <5741> +<2c15> <574b> +<2c1f> <5765> +<2c20> <5767> +<2c21> <576c> +<2c22> <576e> +<2c44> <57a5> +<2c45> <57a8> +<2c46> <57aa> +<2c47> <57ac> +<2c4b> <57b3> +<2c63> <57d3> +<2c68> <57de> +<2c73> <57ee> +<2c7e> <5801> +<2c83> <580c> +<2c8f> <581f> +<2cb0> <584e> +<2cb1> <5850> +<2cb2> <5853> +<2cbd> <5863> +<2cd2> <587f> +<2cd3> <5882> +<2cd4> <5884> +<2ce4> <589b> +<2ce5> <589d> +<2cfd> <58bd> +<2d03> <58c6> +<2d0d> <58d2> +<2d0e> <58d4> +<2d14> <58e1> +<2d15> <58e3> +<2d1a> <58ea> +<2d1b> <58ed> +<2d28> <5903> +<2d30> <590e> +<2d37> <591b> +<2d3c> <5923> +<2d3d> <5926> +<2d3e> <5928> +<2d3f> <592c> +<2d40> <5930> +<2d45> <593b> +<2d46> <593d> +<2d49> <5943> +<2d4c> <594a> +<2d4f> <5950> +<2d52> <5959> +<2d58> <5961> +<2d5e> <596b> +<2d5f> <596d> +<2d64> <5975> +<2d65> <5977> +<2d6c> <5985> +<2d6d> <5989> +<2d76> <5998> +<2d8a> <59ba> +<2d9d> <59d9> +<2d9e> <59db> +<2da4> <59e4> +<2db6> <59fa> +<2dba> <5a00> +<2dbb> <5a02> +<2dc2> <5a12> +<2dce> <5a24> +<2dd9> <5a33> +<2dda> <5a35> +<2e00> <5a65> +<2e3e> <5ab4> +<2e54> <5ad3> +<2e55> <5ad5> +<2e5c> <5ae2> +<2e61> <5aea> +<2e7a> <5b0a> +<2e84> <5b18> +<2e99> <5b31> endbfchar 100 beginbfchar -<2e61> <5aea> -<2e7a> <5b0a> -<2e84> <5b18> -<2e99> <5b31> -<2e9a> <5b33> -<2eb2> <5b52> -<2eb3> <5b56> -<2eb4> <5b5e> -<2ebc> <5b72> -<2ebd> <5b74> -<2ec0> <5b79> -<2ec3> <5b7e> -<2ec4> <5b82> -<2ec5> <5b86> -<2ec6> <5b8a> -<2ecc> <5b94> -<2ecd> <5b96> -<2ece> <5b9f> -<2ed8> <5bb7> -<2ede> <5bc3> -<2ee6> <5bd1> -<2ef0> <5be0> -<2ef1> <5be3> -<2ef2> <5bea> -<2ef3> <5bed> -<2ef4> <5bef> -<2ef9> <5bf7> -<2efc> <5c00> -<2eff> <5c05> -<2f00> <5c0c> -<2f01> <5c10> -<2f04> <5c17> -<2f05> <5c19> -<2f06> <5c1b> -<2f0b> <5c23> -<2f0c> <5c26> -<2f29> <5c5f> -<2f2a> <5c67> -<2f2e> <5c6d> -<2f2f> <5c70> -<2f3b> <5c80> -<2f48> <5c95> -<2f52> <5caa> -<2f56> <5cb2> -<2f57> <5cb4> -<2f58> <5cb6> -<2f5d> <5cbe> -<2f5e> <5cc0> -<2f7c> <5ce7> -<2f7d> <5ce9> -<2f85> <5cf5> -<2f8a> <5cfc> -<2f9b> <5d15> -<2fa6> <5d25> -<2fa7> <5d28> -<2fcd> <5d5c> -<2fd9> <5d6a> -<2fec> <5d83> -<2ffe> <5d98> -<2fff> <5d9a> -<3019> <5db9> -<301a> <5dbb> -<3028> <5dcc> -<302d> <5dd3> -<3034> <5ddc> -<3039> <5dea> -<3045> <5e04> -<3046> <5e07> -<304e> <5e17> -<3059> <5e2c> -<305c> <5e32> -<3063> <5e41> -<3071> <5e56> -<3076> <5e60> -<3083> <5e75> -<3084> <5e77> -<3088> <5e85> -<308e> <5e92> -<308f> <5e98> -<3090> <5e9b> -<3091> <5e9d> -<3099> <5eac> -<309f> <5eb4> -<30c1> <5ee9> -<30c2> <5eeb> -<30c9> <5ef5> -<30d2> <5f09> -<30d6> <5f10> -<30d7> <5f12> -<30d8> <5f14> -<30d9> <5f16> -<30e3> <5f28> -<30e6> <5f2e> -<30e7> <5f30> -<30e8> <5f32> -<30e9> <5f34> -<30ed> <5f3b> -<30f6> <5f47> -<30fa> <5f4d> -<30fb> <5f4f> +<2e9a> <5b33> +<2eb2> <5b52> +<2eb3> <5b56> +<2eb4> <5b5e> +<2ebc> <5b72> +<2ebd> <5b74> +<2ec0> <5b79> +<2ec3> <5b7e> +<2ec4> <5b82> +<2ec5> <5b86> +<2ec6> <5b8a> +<2ecc> <5b94> +<2ecd> <5b96> +<2ece> <5b9f> +<2ed8> <5bb7> +<2ede> <5bc3> +<2ee6> <5bd1> +<2ef0> <5be0> +<2ef1> <5be3> +<2ef2> <5bea> +<2ef3> <5bed> +<2ef4> <5bef> +<2ef9> <5bf7> +<2efc> <5c00> +<2eff> <5c05> +<2f00> <5c0c> +<2f01> <5c10> +<2f04> <5c17> +<2f05> <5c19> +<2f06> <5c1b> +<2f0b> <5c23> +<2f0c> <5c26> +<2f29> <5c5f> +<2f2a> <5c67> +<2f2e> <5c6d> +<2f2f> <5c70> +<2f3b> <5c80> +<2f48> <5c95> +<2f52> <5caa> +<2f56> <5cb2> +<2f57> <5cb4> +<2f58> <5cb6> +<2f5d> <5cbe> +<2f5e> <5cc0> +<2f7c> <5ce7> +<2f7d> <5ce9> +<2f85> <5cf5> +<2f8a> <5cfc> +<2f9b> <5d15> +<2fa6> <5d25> +<2fa7> <5d28> +<2fcd> <5d5c> +<2fd9> <5d6a> +<2fec> <5d83> +<2ffe> <5d98> +<2fff> <5d9a> +<3019> <5db9> +<301a> <5dbb> +<3028> <5dcc> +<302d> <5dd3> +<3034> <5ddc> +<3039> <5dea> +<3045> <5e04> +<3046> <5e07> +<304e> <5e17> +<3059> <5e2c> +<305c> <5e32> +<3063> <5e41> +<3071> <5e56> +<3076> <5e60> +<3083> <5e75> +<3084> <5e77> +<3088> <5e85> +<308e> <5e92> +<308f> <5e98> +<3090> <5e9b> +<3091> <5e9d> +<3099> <5eac> +<309f> <5eb4> +<30c1> <5ee9> +<30c2> <5eeb> +<30c9> <5ef5> +<30d2> <5f09> +<30d6> <5f10> +<30d7> <5f12> +<30d8> <5f14> +<30d9> <5f16> +<30e3> <5f28> +<30e6> <5f2e> +<30e7> <5f30> +<30e8> <5f32> +<30e9> <5f34> +<30ed> <5f3b> +<30f6> <5f47> +<30fa> <5f4d> +<30fb> <5f4f> +<30fc> <5f51> +<30fd> <5f54> +<3100> <5f5c> +<3104> <5f63> endbfchar 100 beginbfchar -<30fc> <5f51> -<30fd> <5f54> -<3100> <5f5c> -<3104> <5f63> -<3105> <5f65> -<3108> <5f6b> -<310b> <5f72> -<310f> <5f78> -<3110> <5f7a> -<3114> <5f83> -<3115> <5f86> -<311b> <5f96> -<311e> <5f9d> -<311f> <5f9f> -<312e> <5fb6> -<312f> <5fb8> -<313b> <5fce> -<314a> <5fec> -<3154> <5ffc> -<315c> <6013> -<315f> <601a> -<3174> <6040> -<317c> <604c> -<317f> <6051> -<318d> <606e> -<3192> <6077> -<3193> <607e> -<31a1> <6093> -<31a2> <6095> -<31a6> <609c> -<31a7> <609e> -<31ac> <60a7> -<31af> <60ae> -<31b0> <60b0> -<31b1> <60b3> -<31b2> <60b7> -<31ca> <60d9> -<31cb> <60db> -<31cc> <60de> -<31d1> <60ea> -<31d2> <60f5> -<31dd> <6107> -<31ee> <6125> -<320a> <6149> -<320b> <614d> -<3213> <6159> -<3216> <615e> -<321b> <6169> -<321e> <616f> -<3221> <6174> -<3235> <618f> -<3236> <6193> -<3246> <61aa> -<3247> <61ad> -<325f> <61d3> -<326e> <61e7> -<327a> <61f9> -<327b> <61fb> -<327c> <61fd> -<3282> <6209> -<3283> <6213> -<3284> <6219> -<3288> <6220> -<3289> <6223> -<328a> <6226> -<328d> <622b> -<328e> <622d> -<328f> <622f> -<3290> <6231> -<3298> <6242> -<329c> <624a> -<32ad> <6268> -<32b6> <627d> -<32c4> <6294> -<32c5> <6299> -<32c9> <62a3> -<32d8> <62ba> -<32d9> <62be> -<32dc> <62c3> -<32dd> <62cb> -<32de> <62cf> -<32df> <62d1> -<32e0> <62d5> -<32e5> <62e4> -<32e8> <62f0> -<32e9> <62f2> -<32ea> <62f5> -<32ef> <6300> -<3300> <6319> -<3301> <631c> -<3304> <6329> -<3315> <6344> -<3318> <634a> -<3325> <6360> -<3329> <636a> -<332a> <636c> -<3336> <6381> -<3339> <638b> -<333a> <638d> -<333b> <6391> +<3105> <5f65> +<3108> <5f6b> +<310b> <5f72> +<310f> <5f78> +<3110> <5f7a> +<3114> <5f83> +<3115> <5f86> +<311b> <5f96> +<311e> <5f9d> +<311f> <5f9f> +<312e> <5fb6> +<312f> <5fb8> +<313b> <5fce> +<314a> <5fec> +<3154> <5ffc> +<315c> <6013> +<315f> <601a> +<3174> <6040> +<317c> <604c> +<317f> <6051> +<318d> <606e> +<3192> <6077> +<3193> <607e> +<31a1> <6093> +<31a2> <6095> +<31a6> <609c> +<31a7> <609e> +<31ac> <60a7> +<31af> <60ae> +<31b0> <60b0> +<31b1> <60b3> +<31b2> <60b7> +<31ca> <60d9> +<31cb> <60db> +<31cc> <60de> +<31d1> <60ea> +<31d2> <60f5> +<31dd> <6107> +<31ee> <6125> +<320a> <6149> +<320b> <614d> +<3213> <6159> +<3216> <615e> +<321b> <6169> +<321e> <616f> +<3221> <6174> +<3235> <618f> +<3236> <6193> +<3246> <61aa> +<3247> <61ad> +<325f> <61d3> +<326e> <61e7> +<327a> <61f9> +<327b> <61fb> +<327c> <61fd> +<3282> <6209> +<3283> <6213> +<3284> <6219> +<3288> <6220> +<3289> <6223> +<328a> <6226> +<328d> <622b> +<328e> <622d> +<328f> <622f> +<3290> <6231> +<3298> <6242> +<329c> <624a> +<32ad> <6268> +<32b6> <627d> +<32c4> <6294> +<32c5> <6299> +<32c9> <62a3> +<32d8> <62ba> +<32d9> <62be> +<32dc> <62c3> +<32dd> <62cb> +<32de> <62cf> +<32df> <62d1> +<32e0> <62d5> +<32e5> <62e4> +<32e8> <62f0> +<32e9> <62f2> +<32ea> <62f5> +<32ef> <6300> +<3300> <6319> +<3301> <631c> +<3304> <6329> +<3315> <6344> +<3318> <634a> +<3325> <6360> +<3329> <636a> +<332a> <636c> +<3336> <6381> +<3339> <638b> +<333a> <638d> +<333b> <6391> +<333f> <6397> +<3347> <63a1> +<3348> <63a4> +<3349> <63a6> endbfchar 100 beginbfchar -<333f> <6397> -<3347> <63a1> -<3348> <63a4> -<3349> <63a6> -<334a> <63ab> -<334b> <63af> -<3350> <63b9> -<3351> <63bb> -<3352> <63bd> -<3353> <63bf> -<3357> <63c5> -<335d> <63d1> -<3367> <63df> -<3368> <63e2> -<3373> <63f3> -<3374> <63f5> -<3375> <63f7> -<337a> <63fe> -<3382> <640e> -<338a> <641d> -<338b> <641f> -<3393> <642b> -<339a> <6435> -<33a0> <643e> -<33a1> <6440> -<33a4> <6449> -<33ab> <6453> -<33b2> <645d> -<33ba> <6468> -<33be> <646e> -<33c4> <6477> -<33cb> <6483> -<33cc> <6486> -<33d5> <6494> -<33e2> <64aa> -<33e3> <64af> -<33e4> <64b1> -<33e5> <64b4> -<33e6> <64b6> -<33e7> <64b9> -<33e8> <64bd> -<33e9> <64c3> -<33ea> <64c6> -<33ed> <64cc> -<33ee> <64cf> -<33ef> <64d1> -<33f0> <64d3> -<33f3> <64d9> -<33f7> <64df> -<33f8> <64e1> -<33f9> <64e3> -<33fa> <64e5> -<3402> <64f3> -<3407> <64fd> -<3408> <64ff> -<340c> <6505> -<3416> <6513> -<3417> <6515> -<3418> <6517> -<3419> <651a> -<341a> <651c> -<3423> <652d> -<3428> <6537> -<3429> <653a> -<3437> <6550> -<343b> <6558> -<343c> <655a> -<343d> <655c> -<344a> <6571> -<344b> <6573> -<344c> <6576> -<345f> <6592> -<3460> <6594> -<3461> <6596> -<3462> <6598> -<3463> <659a> -<3466> <65a0> -<3469> <65a6> -<346a> <65a8> -<346b> <65aa> -<346c> <65ae> -<3473> <65b8> -<3479> <65c2> -<347e> <65cd> -<348c> <65e1> -<349c> <6601> -<34a2> <660b> -<34a3> <660d> -<34ad> <661e> -<34b2> <6626> -<34b7> <662e> -<34b8> <6630> -<34c0> <663d> -<34d2> <665e> -<34d3> <6660> -<34d6> <6665> -<34d7> <6667> -<34e0> <6675> -<34e9> <6683> -<34ff> <66a3> +<334a> <63ab> +<334b> <63af> +<3350> <63b9> +<3351> <63bb> +<3352> <63bd> +<3353> <63bf> +<3357> <63c5> +<335d> <63d1> +<3367> <63df> +<3368> <63e2> +<3373> <63f3> +<3374> <63f5> +<3375> <63f7> +<337a> <63fe> +<3382> <640e> +<338a> <641d> +<338b> <641f> +<3393> <642b> +<339a> <6435> +<33a0> <643e> +<33a1> <6440> +<33a4> <6449> +<33ab> <6453> +<33b2> <645d> +<33ba> <6468> +<33be> <646e> +<33c4> <6477> +<33cb> <6483> +<33cc> <6486> +<33d5> <6494> +<33e2> <64aa> +<33e3> <64af> +<33e4> <64b1> +<33e5> <64b4> +<33e6> <64b6> +<33e7> <64b9> +<33e8> <64bd> +<33e9> <64c3> +<33ea> <64c6> +<33ed> <64cc> +<33ee> <64cf> +<33ef> <64d1> +<33f0> <64d3> +<33f3> <64d9> +<33f7> <64df> +<33f8> <64e1> +<33f9> <64e3> +<33fa> <64e5> +<3402> <64f3> +<3407> <64fd> +<3408> <64ff> +<340c> <6505> +<3416> <6513> +<3417> <6515> +<3418> <6517> +<3419> <651a> +<341a> <651c> +<3423> <652d> +<3428> <6537> +<3429> <653a> +<3437> <6550> +<343b> <6558> +<343c> <655a> +<343d> <655c> +<344a> <6571> +<344b> <6573> +<344c> <6576> +<345f> <6592> +<3460> <6594> +<3461> <6596> +<3462> <6598> +<3463> <659a> +<3466> <65a0> +<3469> <65a6> +<346a> <65a8> +<346b> <65aa> +<346c> <65ae> +<3473> <65b8> +<3479> <65c2> +<347e> <65cd> +<348c> <65e1> +<349c> <6601> +<34a2> <660b> +<34a3> <660d> +<34ad> <661e> +<34b2> <6626> +<34b7> <662e> +<34b8> <6630> +<34c0> <663d> +<34d2> <665e> +<34d3> <6660> +<34d6> <6665> +<34d7> <6667> +<34e0> <6675> +<34e9> <6683> +<34ff> <66a3> +<3519> <66c5> +<351a> <66c8> +<3529> <66da> +<3538> <66f1> endbfchar 100 beginbfchar -<3519> <66c5> -<351a> <66c8> -<3529> <66da> -<3538> <66f1> -<353d> <66fd> -<3544> <670c> -<354a> <6716> -<354e> <671c> -<354f> <671e> -<3556> <6729> -<3557> <672e> -<3558> <6730> -<3563> <6741> -<3566> <6747> -<3569> <674d> -<356a> <6752> -<3572> <675d> -<357a> <676e> -<357b> <6774> -<357c> <6776> -<3581> <677d> -<3582> <6780> -<3587> <6788> -<3588> <678a> -<3591> <6796> -<3592> <6799> -<3593> <679b> -<3597> <67a4> -<3598> <67a6> -<3599> <67a9> -<359a> <67ac> -<359b> <67ae> -<359e> <67b4> -<35a7> <67c2> -<35b5> <67db> -<35b6> <67df> -<35b7> <67e1> -<35c1> <67f2> -<35ca> <67fe> -<35cf> <6806> -<35d0> <680d> -<35d1> <6810> -<35d2> <6812> -<35f0> <683f> -<35f1> <6847> -<35f2> <684b> -<35f3> <684d> -<35f4> <684f> -<35f5> <6852> -<3600> <686a> -<3609> <6875> -<3613> <6882> -<3614> <6884> -<3627> <689e> -<3631> <68ae> -<3634> <68b4> -<363f> <68c1> -<3646> <68ca> -<3647> <68cc> -<364e> <68d9> -<365e> <68ef> -<3665> <68fb> -<3672> <690c> -<3673> <6911> -<3697> <693e> -<36af> <695f> -<36b4> <6967> -<36b7> <696c> -<36bd> <6976> -<36c3> <6981> -<36c4> <6983> -<36c5> <6985> -<36dd> <69a9> -<36de> <69ac> -<36eb> <69c0> -<36f4> <69cf> -<3700> <69de> -<3719> <69fe> -<371a> <6a00> -<3730> <6a20> -<3731> <6a22> -<3736> <6a29> -<373b> <6a30> -<3757> <6a5a> -<375b> <6a60> -<3780> <6a8f> -<378c> <6aa1> -<3792> <6aaa> -<37ba> <6adc> -<37c2> <6ae9> -<37c3> <6aeb> -<37ed> <6b1f> -<37fe> <6b38> -<37ff> <6b3b> -<3800> <6b3c> -<3807> <6b48> -<381a> <6b60> -<3828> <6b7a> -<382d> <6b85> -<382e> <6b88> +<353d> <66fd> +<3544> <670c> +<354a> <6716> +<354e> <671c> +<354f> <671e> +<3556> <6729> +<3557> <672e> +<3558> <6730> +<3563> <6741> +<3566> <6747> +<3569> <674d> +<356a> <6752> +<3572> <675d> +<357a> <676e> +<357b> <6774> +<357c> <6776> +<3581> <677d> +<3582> <6780> +<3587> <6788> +<3588> <678a> +<3591> <6796> +<3592> <6799> +<3593> <679b> +<3597> <67a4> +<3598> <67a6> +<3599> <67a9> +<359a> <67ac> +<359b> <67ae> +<359e> <67b4> +<35a7> <67c2> +<35b5> <67db> +<35b6> <67df> +<35b7> <67e1> +<35c1> <67f2> +<35ca> <67fe> +<35cf> <6806> +<35d0> <680d> +<35d1> <6810> +<35d2> <6812> +<35f0> <683f> +<35f1> <6847> +<35f2> <684b> +<35f3> <684d> +<35f4> <684f> +<35f5> <6852> +<3600> <686a> +<3609> <6875> +<3613> <6882> +<3614> <6884> +<3627> <689e> +<3631> <68ae> +<3634> <68b4> +<363f> <68c1> +<3646> <68ca> +<3647> <68cc> +<364e> <68d9> +<365e> <68ef> +<3665> <68fb> +<3672> <690c> +<3673> <6911> +<3697> <693e> +<36af> <695f> +<36b4> <6967> +<36b7> <696c> +<36bd> <6976> +<36c3> <6981> +<36c4> <6983> +<36c5> <6985> +<36dd> <69a9> +<36de> <69ac> +<36eb> <69c0> +<36f4> <69cf> +<3700> <69de> +<3719> <69fe> +<371a> <6a00> +<3730> <6a20> +<3731> <6a22> +<3736> <6a29> +<373b> <6a30> +<3757> <6a5a> +<375b> <6a60> +<3780> <6a8f> +<378c> <6aa1> +<3792> <6aaa> +<37ba> <6adc> +<37c2> <6ae9> +<37c3> <6aeb> +<37ed> <6b1f> +<37fe> <6b38> +<37ff> <6b3b> +<3800> <6b3c> +<3807> <6b48> +<381a> <6b60> +<3828> <6b7a> +<382d> <6b85> +<382e> <6b88> +<382f> <6b8c> +<3836> <6b97> +<3837> <6b99> +<3847> <6bb6> endbfchar 100 beginbfchar -<382f> <6b8c> -<3836> <6b97> -<3837> <6b99> -<3847> <6bb6> -<384d> <6bc0> -<3854> <6bcc> -<3855> <6bce> -<3858> <6bd8> -<3859> <6bda> -<386d> <6bf4> -<3874> <6bfe> -<387d> <6c0e> -<387e> <6c12> -<387f> <6c17> -<3883> <6c20> -<3884> <6c25> -<3885> <6c2d> -<3886> <6c31> -<3887> <6c33> -<3893> <6c48> -<389c> <6c56> -<38aa> <6c71> -<38ab> <6c73> -<38ac> <6c75> -<38b4> <6c84> -<38b5> <6c87> -<38c0> <6c9a> -<38c4> <6ca0> -<38c5> <6ca2> -<38c6> <6ca8> -<38c7> <6cac> -<38ce> <6cba> -<38d6> <6ccb> -<38e1> <6cdf> -<38e2> <6ce4> -<38e5> <6ce9> -<38e8> <6cf2> -<38e9> <6cf4> -<38ea> <6cf9> -<38f4> <6d0d> -<38fc> <6d18> -<38ff> <6d1f> -<3905> <6d26> -<390c> <6d34> -<3910> <6d3a> -<3913> <6d42> -<3914> <6d44> -<3915> <6d49> -<3916> <6d4c> -<3917> <6d50> -<391c> <6d5b> -<391d> <6d5d> -<391e> <6d5f> -<3937> <6d86> -<393a> <6d8d> -<393d> <6d92> -<3943> <6d9c> -<3944> <6da2> -<3945> <6da5> -<3962> <6dd7> -<3966> <6ddf> -<3969> <6de5> -<396d> <6ded> -<3970> <6df2> -<3971> <6df4> -<3972> <6df8> -<397f> <6e0b> -<3980> <6e0f> -<3983> <6e15> -<398a> <6e22> -<398d> <6e2a> -<398e> <6e2e> -<3991> <6e33> -<3995> <6e39> -<39a9> <6e55> -<39aa> <6e57> -<39cd> <6e84> -<39da> <6e97> -<39de> <6e9e> -<39e3> <6ea6> -<39ea> <6eb0> -<39eb> <6eb3> -<39ec> <6eb5> -<39ef> <6ebc> -<39f3> <6ec3> -<39f4> <6ec6> -<39f8> <6ecd> -<39f9> <6ed0> -<39fa> <6ed2> -<39fb> <6ed6> -<3a00> <6edd> -<3a01> <6ee3> -<3a02> <6ee7> -<3a09> <6ef3> -<3a11> <6f00> -<3a28> <6f21> -<3a2d> <6f2e> -<3a2e> <6f30> -<3a31> <6f37> -<3a37> <6f40> +<384d> <6bc0> +<3854> <6bcc> +<3855> <6bce> +<3858> <6bd8> +<3859> <6bda> +<386d> <6bf4> +<3874> <6bfe> +<387d> <6c0e> +<387e> <6c12> +<387f> <6c17> +<3883> <6c20> +<3884> <6c25> +<3885> <6c2d> +<3886> <6c31> +<3887> <6c33> +<3893> <6c48> +<389c> <6c56> +<38aa> <6c71> +<38ab> <6c73> +<38ac> <6c75> +<38b4> <6c84> +<38b5> <6c87> +<38c0> <6c9a> +<38c4> <6ca0> +<38c5> <6ca2> +<38c6> <6ca8> +<38c7> <6cac> +<38ce> <6cba> +<38d6> <6ccb> +<38e1> <6cdf> +<38e2> <6ce4> +<38e5> <6ce9> +<38e8> <6cf2> +<38e9> <6cf4> +<38ea> <6cf9> +<38f4> <6d0d> +<38fc> <6d18> +<38ff> <6d1f> +<3905> <6d26> +<390c> <6d34> +<3910> <6d3a> +<3913> <6d42> +<3914> <6d44> +<3915> <6d49> +<3916> <6d4c> +<3917> <6d50> +<391c> <6d5b> +<391d> <6d5d> +<391e> <6d5f> +<3937> <6d86> +<393a> <6d8d> +<393d> <6d92> +<3943> <6d9c> +<3944> <6da2> +<3945> <6da5> +<3962> <6dd7> +<3966> <6ddf> +<3969> <6de5> +<396d> <6ded> +<3970> <6df2> +<3971> <6df4> +<3972> <6df8> +<397f> <6e0b> +<3980> <6e0f> +<3983> <6e15> +<398a> <6e22> +<398d> <6e2a> +<398e> <6e2e> +<3991> <6e33> +<3995> <6e39> +<39a9> <6e55> +<39aa> <6e57> +<39cd> <6e84> +<39da> <6e97> +<39de> <6e9e> +<39e3> <6ea6> +<39ea> <6eb0> +<39eb> <6eb3> +<39ec> <6eb5> +<39ef> <6ebc> +<39f3> <6ec3> +<39f4> <6ec6> +<39f8> <6ecd> +<39f9> <6ed0> +<39fa> <6ed2> +<39fb> <6ed6> +<3a00> <6edd> +<3a01> <6ee3> +<3a02> <6ee7> +<3a09> <6ef3> +<3a11> <6f00> +<3a28> <6f21> +<3a2d> <6f2e> +<3a2e> <6f30> +<3a31> <6f37> +<3a37> <6f40> +<3a3f> <6f4c> +<3a4a> <6f5d> +<3a4e> <6f63> +<3a4f> <6f65> endbfchar 100 beginbfchar -<3a3f> <6f4c> -<3a4a> <6f5d> -<3a4e> <6f63> -<3a4f> <6f65> -<3a56> <6f71> -<3a57> <6f73> -<3a5a> <6f79> -<3a5b> <6f7b> -<3a61> <6f85> -<3a77> <6fa8> -<3a7e> <6fb2> -<3aaf> <6ffb> -<3ab0> <6ffd> -<3ab9> <700a> -<3abd> <7010> -<3ac3> <7019> -<3ac4> <701c> -<3ac5> <701e> -<3ad2> <7031> -<3ae9> <7050> -<3afc> <706e> -<3b00> <7074> -<3b01> <7077> -<3b05> <707d> -<3b13> <7093> -<3b25> <70b0> -<3b26> <70b2> -<3b2a> <70ba> -<3b31> <70c9> -<3b3e> <70da> -<3b46> <70e5> -<3b47> <70ea> -<3b48> <70ee> -<3b4f> <70f8> -<3b65> <7114> -<3b66> <7117> -<3b8e> <714b> -<3b8f> <714d> -<3b9c> <715d> -<3ba0> <7163> -<3ba1> <7165> -<3ba4> <716d> -<3bac> <7179> -<3bc0> <7193> -<3bd6> <71b2> -<3bd7> <71b4> -<3be1> <71c2> -<3bee> <71d3> -<3bff> <71ef> -<3c0a> <71fd> -<3c24> <721c> -<3c2f> <7229> -<3c30> <722b> -<3c36> <723c> -<3c48> <7257> -<3c49> <725a> -<3c4a> <725c> -<3c4b> <725e> -<3c4c> <7260> -<3c50> <7268> -<3c65> <728c> -<3c66> <728e> -<3c7e> <72ae> -<3c82> <72b5> -<3c90> <72cf> -<3c91> <72d1> -<3c96> <72d8> -<3c9b> <72df> -<3ca9> <7302> -<3cb7> <7314> -<3cc2> <732d> -<3cc7> <7335> -<3cc8> <733a> -<3ccb> <7340> -<3cd7> <7351> -<3ceb> <7369> -<3cec> <736e> -<3ced> <7371> -<3cf0> <7376> -<3cf1> <7379> -<3cf2> <737d> -<3cf3> <737f> -<3cf9> <7388> -<3cfa> <738a> -<3cff> <7392> -<3d12> <73aa> -<3d15> <73b1> -<3d1f> <73c1> -<3d27> <73ce> -<3d33> <73df> -<3d38> <73e6> -<3d39> <73e8> -<3d50> <7404> -<3d68> <7427> -<3d69> <7429> -<3d6a> <742b> -<3d6b> <742d> -<3d6c> <742f> -<3d76> <7440> -<3d89> <7456> +<3a56> <6f71> +<3a57> <6f73> +<3a5a> <6f79> +<3a5b> <6f7b> +<3a61> <6f85> +<3a77> <6fa8> +<3a7e> <6fb2> +<3aaf> <6ffb> +<3ab0> <6ffd> +<3ab9> <700a> +<3abd> <7010> +<3ac3> <7019> +<3ac4> <701c> +<3ac5> <701e> +<3ad2> <7031> +<3ae9> <7050> +<3afc> <706e> +<3b00> <7074> +<3b01> <7077> +<3b05> <707d> +<3b13> <7093> +<3b25> <70b0> +<3b26> <70b2> +<3b2a> <70ba> +<3b31> <70c9> +<3b3e> <70da> +<3b46> <70e5> +<3b47> <70ea> +<3b48> <70ee> +<3b4f> <70f8> +<3b65> <7114> +<3b66> <7117> +<3b8e> <714b> +<3b8f> <714d> +<3b9c> <715d> +<3ba0> <7163> +<3ba1> <7165> +<3ba4> <716d> +<3bac> <7179> +<3bc0> <7193> +<3bd6> <71b2> +<3bd7> <71b4> +<3be1> <71c2> +<3bee> <71d3> +<3bff> <71ef> +<3c0a> <71fd> +<3c24> <721c> +<3c2f> <7229> +<3c30> <722b> +<3c36> <723c> +<3c48> <7257> +<3c49> <725a> +<3c4a> <725c> +<3c4b> <725e> +<3c4c> <7260> +<3c50> <7268> +<3c65> <728c> +<3c66> <728e> +<3c7e> <72ae> +<3c82> <72b5> +<3c90> <72cf> +<3c91> <72d1> +<3c96> <72d8> +<3c9b> <72df> +<3ca9> <7302> +<3cb7> <7314> +<3cc2> <732d> +<3cc7> <7335> +<3cc8> <733a> +<3ccb> <7340> +<3cd7> <7351> +<3ceb> <7369> +<3cec> <736e> +<3ced> <7371> +<3cf0> <7376> +<3cf1> <7379> +<3cf2> <737d> +<3cf3> <737f> +<3cf9> <7388> +<3cfa> <738a> +<3cff> <7392> +<3d12> <73aa> +<3d15> <73b1> +<3d1f> <73c1> +<3d27> <73ce> +<3d33> <73df> +<3d38> <73e6> +<3d39> <73e8> +<3d50> <7404> +<3d68> <7427> +<3d69> <7429> +<3d6a> <742b> +<3d6b> <742d> +<3d6c> <742f> +<3d76> <7440> +<3d89> <7456> +<3d8a> <7458> +<3d8b> <745d> +<3da3> <747f> +<3da4> <7482> endbfchar 100 beginbfchar -<3d8a> <7458> -<3d8b> <745d> -<3da3> <747f> -<3da4> <7482> -<3da8> <7488> -<3da9> <748a> -<3dac> <748f> -<3db8> <749d> -<3de2> <74d3> -<3de8> <74db> -<3de9> <74dd> -<3dea> <74df> -<3deb> <74e1> -<3dec> <74e5> -<3df8> <74f5> -<3e0b> <750e> -<3e0c> <7510> -<3e0d> <7512> -<3e12> <751b> -<3e18> <7524> -<3e1b> <752a> -<3e1c> <752e> -<3e1d> <7534> -<3e1e> <7536> -<3e1f> <7539> -<3e22> <753f> -<3e2b> <754d> -<3e43> <7573> -<3e44> <7575> -<3e45> <7577> -<3e56> <7590> -<3e57> <7593> -<3e58> <7595> -<3e59> <7598> -<3e5c> <759e> -<3e5d> <75a2> -<3e63> <75ad> -<3e6b> <75c6> -<3e72> <75d3> -<3e73> <75d7> -<3e74> <75da> -<3e7a> <75e5> -<3e7b> <75e9> -<3e8a> <7604> -<3e95> <7616> -<3e96> <761a> -<3e99> <7623> -<3e9a> <7628> -<3e9b> <762c> -<3ea4> <763d> -<3ea5> <7641> -<3ea8> <7648> -<3eb1> <7655> -<3eb2> <7657> -<3eb6> <765d> -<3eb9> <7666> -<3eba> <7668> -<3ebb> <766a> -<3ec6> <7683> -<3ec7> <7685> -<3ece> <7692> -<3ee7> <76b3> -<3eeb> <76b9> -<3ef4> <76c7> -<3ef5> <76c9> -<3ef8> <76d3> -<3ef9> <76d5> -<3efe> <76e0> -<3eff> <76e2> -<3f00> <76e6> -<3f07> <76f0> -<3f08> <76f3> -<3f0e> <76fd> -<3f15> <770a> -<3f16> <770c> -<3f26> <7721> -<3f2a> <7727> -<3f2e> <772e> -<3f34> <7739> -<3f35> <773b> -<3f39> <7742> -<3f50> <7764> -<3f51> <7767> -<3f78> <77a1> -<3f7b> <77a6> -<3f7c> <77a8> -<3f7d> <77ab> -<3f82> <77b4> -<3f88> <77be> -<3fa5> <77e4> -<3fa6> <77e6> -<3fa7> <77e8> -<3fa8> <77ea> -<3fae> <77f7> -<3fbe> <7813> -<3fbf> <7815> -<3fc0> <7819> -<3fc1> <781b> -<3fc2> <781e> -<3fc6> <7824> +<3da8> <7488> +<3da9> <748a> +<3dac> <748f> +<3db8> <749d> +<3de2> <74d3> +<3de8> <74db> +<3de9> <74dd> +<3dea> <74df> +<3deb> <74e1> +<3dec> <74e5> +<3df8> <74f5> +<3e0b> <750e> +<3e0c> <7510> +<3e0d> <7512> +<3e12> <751b> +<3e18> <7524> +<3e1b> <752a> +<3e1c> <752e> +<3e1d> <7534> +<3e1e> <7536> +<3e1f> <7539> +<3e22> <753f> +<3e2b> <754d> +<3e43> <7573> +<3e44> <7575> +<3e45> <7577> +<3e56> <7590> +<3e57> <7593> +<3e58> <7595> +<3e59> <7598> +<3e5c> <759e> +<3e5d> <75a2> +<3e63> <75ad> +<3e6b> <75c6> +<3e72> <75d3> +<3e73> <75d7> +<3e74> <75da> +<3e7a> <75e5> +<3e7b> <75e9> +<3e8a> <7604> +<3e95> <7616> +<3e96> <761a> +<3e99> <7623> +<3e9a> <7628> +<3e9b> <762c> +<3ea4> <763d> +<3ea5> <7641> +<3ea8> <7648> +<3eb1> <7655> +<3eb2> <7657> +<3eb6> <765d> +<3eb9> <7666> +<3eba> <7668> +<3ebb> <766a> +<3ec6> <7683> +<3ec7> <7685> +<3ece> <7692> +<3ee7> <76b3> +<3eeb> <76b9> +<3ef4> <76c7> +<3ef5> <76c9> +<3ef8> <76d3> +<3ef9> <76d5> +<3efe> <76e0> +<3eff> <76e2> +<3f00> <76e6> +<3f07> <76f0> +<3f08> <76f3> +<3f0e> <76fd> +<3f15> <770a> +<3f16> <770c> +<3f26> <7721> +<3f2a> <7727> +<3f2e> <772e> +<3f34> <7739> +<3f35> <773b> +<3f39> <7742> +<3f50> <7764> +<3f51> <7767> +<3f78> <77a1> +<3f7b> <77a6> +<3f7c> <77a8> +<3f7d> <77ab> +<3f82> <77b4> +<3f88> <77be> +<3fa5> <77e4> +<3fa6> <77e6> +<3fa7> <77e8> +<3fa8> <77ea> +<3fae> <77f7> +<3fbe> <7813> +<3fbf> <7815> +<3fc0> <7819> +<3fc1> <781b> +<3fc2> <781e> +<3fc6> <7824> +<3fc7> <7828> +<3fd1> <783d> +<3fd2> <783f> +<3fd5> <7844> endbfchar 100 beginbfchar -<3fc7> <7828> -<3fd1> <783d> -<3fd2> <783f> -<3fd5> <7844> -<3fd6> <7846> -<3fdb> <784d> -<3fdc> <784f> -<3fdd> <7851> -<3fee> <7869> -<4004> <7888> -<4009> <7892> -<400d> <7899> -<4010> <78a0> -<4011> <78a2> -<4012> <78a4> -<4013> <78a6> -<4014> <78a8> -<401d> <78bb> -<401e> <78bd> -<4043> <78f3> -<406a> <7925> -<4079> <793d> -<407a> <793f> -<407f> <7947> -<408d> <7961> -<4090> <7966> -<4095> <796e> -<409d> <7979> -<40c5> <79af> -<40c6> <79b2> -<40cc> <79bc> -<40cd> <79bf> -<40ce> <79c2> -<40d3> <79ca> -<40d4> <79cc> -<40e5> <79e5> -<40e6> <79e8> -<40e7> <79ea> -<40e8> <79ec> -<40e9> <79ee> -<40f3> <79fc> -<40f6> <7a01> -<40fd> <7a0c> -<410a> <7a1f> -<4119> <7a32> -<411d> <7a38> -<411e> <7a3a> -<411f> <7a3e> -<4140> <7a6a> -<4148> <7a75> -<414d> <7a82> -<414e> <7a85> -<414f> <7a87> -<415c> <7a9e> -<4161> <7aa7> -<4162> <7aab> -<4174> <7ac6> -<4175> <7ac9> -<4188> <7ae4> -<418e> <7aee> -<4199> <7afe> -<419d> <7b05> -<419e> <7b07> -<419f> <7b09> -<41a3> <7b10> -<41a9> <7b1a> -<41ac> <7b1f> -<41b0> <7b27> -<41b1> <7b29> -<41b2> <7b2d> -<41b5> <7b32> -<41ba> <7b39> -<41bb> <7b3b> -<41bc> <7b3d> -<41c3> <7b48> -<41c4> <7b4a> -<41c7> <7b53> -<41c8> <7b55> -<41c9> <7b57> -<41ca> <7b59> -<41cb> <7b5c> -<41ce> <7b61> -<41dd> <7b76> -<41de> <7b78> -<41df> <7b7a> -<41e2> <7b7f> -<41ec> <7b8c> -<41f2> <7b96> -<420e> <7bc5> -<420f> <7bc8> -<4210> <7bca> -<4215> <7bd2> -<4229> <7bf2> -<4231> <7bfd> -<4232> <7bff> -<423c> <7c0e> -<424a> <7c20> -<424b> <7c22> -<4260> <7c42> -<4280> <7c6b> +<3fd6> <7846> +<3fdb> <784d> +<3fdc> <784f> +<3fdd> <7851> +<3fee> <7869> +<4004> <7888> +<4009> <7892> +<400d> <7899> +<4010> <78a0> +<4011> <78a2> +<4012> <78a4> +<4013> <78a6> +<4014> <78a8> +<401d> <78bb> +<401e> <78bd> +<4043> <78f3> +<406a> <7925> +<4079> <793d> +<407a> <793f> +<407f> <7947> +<408d> <7961> +<4090> <7966> +<4095> <796e> +<409d> <7979> +<40c5> <79af> +<40c6> <79b2> +<40cc> <79bc> +<40cd> <79bf> +<40ce> <79c2> +<40d3> <79ca> +<40d4> <79cc> +<40e5> <79e5> +<40e6> <79e8> +<40e7> <79ea> +<40e8> <79ec> +<40e9> <79ee> +<40f3> <79fc> +<40f6> <7a01> +<40fd> <7a0c> +<410a> <7a1f> +<4119> <7a32> +<411d> <7a38> +<411e> <7a3a> +<411f> <7a3e> +<4140> <7a6a> +<4148> <7a75> +<414d> <7a82> +<414e> <7a85> +<414f> <7a87> +<415c> <7a9e> +<4161> <7aa7> +<4162> <7aab> +<4174> <7ac6> +<4175> <7ac9> +<4188> <7ae4> +<418e> <7aee> +<4199> <7afe> +<419d> <7b05> +<419e> <7b07> +<419f> <7b09> +<41a3> <7b10> +<41a9> <7b1a> +<41ac> <7b1f> +<41b0> <7b27> +<41b1> <7b29> +<41b2> <7b2d> +<41b5> <7b32> +<41ba> <7b39> +<41bb> <7b3b> +<41bc> <7b3d> +<41c3> <7b48> +<41c4> <7b4a> +<41c7> <7b53> +<41c8> <7b55> +<41c9> <7b57> +<41ca> <7b59> +<41cb> <7b5c> +<41ce> <7b61> +<41dd> <7b76> +<41de> <7b78> +<41df> <7b7a> +<41e2> <7b7f> +<41ec> <7b8c> +<41f2> <7b96> +<420e> <7bc5> +<420f> <7bc8> +<4210> <7bca> +<4215> <7bd2> +<4229> <7bf2> +<4231> <7bfd> +<4232> <7bff> +<423c> <7c0e> +<424a> <7c20> +<424b> <7c22> +<4260> <7c42> +<4280> <7c6b> +<4281> <7c6d> +<429f> <7c96> +<42a5> <7ca3> +<42bb> <7cc6> endbfchar 100 beginbfchar -<4281> <7c6d> -<429f> <7c96> -<42a5> <7ca3> -<42bb> <7cc6> -<42bc> <7cc9> -<42bd> <7ccb> -<42c5> <7cd8> -<42d4> <7cf1> -<42d5> <7cf3> -<42d6> <7cf5> -<42d7> <7cf7> -<42d8> <7cfa> -<42db> <7cff> -<42dc> <7d01> -<42dd> <7d03> -<42de> <7d0c> -<42e3> <7d16> -<42e4> <7d18> -<42f7> <7d3b> -<42fa> <7d41> -<42fb> <7d43> -<42fc> <7d45> -<4304> <7d4f> -<4316> <7d67> -<4320> <7d78> -<4328> <7d82> -<432b> <7d87> -<433c> <7d9d> -<4346> <7daf> -<434a> <7dbc> -<4358> <7dd3> -<435e> <7ddf> -<435f> <7de2> -<4362> <7de7> -<4367> <7df0> -<4368> <7df3> -<4369> <7df5> -<436c> <7dfa> -<4386> <7e1c> -<4390> <7e2c> -<4393> <7e33> -<4394> <7e38> -<4395> <7e3a> -<4396> <7e3c> -<43a6> <7e53> -<43b7> <7e6c> -<43c9> <7e89> -<43ca> <7e8b> -<43cb> <7e8e> -<43cf> <7e95> -<43d0> <7e97> -<43d5> <7eae> -<43d6> <7eb4> -<43d9> <7ed6> -<43da> <7ee4> -<43db> <7eec> -<43dc> <7ef9> -<43dd> <7f0a> -<43de> <7f10> -<43df> <7f1e> -<43e0> <7f37> -<43e1> <7f39> -<43e9> <7f43> -<43f0> <7f4d> -<43f1> <7f4f> -<43f4> <7f56> -<43f5> <7f59> -<43fa> <7f60> -<4403> <7f6f> -<4404> <7f73> -<4407> <7f78> -<4411> <7f87> -<4412> <7f89> -<4413> <7f8b> -<4414> <7f8d> -<4421> <7fa0> -<4424> <7fa6> -<4425> <7fa8> -<442b> <7fb1> -<4433> <7fbe> -<4434> <7fc0> -<443c> <7fcb> -<443d> <7fcd> -<4441> <7fd3> -<4453> <7fef> -<4454> <7ff2> -<445a> <7ffa> -<445e> <8002> -<4465> <8011> -<4466> <8013> -<446c> <8021> -<446f> <802b> -<4470> <802d> -<4473> <8032> -<4474> <8034> -<4477> <803c> -<4478> <803e> -<4484> <8053> -<4485> <8055> -<4486> <8057> +<42bc> <7cc9> +<42bd> <7ccb> +<42c5> <7cd8> +<42d4> <7cf1> +<42d5> <7cf3> +<42d6> <7cf5> +<42d7> <7cf7> +<42d8> <7cfa> +<42db> <7cff> +<42dc> <7d01> +<42dd> <7d03> +<42de> <7d0c> +<42e3> <7d16> +<42e4> <7d18> +<42f7> <7d3b> +<42fa> <7d41> +<42fb> <7d43> +<42fc> <7d45> +<4304> <7d4f> +<4316> <7d67> +<4320> <7d78> +<4328> <7d82> +<432b> <7d87> +<433c> <7d9d> +<4346> <7daf> +<434a> <7dbc> +<4358> <7dd3> +<435e> <7ddf> +<435f> <7de2> +<4362> <7de7> +<4367> <7df0> +<4368> <7df3> +<4369> <7df5> +<436c> <7dfa> +<4386> <7e1c> +<4390> <7e2c> +<4393> <7e33> +<4394> <7e38> +<4395> <7e3a> +<4396> <7e3c> +<43a6> <7e53> +<43b7> <7e6c> +<43c9> <7e89> +<43ca> <7e8b> +<43cb> <7e8e> +<43cf> <7e95> +<43d0> <7e97> +<43d5> <7eae> +<43d6> <7eb4> +<43d9> <7ed6> +<43da> <7ee4> +<43db> <7eec> +<43dc> <7ef9> +<43dd> <7f0a> +<43de> <7f10> +<43df> <7f1e> +<43e0> <7f37> +<43e1> <7f39> +<43e9> <7f43> +<43f0> <7f4d> +<43f1> <7f4f> +<43f4> <7f56> +<43f5> <7f59> +<43fa> <7f60> +<4403> <7f6f> +<4404> <7f73> +<4407> <7f78> +<4411> <7f87> +<4412> <7f89> +<4413> <7f8b> +<4414> <7f8d> +<4421> <7fa0> +<4424> <7fa6> +<4425> <7fa8> +<442b> <7fb1> +<4433> <7fbe> +<4434> <7fc0> +<443c> <7fcb> +<443d> <7fcd> +<4441> <7fd3> +<4453> <7fef> +<4454> <7ff2> +<445a> <7ffa> +<445e> <8002> +<4465> <8011> +<4466> <8013> +<446c> <8021> +<446f> <802b> +<4470> <802d> +<4473> <8032> +<4474> <8034> +<4477> <803c> +<4478> <803e> +<4484> <8053> +<4485> <8055> +<4486> <8057> +<4487> <8059> +<4499> <8074> +<449a> <8078> +<44a0> <8088> endbfchar 100 beginbfchar -<4487> <8059> -<4499> <8074> -<449a> <8078> -<44a0> <8088> -<44a1> <808a> -<44aa> <8097> -<44ab> <8099> -<44ac> <809e> -<44ad> <80a3> -<44b1> <80ac> -<44b2> <80b0> -<44b3> <80b3> -<44b8> <80bb> -<44b9> <80c5> -<44c6> <80d8> -<44cb> <80e6> -<44cc> <80ee> -<44cd> <80f5> -<44ce> <80f7> -<44cf> <80f9> -<44d0> <80fb> -<44db> <8115> -<44dc> <8117> -<44dd> <8119> -<44ef> <8130> -<44f3> <8137> -<44ff> <8147> -<4500> <8149> -<4501> <814d> -<4502> <814f> -<4503> <8152> -<450e> <8168> -<450f> <816a> -<4510> <816c> -<4511> <816f> -<4517> <8181> -<451d> <8189> -<4522> <8190> -<4529> <8199> -<4530> <81a7> -<453f> <81bc> -<4544> <81cb> -<4545> <81ce> -<454e> <81d9> -<4558> <81e9> -<4559> <81eb> -<4564> <81fd> -<4565> <81ff> -<4566> <8203> -<4567> <820b> -<456a> <8211> -<456b> <8213> -<4572> <821d> -<4573> <8220> -<4578> <8229> -<4579> <822e> -<457a> <8232> -<457b> <823a> -<4585> <8248> -<4586> <824a> -<459a> <8265> -<459b> <8267> -<45a2> <8278> -<45a7> <8283> -<45ab> <8289> -<45ac> <828c> -<45ad> <8290> -<45b4> <829e> -<45b5> <82a0> -<45b8> <82a7> -<45b9> <82b2> -<45bc> <82ba> -<45bd> <82bc> -<45c4> <82c9> -<45c5> <82d0> -<45c6> <82d6> -<45c9> <82dd> -<45ca> <82e2> -<45d1> <82f0> -<45d6> <82f8> -<45d7> <82fa> -<45df> <830d> -<45e0> <8310> -<45e3> <8316> -<45f2> <832e> -<45f3> <8330> -<45f4> <8332> -<45f5> <8337> -<45f6> <833b> -<45fe> <8348> -<45ff> <834a> -<4604> <8353> -<460a> <835d> -<460b> <8362> -<4626> <8397> -<4629> <839d> -<462a> <839f> -<462b> <83a1> -<4634> <83b5> -<4635> <83bb> +<44a1> <808a> +<44aa> <8097> +<44ab> <8099> +<44ac> <809e> +<44ad> <80a3> +<44b1> <80ac> +<44b2> <80b0> +<44b3> <80b3> +<44b8> <80bb> +<44b9> <80c5> +<44c6> <80d8> +<44cb> <80e6> +<44cc> <80ee> +<44cd> <80f5> +<44ce> <80f7> +<44cf> <80f9> +<44d0> <80fb> +<44db> <8115> +<44dc> <8117> +<44dd> <8119> +<44ef> <8130> +<44f3> <8137> +<44ff> <8147> +<4500> <8149> +<4501> <814d> +<4502> <814f> +<4503> <8152> +<450e> <8168> +<450f> <816a> +<4510> <816c> +<4511> <816f> +<4517> <8181> +<451d> <8189> +<4522> <8190> +<4529> <8199> +<4530> <81a7> +<453f> <81bc> +<4544> <81cb> +<4545> <81ce> +<454e> <81d9> +<4558> <81e9> +<4559> <81eb> +<4564> <81fd> +<4565> <81ff> +<4566> <8203> +<4567> <820b> +<456a> <8211> +<456b> <8213> +<4572> <821d> +<4573> <8220> +<4578> <8229> +<4579> <822e> +<457a> <8232> +<457b> <823a> +<4585> <8248> +<4586> <824a> +<459a> <8265> +<459b> <8267> +<45a2> <8278> +<45a7> <8283> +<45ab> <8289> +<45ac> <828c> +<45ad> <8290> +<45b4> <829e> +<45b5> <82a0> +<45b8> <82a7> +<45b9> <82b2> +<45bc> <82ba> +<45bd> <82bc> +<45c4> <82c9> +<45c5> <82d0> +<45c6> <82d6> +<45c9> <82dd> +<45ca> <82e2> +<45d1> <82f0> +<45d6> <82f8> +<45d7> <82fa> +<45df> <830d> +<45e0> <8310> +<45e3> <8316> +<45f2> <832e> +<45f3> <8330> +<45f4> <8332> +<45f5> <8337> +<45f6> <833b> +<45fe> <8348> +<45ff> <834a> +<4604> <8353> +<460a> <835d> +<460b> <8362> +<4626> <8397> +<4629> <839d> +<462a> <839f> +<462b> <83a1> +<4634> <83b5> +<4635> <83bb> +<463b> <83c6> +<463e> <83cb> +<4645> <83d5> +<4646> <83d7> endbfchar 100 beginbfchar -<463b> <83c6> -<463e> <83cb> -<4645> <83d5> -<4646> <83d7> -<464a> <83de> -<4660> <8402> -<4661> <8405> -<4664> <8410> -<4698> <8458> -<469d> <8462> -<469e> <8465> -<46a1> <846a> -<46a2> <846e> -<46a3> <8470> -<46a4> <8472> -<46a5> <8474> -<46a6> <8479> -<46b2> <848a> -<46b3> <848d> -<46ba> <8498> -<46d0> <84b3> -<46d4> <84bb> -<46d5> <84be> -<46dc> <84cc> -<46df> <84d2> -<46e8> <84de> -<46eb> <84e4> -<46f1> <84ed> -<46fd> <84fe> -<470e> <8512> -<4716> <8520> -<4717> <8522> -<472a> <8542> -<472d> <8547> -<4734> <8554> -<4735> <8557> -<473d> <8563> -<4747> <8573> -<474a> <8578> -<4752> <8586> -<4753> <8589> -<4754> <858b> -<4757> <8590> -<4766> <85a5> -<4767> <85a7> -<4771> <85b8> -<4784> <85d4> -<479d> <85f5> -<47c0> <8628> -<47ce> <8639> -<47cf> <863b> -<47e5> <865b> -<47e6> <865d> -<47f0> <866d> -<4800> <8689> -<4806> <8694> -<4814> <86ab> -<4824> <86c5> -<4825> <86c8> -<482d> <86da> -<483b> <86ef> -<4842> <86ff> -<4843> <8701> -<484c> <8714> -<484d> <8716> -<484e> <8719> -<484f> <871b> -<4850> <871d> -<4853> <8724> -<486f> <874d> -<4874> <8754> -<4875> <8756> -<4876> <8758> -<4886> <876f> -<488a> <8775> -<488b> <8777> -<4895> <878c> -<48ad> <87ae> -<48b1> <87b4> -<48b6> <87bc> -<48bc> <87c5> -<48bd> <87c7> -<48be> <87c9> -<48d0> <87e4> -<48d5> <87eb> -<48d6> <87ed> -<48de> <87fa> -<48e5> <8804> -<48ee> <8812> -<48ef> <8814> -<48f7> <8820> -<490a> <883a> -<4914> <884b> -<491c> <8858> -<491d> <885a> -<491e> <885c> -<4924> <886a> -<4925> <886d> -<4926> <886f> -<4927> <8871> +<464a> <83de> +<4660> <8402> +<4661> <8405> +<4664> <8410> +<4698> <8458> +<469d> <8462> +<469e> <8465> +<46a1> <846a> +<46a2> <846e> +<46a3> <8470> +<46a4> <8472> +<46a5> <8474> +<46a6> <8479> +<46b2> <848a> +<46b3> <848d> +<46ba> <8498> +<46d0> <84b3> +<46d4> <84bb> +<46d5> <84be> +<46dc> <84cc> +<46df> <84d2> +<46e8> <84de> +<46eb> <84e4> +<46f1> <84ed> +<46fd> <84fe> +<470e> <8512> +<4716> <8520> +<4717> <8522> +<472a> <8542> +<472d> <8547> +<4734> <8554> +<4735> <8557> +<473d> <8563> +<4747> <8573> +<474a> <8578> +<4752> <8586> +<4753> <8589> +<4754> <858b> +<4757> <8590> +<4766> <85a5> +<4767> <85a7> +<4771> <85b8> +<4784> <85d4> +<479d> <85f5> +<47c0> <8628> +<47ce> <8639> +<47cf> <863b> +<47e5> <865b> +<47e6> <865d> +<47f0> <866d> +<4800> <8689> +<4806> <8694> +<4814> <86ab> +<4824> <86c5> +<4825> <86c8> +<482d> <86da> +<483b> <86ef> +<4842> <86ff> +<4843> <8701> +<484c> <8714> +<484d> <8716> +<484e> <8719> +<484f> <871b> +<4850> <871d> +<4853> <8724> +<486f> <874d> +<4874> <8754> +<4875> <8756> +<4876> <8758> +<4886> <876f> +<488a> <8775> +<488b> <8777> +<4895> <878c> +<48ad> <87ae> +<48b1> <87b4> +<48b6> <87bc> +<48bc> <87c5> +<48bd> <87c7> +<48be> <87c9> +<48d0> <87e4> +<48d5> <87eb> +<48d6> <87ed> +<48de> <87fa> +<48e5> <8804> +<48ee> <8812> +<48ef> <8814> +<48f7> <8820> +<490a> <883a> +<4914> <884b> +<491c> <8858> +<491d> <885a> +<491e> <885c> +<4924> <886a> +<4925> <886d> +<4926> <886f> +<4927> <8871> +<492c> <8878> +<4930> <8880> +<4931> <8883> +<4936> <888c> endbfchar 100 beginbfchar -<492c> <8878> -<4930> <8880> -<4931> <8883> -<4936> <888c> -<4948> <88a3> -<494f> <88ac> -<4969> <88d3> -<496e> <88de> -<497a> <88f2> -<498e> <8911> -<49a4> <8931> -<49a5> <8935> -<49a6> <8937> -<49c9> <8965> -<49cd> <896b> -<49dd> <8980> -<49de> <8982> -<49ed> <8997> -<49fd> <89ab> -<4a0a> <89be> -<4a0b> <89c3> -<4a0c> <89cd> -<4a13> <89db> -<4a14> <89dd> -<4a19> <89e4> -<4a24> <89f5> -<4a25> <89f7> -<4a30> <8a09> -<4a31> <8a0b> -<4a32> <8a0d> -<4a33> <8a0f> -<4a36> <8a14> -<4a37> <8a17> -<4a3a> <8a1c> -<4a3b> <8a1e> -<4a3f> <8a24> -<4a4b> <8a35> -<4a58> <8a47> -<4a5e> <8a4f> -<4a5f> <8a51> -<4a60> <8a53> -<4a6d> <8a6a> -<4a6e> <8a6f> -<4a6f> <8a74> -<4a7b> <8a88> -<4a81> <8a94> -<4a84> <8a99> -<4a88> <8a9f> -<4a89> <8aa2> -<4a8a> <8aa7> -<4a91> <8ab1> -<4a9d> <8ac3> -<4aa0> <8ac8> -<4aa1> <8aca> -<4aa2> <8acc> -<4aa3> <8ace> -<4aa4> <8ad0> -<4aab> <8add> -<4aaf> <8ae3> -<4ab0> <8ae5> -<4ab4> <8aec> -<4ab7> <8af2> -<4aba> <8af9> -<4abb> <8afb> -<4abc> <8afd> -<4abd> <8aff> -<4abe> <8b03> -<4abf> <8b06> -<4ac5> <8b0f> -<4ac9> <8b15> -<4aca> <8b18> -<4acb> <8b1c> -<4ad3> <8b27> -<4af8> <8b57> -<4af9> <8b5b> -<4b24> <8b94> -<4b2a> <8b9d> -<4b2b> <8b9f> -<4b2c> <8bac> -<4b2d> <8bb1> -<4b2e> <8bbb> -<4b2f> <8bc7> -<4b30> <8bd0> -<4b31> <8bea> -<4b32> <8c09> -<4b33> <8c1e> -<4b72> <8c8b> -<4b81> <8c9f> -<4b88> <8cb1> -<4b89> <8cb5> -<4b8a> <8cb9> -<4b8b> <8cbe> -<4b8c> <8cc6> -<4b8d> <8cc9> -<4b94> <8cd4> -<4b99> <8cdb> -<4b9a> <8cdd> -<4b9b> <8cdf> -<4b9c> <8ce5> -<4bb1> <8d09> +<4948> <88a3> +<494f> <88ac> +<4969> <88d3> +<496e> <88de> +<497a> <88f2> +<498e> <8911> +<49a4> <8931> +<49a5> <8935> +<49a6> <8937> +<49c9> <8965> +<49cd> <896b> +<49dd> <8980> +<49de> <8982> +<49ed> <8997> +<49fd> <89ab> +<4a0a> <89be> +<4a0b> <89c3> +<4a0c> <89cd> +<4a13> <89db> +<4a14> <89dd> +<4a19> <89e4> +<4a24> <89f5> +<4a25> <89f7> +<4a30> <8a09> +<4a31> <8a0b> +<4a32> <8a0d> +<4a33> <8a0f> +<4a36> <8a14> +<4a37> <8a17> +<4a3a> <8a1c> +<4a3b> <8a1e> +<4a3f> <8a24> +<4a4b> <8a35> +<4a58> <8a47> +<4a5e> <8a4f> +<4a5f> <8a51> +<4a60> <8a53> +<4a6d> <8a6a> +<4a6e> <8a6f> +<4a6f> <8a74> +<4a7b> <8a88> +<4a81> <8a94> +<4a84> <8a99> +<4a88> <8a9f> +<4a89> <8aa2> +<4a8a> <8aa7> +<4a91> <8ab1> +<4a9d> <8ac3> +<4aa0> <8ac8> +<4aa1> <8aca> +<4aa2> <8acc> +<4aa3> <8ace> +<4aa4> <8ad0> +<4aab> <8add> +<4aaf> <8ae3> +<4ab0> <8ae5> +<4ab4> <8aec> +<4ab7> <8af2> +<4aba> <8af9> +<4abb> <8afb> +<4abc> <8afd> +<4abd> <8aff> +<4abe> <8b03> +<4abf> <8b06> +<4ac5> <8b0f> +<4ac9> <8b15> +<4aca> <8b18> +<4acb> <8b1c> +<4ad3> <8b27> +<4af8> <8b57> +<4af9> <8b5b> +<4b24> <8b94> +<4b2a> <8b9d> +<4b2b> <8b9f> +<4b2c> <8bac> +<4b2d> <8bb1> +<4b2e> <8bbb> +<4b2f> <8bc7> +<4b30> <8bd0> +<4b31> <8bea> +<4b32> <8c09> +<4b33> <8c1e> +<4b72> <8c8b> +<4b81> <8c9f> +<4b88> <8cb1> +<4b89> <8cb5> +<4b8a> <8cb9> +<4b8b> <8cbe> +<4b8c> <8cc6> +<4b8d> <8cc9> +<4b94> <8cd4> +<4b99> <8cdb> +<4b9a> <8cdd> +<4b9b> <8cdf> +<4b9c> <8ce5> +<4bb1> <8d09> +<4bb2> <8d0c> +<4bb3> <8d0e> +<4bbd> <8d20> +<4bc0> <8d57> endbfchar 100 beginbfchar -<4bb2> <8d0c> -<4bb3> <8d0e> -<4bbd> <8d20> -<4bc0> <8d57> -<4bc1> <8d5f> -<4bc2> <8d65> -<4bc6> <8d6c> -<4bfa> <8db9> -<4bfb> <8dbb> -<4bfc> <8dbd> -<4c00> <8dc5> -<4c05> <8dcd> -<4c06> <8dd0> -<4c0d> <8ddc> -<4c14> <8de9> -<4c1a> <8df4> -<4c1b> <8df6> -<4c1c> <8dfc> -<4c27> <8e0b> -<4c3c> <8e2b> -<4c3d> <8e2d> -<4c3e> <8e30> -<4c48> <8e43> -<4c63> <8e6e> -<4c64> <8e71> -<4c65> <8e73> -<4c66> <8e75> -<4c6a> <8e7b> -<4c6d> <8e80> -<4c71> <8e86> -<4c72> <8e88> -<4c73> <8e8c> -<4c74> <8e8e> -<4c7a> <8e9b> -<4c7b> <8e9d> -<4ca0> <8ed3> -<4cbf> <8efd> -<4cc4> <8f04> -<4cc5> <8f06> -<4cc6> <8f08> -<4cce> <8f13> -<4cec> <8f43> -<4d00> <8f5e> -<4d01> <8f60> -<4d02> <8f63> -<4d03> <8f65> -<4d04> <8f6a> -<4d05> <8f80> -<4d06> <8f8c> -<4d07> <8f92> -<4d08> <8f9d> -<4d0e> <8fa7> -<4d0f> <8faa> -<4d10> <8fac> -<4d1b> <8fc3> -<4d1c> <8fc6> -<4d22> <8fcf> -<4d23> <8fd2> -<4d26> <8fda> -<4d29> <8fe3> -<4d2a> <8fe7> -<4d2b> <8fec> -<4d2c> <8fef> -<4d38> <900c> -<4d39> <900e> -<4d3a> <9013> -<4d3b> <9018> -<4d3c> <901c> -<4d49> <9037> -<4d4c> <903d> -<4d4f> <9043> -<4d55> <904c> -<4d56> <9056> -<4d59> <905d> -<4d5a> <905f> -<4d5b> <9061> -<4d5c> <9064> -<4d65> <9073> -<4d66> <9076> -<4d67> <9079> -<4d68> <907b> -<4d69> <907e> -<4d6c> <9089> -<4d70> <9092> -<4d71> <9094> -<4d72> <9096> -<4d73> <9098> -<4d74> <909a> -<4d75> <909c> -<4d7e> <90ab> -<4d7f> <90ad> -<4d80> <90b2> -<4d81> <90b7> -<4d88> <90c6> -<4d8e> <90d2> -<4d95> <90de> -<4d96> <90e0> -<4d9c> <90ec> -<4d9d> <90ee> -<4dab> <9103> +<4bc1> <8d5f> +<4bc2> <8d65> +<4bc6> <8d6c> +<4bfa> <8db9> +<4bfb> <8dbb> +<4bfc> <8dbd> +<4c00> <8dc5> +<4c05> <8dcd> +<4c06> <8dd0> +<4c0d> <8ddc> +<4c14> <8de9> +<4c1a> <8df4> +<4c1b> <8df6> +<4c1c> <8dfc> +<4c27> <8e0b> +<4c3c> <8e2b> +<4c3d> <8e2d> +<4c3e> <8e30> +<4c48> <8e43> +<4c63> <8e6e> +<4c64> <8e71> +<4c65> <8e73> +<4c66> <8e75> +<4c6a> <8e7b> +<4c6d> <8e80> +<4c71> <8e86> +<4c72> <8e88> +<4c73> <8e8c> +<4c74> <8e8e> +<4c7a> <8e9b> +<4c7b> <8e9d> +<4ca0> <8ed3> +<4cbf> <8efd> +<4cc4> <8f04> +<4cc5> <8f06> +<4cc6> <8f08> +<4cce> <8f13> +<4cec> <8f43> +<4d00> <8f5e> +<4d01> <8f60> +<4d02> <8f63> +<4d03> <8f65> +<4d04> <8f6a> +<4d05> <8f80> +<4d06> <8f8c> +<4d07> <8f92> +<4d08> <8f9d> +<4d0e> <8fa7> +<4d0f> <8faa> +<4d10> <8fac> +<4d1b> <8fc3> +<4d1c> <8fc6> +<4d22> <8fcf> +<4d23> <8fd2> +<4d26> <8fda> +<4d29> <8fe3> +<4d2a> <8fe7> +<4d2b> <8fec> +<4d2c> <8fef> +<4d38> <900c> +<4d39> <900e> +<4d3a> <9013> +<4d3b> <9018> +<4d3c> <901c> +<4d49> <9037> +<4d4c> <903d> +<4d4f> <9043> +<4d55> <904c> +<4d56> <9056> +<4d59> <905d> +<4d5a> <905f> +<4d5b> <9061> +<4d5c> <9064> +<4d65> <9073> +<4d66> <9076> +<4d67> <9079> +<4d68> <907b> +<4d69> <907e> +<4d6c> <9089> +<4d70> <9092> +<4d71> <9094> +<4d72> <9096> +<4d73> <9098> +<4d74> <909a> +<4d75> <909c> +<4d7e> <90ab> +<4d7f> <90ad> +<4d80> <90b2> +<4d81> <90b7> +<4d88> <90c6> +<4d8e> <90d2> +<4d95> <90de> +<4d96> <90e0> +<4d9c> <90ec> +<4d9d> <90ee> +<4dab> <9103> +<4dac> <9105> +<4db7> <9113> +<4db8> <9115> +<4dca> <912e> endbfchar 100 beginbfchar -<4dac> <9105> -<4db7> <9113> -<4db8> <9115> -<4dca> <912e> -<4dcb> <9133> -<4dcc> <9135> -<4dd9> <9147> -<4dda> <9151> -<4de8> <916b> -<4de9> <916d> -<4dea> <9173> -<4df3> <9186> -<4df4> <9188> -<4df5> <918a> -<4e16> <91c2> -<4e17> <91c4> -<4e18> <91c6> -<4e19> <91c8> -<4e1a> <91d0> -<4e1b> <91d6> -<4e25> <91e8> -<4e31> <91f6> -<4e32> <91f8> -<4e40> <920f> -<4e4f> <9224> -<4e56> <922f> -<4e6c> <9256> -<4e85> <9279> -<4e8b> <9284> -<4e96> <9292> -<4e99> <9297> -<4e9a> <9299> -<4e9b> <929b> -<4ea1> <92a4> -<4ea2> <92a7> -<4ea3> <92ad> -<4eab> <92b8> -<4eac> <92ba> -<4eb1> <92c2> -<4eb2> <92c4> -<4eb3> <92c6> -<4ec5> <92de> -<4ec9> <92e7> -<4eca> <92e9> -<4ed1> <92f7> -<4ee4> <9311> -<4eec> <9321> -<4ef0> <9327> -<4ef9> <9337> -<4eff> <933f> -<4f00> <9342> -<4f06> <934c> -<4f1d> <936b> -<4f2e> <9383> -<4f3d> <9397> -<4f49> <93a8> -<4f4a> <93ab> -<4f4b> <93ad> -<4f4c> <93af> -<4f4f> <93b4> -<4f5e> <93c9> -<4f5f> <93cb> -<4f6a> <93e0> -<4f6b> <93e3> -<4f7b> <93f6> -<4f7c> <93f8> -<4f91> <9411> -<4fa7> <9434> -<4faa> <9439> -<4fb7> <944b> -<4fbd> <9453> -<4fcb> <9464> -<4fd1> <946c> -<4fd4> <9471> -<4fd9> <9478> -<4fe1> <9491> -<4fe2> <9496> -<4fe3> <9498> -<4fe4> <94c7> -<4fe5> <94cf> -<4fe8> <94da> -<4fe9> <94e6> -<4fea> <94fb> -<4feb> <951c> -<4fec> <9520> -<4fed> <9527> -<4fee> <9533> -<4fef> <953d> -<4ff0> <9543> -<4ff1> <9548> -<4ff2> <954b> -<4ff3> <9555> -<4ff4> <955a> -<4ff5> <9560> -<4ff6> <956e> -<5000> <9581> -<5005> <958a> -<5006> <958d> -<5007> <9590> -<5008> <9592> +<4dcb> <9133> +<4dcc> <9135> +<4dd9> <9147> +<4dda> <9151> +<4de8> <916b> +<4de9> <916d> +<4dea> <9173> +<4df3> <9186> +<4df4> <9188> +<4df5> <918a> +<4e16> <91c2> +<4e17> <91c4> +<4e18> <91c6> +<4e19> <91c8> +<4e1a> <91d0> +<4e1b> <91d6> +<4e25> <91e8> +<4e31> <91f6> +<4e32> <91f8> +<4e40> <920f> +<4e4f> <9224> +<4e56> <922f> +<4e6c> <9256> +<4e85> <9279> +<4e8b> <9284> +<4e96> <9292> +<4e99> <9297> +<4e9a> <9299> +<4e9b> <929b> +<4ea1> <92a4> +<4ea2> <92a7> +<4ea3> <92ad> +<4eab> <92b8> +<4eac> <92ba> +<4eb1> <92c2> +<4eb2> <92c4> +<4eb3> <92c6> +<4ec5> <92de> +<4ec9> <92e7> +<4eca> <92e9> +<4ed1> <92f7> +<4ee4> <9311> +<4eec> <9321> +<4ef0> <9327> +<4ef9> <9337> +<4eff> <933f> +<4f00> <9342> +<4f06> <934c> +<4f1d> <936b> +<4f2e> <9383> +<4f3d> <9397> +<4f49> <93a8> +<4f4a> <93ab> +<4f4b> <93ad> +<4f4c> <93af> +<4f4f> <93b4> +<4f5e> <93c9> +<4f5f> <93cb> +<4f6a> <93e0> +<4f6b> <93e3> +<4f7b> <93f6> +<4f7c> <93f8> +<4f91> <9411> +<4fa7> <9434> +<4faa> <9439> +<4fb7> <944b> +<4fbd> <9453> +<4fcb> <9464> +<4fd1> <946c> +<4fd4> <9471> +<4fd9> <9478> +<4fe1> <9491> +<4fe2> <9496> +<4fe3> <9498> +<4fe4> <94c7> +<4fe5> <94cf> +<4fe8> <94da> +<4fe9> <94e6> +<4fea> <94fb> +<4feb> <951c> +<4fec> <9520> +<4fed> <9527> +<4fee> <9533> +<4fef> <953d> +<4ff0> <9543> +<4ff1> <9548> +<4ff2> <954b> +<4ff3> <9555> +<4ff4> <955a> +<4ff5> <9560> +<4ff6> <956e> +<5000> <9581> +<5005> <958a> +<5006> <958d> +<5007> <9590> +<5008> <9592> +<5014> <95a2> +<5017> <95aa> +<5021> <95ba> +<5027> <95c7> endbfchar 100 beginbfchar -<5014> <95a2> -<5017> <95aa> -<5021> <95ba> -<5027> <95c7> -<5028> <95c9> -<5034> <95dd> -<503b> <95ec> -<503c> <95ff> -<503d> <9607> -<503e> <9613> -<503f> <9618> -<5040> <961b> -<5041> <961e> -<5042> <9620> -<5053> <963e> -<5054> <9641> -<5055> <9643> -<5056> <964a> -<5060> <965c> -<5061> <965e> -<5062> <9660> -<5065> <966b> -<5069> <9671> -<5075> <9687> -<5076> <9689> -<5077> <968c> -<507b> <9696> -<507c> <969a> -<5087> <96a9> -<508d> <96b2> -<508e> <96b5> -<508f> <96b7> -<5090> <96ba> -<5091> <96bf> -<5094> <96c8> -<509d> <96da> -<50a1> <96e1> -<50ae> <96f8> -<50af> <96fa> -<50b2> <96ff> -<50b5> <9705> -<50c3> <971d> -<50d2> <9731> -<50de> <9743> -<50f1> <975f> -<50ff> <9775> -<5112> <978c> -<5113> <978e> -<5114> <9790> -<5115> <9793> -<5128> <97ac> -<5129> <97ae> -<512c> <97b3> -<513e> <97ca> -<514c> <97dd> -<5154> <97e8> -<515a> <97f4> -<5163> <9800> -<5164> <9804> -<5165> <9809> -<5166> <980b> -<5167> <980d> -<5174> <9825> -<5185> <983c> -<519a> <985a> -<51a2> <9866> -<51a8> <9872> -<51a9> <988b> -<51aa> <988e> -<51ab> <9892> -<51ac> <9895> -<51ad> <9899> -<51ae> <98a3> -<51b4> <98b0> -<51b5> <98b2> -<51c4> <98c5> -<51c5> <98c7> -<51cd> <98d4> -<51d2> <98e1> -<51d7> <98ec> -<51d8> <98ee> -<51db> <98f3> -<51e7> <9904> -<51eb> <990b> -<520e> <993d> -<5212> <9944> -<5219> <9953> -<521a> <9956> -<521f> <995d> -<5223> <9964> -<5224> <9966> -<5225> <9973> -<5228> <997b> -<5229> <997e> -<522c> <9989> -<522d> <998c> -<522e> <998e> -<5241> <99b2> -<525c> <99d3> -<525f> <99da> +<5028> <95c9> +<5034> <95dd> +<503b> <95ec> +<503c> <95ff> +<503d> <9607> +<503e> <9613> +<503f> <9618> +<5040> <961b> +<5041> <961e> +<5042> <9620> +<5053> <963e> +<5054> <9641> +<5055> <9643> +<5056> <964a> +<5060> <965c> +<5061> <965e> +<5062> <9660> +<5065> <966b> +<5069> <9671> +<5075> <9687> +<5076> <9689> +<5077> <968c> +<507b> <9696> +<507c> <969a> +<5087> <96a9> +<508d> <96b2> +<508e> <96b5> +<508f> <96b7> +<5090> <96ba> +<5091> <96bf> +<5094> <96c8> +<509d> <96da> +<50a1> <96e1> +<50ae> <96f8> +<50af> <96fa> +<50b2> <96ff> +<50b5> <9705> +<50c3> <971d> +<50d2> <9731> +<50de> <9743> +<50f1> <975f> +<50ff> <9775> +<5112> <978c> +<5113> <978e> +<5114> <9790> +<5115> <9793> +<5128> <97ac> +<5129> <97ae> +<512c> <97b3> +<513e> <97ca> +<514c> <97dd> +<5154> <97e8> +<515a> <97f4> +<5163> <9800> +<5164> <9804> +<5165> <9809> +<5166> <980b> +<5167> <980d> +<5174> <9825> +<5185> <983c> +<519a> <985a> +<51a2> <9866> +<51a8> <9872> +<51a9> <988b> +<51aa> <988e> +<51ab> <9892> +<51ac> <9895> +<51ad> <9899> +<51ae> <98a3> +<51b4> <98b0> +<51b5> <98b2> +<51c4> <98c5> +<51c5> <98c7> +<51cd> <98d4> +<51d2> <98e1> +<51d7> <98ec> +<51d8> <98ee> +<51db> <98f3> +<51e7> <9904> +<51eb> <990b> +<520e> <993d> +<5212> <9944> +<5219> <9953> +<521a> <9956> +<521f> <995d> +<5223> <9964> +<5224> <9966> +<5225> <9973> +<5228> <997b> +<5229> <997e> +<522c> <9989> +<522d> <998c> +<522e> <998e> +<5241> <99b2> +<525c> <99d3> +<525f> <99da> +<5260> <99dc> +<5261> <99de> +<5262> <99e0> +<527d> <9a00> endbfchar 100 beginbfchar -<5260> <99dc> -<5261> <99de> -<5262> <99e0> -<527d> <9a00> -<52a1> <9a2c> -<52a2> <9a2f> -<52ad> <9a3f> -<52b4> <9a4e> -<52ba> <9a56> -<52c2> <9a63> -<52c7> <9a6b> -<52c8> <9a72> -<52c9> <9a83> -<52ca> <9a89> -<52cf> <9a99> -<52d0> <9aa6> -<52db> <9ab9> -<52dc> <9abb> -<52e9> <9ad0> -<52ea> <9ad7> -<52f1> <9ae0> -<52fa> <9aec> -<5304> <9afa> -<530e> <9b07> -<5313> <9b0e> -<5323> <9b24> -<5324> <9b26> -<5325> <9b28> -<532a> <9b30> -<5337> <9b46> -<533b> <9b50> -<5341> <9b59> -<5365> <9b82> -<5370> <9b8f> -<5385> <9bac> -<539c> <9bc8> -<53a6> <9bd5> -<53ab> <9bdc> -<53af> <9be3> -<53b2> <9be9> -<53c2> <9bfe> -<53d0> <9c11> -<53df> <9c24> -<53e8> <9c34> -<53e9> <9c36> -<53ea> <9c38> -<53eb> <9c3a> -<53fe> <9c53> -<53ff> <9c55> -<5404> <9c5e> -<541b> <9c79> -<541c> <9c7b> -<541f> <9c80> -<5424> <9c8c> -<5425> <9c8f> -<5426> <9c93> -<542b> <9c9d> -<542c> <9caa> -<542d> <9cac> -<542e> <9caf> -<542f> <9cb9> -<544a> <9cf5> -<545a> <9d08> -<546b> <9d1c> -<546c> <9d1e> -<5472> <9d27> -<54a8> <9d6b> -<54c1> <9d88> -<54cf> <9d99> -<54ef> <9dc1> -<54f0> <9dc3> -<54ff> <9dd4> -<5502> <9dd8> -<5538> <9e1c> -<5539> <9e24> -<553a> <9e27> -<553b> <9e2e> -<553c> <9e30> -<553d> <9e34> -<5540> <9e40> -<5541> <9e4d> -<5542> <9e50> -<5546> <9e56> -<5547> <9e59> -<5548> <9e5d> -<554d> <9e65> -<5550> <9e72> -<5551> <9e74> -<5555> <9e7b> -<556c> <9e9e> -<5581> <9ebc> -<558d> <9ed0> -<5595> <9ee1> -<5598> <9ee6> -<559f> <9ef3> -<55a2> <9ef8> -<55a3> <9efa> -<55ad> <9f0a> -<55ae> <9f0c> -<55af> <9f0f> +<52a1> <9a2c> +<52a2> <9a2f> +<52ad> <9a3f> +<52b4> <9a4e> +<52ba> <9a56> +<52c2> <9a63> +<52c7> <9a6b> +<52c8> <9a72> +<52c9> <9a83> +<52ca> <9a89> +<52cf> <9a99> +<52d0> <9aa6> +<52db> <9ab9> +<52dc> <9abb> +<52e9> <9ad0> +<52ea> <9ad7> +<52f1> <9ae0> +<52fa> <9aec> +<5304> <9afa> +<530e> <9b07> +<5313> <9b0e> +<5323> <9b24> +<5324> <9b26> +<5325> <9b28> +<532a> <9b30> +<5337> <9b46> +<533b> <9b50> +<5341> <9b59> +<5365> <9b82> +<5370> <9b8f> +<5385> <9bac> +<539c> <9bc8> +<53a6> <9bd5> +<53ab> <9bdc> +<53af> <9be3> +<53b2> <9be9> +<53c2> <9bfe> +<53d0> <9c11> +<53df> <9c24> +<53e8> <9c34> +<53e9> <9c36> +<53ea> <9c38> +<53eb> <9c3a> +<53fe> <9c53> +<53ff> <9c55> +<5404> <9c5e> +<541b> <9c79> +<541c> <9c7b> +<541f> <9c80> +<5424> <9c8c> +<5425> <9c8f> +<5426> <9c93> +<542b> <9c9d> +<542c> <9caa> +<542d> <9cac> +<542e> <9caf> +<542f> <9cb9> +<544a> <9cf5> +<545a> <9d08> +<546b> <9d1c> +<546c> <9d1e> +<5472> <9d27> +<54a8> <9d6b> +<54c1> <9d88> +<54cf> <9d99> +<54ef> <9dc1> +<54f0> <9dc3> +<54ff> <9dd4> +<5502> <9dd8> +<5538> <9e1c> +<5539> <9e24> +<553a> <9e27> +<553b> <9e2e> +<553c> <9e30> +<553d> <9e34> +<5540> <9e40> +<5541> <9e4d> +<5542> <9e50> +<5546> <9e56> +<5547> <9e59> +<5548> <9e5d> +<554d> <9e65> +<5550> <9e72> +<5551> <9e74> +<5555> <9e7b> +<556c> <9e9e> +<5581> <9ebc> +<558d> <9ed0> +<5595> <9ee1> +<5598> <9ee6> +<559f> <9ef3> +<55a2> <9ef8> +<55a3> <9efa> +<55ad> <9f0a> +<55ae> <9f0c> +<55af> <9f0f> +<55b2> <9f14> +<55b3> <9f16> +<55b4> <9f18> +<55bb> <9f21> endbfchar 100 beginbfchar -<55b2> <9f14> -<55b3> <9f16> -<55b4> <9f18> -<55bb> <9f21> -<55ce> <9f38> -<55cf> <9f3a> -<55d0> <9f3c> -<55de> <9f53> -<55e7> <9f62> -<55ed> <9f6b> -<560f> <90cefe00> -<5610> <55c0fe00> -<5613> <fa11> -<5616> <793cfe00> -<5617> <fa1f> -<5618> <8612fe00> -<5619> <fa21> -<561f> <2e81> -<5620> <d840dc87> -<5621> <d840dc89> -<5622> <d840dccc> -<5623> <2e84> -<5624> <3473> -<5625> <3447> -<5626> <2e88> -<5627> <2e8b> -<5628> <9fb4> -<5629> <359e> -<562a> <361a> -<562b> <360e> -<562c> <2e8c> -<562d> <2e97> -<562e> <396e> -<562f> <3918> -<5630> <9fb5> -<5631> <39cf> -<5632> <39df> -<5633> <3a73> -<5634> <39d0> -<5637> <3b4e> -<5638> <3c6e> -<5639> <3ce0> -<563a> <2ea7> -<563b> <d845ddd7> -<563c> <9fb8> -<563d> <2eaa> -<563e> <4056> -<563f> <415f> -<5640> <2eae> -<5641> <4337> -<5642> <2eb3> -<5645> <d84add8f> -<5646> <43b1> -<5647> <43ac> -<5648> <2ebb> -<5649> <43dd> -<564a> <44d6> -<564b> <4661> -<564c> <464c> -<564d> <9fb9> -<564e> <4723> -<564f> <4729> -<5650> <477c> -<5651> <478d> -<5652> <2eca> -<5653> <4947> -<5654> <497a> -<5655> <497d> -<565a> <499f> -<565b> <499b> -<565c> <49b7> -<565d> <49b6> -<565e> <9fba> -<565f> <d850ddfe> -<5660> <4ca3> -<5664> <4c77> -<5665> <4ca2> -<566d> <4dae> -<566e> <9fbb> -<56ce> <00fc> -<56cf> <00a9> -<56d0> <2122> -<56d1> <2026> -<5730> <0101> -<5731> <00e1> -<5732> <01ce> -<5733> <00e0> -<5734> <0113> -<5735> <00e9> -<5736> <011b> -<5737> <00e8> -<5738> <012b> -<5739> <00ed> -<573a> <01d0> -<573b> <00ec> -<573c> <014d> -<573d> <00f3> -<573e> <01d2> -<573f> <00f2> -<5740> <016b> +<55ce> <9f38> +<55cf> <9f3a> +<55d0> <9f3c> +<55de> <9f53> +<55e7> <9f62> +<55ed> <9f6b> +<560f> <f92c> +<5613> <fa11> +<5616> <fa18> +<561f> <2e81> +<5620> <d840dc87> +<5621> <d840dc89> +<5622> <d840dccc> +<5623> <2e84> +<5624> <3473> +<5625> <3447> +<5626> <2e88> +<5627> <2e8b> +<5628> <9fb4> +<5629> <359e> +<562a> <361a> +<562b> <360e> +<562c> <2e8c> +<562d> <2e97> +<562e> <396e> +<562f> <3918> +<5630> <9fb5> +<5631> <39cf> +<5632> <39df> +<5633> <3a73> +<5634> <39d0> +<5637> <3b4e> +<5638> <3c6e> +<5639> <3ce0> +<563a> <2ea7> +<563b> <d845ddd7> +<563c> <9fb8> +<563d> <2eaa> +<563e> <4056> +<563f> <415f> +<5640> <2eae> +<5641> <4337> +<5642> <2eb3> +<5645> <d84add8f> +<5646> <43b1> +<5647> <43ac> +<5648> <2ebb> +<5649> <43dd> +<564a> <44d6> +<564b> <4661> +<564c> <464c> +<564d> <9fb9> +<564e> <4723> +<564f> <4729> +<5650> <477c> +<5651> <478d> +<5652> <2eca> +<5653> <4947> +<5654> <497a> +<5655> <497d> +<565a> <499f> +<565b> <499b> +<565c> <49b7> +<565d> <49b6> +<565e> <9fba> +<565f> <d850ddfe> +<5660> <4ca3> +<5664> <4c77> +<5665> <4ca2> +<566d> <4dae> +<566e> <9fbb> +<56ce> <00fc> +<56cf> <00a9> +<56d0> <2122> +<56d1> <2026> +<5730> <0101> +<5731> <00e1> +<5732> <01ce> +<5733> <00e0> +<5734> <0113> +<5735> <00e9> +<5736> <011b> +<5737> <00e8> +<5738> <012b> +<5739> <00ed> +<573a> <01d0> +<573b> <00ec> +<573c> <014d> +<573d> <00f3> +<573e> <01d2> +<573f> <00f2> +<5740> <016b> +<5741> <00fa> +<5742> <01d4> +<5743> <00f9> +<5744> <01d6> +<5745> <01d8> +<5746> <01da> +<5747> <01dc> +<5748> <00fc> endbfchar -64 beginbfchar -<5741> <00fa> -<5742> <01d4> -<5743> <00f9> -<5744> <01d6> -<5745> <01d8> -<5746> <01da> -<5747> <01dc> -<5748> <00fc> -<5749> <00ea> -<574a> <0251> -<574b> <1e3f> -<574c> <0144> -<574d> <0148> -<574e> <01f9> -<574f> <0261> -<5750> <0020> -<5751> <20ac> -<5752> <00a5> -<5753> <20ac> -<5754> <0024> -<5755> <303f> -<5756> <20ac> -<5757> <3041> -<5758> <3047> -<5759> <3043> -<575a> <3095> -<575b> <304b> -<575c> <3096> -<575d> <3051> -<575e> <3053> -<575f> <3053> -<5760> <3049> -<5761> <3064> -<5762> <3045> -<5763> <308e> -<5764> <3083> -<5765> <3087> -<5766> <3085> -<5767> <3094> -<5768> <30a1> -<5769> <30a7> -<576a> <30a3> -<576d> <30b3> -<576e> <30b3> -<576f> <30a9> -<5770> <30c3> -<5771> <30a5> -<5772> <30ee> -<5773> <30e3> -<5774> <30e7> -<5775> <30e5> -<5776> <30f7> -<5777> <30f9> -<5778> <30f8> -<5779> <30fa> -<577a> <30fc> -<579c> <2e80> -<5800> <2ef3> -<6d65> <4984> -<7183> <20ac> -<7184> <00a5> -<7185> <20ac> -<7186> <0024> -<7187> <303f> +56 beginbfchar +<5749> <00ea> +<574a> <0251> +<574b> <1e3f> +<574c> <0144> +<574d> <0148> +<574e> <01f9> +<574f> <0261> +<5750> <0020> +<5751> <20ac> +<5752> <00a5> +<5753> <20ac> +<5754> <0024> +<5755> <303f> +<5756> <20ac> +<5757> <3041> +<5758> <3047> +<5759> <3043> +<575a> <304b> +<575b> <304b> +<575c> <3051> +<575d> <3051> +<575e> <3053> +<575f> <3053> +<5760> <3049> +<5761> <3064> +<5762> <3045> +<5763> <308e> +<5764> <3083> +<5765> <3087> +<5766> <3085> +<5767> <3094> +<5768> <30a1> +<5769> <30a7> +<576a> <30a3> +<576d> <30b3> +<576e> <30b3> +<576f> <30a9> +<5770> <30c3> +<5771> <30a5> +<5772> <30ee> +<5773> <30e3> +<5774> <30e7> +<5775> <30e5> +<5776> <30f7> +<5777> <30f9> +<5778> <30f8> +<5779> <30fa> +<577a> <30fc> +<579c> <2e80> +<5800> <2ef3> +<6d65> <4984> +<7183> <20ac> +<7184> <00a5> +<7185> <20ac> +<7186> <0024> +<7187> <303f> endbfchar 100 beginbfrange @@ -11080,11 +11072,15 @@ endbfchar <0225> <0235> <03b1> <0236> <023c> <03c3> <0240> <0241> <ff1a> -<0244> <0245> <ff08> -<0246> <0247> <3014> -<0248> <024f> <3008> +<0244> <0245> <fe35> +<0246> <0247> <fe39> +<0248> <0249> <fe3f> +<024a> <024b> <fe3d> +<024c> <024f> <fe41> <0250> <0251> <3016> -<0252> <0253> <3010> +<0252> <0253> <fe3b> +<0254> <0255> <fe37> +<0258> <0259> <fe33> <025a> <025f> <0410> <0261> <0280> <0416> <0282> <029b> <0436> @@ -11146,13 +11142,13 @@ endbfchar <164c> <164d> <6005> <165c> <165d> <6078> <1689> <168a> <95f5> +endbfrange + +100 beginbfrange <168d> <168e> <9603> <1691> <1694> <960a> <1697> <1699> <9615> <169a> <169b> <9619> -endbfrange - -100 beginbfrange <16a8> <16a9> <6c68> <16b1> <16b2> <6cf7> <16d6> <16d7> <6d93> @@ -11249,13 +11245,13 @@ endbfrange <1aed> <1aee> <9531> <1af0> <1af2> <9536> <1af4> <1af5> <953e> +endbfrange + +100 beginbfrange <1af8> <1afa> <9544> <1afd> <1afe> <954e> <1b00> <1b01> <9553> <1b02> <1b05> <9556> -endbfrange - -100 beginbfrange <1b07> <1b08> <955e> <1b0a> <1b0b> <9561> <1b0c> <1b14> <9564> @@ -11352,13 +11348,13 @@ endbfrange <2726> <2727> <30fd> <2729> <272a> <309d> <272b> <2734> <fe49> +endbfrange + +100 beginbfrange <2735> <2738> <fe54> <2739> <2746> <fe59> <2747> <274a> <fe68> <274c> <2757> <2ff0> -endbfrange - -100 beginbfrange <2759> <275b> <4e04> <275f> <2761> <4e1f> <2765> <2766> <4e2e> @@ -11455,13 +11451,13 @@ endbfrange <290c> <290f> <5133> <2910> <2911> <5138> <2912> <2913> <513d> +endbfrange + +100 beginbfrange <2918> <291a> <514e> <291c> <291e> <5157> <2920> <2924> <515d> <2925> <2926> <5163> -endbfrange - -100 beginbfrange <2927> <2928> <5166> <292d> <292e> <517e> <292f> <2930> <5183> @@ -11558,13 +11554,13 @@ endbfrange <2ac1> <2ac2> <54ca> <2ac7> <2ac9> <54e2> <2aca> <2acb> <54eb> +endbfrange + +100 beginbfrange <2acc> <2ace> <54ef> <2acf> <2ad4> <54f4> <2ad8> <2ad9> <5502> <2adc> <2ae0> <550a> -endbfrange - -100 beginbfrange <2ae1> <2ae2> <5512> <2ae3> <2ae8> <5515> <2ae9> <2aec> <551c> @@ -11661,13 +11657,13 @@ endbfrange <2c58> <2c5e> <57c4> <2c5f> <2c60> <57cc> <2c61> <2c62> <57d0> +endbfrange + +100 beginbfrange <2c64> <2c65> <57d6> <2c66> <2c67> <57db> <2c69> <2c6a> <57e2> <2c6b> <2c72> <57e5> -endbfrange - -100 beginbfrange <2c74> <2c77> <57f0> <2c78> <2c79> <57f5> <2c7a> <2c7b> <57fb> @@ -11764,13 +11760,13 @@ endbfrange <2dfe> <2dff> <5a63> <2e01> <2e02> <5a68> <2e03> <2e04> <5a6b> +endbfrange + +100 beginbfrange <2e05> <2e0a> <5a6e> <2e0b> <2e0c> <5a78> <2e0d> <2e10> <5a7b> <2e11> <2e22> <5a80> -endbfrange - -100 beginbfrange <2e23> <2e29> <5a93> <2e2a> <2e34> <5a9c> <2e35> <2e36> <5aa8> @@ -11867,13 +11863,13 @@ endbfrange <2fce> <2fd8> <5d5e> <2fda> <2fdb> <5d6d> <2fdc> <2fdf> <5d70> +endbfrange + +100 beginbfrange <2fe0> <2feb> <5d75> <2fed> <2fee> <5d85> <2fef> <2ffd> <5d88> <3000> <3001> <5d9b> -endbfrange - -100 beginbfrange <3002> <3003> <5d9e> <3004> <3009> <5da1> <300a> <3018> <5da8> @@ -11970,13 +11966,13 @@ endbfrange <3182> <3184> <6056> <3185> <3186> <605b> <3187> <318a> <605e> +endbfrange + +100 beginbfrange <318b> <318c> <6065> <318e> <318f> <6071> <3190> <3191> <6074> <3194> <3196> <6080> -endbfrange - -100 beginbfrange <3197> <319a> <6085> <319b> <319c> <608a> <319d> <31a0> <608e> @@ -12073,13 +12069,13 @@ endbfrange <3312> <3314> <633f> <3316> <3317> <6347> <3319> <331c> <6351> +endbfrange + +100 beginbfrange <331d> <3324> <6356> <3326> <3328> <6364> <332b> <332c> <636f> <332d> <332f> <6373> -endbfrange - -100 beginbfrange <3330> <3331> <6378> <3332> <3335> <637c> <3337> <3338> <6385> @@ -12176,13 +12172,13 @@ endbfrange <34c3> <34c9> <6644> <34ca> <34cb> <664d> <34cc> <34cd> <6650> +endbfrange + +100 beginbfrange <34ce> <34cf> <6658> <34d0> <34d1> <665b> <34d4> <34d5> <6662> <34d8> <34dc> <6669> -endbfrange - -100 beginbfrange <34dd> <34df> <6671> <34e1> <34e2> <6678> <34e3> <34e5> <667b> @@ -12279,13 +12275,13 @@ endbfrange <368b> <368c> <692e> <368d> <368f> <6931> <3690> <3693> <6935> +endbfrange + +100 beginbfrange <3694> <3696> <693a> <3698> <3699> <6940> <369a> <36a0> <6943> <36a1> <36a8> <694b> -endbfrange - -100 beginbfrange <36a9> <36aa> <6955> <36ab> <36ac> <6958> <36ad> <36ae> <695b> @@ -12382,13 +12378,13 @@ endbfrange <3843> <3844> <6bac> <3845> <3846> <6bb0> <3848> <3849> <6bb8> +endbfrange + +100 beginbfrange <384a> <384c> <6bbc> <384e> <384f> <6bc3> <3850> <3853> <6bc7> <3856> <3857> <6bd0> -endbfrange - -100 beginbfrange <385a> <385e> <6bdc> <385f> <3866> <6be2> <3867> <3869> <6bec> @@ -12485,13 +12481,13 @@ endbfrange <39bc> <39c9> <6e70> <39ca> <39cc> <6e80> <39ce> <39cf> <6e87> +endbfrange + +100 beginbfrange <39d0> <39d4> <6e8a> <39d5> <39d9> <6e91> <39db> <39dd> <6e99> <39df> <39e0> <6ea0> -endbfrange - -100 beginbfrange <39e1> <39e2> <6ea3> <39e4> <39e5> <6ea8> <39e6> <39e9> <6eab> @@ -12588,13 +12584,13 @@ endbfrange <3b53> <3b5d> <70fe> <3b5e> <3b62> <710b> <3b63> <3b64> <7111> +endbfrange + +100 beginbfrange <3b67> <3b6c> <711b> <3b6d> <3b70> <7122> <3b71> <3b78> <7127> <3b79> <3b7c> <7132> -endbfrange - -100 beginbfrange <3b7d> <3b8a> <7137> <3b8b> <3b8d> <7146> <3b90> <3b92> <714f> @@ -12691,13 +12687,13 @@ endbfrange <3d13> <3d14> <73ac> <3d16> <3d18> <73b4> <3d19> <3d1a> <73b8> +endbfrange + +100 beginbfrange <3d1b> <3d1e> <73bc> <3d20> <3d24> <73c3> <3d25> <3d26> <73cb> <3d28> <3d2e> <73d2> -endbfrange - -100 beginbfrange <3d2f> <3d32> <73da> <3d34> <3d37> <73e1> <3d3a> <3d3c> <73ea> @@ -12794,13 +12790,13 @@ endbfrange <3ed3> <3edb> <769b> <3edc> <3ee4> <76a5> <3ee5> <3ee6> <76af> +endbfrange + +100 beginbfrange <3ee8> <3eea> <76b5> <3eec> <3eef> <76bb> <3ef0> <3ef1> <76c0> <3ef2> <3ef3> <76c3> -endbfrange - -100 beginbfrange <3ef6> <3ef7> <76cb> <3efa> <3efb> <76d9> <3efc> <3efd> <76dc> @@ -12897,13 +12893,13 @@ endbfrange <408b> <408c> <7958> <408e> <408f> <7963> <4091> <4094> <7969> +endbfrange + +100 beginbfrange <4096> <409c> <7970> <409e> <40a2> <797b> <40a3> <40a4> <7982> <40a5> <40a8> <7986> -endbfrange - -100 beginbfrange <40a9> <40aa> <798b> <40ab> <40b4> <7990> <40b5> <40bf> <799b> @@ -13000,13 +12996,13 @@ endbfrange <4233> <4238> <7c01> <4239> <423b> <7c08> <423d> <4242> <7c10> +endbfrange + +100 beginbfrange <4243> <4249> <7c17> <424c> <424d> <7c24> <424e> <424f> <7c28> <4250> <425b> <7c2c> -endbfrange - -100 beginbfrange <425c> <425f> <7c39> <4261> <4268> <7c44> <4269> <4276> <7c4e> @@ -13103,13 +13099,13 @@ endbfrange <4415> <4419> <7f8f> <441a> <441e> <7f95> <441f> <4420> <7f9b> +endbfrange + +100 beginbfrange <4422> <4423> <7fa2> <4426> <442a> <7faa> <442c> <4430> <7fb3> <4431> <4432> <7fba> -endbfrange - -100 beginbfrange <4435> <4437> <7fc2> <4438> <443b> <7fc6> <443e> <4440> <7fcf> @@ -13206,13 +13202,13 @@ endbfrange <45d4> <45d5> <82f5> <45d8> <45dc> <82fc> <45dd> <45de> <830a> +endbfrange + +100 beginbfrange <45e1> <45e2> <8312> <45e4> <45e5> <8318> <45e6> <45ef> <831d> <45f0> <45f1> <8329> -endbfrange - -100 beginbfrange <45f7> <45f9> <833d> <45fa> <45fb> <8341> <45fc> <45fd> <8344> @@ -13309,13 +13305,13 @@ endbfrange <4791> <4793> <85e6> <4794> <479c> <85eb> <479e> <479f> <85f7> +endbfrange + +100 beginbfrange <47a0> <47a2> <85fc> <47a3> <47a6> <8600> <47a7> <47a9> <8608> <47aa> <47ae> <860c> -endbfrange - -100 beginbfrange <47af> <47b2> <8612> <47b3> <47b5> <8617> <47b6> <47b8> <861b> @@ -13412,13 +13408,13 @@ endbfrange <4928> <492b> <8873> <492d> <492f> <887a> <4932> <4933> <8886> +endbfrange + +100 beginbfrange <4934> <4935> <8889> <4937> <493a> <888e> <493b> <493d> <8893> <493e> <4942> <8897> -endbfrange - -100 beginbfrange <4943> <4947> <889d> <4949> <494e> <88a5> <4950> <4952> <88ae> @@ -13515,13 +13511,13 @@ endbfrange <4aa5> <4aa7> <8ad3> <4aa8> <4aaa> <8ad8> <4aac> <4aae> <8adf> +endbfrange + +100 beginbfrange <4ab1> <4ab3> <8ae8> <4ab5> <4ab6> <8aef> <4ab8> <4ab9> <8af4> <4ac0> <4ac1> <8b08> -endbfrange - -100 beginbfrange <4ac2> <4ac4> <8b0b> <4ac6> <4ac8> <8b11> <4acc> <4ace> <8b1e> @@ -13618,13 +13614,13 @@ endbfrange <4c6b> <4c6c> <8e7d> <4c6e> <4c70> <8e82> <4c75> <4c79> <8e95> +endbfrange + +100 beginbfrange <4c7c> <4c7d> <8e9f> <4c7e> <4c80> <8ea2> <4c81> <4c83> <8ea7> <4c84> <4c85> <8ead> -endbfrange - -100 beginbfrange <4c86> <4c87> <8eb0> <4c88> <4c8e> <8eb3> <4c8f> <4c93> <8ebb> @@ -13721,13 +13717,13 @@ endbfrange <4e09> <4e0c> <91b0> <4e0d> <4e10> <91b6> <4e11> <4e15> <91bb> +endbfrange + +100 beginbfrange <4e1c> <4e1d> <91da> <4e1e> <4e22> <91de> <4e23> <4e24> <91e5> <4e26> <4e30> <91ea> -endbfrange - -100 beginbfrange <4e33> <4e37> <91fb> <4e38> <4e39> <9202> <4e3a> <4e3c> <9205> @@ -13824,13 +13820,13 @@ endbfrange <4fb2> <4fb6> <9445> <4fb8> <4fbc> <944d> <4fbe> <4fc8> <9455> +endbfrange + +100 beginbfrange <4fc9> <4fca> <9461> <4fcc> <4fd0> <9466> <4fd2> <4fd3> <946e> <4fd5> <4fd8> <9473> -endbfrange - -100 beginbfrange <4fda> <4fdb> <947a> <4fdc> <4fe0> <9480> <4fe6> <4fe7> <94d3> @@ -13927,13 +13923,13 @@ endbfrange <5183> <5184> <9839> <5186> <518d> <983e> <518e> <5192> <9847> +endbfrange + +100 beginbfrange <5193> <5196> <984f> <5197> <5199> <9855> <519b> <519c> <985c> <519d> <519f> <985f> -endbfrange - -100 beginbfrange <51a0> <51a1> <9863> <51a3> <51a5> <9868> <51a6> <51a7> <986d> @@ -14030,13 +14026,13 @@ endbfrange <5397> <539b> <9bc2> <539d> <53a5> <9bcb> <53a7> <53aa> <9bd7> +endbfrange + +100 beginbfrange <53ac> <53ae> <9bde> <53b0> <53b1> <9be5> <53b3> <53b6> <9bec> <53b7> <53b9> <9bf1> -endbfrange - -100 beginbfrange <53ba> <53c1> <9bf5> <53c3> <53ca> <9c00> <53cb> <53cd> <9c0a> @@ -14133,13 +14129,13 @@ endbfrange <55bc> <55c4> <9f23> <55c5> <55c6> <9f2d> <55c7> <55cd> <9f30> +endbfrange + +100 beginbfrange <55d1> <55d5> <9f3f> <55d6> <55da> <9f45> <55db> <55dd> <9f4c> <55df> <55e2> <9f55> -endbfrange - -100 beginbfrange <55e3> <55e4> <9f5a> <55e5> <55e6> <9f5d> <55e8> <55e9> <9f64> @@ -14153,8 +14149,9 @@ endbfrange <5605> <5607> <9f96> <5608> <5609> <9f9d> <560a> <560e> <9fa1> -<5611> <5612> <fa0e> +<5610> <5612> <fa0d> <5614> <5615> <fa13> +<5617> <5619> <fa1f> <561a> <561b> <fa23> <561c> <561e> <fa27> <5635> <5636> <9fb6> @@ -14235,14 +14232,14 @@ endbfrange <6d2d> <6d5e> <4948> <6d5f> <6d60> <497b> <6d61> <6d64> <497e> +endbfrange + +19 beginbfrange <6d66> <6d79> <4987> <6d7a> <6d7c> <499c> <6d7d> <6d92> <49a0> <6d93> <6dff> <49b8> <6e00> <6eff> <4a25> -endbfrange - -14 beginbfrange <6f00> <6fff> <4b25> <7000> <7051> <4c25> <7052> <7078> <4c78> diff --git a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 index 599d35a819..e07d2bcc81 100644 --- a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 +++ b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-Japan1-UCS2 @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (Adobe-Japan1-UCS2) %%Title: (Adobe-Japan1-UCS2 Adobe Japan1 7) -%%Version: 10.002 +%%Version: 9.002 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2023 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /Adobe-Japan1-UCS2 def -/CMapVersion 10.002 def +/CMapVersion 9.002 def /CMapType 2 def /XUID [1 10 25335 1212] def @@ -81,7 +81,7 @@ endcodespacerange <006b> <00a4> <006c> <201c> <006d> <00ab> -<0072> <2013> +<0072> <2012> <0075> <00b7> <0076> <00b6> <0077> <2022> @@ -98,7 +98,7 @@ endcodespacerange <0087> <030b> <0088> <0328> <0089> <030c> -<008a> <2014> +<008a> <0336> <008b> <00c6> <008c> <00aa> <008d> <0141> @@ -111,7 +111,7 @@ endcodespacerange <0094> <00f8> <0095> <0153> <0096> <00df> -<0097> <2212> +<0097> <002d> <0098> <00a9> <0099> <00ac> <009a> <00ae> @@ -124,14 +124,13 @@ endcodespacerange <00e3> <0161> <00e4> <2122> <00e5> <017e> -<00e6> <0030fe00> -<00e7> <2002> +<00e6> <0030> <0123> <00a5> -<0143> <ffe8> -<0144> <007d> <0145> <203e> <0186> <ff40> <0189> <30ee> +<018a> <30ab> +<018b> <30b1> <018c> <30f4> <018d> <30ac> <018e> <30ae> @@ -165,10 +164,10 @@ endcodespacerange <020a> <3083> <020b> <3085> <020c> <3087> +<020d> <3063> endbfchar 100 beginbfchar -<020d> <3063> <020e> <3042> <020f> <3044> <0210> <3046> @@ -242,7 +241,7 @@ endbfchar <0275> <25b2> <0276> <00e1> <0277> <007e> -<0278> <0030fe00> +<0278> <0030> <027c> <ff0c> <027d> <ff0e> <027e> <30fb> @@ -252,7 +251,7 @@ endbfchar <0286> <ff40> <0287> <00a8> <0288> <ff3e> -<0289> <ffe3> +<0289> <203e> <028a> <ff3f> <028f> <3003> <0290> <4edd> @@ -261,20 +260,20 @@ endbfchar <0296> <2010> <0297> <ff0f> <0298> <ff3c> -<0299> <301c> +<0299> <ff5e> <029a> <2016> <029b> <ff5c> <029c> <2026> <029d> <2025> <02a6> <ff3b> <02a7> <ff3d> +<02a8> <ff5b> endbfchar 100 beginbfchar -<02a8> <ff5b> <02a9> <ff5d> <02b4> <ff0b> -<02b5> <2212> +<02b5> <ff0d> <02b6> <00b1> <02b7> <00d7> <02b8> <00f7> @@ -318,7 +317,7 @@ endbfchar <02e6> <220b> <02eb> <222a> <02ec> <2229> -<02ef> <ffe2> +<02ef> <00ac> <02f0> <21d2> <02f1> <21d4> <02f2> <2200> @@ -351,7 +350,7 @@ endbfchar <046a> <611b> <046b> <6328> <046c> <59f6> -<046d> <9022db40dd00> +<046d> <9022> <046e> <8475> <046f> <831c> <0470> <7a50> @@ -360,7 +359,7 @@ endbfchar <0473> <6e25> <0474> <65ed> <0475> <8466> -<0476> <82a6db40dd00> +<0476> <82a6> <0477> <9bf5> <0478> <6893> <0479> <5727> @@ -369,12 +368,12 @@ endbfchar <047c> <5b9b> <047d> <59d0> <047e> <867b> -<047f> <98f4db40dd00> +<047f> <98f4> <0480> <7d62> +<0481> <7dbe> endbfchar 100 beginbfchar -<0481> <7dbe> <0482> <9b8e> <0483> <6216> <0484> <7c9f> @@ -423,12 +422,12 @@ endbfchar <04af> <78ef> <04b0> <4e00> <04b1> <58f1> -<04b2> <6ea2db40dd00> +<04b2> <6ea2> <04b3> <9038> <04b4> <7a32> -<04b5> <8328db40dd00> +<04b5> <8328> <04b6> <828b> -<04b7> <9c2fdb40dd00> +<04b7> <9c2f> <04b8> <5141> <04b9> <5370> <04ba> <54bd> @@ -437,7 +436,7 @@ endbfchar <04bd> <59fb> <04be> <5f15> <04bf> <98f2> -<04c0> <6debdb40dd00> +<04c0> <6deb> <04c1> <80e4> <04c2> <852d> <04c3> <9662> @@ -449,7 +448,7 @@ endbfchar <04c9> <5b87> <04ca> <70cf> <04cb> <7fbd> -<04cc> <8fc2db40dd00> +<04cc> <8fc2> <04cd> <96e8> <04ce> <536f> <04cf> <9d5c> @@ -464,20 +463,20 @@ endbfchar <04d8> <851a> <04d9> <9c3b> <04da> <59e5> -<04db> <53a9db40dd00> +<04db> <53a9> <04dc> <6d66> <04dd> <74dc> <04de> <958f> -<04df> <5642db40dd00> +<04df> <5642> <04e0> <4e91> <04e1> <904b> <04e2> <96f2> <04e3> <834f> -<04e4> <990cdb40dd00> +<04e4> <990c> +<04e5> <53e1> endbfchar 100 beginbfchar -<04e5> <53e1> <04e6> <55b6> <04e7> <5b30> <04e8> <5f71> @@ -544,7 +543,7 @@ endbfchar <0525> <6bb4> <0526> <738b> <0527> <7fc1> -<0528> <8956db40dd00> +<0528> <8956> <0529> <9d2c> <052a> <9d0e> <052b> <9ec4> @@ -577,10 +576,10 @@ endbfchar <0546> <590f> <0547> <5ac1> <0548> <5bb6> +<0549> <5be1> endbfchar 100 beginbfchar -<0549> <5be1> <054a> <79d1> <054b> <6687> <054c> <679c> @@ -603,14 +602,14 @@ endbfchar <055d> <8ab2> <055e> <5629> <055f> <8ca8> -<0560> <8fe6db40dd00> +<0560> <8fe6> <0561> <904e> <0562> <971e> <0563> <868a> <0564> <4fc4> <0565> <5ce8> <0566> <6211> -<0567> <7259db40dd00> +<0567> <7259> <0568> <753b> <0569> <81e5> <056a> <82bd> @@ -625,17 +624,17 @@ endbfchar <0573> <56de> <0574> <584a> <0575> <58ca> -<0576> <5efbdb40dd00> +<0576> <5efb> <0577> <5feb> <0578> <602a> <0579> <6094> -<057a> <6062db40dd00> +<057a> <6062> <057b> <61d0> <057c> <6212> <057d> <62d0> <057e> <6539> <057f> <9b41> -<0580> <6666db40dd00> +<0580> <6666> <0581> <68b0> <0582> <6d77> <0583> <7070> @@ -680,10 +679,10 @@ endbfchar <05aa> <6bbb> <05ab> <7372> <05ac> <78ba> +<05ad> <7a6b> endbfchar 100 beginbfchar -<05ad> <7a6b> <05ae> <899a> <05af> <89d2> <05b0> <8d6b> @@ -709,7 +708,7 @@ endbfchar <05c6> <6d3b> <05c7> <6e07> <05c8> <6ed1> -<05c9> <845bdb40dd00> +<05c9> <845b> <05ca> <8910> <05cb> <8f44> <05cc> <4e14> @@ -717,12 +716,12 @@ endbfchar <05ce> <53f6> <05cf> <691b> <05d0> <6a3a> -<05d1> <9784db40dd00> +<05d1> <9784> <05d2> <682a> <05d3> <515c> <05d4> <7ac3> <05d5> <84b2> -<05d6> <91dcdb40dd00> +<05d6> <91dc> <05d7> <938c> <05d8> <565b> <05d9> <9d28> @@ -773,7 +772,7 @@ endbfchar <0606> <7c21> <0607> <7de9> <0608> <7f36> -<0609> <7ff0db40dd00> +<0609> <7ff0> <060a> <809d> <060b> <8266> <060c> <839e> @@ -783,10 +782,10 @@ endbfchar <0610> <9084> <0611> <9451> <0612> <9593> +<0613> <9591> endbfchar 100 beginbfchar -<0613> <9591> <0614> <95a2> <0615> <9665> <0616> <97d3> @@ -800,7 +799,7 @@ endbfchar <061e> <764c> <061f> <773c> <0620> <5ca9> -<0621> <7febdb40dd00> +<0621> <7feb> <0622> <8d0b> <0623> <96c1> <0624> <9811> @@ -836,7 +835,7 @@ endbfchar <0642> <5b63> <0643> <7a00> <0644> <7d00> -<0645> <5fbddb40dd00> +<0645> <5fbd> <0646> <898f> <0647> <8a18> <0648> <8cb4> @@ -857,7 +856,7 @@ endbfchar <0657> <6b3a> <0658> <72a0> <0659> <7591> -<065a> <7947db40dd00> +<065a> <7947> <065b> <7fa9> <065c> <87fb> <065d> <8abc> @@ -886,21 +885,21 @@ endbfchar <0674> <53ca> <0675> <5438> <0676> <5bae> +<0677> <5f13> endbfchar 100 beginbfchar -<0677> <5f13> <0678> <6025> <0679> <6551> <067a> <673d> <067b> <6c42> -<067c> <6c72db40dd00> +<067c> <6c72> <067d> <6ce3> -<067e> <7078db40dd00> +<067e> <7078> <067f> <7403> <0680> <7a76> <0681> <7aae> -<0682> <7b08db40dd00> +<0682> <7b08> <0683> <7d1a> <0684> <7cfe> <0685> <7d66> @@ -930,7 +929,7 @@ endbfchar <069f> <51f6> <06a0> <5354> <06a1> <5321> -<06a2> <537fdb40dd01> +<06a2> <537f> <06a3> <53eb> <06a4> <55ac> <06a5> <5883> @@ -954,7 +953,7 @@ endbfchar <06b7> <90f7> <06b8> <93e1> <06b9> <97ff> -<06ba> <9957db40dd00> +<06ba> <9957> <06bb> <9a5a> <06bc> <4ef0> <06bd> <51dd> @@ -967,7 +966,7 @@ endbfchar <06c4> <7389> <06c5> <6850> <06c6> <7c81> -<06c7> <50c5db40dd00> +<06c7> <50c5> <06c8> <52e4> <06c9> <5747> <06ca> <5dfe> @@ -989,10 +988,10 @@ endbfchar <06da> <91d1> <06db> <541f> <06dc> <9280> +<06dd> <4e5d> endbfchar 100 beginbfchar -<06dd> <4e5d> <06de> <5036> <06df> <53e5> <06e0> <533a> @@ -1007,16 +1006,16 @@ endbfchar <06e9> <5177> <06ea> <611a> <06eb> <865e> -<06ec> <55b0db40dd00> +<06ec> <55b0> <06ed> <7a7a> <06ee> <5076> <06ef> <5bd3> <06f0> <9047> <06f1> <9685> <06f2> <4e32> -<06f3> <6adbdb40dd01> +<06f3> <6adb> <06f4> <91e7> -<06f5> <5c51db40dd00> +<06f5> <5c51> <06f6> <5c48> <06f7> <6398> <06f8> <7a9f> @@ -1026,7 +1025,7 @@ endbfchar <06fc> <7aaa> <06fd> <718a> <06fe> <9688> -<06ff> <7c82db40dd00> +<06ff> <7c82> <0700> <6817> <0701> <7e70> <0702> <6851> @@ -1040,7 +1039,7 @@ endbfchar <070a> <90e1> <070b> <5366> <070c> <8888> -<070d> <7941db40dd00> +<070d> <7941> <070e> <4fc2> <070f> <50be> <0710> <5211> @@ -1085,23 +1084,23 @@ endbfchar <0737> <621f> <0738> <6483> <0739> <6fc0> -<073a> <9699db40dd00> +<073a> <9699> <073b> <6841> <073c> <5091> <073d> <6b20> <073e> <6c7a> <073f> <6f54> <0740> <7a74> +<0741> <7d50> endbfchar 100 beginbfchar -<0741> <7d50> <0742> <8840> <0743> <8a23> <0744> <6708> <0745> <4ef6> <0746> <5039> -<0747> <5026db40dd00> +<0747> <5026> <0748> <5065> <0749> <517c> <074a> <5238> @@ -1114,7 +1113,7 @@ endbfchar <0751> <61b2> <0752> <61f8> <0753> <62f3> -<0754> <6372db40dd00> +<0754> <6372> <0755> <691c> <0756> <6a29> <0757> <727d> @@ -1130,7 +1129,7 @@ endbfchar <0761> <8ce2> <0762> <8ed2> <0763> <9063> -<0764> <9375db40dd00> +<0764> <9375> <0765> <967a> <0766> <9855> <0767> <9a13> @@ -1147,7 +1146,7 @@ endbfchar <0772> <7d43> <0773> <8237> <0774> <8a00> -<0775> <8afadb40dd00> +<0775> <8afa> <0776> <9650> <0777> <4e4e> <0778> <500b> @@ -1195,10 +1194,10 @@ endbfchar <07a2> <8b77> <07a3> <9190> <07a4> <4e5e> +<07a5> <9bc9> endbfchar 100 beginbfchar -<07a5> <9bc9> <07a6> <4ea4> <07a7> <4f7c> <07a8> <4faf> @@ -1222,7 +1221,7 @@ endbfchar <07ba> <5b8f> <07bb> <5de5> <07bc> <5de7> -<07bd> <5df7db40dd00> +<07bd> <5df7> <07be> <5e78> <07bf> <5e83> <07c0> <5e9a> @@ -1239,7 +1238,7 @@ endbfchar <07cb> <66f4> <07cc> <676d> <07cd> <6821> -<07ce> <6897db40dd00> +<07ce> <6897> <07cf> <69cb> <07d0> <6c5f> <07d1> <6d2a> @@ -1295,15 +1294,15 @@ endbfchar <0803> <56fd> <0804> <7a40> <0805> <9177> -<0806> <9d60db40dd00> +<0806> <9d60> <0807> <9ed2> <0808> <7344> +<0809> <6f09> endbfchar 100 beginbfchar -<0809> <6f09> <080a> <8170> -<080b> <7511db40dd00> +<080b> <7511> <080c> <5ffd> <080d> <60da> <080e> <9aa8> @@ -1329,7 +1328,7 @@ endbfchar <0822> <9b42> <0823> <4e9b> <0824> <4f50> -<0825> <53c9db40dd00> +<0825> <53c9> <0826> <5506> <0827> <5d6f> <0828> <5de6> @@ -1379,7 +1378,7 @@ endbfchar <0854> <5742> <0855> <962a> <0856> <583a> -<0857> <698adb40dd00> +<0857> <698a> <0858> <80b4> <0859> <54b2> <085a> <5d0e> @@ -1401,10 +1400,10 @@ endbfchar <086a> <9bad> <086b> <7b39> <086c> <5319> +<086d> <518a> endbfchar 100 beginbfchar -<086d> <518a> <086e> <5237> <086f> <5bdf> <0870> <62f6> @@ -1412,13 +1411,13 @@ endbfchar <0872> <64e6> <0873> <672d> <0874> <6bba> -<0875> <85a9db40dd00> +<0875> <85a9> <0876> <96d1> <0877> <7690> -<0878> <9bd6db40dd00> +<0878> <9bd6> <0879> <634c> -<087a> <9306db40dd00> -<087b> <9babdb40dd00> +<087a> <9306> +<087b> <9bab> <087c> <76bf> <087d> <6652> <087e> <4e09> @@ -1438,7 +1437,7 @@ endbfchar <088c> <8b83> <088d> <8cdb> <088e> <9178> -<088f> <9910db40dd00> +<088f> <9910> <0890> <65ac> <0891> <66ab> <0892> <6b8b> @@ -1504,10 +1503,10 @@ endbfchar <08ce> <6ecb> <08cf> <6cbb> <08d0> <723e> +<08d1> <74bd> endbfchar 100 beginbfchar -<08d1> <74bd> <08d2> <75d4> <08d3> <78c1> <08d4> <793a> @@ -1563,8 +1562,8 @@ endbfchar <0906> <501f> <0907> <52fa> <0908> <5c3a> -<0909> <6753db40dd00> -<090a> <707cdb40dd00> +<0909> <6753> +<090a> <707c> <090b> <7235> <090c> <914c> <090d> <91c8> @@ -1607,10 +1606,10 @@ endbfchar <0932> <79c0> <0933> <79cb> <0934> <7d42> +<0935> <7e4d> endbfchar 100 beginbfchar -<0935> <7e4d> <0936> <7fd2> <0937> <81ed> <0938> <821f> @@ -1621,7 +1620,7 @@ endbfchar <093d> <8e74> <093e> <8f2f> <093f> <9031> -<0940> <914bdb40dd00> +<0940> <914b> <0941> <916c> <0942> <96c6> <0943> <919c> @@ -1660,7 +1659,7 @@ endbfchar <0964> <51c6> <0965> <5faa> <0966> <65ec> -<0967> <696fdb40dd00> +<0967> <696f> <0968> <6b89> <0969> <6df3> <096a> <6e96> @@ -1681,8 +1680,8 @@ endbfchar <0979> <7dd2> <097a> <7f72> <097b> <66f8> -<097c> <85afdb40dd00> -<097d> <85f7db40dd00> +<097c> <85af> +<097d> <85f7> <097e> <8af8> <097f> <52a9> <0980> <53d9> @@ -1698,7 +1697,7 @@ endbfchar <098a> <5320> <098b> <5347> <098c> <53ec> -<098d> <54e8db40dd00> +<098d> <54e8> <098e> <5546> <098f> <5531> <0990> <5617> @@ -1710,10 +1709,10 @@ endbfchar <0996> <5c0f> <0997> <5c11> <0998> <5c1a> +<0999> <5e84> endbfchar 100 beginbfchar -<0999> <5e84> <099a> <5e8a> <099b> <5ee0> <099c> <5f70> @@ -1764,7 +1763,7 @@ endbfchar <09c9> <937e> <09ca> <9418> <09cb> <969c> -<09cc> <9798db40dd00> +<09cc> <9798> <09cd> <4e0a> <09ce> <4e08> <09cf> <4e1e> @@ -1779,7 +1778,7 @@ endbfchar <09d8> <60c5> <09d9> <64fe> <09da> <6761> -<09db> <6756db40dd00> +<09db> <6756> <09dc> <6d44> <09dd> <72b6> <09de> <7573> @@ -1800,7 +1799,7 @@ endbfchar <09ed> <8272> <09ee> <89e6> <09ef> <98df> -<09f0> <8755db40dd00> +<09f0> <8755> <09f1> <8fb1> <09f2> <5c3b> <09f3> <4f38> @@ -1813,10 +1812,10 @@ endbfchar <09fa> <5fc3> <09fb> <614e> <09fc> <632f> +<09fd> <65b0> endbfchar 100 beginbfchar -<09fd> <65b0> <09fe> <664b> <09ff> <68ee> <0a00> <699b> @@ -1847,7 +1846,7 @@ endbfchar <0a19> <751a> <0a1a> <5c3d> <0a1b> <814e> -<0a1c> <8a0adb40dd00> +<0a1c> <8a0a> <0a1d> <8fc5> <0a1e> <9663> <0a1f> <976d> @@ -1857,7 +1856,7 @@ endbfchar <0a23> <9162> <0a24> <56f3> <0a25> <53a8> -<0a26> <9017db40dd00> +<0a26> <9017> <0a27> <5439> <0a28> <5782> <0a29> <5e25> @@ -1889,7 +1888,7 @@ endbfchar <0a43> <96c0> <0a44> <88fe> <0a45> <6f84> -<0a46> <647adb40dd00> +<0a46> <647a> <0a47> <5bf8> <0a48> <4e16> <0a49> <702c> @@ -1916,10 +1915,10 @@ endbfchar <0a5e> <7cbe> <0a5f> <8056> <0a60> <58f0> +<0a61> <88fd> endbfchar 100 beginbfchar -<0a61> <88fd> <0a62> <897f> <0a63> <8aa0> <0a64> <8a93> @@ -1971,7 +1970,7 @@ endbfchar <0a92> <5ddd> <0a93> <6226> <0a94> <6247> -<0a95> <64b0db40dd00> +<0a95> <64b0> <0a96> <6813> <0a97> <6834> <0a98> <6cc9> @@ -1979,11 +1978,11 @@ endbfchar <0a9a> <6d17> <0a9b> <67d3> <0a9c> <6f5c> -<0a9d> <714edb40dd00> -<0a9e> <717ddb40dd00> +<0a9d> <714e> +<0a9e> <717d> <0a9f> <65cb> -<0aa0> <7a7fdb40dd00> -<0aa1> <7baddb40dd00> +<0aa0> <7a7f> +<0aa1> <7bad> <0aa2> <7dda> <0aa3> <7e4a> <0aa4> <7fa8> @@ -1991,7 +1990,7 @@ endbfchar <0aa6> <821b> <0aa7> <8239> <0aa8> <85a6> -<0aa9> <8a6edb40dd00> +<0aa9> <8a6e> <0aaa> <8cce> <0aab> <8df5> <0aac> <9078> @@ -2009,7 +2008,7 @@ endbfchar <0ab8> <7e55> <0ab9> <81b3> <0aba> <7cce> -<0abb> <564cdb40dd00> +<0abb> <564c> <0abc> <5851> <0abd> <5ca8> <0abe> <63aa> @@ -2019,10 +2018,10 @@ endbfchar <0ac2> <72d9> <0ac3> <758f> <0ac4> <758e> +<0ac5> <790e> endbfchar 100 beginbfchar -<0ac5> <790e> <0ac6> <7956> <0ac7> <79df> <0ac8> <7c97> @@ -2031,7 +2030,7 @@ endbfchar <0acb> <8607> <0acc> <8a34> <0acd> <963b> -<0ace> <9061db40dd00> +<0ace> <9061> <0acf> <9f20> <0ad0> <50e7> <0ad1> <5275> @@ -2104,13 +2103,13 @@ endbfchar <0b14> <5352> <0b15> <8896> <0b16> <5176> -<0b17> <63c3db40dd00> +<0b17> <63c3> <0b18> <5b58> <0b19> <5b6b> <0b1a> <5c0a> <0b1b> <640d> <0b1c> <6751> -<0b1d> <905cdb40dd00> +<0b1d> <905c> <0b1e> <4ed6> <0b1f> <591a> <0b20> <592a> @@ -2122,10 +2121,10 @@ endbfchar <0b26> <60f0> <0b27> <6253> <0b28> <67c1> +<0b29> <8235> endbfchar 100 beginbfchar -<0b29> <8235> <0b2a> <6955> <0b2b> <9640> <0b2c> <99c4> @@ -2144,7 +2143,7 @@ endbfchar <0b39> <6cf0> <0b3a> <6ede> <0b3b> <80ce> -<0b3c> <817fdb40dd00> +<0b3c> <817f> <0b3d> <82d4> <0b3e> <888b> <0b3f> <8cb8> @@ -2177,7 +2176,7 @@ endbfchar <0b5a> <8afe> <0b5b> <8338> <0b5c> <51e7> -<0b5d> <86f8db40dd00> +<0b5d> <86f8> <0b5e> <53ea> <0b5f> <53e9> <0b60> <4f46> @@ -2187,12 +2186,12 @@ endbfchar <0b64> <8131> <0b65> <5dfd> <0b66> <7aea> -<0b67> <8fbfdb40dd00> +<0b67> <8fbf> <0b68> <68da> <0b69> <8c37> <0b6a> <72f8> <0b6b> <9c48> -<0b6c> <6a3ddb40dd00> +<0b6c> <6a3d> <0b6d> <8ab0> <0b6e> <4e39> <0b6f> <5358> @@ -2201,7 +2200,7 @@ endbfchar <0b72> <62c5> <0b73> <63a2> <0b74> <65e6> -<0b75> <6b4edb40dd00> +<0b75> <6b4e> <0b76> <6de1> <0b77> <6e5b> <0b78> <70ad> @@ -2225,10 +2224,10 @@ endbfchar <0b8a> <8ac7> <0b8b> <5024> <0b8c> <77e5> +<0b8d> <5730> endbfchar 100 beginbfchar -<0b8d> <5730> <0b8e> <5f1b> <0b8f> <6065> <0b90> <667a> @@ -2261,12 +2260,12 @@ endbfchar <0bab> <6ce8> <0bac> <866b> <0bad> <8877> -<0bae> <8a3bdb40dd00> +<0bae> <8a3b> <0baf> <914e> <0bb0> <92f3> <0bb1> <99d0> <0bb2> <6a17> -<0bb3> <7026db40dd00> +<0bb3> <7026> <0bb4> <732a> <0bb5> <82e7> <0bb6> <8457> @@ -2304,7 +2303,7 @@ endbfchar <0bd6> <9802> <0bd7> <9ce5> <0bd8> <52c5> -<0bd9> <6357db40dd00> +<0bd9> <6357> <0bda> <76f4> <0bdb> <6715> <0bdc> <6c88> @@ -2315,9 +2314,9 @@ endbfchar <0be1> <6d25> <0be2> <589c> <0be3> <690e> -<0be4> <69ccdb40dd00> +<0be4> <69cc> <0be5> <8ffd> -<0be6> <939adb40dd00> +<0be6> <939a> <0be7> <75db> <0be8> <901a> <0be9> <585a> @@ -2327,11 +2326,11 @@ endbfchar <0bed> <4f43> <0bee> <6f2c> <0bef> <67d8> -<0bf0> <8fbbdb40dd00> +<0bf0> <8fbb> +<0bf1> <8526> endbfchar 100 beginbfchar -<0bf1> <8526> <0bf2> <7db4> <0bf3> <9354> <0bf4> <693f> @@ -2360,7 +2359,7 @@ endbfchar <0c0b> <5f1f> <0c0c> <608c> <0c0d> <62b5> -<0c0e> <633adb40dd00> +<0c0e> <633a> <0c0f> <63d0> <0c10> <68af> <0c11> <6c40> @@ -2374,19 +2373,19 @@ endbfchar <0c19> <8e44> <0c1a> <9013> <0c1b> <90b8> -<0c1c> <912ddb40dd00> +<0c1c> <912d> <0c1d> <91d8> <0c1e> <9f0e> <0c1f> <6ce5> <0c20> <6458> -<0c21> <64e2db40dd00> +<0c21> <64e2> <0c22> <6575> <0c23> <6ef4> <0c24> <7684> <0c25> <7b1b> <0c26> <9069> <0c27> <93d1> -<0c28> <6ebadb40dd00> +<0c28> <6eba> <0c29> <54f2> <0c2a> <5fb9> <0c2b> <64a4> @@ -2410,19 +2409,19 @@ endbfchar <0c3d> <6fb1> <0c3e> <7530> <0c3f> <96fb> -<0c40> <514edb40dd00> +<0c40> <514e> <0c41> <5410> -<0c42> <5835db40dd00> +<0c42> <5835> <0c43> <5857> <0c44> <59ac> -<0c45> <5c60db40dd00> +<0c45> <5c60> <0c46> <5f92> <0c47> <6597> <0c48> <675c> <0c49> <6e21> <0c4a> <767b> <0c4b> <83df> -<0c4c> <8ceddb40dd00> +<0c4c> <8ced> <0c4d> <9014> <0c4e> <90fd> <0c4f> <934d> @@ -2431,10 +2430,10 @@ endbfchar <0c52> <52aa> <0c53> <5ea6> <0c54> <571f> +<0c55> <5974> endbfchar 100 beginbfchar -<0c55> <5974> <0c56> <6012> <0c57> <5012> <0c58> <515a> @@ -2521,32 +2520,32 @@ endbfchar <0ca9> <82eb> <0caa> <5bc5> <0cab> <9149> -<0cac> <701edb40dd00> +<0cac> <701e> <0cad> <5678> <0cae> <5c6f> <0caf> <60c7> <0cb0> <6566> <0cb1> <6c8c> <0cb2> <8c5a> -<0cb3> <9041db40dd00> +<0cb3> <9041> <0cb4> <9813> <0cb5> <5451> <0cb6> <66c7> <0cb7> <920d> <0cb8> <5948> +<0cb9> <90a3> endbfchar 100 beginbfchar -<0cb9> <90a3> <0cba> <5185> <0cbb> <4e4d> <0cbc> <51ea> <0cbd> <8599> -<0cbe> <8b0edb40dd00> -<0cbf> <7058db40dd00> +<0cbe> <8b0e> +<0cbf> <7058> <0cc0> <637a> <0cc1> <934b> -<0cc2> <6962db40dd00> +<0cc2> <6962> <0cc3> <99b4> <0cc4> <7e04> <0cc5> <7577> @@ -2575,7 +2574,7 @@ endbfchar <0cdc> <5fcd> <0cdd> <8a8d> <0cde> <6fe1> -<0cdf> <79b0db40dd00> +<0cdf> <79b0> <0ce0> <7962> <0ce1> <5be7> <0ce2> <8471> @@ -2621,7 +2620,7 @@ endbfchar <0d0a> <6557> <0d0b> <676f> <0d0c> <76c3> -<0d0d> <724cdb40dd00> +<0d0d> <724c> <0d0e> <80cc> <0d0f> <80ba> <0d10> <8f29> @@ -2637,12 +2636,12 @@ endbfchar <0d1a> <58f2> <0d1b> <8ce0> <0d1c> <966a> +<0d1d> <9019> endbfchar 100 beginbfchar -<0d1d> <9019db40dd00> <0d1e> <877f> -<0d1f> <79e4db40dd00> +<0d1f> <79e4> <0d20> <77e7> <0d21> <8429> <0d22> <4f2f> @@ -2662,12 +2661,12 @@ endbfchar <0d30> <7206> <0d31> <7e1b> <0d32> <83ab> -<0d33> <99c1db40dd00> +<0d33> <99c1> <0d34> <9ea6> <0d35> <51fd> <0d36> <7bb1> <0d37> <7872> -<0d38> <7bb8db40dd00> +<0d38> <7bb8> <0d39> <8087> <0d3a> <7b48> <0d3b> <6ae8> @@ -2695,7 +2694,7 @@ endbfchar <0d51> <5224> <0d52> <534a> <0d53> <53cd> -<0d54> <53dbdb40dd00> +<0d54> <53db> <0d55> <5e06> <0d56> <642c> <0d57> <6591> @@ -2715,7 +2714,7 @@ endbfchar <0d65> <7169> <0d66> <9812> <0d67> <98ef> -<0d68> <633ddb40dd00> +<0d68> <633d> <0d69> <6669> <0d6a> <756a> <0d6b> <76e4> @@ -2740,18 +2739,18 @@ endbfchar <0d7e> <7891> <0d7f> <79d8> <0d80> <7dcb> +<0d81> <7f77> endbfchar 100 beginbfchar -<0d81> <7f77> <0d82> <80a5> <0d83> <88ab> -<0d84> <8ab9db40dd00> +<0d84> <8ab9> <0d85> <8cbb> <0d86> <907f> <0d87> <975e> <0d88> <98db> -<0d89> <6a0bdb40dd00> +<0d89> <6a0b> <0d8a> <7c38> <0d8b> <5099> <0d8c> <5c3e> @@ -2763,7 +2762,7 @@ endbfchar <0d92> <7f8e> <0d93> <9f3b> <0d94> <67ca> -<0d95> <7a17db40dd00> +<0d95> <7a17> <0d96> <5339> <0d97> <758b> <0d98> <9aed> @@ -2775,13 +2774,13 @@ endbfchar <0d9e> <5fc5> <0d9f> <7562> <0da0> <7b46> -<0da1> <903cdb40dd00> +<0da1> <903c> <0da2> <6867> <0da3> <59eb> <0da4> <5a9b> <0da5> <7d10> <0da6> <767e> -<0da7> <8b2cdb40dd00> +<0da7> <8b2c> <0da8> <4ff5> <0da9> <5f6a> <0daa> <6a19> @@ -2791,8 +2790,8 @@ endbfchar <0dae> <7968> <0daf> <8868> <0db0> <8a55> -<0db1> <8c79db40dd00> -<0db2> <5edfdb40dd00> +<0db1> <8c79> +<0db2> <5edf> <0db3> <63cf> <0db4> <75c5> <0db5> <79d2> @@ -2806,7 +2805,7 @@ endbfchar <0dbd> <5f6c> <0dbe> <658c> <0dbf> <6d5c> -<0dc0> <7015db40dd00> +<0dc0> <7015> <0dc1> <8ca7> <0dc2> <8cd3> <0dc3> <983b> @@ -2824,7 +2823,7 @@ endbfchar <0dcf> <6016> <0dd0> <6276> <0dd1> <6577> -<0dd2> <65a7db40dd00> +<0dd2> <65a7> <0dd3> <666e> <0dd4> <6d6e> <0dd5> <7236> @@ -2843,10 +2842,10 @@ endbfchar <0de2> <6b66> <0de3> <821e> <0de4> <8461> +<0de5> <856a> endbfchar 100 beginbfchar -<0de5> <856a> <0de6> <90e8> <0de7> <5c01> <0de8> <6953> @@ -2892,7 +2891,7 @@ endbfchar <0e10> <5f0a> <0e11> <67c4> <0e12> <4e26> -<0e13> <853ddb40dd00> +<0e13> <853d> <0e14> <9589> <0e15> <965b> <0e16> <7c73> @@ -2902,22 +2901,22 @@ endbfchar <0e1a> <7656> <0e1b> <78a7> <0e1c> <5225> -<0e1d> <77a5db40dd00> -<0e1e> <8511db40dd00> +<0e1d> <77a5> +<0e1e> <8511> <0e1f> <7b86> <0e20> <504f> <0e21> <5909> <0e22> <7247> -<0e23> <7bc7db40dd00> +<0e23> <7bc7> <0e24> <7de8> <0e25> <8fba> <0e26> <8fd4> <0e27> <904d> <0e28> <4fbf> <0e29> <52c9> -<0e2a> <5a29db40dd00> +<0e2a> <5a29> <0e2b> <5f01> -<0e2c> <97addb40dd00> +<0e2c> <97ad> <0e2d> <4fdd> <0e2e> <8217> <0e2f> <92ea> @@ -2946,10 +2945,10 @@ endbfchar <0e46> <5cf0> <0e47> <5cef> <0e48> <5d29> +<0e49> <5e96> endbfchar 100 beginbfchar -<0e49> <5e96db40dd00> <0e4a> <62b1> <0e4b> <6367> <0e4c> <653e> @@ -2963,7 +2962,7 @@ endbfchar <0e54> <80de> <0e55> <82b3> <0e56> <840c> -<0e57> <84ecdb40dd00> +<0e57> <84ec> <0e58> <8702> <0e59> <8912> <0e5a> <8a2a> @@ -3032,7 +3031,7 @@ endbfchar <0e9b> <6795> <0e9c> <9baa> <0e9d> <67fe> -<0e9e> <9c52db40dd00> +<0e9e> <9c52> <0e9f> <685d> <0ea0> <4ea6> <0ea1> <4fe3> @@ -3040,7 +3039,7 @@ endbfchar <0ea3> <62b9> <0ea4> <672b> <0ea5> <6cab> -<0ea6> <8fc4db40dd00> +<0ea6> <8fc4> <0ea7> <4fad> <0ea8> <7e6d> <0ea9> <9ebf> @@ -3049,10 +3048,10 @@ endbfchar <0eac> <6e80> <0ead> <6f2b> <0eae> <8513> +<0eaf> <5473> endbfchar 100 beginbfchar -<0eaf> <5473> <0eb0> <672a> <0eb1> <9b45> <0eb2> <5df3> @@ -3106,16 +3105,16 @@ endbfchar <0ee2> <7db2> <0ee3> <8017> <0ee4> <8499> -<0ee5> <5132db40dd00> +<0ee5> <5132> <0ee6> <6728> <0ee7> <9ed9> <0ee8> <76ee> <0ee9> <6762> <0eea> <52ff> -<0eeb> <9905db40dd00> +<0eeb> <9905> <0eec> <5c24> <0eed> <623b> -<0eee> <7c7edb40dd00> +<0eee> <7c7e> <0eef> <8cb0> <0ef0> <554f> <0ef1> <60b6> @@ -3125,7 +3124,7 @@ endbfchar <0ef5> <4e5f> <0ef6> <51b6> <0ef7> <591c> -<0ef8> <723adb40dd00> +<0ef8> <723a> <0ef9> <8036> <0efa> <91ce> <0efb> <5f25> @@ -3139,9 +3138,9 @@ endbfchar <0f03> <9756> <0f04> <67f3> <0f05> <85ae> -<0f06> <9453db40dd00> +<0f06> <9453> <0f07> <6109> -<0f08> <6108db40dd00> +<0f08> <6108> <0f09> <6cb9> <0f0a> <7652> <0f0b> <8aed> @@ -3152,10 +3151,10 @@ endbfchar <0f10> <52c7> <0f11> <53cb> <0f12> <5ba5> +<0f13> <5e7d> endbfchar 100 beginbfchar -<0f13> <5e7d> <0f14> <60a0> <0f15> <6182> <0f16> <63d6> @@ -3163,8 +3162,6 @@ endbfchar <0f18> <67da> <0f19> <6e67> <0f1a> <6d8c> -<0f1b> <7336> -<0f1c> <7337db40dd00> <0f1d> <7531> <0f1e> <7950> <0f1f> <88d5> @@ -3255,12 +3252,12 @@ endbfchar <0f74> <7565> <0f75> <5289> <0f76> <6d41> -endbfchar - -100 beginbfchar <0f77> <6e9c> <0f78> <7409> <0f79> <7559> +endbfchar + +100 beginbfchar <0f7a> <786b> <0f7b> <7c92> <0f7c> <9686> @@ -3333,9 +3330,9 @@ endbfchar <0fbf> <5ec9> <0fc0> <604b> <0fc1> <6190> -<0fc2> <6f23db40dd01> -<0fc3> <7149db40dd01> -<0fc4> <7c3edb40dd00> +<0fc2> <6f23> +<0fc3> <7149> +<0fc4> <7c3e> <0fc5> <7df4> <0fc6> <806f> <0fc7> <84ee> @@ -3354,16 +3351,16 @@ endbfchar <0fd4> <5f04> <0fd5> <6717> <0fd6> <697c> -<0fd7> <6994db40dd00> +<0fd7> <6994> <0fd8> <6d6a> <0fd9> <6f0f> <0fda> <7262> -endbfchar - -100 beginbfchar <0fdb> <72fc> <0fdc> <7bed> <0fdd> <8001> +endbfchar + +100 beginbfchar <0fde> <807e> <0fdf> <874b> <0fe0> <90ce> @@ -3461,12 +3458,12 @@ endbfchar <1041> <4ff6> <1042> <5021> <1043> <5029> -endbfchar - -100 beginbfchar <1044> <502c> <1045> <4ffe> <1046> <4fef> +endbfchar + +100 beginbfchar <1047> <5011> <1048> <5006> <1049> <5043> @@ -3518,7 +3515,7 @@ endbfchar <107f> <518f> <1080> <5191> <1081> <5193> -<1084> <51a4db40dd00> +<1084> <51a4> <1085> <51a6> <1086> <51a2> <108a> <51b3> @@ -3564,12 +3561,12 @@ endbfchar <10b6> <8fa7> <10b9> <52bc> <10ba> <52b5> -endbfchar - -100 beginbfchar <10bb> <52c1> <10bc> <52cd> <10bd> <52d7> +endbfchar + +100 beginbfchar <10be> <52de> <10bf> <52e3> <10c0> <52e6> @@ -3614,7 +3611,7 @@ endbfchar <10e9> <53c3> <10ea> <7c12> <10eb> <96d9> -<10ec> <53dfdb40dd00> +<10ec> <53df> <10ed> <66fc> <10ee> <71ee> <10ef> <53ee> @@ -3648,7 +3645,7 @@ endbfchar <110d> <54a2> <110e> <54b8> <110f> <54a5> -<1110> <54acdb40dd00> +<1110> <54ac> <1111> <54c4> <1112> <54c8> <1113> <54a8> @@ -3667,12 +3664,12 @@ endbfchar <1122> <54e2> <1123> <5539> <1124> <5540> -endbfchar - -100 beginbfchar <1125> <5563> <1126> <554c> <1127> <552e> +endbfchar + +100 beginbfchar <1128> <555c> <1129> <5545> <112c> <5538> @@ -3712,7 +3709,7 @@ endbfchar <114e> <71df> <114f> <5634> <1150> <5636> -<1151> <5632db40dd00> +<1151> <5632> <1152> <5638> <1153> <566b> <1154> <5664> @@ -3733,7 +3730,7 @@ endbfchar <1163> <56bc> <1164> <56c1> <1165> <56c3> -<1166> <56c0db40dd00> +<1166> <56c0> <1167> <56c8> <1168> <56ce> <1169> <56d1> @@ -3770,12 +3767,12 @@ endbfchar <118a> <57a4> <118b> <57aa> <118c> <57b0> -endbfchar - -100 beginbfchar <118d> <57c3> <118e> <57c6> <118f> <57d4> +endbfchar + +100 beginbfchar <1192> <580a> <1193> <57d6> <1194> <57e3> @@ -3873,12 +3870,12 @@ endbfchar <11fb> <5ad0> <11fc> <5b2a> <11fd> <5b36> -endbfchar - -100 beginbfchar <11fe> <5b3e> <11ff> <5b43> <1200> <5b45> +endbfchar + +100 beginbfchar <1201> <5b40> <1202> <5b51> <1203> <5b55> @@ -3976,12 +3973,12 @@ endbfchar <1265> <5db7> <1266> <5dbc> <1267> <5dc9> -endbfchar - -100 beginbfchar <1268> <5dcd> <1269> <5dd3> <126a> <5dd2> +endbfchar + +100 beginbfchar <126b> <5dd6> <126c> <5ddb> <126d> <5deb> @@ -4051,7 +4048,7 @@ endbfchar <12b9> <5f87> <12ba> <5f9e> <12bb> <5f99> -<12bc> <5f98db40dd00> +<12bc> <5f98> <12bd> <5fa0> <12be> <5fa8> <12bf> <5fad> @@ -4079,12 +4076,12 @@ endbfchar <12d5> <603a> <12d6> <605a> <12d7> <6041> -endbfchar - -100 beginbfchar <12d8> <606a> <12d9> <6077> <12da> <605f> +endbfchar + +100 beginbfchar <12db> <604a> <12dc> <6046> <12dd> <604d> @@ -4182,16 +4179,16 @@ endbfchar <1344> <620d> <1345> <620c> <1346> <6214> -endbfchar - -100 beginbfchar <1347> <621b> <1348> <621e> <1349> <6221> +endbfchar + +100 beginbfchar <134a> <622a> <134b> <622e> <134c> <6230> -<134f> <6241db40dd00> +<134f> <6241> <1350> <624e> <1351> <625e> <1352> <6263> @@ -4266,7 +4263,7 @@ endbfchar <1399> <6428> <139a> <640f> <139b> <6467> -<139c> <646fdb40dd00> +<139c> <646f> <139d> <6476> <139e> <644e> <139f> <652a> @@ -4285,12 +4282,12 @@ endbfchar <13ac> <64c2> <13ad> <64f1> <13ae> <64e7> -endbfchar - -100 beginbfchar <13af> <8209> <13b2> <62ac> <13b3> <64e3> +endbfchar + +100 beginbfchar <13b4> <64ef> <13b5> <652c> <13b6> <64f6> @@ -4388,12 +4385,12 @@ endbfchar <141e> <6759> <1421> <6789> <1422> <6770> -endbfchar - -100 beginbfchar <1423> <67a9> <1424> <677c> <1425> <676a> +endbfchar + +100 beginbfchar <1426> <678c> <1427> <678b> <1428> <67a6> @@ -4491,12 +4488,12 @@ endbfchar <1484> <6981> <1485> <696a> <1486> <69b2> -endbfchar - -100 beginbfchar <1487> <69ae> <1488> <69d0> <1489> <69bf> +endbfchar + +100 beginbfchar <148a> <69c1> <148b> <69d3> <148c> <69be> @@ -4594,12 +4591,12 @@ endbfchar <14ee> <6ba4> <14f1> <6baf> <14f2> <6bb2> -endbfchar - -100 beginbfchar <14f3> <6bb1> <14f4> <6bb3> <14f5> <6bb7> +endbfchar + +100 beginbfchar <14f6> <6bbc> <14f7> <6bc6> <14f8> <6bcb> @@ -4697,12 +4694,12 @@ endbfchar <1556> <6e76> <1557> <6e4d> <1558> <6e1f> -endbfchar - -100 beginbfchar <1559> <6e43> <155a> <6e3a> <155b> <6e4e> +endbfchar + +100 beginbfchar <155c> <6e24> <155d> <6eff> <155e> <6e1d> @@ -4800,12 +4797,12 @@ endbfchar <15bc> <7109> <15bd> <70fd> <15be> <711c> -endbfchar - -100 beginbfchar <15bf> <7119> <15c0> <7165> <15c1> <7155> +endbfchar + +100 beginbfchar <15c2> <7188> <15c3> <7166> <15c4> <7162> @@ -4860,8 +4857,6 @@ endbfchar <15f9> <72ce> <15fa> <72d2> <15fb> <72e2> -<15fc> <72e0> -<15fd> <72e1db40dd00> <15fe> <72f9> <15ff> <72f7> <1600> <500f> @@ -4903,14 +4898,14 @@ endbfchar <1626> <743f> <1627> <745f> <1628> <7459> -endbfchar - -100 beginbfchar <1629> <7441> <162a> <745c> <162b> <7469> <162c> <7470> <162d> <7463> +endbfchar + +100 beginbfchar <162e> <746a> <162f> <7476> <1630> <747e> @@ -4935,10 +4930,10 @@ endbfchar <1645> <750c> <1646> <750e> <1647> <750d> -<1648> <7515db40dd00> +<1648> <7515> <1649> <7513> <164a> <751e> -<164b> <7526db40dd00> +<164b> <7526> <164c> <752c> <164d> <753c> <164e> <7544> @@ -4970,7 +4965,7 @@ endbfchar <166a> <75b5> <166b> <75bd> <166c> <75b8> -<166d> <75bcdb40dd00> +<166d> <75bc> <166e> <75b1> <166f> <75cd> <1670> <75ca> @@ -5006,14 +5001,14 @@ endbfchar <169c> <7688> <169d> <768b> <169e> <768e> -endbfchar - -100 beginbfchar <169f> <7696> <16a0> <7693> <16a3> <76b0> <16a4> <76b4> <16a8> <76c2> +endbfchar + +100 beginbfchar <16a9> <76cd> <16aa> <76d6> <16ab> <76d2> @@ -5109,14 +5104,14 @@ endbfchar <170b> <79aa> <170c> <79ae> <170d> <79b3> -endbfchar - -100 beginbfchar <1710> <79c9> <1711> <79d5> <1712> <79e7> <1713> <79ec> <1714> <79e1> +endbfchar + +100 beginbfchar <1715> <79e3> <1716> <7a08> <1717> <7a0d> @@ -5141,7 +5136,7 @@ endbfchar <172e> <7a98> <172f> <7a96> <1730> <7aa9> -<1731> <7ac8db40dd00> +<1731> <7ac8> <1732> <7ab0> <1733> <7ab6> <1734> <7ac5> @@ -5174,7 +5169,7 @@ endbfchar <1755> <7b0b> <1756> <7b4c> <1757> <7b45> -<1758> <7b75db40dd00> +<1758> <7b75> <1759> <7b65> <175a> <7b74> <175b> <7b67> @@ -5197,7 +5192,7 @@ endbfchar <176e> <7bcf> <176f> <7bb4> <1770> <7bc6> -<1771> <7bdddb40dd00> +<1771> <7bdd> <1772> <7be9> <1773> <7c11> <1774> <7c14> @@ -5212,14 +5207,14 @@ endbfchar <177d> <7c17> <177e> <7c0d> <177f> <7bf6> -endbfchar - -100 beginbfchar <1780> <7c23> <1781> <7c27> <1782> <7c2a> <1783> <7c1f> <1784> <7c37> +endbfchar + +100 beginbfchar <1785> <7c2b> <1786> <7c3d> <1787> <7c4c> @@ -5315,14 +5310,14 @@ endbfchar <17e1> <7e21> <17e2> <7e12> <17e3> <7e31> -endbfchar - -100 beginbfchar <17e4> <7e1f> <17e5> <7e09> <17e6> <7e0b> <17e7> <7e22> <17e8> <7e46> +endbfchar + +100 beginbfchar <17e9> <7e66> <17ea> <7e3b> <17eb> <7e35> @@ -5418,14 +5413,14 @@ endbfchar <185a> <80ad> <185b> <5190> <185c> <80ac> -endbfchar - -100 beginbfchar <185d> <80db> <185e> <80e5> <185f> <80d9> <1860> <80dd> <1861> <80c4> +endbfchar + +100 beginbfchar <1862> <80da> <1863> <80d6> <1864> <8109> @@ -5442,7 +5437,7 @@ endbfchar <186f> <8153> <1870> <8151> <1871> <80fc> -<1872> <8171db40dd00> +<1872> <8171> <1873> <816e> <1876> <8174> <1877> <8183> @@ -5486,7 +5481,7 @@ endbfchar <18a3> <8233> <18a4> <8240> <18a5> <8259> -<18a6> <8258db40dd00> +<18a6> <8258> <18a7> <825d> <18a8> <825a> <18a9> <825f> @@ -5497,7 +5492,7 @@ endbfchar <18b0> <8271> <18b3> <827e> <18b4> <828d> -<18b5> <8292db40dd00> +<18b5> <8292> <18b6> <82ab> <18b7> <829f> <18b8> <82bb> @@ -5521,14 +5516,14 @@ endbfchar <18ca> <8335> <18cb> <8334> <18cc> <8316> -endbfchar - -100 beginbfchar <18cd> <8332> <18ce> <8331> <18cf> <8340> <18d0> <8339> <18d1> <8350> +endbfchar + +100 beginbfchar <18d2> <8345> <18d3> <832f> <18d4> <832b> @@ -5624,14 +5619,14 @@ endbfchar <1932> <856d> <1933> <8594> <1934> <859b> -endbfchar - -100 beginbfchar <1935> <85ea> <1936> <8587> <1937> <859c> <1938> <8577> <1939> <857e> +endbfchar + +100 beginbfchar <193a> <8590> <193b> <85c9> <193c> <85ba> @@ -5655,7 +5650,7 @@ endbfchar <194e> <863f> <194f> <864d> <1950> <4e55> -<1951> <8654db40dd00> +<1951> <8654> <1952> <865f> <1953> <8667> <1954> <8671> @@ -5680,7 +5675,7 @@ endbfchar <196b> <8706> <196c> <8708> <196d> <8700> -<196e> <8703db40dd00> +<196e> <8703> <196f> <86fb> <1970> <8711> <1971> <8709> @@ -5707,7 +5702,7 @@ endbfchar <1986> <8753> <1987> <8763> <1988> <876a> -<1989> <8805db40dd00> +<1989> <8805> <198a> <87a2> <198b> <879f> <198c> <8782> @@ -5727,14 +5722,14 @@ endbfchar <199a> <87f2> <199b> <87e0> <199c> <880f> -endbfchar - -100 beginbfchar <199d> <880d> <199e> <87fe> <19a1> <880e> <19a2> <87d2> <19a3> <8811> +endbfchar + +100 beginbfchar <19a4> <8816> <19a5> <8815> <19a6> <8822> @@ -5823,21 +5818,21 @@ endbfchar <1a03> <8a10> <1a04> <8a0c> <1a05> <8a1b> -<1a06> <8a1ddb40dd00> +<1a06> <8a1d> <1a07> <8a25> <1a08> <8a36> <1a09> <8a41> <1a0a> <8a5b> <1a0b> <8a52> <1a0c> <8a46> -endbfchar - -100 beginbfchar <1a0d> <8a48> <1a0e> <8a7c> <1a0f> <8a6d> <1a10> <8a6c> <1a11> <8a62> +endbfchar + +100 beginbfchar <1a12> <8a85> <1a13> <8a82> <1a14> <8a84> @@ -5933,14 +5928,14 @@ endbfchar <1a7c> <8d13> <1a7d> <8ccd> <1a7e> <8d14> -endbfchar - -100 beginbfchar <1a7f> <8d16> <1a80> <8d67> <1a81> <8d6d> <1a82> <8d71> <1a83> <8d73> +endbfchar + +100 beginbfchar <1a84> <8d81> <1a85> <8d99> <1a86> <8dc2> @@ -6036,14 +6031,14 @@ endbfchar <1ae9> <8fe5> <1aea> <8fe2> <1aeb> <8fea> -endbfchar - -100 beginbfchar <1aec> <8fef> <1aed> <9087> <1aee> <8ff4> <1aef> <9005> <1af2> <9011> +endbfchar + +100 beginbfchar <1af3> <9015> <1af4> <9021> <1af5> <900d> @@ -6139,14 +6134,14 @@ endbfchar <1b57> <92e9> <1b58> <930f> <1b59> <92fa> -endbfchar - -100 beginbfchar <1b5a> <9344> <1b5b> <932e> <1b5c> <9319> <1b5d> <9322> <1b5e> <931a> +endbfchar + +100 beginbfchar <1b5f> <9323> <1b60> <933a> <1b61> <9335> @@ -6242,14 +6237,14 @@ endbfchar <1bc3> <96aa> <1bc4> <96a7> <1bc7> <96b0> -endbfchar - -100 beginbfchar <1bc8> <96b4> <1bc9> <96b6> <1bcc> <96ce> <1bcd> <96cb> <1bce> <96c9> +endbfchar + +100 beginbfchar <1bcf> <96cd> <1bd0> <894d> <1bd1> <96dc> @@ -6281,7 +6276,7 @@ endbfchar <1bed> <9768> <1bee> <52d2> <1bef> <976b> -<1bf0> <9771db40dd00> +<1bf0> <9771> <1bf1> <9779> <1bf2> <9785> <1bf3> <977c> @@ -6345,21 +6340,21 @@ endbfchar <1c3a> <9955> <1c3d> <99a5> <1c40> <99bc> -endbfchar - -100 beginbfchar <1c41> <99df> <1c42> <99db> <1c43> <99dd> <1c44> <99d8> <1c45> <99d1> +endbfchar + +100 beginbfchar <1c4a> <99fb> <1c4b> <99f8> <1c4c> <9a01> <1c4d> <9a0f> <1c4e> <9a05> <1c4f> <99e2> -<1c50> <9a19db40dd00> +<1c50> <9a19> <1c51> <9a2b> <1c52> <9a37> <1c53> <9a45> @@ -6448,14 +6443,14 @@ endbfchar <1cbc> <9c67> <1cbd> <9c76> <1cbe> <9c78> -endbfchar - -100 beginbfchar <1cbf> <9ce7> <1cc0> <9cec> <1cc1> <9cf0> -<1cc2> <9d09db40dd00> +<1cc2> <9d09> <1cc3> <9d08> +endbfchar + +100 beginbfchar <1cc4> <9ceb> <1cc5> <9d03> <1cc6> <9d06> @@ -6551,14 +6546,14 @@ endbfchar <1d35> <7464> <1d36> <2642> <1da1> <3349> -endbfchar - -100 beginbfchar <1da2> <3314> <1da3> <3322> <1da4> <334d> <1da5> <3318> <1da6> <3327> +endbfchar + +100 beginbfchar <1da7> <3303> <1da8> <3336> <1da9> <3351> @@ -6593,19 +6588,19 @@ endbfchar <1dd4> <9c2f> <1dd5> <6deb> <1dd6> <8fc2> -<1dd7> <6b1ddb40dd01> -<1dd8> <53a9db40dd01> +<1dd7> <6b1d> +<1dd8> <53a9> <1dd9> <d863dcdd> <1dda> <5642> -<1ddb> <990cdb40dd01> +<1ddb> <990c> <1ddc> <7130> <1ddd> <8956> <1dde> <9dd7> <1ddf> <8fe6> -<1de0> <6062db40dd01> -<1de1> <62d0db40dd01> +<1de0> <6062> +<1de1> <62d0> <1de2> <6666> -<1de3> <559dfe00> +<1de3> <fa36> <1de4> <845b> <1de5> <9784> <1de6> <5699> @@ -6619,110 +6614,110 @@ endbfchar <1dee> <50c5> <1def> <8ec0> <1df0> <55b0> -<1df1> <6adb> +<1df1> <d87edced> <1df2> <5c51> -<1df3> <9774db40dd01> +<1df3> <9774> <1df4> <7941> -<1df5> <6167db40dd01> +<1df5> <6167> <1df6> <d856dc74> <1df7> <7e6b> <1df8> <8346> <1df9> <d863def6> <1dfa> <5026> -<1dfb> <5accdb40dd01> +<1dfb> <5acc> <1dfc> <6372> <1dfd> <9e7c> <1dfe> <8afa> <1dff> <5df7> <1e00> <663b> -<1e01> <6e9ddb40dd01> +<1e01> <6e9d> <1e02> <9eb4> <1e03> <9d60> -<1e04> <7511db40dd01> -<1e05> <91c7db40dd01> +<1e04> <7511> +<1e05> <91c7> <1e06> <698a> <1e07> <6805> <1e08> <85a9> <1e09> <9bd6> <1e0a> <9306> -<1e0b> <73cadb40dd01> -<1e0c> <53f1db40dd01> +<1e0b> <73ca> +<1e0c> <53f1> <1e0d> <5c62> -<1e0e> <906edb40dd01> -<1e0f> <6753> +<1e0e> <906e> +<1e0f> <d87edcdc> <1e10> <707c> <1e11> <7e61> <1e12> <914b> -<1e13> <66d9db40dd01> -endbfchar - -100 beginbfchar -<1e14> <6e1afe00> +<1e13> <66d9> +<1e14> <fa46> <1e15> <85af> <1e16> <85f7> <1e17> <54e8> -<1e18> <5ee0db40dd01> -<1e19> <68a2db40dd01> +<1e18> <5ee0> +endbfchar + +100 beginbfchar +<1e19> <68a2> <1e1a> <8523> <1e1b> <91ac> <1e1c> <9798> <1e1d> <8755> -<1e1e> <9771db40dd01> +<1e1e> <976d> <1e1f> <9017> -<1e20> <7fe0db40dd01> +<1e20> <7fe0> <1e21> <647a> -<1e22> <901ddb40dd01> +<1e22> <901d> <1e23> <87ec> <1e24> <64b0> -<1e25> <6813db40dd01> +<1e25> <6813> <1e26> <714e> -<1e27> <717ddb40dd01> +<1e27> <717d> <1e28> <8a6e> <1e29> <564c> <1e2a> <9061> -<1e2b> <5275db40dd01> +<1e2b> <5275> <1e2c> <6414> -<1e2d> <7626db40dd01> +<1e2d> <75e9> <1e2e> <905c> <1e2f> <9a52> <1e30> <817f> -<1e31> <9edbdb40dd01> -<1e32> <5544db40dd01> -<1e33> <6fefdb40dd01> -<1e34> <7422fe00> +<1e31> <9edb> +<1e32> <5544> +<1e33> <6fef> +<1e34> <fa4a> <1e35> <86f8> <1e36> <d87edc84> <1e37> <8fbf> -<1e38> <68dadb40dd01> -<1e39> <9c48db40dd01> +<1e38> <68da> +<1e39> <9c48> <1e3a> <6a3d> <1e3b> <7c1e> <1e3c> <8a3b> <1e3d> <7026> -<1e3e> <51cbdb40dd01> +<1e3e> <51cb> <1e3f> <6357> <1e40> <69cc> <1e41> <939a> -<1e42> <585afe00> +<1e42> <fa10> <1e43> <6451> <1e44> <912d> <1e45> <64e2> -<1e46> <6eba> +<1e46> <f9ec> <1e47> <5861> <1e48> <985a> <1e49> <5835> -<1e4a> <5c60> -<1e4b> <83dfdb40dd01> +<1e4a> <d87edc77> +<1e4b> <83df> <1e4c> <8ced> -<1e4d> <5858db40dd01> +<1e4d> <5858> <1e4e> <79b1> -<1e4f> <9d07db40dd01> +<1e4f> <9d07> <1e50> <7006> <1e51> <701e> -<1e52> <5678db40dd01> -<1e53> <9041db40dd01> -<1e54> <9813db40dd01> -<1e55> <90a3db40dd01> +<1e52> <5678> +<1e53> <9041> +<1e54> <9813> +<1e55> <90a3> <1e56> <8b0e> <1e57> <7058> <1e58> <6962> @@ -6736,117 +6731,115 @@ endbfchar <1e60> <6f51> <1e61> <91b1> <1e62> <633d> -<1e63> <6249db40dd01> +<1e63> <6249> <1e64> <6a0b> -<1e65> <67cadb40dd01> +<1e65> <67ca> <1e66> <7a17> <1e67> <903c> -<1e68> <5a9bdb40dd01> +<1e68> <5a9b> <1e69> <8b2c> <1e6a> <5edf> <1e6b> <7015> -<1e6c> <983bfe00> +<1e6c> <fa6a> <1e6d> <853d> <1e6e> <77a5> <1e6f> <5a29> <1e70> <5e96> -<1e71> <6ce1db40dd01> +<1e71> <6ce1> <1e72> <84ec> <1e73> <9830> <1e74> <9c52> <1e75> <9eb5> <1e76> <5132> <1e77> <9905> +<1e78> <7c7e> +<1e79> <9453> +<1e7a> <6108> +<1e7b> <7652> +<1e7c> <7337> endbfchar 100 beginbfchar -<1e78> <7c7edb40dd01> -<1e79> <9453> -<1e7a> <6108> -<1e7b> <7652db40dd01> -<1e7c> <7337db40dd01> -<1e7d> <7194db40dd01> -<1e7e> <8000db40dd01> +<1e7d> <7194> +<1e7e> <8000> <1e7f> <840a> <1e80> <f9c3> -<1e81> <6f23> -<1e82> <7149> <1e83> <f999> <1e84> <6994> <1e85> <881f> <1e86> <d87edc0f> -<1e87> <5189db40dd01> +<1e87> <5189> <1e88> <d87edcd3> -<1e89> <51a4> -<1e8a> <5539db40dd01> -<1e8b> <5533db40dd01> -<1e8c> <55e4db40dd01> +<1e89> <d87edc18> +<1e8a> <5539> +<1e8b> <5533> +<1e8c> <55e4> <1e8d> <5632> -<1e8e> <56a5db40dd01> -<1e8f> <580bdb40dd01> -<1e90> <5abedb40dd01> +<1e8e> <56a5> +<1e8f> <580b> +<1e90> <5abe> <1e91> <d846de1a> <1e92> <5c5b> -<1e93> <5e64db40dd01> -<1e94> <6097db40dd01> -<1e95> <6369db40dd01> -<1e96> <6406db40dd01> +<1e93> <5e64> +<1e94> <6097> +<1e95> <6369> +<1e96> <6406> <1e97> <6522> -<1e98> <6583db40dd01> -<1e99> <67a6db40dd01> +<1e98> <6583> +<1e99> <67a6> <1e9a> <67fa> -<1e9b> <689bdb40dd01> +<1e9b> <689b> <1e9c> <688e> -<1e9d> <6e6edb40dd01> +<1e9d> <6e6e> <1e9e> <d850dfd0> <1e9f> <d87edd20> -<1ea0> <73cedb40dd01> -<1ea1> <7504db40dd01> -<1ea2> <750ddb40dd01> -<1ea3> <7515db40dd01> -<1ea4> <7693db40dd01> -<1ea5> <787cdb40dd01> -<1ea6> <7a31db40dd01> -<1ea7> <9f9ddb40dd01> -<1ea8> <7b99db40dd01> -<1ea9> <7c90db40dd01> -<1eaa> <7caedb40dd01> -<1eab> <7d9bdb40dd01> -<1eac> <7daedb40dd01> -<1ead> <7d9fdb40dd01> -<1eae> <7fd4db40dd01> -<1eaf> <822edb40dd01> -<1eb0> <828ddb40dd01> -<1eb1> <82d2db40dd01> -<1eb2> <8323db40dd01> -<1eb3> <8375db40dd01> -<1eb4> <8517db40dd01> +<1ea0> <73ce> +<1ea1> <7504> +<1ea2> <750d> +<1ea3> <7515> +<1ea4> <7693> +<1ea5> <787c> +<1ea6> <7a31> +<1ea7> <9f9d> +<1ea8> <7b99> +<1ea9> <7c90> +<1eaa> <7cae> +<1eab> <7d9b> +<1eac> <7dae> +<1ead> <7d9f> +<1eae> <7fd4> +<1eaf> <822e> +<1eb0> <828d> +<1eb1> <82d2> +<1eb2> <8323> +<1eb3> <8375> +<1eb4> <8517> <1eb5> <853e> -<1eb6> <8782db40dd01> -<1eb7> <87d2db40dd01> -<1eb8> <890adb40dd01> -<1eb9> <89afdb40dd01> -<1eba> <8adedb40dd01> -<1ebb> <8b41db40dd01> -<1ebc> <8ddadb40dd01> -<1ebd> <8e09db40dd01> -<1ebe> <8f13db40dd01> -<1ebf> <8feadb40dd01> -<1ec0> <8fe9db40dd01> -<1ec1> <9058db40dd01> -<1ec2> <6248db40dd01> -<1ec3> <91c1db40dd01> -<1ec4> <95bbdb40dd01> +<1eb6> <8782> +<1eb7> <87d2> +<1eb8> <890a> +<1eb9> <89af> +<1eba> <8ade> +<1ebb> <8b41> +<1ebc> <8dda> +<1ebd> <8e09> +<1ebe> <8f13> +<1ebf> <8fea> +<1ec0> <9087> +<1ec1> <9058> +<1ec2> <6248> +<1ec3> <91c1> +<1ec4> <95bb> <1ec5> <7762> -<1ec6> <9724db40dd01> -<1ec7> <9760db40dd01> -<1ec8> <976ddb40dd01> -<1ec9> <9824db40dd01> -<1eca> <9b2edb40dd01> -<1ecb> <9b97db40dd01> -<1ecc> <9bf2db40dd01> -<1ecd> <9eaadb40dd01> -<1ece> <9f9cdb40dd01> +<1ec6> <9724> +<1ec7> <9760> +<1ec8> <9771> +<1ec9> <9824> +<1eca> <9b2e> +<1ecb> <9b97> +<1ecc> <9bf2> +<1ecd> <9eaa> +<1ece> <9f9c> <1ed1> <203e> <1ed2> <ff3f> <1ed3> <30fc> @@ -6857,12 +6850,7 @@ endbfchar <1ed8> <ff5c> <1ed9> <2026> <1eda> <2025> -<1edf> <ff3b> -<1ee0> <ff3d> <1ee1> <ff5b> -endbfchar - -100 beginbfchar <1ee2> <ff5d> <1eed> <ff1d> <1eee> <3041> @@ -6872,6 +6860,9 @@ endbfchar <1ef2> <3049> <1ef3> <3063> <1ef4> <3083> +endbfchar + +100 beginbfchar <1ef5> <3085> <1ef6> <3087> <1ef7> <308e> @@ -6904,47 +6895,47 @@ endbfchar <1f19> <82a6> <1f1a> <8328> <1f1b> <5653> -<1f1c> <53a9db40dd02> +<1f1c> <53a9> <1f1d> <7259> <1f1e> <6c72> -<1f1f> <7b08db40dd01> +<1f1f> <7b08> <1f20> <9957> -<1f21> <62f3db40dd01> +<1f21> <62f3> <1f22> <9910> -<1f23> <976ddb40dd02> +<1f23> <976d> <1f24> <717d> <1f25> <7a7f> <1f26> <7bad> <1f27> <63c3> -<1f28> <83dfdb40dd02> -<1f29> <7962db40dd01> +<1f28> <83df> +<1f29> <7962> <1f2a> <53db> <1f2b> <7bc7> <1f2c> <8fc4> -<1f2d> <7c3edb40dd01> -<1f2e> <50cadb40dd01> -<1f2f> <5315db40dd01> -<1f30> <55a9db40dd01> -<1f31> <56aedb40dd01> -<1f32> <5819db40dd01> -<1f33> <591bdb40dd01> -<1f34> <5c28db40dd01> -<1f35> <5ed0db40dd01> -<1f36> <5ecfdb40dd01> +<1f2d> <7c3e> +<1f2e> <50ca> +<1f2f> <5315> +<1f30> <55a9> +<1f31> <56ae> +<1f32> <5819> +<1f33> <591b> +<1f34> <5c28> +<1f35> <5ed0> +<1f36> <5ecf> <1f37> <6241> -<1f38> <66c1db40dd01> -<1f39> <6c08db40dd01> -<1f3a> <6e23db40dd01> -<1f3b> <6eecdb40dd01> -<1f3c> <7a97db40dd01> +<1f38> <66c1> +<1f39> <6c08> +<1f3a> <6e23> +<1f3b> <6eec> +<1f3c> <7a97> <1f3d> <7bdd> -<1f3e> <7fe9db40dd01> -<1f3f> <8422db40dd01> -<1f40> <8759db40dd01> -<1f41> <880edb40dd01> -<1f42> <87d2db40dd02> +<1f3e> <7fe9> +<1f3f> <8422> +<1f40> <8759> +<1f41> <880e> +<1f42> <87d2> <1f43> <9a19> -<1f44> <9eaddb40dd01> +<1f44> <9ead> <1f45> <ffe4> <1f46> <ff07> <1f47> <ff02> @@ -6963,9 +6954,6 @@ endbfchar <1f54> <33a0> <1f55> <33a2> <1f58> <3397> -endbfchar - -100 beginbfchar <1f59> <2113> <1f5a> <3398> <1f5b> <33b3> @@ -6975,6 +6963,9 @@ endbfchar <1f62> <33cb> <1f63> <3390> <1f64> <33d4> +endbfchar + +100 beginbfchar <1f65> <3396> <1f66> <3322> <1f67> <3316> @@ -6999,7 +6990,7 @@ endbfchar <1f7a> <3020> <1f7b> <00a9> <1f7c> <00ae> -<1f7d> <d83cdd00> +<1f7d> <0030002e> <1f9b> <3251> <1fca> <3243> <1fcb> <323d> @@ -7066,10 +7057,7 @@ endbfchar <201f> <3299> <2020> <24ea> <2023> <ff10> -endbfchar - -100 beginbfchar -<2024> <ff10fe00> +<2024> <ff10> <2025> <3000> <202e> <258f> <202f> <258e> @@ -7078,6 +7066,9 @@ endbfchar <2032> <258b> <2033> <258a> <2034> <2589> +endbfchar + +100 beginbfchar <2039> <2570> <203a> <256f> <203b> <2550> @@ -7117,7 +7108,7 @@ endbfchar <2073> <213b> <2074> <3004> <2075> <21c6> -<2078> <21f5> +<2078> <21932191> <207d> <5927> <207e> <5c0f> <207f> <329d> @@ -7169,9 +7160,6 @@ endbfchar <20ad> <70bb> <20ae> <6631> <20af> <68c8> -endbfchar - -100 beginbfchar <20b0> <92f9> <20b1> <66fb> <20b2> <5f45> @@ -7181,6 +7169,9 @@ endbfchar <20b6> <4f00> <20b7> <4f03> <20b8> <4f39> +endbfchar + +100 beginbfchar <20b9> <4f56> <20ba> <4f92> <20bb> <4f8a> @@ -7208,7 +7199,7 @@ endbfchar <20d1> <52c0> <20d2> <52db> <20d3> <5300> -<20d4> <5307db40dd01> +<20d4> <5307> <20d5> <5324> <20d6> <5372> <20d7> <5393> @@ -7226,7 +7217,7 @@ endbfchar <20e3> <57c8> <20e4> <57c7> <20e5> <fa0f> -<20e6> <585adb40dd02> +<20e6> <585a> <20e7> <589e> <20e8> <58b2> <20e9> <590b> @@ -7240,14 +7231,14 @@ endbfchar <20f1> <5bc0> <20f2> <752f> <20f3> <5bd8> -<20f4> <5bdbdb40dd01> +<20f4> <5bdb> <20f5> <5c1e> <20f6> <5ca6> <20f7> <5cba> <20f8> <5cf5> <20f9> <5d27> <20fa> <5d53> -<20fb> <fa11db40dd01> +<20fb> <fa11> <20fc> <5d42> <20fd> <5d6d> <2100> <5dd0> @@ -7272,21 +7263,21 @@ endbfchar <2113> <63f5> <2114> <6460> <2115> <649d> -endbfchar - -100 beginbfchar <2116> <64ce> <2117> <654e> <2118> <6600> <2119> <6615> <211a> <6609> <211b> <662e> -<211c> <661edb40dd01> +<211c> <661e> <211d> <6624> <211e> <6665> +endbfchar + +100 beginbfchar <211f> <6657> <2120> <6659> -<2121> <6674fe00> +<2121> <fa12> <2122> <6673> <2123> <6699> <2124> <66a0> @@ -7294,12 +7285,12 @@ endbfchar <2126> <66bf> <2127> <66fa> <2128> <670e> -<2129> <6717db40dd02> +<2129> <6717> <212a> <6766> <212b> <67bb> <212c> <6852> <212d> <67c0> -<212e> <6801db40dd01> +<212e> <6801> <212f> <6844> <2130> <68cf> <2131> <fa13> @@ -7345,13 +7336,13 @@ endbfchar <2159> <710f> <215a> <7104> <215b> <715c> -<215e> <51dedb40dd04> +<215e> <d841de11> <215f> <71c1> <2160> <71fe> <2161> <72b1> <2162> <72be> <2163> <7324> -<2164> <732afe00> +<2164> <fa16> <2165> <7377> <2166> <73bd> <2167> <73c9> @@ -7364,7 +7355,7 @@ endbfchar <216e> <742a> <216f> <7429> <2170> <742e> -<2171> <7462db40dd01> +<2171> <7462> <2172> <7489> <2173> <749f> <2174> <7501> @@ -7374,10 +7365,7 @@ endbfchar <2178> <769e> <2179> <769b> <217a> <76a6> -<217b> <76cafe00> -endbfchar - -100 beginbfchar +<217b> <fa17> <217c> <7746> <217d> <52af> <217e> <7821> @@ -7385,27 +7373,27 @@ endbfchar <2180> <7864> <2181> <787a> <2182> <7930> -<2183> <793cfe00> -<2184> <795efe00> -<2185> <7965fe00> <2186> <7994> -<2187> <798ffe00> +<2187> <fa1b> +endbfchar + +100 beginbfchar <2188> <799b> <2189> <7ad1> <218a> <7ae7> -<218b> <9756fe00> +<218b> <fa1c> <218c> <7aeb> <218d> <7b9e> -<218e> <7cbefe00> +<218e> <fa1d> <218f> <7d48> -<2190> <7d5cdb40dd01> +<2190> <7d5c> <2191> <7db7> <2192> <7da0> <2193> <7dd6> <2194> <7e52> <2195> <7f47> <2196> <7fa1> -<2197> <7fbdfe00> +<2197> <fa1e> <2198> <8301> <2199> <8362> <219a> <837f> @@ -7418,8 +7406,6 @@ endbfchar <21a1> <856b> <21a2> <fa1f> <21a3> <85b0> -<21a4> <8612db40dd01> -<21a5> <fa21> <21a6> <8807> <21a7> <88f5> <21a8> <8a12> @@ -7428,21 +7414,19 @@ endbfchar <21ab> <8aa7> <21ac> <8abe> <21ad> <8adf> -<21ae> <8af8fe00> +<21ae> <fa22> <21af> <8af6> <21b0> <8b53> -<21b1> <8b7fdb40dd00> +<21b1> <8b7f> <21b2> <8cf0> <21b3> <8cf4> <21b4> <8d12> <21b5> <8d76> <21b6> <fa23> <21b7> <8ecf> -<21b8> <fa24db40dd01> -<21b9> <9038fe00> <21ba> <9067> <21bb> <90de> -<21bc> <90fdfe00> +<21bc> <fa26> <21bd> <9115> <21be> <9127> <21bf> <91da> @@ -7478,9 +7462,6 @@ endbfchar <21e3> <9302> <21e4> <9370> <21e5> <9357> -endbfchar - -100 beginbfchar <21e6> <93a4> <21e7> <93c6> <21e8> <93de> @@ -7489,7 +7470,7 @@ endbfchar <21eb> <9445> <21ec> <9448> <21ed> <9592> -<21ee> <9686db40dd02> +<21ee> <9686> <21ef> <fa29> <21f0> <969d> <21f1> <96af> @@ -7497,15 +7478,16 @@ endbfchar <21f3> <973b> <21f4> <9743> <21f5> <974d> +endbfchar + +100 beginbfchar <21f6> <974f> <21f7> <9751> -<21f8> <9755db40dd01> +<21f8> <9755> <21f9> <9857> <21fa> <9865> -<21fb> <98effe00> -<21fc> <98fcfe00> <21fd> <9927> -<21fe> <9928fe00> +<21fe> <fa2c> <21ff> <999e> <2200> <9a4e> <2201> <9ad9> @@ -7518,7 +7500,7 @@ endbfchar <2208> <9c00> <2209> <9d70> <220a> <9d6b> -<220b> <9db4fe00> +<220b> <fa2d> <220c> <9e19> <220d> <9ed1> <220e> <00ac> @@ -7538,7 +7520,7 @@ endbfchar <227a> <00a4> <227b> <201c> <227c> <00ab> -<2281> <2013> +<2281> <2012> <2284> <00b7> <2285> <00b6> <2286> <2022> @@ -7555,7 +7537,7 @@ endbfchar <2296> <030b> <2297> <0328> <2298> <030c> -<2299> <2014> +<2299> <0336> <229a> <00c6> <229b> <00aa> <229c> <0141> @@ -7568,7 +7550,7 @@ endbfchar <22a3> <00f8> <22a4> <0153> <22a5> <00df> -<22a6> <2212> +<22a6> <002d> <22a7> <00a9> <22a8> <00ac> <22a9> <00ae> @@ -7581,14 +7563,9 @@ endbfchar <22f2> <0161> <22f3> <2122> <22f4> <017e> -endbfchar - -100 beginbfchar -<22f5> <0030fe00> +<22f5> <0030> <22f6> <2002> <2332> <00a5> -<2352> <ffe8> -<2353> <007d> <2354> <203e> <2355> <ff40> <2356> <2032> @@ -7604,6 +7581,9 @@ endbfchar <2360> <00d1> <2361> <00f1> <2364> <00f3> +endbfchar + +100 beginbfchar <2365> <00fa> <2366> <00a1> <2367> <00bf> @@ -7624,10 +7604,12 @@ endbfchar <2376> <00e9> <2377> <00e1> <2378> <007e> -<2379> <0030fe00> +<2379> <0030> <237a> <00ac> <237b> <005c> <23be> <30ee> +<23bf> <30ab> +<23c0> <30b1> <23c1> <30f4> <23c2> <30ac> <23c3> <30ae> @@ -7684,9 +7666,6 @@ endbfchar <2415> <308e> <2416> <304c> <2417> <304e> -endbfchar - -100 beginbfchar <2418> <3050> <2419> <3052> <241a> <3054> @@ -7705,6 +7684,9 @@ endbfchar <243b> <2012> <243c> <ff60> <2489> <25b2> +endbfchar + +100 beginbfchar <248a> <20ac> <248b> <2126> <248e> <fb00> @@ -7780,16 +7762,13 @@ endbfchar <254e> <00a4> <254f> <201c> <2550> <00ab> -<2555> <2013> +<2555> <2012> <2558> <00b7> <2559> <00b6> <255a> <2022> <255b> <201a> <255c> <201e> <255d> <201d> -endbfchar - -100 beginbfchar <255e> <00bb> <255f> <2026> <2560> <2030> @@ -7800,7 +7779,7 @@ endbfchar <256a> <030b> <256b> <0328> <256c> <030c> -<256d> <2014> +<256d> <0336> <256e> <00c6> <256f> <00aa> <2570> <0141> @@ -7808,12 +7787,15 @@ endbfchar <2572> <0152> <2573> <00ba> <2574> <00e6> +endbfchar + +100 beginbfchar <2575> <0131> <2576> <0142> <2577> <00f8> <2578> <0153> <2579> <00df> -<257a> <2212> +<257a> <002d> <257b> <00a9> <257c> <00ac> <257d> <00ae> @@ -7826,7 +7808,7 @@ endbfchar <25c6> <0161> <25c7> <2122> <25c8> <017e> -<25c9> <0030fe00> +<25c9> <0030> <25ca> <20ac> <25cb> <2126> <25ce> <fb00> @@ -7865,34 +7847,31 @@ endbfchar <2607> <01d4> <2608> <016f> <2609> <0169> -<2614> <2014> +<2614> <0336> <2615> <002d> <2616> <003d> <2617> <002c> -<2628> <2014> +<2628> <0336> <2629> <002d> <262a> <003d> <262b> <002c> <2632> <00b7> <2633> <20ac> -<2634> <2189> +<2634> <0030002f0033> <2637> <00be> -<263e> <2150> +<263e> <0031002f0037> <263f> <0032002f0037> <2640> <0033002f0037> <2641> <0034002f0037> <2642> <0035002f0037> <2643> <0036002f0037> -<2648> <2151> +<2648> <0031002f0039> <2649> <0032002f0039> <264a> <0034002f0039> <264b> <0035002f0039> <264c> <0037002f0039> <264d> <0038002f0039> -<264e> <2152> -endbfchar - -100 beginbfchar +<264e> <0031002f00310030> <264f> <0033002f00310030> <2650> <0037002f00310030> <2651> <0039002f00310030> @@ -7911,6 +7890,9 @@ endbfchar <265e> <0037002f00310032> <265f> <00310031002f00310032> <2660> <0031002f003100300030> +endbfchar + +100 beginbfchar <2661> <0030002f0033> <2662> <0031002f0032> <2663> <0031002f0033> @@ -7958,7 +7940,7 @@ endbfchar <268d> <0037002f00310032> <268e> <00310031002f00310032> <268f> <0031002f003100300030> -<269a> <0030fe00> +<269a> <0030> <269b> <2163> <269c> <00300030> <269d> <00300031> @@ -7993,9 +7975,6 @@ endbfchar <26ba> <00340031> <26bb> <00340032> <26bc> <00340033> -endbfchar - -100 beginbfchar <26bd> <00340034> <26be> <00340035> <26bf> <00340036> @@ -8014,6 +7993,9 @@ endbfchar <26cc> <00350039> <26cd> <00360030> <26ce> <00360031> +endbfchar + +100 beginbfchar <26cf> <00360032> <26d0> <00360033> <26d1> <00360034> @@ -8096,9 +8078,6 @@ endbfchar <276a> <30b9> <276b> <30bb> <276c> <30bd> -endbfchar - -100 beginbfchar <276d> <30bf> <276e> <30c1> <276f> <30c4> @@ -8117,6 +8096,9 @@ endbfchar <279c> <53414e94> <279d> <5341516d> <279e> <53414e03> +endbfchar + +100 beginbfchar <279f> <5341516b> <27a0> <53414e5d> <27a1> <4e8c5341> @@ -8126,7 +8108,7 @@ endbfchar <27a5> <554f> <27a6> <7b54> <27a7> <4f8b> -<27bc> <3064> +<27bc> <3063> <27bd> <624d> <27be> <3007> <27bf> <4e00> @@ -8184,11 +8166,30 @@ endbfchar <27f3> <4e5d> <27f4> <5341> <27f5> <30b3> -<27f6> <3064> -<27f7> <30c4> -<27f8> <624d> +<27f6> <3063> +<27f7> <30c3> +<27f8> <30a9> <27f9> <00280029> <27fa> <00300030> +<2804> <00330032> +<2805> <00330033> +<2806> <00330034> +<2807> <00330035> +<2808> <00330036> +<2809> <00330037> +<280a> <00330038> +<280b> <00330039> +<280c> <00340030> +<280d> <00340031> +<280e> <00340032> +<280f> <00340033> +<2810> <00340034> +<2811> <00340035> +<2812> <00340036> +<2813> <00340037> +<2814> <00340038> +<2815> <00340039> +<2816> <00350030> <2817> <00350031> <2818> <00350032> <2819> <00350033> @@ -8198,10 +8199,10 @@ endbfchar <281d> <00350037> <281e> <00350038> <281f> <00350039> -<2820> <00360030> endbfchar 100 beginbfchar +<2820> <00360030> <2821> <00360031> <2822> <00360032> <2823> <00360033> @@ -8286,7 +8287,7 @@ endbfchar <28ff> <3295> <2900> <6e08> <2901> <5897> -<2902> <3244> +<2902> <554f> <2903> <7b54> <2904> <4f8b> <2905> <96fb> @@ -8301,11 +8302,21 @@ endbfchar <290e> <00300036> <290f> <00300037> <2910> <00300038> -<2911> <00300039> endbfchar 100 beginbfchar -<2912> <277f> +<2911> <00300039> +<2912> <00310030> +<2913> <00310031> +<2914> <00310032> +<2915> <00310033> +<2916> <00310034> +<2917> <00310035> +<2918> <00310036> +<2919> <00310037> +<291a> <00310038> +<291b> <00310039> +<291c> <00320030> <291d> <00320031> <291e> <00320032> <291f> <00320033> @@ -8394,6 +8405,9 @@ endbfchar <29a8> <304f> <29a9> <3051> <29aa> <3053> +endbfchar + +100 beginbfchar <29ab> <3055> <29ac> <3057> <29ad> <3059> @@ -8405,9 +8419,6 @@ endbfchar <29b3> <3066> <29b4> <3068> <29bb> <3072> -endbfchar - -100 beginbfchar <29bc> <3075> <29bd> <3078> <29be> <307b> @@ -8497,6 +8508,9 @@ endbfchar <2a39> <00330035> <2a3a> <00330036> <2a3b> <00330037> +endbfchar + +100 beginbfchar <2a3c> <00330038> <2a3d> <00330039> <2a3e> <00340030> @@ -8508,9 +8522,6 @@ endbfchar <2a44> <00340036> <2a45> <00340037> <2a46> <00340038> -endbfchar - -100 beginbfchar <2a47> <00340039> <2a48> <00350030> <2a49> <00350031> @@ -8595,11 +8606,14 @@ endbfchar <2ae6> <30af> <2ae7> <30b1> <2ae8> <30b3> -<2ae9> <d83cde02> +<2ae9> <30b5> <2aea> <30b7> <2aeb> <30b9> <2aec> <30bb> <2aed> <30bd> +endbfchar + +100 beginbfchar <2aee> <30bf> <2aef> <30c1> <2af0> <30c4> @@ -8611,11 +8625,8 @@ endbfchar <2afc> <30db> <2b02> <30e4> <2b03> <30e6> -endbfchar - -100 beginbfchar <2b0f> <65e5> -<2b10> <d83cde37> +<2b10> <6708> <2b11> <706b> <2b12> <6c34> <2b13> <6728> @@ -8627,7 +8638,7 @@ endbfchar <2b19> <7b54> <2b1a> <4f8b> <2b1b> <20de> -<2b1c> <2b1a> +<2b1c> <25a1> <2b1d> <0030> <2b1e> <00300030> <2b1f> <0031> @@ -8703,6 +8714,9 @@ endbfchar <2b65> <00360032> <2b66> <00360033> <2b67> <00360034> +endbfchar + +100 beginbfchar <2b68> <00360035> <2b69> <00360036> <2b6a> <00360037> @@ -8714,9 +8728,6 @@ endbfchar <2b70> <00370033> <2b71> <00370034> <2b72> <00370035> -endbfchar - -100 beginbfchar <2b73> <00370036> <2b74> <00370037> <2b75> <00370038> @@ -8806,6 +8817,9 @@ endbfchar <2c2d> <0031> <2c2e> <00300031> <2c2f> <0032> +endbfchar + +100 beginbfchar <2c30> <00300032> <2c31> <0033> <2c32> <00300033> @@ -8817,9 +8831,6 @@ endbfchar <2c38> <00300036> <2c39> <0037> <2c3a> <00300037> -endbfchar - -100 beginbfchar <2c3b> <0038> <2c3c> <00300038> <2c3d> <0039> @@ -8909,6 +8920,9 @@ endbfchar <2c91> <00390032> <2c92> <00390033> <2c93> <00390034> +endbfchar + +100 beginbfchar <2c94> <00390035> <2c95> <00390036> <2c96> <00390037> @@ -8920,9 +8934,6 @@ endbfchar <2cd0> <3046> <2cd1> <3048> <2cd4> <304d> -endbfchar - -100 beginbfchar <2cd5> <304f> <2cd6> <3051> <2cd7> <3053> @@ -9012,6 +9023,9 @@ endbfchar <2d59> <00320033> <2d5a> <00320034> <2d5b> <00320035> +endbfchar + +100 beginbfchar <2d5c> <00320036> <2d5d> <00320037> <2d5e> <00320038> @@ -9023,9 +9037,6 @@ endbfchar <2d64> <00330034> <2d65> <00330035> <2d66> <00330036> -endbfchar - -100 beginbfchar <2d67> <00330037> <2d68> <00330038> <2d69> <00330039> @@ -9115,6 +9126,9 @@ endbfchar <2dfe> <3084> <2dff> <3086> <2e0b> <30a2> +endbfchar + +100 beginbfchar <2e0c> <30a4> <2e0d> <30a6> <2e0e> <30a8> @@ -9126,9 +9140,6 @@ endbfchar <2e16> <30b7> <2e17> <30b9> <2e18> <30bb> -endbfchar - -100 beginbfchar <2e19> <30bd> <2e1a> <30bf> <2e1b> <30c1> @@ -9218,6 +9229,9 @@ endbfchar <2e9f> <3341> <2ea7> <3348> <2eac> <30e630fc30ed> +endbfchar + +100 beginbfchar <2ead> <30e930c9> <2eae> <3352> <2eaf> <3354> @@ -9229,9 +9243,6 @@ endbfchar <2eb9> <3306> <2eba> <30a630eb30b7> <2ebb> <3308> -endbfchar - -100 beginbfchar <2ebc> <30a830af30b5> <2ebd> <3307> <2ebe> <330a> @@ -9316,11 +9327,14 @@ endbfchar <2f3e> <03d5> <2f3f> <03db> <2f40> <03d1> -<2f41> <26be> +<2f41> <91ce7403> <2f44> <266c> <2f45> <ff1a> <2f46> <00a9> <2f47> <00a9> +endbfchar + +100 beginbfchar <2f48> <00ae> <2f49> <00ae> <2f4a> <303b> @@ -9332,9 +9346,6 @@ endbfchar <2f53> <2049> <2f54> <244a> <2f55> <005c005c> -endbfchar - -100 beginbfchar <2f56> <2213> <2f57> <2260> <2f58> <2243> @@ -9365,7 +9376,7 @@ endbfchar <2f93> <303d> <2f94> <3012> <2f95> <309f> -<2f96> <0fd6> +<2f96> <534d> <2f97> <2207> <2f98> <2205> <2f99> <22a0> @@ -9387,9 +9398,9 @@ endbfchar <2fa9> <2194> <2fae> <21cc> <2faf> <21cb> -<2fb2> <2b60> -<2fb3> <2b62> -<2fb4> <2b61> +<2fb2> <2190> +<2fb3> <2192> +<2fb4> <2191> <2fb8> <2504> <2fb9> <2506> <2fba> <3030> @@ -9405,54 +9416,50 @@ endbfchar <2fc4> <2740> <2fc5> <273f> <2fc6> <25a1> -<2fc9> <26cb> +<2fc9> <25a1> <2fca> <25a1> <2fcb> <25a1> -<2fcc> <25fb> +<2fcc> <25a1> <2fcd> <25ab> -<2fce> <25fc> +<2fce> <25a0> <2fcf> <25aa> <2fd0> <271a> <2fd1> <271a> <2fd2> <25c7> <2fd5> <25c7> <2fd6> <25c7> -<2fd7> <2b26> -<2fd8> <22c4> -<2fd9> <2b25> -<2fda> <2b29> +<2fd7> <25c7> +<2fd8> <25c7> +<2fd9> <25c6> +<2fda> <25c6> <2fdb> <25ce> <2fdc> <25c9> -<2fdd> <26aa> +<2fdd> <25cb> +endbfchar + +100 beginbfchar <2fde> <25e6> -<2fdf> <26ab> +<2fdf> <25cf> <2fe0> <2022> <2fe1> <2756> <2fe2> <2756> <2fe3> <2756> <2fe4> <2756> -<2fed> <d82cdd32> -<2fee> <d82cdd32> -<2fef> <d82cdd55> -<2ff0> <d82cdd55> -endbfchar - -100 beginbfchar +<2fed> <3053> +<2fee> <3053> +<2fef> <30b3> +<2ff0> <30b3> <2ffd> <3095> <3004> <3096> -<3007> <d82cdd32> <304c> <30fc> <3057> <30f5> <305e> <30f6> -<3061> <d82cdd55> <30b4> <3095> <30bb> <3096> -<30be> <d82cdd32> <3100> <3094> <3103> <30fc> <310e> <30f5> <3115> <30f6> -<3118> <d82cdd55> <3161> <30fb> <3162> <ff0a> <3163> <203b> @@ -9489,7 +9496,7 @@ endbfchar <3242> <30ee> <3243> <30fc> <3244> <30fc> -<3245> <6ce8db40dd02> +<3245> <6ce8> <3246> <20ac> <3247> <2126> <324a> <fb00> @@ -9531,6 +9538,9 @@ endbfchar <3286> <0251> <3287> <0251> <3288> <0251> +endbfchar + +100 beginbfchar <3289> <01fd> <328a> <00e6> <328b> <0254> @@ -9538,9 +9548,6 @@ endbfchar <328d> <0254> <328e> <0259> <328f> <0259> -endbfchar - -100 beginbfchar <3292> <025a> <3295> <025b> <3296> <025b> @@ -9568,7 +9575,7 @@ endbfchar <330a> <00a4> <330b> <201c> <330c> <00ab> -<3311> <2013> +<3311> <2012> <3314> <00b7> <3315> <00b6> <3316> <2022> @@ -9585,7 +9592,7 @@ endbfchar <3326> <030b> <3327> <0328> <3328> <030c> -<3329> <2014> +<3329> <0336> <332a> <00c6> <332b> <00aa> <332c> <0141> @@ -9598,7 +9605,7 @@ endbfchar <3333> <00f8> <3334> <0153> <3335> <00df> -<3336> <2212> +<3336> <002d> <3337> <00a9> <3338> <00ac> <3339> <00ae> @@ -9611,7 +9618,7 @@ endbfchar <3382> <0161> <3383> <2122> <3384> <017e> -<3385> <0030fe00> +<3385> <0030> <3386> <20ac> <3387> <2126> <338a> <fb00> @@ -9634,6 +9641,9 @@ endbfchar <33b3> <0049030a> <33b4> <0128> <33b5> <01d1> +endbfchar + +100 beginbfchar <33b6> <004f030a> <33b7> <01d3> <33b8> <016e> @@ -9641,9 +9651,6 @@ endbfchar <33ba> <01ce> <33bb> <011b> <33bc> <0065030a> -endbfchar - -100 beginbfchar <33bd> <1ebd> <33be> <01d0> <33bf> <0131030a> @@ -9653,11 +9660,11 @@ endbfchar <33c3> <01d4> <33c4> <016f> <33c5> <0169> -<33d0> <2014> +<33d0> <0336> <33d1> <002d> <33d2> <003d> <33d3> <002c> -<33e4> <2014> +<33e4> <0336> <33e5> <002d> <33e6> <003d> <33e7> <002c> @@ -9671,870 +9678,862 @@ endbfchar <33f5> <3012> <3406> <0027> <3407> <0022> -<3408> <9038fe01> -<3409> <8b01fe00> +<3408> <fa67> +<3409> <fa62> <340a> <7de3> <340b> <9ec3> <340c> <6eab> -<340d> <798dfe00> -<340e> <6094fe00> -<340f> <6d77fe00> -<3410> <6168fe00> +<340d> <fa52> +<340e> <fa3d> +<340f> <fa45> +<3410> <fa3e> <3411> <69ea> <3412> <6e34> -<3413> <8910fe00> -<3414> <6f22fe00> -<3415> <5668fe00> -<3416> <65e2fe00> -<3417> <7948fe00> +<3413> <fa60> +<3414> <fa47> +<3415> <fa38> +<3416> <fa42> +<3417> <fa4e> <3418> <865b> -<3419> <97fffe00> -<341a> <52e4fe00> -<341b> <8b39fe00> +<3419> <fa69> +<341a> <fa34> +<341b> <fa63> <341c> <63ed> <341d> <64ca> <341e> <784f> -<341f> <7a40fe00> -<3420> <6bbafe00> -<3421> <7949fe00> -<3422> <8996fe00> -<3423> <716efe00> -<3424> <793efe00> -<3425> <8005fe00> -<3426> <81edfe00> -<3427> <795dfe00> -<3428> <6691fe00> -<3429> <7f72fe00> +<341f> <fa54> +<3420> <f970> +<3421> <fa4d> +<3422> <fa61> +<3423> <fa48> +<3424> <fa4c> +<3427> <fa51> +<3428> <fa43> +<3429> <fa5a> <342a> <6d89> <342b> <72c0> -<342c> <614edb40dd01> +<342c> <614e> <342d> <d87edd45> -<342e> <7bc0fe00> -<342f> <7956fe00> -<3430> <50e7fe00> -<3431> <5c64fe00> +<342e> <fa56> +<342f> <fa50> +<3430> <fa31> +<3431> <fa3b> <3432> <5de2> -<3433> <618efe00> -<3434> <8d08fe00> +<3433> <fa3f> +<3434> <fa65> <3435> <537d> -<3436> <5606fe00> -<3437> <8457fe00> +<3436> <fa37> +<3437> <fa5f> <3438> <5fb5> -<3439> <61f2db40dd01> -<343a> <93aedb40dd01> -<343b> <798efe00> -<343c> <9b2ddb40dd01> -<343d> <7a81fe00> -<343e> <96e3fe00> -<343f> <6885fe00> -<3440> <7e41fe00> +<3439> <fa40> +<343a> <93ae> +<343b> <fa53> +<343c> <9b2d> +<343d> <fa55> +<343e> <fa68> +<343f> <fa44> +<3440> <fa59> <3441> <665a> -<3442> <5351fe00> -<3443> <7891fe00> -<3444> <8cd3fe00> -<3445> <654ffe00> -<3446> <4faefe00> -<3447> <4f75db40dd01> -<3448> <5840fe00> -<3449> <52c9fe00> +<3442> <fa35> +<3443> <fa4b> +<3444> <fa64> +<3445> <fa41> +<3446> <fa30> +<3447> <4f75> +<3448> <fa39> +<3449> <fa33> <344a> <6b65> -<344b> <58a8fe00> -<344c> <6bcf> -<344d> <514dfe00> -<344e> <623e> -<344f> <7950fe00> -<3450> <6b04fe00> +<344b> <fa3a> endbfchar 100 beginbfchar -<3451> <9686fe00> -<3452> <865cfe00> +<344c> <6bcf> +<344d> <fa32> +<344e> <623e> +<344f> <fa4f> +<3450> <f91d> +<3451> <f9dc> +<3452> <f936> <3453> <6dda> -<3454> <985efe00> +<3454> <f9d0> <3455> <66c6> <3456> <6b77> -<3457> <7df4fe01> +<3457> <fa57> <3458> <934a> -<3459> <5ecadb40dd02> +<3459> <5eca> <345a> <9304> -<345b> <6982db40dd01> -<345c> <51b4db40dd01> -<345d> <634cdb40dd01> -<345e> <86dbdb40dd01> -<345f> <9089db40dd01> -<3460> <9022db40dd02> -<3461> <5049db40dd01> -<3462> <7defdb40dd01> -<3463> <9055db40dd01> -<3464> <53a9db40dd03> -<3465> <990cdb40dd02> -<3466> <885bdb40dd01> -<3467> <5ef6db40dd01> -<3468> <6cbfdb40dd02> -<3469> <925bdb40dd01> -<346a> <7fc1db40dd01> -<346b> <82bddb40dd02> -<346c> <96c5db40dd01> -<346d> <5bb3db40dd01> -<346e> <6168db40dd02> -<346f> <6982db40dd02> -<3470> <6bbbdb40dd01> -<3471> <6562db40dd01> -<3472> <8cabdb40dd01> -<3473> <5dccdb40dd01> -<3474> <9811db40dd01> -<3475> <5e30db40dd01> -<3476> <8eccdb40dd01> -<3477> <7aaedb40dd01> -<3478> <5747db40dd01> -<3479> <5091db40dd01> -<347a> <7a74db40dd01> -<347b> <5065db40dd01> -<347c> <5efadb40dd01> -<347d> <9237db40dd01> -<347e> <6a8edb40dd01> -<347f> <4ea4db40dd01> -<3480> <516cdb40dd01> -<3481> <66f4db40dd01> -<3482> <6821db40dd01> -<3483> <786cdb40dd01> -<3484> <7d5edb40dd01> -<3485> <8003db40dd01> -<3486> <8cfcdb40dd01> -<3487> <964ddb40dd01> -<3488> <62f7db40dd01> -<3489> <7f6adb40dd01> -<348a> <4f7fdb40dd01> -<348b> <53f2db40dd01> -<348c> <59c9db40dd01> -<348d> <8b1ddb40dd01> -<348e> <90aadb40dd01> -<348f> <53cedb40dd01> -<3490> <8f2fdb40dd01> -<3491> <67d4db40dd01> -<3492> <77acdb40dd01> -<3493> <821cdb40dd01> +<345b> <6982> +<345c> <51b4> +<345d> <634c> +<345e> <86db> +<345f> <9089> +<3460> <9022> +<3461> <5049> +<3462> <7def> +<3463> <9055> +<3464> <53a9> +<3465> <990c> +<3466> <885b> +<3467> <5ef6> +<3468> <6cbf> +<3469> <925b> +<346a> <7fc1> +<346b> <82bd> +<346c> <96c5> +<346d> <5bb3> +<346e> <6168> +<346f> <6982> +<3470> <6bbb> +<3471> <6562> +<3472> <8cab> +<3473> <5dcc> +<3474> <9811> +<3475> <5e30> +<3476> <8ecc> +<3477> <7aae> +<3478> <5747> +<3479> <5091> +<347a> <7a74> +<347b> <5065> +<347c> <5efa> +<347d> <9237> +<347e> <6a8e> +<347f> <4ea4> +<3480> <516c> +<3481> <66f4> +<3482> <6821> +<3483> <786c> +<3484> <7d5e> +<3485> <8003> +<3486> <8cfc> +<3487> <964d> +<3488> <62f7> +<3489> <7f6a> +<348a> <4f7f> +<348b> <53f2> +<348c> <59c9> +<348d> <8b1d> +<348e> <90aa> +<348f> <53ce> +<3490> <8f2f> +<3491> <67d4> +<3492> <77ac> +<3493> <821c> <3494> <696f> -<3495> <677edb40dd01> -<3496> <8a1fdb40dd01> -<3497> <4e08db40dd01> -<3498> <57f4db40dd01> -<3499> <690ddb40dd01> -<349a> <8077db40dd01> -<349b> <89aadb40dd01> -<349c> <9042db40dd01> -<349d> <636edb40dd01> -<349e> <6442db40dd01> -<349f> <8239db40dd01> -<34a0> <7dcfdb40dd01> -<34a1> <8061db40dd01> -<34a2> <50cfdb40dd01> -<34a3> <8a95db40dd01> -<34a4> <6065db40dd01> -<34a5> <5146db40dd01> -<34a6> <773adb40dd01> -<34a7> <8074db40dd01> -<34a8> <8df3db40dd01> -<34a9> <5eaddb40dd01> -<34aa> <5ef7db40dd01> -<34ab> <8247db40dd01> -<34ac> <6843db40dd01> -<34ad> <9003db40dd01> -<34ae> <6d3edb40dd01> -<34af> <6392db40dd01> -<34b0> <8f29db40dd01> -<34b1> <73eddb40dd01> -<34b2> <9812db40dd01> -<34b3> <60b2db40dd01> -<34b4> <6249db40dd02> +<3495> <677e> +<3496> <8a1f> +<3497> <4e08> +<3498> <57f4> +<3499> <690d> +<349a> <8077> +<349b> <89aa> +<349c> <9042> +<349d> <636e> +<349e> <6442> +<349f> <8239> +<34a0> <7dcf> +<34a1> <8061> +<34a2> <50cf> +<34a3> <8a95> +<34a4> <6065> +<34a5> <5146> +<34a6> <773a> +<34a7> <8074> +<34a8> <8df3> +<34a9> <5ead> +<34aa> <5ef7> +<34ab> <8247> +<34ac> <6843> +<34ad> <9003> +<34ae> <6d3e> +<34af> <6392> endbfchar 100 beginbfchar -<34b5> <6590db40dd01> -<34b6> <7dcbdb40dd01> +<34b0> <8f29> +<34b1> <73ed> +<34b2> <9812> +<34b3> <60b2> +<34b4> <6249> +<34b5> <6590> +<34b6> <7dcb> <34b7> <8ab9> -<34b8> <8ca7db40dd01> -<34b9> <7236db40dd01> -<34ba> <847adb40dd01> -<34bb> <5206db40dd01> -<34bc> <5674db40dd01> -<34bd> <61a4db40dd01> -<34be> <7c89db40dd01> -<34bf> <7d1bdb40dd01> -<34c0> <96f0db40dd01> -<34c1> <853ddb40dd02> -<34c2> <4fbfdb40dd01> -<34c3> <6367db40dd01> -<34c4> <76c6db40dd01> -<34c5> <685ddb40dd01> -<34c6> <8108db40dd01> -<34c7> <8036db40dd01> -<34c8> <7ffcdb40dd01> -<34c9> <540fdb40dd01> -<34ca> <96a3db40dd01> -<34cb> <9e9fdb40dd01> -<34cc> <9e97db40dd01> -<34cd> <806fdb40dd01> -<34ce> <807edb40dd01> -<34cf> <6e7edb40dd01> -<34d0> <5085db40dd01> -<34d1> <5193db40dd01> -<34d2> <51dbdb40dd01> +<34b8> <8ca7> +<34b9> <7236> +<34ba> <847a> +<34bb> <5206> +<34bc> <5674> +<34bd> <61a4> +<34be> <7c89> +<34bf> <7d1b> +<34c0> <96f0> +<34c1> <853d> +<34c2> <4fbf> +<34c3> <6367> +<34c4> <76c6> +<34c5> <685d> +<34c6> <8108> +<34c7> <8036> +<34c8> <7ffc> +<34c9> <540f> +<34ca> <96a3> +<34cb> <9e9f> +<34cc> <9e97> +<34cd> <806f> +<34ce> <807e> +<34cf> <6e7e> +<34d0> <5085> +<34d1> <5193> +<34d2> <51db> <34d3> <d842dd0e> -<34d4> <5340db40dd01> -<34d5> <96d9db40dd01> -<34d6> <55a9db40dd02> -<34d7> <56c1db40dd01> -<34d8> <570ddb40dd01> -<34d9> <58abdb40dd01> -<34da> <59dadb40dd01> -<34db> <5a36db40dd01> -<34dc> <5abedb40dd02> -<34dd> <5d4edb40dd01> -<34de> <5d87db40dd01> -<34df> <5dc9db40dd01> -<34e0> <5dd3db40dd01> -<34e1> <5f2ddb40dd01> +<34d4> <5340> +<34d5> <96d9> +<34d6> <55a9> +<34d7> <56c1> +<34d8> <570d> +<34d9> <58ab> +<34da> <59da> +<34db> <5a36> +<34dc> <5abe> +<34dd> <5d4e> +<34de> <5d87> +<34df> <5dc9> +<34e0> <5dd3> +<34e1> <5f2d> <34e2> <5f98> -<34e3> <60d8db40dd01> -<34e4> <613ddb40dd01> -<34e5> <61fedb40dd01> -<34e6> <6268db40dd01> -<34e7> <62cfdb40dd01> -<34e8> <651ddb40dd01> -<34e9> <640fdb40dd01> -<34ea> <64f2db40dd01> -<34eb> <655ddb40dd01> -<34ec> <665fdb40dd01> -<34ed> <67a9db40dd01> -<34ee> <67e7db40dd01> -<34ef> <696bdb40dd01> -<34f0> <6930db40dd01> -<34f1> <69a7db40dd01> -<34f2> <6a44db40dd01> -<34f3> <6a90db40dd01> -<34f4> <6c08db40dd02> -<34f5> <6c13db40dd01> -<34f6> <6e23db40dd02> -<34f7> <6f11db40dd01> -<34f8> <6efedb40dd01> -<34f9> <6f3edb40dd01> -<34fa> <71ffdb40dd01> -<34fb> <73e5db40dd01> -<34fc> <7432db40dd01> -<34fd> <745fdb40dd01> -<34fe> <74e0db40dd01> -<34ff> <750cdb40dd01> -<3500> <7672db40dd01> -<3501> <792adb40dd01> -<3502> <78d4db40dd01> -<3503> <79badb40dd01> -<3504> <7a19db40dd01> -<3505> <7a95db40dd01> -<3506> <7cf2db40dd01> -<3507> <7d73db40dd01> -<3508> <7ddddb40dd01> -<3509> <7e35db40dd01> -<350a> <7faedb40dd01> -<350b> <7fe1db40dd01> -<350c> <805adb40dd01> -<350d> <805fdb40dd01> -<350e> <8073db40dd01> -<350f> <8070db40dd01> -<3510> <8076db40dd01> -<3511> <8153db40dd01> -<3512> <818adb40dd01> -<3513> <81b5db40dd01> -<3514> <81cddb40dd01> -<3515> <83f2db40dd01> -<3516> <8555db40dd01> -<3517> <85d5db40dd01> -<3518> <871adb40dd01> +<34e3> <60d8> +<34e4> <613d> +<34e5> <61fe> +<34e6> <6268> +<34e7> <62cf> +<34e8> <651d> +<34e9> <640f> +<34ea> <64f2> +<34eb> <655d> +<34ec> <665f> +<34ed> <67a9> +<34ee> <67e7> +<34ef> <696b> +<34f0> <6930> +<34f1> <69a7> +<34f2> <6a44> +<34f3> <6a90> +<34f4> <6c08> +<34f5> <6c13> +<34f6> <6e23> +<34f7> <6f11> +<34f8> <6efe> +<34f9> <6f3e> +<34fa> <71ff> +<34fb> <73e5> +<34fc> <7432> +<34fd> <745f> +<34fe> <74e0> +<34ff> <750c> +<3500> <7672> +<3501> <792a> +<3502> <78d4> +<3503> <79ba> +<3504> <7a19> +<3505> <7a95> +<3506> <7cf2> +<3507> <7d73> +<3508> <7ddd> +<3509> <7e35> +<350a> <7fae> +<350b> <7fe1> +<350c> <805a> +<350d> <805f> +<350e> <8073> +<350f> <8070> +<3510> <8076> +<3511> <8153> +<3512> <818a> +<3513> <81b5> endbfchar 100 beginbfchar -<3519> <8836db40dd01> -<351a> <889edb40dd01> -<351b> <88d8db40dd01> -<351c> <88f4db40dd01> -<351d> <892bdb40dd01> -<351e> <893bdb40dd01> -<351f> <896adb40dd01> -<3520> <896fdb40dd01> -<3521> <8a1ddb40dd01> -<3522> <8d05db40dd01> -<3523> <8d0fdb40dd01> -<3524> <9f4edb40dd01> -<3525> <8e91db40dd01> -<3526> <8ea1db40dd01> -<3527> <9052db40dd01> -<3528> <900edb40dd01> -<3529> <9130db40dd01> -<352a> <9156db40dd01> -<352b> <9158db40dd01> -<352c> <9165db40dd01> -<352d> <9173db40dd01> -<352e> <9172db40dd01> -<352f> <91a2db40dd01> -<3530> <91afdb40dd01> -<3531> <91aadb40dd01> -<3532> <91b4db40dd01> -<3533> <91badb40dd01> -<3534> <9477db40dd01> -<3535> <9698db40dd01> -<3536> <973ddb40dd01> -<3537> <9760db40dd02> +<3514> <81cd> +<3515> <83f2> +<3516> <8555> +<3517> <85d5> +<3518> <871a> +<3519> <8836> +<351a> <889e> +<351b> <88d8> +<351c> <88f4> +<351d> <892b> +<351e> <893b> +<351f> <896a> +<3520> <896f> +<3521> <8a1d> +<3522> <8d05> +<3523> <8d0f> +<3524> <9f4e> +<3525> <8e91> +<3526> <8ea1> +<3527> <9052> +<3528> <900e> +<3529> <9130> +<352a> <9156> +<352b> <9158> +<352c> <9165> +<352d> <9173> +<352e> <9172> +<352f> <91a2> +<3530> <91af> +<3531> <91aa> +<3532> <91b4> +<3533> <91ba> +<3534> <9477> +<3535> <9698> +<3536> <973d> +<3537> <9760> <3538> <9771> -<3539> <980cdb40dd01> -<353a> <9873db40dd01> -<353b> <98c3db40dd01> -<353c> <9a45db40dd01> -<353d> <9b4ddb40dd01> -<353e> <9b58db40dd01> -<353f> <9bc6db40dd01> -<3540> <9be1db40dd01> -<3541> <9bf1db40dd01> -<3542> <9d48db40dd01> -<3543> <9dcfdb40dd01> -<3544> <9f08db40dd01> -<3545> <6271db40dd01> -<3546> <6697db40dd01> -<3547> <610fdb40dd01> -<3548> <8863db40dd01> -<3549> <9055db40dd02> -<354a> <907adb40dd01> -<354b> <78efdb40dd01> +<3539> <980c> +<353a> <9873> +<353b> <98c3> +<353c> <9a45> +<353d> <9b4d> +<353e> <9b58> +<353f> <9bc6> +<3540> <9be1> +<3541> <9bf1> +<3542> <9d48> +<3543> <9dcf> +<3544> <9f08> +<3545> <6271> +<3546> <6697> +<3547> <610f> +<3548> <8863> +<3549> <9055> +<354a> <907a> +<354b> <78ef> <354c> <8c9f> <354d> <2ed7> -<354e> <d85add51> -<354f> <53a9db40dd04> -<3550> <74dcdb40dd01> -<3551> <904bdb40dd01> +<354e> <2ebd> +<354f> <5ed0> +<3550> <74dc> +<3551> <904b> <3552> <990c> -<3553> <d86ddfd8> +<3553> <885e> <3554> <92b3> <3555> <95b1> -<3556> <5ef6db40dd02> -<3557> <63f4db40dd01> +<3556> <5ef6> +<3557> <63f4> <3558> <d87edcfc> -<3559> <7159db40dd01> -<355a> <9060db40dd01> -<355b> <925bdb40dd02> -<355c> <65bcdb40dd01> -<355d> <5f80db40dd01> -<355e> <7fc1db40dd02> -<355f> <5378db40dd01> -<3560> <97f3db40dd01> -<3561> <5316db40dd01> -<3562> <82b1db40dd01> -<3563> <83d3db40dd01> -<3564> <8ca8db40dd01> -<3565> <904edb40dd01> +<3559> <7159> +<355a> <9060> +<355b> <925b> +<355c> <65bc> +<355d> <5f80> +<355e> <7fc1> +<355f> <5378> +<3560> <97f3> +<3561> <5316> +<3562> <82b1> +<3563> <83d3> +<3564> <8ca8> +<3565> <904e> <3566> <d87edd95> -<3567> <96c5db40dd02> -<3568> <9913db40dd01> +<3567> <96c5> +<3568> <9913> <3569> <5efb> -<356a> <7070db40dd01> -<356b> <5bb3db40dd02> -<356c> <6168db40dd03> -<356d> <6168db40dd04> -<356e> <6168db40dd05> +<356a> <7070> +<356b> <5bb3> +<356c> <6168> +<356d> <6168> +<356e> <6168> <356f> <d87edcea> -<3570> <6982db40dd03> +<3570> <6982> <3571> <676e> <3572> <2ec6> -<3573> <9694db40dd01> +<3573> <9694> <3574> <d87edc22> -<3575> <8f44db40dd01> -<3576> <938cdb40dd01> -<3577> <82c5db40dd01> -<3578> <5bd2db40dd01> -<3579> <74b0db40dd01> -<357a> <7de9db40dd01> -<357b> <d858de22> -<357c> <9084db40dd01> +<3575> <8f44> +<3576> <938c> +<3577> <82c5> endbfchar 100 beginbfchar -<357d> <9592db40dd01> -<357e> <97d3db40dd01> -<357f> <8218fe00> -<3580> <5371db40dd01> -<3581> <3402db40dd01> +<3578> <5bd2> +<3579> <74b0> +<357a> <7de9> +<357b> <7f36> +<357c> <9084> +<357d> <9592> +<357e> <97d3> +<357f> <8218> +<3580> <5371> +<3581> <3402> <3582> <3402> -<3583> <3402db40dd02> -<3584> <5e7edb40dd01> +<3583> <3402> +<3584> <5e7e> <3585> <65e3> -<3586> <671fdb40dd01> -<3587> <6a5fdb40dd01> -<3588> <8d77db40dd01> -<3589> <98e2db40dd01> +<3586> <671f> +<3587> <6a5f> +<3588> <8d77> +<3589> <98e2> <358a> <d842dfb7> -<358b> <55abdb40dd01> -<358c> <8650db40dd01> -<358d> <9006db40dd01> -<358e> <53cadb40dd01> -<358f> <5438db40dd01> -<3590> <6025db40dd01> -<3591> <7d1adb40dd01> -<3592> <5de8db40dd01> -<3593> <62d2db40dd01> -<3594> <8ddddb40dd01> +<358b> <55ab> +<358c> <8650> +<358d> <9006> +<358e> <53ca> +<358f> <5438> +<3590> <6025> +<3591> <7d1a> +<3592> <5de8> +<3593> <62d2> +<3594> <8ddd> <3595> <d867dd4b> -<3596> <d867dd4bdb40dd01> +<3596> <d867dd4b> <3597> <d87edc33> <3598> <5f3a> -<3599> <6050db40dd01> -<359a> <69c1db40dd01> -<359b> <d84dde3adb40dd01> -<359c> <d86ddf8e> -<359d> <90f7db40dd01> -<359e> <97ffdb40dd02> -<359f> <9957db40dd02> -<35a0> <6681db40dd01> +<3599> <6050> +<359a> <69c1> +<359b> <d84dde3a> +<359c> <d84dde3a> +<359d> <90f7> +<359e> <97ff> +<359f> <9957> +<35a0> <6681> <35a1> <2ea9> -<35a2> <8fd1db40dd01> +<35a2> <8fd1> <35a3> <4ff1> -<35a4> <77e9db40dd01> -<35a5> <5177db40dd01> -<35a6> <865edb40dd01> -<35a7> <7a7adb40dd01> -<35a8> <9047db40dd01> -<35a9> <6adbdb40dd02> -<35aa> <5553db40dd01> +<35a4> <77e9> +<35a5> <5177> +<35a6> <865e> +<35a7> <7a7a> +<35a8> <9047> +<35a9> <6adb> +<35aa> <5553> <35ab> <f909> -<35ac> <6075fe00> -<35ad> <6167db40dd02> -<35ae> <8fcedb40dd01> -<35af> <5091db40dd02> -<35b0> <6f54db40dd01> -<35b1> <7a74db40dd02> -<35b2> <6708db40dd01> +<35ac> <6075> +<35ad> <6167> +<35ae> <8fce> +<35af> <5091> +<35b0> <6f54> +<35b1> <7a74> +<35b2> <6708> <35b3> <2ebc> -<35b4> <517cdb40dd01> -<35b5> <5238db40dd01> +<35b4> <517c> +<35b5> <5238> <35b6> <d87edcac> <35b7> <6743> -<35b8> <80a9db40dd01> -<35b9> <8b19db40dd01> -<35ba> <9063db40dd01> +<35b8> <80a9> +<35b9> <8b19> +<35ba> <9063> <35bb> <d842de64> <35bc> <8a01> <35bd> <6236> -<35be> <96c7db40dd01> -<35bf> <9867db40dd01> +<35be> <96c7> +<35bf> <9867> <35c0> <5433> <35c1> <5a1b> -<35c2> <8aa4db40dd01> -<35c3> <5de5db40dd01> -<35c4> <614cdb40dd01> +<35c2> <8aa4> +<35c3> <5de5> +<35c4> <614c> <35c5> <6285> -<35c6> <63a7db40dd01> -<35c7> <69cbdb40dd01> +<35c6> <63a7> +<35c7> <69cb> <35c8> <d87edd03> -<35c9> <6e2fdb40dd01> -<35ca> <8015db40dd01> -<35cb> <8154db40dd01> -<35cc> <8352db40dd01> -<35cd> <8b1bdb40dd01> -<35ce> <8cfcdb40dd02> +<35c9> <6e2f> +<35ca> <8015> +<35cb> <8154> +<35cc> <8352> +<35cd> <8b1b> +<35ce> <8cfc> <35cf> <543f> -<35d0> <9177db40dd01> -<35d1> <8170db40dd01> -<35d2> <7511db40dd02> -<35d3> <8fbcdb40dd01> -<35d4> <d86ddf46> -<35d5> <9396db40dd01> -<35d6> <d86ddf77> -<35d7> <5f69db40dd01> -<35d8> <63a1db40dd01> +<35d0> <9177> +<35d1> <8170> +<35d2> <7511> +<35d3> <8fbc> +<35d4> <4eca> +<35d5> <9396> +<35d6> <5ea7> +<35d7> <5f69> +<35d8> <63a1> <35d9> <6b72> -<35da> <83dcdb40dd01> -<35db> <51b4db40dd02> -<35dc> <54b2db40dd01> -<35dd> <524adb40dd01> -<35de> <7522> -<35df> <4b38> -<35e0> <59ffdb40dd01> +<35da> <83dc> +<35db> <51b4> endbfchar 100 beginbfchar -<35e1> <59ffdb40dd02> +<35dc> <54b2> +<35dd> <524a> +<35de> <7522> +<35df> <4b38> +<35e0> <59ff> +<35e1> <59ff> <35e2> <5dff> -<35e3> <8aeedb40dd01> -<35e4> <8aeedb40dd02> -<35e5> <8cc7db40dd01> -<35e6> <8cc7db40dd02> -<35e7> <6b21db40dd01> -<35e8> <6b21db40dd02> +<35e3> <8aee> +<35e4> <8aee> +<35e5> <8cc7> +<35e6> <8cc7> +<35e7> <6b21> +<35e8> <6b21> <35e9> <d87edd0b> <35ea> <73ba> <35eb> <d842df9f> -<35ec> <6368db40dd01> -<35ed> <659cdb40dd01> -<35ee> <90aadb40dd02> +<35ec> <6368> +<35ed> <659c> +<35ee> <90aa> <35ef> <d87edc28> -<35f0> <7235db40dd02> +<35f0> <7235> <35f1> <d87edd21> -<35f2> <914cdb40dd01> -<35f3> <5f31db40dd01> -<35f4> <4e3bdb40dd01> -<35f5> <53d7db40dd01> -<35f6> <6388db40dd01> +<35f2> <914c> +<35f3> <5f31> +<35f4> <4e3b> +<35f5> <53d7> +<35f6> <6388> <35f7> <d87edc3f> -<35f8> <7d42db40dd01> -<35f9> <7fd2db40dd01> -<35fa> <8846db40dd01> -<35fb> <9031db40dd01> -<35fc> <4f4fdb40dd01> -<35fd> <8853db40dd01> -<35fe> <8ff0db40dd01> -<35ff> <5de1db40dd01> -<3600> <9075db40dd01> -<3601> <9075db40dd02> -<3602> <6240db40dd01> -<3603> <66f8db40dd01> -<3604> <5973db40dd01> -<3605> <52dddb40dd01> -<3606> <5546db40dd01> -<3607> <5bb5db40dd01> +<35f8> <7d42> +<35f9> <7fd2> +<35fa> <8846> +<35fb> <9031> +<35fc> <4f4f> +<35fd> <8853> +<35fe> <8ff0> +<35ff> <5de1> +<3600> <9075> +<3601> <9075> +<3602> <6240> +<3603> <66f8> +<3604> <5973> +<3605> <52dd> +<3606> <5546> +<3607> <5bb5> <3608> <d87edc73> -<3609> <2e8c> -<360a> <d875dd44> <360b> <5c19> -<360c> <6d88db40dd01> -<360d> <785ddb40dd01> -<360e> <8096db40dd01> +<360c> <6d88> +<360d> <785d> +<360e> <8096> <360f> <d840dc0b> <3610> <5b82> <3611> <d87edc52> -<3612> <60c5db40dd01> -<3613> <57f4db40dd02> -<3614> <98fedb40dd01> -<3615> <690ddb40dd02> -<3616> <6b96db40dd01> +<3612> <60c5> +<3613> <57f4> +<3614> <98fe> +<3615> <690d> +<3616> <6b96> <3617> <2edd> <3618> <98e0> -<3619> <d865de7f> +<3619> <2ede> <361a> <378d> -<361b> <4fb5db40dd01> -<361c> <38fa> -<361d> <6d78db40dd01> +<361b> <4fb5> +<361c> <2e97> +<361d> <6d78> <361e> <d87edd47> -<361f> <9032db40dd01> +<361f> <9032> <3620> <4ebb> <3621> <d840dda2> -<3622> <5203db40dd01> -<3623> <5c0bdb40dd01> +<3622> <5203> +<3623> <5c0b> <3624> <8a0a> -<3625> <8a0adb40dd02> -<3626> <8fc5db40dd01> -<3627> <d879dd69> -<3628> <9042db40dd02> +<3625> <8a0a> +<3626> <8fc5> +<3627> <8870> +<3628> <9042> <3629> <351f> -<362a> <d86ddf51> +<362a> <52e2> <362b> <d87edcb2> -<362c> <76dbdb40dd01> -<362d> <8056db40dd01> +<362c> <76db> +<362d> <8056> <362e> <8980> -<362f> <8aa0db40dd01> -<3630> <8acbdb40dd01> -<3631> <975cdb40dd01> -<3632> <975cdb40dd02> +<362f> <8aa0> +<3630> <8acb> +<3631> <975c> +<3632> <975c> <3633> <7a05> -<3634> <8106db40dd01> -<3635> <96bbdb40dd01> -<3636> <7c4ddb40dd01> -<3637> <7bc0db40dd02> +<3634> <8106> +<3635> <96bb> +<3636> <7c4d> +<3637> <7bc0> <3638> <8aaa> -<3639> <96eadb40dd01> +<3639> <96ea> <363a> <7d55> -<363b> <6247db40dd01> +<363b> <6247> <363c> <6f98> -<363d> <7fa1db40dd01> -<363e> <8239db40dd02> -<363f> <9078db40dd01> -<3640> <9077db40dd01> -<3641> <524ddb40dd01> -<3642> <5168db40dd01> -<3643> <6383db40dd01> -<3644> <63f7> +<363d> <7fa1> +<363e> <8239> +<363f> <9078> +<3640> <9077> +<3641> <524d> endbfchar 100 beginbfchar +<3642> <5168> +<3643> <6383> +<3644> <63f7> <3645> <7626> -<3646> <8d70db40dd01> -<3647> <9001db40dd01> -<3648> <906ddb40dd01> -<3649> <9020db40dd01> -<364a> <d85fdfb7> -<364b> <901fdb40dd01> -<364c> <8ccadb40dd01> -<364d> <5c0adb40dd01> -<364e> <5c0adb40dd02> -<364f> <59a5db40dd01> +<3646> <8d70> +<3647> <9001> +<3648> <906d> +<3649> <9020> +<364a> <2eca> +<364b> <901f> +<364c> <8cca> +<364d> <5c0a> +<364e> <5c0a> +<364f> <59a5> <3650> <d84fdcfe> -<3651> <9000db40dd01> -<3652> <902edb40dd01> -<3653> <968adb40dd01> -<3654> <9bdbdb40dd01> -<3655> <5927db40dd01> +<3651> <9000> +<3652> <902e> +<3653> <968a> +<3654> <9bdb> +<3655> <5927> <3656> <3427> -<3657> <7027db40dd01> -<3658> <9039db40dd01> +<3657> <7027> +<3658> <9039> <3659> <812b> -<365a> <4e39db40dd01> +<365a> <4e39> <365b> <6b4e> <365c> <d87edd1a> -<365d> <8a95db40dd02> -<365e> <6696db40dd01> -<365f> <5024db40dd01> -<3660> <7f6edb40dd01> -<3661> <7bc9db40dd01> -<3662> <d856ded7> -<3663> <7b51db40dd01> -<3664> <9010db40dd01> -<3665> <67f1db40dd01> -<3666> <6ce8db40dd01> -<3667> <99d0db40dd01> +<365d> <8a95> +<365e> <6696> +<365f> <5024> +<3660> <7f6e> +<3661> <7bc9> +<3662> <2eae> +<3663> <7b51> +<3664> <9010> +<3665> <67f1> +<3666> <6ce8> +<3667> <99d0> <3668> <d87edc9a> -<3669> <5fb5db40dd01> -<366a> <61f2db40dd02> -<366b> <671ddb40dd01> +<3669> <5fb5> +<366a> <61f2> +<366b> <671d> <366c> <d87edd0f> -<366d> <8abfdb40dd01> -<366e> <76f4db40dd01> -<366f> <6715db40dd01> -<3670> <6715db40dd02> -<3671> <589cdb40dd01> -<3672> <8ffddb40dd01> -<3673> <901adb40dd01> -<3674> <576adb40dd01> -<3675> <91e3db40dd01> -<3676> <5448db40dd01> -<3677> <5e1ddb40dd01> -<3678> <7a0bdb40dd01> -<3679> <7684db40dd01> -<367a> <9069db40dd01> -<367b> <8feddb40dd01> -<367c> <6dfbdb40dd01> +<366d> <8abf> +<366e> <76f4> +<366f> <6715> +<3670> <6715> +<3671> <589c> +<3672> <8ffd> +<3673> <901a> +<3674> <576a> +<3675> <91e3> +<3676> <5448> +<3677> <5e1d> +<3678> <7a0b> +<3679> <7684> +<367a> <9069> +<367b> <8fed> +<367c> <6dfb> <367d> <514e> -<367e> <9014db40dd01> -<367f> <783adb40dd01> +<367e> <9014> +<367f> <783a> <3680> <5721> <3681> <d844de3d> <3682> <d87edc1a> -<3683> <5510db40dd01> +<3683> <5510> <3684> <fa03> -<3685> <85e4db40dd01> -<3686> <8b04db40dd01> -<3687> <9003db40dd02> -<3688> <900fdb40dd01> -<3689> <9a30db40dd01> -<368a> <5c0edb40dd01> -<368b> <9053db40dd01> +<3685> <85e4> +<3686> <8b04> +<3687> <9003> +<3688> <900f> +<3689> <9a30> +<368a> <5c0e> +<368b> <9053> <368c> <541e> <368d> <3b88> <368e> <5167> -<368f> <8089db40dd01> -<3690> <4e73db40dd01> -<3691> <5fcddb40dd01> -<3692> <8a8ddb40dd01> +<368f> <8089> +<3690> <4e73> +<3691> <5fcd> +<3692> <8a8d> <3693> <f95f> -<3694> <7d0ddb40dd01> -<3695> <8987db40dd01> -<3696> <6d3edb40dd02> -<3697> <80badb40dd01> -<3698> <535adb40dd01> -<3699> <8584db40dd01> -<369a> <8febdb40dd01> -<369b> <7e1bdb40dd01> -<369c> <8087db40dd01> +<3694> <7d0d> +<3695> <8987> +<3696> <6d3e> +<3697> <80ba> +<3698> <535a> +<3699> <8584> +<369a> <8feb> +<369b> <7e1b> +<369c> <8087> <369d> <4e37> -<369e> <6f51db40dd01> -<369f> <91b1db40dd01> -<36a0> <4f34db40dd01> -<36a1> <5224db40dd01> -<36a2> <534adb40dd01> -<36a3> <5e06db40dd01> -<36a4> <7554db40dd01> -<36a5> <6669db40dd01> -<36a6> <8543db40dd01> -<36a7> <907fdb40dd01> -<36a8> <5faedb40dd01> +<369e> <6f51> +<369f> <91b1> +<36a0> <4f34> +<36a1> <5224> +<36a2> <534a> +<36a3> <5e06> +<36a4> <7554> +<36a5> <6669> endbfchar 100 beginbfchar -<36a9> <9f3bdb40dd01> -<36aa> <5339db40dd01> -<36ab> <d853dd14> +<36a6> <8543> +<36a7> <907f> +<36a8> <5fae> +<36a9> <9f3b> +<36aa> <5339> +<36ab> <2eaa> <36ac> <5f65> <36ad> <59ec> <36ae> <d87edc62> -<36af> <8a55db40dd01> +<36af> <8a55> <36b0> <5e99> -<36b1> <75c5db40dd01> -<36b2> <5a66db40dd01> -<36b3> <6577db40dd01> -<36b4> <6d6edb40dd01> -<36b5> <8ca0db40dd01> -<36b6> <8ca0db40dd02> -<36b7> <670ddb40dd01> -<36b8> <8986db40dd01> -<36b9> <4e19db40dd01> -<36ba> <5e63db40dd01> -<36bb> <5e73db40dd01> -<36bc> <5f0adb40dd01> +<36b1> <75c5> +<36b2> <5a66> +<36b3> <6577> +<36b4> <6d6e> +<36b5> <8ca0> +<36b6> <8ca0> +<36b7> <670d> +<36b8> <8986> +<36b9> <4e19> +<36ba> <5e63> +<36bb> <5e73> +<36bc> <5f0a> <36bd> <8511> -<36be> <504fdb40dd01> -<36bf> <7de8db40dd01> -<36c0> <8fd4db40dd01> -<36c1> <904ddb40dd01> -<36c2> <7c3fdb40dd01> -<36c3> <5305db40dd01> -<36c4> <5d29db40dd01> -<36c5> <62b1db40dd01> -<36c6> <670bdb40dd01> -<36c7> <7832db40dd01> -<36c8> <7e2bdb40dd01> -<36c9> <80dedb40dd01> -<36ca> <840cdb40dd01> -<36cb> <90a6db40dd01> -<36cc> <90a6db40dd02> -<36cd> <98fddb40dd01> -<36ce> <9d6cdb40dd01> -<36cf> <4ea1db40dd01> -<36d0> <5e3ddb40dd01> -<36d1> <5fd8db40dd01> -<36d2> <5fd9db40dd01> -<36d3> <623fdb40dd01> -<36d4> <671bdb40dd01> -<36d5> <671bdb40dd02> -<36d6> <5192db40dd01> -<36d7> <6469db40dd01> -<36d8> <7ffbdb40dd01> -<36d9> <51e1db40dd01> -<36da> <78e8db40dd01> -<36db> <9b54db40dd01> -<36dc> <9ebbdb40dd01> -<36dd> <69d9db40dd01> -<36de> <685ddb40dd02> +<36be> <504f> +<36bf> <7de8> +<36c0> <8fd4> +<36c1> <904d> +<36c2> <7c3f> +<36c3> <5305> +<36c4> <5d29> +<36c5> <62b1> +<36c6> <670b> +<36c7> <7832> +<36c8> <7e2b> +<36c9> <80de> +<36ca> <840c> +<36cb> <90a6> +<36cc> <90a6> +<36cd> <98fd> +<36ce> <9d6c> +<36cf> <4ea1> +<36d0> <5e3d> +<36d3> <623f> +<36d4> <671b> +<36d5> <671b> +<36d6> <5192> +<36d7> <6469> +<36d8> <7ffb> +<36d9> <51e1> +<36da> <78e8> +<36db> <9b54> +<36dc> <9ebb> +<36dd> <69d9> +<36de> <685d> <36df> <3468> <36e0> <9fb4> -<36e1> <7e6ddb40dd01> -<36e2> <9ebfdb40dd01> -<36e3> <8108db40dd02> -<36e4> <660edb40dd01> -<36e5> <76dfdb40dd01> -<36e6> <8ff7db40dd01> -<36e7> <5984db40dd01> +<36e1> <7e6d> +<36e2> <9ebf> +<36e3> <8108> +<36e4> <660e> +<36e5> <76df> +<36e6> <8ff7> +<36e7> <5984> <36e8> <52d0> -<36e9> <76f2db40dd01> -<36ea> <8017db40dd01> -<36eb> <623bdb40dd01> -<36ec> <7d0bdb40dd01> -<36ed> <95e8> -<36ee> <7d04db40dd01> -<36ef> <8e8ddb40dd01> -<36f0> <d86ddf89> -<36f1> <687adb40dd02> +<36e9> <76f2> +<36ea> <8017> +<36eb> <623b> +<36ec> <7d0b> +<36ed> <9580> +<36ee> <7d04> +<36ef> <8e8d> +<36f0> <687a> +<36f1> <687a> <36f2> <6801> -<36f3> <6109db40dd01> +<36f3> <6109> <36f4> <d87eddd0> <36f5> <d87edddf> -<36f6> <52c7db40dd01> -<36f7> <6709db40dd01> -<36f8> <7336db40dd01> -<36f9> <7336db40dd02> -<36fa> <7337> +<36f6> <52c7> +<36f7> <6709> +<36f8> <7336> <36fb> <d855de7f> -<36fc> <904adb40dd01> -<36fd> <66dcdb40dd01> +<36fc> <904a> +<36fd> <66dc> <36fe> <2eb7> -<36ff> <8981db40dd01> -<3700> <990adb40dd01> -<3701> <7fccdb40dd01> -<3702> <7ffcdb40dd02> +<36ff> <8981> +<3700> <990a> +<3701> <7fcc> +<3702> <7ffc> <3703> <8eb6> <3704> <f91f> -<3705> <7387db40dd01> -<3706> <9f8ddb40dd01> -<3707> <9f8ddb40dd02> +<3705> <7387> +<3706> <9f8d> +<3707> <9f8d> <3708> <f983> -<3709> <9fc4> -<370a> <71d0db40dd01> -<370b> <96a3db40dd02> -<370c> <9c57db40dd01> +<3709> <6881> +<370a> <71d0> +<370b> <96a3> +<370c> <9c57> +<370d> <9e9f> endbfchar 100 beginbfchar -<370d> <9e9fdb40dd02> <370e> <7c7b> <370f> <f9a2> -<3710> <6190db40dd01> +<3710> <6190> <3711> <f99a> -<3712> <6717db40dd03> +<3712> <6717> <3713> <8002> <3714> <d859deb0> -<3715> <50cadb40dd02> -<3716> <511adb40dd01> -<3717> <5154db40dd02> -<3718> <5195db40dd02> -<3719> <d841de28> -<371a> <528ddb40dd01> -<371b> <52d7db40dd01> +<3715> <50ca> +<3716> <511a> +<3717> <5154> +<3718> <5195> +<3719> <2e87> +<371a> <528d> +<371b> <52d7> <371c> <d840dc8a> -<371d> <d842dd84> +<371d> <d87edc2c> <371e> <353e> <371f> <53df> -<3720> <66fcdb40dd01> -<3721> <5533db40dd02> -<3722> <55e4db40dd02> +<3720> <66fc> +<3721> <5533> +<3722> <55e4> <3723> <5455> <3724> <56c0> <3725> <5939> -<3726> <5a1cdb40dd01> -<3727> <5ac2db40dd01> +<3726> <5a1c> +<3727> <5ac2> <3728> <5b76> <3729> <d87edc6d> <372a> <5c14> <372b> <37e2> <372c> <5ce6> -<372d> <5e54db40dd01> +<372d> <5e54> <372e> <4e48> -<372f> <5ee3db40dd01> -<3730> <6097db40dd02> +<372f> <5ee3> +<3730> <6097> <3731> <d87edcb6> -<3732> <62ccdb40dd01> -<3733> <641cdb40dd01> -<3734> <63c6db40dd01> -<3735> <6428db40dd01> +<3732> <62cc> +<3733> <641c> +<3734> <63c6> +<3735> <6428> <3736> <d85add99> <3737> <631b> -<3738> <665fdb40dd02> -<3739> <665fdb40dd03> +<3738> <665f> +<3739> <665f> <373a> <6663> -<373b> <66f5db40dd01> -<373c> <d84cdfcc> -<373d> <689ddb40dd01> -<373e> <688ddb40dd01> +<373b> <66f5> +<373c> <d87edcdb> +<373d> <689d> +<373e> <688d> <373f> <69f6> <3740> <6986> -<3741> <d86adde6> -<3742> <5be8db40dd01> -<3743> <69bbdb40dd01> +<3741> <5be8> +<3742> <5be8> +<3743> <69bb> <3744> <6bcc> -<3745> <6f11db40dd02> +<3745> <6f11> <3746> <6e17> -<3747> <6f98db40dd01> -<3748> <6caadb40dd01> +<3747> <6f98> +<3748> <6caa> <3749> <6caa> -<374a> <701bdb40dd01> -<374b> <7162db40dd01> -<374c> <723bdb40dd01> +<374a> <701b> +<374b> <7162> +<374c> <723b> <374d> <4e2c> -<374e> <731cdb40dd01> -<374f> <74cadb40dd01> +<374e> <731c> +<374f> <74ca> <3750> <74ef> <3751> <7575> <3752> <75ec> @@ -10542,145 +10541,139 @@ endbfchar <3754> <3fb1> <3755> <776a> <3756> <77a9> -<3757> <7940db40dd01> -<3758> <9fc6> -<3759> <7953db40dd02> -<375a> <9f4bdb40dd01> -<375b> <79aedb40dd01> -<375c> <9083db40dd01> +<3757> <7940> +<3758> <7953> +<3759> <7953> +<375a> <9f4b> +<375b> <79ae> +<375c> <9083> <375d> <7b53> -<375e> <d86ddfbd> -<375f> <7c14db40dd01> +<375e> <7c14> +<375f> <7c14> <3760> <4264> -<3761> <7c50db40dd01> -<3762> <7c58db40dd01> -<3763> <7d46db40dd01> +<3761> <7c50> +<3762> <7c58> +<3763> <7d46> <3764> <d87edd6c> -<3765> <7e22db40dd01> -<3766> <7e22db40dd02> +<3765> <7e22> +<3766> <7e22> <3767> <7e48> -<3768> <7e35db40dd02> -<3769> <7e43db40dd01> -<376a> <7e8cdb40dd01> -<376b> <d878de78> -<376c> <d841dd3f> -<376d> <d858de6a> -<376e> <d858de70db40dd01> -<376f> <7fc5db40dd01> -<3770> <7fc6db40dd01> -endbfchar - -100 beginbfchar -<3771> <7fe9db40dd02> +<3768> <7e35> +<3769> <7e43> +<376a> <7e8c> +<376d> <7f51> +<376e> <d858de70> +<3771> <7fe9> <3772> <8141> <3773> <4453> <3774> <8258> <3775> <8279> -<3776> <8279fe01> -<3777> <8279fe00> -<3778> <82e3db40dd01> +endbfchar + +100 beginbfchar +<3778> <82e3> <3779> <5179> <377a> <835a> -<377b> <8420db40dd01> -<377c> <83bddb40dd01> -<377d> <84f4db40dd01> +<377b> <8420> +<377c> <83bd> +<377d> <84f4> <377e> <4525> -<377f> <8587db40dd01> +<377f> <8587> <3780> <85f4> <3781> <d840dcb0> -<3782> <8737db40dd01> -<3783> <873bdb40dd01> -<3784> <8805db40dd01> -<3785> <87bddb40dd01> +<3782> <8737> +<3783> <873b> +<3784> <8805> +<3785> <87bd> <3786> <867d> -<3787> <8836db40dd02> +<3787> <8836> <3788> <342e> <3789> <88c6> -<378a> <89bddb40dd01> -<378b> <8adbdb40dd01> -<378c> <8b3edb40dd01> -<378d> <8b5adb40dd01> -<378e> <8d73db40dd01> -<378f> <8d99db40dd01> +<378a> <89bd> +<378b> <8adb> +<378c> <8b3e> +<378d> <8b5a> +<378e> <8d73> +<378f> <8d99> <3790> <47e6> -<3791> <8e34db40dd01> -<3792> <d879deea> -<3793> <8fefdb40dd01> -<3794> <9087db40dd01> -<3795> <8ffadb40dd01> -<3796> <901edb40dd01> -<3797> <9035db40dd01> -<3798> <9050db40dd01> +<3791> <8e34> +<3792> <8e4a> +<3793> <8fef> +<3794> <9087> +<3795> <8ffa> +<3796> <901e> +<3797> <9035> +<3798> <9050> <3799> <8fc8> -<379a> <9081db40dd01> -<379b> <908adb40dd01> -<379c> <908adb40dd02> -<379d> <908adb40dd03> -<379e> <908adb40dd04> -<379f> <908adb40dd05> -<37a0> <908adb40dd06> -<37a1> <9089db40dd02> -<37a2> <9089db40dd03> -<37a3> <9089db40dd04> -<37a4> <9089db40dd05> -<37a5> <9089db40dd06> -<37a6> <9089db40dd07> -<37a7> <9089db40dd08> -<37a8> <9089db40dd09> -<37a9> <9089db40dd0a> -<37aa> <9089db40dd0b> -<37ab> <9089db40dd0c> -<37ac> <9089db40dd0d> +<379a> <9081> +<379b> <908a> +<379c> <908a> +<379d> <908a> +<379e> <908a> +<379f> <908a> +<37a0> <908a> +<37a1> <9089> +<37a2> <9089> +<37a3> <9089> +<37a4> <9089> +<37a5> <9089> +<37a6> <9089> +<37a7> <9089> +<37a8> <9089> +<37a9> <9089> +<37aa> <9089> +<37ab> <9089> +<37ac> <9089> <37ad> <d862dd87> -<37ae> <93dddb40dd01> -<37af> <95bcdb40dd01> +<37ae> <93dd> +<37af> <95bc> <37b0> <d863de17> -<37b1> <96b2db40dd01> -<37b2> <9759db40dd01> +<37b1> <96b2> +<37b2> <975c> <37b3> <9839> -<37b4> <98ebdb40dd01> -<37b5> <9903db40dd01> -<37b6> <9909db40dd01> -<37b7> <9945db40dd01> -<37b8> <9945db40dd02> -<37b9> <994bdb40dd01> +<37b4> <98eb> +<37b5> <9903> +<37b6> <9909> +<37b7> <9945> +<37b8> <9945> +<37b9> <994b> <37ba> <9a08> -<37bb> <9a5fdb40dd01> -<37bc> <9a65db40dd01> -<37bd> <9aefdb40dd01> -<37be> <9b18db40dd01> +<37bb> <9a5f> +<37bc> <9a65> +<37bd> <9aef> +<37be> <9b18> <37bf> <9bdf> <37c0> <9d09> -<37c1> <9d08db40dd01> -<37c2> <9ea5db40dd01> -<37c3> <9eccdb40dd01> -<37c4> <9f08db40dd02> -<37c5> <9f4adb40dd01> -<37c6> <d86edc1a> -<37c7> <9f67db40dd01> -<37c8> <d869de1adb40dd01> -<37c9> <d850deeefe00> +<37c1> <9d08> +<37c2> <9ea5> +<37c3> <9ecc> +<37c4> <9f08> +<37c5> <9f4a> +<37c6> <9f63> +<37c7> <9f67> +<37c8> <d869de1a> +<37c9> <d850deee> <37ca> <d850deee> -<37cb> <891cdb40dd01> -<37cc> <68c8db40dd01> -<37cd> <66fbdb40dd01> -<37ce> <5f45db40dd01> -<37cf> <5300db40dd01> +<37cb> <891c> +<37cc> <68c8> +<37cd> <66fb> +<37ce> <5f45> +<37cf> <5300> <37d0> <5389> -<37d1> <5953db40dd01> +<37d1> <5953> <37d2> <fa11> <37d3> <d87edce1> -<37d4> <6a73db40dd01> -endbfchar - -100 beginbfchar +<37d4> <6a73> <37d5> <d84fdcbe> <37d6> <d841de11> -<37d7> <8a12db40dd01> +<37d7> <8a12> <37da> <4e1f> <37db> <4e2b> <37e0> <4e44> <37e1> <4e5a> +endbfchar + +100 beginbfchar <37e2> <4e7f> <37e3> <4e8d> <37e4> <4e96> @@ -10723,7 +10716,7 @@ endbfchar <380d> <515f> <380e> <51a1> <380f> <51bc> -<3810> <51dedb40dd02> +<3810> <51de> <3811> <51ee> <3812> <51f4> <3815> <5213> @@ -10759,8 +10752,6 @@ endbfchar <3835> <552b> <3836> <5535> <3837> <554a> -<3838> <5560> -<3839> <5561db40dd01> <383a> <5588> <383b> <558e> <383c> <5608> @@ -10774,9 +10765,6 @@ endbfchar <3846> <566f> <3849> <5695> <384a> <569a> -endbfchar - -100 beginbfchar <384d> <56b1> <384e> <56c9> <384f> <56dd> @@ -10786,6 +10774,9 @@ endbfchar <3853> <5723> <3854> <572f> <3857> <574c> +endbfchar + +100 beginbfchar <3858> <5770> <3859> <578c> <385a> <579c> @@ -10860,7 +10851,7 @@ endbfchar <38a7> <5e58> <38aa> <5ea8> <38ab> <5eaa> -<38ae> <5ecbdb40dd01> +<38ae> <5ecb> <38af> <5ed2> <38b0> <5f07> <38b1> <5f0e> @@ -10877,9 +10868,6 @@ endbfchar <38be> <5fa7> <38bf> <5fa4> <38c0> <5faf> -endbfchar - -100 beginbfchar <38c1> <5fb8> <38c2> <5fc4> <38c3> <5fc9> @@ -10889,10 +10877,13 @@ endbfchar <38c7> <5ffc> <38c8> <6017> <38c9> <601a> +endbfchar + +100 beginbfchar <38ca> <6033> <38cb> <6061> <38cc> <607f> -<38cd> <609edb40dd00> +<38cd> <609e> <38ce> <60a4> <38cf> <60b0> <38d0> <60cb> @@ -10951,7 +10942,7 @@ endbfchar <390c> <664c> <390f> <6661> <3910> <666b> -<3911> <6677db40dd01> +<3911> <6677> <3912> <66a4> <3913> <66c8> <3914> <66ec> @@ -10980,9 +10971,6 @@ endbfchar <392d> <68d6> <392e> <68e8> <392f> <68ed> -endbfchar - -100 beginbfchar <3932> <68fc> <3933> <6911> <3934> <6913> @@ -10992,6 +10980,9 @@ endbfchar <3938> <6963> <3939> <6972> <393c> <69a6> +endbfchar + +100 beginbfchar <393d> <69ad> <393e> <69b7> <3941> <6a01> @@ -11022,7 +11013,7 @@ endbfchar <395f> <6c10> <3960> <6c33> <3961> <6c35> -<3962> <2ea2> +<3962> <6c3a> <3963> <6c59> <3964> <6c76> <3965> <6c7b> @@ -11069,10 +11060,10 @@ endbfchar <3992> <6fb6> <3993> <6fda> <3994> <6fde> -<3995> <6ff9db40dd01> +<3995> <6ff9> <3996> <7039> <3997> <703c> -<3998> <704adb40dd01> +<3998> <704a> <3999> <7054> <399c> <7064> <399d> <706c> @@ -11083,18 +11074,18 @@ endbfchar <39a4> <70d8> <39a5> <70dc> <39a6> <7107> -endbfchar - -100 beginbfchar <39a7> <7120> <39a8> <7131> <39a9> <714a> -<39aa> <7152db40dd00> +<39aa> <7152> <39ab> <7160> <39ac> <7179> <39ad> <7192> -<39ae> <71b3db40dd01> +<39ae> <71b3> <39af> <71cb> +endbfchar + +100 beginbfchar <39b0> <71d3> <39b1> <71d6> <39b2> <7200> @@ -11186,9 +11177,6 @@ endbfchar <3a21> <7795> <3a22> <77aa> <3a23> <77e6> -endbfchar - -100 beginbfchar <3a24> <77f0> <3a25> <77f4> <3a26> <7806> @@ -11198,6 +11186,9 @@ endbfchar <3a2c> <7868> <3a2d> <789e> <3a2e> <78c8> +endbfchar + +100 beginbfchar <3a2f> <78cc> <3a30> <78ce> <3a31> <78e4> @@ -11205,7 +11196,7 @@ endbfchar <3a35> <78f7> <3a36> <78fb> <3a37> <7931> -<3a38> <7934db40dd01> +<3a38> <7934> <3a39> <793b> <3a3a> <793d> <3a3b> <7945> @@ -11225,7 +11216,7 @@ endbfchar <3a4b> <7a45> <3a4c> <7a4c> <3a4d> <7a5d> -<3a4e> <7a60db40dd01> +<3a4e> <7a60> <3a4f> <7a6d> <3a50> <7a78> <3a51> <7aa0> @@ -11289,9 +11280,6 @@ endbfchar <3a94> <7e98> <3a95> <7f44> <3a96> <7f4f> -endbfchar - -100 beginbfchar <3a99> <7f61> <3a9a> <7f91> <3a9b> <7fbf> @@ -11301,6 +11289,9 @@ endbfchar <3a9f> <7fec> <3aa2> <7ffa> <3aa3> <800e> +endbfchar + +100 beginbfchar <3aa4> <8011> <3aa5> <8014> <3aa6> <8024> @@ -11388,13 +11379,10 @@ endbfchar <3b00> <87eb> <3b01> <87ed> <3b02> <8801> -<3b03> <8803db40dd01> +<3b03> <8803> <3b04> <8806> <3b05> <880b> <3b06> <8814> -endbfchar - -100 beginbfchar <3b07> <881c> <3b08> <8856> <3b09> <885f> @@ -11404,6 +11392,9 @@ endbfchar <3b0f> <88ca> <3b10> <88d2> <3b11> <88db> +endbfchar + +100 beginbfchar <3b14> <8906> <3b18> <8927> <3b19> <8930> @@ -11458,7 +11449,7 @@ endbfchar <3b4c> <8f17> <3b4d> <8f36> <3b4e> <8fa6> -<3b51> <8fc6db40dd01> +<3b51> <8fc6> <3b52> <8fe0> <3b53> <8fe4> <3b54> <8ff6> @@ -11495,9 +11486,6 @@ endbfchar <3b75> <9228> <3b76> <9233> <3b77> <9238> -endbfchar - -100 beginbfchar <3b78> <9243> <3b79> <9247> <3b7a> <924f> @@ -11507,10 +11495,13 @@ endbfchar <3b80> <930d> <3b81> <9315> <3b82> <931f> +endbfchar + +100 beginbfchar <3b83> <9327> <3b84> <9347> <3b85> <9352> -<3b86> <9365db40dd01> +<3b86> <9365> <3b87> <936a> <3b88> <936d> <3b89> <939b> @@ -11530,7 +11521,7 @@ endbfchar <3b97> <9578> <3b98> <95a6> <3b99> <95a9> -<3b9a> <95abdb40dd01> +<3b9a> <95ab> <3b9b> <95b4> <3b9c> <95bd> <3b9d> <95da> @@ -11581,7 +11572,7 @@ endbfchar <3bd2> <9a27> <3bd5> <9a36> <3bd6> <9a38> -<3bd7> <9a4adb40dd00> +<3bd7> <9a4a> <3bd8> <9a56> <3bdb> <9af9> <3bdc> <9b03> @@ -11598,9 +11589,6 @@ endbfchar <3be9> <9bfa> <3bea> <9bfd> <3beb> <9c0b> -endbfchar - -100 beginbfchar <3bec> <9c27> <3bed> <9c2a> <3bee> <9c36> @@ -11610,6 +11598,9 @@ endbfchar <3bf2> <9c70> <3bf3> <9c77> <3bf4> <9d02> +endbfchar + +100 beginbfchar <3bf5> <9d42> <3bf6> <9d47> <3bf7> <9d63> @@ -11647,27 +11638,27 @@ endbfchar <3c17> <9f90> <3c18> <9f94> <3c19> <9fa2> -<3c1a> <4e30db40dd01> +<3c1a> <4e30> <3c1b> <3405> <3c1c> <d87edc04> <3c1d> <5620> <3c1e> <5ecb> <3c1f> <2e95> -<3c20> <60a4db40dd01> +<3c20> <60a4> <3c21> <d84dde3a> -<3c22> <6b24db40dd01> +<3c22> <6b24> <3c23> <6ff9> <3c24> <6ee6> <3c25> <71b3> -<3c26> <722bfe00> -<3c27> <7ac6db40dd01> -<3c28> <7f61db40dd01> -<3c29> <8071db40dd01> -<3c2a> <809edb40dd01> -<3c2b> <8fb6fe00> -<3c2c> <91fcdb40dd01> +<3c26> <2ea4> +<3c27> <7ac6> +<3c28> <7f61> +<3c29> <8071> +<3c2a> <809e> +<3c2b> <2ecc> +<3c2c> <91fc> <3c2d> <5db2> -<3c2e> <97dedb40dd01> +<3c2e> <97de> <3c2f> <4fd3> <3c30> <50d9> <3c31> <50f0> @@ -11689,21 +11680,18 @@ endbfchar <3c41> <34db> <3c42> <440c> <3c43> <3e8a> -<3c44> <d84dddc4db40dd01> -<3c45> <9fbd> +<3c44> <d84dddc4> +<3c45> <fffd> <3c46> <4be8> -<3c47> <9fbc> +<3c47> <fffd> <3c48> <3eda> <3c49> <3b22> -<3c4a> <9fbe> +<3c4a> <fffd> <3c4b> <457a> <3c4c> <4093> -<3c4d> <d867de3ddb40dd01> +<3c4d> <d867de3d> <3c4e> <4665> <3c4f> <4103> -endbfchar - -100 beginbfchar <3c50> <4293> <3c51> <46ae> <3c52> <3488> @@ -11713,6 +11701,9 @@ endbfchar <3c5d> <3003> <3c5e> <3006> <3c5f> <30fc> +endbfchar + +100 beginbfchar <3c60> <2260> <3c63> <221e> <3c64> <2234> @@ -11748,7 +11739,7 @@ endbfchar <3c99> <2135> <3c9a> <210f> <3c9b> <2127> -<3c9c> <2e40> +<3c9c> <30a0> <3cf3> <304b309a> <3cf4> <304d309a> <3cf5> <304f309a> @@ -11763,8 +11754,8 @@ endbfchar <3d54> <30c4309a> <3d55> <30c8309a> <3d60> <31f7309a> -<3d6b> <d82cdd32> -<3d6c> <d82cdd55> +<3d6b> <3053> +<3d6c> <30b3> <3d6f> <2155> <3d70> <2318> <3d75> <01d6> @@ -11804,9 +11795,6 @@ endbfchar <3d97> <0162> <3d98> <0155> <3d99> <0103> -endbfchar - -100 beginbfchar <3d9a> <013a> <3d9b> <0107> <3d9c> <010d> @@ -11816,6 +11804,9 @@ endbfchar <3da0> <0144> <3da1> <0148> <3da2> <0151> +endbfchar + +100 beginbfchar <3da3> <0159> <3da4> <0171> <3da5> <0163> @@ -11907,9 +11898,6 @@ endbfchar <3e08> <222e> <3e09> <221f> <3e0a> <22bf> -endbfchar - -100 beginbfchar <3e0d> <026a> <3e0e> <0274> <3e0f> <0276> @@ -11919,6 +11907,9 @@ endbfchar <3e13> <0299> <3e14> <029c> <3e15> <029f> +endbfchar + +100 beginbfchar <3e16> <02b0> <3e17> <02b2> <3e18> <02b7> @@ -11929,12 +11920,12 @@ endbfchar <3e21> <2298> <3e22> <229e> <3e23> <22a0> -<3e24> <207f> -<3e25> <a7b5> +<3e24> <006e> +<3e25> <03b2> <3e26> <03b8> -<3e27> <ab53> +<3e27> <03c7> <3e28> <2127> -<3e29> <2e40> +<3e29> <30a0> <3e2a> <2155> <3e2f> <01d6> <3e30> <01d8> @@ -12010,18 +12001,18 @@ endbfchar <3f26> <30b3309a> <3f27> <30bb309a> <3f28> <30c4309a> -endbfchar - -100 beginbfchar <3f29> <30c8309a> <3f34> <31f7309a> -<3f3f> <d82cdd32> -<3f40> <d82cdd55> +<3f3f> <3053> +<3f40> <30b3> <3f41> <30fd> <3f42> <303c> <3f43> <30ff> <3f44> <2225> <3f47> <266e> +endbfchar + +100 beginbfchar <3f48> <266b> <3f4b> <29bf> <3f4c> <2127> @@ -12105,17 +12096,14 @@ endbfchar <4029> <30c4309a> <402a> <30c8309a> <4035> <31f7309a> -<4040> <d82cdd32> -<4041> <d82cdd55> +<4040> <3053> +<4041> <30b3> <404c> <31f7309a> -<4053> <d82cdd32> -<4054> <d82cdd55> +<4053> <3053> +<4054> <30b3> <4055> <2260> <4058> <221e> <4059> <2234> -endbfchar - -100 beginbfchar <405a> <2103> <405b> <2208> <405c> <220b> @@ -12125,6 +12113,9 @@ endbfchar <4068> <2205> <406d> <21d2> <406e> <21d4> +endbfchar + +100 beginbfchar <406f> <2200> <4070> <2203> <4076> <2220> @@ -12146,7 +12137,7 @@ endbfchar <408c> <2135> <408d> <210f> <408e> <2127> -<408f> <2e40> +<408f> <30a0> <4092> <2155> <4093> <2318> <4098> <01d6> @@ -12216,9 +12207,6 @@ endbfchar <40d8> <027e> <40d9> <026c> <40da> <026e> -endbfchar - -100 beginbfchar <40db> <0279> <40dc> <0288> <40dd> <0256> @@ -12228,6 +12216,9 @@ endbfchar <40e1> <0290> <40e2> <027b> <40e3> <026d> +endbfchar + +100 beginbfchar <40e4> <025f> <40e5> <0272> <40e6> <029d> @@ -12308,20 +12299,17 @@ endbfchar <4144> <2298> <4145> <229e> <4146> <22a0> -<4147> <207f> -<4148> <a7b5> +<4147> <006e> +<4148> <03b2> <4149> <03b8> -<414a> <ab53> +<414a> <03c7> <414b> <2127> -<414c> <2e40> +<414c> <30a0> <414d> <2155> <4152> <01d6> <4153> <01d8> <4154> <01da> <4155> <01dc> -endbfchar - -100 beginbfchar <4156> <0104> <4157> <013d> <4158> <015a> @@ -12331,6 +12319,9 @@ endbfchar <415c> <017b> <415d> <0105> <415e> <013e> +endbfchar + +100 beginbfchar <415f> <015b> <4160> <015f> <4161> <0165> @@ -12422,9 +12413,6 @@ endbfchar <41b7> <58e0> <41b8> <8641> <41b9> <598b> -endbfchar - -100 beginbfchar <41ba> <5992> <41bb> <59c3> <41bc> <5a13> @@ -12434,9 +12422,12 @@ endbfchar <41c0> <5ac4> <41c1> <d846dcbd> <41c2> <5b7d> +endbfchar + +100 beginbfchar <41c3> <5b93> <41c4> <5c12> -<41c5> <5c6efe00> +<41c5> <fa3c> <41c6> <d845deb4> <41c7> <5c7a> <41c8> <5c8f> @@ -12525,9 +12516,6 @@ endbfchar <421d> <6bd7> <421e> <6bff> <421f> <6c05> -endbfchar - -100 beginbfchar <4220> <6c74> <4221> <6c98> <4222> <6cfb> @@ -12537,6 +12525,9 @@ endbfchar <4226> <6d3f> <4227> <6d58> <4228> <6d94> +endbfchar + +100 beginbfchar <4229> <6daa> <422a> <6ddb> <422b> <6ddd> @@ -12628,9 +12619,6 @@ endbfchar <4283> <7b12> <4284> <7b2d> <4285> <7b3b> -endbfchar - -100 beginbfchar <4286> <7b6f> <4287> <7c01> <4288> <7c33> @@ -12640,6 +12628,9 @@ endbfchar <428c> <7c8f> <428d> <7c94> <428e> <7ca0> +endbfchar + +100 beginbfchar <428f> <7cd5> <4290> <7d31> <4291> <7d5c> @@ -12731,9 +12722,6 @@ endbfchar <42ed> <8c68> <42ee> <8daf> <42ef> <8dd1> -endbfchar - -100 beginbfchar <42f0> <8dd7> <42f1> <8e23> <42f2> <8e3d> @@ -12743,6 +12731,9 @@ endbfchar <42f6> <8efa> <42f7> <8f1e> <42f8> <8f2d> +endbfchar + +100 beginbfchar <42f9> <8f54> <42fa> <d860dfcd> <42fb> <8fe8> @@ -12834,9 +12825,6 @@ endbfchar <435b> <d840dca4> <435c> <4e69> <435d> <4e9d> -endbfchar - -100 beginbfchar <435e> <342c> <435f> <4ebc> <4360> <4ec3> @@ -12846,6 +12834,9 @@ endbfchar <4364> <4ef1> <4365> <4ef5> <4366> <4f16> +endbfchar + +100 beginbfchar <4367> <4f64> <4368> <4f37> <4369> <4f3e> @@ -12937,9 +12928,6 @@ endbfchar <43c9> <54a0> <43ca> <54a6> <43cb> <54ae> -endbfchar - -100 beginbfchar <43cc> <54b7> <43cd> <54ba> <43ce> <54c3> @@ -12949,6 +12937,9 @@ endbfchar <43d2> <54f1> <43d3> <54f3> <43d6> <5509> +endbfchar + +100 beginbfchar <43d7> <553c> <43d8> <5541> <43d9> <35a6> @@ -13035,14 +13026,9 @@ endbfchar <4437> <58c3> <4438> <58cd> <4439> <58e2> -<443c> <5905> -<443d> <5906db40dd00> <443e> <590d> <443f> <5914> <4440> <d845ddd7> -endbfchar - -100 beginbfchar <4441> <3691> <4442> <593d> <4443> <3699> @@ -13054,6 +13040,9 @@ endbfchar <444b> <597c> <444c> <599f> <444d> <59ae> +endbfchar + +100 beginbfchar <444e> <59bc> <444f> <59c8> <4450> <59cd> @@ -13143,9 +13132,6 @@ endbfchar <44aa> <3800> <44ab> <5d97> <44ac> <5db0> -endbfchar - -100 beginbfchar <44ad> <5db4> <44ae> <d847df76> <44af> <5dd1> @@ -13157,6 +13143,9 @@ endbfchar <44b5> <3836> <44b6> <3840> <44b7> <5e1f> +endbfchar + +100 beginbfchar <44b8> <5e3e> <44b9> <5e49> <44ba> <385c> @@ -13246,9 +13235,6 @@ endbfchar <451f> <641e> <4520> <6425> <4521> <6429> -endbfchar - -100 beginbfchar <4522> <642f> <4523> <645a> <4524> <645d> @@ -13260,6 +13246,9 @@ endbfchar <452c> <64d5> <452d> <64d7> <452e> <d84bdde1> +endbfchar + +100 beginbfchar <452f> <64e4> <4530> <64ff> <4531> <3a6e> @@ -13302,7 +13291,7 @@ endbfchar <4558> <3b0e> <4559> <66ad> <455a> <66b1> -<455b> <66b5db40dd00> +<455b> <66b5> <455c> <3b1a> <455d> <3b1c> <455e> <3ad7> @@ -13349,9 +13338,6 @@ endbfchar <4587> <686e> <4588> <687c> <4589> <6882> -endbfchar - -100 beginbfchar <458a> <6890> <458b> <6896> <458c> <3b6d> @@ -13363,6 +13349,9 @@ endbfchar <4597> <d84ddd5a> <4598> <68c3> <4599> <68c5> +endbfchar + +100 beginbfchar <459a> <68cc> <459b> <68d9> <459e> <68ec> @@ -13452,9 +13441,6 @@ endbfchar <4601> <3cd2> <4602> <6cdc> <4603> <6ce9> -endbfchar - -100 beginbfchar <4604> <6ced> <4605> <d84fdd00> <4606> <6d00> @@ -13466,6 +13452,9 @@ endbfchar <460e> <6d60> <460f> <6d70> <4612> <6d8a> +endbfchar + +100 beginbfchar <4613> <6d8d> <4614> <6d91> <4615> <6d98> @@ -13555,9 +13544,6 @@ endbfchar <4671> <7180> <4672> <719b> <4673> <71a0> -endbfchar - -100 beginbfchar <4674> <71a2> <4677> <d850dfbc> <4678> <71d9> @@ -13569,6 +13555,9 @@ endbfchar <467e> <7242> <467f> <7257> <4680> <7263> +endbfchar + +100 beginbfchar <4681> <d851de29> <4684> <7278> <4685> <727f> @@ -13658,9 +13647,6 @@ endbfchar <46e3> <75dd> <46e6> <75e7> <46e7> <75ee> -endbfchar - -100 beginbfchar <46e8> <75f1> <46e9> <7603> <46ea> <7618> @@ -13672,6 +13658,9 @@ endbfchar <46f2> <d853de37> <46f3> <7625> <46f4> <7628> +endbfchar + +100 beginbfchar <46f5> <763c> <46f6> <7633> <46f7> <d853de6a> @@ -13761,9 +13750,6 @@ endbfchar <4753> <7a5c> <4754> <7a5f> <4755> <7a67> -endbfchar - -100 beginbfchar <4756> <7a6a> <4757> <7a75> <4758> <7a82> @@ -13775,6 +13761,9 @@ endbfchar <475e> <7ab9> <475f> <7abe> <4760> <41bf> +endbfchar + +100 beginbfchar <4761> <7acc> <4762> <7ae8> <4763> <7af4> @@ -13862,11 +13851,8 @@ endbfchar <47bb> <7de6> <47bc> <4302> <47bd> <d858dced> -<47be> <7e09fe00> +<47be> <fa58> <47bf> <7e10> -endbfchar - -100 beginbfchar <47c0> <7e17> <47c1> <7e1d> <47c2> <7e27> @@ -13878,6 +13864,9 @@ endbfchar <47ca> <7e9a> <47cb> <4343> <47cc> <7f3c> +endbfchar + +100 beginbfchar <47cd> <7f3b> <47ce> <7f3e> <47cf> <7f43> @@ -13967,9 +13956,6 @@ endbfchar <4827> <828a> <4828> <8293> <482b> <82b2> -endbfchar - -100 beginbfchar <482c> <82b4> <482d> <82ba> <482e> <82bc> @@ -13981,6 +13967,9 @@ endbfchar <4836> <831b> <4837> <831d> <4838> <8330> +endbfchar + +100 beginbfchar <4839> <833c> <483a> <8344> <483b> <8357> @@ -14070,9 +14059,6 @@ endbfchar <48a1> <8705> <48a2> <8707> <48a3> <870e> -endbfchar - -100 beginbfchar <48a4> <8710> <48a5> <871f> <48a6> <8721> @@ -14084,6 +14070,9 @@ endbfchar <48ac> <8751> <48ad> <8758> <48b0> <8772> +endbfchar + +100 beginbfchar <48b1> <877c> <48b2> <d85cdfdb> <48b3> <d85cdfda> @@ -14173,9 +14162,6 @@ endbfchar <490b> <d85edfb3> <490c> <8c3d> <490d> <d85edfbe> -endbfchar - -100 beginbfchar <490e> <d85edfc7> <490f> <8c45> <4910> <8c4f> @@ -14187,6 +14173,9 @@ endbfchar <4916> <8c92> <4917> <8c99> <4918> <4764> +endbfchar + +100 beginbfchar <4919> <8c9b> <491a> <8cd6> <491b> <8cd5> @@ -14276,9 +14265,6 @@ endbfchar <4977> <91b3> <4978> <91b6> <497b> <d862dd49> -endbfchar - -100 beginbfchar <497c> <d862dd46> <497d> <91ec> <497e> <9201> @@ -14290,6 +14276,9 @@ endbfchar <4986> <9265> <4987> <9268> <4988> <d862dd88> +endbfchar + +100 beginbfchar <498b> <927f> <498c> <9289> <498d> <928d> @@ -14379,9 +14368,6 @@ endbfchar <49ed> <97d1> <49ee> <97d4> <49ef> <97d8> -endbfchar - -100 beginbfchar <49f0> <97e1> <49f1> <97f1> <49f2> <9804> @@ -14393,6 +14379,9 @@ endbfchar <49fa> <9825> <49fb> <9847> <49fc> <9866> +endbfchar + +100 beginbfchar <49fd> <98ab> <49fe> <98ad> <49ff> <98b0> @@ -14482,9 +14471,6 @@ endbfchar <4a66> <d867dec4> <4a67> <9c31> <4a68> <9c37> -endbfchar - -100 beginbfchar <4a69> <9c45> <4a6a> <9c5c> <4a6b> <d867dee9> @@ -14496,11 +14482,14 @@ endbfchar <4a73> <9c5f> <4a79> <9c72> <4a7a> <9c75> +endbfchar + +100 beginbfchar <4a7b> <9c7a> <4a7c> <9ce6> <4a7d> <9cf2> <4a7e> <9d0b> -<4a7f> <d867dfce> +<4a7f> <d867dfd7> <4a80> <9d11> <4a83> <d868dc2f> <4a84> <4cc4> @@ -14555,7 +14544,7 @@ endbfchar <4ab7> <9f6d> <4ab8> <9f70> <4ab9> <d869deb2> -<4aba> <d884df50> +<4aba> <2eac> <4abb> <3614> <4abc> <38ad> <4abd> <3dcc> @@ -14585,9 +14574,6 @@ endbfchar <4ad7> <508e> <4ad8> <509e> <4ad9> <50a2> -endbfchar - -100 beginbfchar <4ada> <50c3> <4adb> <50e8> <4adc> <50f1> @@ -14599,6 +14585,9 @@ endbfchar <4ae5> <5184> <4ae6> <51b8> <4ae7> <51ba> +endbfchar + +100 beginbfchar <4ae8> <51c8> <4ae9> <51cf> <4aea> <51d1> @@ -14688,9 +14677,6 @@ endbfchar <4b4a> <56f1> <4b4b> <5707> <4b4c> <570c> -endbfchar - -100 beginbfchar <4b4f> <571d> <4b50> <572c> <4b51> <572e> @@ -14702,6 +14688,9 @@ endbfchar <4b59> <5797> <4b5a> <57ae> <4b5b> <57d5> +endbfchar + +100 beginbfchar <4b5c> <57e7> <4b5d> <580d> <4b5e> <5826> @@ -14791,9 +14780,6 @@ endbfchar <4bb4> <6207> <4bb5> <6231> <4bb6> <6239> -endbfchar - -100 beginbfchar <4bb7> <623d> <4bb8> <627a> <4bb9> <6290> @@ -14805,6 +14791,9 @@ endbfchar <4bbf> <6336> <4bc0> <6346> <4bc1> <634b> +endbfchar + +100 beginbfchar <4bc2> <6353> <4bc3> <6371> <4bc4> <6375> @@ -14894,9 +14883,6 @@ endbfchar <4c24> <6d61> <4c25> <6d7c> <4c26> <6db9> -endbfchar - -100 beginbfchar <4c27> <6df0> <4c28> <6e45> <4c29> <6e73> @@ -14908,6 +14894,9 @@ endbfchar <4c31> <6f29> <4c32> <6f30> <4c33> <6f87> +endbfchar + +100 beginbfchar <4c34> <6f9d> <4c35> <6fae> <4c36> <6fb7> @@ -14997,9 +14986,6 @@ endbfchar <4c92> <7837> <4c93> <785c> <4c94> <787e> -endbfchar - -100 beginbfchar <4c95> <7898> <4c96> <78a1> <4c97> <78b1> @@ -15011,6 +14997,9 @@ endbfchar <4c9f> <793f> <4ca0> <7942> <4ca1> <7954> +endbfchar + +100 beginbfchar <4ca2> <796b> <4ca3> <797c> <4ca4> <79ab> @@ -15100,9 +15089,6 @@ endbfchar <4d04> <81d5> <4d07> <81e1> <4d08> <81ef> -endbfchar - -100 beginbfchar <4d09> <81f6> <4d0a> <8200> <4d0b> <820b> @@ -15114,6 +15100,9 @@ endbfchar <4d13> <8289> <4d14> <8291> <4d15> <82aa> +endbfchar + +100 beginbfchar <4d16> <82b0> <4d17> <82d0> <4d18> <82ea> @@ -15203,9 +15192,6 @@ endbfchar <4d73> <8cba> <4d74> <8cc5> <4d75> <8cc9> -endbfchar - -100 beginbfchar <4d76> <8cd2> <4d77> <8cec> <4d78> <8cf5> @@ -15217,6 +15203,9 @@ endbfchar <4d7e> <8d6e> <4d7f> <8d91> <4d80> <8d9f> +endbfchar + +100 beginbfchar <4d81> <8dab> <4d82> <8db2> <4d83> <8dd5> @@ -15306,9 +15295,6 @@ endbfchar <4de0> <93f9> <4de1> <9402> <4de4> <942e> -endbfchar - -100 beginbfchar <4de5> <944c> <4de6> <9588> <4de7> <95a1> @@ -15320,6 +15306,9 @@ endbfchar <4def> <95e6> <4df0> <9624> <4df1> <9631> +endbfchar + +100 beginbfchar <4df2> <9638> <4df3> <963d> <4df4> <9654> @@ -15409,9 +15398,6 @@ endbfchar <4e51> <9f26> <4e54> <9f34> <4e55> <9f5a> -endbfchar - -100 beginbfchar <4e56> <9f6f> <4e57> <9f9e> <4e58> <9fa5> @@ -15423,206 +15409,204 @@ endbfchar <4e5e> <d87edc46> <4e5f> <d87edc99> <4e60> <d87edca6> +endbfchar + +100 beginbfchar <4e61> <d87edce5> <4e62> <d87eddde> <4e63> <35de> +<4e64> <fffd> +<4e65> <fffd> +<4e66> <fffd> +<4e67> <fffd> <4e68> <d868deb2> -<4e69> <4e0edb40dd01> -<4e6a> <4e26db40dd01> +<4e69> <4e0e> +<4e6a> <4e26> <4e6b> <d840dd58> -<4e6c> <4f73db40dd01> -<4e6d> <5056db40dd01> -<4e6e> <50eddb40dd01> -<4e6f> <516bdb40dd01> +<4e6c> <4f73> +<4e6d> <5056> +<4e6e> <50ed> +<4e6f> <516b> <4e70> <d841ddb1> -<4e71> <51dedb40dd03> -<4e72> <51fddb40dd01> +<4e71> <51de> +<4e72> <51fd> <4e73> <d841deec> -<4e74> <5264db40dd01> -<4e75> <5271db40dd01> -<4e76> <5272db40dd02> -<4e77> <533fdb40dd01> -<4e78> <d86ddf53> -<4e79> <5440db40dd01> +<4e74> <5264> +<4e77> <533f> +<4e78> <5354> +<4e79> <5440> <4e7a> <d843dd58> -<4e7b> <559cdb40dd01> -<4e7c> <55abdb40dd02> -<4e7d> <5609db40dd01> -<4e7e> <56aedb40dd02> -<4e7f> <56aedb40dd03> -<4e80> <d86ddf5a> -<4e81> <d86ddf5c> -<4e82> <56cedb40dd01> -<4e83> <56eedb40dd01> -<4e84> <57d6db40dd01> -<4e85> <583ddb40dd01> -<4e86> <5859db40dd01> -<4e87> <594fdb40dd01> -<4e88> <5951db40dd02> -<4e89> <5960db40dd01> -<4e8a> <5962db40dd01> -<4e8b> <5adadb40dd01> -<4e8c> <5b5adb40dd01> -<4e8d> <5b73db40dd01> -<4e8e> <5b7cdb40dd01> -<4e8f> <5bb3db40dd03> +<4e7b> <559c> +<4e7c> <55ab> +<4e7d> <5609> +<4e7e> <56ae> +<4e7f> <56ae> +<4e80> <56c0> +<4e81> <56c3> +<4e82> <56ce> +<4e83> <56ee> +<4e84> <57d6> +<4e85> <583d> +<4e86> <5859> +<4e87> <594f> +<4e88> <5951> +<4e89> <5960> +<4e8a> <5962> +<4e8b> <5ada> +<4e8c> <5b5a> +<4e8d> <5b73> +<4e8e> <5b7c> +<4e8f> <5bb3> <4e90> <d856ddcc> -<4e91> <5e43db40dd01> -<4e92> <d86ddf76> -<4e93> <5ee3db40dd02> -<4e94> <5f38db40dd01> -<4e95> <5fa1db40dd01> -<4e96> <5fdddb40dd01> -<4e97> <6162db40dd01> -<4e98> <61b2db40dd02> -<4e99> <61f8db40dd01> +<4e91> <5e43> +<4e92> <5ea7> +<4e93> <5ee3> +<4e94> <5f38> +<4e95> <5fa1> +<4e96> <5fdd> +<4e97> <6162> +<4e98> <61b2> +<4e99> <61f8> <4e9a> <39a4> <4e9b> <39b8> <4e9c> <d84bde42> -<4e9d> <d86ddf7c> -<4e9e> <64f6db40dd01> +<4e9d> <64a5> +<4e9e> <64f6> <4e9f> <3a5c> -<4ea0> <d841dfc8> -<4ea1> <655edb40dd01> <4ea2> <d84bdfeb> -<4ea3> <6587db40dd01> -<4ea4> <6589db40dd01> +<4ea3> <6587> +<4ea4> <6589> <4ea5> <d85eddb4> -<4ea6> <658edb40dd01> +<4ea6> <658e> <4ea7> <3ac4> <4ea8> <3acb> -<4ea9> <65e1db40dd01> -<4eaa> <6667db40dd01> -<4eab> <666edb40dd01> -<4eac> <66c1db40dd02> -<4ead> <d86ddf82> +<4ea9> <65e1> +<4eaa> <6667> +<4eab> <666e> +<4eac> <66c1> +<4ead> <66dc> <4eae> <3a85> -<4eaf> <6700db40dd01> -<4eb0> <6761db40dd01> -<4eb1> <67c4db40dd01> -<4eb2> <6802db40dd01> -<4eb3> <693ddb40dd01> -<4eb4> <695edb40dd01> -<4eb5> <d86ddf8b> -<4eb6> <6a9cdb40dd01> +<4eaf> <6700> +<4eb0> <6761> +<4eb1> <67c4> +<4eb2> <6802> +<4eb3> <693d> +<4eb4> <695e> +<4eb5> <6a05> +<4eb6> <6a9c> <4eb7> <3bf3> <4eb8> <6af8> -<4eb9> <d86ddf94> -<4eba> <6c38db40dd01> -<4ebb> <6caadb40dd02> -<4ebc> <9fcc> -<4ebd> <6de4db40dd01> +<4eb9> <6bb1> +<4eba> <6c38> +<4ebb> <6caa> +<4ebc> <6dbc> +<4ebd> <6de4> +<4ebe> <3d31> +<4ebf> <6e08> +<4ec0> <6e72> +<4ec1> <6ecb> +<4ec2> <6ed5> +<4ec3> <6edb> +<4ec4> <6f5b> +<4ec5> <6f5b> +<4ec6> <6f64> +<4ec7> <6f74> +<4ec8> <d850dc4b> endbfchar 100 beginbfchar -<4ebe> <3d31> -<4ebf> <6e08db40dd01> -<4ec0> <6e72db40dd01> -<4ec1> <6ecbdb40dd02> -<4ec2> <6ed5db40dd01> -<4ec3> <6edbdb40dd01> -<4ec4> <6f5bdb40dd01> -<4ec5> <6f5bdb40dd02> -<4ec6> <6f64db40dd01> -<4ec7> <6f74db40dd01> -<4ec8> <d850dc4b> -<4ec9> <723edb40dd01> +<4ec9> <723e> <4eca> <3e40> <4ecb> <38a1> -<4ecc> <73cadb40dd02> -<4ecd> <74bddb40dd01> -<4ece> <755ddb40dd01> +<4ecc> <73ca> +<4ecd> <74bd> +<4ece> <755d> <4ecf> <75bc> -<4ed0> <d86ddfac> -<4ed1> <7608db40dd01> -<4ed2> <7664db40dd01> -<4ed3> <7669db40dd01> -<4ed4> <d86ddfaf> -<4ed5> <7737db40dd01> -<4ed6> <777edb40dd01> -<4ed7> <79a7db40dd01> -<4ed8> <79b1db40dd01> -<4ed9> <7abedb40dd01> -<4eda> <7be0db40dd01> -<4edb> <7c50db40dd02> -<4edc> <7d09db40dd01> -<4edd> <7db2db40dd01> -<4ede> <7db2db40dd02> -<4edf> <7f3edb40dd01> -<4ee0> <7fe1db40dd02> -<4ee1> <8012db40dd01> -<4ee2> <d86ddfc9> -<4ee3> <80d6db40dd01> -<4ee4> <8109db40dd01> -<4ee5> <8129db40dd01> -<4ee6> <820cdb40dd01> -<4ee7> <821bdb40dd01> -<4ee8> <8240db40dd01> -<4ee9> <d86ddfcf> -<4eea> <83d4db40dd01> -<4eeb> <840fdb40dd01> -<4eec> <d86ddfd2> -<4eed> <84eadb40dd01> +<4ed0> <75d9> +<4ed1> <7608> +<4ed2> <7664> +<4ed3> <7669> +<4ed4> <76c8> +<4ed5> <7737> +<4ed6> <777e> +<4ed7> <79a7> +<4ed8> <79b1> +<4ed9> <7abe> +<4eda> <7be0> +<4edb> <7c50> +<4edc> <7d09> +<4edd> <7db2> +<4ede> <7db2> +<4edf> <7f3e> +<4ee0> <7fe1> +<4ee1> <8012> +<4ee2> <8077> +<4ee3> <80d6> +<4ee4> <8109> +<4ee5> <8129> +<4ee6> <820c> +<4ee7> <821b> +<4ee8> <8240> +<4ee9> <83df> +<4eea> <83d4> +<4eeb> <840f> +<4eec> <8449> +<4eed> <84ea> <4eee> <d85bdc9e> -<4eef> <8551db40dd01> -<4ef0> <8563db40dd01> -<4ef1> <85cfdb40dd01> -<4ef2> <864edb40dd01> -<4ef3> <8662db40dd01> -<4ef4> <868adb40dd01> -<4ef5> <8842db40dd01> -<4ef6> <8877db40dd01> -<4ef7> <8941db40dd01> -<4ef8> <8b56db40dd01> -<4ef9> <8b56db40dd02> -<4efa> <8b5cdb40dd01> +<4eef> <8551> +<4ef0> <8563> +<4ef1> <85cf> +<4ef2> <864e> +<4ef3> <8662> +<4ef4> <868a> +<4ef5> <8842> +<4ef6> <8877> +<4ef7> <8941> +<4ef8> <8b56> +<4ef9> <8b56> +<4efa> <8b5c> <4efb> <471f> <4efc> <d85fdc3c> -<4efd> <8c6adb40dd01> +<4efd> <8c6a> <4efe> <8c79> -<4eff> <8ccadb40dd02> -<4f00> <8d67db40dd01> +<4eff> <8cca> +<4f00> <8d67> <4f01> <481e> -<4f02> <8f03db40dd01> -<4f03> <8f44db40dd02> -<4f04> <8fc5db40dd02> -<4f05> <8fd4db40dd02> -<4f06> <8ff6db40dd01> -<4f07> <9077db40dd02> -<4f08> <9077db40dd03> -<4f09> <9089db40dd0e> -<4f0a> <908adb40dd07> -<4f0b> <90a8db40dd01> -<4f0c> <914ddb40dd01> -<4f0d> <92e9db40dd01> -<4f0e> <9335db40dd01> -<4f0f> <938bdb40dd01> -<4f10> <d86ddff0> -<4f11> <95cddb40dd01> -<4f12> <962adb40dd01> -<4f13> <9698db40dd02> -<4f14> <96a7db40dd01> -<4f15> <97ffdb40dd03> -<4f16> <97ffdb40dd04> -<4f17> <d86ddf65> -<4f18> <9921db40dd01> -<4f19> <9957db40dd03> -<4f1a> <9ba8db40dd01> -<4f1b> <9baedb40dd01> -<4f1c> <9bb9db40dd01> -<4f1d> <9c08db40dd01> -<4f1e> <9c24db40dd01> -<4f1f> <9c3bdb40dd01> -<4f20> <d86edc0d> -<4f21> <9ce6db40dd01> -endbfchar - -100 beginbfchar -<4f22> <9dc0db40dd01> -<4f23> <9dc2db40dd01> -<4f24> <d86edc17> -<4f25> <98efdb40dd02> -<4f26> <d84edc3ddb40dd01> +<4f02> <8f03> +<4f03> <8f44> +<4f04> <8fc5> +<4f05> <8fd4> +<4f06> <8ff6> +<4f07> <9077> +<4f08> <9077> +<4f0b> <90a8> +<4f0c> <914d> +<4f0d> <92e9> +<4f0e> <9335> +<4f0f> <938b> +<4f10> <943a> +<4f11> <95cd> +<4f12> <962a> +<4f13> <9698> +<4f14> <96a7> +<4f15> <97ff> +<4f16> <97ff> +<4f17> <990a> +<4f18> <9921> +<4f19> <9957> +<4f1a> <9ba8> +<4f1b> <9bae> +<4f1c> <9bb9> +<4f1d> <9c08> +<4f1e> <9c24> +<4f1f> <9c3b> +<4f20> <9c75> +<4f21> <9ce6> +<4f22> <9dc0> +<4f23> <9dc2> +<4f24> <9e78> +<4f25> <98ef> +<4f26> <d84edc3d> <4f27> <7b08> <4f28> <646f> <4f29> <7c3e> @@ -15631,7 +15615,10 @@ endbfchar <4f2c> <8a1d> <4f2d> <6062> <4f2e> <7078> -<4f2f> <53a9> +endbfchar + +100 beginbfchar +<4f2f> <5ed0> <4f30> <7c82> <4f31> <9699> <4f32> <8654> @@ -15650,7 +15637,7 @@ endbfchar <4f3f> <9041> <4f40> <99c1> <4f41> <65a7> -<4f42> <91dc> +<4f42> <91e1> <4f43> <97ad> <4f44> <8292> <4f45> <7c7e> @@ -15663,11 +15650,11 @@ endbfchar <4f4c> <51de> <4f4d> <5307> <4f4e> <5bec> -<4f4f> <5ecafe00> +<4f4f> <f928> <4f50> <661e> -<4f51> <6717fe00> +<4f51> <f929> <4f52> <704a> -<4f53> <51defe00> +<4f53> <fa15> <4f54> <5561> <4f55> <6c3a> <4f56> <7a60> @@ -15718,9 +15705,6 @@ endbfchar <4f85> <012f> <4f86> <0137> <4f87> <013e> -endbfchar - -100 beginbfchar <4f88> <013c> <4f89> <0146> <4f8a> <0157> @@ -15734,6 +15718,9 @@ endbfchar <4f96> <00ba> <4f97> <00aa> <4f98> <2116> +endbfchar + +100 beginbfchar <4f99> <0110> <4f9a> <0126> <4f9b> <0132> @@ -15821,9 +15808,6 @@ endbfchar <5032> <003700d7> <5033> <003800d7> <5034> <003900d7> -endbfchar - -100 beginbfchar <5049> <5e74> <504a> <004e> <504b> <5929> @@ -15837,6 +15821,9 @@ endbfchar <5053> <7acb> <5054> <4ea4> <5055> <307b304b> +endbfchar + +100 beginbfchar <5056> <5287> <5057> <53f8> <5058> <89e3> @@ -15924,9 +15911,6 @@ endbfchar <50ac> <002700300033> <50ad> <002700300034> <50ae> <002700300035> -endbfchar - -100 beginbfchar <50af> <002700300036> <50b0> <002700300037> <50b1> <002700300038> @@ -15940,6 +15924,9 @@ endbfchar <50b9> <002700310036> <50ba> <002700310037> <50bb> <002700310038> +endbfchar + +100 beginbfchar <50bc> <002700310039> <50bd> <002700320030> <50be> <002700320031> @@ -16027,9 +16014,6 @@ endbfchar <5110> <00300033> <5111> <00300034> <5112> <00300035> -endbfchar - -100 beginbfchar <5113> <00300036> <5114> <00300037> <5115> <00300038> @@ -16043,6 +16027,9 @@ endbfchar <511d> <00310036> <511e> <00310037> <511f> <00310038> +endbfchar + +100 beginbfchar <5120> <00310039> <5121> <00320030> <5122> <00320031> @@ -16130,9 +16117,6 @@ endbfchar <5174> <003100300033> <5175> <003100300034> <5176> <003100300035> -endbfchar - -100 beginbfchar <5177> <003100300036> <5178> <003100300037> <5179> <003100300038> @@ -16146,6 +16130,9 @@ endbfchar <5181> <003100310036> <5182> <003100310037> <5183> <003100310038> +endbfchar + +100 beginbfchar <5184> <003100310039> <5185> <003100320030> <5186> <003100320031> @@ -16233,13 +16220,10 @@ endbfchar <51d8> <30d330c330c8> <51d9> <30d930af30ec30eb> <51da> <30dc30fc> -endbfchar - -100 beginbfchar <51db> <30e930f330c9> <51dc> <30ea30f330ae30c330c8> -<51dd> <26bd> -<51de> <27bf> +<51dd> <fffd> +<51de> <fffd> <51df> <3002300d> <51e0> <3002300f> <51e3> <00ba> @@ -16249,6 +16233,9 @@ endbfchar <51e7> <0126> <51e8> <0132> <51e9> <013f> +endbfchar + +100 beginbfchar <51ea> <014a> <51eb> <0166> <51ec> <0133> @@ -16336,9 +16323,6 @@ endbfchar <5242> <013e> <5243> <013c> <5244> <0146> -endbfchar - -100 beginbfchar <5245> <0157> <5246> <0173> <5247> <0175> @@ -16347,11 +16331,14 @@ endbfchar <524a> <2206> <524b> <220f> <524e> <25ca> -<524f> <6ea2db40dd02> -<5250> <61f2fe00> -<5251> <8612fe00> +<524f> <6ea2> +<5250> <fa40> +<5251> <fa20> <5252> <8b7f> <5253> <4e35> +endbfchar + +100 beginbfchar <5254> <4e5c> <5255> <4e63> <5256> <4e68> @@ -16418,7 +16405,7 @@ endbfchar <52a9> <50e4> <52aa> <50f6> <52ab> <50fa> -<52ac> <50f2db40dd01> +<52ac> <50f2> <52ad> <5119> <52b0> <5123> <52b5> <512f> @@ -16439,9 +16426,6 @@ endbfchar <52c4> <51e5> <52c5> <51f2> <52c6> <51f7> -endbfchar - -100 beginbfchar <52c7> <5218> <52c8> <5222> <52c9> <5245> @@ -16455,6 +16439,9 @@ endbfchar <52d4> <52b0> <52d8> <52bd> <52d9> <52c4> +endbfchar + +100 beginbfchar <52da> <52c6> <52db> <52cf> <52dc> <52d4> @@ -16475,7 +16462,7 @@ endbfchar <52f0> <533c> <52f1> <5359> <52f2> <535b> -<52f3> <5365db40dd01> +<52f3> <5365> <52f4> <5383> <52f7> <538e> <52f8> <53a1> @@ -16484,7 +16471,7 @@ endbfchar <52fb> <53bd> <52fc> <53cf> <52ff> <53de> -<5300> <53e0db40dd01> +<5300> <53e0> <5301> <53e7> <5302> <5402> <5303> <541a> @@ -16521,7 +16508,7 @@ endbfchar <5328> <55cb> <532b> <55de> <532c> <55ff> -<532d> <5605db40dd01> +<532d> <5605> <532e> <560a> <532f> <5619> <5330> <5633> @@ -16542,9 +16529,6 @@ endbfchar <5349> <5722> <534c> <572a> <534d> <573f> -endbfchar - -100 beginbfchar <534e> <5752> <534f> <5762> <5350> <5767> @@ -16558,6 +16542,9 @@ endbfchar <5358> <579f> <5359> <57a1> <535a> <5795> +endbfchar + +100 beginbfchar <535b> <57a7> <535c> <57a9> <535d> <57bd> @@ -16645,9 +16632,6 @@ endbfchar <53be> <5baf> <53c1> <5bba> <53c2> <5bbc> -endbfchar - -100 beginbfchar <53c3> <5bc1> <53c4> <5bcd> <53c5> <5bcf> @@ -16661,6 +16645,9 @@ endbfchar <53cf> <5c35> <53d0> <5c5a> <53d3> <5c7b> +endbfchar + +100 beginbfchar <53d4> <5c7d> <53d5> <5c87> <53d6> <5c92> @@ -16741,16 +16728,13 @@ endbfchar <5433> <6091> <5434> <6093> <5435> <6098> -<5436> <609e> +<5436> <65df> <5437> <60a2> <5438> <60a5> <5439> <60b7> <543a> <60c2> <543f> <60e2> <5440> <60e5> -endbfchar - -100 beginbfchar <5441> <60fc> <5442> <6102> <5443> <6107> @@ -16764,6 +16748,9 @@ endbfchar <544b> <6149> <544c> <616c> <544d> <6172> +endbfchar + +100 beginbfchar <544e> <6178> <5453> <618b> <5454> <619c> @@ -16851,11 +16838,8 @@ endbfchar <54ba> <65ae> <54bb> <65b3> <54bc> <65d6> -endbfchar - -100 beginbfchar <54bd> <65d8> -<54be> <65dfdb40dd01> +<54be> <65df> <54c3> <660d> <54c6> <6616> <54c7> <661d> @@ -16867,6 +16851,9 @@ endbfchar <54cd> <6640> <54ce> <6646> <54cf> <664a> +endbfchar + +100 beginbfchar <54d0> <6658> <54d1> <6660> <54d2> <6675> @@ -16874,7 +16861,7 @@ endbfchar <54d4> <6679> <54d5> <667c> <54d9> <669f> -<54da> <66b5> +<54da> <69fe> <54dd> <66cc> <54de> <66ce> <54df> <66d4> @@ -16933,13 +16920,13 @@ endbfchar <551c> <69b8> <551d> <69c5> <551e> <69c8> -<551f> <69fedb40dd01> +<551f> <69fe> <5520> <6a00> <5521> <6a03> <5522> <6a20> <5523> <6a24> <5524> <6a37> -<5525> <6a55db40dd01> +<5525> <6a55> <5526> <6a6a> <5527> <6a81> <552a> <6a9b> @@ -16954,9 +16941,6 @@ endbfchar <553b> <6b36> <553c> <6b4d> <553d> <6b52> -endbfchar - -100 beginbfchar <553e> <6b5d> <553f> <6b6b> <5540> <6b6e> @@ -16970,6 +16954,9 @@ endbfchar <5550> <6c19> <5551> <6c1f> <5555> <6c2e> +endbfchar + +100 beginbfchar <5556> <6c3b> <5557> <6c4b> <5558> <6c4f> @@ -17053,13 +17040,10 @@ endbfchar <55aa> <7138> <55ab> <7141> <55ac> <714b> -<55ad> <7152> +<55ad> <74d8> <55ae> <7157> <55af> <715a> <55b0> <718c> -endbfchar - -100 beginbfchar <55b1> <719a> <55b2> <71b0> <55b5> <71cc> @@ -17073,6 +17057,9 @@ endbfchar <55bf> <724e> <55c0> <725e> <55c1> <726b> +endbfchar + +100 beginbfchar <55c2> <7271> <55c5> <7289> <55c6> <7293> @@ -17111,11 +17098,11 @@ endbfchar <55f3> <74cc> <55f4> <74d0> <55f5> <74d3> -<55f6> <74d8db40dd01> +<55f6> <74d8> <55f7> <74db> <55f8> <74e8> <55f9> <74ea> -<55fa> <74efdb40dd01> +<55fa> <74ef> <55fb> <74fc> <55fc> <7506> <55fd> <7512> @@ -17142,7 +17129,7 @@ endbfchar <5618> <769f> <561b> <76c1> <561c> <76cb> -<561d> <76d4db40dd01> +<561d> <76d4> <561e> <76e0> <561f> <76f6> <5620> <7706> @@ -17153,16 +17140,13 @@ endbfchar <5627> <7742> <5628> <7752> <562b> <7770> -<562e> <778ddb40dd01> -<562f> <77a2db40dd01> +<562e> <778d> +<562f> <77a2> <5630> <77ae> <5631> <77b1> <5632> <77b5> <5633> <77c3> <5634> <77d2> -endbfchar - -100 beginbfchar <5635> <77d5> <5636> <77f8> <5637> <780e> @@ -17176,6 +17160,9 @@ endbfchar <563f> <785e> <5642> <7863> <5643> <788f> +endbfchar + +100 beginbfchar <5644> <78a8> <5645> <78ac> <5646> <78b2> @@ -17263,13 +17250,10 @@ endbfchar <56a2> <7c2c> <56a3> <7c34> <56a6> <7c46> -endbfchar - -100 beginbfchar <56a7> <7c55> <56a8> <7c5a> <56a9> <7c63> -<56aa> <7c69db40dd01> +<56aa> <7c69> <56ab> <7c7c> <56ac> <7c86> <56ad> <7cb0> @@ -17279,6 +17263,9 @@ endbfchar <56b1> <7ce9> <56b2> <7d0f> <56b3> <7d11> +endbfchar + +100 beginbfchar <56b4> <7d16> <56b5> <7d26> <56b6> <7d2a> @@ -17309,7 +17296,7 @@ endbfchar <56d7> <7f3f> <56d8> <7f5c> <56d9> <7f66> -<56da> <7f80db40dd01> +<56da> <7f80> <56db> <7f8d> <56dc> <7f8f> <56dd> <7fa6> @@ -17357,7 +17344,7 @@ endbfchar <5709> <81eb> <570d> <81f5> <570e> <81f8> -<570f> <8200db40dd01> +<570f> <8200> <5710> <820f> <5711> <821d> <5712> <8228> @@ -17366,9 +17353,6 @@ endbfchar <5715> <8251> <5716> <8256> <5717> <8267> -endbfchar - -100 beginbfchar <5718> <827b> <571b> <8287> <571c> <8294> @@ -17382,6 +17366,9 @@ endbfchar <572a> <8321> <572b> <832c> <572c> <832e> +endbfchar + +100 beginbfchar <572d> <8333> <572e> <8337> <572f> <833d> @@ -17404,7 +17391,7 @@ endbfchar <5742> <8447> <5743> <844d> <5744> <8456> -<5745> <845cdb40dd01> +<5745> <845c> <5746> <8460> <5747> <8464> <5748> <8467> @@ -17428,8 +17415,6 @@ endbfchar <5760> <853f> <5761> <8550> <5762> <8552> -<5763> <855c> -<5764> <855ddb40dd01> <5767> <8579> <5768> <8589> <5769> <858b> @@ -17469,9 +17454,6 @@ endbfchar <5796> <86e0> <5797> <86e5> <5798> <86e7> -endbfchar - -100 beginbfchar <5799> <8688> <579a> <8704> <579b> <870f> @@ -17483,10 +17465,13 @@ endbfchar <57a3> <876f> <57a8> <8790> <57a9> <8795> -<57aa> <87a3db40dd01> +<57aa> <87a3> <57ab> <87b1> <57ac> <87c8> <57ad> <87ca> +endbfchar + +100 beginbfchar <57ae> <87d5> <57af> <87d9> <57b0> <87dc> @@ -17506,7 +17491,7 @@ endbfchar <57be> <8835> <57bf> <8841> <57c0> <8843> -<57c3> <884bdb40dd01> +<57c3> <884b> <57c4> <8851> <57c5> <885c> <57c6> <8860> @@ -17572,9 +17557,6 @@ endbfchar <5810> <8abb> <5811> <8ac3> <5812> <8ac6> -endbfchar - -100 beginbfchar <5813> <8ac8> <5814> <8aca> <5818> <8af0> @@ -17590,6 +17572,9 @@ endbfchar <5822> <8b79> <5823> <8b84> <5824> <8b8d> +endbfchar + +100 beginbfchar <5825> <8b8f> <5826> <8c38> <5827> <8c3e> @@ -17602,8 +17587,6 @@ endbfchar <5832> <8c7e> <5835> <8c8b> <5836> <8c90> -<5837> <8c9bdb40dd01> -<5838> <8c9c> <5839> <8cb9> <583a> <8cc6> <583b> <8ccb> @@ -17675,9 +17658,6 @@ endbfchar <5894> <906c> <5895> <908e> <5896> <90a5> -endbfchar - -100 beginbfchar <5897> <90cc> <5898> <90d5> <589b> <90e5> @@ -17695,6 +17675,9 @@ endbfchar <58a7> <914f> <58a8> <9153> <58a9> <916d> +endbfchar + +100 beginbfchar <58aa> <917b> <58ab> <9181> <58ac> <9186> @@ -17754,7 +17737,7 @@ endbfchar <5901> <9392> <5902> <9395> <5903> <9398> -<5904> <93a1db40dd01> +<5904> <93a1> <5905> <93a6> <5906> <93a8> <5907> <93ab> @@ -17778,9 +17761,6 @@ endbfchar <591e> <9468> <591f> <946e> <5920> <9484> -endbfchar - -100 beginbfchar <5921> <9483> <5922> <957e> <5923> <9584> @@ -17798,14 +17778,17 @@ endbfchar <5937> <9691> <5938> <969f> <5939> <96a6> +endbfchar + +100 beginbfchar <593a> <96ca> -<593b> <96dadb40dd01> +<593b> <96da> <593c> <96df> <593d> <96fa> <593e> <9705> <593f> <971a> <5940> <971d> -<5941> <9721db40dd01> +<5941> <9721> <5942> <974a> <5943> <9758> <5946> <977b> @@ -17881,12 +17864,9 @@ endbfchar <599b> <9af5> <599c> <9afa> <599d> <9afd> -endbfchar - -87 beginbfchar <59a2> <9b1b> <59a3> <9b26> -<59a4> <9b35db40dd01> +<59a4> <9b35> <59a5> <9b37> <59a8> <9b4c> <59ab> <9b5b> @@ -17901,6 +17881,9 @@ endbfchar <59b6> <9b8d> <59b7> <9b94> <59b8> <9b9a> +endbfchar + +70 beginbfchar <59b9> <9ba9> <59ba> <9bb7> <59bb> <9bbc> @@ -17930,7 +17913,7 @@ endbfchar <59d9> <9d95> <59dc> <9daa> <59dd> <9dae> -<59de> <9dbfdb40dd01> +<59de> <9dbf> <59df> <9dca> <59e2> <9dde> <59e3> <9dee> @@ -17990,12 +17973,11 @@ endbfchar <00c1> <00c6> <00e0> <00c7> <00d7> <00e7> <00d8> <00de> <00f9> -<00e8> <00ff> <0021> +<00e7> <00ff> <0020> <0100> <0122> <0039> -<0124> <0142> <005d> +<0124> <0144> <005d> <0146> <0185> <ff60> <0187> <0188> <30f0> -<018a> <018b> <30f5> <019c> <019d> <30d0> <019e> <019f> <30d3> <01a0> <01a1> <30d6> @@ -18030,7 +18012,7 @@ endbfchar <02aa> <02b3> <3008> <02bd> <02be> <2266> <02c4> <02c5> <2032> -<02c9> <02ca> <ffe0> +<02c9> <02ca> <00a2> <02e1> <02e2> <2190> <02e7> <02e8> <2286> <02e9> <02ea> <2282> @@ -18054,6 +18036,7 @@ endbfchar <05b9> <05ba> <984d> <0697> <0698> <4eab> <0e68> <0e69> <5fd8> +<0f1b> <0f1c> <7336> <100c> <100e> <4e9e> <1038> <1039> <4fe4> <1058> <1059> <50c9> @@ -18111,6 +18094,7 @@ endbfrange <156a> <156b> <6ed4> <15e4> <15e5> <723b> <15e6> <15e7> <723f> +<15fc> <15fd> <72e0> <160b> <160c> <734e> <163e> <163f> <74f0> <165c> <165d> <7586> @@ -18176,10 +18160,10 @@ endbfrange <1b3d> <1b3e> <91f5> <1b69> <1b6a> <93ac> <1b6d> <1b6e> <93d6> -<1b99> <1b9a> <9598> endbfrange 100 beginbfrange +<1b99> <1b9a> <9598> <1bb1> <1bb2> <962e> <1bc5> <1bc6> <96b1> <1bca> <1bcb> <96b8> @@ -18221,9 +18205,11 @@ endbfrange <1dbd> <1dc1> <32a4> <1dc2> <1dc3> <3231> <1dcf> <1dd0> <2229> +<1e81> <1e82> <f992> <1ecf> <1ed0> <3001> <1edb> <1edc> <ff08> <1edd> <1ede> <3014> +<1edf> <1ee0> <fe47> <1ee3> <1eec> <3008> <1f02> <1f03> <30f5> <1f14> <1f15> <301d> @@ -18257,9 +18243,13 @@ endbfrange <2079> <207c> <30f7> <20fe> <20ff> <5db8> <215c> <215d> <7146> +<2183> <2185> <fa18> +<21a4> <21a5> <fa20> +<21b8> <21b9> <fa24> <21c2> <21c3> <91ed> <21c4> <21c5> <91e4> <21d2> <21d3> <9277> +<21fb> <21fc> <fa2a> <2210> <224b> <0020> <224d> <226b> <005d> <2274> <2276> <00a1> @@ -18273,19 +18263,18 @@ endbfrange <22b3> <22b8> <00c0> <22b9> <22c9> <00c7> <22ca> <22cf> <00d9> +endbfrange + +100 beginbfrange <22d0> <22d5> <00e0> <22d6> <22e6> <00e7> <22e7> <22ed> <00f9> <22f7> <22ff> <0021> <2300> <2331> <002a> -<2333> <2351> <005d> +<2333> <2353> <005d> <2362> <2363> <00a2> -endbfrange - -100 beginbfrange <237c> <23bb> <ff60> <23bc> <23bd> <30f0> -<23bf> <23c0> <30f5> <23d1> <23d2> <30d0> <23d3> <23d4> <30d3> <23d5> <23d6> <30d6> @@ -18351,7 +18340,7 @@ endbfrange <26f6> <26ff> <2170> <2700> <2701> <217a> <2705> <2710> <2160> -<2714> <272d> <d83cdd10> +<2714> <272d> <0041> <2732> <2733> <304a> <2742> <2747> <306a> <274c> <2750> <307e> @@ -18367,8 +18356,6 @@ endbfrange <27b2> <27bb> <0030> <27fb> <27ff> <2460> <2800> <2803> <2465> -<2804> <2807> <325c> -<2808> <2816> <32b1> <2849> <2862> <24d0> <2863> <287c> <24b6> <2881> <2882> <304a> @@ -18379,13 +18366,12 @@ endbfrange <28ad> <28db> <32d0> <28dd> <28e6> <3280> <28e8> <28ed> <328a> -<28f6> <28f7> <32a0> -<2913> <291c> <24eb> -<296d> <2986> <0061> -<2987> <29a0> <d83cdd50> endbfrange 100 beginbfrange +<28f6> <28f7> <32a0> +<296d> <2986> <0061> +<2987> <29a0> <0041> <29a5> <29a6> <304a> <29b5> <29ba> <306a> <29bf> <29c3> <307e> @@ -18397,7 +18383,7 @@ endbfrange <29f6> <29fb> <30e8> <29fc> <29ff> <30ef> <2a7b> <2a94> <0061> -<2a95> <2aae> <d83cdd30> +<2a95> <2aae> <0041> <2ab3> <2ab4> <304a> <2ac3> <2ac8> <306a> <2acd> <2ad1> <307e> @@ -18434,7 +18420,7 @@ endbfrange <2d23> <2d28> <30e8> <2d29> <2d2d> <30ef> <2da7> <2dc0> <0061> -<2dc1> <2dda> <d83cdd70> +<2dc1> <2dda> <0041> <2ddf> <2de0> <304a> <2def> <2df4> <306a> <2df9> <2dfd> <307e> @@ -18483,12 +18469,12 @@ endbfrange <2f59> <2f5a> <2272> <2f5b> <2f5e> <300c> <2f5f> <2f60> <301a> -<2f61> <2f62> <3018> -<2f63> <2f64> <ff5f> -<2f65> <2f68> <300c> endbfrange 100 beginbfrange +<2f61> <2f62> <3018> +<2f63> <2f64> <ff5f> +<2f65> <2f68> <300c> <2f69> <2f6a> <301a> <2f6b> <2f6c> <3018> <2f6d> <2f6e> <ff5f> @@ -18500,8 +18486,8 @@ endbfrange <2f8d> <2f8e> <2018> <2faa> <2fab> <2198> <2fac> <2fad> <2196> -<2fb0> <2fb1> <2b82> -<2fb5> <2fb7> <2b63> +<2fb0> <2fb1> <21c4> +<2fb5> <2fb7> <2193> <2fc7> <2fc8> <25a0> <2fd3> <2fd4> <25c6> <2fe5> <2fe6> <3008> @@ -18511,23 +18497,23 @@ endbfrange <2ff3> <2ffc> <3041> <2ffe> <2fff> <304b> <3000> <3003> <304d> -<3005> <3006> <3051> +<3005> <3007> <3051> <3008> <3049> <3053> <304a> <304b> <30fd> <304d> <3056> <30a1> <3058> <305d> <30ab> -<305f> <3060> <30b1> +<305f> <3061> <30b1> <3062> <30a3> <30b3> <30a4> <30a7> <30f7> <30a8> <30a9> <309d> <30aa> <30b3> <3041> <30b5> <30ba> <304b> -<30bc> <30bd> <3051> +<30bc> <30be> <3051> <30bf> <30ff> <3053> <3101> <3102> <30fd> <3104> <310d> <30a1> <310f> <3114> <30ab> -<3116> <3117> <30b1> +<3116> <3118> <30b1> <3119> <315a> <30b3> <315b> <315e> <30f7> <315f> <3160> <fe45> @@ -18586,14 +18572,21 @@ endbfrange <33ec> <33ed> <003a> <33f6> <33f9> <300c> <33fa> <33fb> <301a> -<33fc> <33fd> <3018> -<33fe> <33ff> <ff08> -<3400> <3401> <301d> endbfrange 100 beginbfrange +<33fc> <33fd> <3018> +<33fe> <33ff> <ff08> +<3400> <3401> <301d> <3402> <3403> <2018> <3404> <3405> <201c> +<3425> <3426> <fa5b> +<3609> <360a> <2e8c> +<36d1> <36d2> <5fd8> +<36f9> <36fa> <7336> +<376b> <376c> <7f50> +<376f> <3770> <7fc5> +<3776> <3777> <2ebf> <37d8> <37d9> <4e04> <37dc> <37dd> <4e2f> <37de> <37df> <4e40> @@ -18601,6 +18594,7 @@ endbfrange <37f7> <37f8> <5000> <3813> <3814> <5201> <381c> <381d> <530a> +<3838> <3839> <5560> <383d> <383e> <560e> <3847> <3848> <5671> <384b> <384c> <56ac> @@ -18681,6 +18675,9 @@ endbfrange <3c95> <3c96> <2276> <3c9d> <3cf2> <3041> <3cf8> <3cff> <30a1> +endbfrange + +100 beginbfrange <3d00> <3d4d> <30a9> <3d56> <3d5f> <31f0> <3d61> <3d66> <31fa> @@ -18692,9 +18689,6 @@ endbfrange <3df6> <3df7> <031f> <3e00> <3e01> <031d> <3e02> <3e03> <0318> -endbfrange - -100 beginbfrange <3e05> <3e06> <033a> <3e0b> <3e0c> <0262> <3e1a> <3e1b> <02e0> @@ -18784,10 +18778,14 @@ endbfrange <4404> <4405> <56f6> <440a> <440b> <5745> <4410> <4412> <5773> +endbfrange + +100 beginbfrange <4417> <4418> <579d> <442d> <442e> <588a> <4430> <4431> <588f> <443a> <443b> <58f3> +<443c> <443d> <5905> <4449> <444a> <5975> <445f> <4460> <5a9f> <4478> <4479> <3761> @@ -18795,9 +18793,6 @@ endbfrange <44bd> <44be> <5e6d> <44d2> <44d4> <5fd2> <44d6> <44d7> <5fee> -endbfrange - -100 beginbfrange <44f0> <44f1> <6192> <4507> <4508> <d84adf4f> <450b> <450c> <633b> @@ -18886,6 +18881,9 @@ endbfrange <4af3> <4af4> <5231> <4afa> <4afb> <5278> <4b11> <4b12> <53c4> +endbfrange + +100 beginbfrange <4b17> <4b18> <5434> <4b39> <4b3a> <5611> <4b4d> <4b4e> <571a> @@ -18898,9 +18896,6 @@ endbfrange <4c0f> <4c10> <6ac8> <4c14> <4c15> <6b7d> <4c2e> <4c2f> <6eda> -endbfrange - -100 beginbfrange <4c3c> <4c3d> <70d5> <4c44> <4c45> <724f> <4c52> <4c53> <733a> @@ -18927,7 +18922,9 @@ endbfrange <4e27> <4e28> <9b0d> <4e45> <4e47> <9e82> <4e52> <4e53> <9f2a> -<4e64> <4e67> <9fbf> +<4e75> <4e76> <5271> +<4ea0> <4ea1> <655d> +<4f09> <4f0a> <9089> <4f5d> <4f5e> <0384> <4f91> <4f92> <2264> <4f94> <4f95> <0384> @@ -18987,6 +18984,9 @@ endbfrange <53a2> <53a3> <5a44> <53b8> <53b9> <5b90> <53bb> <53bc> <5ba8> +endbfrange + +100 beginbfrange <53bf> <53c0> <5bb1> <53c6> <53c7> <5bd9> <53d1> <53d2> <5c74> @@ -19001,9 +19001,6 @@ endbfrange <542b> <542c> <6056> <543b> <543c> <60c9> <543d> <543e> <60ce> -endbfrange - -100 beginbfrange <544f> <5450> <6180> <5451> <5452> <6183> <5457> <5458> <61c0> @@ -19071,6 +19068,7 @@ endbfrange <574e> <574f> <84a9> <5750> <5751> <84c7> <5755> <5756> <8502> +<5763> <5764> <855c> <5765> <5766> <855f> <5770> <5772> <85bd> <5779> <577a> <860d> @@ -19089,8 +19087,12 @@ endbfrange <5803> <5804> <8a7a> <5815> <5817> <8ad3> <582d> <582e> <8c63> +endbfrange + +58 beginbfrange <5830> <5831> <8c75> <5833> <5834> <8c86> +<5837> <5838> <8c9b> <5856> <5857> <8e04> <585a> <585b> <8e37> <585e> <585f> <8e5d> @@ -19104,9 +19106,6 @@ endbfrange <588f> <5890> <9033> <5899> <589a> <90d8> <58ad> <58ae> <9193> -endbfrange - -42 beginbfrange <58b3> <58b4> <91d3> <58b6> <58b7> <91e9> <58bb> <58bc> <9204> diff --git a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 index 05698686f0..99d0cb5d96 100644 --- a/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 +++ b/support/adobemapping/mapping-resources-pdf/pdf2unicode/Adobe-KR-UCS2 @@ -3,9 +3,9 @@ %%IncludeResource: ProcSet (CIDInit) %%BeginResource: CMap (Adobe-KR-UCS2) %%Title: (Adobe-KR-UCS2 Adobe KR 9) -%%Version: 2.000 +%%Version: 1.001 %%Copyright: ----------------------------------------------------------- -%%Copyright: Copyright 1990-2020 Adobe. All rights reserved. +%%Copyright: Copyright 1990-2019 Adobe. All rights reserved. %%Copyright: %%Copyright: Redistribution and use in source and binary forms, with or %%Copyright: without modification, are permitted provided that the @@ -53,7 +53,7 @@ begincmap end def /CMapName /Adobe-KR-UCS2 def -/CMapVersion 2.000 def +/CMapVersion 1.001 def /CMapType 2 def /WMode 0 def @@ -8303,7 +8303,6 @@ endbfchar endbfchar 49 beginbfchar -<57bd> <d881df29> <57be> <537fdb40dd09> <57bf> <5795db40dd02> <57c0> <57cedb40dd05> @@ -8322,6 +8321,7 @@ endbfchar <57cd> <8acbdb40dd05> <57ce> <927cdb40dd04> <57cf> <9f9cdb40dd07> +<57bd> <fffd> <57d0> <00a1> <57d4> <00aa> <57d5> <00af> diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index b7ceccd00a..3201141fb9 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -181,6 +181,9 @@ $mirrors = { 'https://mirror.its.dal.ca/ctan/' => 1, 'https://muug.ca/mirror/ctan/' => 1, }, + 'Costa Rica' => { + 'https://mirrors.ucr.ac.cr/CTAN/' => 1, + }, 'USA' => { 'http://bay.uchicago.edu/CTAN/' => 1, 'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 79e9a9803b..36a8364207 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2022 -depend revision/66515 +depend revision/66533 name 00texlive.image category TLCore -revision 66516 +revision 66534 shortdesc TeX Live files only in the source repository longdesc The files here are not copied by the installer and containers longdesc are not built for them; they exist only in the source @@ -4711,7 +4711,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 66486 +revision 66519 shortdesc TeX Live standalone installer package longdesc This package defines the files to go into the installer longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the @@ -38571,7 +38571,7 @@ catalogue-version 0.01 name biblatex-dw category Package -revision 42649 +revision 66534 shortdesc Humanities styles for BibLaTeX relocated 1 longdesc A small collection of styles for the BibLaTeX package. It was @@ -38585,11 +38585,11 @@ longdesc den Standard-Stilen von BibLaTeX nicht direkt bereitgestellt longdesc werden. Das Paket baut vollstandig auf BibLaTeX auf und kann longdesc nicht ohne BibLaTeX (mindestens in der Version 0.9b) verwendet longdesc werden. -containersize 16432 -containerchecksum faa43e5f4de281747e5cbc22fdcbfb7d03c5c04d68245340e084c4e34f1ff9917c6ccf22a06ae4eefc41f7a5315db15aa8b51f2a8c3ed7c68cd033308fbe99be -doccontainersize 1124296 -doccontainerchecksum d29c64dac41255066a844639e4330193811c62049e4b38600951346d4c126a495fab78458bd322fb3defc4352b765c1a7e7a73b7c64bdfde3a90f3e5a74e4e4c -docfiles size=491 +containersize 16472 +containerchecksum e45780eab8c3c19e129193dc83ab34ff7d0ef2636c1c9ed89bc9302fa3763448a701dc4cd9ae2d7ea17c18730b7daed22397a91469c8d50461e660d8486c2f11 +doccontainersize 1145632 +doccontainerchecksum ab8cb148e87de3e8f9100f60d0dd6da56b0ee3cdc5107c02ee29dd0f14938181b2ca8e2138745f2e68a7107399090b2b0b308708a613a649a89e2683b519482f +docfiles size=510 RELOC/doc/latex/biblatex-dw/CHANGES RELOC/doc/latex/biblatex-dw/LIESMICH details="Readme (German)" language="de" RELOC/doc/latex/biblatex-dw/README details="Readme (English)" language="en" @@ -38610,6 +38610,7 @@ docfiles size=491 RELOC/doc/latex/biblatex-dw/examples/en-footnote-dw.pdf RELOC/doc/latex/biblatex-dw/examples/en-footnote-dw.tex RELOC/doc/latex/biblatex-dw/examples/examples-dw.bib + RELOC/doc/latex/biblatex-dw/todo.txt runfiles size=35 RELOC/tex/latex/biblatex-dw/bbx/authortitle-dw.bbx RELOC/tex/latex/biblatex-dw/bbx/footnote-dw.bbx @@ -38621,9 +38622,9 @@ runfiles size=35 RELOC/tex/latex/biblatex-dw/lbx/german-dw.lbx catalogue-contact-home http://biblatex.dominik-wassenhoven.de catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-dw -catalogue-license lppl +catalogue-license lppl1.3 catalogue-topics biblatex humanities -catalogue-version 1.7 +catalogue-version 1.7a name biblatex-enc category Package @@ -102942,7 +102943,7 @@ catalogue-version 1.6 name dvisvgm category TLCore -revision 66119 +revision 66534 shortdesc Convert DVI, EPS, and PDF files to Scalable Vector Graphics format (SVG) longdesc Dvisvgm is a command line utility that converts TeX DVI as well longdesc as EPS and PDF files to the XML-based Scalable Vector Graphics @@ -102959,9 +102960,9 @@ longdesc the kpathsea library. For more detailed information, see the longdesc project page. depend dvisvgm.ARCH containersize 880 -containerchecksum ac7f13fa8b5a422fd2f81a737e6438931ff73ef6ce1ab3a5c18680dc1c90fd592c59b1b6b70081ca388214aa881b09a1bfcf8b04de3c59629ae7e1cbc18a104b +containerchecksum 503ca116be0a87f2606c9e898a591dedaa7a078713e30673eae5dc748fa4c4f13ce8c81852c959e84c3c45766daa565222db59a66315b0238e716e762e19eb31 doccontainersize 107332 -doccontainerchecksum 46852714ffc366b2a016fd382f52997679870bdbb3f3ecb34dac1438a19dc8bf270ccbdf495de4f5f2949d865600705e04d5bd776d2a89e668614f3584080e2a +doccontainerchecksum faa5efd79a8cf665cc502825ea185e1abe8ce5e466b5bf485f90fc2a21a1df564ce7f9c91e6db42e67acbe78bbeb683dd9a94231044503c8082f68c33d9f8ec0 docfiles size=42 texmf-dist/doc/man/man1/dvisvgm.1 texmf-dist/doc/man/man1/dvisvgm.man1.pdf @@ -102972,7 +102973,7 @@ catalogue-contact-repository https://github.com/mgieseki/dvisvgm catalogue-ctan /dviware/dvisvgm catalogue-license gpl3+ catalogue-topics dvi-proc -catalogue-version 3.0.3 +catalogue-version 3.0.4 name dvisvgm.aarch64-linux category TLCore @@ -244090,7 +244091,7 @@ catalogue-version 0.13 name pdfmanagement-testphase category Package -revision 66028 +revision 66534 shortdesc LaTeX PDF management testphase bundle relocated 1 longdesc This is a temporary package, which is used during a test phase @@ -244103,11 +244104,11 @@ longdesc allow users and package authors to safely test the code. At a longdesc later stage it will be integrated into the LaTeX kernel (or in longdesc parts into permanent support packages), and the current longdesc testphase bundle will be removed. -containersize 75792 -containerchecksum 9fc29725981b3862760ef0a9d3b6182a3d44d21f99062a34be437efb38e8619eefc9f100c71d58f19e82b8d5526c18ac6233406875bd4f9b2687466ab0f4fffe -doccontainersize 8709804 -doccontainerchecksum afa198392c5925cc1e058b49cd6eda0c13b6ea5833ac7b67877f472735bc1cf2037c9d043dac22557906a7775b1ffa07c4c06573513326664b6fd8afef123b52 -docfiles size=2866 +containersize 53640 +containerchecksum 917ec60e918fcf8f23fe44eec39d9f31e8edecf2421b3b2c4c4e015691d13d568a33b4290d0db6318362c51bd67cd64b329c3f6c8a755c35609a02b908d15be0 +doccontainersize 8714664 +doccontainerchecksum b4359b695dbc834aebf827b91b8042f9cd57a3f1ae67459e2ad1dce882fcfb1d9042a781f24faaa13bdd7bf1547cfe693cfa422960fc1ce90d09138de2e11da4 +docfiles size=2869 RELOC/doc/latex/pdfmanagement-testphase/CHANGELOG.md RELOC/doc/latex/pdfmanagement-testphase/README.md details="Readme" RELOC/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf @@ -244130,9 +244131,9 @@ docfiles size=2866 RELOC/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdf RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf details="Package documentation" -srccontainersize 137268 -srccontainerchecksum 8bd57ecb8a4ec77548ae51f80b1347dd25e40780fda0d6a77d9f0cce599103dc487ac3b298314743442bdd5c0332e73ed376f28656e9a56824900916e3c9384c -srcfiles size=198 +srccontainersize 137464 +srccontainerchecksum 08783e1c58f595dc5efc13ba4660de5dce1660615ca51b3e5404daaf99f2fa17c5c2e34cfc4d9954a320358bc770eb005a6d9127132a4e0add5ed189dce49e7e +srcfiles size=199 RELOC/source/latex/pdfmanagement-testphase/hyperref-generic.dtx RELOC/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx RELOC/source/latex/pdfmanagement-testphase/l3pdfannot.dtx @@ -244154,10 +244155,9 @@ srcfiles size=198 RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.ins -runfiles size=143 +runfiles size=105 RELOC/tex/latex/pdfmanagement-testphase/color-ltx.sty RELOC/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty - RELOC/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty RELOC/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def RELOC/tex/latex/pdfmanagement-testphase/hyperref-colorschemes.def RELOC/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def @@ -244169,7 +244169,6 @@ runfiles size=143 RELOC/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua RELOC/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty RELOC/tex/latex/pdfmanagement-testphase/l3ref-tmp.sty - RELOC/tex/latex/pdfmanagement-testphase/luaotfload-l3color-tmp.lua RELOC/tex/latex/pdfmanagement-testphase/output-patches-tmp-ltx.sty RELOC/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty RELOC/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -244180,7 +244179,7 @@ catalogue-contact-repository https://github.com/latex3/pdfresources catalogue-ctan /macros/latex/contrib/pdfmanagement-testphase catalogue-license lppl1.3c catalogue-topics latex-devel pdf-feat -catalogue-version 0.95w +catalogue-version 0.95x name pdfmarginpar category Package @@ -301400,7 +301399,7 @@ binfiles arch=x86_64-solaris size=1 name tex4ht category Package -revision 66459 +revision 66531 shortdesc Convert (La)TeX to HTML/XML longdesc A converter from TeX and LaTeX to SGML-based formats such as longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a @@ -301421,10 +301420,10 @@ longdesc files from them is nontrivial, and generally done with the longdesc Makefile in development, from which the TeX4ht package in TeX longdesc Live is updated. depend tex4ht.ARCH -containersize 1106552 -containerchecksum 7ec663a59d3287641e2f2e26ad833030d823f26747703b02977a04935f7d0fd9b2ac0197e1ac6fd3dbdcff9e295f0d00e1142d75817f659b32423e4a4b84c6cf +containersize 1106580 +containerchecksum 44ed16da1e774edb33b68c478ba8fa70eb33b03094c87cfd2c17068786c93bf4c083e85046158aef30353824d1458f0c5646ee71446f22ed991145827fad5f4a doccontainersize 136384 -doccontainerchecksum ad2a569edc79755977f7972d2c0dd536ccaf9120fd8dea2fc194d6c36efdcc4a665e2bfffac9e31af60e55ee19c8cd6ccf85ccd77c17dbe6bcba3a82c2870c1b +doccontainerchecksum 7c831eccdb5d303b756799bb28fa962593eec8a12e5ee1c763b7c614bab29d27fc507ebd86637e920581a4dd3a89d9e7acdb0aba2798b24048b9b0bacdcd1dd7 docfiles size=260 texmf-dist/doc/generic/tex4ht/Makefile texmf-dist/doc/generic/tex4ht/README details="Readme" @@ -301496,8 +301495,8 @@ docfiles size=260 texmf-dist/doc/generic/tex4ht/mn56.html texmf-dist/doc/generic/tex4ht/mn5x.png texmf-dist/doc/generic/tex4ht/mn6x.png -srccontainersize 1447440 -srccontainerchecksum bdb04e4c0423f50a74b05e83a73b63a4a4b038568f2c0b5473c5612e1d9fa3622143bf7f314d1883e891d79684e3191910a1984fd37c9c7e14e64851ae7266d0 +srccontainersize 1444484 +srccontainerchecksum 777422dea0615764a824f70ec7a85d4fbc824c25587935bfdf514420c2e0c61243dee2a84861b2290cec1fb444f64bd9754ce6334fb47c9ab3142d8e083fed75 srcfiles size=4378 texmf-dist/source/generic/tex4ht/ChangeLog texmf-dist/source/generic/tex4ht/Makefile @@ -312903,7 +312902,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 66486 +revision 66519 shortdesc TeX Live infrastructure programs longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for longdesc tlmgr to run but still ours. Not included in tlcritical. @@ -312911,11 +312910,11 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 113808 -containerchecksum 08d9211217ea31efda704111594909c9c370740182df7945e5f2b205da49163a3e01a045ff81543ba3d8ed083b91391abf365bee1501c2020571bdd3a414998b +containersize 113824 +containerchecksum 8c08b4ad89ca1475b6c5538b3e6d26cfc7517f0afcbb2e146754d1e5bef6bcabb1287a6489a9f62560e6f24d64d7af67397cccd2ff59537c0e6312b40a7056af doccontainersize 424920 -doccontainerchecksum 86c645031496d655b99d67b27b70600f1206b3f77a24b631ff09e5f4ef56e89d3e64fa591a8a6d7b5c73556bfe325d4158b0f9da470ad0d0d2018d999ab98563 -docfiles size=534 +doccontainerchecksum 6fe662d75a95f4348f3405fc984968582cc797f7a33b019d6ffe395223f94bd0f1ff5412b8aa32fae8f47c740f78e580a129ee10337820f6e32405bee009fd19 +docfiles size=535 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf @@ -348496,7 +348495,7 @@ catalogue-version 2.1 name widows-and-orphans category Package -revision 64212 +revision 66534 shortdesc Identify (typographic) widows and orphans relocated 1 longdesc This package identifies all widows and orphans in a document to @@ -348506,11 +348505,11 @@ longdesc paragraph long or short or or explicitly breaking in some longdesc strategic place. It will also identify and warn about words longdesc broken across columns or pages and display formulas separated longdesc from their introductory paragraph. -containersize 2892 -containerchecksum cc930d6184eb358db304723c569bdc05c001b99ef871080e119c172f240758d83cd9e783061ee521a4f0dbf8466542cae7ba84de26129c9cfe98f1b19f883f38 -doccontainersize 843620 -doccontainerchecksum 05afb64de8aabe837f1cb9b6e6b420815b407bfe31703dce7bef3c467d634b996c64f1bfea7d624917d68d8a9bf6a95b6a407f4c69420dea47720f1c52795730 -docfiles size=231 +containersize 2904 +containerchecksum df6534b55c029166cbbf91dae1b19b083093ad5c694b8a9dbe50c724fafb7f9ada320b298882ef3faf6069d9218d0ac70f6a0b0ef95a62f707232107efa2840c +doccontainersize 816884 +doccontainerchecksum 6a415e3068a378cb94f9b2f07866e2e515248691628ea838c7be8b43285b7832a49fd1842bb9b6767c27ab62f694b76998396cc51079da46584a2fe17c1cb6cc +docfiles size=224 RELOC/doc/latex/widows-and-orphans/MANIFEST.md RELOC/doc/latex/widows-and-orphans/README.md details="Readme" RELOC/doc/latex/widows-and-orphans/changes.txt @@ -348519,8 +348518,8 @@ docfiles size=231 RELOC/doc/latex/widows-and-orphans/widows-and-orphans-code.tex RELOC/doc/latex/widows-and-orphans/widows-and-orphans-doc.pdf details="Package documentation" RELOC/doc/latex/widows-and-orphans/widows-and-orphans-doc.tex -srccontainersize 12312 -srccontainerchecksum ccfd4b442df7c061eebf68c736c3ec8f31cfb1307c2ef09e27990e1d321259a3b4cf6c14db461fc36563f1d983ff45e44aa96a371bf8c9388dfda6cebffaacec +srccontainersize 12324 +srccontainerchecksum bc1ab6f2c3bb52b25e9e1a39b0f59341710ef02e1a20e456d09a53230f3a312e7eea64998481c6063dabe97cc91cd5c97c51ba907fde9818046acfd2fd1cd30d srcfiles size=12 RELOC/source/latex/widows-and-orphans/widows-and-orphans.dtx RELOC/source/latex/widows-and-orphans/widows-and-orphans.ins @@ -348530,7 +348529,7 @@ catalogue-also nowidow catalogue-contact-repository https://github.com/FrankMittelbach/fmitex-widows-and-orphans catalogue-ctan /macros/latex/contrib/widows-and-orphans catalogue-license lppl1.3c -catalogue-topics layout +catalogue-topics layout expl3 catalogue-version 1.0e name williams diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 4b0351dd7f..ebc25e35de 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -3d41f3746bfc35bd16878bfec944d9b1 texlive.tlpdb +a63186440ae0442611d4371735af1a02 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 2f843b33dd..c3aab845dc 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -c3f73faa67295cc768286ee86ee3d2cd85ee4f1861ac9c40f787edcbc350086bdd20dc6bae7455b3bab6a067a4ba5fee587f5630f53281cd8f95927f2ff8cd2e texlive.tlpdb +78ff260fb8598898233c5f9f9df99eb2df0cc3cf6f92760848771d25e6a6d477fc2a08841b9e349ae46a9d1c3fd77cde0d7a15fb8ce01e3266baaedab20e6a10 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index edcd8500a5..4a039f72cd 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----- -iQEcBAEBCgAGBQJkCpeKAAoJEEzhh34ZQ4xwi54IAKEWBWIN4wCUD0+egptIolog -Kk3ghdB4m3lHY0hAvWB5O7nopNNONjSXSZTXoR3B7eXmVECO7qJYHNEN0gwcoxk5 -/CcJqYjST5Uwvx3ILHstqwSralEBHJ/Ll4ebAMUtV6/Q17OHaBv/NeekFeTMHoYB -GS0ohtsNrjoHwsK4+8L8j3fNuD6bgYEdlDNLKlDyfjg/jCLulB0eU0Xu8ygMODUh -kHV+BoD0UaKinRoXDgOQ+tZv8N1saWtbLlAFAmr5gL9kOoGpwBlIoG7i3NzhELo0 -4vPZ8uGT9whMH3YJ6QkmBP7f3wC098k+/HvmRTSWOQKOMWVVoDJHj8U0Bueqdsk= -=/sWR +iQEcBAEBCgAGBQJkC+jhAAoJEEzhh34ZQ4xwNaoIAKbYRQ77oWhPvgRihOeAvmv6 +k134iGrIaGGHUf/oq3x/QfsqUu4aeEoT6Si8sRt2heScqsN0EdBRiuwJom1sp9RZ +z5hIeEXZWKL7g+Gu4HjeT10Mo7lKvK3AXXyYvCHenNAKcDsBPttILuldQAepodyU +sXANeUWkLspE9P4BgZ5jg2Iy8/P999uE8+gq9w6Vcz6wtuH6+r0T9qaudjspeu3Z +Zb4ZGZ5ECgd+I1J9SSJObk29tJCyzJ0fuHHotkyg8GQsK9vv3yzAkibTpBoN8VGN +7fbkej4FA8dN9Cs0MQEoOfPzmysaxtnz4m+ifNinMXp432ZrpWlMJxItRvJyUiY= +=Cs/K -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex d93c836fad..43c34d15f8 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2023-03-11-02-02 +2023-03-12-02-02 |
