diff options
981 files changed, 35810 insertions, 8668 deletions
diff --git a/FILES.byname b/FILES.byname index 1b08211ab0..6d82b2db73 100644 --- a/FILES.byname +++ b/FILES.byname @@ -4993,7 +4993,7 @@ 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web 2014/04/13 | 4600576 | dviware/xdvi/22.87/xdvik-22.87.tar.gz -2020/02/05 | 183078 | FILES.last07days +2020/02/06 | 193695 | FILES.last07days 2018/06/27 | 99883 | fonts/academicons/academicons.pdf 2018/06/27 | 10779 | fonts/academicons/academicons.sty 2018/06/27 | 5774 | fonts/academicons/academicons.tex @@ -116764,372 +116764,477 @@ 2019/04/13 | 106359 | fonts/spark-otf.zip 1993/12/13 | 22798 | fonts/srune/srune.mf 2019/09/15 | 5248 | fonts/step/doc/STEP-COPYING -2019/10/24 | 888 | fonts/step/doc/step-fonts.aux -2019/10/24 | 26949 | fonts/step/doc/step-fonts.log -2019/10/24 | 171033 | fonts/step/doc/step-fonts.pdf -2019/10/24 | 5166 | fonts/step/doc/step-fonts.tex -2019/09/15 | 2973 | fonts/step/enc/a_2gbaam.enc -2019/09/10 | 3007 | fonts/step/enc/a_3rxxvm.enc -2019/09/15 | 3023 | fonts/step/enc/a_4esb2f.enc -2019/09/15 | 2953 | fonts/step/enc/a_4otmjh.enc -2019/09/15 | 3222 | fonts/step/enc/a_4t3tqv.enc -2019/09/10 | 2843 | fonts/step/enc/a_574n7u.enc -2019/09/15 | 3180 | fonts/step/enc/a_5k2pnm.enc -2019/09/10 | 2822 | fonts/step/enc/a_5kjsul.enc -2019/09/15 | 3097 | fonts/step/enc/a_5xnggg.enc -2019/09/10 | 2794 | fonts/step/enc/a_6jxagp.enc -2019/09/15 | 2987 | fonts/step/enc/a_6sfsu6.enc -2019/09/15 | 3154 | fonts/step/enc/a_75yyfj.enc -2019/09/15 | 3096 | fonts/step/enc/a_7a5nqn.enc -2019/09/10 | 2909 | fonts/step/enc/a_7if24z.enc -2019/09/15 | 2829 | fonts/step/enc/a_aevneq.enc -2019/09/15 | 3068 | fonts/step/enc/a_ahbw5k.enc -2019/09/10 | 2956 | fonts/step/enc/a_ahclkl.enc -2019/09/15 | 2921 | fonts/step/enc/a_aoap6m.enc -2019/09/10 | 2784 | fonts/step/enc/a_arx325.enc -2019/09/15 | 3171 | fonts/step/enc/a_bt7ykx.enc -2019/09/15 | 2929 | fonts/step/enc/a_bw7ysd.enc -2019/09/10 | 2923 | fonts/step/enc/a_cc2n7r.enc -2019/09/15 | 3163 | fonts/step/enc/a_cqqmgz.enc -2019/09/15 | 3070 | fonts/step/enc/a_ds5txz.enc -2019/09/10 | 2876 | fonts/step/enc/a_enu25g.enc -2019/09/10 | 2810 | fonts/step/enc/a_euweyh.enc -2019/09/10 | 2714 | fonts/step/enc/a_f2t6y6.enc -2019/09/10 | 3266 | fonts/step/enc/a_f5fqnw.enc -2019/09/15 | 3159 | fonts/step/enc/a_fdcm6h.enc -2019/09/15 | 3163 | fonts/step/enc/a_ffybip.enc -2019/09/10 | 3298 | fonts/step/enc/a_fha2fn.enc -2019/09/15 | 2840 | fonts/step/enc/a_fwzjjs.enc -2019/09/10 | 2796 | fonts/step/enc/a_g3ibdt.enc -2019/09/15 | 3171 | fonts/step/enc/a_g5azuq.enc -2019/09/10 | 3334 | fonts/step/enc/a_gbbiod.enc -2019/09/15 | 3180 | fonts/step/enc/a_gkokml.enc -2019/09/15 | 3097 | fonts/step/enc/a_gl5exx.enc -2019/09/15 | 2923 | fonts/step/enc/a_gwwgis.enc -2019/09/15 | 3234 | fonts/step/enc/a_h6i53a.enc -2019/09/15 | 2985 | fonts/step/enc/a_hamrva.enc -2019/09/15 | 3162 | fonts/step/enc/a_ibvqy3.enc -2019/09/15 | 2919 | fonts/step/enc/a_j4ep6i.enc -2019/09/15 | 3034 | fonts/step/enc/a_jhwfjo.enc -2019/09/15 | 3168 | fonts/step/enc/a_jothuw.enc -2019/09/10 | 3041 | fonts/step/enc/a_kbcxke.enc -2019/09/10 | 2728 | fonts/step/enc/a_kgjeet.enc -2019/09/10 | 3041 | fonts/step/enc/a_l3q5ro.enc -2019/09/15 | 3021 | fonts/step/enc/a_l6bj4g.enc -2019/09/10 | 3173 | fonts/step/enc/a_lvbxzy.enc -2019/09/15 | 3200 | fonts/step/enc/a_mjsrji.enc -2019/09/15 | 3171 | fonts/step/enc/a_mmhgd3.enc -2019/09/15 | 2955 | fonts/step/enc/a_n35jrc.enc -2019/09/15 | 3042 | fonts/step/enc/a_n6yyi4.enc -2019/09/10 | 3223 | fonts/step/enc/a_nj7yl6.enc -2019/09/15 | 3199 | fonts/step/enc/a_nk3vlt.enc -2019/09/15 | 3040 | fonts/step/enc/a_nm54me.enc -2019/09/15 | 3042 | fonts/step/enc/a_nys5r4.enc -2019/09/15 | 3181 | fonts/step/enc/a_oqx7v6.enc -2019/09/15 | 2923 | fonts/step/enc/a_owwokh.enc -2019/09/10 | 3006 | fonts/step/enc/a_psybls.enc -2019/09/15 | 2953 | fonts/step/enc/a_q3sghv.enc -2019/09/10 | 3217 | fonts/step/enc/a_q6ipx2.enc -2019/09/15 | 3034 | fonts/step/enc/a_qboisw.enc -2019/09/15 | 3169 | fonts/step/enc/a_rcz4zw.enc -2019/09/10 | 3006 | fonts/step/enc/a_redus5.enc -2019/09/15 | 3105 | fonts/step/enc/a_rgssq4.enc -2019/09/15 | 3189 | fonts/step/enc/a_rx4otu.enc -2019/09/15 | 2831 | fonts/step/enc/a_smf27h.enc -2019/09/10 | 2914 | fonts/step/enc/a_smrcla.enc -2019/09/15 | 3134 | fonts/step/enc/a_tded26.enc -2019/09/10 | 3232 | fonts/step/enc/a_tpegoz.enc -2019/09/15 | 2957 | fonts/step/enc/a_tpkmtb.enc -2019/09/15 | 3177 | fonts/step/enc/a_tqaent.enc -2019/09/15 | 3168 | fonts/step/enc/a_trfpj6.enc -2019/09/15 | 2907 | fonts/step/enc/a_u5xlv2.enc -2019/09/10 | 3073 | fonts/step/enc/a_uda4d5.enc -2019/09/15 | 3070 | fonts/step/enc/a_udjv2r.enc -2019/09/10 | 2914 | fonts/step/enc/a_uhrokn.enc -2019/09/15 | 3093 | fonts/step/enc/a_uip2yp.enc -2019/09/15 | 3032 | fonts/step/enc/a_uki32u.enc -2019/09/10 | 3218 | fonts/step/enc/a_v7z4fi.enc -2019/09/15 | 2993 | fonts/step/enc/a_vjmilf.enc -2019/09/10 | 2716 | fonts/step/enc/a_vmnawy.enc -2019/09/10 | 2912 | fonts/step/enc/a_vzhqhy.enc -2019/09/15 | 3105 | fonts/step/enc/a_wmhjje.enc -2019/09/15 | 2954 | fonts/step/enc/a_wql5wd.enc -2019/09/15 | 2906 | fonts/step/enc/a_wzfdme.enc -2019/09/10 | 2782 | fonts/step/enc/a_xnivr2.enc -2019/09/10 | 2857 | fonts/step/enc/a_xwhxeh.enc -2019/09/15 | 2831 | fonts/step/enc/a_xy7ndg.enc -2019/09/15 | 2927 | fonts/step/enc/a_yl3m5r.enc -2019/09/15 | 3133 | fonts/step/enc/a_zbkikv.enc -2019/09/15 | 2995 | fonts/step/enc/a_zdolkr.enc -2019/09/10 | 2730 | fonts/step/enc/a_zjx4yp.enc -2019/09/10 | 2888 | fonts/step/enc/a_zypzpm.enc -2019/09/19 | 629 | fonts/step/latex/LGRSTEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/LGRSTEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/LGRSTEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/LGRSTEP-TOsF.fd -2019/09/19 | 629 | fonts/step/latex/LY1STEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/LY1STEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/LY1STEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/LY1STEP-TOsF.fd -2019/09/19 | 629 | fonts/step/latex/OT1STEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/OT1STEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/OT1STEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/OT1STEP-TOsF.fd +2020/02/06 | 43463 | fonts/step/doc/step-fonts.pdf +2020/02/06 | 5854 | fonts/step/doc/step-fonts.tex +2020/02/06 | 3107 | fonts/step/enc/a_2a2bfu.enc +2020/02/06 | 3116 | fonts/step/enc/a_2b3rql.enc +2020/02/06 | 2994 | fonts/step/enc/a_3rxxvm.enc +2020/02/06 | 3024 | fonts/step/enc/a_47wiac.enc +2020/02/06 | 3176 | fonts/step/enc/a_4h34hb.enc +2020/02/06 | 3107 | fonts/step/enc/a_4mxykn.enc +2020/02/06 | 3258 | fonts/step/enc/a_4zqdxy.enc +2020/02/06 | 2936 | fonts/step/enc/a_574n7u.enc +2020/02/06 | 3050 | fonts/step/enc/a_5mws5y.enc +2020/02/06 | 3190 | fonts/step/enc/a_5xnggg.enc +2020/02/06 | 2988 | fonts/step/enc/a_6auynr.enc +2020/02/06 | 2904 | fonts/step/enc/a_6hfbmi.enc +2020/02/06 | 3142 | fonts/step/enc/a_6wpl7b.enc +2020/02/06 | 3002 | fonts/step/enc/a_7if24z.enc +2020/02/06 | 3115 | fonts/step/enc/a_7jxw4d.enc +2020/02/06 | 3179 | fonts/step/enc/a_7wspdk.enc +2020/02/06 | 3114 | fonts/step/enc/a_7z23fd.enc +2020/02/06 | 3026 | fonts/step/enc/a_a6xuhy.enc +2020/02/06 | 2877 | fonts/step/enc/a_arx325.enc +2020/02/06 | 3026 | fonts/step/enc/a_bm4xhn.enc +2020/02/06 | 3275 | fonts/step/enc/a_bmbu3p.enc +2020/02/06 | 3189 | fonts/step/enc/a_bonk4u.enc +2020/02/06 | 3266 | fonts/step/enc/a_bt7ykx.enc +2020/02/06 | 3220 | fonts/step/enc/a_ccwxvq.enc +2020/02/06 | 3025 | fonts/step/enc/a_dy6wlv.enc +2020/02/06 | 3080 | fonts/step/enc/a_e4dxwh.enc +2020/02/06 | 2971 | fonts/step/enc/a_enu25g.enc +2020/02/06 | 2905 | fonts/step/enc/a_euweyh.enc +2020/02/06 | 3106 | fonts/step/enc/a_evkz3b.enc +2020/02/06 | 2809 | fonts/step/enc/a_f2t6y6.enc +2020/02/06 | 3253 | fonts/step/enc/a_f5fqnw.enc +2020/02/06 | 3254 | fonts/step/enc/a_fdcm6h.enc +2020/02/06 | 3258 | fonts/step/enc/a_ffybip.enc +2020/02/06 | 3287 | fonts/step/enc/a_fha2fn.enc +2020/02/06 | 2935 | fonts/step/enc/a_fwzjjs.enc +2020/02/06 | 3321 | fonts/step/enc/a_gbbiod.enc +2020/02/06 | 3088 | fonts/step/enc/a_gnavrk.enc +2020/02/06 | 3185 | fonts/step/enc/a_gwrxgc.enc +2020/02/06 | 2994 | fonts/step/enc/a_gz42of.enc +2020/02/06 | 2904 | fonts/step/enc/a_hbts53.enc +2020/02/06 | 3184 | fonts/step/enc/a_hgebca.enc +2020/02/06 | 3082 | fonts/step/enc/a_inbzfq.enc +2020/02/06 | 3115 | fonts/step/enc/a_jwptb5.enc +2020/02/06 | 3275 | fonts/step/enc/a_k7io4a.enc +2020/02/06 | 3025 | fonts/step/enc/a_kleesj.enc +2020/02/06 | 3172 | fonts/step/enc/a_knoumu.enc +2020/02/06 | 3276 | fonts/step/enc/a_kv7n4v.enc +2020/02/06 | 3140 | fonts/step/enc/a_kxamvp.enc +2020/02/06 | 3014 | fonts/step/enc/a_l3aktj.enc +2020/02/06 | 3026 | fonts/step/enc/a_l3q5ro.enc +2020/02/06 | 2994 | fonts/step/enc/a_lihfjg.enc +2020/02/06 | 3114 | fonts/step/enc/a_lwp5cc.enc +2020/02/06 | 3235 | fonts/step/enc/a_lws4fe.enc +2020/02/06 | 3143 | fonts/step/enc/a_lz3c5z.enc +2020/02/06 | 3060 | fonts/step/enc/a_mkgnjm.enc +2020/02/06 | 3118 | fonts/step/enc/a_mpy73s.enc +2020/02/06 | 3090 | fonts/step/enc/a_msql4j.enc +2020/02/06 | 3249 | fonts/step/enc/a_nm3vu2.enc +2020/02/06 | 3192 | fonts/step/enc/a_np5cf6.enc +2020/02/06 | 3276 | fonts/step/enc/a_oqx7v6.enc +2020/02/06 | 3104 | fonts/step/enc/a_oxrcs3.enc +2020/02/06 | 3143 | fonts/step/enc/a_p2lhbt.enc +2020/02/06 | 2993 | fonts/step/enc/a_psybls.enc +2020/02/06 | 3204 | fonts/step/enc/a_q6ipx2.enc +2020/02/06 | 3207 | fonts/step/enc/a_qqe53s.enc +2020/02/06 | 3022 | fonts/step/enc/a_rcc5m6.enc +2020/02/06 | 2993 | fonts/step/enc/a_redus5.enc +2020/02/06 | 3198 | fonts/step/enc/a_rgssq4.enc +2020/02/06 | 3284 | fonts/step/enc/a_rx4otu.enc +2020/02/06 | 3142 | fonts/step/enc/a_ryuwvo.enc +2020/02/06 | 2903 | fonts/step/enc/a_smrcla.enc +2020/02/06 | 3250 | fonts/step/enc/a_sycgav.enc +2020/02/06 | 3257 | fonts/step/enc/a_tmbyhw.enc +2020/02/06 | 3221 | fonts/step/enc/a_tpegoz.enc +2020/02/06 | 3272 | fonts/step/enc/a_tqaent.enc +2020/02/06 | 2994 | fonts/step/enc/a_txv6lr.enc +2020/02/06 | 3060 | fonts/step/enc/a_uda4d5.enc +2020/02/06 | 3106 | fonts/step/enc/a_ufgsbs.enc +2020/02/06 | 2903 | fonts/step/enc/a_uhrokn.enc +2020/02/06 | 3186 | fonts/step/enc/a_uip2yp.enc +2020/02/06 | 3317 | fonts/step/enc/a_umr5bj.enc +2020/02/06 | 3205 | fonts/step/enc/a_v7z4fi.enc +2020/02/06 | 3052 | fonts/step/enc/a_vca5tb.enc +2020/02/06 | 2811 | fonts/step/enc/a_vmnawy.enc +2020/02/06 | 2901 | fonts/step/enc/a_vzhqhy.enc +2020/02/06 | 3059 | fonts/step/enc/a_w7y2wc.enc +2020/02/06 | 3001 | fonts/step/enc/a_wzfdme.enc +2020/02/06 | 3112 | fonts/step/enc/a_x67loa.enc +2020/02/06 | 2994 | fonts/step/enc/a_x7ixiy.enc +2020/02/06 | 2875 | fonts/step/enc/a_xnivr2.enc +2020/02/06 | 3053 | fonts/step/enc/a_xscnug.enc +2020/02/06 | 3016 | fonts/step/enc/a_y3uxyj.enc +2020/02/06 | 3276 | fonts/step/enc/a_ya3dy4.enc +2020/02/06 | 3286 | fonts/step/enc/a_ylmzrw.enc +2020/02/06 | 895 | fonts/step/latex/LGRSTEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/LGRSTEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/LGRSTEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/LGRSTEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/LGRSTEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/LGRSTEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/LY1STEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/LY1STEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/LY1STEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/LY1STEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/LY1STEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/LY1STEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/OT1STEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/OT1STEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/OT1STEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/OT1STEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/OT1STEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/OT1STEP-TOsF.fd 2019/09/09 | 1775 | fonts/step/latex/step.sty -2019/09/19 | 623 | fonts/step/latex/T1STEP-Inf.fd -2019/09/19 | 1735 | fonts/step/latex/T1STEP-Sup.fd -2019/09/19 | 1735 | fonts/step/latex/T1STEP-TLF.fd -2019/09/19 | 1768 | fonts/step/latex/T1STEP-TOsF.fd -2019/09/19 | 629 | fonts/step/latex/T2ASTEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/T2ASTEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/T2ASTEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/T2ASTEP-TOsF.fd -2019/09/19 | 629 | fonts/step/latex/T2BSTEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/T2BSTEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/T2BSTEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/T2BSTEP-TOsF.fd -2019/09/19 | 629 | fonts/step/latex/T2CSTEP-Inf.fd -2019/09/19 | 1757 | fonts/step/latex/T2CSTEP-Sup.fd -2019/09/19 | 1757 | fonts/step/latex/T2CSTEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/T2CSTEP-TOsF.fd -2019/09/19 | 1757 | fonts/step/latex/TS1STEP-TLF.fd -2019/09/19 | 1790 | fonts/step/latex/TS1STEP-TOsF.fd -2019/09/15 | 13620 | fonts/step/map/STEP.map -2019/09/19 | 127016 | fonts/step/opentype/STEP-BoldItalic.otf -2019/09/19 | 167572 | fonts/step/opentype/STEP-Bold.otf -2019/09/19 | 133736 | fonts/step/opentype/STEP-Italic.otf -2019/09/19 | 245508 | fonts/step/opentype/STEPMath-Bold.otf -2019/09/19 | 553244 | fonts/step/opentype/STEPMath-Regular.otf -2019/09/19 | 305480 | fonts/step/opentype/STEP-Regular.otf -2019/10/24 | 488 | fonts/step/README -2019/09/15 | 1648 | fonts/step/tfm/STEP-BoldItalic-sup-lgr--base.tfm -2019/09/15 | 1652 | fonts/step/tfm/STEP-BoldItalic-sup-lgr.tfm -2019/09/19 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-ly1--base.tfm -2019/09/19 | 1628 | fonts/step/tfm/STEP-BoldItalic-sup-ly1.tfm -2019/09/19 | 1232 | fonts/step/tfm/STEP-BoldItalic-sup-ot1.tfm -2019/09/19 | 1616 | fonts/step/tfm/STEP-BoldItalic-sup-t1--base.tfm -2019/09/19 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-t1.tfm -2019/09/19 | 1852 | fonts/step/tfm/STEP-BoldItalic-sup-t2a.tfm -2019/09/19 | 1792 | fonts/step/tfm/STEP-BoldItalic-sup-t2b.tfm -2019/09/19 | 1760 | fonts/step/tfm/STEP-BoldItalic-sup-t2c.tfm -2019/09/15 | 1632 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr--base.tfm -2019/09/15 | 4180 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr.tfm -2019/09/15 | 1616 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1--base.tfm -2019/09/19 | 7216 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1.tfm -2019/09/19 | 2548 | fonts/step/tfm/STEP-BoldItalic-tlf-ot1.tfm -2019/09/15 | 1596 | fonts/step/tfm/STEP-BoldItalic-tlf-t1--base.tfm -2019/09/19 | 9544 | fonts/step/tfm/STEP-BoldItalic-tlf-t1.tfm -2019/09/19 | 3868 | fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm -2019/09/19 | 3672 | fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm -2019/09/19 | 3440 | fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm -2019/09/19 | 1404 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1--base.tfm -2019/09/19 | 1432 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1.tfm -2019/09/15 | 1632 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr--base.tfm -2019/09/15 | 4180 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr.tfm -2019/09/15 | 1620 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1--base.tfm -2019/09/19 | 7220 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1.tfm -2019/09/19 | 2556 | fonts/step/tfm/STEP-BoldItalic-tosf-ot1.tfm -2019/09/15 | 1600 | fonts/step/tfm/STEP-BoldItalic-tosf-t1--base.tfm -2019/09/19 | 9548 | fonts/step/tfm/STEP-BoldItalic-tosf-t1.tfm -2019/09/19 | 3868 | fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm -2019/09/19 | 3676 | fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm -2019/09/19 | 3444 | fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm -2019/09/19 | 1404 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1--base.tfm -2019/09/19 | 1432 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1.tfm -2019/09/15 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr--base.tfm -2019/09/15 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr.tfm -2019/09/19 | 1468 | fonts/step/tfm/STEP-Bold-sup-ly1--base.tfm -2019/09/19 | 1472 | fonts/step/tfm/STEP-Bold-sup-ly1.tfm -2019/09/19 | 1088 | fonts/step/tfm/STEP-Bold-sup-ot1.tfm -2019/09/19 | 1452 | fonts/step/tfm/STEP-Bold-sup-t1--base.tfm -2019/09/19 | 1460 | fonts/step/tfm/STEP-Bold-sup-t1.tfm -2019/09/19 | 1668 | fonts/step/tfm/STEP-Bold-sup-t2a.tfm -2019/09/19 | 1624 | fonts/step/tfm/STEP-Bold-sup-t2b.tfm -2019/09/19 | 1596 | fonts/step/tfm/STEP-Bold-sup-t2c.tfm -2019/09/15 | 1516 | fonts/step/tfm/STEP-Bold-tlf-lgr--base.tfm -2019/09/15 | 4052 | fonts/step/tfm/STEP-Bold-tlf-lgr.tfm -2019/09/15 | 1472 | fonts/step/tfm/STEP-Bold-tlf-ly1--base.tfm -2019/09/19 | 7384 | fonts/step/tfm/STEP-Bold-tlf-ly1.tfm -2019/09/19 | 2548 | fonts/step/tfm/STEP-Bold-tlf-ot1.tfm -2019/09/15 | 1444 | fonts/step/tfm/STEP-Bold-tlf-t1--base.tfm -2019/09/19 | 10020 | fonts/step/tfm/STEP-Bold-tlf-t1.tfm -2019/09/19 | 3668 | fonts/step/tfm/STEP-Bold-tlf-t2a.tfm -2019/09/19 | 3528 | fonts/step/tfm/STEP-Bold-tlf-t2b.tfm -2019/09/19 | 3252 | fonts/step/tfm/STEP-Bold-tlf-t2c.tfm -2019/09/19 | 1392 | fonts/step/tfm/STEP-Bold-tlf-ts1--base.tfm -2019/09/19 | 1420 | fonts/step/tfm/STEP-Bold-tlf-ts1.tfm -2019/09/15 | 1516 | fonts/step/tfm/STEP-Bold-tosf-lgr--base.tfm -2019/09/15 | 4052 | fonts/step/tfm/STEP-Bold-tosf-lgr.tfm -2019/09/15 | 1472 | fonts/step/tfm/STEP-Bold-tosf-ly1--base.tfm -2019/09/19 | 7384 | fonts/step/tfm/STEP-Bold-tosf-ly1.tfm -2019/09/19 | 2548 | fonts/step/tfm/STEP-Bold-tosf-ot1.tfm -2019/09/15 | 1444 | fonts/step/tfm/STEP-Bold-tosf-t1--base.tfm -2019/09/19 | 10020 | fonts/step/tfm/STEP-Bold-tosf-t1.tfm -2019/09/19 | 3668 | fonts/step/tfm/STEP-Bold-tosf-t2a.tfm -2019/09/19 | 3528 | fonts/step/tfm/STEP-Bold-tosf-t2b.tfm -2019/09/19 | 3252 | fonts/step/tfm/STEP-Bold-tosf-t2c.tfm -2019/09/19 | 1392 | fonts/step/tfm/STEP-Bold-tosf-ts1--base.tfm -2019/09/19 | 1420 | fonts/step/tfm/STEP-Bold-tosf-ts1.tfm -2019/09/15 | 1624 | fonts/step/tfm/STEP-Italic-sup-lgr--base.tfm -2019/09/15 | 1628 | fonts/step/tfm/STEP-Italic-sup-lgr.tfm -2019/09/19 | 1668 | fonts/step/tfm/STEP-Italic-sup-ly1--base.tfm -2019/09/19 | 1672 | fonts/step/tfm/STEP-Italic-sup-ly1.tfm -2019/09/19 | 1224 | fonts/step/tfm/STEP-Italic-sup-ot1.tfm -2019/09/19 | 1656 | fonts/step/tfm/STEP-Italic-sup-t1--base.tfm -2019/09/19 | 1664 | fonts/step/tfm/STEP-Italic-sup-t1.tfm -2019/09/19 | 1872 | fonts/step/tfm/STEP-Italic-sup-t2a.tfm -2019/09/19 | 1840 | fonts/step/tfm/STEP-Italic-sup-t2b.tfm -2019/09/19 | 1812 | fonts/step/tfm/STEP-Italic-sup-t2c.tfm -2019/09/15 | 1596 | fonts/step/tfm/STEP-Italic-tlf-lgr--base.tfm -2019/09/15 | 4284 | fonts/step/tfm/STEP-Italic-tlf-lgr.tfm -2019/09/15 | 1656 | fonts/step/tfm/STEP-Italic-tlf-ly1--base.tfm -2019/09/19 | 7428 | fonts/step/tfm/STEP-Italic-tlf-ly1.tfm -2019/09/19 | 2660 | fonts/step/tfm/STEP-Italic-tlf-ot1.tfm -2019/09/15 | 1632 | fonts/step/tfm/STEP-Italic-tlf-t1--base.tfm -2019/09/19 | 10260 | fonts/step/tfm/STEP-Italic-tlf-t1.tfm -2019/09/19 | 4176 | fonts/step/tfm/STEP-Italic-tlf-t2a.tfm -2019/09/19 | 3988 | fonts/step/tfm/STEP-Italic-tlf-t2b.tfm -2019/09/19 | 3680 | fonts/step/tfm/STEP-Italic-tlf-t2c.tfm -2019/09/19 | 1412 | fonts/step/tfm/STEP-Italic-tlf-ts1--base.tfm -2019/09/19 | 1440 | fonts/step/tfm/STEP-Italic-tlf-ts1.tfm -2019/09/15 | 1600 | fonts/step/tfm/STEP-Italic-tosf-lgr--base.tfm -2019/09/15 | 4288 | fonts/step/tfm/STEP-Italic-tosf-lgr.tfm -2019/09/15 | 1656 | fonts/step/tfm/STEP-Italic-tosf-ly1--base.tfm -2019/09/19 | 7428 | fonts/step/tfm/STEP-Italic-tosf-ly1.tfm -2019/09/19 | 2656 | fonts/step/tfm/STEP-Italic-tosf-ot1.tfm -2019/09/15 | 1632 | fonts/step/tfm/STEP-Italic-tosf-t1--base.tfm -2019/09/19 | 10260 | fonts/step/tfm/STEP-Italic-tosf-t1.tfm -2019/09/19 | 4176 | fonts/step/tfm/STEP-Italic-tosf-t2a.tfm -2019/09/19 | 3988 | fonts/step/tfm/STEP-Italic-tosf-t2b.tfm -2019/09/19 | 3680 | fonts/step/tfm/STEP-Italic-tosf-t2c.tfm -2019/09/19 | 1412 | fonts/step/tfm/STEP-Italic-tosf-ts1--base.tfm -2019/09/19 | 1440 | fonts/step/tfm/STEP-Italic-tosf-ts1.tfm -2019/09/19 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm -2019/09/19 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr.tfm -2019/09/19 | 1516 | fonts/step/tfm/STEP-Regular-inf-ly1--base.tfm -2019/09/19 | 1520 | fonts/step/tfm/STEP-Regular-inf-ly1.tfm -2019/09/19 | 1112 | fonts/step/tfm/STEP-Regular-inf-ot1.tfm -2019/09/19 | 1488 | fonts/step/tfm/STEP-Regular-inf-t1--base.tfm -2019/09/19 | 1496 | fonts/step/tfm/STEP-Regular-inf-t1.tfm -2019/09/19 | 1680 | fonts/step/tfm/STEP-Regular-inf-t2a.tfm -2019/09/19 | 1644 | fonts/step/tfm/STEP-Regular-inf-t2b.tfm -2019/09/19 | 1632 | fonts/step/tfm/STEP-Regular-inf-t2c.tfm -2019/09/19 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm -2019/09/19 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr.tfm -2019/09/19 | 1516 | fonts/step/tfm/STEP-Regular-sup-ly1--base.tfm -2019/09/19 | 1520 | fonts/step/tfm/STEP-Regular-sup-ly1.tfm -2019/09/19 | 1112 | fonts/step/tfm/STEP-Regular-sup-ot1.tfm -2019/09/19 | 1488 | fonts/step/tfm/STEP-Regular-sup-t1--base.tfm -2019/09/19 | 1496 | fonts/step/tfm/STEP-Regular-sup-t1.tfm -2019/09/19 | 1680 | fonts/step/tfm/STEP-Regular-sup-t2a.tfm -2019/09/19 | 1644 | fonts/step/tfm/STEP-Regular-sup-t2b.tfm -2019/09/19 | 1632 | fonts/step/tfm/STEP-Regular-sup-t2c.tfm -2019/09/19 | 1528 | fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm -2019/09/19 | 3652 | fonts/step/tfm/STEP-Regular-tlf-lgr.tfm -2019/09/15 | 1524 | fonts/step/tfm/STEP-Regular-tlf-ly1--base.tfm -2019/09/19 | 7144 | fonts/step/tfm/STEP-Regular-tlf-ly1.tfm -2019/09/19 | 2412 | fonts/step/tfm/STEP-Regular-tlf-ot1.tfm -2019/09/15 | 1540 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm -2019/09/15 | 3664 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm -2019/09/15 | 1512 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm -2019/09/15 | 8576 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm -2019/09/15 | 1100 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm -2019/09/15 | 2448 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm -2019/09/15 | 1448 | fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm -2019/09/15 | 11776 | fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm -2019/09/15 | 4136 | fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm -2019/09/15 | 3984 | fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm -2019/09/15 | 3772 | fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm -2019/09/15 | 1484 | fonts/step/tfm/STEP-Regular-tlf-t1--base.tfm -2019/09/19 | 9384 | fonts/step/tfm/STEP-Regular-tlf-t1.tfm -2019/09/19 | 4208 | fonts/step/tfm/STEP-Regular-tlf-t2a.tfm -2019/09/19 | 4052 | fonts/step/tfm/STEP-Regular-tlf-t2b.tfm -2019/09/19 | 3836 | fonts/step/tfm/STEP-Regular-tlf-t2c.tfm -2019/09/19 | 1412 | fonts/step/tfm/STEP-Regular-tlf-ts1--base.tfm -2019/09/19 | 1436 | fonts/step/tfm/STEP-Regular-tlf-ts1.tfm -2019/09/19 | 1528 | fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm -2019/09/19 | 3652 | fonts/step/tfm/STEP-Regular-tosf-lgr.tfm -2019/09/15 | 1524 | fonts/step/tfm/STEP-Regular-tosf-ly1--base.tfm -2019/09/19 | 7144 | fonts/step/tfm/STEP-Regular-tosf-ly1.tfm -2019/09/19 | 2412 | fonts/step/tfm/STEP-Regular-tosf-ot1.tfm -2019/09/15 | 1540 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm -2019/09/15 | 3664 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm -2019/09/15 | 1512 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm -2019/09/15 | 8576 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm -2019/09/15 | 1100 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm -2019/09/15 | 2448 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm -2019/09/15 | 1448 | fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm -2019/09/15 | 11776 | fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm -2019/09/15 | 4136 | fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm -2019/09/15 | 3984 | fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm -2019/09/15 | 3772 | fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm -2019/09/15 | 1484 | fonts/step/tfm/STEP-Regular-tosf-t1--base.tfm -2019/09/19 | 9384 | fonts/step/tfm/STEP-Regular-tosf-t1.tfm -2019/09/19 | 4208 | fonts/step/tfm/STEP-Regular-tosf-t2a.tfm -2019/09/19 | 4052 | fonts/step/tfm/STEP-Regular-tosf-t2b.tfm -2019/09/19 | 3836 | fonts/step/tfm/STEP-Regular-tosf-t2c.tfm -2019/09/19 | 1412 | fonts/step/tfm/STEP-Regular-tosf-ts1--base.tfm -2019/09/19 | 1436 | fonts/step/tfm/STEP-Regular-tosf-ts1.tfm -2019/09/19 | 152831 | fonts/step/type1/STEP-BoldItalic.pfb -2019/09/19 | 199655 | fonts/step/type1/STEP-Bold.pfb -2019/09/19 | 162227 | fonts/step/type1/STEP-Italic.pfb -2019/09/19 | 411364 | fonts/step/type1/STEP-Regular.pfb -2019/09/15 | 824 | fonts/step/vf/STEP-BoldItalic-sup-lgr.vf -2019/09/19 | 1708 | fonts/step/vf/STEP-BoldItalic-sup-ly1.vf -2019/09/19 | 1724 | fonts/step/vf/STEP-BoldItalic-sup-t1.vf -2019/09/15 | 824 | fonts/step/vf/STEP-BoldItalic-tlf-lgr.vf -2019/09/15 | 1720 | fonts/step/vf/STEP-BoldItalic-tlf-ly1.vf -2019/09/15 | 1728 | fonts/step/vf/STEP-BoldItalic-tlf-t1.vf -2019/09/19 | 532 | fonts/step/vf/STEP-BoldItalic-tlf-ts1.vf -2019/09/15 | 824 | fonts/step/vf/STEP-BoldItalic-tosf-lgr.vf -2019/09/15 | 1720 | fonts/step/vf/STEP-BoldItalic-tosf-ly1.vf -2019/09/15 | 1732 | fonts/step/vf/STEP-BoldItalic-tosf-t1.vf -2019/09/19 | 536 | fonts/step/vf/STEP-BoldItalic-tosf-ts1.vf -2019/09/15 | 844 | fonts/step/vf/STEP-Bold-sup-lgr.vf -2019/09/19 | 1700 | fonts/step/vf/STEP-Bold-sup-ly1.vf -2019/09/19 | 1716 | fonts/step/vf/STEP-Bold-sup-t1.vf -2019/09/15 | 844 | fonts/step/vf/STEP-Bold-tlf-lgr.vf -2019/09/15 | 1712 | fonts/step/vf/STEP-Bold-tlf-ly1.vf -2019/09/15 | 1724 | fonts/step/vf/STEP-Bold-tlf-t1.vf -2019/09/19 | 564 | fonts/step/vf/STEP-Bold-tlf-ts1.vf -2019/09/15 | 844 | fonts/step/vf/STEP-Bold-tosf-lgr.vf -2019/09/15 | 1716 | fonts/step/vf/STEP-Bold-tosf-ly1.vf -2019/09/15 | 1724 | fonts/step/vf/STEP-Bold-tosf-t1.vf -2019/09/19 | 564 | fonts/step/vf/STEP-Bold-tosf-ts1.vf -2019/09/15 | 828 | fonts/step/vf/STEP-Italic-sup-lgr.vf -2019/09/19 | 1704 | fonts/step/vf/STEP-Italic-sup-ly1.vf -2019/09/19 | 1720 | fonts/step/vf/STEP-Italic-sup-t1.vf -2019/09/15 | 828 | fonts/step/vf/STEP-Italic-tlf-lgr.vf -2019/09/15 | 1716 | fonts/step/vf/STEP-Italic-tlf-ly1.vf -2019/09/15 | 1724 | fonts/step/vf/STEP-Italic-tlf-t1.vf -2019/09/19 | 528 | fonts/step/vf/STEP-Italic-tlf-ts1.vf -2019/09/15 | 828 | fonts/step/vf/STEP-Italic-tosf-lgr.vf -2019/09/15 | 1716 | fonts/step/vf/STEP-Italic-tosf-ly1.vf -2019/09/15 | 1728 | fonts/step/vf/STEP-Italic-tosf-t1.vf -2019/09/19 | 532 | fonts/step/vf/STEP-Italic-tosf-ts1.vf -2019/09/19 | 1656 | fonts/step/vf/STEP-Regular-inf-lgr.vf -2019/09/19 | 1704 | fonts/step/vf/STEP-Regular-inf-ly1.vf -2019/09/19 | 1720 | fonts/step/vf/STEP-Regular-inf-t1.vf -2019/09/19 | 1656 | fonts/step/vf/STEP-Regular-sup-lgr.vf -2019/09/19 | 1704 | fonts/step/vf/STEP-Regular-sup-ly1.vf -2019/09/19 | 1720 | fonts/step/vf/STEP-Regular-sup-t1.vf -2019/09/19 | 1656 | fonts/step/vf/STEP-Regular-tlf-lgr.vf -2019/09/15 | 1716 | fonts/step/vf/STEP-Regular-tlf-ly1.vf -2019/09/15 | 1660 | fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf -2019/09/15 | 1680 | fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf -2019/09/15 | 812 | fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf -2019/09/15 | 1692 | fonts/step/vf/STEP-Regular-tlf-sc-t1.vf -2019/09/15 | 1728 | fonts/step/vf/STEP-Regular-tlf-t1.vf -2019/09/19 | 596 | fonts/step/vf/STEP-Regular-tlf-ts1.vf -2019/09/19 | 1656 | fonts/step/vf/STEP-Regular-tosf-lgr.vf -2019/09/15 | 1716 | fonts/step/vf/STEP-Regular-tosf-ly1.vf -2019/09/15 | 1660 | fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf -2019/09/15 | 1680 | fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf -2019/09/15 | 812 | fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf -2019/09/15 | 1696 | fonts/step/vf/STEP-Regular-tosf-sc-t1.vf -2019/09/15 | 1728 | fonts/step/vf/STEP-Regular-tosf-t1.vf -2019/09/19 | 596 | fonts/step/vf/STEP-Regular-tosf-ts1.vf -2019/10/24 | 2586222 | fonts/step.zip +2020/02/06 | 889 | fonts/step/latex/T1STEP-Dnom.fd +2020/02/06 | 882 | fonts/step/latex/T1STEP-Inf.fd +2020/02/06 | 889 | fonts/step/latex/T1STEP-Numr.fd +2020/02/06 | 1999 | fonts/step/latex/T1STEP-Sup.fd +2020/02/06 | 2179 | fonts/step/latex/T1STEP-TLF.fd +2020/02/06 | 2216 | fonts/step/latex/T1STEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/T2ASTEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/T2ASTEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/T2ASTEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/T2ASTEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/T2ASTEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/T2ASTEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/T2BSTEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/T2BSTEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/T2BSTEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/T2BSTEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/T2BSTEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/T2BSTEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/T2CSTEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/T2CSTEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/T2CSTEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/T2CSTEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/T2CSTEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/T2CSTEP-TOsF.fd +2020/02/06 | 889 | fonts/step/latex/T3STEP-Dnom.fd +2020/02/06 | 882 | fonts/step/latex/T3STEP-Inf.fd +2020/02/06 | 889 | fonts/step/latex/T3STEP-Numr.fd +2020/02/06 | 1999 | fonts/step/latex/T3STEP-Sup.fd +2020/02/06 | 2179 | fonts/step/latex/T3STEP-TLF.fd +2020/02/06 | 2216 | fonts/step/latex/T3STEP-TOsF.fd +2020/02/06 | 2021 | fonts/step/latex/TS1STEP-TLF.fd +2020/02/06 | 2054 | fonts/step/latex/TS1STEP-TOsF.fd +2020/02/06 | 895 | fonts/step/latex/TS3STEP-Dnom.fd +2020/02/06 | 888 | fonts/step/latex/TS3STEP-Inf.fd +2020/02/06 | 895 | fonts/step/latex/TS3STEP-Numr.fd +2020/02/06 | 2021 | fonts/step/latex/TS3STEP-Sup.fd +2020/02/06 | 2204 | fonts/step/latex/TS3STEP-TLF.fd +2020/02/06 | 2241 | fonts/step/latex/TS3STEP-TOsF.fd +2020/02/06 | 19341 | fonts/step/map/STEP.map +2020/02/06 | 126224 | fonts/step/opentype/STEP-BoldItalic.otf +2020/02/06 | 166744 | fonts/step/opentype/STEP-Bold.otf +2020/02/06 | 132912 | fonts/step/opentype/STEP-Italic.otf +2020/02/06 | 245508 | fonts/step/opentype/STEPMath-Bold.otf +2020/02/06 | 553244 | fonts/step/opentype/STEPMath-Regular.otf +2020/02/06 | 296192 | fonts/step/opentype/STEP-Regular.otf +2020/02/06 | 517 | fonts/step/README +2020/02/06 | 1648 | fonts/step/tfm/STEP-BoldItalic-sup-lgr--base.tfm +2020/02/06 | 1652 | fonts/step/tfm/STEP-BoldItalic-sup-lgr.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-ly1--base.tfm +2020/02/06 | 1628 | fonts/step/tfm/STEP-BoldItalic-sup-ly1.tfm +2020/02/06 | 1232 | fonts/step/tfm/STEP-BoldItalic-sup-ot1.tfm +2020/02/06 | 1616 | fonts/step/tfm/STEP-BoldItalic-sup-t1--base.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-t1.tfm +2020/02/06 | 1852 | fonts/step/tfm/STEP-BoldItalic-sup-t2a.tfm +2020/02/06 | 1792 | fonts/step/tfm/STEP-BoldItalic-sup-t2b.tfm +2020/02/06 | 1760 | fonts/step/tfm/STEP-BoldItalic-sup-t2c.tfm +2020/02/06 | 1760 | fonts/step/tfm/STEP-BoldItalic-sup-t3.tfm +2020/02/06 | 1200 | fonts/step/tfm/STEP-BoldItalic-sup-ts3.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr--base.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr.tfm +2020/02/06 | 1616 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1--base.tfm +2020/02/06 | 7216 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-BoldItalic-tlf-ot1.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-BoldItalic-tlf-t1--base.tfm +2020/02/06 | 9544 | fonts/step/tfm/STEP-BoldItalic-tlf-t1.tfm +2020/02/06 | 3872 | fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm +2020/02/06 | 3676 | fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm +2020/02/06 | 3444 | fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm +2020/02/06 | 2200 | fonts/step/tfm/STEP-BoldItalic-tlf-t3.tfm +2020/02/06 | 1404 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1--base.tfm +2020/02/06 | 1432 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1.tfm +2020/02/06 | 1336 | fonts/step/tfm/STEP-BoldItalic-tlf-ts3.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr--base.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr.tfm +2020/02/06 | 1620 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1--base.tfm +2020/02/06 | 7220 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1.tfm +2020/02/06 | 2556 | fonts/step/tfm/STEP-BoldItalic-tosf-ot1.tfm +2020/02/06 | 1600 | fonts/step/tfm/STEP-BoldItalic-tosf-t1--base.tfm +2020/02/06 | 9548 | fonts/step/tfm/STEP-BoldItalic-tosf-t1.tfm +2020/02/06 | 3872 | fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm +2020/02/06 | 3680 | fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm +2020/02/06 | 3448 | fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm +2020/02/06 | 2200 | fonts/step/tfm/STEP-BoldItalic-tosf-t3.tfm +2020/02/06 | 1404 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1--base.tfm +2020/02/06 | 1432 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1.tfm +2020/02/06 | 1336 | fonts/step/tfm/STEP-BoldItalic-tosf-ts3.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr--base.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr.tfm +2020/02/06 | 1468 | fonts/step/tfm/STEP-Bold-sup-ly1--base.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-sup-ly1.tfm +2020/02/06 | 1088 | fonts/step/tfm/STEP-Bold-sup-ot1.tfm +2020/02/06 | 1452 | fonts/step/tfm/STEP-Bold-sup-t1--base.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Bold-sup-t1.tfm +2020/02/06 | 1668 | fonts/step/tfm/STEP-Bold-sup-t2a.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-Bold-sup-t2b.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-Bold-sup-t2c.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-sup-t3--base.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-sup-t3.tfm +2020/02/06 | 1316 | fonts/step/tfm/STEP-Bold-sup-ts3.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Bold-tlf-lgr--base.tfm +2020/02/06 | 4052 | fonts/step/tfm/STEP-Bold-tlf-lgr.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-tlf-ly1--base.tfm +2020/02/06 | 7384 | fonts/step/tfm/STEP-Bold-tlf-ly1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-Bold-tlf-ot1.tfm +2020/02/06 | 1444 | fonts/step/tfm/STEP-Bold-tlf-t1--base.tfm +2020/02/06 | 10020 | fonts/step/tfm/STEP-Bold-tlf-t1.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Bold-tlf-t2a.tfm +2020/02/06 | 3532 | fonts/step/tfm/STEP-Bold-tlf-t2b.tfm +2020/02/06 | 3256 | fonts/step/tfm/STEP-Bold-tlf-t2c.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-tlf-t3--base.tfm +2020/02/06 | 2216 | fonts/step/tfm/STEP-Bold-tlf-t3.tfm +2020/02/06 | 1392 | fonts/step/tfm/STEP-Bold-tlf-ts1--base.tfm +2020/02/06 | 1420 | fonts/step/tfm/STEP-Bold-tlf-ts1.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Bold-tlf-ts3.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Bold-tosf-lgr--base.tfm +2020/02/06 | 4052 | fonts/step/tfm/STEP-Bold-tosf-lgr.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-tosf-ly1--base.tfm +2020/02/06 | 7384 | fonts/step/tfm/STEP-Bold-tosf-ly1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-Bold-tosf-ot1.tfm +2020/02/06 | 1444 | fonts/step/tfm/STEP-Bold-tosf-t1--base.tfm +2020/02/06 | 10020 | fonts/step/tfm/STEP-Bold-tosf-t1.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Bold-tosf-t2a.tfm +2020/02/06 | 3532 | fonts/step/tfm/STEP-Bold-tosf-t2b.tfm +2020/02/06 | 3256 | fonts/step/tfm/STEP-Bold-tosf-t2c.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-tosf-t3--base.tfm +2020/02/06 | 2216 | fonts/step/tfm/STEP-Bold-tosf-t3.tfm +2020/02/06 | 1392 | fonts/step/tfm/STEP-Bold-tosf-ts1--base.tfm +2020/02/06 | 1420 | fonts/step/tfm/STEP-Bold-tosf-ts1.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Bold-tosf-ts3.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-Italic-sup-lgr--base.tfm +2020/02/06 | 1628 | fonts/step/tfm/STEP-Italic-sup-lgr.tfm +2020/02/06 | 1668 | fonts/step/tfm/STEP-Italic-sup-ly1--base.tfm +2020/02/06 | 1672 | fonts/step/tfm/STEP-Italic-sup-ly1.tfm +2020/02/06 | 1224 | fonts/step/tfm/STEP-Italic-sup-ot1.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-sup-t1--base.tfm +2020/02/06 | 1664 | fonts/step/tfm/STEP-Italic-sup-t1.tfm +2020/02/06 | 1872 | fonts/step/tfm/STEP-Italic-sup-t2a.tfm +2020/02/06 | 1840 | fonts/step/tfm/STEP-Italic-sup-t2b.tfm +2020/02/06 | 1812 | fonts/step/tfm/STEP-Italic-sup-t2c.tfm +2020/02/06 | 1744 | fonts/step/tfm/STEP-Italic-sup-t3.tfm +2020/02/06 | 1192 | fonts/step/tfm/STEP-Italic-sup-ts3.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-Italic-tlf-lgr--base.tfm +2020/02/06 | 4284 | fonts/step/tfm/STEP-Italic-tlf-lgr.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-tlf-ly1--base.tfm +2020/02/06 | 7428 | fonts/step/tfm/STEP-Italic-tlf-ly1.tfm +2020/02/06 | 2660 | fonts/step/tfm/STEP-Italic-tlf-ot1.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Italic-tlf-t1--base.tfm +2020/02/06 | 10260 | fonts/step/tfm/STEP-Italic-tlf-t1.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-Italic-tlf-t2a.tfm +2020/02/06 | 3992 | fonts/step/tfm/STEP-Italic-tlf-t2b.tfm +2020/02/06 | 3684 | fonts/step/tfm/STEP-Italic-tlf-t2c.tfm +2020/02/06 | 2252 | fonts/step/tfm/STEP-Italic-tlf-t3.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Italic-tlf-ts1--base.tfm +2020/02/06 | 1440 | fonts/step/tfm/STEP-Italic-tlf-ts1.tfm +2020/02/06 | 1260 | fonts/step/tfm/STEP-Italic-tlf-ts3.tfm +2020/02/06 | 1600 | fonts/step/tfm/STEP-Italic-tosf-lgr--base.tfm +2020/02/06 | 4288 | fonts/step/tfm/STEP-Italic-tosf-lgr.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-tosf-ly1--base.tfm +2020/02/06 | 7428 | fonts/step/tfm/STEP-Italic-tosf-ly1.tfm +2020/02/06 | 2656 | fonts/step/tfm/STEP-Italic-tosf-ot1.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Italic-tosf-t1--base.tfm +2020/02/06 | 10260 | fonts/step/tfm/STEP-Italic-tosf-t1.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-Italic-tosf-t2a.tfm +2020/02/06 | 3992 | fonts/step/tfm/STEP-Italic-tosf-t2b.tfm +2020/02/06 | 3684 | fonts/step/tfm/STEP-Italic-tosf-t2c.tfm +2020/02/06 | 2252 | fonts/step/tfm/STEP-Italic-tosf-t3.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Italic-tosf-ts1--base.tfm +2020/02/06 | 1440 | fonts/step/tfm/STEP-Italic-tosf-ts1.tfm +2020/02/06 | 1260 | fonts/step/tfm/STEP-Italic-tosf-ts3.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-dnom-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-dnom-lgr.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-dnom-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-dnom-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-dnom-ot1.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-dnom-t1--base.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-dnom-t1.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-dnom-t2a.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-dnom-t2b.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-dnom-t2c.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-dnom-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-dnom-t3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-dnom-ts3.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Regular-inf-ly1--base.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-inf-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-inf-ot1.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-inf-t1--base.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-inf-t1.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-inf-t2a.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-inf-t2b.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-inf-t2c.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-inf-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-inf-t3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-inf-ts3.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-numr-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-numr-lgr.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-numr-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-numr-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-numr-ot1.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-numr-t1--base.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-numr-t1.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-numr-t2a.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-numr-t2b.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-numr-t2c.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-numr-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-numr-t3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-numr-ts3.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Regular-sup-ly1--base.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-sup-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-sup-ot1.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-sup-t1--base.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-sup-t1.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-sup-t2a.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-sup-t2b.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-sup-t2c.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-sup-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-sup-t3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-sup-ts3.tfm +2020/02/06 | 1528 | fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm +2020/02/06 | 3664 | fonts/step/tfm/STEP-Regular-tlf-lgr.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tlf-ly1--base.tfm +2020/02/06 | 7144 | fonts/step/tfm/STEP-Regular-tlf-ly1.tfm +2020/02/06 | 2412 | fonts/step/tfm/STEP-Regular-tlf-ot1.tfm +2020/02/06 | 1536 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm +2020/02/06 | 8768 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm +2020/02/06 | 2576 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm +2020/02/06 | 11980 | fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm +2020/02/06 | 4240 | fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm +2020/02/06 | 4088 | fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm +2020/02/06 | 3880 | fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm +2020/02/06 | 1728 | fonts/step/tfm/STEP-Regular-tlf-sc-t3--base.tfm +2020/02/06 | 4048 | fonts/step/tfm/STEP-Regular-tlf-sc-t3.tfm +2020/02/06 | 1352 | fonts/step/tfm/STEP-Regular-tlf-sc-ts3.tfm +2020/02/06 | 1484 | fonts/step/tfm/STEP-Regular-tlf-t1--base.tfm +2020/02/06 | 9384 | fonts/step/tfm/STEP-Regular-tlf-t1.tfm +2020/02/06 | 4212 | fonts/step/tfm/STEP-Regular-tlf-t2a.tfm +2020/02/06 | 4056 | fonts/step/tfm/STEP-Regular-tlf-t2b.tfm +2020/02/06 | 3840 | fonts/step/tfm/STEP-Regular-tlf-t2c.tfm +2020/02/06 | 1736 | fonts/step/tfm/STEP-Regular-tlf-t3--base.tfm +2020/02/06 | 4112 | fonts/step/tfm/STEP-Regular-tlf-t3.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Regular-tlf-ts1--base.tfm +2020/02/06 | 1436 | fonts/step/tfm/STEP-Regular-tlf-ts1.tfm +2020/02/06 | 1388 | fonts/step/tfm/STEP-Regular-tlf-ts3.tfm +2020/02/06 | 1528 | fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm +2020/02/06 | 3664 | fonts/step/tfm/STEP-Regular-tosf-lgr.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tosf-ly1--base.tfm +2020/02/06 | 7144 | fonts/step/tfm/STEP-Regular-tosf-ly1.tfm +2020/02/06 | 2412 | fonts/step/tfm/STEP-Regular-tosf-ot1.tfm +2020/02/06 | 1536 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm +2020/02/06 | 8768 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm +2020/02/06 | 2576 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm +2020/02/06 | 11980 | fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm +2020/02/06 | 4240 | fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm +2020/02/06 | 4088 | fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm +2020/02/06 | 3880 | fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm +2020/02/06 | 1728 | fonts/step/tfm/STEP-Regular-tosf-sc-t3--base.tfm +2020/02/06 | 4048 | fonts/step/tfm/STEP-Regular-tosf-sc-t3.tfm +2020/02/06 | 1352 | fonts/step/tfm/STEP-Regular-tosf-sc-ts3.tfm +2020/02/06 | 1484 | fonts/step/tfm/STEP-Regular-tosf-t1--base.tfm +2020/02/06 | 9384 | fonts/step/tfm/STEP-Regular-tosf-t1.tfm +2020/02/06 | 4212 | fonts/step/tfm/STEP-Regular-tosf-t2a.tfm +2020/02/06 | 4056 | fonts/step/tfm/STEP-Regular-tosf-t2b.tfm +2020/02/06 | 3840 | fonts/step/tfm/STEP-Regular-tosf-t2c.tfm +2020/02/06 | 1736 | fonts/step/tfm/STEP-Regular-tosf-t3--base.tfm +2020/02/06 | 4112 | fonts/step/tfm/STEP-Regular-tosf-t3.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Regular-tosf-ts1--base.tfm +2020/02/06 | 1436 | fonts/step/tfm/STEP-Regular-tosf-ts1.tfm +2020/02/06 | 1388 | fonts/step/tfm/STEP-Regular-tosf-ts3.tfm +2020/02/06 | 151006 | fonts/step/type1/STEP-BoldItalic.pfb +2020/02/06 | 197868 | fonts/step/type1/STEP-Bold.pfb +2020/02/06 | 160387 | fonts/step/type1/STEP-Italic.pfb +2020/02/06 | 375100 | fonts/step/type1/STEP-Regular.pfb +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-sup-lgr.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-BoldItalic-sup-ly1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-BoldItalic-sup-t1.vf +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-tlf-lgr.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-BoldItalic-tlf-ly1.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-BoldItalic-tlf-t1.vf +2020/02/06 | 532 | fonts/step/vf/STEP-BoldItalic-tlf-ts1.vf +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-tosf-lgr.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-BoldItalic-tosf-ly1.vf +2020/02/06 | 1732 | fonts/step/vf/STEP-BoldItalic-tosf-t1.vf +2020/02/06 | 536 | fonts/step/vf/STEP-BoldItalic-tosf-ts1.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-sup-lgr.vf +2020/02/06 | 1700 | fonts/step/vf/STEP-Bold-sup-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Bold-sup-t1.vf +2020/02/06 | 1368 | fonts/step/vf/STEP-Bold-sup-t3.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-tlf-lgr.vf +2020/02/06 | 1712 | fonts/step/vf/STEP-Bold-tlf-ly1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Bold-tlf-t1.vf +2020/02/06 | 1416 | fonts/step/vf/STEP-Bold-tlf-t3.vf +2020/02/06 | 564 | fonts/step/vf/STEP-Bold-tlf-ts1.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-tosf-lgr.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Bold-tosf-ly1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Bold-tosf-t1.vf +2020/02/06 | 1416 | fonts/step/vf/STEP-Bold-tosf-t3.vf +2020/02/06 | 564 | fonts/step/vf/STEP-Bold-tosf-ts1.vf +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-sup-lgr.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Italic-sup-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Italic-sup-t1.vf +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-tlf-lgr.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Italic-tlf-ly1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Italic-tlf-t1.vf +2020/02/06 | 528 | fonts/step/vf/STEP-Italic-tlf-ts1.vf +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-tosf-lgr.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Italic-tosf-ly1.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-Italic-tosf-t1.vf +2020/02/06 | 532 | fonts/step/vf/STEP-Italic-tosf-ts1.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-dnom-lgr.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-dnom-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-dnom-t1.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-dnom-t3.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-inf-lgr.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-inf-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-inf-t1.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-inf-t3.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-numr-lgr.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-numr-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-numr-t1.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-numr-t3.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-sup-lgr.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-sup-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-sup-t1.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-sup-t3.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-tlf-lgr.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Regular-tlf-ly1.vf +2020/02/06 | 1688 | fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf +2020/02/06 | 840 | fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Regular-tlf-sc-t1.vf +2020/02/06 | 1412 | fonts/step/vf/STEP-Regular-tlf-sc-t3.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-Regular-tlf-t1.vf +2020/02/06 | 1452 | fonts/step/vf/STEP-Regular-tlf-t3.vf +2020/02/06 | 596 | fonts/step/vf/STEP-Regular-tlf-ts1.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-tosf-lgr.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Regular-tosf-ly1.vf +2020/02/06 | 1688 | fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Regular-tosf-sc-t1.vf +2020/02/06 | 1412 | fonts/step/vf/STEP-Regular-tosf-sc-t3.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-Regular-tosf-t1.vf +2020/02/06 | 1452 | fonts/step/vf/STEP-Regular-tosf-t3.vf +2020/02/06 | 596 | fonts/step/vf/STEP-Regular-tosf-ts1.vf +2020/02/06 | 2518042 | fonts/step.zip 2019/10/04 | 12051 | fonts/stickstoo/afm/stickstooMath-Bold.afm 2019/10/05 | 6385 | fonts/stickstoo/afm/stickstooMath-BoldItalic.afm 2019/10/04 | 6303 | fonts/stickstoo/afm/stickstooMath-Italic.afm @@ -161233,7 +161338,6 @@ 2019/01/21 | 745849 | install/support/m-tx.tds.zip 2012/11/02 | 16083 | install/support/pdfcrop.tds.zip 2015/12/31 | 575855 | install/support/pmxchords.tds.zip -2018/02/12 | 567984 | install/support/pmx.tds.zip 2018/03/28 | 170265 | install/support/texdef.tds.zip 2020/02/02 | 3082654 | install/support/texplate.tds.zip 2018/09/08 | 33172 | install/support/thumbpdf.tds.zip @@ -184729,11 +184833,10 @@ 2007/11/04 | 3526 | macros/latex/contrib/errata/errata.sty 2007/11/04 | 559 | macros/latex/contrib/errata/README 2007/11/09 | 157151 | macros/latex/contrib/errata.zip -2019/12/13 | 36890 | macros/latex/contrib/erw-l3/erw-l3.dtx -2019/12/13 | 2112 | macros/latex/contrib/erw-l3/erw-l3.ins -2019/12/13 | 534931 | macros/latex/contrib/erw-l3/erw-l3.pdf -2019/12/13 | 329 | macros/latex/contrib/erw-l3/README.md -2019/12/13 | 538144 | macros/latex/contrib/erw-l3.zip +2020/02/06 | 37098 | macros/latex/contrib/erw-l3/erw-l3.dtx +2020/02/06 | 532611 | macros/latex/contrib/erw-l3/erw-l3.pdf +2019/12/13 | 339 | macros/latex/contrib/erw-l3/README.md +2020/02/06 | 535165 | macros/latex/contrib/erw-l3.zip 2016/08/31 | 1570 | macros/latex/contrib/esami/doc/esami.bib 2018/05/06 | 459201 | macros/latex/contrib/esami/doc/esami-doc-en.pdf 2018/05/06 | 52105 | macros/latex/contrib/esami/doc/esami-doc-en.tex @@ -185002,6 +185105,12 @@ 2018/07/10 | 1449 | macros/latex/contrib/etsvthor/etsvthor.sty 2018/07/10 | 700 | macros/latex/contrib/etsvthor/README.md 2018/07/11 | 1392 | macros/latex/contrib/etsvthor.zip +2020/02/06 | 70743 | macros/latex/contrib/euclideangeometry/euclideangeometry.dtx +2020/02/06 | 558102 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf +2020/02/06 | 74471 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex +2020/02/06 | 455029 | macros/latex/contrib/euclideangeometry/euclideangeometry.pdf +2020/02/06 | 1652 | macros/latex/contrib/euclideangeometry/README.txt +2020/02/06 | 1053396 | macros/latex/contrib/euclideangeometry.zip 2010/09/18 | 19465 | macros/latex/contrib/euenc/euenc.dtx 2010/09/18 | 143284 | macros/latex/contrib/euenc/euenc.pdf 2010/08/05 | 2208 | macros/latex/contrib/euenc/Makefile @@ -192287,6 +192396,11 @@ 2019/01/20 | 498 | macros/latex/contrib/metalogox/README.txt 2019/01/20 | 434434 | macros/latex/contrib/metalogox.zip 2010/05/29 | 90622 | macros/latex/contrib/metalogo.zip +2020/02/06 | 105694 | macros/latex/contrib/metastr/metastr.dtx +2020/01/03 | 958 | macros/latex/contrib/metastr/metastr.ins +2020/02/06 | 327624 | macros/latex/contrib/metastr/metastr.pdf +2020/02/05 | 1286 | macros/latex/contrib/metastr/README.txt +2020/02/06 | 338190 | macros/latex/contrib/metastr.zip 2010/03/14 | 433 | macros/latex/contrib/method/Makefile 1999/03/25 | 27137 | macros/latex/contrib/method/method.dtx 1999/03/25 | 1837 | macros/latex/contrib/method/method.ins @@ -202413,10 +202527,12 @@ 2009/09/04 | 2519 | macros/latex/contrib/titling/titling.ins 2009/09/04 | 200649 | macros/latex/contrib/titling/titling.pdf 2009/09/04 | 192957 | macros/latex/contrib/titling.zip -2011/06/02 | 112 | macros/latex/contrib/tkz-doc/README -2018/09/19 | 17458 | macros/latex/contrib/tkz-doc/tkz-doc.cls -2018/09/19 | 15764 | macros/latex/contrib/tkz-doc/tkzexample.sty -2018/09/19 | 9223 | macros/latex/contrib/tkz-doc.zip +2020/02/01 | 2686 | macros/latex/contrib/tkz-doc/couverture.tex +2011/06/03 | 112 | macros/latex/contrib/tkz-doc/README +2020/02/04 | 3295 | macros/latex/contrib/tkz-doc/tkz-doc.cfg +2020/02/03 | 12571 | macros/latex/contrib/tkz-doc/tkz-doc.cls +2019/08/13 | 15755 | macros/latex/contrib/tkz-doc/tkzexample.sty +2020/02/06 | 10292 | macros/latex/contrib/tkz-doc.zip 2016/03/06 | 15326 | macros/latex/contrib/tkz/pgfornament/doc/baseline.png 2016/03/10 | 2871702 | macros/latex/contrib/tkz/pgfornament/doc/ornaments.pdf 2016/03/07 | 369314 | macros/latex/contrib/tkz/pgfornament/doc/ornaments.png @@ -202628,137 +202744,156 @@ 2016/03/08 | 3497 | macros/latex/contrib/tkz/pgfornament/latex/tikzrput.sty 2016/03/10 | 1386 | macros/latex/contrib/tkz/pgfornament/README 2016/03/10 | 4817012 | macros/latex/contrib/tkz/pgfornament.zip -2020/01/23 | 392458 | macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf -2020/01/23 | 115 | macros/latex/contrib/tkz/tkz-base/examples/how_to_compile.txt -2020/01/23 | 271 | macros/latex/contrib/tkz/tkz-base/examples/main.tex -2020/01/23 | 170 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-10-2-0.tex -2020/01/23 | 231 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-1-1.tex -2020/01/23 | 404 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-2-1.tex -2020/01/23 | 203 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-3-1.tex -2020/01/23 | 259 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-4-0.tex -2020/01/23 | 257 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-5-1.tex -2020/01/23 | 123 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-1.tex -2020/01/23 | 143 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-2.tex -2020/01/23 | 574 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-7-0.tex -2020/01/23 | 277 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-9-0.tex -2020/01/23 | 348 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-1.tex -2020/01/23 | 274 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-2.tex -2020/01/23 | 354 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-3.tex -2020/01/23 | 314 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-0.tex -2020/01/23 | 576 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-1.tex -2020/01/23 | 700 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-2-0.tex -2020/01/23 | 556 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-3-1.tex -2020/01/23 | 532 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-5-0.tex -2020/01/23 | 805 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-7-0.tex -2020/01/23 | 542 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-8-1.tex -2020/01/23 | 286 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-13-2-0.tex -2020/01/23 | 196 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-14-1-2.tex -2020/01/23 | 189 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-1.tex -2020/01/23 | 183 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-2.tex -2020/01/23 | 136 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-2-1.tex -2020/01/23 | 189 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-1.tex -2020/01/23 | 170 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-2.tex -2020/01/23 | 112 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-4-1.tex -2020/01/23 | 176 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-16-1-1.tex -2020/01/23 | 322 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-1-1.tex -2020/01/23 | 389 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-1.tex -2020/01/23 | 393 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-2.tex -2020/01/23 | 780 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-3-1.tex -2020/01/23 | 112 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-4-0.tex -2020/01/23 | 309 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-5-1.tex -2020/01/23 | 281 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-1.tex -2020/01/23 | 321 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-2.tex -2020/01/23 | 268 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-3.tex -2020/01/23 | 288 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-4.tex -2020/01/23 | 971 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-2-1.tex -2020/01/23 | 119 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-1.tex -2020/01/23 | 109 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-2.tex -2020/01/23 | 108 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-0.tex -2020/01/23 | 222 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-1.tex -2020/01/23 | 207 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-2.tex -2020/01/23 | 194 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-3.tex -2020/01/23 | 173 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-10-1.tex -2020/01/23 | 85 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-1.tex -2020/01/23 | 120 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-2.tex -2020/01/23 | 113 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-3.tex -2020/01/23 | 134 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-4.tex -2020/01/23 | 99 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-5.tex -2020/01/23 | 99 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-6.tex -2020/01/23 | 115 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-10.tex -2020/01/23 | 130 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-11.tex -2020/01/23 | 141 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-1.tex -2020/01/23 | 188 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-2.tex -2020/01/23 | 183 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-3.tex -2020/01/23 | 154 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-4.tex -2020/01/23 | 142 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-5.tex -2020/01/23 | 171 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-6.tex -2020/01/23 | 218 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-7.tex -2020/01/23 | 130 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-8.tex -2020/01/23 | 168 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-9.tex -2020/01/23 | 112 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-1.tex -2020/01/23 | 195 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-2.tex -2020/01/23 | 161 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-3.tex -2020/01/23 | 112 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-1.tex -2020/01/23 | 119 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-2.tex -2020/01/23 | 103 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-3.tex -2020/01/23 | 115 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-1.tex -2020/01/23 | 120 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-2.tex -2020/01/23 | 138 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-9-1.tex -2020/01/23 | 269 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-10.tex -2020/01/23 | 279 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-11.tex -2020/01/23 | 90 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-1.tex -2020/01/23 | 238 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-2.tex -2020/01/23 | 101 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-3.tex -2020/01/23 | 132 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-4.tex -2020/01/23 | 177 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-5.tex -2020/01/23 | 191 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-6.tex -2020/01/23 | 205 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-7.tex -2020/01/23 | 231 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-8.tex -2020/01/23 | 294 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-9.tex -2020/01/23 | 242 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-1.tex -2020/01/23 | 311 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-2.tex -2020/01/23 | 478 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-3.tex -2020/01/23 | 275 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-2.tex -2020/01/23 | 229 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-3.tex -2020/01/23 | 240 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-1.tex -2020/01/23 | 190 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-12-1.tex -2020/01/23 | 318 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-2.tex -2020/01/23 | 335 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-3.tex -2020/01/23 | 486 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-4.tex -2020/01/23 | 322 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-5.tex -2020/01/23 | 310 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-2-0.tex -2020/01/23 | 281 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-3-1.tex -2020/01/23 | 277 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-1.tex -2020/01/23 | 254 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-2.tex -2020/01/23 | 86 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-1.tex -2020/01/23 | 341 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-2.tex -2020/01/23 | 328 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-3.tex -2020/01/23 | 167 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-1.tex -2020/01/23 | 408 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-2.tex -2020/01/23 | 274 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-1.tex -2020/01/23 | 201 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-2.tex -2020/01/23 | 174 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-8-1.tex -2020/01/23 | 491 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-1.tex -2020/01/23 | 407 | macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-2.tex -2020/01/23 | 7495 | macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg -2020/01/23 | 3378 | macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty -2020/01/23 | 3568 | macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex -2020/01/23 | 17915 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex -2020/01/23 | 3169 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex -2020/01/23 | 4558 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex -2020/01/23 | 13361 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex -2020/01/23 | 2384 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex -2020/01/23 | 6137 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex -2020/01/23 | 3075 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex -2020/01/23 | 2367 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex -2020/01/23 | 4455 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex -2020/01/23 | 3136 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex -2020/01/23 | 2399 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex -2020/01/23 | 2363 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex -2020/01/23 | 2626 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex -2020/01/23 | 6209 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex -2020/01/24 | 2102 | macros/latex/contrib/tkz/tkz-base/README -2020/01/24 | 439022 | macros/latex/contrib/tkz/tkz-base.zip +2007/10/29 | 34359 | macros/latex/contrib/tkz/tkz-base/doc/latex/tiger.pdf +2020/01/06 | 17355 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex +2020/01/25 | 8381 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex +2020/01/23 | 6643 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex +2020/01/06 | 6441 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex +2020/01/25 | 920 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex +2020/01/14 | 2457 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex +2020/01/25 | 5340 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex +2020/01/12 | 9745 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex +2020/01/29 | 2221 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex +2020/02/06 | 5807 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex +2020/01/25 | 6181 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex +2020/01/16 | 2242 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex +2020/01/16 | 4232 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex +2020/01/25 | 24902 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex +2020/01/03 | 2105 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex +2020/01/04 | 2613 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex +2020/01/25 | 4604 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex +2020/01/25 | 13129 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex +2020/02/06 | 414751 | macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf +2020/02/06 | 64 | macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx +2007/10/29 | 34359 | macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf +2020/02/06 | 277 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex +2020/02/06 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex +2020/02/06 | 258 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex +2020/02/06 | 332 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex +2020/02/06 | 311 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex +2020/02/06 | 306 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex +2020/02/06 | 202 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex +2020/02/06 | 237 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex +2020/02/06 | 240 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex +2020/02/06 | 262 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex +2020/02/06 | 270 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex +2020/02/06 | 251 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex +2020/02/06 | 268 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex +2020/02/06 | 263 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex +2020/02/06 | 265 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex +2020/02/06 | 340 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex +2020/02/06 | 310 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex +2020/02/06 | 268 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex +2020/02/06 | 256 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex +2020/02/06 | 293 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex +2020/02/06 | 341 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex +2020/02/06 | 266 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex +2020/02/06 | 325 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex +2020/02/06 | 243 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex +2020/02/06 | 338 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex +2020/02/06 | 300 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex +2020/02/06 | 245 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex +2020/02/06 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex +2020/02/06 | 224 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex +2020/02/06 | 246 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex +2020/02/06 | 247 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex +2020/02/06 | 238 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex +2020/02/06 | 434 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex +2020/02/06 | 418 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex +2020/02/06 | 234 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex +2020/02/06 | 220 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex +2020/02/06 | 272 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex +2020/02/06 | 297 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex +2020/02/06 | 372 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex +2020/02/06 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex +2020/02/06 | 366 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex +2020/02/06 | 439 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex +2020/02/06 | 387 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex +2020/02/06 | 449 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex +2020/02/06 | 644 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex +2020/02/06 | 345 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex +2020/02/06 | 469 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex +2020/02/06 | 483 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex +2020/02/06 | 610 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex +2020/02/06 | 451 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex +2020/02/06 | 456 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex +2020/02/06 | 422 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex +2020/02/06 | 409 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex +2020/02/06 | 212 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex +2020/02/06 | 460 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex +2020/02/06 | 454 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex +2020/02/06 | 329 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex +2020/02/06 | 411 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex +2020/02/06 | 312 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex +2020/02/06 | 649 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex +2020/02/06 | 567 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex +2020/02/06 | 555 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex +2020/02/06 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex +2020/02/06 | 367 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex +2020/02/06 | 405 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex +2020/02/06 | 283 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex +2020/02/06 | 289 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex +2020/02/06 | 680 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex +2020/02/06 | 468 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex +2020/02/06 | 456 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex +2020/02/06 | 433 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex +2020/02/06 | 505 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex +2020/02/06 | 431 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex +2020/02/06 | 727 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex +2020/02/06 | 819 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex +2020/02/06 | 707 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex +2020/02/06 | 679 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex +2020/02/06 | 945 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex +2020/02/06 | 676 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex +2020/02/06 | 418 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex +2020/02/06 | 318 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex +2020/02/06 | 307 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex +2020/02/06 | 339 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex +2020/02/06 | 234 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex +2020/02/06 | 306 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex +2020/02/06 | 325 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex +2020/02/06 | 230 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex +2020/02/06 | 284 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex +2020/02/06 | 475 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex +2020/02/06 | 543 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex +2020/02/06 | 526 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex +2020/02/06 | 890 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex +2020/02/06 | 231 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex +2020/02/06 | 460 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex +2020/02/06 | 390 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex +2020/02/06 | 427 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex +2020/02/06 | 404 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex +2020/02/06 | 1096 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex +2020/02/05 | 7682 | macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg +2020/01/30 | 3543 | macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty +2020/02/05 | 4027 | macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex +2020/01/25 | 17915 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex +2020/02/05 | 3169 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex +2020/02/05 | 4598 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex +2020/02/05 | 13224 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex +2020/02/05 | 2381 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex +2020/01/25 | 6137 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex +2020/02/05 | 3073 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex +2020/02/05 | 2365 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex +2020/02/05 | 4452 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex +2020/01/25 | 3136 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex +2020/01/25 | 2399 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex +2020/01/25 | 2363 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex +2020/01/25 | 2626 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex +2020/02/05 | 6212 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex +2020/02/06 | 2156 | macros/latex/contrib/tkz/tkz-base/README +2020/02/06 | 577110 | macros/latex/contrib/tkz/tkz-base.zip 2011/02/13 | 154 | macros/latex/contrib/tkz/tkz-berge/doc/latex/berge.ist 2011/02/19 | 25116 | macros/latex/contrib/tkz/tkz-berge/doc/latex/TKZdoc-berge-classic.tex 2011/05/26 | 7121 | macros/latex/contrib/tkz/tkz-berge/doc/latex/TKZdoc-berge-installation.tex @@ -202936,326 +203071,371 @@ 2020/01/23 | 24350 | macros/latex/contrib/tkz/tkz-euclide/doc/cheatsheet_euclide_1.pdf 2020/01/23 | 20779 | macros/latex/contrib/tkz/tkz-euclide/doc/cheatsheet_euclide_2.pdf 2020/01/23 | 480539 | macros/latex/contrib/tkz/tkz-euclide/doc/Euclidean_geometry.pdf -2020/01/23 | 633226 | macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf -2020/01/23 | 121 | macros/latex/contrib/tkz/tkz-euclide/examples/how_to_compile.txt -2020/01/23 | 271 | macros/latex/contrib/tkz/tkz-euclide/examples/main.tex -2020/01/23 | 232 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-2.tex -2020/01/23 | 408 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-3.tex -2020/01/23 | 494 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-1-1.tex -2020/01/23 | 542 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-2-1.tex -2020/01/23 | 541 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-3-1.tex -2020/01/23 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-4-1.tex -2020/01/23 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-5-1.tex -2020/01/23 | 315 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-6-1.tex -2020/01/23 | 491 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-1.tex -2020/01/23 | 376 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-2.tex -2020/01/23 | 461 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-12-1-0.tex -2020/01/23 | 257 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-10.tex -2020/01/23 | 274 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-11.tex -2020/01/23 | 334 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-1.tex -2020/01/23 | 387 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-2.tex -2020/01/23 | 301 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-3.tex -2020/01/23 | 348 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-4.tex -2020/01/23 | 351 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-5.tex -2020/01/23 | 521 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-6.tex -2020/01/23 | 374 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-7.tex -2020/01/23 | 310 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-8.tex -2020/01/23 | 386 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-9.tex -2020/01/23 | 275 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-2-1.tex -2020/01/23 | 304 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-2-0.tex -2020/01/23 | 279 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-3-0.tex -2020/01/23 | 273 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-0.tex -2020/01/23 | 606 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-1.tex -2020/01/23 | 721 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-5-1.tex -2020/01/23 | 324 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-6-0.tex -2020/01/23 | 757 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-7-0.tex -2020/01/23 | 412 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-1.tex -2020/01/23 | 534 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-2.tex -2020/01/23 | 354 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-3.tex -2020/01/23 | 374 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-4.tex -2020/01/23 | 524 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-5.tex -2020/01/23 | 663 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-6.tex -2020/01/23 | 479 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-1.tex -2020/01/23 | 190 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-2.tex -2020/01/23 | 317 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-3.tex -2020/01/23 | 285 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-2-1.tex -2020/01/23 | 179 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-1.tex -2020/01/23 | 267 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-2.tex -2020/01/23 | 736 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-3.tex -2020/01/23 | 272 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-2-0.tex -2020/01/23 | 297 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-1.tex -2020/01/23 | 390 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-2.tex -2020/01/23 | 201 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-4-1.tex -2020/01/23 | 581 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-0.tex -2020/01/23 | 192 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-1.tex -2020/01/23 | 796 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-2.tex -2020/01/23 | 210 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-3.tex -2020/01/23 | 308 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-1.tex -2020/01/23 | 295 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-2.tex -2020/01/23 | 248 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-3.tex -2020/01/23 | 129 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-1.tex -2020/01/23 | 234 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-2.tex -2020/01/23 | 307 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-3-1.tex -2020/01/23 | 309 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-4-1.tex -2020/01/23 | 307 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-5-1.tex -2020/01/23 | 950 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-1.tex -2020/01/23 | 374 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-2.tex -2020/01/23 | 424 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-3.tex -2020/01/23 | 662 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-4.tex -2020/01/23 | 415 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-5.tex -2020/01/23 | 738 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-6.tex -2020/01/23 | 655 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-7.tex -2020/01/23 | 319 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-1.tex -2020/01/23 | 185 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-2.tex -2020/01/23 | 670 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-3.tex -2020/01/23 | 235 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-1.tex -2020/01/23 | 252 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-2.tex -2020/01/23 | 506 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-3.tex -2020/01/23 | 655 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-4-1.tex -2020/01/23 | 290 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-5-1.tex -2020/01/23 | 1109 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-1.tex -2020/01/23 | 629 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-2.tex -2020/01/23 | 602 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-7-1.tex -2020/01/23 | 481 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-1.tex -2020/01/23 | 459 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-2.tex -2020/01/23 | 511 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-3.tex -2020/01/23 | 691 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-4.tex -2020/01/23 | 347 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-5.tex -2020/01/23 | 391 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-6.tex -2020/01/23 | 427 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-7.tex -2020/01/23 | 326 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-1.tex -2020/01/23 | 417 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-2.tex -2020/01/23 | 451 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-3.tex -2020/01/23 | 441 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-1-1.tex -2020/01/23 | 212 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-1.tex -2020/01/23 | 145 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-2.tex -2020/01/23 | 336 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-3.tex -2020/01/23 | 213 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-4.tex -2020/01/23 | 733 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-4-1.tex -2020/01/23 | 341 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-5-1.tex -2020/01/23 | 576 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-6-1.tex -2020/01/23 | 297 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-1-1.tex -2020/01/23 | 358 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-1.tex -2020/01/23 | 582 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-2.tex -2020/01/23 | 584 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-3.tex -2020/01/23 | 611 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-4.tex -2020/01/23 | 328 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-6.tex -2020/01/23 | 281 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-7.tex -2020/01/23 | 569 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-8.tex -2020/01/23 | 279 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-9.tex -2020/01/23 | 411 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-1.tex -2020/01/23 | 278 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-2.tex -2020/01/23 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-3.tex -2020/01/23 | 683 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-4.tex -2020/01/23 | 189 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-1.tex -2020/01/23 | 264 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-2.tex -2020/01/23 | 735 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-3.tex -2020/01/23 | 253 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-1.tex -2020/01/23 | 252 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-2.tex -2020/01/23 | 754 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-3-1.tex -2020/01/23 | 343 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-1.tex -2020/01/23 | 368 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-2.tex -2020/01/23 | 458 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-3.tex -2020/01/23 | 834 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-4.tex -2020/01/23 | 414 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-1.tex -2020/01/23 | 776 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-2.tex -2020/01/23 | 495 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-8-1.tex -2020/01/23 | 396 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-1.tex -2020/01/23 | 226 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-2.tex -2020/01/23 | 336 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-3.tex -2020/01/23 | 391 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-4.tex -2020/01/23 | 790 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-5.tex -2020/01/23 | 403 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-1.tex -2020/01/23 | 186 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-2.tex -2020/01/23 | 342 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-3-1.tex -2020/01/23 | 309 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-1-0.tex -2020/01/23 | 309 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-2-0.tex -2020/01/23 | 248 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-3-0.tex -2020/01/23 | 260 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-4-0.tex -2020/01/23 | 198 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-5-0.tex -2020/01/23 | 489 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-6-0.tex -2020/01/23 | 259 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-1.tex -2020/01/23 | 287 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-2.tex -2020/01/23 | 628 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-2-0.tex -2020/01/23 | 630 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-3-0.tex -2020/01/23 | 241 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-1.tex -2020/01/23 | 351 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-2.tex -2020/01/23 | 613 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-3.tex -2020/01/23 | 260 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-4.tex -2020/01/23 | 1102 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-1.tex -2020/01/23 | 695 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-2.tex -2020/01/23 | 423 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-29-1-1.tex -2020/01/23 | 266 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-1-0.tex -2020/01/23 | 221 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-2-0.tex -2020/01/23 | 853 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-2.tex -2020/01/23 | 789 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-3.tex -2020/01/23 | 662 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-4.tex -2020/01/23 | 791 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-5.tex -2020/01/23 | 673 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-10.tex -2020/01/23 | 1134 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-11.tex -2020/01/23 | 2284 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-12.tex -2020/01/23 | 282 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-1.tex -2020/01/23 | 602 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-2.tex -2020/01/23 | 457 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-3.tex -2020/01/23 | 802 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-4.tex -2020/01/23 | 730 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-5.tex -2020/01/23 | 1235 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-6.tex -2020/01/23 | 860 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-7.tex -2020/01/23 | 1254 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-8.tex -2020/01/23 | 928 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-9.tex -2020/01/23 | 884 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-5-0-0.tex -2020/01/23 | 122 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-2-0.tex -2020/01/23 | 123 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-3-0.tex -2020/01/23 | 132 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-4-0.tex -2020/01/23 | 323 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-1.tex -2020/01/23 | 497 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-2.tex -2020/01/23 | 335 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-3.tex -2020/01/23 | 128 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-3-0.tex -2020/01/23 | 138 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-4-0.tex -2020/01/23 | 298 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-1.tex -2020/01/23 | 233 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-2.tex -2020/01/23 | 206 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-3.tex -2020/01/23 | 205 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-1-1.tex -2020/01/23 | 222 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-1.tex -2020/01/23 | 535 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-2.tex -2020/01/23 | 780 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-3-0.tex -2020/01/23 | 456 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-1.tex -2020/01/23 | 297 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-2.tex -2020/01/23 | 219 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-3.tex -2020/01/23 | 316 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-4.tex -2020/01/23 | 318 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-5.tex -2020/01/23 | 910 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-6.tex -2020/01/23 | 604 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-7.tex -2020/01/23 | 1013 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty -2020/01/23 | 10772 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex -2020/01/23 | 6892 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex -2020/01/23 | 9141 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex -2020/01/23 | 3985 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex -2020/01/23 | 8710 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex -2020/01/23 | 16042 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex -2020/01/23 | 2992 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex -2020/01/23 | 7163 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex -2020/01/23 | 13717 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex -2020/01/23 | 4944 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex -2020/01/23 | 16919 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex -2020/01/23 | 10082 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex -2020/01/23 | 3718 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex -2020/01/23 | 4225 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex -2020/01/23 | 13854 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex -2020/01/23 | 14070 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex -2020/01/23 | 18158 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex -2020/01/23 | 2747 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex -2020/01/23 | 14395 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex -2020/01/24 | 2421 | macros/latex/contrib/tkz/tkz-euclide/README -2020/01/24 | 1197285 | macros/latex/contrib/tkz/tkz-euclide.zip -2010/12/19 | 153 | macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist -2011/06/01 | 7289 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex -2011/01/14 | 4959 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex -2011/06/01 | 5694 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex -2011/06/01 | 11072 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex -2011/01/14 | 4088 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex +2020/02/03 | 16597 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex +2020/02/03 | 4582 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex +2020/01/31 | 2336 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex +2020/02/04 | 23007 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex +2020/02/03 | 3861 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex +2020/02/06 | 6242 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex +2020/02/06 | 21469 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex +2020/02/04 | 2859 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex +2020/01/29 | 2577 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex +2020/02/06 | 12914 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex +2020/02/06 | 19833 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex +2020/02/06 | 6227 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex +2020/02/04 | 2869 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex +2020/01/03 | 1446 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex +2020/02/01 | 9119 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex +2020/02/06 | 29351 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex +2020/02/02 | 8905 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex +2020/02/03 | 11361 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex +2020/02/04 | 20146 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex +2020/01/22 | 1279 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex +2020/02/02 | 5440 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex +2020/02/03 | 7811 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex +2020/02/05 | 8102 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex +2020/02/03 | 15476 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex +2020/02/06 | 716749 | macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf +2020/02/06 | 64 | macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx +2020/02/06 | 992 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex +2020/02/06 | 1000 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex +2020/02/06 | 1009 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex +2020/02/06 | 486 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex +2020/02/06 | 563 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex +2020/02/06 | 646 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex +2020/02/06 | 313 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex +2020/02/06 | 377 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex +2020/02/06 | 305 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex +2020/02/06 | 447 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex +2020/02/06 | 353 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex +2020/02/06 | 243 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex +2020/02/06 | 251 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex +2020/02/06 | 337 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex +2020/02/06 | 377 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex +2020/02/06 | 692 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex +2020/02/06 | 906 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex +2020/02/06 | 437 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex +2020/02/06 | 356 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex +2020/02/06 | 451 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex +2020/02/06 | 453 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex +2020/02/06 | 1064 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex +2020/02/06 | 759 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex +2020/02/06 | 868 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex +2020/02/06 | 814 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex +2020/02/06 | 355 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex +2020/02/06 | 290 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex +2020/02/06 | 521 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex +2020/02/06 | 559 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex +2020/02/06 | 622 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex +2020/02/06 | 677 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex +2020/02/06 | 661 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex +2020/02/06 | 561 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex +2020/02/06 | 444 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex +2020/02/06 | 640 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex +2020/02/06 | 581 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex +2020/02/06 | 403 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex +2020/02/06 | 426 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex +2020/02/06 | 485 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex +2020/02/06 | 484 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex +2020/02/06 | 491 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex +2020/02/06 | 469 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex +2020/02/06 | 619 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex +2020/02/06 | 505 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex +2020/02/06 | 470 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex +2020/02/06 | 548 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex +2020/02/06 | 423 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex +2020/02/06 | 429 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex +2020/02/06 | 730 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex +2020/02/06 | 446 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex +2020/02/06 | 860 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex +2020/02/06 | 881 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex +2020/02/06 | 543 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex +2020/02/06 | 689 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex +2020/02/06 | 480 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex +2020/02/06 | 683 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex +2020/02/06 | 801 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex +2020/02/06 | 627 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex +2020/02/06 | 326 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex +2020/02/06 | 455 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex +2020/02/06 | 379 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex +2020/02/06 | 384 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex +2020/02/06 | 382 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex +2020/02/06 | 421 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex +2020/02/06 | 416 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex +2020/02/06 | 901 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex +2020/02/06 | 413 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex +2020/02/06 | 410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex +2020/02/06 | 510 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex +2020/02/06 | 334 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex +2020/02/06 | 694 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex +2020/02/06 | 914 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex +2020/02/06 | 342 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex +2020/02/06 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex +2020/02/06 | 417 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex +2020/02/06 | 372 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex +2020/02/06 | 291 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex +2020/02/06 | 394 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex +2020/02/06 | 660 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex +2020/02/06 | 607 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex +2020/02/06 | 581 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex +2020/02/06 | 567 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex +2020/02/06 | 950 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex +2020/02/06 | 840 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex +2020/02/06 | 545 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex +2020/02/06 | 1075 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex +2020/02/06 | 361 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex +2020/02/06 | 819 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex +2020/02/06 | 373 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex +2020/02/06 | 367 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex +2020/02/06 | 644 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex +2020/02/06 | 809 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex +2020/02/06 | 408 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex +2020/02/06 | 452 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex +2020/02/06 | 757 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex +2020/02/06 | 718 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex +2020/02/06 | 562 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex +2020/02/06 | 659 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex +2020/02/06 | 616 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex +2020/02/06 | 1006 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex +2020/02/06 | 539 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex +2020/02/06 | 659 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex +2020/02/06 | 831 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex +2020/02/06 | 605 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex +2020/02/06 | 542 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex +2020/02/06 | 486 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex +2020/02/06 | 572 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex +2020/02/06 | 575 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex +2020/02/06 | 479 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex +2020/02/06 | 343 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex +2020/02/06 | 265 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex +2020/02/06 | 457 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex +2020/02/06 | 849 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex +2020/02/06 | 449 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex +2020/02/06 | 694 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex +2020/02/06 | 448 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex +2020/02/06 | 503 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex +2020/02/06 | 733 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex +2020/02/06 | 744 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex +2020/02/06 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex +2020/02/06 | 462 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex +2020/02/06 | 691 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex +2020/02/06 | 399 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex +2020/02/06 | 551 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex +2020/02/06 | 554 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex +2020/02/06 | 802 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex +2020/02/06 | 582 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex +2020/02/06 | 747 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex +2020/02/06 | 317 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex +2020/02/06 | 852 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex +2020/02/06 | 381 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex +2020/02/06 | 380 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex +2020/02/06 | 881 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex +2020/02/06 | 480 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex +2020/02/06 | 519 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex +2020/02/06 | 577 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex +2020/02/06 | 950 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex +2020/02/06 | 550 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex +2020/02/06 | 920 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex +2020/02/06 | 602 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex +2020/02/06 | 540 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex +2020/02/06 | 371 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex +2020/02/06 | 476 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex +2020/02/06 | 531 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex +2020/02/06 | 941 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex +2020/02/06 | 547 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex +2020/02/06 | 331 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex +2020/02/06 | 395 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex +2020/02/06 | 628 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex +2020/02/06 | 383 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex +2020/02/06 | 410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex +2020/02/06 | 773 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex +2020/02/06 | 757 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex +2020/02/06 | 512 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex +2020/02/06 | 769 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex +2020/02/06 | 416 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex +2020/02/06 | 1260 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex +2020/02/06 | 859 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex +2020/02/06 | 586 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex +2020/02/06 | 389 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex +2020/02/06 | 978 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex +2020/02/06 | 909 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex +2020/02/06 | 785 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex +2020/02/06 | 903 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex +2020/02/06 | 797 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex +2020/02/06 | 2243 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex +2020/02/06 | 1249 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex +2020/02/06 | 2410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex +2020/02/06 | 411 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex +2020/02/06 | 720 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex +2020/02/06 | 578 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex +2020/02/06 | 913 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex +2020/02/06 | 856 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex +2020/02/06 | 1362 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex +2020/02/06 | 988 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex +2020/02/06 | 1381 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex +2020/02/06 | 1064 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex +2020/02/06 | 803 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex +2020/02/06 | 831 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex +2020/02/06 | 258 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex +2020/02/06 | 622 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex +2020/02/06 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex +2020/02/06 | 885 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex +2020/02/06 | 459 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex +2020/02/06 | 263 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex +2020/02/06 | 240 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex +2020/02/06 | 277 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex +2020/01/26 | 1204 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty +2020/02/05 | 10802 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex +2020/02/06 | 6904 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex +2020/02/05 | 9005 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex +2020/02/05 | 4006 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex +2020/02/05 | 8690 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex +2020/02/06 | 16058 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex +2020/01/25 | 2992 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex +2020/01/25 | 7163 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex +2020/01/25 | 13717 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex +2020/01/25 | 4944 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex +2020/02/06 | 18061 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex +2020/01/25 | 10082 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex +2020/01/25 | 3718 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex +2020/01/25 | 4225 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex +2020/01/25 | 13854 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex +2020/02/05 | 14127 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex +2020/01/30 | 17145 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex +2020/01/25 | 2747 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex +2020/01/25 | 14446 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex +2020/02/06 | 2580 | macros/latex/contrib/tkz/tkz-euclide/README +2020/02/06 | 1381531 | macros/latex/contrib/tkz/tkz-euclide.zip +2020/02/04 | 7237 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex +2020/02/04 | 4872 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex +2020/02/04 | 5620 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex +2020/02/04 | 10772 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex +2020/01/31 | 4043 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex 2011/01/04 | 11981 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex -2011/06/01 | 6447 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex -2011/06/01 | 2561 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex -2011/01/05 | 8191 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex +2020/02/04 | 6261 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex +2020/02/04 | 2486 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex +2020/02/04 | 678 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex 2011/01/20 | 3595 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex -2011/06/01 | 1443 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex +2020/02/04 | 1369 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex 2010/12/20 | 2115 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex -2011/06/01 | 6640 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex -2011/06/01 | 4472 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex -2010/12/29 | 5941 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex -2011/06/01 | 3912 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex +2020/02/06 | 5473 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex +2020/02/04 | 4395 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex +2020/02/04 | 5931 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex +2020/02/04 | 3830 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex 2010/12/20 | 3063 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex -2010/12/12 | 1178 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex -2011/06/01 | 10769 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex -2011/01/14 | 4358 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex -2011/06/01 | 3025 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex -2011/06/01 | 301 | macros/latex/contrib/tkz/tkz-fct/doc/readme.tex -2011/06/02 | 778582 | macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf -2011/01/25 | 414 | macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt -2011/06/02 | 394 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex -2011/06/02 | 459 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex -2011/06/02 | 279 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex -2011/06/02 | 363 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex -2011/06/02 | 286 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex -2011/06/02 | 489 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex -2011/06/02 | 265 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex -2011/06/02 | 718 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex -2011/06/02 | 322 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex -2011/06/02 | 381 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex -2011/06/02 | 400 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex -2011/06/02 | 438 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex -2011/06/02 | 403 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex -2011/06/02 | 433 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex -2011/06/02 | 442 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex -2011/06/02 | 381 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex -2011/06/02 | 371 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex -2011/06/02 | 484 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex -2011/06/02 | 325 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex -2011/06/02 | 387 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex -2011/06/02 | 361 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex -2011/06/02 | 477 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex -2011/06/02 | 893 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex -2011/06/02 | 952 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex -2011/06/02 | 566 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex -2011/06/02 | 949 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex -2011/06/02 | 677 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex -2011/06/02 | 1407 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex -2011/06/02 | 422 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex -2011/06/02 | 639 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex -2011/06/02 | 643 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex -2011/06/02 | 649 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex -2011/06/02 | 837 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex -2011/06/02 | 799 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex -2011/06/02 | 572 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex -2011/06/02 | 579 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex -2011/06/02 | 716 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex -2011/06/02 | 358 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex -2011/06/02 | 309 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex -2011/06/02 | 321 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex -2011/06/02 | 316 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex -2011/06/02 | 384 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex -2011/06/02 | 424 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex -2011/06/02 | 531 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex -2011/06/02 | 460 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex -2011/06/02 | 464 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex -2011/06/02 | 506 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex -2011/06/02 | 459 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex -2011/06/02 | 459 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex -2011/06/02 | 437 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex -2011/06/02 | 442 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex -2011/06/02 | 525 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex -2011/06/02 | 920 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex -2011/06/02 | 510 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex -2011/06/02 | 406 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex -2011/06/02 | 726 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex -2011/06/02 | 487 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex -2011/06/02 | 734 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex -2011/06/02 | 574 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex -2011/06/02 | 489 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex -2011/06/02 | 596 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex -2011/06/02 | 640 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex -2011/06/02 | 625 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex -2011/06/02 | 550 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex -2011/06/02 | 936 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex -2011/06/02 | 658 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex -2011/06/02 | 547 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex -2011/06/02 | 608 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex -2011/06/02 | 380 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex -2011/06/02 | 412 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex -2011/06/02 | 441 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex -2011/06/02 | 568 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex -2011/06/02 | 466 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex -2011/06/02 | 424 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex -2011/06/02 | 505 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex -2011/06/02 | 424 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex -2011/06/01 | 132 | macros/latex/contrib/tkz/tkz-fct/examples/Makefile -2011/06/02 | 471 | macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx -2011/06/02 | 24900 | macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty -2011/06/04 | 2724 | macros/latex/contrib/tkz/tkz-fct/README -2011/06/02 | 3026 | macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt -2011/06/02 | 2594 | macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt -2011/06/05 | 857225 | macros/latex/contrib/tkz/tkz-fct.zip +2020/01/31 | 1104 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex +2020/02/04 | 10683 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex +2020/02/04 | 4264 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex +2020/02/04 | 2911 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex +2020/02/06 | 742770 | macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf +2020/02/06 | 81 | macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex +2020/02/06 | 239 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex +2020/02/06 | 284 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex +2020/02/06 | 272 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex +2020/02/06 | 346 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex +2020/02/06 | 404 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex +2020/02/06 | 405 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex +2020/02/06 | 453 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex +2020/02/06 | 407 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex +2020/02/06 | 506 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex +2020/02/06 | 888 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex +2020/02/06 | 457 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex +2020/02/06 | 721 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex +2020/02/06 | 482 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex +2020/02/06 | 700 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex +2020/02/06 | 524 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex +2020/02/06 | 434 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex +2020/02/06 | 559 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex +2020/02/06 | 590 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex +2020/02/06 | 886 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex +2020/02/06 | 635 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex +2020/02/06 | 490 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex +2020/02/06 | 558 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex +2020/02/06 | 394 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex +2020/02/06 | 439 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex +2020/02/06 | 555 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex +2020/02/06 | 413 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex +2020/02/06 | 463 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex +2020/02/06 | 406 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex +2020/02/06 | 227 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex +2020/02/06 | 337 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex +2020/02/06 | 238 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex +2020/02/06 | 440 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex +2020/02/06 | 215 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex +2020/02/06 | 681 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex +2020/02/06 | 282 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex +2020/02/06 | 341 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex +2020/02/06 | 360 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex +2020/02/06 | 398 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex +2020/02/06 | 393 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex +2020/02/06 | 339 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex +2020/02/06 | 329 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex +2020/02/06 | 396 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex +2020/02/06 | 283 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex +2020/02/06 | 288 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex +2020/02/06 | 414 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex +2020/02/06 | 785 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex +2020/02/06 | 911 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex +2020/02/06 | 517 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex +2020/02/06 | 897 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex +2020/02/06 | 649 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex +2020/02/06 | 1347 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex +2020/02/06 | 374 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex +2020/02/06 | 531 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex +2020/02/06 | 533 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex +2020/02/06 | 542 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex +2020/02/06 | 805 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex +2020/02/06 | 773 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex +2020/02/06 | 535 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex +2020/02/06 | 664 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex +2020/02/06 | 305 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex +2020/02/06 | 23766 | macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty +2020/02/06 | 2090 | macros/latex/contrib/tkz/tkz-fct/README +2020/02/06 | 806981 | macros/latex/contrib/tkz/tkz-fct.zip 2011/02/13 | 154 | macros/latex/contrib/tkz/tkz-graph/doc/latex/graph.ist 2011/02/18 | 48760 | macros/latex/contrib/tkz/tkz-graph/doc/latex/TKZdoc-gr-annales.tex 2010/09/16 | 1064 | macros/latex/contrib/tkz/tkz-graph/doc/latex/TKZdoc-gr-couverture.tex @@ -239500,31 +239680,31 @@ 2020/01/20 | 8438 | support/autosp/doc/autosp.1 2020/01/20 | 29685 | support/autosp/doc/autosp.pdf 2017/12/19 | 6137 | support/autosp/doc/barsant2.aspc -2018/05/16 | 33166 | support/autosp/doc/barsant2.pdf +2020/02/06 | 33270 | support/autosp/doc/barsant2.pdf 2017/07/14 | 32336 | support/autosp/doc/geminiani.aspc -2018/05/16 | 146004 | support/autosp/doc/geminiani.pdf +2020/02/06 | 146034 | support/autosp/doc/geminiani.pdf 2017/12/22 | 5138 | support/autosp/doc/kinder2.aspc -2018/05/16 | 32967 | support/autosp/doc/kinder2.pdf +2020/02/06 | 32944 | support/autosp/doc/kinder2.pdf 2017/06/14 | 5079 | support/autosp/doc/quod2A.aspc -2018/05/16 | 24235 | support/autosp/doc/quod2A.pdf -2020/01/20 | 5145 | support/autosp/doc/quod2.aspc -2018/05/16 | 33769 | support/autosp/doc/quod2.pdf +2020/02/06 | 24283 | support/autosp/doc/quod2A.pdf +2020/02/06 | 5145 | support/autosp/doc/quod2.aspc +2020/02/06 | 35572 | support/autosp/doc/quod2.pdf 2017/06/10 | 1158 | support/autosp/doc/rebar.1 2017/06/10 | 4065 | support/autosp/doc/rebar.pdf 2018/06/16 | 1032 | support/autosp/doc/tex2aspc.1 2018/01/01 | 4127 | support/autosp/doc/tex2aspc.pdf -2020/01/22 | 59212 | support/autosp/MacOSX/autosp -2020/01/22 | 19408 | support/autosp/MacOSX/rebar -2020/01/22 | 19804 | support/autosp/MacOSX/tex2aspc -2020/01/20 | 4962 | support/autosp/README -2020/01/20 | 141796 | support/autosp/source/autosp-2019-12-22.tar.gz -2020/01/20 | 157589 | support/autosp/Windows32bit/autosp.exe -2020/01/20 | 78455 | support/autosp/Windows32bit/rebar.exe -2020/01/20 | 78721 | support/autosp/Windows32bit/tex2aspc.exe -2020/01/20 | 186496 | support/autosp/Windows64bit/autosp.exe -2020/01/20 | 92616 | support/autosp/Windows64bit/rebar.exe -2020/01/20 | 95343 | support/autosp/Windows64bit/tex2aspc.exe -2020/01/22 | 719562 | support/autosp.zip +2020/02/06 | 59176 | support/autosp/MacOSX/autosp +2020/02/06 | 19408 | support/autosp/MacOSX/rebar +2020/02/06 | 19804 | support/autosp/MacOSX/tex2aspc +2020/02/06 | 4962 | support/autosp/README +2020/02/06 | 143362 | support/autosp/source/autosp-2020-02-06.tar.gz +2020/02/06 | 153439 | support/autosp/Windows32bit/autosp.exe +2020/02/06 | 78455 | support/autosp/Windows32bit/rebar.exe +2020/02/06 | 78721 | support/autosp/Windows32bit/tex2aspc.exe +2020/02/06 | 189022 | support/autosp/Windows64bit/autosp.exe +2020/02/06 | 92707 | support/autosp/Windows64bit/rebar.exe +2020/02/06 | 95434 | support/autosp/Windows64bit/tex2aspc.exe +2020/02/06 | 721289 | support/autosp.zip 2000/11/20 | 7335 | support/autoview/autoview.el 2000/11/20 | 137 | support/autoview/deegoprofile.el 2000/11/20 | 215 | support/autoview/generalprofile.el @@ -239964,61 +240144,62 @@ 2013/05/28 | 5779 | support/classpack/README 2012/06/23 | 7368 | support/classpack/readme.xml 2013/05/30 | 405381 | support/classpack.zip -2019/08/21 | 106821 | support/cluttex/bin/cluttex -2019/08/21 | 106849 | support/cluttex/bin/cluttex.bat -2019/08/21 | 5961 | support/cluttex/build.lua -2019/08/21 | 1267 | support/cluttex/CHANGELOG.md -2019/08/21 | 1246 | support/cluttex/checkglobal.lua -2019/08/21 | 35147 | support/cluttex/COPYING -2019/08/21 | 272 | support/cluttex/doc/Makefile -2019/08/21 | 476078 | support/cluttex/doc/manual-ja.pdf -2019/08/21 | 16256 | support/cluttex/doc/manual-ja.tex -2019/08/21 | 173012 | support/cluttex/doc/manual.pdf -2019/08/21 | 11659 | support/cluttex/doc/manual.tex -2019/08/21 | 325 | support/cluttex/example/biblatex/foo.bib -2019/08/21 | 169 | support/cluttex/example/biblatex/main.tex -2019/08/21 | 24 | support/cluttex/example/biblatex/sub.tex -2019/08/21 | 177 | support/cluttex/example/bibtex/baz.bib -2019/08/21 | 149 | support/cluttex/example/bibtex/foo.bib -2019/08/21 | 137 | support/cluttex/example/bibtex/main.tex -2019/08/21 | 24 | support/cluttex/example/bibtex/sub.tex -2019/08/21 | 56 | support/cluttex/example/empty/main.tex -2019/08/21 | 3164 | support/cluttex/example/epstopdf/drawing.eps -2019/08/21 | 3164 | support/cluttex/example/epstopdf/fig/drawing2.eps -2019/08/21 | 215 | support/cluttex/example/epstopdf/main.tex -2019/08/21 | 173 | support/cluttex/example/include/main.tex -2019/08/21 | 63 | support/cluttex/example/include/path/to/file.tex -2019/08/21 | 69 | support/cluttex/example/include/sub2.tex -2019/08/21 | 72 | support/cluttex/example/include/sub.tex -2019/08/21 | 238 | support/cluttex/example/makeindex/main.tex -2019/08/21 | 47 | support/cluttex/example/minted/file.lua -2019/08/21 | 183 | support/cluttex/example/minted/main.tex -2019/08/21 | 830 | support/cluttex/example/README.md -2019/08/21 | 197 | support/cluttex/example/simple-ja/main-luatexja.tex -2019/08/21 | 126 | support/cluttex/example/simple-ja/main-platex.tex -2019/08/21 | 69 | support/cluttex/example/simple/main.tex -2019/08/21 | 999 | support/cluttex/Makefile -2019/08/21 | 4552 | support/cluttex/README.md -2019/08/21 | 23231 | support/cluttex/src/cluttex.lua -2019/08/21 | 2332 | support/cluttex/src/texrunner/auxfile.lua -2019/08/21 | 2228 | support/cluttex/src/texrunner/fsutil.lua -2019/08/21 | 15481 | support/cluttex/src/texrunner/fswatcher_windows.lua -2019/08/21 | 14004 | support/cluttex/src/texrunner/handleoption.lua -2019/08/21 | 7593 | support/cluttex/src/texrunner/isatty.lua -2019/08/21 | 3258 | support/cluttex/src/texrunner/luatexinit.lua -2019/08/21 | 4129 | support/cluttex/src/texrunner/message.lua -2019/08/21 | 4696 | support/cluttex/src/texrunner/option.lua -2019/08/21 | 1051 | support/cluttex/src/texrunner/pathutil.lua -2019/08/21 | 5463 | support/cluttex/src/texrunner/pathutil_unix.lua -2019/08/21 | 5959 | support/cluttex/src/texrunner/pathutil_windows.lua -2019/08/21 | 3203 | support/cluttex/src/texrunner/recovery.lua -2019/08/21 | 8602 | support/cluttex/src/texrunner/reruncheck.lua -2019/08/21 | 1788 | support/cluttex/src/texrunner/safename.lua -2019/08/21 | 867 | support/cluttex/src/texrunner/shellutil.lua -2019/08/21 | 1980 | support/cluttex/src/texrunner/shellutil_unix.lua -2019/08/21 | 1370 | support/cluttex/src/texrunner/shellutil_windows.lua -2019/08/21 | 5056 | support/cluttex/src/texrunner/tex_engine.lua -2019/08/21 | 759608 | support/cluttex.zip +2020/02/06 | 115040 | support/cluttex/bin/cluttex +2020/02/06 | 115068 | support/cluttex/bin/cluttex.bat +2020/02/06 | 6046 | support/cluttex/build.lua +2020/02/06 | 1545 | support/cluttex/CHANGELOG.md +2020/02/06 | 1246 | support/cluttex/checkglobal.lua +2020/02/06 | 35147 | support/cluttex/COPYING +2020/02/06 | 480358 | support/cluttex/doc/cluttex-ja.pdf +2020/02/06 | 17301 | support/cluttex/doc/cluttex-ja.tex +2020/02/06 | 174976 | support/cluttex/doc/cluttex.pdf +2020/02/06 | 12362 | support/cluttex/doc/cluttex.tex +2020/02/06 | 463 | support/cluttex/doc/Makefile +2020/02/06 | 325 | support/cluttex/example/biblatex/foo.bib +2020/02/06 | 169 | support/cluttex/example/biblatex/main.tex +2020/02/06 | 24 | support/cluttex/example/biblatex/sub.tex +2020/02/06 | 177 | support/cluttex/example/bibtex/baz.bib +2020/02/06 | 149 | support/cluttex/example/bibtex/foo.bib +2020/02/06 | 137 | support/cluttex/example/bibtex/main.tex +2020/02/06 | 24 | support/cluttex/example/bibtex/sub.tex +2020/02/06 | 56 | support/cluttex/example/empty/main.tex +2020/02/06 | 3164 | support/cluttex/example/epstopdf/drawing.eps +2020/02/06 | 3164 | support/cluttex/example/epstopdf/fig/drawing2.eps +2020/02/06 | 215 | support/cluttex/example/epstopdf/main.tex +2020/02/06 | 173 | support/cluttex/example/include/main.tex +2020/02/06 | 63 | support/cluttex/example/include/path/to/file.tex +2020/02/06 | 69 | support/cluttex/example/include/sub2.tex +2020/02/06 | 72 | support/cluttex/example/include/sub.tex +2020/02/06 | 238 | support/cluttex/example/makeindex/main.tex +2020/02/06 | 47 | support/cluttex/example/minted/file.lua +2020/02/06 | 183 | support/cluttex/example/minted/main.tex +2020/02/06 | 830 | support/cluttex/example/README.md +2020/02/06 | 197 | support/cluttex/example/simple-ja/main-luatexja.tex +2020/02/06 | 126 | support/cluttex/example/simple-ja/main-platex.tex +2020/02/06 | 69 | support/cluttex/example/simple/main.tex +2020/02/06 | 1032 | support/cluttex/Makefile +2020/02/06 | 4726 | support/cluttex/README.md +2020/02/06 | 23310 | support/cluttex/src/cluttex.lua +2020/02/06 | 2462 | support/cluttex/src/texrunner/auxfile.lua +2020/02/06 | 6486 | support/cluttex/src/texrunner/checkdriver.lua +2020/02/06 | 2228 | support/cluttex/src/texrunner/fsutil.lua +2020/02/06 | 15481 | support/cluttex/src/texrunner/fswatcher_windows.lua +2020/02/06 | 15319 | support/cluttex/src/texrunner/handleoption.lua +2020/02/06 | 7593 | support/cluttex/src/texrunner/isatty.lua +2020/02/06 | 3405 | support/cluttex/src/texrunner/luatexinit.lua +2020/02/06 | 4130 | support/cluttex/src/texrunner/message.lua +2020/02/06 | 4696 | support/cluttex/src/texrunner/option.lua +2020/02/06 | 1051 | support/cluttex/src/texrunner/pathutil.lua +2020/02/06 | 5463 | support/cluttex/src/texrunner/pathutil_unix.lua +2020/02/06 | 5959 | support/cluttex/src/texrunner/pathutil_windows.lua +2020/02/06 | 3203 | support/cluttex/src/texrunner/recovery.lua +2020/02/06 | 8602 | support/cluttex/src/texrunner/reruncheck.lua +2020/02/06 | 1788 | support/cluttex/src/texrunner/safename.lua +2020/02/06 | 867 | support/cluttex/src/texrunner/shellutil.lua +2020/02/06 | 1980 | support/cluttex/src/texrunner/shellutil_unix.lua +2020/02/06 | 1370 | support/cluttex/src/texrunner/shellutil_windows.lua +2020/02/06 | 5056 | support/cluttex/src/texrunner/tex_engine.lua +2020/02/06 | 771877 | support/cluttex.zip 2006/05/12 | 560738 | support/cms4talks/CMS4talks.zip 2006/02/06 | 1422 | support/cms4talks/Manual/CMS4talks.gif 2006/02/06 | 358 | support/cms4talks/Manual/images/copyleft.gif @@ -245963,35 +246144,40 @@ 2015/12/30 | 9331 | support/pmxchords/tex/chords.tex 2015/12/30 | 240 | support/pmxchords/Windows/pmxchords.bat 2015/12/31 | 573998 | support/pmxchords.zip -2018/02/12 | 2482 | support/pmx/doc/examples/barsant.pmx -2018/02/12 | 2624 | support/pmx/doc/examples/dyntest.pmx -2018/02/12 | 2628 | support/pmx/doc/examples/most.pmx -2018/02/12 | 2731 | support/pmx/doc/examples/mwalmnd.pmx -2018/02/12 | 769 | support/pmx/doc/examples/netsoos.pmx -2018/02/12 | 3153 | support/pmx/doc/examples/staffcrossall.pmx -2018/02/12 | 145458 | support/pmx/doc/file600.eps -2018/02/12 | 32473 | support/pmx/doc/gpl.txt -2018/02/12 | 14280 | support/pmx/doc/pmx25-284.html -2018/02/12 | 322439 | support/pmx/doc/pmx284.pdf -2018/02/12 | 137632 | support/pmx/doc/pmx284.tex -2018/02/12 | 871 | support/pmx/doc/pmxab.1 -2018/02/12 | 4034 | support/pmx/doc/pmxab.pdf -2018/02/12 | 90847 | support/pmx/doc/pmx-install.pdf -2018/02/12 | 5691 | support/pmx/doc/pmx-install.tex -2018/02/12 | 64109 | support/pmx/doc/ref284.pdf -2018/02/12 | 23349 | support/pmx/doc/ref284.tex -2016/02/04 | 807 | support/pmx/doc/scor2prt.1 -2016/02/04 | 3675 | support/pmx/doc/scor2prt.pdf -2018/02/12 | 720504 | support/pmx/OSX/pmxab -2018/02/12 | 120376 | support/pmx/OSX/scor2prt -2018/02/12 | 976986 | support/pmx/pmx-2.8.4.tar.gz -2018/02/12 | 538 | support/pmx/README -2018/02/12 | 30502 | support/pmx/tex/pmx.tex -2018/02/12 | 1251151 | support/pmx/Windows32bit/pmxab.exe -2018/02/12 | 312406 | support/pmx/Windows32bit/scor2prt.exe -2018/02/12 | 1500195 | support/pmx/Windows64bit/pmxab.exe -2018/02/12 | 388346 | support/pmx/Windows64bit/scor2prt.exe -2018/02/13 | 3191348 | support/pmx.zip +2020/01/29 | 65925 | support/pmx/doc/accents.eps +2020/02/06 | 32532 | support/pmx/doc/ChangeLog +2020/01/29 | 2482 | support/pmx/doc/examples/barsant.pmx +2020/01/29 | 2624 | support/pmx/doc/examples/dyntest.pmx +2020/01/29 | 2628 | support/pmx/doc/examples/most.pmx +2020/01/29 | 2731 | support/pmx/doc/examples/mwalmnd.pmx +2020/01/29 | 769 | support/pmx/doc/examples/netsoos.pmx +2020/01/29 | 3771 | support/pmx/doc/examples/prad5x.pmx +2020/01/29 | 3153 | support/pmx/doc/examples/staffcrossall.pmx +2020/01/29 | 145458 | support/pmx/doc/file600.eps +2020/01/29 | 71540 | support/pmx/doc/gapxmpl.eps +2020/01/27 | 32473 | support/pmx/doc/gpl.txt +2020/01/29 | 345417 | support/pmx/doc/pmx294.pdf +2020/01/29 | 145748 | support/pmx/doc/pmx294.tex +2020/01/27 | 871 | support/pmx/doc/pmxab.1 +2020/01/27 | 4034 | support/pmx/doc/pmxab.pdf +2020/02/06 | 108463 | support/pmx/doc/pmx-install.pdf +2020/02/06 | 5163 | support/pmx/doc/pmx-install.tex +2020/01/29 | 70133 | support/pmx/doc/ref294.pdf +2020/01/29 | 23870 | support/pmx/doc/ref294.tex +2020/01/27 | 807 | support/pmx/doc/scor2prt.1 +2020/01/27 | 3675 | support/pmx/doc/scor2prt.pdf +2020/01/29 | 59351 | support/pmx/doc/sjb291.eps +2020/01/29 | 55583 | support/pmx/doc/tremxmpl4.eps +2020/01/29 | 748292 | support/pmx/OSX/pmxab +2020/01/29 | 118012 | support/pmx/OSX/scor2prt +2020/02/06 | 687 | support/pmx/README +2020/01/29 | 804016 | support/pmx/source/pmx-2.9.4.tar.gz +2020/01/29 | 30828 | support/pmx/tex/pmx.tex +2020/01/29 | 1285430 | support/pmx/Windows32bit/pmxab.exe +2020/01/29 | 312406 | support/pmx/Windows32bit/scor2prt.exe +2020/01/29 | 1539478 | support/pmx/Windows64bit/pmxab.exe +2020/01/29 | 388346 | support/pmx/Windows64bit/scor2prt.exe +2020/02/06 | 3236352 | support/pmx.zip 2000/06/22 | 2414 | support/poster/getopt.c 1999/04/28 | 18007 | support/poster/LICENSE 1999/04/28 | 681 | support/poster/Makefile @@ -251603,8 +251789,8 @@ 2019/02/28 | 6452 | systems/texlive/tlnet/archive/barcodes.tar.xz 2019/02/28 | 588832 | systems/texlive/tlnet/archive/bardiag.doc.tar.xz 2019/02/28 | 12260 | systems/texlive/tlnet/archive/bardiag.tar.xz -2019/12/06 | 285156 | systems/texlive/tlnet/archive/barracuda.doc.r53034.tar.xz -2019/12/06 | 25288 | systems/texlive/tlnet/archive/barracuda.r53034.tar.xz +2020/02/06 | 347964 | systems/texlive/tlnet/archive/barracuda.doc.r53683.tar.xz +2020/02/06 | 30052 | systems/texlive/tlnet/archive/barracuda.r53683.tar.xz 2019/02/28 | 414908 | systems/texlive/tlnet/archive/barr.doc.tar.xz 2019/02/28 | 8104 | systems/texlive/tlnet/archive/barr.tar.xz 2019/02/28 | 5492 | systems/texlive/tlnet/archive/bartel-chess-fonts.doc.tar.xz @@ -252241,9 +252427,9 @@ 2019/02/28 | 2808 | systems/texlive/tlnet/archive/bxjaprnind.tar.xz 2019/10/24 | 2068 | systems/texlive/tlnet/archive/bxjatoucs.doc.tar.xz 2019/10/24 | 25604 | systems/texlive/tlnet/archive/bxjatoucs.tar.xz -2019/11/27 | 1824300 | systems/texlive/tlnet/archive/bxjscls.doc.r52927.tar.xz -2019/11/27 | 31260 | systems/texlive/tlnet/archive/bxjscls.r52927.tar.xz -2019/11/27 | 78592 | systems/texlive/tlnet/archive/bxjscls.source.r52927.tar.xz +2020/02/06 | 1790400 | systems/texlive/tlnet/archive/bxjscls.doc.r53684.tar.xz +2020/02/06 | 31388 | systems/texlive/tlnet/archive/bxjscls.r53684.tar.xz +2020/02/06 | 78872 | systems/texlive/tlnet/archive/bxjscls.source.r53684.tar.xz 2019/02/28 | 2376 | systems/texlive/tlnet/archive/bxnewfont.doc.tar.xz 2019/02/28 | 4760 | systems/texlive/tlnet/archive/bxnewfont.tar.xz 2019/02/28 | 2112 | systems/texlive/tlnet/archive/bxorigcapt.doc.tar.xz @@ -257254,9 +257440,9 @@ 2019/02/28 | 62752 | systems/texlive/tlnet/archive/lualatex-truncate.doc.tar.xz 2019/02/28 | 5392 | systems/texlive/tlnet/archive/lualatex-truncate.source.tar.xz 2019/02/28 | 1932 | systems/texlive/tlnet/archive/lualatex-truncate.tar.xz -2019/11/07 | 87748 | systems/texlive/tlnet/archive/lualibs.doc.tar.xz -2019/11/07 | 8580 | systems/texlive/tlnet/archive/lualibs.source.tar.xz -2019/11/07 | 120408 | systems/texlive/tlnet/archive/lualibs.tar.xz +2020/02/06 | 87576 | systems/texlive/tlnet/archive/lualibs.doc.r53682.tar.xz +2020/02/06 | 120980 | systems/texlive/tlnet/archive/lualibs.r53682.tar.xz +2020/02/06 | 8572 | systems/texlive/tlnet/archive/lualibs.source.r53682.tar.xz 2019/02/28 | 220808 | systems/texlive/tlnet/archive/luamesh.doc.tar.xz 2019/02/28 | 11704 | systems/texlive/tlnet/archive/luamesh.tar.xz 2019/12/12 | 151880 | systems/texlive/tlnet/archive/luamplib.doc.r53099.tar.xz @@ -258059,13 +258245,13 @@ 2019/02/28 | 352 | systems/texlive/tlnet/archive/mptopdf.amd64-freebsd.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.amd64-netbsd.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.armhf-linux.tar.xz -2019/12/13 | 13684 | systems/texlive/tlnet/archive/mptopdf.doc.r53110.tar.xz +2020/02/06 | 13556 | systems/texlive/tlnet/archive/mptopdf.doc.r53687.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.i386-cygwin.tar.xz 2019/02/28 | 352 | systems/texlive/tlnet/archive/mptopdf.i386-freebsd.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.i386-linux.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.i386-netbsd.tar.xz 2019/02/28 | 348 | systems/texlive/tlnet/archive/mptopdf.i386-solaris.tar.xz -2019/12/13 | 38436 | systems/texlive/tlnet/archive/mptopdf.r53110.tar.xz +2020/02/06 | 38596 | systems/texlive/tlnet/archive/mptopdf.r53687.tar.xz 2019/02/28 | 684 | systems/texlive/tlnet/archive/mptopdf.win32.tar.xz 2019/02/28 | 352 | systems/texlive/tlnet/archive/mptopdf.x86_64-cygwin.tar.xz 2019/02/28 | 356 | systems/texlive/tlnet/archive/mptopdf.x86_64-darwinlegacy.tar.xz @@ -261277,8 +261463,8 @@ 2019/04/06 | 280 | systems/texlive/tlnet/archive/texlive-cz.tar.xz 2019/03/28 | 1299960 | systems/texlive/tlnet/archive/texlive-de.doc.tar.xz 2019/03/28 | 272 | systems/texlive/tlnet/archive/texlive-de.tar.xz -2020/02/05 | 158488 | systems/texlive/tlnet/archive/texlive-docindex.doc.r53663.tar.xz -2020/02/05 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r53663.tar.xz +2020/02/06 | 158468 | systems/texlive/tlnet/archive/texlive-docindex.doc.r53679.tar.xz +2020/02/06 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r53679.tar.xz 2020/01/19 | 1858612 | systems/texlive/tlnet/archive/texlive-en.doc.r53451.tar.xz 2020/01/19 | 276 | systems/texlive/tlnet/archive/texlive-en.r53451.tar.xz 2019/04/01 | 2279380 | systems/texlive/tlnet/archive/texlive-es.doc.tar.xz @@ -261551,9 +261737,9 @@ 2019/02/28 | 500 | systems/texlive/tlnet/archive/theatre.tar.xz 2019/02/28 | 333032 | systems/texlive/tlnet/archive/theoremref.doc.tar.xz 2019/02/28 | 4124 | systems/texlive/tlnet/archive/theoremref.tar.xz -2020/01/06 | 251688 | systems/texlive/tlnet/archive/thesis-ekf.doc.r53332.tar.xz -2020/01/06 | 59236 | systems/texlive/tlnet/archive/thesis-ekf.r53332.tar.xz -2020/01/06 | 7476 | systems/texlive/tlnet/archive/thesis-ekf.source.r53332.tar.xz +2020/02/06 | 250060 | systems/texlive/tlnet/archive/thesis-ekf.doc.r53685.tar.xz +2020/02/06 | 59216 | systems/texlive/tlnet/archive/thesis-ekf.r53685.tar.xz +2020/02/06 | 7440 | systems/texlive/tlnet/archive/thesis-ekf.source.r53685.tar.xz 2019/02/28 | 402080 | systems/texlive/tlnet/archive/thesis-gwu.doc.tar.xz 2019/02/28 | 10428 | systems/texlive/tlnet/archive/thesis-gwu.tar.xz 2019/02/28 | 1248052 | systems/texlive/tlnet/archive/thesis-qom.doc.tar.xz @@ -262965,16 +263151,16 @@ 2020/01/24 | 138180 | systems/texlive/tlnet/archive/zxjatype.doc.r53500.tar.xz 2020/01/24 | 8760 | systems/texlive/tlnet/archive/zxjatype.r53500.tar.xz 2020/01/17 | 107147 | systems/texlive/tlnet/install-tl -2020/02/05 | 3949226 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/02/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/02/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/02/06 | 3949230 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/02/06 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/02/06 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2019/05/09 | 4543 | systems/texlive/tlnet/install-tl-windows.bat -2020/02/05 | 18698877 | systems/texlive/tlnet/install-tl-windows.exe -2020/02/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/02/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/02/05 | 22541603 | systems/texlive/tlnet/install-tl.zip -2020/02/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/02/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/02/06 | 18698845 | systems/texlive/tlnet/install-tl-windows.exe +2020/02/06 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/02/06 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/02/06 | 22541603 | systems/texlive/tlnet/install-tl.zip +2020/02/06 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/02/06 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2019/04/29 | 1221 | systems/texlive/tlnet/README.md 2019/03/13 | 5351 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -263029,12 +263215,12 @@ 2019/09/23 | 18176 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2016/10/11 | 4618 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2017/11/14 | 27560 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2020/02/05 | 16096800 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/02/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/02/06 | 16097295 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/02/06 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2019/12/10 | 87503 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2020/02/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/02/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/02/05 | 2160000 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/02/06 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/02/06 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/02/06 | 2162616 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2019/12/22 | 58727 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/01/17 | 40906 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2018/08/31 | 14972 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -266439,7 +266625,7 @@ 2020/02/04 | 281488 | systems/win32/miktex/tm/packages/filehook.tar.lzma 2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma 2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma -2020/02/05 | 526023 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/02/06 | 524347 | systems/win32/miktex/tm/packages/files.csv.lzma 2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma 2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma 2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma @@ -267532,8 +267718,8 @@ 2020/01/26 | 4527 | systems/win32/miktex/tm/packages/miktex-tex4ht.tar.lzma 2020/02/05 | 147408 | systems/win32/miktex/tm/packages/miktex-tex-bin-2.9.tar.lzma 2020/02/05 | 160756 | systems/win32/miktex/tm/packages/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/05 | 74381 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma -2020/02/05 | 84334 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/06 | 74372 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma +2020/02/06 | 84371 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma 2016/11/05 | 748 | systems/win32/miktex/tm/packages/miktex-texinfo.tar.lzma 2016/11/05 | 724 | systems/win32/miktex/tm/packages/miktex-tex.tar.lzma 2020/02/05 | 91227 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma @@ -267566,9 +267752,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2020/02/05 | 39183 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2020/02/05 | 42863 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2020/02/05 | 196162 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/02/05 | 1172430 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/02/05 | 1092090 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/02/06 | 196212 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/02/06 | 1172657 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/02/06 | 1093279 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2020/02/05 | 13048 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2020/02/05 | 14026 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma @@ -267633,7 +267819,7 @@ 2013/04/08 | 196636 | systems/win32/miktex/tm/packages/mpgraphics.tar.lzma 2008/05/14 | 857010 | systems/win32/miktex/tm/packages/mpman-ru.tar.lzma 2019/01/03 | 356531 | systems/win32/miktex/tm/packages/mpostinl.tar.lzma -2019/02/25 | 37256 | systems/win32/miktex/tm/packages/mptopdf.tar.lzma +2020/02/06 | 37288 | systems/win32/miktex/tm/packages/mptopdf.tar.lzma 2017/06/03 | 439743 | systems/win32/miktex/tm/packages/mptrees.tar.lzma 2008/06/10 | 431024 | systems/win32/miktex/tm/packages/msc.tar.lzma 2019/01/03 | 789714 | systems/win32/miktex/tm/packages/msg.tar.lzma @@ -267719,183 +267905,183 @@ 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2020/02/05 | 526025 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/02/05 | 29243 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/02/05 | 33364 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/02/05 | 935861 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/02/05 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/02/05 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2020/02/05 | 30741 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/02/05 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/02/05 | 34868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/02/05 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/02/05 | 57126 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/02/05 | 84720 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/02/05 | 94282 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/02/05 | 60291 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/02/05 | 67235 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/02/05 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/02/05 | 30232 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/02/05 | 328772 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/02/05 | 391584 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/02/05 | 32182 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2020/02/05 | 36397 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/02/05 | 49301 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/02/05 | 53967 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/02/05 | 199143 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2020/02/05 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/02/05 | 169440 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/02/05 | 184200 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/02/05 | 52118 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/02/05 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2020/02/05 | 20686 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/02/05 | 22933 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2020/02/05 | 450289 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2020/02/05 | 40947 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/02/05 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/02/05 | 272358 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/02/05 | 309679 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/02/05 | 40690 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2020/02/05 | 44928 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2020/02/05 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/02/05 | 130322 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2020/02/05 | 1249562 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2020/02/05 | 1381484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2020/02/05 | 33527 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/02/05 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/02/05 | 43429 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/02/05 | 47981 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/02/05 | 45464 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/02/05 | 50535 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2020/02/05 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/02/05 | 61674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/02/05 | 133125 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/02/05 | 152085 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/02/05 | 69635 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/02/05 | 72639 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/02/05 | 68638 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/02/05 | 77461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/02/05 | 246459 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/02/05 | 281547 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/02/05 | 25303 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/02/05 | 28742 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/02/05 | 100616 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2020/02/05 | 116764 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/02/05 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/02/05 | 72570 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/02/05 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/02/05 | 110867 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/02/05 | 57730 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/02/05 | 64417 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/02/05 | 457121 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/02/05 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/02/05 | 137213 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/02/05 | 149876 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/02/05 | 92881 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/02/05 | 108953 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/02/05 | 15892 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/02/05 | 17680 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/02/05 | 27780 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/02/05 | 29675 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2020/02/05 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/02/05 | 669504 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/02/05 | 498554 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/02/05 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2020/02/05 | 539502 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/02/05 | 576247 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/02/05 | 93431 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/02/05 | 102365 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/02/05 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/02/05 | 1938203 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/02/05 | 67262 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/02/05 | 73624 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/02/05 | 26925 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/02/05 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/02/05 | 7502 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/02/05 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/02/05 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/02/05 | 182742 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2020/02/05 | 247669 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/02/05 | 281236 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/02/05 | 87148 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/02/05 | 92018 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/02/05 | 77980 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/02/05 | 86622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/02/05 | 164885 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/02/05 | 185529 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2020/02/05 | 148964 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/02/05 | 168841 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/02/05 | 194911 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/02/05 | 177525 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2020/02/05 | 80368 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/02/05 | 91201 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/02/05 | 30993 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/02/05 | 34844 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/02/05 | 56414 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/02/05 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/02/05 | 41845 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/02/05 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/02/05 | 45588 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/02/05 | 52145 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/02/05 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma -2020/02/05 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma -2020/02/05 | 321847 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/02/05 | 356121 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/02/05 | 186772 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/02/05 | 193832 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/02/05 | 201991 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/02/05 | 237660 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/02/05 | 78005 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/02/05 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/02/05 | 932524 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/02/05 | 1043326 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/02/05 | 19798 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/02/05 | 23380 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2020/02/05 | 31150 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/02/05 | 36615 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2020/02/05 | 63182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/02/05 | 71726 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2020/02/05 | 42588 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/02/05 | 50747 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/02/05 | 1102204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/02/05 | 1229002 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2020/02/05 | 41837 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2020/02/05 | 50863 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/02/05 | 53384 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/02/05 | 59430 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/02/05 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2020/02/05 | 29120 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/02/05 | 16038 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/02/05 | 17754 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/02/05 | 63049 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/02/05 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/02/05 | 147164 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2020/02/05 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/05 | 74406 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/02/05 | 84410 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/02/05 | 91310 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/02/05 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/02/05 | 2457577 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/02/05 | 2581039 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/02/05 | 54878 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/02/05 | 61308 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2020/02/05 | 26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2020/02/05 | 32361 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/02/05 | 61607 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/02/05 | 65018 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/02/05 | 247150 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/02/05 | 276821 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/02/05 | 533701 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/02/05 | 563260 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/02/05 | 38795 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/02/05 | 42956 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/02/05 | 196293 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/02/05 | 1172134 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/02/05 | 1093231 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/02/05 | 13066 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/02/05 | 14058 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/02/06 | 524496 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/02/06 | 29244 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/02/06 | 33364 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/02/06 | 935863 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/02/06 | 1043544 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/02/06 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/02/06 | 30740 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/06 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/02/06 | 34868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/02/06 | 49682 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/02/06 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/02/06 | 84718 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/02/06 | 94281 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/02/06 | 60291 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/02/06 | 67236 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/02/06 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/02/06 | 30233 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/02/06 | 328773 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/02/06 | 391586 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/02/06 | 32181 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/02/06 | 36397 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/02/06 | 49304 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/02/06 | 53968 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/02/06 | 199143 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/02/06 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/02/06 | 169439 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/02/06 | 184204 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/02/06 | 52120 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/02/06 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/02/06 | 20686 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/02/06 | 22932 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/02/06 | 450289 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/02/06 | 40947 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/02/06 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/02/06 | 272357 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/02/06 | 309680 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/02/06 | 40690 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/02/06 | 44927 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/06 | 115485 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/02/06 | 130323 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/06 | 1249564 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/02/06 | 1381485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/02/06 | 33527 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/02/06 | 38842 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/02/06 | 43428 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/02/06 | 47980 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/02/06 | 45464 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/02/06 | 50535 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/02/06 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/02/06 | 61677 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/02/06 | 133124 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/02/06 | 152085 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/02/06 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/02/06 | 72637 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/02/06 | 68638 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/02/06 | 77461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/02/06 | 246460 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/02/06 | 281548 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/02/06 | 25304 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/02/06 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/02/06 | 100618 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/02/06 | 116763 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/02/06 | 63276 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/02/06 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/02/06 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/02/06 | 110867 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/02/06 | 57730 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/02/06 | 64417 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/02/06 | 457120 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/02/06 | 544257 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/02/06 | 137212 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/02/06 | 149875 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/02/06 | 92880 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/02/06 | 108952 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/02/06 | 15892 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/02/06 | 17680 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/02/06 | 27779 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/02/06 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/02/06 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/02/06 | 669504 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/02/06 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/02/06 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/02/06 | 539503 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/02/06 | 576247 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/02/06 | 93431 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/02/06 | 102364 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/02/06 | 1697673 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/02/06 | 1938204 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/02/06 | 67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/02/06 | 73625 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/02/06 | 26925 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/02/06 | 31251 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/06 | 7501 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/02/06 | 8464 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/02/06 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/02/06 | 182742 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/02/06 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/02/06 | 281236 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/02/06 | 87148 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/02/06 | 92017 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/02/06 | 77982 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/02/06 | 86622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/02/06 | 164887 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/02/06 | 185529 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/02/06 | 148964 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/02/06 | 168842 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/02/06 | 194910 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/02/06 | 177527 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/02/06 | 80370 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/02/06 | 91202 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/02/06 | 30993 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/02/06 | 34844 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/02/06 | 56418 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/02/06 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/02/06 | 41844 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/02/06 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/02/06 | 45588 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/02/06 | 52144 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/02/06 | 354458 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/02/06 | 387564 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/02/06 | 321847 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/02/06 | 356119 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/02/06 | 186771 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/02/06 | 193834 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/02/06 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/02/06 | 237659 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/06 | 78005 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/02/06 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/02/06 | 932525 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/02/06 | 1043326 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/02/06 | 19798 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/02/06 | 23378 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/06 | 31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/02/06 | 36613 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/02/06 | 63182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/02/06 | 71725 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/02/06 | 42590 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/02/06 | 50746 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/02/06 | 1102205 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/02/06 | 1229000 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/02/06 | 41836 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/02/06 | 50863 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/02/06 | 53385 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/02/06 | 59431 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/02/06 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/02/06 | 29117 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/02/06 | 16036 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/02/06 | 17753 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/02/06 | 63049 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/02/06 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/02/06 | 147164 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/02/06 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/02/06 | 74405 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/02/06 | 84411 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/06 | 91311 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/02/06 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/02/06 | 2457577 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/02/06 | 2581038 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/02/06 | 54877 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/02/06 | 61307 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/02/06 | 26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/02/06 | 32359 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/02/06 | 61606 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/02/06 | 65017 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/02/06 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/02/06 | 276820 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/02/06 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/02/06 | 563261 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/02/06 | 38796 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/02/06 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/02/06 | 196191 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/02/06 | 1173210 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/02/06 | 1093656 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/02/06 | 13067 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/02/06 | 14057 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma -2020/02/05 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2020/02/06 | 652 | systems/win32/miktex/tm/packages/next/pr.ini 2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma 2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma 2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma @@ -268169,7 +268355,7 @@ 2019/12/09 | 616892 | systems/win32/miktex/tm/packages/pmboxdraw.tar.lzma 2019/12/31 | 514305 | systems/win32/miktex/tm/packages/pmdb.tar.lzma 2008/11/07 | 139838 | systems/win32/miktex/tm/packages/pmgraph.tar.lzma -2020/02/05 | 772847 | systems/win32/miktex/tm/packages/pmhanguljamo.tar.lzma +2020/02/06 | 773748 | systems/win32/miktex/tm/packages/pmhanguljamo.tar.lzma 2018/01/22 | 615824 | systems/win32/miktex/tm/packages/pm-isomath.tar.lzma 2016/01/03 | 396227 | systems/win32/miktex/tm/packages/pmxchords.tar.lzma 2018/02/14 | 548653 | systems/win32/miktex/tm/packages/pmx.tar.lzma @@ -268207,7 +268393,7 @@ 2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma 2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma -2020/02/05 | 482 | systems/win32/miktex/tm/packages/pr.ini +2020/02/06 | 425 | systems/win32/miktex/tm/packages/pr.ini 2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma 2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma 2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma @@ -268494,7 +268680,7 @@ 2005/05/04 | 598648 | systems/win32/miktex/tm/packages/sanskrit.cab 2017/01/12 | 744460 | systems/win32/miktex/tm/packages/sanskrit-t1.tar.lzma 2017/01/12 | 935933 | systems/win32/miktex/tm/packages/sanskrit.tar.lzma -2020/02/02 | 169053 | systems/win32/miktex/tm/packages/sansmathaccent.tar.lzma +2020/02/06 | 169073 | systems/win32/miktex/tm/packages/sansmathaccent.tar.lzma 2019/06/11 | 4542285 | systems/win32/miktex/tm/packages/sansmathfonts.tar.lzma 2010/04/27 | 185726 | systems/win32/miktex/tm/packages/sansmath.tar.lzma 2018/08/08 | 248923 | systems/win32/miktex/tm/packages/sapthesis.tar.lzma @@ -268860,7 +269046,7 @@ 2019/07/29 | 528452 | systems/win32/miktex/tm/packages/theanooldstyle.tar.lzma 2017/09/21 | 125446 | systems/win32/miktex/tm/packages/theatre.tar.lzma 2013/05/23 | 337323 | systems/win32/miktex/tm/packages/theoremref.tar.lzma -2020/01/08 | 319386 | systems/win32/miktex/tm/packages/thesis-ekf.tar.lzma +2020/02/06 | 317745 | systems/win32/miktex/tm/packages/thesis-ekf.tar.lzma 2018/09/04 | 412892 | systems/win32/miktex/tm/packages/thesis-gwu.tar.lzma 2018/11/11 | 1423236 | systems/win32/miktex/tm/packages/thesis-qom.tar.lzma 2016/07/18 | 175742 | systems/win32/miktex/tm/packages/thesis.tar.lzma @@ -269332,13 +269518,13 @@ 2020/02/04 | 4936804 | systems/win32/w32tex/aleph-w32.tar.xz 2020/02/02 | 64233068 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2020/02/04 | 582633 | systems/win32/w32tex/ChangeLog +2020/02/05 | 583065 | systems/win32/w32tex/ChangeLog 2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0 2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1 2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2 2013/09/03 | 352299 | systems/win32/w32tex/ChangeLog.3 2017/06/24 | 644754 | systems/win32/w32tex/ChangeLog.4 -2020/02/03 | 22494836 | systems/win32/w32tex/cjkzr.tar.xz +2020/02/05 | 22458676 | systems/win32/w32tex/cjkzr.tar.xz 2013/04/27 | 15858676 | systems/win32/w32tex/context-doc.tar.xz 2020/02/03 | 139739260 | systems/win32/w32tex/context.tar.xz 2020/01/20 | 902564 | systems/win32/w32tex/cweb-w32.tar.xz @@ -269352,7 +269538,7 @@ 2020/01/20 | 17349048 | systems/win32/w32tex/gregorio-w32.tar.xz 2009/08/03 | 1072620 | systems/win32/w32tex/gtftex.zip 2020/02/04 | 1807480 | systems/win32/w32tex/jtex-w32.tar.xz -2020/02/04 | 41549016 | systems/win32/w32tex/latex-dev.tar.xz +2020/02/04 | 41552388 | systems/win32/w32tex/latex-dev.tar.xz 2020/02/04 | 30267284 | systems/win32/w32tex/latex.tar.xz 2020/01/20 | 996420 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz 2020/01/31 | 391398912 | systems/win32/w32tex/ltxpkgdocs.tar.xz @@ -269374,15 +269560,15 @@ 2020/02/03 | 1227768 | systems/win32/w32tex/omegaj-w32.tar.xz 2019/09/08 | 357888 | systems/win32/w32tex/otfbeta.tar.xz 2020/02/04 | 20533868 | systems/win32/w32tex/pdftex-w32.tar.xz -2020/02/04 | 82882728 | systems/win32/w32tex/pgfcontrib.tar.xz +2020/02/05 | 82903688 | systems/win32/w32tex/pgfcontrib.tar.xz 2015/01/26 | 189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz -2020/02/03 | 2955108 | systems/win32/w32tex/platex.tar.xz +2020/02/04 | 2959936 | systems/win32/w32tex/platex.tar.xz 2020/01/19 | 1468516 | systems/win32/w32tex/pmx.tar.xz 2020/01/20 | 1168532 | systems/win32/w32tex/pstoedit-w32.tar.xz 2020/01/30 | 284716996 | systems/win32/w32tex/pstricks.tar.xz 2020/01/20 | 517548 | systems/win32/w32tex/psutils-w32.tar.xz -2020/02/04 | 6344328 | systems/win32/w32tex/ptex-ng-w32.tar.xz -2020/02/04 | 9811276 | systems/win32/w32tex/ptex-w32.tar.xz +2020/02/04 | 6346472 | systems/win32/w32tex/ptex-ng-w32.tar.xz +2020/02/04 | 9813904 | systems/win32/w32tex/ptex-w32.tar.xz 2020/01/27 | 1760916 | systems/win32/w32tex/qpdf-w32.tar.xz 2019/04/15 | 499188 | systems/win32/w32tex/sam2p-w32.tar.xz 2020/01/24 | 24929772 | systems/win32/w32tex/t1fonts.tar.xz @@ -269402,12 +269588,12 @@ 2020/01/19 | 5856 | systems/win32/w32tex/txtutil.tar.xz 2013/04/08 | 71588 | systems/win32/w32tex/ums.tar.xz 2012/05/28 | 233472 | systems/win32/w32tex/unzip.exe -2020/02/04 | 8368412 | systems/win32/w32tex/uptex-w32.tar.xz +2020/02/04 | 8368924 | systems/win32/w32tex/uptex-w32.tar.xz 2013/04/08 | 722652 | systems/win32/w32tex/utf.tar.xz 2013/04/08 | 13748 | systems/win32/w32tex/vf-n2bk.tar.xz 2019/04/08 | 35478888 | systems/win32/w32tex/w32tex-src.tar.xz 2020/02/04 | 99038480 | systems/win32/w32tex/web2c-lib.tar.xz -2020/02/02 | 42982644 | systems/win32/w32tex/web2c-w32.tar.xz +2020/02/05 | 42993136 | systems/win32/w32tex/web2c-w32.tar.xz 2020/01/20 | 810476 | systems/win32/w32tex/win64/aleph-w64.tar.xz 2019/12/09 | 22317480 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz 2020/01/27 | 1943864 | systems/win32/w32tex/win64/context-w64.tar.xz @@ -269438,7 +269624,7 @@ 2020/01/18 | 551296 | systems/win32/w32tex/win64/pmx-w64.tar.xz 2020/01/20 | 789804 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz 2020/01/20 | 385896 | systems/win32/w32tex/win64/psutils-w64.tar.xz -2020/01/24 | 1680180 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz +2020/02/04 | 1680620 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz 2020/01/20 | 1871596 | systems/win32/w32tex/win64/ptex-w64.tar.xz 2020/01/18 | 40736 | systems/win32/w32tex/win64/t1utils-w64.tar.xz 2020/01/20 | 419528 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz @@ -269546,7 +269732,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2020/02/06 | 186 | timestamp +2020/02/07 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex 3b9c0ef2a7..5314ec1dae 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 02e09567cb..4b5be8c118 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,139 +1,1286 @@ +2020/02/06 | 992 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex +2020/02/06 | 988 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex +2020/02/06 | 978 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex +2020/02/06 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/02/06 | 9548 | fonts/step/tfm/STEP-BoldItalic-tosf-t1.tfm +2020/02/06 | 9544 | fonts/step/tfm/STEP-BoldItalic-tlf-t1.tfm +2020/02/06 | 95434 | support/autosp/Windows64bit/tex2aspc.exe +2020/02/06 | 950 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex +2020/02/06 | 950 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex +2020/02/06 | 945 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex +2020/02/06 | 94281 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/02/06 | 941 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex +2020/02/06 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/02/06 | 9384 | fonts/step/tfm/STEP-Regular-tosf-t1.tfm +2020/02/06 | 9384 | fonts/step/tfm/STEP-Regular-tlf-t1.tfm +2020/02/06 | 935863 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/02/06 | 93431 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/02/06 | 932525 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/02/06 | 92880 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/02/06 | 92707 | support/autosp/Windows64bit/rebar.exe +2020/02/06 | 920 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex +2020/02/06 | 92017 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/02/06 | 914 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex +2020/02/06 | 913 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex +2020/02/06 | 91311 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/02/06 | 91202 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/02/06 | 911 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex +2020/02/06 | 909 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex +2020/02/06 | 906 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex +2020/02/06 | 903 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex +2020/02/06 | 901 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex +2020/02/06 | 897 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex +2020/02/06 | 895 | fonts/step/latex/TS3STEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/TS3STEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/T2CSTEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/T2CSTEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/T2BSTEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/T2BSTEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/T2ASTEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/T2ASTEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/OT1STEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/OT1STEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/LY1STEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/LY1STEP-Dnom.fd +2020/02/06 | 895 | fonts/step/latex/LGRSTEP-Numr.fd +2020/02/06 | 895 | fonts/step/latex/LGRSTEP-Dnom.fd +2020/02/06 | 890 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex +2020/02/06 | 889 | fonts/step/latex/T3STEP-Numr.fd +2020/02/06 | 889 | fonts/step/latex/T3STEP-Dnom.fd +2020/02/06 | 889 | fonts/step/latex/T1STEP-Numr.fd +2020/02/06 | 889 | fonts/step/latex/T1STEP-Dnom.fd +2020/02/06 | 888 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex +2020/02/06 | 888 | fonts/step/latex/TS3STEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/T2CSTEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/T2BSTEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/T2ASTEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/OT1STEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/LY1STEP-Inf.fd +2020/02/06 | 888 | fonts/step/latex/LGRSTEP-Inf.fd +2020/02/06 | 886 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex +2020/02/06 | 885 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex +2020/02/06 | 882 | fonts/step/latex/T3STEP-Inf.fd +2020/02/06 | 882 | fonts/step/latex/T1STEP-Inf.fd +2020/02/06 | 881 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex +2020/02/06 | 881 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex +2020/02/06 | 8768 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm +2020/02/06 | 8768 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm +2020/02/06 | 87576 | systems/texlive/tlnet/archive/lualibs.doc.r53682.tar.xz +2020/02/06 | 87148 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/02/06 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/02/06 | 868 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex +2020/02/06 | 867 | support/cluttex/src/texrunner/shellutil.lua +2020/02/06 | 86622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/02/06 | 860 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex +2020/02/06 | 8602 | support/cluttex/src/texrunner/reruncheck.lua +2020/02/06 | 859 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex +2020/02/06 | 8572 | systems/texlive/tlnet/archive/lualibs.source.r53682.tar.xz +2020/02/06 | 856 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex +2020/02/06 | 852 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex +2020/02/06 | 849 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex +2020/02/06 | 84718 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/02/06 | 8464 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/02/06 | 844 | fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-tosf-lgr.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-tlf-lgr.vf +2020/02/06 | 844 | fonts/step/vf/STEP-Bold-sup-lgr.vf +2020/02/06 | 84411 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/06 | 84371 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma +2020/02/06 | 840 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex +2020/02/06 | 840 | fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf +2020/02/06 | 831 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex +2020/02/06 | 831 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex +2020/02/06 | 830 | support/cluttex/example/README.md +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-tosf-lgr.vf +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-tlf-lgr.vf +2020/02/06 | 828 | fonts/step/vf/STEP-Italic-sup-lgr.vf +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-tosf-lgr.vf +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-tlf-lgr.vf +2020/02/06 | 824 | fonts/step/vf/STEP-BoldItalic-sup-lgr.vf +2020/02/06 | 81 | macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx +2020/02/06 | 819 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex +2020/02/06 | 819 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex +2020/02/06 | 814 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex +2020/02/06 | 809 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex +2020/02/06 | 806981 | macros/latex/contrib/tkz/tkz-fct.zip +2020/02/06 | 805 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex +2020/02/06 | 803 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex +2020/02/06 | 80370 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/02/06 | 802 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex +2020/02/06 | 801 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex +2020/02/06 | 797 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex +2020/02/06 | 78872 | systems/texlive/tlnet/archive/bxjscls.source.r53684.tar.xz +2020/02/06 | 78721 | support/autosp/Windows32bit/tex2aspc.exe +2020/02/06 | 785 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex +2020/02/06 | 785 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex +2020/02/06 | 78455 | support/autosp/Windows32bit/rebar.exe +2020/02/06 | 78005 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/02/06 | 77982 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/02/06 | 77461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/02/06 | 773 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex +2020/02/06 | 773 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex +2020/02/06 | 773748 | systems/win32/miktex/tm/packages/pmhanguljamo.tar.lzma +2020/02/06 | 771877 | support/cluttex.zip +2020/02/06 | 769 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex +2020/02/06 | 759 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex +2020/02/06 | 7593 | support/cluttex/src/texrunner/isatty.lua +2020/02/06 | 757 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex +2020/02/06 | 757 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex +2020/02/06 | 7501 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/02/06 | 747 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex +2020/02/06 | 744 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex +2020/02/06 | 74471 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex +2020/02/06 | 7440 | systems/texlive/tlnet/archive/thesis-ekf.source.r53685.tar.xz +2020/02/06 | 74405 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/02/06 | 74372 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma +2020/02/06 | 7428 | fonts/step/tfm/STEP-Italic-tosf-ly1.tfm +2020/02/06 | 7428 | fonts/step/tfm/STEP-Italic-tlf-ly1.tfm +2020/02/06 | 742770 | macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf +2020/02/06 | 7384 | fonts/step/tfm/STEP-Bold-tosf-ly1.tfm +2020/02/06 | 7384 | fonts/step/tfm/STEP-Bold-tlf-ly1.tfm +2020/02/06 | 73625 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/02/06 | 733 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex +2020/02/06 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex +2020/02/06 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex +2020/02/06 | 730 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex +2020/02/06 | 72 | support/cluttex/example/include/sub.tex +2020/02/06 | 727 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex +2020/02/06 | 72637 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/02/06 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/02/06 | 7220 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1.tfm +2020/02/06 | 721 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex +2020/02/06 | 7216 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1.tfm +2020/02/06 | 721289 | support/autosp.zip +2020/02/06 | 720 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex +2020/02/06 | 718 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex +2020/02/06 | 71725 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/02/06 | 716749 | macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf +2020/02/06 | 7144 | fonts/step/tfm/STEP-Regular-tosf-ly1.tfm +2020/02/06 | 7144 | fonts/step/tfm/STEP-Regular-tlf-ly1.tfm +2020/02/06 | 707 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex +2020/02/06 | 70743 | macros/latex/contrib/euclideangeometry/euclideangeometry.dtx +2020/02/06 | 700 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex +2020/02/06 | 69 | support/cluttex/example/simple/main.tex +2020/02/06 | 69 | support/cluttex/example/include/sub2.tex +2020/02/06 | 69636 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/02/06 | 694 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex +2020/02/06 | 694 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex +2020/02/06 | 692 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex +2020/02/06 | 691 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex +2020/02/06 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/02/06 | 6904 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex +2020/02/06 | 689 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex +2020/02/06 | 687 | support/pmx/README +2020/02/06 | 68638 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/02/06 | 683 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex +2020/02/06 | 681 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex +2020/02/06 | 680 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex +2020/02/06 | 679 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex +2020/02/06 | 677 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex +2020/02/06 | 676 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex +2020/02/06 | 67263 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/02/06 | 67236 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/02/06 | 669504 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/02/06 | 664 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex +2020/02/06 | 661 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex +2020/02/06 | 660 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex +2020/02/06 | 659 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex +2020/02/06 | 659 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex +2020/02/06 | 652 | systems/win32/miktex/tm/packages/next/pr.ini +2020/02/06 | 65017 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/02/06 | 64 | macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx +2020/02/06 | 64 | macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx +2020/02/06 | 649 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex +2020/02/06 | 649 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex +2020/02/06 | 6486 | support/cluttex/src/texrunner/checkdriver.lua +2020/02/06 | 646 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex +2020/02/06 | 644 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex +2020/02/06 | 644 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex +2020/02/06 | 64417 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/02/06 | 640 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex +2020/02/06 | 63 | support/cluttex/example/include/path/to/file.tex +2020/02/06 | 635 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex +2020/02/06 | 63276 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/02/06 | 63182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/02/06 | 63049 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/02/06 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/02/06 | 628 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex +2020/02/06 | 627 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex +2020/02/06 | 6242 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex +2020/02/06 | 622 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex +2020/02/06 | 622 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex +2020/02/06 | 6227 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex +2020/02/06 | 619 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex +2020/02/06 | 616 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex +2020/02/06 | 61677 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/02/06 | 61606 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/02/06 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/02/06 | 61307 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/02/06 | 610 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex +2020/02/06 | 607 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex +2020/02/06 | 605 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex +2020/02/06 | 6046 | support/cluttex/build.lua +2020/02/06 | 602 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex +2020/02/06 | 60291 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/02/06 | 596 | fonts/step/vf/STEP-Regular-tosf-ts1.vf +2020/02/06 | 596 | fonts/step/vf/STEP-Regular-tlf-ts1.vf +2020/02/06 | 5959 | support/cluttex/src/texrunner/pathutil_windows.lua +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex +2020/02/06 | 594 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex +2020/02/06 | 59431 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/02/06 | 59216 | systems/texlive/tlnet/archive/thesis-ekf.r53685.tar.xz +2020/02/06 | 59176 | support/autosp/MacOSX/autosp +2020/02/06 | 590 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex +2020/02/06 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/02/06 | 586 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex +2020/02/06 | 5854 | fonts/step/doc/step-fonts.tex +2020/02/06 | 582 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex +2020/02/06 | 581 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex +2020/02/06 | 581 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex +2020/02/06 | 5807 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex +2020/02/06 | 578 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex +2020/02/06 | 577 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex +2020/02/06 | 57730 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/02/06 | 577110 | macros/latex/contrib/tkz/tkz-base.zip +2020/02/06 | 576247 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/02/06 | 575 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex +2020/02/06 | 572 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex +2020/02/06 | 57127 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/02/06 | 56 | support/cluttex/example/empty/main.tex +2020/02/06 | 567 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex +2020/02/06 | 567 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex +2020/02/06 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/02/06 | 564 | fonts/step/vf/STEP-Bold-tosf-ts1.vf +2020/02/06 | 564 | fonts/step/vf/STEP-Bold-tlf-ts1.vf +2020/02/06 | 56418 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/02/06 | 563 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex +2020/02/06 | 563261 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/02/06 | 562 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex +2020/02/06 | 561 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex +2020/02/06 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/02/06 | 559 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex +2020/02/06 | 559 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex +2020/02/06 | 558 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex +2020/02/06 | 558102 | macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf +2020/02/06 | 555 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex +2020/02/06 | 555 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex +2020/02/06 | 554 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex +2020/02/06 | 553244 | fonts/step/opentype/STEPMath-Regular.otf +2020/02/06 | 551 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex +2020/02/06 | 550 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex +2020/02/06 | 548 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex +2020/02/06 | 54877 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/02/06 | 547 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex +2020/02/06 | 5473 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex +2020/02/06 | 5463 | support/cluttex/src/texrunner/pathutil_unix.lua +2020/02/06 | 545 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex +2020/02/06 | 544257 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/02/06 | 543 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex +2020/02/06 | 543 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex +2020/02/06 | 542 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex +2020/02/06 | 542 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex +2020/02/06 | 540 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex +2020/02/06 | 539 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex +2020/02/06 | 53968 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/02/06 | 539503 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/02/06 | 536 | fonts/step/vf/STEP-BoldItalic-tosf-ts1.vf +2020/02/06 | 535 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex +2020/02/06 | 535165 | macros/latex/contrib/erw-l3.zip +2020/02/06 | 533 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex +2020/02/06 | 53385 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/02/06 | 533703 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/02/06 | 532 | fonts/step/vf/STEP-Italic-tosf-ts1.vf +2020/02/06 | 532 | fonts/step/vf/STEP-BoldItalic-tlf-ts1.vf +2020/02/06 | 532611 | macros/latex/contrib/erw-l3/erw-l3.pdf +2020/02/06 | 531 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex +2020/02/06 | 531 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex +2020/02/06 | 529 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex +2020/02/06 | 528 | fonts/step/vf/STEP-Italic-tlf-ts1.vf +2020/02/06 | 526 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex +2020/02/06 | 524 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex +2020/02/06 | 524496 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/02/06 | 524347 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/02/06 | 521 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex +2020/02/06 | 52144 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/02/06 | 52120 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/02/06 | 519 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex +2020/02/06 | 517 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex +2020/02/06 | 517 | fonts/step/README +2020/02/06 | 5163 | support/pmx/doc/pmx-install.tex +2020/02/06 | 5145 | support/autosp/doc/quod2.aspc +2020/02/06 | 512 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex +2020/02/06 | 510 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex +2020/02/06 | 50863 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/02/06 | 50746 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/02/06 | 506 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex +2020/02/06 | 505 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex +2020/02/06 | 505 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex +2020/02/06 | 5056 | support/cluttex/src/texrunner/tex_engine.lua +2020/02/06 | 50535 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/02/06 | 503 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex +2020/02/06 | 498553 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/02/06 | 49682 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/02/06 | 4962 | support/autosp/README +2020/02/06 | 49304 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/02/06 | 491 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex +2020/02/06 | 490 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex +2020/02/06 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/02/06 | 486 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex +2020/02/06 | 486 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex +2020/02/06 | 485 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex +2020/02/06 | 484 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex +2020/02/06 | 483 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex +2020/02/06 | 482 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex +2020/02/06 | 480 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex +2020/02/06 | 480 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex +2020/02/06 | 480358 | support/cluttex/doc/cluttex-ja.pdf +2020/02/06 | 47 | support/cluttex/example/minted/file.lua +2020/02/06 | 479 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex +2020/02/06 | 47980 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/02/06 | 476 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex +2020/02/06 | 475 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex +2020/02/06 | 4726 | support/cluttex/README.md +2020/02/06 | 470 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex +2020/02/06 | 469 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex +2020/02/06 | 469 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex +2020/02/06 | 4696 | support/cluttex/src/texrunner/option.lua +2020/02/06 | 468 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex +2020/02/06 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex +2020/02/06 | 463 | support/cluttex/doc/Makefile +2020/02/06 | 463 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex +2020/02/06 | 462 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex +2020/02/06 | 460 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex +2020/02/06 | 460 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex +2020/02/06 | 459 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex +2020/02/06 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/02/06 | 457 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex +2020/02/06 | 457 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex +2020/02/06 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/02/06 | 457120 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/02/06 | 456 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex +2020/02/06 | 456 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex +2020/02/06 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/02/06 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/02/06 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/02/06 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/02/06 | 455 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex +2020/02/06 | 45588 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/02/06 | 455029 | macros/latex/contrib/euclideangeometry/euclideangeometry.pdf +2020/02/06 | 454 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex +2020/02/06 | 45464 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/02/06 | 453 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex +2020/02/06 | 453 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex +2020/02/06 | 452 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex +2020/02/06 | 451 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex +2020/02/06 | 451 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex +2020/02/06 | 450 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex +2020/02/06 | 450289 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/02/06 | 449 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex +2020/02/06 | 449 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex +2020/02/06 | 44927 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/06 | 448 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex +2020/02/06 | 447 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex +2020/02/06 | 446 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex +2020/02/06 | 444 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex +2020/02/06 | 440 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex +2020/02/06 | 439 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex +2020/02/06 | 439 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex +2020/02/06 | 437 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex +2020/02/06 | 434 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex +2020/02/06 | 434 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex +2020/02/06 | 43463 | fonts/step/doc/step-fonts.pdf +2020/02/06 | 43428 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/02/06 | 433 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex +2020/02/06 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex +2020/02/06 | 431 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex +2020/02/06 | 429 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex +2020/02/06 | 42955 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/02/06 | 4288 | fonts/step/tfm/STEP-Italic-tosf-lgr.tfm +2020/02/06 | 4284 | fonts/step/tfm/STEP-Italic-tlf-lgr.tfm +2020/02/06 | 427 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex +2020/02/06 | 426 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex +2020/02/06 | 425 | systems/win32/miktex/tm/packages/pr.ini +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex +2020/02/06 | 425 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex +2020/02/06 | 42590 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/02/06 | 4240 | fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm +2020/02/06 | 4240 | fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm +2020/02/06 | 423 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex +2020/02/06 | 422 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex +2020/02/06 | 421 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex +2020/02/06 | 4212 | fonts/step/tfm/STEP-Regular-tosf-t2a.tfm +2020/02/06 | 4212 | fonts/step/tfm/STEP-Regular-tlf-t2a.tfm +2020/02/06 | 418 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex +2020/02/06 | 418 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex +2020/02/06 | 41844 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/02/06 | 41836 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/02/06 | 4180 | fonts/step/tfm/STEP-Italic-tosf-t2a.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-Italic-tlf-t2a.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr.tfm +2020/02/06 | 4180 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr.tfm +2020/02/06 | 417 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex +2020/02/06 | 416 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex +2020/02/06 | 416 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex +2020/02/06 | 415 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex +2020/02/06 | 414 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex +2020/02/06 | 414751 | macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf +2020/02/06 | 413 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex +2020/02/06 | 413 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex +2020/02/06 | 4130 | support/cluttex/src/texrunner/message.lua +2020/02/06 | 411 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex +2020/02/06 | 411 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex +2020/02/06 | 4112 | fonts/step/tfm/STEP-Regular-tosf-t3.tfm +2020/02/06 | 4112 | fonts/step/tfm/STEP-Regular-tlf-t3.tfm +2020/02/06 | 410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex +2020/02/06 | 410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex +2020/02/06 | 409 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex +2020/02/06 | 40947 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/02/06 | 408 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex +2020/02/06 | 4088 | fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm +2020/02/06 | 4088 | fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm +2020/02/06 | 407 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex +2020/02/06 | 406 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex +2020/02/06 | 40690 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/02/06 | 405 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex +2020/02/06 | 405 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex +2020/02/06 | 4056 | fonts/step/tfm/STEP-Regular-tosf-t2b.tfm +2020/02/06 | 4056 | fonts/step/tfm/STEP-Regular-tlf-t2b.tfm +2020/02/06 | 4052 | fonts/step/tfm/STEP-Bold-tosf-lgr.tfm +2020/02/06 | 4052 | fonts/step/tfm/STEP-Bold-tlf-lgr.tfm +2020/02/06 | 404 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex +2020/02/06 | 404 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex +2020/02/06 | 4048 | fonts/step/tfm/STEP-Regular-tosf-sc-t3.tfm +2020/02/06 | 4048 | fonts/step/tfm/STEP-Regular-tlf-sc-t3.tfm +2020/02/06 | 403 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex +2020/02/06 | 402 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex +2020/02/06 | 399 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex +2020/02/06 | 3992 | fonts/step/tfm/STEP-Italic-tosf-t2b.tfm +2020/02/06 | 3992 | fonts/step/tfm/STEP-Italic-tlf-t2b.tfm +2020/02/06 | 398 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex +2020/02/06 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex +2020/02/06 | 396 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex +2020/02/06 | 395 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex +2020/02/06 | 394 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex +2020/02/06 | 394 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex +2020/02/06 | 3949230 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/02/06 | 393 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex +2020/02/06 | 391586 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/02/06 | 390 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex +2020/02/06 | 389 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex +2020/02/06 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r53679.tar.xz +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex +2020/02/06 | 388 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex +2020/02/06 | 38842 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/02/06 | 3880 | fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm +2020/02/06 | 3880 | fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm +2020/02/06 | 387 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex +2020/02/06 | 38796 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/02/06 | 387564 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/02/06 | 3872 | fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm +2020/02/06 | 3872 | fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm +2020/02/06 | 38596 | systems/texlive/tlnet/archive/mptopdf.r53687.tar.xz +2020/02/06 | 384 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex +2020/02/06 | 3840 | fonts/step/tfm/STEP-Regular-tosf-t2c.tfm +2020/02/06 | 3840 | fonts/step/tfm/STEP-Regular-tlf-t2c.tfm +2020/02/06 | 383 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex +2020/02/06 | 382 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex +2020/02/06 | 381 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex +2020/02/06 | 380 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex +2020/02/06 | 379 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex +2020/02/06 | 377 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex +2020/02/06 | 377 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex +2020/02/06 | 375 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex +2020/02/06 | 375100 | fonts/step/type1/STEP-Regular.pfb +2020/02/06 | 374 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex +2020/02/06 | 373 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex +2020/02/06 | 372 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex +2020/02/06 | 372 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex +2020/02/06 | 37288 | systems/win32/miktex/tm/packages/mptopdf.tar.lzma +2020/02/06 | 371 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex +2020/02/06 | 370 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex +2020/02/06 | 37098 | macros/latex/contrib/erw-l3/erw-l3.dtx +2020/02/06 | 3684 | fonts/step/tfm/STEP-Italic-tosf-t2c.tfm +2020/02/06 | 3684 | fonts/step/tfm/STEP-Italic-tlf-t2c.tfm +2020/02/06 | 3680 | fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm +2020/02/06 | 367 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex +2020/02/06 | 367 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex +2020/02/06 | 3676 | fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Bold-tosf-t2a.tfm +2020/02/06 | 3672 | fonts/step/tfm/STEP-Bold-tlf-t2a.tfm +2020/02/06 | 366 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex +2020/02/06 | 3664 | fonts/step/tfm/STEP-Regular-tosf-lgr.tfm +2020/02/06 | 3664 | fonts/step/tfm/STEP-Regular-tlf-lgr.tfm +2020/02/06 | 36613 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex +2020/02/06 | 363 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex +2020/02/06 | 36397 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/02/06 | 361 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex +2020/02/06 | 360 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex +2020/02/06 | 356 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex +2020/02/06 | 356119 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/02/06 | 355 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex +2020/02/06 | 35572 | support/autosp/doc/quod2.pdf +2020/02/06 | 354458 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/02/06 | 353 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex +2020/02/06 | 3532 | fonts/step/tfm/STEP-Bold-tosf-t2b.tfm +2020/02/06 | 3532 | fonts/step/tfm/STEP-Bold-tlf-t2b.tfm +2020/02/06 | 35147 | support/cluttex/COPYING +2020/02/06 | 34868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/02/06 | 34844 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/02/06 | 347964 | systems/texlive/tlnet/archive/barracuda.doc.r53683.tar.xz +2020/02/06 | 346 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex +2020/02/06 | 345 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex +2020/02/06 | 344 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex +2020/02/06 | 3448 | fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm +2020/02/06 | 3444 | fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm +2020/02/06 | 343 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex +2020/02/06 | 342 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex +2020/02/06 | 341 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex +2020/02/06 | 341 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex +2020/02/06 | 340 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex +2020/02/06 | 3405 | support/cluttex/src/texrunner/luatexinit.lua +2020/02/06 | 339 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex +2020/02/06 | 339 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex +2020/02/06 | 338 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex +2020/02/06 | 338190 | macros/latex/contrib/metastr.zip +2020/02/06 | 337 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex +2020/02/06 | 337 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex +2020/02/06 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex +2020/02/06 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex +2020/02/06 | 33527 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/02/06 | 334 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex +2020/02/06 | 33364 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/02/06 | 332 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex +2020/02/06 | 33270 | support/autosp/doc/barsant2.pdf +2020/02/06 | 3321 | fonts/step/enc/a_gbbiod.enc +2020/02/06 | 331 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex +2020/02/06 | 3317 | fonts/step/enc/a_umr5bj.enc +2020/02/06 | 329 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex +2020/02/06 | 329 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex +2020/02/06 | 32944 | support/autosp/doc/kinder2.pdf +2020/02/06 | 3287 | fonts/step/enc/a_fha2fn.enc +2020/02/06 | 328773 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/02/06 | 3286 | fonts/step/enc/a_ylmzrw.enc +2020/02/06 | 3284 | fonts/step/enc/a_rx4otu.enc +2020/02/06 | 3276 | fonts/step/enc/a_ya3dy4.enc +2020/02/06 | 3276 | fonts/step/enc/a_oqx7v6.enc +2020/02/06 | 3276 | fonts/step/enc/a_kv7n4v.enc +2020/02/06 | 327624 | macros/latex/contrib/metastr/metastr.pdf +2020/02/06 | 3275 | fonts/step/enc/a_k7io4a.enc +2020/02/06 | 3275 | fonts/step/enc/a_bmbu3p.enc +2020/02/06 | 3272 | fonts/step/enc/a_tqaent.enc +2020/02/06 | 326 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex +2020/02/06 | 3266 | fonts/step/enc/a_bt7ykx.enc +2020/02/06 | 325 | support/cluttex/example/biblatex/foo.bib +2020/02/06 | 325 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex +2020/02/06 | 325 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex +2020/02/06 | 3258 | fonts/step/enc/a_ffybip.enc +2020/02/06 | 3258 | fonts/step/enc/a_4zqdxy.enc +2020/02/06 | 3257 | fonts/step/enc/a_tmbyhw.enc +2020/02/06 | 3256 | fonts/step/tfm/STEP-Bold-tosf-t2c.tfm +2020/02/06 | 3256 | fonts/step/tfm/STEP-Bold-tlf-t2c.tfm +2020/02/06 | 3254 | fonts/step/enc/a_fdcm6h.enc +2020/02/06 | 3253 | fonts/step/enc/a_f5fqnw.enc +2020/02/06 | 32532 | support/pmx/doc/ChangeLog +2020/02/06 | 3250 | fonts/step/enc/a_sycgav.enc +2020/02/06 | 3249 | fonts/step/enc/a_nm3vu2.enc +2020/02/06 | 3236352 | support/pmx.zip +2020/02/06 | 3235 | fonts/step/enc/a_lws4fe.enc +2020/02/06 | 32359 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/02/06 | 3221 | fonts/step/enc/a_tpegoz.enc +2020/02/06 | 3220 | fonts/step/enc/a_ccwxvq.enc +2020/02/06 | 321847 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/02/06 | 32181 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/02/06 | 3207 | fonts/step/enc/a_qqe53s.enc +2020/02/06 | 3205 | fonts/step/enc/a_v7z4fi.enc +2020/02/06 | 3204 | fonts/step/enc/a_q6ipx2.enc +2020/02/06 | 3203 | support/cluttex/src/texrunner/recovery.lua +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex +2020/02/06 | 319 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex +2020/02/06 | 3198 | fonts/step/enc/a_rgssq4.enc +2020/02/06 | 3192 | fonts/step/enc/a_np5cf6.enc +2020/02/06 | 3190 | fonts/step/enc/a_5xnggg.enc +2020/02/06 | 318 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex +2020/02/06 | 3189 | fonts/step/enc/a_bonk4u.enc +2020/02/06 | 3186 | fonts/step/enc/a_uip2yp.enc +2020/02/06 | 3185 | fonts/step/enc/a_gwrxgc.enc +2020/02/06 | 3184 | fonts/step/enc/a_hgebca.enc +2020/02/06 | 317 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex +2020/02/06 | 3179 | fonts/step/enc/a_7wspdk.enc +2020/02/06 | 317745 | systems/win32/miktex/tm/packages/thesis-ekf.tar.lzma +2020/02/06 | 3176 | fonts/step/enc/a_4h34hb.enc +2020/02/06 | 3172 | fonts/step/enc/a_knoumu.enc +2020/02/06 | 3164 | support/cluttex/example/epstopdf/fig/drawing2.eps +2020/02/06 | 3164 | support/cluttex/example/epstopdf/drawing.eps +2020/02/06 | 3143 | fonts/step/enc/a_p2lhbt.enc +2020/02/06 | 3143 | fonts/step/enc/a_lz3c5z.enc +2020/02/06 | 3142 | fonts/step/enc/a_ryuwvo.enc +2020/02/06 | 3142 | fonts/step/enc/a_6wpl7b.enc +2020/02/06 | 3140 | fonts/step/enc/a_kxamvp.enc +2020/02/06 | 313 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex +2020/02/06 | 31388 | systems/texlive/tlnet/archive/bxjscls.r53684.tar.xz +2020/02/06 | 312 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex +2020/02/06 | 31251 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/06 | 311 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex +2020/02/06 | 3118 | fonts/step/enc/a_mpy73s.enc +2020/02/06 | 3116 | fonts/step/enc/a_2b3rql.enc +2020/02/06 | 3115 | fonts/step/enc/a_jwptb5.enc +2020/02/06 | 3115 | fonts/step/enc/a_7jxw4d.enc +2020/02/06 | 31151 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/02/06 | 3114 | fonts/step/enc/a_lwp5cc.enc +2020/02/06 | 3114 | fonts/step/enc/a_7z23fd.enc +2020/02/06 | 3112 | fonts/step/enc/a_x67loa.enc +2020/02/06 | 310 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex +2020/02/06 | 3107 | fonts/step/enc/a_4mxykn.enc +2020/02/06 | 3107 | fonts/step/enc/a_2a2bfu.enc +2020/02/06 | 3106 | fonts/step/enc/a_ufgsbs.enc +2020/02/06 | 3106 | fonts/step/enc/a_evkz3b.enc +2020/02/06 | 3104 | fonts/step/enc/a_oxrcs3.enc +2020/02/06 | 30993 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/02/06 | 309680 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/02/06 | 3090 | fonts/step/enc/a_msql4j.enc +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex +2020/02/06 | 308 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex +2020/02/06 | 3088 | fonts/step/enc/a_gnavrk.enc +2020/02/06 | 3082 | fonts/step/enc/a_inbzfq.enc +2020/02/06 | 3080 | fonts/step/enc/a_e4dxwh.enc +2020/02/06 | 307 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex +2020/02/06 | 30740 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/06 | 306 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex +2020/02/06 | 306 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex +2020/02/06 | 3060 | fonts/step/enc/a_uda4d5.enc +2020/02/06 | 3060 | fonts/step/enc/a_mkgnjm.enc +2020/02/06 | 305 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex +2020/02/06 | 305 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex +2020/02/06 | 3059 | fonts/step/enc/a_w7y2wc.enc +2020/02/06 | 3053 | fonts/step/enc/a_xscnug.enc +2020/02/06 | 3052 | fonts/step/enc/a_vca5tb.enc +2020/02/06 | 3050 | fonts/step/enc/a_5mws5y.enc +2020/02/06 | 3026 | fonts/step/enc/a_l3q5ro.enc +2020/02/06 | 3026 | fonts/step/enc/a_bm4xhn.enc +2020/02/06 | 3026 | fonts/step/enc/a_a6xuhy.enc +2020/02/06 | 3025 | fonts/step/enc/a_kleesj.enc +2020/02/06 | 3025 | fonts/step/enc/a_dy6wlv.enc +2020/02/06 | 3024 | fonts/step/enc/a_47wiac.enc +2020/02/06 | 30233 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/02/06 | 3022 | fonts/step/enc/a_rcc5m6.enc +2020/02/06 | 3016 | fonts/step/enc/a_y3uxyj.enc +2020/02/06 | 3014 | fonts/step/enc/a_l3aktj.enc +2020/02/06 | 300 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex +2020/02/06 | 30052 | systems/texlive/tlnet/archive/barracuda.r53683.tar.xz +2020/02/06 | 3002 | fonts/step/enc/a_7if24z.enc +2020/02/06 | 3001 | fonts/step/enc/a_wzfdme.enc +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex +2020/02/06 | 299 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex +2020/02/06 | 2994 | fonts/step/enc/a_x7ixiy.enc +2020/02/06 | 2994 | fonts/step/enc/a_txv6lr.enc +2020/02/06 | 2994 | fonts/step/enc/a_lihfjg.enc +2020/02/06 | 2994 | fonts/step/enc/a_gz42of.enc +2020/02/06 | 2994 | fonts/step/enc/a_3rxxvm.enc +2020/02/06 | 2993 | fonts/step/enc/a_redus5.enc +2020/02/06 | 2993 | fonts/step/enc/a_psybls.enc +2020/02/06 | 2988 | fonts/step/enc/a_6auynr.enc +2020/02/06 | 297 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex +2020/02/06 | 2971 | fonts/step/enc/a_enu25g.enc +2020/02/06 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/02/06 | 296192 | fonts/step/opentype/STEP-Regular.otf +2020/02/06 | 293 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex +2020/02/06 | 2936 | fonts/step/enc/a_574n7u.enc +2020/02/06 | 2935 | fonts/step/enc/a_fwzjjs.enc +2020/02/06 | 29351 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex +2020/02/06 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/02/06 | 29244 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/02/06 | 291 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex +2020/02/06 | 29117 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/02/06 | 290 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex +2020/02/06 | 2905 | fonts/step/enc/a_euweyh.enc +2020/02/06 | 2904 | fonts/step/enc/a_hbts53.enc +2020/02/06 | 2904 | fonts/step/enc/a_6hfbmi.enc +2020/02/06 | 2903 | fonts/step/enc/a_uhrokn.enc +2020/02/06 | 2903 | fonts/step/enc/a_smrcla.enc +2020/02/06 | 2901 | fonts/step/enc/a_vzhqhy.enc +2020/02/06 | 289 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex +2020/02/06 | 288 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex +2020/02/06 | 2877 | fonts/step/enc/a_arx325.enc +2020/02/06 | 2875 | fonts/step/enc/a_xnivr2.enc +2020/02/06 | 28743 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/02/06 | 284 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex +2020/02/06 | 284 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex +2020/02/06 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/02/06 | 283 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex +2020/02/06 | 283 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex +2020/02/06 | 282 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex +2020/02/06 | 281548 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/02/06 | 281236 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/02/06 | 2811 | fonts/step/enc/a_vmnawy.enc +2020/02/06 | 2809 | fonts/step/enc/a_f2t6y6.enc +2020/02/06 | 277 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex +2020/02/06 | 277 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex +2020/02/06 | 27779 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/02/06 | 276820 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/02/06 | 272 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex +2020/02/06 | 272 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex +2020/02/06 | 272357 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/02/06 | 270 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex +2020/02/06 | 26925 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/02/06 | 268 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex +2020/02/06 | 268 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex +2020/02/06 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/02/06 | 266 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex +2020/02/06 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/02/06 | 2660 | fonts/step/tfm/STEP-Italic-tlf-ot1.tfm +2020/02/06 | 265 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex +2020/02/06 | 265 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex +2020/02/06 | 2656 | fonts/step/tfm/STEP-Italic-tosf-ot1.tfm +2020/02/06 | 26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/02/06 | 263 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex +2020/02/06 | 263 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex +2020/02/06 | 262 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex +2020/02/06 | 258 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex +2020/02/06 | 258 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex +2020/02/06 | 2581038 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/02/06 | 2580 | macros/latex/contrib/tkz/tkz-euclide/README +2020/02/06 | 2576 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm +2020/02/06 | 2576 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm +2020/02/06 | 256 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex +2020/02/06 | 2556 | fonts/step/tfm/STEP-BoldItalic-tosf-ot1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-Bold-tosf-ot1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-Bold-tlf-ot1.tfm +2020/02/06 | 2548 | fonts/step/tfm/STEP-BoldItalic-tlf-ot1.tfm +2020/02/06 | 25304 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/02/06 | 251 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex +2020/02/06 | 251 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex +2020/02/06 | 2518042 | fonts/step.zip +2020/02/06 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex +2020/02/06 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex +2020/02/06 | 250060 | systems/texlive/tlnet/archive/thesis-ekf.doc.r53685.tar.xz +2020/02/06 | 24 | support/cluttex/example/bibtex/sub.tex +2020/02/06 | 24 | support/cluttex/example/biblatex/sub.tex +2020/02/06 | 247 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex +2020/02/06 | 247670 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/02/06 | 247152 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/02/06 | 246 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex +2020/02/06 | 246460 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/02/06 | 2462 | support/cluttex/src/texrunner/auxfile.lua +2020/02/06 | 245 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex +2020/02/06 | 2457577 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/02/06 | 245508 | fonts/step/opentype/STEPMath-Bold.otf +2020/02/06 | 243 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex +2020/02/06 | 243 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex +2020/02/06 | 24283 | support/autosp/doc/quod2A.pdf +2020/02/06 | 2412 | fonts/step/tfm/STEP-Regular-tosf-ot1.tfm +2020/02/06 | 2412 | fonts/step/tfm/STEP-Regular-tlf-ot1.tfm +2020/02/06 | 2410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex +2020/02/06 | 240 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex +2020/02/06 | 240 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex +2020/02/06 | 239 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex +2020/02/06 | 238 | support/cluttex/example/makeindex/main.tex +2020/02/06 | 238 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex +2020/02/06 | 238 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex +2020/02/06 | 237 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex +2020/02/06 | 23766 | macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty +2020/02/06 | 237659 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/06 | 234 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex +2020/02/06 | 234 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex +2020/02/06 | 23378 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/06 | 23310 | support/cluttex/src/cluttex.lua +2020/02/06 | 231 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex +2020/02/06 | 230 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex +2020/02/06 | 22932 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/02/06 | 227 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex +2020/02/06 | 22541603 | systems/texlive/tlnet/install-tl.zip +2020/02/06 | 2252 | fonts/step/tfm/STEP-Italic-tosf-t3.tfm +2020/02/06 | 2252 | fonts/step/tfm/STEP-Italic-tlf-t3.tfm +2020/02/06 | 224 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex +2020/02/06 | 2243 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex +2020/02/06 | 2241 | fonts/step/latex/TS3STEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/T2CSTEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/T2BSTEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/T2ASTEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/OT1STEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/LY1STEP-TOsF.fd +2020/02/06 | 2241 | fonts/step/latex/LGRSTEP-TOsF.fd +2020/02/06 | 2228 | support/cluttex/src/texrunner/fsutil.lua +2020/02/06 | 2216 | fonts/step/tfm/STEP-Bold-tosf-t3.tfm +2020/02/06 | 2216 | fonts/step/tfm/STEP-Bold-tlf-t3.tfm +2020/02/06 | 2216 | fonts/step/latex/T3STEP-TOsF.fd +2020/02/06 | 2216 | fonts/step/latex/T1STEP-TOsF.fd +2020/02/06 | 220 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex +2020/02/06 | 2204 | fonts/step/latex/TS3STEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/T2CSTEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/T2BSTEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/T2ASTEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/OT1STEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/LY1STEP-TLF.fd +2020/02/06 | 2204 | fonts/step/latex/LGRSTEP-TLF.fd +2020/02/06 | 2200 | fonts/step/tfm/STEP-BoldItalic-tosf-t3.tfm +2020/02/06 | 2200 | fonts/step/tfm/STEP-BoldItalic-tlf-t3.tfm +2020/02/06 | 2179 | fonts/step/latex/T3STEP-TLF.fd +2020/02/06 | 2179 | fonts/step/latex/T1STEP-TLF.fd +2020/02/06 | 2162616 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/02/06 | 215 | support/cluttex/example/epstopdf/main.tex +2020/02/06 | 215 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex +2020/02/06 | 2156 | macros/latex/contrib/tkz/tkz-base/README +2020/02/06 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/02/06 | 21469 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex +2020/02/06 | 212 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex +2020/02/06 | 2090 | macros/latex/contrib/tkz/tkz-fct/README +2020/02/06 | 20686 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/02/06 | 2054 | fonts/step/latex/TS1STEP-TOsF.fd +2020/02/06 | 202 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex +2020/02/06 | 2021 | fonts/step/latex/TS3STEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/TS1STEP-TLF.fd +2020/02/06 | 2021 | fonts/step/latex/T2CSTEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/T2BSTEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/T2ASTEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/OT1STEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/LY1STEP-Sup.fd +2020/02/06 | 2021 | fonts/step/latex/LGRSTEP-Sup.fd +2020/02/06 | 201993 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/02/06 | 1999 | fonts/step/latex/T3STEP-Sup.fd +2020/02/06 | 1999 | fonts/step/latex/T1STEP-Sup.fd +2020/02/06 | 199143 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/02/06 | 19833 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex +2020/02/06 | 1980 | support/cluttex/src/texrunner/shellutil_unix.lua +2020/02/06 | 19804 | support/autosp/MacOSX/tex2aspc +2020/02/06 | 197 | support/cluttex/example/simple-ja/main-luatexja.tex +2020/02/06 | 19798 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/02/06 | 197868 | fonts/step/type1/STEP-Bold.pfb +2020/02/06 | 196212 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/02/06 | 196191 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/02/06 | 194910 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/02/06 | 19408 | support/autosp/MacOSX/rebar +2020/02/06 | 193834 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/02/06 | 1938204 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/02/06 | 19341 | fonts/step/map/STEP.map +2020/02/06 | 189022 | support/autosp/Windows64bit/autosp.exe +2020/02/06 | 1872 | fonts/step/tfm/STEP-Italic-sup-t2a.tfm +2020/02/06 | 18698845 | systems/texlive/tlnet/install-tl-windows.exe +2020/02/06 | 186771 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/02/06 | 185529 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/02/06 | 1852 | fonts/step/tfm/STEP-BoldItalic-sup-t2a.tfm +2020/02/06 | 184204 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/02/06 | 1840 | fonts/step/tfm/STEP-Italic-sup-t2b.tfm +2020/02/06 | 183 | support/cluttex/example/minted/main.tex +2020/02/06 | 182742 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/02/06 | 1812 | fonts/step/tfm/STEP-Italic-sup-t2c.tfm +2020/02/06 | 18061 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex +2020/02/06 | 1792 | fonts/step/tfm/STEP-BoldItalic-sup-t2b.tfm +2020/02/06 | 1790400 | systems/texlive/tlnet/archive/bxjscls.doc.r53684.tar.xz +2020/02/06 | 1788 | support/cluttex/src/texrunner/safename.lua +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-tosf-t3--base.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-tlf-t3--base.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-sup-t3.tfm +2020/02/06 | 1780 | fonts/step/tfm/STEP-Bold-sup-t3--base.tfm +2020/02/06 | 177 | support/cluttex/example/bibtex/baz.bib +2020/02/06 | 17753 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/02/06 | 177527 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/02/06 | 17680 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/02/06 | 1760 | fonts/step/tfm/STEP-BoldItalic-sup-t3.tfm +2020/02/06 | 1760 | fonts/step/tfm/STEP-BoldItalic-sup-t2c.tfm +2020/02/06 | 174976 | support/cluttex/doc/cluttex.pdf +2020/02/06 | 1744 | fonts/step/tfm/STEP-Italic-sup-t3.tfm +2020/02/06 | 173 | support/cluttex/example/include/main.tex +2020/02/06 | 1736 | fonts/step/tfm/STEP-Regular-tosf-t3--base.tfm +2020/02/06 | 1736 | fonts/step/tfm/STEP-Regular-tlf-t3--base.tfm +2020/02/06 | 1732 | fonts/step/vf/STEP-BoldItalic-tosf-t1.vf +2020/02/06 | 17301 | support/cluttex/doc/cluttex-ja.tex +2020/02/06 | 1728 | fonts/step/vf/STEP-Regular-tosf-t1.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-Regular-tlf-t1.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-Italic-tosf-t1.vf +2020/02/06 | 1728 | fonts/step/vf/STEP-BoldItalic-tlf-t1.vf +2020/02/06 | 1728 | fonts/step/tfm/STEP-Regular-tosf-sc-t3--base.tfm +2020/02/06 | 1728 | fonts/step/tfm/STEP-Regular-tlf-sc-t3--base.tfm +2020/02/06 | 1724 | fonts/step/vf/STEP-Regular-tosf-sc-t1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Regular-tlf-sc-t1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Italic-tlf-t1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Bold-tosf-t1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-Bold-tlf-t1.vf +2020/02/06 | 1724 | fonts/step/vf/STEP-BoldItalic-sup-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-sup-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-numr-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-inf-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Regular-dnom-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-Italic-sup-t1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-BoldItalic-tosf-ly1.vf +2020/02/06 | 1720 | fonts/step/vf/STEP-BoldItalic-tlf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Regular-tosf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Regular-tlf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Italic-tosf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Italic-tlf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Bold-tosf-ly1.vf +2020/02/06 | 1716 | fonts/step/vf/STEP-Bold-sup-t1.vf +2020/02/06 | 1712 | fonts/step/vf/STEP-Bold-tlf-ly1.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf +2020/02/06 | 1708 | fonts/step/vf/STEP-BoldItalic-sup-ly1.vf +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-sup-t3.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-sup-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-numr-t3.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-numr-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-inf-t3.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-inf-t3--base.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-dnom-t3.tfm +2020/02/06 | 1708 | fonts/step/tfm/STEP-Regular-dnom-t3--base.tfm +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-sup-ly1.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-numr-ly1.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-inf-ly1.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Regular-dnom-ly1.vf +2020/02/06 | 1704 | fonts/step/vf/STEP-Italic-sup-ly1.vf +2020/02/06 | 1700 | fonts/step/vf/STEP-Bold-sup-ly1.vf +2020/02/06 | 169 | support/cluttex/example/biblatex/main.tex +2020/02/06 | 1697673 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/02/06 | 169439 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/02/06 | 169073 | systems/win32/miktex/tm/packages/sansmathaccent.tar.lzma +2020/02/06 | 1688 | fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf +2020/02/06 | 1688 | fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf +2020/02/06 | 168842 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-tosf-lgr.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-tlf-lgr.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-sup-lgr.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-numr-lgr.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-inf-lgr.vf +2020/02/06 | 1684 | fonts/step/vf/STEP-Regular-dnom-lgr.vf +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-sup-t2a.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-numr-t2a.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-inf-t2a.tfm +2020/02/06 | 1680 | fonts/step/tfm/STEP-Regular-dnom-t2a.tfm +2020/02/06 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/02/06 | 1672 | fonts/step/tfm/STEP-Italic-sup-ly1.tfm +2020/02/06 | 1668 | fonts/step/tfm/STEP-Italic-sup-ly1--base.tfm +2020/02/06 | 1668 | fonts/step/tfm/STEP-Bold-sup-t2a.tfm +2020/02/06 | 166744 | fonts/step/opentype/STEP-Bold.otf +2020/02/06 | 1664 | fonts/step/tfm/STEP-Italic-sup-t1.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-tosf-ly1--base.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-tlf-ly1--base.tfm +2020/02/06 | 1656 | fonts/step/tfm/STEP-Italic-sup-t1--base.tfm +2020/02/06 | 1652 | macros/latex/contrib/euclideangeometry/README.txt +2020/02/06 | 1652 | fonts/step/tfm/STEP-BoldItalic-sup-lgr.tfm +2020/02/06 | 1648 | fonts/step/tfm/STEP-BoldItalic-sup-lgr--base.tfm +2020/02/06 | 164887 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-sup-t2b.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-numr-t2b.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-inf-t2b.tfm +2020/02/06 | 1644 | fonts/step/tfm/STEP-Regular-dnom-t2b.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-sup-t2c.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-numr-t2c.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-inf-t2c.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Regular-dnom-t2c.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Italic-tosf-t1--base.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-Italic-tlf-t1--base.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-BoldItalic-tosf-lgr--base.tfm +2020/02/06 | 1632 | fonts/step/tfm/STEP-BoldItalic-tlf-lgr--base.tfm +2020/02/06 | 1628 | fonts/step/tfm/STEP-Italic-sup-lgr.tfm +2020/02/06 | 1628 | fonts/step/tfm/STEP-BoldItalic-sup-ly1.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-Italic-sup-lgr--base.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-Bold-sup-t2b.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-t1.tfm +2020/02/06 | 1624 | fonts/step/tfm/STEP-BoldItalic-sup-ly1--base.tfm +2020/02/06 | 1620 | fonts/step/tfm/STEP-BoldItalic-tosf-ly1--base.tfm +2020/02/06 | 1616 | fonts/step/tfm/STEP-BoldItalic-tlf-ly1--base.tfm +2020/02/06 | 1616 | fonts/step/tfm/STEP-BoldItalic-sup-t1--base.tfm +2020/02/06 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/02/06 | 16097295 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/02/06 | 16058 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex +2020/02/06 | 160387 | fonts/step/type1/STEP-Italic.pfb +2020/02/06 | 16036 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/02/06 | 1600 | fonts/step/tfm/STEP-Italic-tosf-lgr--base.tfm +2020/02/06 | 1600 | fonts/step/tfm/STEP-BoldItalic-tosf-t1--base.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-Italic-tlf-lgr--base.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-Bold-sup-t2c.tfm +2020/02/06 | 1596 | fonts/step/tfm/STEP-BoldItalic-tlf-t1--base.tfm +2020/02/06 | 15892 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/02/06 | 158468 | systems/texlive/tlnet/archive/texlive-docindex.doc.r53679.tar.xz +2020/02/06 | 15481 | support/cluttex/src/texrunner/fswatcher_windows.lua +2020/02/06 | 1545 | support/cluttex/CHANGELOG.md +2020/02/06 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/02/06 | 1536 | fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm +2020/02/06 | 1536 | fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm +2020/02/06 | 153439 | support/autosp/Windows32bit/autosp.exe +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-numr-lgr.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-numr-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-dnom-lgr.tfm +2020/02/06 | 1532 | fonts/step/tfm/STEP-Regular-dnom-lgr--base.tfm +2020/02/06 | 15319 | support/cluttex/src/texrunner/handleoption.lua +2020/02/06 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/02/06 | 1528 | fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm +2020/02/06 | 1528 | fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tosf-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-tlf-ly1--base.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-numr-ly1.tfm +2020/02/06 | 1524 | fonts/step/tfm/STEP-Regular-dnom-ly1.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-sup-ly1.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-numr-ly1--base.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-inf-ly1.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Regular-dnom-ly1--base.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr.tfm +2020/02/06 | 1520 | fonts/step/tfm/STEP-Bold-sup-lgr--base.tfm +2020/02/06 | 152085 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/02/06 | 1516 | fonts/step/tfm/STEP-Regular-sup-ly1--base.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Regular-inf-ly1--base.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Bold-tosf-lgr--base.tfm +2020/02/06 | 1516 | fonts/step/tfm/STEP-Bold-tlf-lgr--base.tfm +2020/02/06 | 151006 | fonts/step/type1/STEP-BoldItalic.pfb +2020/02/06 | 149 | support/cluttex/example/bibtex/foo.bib +2020/02/06 | 149875 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-sup-t1.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-numr-t1.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-inf-t1.tfm +2020/02/06 | 1496 | fonts/step/tfm/STEP-Regular-dnom-t1.tfm +2020/02/06 | 148964 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-sup-t1--base.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-numr-t1--base.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-inf-t1--base.tfm +2020/02/06 | 1488 | fonts/step/tfm/STEP-Regular-dnom-t1--base.tfm +2020/02/06 | 1484 | fonts/step/tfm/STEP-Regular-tosf-t1--base.tfm +2020/02/06 | 1484 | fonts/step/tfm/STEP-Regular-tlf-t1--base.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-tosf-ly1--base.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-tlf-ly1--base.tfm +2020/02/06 | 1472 | fonts/step/tfm/STEP-Bold-sup-ly1.tfm +2020/02/06 | 147164 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/02/06 | 1468 | fonts/step/tfm/STEP-Bold-sup-ly1--base.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm +2020/02/06 | 1460 | fonts/step/tfm/STEP-Bold-sup-t1.tfm +2020/02/06 | 146034 | support/autosp/doc/geminiani.pdf +2020/02/06 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/02/06 | 1452 | fonts/step/vf/STEP-Regular-tosf-t3.vf +2020/02/06 | 1452 | fonts/step/vf/STEP-Regular-tlf-t3.vf +2020/02/06 | 1452 | fonts/step/tfm/STEP-Bold-sup-t1--base.tfm +2020/02/06 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/02/06 | 1444 | fonts/step/tfm/STEP-Bold-tosf-t1--base.tfm +2020/02/06 | 1444 | fonts/step/tfm/STEP-Bold-tlf-t1--base.tfm +2020/02/06 | 1440 | fonts/step/tfm/STEP-Italic-tosf-ts1.tfm +2020/02/06 | 1440 | fonts/step/tfm/STEP-Italic-tlf-ts1.tfm +2020/02/06 | 1436 | fonts/step/tfm/STEP-Regular-tosf-ts1.tfm +2020/02/06 | 1436 | fonts/step/tfm/STEP-Regular-tlf-ts1.tfm +2020/02/06 | 143362 | support/autosp/source/autosp-2020-02-06.tar.gz +2020/02/06 | 1432 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1.tfm +2020/02/06 | 1432 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1.tfm +2020/02/06 | 1420 | fonts/step/tfm/STEP-Bold-tosf-ts1.tfm +2020/02/06 | 1420 | fonts/step/tfm/STEP-Bold-tlf-ts1.tfm +2020/02/06 | 1416 | fonts/step/vf/STEP-Bold-tosf-t3.vf +2020/02/06 | 1416 | fonts/step/vf/STEP-Bold-tlf-t3.vf +2020/02/06 | 1412 | fonts/step/vf/STEP-Regular-tosf-sc-t3.vf +2020/02/06 | 1412 | fonts/step/vf/STEP-Regular-tlf-sc-t3.vf +2020/02/06 | 1412 | fonts/step/tfm/STEP-Regular-tosf-ts1--base.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Regular-tlf-ts1--base.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Italic-tosf-ts1--base.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Italic-tlf-ts1--base.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Bold-tosf-ts3.tfm +2020/02/06 | 1412 | fonts/step/tfm/STEP-Bold-tlf-ts3.tfm +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-sup-t3.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-numr-t3.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-inf-t3.vf +2020/02/06 | 1408 | fonts/step/vf/STEP-Regular-dnom-t3.vf +2020/02/06 | 14057 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/02/06 | 1404 | fonts/step/tfm/STEP-BoldItalic-tosf-ts1--base.tfm +2020/02/06 | 1404 | fonts/step/tfm/STEP-BoldItalic-tlf-ts1--base.tfm +2020/02/06 | 1392 | fonts/step/tfm/STEP-Bold-tosf-ts1--base.tfm +2020/02/06 | 1392 | fonts/step/tfm/STEP-Bold-tlf-ts1--base.tfm +2020/02/06 | 1388 | fonts/step/tfm/STEP-Regular-tosf-ts3.tfm +2020/02/06 | 1388 | fonts/step/tfm/STEP-Regular-tlf-ts3.tfm +2020/02/06 | 1381 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex +2020/02/06 | 1381531 | macros/latex/contrib/tkz/tkz-euclide.zip +2020/02/06 | 1381485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/02/06 | 137 | support/cluttex/example/bibtex/main.tex +2020/02/06 | 137212 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/02/06 | 1370 | support/cluttex/src/texrunner/shellutil_windows.lua +2020/02/06 | 1368 | fonts/step/vf/STEP-Bold-sup-t3.vf +2020/02/06 | 1362 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex +2020/02/06 | 13556 | systems/texlive/tlnet/archive/mptopdf.doc.r53687.tar.xz +2020/02/06 | 1352 | fonts/step/tfm/STEP-Regular-tosf-sc-ts3.tfm +2020/02/06 | 1352 | fonts/step/tfm/STEP-Regular-tlf-sc-ts3.tfm +2020/02/06 | 1347 | macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex +2020/02/06 | 1336 | fonts/step/tfm/STEP-BoldItalic-tosf-ts3.tfm +2020/02/06 | 1336 | fonts/step/tfm/STEP-BoldItalic-tlf-ts3.tfm +2020/02/06 | 133124 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/02/06 | 132912 | fonts/step/opentype/STEP-Italic.otf +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-sup-ts3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-numr-ts3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-inf-ts3.tfm +2020/02/06 | 1320 | fonts/step/tfm/STEP-Regular-dnom-ts3.tfm +2020/02/06 | 1316 | fonts/step/tfm/STEP-Bold-sup-ts3.tfm +2020/02/06 | 13067 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/02/06 | 130323 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/06 | 12914 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex +2020/02/06 | 126 | support/cluttex/example/simple-ja/main-platex.tex +2020/02/06 | 126224 | fonts/step/opentype/STEP-BoldItalic.otf +2020/02/06 | 1260 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex +2020/02/06 | 1260 | fonts/step/tfm/STEP-Italic-tosf-ts3.tfm +2020/02/06 | 1260 | fonts/step/tfm/STEP-Italic-tlf-ts3.tfm +2020/02/06 | 1249 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex +2020/02/06 | 1249564 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/02/06 | 1246 | support/cluttex/checkglobal.lua +2020/02/06 | 12362 | support/cluttex/doc/cluttex.tex +2020/02/06 | 1232 | fonts/step/tfm/STEP-BoldItalic-sup-ot1.tfm +2020/02/06 | 1229000 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/02/06 | 1224 | fonts/step/tfm/STEP-Italic-sup-ot1.tfm +2020/02/06 | 120980 | systems/texlive/tlnet/archive/lualibs.r53682.tar.xz +2020/02/06 | 1200 | fonts/step/tfm/STEP-BoldItalic-sup-ts3.tfm +2020/02/06 | 11980 | fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm +2020/02/06 | 11980 | fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm +2020/02/06 | 1192 | fonts/step/tfm/STEP-Italic-sup-ts3.tfm +2020/02/06 | 1173210 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/02/06 | 1172657 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/02/06 | 116763 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/02/06 | 115485 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/02/06 | 115068 | support/cluttex/bin/cluttex.bat +2020/02/06 | 115040 | support/cluttex/bin/cluttex +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-sup-ot1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-numr-ot1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-inf-ot1.tfm +2020/02/06 | 1112 | fonts/step/tfm/STEP-Regular-dnom-ot1.tfm +2020/02/06 | 110867 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/02/06 | 1102205 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/02/06 | 1096 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex +2020/02/06 | 1093656 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/02/06 | 1093279 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/02/06 | 108952 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/02/06 | 1088 | fonts/step/tfm/STEP-Bold-sup-ot1.tfm +2020/02/06 | 108463 | support/pmx/doc/pmx-install.pdf +2020/02/06 | 1075 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex +2020/02/06 | 1064 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex +2020/02/06 | 1064 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex +2020/02/06 | 105694 | macros/latex/contrib/metastr/metastr.dtx +2020/02/06 | 1053396 | macros/latex/contrib/euclideangeometry.zip +2020/02/06 | 1051 | support/cluttex/src/texrunner/pathutil.lua +2020/02/06 | 1043544 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/02/06 | 1043326 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/02/06 | 1032 | support/cluttex/Makefile +2020/02/06 | 10292 | macros/latex/contrib/tkz-doc.zip +2020/02/06 | 10260 | fonts/step/tfm/STEP-Italic-tosf-t1.tfm +2020/02/06 | 10260 | fonts/step/tfm/STEP-Italic-tlf-t1.tfm +2020/02/06 | 102364 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/02/06 | 1009 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex +2020/02/06 | 1006 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex +2020/02/06 | 100618 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/02/06 | 10020 | fonts/step/tfm/STEP-Bold-tosf-t1.tfm +2020/02/06 | 10020 | fonts/step/tfm/STEP-Bold-tlf-t1.tfm +2020/02/06 | 1000 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex 2020/02/05 | 9927616 | systems/texlive/tlnet/archive/l3kernel.doc.r53673.tar.xz 2020/02/05 | 973972 | systems/texlive/tlnet/archive/circuitikz.doc.r53667.tar.xz -2020/02/05 | 96207 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma 2020/02/05 | 96126 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma 2020/02/05 | 94452 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-2.9.tar.lzma -2020/02/05 | 94282 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma 2020/02/05 | 94253 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/02/05 | 94007 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma 2020/02/05 | 938367 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-2.9.tar.lzma -2020/02/05 | 935861 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma 2020/02/05 | 93479 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma -2020/02/05 | 93431 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/02/05 | 932524 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma 2020/02/05 | 932499 | systems/win32/miktex/tm/packages/miktex-poppler-bin-2.9.tar.lzma 2020/02/05 | 92901 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-2.9.tar.lzma -2020/02/05 | 92881 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma 2020/02/05 | 92237 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma -2020/02/05 | 92018 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/02/05 | 91310 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma 2020/02/05 | 91227 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma -2020/02/05 | 91201 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma 2020/02/05 | 91111 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/02/05 | 9005 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex 2020/02/05 | 8817269 | systems/win32/miktex/tm/packages/reledmac.tar.lzma 2020/02/05 | 87273 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma -2020/02/05 | 87148 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/02/05 | 87136 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma 2020/02/05 | 87105 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma -2020/02/05 | 86622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/02/05 | 8690 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex 2020/02/05 | 86547 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-x64-2.9.tar.lzma 2020/02/05 | 8553780 | systems/texlive/tlnet/archive/reledmac.doc.r53675.tar.xz 2020/02/05 | 84847 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/02/05 | 84720 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/02/05 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma 2020/02/05 | 8451 | systems/win32/miktex/tm/packages/miktex-md5-bin-x64-2.9.tar.lzma -2020/02/05 | 84410 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/02/05 | 84334 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma 2020/02/05 | 832537 | language/korean/pmhanguljamo.zip +2020/02/05 | 82903688 | systems/win32/w32tex/pgfcontrib.tar.xz +2020/02/05 | 8102 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex 2020/02/05 | 80464 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-2.9.tar.lzma -2020/02/05 | 80368 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/02/05 | 78005 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma 2020/02/05 | 78002 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-2.9.tar.lzma 2020/02/05 | 77990 | systems/win32/miktex/tm/packages/miktex-png-bin-2.9.tar.lzma -2020/02/05 | 77980 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/02/05 | 77461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma 2020/02/05 | 77370 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/02/05 | 772847 | systems/win32/miktex/tm/packages/pmhanguljamo.tar.lzma 2020/02/05 | 771002 | systems/win32/miktex/tm/packages/l3build.tar.lzma +2020/02/05 | 7682 | macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg 2020/02/05 | 767329 | systems/win32/miktex/tm/packages/l3backend.tar.lzma 2020/02/05 | 756 | systems/texlive/tlnet/archive/collection-latexrecommended.r53677.tar.xz -2020/02/05 | 7502 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma 2020/02/05 | 7473 | systems/win32/miktex/tm/packages/miktex-md5-bin-2.9.tar.lzma 2020/02/05 | 746586 | systems/win32/miktex/tm/packages/texosquery.tar.lzma -2020/02/05 | 74406 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/02/05 | 74381 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma -2020/02/05 | 73624 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma 2020/02/05 | 73612 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma 2020/02/05 | 729015 | language/japanese/BX/bxjscls/bxjscls-manual.pdf 2020/02/05 | 72778 | systems/win32/miktex/tm/packages/miktex-fonts-bin-x64-2.9.tar.lzma 2020/02/05 | 727672 | systems/texlive/tlnet/archive/l3backend.doc.r53673.tar.xz -2020/02/05 | 72639 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/02/05 | 72570 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma 2020/02/05 | 72505 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-x64-2.9.tar.lzma 2020/02/05 | 719560 | systems/texlive/tlnet/archive/l3build.doc.r53673.tar.xz -2020/02/05 | 71726 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma 2020/02/05 | 71605 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-x64-2.9.tar.lzma 2020/02/05 | 71404 | systems/texlive/tlnet/archive/texosquery.source.r53676.tar.xz -2020/02/05 | 69635 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma 2020/02/05 | 69577 | systems/win32/miktex/tm/packages/miktex-fonts-bin-2.9.tar.lzma -2020/02/05 | 69183 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma 2020/02/05 | 69178 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma 2020/02/05 | 68700 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-2.9.tar.lzma -2020/02/05 | 68638 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma 2020/02/05 | 684040 | systems/texlive/tlnet/archive/pmhanguljamo.doc.r53664.tar.xz 2020/02/05 | 67281 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/02/05 | 67262 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma 2020/02/05 | 67251 | systems/win32/miktex/tm/packages/miktex-lzma-bin-2.9.tar.lzma -2020/02/05 | 67235 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma 2020/02/05 | 669947 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/02/05 | 669504 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/02/05 | 652 | systems/win32/miktex/tm/packages/next/pr.ini 2020/02/05 | 652 | systems/texlive/tlnet/archive/collection-latex.r53677.tar.xz -2020/02/05 | 65018 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma 2020/02/05 | 65018 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma 2020/02/05 | 64808 | systems/texlive/tlnet/archive/l3packages.source.r53673.tar.xz -2020/02/05 | 64417 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma 2020/02/05 | 64347 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/02/05 | 63277 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma 2020/02/05 | 63274 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-2.9.tar.lzma 2020/02/05 | 63270 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-2.9.tar.lzma -2020/02/05 | 63182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/02/05 | 63049 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma 2020/02/05 | 63002 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-2.9.tar.lzma -2020/02/05 | 62914 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma 2020/02/05 | 62815 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/02/05 | 61674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/02/05 | 6212 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex 2020/02/05 | 61669 | systems/win32/miktex/tm/packages/miktex-fmt-bin-x64-2.9.tar.lzma -2020/02/05 | 61607 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma 2020/02/05 | 615875 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/02/05 | 615428 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma 2020/02/05 | 61512 | systems/win32/miktex/tm/packages/miktex-web-bin-2.9.tar.lzma -2020/02/05 | 61308 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma 2020/02/05 | 60803 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-x64-2.9.tar.lzma 2020/02/05 | 604 | systems/texlive/tlnet/archive/latex-bin-dev.r53677.tar.xz 2020/02/05 | 60326 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma -2020/02/05 | 60291 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma 2020/02/05 | 599800 | systems/texlive/tlnet/archive/acro.doc.r53670.tar.xz -2020/02/05 | 59430 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma 2020/02/05 | 59416 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/02/05 | 58862 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma 2020/02/05 | 58798 | systems/win32/miktex/tm/packages/miktex-cweb-bin-x64-2.9.tar.lzma +2020/02/05 | 583065 | systems/win32/w32tex/ChangeLog 2020/02/05 | 57761 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma -2020/02/05 | 57730 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/02/05 | 576247 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma 2020/02/05 | 574750 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-x64-2.9.tar.lzma 2020/02/05 | 57177 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/02/05 | 57126 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma 2020/02/05 | 5688 | systems/texlive/tlnet/archive/physconst.r53674.tar.xz -2020/02/05 | 56734 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma 2020/02/05 | 56676 | systems/win32/miktex/tm/packages/miktex-fmt-bin-2.9.tar.lzma -2020/02/05 | 56414 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma 2020/02/05 | 56411 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-2.9.tar.lzma -2020/02/05 | 563260 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma 2020/02/05 | 563237 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma 2020/02/05 | 561195 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma -2020/02/05 | 560983 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma 2020/02/05 | 56018 | systems/win32/miktex/tm/packages/dvips.tar.lzma 2020/02/05 | 54888 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/02/05 | 54878 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma 2020/02/05 | 545364 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/02/05 | 544258 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma 2020/02/05 | 54046 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/02/05 | 53967 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/02/05 | 539502 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma 2020/02/05 | 539316 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-2.9.tar.lzma -2020/02/05 | 53384 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/02/05 | 533701 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma 2020/02/05 | 533546 | systems/win32/miktex/tm/packages/miktex-yap-bin-2.9.tar.lzma 2020/02/05 | 53335 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-2.9.tar.lzma 2020/02/05 | 532 | systems/texlive/tlnet/archive/latex-bin.r53677.tar.xz @@ -141,315 +1288,191 @@ 2020/02/05 | 532188 | language/korean/pmhanguljamo/doc/pmhanguljamo-kdoc.pdf 2020/02/05 | 52976 | systems/texlive/tlnet/archive/reledmac.r53675.tar.xz 2020/02/05 | 529172 | systems/texlive/tlnet/archive/l3kernel.source.r53673.tar.xz -2020/02/05 | 526025 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/02/05 | 526023 | systems/win32/miktex/tm/packages/files.csv.lzma -2020/02/05 | 52145 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma 2020/02/05 | 52143 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/02/05 | 52118 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma 2020/02/05 | 52022 | systems/win32/miktex/tm/packages/miktex-cweb-bin-2.9.tar.lzma 2020/02/05 | 51023 | language/korean/pmhanguljamo/doc/pmhanguljamo-kdoc.tex 2020/02/05 | 50900 | systems/win32/miktex/tm/packages/miktex-psutils-bin-x64-2.9.tar.lzma -2020/02/05 | 50863 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma 2020/02/05 | 50836 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma -2020/02/05 | 50747 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/02/05 | 50535 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma 2020/02/05 | 50530 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-x64-2.9.tar.lzma 2020/02/05 | 503224 | systems/texlive/tlnet/archive/texosquery.doc.r53676.tar.xz 2020/02/05 | 502258 | systems/win32/miktex/doc/2.9/miktex.pdf 2020/02/05 | 4988 | language/japanese/BX/bxjscls/README.md 2020/02/05 | 498694 | systems/win32/miktex/tm/packages/miktex-libressl-bin-2.9.tar.lzma -2020/02/05 | 498554 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma 2020/02/05 | 49733 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-2.9.tar.lzma -2020/02/05 | 49684 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma 2020/02/05 | 49308 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-2.9.tar.lzma -2020/02/05 | 49301 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/02/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2020/02/05 | 482 | systems/win32/miktex/tm/packages/pr.ini 2020/02/05 | 4806 | systems/win32/miktex/tm/packages/miktex-config-2.9.tar.lzma -2020/02/05 | 47981 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma 2020/02/05 | 47969 | systems/win32/miktex/tm/packages/miktex-expat-bin-x64-2.9.tar.lzma -2020/02/05 | 45817 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/02/05 | 4598 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex 2020/02/05 | 45808 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-x64-2.9.tar.lzma 2020/02/05 | 457907 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-2.9.tar.lzma -2020/02/05 | 45751 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/02/05 | 457121 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma 2020/02/05 | 45688 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-x64-2.9.tar.lzma 2020/02/05 | 45602 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-2.9.tar.lzma -2020/02/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/02/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2020/02/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/02/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc -2020/02/05 | 45588 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/02/05 | 45464 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma 2020/02/05 | 45437 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-2.9.tar.lzma -2020/02/05 | 450289 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma 2020/02/05 | 450099 | systems/win32/miktex/tm/packages/miktex-doc-2.9.tar.lzma -2020/02/05 | 44928 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2020/02/05 | 44871 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/02/05 | 4452 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex 2020/02/05 | 44100 | systems/texlive/tlnet/archive/chemmacros.r53665.tar.xz -2020/02/05 | 43429 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma 2020/02/05 | 43376 | systems/win32/miktex/tm/packages/miktex-expat-bin-2.9.tar.lzma +2020/02/05 | 42993136 | systems/win32/w32tex/web2c-w32.tar.xz 2020/02/05 | 4296 | systems/texlive/tlnet/archive/tokcycle.r53669.tar.xz -2020/02/05 | 42956 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma 2020/02/05 | 42863 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2020/02/05 | 42588 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma 2020/02/05 | 42571 | systems/win32/miktex/tm/packages/miktex-psutils-bin-2.9.tar.lzma 2020/02/05 | 41876 | systems/win32/miktex/tm/packages/miktex-synctex-bin-2.9.tar.lzma 2020/02/05 | 41869 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-2.9.tar.lzma -2020/02/05 | 41845 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/02/05 | 41837 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2020/02/05 | 40947 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma 2020/02/05 | 40920 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma -2020/02/05 | 40690 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma 2020/02/05 | 40561 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-2.9.tar.lzma -2020/02/05 | 3949226 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/02/05 | 4027 | macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex +2020/02/05 | 4006 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex 2020/02/05 | 39183 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma -2020/02/05 | 391584 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma 2020/02/05 | 391463 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma -2020/02/05 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r53663.tar.xz -2020/02/05 | 38843 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma 2020/02/05 | 38842 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/02/05 | 38795 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/02/05 | 387565 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma 2020/02/05 | 387416 | systems/win32/miktex/tm/packages/miktex-omega-bin-x64-2.9.tar.lzma 2020/02/05 | 386075 | systems/win32/miktex/tm/packages/barracuda.tar.lzma 2020/02/05 | 385534 | language/japanese/BX/bxjscls/bxjscls.dtx 2020/02/05 | 37688 | systems/texlive/tlnet/archive/platex.r53668.tar.xz -2020/02/05 | 36615 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma 2020/02/05 | 36613 | systems/win32/miktex/tm/packages/miktex-posix-bin-x64-2.9.tar.lzma -2020/02/05 | 36397 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma 2020/02/05 | 36350 | systems/win32/miktex/tm/packages/miktex-chktex-bin-x64-2.9.tar.lzma 2020/02/05 | 356200 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/02/05 | 356121 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma 2020/02/05 | 354603 | systems/win32/miktex/tm/packages/miktex-omega-bin-2.9.tar.lzma -2020/02/05 | 354459 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma 2020/02/05 | 34869 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/02/05 | 34868 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/02/05 | 34844 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma 2020/02/05 | 34818 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma 2020/02/05 | 33541 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-2.9.tar.lzma -2020/02/05 | 33527 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma 2020/02/05 | 33435 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/02/05 | 33364 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/02/05 | 328772 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma 2020/02/05 | 328668 | systems/win32/miktex/tm/packages/miktex-cairo-bin-2.9.tar.lzma 2020/02/05 | 327543 | macros/latex/contrib/thesis-ekf.zip -2020/02/05 | 32361 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma 2020/02/05 | 32318 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-x64-2.9.tar.lzma 2020/02/05 | 32264 | systems/win32/miktex/tm/packages/miktex-chktex-bin-2.9.tar.lzma 2020/02/05 | 3224 | systems/texlive/tlnet/archive/pmhanguljamo.r53664.tar.xz -2020/02/05 | 321847 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/02/05 | 32182 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma 2020/02/05 | 321641 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-2.9.tar.lzma 2020/02/05 | 31872 | systems/texlive/tlnet/archive/l3build.r53673.tar.xz -2020/02/05 | 31253 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/02/05 | 3169 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex 2020/02/05 | 31170 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/02/05 | 31150 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma 2020/02/05 | 31140 | systems/win32/miktex/tm/packages/miktex-posix-bin-2.9.tar.lzma 2020/02/05 | 310013 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/02/05 | 30993 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/02/05 | 309679 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma 2020/02/05 | 30966 | systems/win32/miktex/tm/packages/miktex-mspack-bin-2.9.tar.lzma -2020/02/05 | 30741 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/02/05 | 3073 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex 2020/02/05 | 30708 | systems/win32/miktex/tm/packages/miktex-autosp-bin-x64-2.9.tar.lzma -2020/02/05 | 30232 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma 2020/02/05 | 30202 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/02/05 | 29675 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma 2020/02/05 | 29655 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-x64-2.9.tar.lzma 2020/02/05 | 29287 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-2.9.tar.lzma -2020/02/05 | 29283 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/02/05 | 29243 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma 2020/02/05 | 29198 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-2.9.tar.lzma -2020/02/05 | 29120 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma 2020/02/05 | 29006 | systems/win32/miktex/tm/packages/miktex-teckit-bin-x64-2.9.tar.lzma 2020/02/05 | 28960 | systems/texlive/tlnet/archive/l3build.source.r53673.tar.xz 2020/02/05 | 28762 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/02/05 | 28742 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/02/05 | 28493 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma 2020/02/05 | 28483 | systems/win32/miktex/tm/packages/miktex-autosp-bin-2.9.tar.lzma 2020/02/05 | 282906 | systems/win32/miktex/tm/packages/tokcycle.tar.lzma 2020/02/05 | 281568 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/02/05 | 281547 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma 2020/02/05 | 281355 | systems/win32/miktex/tm/packages/miktex-metapost-bin-x64-2.9.tar.lzma -2020/02/05 | 281236 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/02/05 | 27780 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma 2020/02/05 | 277716 | systems/texlive/tlnet/archive/tokcycle.doc.r53669.tar.xz -2020/02/05 | 276821 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma 2020/02/05 | 276790 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma 2020/02/05 | 27655 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-2.9.tar.lzma -2020/02/05 | 272358 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma 2020/02/05 | 272351 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/02/05 | 26925 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma 2020/02/05 | 26822 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-2.9.tar.lzma -2020/02/05 | 26767 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma 2020/02/05 | 26766 | systems/win32/miktex/tm/packages/miktex-teckit-bin-2.9.tar.lzma -2020/02/05 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma 2020/02/05 | 26625 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-2.9.tar.lzma -2020/02/05 | 26505 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma 2020/02/05 | 26468 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-2.9.tar.lzma 2020/02/05 | 2615797 | systems/win32/miktex/tm/packages/asymptote.tar.lzma 2020/02/05 | 26052 | macros/latex/contrib/thesis-ekf/thesis-ekf.dtx 2020/02/05 | 25824 | systems/texlive/tlnet/archive/l3backend.source.r53673.tar.xz -2020/02/05 | 2581039 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma 2020/02/05 | 2579861 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma -2020/02/05 | 25303 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma 2020/02/05 | 25294 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-2.9.tar.lzma 2020/02/05 | 248978 | macros/latex/contrib/thesis-ekf/thesis-ekf.pdf -2020/02/05 | 247669 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma 2020/02/05 | 247654 | systems/win32/miktex/tm/packages/miktex-metapost-bin-2.9.tar.lzma -2020/02/05 | 247150 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma 2020/02/05 | 247005 | systems/win32/miktex/tm/packages/miktex-xetex-bin-2.9.tar.lzma -2020/02/05 | 246459 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma 2020/02/05 | 246456 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-2.9.tar.lzma 2020/02/05 | 2460009 | systems/win32/miktex/tm/packages/miktex-texworks-bin-2.9.tar.lzma -2020/02/05 | 2457577 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma 2020/02/05 | 24556 | systems/texlive/tlnet/archive/acro.r53670.tar.xz -2020/02/05 | 237660 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/02/05 | 2381 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex 2020/02/05 | 237454 | systems/win32/miktex/tm/packages/miktex-pmx-bin-x64-2.9.tar.lzma 2020/02/05 | 23683 | language/korean/pmhanguljamo/doc/pmhanguljamo-doc.tex -2020/02/05 | 23380 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/02/05 | 2365 | macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex 2020/02/05 | 23317 | systems/win32/miktex/tm/packages/miktex-popt-bin-x64-2.9.tar.lzma -2020/02/05 | 22933 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma 2020/02/05 | 22896 | systems/win32/miktex/tm/packages/miktex-devnag-bin-x64-2.9.tar.lzma -2020/02/05 | 22541603 | systems/texlive/tlnet/install-tl.zip +2020/02/05 | 22458676 | systems/win32/w32tex/cjkzr.tar.xz 2020/02/05 | 218447 | systems/win32/miktex/tm/packages/miktex-console-bin-x64-2.9.tar.lzma -2020/02/05 | 2160000 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz -2020/02/05 | 215280 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma 2020/02/05 | 212246 | systems/win32/miktex/tm/packages/classics.tar.lzma 2020/02/05 | 209880 | systems/texlive/tlnet/archive/classics.doc.r53671.tar.xz -2020/02/05 | 20686 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma 2020/02/05 | 20632 | systems/win32/miktex/tm/packages/miktex-devnag-bin-2.9.tar.lzma 2020/02/05 | 203632 | systems/texlive/tlnet/archive/reledmac.source.r53675.tar.xz -2020/02/05 | 201991 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma 2020/02/05 | 201824 | systems/texlive/tlnet/archive/physconst.doc.r53674.tar.xz 2020/02/05 | 201793 | systems/win32/miktex/tm/packages/miktex-pmx-bin-2.9.tar.lzma 2020/02/05 | 199340 | systems/win32/miktex/tm/packages/miktex-console-bin-2.9.tar.lzma -2020/02/05 | 199143 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma 2020/02/05 | 19852 | systems/texlive/tlnet/archive/l3packages.r53673.tar.xz -2020/02/05 | 19798 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma 2020/02/05 | 19777 | systems/win32/miktex/tm/packages/miktex-popt-bin-2.9.tar.lzma -2020/02/05 | 196293 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/02/05 | 196162 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma 2020/02/05 | 195194 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-2.9.tar.lzma 2020/02/05 | 1950643 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma -2020/02/05 | 194911 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/02/05 | 193832 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/02/05 | 1938203 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma 2020/02/05 | 193713 | systems/win32/miktex/tm/packages/miktex-pixman-bin-x64-2.9.tar.lzma 2020/02/05 | 1902810 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma -2020/02/05 | 18698877 | systems/texlive/tlnet/install-tl-windows.exe -2020/02/05 | 186772 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma 2020/02/05 | 186768 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma -2020/02/05 | 185529 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma 2020/02/05 | 185365 | systems/win32/miktex/tm/packages/miktex-mktex-bin-x64-2.9.tar.lzma 2020/02/05 | 1844 | systems/texlive/tlnet/archive/classics.r53671.tar.xz 2020/02/05 | 184220 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma -2020/02/05 | 184200 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma 2020/02/05 | 18320 | systems/texlive/tlnet/archive/physconst.source.r53674.tar.xz -2020/02/05 | 182742 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma 2020/02/05 | 182617 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma 2020/02/05 | 182360 | systems/texlive/tlnet/archive/erewhon-math.r53666.tar.xz 2020/02/05 | 1813060 | systems/win32/miktex/tm/packages/l3packages.tar.lzma -2020/02/05 | 17754 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/02/05 | 177525 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma 2020/02/05 | 177510 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-x64-2.9.tar.lzma 2020/02/05 | 17743 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/02/05 | 17680 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma 2020/02/05 | 17666 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-x64-2.9.tar.lzma 2020/02/05 | 1759717 | systems/win32/miktex/tm/packages/platex.tar.lzma 2020/02/05 | 1727072 | systems/texlive/tlnet/archive/l3packages.doc.r53673.tar.xz 2020/02/05 | 170304 | systems/texlive/tlnet/archive/texosquery.r53676.tar.xz -2020/02/05 | 1697677 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma 2020/02/05 | 169543 | systems/win32/miktex/tm/packages/miktex-curl-bin-2.9.tar.lzma -2020/02/05 | 169440 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/02/05 | 168841 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma 2020/02/05 | 1681369 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma -2020/02/05 | 167838 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma 2020/02/05 | 167767 | systems/win32/miktex/tm/packages/miktex-metafont-bin-2.9.tar.lzma 2020/02/05 | 167070 | systems/win32/miktex/tm/packages/miktex-mo-bin-x64-2.9.tar.lzma 2020/02/05 | 1652564 | systems/win32/miktex/tm/packages/erewhon-math.tar.lzma 2020/02/05 | 164946 | systems/win32/miktex/tm/packages/miktex-mktex-bin-2.9.tar.lzma -2020/02/05 | 164885 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma 2020/02/05 | 1611644 | systems/texlive/tlnet/archive/platex.doc.r53668.tar.xz -2020/02/05 | 161144 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/05 | 16096800 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2020/02/05 | 160756 | systems/win32/miktex/tm/packages/miktex-tex-bin-x64-2.9.tar.lzma -2020/02/05 | 16038 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma 2020/02/05 | 16026 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-2.9.tar.lzma -2020/02/05 | 15892 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma 2020/02/05 | 15880 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-2.9.tar.lzma -2020/02/05 | 158488 | systems/texlive/tlnet/archive/texlive-docindex.doc.r53663.tar.xz -2020/02/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/02/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 2020/02/05 | 152133 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/02/05 | 152085 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma 2020/02/05 | 149941 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/02/05 | 149876 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/02/05 | 148964 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma 2020/02/05 | 148308 | systems/texlive/tlnet/archive/l3kernel.r53673.tar.xz 2020/02/05 | 148221 | systems/win32/miktex/tm/packages/miktex-mo-bin-2.9.tar.lzma 2020/02/05 | 147408 | systems/win32/miktex/tm/packages/miktex-tex-bin-2.9.tar.lzma -2020/02/05 | 147164 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2020/02/05 | 1463860 | systems/texlive/tlnet/archive/erewhon-math.doc.r53666.tar.xz 2020/02/05 | 1461 | language/japanese/BX/bxjscls/LICENSE -2020/02/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/02/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/02/05 | 14058 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/02/05 | 14127 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex 2020/02/05 | 14026 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma 2020/02/05 | 13960 | systems/texlive/tlnet/archive/latex-bin-dev.doc.r53677.tar.xz -2020/02/05 | 1381484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2020/02/05 | 1378652 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2020/02/05 | 137576 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-2.9.tar.lzma -2020/02/05 | 137213 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma 2020/02/05 | 134520 | language/korean/pmhanguljamo/doc/pmhanguljamo-doc.pdf 2020/02/05 | 133153 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-2.9.tar.lzma -2020/02/05 | 133125 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma 2020/02/05 | 13296 | language/japanese/BX/bxjscls/README-ja.md +2020/02/05 | 13224 | macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex 2020/02/05 | 13092 | language/korean/pmhanguljamo/tex/pmhanguljamo.sty -2020/02/05 | 13066 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma 2020/02/05 | 13048 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2020/02/05 | 130451 | systems/win32/miktex/tm/packages/miktex-dvips-bin-x64-2.9.tar.lzma -2020/02/05 | 130322 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/02/05 | 1286 | macros/latex/contrib/metastr/README.txt 2020/02/05 | 12542 | language/korean/pmhanguljamo/tex/pmhanguljamo-rrk.sty 2020/02/05 | 1249819 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-2.9.tar.lzma -2020/02/05 | 1249562 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma 2020/02/05 | 123276 | systems/texlive/tlnet/archive/platex.source.r53668.tar.xz -2020/02/05 | 1229002 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma 2020/02/05 | 1228600 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma 2020/02/05 | 12060 | systems/texlive/tlnet/archive/jslectureplanner.r53672.tar.xz 2020/02/05 | 1196419 | systems/win32/miktex/tm/packages/jslectureplanner.tar.lzma 2020/02/05 | 11896 | systems/texlive/tlnet/archive/l3backend.r53673.tar.xz 2020/02/05 | 1180012 | systems/texlive/tlnet/archive/jslectureplanner.doc.r53672.tar.xz -2020/02/05 | 1172430 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/02/05 | 1172134 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma 2020/02/05 | 116845 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma -2020/02/05 | 116764 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/02/05 | 115488 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma 2020/02/05 | 115488 | systems/win32/miktex/tm/packages/miktex-dvips-bin-2.9.tar.lzma 2020/02/05 | 1153350 | language/japanese/BX/bxjscls/bxjscls.pdf 2020/02/05 | 113388 | systems/texlive/tlnet/archive/circuitikz.r53667.tar.xz 2020/02/05 | 111106 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/02/05 | 110867 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma 2020/02/05 | 1102422 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma -2020/02/05 | 1102204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/02/05 | 1093231 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/02/05 | 1092090 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma -2020/02/05 | 108953 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma 2020/02/05 | 108792 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/02/05 | 10802 | macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex 2020/02/05 | 1078555 | systems/win32/miktex/tm/packages/circuitikz.tar.lzma 2020/02/05 | 10514858 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma -2020/02/05 | 1043545 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/02/05 | 1043326 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma 2020/02/05 | 1042941 | systems/win32/miktex/tm/packages/miktex-poppler-bin-x64-2.9.tar.lzma 2020/02/05 | 1041995 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma 2020/02/05 | 102436 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma -2020/02/05 | 102365 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/02/05 | 100616 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma 2020/02/05 | 100501 | systems/win32/miktex/tm/packages/miktex-gd-bin-2.9.tar.lzma 2020/02/05 | 1002320 | systems/texlive/tlnet/archive/chemmacros.doc.r53665.tar.xz 2020/02/04 | 99038480 | systems/win32/w32tex/web2c-lib.tar.xz 2020/02/04 | 985304 | macros/latex/contrib/reledmac/reledpar.pdf -2020/02/04 | 9811276 | systems/win32/w32tex/ptex-w32.tar.xz +2020/02/04 | 9813904 | systems/win32/w32tex/ptex-w32.tar.xz 2020/02/04 | 9712 | language/japanese/platex/kinsoku.dtx 2020/02/04 | 9530 | macros/latex/contrib/jslectureplanner/README 2020/02/04 | 95276 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex @@ -465,8 +1488,7 @@ 2020/02/04 | 85104 | macros/latex/contrib/jslectureplanner/examples/English/lecturebib-english.pdf 2020/02/04 | 84992 | macros/latex/contrib/jslectureplanner/examples/German/lecturepresentation.pdf 2020/02/04 | 84606 | macros/latex/contrib/jslectureplanner/examples/English/lecturepresentation-english.pdf -2020/02/04 | 8368412 | systems/win32/w32tex/uptex-w32.tar.xz -2020/02/04 | 82882728 | systems/win32/w32tex/pgfcontrib.tar.xz +2020/02/04 | 8368924 | systems/win32/w32tex/uptex-w32.tar.xz 2020/02/04 | 82840 | systems/texlive/tlnet/archive/fontspec.source.r53656.tar.xz 2020/02/04 | 8278 | macros/luatex/generic/barracuda/PLANNER.txt 2020/02/04 | 782620 | support/texosquery.zip @@ -479,6 +1501,7 @@ 2020/02/04 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex 2020/02/04 | 7477 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex 2020/02/04 | 744648 | systems/texlive/tlnet/archive/babel.doc.r53660.tar.xz +2020/02/04 | 7237 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex 2020/02/04 | 70 | support/texosquery/java/Manifest-jre8.txt 2020/02/04 | 70 | support/texosquery/java/Manifest-jre7.txt 2020/02/04 | 70 | support/texosquery/java/Manifest-jre5.txt @@ -492,21 +1515,23 @@ 2020/02/04 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex 2020/02/04 | 68110 | macros/latex/contrib/jslectureplanner/jslectureplanner.tex 2020/02/04 | 679 | support/texosquery/java/FileListType.java +2020/02/04 | 678 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex 2020/02/04 | 67784 | macros/luatex/generic/barracuda/doc/barracuda.pdf 2020/02/04 | 6717 | language/japanese/platex/plnewsc06.tex 2020/02/04 | 6604 | systems/texlive/tlnet/archive/luaotfload.source.r53652.tar.xz 2020/02/04 | 65370 | support/texosquery/texosquery-jre5.jar -2020/02/04 | 6344328 | systems/win32/w32tex/ptex-ng-w32.tar.xz +2020/02/04 | 6346472 | systems/win32/w32tex/ptex-ng-w32.tar.xz 2020/02/04 | 6323 | fonts/erewhon-math/fourier-otf.sty 2020/02/04 | 628833 | systems/win32/miktex/tm/packages/acro.tar.lzma +2020/02/04 | 6261 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex 2020/02/04 | 618444 | systems/texlive/tlnet/archive/babel.source.r53660.tar.xz 2020/02/04 | 6119 | support/texosquery/java/FileWalkVisitor.java 2020/02/04 | 6069 | language/japanese/platex/plnews06.tex 2020/02/04 | 598 | language/japanese/platex/platexrelease.ins +2020/02/04 | 5931 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex 2020/02/04 | 59148 | macros/latex/contrib/jslectureplanner/examples/German/lecturehandout.pdf 2020/02/04 | 588098 | systems/win32/miktex/tm/packages/lie-hasse.tar.lzma 2020/02/04 | 58658 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex -2020/02/04 | 582633 | systems/win32/w32tex/ChangeLog 2020/02/04 | 579656 | systems/texlive/tlnet/archive/luaotfload.r53652.tar.xz 2020/02/04 | 57923 | macros/latex/contrib/jslectureplanner/examples/English/lecturehandout-english.pdf 2020/02/04 | 57899 | macros/latex/contrib/jslectureplanner/examples/German/lectureprogram.pdf @@ -516,6 +1541,7 @@ 2020/02/04 | 5687 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty 2020/02/04 | 567896 | systems/texlive/tlnet/archive/luaotfload.doc.r53652.tar.xz 2020/02/04 | 565 | language/japanese/platex/pldocs.ins +2020/02/04 | 5620 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex 2020/02/04 | 53584 | language/japanese/platex/plext.dtx 2020/02/04 | 5242 | support/texosquery/java/TeXOSQueryJRE7.java 2020/02/04 | 522988 | systems/texlive/tlnet/archive/latex-base-dev.source.r53651.tar.xz @@ -529,6 +1555,7 @@ 2020/02/04 | 4977 | language/japanese/platex/Makefile 2020/02/04 | 49610620 | systems/win32/w32tex/xetex-w32.tar.xz 2020/02/04 | 4936804 | systems/win32/w32tex/aleph-w32.tar.xz +2020/02/04 | 4872 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex 2020/02/04 | 4795 | support/texosquery/java/FileSortComparator.java 2020/02/04 | 47912 | macros/latex/contrib/jslectureplanner/jslectureplanner.sty 2020/02/04 | 4773 | macros/luatex/generic/barracuda/test/test-ean/ars.svg @@ -537,12 +1564,14 @@ 2020/02/04 | 457357 | macros/latex/contrib/jslectureplanner/jslectureplanner.pdf 2020/02/04 | 45651 | macros/luatex/generic/barracuda/src/lib-barcode/brcd-ean.lua 2020/02/04 | 4524 | systems/texlive/tlnet/archive/filehook.r53655.tar.xz +2020/02/04 | 4395 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex +2020/02/04 | 4264 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex 2020/02/04 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty 2020/02/04 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex 2020/02/04 | 4184 | systems/texlive/tlnet/archive/secnum.source.r53657.tar.xz 2020/02/04 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex 2020/02/04 | 416250 | macros/luatex/generic/barracuda.zip -2020/02/04 | 41549016 | systems/win32/w32tex/latex-dev.tar.xz +2020/02/04 | 41552388 | systems/win32/w32tex/latex-dev.tar.xz 2020/02/04 | 4153 | language/japanese/platex/plnewsc08.tex 2020/02/04 | 41176 | systems/texlive/tlnet/archive/latex-tools-dev.r53651.tar.xz 2020/02/04 | 4087 | macros/latex/contrib/reledmac/README @@ -553,6 +1582,7 @@ 2020/02/04 | 3901 | macros/luatex/generic/barracuda/test/test-ean/003-ean-test.pdf 2020/02/04 | 38810 | macros/generic/tokcycle/tokcycle-examples.tex 2020/02/04 | 3877 | language/japanese/platex/plnews08.tex +2020/02/04 | 3830 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex 2020/02/04 | 382656 | systems/texlive/tlnet/archive/secnum.doc.r53657.tar.xz 2020/02/04 | 3796 | language/japanese/platex/plnewsc05.tex 2020/02/04 | 37802 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf @@ -570,6 +1600,7 @@ 2020/02/04 | 3392 | macros/luatex/generic/barracuda/README.md 2020/02/04 | 33252 | systems/texlive/tlnet/archive/thuthesis.source.r53659.tar.xz 2020/02/04 | 3321 | language/japanese/platex/plnewsc03.tex +2020/02/04 | 3295 | macros/latex/contrib/tkz-doc/tkz-doc.cfg 2020/02/04 | 3276 | graphics/pgf/contrib/circuitikz/README.md 2020/02/04 | 3197 | language/japanese/platex/plnewsc13.tex 2020/02/04 | 3194 | language/japanese/platex/plnews.cls @@ -580,9 +1611,13 @@ 2020/02/04 | 30267284 | systems/win32/w32tex/latex.tar.xz 2020/02/04 | 2999 | language/japanese/platex/plnewsc09.tex 2020/02/04 | 298165 | language/japanese/platex/platex.pdf +2020/02/04 | 2959936 | systems/win32/w32tex/platex.tar.xz 2020/02/04 | 2948 | language/japanese/platex/plnewsc10.tex 2020/02/04 | 2931 | language/japanese/platex/plnews04.tex 2020/02/04 | 292428 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +2020/02/04 | 2911 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex +2020/02/04 | 2869 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex +2020/02/04 | 2859 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex 2020/02/04 | 28509 | macros/latex/contrib/jslectureplanner/examples/German/membertable-filled.pdf 2020/02/04 | 284600 | fonts/erewhon-math/Erewhon-Math.otf 2020/02/04 | 28450 | macros/latex/contrib/jslectureplanner/examples/English/membertable-filled-english.pdf @@ -606,6 +1641,7 @@ 2020/02/04 | 25688 | macros/latex/contrib/jslectureplanner/examples/English/presentation-list-english.pdf 2020/02/04 | 254565 | macros/generic/tokcycle/tokcycle-doc.pdf 2020/02/04 | 253 | language/japanese/platex/platex.ini +2020/02/04 | 2486 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex 2020/02/04 | 2472 | support/texosquery/texosquery.ins 2020/02/04 | 24279 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf 2020/02/04 | 2421 | language/japanese/platex/plnewsc12.tex @@ -614,6 +1650,7 @@ 2020/02/04 | 23620 | macros/luatex/generic/barracuda/test/test-ean/001-13-ean-test.pdf 2020/02/04 | 23460 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex 2020/02/04 | 2313 | language/japanese/platex/plnews05.tex +2020/02/04 | 23007 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex 2020/02/04 | 226045 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex 2020/02/04 | 225652 | systems/win32/miktex/tm/packages/physconst.tar.lzma 2020/02/04 | 224216 | systems/texlive/tlnet/archive/latex-tools-dev.source.r53651.tar.xz @@ -631,6 +1668,7 @@ 2020/02/04 | 204405 | systems/win32/miktex/tm/packages/derivative.tar.lzma 2020/02/04 | 20296 | language/japanese/platex/plvers.dtx 2020/02/04 | 201833 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +2020/02/04 | 20146 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex 2020/02/04 | 2006 | language/japanese/platex/README.md 2020/02/04 | 1988196 | systems/texlive/tlnet/archive/latex-graphics-dev.doc.r53651.tar.xz 2020/02/04 | 1986941 | language/japanese/BX/bxjscls.zip @@ -674,6 +1712,7 @@ 2020/02/04 | 16903836 | systems/win32/w32tex/luatex-w32.tar.xz 2020/02/04 | 1680 | macros/latex/contrib/suftesi/README 2020/02/04 | 168099 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +2020/02/04 | 1680620 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz 2020/02/04 | 167788 | systems/texlive/tlnet/archive/latex-base-dev.r53651.tar.xz 2020/02/04 | 1673379 | fonts/erewhon-math.zip 2020/02/04 | 16345 | fonts/erewhon-math/unimath-erewhon.ltx @@ -703,6 +1742,7 @@ 2020/02/04 | 13872 | support/texosquery/README.md 2020/02/04 | 138405 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf 2020/02/04 | 138222 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +2020/02/04 | 1369 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex 2020/02/04 | 136553 | language/japanese/platex/plfonts.dtx 2020/02/04 | 13621 | macros/luatex/generic/barracuda/doc/barracuda.tex 2020/02/04 | 135414 | macros/latex/contrib/reledmac/examples/2-performances.pdf @@ -733,7 +1773,9 @@ 2020/02/04 | 11078 | macros/generic/tokcycle/tokcycle.tex 2020/02/04 | 11043 | support/texosquery/java/QueryAction.java 2020/02/04 | 10839 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +2020/02/04 | 10772 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex 2020/02/04 | 10712 | systems/texlive/tlnet/archive/lie-hasse.r53653.tar.xz +2020/02/04 | 10683 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex 2020/02/04 | 10601 | macros/luatex/generic/barracuda/test/test-ean/002-ean-test.pdf 2020/02/04 | 1057 | language/japanese/platex/plfmt.ins 2020/02/04 | 105500 | language/japanese/platex/plcore.dtx @@ -789,6 +1831,7 @@ 2020/02/03 | 7953 | systems/win32/miktex/tm/packages/lectures.tar.lzma 2020/02/03 | 785221 | install/macros/latex/contrib/l3build.tds.zip 2020/02/03 | 785185 | install/macros/latex/contrib/l3backend.tds.zip +2020/02/03 | 7811 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex 2020/02/03 | 77323 | macros/luatex/generic/luaotfload/luaotfload-conf.pdf 2020/02/03 | 771605 | macros/latex/contrib/thuthesis/main.pdf 2020/02/03 | 77128 | macros/latex/contrib/l3kernel/l3box.dtx @@ -884,6 +1927,7 @@ 2020/02/03 | 46646 | macros/latex/contrib/l3kernel/l3text-case.dtx 2020/02/03 | 4611 | macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex 2020/02/03 | 4602 | macros/latex/contrib/thuthesis/README.md +2020/02/03 | 4582 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex 2020/02/03 | 4561 | macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex 2020/02/03 | 453950 | macros/latex/contrib/l3packages/xfrac.pdf 2020/02/03 | 4525 | macros/latex/contrib/l3kernel/l3news.tex @@ -914,6 +1958,7 @@ 2020/02/03 | 388840 | systems/win32/miktex/tm/packages/secnum.tar.lzma 2020/02/03 | 3866 | macros/luatex/generic/luaotfload/luaotfload-fallback.lua 2020/02/03 | 3863 | macros/luatex/generic/luaotfload/README.md +2020/02/03 | 3861 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex 2020/02/03 | 38547 | macros/latex/contrib/l3kernel/l3deprecation.dtx 2020/02/03 | 379209 | macros/latex/contrib/l3kernel/l3news.pdf 2020/02/03 | 3711 | macros/latex/contrib/physconst/makefile @@ -948,7 +1993,6 @@ 2020/02/03 | 2997 | macros/latex/contrib/l3kernel/README.md 2020/02/03 | 29800 | systems/texlive/tlnet/archive/jadetex.r53645.tar.xz 2020/02/03 | 29795 | macros/latex/contrib/fontspec/fontspec-doc-fontsel.tex -2020/02/03 | 2955108 | systems/win32/w32tex/platex.tar.xz 2020/02/03 | 2905600 | systems/texlive/tlnet/archive/texplate.r53637.tar.xz 2020/02/03 | 2846 | macros/latex/contrib/fontspec/README.md 2020/02/03 | 279681 | macros/latex/contrib/l3kernel/l3styleguide.pdf @@ -992,7 +2036,6 @@ 2020/02/03 | 22921387 | install/macros/latex/latex-base.tds.zip 2020/02/03 | 227409 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf 2020/02/03 | 2259 | macros/latex/contrib/l3packages/CHANGELOG.md -2020/02/03 | 22494836 | systems/win32/w32tex/cjkzr.tar.xz 2020/02/03 | 224285 | macros/latex/contrib/physconst.zip 2020/02/03 | 224212 | systems/texlive/tlnet/archive/tools.source.r53640.tar.xz 2020/02/03 | 2241629 | macros/latex/contrib/thuthesis.zip @@ -1061,6 +2104,7 @@ 2020/02/03 | 1687 | macros/latex/contrib/fontspec/fontspec-example.tex 2020/02/03 | 168372 | systems/texlive/tlnet/archive/latex.r53640.tar.xz 2020/02/03 | 1669 | macros/latex/contrib/thuthesis/Makefile +2020/02/03 | 16597 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex 2020/02/03 | 1658152 | macros/latex/required/babel/base.zip 2020/02/03 | 16553 | macros/luatex/generic/luaotfload/luaotfload-colors.lua 2020/02/03 | 16548 | macros/luatex/generic/luaotfload/luaotfload.conf.5 @@ -1071,6 +2115,7 @@ 2020/02/03 | 15837 | macros/luatex/generic/luaotfload/luaotfload-tool.rst 2020/02/03 | 15708 | macros/latex/contrib/l3kernel/l3final.dtx 2020/02/03 | 1567 | macros/latex/contrib/l3packages/xtemplate.ins +2020/02/03 | 15476 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex 2020/02/03 | 1539482 | macros/latex/contrib/l3kernel/interface3.pdf 2020/02/03 | 1537 | macros/latex/contrib/l3build/l3build.ins 2020/02/03 | 152413 | macros/latex/contrib/l3kernel/l3news08.pdf @@ -1115,6 +2160,7 @@ 2020/02/03 | 1267 | macros/latex/contrib/l3packages/xfrac.ins 2020/02/03 | 126798 | macros/latex/contrib/l3kernel/l3file.dtx 2020/02/03 | 12627 | macros/luatex/generic/luaotfload/luaotfload-tool.1 +2020/02/03 | 12571 | macros/latex/contrib/tkz-doc/tkz-doc.cls 2020/02/03 | 1246 | macros/latex/contrib/fontspec/fontspec.ltx 2020/02/03 | 12465 | macros/latex/contrib/fontspec/fontspec-code-api.dtx 2020/02/03 | 1234 | macros/latex/contrib/l3packages/l3keys2e.ins @@ -1142,6 +2188,7 @@ 2020/02/03 | 11626 | macros/latex/contrib/l3build/CHANGELOG.md 2020/02/03 | 114704 | systems/texlive/tlnet/archive/texplate.doc.r53637.tar.xz 2020/02/03 | 11387 | macros/luatex/generic/luaotfload/luaotfload-log.lua +2020/02/03 | 11361 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex 2020/02/03 | 113529 | macros/latex/contrib/l3kernel/l3news01.pdf 2020/02/03 | 112871 | macros/latex/contrib/l3kernel/l3names.dtx 2020/02/03 | 11238 | macros/latex/contrib/l3packages/l3keys2e.dtx @@ -1178,6 +2225,7 @@ 2020/02/02 | 899 | macros/latex/contrib/secnum/README.md 2020/02/02 | 898149 | systems/win32/miktex/tm/packages/chemformula.tar.lzma 2020/02/02 | 8980 | support/texplate/source/main/kotlin/org/islandoftex/texplate/TemplateProcessing.kt +2020/02/02 | 8905 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex 2020/02/02 | 8846 | macros/latex/contrib/lectures.zip 2020/02/02 | 883186 | systems/win32/miktex/tm/packages/baskervaldx.tar.lzma 2020/02/02 | 873148 | systems/texlive/tlnet/archive/chemformula.doc.r53624.tar.xz @@ -1212,6 +2260,7 @@ 2020/02/02 | 555 | language/japanese/uplatex/upldocs.ins 2020/02/02 | 5500495 | systems/win32/miktex/tm/packages/mpfonts.tar.lzma 2020/02/02 | 5446 | support/texplate/source/main/kotlin/org/islandoftex/texplate/util/MergingUtils.kt +2020/02/02 | 5440 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex 2020/02/02 | 542292 | language/japanese/uplatex/upldoc.pdf 2020/02/02 | 535 | support/texplate/source/main/kotlin/org/islandoftex/texplate/model/handlers/CSVListHandler.kt 2020/02/02 | 526206 | macros/latex-dev/base/classes.pdf @@ -1231,7 +2280,6 @@ 2020/02/02 | 452 | support/texplate/source/main/kotlin/org/islandoftex/texplate/model/handlers/BooleanHandler.kt 2020/02/02 | 433013 | macros/latex-dev/base/ltnews29.pdf 2020/02/02 | 430478 | macros/latex/required/amsmath/testmath.pdf -2020/02/02 | 42982644 | systems/win32/w32tex/web2c-w32.tar.xz 2020/02/02 | 42448 | systems/texlive/tlnet/archive/polexpr.doc.r53633.tar.xz 2020/02/02 | 40712 | systems/texlive/tlnet/archive/xepersian.r53625.tar.xz 2020/02/02 | 404292 | macros/latex-dev/base/usrguide.pdf @@ -1398,7 +2446,6 @@ 2020/02/02 | 169764 | macros/latex/required/tools/shellesc.pdf 2020/02/02 | 169764 | macros/latex-dev/required/tools/shellesc.pdf 2020/02/02 | 1695 | support/texplate/source/main/kotlin/org/islandoftex/texplate/util/ValidatorUtils.kt -2020/02/02 | 169053 | systems/win32/miktex/tm/packages/sansmathaccent.tar.lzma 2020/02/02 | 168006 | language/japanese/uplatex/ujclasses.dtx 2020/02/02 | 1666 | macros/latex-dev/required/tools/README.md 2020/02/02 | 165748 | macros/latex/required/amsmath/amscd.pdf @@ -1497,6 +2544,7 @@ 2020/02/01 | 9142 | macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx 2020/02/01 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx 2020/02/01 | 9136 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx +2020/02/01 | 9119 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex 2020/02/01 | 9114 | macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx 2020/02/01 | 9108 | macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx 2020/02/01 | 9093 | macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx @@ -1581,6 +2629,7 @@ 2020/02/01 | 273653 | macros/latex/base/tlc2.pdf 2020/02/01 | 273304 | macros/latex/base/cmfonts.pdf 2020/02/01 | 2712 | macros/latex/required/amsmath/README.md +2020/02/01 | 2686 | macros/latex/contrib/tkz-doc/couverture.tex 2020/02/01 | 267213 | macros/latex/base/fix-cm.pdf 2020/02/01 | 26211 | macros/latex/contrib/lwarp/lwarp.ins 2020/02/01 | 25947 | macros/xetex/latex/xepersian/xepersian-doc-pkgs.ltx @@ -1689,11 +2738,8 @@ 2020/01/31 | 9810 | macros/latex-dev/base/ltnews21.tex 2020/01/31 | 9810 | macros/latex/base/ltnews21.tex 2020/01/31 | 976 | macros/latex/contrib/jmlr/sample-books/paper4/paper4.tex -2020/01/31 | 962 | macros/latex/contrib/unicode-math/unicode-math-code.ltx 2020/01/31 | 96166 | macros/latex-dev/base/ltclass.dtx 2020/01/31 | 96166 | macros/latex/base/ltclass.dtx -2020/01/31 | 9606 | macros/latex/contrib/unicode-math/um-code-pkgopt.dtx -2020/01/31 | 9567 | macros/latex/contrib/unicode-math/um-code-fontopt.dtx 2020/01/31 | 9562 | macros/latex-dev/base/ltcntrl.dtx 2020/01/31 | 9562 | macros/latex/base/ltcntrl.dtx 2020/01/31 | 9494 | macros/latex/required/tools/shellesc.dtx @@ -1704,8 +2750,6 @@ 2020/01/31 | 93897173 | systems/win32/w32tex/TLW64/tl-win64.zip 2020/01/31 | 9374 | macros/latex-dev/base/preload.dtx 2020/01/31 | 9374 | macros/latex/base/preload.dtx -2020/01/31 | 9250 | macros/latex/contrib/unicode-math/um-code-setchar.dtx -2020/01/31 | 9203 | macros/latex/contrib/unicode-math/MANIFEST.md 2020/01/31 | 9202 | macros/latex/required/amsmath/amsopn.dtx 2020/01/31 | 90991 | macros/latex/contrib/polexpr/polexpr.txt 2020/01/31 | 9086923 | fonts/mpfonts.zip @@ -1718,7 +2762,6 @@ 2020/01/31 | 89737 | macros/latex/base/slides.dtx 2020/01/31 | 89386 | macros/latex-dev/base/utf8ienc.dtx 2020/01/31 | 89386 | macros/latex/base/utf8ienc.dtx -2020/01/31 | 8889 | macros/latex/contrib/unicode-math/um-code-sscript.dtx 2020/01/31 | 8864 | macros/latex-dev/base/ltnews17.tex 2020/01/31 | 8864 | macros/latex/base/ltnews17.tex 2020/01/31 | 8770 | macros/latex-dev/base/format.ins @@ -1733,7 +2776,6 @@ 2020/01/31 | 85087 | macros/latex/required/amsmath/amsmath-2018-12-01.sty 2020/01/31 | 8493 | macros/latex-dev/base/texpert.txt 2020/01/31 | 8493 | macros/latex/base/texpert.txt -2020/01/31 | 7782 | macros/latex/contrib/unicode-math/um-code-sym-commands.dtx 2020/01/31 | 7698 | macros/latex/contrib/jmlr/sample-books/jmlrbook-sample.tex 2020/01/31 | 7666 | macros/latex-dev/base/ltnews.tex 2020/01/31 | 7666 | macros/latex/base/ltnews.tex @@ -1743,7 +2785,6 @@ 2020/01/31 | 7526 | macros/latex/base/ltxguide.cls 2020/01/31 | 73723 | macros/latex-dev/base/fntguide.tex 2020/01/31 | 73723 | macros/latex/base/fntguide.tex -2020/01/31 | 7362 | macros/latex/contrib/unicode-math/um-code-variables.dtx 2020/01/31 | 725020 | systems/texlive/tlnet/archive/nimbus15.doc.r53605.tar.xz 2020/01/31 | 7222 | macros/latex-dev/base/exscale.dtx 2020/01/31 | 7222 | macros/latex/base/exscale.dtx @@ -1804,7 +2845,6 @@ 2020/01/31 | 5777 | macros/latex/base/ltnews16.tex 2020/01/31 | 5716 | macros/latex-dev/base/inputenc.ins 2020/01/31 | 5716 | macros/latex/base/inputenc.ins -2020/01/31 | 57133 | macros/latex/contrib/unicode-math/um-doc-main.tex 2020/01/31 | 5696 | macros/latex-dev/base/ltnews08.tex 2020/01/31 | 5696 | macros/latex/base/ltnews08.tex 2020/01/31 | 5682 | macros/latex/required/tools/tools.ins @@ -1855,7 +2895,6 @@ 2020/01/31 | 52532 | macros/latex/base/lb2.err 2020/01/31 | 5239 | macros/latex-dev/base/ltnews01.tex 2020/01/31 | 5239 | macros/latex/base/ltnews01.tex -2020/01/31 | 5222 | macros/latex/contrib/unicode-math/um-code-compat.dtx 2020/01/31 | 5213 | macros/latex/required/tools/tools-overview.tex 2020/01/31 | 5213 | macros/latex-dev/required/tools/tools-overview.tex 2020/01/31 | 5201 | macros/latex-dev/base/ltnews03.tex @@ -1875,8 +2914,6 @@ 2020/01/31 | 4965 | macros/latex-dev/required/tools/fileerr.dtx 2020/01/31 | 4952 | macros/latex-dev/base/lthyphen.dtx 2020/01/31 | 4952 | macros/latex/base/lthyphen.dtx -2020/01/31 | 4904 | macros/latex/contrib/unicode-math/um-code-amsmath.dtx -2020/01/31 | 4832 | macros/latex/contrib/unicode-math/um-code-msg.dtx 2020/01/31 | 47759 | macros/latex-dev/base/ltplain.dtx 2020/01/31 | 47759 | macros/latex/base/ltplain.dtx 2020/01/31 | 4762 | macros/latex-dev/base/ltlength.dtx @@ -1884,7 +2921,6 @@ 2020/01/31 | 46381 | macros/latex-dev/base/lttab.dtx 2020/01/31 | 46381 | macros/latex/base/lttab.dtx 2020/01/31 | 4614280 | systems/win32/w32tex/dvipsk-w32.tar.xz -2020/01/31 | 459 | macros/latex/contrib/unicode-math/RELEASE_CHECKLIST.md 2020/01/31 | 45887 | macros/latex-dev/base/ltfssaxes.dtx 2020/01/31 | 45887 | macros/latex/base/ltfssaxes.dtx 2020/01/31 | 44813 | macros/latex-dev/base/ltmiscen.dtx @@ -1913,7 +2949,6 @@ 2020/01/31 | 4221 | macros/latex-dev/base/latex209.ins 2020/01/31 | 4221 | macros/latex/base/latex209.ins 2020/01/31 | 421604 | systems/texlive/tlnet/archive/babel-french.doc.r53603.tar.xz -2020/01/31 | 4207 | macros/latex/contrib/unicode-math/README.md 2020/01/31 | 419288 | macros/latex/contrib/jmlr/sample-books/proceedings-sample.pdf 2020/01/31 | 4171 | macros/latex-dev/base/ltnews19.tex 2020/01/31 | 4171 | macros/latex/base/ltnews19.tex @@ -1927,6 +2962,7 @@ 2020/01/31 | 4062 | macros/latex-dev/required/graphics/epsfig.dtx 2020/01/31 | 40589 | macros/latex-dev/base/ltfinal.dtx 2020/01/31 | 40589 | macros/latex/base/ltfinal.dtx +2020/01/31 | 4043 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex 2020/01/31 | 40203 | macros/latex-dev/base/ltboxes.dtx 2020/01/31 | 40203 | macros/latex/base/ltboxes.dtx 2020/01/31 | 39702 | macros/latex/required/tools/ftnright.dtx @@ -1956,10 +2992,8 @@ 2020/01/31 | 35881 | macros/latex-dev/required/tools/tabularx.dtx 2020/01/31 | 35621 | macros/latex-dev/base/latexchanges.tex 2020/01/31 | 35621 | macros/latex/base/latexchanges.tex -2020/01/31 | 3520 | macros/latex/contrib/unicode-math/um-doc-nfsssummary.tex 2020/01/31 | 35162 | macros/latex-dev/base/ltdirchk.dtx 2020/01/31 | 35162 | macros/latex/base/ltdirchk.dtx -2020/01/31 | 3486 | macros/latex/contrib/unicode-math/unicode-math.dtx 2020/01/31 | 34821 | macros/latex-dev/base/ltmath.dtx 2020/01/31 | 34821 | macros/latex/base/ltmath.dtx 2020/01/31 | 34660 | systems/texlive/tlnet/archive/suftesi.source.r53608.tar.xz @@ -1978,12 +3012,10 @@ 2020/01/31 | 3340 | macros/latex-dev/base/exscale.ins 2020/01/31 | 3340 | macros/latex/base/exscale.ins 2020/01/31 | 3327 | macros/latex/contrib/polexpr/README.md -2020/01/31 | 3289 | macros/latex/contrib/unicode-math/um-doc-style.tex 2020/01/31 | 3282 | macros/latex-dev/base/bugs.txt 2020/01/31 | 3282 | macros/latex/base/bugs.txt 2020/01/31 | 3281 | macros/latex/required/tools/manifest.txt 2020/01/31 | 3281 | macros/latex-dev/required/tools/manifest.txt -2020/01/31 | 325165 | macros/latex/contrib/unicode-math/unicode-math-code.pdf 2020/01/31 | 32247 | macros/latex/required/graphics/graphicx.dtx 2020/01/31 | 32247 | macros/latex-dev/required/graphics/graphicx.dtx 2020/01/31 | 32164 | macros/latex-dev/base/latexrelease.dtx @@ -2010,7 +3042,6 @@ 2020/01/31 | 29714 | macros/latex-dev/required/tools/multicol-2017-04-11.sty 2020/01/31 | 29571 | macros/latex/required/tools/showkeys.dtx 2020/01/31 | 29571 | macros/latex-dev/required/tools/showkeys.dtx -2020/01/31 | 2951 | macros/latex/contrib/unicode-math/unimath-example.ltx 2020/01/31 | 29194 | macros/latex-dev/base/ltfntcmd.dtx 2020/01/31 | 29194 | macros/latex/base/ltfntcmd.dtx 2020/01/31 | 29167 | macros/latex/contrib/jmlr/sample-papers/jmlr-sample.tex @@ -2026,7 +3057,6 @@ 2020/01/31 | 2892 | macros/latex/base/alltt.ins 2020/01/31 | 2890 | macros/latex-dev/base/ifthen.ins 2020/01/31 | 2890 | macros/latex/base/ifthen.ins -2020/01/31 | 2835 | macros/latex/contrib/unicode-math/um-code-ui.dtx 2020/01/31 | 273852 | systems/texlive/tlnet/archive/modes.doc.r53604.tar.xz 2020/01/31 | 2733 | macros/latex-dev/base/ltpageno.dtx 2020/01/31 | 2733 | macros/latex/base/ltpageno.dtx @@ -2037,9 +3067,6 @@ 2020/01/31 | 270076 | systems/texlive/tlnet/archive/semantic-markup.doc.r53607.tar.xz 2020/01/31 | 26872 | systems/texlive/tlnet/archive/modes.r53604.tar.xz 2020/01/31 | 26867 | macros/latex/contrib/jmlr/sample-papers/jmlrwcp-sample.tex -2020/01/31 | 26515 | macros/latex/contrib/unicode-math/um-code-main.dtx -2020/01/31 | 26124 | macros/latex/contrib/unicode-math/um-code-alphabets.dtx -2020/01/31 | 2590 | macros/latex/contrib/unicode-math/um-doc-legacyfontdimen.tex 2020/01/31 | 2578 | macros/latex/required/tools/multicol.ins 2020/01/31 | 2578 | macros/latex-dev/required/tools/multicol.ins 2020/01/31 | 2540 | macros/latex/required/tools/longtable.ins @@ -2058,7 +3085,6 @@ 2020/01/31 | 24649 | macros/latex/required/tools/trace.dtx 2020/01/31 | 24649 | macros/latex-dev/required/tools/trace.dtx 2020/01/31 | 2456 | macros/latex/contrib/jmlr/sample-books/bookLogo-gray.png -2020/01/31 | 241265 | macros/latex/contrib/unicode-math/unicode-math-table.tex 2020/01/31 | 2407514 | install/macros/generic/xint.tds.zip 2020/01/31 | 24016 | macros/latex-dev/base/lterror.dtx 2020/01/31 | 24016 | macros/latex/base/lterror.dtx @@ -2066,6 +3092,7 @@ 2020/01/31 | 23652 | macros/latex/base/ltnews30.tex 2020/01/31 | 23521 | macros/latex-dev/base/fix-cm.dtx 2020/01/31 | 23521 | macros/latex/base/fix-cm.dtx +2020/01/31 | 2336 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex 2020/01/31 | 22676 | macros/latex-dev/base/ltcounts.dtx 2020/01/31 | 22676 | macros/latex/base/ltcounts.dtx 2020/01/31 | 22457 | macros/latex-dev/base/cfgguide.tex @@ -2074,13 +3101,11 @@ 2020/01/31 | 2226 | macros/latex/required/tools/indentfirst.dtx 2020/01/31 | 2226 | macros/latex-dev/required/tools/indentfirst.dtx 2020/01/31 | 220392 | macros/latex/required/amsmath/amsmath.dtx -2020/01/31 | 21851 | macros/latex/contrib/unicode-math/unimath-example.pdf 2020/01/31 | 212418 | macros/latex/contrib/jmlr/jmlr.dtx 2020/01/31 | 20994 | macros/latex/required/graphics/rotating.dtx 2020/01/31 | 20994 | macros/latex-dev/required/graphics/rotating.dtx 2020/01/31 | 207788 | systems/texlive/tlnet/archive/texlive-scripts.doc.r53602.tar.xz 2020/01/31 | 2067919 | install/macros/latex/contrib/jmlr.tds.zip -2020/01/31 | 2053 | macros/latex/contrib/unicode-math/unicode-math.ins 2020/01/31 | 20434 | macros/latex-dev/base/lgc2.err 2020/01/31 | 20434 | macros/latex/base/lgc2.err 2020/01/31 | 2042088 | macros/latex/contrib/jmlr.zip @@ -2089,16 +3114,12 @@ 2020/01/31 | 20302 | macros/latex-dev/base/ltnews.cls 2020/01/31 | 20302 | macros/latex/base/ltnews.cls 2020/01/31 | 19827 | macros/luatex/generic/barracuda/test/test-code39/003-code39-test.pdf -2020/01/31 | 19520 | macros/latex/contrib/unicode-math/um-code-usv.dtx 2020/01/31 | 1938 | macros/latex-dev/base/minimal.cls 2020/01/31 | 1938 | macros/latex/base/minimal.cls -2020/01/31 | 19106 | macros/latex/contrib/unicode-math/LICENSE 2020/01/31 | 19040 | macros/latex-dev/base/lppl.txt 2020/01/31 | 19040 | macros/latex/base/lppl.txt 2020/01/31 | 18941 | macros/latex-dev/base/ltnews29.tex 2020/01/31 | 18941 | macros/latex/base/ltnews29.tex -2020/01/31 | 18915 | macros/latex/contrib/unicode-math/um-code-mathmap.dtx -2020/01/31 | 1873940 | install/macros/latex/contrib/unicode-math.tds.zip 2020/01/31 | 18558 | macros/latex-dev/base/ltxdoc.dtx 2020/01/31 | 18558 | macros/latex/base/ltxdoc.dtx 2020/01/31 | 1849 | macros/latex/contrib/jmlr/README @@ -2128,8 +3149,6 @@ 2020/01/31 | 1648 | systems/texlive/tlnet/archive/bxghost.r53606.tar.xz 2020/01/31 | 163680 | macros/latex-dev/base/docstrip.dtx 2020/01/31 | 163680 | macros/latex/base/docstrip.dtx -2020/01/31 | 1627 | macros/latex/contrib/unicode-math/um-doc-stixextract.tex -2020/01/31 | 162723 | macros/latex/contrib/unicode-math/unicode-math.pdf 2020/01/31 | 16234 | macros/latex-dev/base/modguide.tex 2020/01/31 | 16234 | macros/latex/base/modguide.tex 2020/01/31 | 1595334 | macros/generic/xint/xint.dtx @@ -2144,9 +3163,7 @@ 2020/01/31 | 155549 | macros/latex/base/classes.dtx 2020/01/31 | 15430 | macros/latex/required/graphics/graphics-2017-06-25.sty 2020/01/31 | 15430 | macros/latex-dev/required/graphics/graphics-2017-06-25.sty -2020/01/31 | 15419 | macros/latex/contrib/unicode-math/CHANGES.md 2020/01/31 | 153792 | fonts/sansmathaccent/sansmathaccent.pdf -2020/01/31 | 15373 | macros/latex/contrib/unicode-math/unimath-symbols.ltx 2020/01/31 | 1512 | macros/latex/contrib/jmlr/INSTALL 2020/01/31 | 14890 | macros/latex-dev/base/ltnews28.tex 2020/01/31 | 14890 | macros/latex/base/ltnews28.tex @@ -2185,8 +3202,6 @@ 2020/01/31 | 13305 | macros/latex-dev/base/proc.dtx 2020/01/31 | 13305 | macros/latex/base/proc.dtx 2020/01/31 | 131956 | systems/texlive/tlnet/archive/texlive-scripts.r53602.tar.xz -2020/01/31 | 13133 | macros/latex/contrib/unicode-math/um-code-epilogue.dtx -2020/01/31 | 13074 | macros/latex/contrib/unicode-math/um-code-fontparam.dtx 2020/01/31 | 1299 | fonts/sansmathaccent/ot1mathkerncmss.fd 2020/01/31 | 12946 | macros/latex-dev/base/manual.err 2020/01/31 | 12946 | macros/latex/base/manual.err @@ -2203,19 +3218,16 @@ 2020/01/31 | 12225 | macros/latex/base/ltnews24.tex 2020/01/31 | 12120 | macros/latex-dev/base/tulm.fdd 2020/01/31 | 12120 | macros/latex/base/tulm.fdd -2020/01/31 | 1194223 | macros/latex/contrib/unicode-math/unimath-symbols.pdf -2020/01/31 | 1190 | macros/latex/contrib/unicode-math/um-code-api.dtx 2020/01/31 | 11750 | macros/latex/required/tools/array-2016-10-06.sty 2020/01/31 | 11750 | macros/latex-dev/required/tools/array-2016-10-06.sty -2020/01/31 | 11459 | macros/latex/contrib/unicode-math/um-code-primes.dtx 2020/01/31 | 11443 | macros/latex-dev/base/ltpage.dtx 2020/01/31 | 11443 | macros/latex/base/ltpage.dtx 2020/01/31 | 11409 | macros/latex/required/amsmath/amstext.dtx 2020/01/31 | 1133 | macros/latex/contrib/jmlr/jmlr.ins 2020/01/31 | 11291 | macros/latex/required/amsmath/amscd.dtx -2020/01/31 | 11242 | macros/latex/contrib/unicode-math/um-code-opening.dtx 2020/01/31 | 11154 | macros/latex/required/tools/hhline.dtx 2020/01/31 | 11154 | macros/latex-dev/required/tools/hhline.dtx +2020/01/31 | 1104 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex 2020/01/31 | 1097288 | systems/texlive/tlnet/archive/suftesi.doc.r53608.tar.xz 2020/01/31 | 108336 | macros/generic/xint/CHANGES.html 2020/01/31 | 10777 | macros/latex/required/tools/fontsmpl.dtx @@ -2234,374 +3246,11 @@ 2020/01/31 | 10650 | macros/latex-dev/required/tools/enumerate.dtx 2020/01/31 | 10606 | macros/latex-dev/base/makeindx.dtx 2020/01/31 | 10606 | macros/latex/base/makeindx.dtx -2020/01/31 | 1044 | macros/latex/contrib/unicode-math/unicode-math.ltx 2020/01/31 | 104495 | macros/latex/required/amsmath/amsldoc.tex -2020/01/31 | 10420 | macros/latex/contrib/unicode-math/um-doc-mathfontdimen.tex 2020/01/31 | 10376 | macros/latex-dev/base/ltfsscmp.dtx 2020/01/31 | 10376 | macros/latex/base/ltfsscmp.dtx 2020/01/31 | 103573 | macros/latex/required/tools/varioref.dtx 2020/01/31 | 103573 | macros/latex-dev/required/tools/varioref.dtx 2020/01/31 | 1028 | macros/latex/contrib/jmlr/sample-books/paper3/paper3.tex -2020/01/31 | 10279 | macros/latex/contrib/unicode-math/um-code-mathtext.dtx 2020/01/31 | 10053 | macros/latex-dev/base/webcomp.err 2020/01/31 | 10053 | macros/latex/base/webcomp.err -2020/01/30 | 98409 | fonts/mpfonts/type3/mpfonts-tipa/tipxsi10.t3 -2020/01/30 | 98389 | fonts/mpfonts/type3/mpfonts-tipa/xipxsi10.t3 -2020/01/30 | 98325 | fonts/mpfonts/type3/mpfonts-tipa/tipxss8.t3 -2020/01/30 | 98308 | fonts/mpfonts/type3/mpfonts-tipa/tipxss12.t3 -2020/01/30 | 98243 | fonts/mpfonts/type3/mpfonts-tipa/xipxsb10.t3 -2020/01/30 | 98206 | fonts/mpfonts/type3/mpfonts-tipa/tipxss17.t3 -2020/01/30 | 98173 | fonts/mpfonts/type3/mpfonts-tipa/xipxss10.t3 -2020/01/30 | 98163 | fonts/mpfonts/type3/mpfonts-tipa/tipxss10.t3 -2020/01/30 | 980 | fonts/mpfonts/type3/mpfonts-latex-fonts/sroman.t3 -2020/01/30 | 98099 | fonts/mpfonts/type3/mpfonts-tipa/tipxss9.t3 -2020/01/30 | 95921 | fonts/modes/modes.mf -2020/01/30 | 9332 | systems/texlive/tlnet/archive/curve2e.r53595.tar.xz -2020/01/30 | 93256 | macros/latex/contrib/babel-contrib/french/frenchb-doc.tex -2020/01/30 | 9320 | fonts/mpfonts/type3/mpfonts-latex-fonts/icmex10.t3 -2020/01/30 | 9311 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy5.t3 -2020/01/30 | 9310 | fonts/mpfonts/type3/mpfonts-latex-fonts/icmcsc10.t3 -2020/01/30 | 9294 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy6.t3 -2020/01/30 | 9294 | fonts/mpfonts/type3/mpfonts-latex-fonts/ilcmssb8.t3 -2020/01/30 | 9286 | fonts/mpfonts/type3/mpfonts-latex-fonts/ilcmssi8.t3 -2020/01/30 | 9286 | fonts/mpfonts/type3/mpfonts-latex-fonts/icmsy8.t3 -2020/01/30 | 9285 | fonts/mpfonts/type3/mpfonts-latex-fonts/ilcmss8.t3 -2020/01/30 | 9277 | fonts/mpfonts/type3/mpfonts-latex-fonts/icmtt8.t3 -2020/01/30 | 9277 | fonts/mpfonts/type3/mpfonts-latex-fonts/icmmi8.t3 -2020/01/30 | 9258 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy10.t3 -2020/01/30 | 9257 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasyb10.t3 -2020/01/30 | 9250 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy9.t3 -2020/01/30 | 9226 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy8.t3 -2020/01/30 | 9225 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy7.t3 -2020/01/30 | 888860 | macros/xetex/latex/bidi/bidi.dtx -2020/01/30 | 85810 | fonts/mpfonts/type3/mpfonts-cm/cmex9.t3 -2020/01/30 | 85810 | fonts/mpfonts/type3/mpfonts-amsfonts/cmex9.t3 -2020/01/30 | 85796 | fonts/mpfonts/type3/mpfonts-amsfonts/cmex8.t3 -2020/01/30 | 85698 | fonts/mpfonts/type3/mpfonts-amsfonts/cmex7.t3 -2020/01/30 | 85615 | fonts/mpfonts/type3/mpfonts-cm/cmex10.t3 -2020/01/30 | 8451 | fonts/mpfonts/type3/mpfonts-tipa/tipx.t3 -2020/01/30 | 801090 | systems/win32/miktex/tm/packages/polyglossia.tar.lzma -2020/01/30 | 7856 | macros/pdftex/mptopdf/tex/context/base/mkii/syst-tex.mkii -2020/01/30 | 761651 | macros/xetex/latex/bidi/gull.jpg -2020/01/30 | 732 | macros/pdftex/mptopdf/doc/context/scripts/mkii/mptopdf.man -2020/01/30 | 7218 | fonts/mpfonts/map/mpfonts.map -2020/01/30 | 71627 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-pdf.mkii -2020/01/30 | 685792 | systems/win32/w32tex/extractpdfmark-w32.tar.xz -2020/01/30 | 6266992 | systems/win32/w32tex/win64/pdftex-w64.tar.xz -2020/01/30 | 6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx -2020/01/30 | 594300 | systems/win32/w32tex/win64/extractpdfmark-w64.tar.xz -2020/01/30 | 5928 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx -2020/01/30 | 567952 | systems/texlive/tlnet/archive/polyglossia.doc.r53592.tar.xz -2020/01/30 | 535 | macros/xetex/latex/bidi/bidi-doc.ltx -2020/01/30 | 5322 | macros/pdftex/mptopdf/tex/generic/context/mptopdf/mptopdf.tex -2020/01/30 | 50354 | fonts/mpfonts/type3/mpfonts-amsfonts/amsyb.t3 -2020/01/30 | 48684 | systems/texlive/tlnet/archive/fmtcount.source.r53591.tar.xz -2020/01/30 | 486172 | macros/latex/contrib/babel-contrib/french.zip -2020/01/30 | 48415 | fonts/mpfonts/type3/mpfonts-amsfonts/amsya.t3 -2020/01/30 | 4772 | fonts/mpfonts/type3/mpfonts-cmll/llsymbols.t3 -2020/01/30 | 46912 | systems/texlive/tlnet/archive/nwejm.source.r53597.tar.xz -2020/01/30 | 4608 | macros/pdftex/mptopdf/scripts/context/stubs/mswin/mptopdf.exe -2020/01/30 | 4569 | fonts/mpfonts/type3/mpfonts-latex-fonts/lasy.t3 -2020/01/30 | 4557 | macros/pdftex/mptopdf/scripts/context/perl/mptopdf.pl -2020/01/30 | 4555171 | systems/win32/miktex/tm/packages/nimbus15.tar.lzma -2020/01/30 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx -2020/01/30 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx -2020/01/30 | 44868 | systems/texlive/tlnet/archive/pst-eucl.r53594.tar.xz -2020/01/30 | 44068 | systems/texlive/tlnet/archive/curve2e.source.r53595.tar.xz -2020/01/30 | 43828 | systems/texlive/tlnet/archive/fontools.r53593.tar.xz -2020/01/30 | 43325 | fonts/mpfonts/type3/mpfonts-cm/cminch.t3 -2020/01/30 | 42831 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mpe.mkii -2020/01/30 | 4193 | fonts/modes/GNUmakefile -2020/01/30 | 40893 | fonts/mpfonts/type3/mpfonts-cm/mathsy.t3 -2020/01/30 | 4047956 | systems/texlive/tlnet/archive/nwejm.r53597.tar.xz -2020/01/30 | 400164 | systems/texlive/tlnet/archive/fmtcount.doc.r53591.tar.xz -2020/01/30 | 389 | fonts/mpfonts/type3/mpfonts-cmfrak/xxfrak.t3 -2020/01/30 | 389104 | systems/win32/miktex/tm/packages/hycolor.tar.lzma -2020/01/30 | 388 | fonts/mpfonts/type3/mpfonts-amsfonts/dummy.t3 -2020/01/30 | 3775848 | install/macros/xetex/latex/bidi.tds.zip -2020/01/30 | 36571 | fonts/mpfonts/type3/mpfonts-latex-fonts/lcirclew10.t3 -2020/01/30 | 36548 | fonts/mpfonts/type3/mpfonts-latex-fonts/lcircle10.t3 -2020/01/30 | 3598 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx -2020/01/30 | 358618 | systems/win32/miktex/tm/packages/musicography.tar.lzma -2020/01/30 | 3542 | fonts/mpfonts/type3/mpfonts-cm/title.t3 -2020/01/30 | 353768 | systems/texlive/tlnet/archive/musicography.doc.r53596.tar.xz -2020/01/30 | 34336 | systems/texlive/tlnet/archive/tuda-ci.r53598.tar.xz -2020/01/30 | 33144 | fonts/mpfonts/type3/mpfonts-latex-fonts/linew10.t3 -2020/01/30 | 33076 | fonts/mpfonts/type3/mpfonts-latex-fonts/line10.t3 -2020/01/30 | 33054 | fonts/mpfonts/type3/mpfonts-cmll/eullbx6.t3 -2020/01/30 | 33022 | fonts/mpfonts/type3/mpfonts-cmll/eullbx5.t3 -2020/01/30 | 33015 | fonts/mpfonts/type3/mpfonts-cmll/eullr5.t3 -2020/01/30 | 32961 | fonts/mpfonts/type3/mpfonts-cmll/eullr6.t3 -2020/01/30 | 32903 | fonts/mpfonts/type3/mpfonts-cmll/eullbx7.t3 -2020/01/30 | 32873 | fonts/mpfonts/type3/mpfonts-cmll/eullbx8.t3 -2020/01/30 | 32856 | fonts/mpfonts/type3/mpfonts-cmll/eullbx10.t3 -2020/01/30 | 32831 | fonts/mpfonts/type3/mpfonts-cmll/eullr7.t3 -2020/01/30 | 32818 | fonts/mpfonts/type3/mpfonts-cmll/eullbx9.t3 -2020/01/30 | 32768 | fonts/mpfonts/type3/mpfonts-cmll/eullr10.t3 -2020/01/30 | 32765 | fonts/mpfonts/type3/mpfonts-cmll/eullr8.t3 -2020/01/30 | 32734 | fonts/mpfonts/type3/mpfonts-fge/fgeit10.t3 -2020/01/30 | 32697 | fonts/mpfonts/type3/mpfonts-cmll/eullr9.t3 -2020/01/30 | 326723 | fonts/mpfonts/type3/mpfonts-amsfonts/wncysc10.t3 -2020/01/30 | 319085 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr5.t3 -2020/01/30 | 318634 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr6.t3 -2020/01/30 | 318443 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr8.t3 -2020/01/30 | 318324 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr9.t3 -2020/01/30 | 318215 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr7.t3 -2020/01/30 | 317539 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyr10.t3 -2020/01/30 | 3130 | language/japanese/BX/bxghost.zip -2020/01/30 | 3112 | systems/texlive/tlnet/archive/musicography.r53596.tar.xz -2020/01/30 | 310605 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb5.t3 -2020/01/30 | 310467 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb7.t3 -2020/01/30 | 310194 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb6.t3 -2020/01/30 | 309429 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb8.t3 -2020/01/30 | 303042 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb9.t3 -2020/01/30 | 3029 | macros/latex/contrib/babel-contrib/french/frenchb.ins -2020/01/30 | 302779 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyb10.t3 -2020/01/30 | 302710 | fonts/modes.zip -2020/01/30 | 2936 | macros/xetex/latex/bidi/bibitem.pdf -2020/01/30 | 2889 | language/japanese/BX/bxghost/bxghost.sty -2020/01/30 | 284716996 | systems/win32/w32tex/pstricks.tar.xz -2020/01/30 | 278800 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi10.t3 -2020/01/30 | 278678 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi7.t3 -2020/01/30 | 278657 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi6.t3 -2020/01/30 | 278640 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi8.t3 -2020/01/30 | 278323 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi9.t3 -2020/01/30 | 278150 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyi5.t3 -2020/01/30 | 27680 | fonts/mpfonts/type3/mpfonts-cmll/cmllr6.t3 -2020/01/30 | 27680 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx6.t3 -2020/01/30 | 27631 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx8.t3 -2020/01/30 | 27623 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx7.t3 -2020/01/30 | 27619 | fonts/mpfonts/type3/mpfonts-cmll/cmllr5.t3 -2020/01/30 | 27600 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx10.t3 -2020/01/30 | 27570 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx9.t3 -2020/01/30 | 27553 | fonts/mpfonts/type3/mpfonts-cmll/cmllr7.t3 -2020/01/30 | 27550 | fonts/mpfonts/type3/mpfonts-cmll/cmllr10.t3 -2020/01/30 | 27546 | fonts/mpfonts/type3/mpfonts-cmll/cmllr8.t3 -2020/01/30 | 27544 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx12.t3 -2020/01/30 | 27510 | fonts/mpfonts/type3/mpfonts-cmll/cmllr12.t3 -2020/01/30 | 27445 | fonts/mpfonts/type3/mpfonts-cmll/cmllr9.t3 -2020/01/30 | 27396 | fonts/mpfonts/type3/mpfonts-cmll/cmllr17.t3 -2020/01/30 | 273901 | systems/win32/miktex/tm/packages/semantic-markup.tar.lzma -2020/01/30 | 27241 | fonts/mpfonts/type3/mpfonts-cmll/cmllbx5.t3 -2020/01/30 | 26592 | systems/texlive/tlnet/archive/fmtcount.r53591.tar.xz -2020/01/30 | 26587 | fonts/mpfonts/COPYING -2020/01/30 | 265595 | fonts/modes/modes.pdf -2020/01/30 | 261342 | fonts/mpfonts/type3/mpfonts-cm/cmsl9.t3 -2020/01/30 | 261119 | fonts/mpfonts/type3/mpfonts-cm/cmr7.t3 -2020/01/30 | 261098 | fonts/mpfonts/type3/mpfonts-cm/cmsl12.t3 -2020/01/30 | 261044 | fonts/mpfonts/type3/mpfonts-cm/cmsl8.t3 -2020/01/30 | 260959 | fonts/mpfonts/type3/mpfonts-cm/cmr6.t3 -2020/01/30 | 260951 | fonts/mpfonts/type3/mpfonts-cm/cmr9.t3 -2020/01/30 | 260805 | fonts/mpfonts/type3/mpfonts-cm/cmr8.t3 -2020/01/30 | 260640 | fonts/mpfonts/type3/mpfonts-cm/cmr12.t3 -2020/01/30 | 260488 | fonts/mpfonts/type3/mpfonts-cm/cmsl10.t3 -2020/01/30 | 260395 | fonts/mpfonts/type3/mpfonts-cm/cmr10.t3 -2020/01/30 | 260247 | fonts/mpfonts/type3/mpfonts-cm/cmdunh10.t3 -2020/01/30 | 259431 | fonts/mpfonts/type3/mpfonts-cm/cmr17.t3 -2020/01/30 | 259176 | fonts/mpfonts/type3/mpfonts-cm/cmfib8.t3 -2020/01/30 | 2559288 | macros/xetex/latex/bidi/bidi.pdf -2020/01/30 | 254422 | fonts/mpfonts/type3/mpfonts-cm/cmbx6.t3 -2020/01/30 | 254135 | fonts/mpfonts/type3/mpfonts-cm/cmbx8.t3 -2020/01/30 | 25409 | fonts/mpfonts/type3/mpfonts-cmll/lleusym.t3 -2020/01/30 | 254067 | fonts/mpfonts/type3/mpfonts-cm/cmbx7.t3 -2020/01/30 | 253973 | fonts/mpfonts/type3/mpfonts-cm/cmbxsl10.t3 -2020/01/30 | 253865 | fonts/mpfonts/type3/mpfonts-cm/cmbx10.t3 -2020/01/30 | 253671 | fonts/mpfonts/type3/mpfonts-cm/cmbx9.t3 -2020/01/30 | 253608 | fonts/mpfonts/type3/mpfonts-cm/cmb10.t3 -2020/01/30 | 253546 | fonts/mpfonts/type3/mpfonts-cm/cmbx12.t3 -2020/01/30 | 252912 | fonts/mpfonts/type3/mpfonts-cm/cmbx5.t3 -2020/01/30 | 251015 | fonts/mpfonts/type3/mpfonts-cm/cmff10.t3 -2020/01/30 | 246075 | macros/latex/contrib/babel-contrib/french/frenchb.pdf -2020/01/30 | 245044 | fonts/mpfonts/type3/mpfonts-amsfonts/cmcsc8.t3 -2020/01/30 | 244809 | fonts/mpfonts/type3/mpfonts-amsfonts/cmcsc9.t3 -2020/01/30 | 244211 | fonts/mpfonts/type3/mpfonts-cm/cmcsc10.t3 -2020/01/30 | 240704 | fonts/mpfonts/type3/mpfonts-cm/cmr5.t3 -2020/01/30 | 23945 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx -2020/01/30 | 237513 | fonts/mpfonts/type3/mpfonts-cm/cmu10.t3 -2020/01/30 | 236944 | fonts/mpfonts/type3/mpfonts-cm/cmbxti10.t3 -2020/01/30 | 236758 | fonts/mpfonts/type3/mpfonts-cm/cmti10.t3 -2020/01/30 | 236701 | fonts/mpfonts/type3/mpfonts-cm/cmti7.t3 -2020/01/30 | 236648 | fonts/mpfonts/type3/mpfonts-cm/cmti12.t3 -2020/01/30 | 236634 | fonts/mpfonts/type3/mpfonts-cm/cmti8.t3 -2020/01/30 | 236486 | fonts/mpfonts/type3/mpfonts-cm/cmti9.t3 -2020/01/30 | 235738 | macros/latex/contrib/babel-contrib/french/frenchb.dtx -2020/01/30 | 23279 | fonts/mpfonts/type3/mpfonts-cmll/cmllssbx10.t3 -2020/01/30 | 231441 | fonts/mpfonts/type3/mpfonts-cm/cmfi10.t3 -2020/01/30 | 23090 | fonts/mpfonts/type3/mpfonts-cmll/cmllss10.t3 -2020/01/30 | 23054 | fonts/mpfonts/type3/mpfonts-cmll/cmllss8.t3 -2020/01/30 | 23046 | fonts/mpfonts/type3/mpfonts-cmll/cmllss12.t3 -2020/01/30 | 22979 | fonts/mpfonts/type3/mpfonts-cmll/cmllss9.t3 -2020/01/30 | 22936 | fonts/mpfonts/type3/mpfonts-cmll/cmllss17.t3 -2020/01/30 | 227697 | fonts/mpfonts/type3/mpfonts-cm/cmvtt10.t3 -2020/01/30 | 221217 | fonts/mpfonts/type3/mpfonts-amsfonts/cmmib5.t3 -2020/01/30 | 221091 | fonts/mpfonts/type3/mpfonts-amsfonts/cmmib6.t3 -2020/01/30 | 220845 | fonts/mpfonts/type3/mpfonts-cm/cmmi5.t3 -2020/01/30 | 220785 | fonts/mpfonts/type3/mpfonts-cm/cmmi6.t3 -2020/01/30 | 220604 | fonts/mpfonts/type3/mpfonts-cm/cmmib10.t3 -2020/01/30 | 220568 | fonts/mpfonts/type3/mpfonts-cm/cmmi7.t3 -2020/01/30 | 220446 | fonts/mpfonts/type3/mpfonts-amsfonts/cmmib7.t3 -2020/01/30 | 220310 | fonts/mpfonts/type3/mpfonts-amsfonts/cmmib8.t3 -2020/01/30 | 220272 | fonts/mpfonts/type3/mpfonts-cm/cmmi10.t3 -2020/01/30 | 220267 | fonts/mpfonts/type3/mpfonts-cm/cmmi9.t3 -2020/01/30 | 220218 | fonts/mpfonts/type3/mpfonts-cm/cmmi8.t3 -2020/01/30 | 220035 | fonts/mpfonts/type3/mpfonts-amsfonts/cmmib9.t3 -2020/01/30 | 220029 | fonts/mpfonts/type3/mpfonts-cm/cmmi12.t3 -2020/01/30 | 21474 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mis.mkii -2020/01/30 | 214332 | fonts/mpfonts/type3/mpfonts-cm/cmtcsc10.t3 -2020/01/30 | 212290 | fonts/mpfonts/type3/mpfonts-cm/cmtt12.t3 -2020/01/30 | 211620 | fonts/mpfonts/type3/mpfonts-cm/cmtt10.t3 -2020/01/30 | 211564 | fonts/mpfonts/type3/mpfonts-cm/cmtt8.t3 -2020/01/30 | 211442 | fonts/mpfonts/type3/mpfonts-cm/cmtt9.t3 -2020/01/30 | 209118 | fonts/mpfonts/type3/mpfonts-cm/cmsltt10.t3 -2020/01/30 | 208843 | macros/xetex/latex/bidi/bidi-doc.pdf -2020/01/30 | 20606 | graphics/pgf/contrib/lie-hasse/lie-hasse.bib -2020/01/30 | 20174 | fonts/mpfonts/type3/mpfonts-cm/mathex.t3 -2020/01/30 | 200283 | fonts/mpfonts/type3/mpfonts-cm/cmitt10.t3 -2020/01/30 | 1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx -2020/01/30 | 194558 | fonts/mpfonts/type3/mpfonts-tipa/tipasl9.t3 -2020/01/30 | 194535 | fonts/mpfonts/type3/mpfonts-tipa/tipa9.t3 -2020/01/30 | 194453 | fonts/mpfonts/type3/mpfonts-tipa/tipa10.t3 -2020/01/30 | 194398 | fonts/mpfonts/type3/mpfonts-tipa/tipasl10.t3 -2020/01/30 | 194356 | fonts/mpfonts/type3/mpfonts-tipa/tipasl12.t3 -2020/01/30 | 194236 | fonts/mpfonts/type3/mpfonts-tipa/tipa8.t3 -2020/01/30 | 194212 | fonts/mpfonts/type3/mpfonts-tipa/tipasl8.t3 -2020/01/30 | 194149 | fonts/mpfonts/type3/mpfonts-tipa/tipa12.t3 -2020/01/30 | 193583 | fonts/mpfonts/type3/mpfonts-tipa/tipa17.t3 -2020/01/30 | 1914 | fonts/mpfonts/type3/mpfonts-fge/fgeit.t3 -2020/01/30 | 191127 | fonts/mpfonts/type3/mpfonts-tipa/tipabx8.t3 -2020/01/30 | 190940 | fonts/mpfonts/type3/mpfonts-tipa/tipabx9.t3 -2020/01/30 | 190783 | fonts/mpfonts/type3/mpfonts-tipa/tipabs10.t3 -2020/01/30 | 190640 | fonts/mpfonts/type3/mpfonts-tipa/tipabx10.t3 -2020/01/30 | 190390 | fonts/mpfonts/type3/mpfonts-tipa/tipabx12.t3 -2020/01/30 | 190334 | fonts/mpfonts/type3/mpfonts-tipa/tipab10.t3 -2020/01/30 | 19008 | fonts/mpfonts/type3/mpfonts-cm/texset.t3 -2020/01/30 | 187226 | fonts/mpfonts/type3/mpfonts-cm/cmtex10.t3 -2020/01/30 | 187182 | fonts/mpfonts/type3/mpfonts-cm/cmtex8.t3 -2020/01/30 | 187148 | fonts/mpfonts/type3/mpfonts-cm/cmtex9.t3 -2020/01/30 | 185723 | fonts/mpfonts/type3/mpfonts-cmfrak/cmfrak.t3 -2020/01/30 | 1825724 | macros/latex/contrib/unicode-math.zip -2020/01/30 | 1819 | language/japanese/BX/bxghost/README.md -2020/01/30 | 17869 | macros/xetex/latex/bidi/bidi-logo.pdf -2020/01/30 | 175541 | fonts/mpfonts/type3/mpfonts-tipa/xipasl10.t3 -2020/01/30 | 175196 | fonts/mpfonts/type3/mpfonts-tipa/xipa10.t3 -2020/01/30 | 173626 | fonts/mpfonts/type3/mpfonts-tipa/tipatt10.t3 -2020/01/30 | 173610 | fonts/mpfonts/type3/mpfonts-tipa/tipatt12.t3 -2020/01/30 | 173581 | fonts/mpfonts/type3/mpfonts-tipa/tipatt8.t3 -2020/01/30 | 173476 | fonts/mpfonts/type3/mpfonts-tipa/tipatt9.t3 -2020/01/30 | 171770 | fonts/mpfonts/type3/mpfonts-tipa/xipabs10.t3 -2020/01/30 | 17171 | fonts/mpfonts/type3/mpfonts-fge/fgerm.t3 -2020/01/30 | 171658 | fonts/mpfonts/type3/mpfonts-tipa/tipats10.t3 -2020/01/30 | 171460 | fonts/mpfonts/type3/mpfonts-tipa/xipab10.t3 -2020/01/30 | 170051 | systems/win32/miktex/tm/packages/fontools.tar.lzma -2020/01/30 | 169748 | fonts/mpfonts/type3/mpfonts-cmfrak/dcfrak.t3 -2020/01/30 | 1693 | macros/xetex/latex/bidi/picture.jpg -2020/01/30 | 1666 | macros/xetex/latex/bidi/bidi-doc-title.ltx -2020/01/30 | 16603 | macros/luatex/generic/luaotfload/luaotfload-latex.tex -2020/01/30 | 163788 | fonts/mpfonts/type3/mpfonts-fge/fgerm10.t3 -2020/01/30 | 156507 | macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf -2020/01/30 | 1561 | macros/latex/contrib/babel-contrib/french/README.md -2020/01/30 | 1557104 | systems/texlive/tlnet/archive/nwejm.doc.r53597.tar.xz -2020/01/30 | 1544 | fonts/mpfonts/README -2020/01/30 | 15299 | fonts/modes/ChangeLog -2020/01/30 | 149883 | fonts/mpfonts/type3/mpfonts-tipa/tipx9.t3 -2020/01/30 | 149853 | fonts/mpfonts/type3/mpfonts-tipa/tipx8.t3 -2020/01/30 | 149752 | fonts/mpfonts/type3/mpfonts-tipa/tipxsl9.t3 -2020/01/30 | 149743 | fonts/mpfonts/type3/mpfonts-tipa/tipxsl8.t3 -2020/01/30 | 149641 | fonts/mpfonts/type3/mpfonts-tipa/tipxsl12.t3 -2020/01/30 | 149640 | fonts/mpfonts/type3/mpfonts-tipa/tipx10.t3 -2020/01/30 | 149582 | fonts/mpfonts/type3/mpfonts-tipa/tipx12.t3 -2020/01/30 | 149533 | fonts/mpfonts/type3/mpfonts-tipa/tipxsl10.t3 -2020/01/30 | 149167 | fonts/mpfonts/type3/mpfonts-tipa/tipx17.t3 -2020/01/30 | 14908 | fonts/mpfonts/type3/mpfonts-cm/mathit.t3 -2020/01/30 | 1484 | fonts/mpfonts/type3/mpfonts-latex-fonts/ilasy8.t3 -2020/01/30 | 148359 | fonts/mpfonts/type3/mpfonts-tipa/tipxbx8.t3 -2020/01/30 | 148127 | fonts/mpfonts/type3/mpfonts-tipa/tipxbx9.t3 -2020/01/30 | 148080 | fonts/mpfonts/type3/mpfonts-tipa/tipxbs10.t3 -2020/01/30 | 148040 | fonts/mpfonts/type3/mpfonts-tipa/tipxbx10.t3 -2020/01/30 | 147942 | fonts/mpfonts/type3/mpfonts-tipa/tipxb10.t3 -2020/01/30 | 147905 | fonts/mpfonts/type3/mpfonts-tipa/tipxbx12.t3 -2020/01/30 | 147310 | fonts/mpfonts/type3/mpfonts-latex-fonts/lcmss8.t3 -2020/01/30 | 147247 | fonts/mpfonts/type3/mpfonts-cm/cmssdc10.t3 -2020/01/30 | 1470628 | systems/texlive/tlnet/archive/tuda-ci.doc.r53598.tar.xz -2020/01/30 | 146996 | fonts/mpfonts/type3/mpfonts-cm/cmssbx10.t3 -2020/01/30 | 146653 | fonts/mpfonts/type3/mpfonts-cm/cmssq8.t3 -2020/01/30 | 145916 | fonts/mpfonts/type3/mpfonts-latex-fonts/lcmssi8.t3 -2020/01/30 | 145317 | fonts/mpfonts/type3/mpfonts-cm/cmssqi8.t3 -2020/01/30 | 144354 | fonts/mpfonts/type3/mpfonts-latex-fonts/lcmssb8.t3 -2020/01/30 | 14430 | fonts/mpfonts/type3/mpfonts-cm/csc.t3 -2020/01/30 | 140928 | fonts/mpfonts/type3/mpfonts-cm/cmssi8.t3 -2020/01/30 | 140816 | fonts/mpfonts/type3/mpfonts-cm/cmssi17.t3 -2020/01/30 | 140753 | fonts/mpfonts/type3/mpfonts-cm/cmss8.t3 -2020/01/30 | 140519 | fonts/mpfonts/type3/mpfonts-cm/cmssi9.t3 -2020/01/30 | 140510 | fonts/mpfonts/type3/mpfonts-cm/cmssi12.t3 -2020/01/30 | 140482 | fonts/mpfonts/type3/mpfonts-cm/cmss17.t3 -2020/01/30 | 140470 | fonts/mpfonts/type3/mpfonts-cm/cmssi10.t3 -2020/01/30 | 140312 | fonts/mpfonts/type3/mpfonts-cm/cmss9.t3 -2020/01/30 | 140191 | fonts/mpfonts/type3/mpfonts-cm/cmss12.t3 -2020/01/30 | 140151 | fonts/mpfonts/type3/mpfonts-cm/cmss10.t3 -2020/01/30 | 138192 | fonts/mpfonts/type3/mpfonts-tipa/tipxtt8.t3 -2020/01/30 | 137965 | fonts/mpfonts/type3/mpfonts-tipa/tipxtt10.t3 -2020/01/30 | 137811 | fonts/mpfonts/type3/mpfonts-tipa/tipxtt9.t3 -2020/01/30 | 137765 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyss8.t3 -2020/01/30 | 137491 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyss9.t3 -2020/01/30 | 137305 | fonts/mpfonts/type3/mpfonts-amsfonts/wncyss10.t3 -2020/01/30 | 137257 | fonts/mpfonts/type3/mpfonts-tipa/tipxtt12.t3 -2020/01/30 | 135915 | fonts/mpfonts/type3/mpfonts-tipa/tipxts10.t3 -2020/01/30 | 134920 | fonts/mpfonts/type3/mpfonts-tipa/xipxsl10.t3 -2020/01/30 | 134853 | fonts/mpfonts/type3/mpfonts-tipa/xipx10.t3 -2020/01/30 | 132933 | fonts/mpfonts/type3/mpfonts-tipa/xipxbs10.t3 -2020/01/30 | 132917 | fonts/mpfonts/type3/mpfonts-tipa/xipxb10.t3 -2020/01/30 | 13073 | fonts/mpfonts/type3/mpfonts-cm/textit.t3 -2020/01/30 | 1286 | macros/xetex/latex/bidi/bidi-doc-intro.ltx -2020/01/30 | 127958 | fonts/mpfonts/type3/mpfonts-tipa/tipasb10.t3 -2020/01/30 | 126696 | systems/texlive/tlnet/archive/fontools.doc.r53593.tar.xz -2020/01/30 | 1265441 | systems/win32/miktex/tm/packages/pst-eucl.tar.lzma -2020/01/30 | 12483 | fonts/mpfonts/type3/mpfonts-cm/roman.t3 -2020/01/30 | 122883 | fonts/mpfonts/type3/mpfonts-tipa/tipass8.t3 -2020/01/30 | 122808 | fonts/mpfonts/type3/mpfonts-tipa/xipasi10.t3 -2020/01/30 | 122648 | fonts/mpfonts/type3/mpfonts-tipa/tipasi10.t3 -2020/01/30 | 122608 | fonts/mpfonts/type3/mpfonts-tipa/xipass10.t3 -2020/01/30 | 122564 | fonts/mpfonts/type3/mpfonts-tipa/tipass17.t3 -2020/01/30 | 122557 | fonts/mpfonts/type3/mpfonts-tipa/tipass12.t3 -2020/01/30 | 122467 | fonts/mpfonts/type3/mpfonts-tipa/tipass9.t3 -2020/01/30 | 122375 | fonts/mpfonts/type3/mpfonts-tipa/tipass10.t3 -2020/01/30 | 122280 | systems/texlive/tlnet/archive/polyglossia.source.r53592.tar.xz -2020/01/30 | 1220684 | systems/texlive/tlnet/archive/pst-eucl.doc.r53594.tar.xz -2020/01/30 | 122007 | fonts/mpfonts/type3/mpfonts-tipa/xipasb10.t3 -2020/01/30 | 1214 | fonts/modes/modenames.txt -2020/01/30 | 1170741 | systems/win32/miktex/tm/packages/curve2e.tar.lzma -2020/01/30 | 11611 | fonts/mpfonts/type3/mpfonts-amsfonts/cyrfont.t3 -2020/01/30 | 11555 | fonts/mpfonts/type3/mpfonts-tipa/tipa.t3 -2020/01/30 | 11543 | fonts/mpfonts/type3/mpfonts-amsfonts/cyrital.t3 -2020/01/30 | 1151201 | systems/win32/miktex/tm/packages/suftesi.tar.lzma -2020/01/30 | 11422 | fonts/mpfonts/type3/mpfonts-amsfonts/cyrcsc.t3 -2020/01/30 | 112422 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm6.t3 -2020/01/30 | 112367 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm5.t3 -2020/01/30 | 112328 | systems/texlive/tlnet/archive/polyglossia.r53592.tar.xz -2020/01/30 | 112208 | fonts/mpfonts/type3/mpfonts-amsfonts/cmbsy5.t3 -2020/01/30 | 112179 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm10.t3 -2020/01/30 | 112128 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm9.t3 -2020/01/30 | 1121004 | systems/texlive/tlnet/archive/curve2e.doc.r53595.tar.xz -2020/01/30 | 112039 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm7.t3 -2020/01/30 | 111969 | fonts/mpfonts/type3/mpfonts-amsfonts/cmbsy6.t3 -2020/01/30 | 111890 | fonts/mpfonts/type3/mpfonts-amsfonts/cmbsy7.t3 -2020/01/30 | 111845 | fonts/mpfonts/type3/mpfonts-amsfonts/msbm8.t3 -2020/01/30 | 111640 | fonts/mpfonts/type3/mpfonts-cm/cmsy6.t3 -2020/01/30 | 111588 | fonts/mpfonts/type3/mpfonts-amsfonts/cmbsy8.t3 -2020/01/30 | 111513 | fonts/mpfonts/type3/mpfonts-cm/cmsy5.t3 -2020/01/30 | 111279 | fonts/mpfonts/type3/mpfonts-cm/cmbsy10.t3 -2020/01/30 | 111257 | fonts/mpfonts/type3/mpfonts-cm/cmsy7.t3 -2020/01/30 | 111202 | fonts/mpfonts/type3/mpfonts-amsfonts/cmbsy9.t3 -2020/01/30 | 111108 | fonts/mpfonts/type3/mpfonts-cm/cmsy8.t3 -2020/01/30 | 110981 | fonts/mpfonts/type3/mpfonts-cm/cmsy9.t3 -2020/01/30 | 110919 | fonts/mpfonts/type3/mpfonts-cm/cmsy10.t3 -2020/01/30 | 1086 | language/japanese/BX/bxghost/LICENSE -2020/01/30 | 10683 | fonts/modes/modelist.txt -2020/01/30 | 103760 | fonts/mpfonts/type3/mpfonts-amsfonts/msam6.t3 -2020/01/30 | 103693 | fonts/mpfonts/type3/mpfonts-amsfonts/msam5.t3 -2020/01/30 | 103319 | fonts/mpfonts/type3/mpfonts-amsfonts/msam7.t3 -2020/01/30 | 103154 | fonts/mpfonts/type3/mpfonts-amsfonts/msam8.t3 -2020/01/30 | 103090 | fonts/mpfonts/type3/mpfonts-amsfonts/msam9.t3 -2020/01/30 | 102662 | fonts/mpfonts/type3/mpfonts-amsfonts/msam10.t3 -2020/01/30 | 102644 | fonts/mpfonts/type3/mpfonts-tipa/tipxsb10.t3 -2020/01/30 | 1007 | macros/xetex/latex/bidi/README.txt diff --git a/fonts/step/README b/fonts/step/README index 4b1f5a9367..2d9cdcb929 100644 --- a/fonts/step/README +++ b/fonts/step/README @@ -1,11 +1,13 @@ -STEP fonts version 2.0.1a -October 23, 2019 +STEP fonts version 2.0.2 +February 6, 2020 -The STEP fonts are a free Times-like (i.e., Times replacement) font family, implementing -a design first created for The Times of London in 1932. These fonts are meant to be -compatible in design with Adobe’s digitization of Linotype Times, commonly used in -publishing. +The STEP fonts are a free Times-like (i.e., Times replacement) font family, +implementing a design first created for The Times of London in 1932. These fonts +are meant to be compatible in design with Adobe’s digitization of Linotype +Times, commonly used in professional publishing. -The fonts are available under the Open Font License (OFL) version 1.1. See STEP-COPYING. +The fonts are available under the Open Font License (OFL) version 1.1. +See STEP-COPYING for more details. -For contact, email the maintainer, Daniel Benjamin Miller <dbmiller@dbmiller.org>. +For contact, email the maintainer, Daniel Benjamin Miller +<dbmiller@dbmiller.org>. diff --git a/fonts/step/doc/step-fonts.aux b/fonts/step/doc/step-fonts.aux deleted file mode 100644 index 99a0a1a2ac..0000000000 --- a/fonts/step/doc/step-fonts.aux +++ /dev/null @@ -1,11 +0,0 @@ -\relax -\bbl@beforestart -\babel@aux{english}{} -\@writefile{toc}{\contentsline {section}{\numberline {1}History}{1}\protected@file@percent } -\@writefile{toc}{\contentsline {section}{\numberline {2}Why STEP?}{1}\protected@file@percent } -\@writefile{toc}{\contentsline {section}{\numberline {3}Usage with \texttt {fontspec}}{2}\protected@file@percent } -\@writefile{toc}{\contentsline {section}{\numberline {4}Usage with the \texttt {step} \LaTeX \ package}{2}\protected@file@percent } -\@writefile{toc}{\contentsline {subsection}{\numberline {4.1}Package Options}{3}\protected@file@percent } -\@writefile{toc}{\contentsline {subsection}{\numberline {4.2}Text Commands}{3}\protected@file@percent } -\@writefile{toc}{\contentsline {section}{\numberline {5}Contributing}{3}\protected@file@percent } -\@writefile{toc}{\contentsline {section}{\numberline {6}Licensing}{3}\protected@file@percent } diff --git a/fonts/step/doc/step-fonts.log b/fonts/step/doc/step-fonts.log deleted file mode 100644 index 4f75a8f701..0000000000 --- a/fonts/step/doc/step-fonts.log +++ /dev/null @@ -1,562 +0,0 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019) (preloaded format=pdflatex 2019.10.17) 24 OCT 2019 02:00 -entering extended mode - \write18 enabled. - %&-line parsing enabled. -**step-fonts.tex -(./step-fonts.tex -LaTeX2e <2019-10-01> patch level 1 -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/article.cls -Document Class: article 2019/08/27 v1.4j Standard LaTeX document class -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/size12.clo -File: size12.clo 2019/08/27 v1.4j Standard LaTeX file (size option) -) -\c@part=\count80 -\c@section=\count81 -\c@subsection=\count82 -\c@subsubsection=\count83 -\c@paragraph=\count84 -\c@subparagraph=\count85 -\c@figure=\count86 -\c@table=\count87 -\abovecaptionskip=\skip41 -\belowcaptionskip=\skip42 -\bibindent=\dimen102 -) -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/inputenc.sty -Package: inputenc 2018/08/11 v1.3c Input encoding file -\inpenc@prehook=\toks14 -\inpenc@posthook=\toks15 -) -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/fontenc.sty -Package: fontenc 2018/08/11 v2.0j Standard LaTeX package - -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/t1enc.def -File: t1enc.def 2018/08/11 v2.0j Standard LaTeX file -LaTeX Font Info: Redeclaring font encoding T1 on input line 48. -)) -(/usr/local/texlive/texmf-local/tex/latex/step/step.sty -Package: step - -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/textcomp.sty -Package: textcomp 2018/08/11 v2.0j Standard LaTeX package -Package textcomp Info: Sub-encoding information: -(textcomp) 5 = only ISO-Adobe without \textcurrency -(textcomp) 4 = 5 + \texteuro -(textcomp) 3 = 4 + \textohm -(textcomp) 2 = 3 + \textestimated + \textcurrency -(textcomp) 1 = TS1 - \textcircled - \t -(textcomp) 0 = TS1 (full) -(textcomp) Font families with sub-encoding setting implement -(textcomp) only a restricted character set as indicated. -(textcomp) Family '?' is the default used for unknown fonts. -(textcomp) See the documentation for details. -Package textcomp Info: Setting ? sub-encoding to TS1/1 on input line 79. - -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/ts1enc.def -File: ts1enc.def 2001/06/05 v3.0e (jk/car/fm) Standard LaTeX file -Now handling font encoding TS1 ... -... processing UTF-8 mapping file for font encoding TS1 - -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/ts1enc.dfu -File: ts1enc.dfu 2019/07/11 v1.2j UTF-8 support for inputenc - defining Unicode char U+00A2 (decimal 162) - defining Unicode char U+00A3 (decimal 163) - defining Unicode char U+00A4 (decimal 164) - defining Unicode char U+00A5 (decimal 165) - defining Unicode char U+00A6 (decimal 166) - defining Unicode char U+00A7 (decimal 167) - defining Unicode char U+00A8 (decimal 168) - defining Unicode char U+00A9 (decimal 169) - defining Unicode char U+00AA (decimal 170) - defining Unicode char U+00AC (decimal 172) - defining Unicode char U+00AE (decimal 174) - defining Unicode char U+00AF (decimal 175) - defining Unicode char U+00B0 (decimal 176) - defining Unicode char U+00B1 (decimal 177) - defining Unicode char U+00B2 (decimal 178) - defining Unicode char U+00B3 (decimal 179) - defining Unicode char U+00B4 (decimal 180) - defining Unicode char U+00B5 (decimal 181) - defining Unicode char U+00B6 (decimal 182) - defining Unicode char U+00B7 (decimal 183) - defining Unicode char U+00B9 (decimal 185) - defining Unicode char U+00BA (decimal 186) - defining Unicode char U+00BC (decimal 188) - defining Unicode char U+00BD (decimal 189) - defining Unicode char U+00BE (decimal 190) - defining Unicode char U+00D7 (decimal 215) - defining Unicode char U+00F7 (decimal 247) - defining Unicode char U+0192 (decimal 402) - defining Unicode char U+02C7 (decimal 711) - defining Unicode char U+02D8 (decimal 728) - defining Unicode char U+02DD (decimal 733) - defining Unicode char U+0E3F (decimal 3647) - defining Unicode char U+2016 (decimal 8214) - defining Unicode char U+2020 (decimal 8224) - defining Unicode char U+2021 (decimal 8225) - defining Unicode char U+2022 (decimal 8226) - defining Unicode char U+2030 (decimal 8240) - defining Unicode char U+2031 (decimal 8241) - defining Unicode char U+203B (decimal 8251) - defining Unicode char U+203D (decimal 8253) - defining Unicode char U+2044 (decimal 8260) - defining Unicode char U+204E (decimal 8270) - defining Unicode char U+2052 (decimal 8274) - defining Unicode char U+20A1 (decimal 8353) - defining Unicode char U+20A4 (decimal 8356) - defining Unicode char U+20A6 (decimal 8358) - defining Unicode char U+20A9 (decimal 8361) - defining Unicode char U+20AB (decimal 8363) - defining Unicode char U+20AC (decimal 8364) - defining Unicode char U+20B1 (decimal 8369) - defining Unicode char U+2103 (decimal 8451) - defining Unicode char U+2116 (decimal 8470) - defining Unicode char U+2117 (decimal 8471) - defining Unicode char U+211E (decimal 8478) - defining Unicode char U+2120 (decimal 8480) - defining Unicode char U+2122 (decimal 8482) - defining Unicode char U+2126 (decimal 8486) - defining Unicode char U+2127 (decimal 8487) - defining Unicode char U+212E (decimal 8494) - defining Unicode char U+2190 (decimal 8592) - defining Unicode char U+2191 (decimal 8593) - defining Unicode char U+2192 (decimal 8594) - defining Unicode char U+2193 (decimal 8595) - defining Unicode char U+2329 (decimal 9001) - defining Unicode char U+232A (decimal 9002) - defining Unicode char U+2422 (decimal 9250) - defining Unicode char U+25E6 (decimal 9702) - defining Unicode char U+25EF (decimal 9711) - defining Unicode char U+266A (decimal 9834) - defining Unicode char U+27E8 (decimal 10216) - defining Unicode char U+27E9 (decimal 10217) - defining Unicode char U+FEFF (decimal 65279) -)) -LaTeX Info: Redefining \oldstylenums on input line 334. -Package textcomp Info: Setting cmr sub-encoding to TS1/0 on input line 349. -Package textcomp Info: Setting cmss sub-encoding to TS1/0 on input line 350. -Package textcomp Info: Setting cmtt sub-encoding to TS1/0 on input line 351. -Package textcomp Info: Setting cmvtt sub-encoding to TS1/0 on input line 352. -Package textcomp Info: Setting cmbr sub-encoding to TS1/0 on input line 353. -Package textcomp Info: Setting cmtl sub-encoding to TS1/0 on input line 354. -Package textcomp Info: Setting ccr sub-encoding to TS1/0 on input line 355. -Package textcomp Info: Setting ptm sub-encoding to TS1/4 on input line 356. -Package textcomp Info: Setting pcr sub-encoding to TS1/4 on input line 357. -Package textcomp Info: Setting phv sub-encoding to TS1/4 on input line 358. -Package textcomp Info: Setting ppl sub-encoding to TS1/3 on input line 359. -Package textcomp Info: Setting pag sub-encoding to TS1/4 on input line 360. -Package textcomp Info: Setting pbk sub-encoding to TS1/4 on input line 361. -Package textcomp Info: Setting pnc sub-encoding to TS1/4 on input line 362. -Package textcomp Info: Setting pzc sub-encoding to TS1/4 on input line 363. -Package textcomp Info: Setting bch sub-encoding to TS1/4 on input line 364. -Package textcomp Info: Setting put sub-encoding to TS1/5 on input line 365. -Package textcomp Info: Setting uag sub-encoding to TS1/5 on input line 366. -Package textcomp Info: Setting ugq sub-encoding to TS1/5 on input line 367. -Package textcomp Info: Setting ul8 sub-encoding to TS1/4 on input line 368. -Package textcomp Info: Setting ul9 sub-encoding to TS1/4 on input line 369. -Package textcomp Info: Setting augie sub-encoding to TS1/5 on input line 370. -Package textcomp Info: Setting dayrom sub-encoding to TS1/3 on input line 371. -Package textcomp Info: Setting dayroms sub-encoding to TS1/3 on input line 372. - -Package textcomp Info: Setting pxr sub-encoding to TS1/0 on input line 373. -Package textcomp Info: Setting pxss sub-encoding to TS1/0 on input line 374. -Package textcomp Info: Setting pxtt sub-encoding to TS1/0 on input line 375. -Package textcomp Info: Setting txr sub-encoding to TS1/0 on input line 376. -Package textcomp Info: Setting txss sub-encoding to TS1/0 on input line 377. -Package textcomp Info: Setting txtt sub-encoding to TS1/0 on input line 378. -Package textcomp Info: Setting lmr sub-encoding to TS1/0 on input line 379. -Package textcomp Info: Setting lmdh sub-encoding to TS1/0 on input line 380. -Package textcomp Info: Setting lmss sub-encoding to TS1/0 on input line 381. -Package textcomp Info: Setting lmssq sub-encoding to TS1/0 on input line 382. -Package textcomp Info: Setting lmvtt sub-encoding to TS1/0 on input line 383. -Package textcomp Info: Setting lmtt sub-encoding to TS1/0 on input line 384. -Package textcomp Info: Setting qhv sub-encoding to TS1/0 on input line 385. -Package textcomp Info: Setting qag sub-encoding to TS1/0 on input line 386. -Package textcomp Info: Setting qbk sub-encoding to TS1/0 on input line 387. -Package textcomp Info: Setting qcr sub-encoding to TS1/0 on input line 388. -Package textcomp Info: Setting qcs sub-encoding to TS1/0 on input line 389. -Package textcomp Info: Setting qpl sub-encoding to TS1/0 on input line 390. -Package textcomp Info: Setting qtm sub-encoding to TS1/0 on input line 391. -Package textcomp Info: Setting qzc sub-encoding to TS1/0 on input line 392. -Package textcomp Info: Setting qhvc sub-encoding to TS1/0 on input line 393. -Package textcomp Info: Setting futs sub-encoding to TS1/4 on input line 394. -Package textcomp Info: Setting futx sub-encoding to TS1/4 on input line 395. -Package textcomp Info: Setting futj sub-encoding to TS1/4 on input line 396. -Package textcomp Info: Setting hlh sub-encoding to TS1/3 on input line 397. -Package textcomp Info: Setting hls sub-encoding to TS1/3 on input line 398. -Package textcomp Info: Setting hlst sub-encoding to TS1/3 on input line 399. -Package textcomp Info: Setting hlct sub-encoding to TS1/5 on input line 400. -Package textcomp Info: Setting hlx sub-encoding to TS1/5 on input line 401. -Package textcomp Info: Setting hlce sub-encoding to TS1/5 on input line 402. -Package textcomp Info: Setting hlcn sub-encoding to TS1/5 on input line 403. -Package textcomp Info: Setting hlcw sub-encoding to TS1/5 on input line 404. -Package textcomp Info: Setting hlcf sub-encoding to TS1/5 on input line 405. -Package textcomp Info: Setting pplx sub-encoding to TS1/3 on input line 406. -Package textcomp Info: Setting pplj sub-encoding to TS1/3 on input line 407. -Package textcomp Info: Setting ptmx sub-encoding to TS1/4 on input line 408. -Package textcomp Info: Setting ptmj sub-encoding to TS1/4 on input line 409. -) -(/usr/local/texlive/2019/texmf-dist/tex/latex/mweights/mweights.sty -Package: mweights 2017/03/30 (Bob Tennent) Support package for multiple-weight -font packages. -LaTeX Info: Redefining \bfseries on input line 22. -LaTeX Info: Redefining \mdseries on input line 30. -LaTeX Info: Redefining \rmfamily on input line 38. -LaTeX Info: Redefining \sffamily on input line 66. -LaTeX Info: Redefining \ttfamily on input line 94. -) -(/usr/local/texlive/texmf-local/tex/latex/MinionPro/fontaxes.sty -Package: fontaxes 2007/03/31 v0.2b Font selection axes -LaTeX Info: Redefining \upshape on input line 26. -LaTeX Info: Redefining \itshape on input line 28. -LaTeX Info: Redefining \slshape on input line 30. -LaTeX Info: Redefining \scshape on input line 34. -) -(/usr/local/texlive/2019/texmf-dist/tex/latex/xkeyval/xkeyval.sty -Package: xkeyval 2014/12/03 v2.7a package option processing (HA) - -(/usr/local/texlive/2019/texmf-dist/tex/generic/xkeyval/xkeyval.tex -(/usr/local/texlive/2019/texmf-dist/tex/generic/xkeyval/xkvutils.tex -\XKV@toks=\toks16 -\XKV@tempa@toks=\toks17 - -(/usr/local/texlive/2019/texmf-dist/tex/generic/xkeyval/keyval.tex)) -\XKV@depth=\count88 -File: xkeyval.tex 2014/12/03 v2.7a key=value parser (HA) -))) -(/usr/local/texlive/2019/texmf-dist/tex/latex/geometry/geometry.sty -Package: geometry 2018/04/16 v5.8 Page Geometry - -(/usr/local/texlive/2019/texmf-dist/tex/generic/oberdiek/ifpdf.sty -Package: ifpdf 2018/09/07 v3.3 Provides the ifpdf switch -) -(/usr/local/texlive/2019/texmf-dist/tex/generic/oberdiek/ifvtex.sty -Package: ifvtex 2016/05/16 v1.6 Detect VTeX and its facilities (HO) -Package ifvtex Info: VTeX not detected. -) -(/usr/local/texlive/2019/texmf-dist/tex/generic/ifxetex/ifxetex.sty -Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional -) -\Gm@cnth=\count89 -\Gm@cntv=\count90 -\c@Gm@tempcnt=\count91 -\Gm@bindingoffset=\dimen103 -\Gm@wd@mp=\dimen104 -\Gm@odd@mp=\dimen105 -\Gm@even@mp=\dimen106 -\Gm@layoutwidth=\dimen107 -\Gm@layoutheight=\dimen108 -\Gm@layouthoffset=\dimen109 -\Gm@layoutvoffset=\dimen110 -\Gm@dimlist=\toks18 -) -(/usr/local/texlive/2019/texmf-dist/tex/latex/microtype/microtype.sty -Package: microtype 2019/10/10 v2.7c Micro-typographical refinements (RS) -\MT@toks=\toks19 -\MT@count=\count92 -LaTeX Info: Redefining \textls on input line 790. -\MT@outer@kern=\dimen111 -LaTeX Info: Redefining \textmicrotypecontext on input line 1347. -\MT@listname@count=\count93 - -(/usr/local/texlive/2019/texmf-dist/tex/latex/microtype/microtype-pdftex.def -File: microtype-pdftex.def 2019/10/10 v2.7c Definitions specific to pdftex (RS) - -LaTeX Info: Redefining \lsstyle on input line 914. -LaTeX Info: Redefining \lslig on input line 914. -\MT@outer@space=\skip43 -) -Package microtype Info: Loading configuration file microtype.cfg. - -(/usr/local/texlive/2019/texmf-dist/tex/latex/microtype/microtype.cfg -File: microtype.cfg 2019/10/10 v2.7c microtype main configuration file (RS) -)) -(/usr/local/texlive/2019/texmf-dist/tex/generic/babel/babel.sty -Package: babel 2019/10/15 3.35 The Babel package - -(/usr/local/texlive/2019/texmf-dist/tex/generic/babel/switch.def -File: switch.def 2019/10/15 3.35 Babel switching mechanism -) -(/usr/local/texlive/2019/texmf-dist/tex/generic/babel-english/english.ldf -Language: english 2017/06/06 v3.3r English support from the babel system - -(/usr/local/texlive/2019/texmf-dist/tex/generic/babel/babel.def -File: babel.def 2019/10/15 3.35 Babel common definitions -\babel@savecnt=\count94 -\U@D=\dimen112 - -(/usr/local/texlive/2019/texmf-dist/tex/generic/babel/txtbabel.def) -\bbl@dirlevel=\count95 -) -\l@canadian = a dialect from \language\l@american -\l@australian = a dialect from \language\l@british -\l@newzealand = a dialect from \language\l@british -)) -(/usr/local/texlive/2019/texmf-dist/tex/latex/booktabs/booktabs.sty -Package: booktabs 2019/10/08 v1.6180339 publication quality tables -\heavyrulewidth=\dimen113 -\lightrulewidth=\dimen114 -\cmidrulewidth=\dimen115 -\belowrulesep=\dimen116 -\belowbottomsep=\dimen117 -\aboverulesep=\dimen118 -\abovetopsep=\dimen119 -\cmidrulesep=\dimen120 -\cmidrulekern=\dimen121 -\defaultaddspace=\dimen122 -\@cmidla=\count96 -\@cmidlb=\count97 -\@aboverulesep=\dimen123 -\@belowrulesep=\dimen124 -\@thisruleclass=\count98 -\@lastruleclass=\count99 -\@thisrulewidth=\dimen125 -) -No file step-fonts.aux. -\openout1 = `step-fonts.aux'. - -LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 13. -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line 13. -LaTeX Font Info: Trying to load font information for TS1+cmr on input line 1 -3. -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/ts1cmr.fd -File: ts1cmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions -) -LaTeX Font Info: ... okay on input line 13. -LaTeX Font Info: Trying to load font information for T1+STEP-TOsF on input l -ine 13. - -(/usr/local/texlive/texmf-local/tex/latex/step/T1STEP-TOsF.fd -File: T1STEP-TOsF.fd 2019/09/15 (autoinst) Font definitions for T1/STEP-TOsF. -) -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <12> not available -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 13. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 12.0pt on input line 13. -\c@mv@tabular=\count100 -\c@mv@boldtabular=\count101 - -*geometry* driver: auto-detecting -*geometry* detected driver: pdftex -*geometry* verbose mode - [ preamble ] result: -* driver: pdftex -* paper: letterpaper -* layout: <same size as paper> -* layoutoffset:(h,v)=(0.0pt,0.0pt) -* modes: -* h-part:(L,W,R)=(92.14519pt, 430.00462pt, 92.14519pt) -* v-part:(T,H,B)=(95.39737pt, 556.47656pt, 143.09605pt) -* \paperwidth=614.295pt -* \paperheight=794.96999pt -* \textwidth=430.00462pt -* \textheight=556.47656pt -* \oddsidemargin=19.8752pt -* \evensidemargin=19.8752pt -* \topmargin=-13.87262pt -* \headheight=12.0pt -* \headsep=25.0pt -* \topskip=12.0pt -* \footskip=30.0pt -* \marginparwidth=44.0pt -* \marginparsep=10.0pt -* \columnsep=10.0pt -* \skip\footins=10.8pt plus 4.0pt minus 2.0pt -* \hoffset=0.0pt -* \voffset=0.0pt -* \mag=1000 -* \@twocolumnfalse -* \@twosidefalse -* \@mparswitchfalse -* \@reversemarginfalse -* (1in=72.27pt=25.4mm, 1cm=28.453pt) - -LaTeX Info: Redefining \microtypecontext on input line 13. -Package microtype Info: Generating PDF output. -Package microtype Info: Character protrusion enabled (level 2). -Package microtype Info: Using default protrusion set `alltext'. -Package microtype Info: Automatic font expansion enabled (level 2), -(microtype) stretch: 20, shrink: 20, step: 1, non-selected. -Package microtype Info: Using default expansion set `basictext'. -LaTeX Info: Redefining \showhyphens on input line 13. -Package microtype Info: No adjustment of tracking. -Package microtype Info: No adjustment of interword spacing. -Package microtype Info: No adjustment of character kerning. -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `STEP-TOsF' (encoding: T1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 20.74pt on input line 14. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 14.4pt on input line 14. -(/usr/local/texlive/2019/texmf-dist/tex/latex/microtype/mt-cmr.cfg -File: mt-cmr.cfg 2013/05/19 v2.2 microtype config. file: Computer Modern Roman -(RS) -) -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <14.4> on input line 14. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <7> on input line 14. -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <10> not available -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 14. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 10.0pt on input line 14. -LaTeX Font Info: Trying to load font information for TS1+STEP-TOsF on input -line 14. - -(/usr/local/texlive/texmf-local/tex/latex/step/TS1STEP-TOsF.fd -File: TS1STEP-TOsF.fd 2019/09/15 (autoinst) Font definitions for TS1/STEP-TOsF. - -) -LaTeX Font Info: Font shape `TS1/STEP-TOsF/m/n' in size <10> not available -(Font) Font shape `TS1/STEP-TOsF/regular/n' tried instead on input - line 14. -LaTeX Font Info: Font shape `TS1/STEP-TOsF/regular/n' will be -(Font) scaled to size 10.0pt on input line 14. -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `STEP-TOsF' (encoding: TS1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <5> on input line 14. -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <7> not available -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 14. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 7.0pt on input line 14. -LaTeX Font Info: Font shape `TS1/STEP-TOsF/m/n' in size <7> not available -(Font) Font shape `TS1/STEP-TOsF/regular/n' tried instead on input - line 14. -LaTeX Font Info: Font shape `TS1/STEP-TOsF/regular/n' will be -(Font) scaled to size 7.0pt on input line 14. -LaTeX Font Info: Trying to load font information for T1+cmtt on input line 1 -4. - -(/usr/local/texlive/2019/texmf-dist/tex/latex/base/t1cmtt.fd -File: t1cmtt.fd 2014/09/29 v2.5h Standard LaTeX font definitions -) -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `cmtt' (encoding: T1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/it' will be -(Font) scaled to size 12.0pt on input line 15. -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <17.28> not available - -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 16. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 17.28pt on input line 16. -LaTeX Font Info: Font shape `T1/STEP-TOsF/bold/n' will be -(Font) scaled to size 17.28pt on input line 16. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <12> on input line 17. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <8> on input line 17. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <6> on input line 17. -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <8> not available -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 17. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 8.0pt on input line 17. - [1 - -{/usr/local/texlive/2019/texmf-var/fonts/map/pdftex/updmap/pdftex.map}] -LaTeX Font Info: Font shape `T1/cmtt/bx/n' in size <17.28> not available -(Font) Font shape `T1/cmtt/m/n' tried instead on input line 22. -LaTeX Font Info: External font `cmex10' loaded for size -(Font) <17.28> on input line 34. -LaTeX Font Info: Font shape `T1/STEP-TOsF/bold/n' will be -(Font) scaled to size 12.0pt on input line 34. -LaTeX Font Info: Font shape `T1/STEP-TOsF/m/n' in size <14.4> not available -(Font) Font shape `T1/STEP-TOsF/regular/n' tried instead on input -line 40. -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/n' will be -(Font) scaled to size 14.4pt on input line 40. -LaTeX Font Info: Font shape `T1/STEP-TOsF/bold/n' will be -(Font) scaled to size 14.4pt on input line 40. -LaTeX Font Info: Trying to load font information for T1+STEP-TLF on input li -ne 45. - -(/usr/local/texlive/texmf-local/tex/latex/step/T1STEP-TLF.fd -File: T1STEP-TLF.fd 2019/09/15 (autoinst) Font definitions for T1/STEP-TLF. -) -LaTeX Font Info: Font shape `T1/STEP-TLF/regular/n' will be -(Font) scaled to size 12.0pt on input line 45. -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `STEP-TLF' (encoding: T1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. - [2] -LaTeX Font Info: Font shape `T1/STEP-TOsF/regular/sc' will be -(Font) scaled to size 12.0pt on input line 56. -Package microtype Info: Character `029' is missing -(microtype) in font `T1/STEP-TOsF/regular/sc/12'. -(microtype) Ignoring protrusion settings for this character. -LaTeX Font Info: Trying to load font information for T1+STEP-Sup on input li -ne 57. - -(/usr/local/texlive/texmf-local/tex/latex/step/T1STEP-Sup.fd -File: T1STEP-Sup.fd 2019/09/15 (autoinst) Font definitions for T1/STEP-Sup. -) -LaTeX Font Info: Font shape `T1/STEP-Sup/regular/n' will be -(Font) scaled to size 12.0pt on input line 57. -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `STEP-Sup' (encoding: T1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. -LaTeX Font Info: Trying to load font information for T1+STEP-Inf on input li -ne 58. - -(/usr/local/texlive/texmf-local/tex/latex/step/T1STEP-Inf.fd -File: T1STEP-Inf.fd 2019/09/15 (autoinst) Font definitions for T1/STEP-Inf. -) -LaTeX Font Info: Font shape `T1/STEP-Inf/regular/n' will be -(Font) scaled to size 12.0pt on input line 58. -Package microtype Info: Loading generic protrusion settings for font family -(microtype) `STEP-Inf' (encoding: T1). -(microtype) For optimal results, create family-specific settings. -(microtype) See the microtype manual for details. - [3] -(./step-fonts.aux) ) -Here is how much of TeX's memory you used: - 4412 strings out of 492167 - 71432 string characters out of 6125388 - 169154 words of memory out of 5000000 - 8662 multiletter control sequences out of 15000+600000 - 49637 words of font info for 91 fonts, out of 8000000 for 9000 - 1141 hyphenation exceptions out of 8191 - 38i,11n,58p,842b,340s stack positions out of 5000i,500n,10000p,200000b,80000s -{/usr/local/texlive/texmf-local/fonts/enc/dvips/step/a_gwwg -is.enc}{/usr/local/texlive/texmf-local/fonts/enc/dvips/step/a_owwokh.enc}{/usr/ -local/texlive/texmf-local/fonts/enc/dvips/step/a_h6i53a.enc}{/usr/local/texlive -/texmf-local/fonts/enc/dvips/step/a_euweyh.enc}{/usr/local/texlive/2019/texmf-d -ist/fonts/enc/dvips/cm-super/cm-super-t1.enc}{/usr/local/texlive/texmf-local/fo -nts/enc/dvips/step/a_enu25g.enc}{/usr/local/texlive/texmf-local/fonts/enc/dvips -/step/a_g5azuq.enc}</usr/local/texlive/texmf-local/fonts/type1/public/step/STEP --Bold.pfb></usr/local/texlive/texmf-local/fonts/type1/public/step/STEP-Italic.p -fb></usr/local/texlive/texmf-local/fonts/type1/public/step/STEP-Regular.pfb></u -sr/local/texlive/2019/texmf-dist/fonts/type1/public/cm-super/sftt1000.pfb></usr -/local/texlive/2019/texmf-dist/fonts/type1/public/cm-super/sftt1200.pfb></usr/l -ocal/texlive/2019/texmf-dist/fonts/type1/public/cm-super/sftt1728.pfb> -Output written on step-fonts.pdf (3 pages, 171033 bytes). -PDF statistics: - 55 PDF objects out of 1000 (max. 8388607) - 43 compressed objects within 1 object stream - 0 named destinations out of 1000 (max. 500000) - 17921 words of extra memory for PDF output out of 20736 (max. 10000000) - diff --git a/fonts/step/doc/step-fonts.pdf b/fonts/step/doc/step-fonts.pdf Binary files differindex 63f2ec6163..d2c7a13d59 100644 --- a/fonts/step/doc/step-fonts.pdf +++ b/fonts/step/doc/step-fonts.pdf diff --git a/fonts/step/doc/step-fonts.tex b/fonts/step/doc/step-fonts.tex index e3a8ffe404..ea965b5dff 100644 --- a/fonts/step/doc/step-fonts.tex +++ b/fonts/step/doc/step-fonts.tex @@ -1,14 +1,14 @@ -% !TEX TS-program = pdflatex \documentclass[12pt]{article} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage[oldstyle]{step} \usepackage[letterpaper]{geometry} -\usepackage[protrusion=true,expansion=true]{microtype} \usepackage[main=english]{babel} +\usepackage[protrusion,babel]{microtype} +\usepackage[supstfm=STEP-Regular-sup-t1]{superiors} \usepackage{booktabs} \title{The STEP fonts} -\date{Version 2.0.1a\\October 24, 2019} +\date{Version 2.0.2\\February 6, 2020} \author{Daniel~Benjamin Miller\thanks{\texttt{dbmiller@dbmiller.org}}} \begin{document} \maketitle @@ -18,25 +18,14 @@ The STEP fonts are based on the STIX\footnote{\texttt{https://ctan.org/pkg/stix} \section{Why STEP?} The STEP fonts are far from the only free digitization of Times available for use with \LaTeX. The fonts provide some features not found in other commonly-used versions, including small capitals and old-style figures which were manually drawn instead of scaled (semi-) automatically, ensuring higher quality; other Times fonts available often do not include small capitals or old-style figures at all. STEP also includes superior and inferior figures. The utmost care has been taken to ensure that all characters in STEP are of high quality. -Greek support is limited; polytonic Greek is found in the regular font, whereas the other fonts in the family support monotonic Greek only. The Greek does not correspond in design to Linotype Times, but rather to MicroPress' TM Text Extension (MicroPress kindly donated some outlines to the STIX project). For a Greek font more similar to Linotype's, see the \texttt{tempora}\footnote{\texttt{https://ctan.org/pkg/tempora}} package. Cyrillic support is from URW's Nimbus Roman. I do not personally use the Cyrillic alphabet, so I cannot comment on the character set. STEP's character support for certain other languages which use the Latin alphabet (e.g., Vietnamese) is lacking, and improvements are planned for the future. -\section{Usage with \texttt{fontspec}} -If you do not need to use a legacy \TeX\ engine, you may simply use \texttt{fontspec}\footnote{\texttt{https://ctan.org/pkg/fontspec}} as follows: -\begin{verbatim} -\usepackage{fontspec} -\setmainfont{STEP} -\end{verbatim} -If you wish to use the math font as well, this is possible: -\begin{verbatim} -\usepackage{unicode-math} -\setmathfont{STEP Math} -\end{verbatim} -When using \texttt{fontspec}, all font options are handled according to that package's facilities. See its documentation for details. -\section{Usage with the \texttt{step} \LaTeX\ package} -To use the STEP with 8-bit \TeX\ engines, you may use the \LaTeX\ package \texttt{step}. +Greek support is limited; polytonic Greek is found in the regular font, whereas the other fonts in the family support monotonic Greek only. The Greek does not correspond in design to Linotype Times, but rather to MicroPress' TM Text Extension (MicroPress kindly donated some outlines to the STIX project). A better match is discussed in the \textit{Usage} section. Cyrillic support is from URW's Nimbus Roman. I do not personally use the Cyrillic alphabet, so I cannot comment on the character set. STEP's character support for certain other languages which use the Latin alphabet (e.g., Vietnamese) is lacking, and improvements are planned for the future. + +\section{Usage} +To use the STEP, you may use the \LaTeX\ package \texttt{step}. \begin{verbatim} \usepackage{step} \end{verbatim} -Do remember that it is usually wise to load \texttt{fontenc} with the appropriate encoding(s). The \LaTeX\ package does not include support for any math fonts; I recommend that you use STIX's math fonts instead with \texttt{\textbackslash usepackage[notext]\{stix\}}. +Do remember that it is usually wise to load \texttt{fontenc} with the appropriate encoding(s). The \LaTeX\ package does not include support for any math fonts; I recommend that you use STIX's math fonts instead with \texttt{\textbackslash usepackage[notext]\{stix\}}. Alternatively, you can use \texttt{newtxmath} using \texttt{\textbackslash usepackage\{newtxmath\}}. See the documentation for those packages to find out more about available options. \subsection{Package Options} \begin{tabular}{@{} ll @{}} \toprule @@ -58,6 +47,29 @@ Text Command & Feature \\ \texttt{\textbackslash textin\{\}} & Use inferior figures \textin{1234567890}\\ \bottomrule \end{tabular} +\subsection{Greek text using \texttt{txfontsb}} +For a Greek font which is better suited for text (and which includes bold, italic and bold italic as well as regular), I recommend using the fonts from \texttt{txfontsb}. You can access these by adding the following to your preamble: +\begin{verbatim} +\usepackage{substitutefont} +\substitutefont{LGR}{\rmdefault}{txrc} +\end{verbatim} +\subsection{Using superior figures for footnotes} +To use superior figures for footnotes, include the following line in your preamble: +\begin{verbatim} +\usepackage[supstfm=STEP-Regular-sup-t1]{superiors} +\end{verbatim} +\subsection{Usage with \texttt{fontspec}} +If you do not need to use an 8-bit \TeX\ engine, you may simply use \texttt{fontspec}\footnote{\texttt{https://ctan.org/pkg/fontspec}} as follows: +\begin{verbatim} +\usepackage{fontspec} +\setmainfont{STEP} +\end{verbatim} +If you wish to use the math font as well (which is based on XITS), this is possible: +\begin{verbatim} +\usepackage{unicode-math} +\setmathfont{STEP Math} +\end{verbatim} +When using \texttt{fontspec}, all font options are handled according to that package's facilities. See its documentation for details. \section{Contributing} Contributions to the fonts and their \LaTeX\ support may be sent as pull requests to the project's GitHub repository.\footnote{\texttt{https://github.com/dbenjaminmiller/step}} \section{Licensing} diff --git a/fonts/step/enc/a_2a2bfu.enc b/fonts/step/enc/a_2a2bfu.enc new file mode 100644 index 0000000000..fb9b530f83 --- /dev/null +++ b/fonts/step/enc/a_2a2bfu.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_2a2bfutyw3cydpuvgayzzhw4kf +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 +% Command line follows encoding +/AutoEnc_2a2bfutyw3cydpuvgayzzhw4kf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /.notdef /.notdef /.notdef /.notdef /uni04BA /.notdef /.notdef /.notdef + /.notdef /uni049A /.notdef /.notdef /.notdef /uni04A2 /.notdef /.notdef +%90 + /uni04E8 /.notdef /.notdef /.notdef /.notdef /uni04B2 /afii10145 /.notdef + /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency /section +%A0 + /.notdef /.notdef /.notdef /.notdef /uni04BB /.notdef /.notdef /.notdef + /.notdef /uni049B /.notdef /.notdef /.notdef /uni04A3 /.notdef /.notdef +%B0 + /uni04E9 /.notdef /.notdef /.notdef /.notdef /uni04B3 /afii10193 /.notdef + /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2c +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-numr-t2c' diff --git a/fonts/step/enc/a_l6bj4g.enc b/fonts/step/enc/a_2b3rql.enc index da452c6324..4f1d2e813b 100644 --- a/fonts/step/enc/a_l6bj4g.enc +++ b/fonts/step/enc/a_2b3rql.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_l6bj4gjfubzihhvyhvyzdkj7rc -% Encoding created by otftotfm on Sun Sep 15 07:14:43 2019 +%%AutoEnc_2b3rql4ayra2c6tnlxree55uke +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding -/AutoEnc_l6bj4gjfubzihhvyhvyzdkj7rc [ +/AutoEnc_2b3rql4ayra2c6tnlxree55uke [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Italic.otf STEP-Italic-tosf-t2a' diff --git a/fonts/step/enc/a_2gbaam.enc b/fonts/step/enc/a_2gbaam.enc deleted file mode 100644 index 12c3803327..0000000000 --- a/fonts/step/enc/a_2gbaam.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_2gbaamnqda5zy57ukhxpyyizdd -% Encoding created by otftotfm on Sun Sep 15 08:04:26 2019 -% Command line follows encoding -/AutoEnc_2gbaamnqda5zy57ukhxpyyizdd [ -%00 - /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam.sc /quotedblright /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=onum --feature=smcp --unicoding=germandbls -% =: SSsmall --feature=liga STEP-Regular.otf STEP-Regular-tosf-sc-ot1' diff --git a/fonts/step/enc/a_3rxxvm.enc b/fonts/step/enc/a_3rxxvm.enc index f9172a19a9..6894f8d9c4 100644 --- a/fonts/step/enc/a_3rxxvm.enc +++ b/fonts/step/enc/a_3rxxvm.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_3rxxvmfdkzw2bb2vslwun3wcvc -% Encoding created by otftotfm on Tue Sep 10 00:12:29 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding /AutoEnc_3rxxvmfdkzw2bb2vslwun3wcvc [ %00 @@ -54,12 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga --feature=smcp --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl --unicoding=germandbls =: SSsmall STEP-Regular.otf -% STEP-Regular-tlf-sc-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=smcp +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall +% STEP-Regular.otf STEP-Regular-tlf-sc-ot1' diff --git a/fonts/step/enc/a_bw7ysd.enc b/fonts/step/enc/a_47wiac.enc index a34a830475..6c5ab56806 100644 --- a/fonts/step/enc/a_bw7ysd.enc +++ b/fonts/step/enc/a_47wiac.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_bw7ysdvcjxgu4vfmbvtfdldwob -% Encoding created by otftotfm on Sun Sep 15 07:14:40 2019 +%%AutoEnc_47wiacjqsu3ew2zjmpd46uciph +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding -/AutoEnc_bw7ysdvcjxgu4vfmbvtfdldwob [ +/AutoEnc_47wiacjqsu3ew2zjmpd46uciph [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=liga -% STEP-Regular.otf STEP-Regular-tlf-t2b' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf +% STEP-Regular-tlf-t2b' diff --git a/fonts/step/enc/a_4h34hb.enc b/fonts/step/enc/a_4h34hb.enc new file mode 100644 index 0000000000..91c399e803 --- /dev/null +++ b/fonts/step/enc/a_4h34hb.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_4h34hbq4ch4oad2ednx5l76a6h +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 +% Command line follows encoding +/AutoEnc_4h34hbq4ch4oad2ednx5l76a6h [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /uni0297 /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni03B3 /.notdef /.notdef /.notdef +%30 + /.notdef /uni027F /.notdef /uni0284 /.notdef /.notdef /uni019E /.notdef + /.notdef /uni0298 /.notdef /.notdef /.notdef /.notdef /uni01AA /.notdef +%40 + /.notdef /.notdef /uni01BA /.notdef /.notdef /.notdef /.notdef /uni01C1 + /uni01C2 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /thorn /thorn /thorn /thorn /uni0294 /uni0294 /uni0294 /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /uni03B4 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /q /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /ffl /ffi /ff /fl /l /fi /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA SYMBOL ENCODING --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Italic.otf STEP-Italic-sup-ts3' diff --git a/fonts/step/enc/a_4mxykn.enc b/fonts/step/enc/a_4mxykn.enc new file mode 100644 index 0000000000..62ac207201 --- /dev/null +++ b/fonts/step/enc/a_4mxykn.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_4mxykn5ds7lewtr3g34vemowvf +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 +% Command line follows encoding +/AutoEnc_4mxykn5ds7lewtr3g34vemowvf [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /.notdef /.notdef /.notdef /.notdef /uni04BA /.notdef /.notdef /.notdef + /.notdef /uni049A /.notdef /.notdef /.notdef /uni04A2 /.notdef /.notdef +%90 + /uni04E8 /.notdef /.notdef /.notdef /.notdef /uni04B2 /afii10145 /.notdef + /uni04B6 /.notdef /uni04D8 /.notdef /afii10023 /uni2116 /currency /section +%A0 + /.notdef /.notdef /.notdef /.notdef /uni04BB /.notdef /.notdef /.notdef + /.notdef /uni049B /.notdef /.notdef /.notdef /uni04A3 /.notdef /.notdef +%B0 + /uni04E9 /.notdef /.notdef /.notdef /.notdef /uni04B3 /afii10193 /.notdef + /uni04B7 /.notdef /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2c +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=dnom +% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-dnom-t2c' diff --git a/fonts/step/enc/a_mmhgd3.enc b/fonts/step/enc/a_4zqdxy.enc index 3b46ec177d..11c9dbe169 100644 --- a/fonts/step/enc/a_mmhgd3.enc +++ b/fonts/step/enc/a_4zqdxy.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_mmhgd3qmcw7a7hu4c3d5lxil7g -% Encoding created by otftotfm on Sun Sep 15 08:04:27 2019 +%%AutoEnc_4zqdxylwr57usbb5onvgqm2dwa +% Encoding created by otftotfm on Thu Feb 6 13:38:00 2020 % Command line follows encoding -/AutoEnc_mmhgd3qmcw7a7hu4c3d5lxil7g [ +/AutoEnc_4zqdxylwr57usbb5onvgqm2dwa [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=onum --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tosf-sc-t2b' diff --git a/fonts/step/enc/a_574n7u.enc b/fonts/step/enc/a_574n7u.enc index f6d13b0cff..a013139d45 100644 --- a/fonts/step/enc/a_574n7u.enc +++ b/fonts/step/enc/a_574n7u.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_574n7ukwqi5rtsbom2vrpemh2f -% Encoding created by otftotfm on Tue Sep 10 00:18:14 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 % Command line follows encoding /AutoEnc_574n7ukwqi5rtsbom2vrpemh2f [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga STEP-Regular.otf -% STEP-Regular-tlf-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Italic.otf +% STEP-Italic-tlf-ly1' diff --git a/fonts/step/enc/a_5kjsul.enc b/fonts/step/enc/a_5kjsul.enc deleted file mode 100644 index a9a1d513d2..0000000000 --- a/fonts/step/enc/a_5kjsul.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_5kjsulij3f35kydlxzqwfnhjpd -% Encoding created by otftotfm on Tue Sep 10 00:05:49 2019 -% Command line follows encoding -/AutoEnc_5kjsulij3f35kydlxzqwfnhjpd [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /uni0102 /uni0104 /uni0106 /uni010C /uni010E /uni011A /uni0118 /uni011E - /uni0139 /uni013D /Lslash /uni0143 /uni0147 /uni014A /uni0150 /uni0154 -%90 - /uni0158 /uni015A /Scaron /uni015E /uni0164 /uni0162 /uni0170 /uni016E - /Ydieresis /uni0179 /Zcaron /uni017B /uni0132 /uni0130 /uni0111 /section -%A0 - /uni0103 /uni0105 /uni0107 /uni010D /uni010F /uni011B /uni0119 /uni011F - /uni013A /uni013E /lslash /uni0144 /uni0148 /uni014B /uni0151 /uni0155 -%B0 - /uni0159 /uni015B /scaron /uni015F /uni0165 /uni0163 /uni0171 /uni016F - /ydieresis /uni017A /zcaron /uni017C /uni0133 /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% STEP-Regular.otf STEP-Regular-tlf-t1' diff --git a/fonts/step/enc/a_n35jrc.enc b/fonts/step/enc/a_5mws5y.enc index 5ea147299e..23f913dd76 100644 --- a/fonts/step/enc/a_n35jrc.enc +++ b/fonts/step/enc/a_5mws5y.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_n35jrcm4jegjkvm2ry2xjfqlfc -% Encoding created by otftotfm on Sun Sep 15 07:14:44 2019 +%%AutoEnc_5mws5yjbkq62ojguqjd6o3nu4e +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 % Command line follows encoding -/AutoEnc_n35jrcm4jegjkvm2ry2xjfqlfc [ +/AutoEnc_5mws5yjbkq62ojguqjd6o3nu4e [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=liga STEP-Italic.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Italic.otf % STEP-Italic-tlf-t2a' diff --git a/fonts/step/enc/a_5xnggg.enc b/fonts/step/enc/a_5xnggg.enc index 234e4a77f6..2d475bb8cd 100644 --- a/fonts/step/enc/a_5xnggg.enc +++ b/fonts/step/enc/a_5xnggg.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_5xngggi7yvni7khor6dyjejhwg -% Encoding created by otftotfm on Sun Sep 15 07:14:44 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 % Command line follows encoding /AutoEnc_5xngggi7yvni7khor6dyjejhwg [ %00 @@ -54,10 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=liga STEP-Italic.otf -% STEP-Italic-tlf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Italic.otf STEP-Italic-tlf-lgr' diff --git a/fonts/step/enc/a_6auynr.enc b/fonts/step/enc/a_6auynr.enc new file mode 100644 index 0000000000..98107e0452 --- /dev/null +++ b/fonts/step/enc/a_6auynr.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_6auynrhkdbc7hohp7yh4ug5n5f +% Encoding created by otftotfm on Thu Feb 6 13:38:07 2020 +% Command line follows encoding +/AutoEnc_6auynrhkdbc7hohp7yh4ug5n5f [ +%00 + /uni02CB /uni02CA /circumflex /tilde /dieresis /uni02BA /ring /caron + /breve /uni02C9 /dotaccent /cedilla /ogonek /space /uni030D /uni030E +%10 + /uni030F /uni0311 /uni0321 /uni0322 /uni02BE /uni02BF /uni032A /uni032B + /uni02DF /dotlessi /uni0237 /uni02D6 /uni02D4 /uni02D5 /uni033A /uni033B +%20 + /uni033C /uni01C3 /uni02C8 /ff /.notdef /.notdef /uni0360 /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /uni02D0 /uni02D1 /fi /equal /uni2322 /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /uni02BD /bracketright /fl /ffi +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /uni02DE /uni02CC +%80 + /ffl /f_j /f_f_j /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /uni2197 /uni2198 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /.notdef /.notdef /uni1D07 /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /.notdef /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /.notdef /uni02A6 /.notdef /.notdef + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /uni02C2 /uni02C3 /.notdef +%C0 + /uni1D00 /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /uni1D1C /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl STEP-Bold.otf STEP-Bold-tlf-t3' diff --git a/fonts/step/enc/a_g3ibdt.enc b/fonts/step/enc/a_6hfbmi.enc index 9ce6e427df..5d0b015e8d 100644 --- a/fonts/step/enc/a_g3ibdt.enc +++ b/fonts/step/enc/a_6hfbmi.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_g3ibdtb6kp73w7tveveo42yuyb -% Encoding created by otftotfm on Tue Sep 10 00:05:50 2019 +%%AutoEnc_6hfbmizkntdqsdu23vmrez5d3e +% Encoding created by otftotfm on Thu Feb 6 13:37:52 2020 % Command line follows encoding -/AutoEnc_g3ibdtb6kp73w7tveveo42yuyb [ +/AutoEnc_6hfbmizkntdqsdu23vmrez5d3e [ %00 /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef + /uni03A6 /uni03A8 /uni2126 /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -14,8 +14,8 @@ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /exclamdown /equal /questiondown /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,9 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=onum STEP-Regular.otf STEP-Regular-tosf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=dnom --feature=kern --feature=liga +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf +% STEP-Regular-dnom-ot1' diff --git a/fonts/step/enc/a_6jxagp.enc b/fonts/step/enc/a_6jxagp.enc deleted file mode 100644 index 77dfbe067b..0000000000 --- a/fonts/step/enc/a_6jxagp.enc +++ /dev/null @@ -1,62 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_6jxagp3emutdxrebvk23g5ivba -% Encoding created by otftotfm on Tue Sep 10 00:05:51 2019 -% Command line follows encoding -/AutoEnc_6jxagp3emutdxrebvk23g5ivba [ -%00 - /uni0393 /uni0394 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=onum STEP-Italic.otf STEP-Italic-tosf-ot1' diff --git a/fonts/step/enc/a_ds5txz.enc b/fonts/step/enc/a_6wpl7b.enc index 8b2d26b871..eb95a645a5 100644 --- a/fonts/step/enc/a_ds5txz.enc +++ b/fonts/step/enc/a_6wpl7b.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_ds5txz57vvqv4oby42lruskomb -% Encoding created by otftotfm on Sun Sep 15 08:04:30 2019 +%%AutoEnc_6wpl7buwjdrtsxouyaqqtjemaf +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding -/AutoEnc_ds5txz57vvqv4oby42lruskomb [ +/AutoEnc_6wpl7buwjdrtsxouyaqqtjemaf [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=sinf --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-inf-t2a' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-inf-t2a' diff --git a/fonts/step/enc/a_7if24z.enc b/fonts/step/enc/a_7if24z.enc index d434587e74..5a32408e95 100644 --- a/fonts/step/enc/a_7if24z.enc +++ b/fonts/step/enc/a_7if24z.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf -% Encoding created by otftotfm on Tue Sep 10 00:18:15 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding /AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=onum --feature=liga -% STEP-Regular.otf STEP-Regular-tosf-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% STEP-Italic.otf STEP-Italic-tosf-ly1' diff --git a/fonts/step/enc/a_7jxw4d.enc b/fonts/step/enc/a_7jxw4d.enc new file mode 100644 index 0000000000..1933c34f73 --- /dev/null +++ b/fonts/step/enc/a_7jxw4d.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_7jxw4dvfpezgqjni5c7gkvjsug +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 +% Command line follows encoding +/AutoEnc_7jxw4dvfpezgqjni5c7gkvjsug [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /.notdef /uni0492 /.notdef /.notdef /uni04BA /uni0496 /.notdef /.notdef + /afii10058 /uni049A /.notdef /.notdef /.notdef /uni04A2 /.notdef /.notdef +%90 + /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /uni04CB + /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency /section +%A0 + /.notdef /uni0493 /.notdef /.notdef /uni04BB /uni0497 /.notdef /.notdef + /afii10106 /uni049B /.notdef /.notdef /.notdef /uni04A3 /.notdef /.notdef +%B0 + /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /uni04CC + /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2b +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-numr-t2b' diff --git a/fonts/step/enc/a_7wspdk.enc b/fonts/step/enc/a_7wspdk.enc new file mode 100644 index 0000000000..f879ad51ca --- /dev/null +++ b/fonts/step/enc/a_7wspdk.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 +% Command line follows encoding +/AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni02D7 /uni2193 + /.notdef /uni0362 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /uni0297 /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni03B3 /.notdef /.notdef /.notdef +%30 + /uniA727 /uni027F /.notdef /uni0284 /.notdef /.notdef /uni019E /uni2640 + /uni26B2 /uni0298 /.notdef /.notdef /.notdef /.notdef /uni01AA /.notdef +%40 + /.notdef /.notdef /uni01BA /.notdef /.notdef /.notdef /.notdef /uni01C1 + /uni01C2 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /thorn /thorn /thorn /thorn /uni0294 /uni0294 /uni0294 /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /uni03B4 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /q /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /ffl /ffi /ff /fl /l /fi /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA SYMBOL ENCODING --feature=dnom --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-dnom-ts3' diff --git a/fonts/step/enc/a_nys5r4.enc b/fonts/step/enc/a_7z23fd.enc index bcf6f087de..624de120f0 100644 --- a/fonts/step/enc/a_nys5r4.enc +++ b/fonts/step/enc/a_7z23fd.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_nys5r4dgskbgyqqmwngas2vb4b -% Encoding created by otftotfm on Sun Sep 15 08:04:30 2019 +%%AutoEnc_7z23fdntpjvtoxdomx5x27gjge +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding -/AutoEnc_nys5r4dgskbgyqqmwngas2vb4b [ +/AutoEnc_7z23fdntpjvtoxdomx5x27gjge [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=sinf --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-inf-t2b' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-inf-t2b' diff --git a/fonts/step/enc/a_kbcxke.enc b/fonts/step/enc/a_a6xuhy.enc index 15a86ba757..46afacde59 100644 --- a/fonts/step/enc/a_kbcxke.enc +++ b/fonts/step/enc/a_a6xuhy.enc @@ -1,11 +1,11 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_kbcxkezo7bfbpua542cpgc4tyb -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +%%AutoEnc_a6xuhyxsgg5a7iurgljjbv74eb +% Encoding created by otftotfm on Thu Feb 6 13:37:52 2020 % Command line follows encoding -/AutoEnc_kbcxkezo7bfbpua542cpgc4tyb [ +/AutoEnc_a6xuhyxsgg5a7iurgljjbv74eb [ %00 - /.notdef /uni20AC /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring @@ -14,8 +14,8 @@ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.sinf /one.sinf /two.sinf /three.sinf /four.sinf /five.sinf /six.sinf /seven.sinf - /eight.sinf /nine.sinf /colon /semicolon /less /equal /greater /question + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,12 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga --feature=sinf -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf -% STEP-Regular-inf-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom +% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-dnom-ly1' diff --git a/fonts/step/enc/a_aevneq.enc b/fonts/step/enc/a_aevneq.enc deleted file mode 100644 index fcc516bd72..0000000000 --- a/fonts/step/enc/a_aevneq.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_aevneqdjmhye2cweb4twqm4tah -% Encoding created by otftotfm on Sun Sep 15 08:04:32 2019 -% Command line follows encoding -/AutoEnc_aevneqdjmhye2cweb4twqm4tah [ -%00 - /uni0393 /uni0394 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.sups /one.sups /two.sups /three.sups /four.sups /five.sups /six.sups /seven.sups - /eight.sups /nine.sups /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=sups --ligkern=* {KL} * --feature=liga -% STEP-Italic.otf STEP-Italic-sup-ot1' diff --git a/fonts/step/enc/a_ahclkl.enc b/fonts/step/enc/a_ahclkl.enc deleted file mode 100644 index 78de4762ef..0000000000 --- a/fonts/step/enc/a_ahclkl.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_ahclklvo7m4sklsfughv3fv4kg -% Encoding created by otftotfm on Tue Sep 10 00:18:16 2019 -% Command line follows encoding -/AutoEnc_ahclklvo7m4sklsfughv3fv4kg [ -%00 - /.notdef /uni20AC /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.sinf /one.sinf /two.sinf /three.sinf /four.sinf /five.sinf /six.sinf /seven.sinf - /eight.sinf /nine.sinf /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=sinf --ligkern=* {KL} -% * --feature=liga STEP-Regular.otf STEP-Regular-inf-ly1' diff --git a/fonts/step/enc/a_arx325.enc b/fonts/step/enc/a_arx325.enc index c698c6f2c5..333e8bc7b5 100644 --- a/fonts/step/enc/a_arx325.enc +++ b/fonts/step/enc/a_arx325.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_arx325ysxapto7rbr5oxz7i4ng -% Encoding created by otftotfm on Tue Sep 10 00:18:15 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding /AutoEnc_arx325ysxapto7rbr5oxz7i4ng [ %00 @@ -54,10 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=onum --feature=liga STEP-Regular.otf -% STEP-Regular-tosf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Regular.otf STEP-Regular-tosf-ot1' diff --git a/fonts/step/enc/a_cc2n7r.enc b/fonts/step/enc/a_bm4xhn.enc index 9a54e1718c..d3bd0597a2 100644 --- a/fonts/step/enc/a_cc2n7r.enc +++ b/fonts/step/enc/a_bm4xhn.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_cc2n7rx4v52owjrs5yjnkvw6rg -% Encoding created by otftotfm on Tue Sep 10 00:05:50 2019 +%%AutoEnc_bm4xhnnbsywwnnh7phbc3bu5cg +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_cc2n7rx4v52owjrs5yjnkvw6rg [ +/AutoEnc_bm4xhnnbsywwnnh7phbc3bu5cg [ %00 - /.notdef /uni20AC /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -14,8 +14,8 @@ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=onum STEP-Regular.otf -% STEP-Regular-tosf-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-numr-ly1' diff --git a/fonts/step/enc/a_5k2pnm.enc b/fonts/step/enc/a_bmbu3p.enc index 5d56bdb216..3b9eef4615 100644 --- a/fonts/step/enc/a_5k2pnm.enc +++ b/fonts/step/enc/a_bmbu3p.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_5k2pnmzfkunfo4t7vudptjo2zh -% Encoding created by otftotfm on Sun Sep 15 07:14:42 2019 +%%AutoEnc_bmbu3pxj2aya4uwkdq3cf4uegh +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding -/AutoEnc_5k2pnmzfkunfo4t7vudptjo2zh [ +/AutoEnc_bmbu3pxj2aya4uwkdq3cf4uegh [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,13 +51,15 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=sinf --ligkern=* {KL} * -% --feature=liga STEP-Regular.otf STEP-Regular-inf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-inf-lgr' diff --git a/fonts/step/enc/a_7a5nqn.enc b/fonts/step/enc/a_bonk4u.enc index 794ea45bf6..9202d9b232 100644 --- a/fonts/step/enc/a_7a5nqn.enc +++ b/fonts/step/enc/a_bonk4u.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_7a5nqn4qkklivdhmf4t7cf2aqg -% Encoding created by otftotfm on Sun Sep 15 07:14:40 2019 +%%AutoEnc_bonk4u2tudx56qwz5smarjh4gc +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding -/AutoEnc_7a5nqn4qkklivdhmf4t7cf2aqg [ +/AutoEnc_bonk4u2tudx56qwz5smarjh4gc [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,13 +51,14 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=liga STEP-Regular.otf -% STEP-Regular-tlf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Regular.otf STEP-Regular-tlf-lgr' diff --git a/fonts/step/enc/a_bt7ykx.enc b/fonts/step/enc/a_bt7ykx.enc index b1cf9298a5..4c4b321d6d 100644 --- a/fonts/step/enc/a_bt7ykx.enc +++ b/fonts/step/enc/a_bt7ykx.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_bt7ykxvwumt3qi445zhivci3zg -% Encoding created by otftotfm on Sun Sep 15 07:14:48 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:11 2020 % Command line follows encoding /AutoEnc_bt7ykxvwumt3qi445zhivci3zg [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=onum --feature=liga -% STEP-BoldItalic.otf STEP-BoldItalic-tosf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-BoldItalic.otf +% STEP-BoldItalic-tosf-lgr' diff --git a/fonts/step/enc/a_zbkikv.enc b/fonts/step/enc/a_ccwxvq.enc index 6232f6653b..adf0b3b019 100644 --- a/fonts/step/enc/a_zbkikv.enc +++ b/fonts/step/enc/a_ccwxvq.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_zbkikvjwmppaex3l6qmpylsj4f -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 +%%AutoEnc_ccwxvqnpuqsptwylqziucxsosb +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding -/AutoEnc_zbkikvjwmppaex3l6qmpylsj4f [ +/AutoEnc_ccwxvqnpuqsptwylqziucxsosb [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tlf-sc-t2a' diff --git a/fonts/step/enc/a_q3sghv.enc b/fonts/step/enc/a_dy6wlv.enc index 00d1e17a5f..6ca42e964e 100644 --- a/fonts/step/enc/a_q3sghv.enc +++ b/fonts/step/enc/a_dy6wlv.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_q3sghvy6nc344dfczo2y5t5v5a -% Encoding created by otftotfm on Sun Sep 15 08:04:30 2019 +%%AutoEnc_dy6wlvjqeexx7lmrwomwxoz45g +% Encoding created by otftotfm on Thu Feb 6 13:38:00 2020 % Command line follows encoding -/AutoEnc_q3sghvy6nc344dfczo2y5t5v5a [ +/AutoEnc_dy6wlvjqeexx7lmrwomwxoz45g [ %00 /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=sinf --ligkern=* {KL} -% * --feature=liga STEP-Regular.otf STEP-Regular-inf-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-inf-ly1' diff --git a/fonts/step/enc/a_hamrva.enc b/fonts/step/enc/a_e4dxwh.enc index b403c496f6..486eff7403 100644 --- a/fonts/step/enc/a_hamrva.enc +++ b/fonts/step/enc/a_e4dxwh.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_hamrvakza32ug57drgurbdzz5a -% Encoding created by otftotfm on Sun Sep 15 07:14:44 2019 +%%AutoEnc_e4dxwhawvuxpgl3z4f4ifnvowe +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding -/AutoEnc_hamrvakza32ug57drgurbdzz5a [ +/AutoEnc_e4dxwhawvuxpgl3z4f4ifnvowe [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Italic.otf STEP-Italic-tosf-t2c' diff --git a/fonts/step/enc/a_enu25g.enc b/fonts/step/enc/a_enu25g.enc index 54eb3b4060..2078d603b6 100644 --- a/fonts/step/enc/a_enu25g.enc +++ b/fonts/step/enc/a_enu25g.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_enu25gmebasuw3a34724to465g -% Encoding created by otftotfm on Tue Sep 10 00:18:15 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding /AutoEnc_enu25gmebasuw3a34724to465g [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=onum --feature=liga STEP-Regular.otf STEP-Regular-tosf-t1' +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% STEP-Regular.otf STEP-Regular-tosf-t1' diff --git a/fonts/step/enc/a_euweyh.enc b/fonts/step/enc/a_euweyh.enc index 296299f752..fce230e92c 100644 --- a/fonts/step/enc/a_euweyh.enc +++ b/fonts/step/enc/a_euweyh.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_euweyhuge6v7wdejsqavpzeplf -% Encoding created by otftotfm on Tue Sep 10 00:18:14 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding /AutoEnc_euweyhuge6v7wdejsqavpzeplf [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=liga STEP-Regular.otf STEP-Regular-tlf-t1' +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf +% STEP-Regular-tlf-t1' diff --git a/fonts/step/enc/a_jhwfjo.enc b/fonts/step/enc/a_evkz3b.enc index e47def72a6..b91827c08d 100644 --- a/fonts/step/enc/a_jhwfjo.enc +++ b/fonts/step/enc/a_evkz3b.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_jhwfjojyvnh7u5vludvx7snmqa -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 +%%AutoEnc_evkz3b5i3bh3pbdxq2uftiowob +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_jhwfjojyvnh7u5vludvx7snmqa [ +/AutoEnc_evkz3b5i3bh3pbdxq2uftiowob [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-sup-t2c' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-sup-t2c' diff --git a/fonts/step/enc/a_f2t6y6.enc b/fonts/step/enc/a_f2t6y6.enc index fe7029f86e..f5214ad532 100644 --- a/fonts/step/enc/a_f2t6y6.enc +++ b/fonts/step/enc/a_f2t6y6.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_f2t6y63dugrvub3dgjtr74io6f -% Encoding created by otftotfm on Tue Sep 10 00:18:16 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding /AutoEnc_f2t6y63dugrvub3dgjtr74io6f [ %00 @@ -54,9 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga STEP-Italic.otf STEP-Italic-tlf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl STEP-Italic.otf STEP-Italic-tlf-ot1' diff --git a/fonts/step/enc/a_f5fqnw.enc b/fonts/step/enc/a_f5fqnw.enc index 226c155b82..0aa699df7d 100644 --- a/fonts/step/enc/a_f5fqnw.enc +++ b/fonts/step/enc/a_f5fqnw.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_f5fqnwwm6rxoebmbovt27qs3ze -% Encoding created by otftotfm on Tue Sep 10 00:12:29 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding /AutoEnc_f5fqnwwm6rxoebmbovt27qs3ze [ %00 @@ -54,11 +54,11 @@ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern % --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl diff --git a/fonts/step/enc/a_fdcm6h.enc b/fonts/step/enc/a_fdcm6h.enc index bf19814eb4..9f4a5d188f 100644 --- a/fonts/step/enc/a_fdcm6h.enc +++ b/fonts/step/enc/a_fdcm6h.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_fdcm6hiopqqtst63f3lyxqzk5e -% Encoding created by otftotfm on Sun Sep 15 07:14:46 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:07 2020 % Command line follows encoding /AutoEnc_fdcm6hiopqqtst63f3lyxqzk5e [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=onum --feature=liga -% STEP-Bold.otf STEP-Bold-tosf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Bold.otf +% STEP-Bold-tosf-lgr' diff --git a/fonts/step/enc/a_ffybip.enc b/fonts/step/enc/a_ffybip.enc index c05c1b256a..820609ed98 100644 --- a/fonts/step/enc/a_ffybip.enc +++ b/fonts/step/enc/a_ffybip.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_ffybipfnd2vxumndzixaxp2nfe -% Encoding created by otftotfm on Sun Sep 15 07:14:43 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding /AutoEnc_ffybipfnd2vxumndzixaxp2nfe [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=onum --feature=liga -% STEP-Italic.otf STEP-Italic-tosf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Italic.otf +% STEP-Italic-tosf-lgr' diff --git a/fonts/step/enc/a_fha2fn.enc b/fonts/step/enc/a_fha2fn.enc index d59f3452f2..d6b033e0e9 100644 --- a/fonts/step/enc/a_fha2fn.enc +++ b/fonts/step/enc/a_fha2fn.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_fha2fnmd65jpomnyva6gdxuzrc -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:59 2020 % Command line follows encoding /AutoEnc_fha2fnmd65jpomnyva6gdxuzrc [ %00 @@ -54,12 +54,13 @@ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga --feature=onum -% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff -% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: -% SSsmall STEP-Regular.otf STEP-Regular-tosf-sc-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --unicoding=germandbls =: SSsmall STEP-Regular.otf +% STEP-Regular-tosf-sc-ly1' diff --git a/fonts/step/enc/a_fwzjjs.enc b/fonts/step/enc/a_fwzjjs.enc index f299a6b008..3d76a60de0 100644 --- a/fonts/step/enc/a_fwzjjs.enc +++ b/fonts/step/enc/a_fwzjjs.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_fwzjjsdtgttfryokfd3fi7fteg -% Encoding created by otftotfm on Sun Sep 15 07:14:40 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding /AutoEnc_fwzjjsdtgttfryokfd3fi7fteg [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf % STEP-Regular-tlf-ly1' diff --git a/fonts/step/enc/a_gbbiod.enc b/fonts/step/enc/a_gbbiod.enc index ed3cd9a455..53339873d7 100644 --- a/fonts/step/enc/a_gbbiod.enc +++ b/fonts/step/enc/a_gbbiod.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_gbbiodczspubz7um2ydud7w3rg -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:59 2020 % Command line follows encoding /AutoEnc_gbbiodczspubz7um2ydud7w3rg [ %00 @@ -54,11 +54,11 @@ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern % --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff diff --git a/fonts/step/enc/a_vjmilf.enc b/fonts/step/enc/a_gnavrk.enc index e9df0b5acd..25cd9e3c8d 100644 --- a/fonts/step/enc/a_vjmilf.enc +++ b/fonts/step/enc/a_gnavrk.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_vjmilfn6kdcna7ohcrnlaodj2e -% Encoding created by otftotfm on Sun Sep 15 07:14:43 2019 +%%AutoEnc_gnavrknqq2g5dbcml7wtxmoi7d +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding -/AutoEnc_vjmilfn6kdcna7ohcrnlaodj2e [ +/AutoEnc_gnavrknqq2g5dbcml7wtxmoi7d [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Italic.otf STEP-Italic-tosf-t2b' diff --git a/fonts/step/enc/a_gwrxgc.enc b/fonts/step/enc/a_gwrxgc.enc new file mode 100644 index 0000000000..4b6a4a0213 --- /dev/null +++ b/fonts/step/enc/a_gwrxgc.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_gwrxgcjfqvuxewenbxuboytpfd +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 +% Command line follows encoding +/AutoEnc_gwrxgcjfqvuxewenbxuboytpfd [ +%00 + /uni02CB /uni02CA /circumflex /tilde /dieresis /uni02BA /ring /caron + /breve /uni02C9 /dotaccent /cedilla /ogonek /space /uni030D /uni030E +%10 + /uni030F /uni0311 /uni0321 /uni0322 /uni02BE /uni02BF /uni032A /uni032B + /uni02DF /dotlessi.sc /uni0237 /uni02D6 /uni02D4 /uni02D5 /uni033A /uni033B +%20 + /uni033C /uni01C3 /uni02C8 /.notdef /.notdef /.notdef /uni0360 /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /uni02D0 /uni02D1 /.notdef /equal /uni2322 /question.sc +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth.sc /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /uni02BD /bracketright /.notdef /.notdef +%60 + /uni02BB /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /uni0261 + /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc +%70 + /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc + /x.sc /y.sc /z.sc /uni01C1 /uni01C0 /uni01C2 /uni02DE /uni02CC +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /uni2197 /uni2198 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111.sc /uni0221 /.notdef /uni1D07 /g.sc /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /uni0235 /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /uni0236 /uni02A6 /uni02AE /uni02AF + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /uni02C2 /uni02C3 /.notdef +%C0 + /uni1D00 /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /uni1D1C /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae.sc /ccedilla.sc + /uni0127.sc /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe.sc + /oslash.sc /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn.sc /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall STEP-Regular.otf STEP-Regular-tlf-sc-t3' diff --git a/fonts/step/enc/a_zypzpm.enc b/fonts/step/enc/a_gz42of.enc index ccb5ab0024..47446cd9ac 100644 --- a/fonts/step/enc/a_zypzpm.enc +++ b/fonts/step/enc/a_gz42of.enc @@ -1,21 +1,21 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_zypzpmlgifsgdzelred3mdp6eh -% Encoding created by otftotfm on Tue Sep 10 00:05:50 2019 +%%AutoEnc_gz42ofuhq54n5pec5qj53m547g +% Encoding created by otftotfm on Thu Feb 6 13:37:52 2020 % Command line follows encoding -/AutoEnc_zypzpmlgifsgdzelred3mdp6eh [ +/AutoEnc_gz42ofuhq54n5pec5qj53m547g [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright %10 /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=onum STEP-Regular.otf STEP-Regular-tosf-t1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom +% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-dnom-t1' diff --git a/fonts/step/enc/a_h6i53a.enc b/fonts/step/enc/a_h6i53a.enc deleted file mode 100644 index 2045abf553..0000000000 --- a/fonts/step/enc/a_h6i53a.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_h6i53aavcxektk7bv4vgxmvtjh -% Encoding created by otftotfm on Sun Sep 15 08:04:26 2019 -% Command line follows encoding -/AutoEnc_h6i53aavcxektk7bv4vgxmvtjh [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen -%80 - /uni0102 /uni0104 /uni0106 /uni010C /uni010E /uni011A /uni0118 /uni011E - /uni0139 /uni013D /Lslash /uni0143 /uni0147 /uni014A /uni0150 /uni0154 -%90 - /uni0158 /uni015A /Scaron /uni015E /uni0164 /uni0162 /uni0170 /uni016E - /Ydieresis /uni0179 /Zcaron /uni017B /uni0132 /uni0130 /uni0111.sc /section -%A0 - /uni0103.sc /uni0105.sc /uni0107.sc /uni010D.sc /uni010F.sc /uni011B.sc /uni0119.sc /uni011F.sc - /uni013A.sc /uni013E.sc /lslash.sc /uni0144.sc /uni0148.sc /uni014B /uni0151.sc /uni0155.sc -%B0 - /uni0159.sc /uni015B.sc /scaron.sc /uni015F.sc /uni0165.sc /uni0163.sc /uni0171.sc /uni016F.sc - /ydieresis.sc /uni017A.sc /uni017E.sc /uni017C.sc /uni0133.sc /exclamdown.sc /questiondown.sc /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc - /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc -%F0 - /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc - /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=onum --feature=smcp --unicoding=germandbls =: SSsmall -% --feature=liga STEP-Regular.otf STEP-Regular-tosf-sc-t1' diff --git a/fonts/step/enc/a_xy7ndg.enc b/fonts/step/enc/a_hbts53.enc index d560068689..581015b79a 100644 --- a/fonts/step/enc/a_xy7ndg.enc +++ b/fonts/step/enc/a_hbts53.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_xy7ndglw2sj5toqiv4iypmda7f -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 +%%AutoEnc_hbts53j6ntkkpnj6z2l3eekpsf +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_xy7ndglw2sj5toqiv4iypmda7f [ +/AutoEnc_hbts53j6ntkkpnj6z2l3eekpsf [ %00 /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef + /uni03A6 /uni03A8 /uni2126 /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -14,8 +14,8 @@ /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.sups /one.sups /two.sups /three.sups /four.sups /five.sups /six.sups /seven.sups - /eight.sups /nine.sups /colon /semicolon /exclamdown /equal /questiondown /question + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /exclamdown /equal /questiondown /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=sups --ligkern=* {KL} * --feature=liga -% STEP-Regular.otf STEP-Regular-sup-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=numr +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf +% STEP-Regular-numr-ot1' diff --git a/fonts/step/enc/a_gl5exx.enc b/fonts/step/enc/a_hgebca.enc index a1ecafe49d..f2c11fe699 100644 --- a/fonts/step/enc/a_gl5exx.enc +++ b/fonts/step/enc/a_hgebca.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_gl5exx5b3b7ke7u4wf2d62y34h -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 +%%AutoEnc_hgebcav3ea2nc3kwuhkgiczfda +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding -/AutoEnc_gl5exx5b3b7ke7u4wf2d62y34h [ +/AutoEnc_hgebcav3ea2nc3kwuhkgiczfda [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tlf-sc-t2c' diff --git a/fonts/step/enc/a_6sfsu6.enc b/fonts/step/enc/a_inbzfq.enc index 5e2c76a3c3..cf89d1cd1f 100644 --- a/fonts/step/enc/a_6sfsu6.enc +++ b/fonts/step/enc/a_inbzfq.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_6sfsu6zxbipue7dxiizrlsmcsb -% Encoding created by otftotfm on Sun Sep 15 07:14:39 2019 +%%AutoEnc_inbzfqkmyoahjdxehi5asbemxd +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding -/AutoEnc_6sfsu6zxbipue7dxiizrlsmcsb [ +/AutoEnc_inbzfqkmyoahjdxehi5asbemxd [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Regular.otf STEP-Regular-tosf-t2c' diff --git a/fonts/step/enc/a_jothuw.enc b/fonts/step/enc/a_jothuw.enc deleted file mode 100644 index d59c8d5838..0000000000 --- a/fonts/step/enc/a_jothuw.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_jothuwzuwlqu7b5axau6m6xotf -% Encoding created by otftotfm on Sun Sep 15 08:04:34 2019 -% Command line follows encoding -/AutoEnc_jothuwzuwlqu7b5axau6m6xotf [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /question -%10 - /C /exclamdown /quotedblbase /questiondown /endash /.notdef /.notdef /.notdef - /uni2190 /uni2192 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /uni2423 /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /uni2217 /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2191 /uni2193 -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /uni2225 /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /uni20A4 /.notdef /.notdef /.notdef /.notdef /trademark - /uni2031 /.notdef /.notdef /uni2116 /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /uni221A /onequarter /onehalf /threequarters /uni20AC -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --feature=liga STEP-Bold.otf -% STEP-Bold-tosf-ts1' diff --git a/fonts/step/enc/a_jwptb5.enc b/fonts/step/enc/a_jwptb5.enc new file mode 100644 index 0000000000..7838d850d2 --- /dev/null +++ b/fonts/step/enc/a_jwptb5.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_jwptb5oa3fohpafoeom2d5u44f +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 +% Command line follows encoding +/AutoEnc_jwptb5oa3fohpafoeom2d5u44f [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /.notdef /uni0492 /.notdef /.notdef /uni04BA /uni0496 /.notdef /.notdef + /afii10058 /uni049A /.notdef /.notdef /.notdef /uni04A2 /.notdef /.notdef +%90 + /uni04E8 /.notdef /afii10062 /uni04AE /.notdef /uni04B2 /.notdef /uni04CB + /uni04B6 /afii10059 /uni04D8 /.notdef /afii10023 /uni2116 /currency /section +%A0 + /.notdef /uni0493 /.notdef /.notdef /uni04BB /uni0497 /.notdef /.notdef + /afii10106 /uni049B /.notdef /.notdef /.notdef /uni04A3 /.notdef /.notdef +%B0 + /uni04E9 /.notdef /afii10110 /uni04AF /.notdef /uni04B3 /.notdef /uni04CC + /uni04B7 /afii10107 /afii10846 /.notdef /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2b +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=dnom +% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-dnom-t2b' diff --git a/fonts/step/enc/a_gkokml.enc b/fonts/step/enc/a_k7io4a.enc index 46dd8b7ae2..32c085be29 100644 --- a/fonts/step/enc/a_gkokml.enc +++ b/fonts/step/enc/a_k7io4a.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_gkokmlkyki5eotgtrabmu3lc5c -% Encoding created by otftotfm on Sun Sep 15 07:14:42 2019 +%%AutoEnc_k7io4acxtg5swkprclsazi2mrd +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_gkokmlkyki5eotgtrabmu3lc5c [ +/AutoEnc_k7io4acxtg5swkprclsazi2mrd [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,13 +51,15 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=sups --ligkern=* {KL} * -% --feature=liga STEP-Regular.otf STEP-Regular-sup-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-sup-lgr' diff --git a/fonts/step/enc/a_kgjeet.enc b/fonts/step/enc/a_kgjeet.enc deleted file mode 100644 index 5ecd4c35b2..0000000000 --- a/fonts/step/enc/a_kgjeet.enc +++ /dev/null @@ -1,62 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_kgjeetpha72npcl5puo7ec25pd -% Encoding created by otftotfm on Tue Sep 10 00:05:51 2019 -% Command line follows encoding -/AutoEnc_kgjeetpha72npcl5puo7ec25pd [ -%00 - /uni0393 /uni0394 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern STEP-Italic.otf STEP-Italic-tlf-ot1' diff --git a/fonts/step/enc/a_4otmjh.enc b/fonts/step/enc/a_kleesj.enc index 54b51b200d..d0b7fea3fa 100644 --- a/fonts/step/enc/a_4otmjh.enc +++ b/fonts/step/enc/a_kleesj.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_4otmjhxnoga3myzripff6thsbe -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 +%%AutoEnc_kleesj547dbi7re2iv6m6tuo7h +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 % Command line follows encoding -/AutoEnc_4otmjhxnoga3myzripff6thsbe [ +/AutoEnc_kleesj547dbi7re2iv6m6tuo7h [ %00 /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /ff /fi /fl /ffi /ffl %10 /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=sups --ligkern=* {KL} -% * --feature=liga STEP-Regular.otf STEP-Regular-sup-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-sup-ly1' diff --git a/fonts/step/enc/a_knoumu.enc b/fonts/step/enc/a_knoumu.enc new file mode 100644 index 0000000000..984faad3f0 --- /dev/null +++ b/fonts/step/enc/a_knoumu.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_knoumuabumrlzfmvr6xbmqoese +% Encoding created by otftotfm on Thu Feb 6 13:38:06 2020 +% Command line follows encoding +/AutoEnc_knoumuabumrlzfmvr6xbmqoese [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni02D7 /uni2193 + /.notdef /uni0362 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /uni0297 /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni03B3 /.notdef /.notdef /.notdef +%30 + /.notdef /uni027F /.notdef /uni0284 /.notdef /.notdef /uni019E /.notdef + /.notdef /uni0298 /.notdef /.notdef /.notdef /.notdef /uni01AA /.notdef +%40 + /.notdef /.notdef /uni01BA /.notdef /.notdef /.notdef /.notdef /uni01C1 + /uni01C2 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /thorn /thorn /thorn /thorn /uni0294 /uni0294 /uni0294 /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /uni03B4 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /q /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /ffl /ffi /ff /fl /l /fi /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA SYMBOL ENCODING --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Bold.otf STEP-Bold-sup-ts3' diff --git a/fonts/step/enc/a_kv7n4v.enc b/fonts/step/enc/a_kv7n4v.enc new file mode 100644 index 0000000000..b04b26949b --- /dev/null +++ b/fonts/step/enc/a_kv7n4v.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_kv7n4vwyezn55a5usu2m2kg2lb +% Encoding created by otftotfm on Thu Feb 6 13:37:52 2020 +% Command line follows encoding +/AutoEnc_kv7n4vwyezn55a5usu2m2kg2lb [ +%00 + /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB +%10 + /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 + /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron +%20 + /uni1FC1 /exclam /dieresis /uni0385 /uni1FED /percent /periodcentered /uni0384 + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /uni0387 /uni1FFE /equal /uni1FBF /semicolon +%40 + /uni1FDF /uni0391 /uni0392 /uni1FDD /uni2206 /uni0395 /uni03A6 /uni0393 + /uni0397 /uni0399 /uni0398 /uni039A /uni039B /uni039C /uni039D /uni039F +%50 + /uni03A0 /uni03A7 /uni03A1 /uni03A3 /uni03A4 /uni03A5 /uni1FDE /uni2126 + /uni039E /uni03A8 /uni0396 /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD +%60 + /uni1FEF /uni03B1 /uni03B2 /uni03C2 /uni03B4 /uni03B5 /uni03D5 /uni03B3 + /uni03B7 /uni03B9 /uni03B8 /uni03BA /uni03BB /mu /uni03BD /uni03BF +%70 + /uni03C0 /uni03C7 /uni03C1 /uni03C3 /uni03C4 /uni03C5 /.notdef /uni03C9 + /uni03BE /uni03C8 /uni03B6 /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash +%80 + /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83 + /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 +%90 + /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 +%A0 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 + /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 +%B0 + /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 + /uni03CE /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2 +%C0 + /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /uni0388 + /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53 +%D0 + /uni03AF /uni1F35 /uni1F34 /uni1F32 /uni03CD /uni1F55 /uni1F54 /uni1F52 + /uni1FD6 /uni1F37 /uni1F36 /uni03AA /uni1FE6 /uni1F57 /uni1F56 /uni03AB +%E0 + /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43 + /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 +%F0 + /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_lgr +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=dnom --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-dnom-lgr' diff --git a/fonts/step/enc/a_ahbw5k.enc b/fonts/step/enc/a_kxamvp.enc index c6c53d95ec..cc231f5dca 100644 --- a/fonts/step/enc/a_ahbw5k.enc +++ b/fonts/step/enc/a_kxamvp.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_ahbw5kumdoqogltknq2u6mtp3b -% Encoding created by otftotfm on Sun Sep 15 08:04:33 2019 +%%AutoEnc_kxamvpabvpkxbgdwdbbwpy56hc +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding -/AutoEnc_ahbw5kumdoqogltknq2u6mtp3b [ +/AutoEnc_kxamvpabvpkxbgdwdbbwpy56hc [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Italic.otf STEP-Italic-sup-t2a' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Italic.otf STEP-Italic-sup-t2a' diff --git a/fonts/step/enc/a_j4ep6i.enc b/fonts/step/enc/a_l3aktj.enc index df8d0086bb..7d704e4277 100644 --- a/fonts/step/enc/a_j4ep6i.enc +++ b/fonts/step/enc/a_l3aktj.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_j4ep6ii6tr3ueedfni4g24rpbe -% Encoding created by otftotfm on Sun Sep 15 07:14:44 2019 +%%AutoEnc_l3aktjan2xnmksttgcnbfubkwa +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 % Command line follows encoding -/AutoEnc_j4ep6ii6tr3ueedfni4g24rpbe [ +/AutoEnc_l3aktjan2xnmksttgcnbfubkwa [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=liga STEP-Italic.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Italic.otf % STEP-Italic-tlf-t2c' diff --git a/fonts/step/enc/a_l3q5ro.enc b/fonts/step/enc/a_l3q5ro.enc index 79b3486df2..dbe7e605a8 100644 --- a/fonts/step/enc/a_l3q5ro.enc +++ b/fonts/step/enc/a_l3q5ro.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_l3q5rorzcm56k52hiv3drw2w2g -% Encoding created by otftotfm on Tue Sep 10 00:12:29 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding /AutoEnc_l3q5rorzcm56k52hiv3drw2w2g [ %00 @@ -54,12 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga --feature=sups -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf -% STEP-Regular-sup-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Italic.otf STEP-Italic-sup-ly1' diff --git a/fonts/step/enc/a_lihfjg.enc b/fonts/step/enc/a_lihfjg.enc new file mode 100644 index 0000000000..d0f9c56145 --- /dev/null +++ b/fonts/step/enc/a_lihfjg.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lihfjgv3vupwhkt2vv7aci5sab +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 +% Command line follows encoding +/AutoEnc_lihfjgv3vupwhkt2vv7aci5sab [ +%00 + /uni02CB /uni02CA /circumflex /tilde /dieresis /uni02BA /ring /caron + /breve /uni02C9 /dotaccent /cedilla /ogonek /space /uni030D /uni030E +%10 + /uni030F /uni0311 /uni0321 /uni0322 /uni02BE /uni02BF /uni032A /uni032B + /uni02DF /dotlessi /uni0237 /uni02D6 /uni02D4 /uni02D5 /uni033A /uni033B +%20 + /uni033C /uni01C3 /uni02C8 /ff /.notdef /.notdef /uni0360 /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /uni02D0 /uni02D1 /fi /equal /uni2322 /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /uni02BD /bracketright /fl /ffi +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /uni02DE /uni02CC +%80 + /ffl /f_j /f_f_j /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /uni2197 /uni2198 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /uni0221 /.notdef /uni1D07 /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /uni0235 /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /uni0236 /uni02A6 /uni02AE /uni02AF + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /uni02C2 /uni02C3 /.notdef +%C0 + /uni1D00 /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /uni1D1C /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl STEP-Regular.otf STEP-Regular-tlf-t3' diff --git a/fonts/step/enc/a_lvbxzy.enc b/fonts/step/enc/a_lvbxzy.enc deleted file mode 100644 index 21bc28dce8..0000000000 --- a/fonts/step/enc/a_lvbxzy.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_lvbxzyfapvbm3e67hbx5haoghb -% Encoding created by otftotfm on Tue Sep 10 00:18:15 2019 -% Command line follows encoding -/AutoEnc_lvbxzyfapvbm3e67hbx5haoghb [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /question -%10 - /C /exclamdown /quotedblbase /questiondown /endash /.notdef /.notdef /.notdef - /uni2190 /uni2192 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /uni2423 /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /uni2217 /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2191 /uni2193 -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni266A /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /uni2225 /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /uni20A4 /.notdef /.notdef /.notdef /.notdef /trademark - /uni2031 /.notdef /.notdef /uni2116 /.notdef /uni212E /uni25E6 /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /uni203B /onesuperior /ordmasculine /uni221A /onequarter /onehalf /threequarters /uni20AC -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --feature=liga -% STEP-Regular.otf STEP-Regular-tlf-ts1' diff --git a/fonts/step/enc/a_n6yyi4.enc b/fonts/step/enc/a_lwp5cc.enc index 148ee43517..52f88e240b 100644 --- a/fonts/step/enc/a_n6yyi4.enc +++ b/fonts/step/enc/a_lwp5cc.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_n6yyi4idhseyslirzpfmgupuve -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 +%%AutoEnc_lwp5cc4anrslqode44l5vadmja +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_n6yyi4idhseyslirzpfmgupuve [ +/AutoEnc_lwp5cc4anrslqode44l5vadmja [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-sup-t2b' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-sup-t2b' diff --git a/fonts/step/enc/a_lws4fe.enc b/fonts/step/enc/a_lws4fe.enc new file mode 100644 index 0000000000..a201d19754 --- /dev/null +++ b/fonts/step/enc/a_lws4fe.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lws4feyiqaqi74pq2i32ouy7ph +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 +% Command line follows encoding +/AutoEnc_lws4feyiqaqi74pq2i32ouy7ph [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni02D7 /uni2193 + /.notdef /uni0362 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /uni0297 /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni03B3 /.notdef /.notdef /.notdef +%30 + /uniA727 /uni027F /.notdef /uni0284 /.notdef /.notdef /uni019E /uni2640 + /uni26B2 /uni0298 /.notdef /.notdef /.notdef /.notdef /uni01AA /.notdef +%40 + /.notdef /.notdef /uni01BA /.notdef /.notdef /.notdef /.notdef /uni01C1 + /uni01C2 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /thorn.sc /thorn.sc /thorn.sc /thorn.sc /uni0294 /uni0294 /uni0294 /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /uni03B4 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /q.sc /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /ffl.sc /ffi.sc /ff.sc /fl.sc /l.sc /fi.sc /i.sc /f.sc +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA SYMBOL ENCODING --feature=kern --feature=liga +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall STEP-Regular.otf STEP-Regular-tlf-sc-ts3' diff --git a/fonts/step/enc/a_lz3c5z.enc b/fonts/step/enc/a_lz3c5z.enc new file mode 100644 index 0000000000..4c9cfe6e18 --- /dev/null +++ b/fonts/step/enc/a_lz3c5z.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lz3c5zxic7xcakua4g2fm6gk6f +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 +% Command line follows encoding +/AutoEnc_lz3c5zxic7xcakua4g2fm6gk6f [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom + /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /uni0498 /afii10058 + /afii10056 /uni049A /uni04A0 /uni049C /.notdef /uni04A2 /.notdef /afii10054 +%90 + /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /uni04B8 + /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /uni0499 /afii10106 + /afii10104 /uni049B /uni04A1 /uni049D /.notdef /uni04A3 /.notdef /afii10102 +%B0 + /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /uni04B9 + /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2a +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=dnom +% --feature=kern --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-dnom-t2a' diff --git a/fonts/step/enc/a_mjsrji.enc b/fonts/step/enc/a_mjsrji.enc deleted file mode 100644 index 6871222bc1..0000000000 --- a/fonts/step/enc/a_mjsrji.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_mjsrjirk5qjig7z325uxmrjslc -% Encoding created by otftotfm on Sun Sep 15 08:04:26 2019 -% Command line follows encoding -/AutoEnc_mjsrjirk5qjig7z325uxmrjslc [ -%00 - /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.onum /one.onum /two.onum /three.onum /four.onum /five.onum /six.onum /seven.onum - /eight.onum /nine.onum /colon /semicolon /less /equal /greater /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron.sc /guilsinglright /oe.sc /uni017E.sc /asciitilde /Ydieresis -%A0 - /.notdef /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc - /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc -%F0 - /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide - /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=onum --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf -% STEP-Regular-tosf-sc-ly1' diff --git a/fonts/step/enc/a_mkgnjm.enc b/fonts/step/enc/a_mkgnjm.enc new file mode 100644 index 0000000000..a2513cc2ac --- /dev/null +++ b/fonts/step/enc/a_mkgnjm.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 +% Command line follows encoding +/AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh [ +%00 + /uni02CB /uni02CA /circumflex /tilde /dieresis /uni02BA /ring /caron + /breve /uni02C9 /dotaccent /cedilla /ogonek /space /uni030D /uni030E +%10 + /uni030F /uni0311 /uni0321 /uni0322 /uni02BE /uni02BF /uni032A /uni032B + /uni02DF /dotlessi /uni0237 /uni02D6 /uni02D4 /uni02D5 /uni033A /uni033B +%20 + /uni033C /uni01C3 /uni02C8 /.notdef /.notdef /.notdef /uni0360 /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /uni02D0 /uni02D1 /.notdef /equal /uni2322 /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /uni02BD /bracketright /.notdef /.notdef +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /uni02DE /uni02CC +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /uni2197 /uni2198 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /uni0221 /.notdef /uni1D07 /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /uni0235 /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /uni0236 /uni02A6 /uni02AE /uni02AF + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /uni02C2 /uni02C3 /.notdef +%C0 + /uni1D00 /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /uni1D1C /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=dnom --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-dnom-t3' diff --git a/fonts/step/enc/a_4esb2f.enc b/fonts/step/enc/a_mpy73s.enc index ea011f5632..2941a50456 100644 --- a/fonts/step/enc/a_4esb2f.enc +++ b/fonts/step/enc/a_mpy73s.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_4esb2f6gx7nn6xs5jmfw72t6sc -% Encoding created by otftotfm on Sun Sep 15 07:14:38 2019 +%%AutoEnc_mpy73sznerivipkumbh73vnfsa +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding -/AutoEnc_4esb2f6gx7nn6xs5jmfw72t6sc [ +/AutoEnc_mpy73sznerivipkumbh73vnfsa [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Regular.otf STEP-Regular-tosf-t2a' diff --git a/fonts/step/enc/a_zdolkr.enc b/fonts/step/enc/a_msql4j.enc index 6ae74b723b..e1d555a370 100644 --- a/fonts/step/enc/a_zdolkr.enc +++ b/fonts/step/enc/a_msql4j.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_zdolkrfnk3chtgd4snby5cvx6h -% Encoding created by otftotfm on Sun Sep 15 07:14:39 2019 +%%AutoEnc_msql4jcsar3vqj7vxjvu7uknxc +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding -/AutoEnc_zdolkrfnk3chtgd4snby5cvx6h [ +/AutoEnc_msql4jcsar3vqj7vxjvu7uknxc [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Regular.otf STEP-Regular-tosf-t2b' diff --git a/fonts/step/enc/a_nj7yl6.enc b/fonts/step/enc/a_nj7yl6.enc deleted file mode 100644 index 409805fce6..0000000000 --- a/fonts/step/enc/a_nj7yl6.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_nj7yl6jllb26bp2usgxp6rvghd -% Encoding created by otftotfm on Tue Sep 10 00:12:29 2019 -% Command line follows encoding -/AutoEnc_nj7yl6jllb26bp2usgxp6rvghd [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /question -%10 - /C /exclamdown /quotedblbase /questiondown /endash /.notdef /.notdef /.notdef - /uni2190 /uni2192 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /uni2423 /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /uni2217 /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /uni2127 /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2126 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni2191 /uni2193 -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni266A /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /uni2225 /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /uni20A4 /.notdef /.notdef /.notdef /.notdef /trademark - /uni2031 /.notdef /.notdef /uni2116 /.notdef /uni212E /uni25E6 /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /uni203B /onesuperior /ordmasculine /uni221A /onequarter /onehalf /threequarters /uni20AC -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /ffl /ffi /ff /fl /l /fi /i /f -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl STEP-Regular.otf STEP-Regular-tlf-ts1' diff --git a/fonts/step/enc/a_75yyfj.enc b/fonts/step/enc/a_nm3vu2.enc index 9fedb070df..494551604d 100644 --- a/fonts/step/enc/a_75yyfj.enc +++ b/fonts/step/enc/a_nm3vu2.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_75yyfjutdbubmopv24xecrtonc -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 +%%AutoEnc_nm3vu2lhmuudfad6nlgiyndg3b +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding -/AutoEnc_75yyfjutdbubmopv24xecrtonc [ +/AutoEnc_nm3vu2lhmuudfad6nlgiyndg3b [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro.sc /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,13 +51,15 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=smcp --unicoding=germandbls -% =: SSsmall --feature=liga STEP-Regular.otf STEP-Regular-tlf-sc-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall STEP-Regular.otf STEP-Regular-tlf-sc-lgr' diff --git a/fonts/step/enc/a_wmhjje.enc b/fonts/step/enc/a_np5cf6.enc index 32564a6a4b..10423d1f1a 100644 --- a/fonts/step/enc/a_wmhjje.enc +++ b/fonts/step/enc/a_np5cf6.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_wmhjjeo7epgt4jrd6s42vlu3ub -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 +%%AutoEnc_np5cf6erosuj3ial4boipzvx2e +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding -/AutoEnc_wmhjjeo7epgt4jrd6s42vlu3ub [ +/AutoEnc_np5cf6erosuj3ial4boipzvx2e [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tlf-sc-t2b' diff --git a/fonts/step/enc/a_oqx7v6.enc b/fonts/step/enc/a_oqx7v6.enc index 4476ba0138..2217042a52 100644 --- a/fonts/step/enc/a_oqx7v6.enc +++ b/fonts/step/enc/a_oqx7v6.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_oqx7v66vilwb22ocpaqstjso6h -% Encoding created by otftotfm on Sun Sep 15 07:14:45 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding /AutoEnc_oqx7v66vilwb22ocpaqstjso6h [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=sups --ligkern=* {KL} * -% --feature=liga STEP-Italic.otf STEP-Italic-sup-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Italic.otf STEP-Italic-sup-lgr' diff --git a/fonts/step/enc/a_owwokh.enc b/fonts/step/enc/a_owwokh.enc deleted file mode 100644 index 12b8b4cc6a..0000000000 --- a/fonts/step/enc/a_owwokh.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_owwokhtavhrfpkanoznibuh3wc -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 -% Command line follows encoding -/AutoEnc_owwokhtavhrfpkanoznibuh3wc [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.sups /one.sups /two.sups /three.sups /four.sups /five.sups /six.sups /seven.sups - /eight.sups /nine.sups /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /hyphen -%80 - /uni0102 /uni0104 /uni0106 /uni010C /uni010E /uni011A /uni0118 /uni011E - /uni0139 /uni013D /Lslash /uni0143 /uni0147 /uni014A /uni0150 /uni0154 -%90 - /uni0158 /uni015A /Scaron /uni015E /uni0164 /uni0162 /uni0170 /uni016E - /Ydieresis /uni0179 /Zcaron /uni017B /uni0132 /uni0130 /uni0111 /section -%A0 - /uni0103 /uni0105 /uni0107 /uni010D /uni010F /uni011B /uni0119 /uni011F - /uni013A /uni013E /lslash /uni0144 /uni0148 /uni014B /uni0151 /uni0155 -%B0 - /uni0159 /uni015B /scaron /uni015F /uni0165 /uni0163 /uni0171 /uni016F - /ydieresis /uni017A /zcaron /uni017C /uni0133 /exclamdown /questiondown /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=sups --ligkern=* {KL} * --feature=liga STEP-Regular.otf -% STEP-Regular-sup-t1' diff --git a/fonts/step/enc/a_uki32u.enc b/fonts/step/enc/a_oxrcs3.enc index 94b7359814..21a7860028 100644 --- a/fonts/step/enc/a_uki32u.enc +++ b/fonts/step/enc/a_oxrcs3.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_uki32udkpngyrxct2hw2wzv3rg -% Encoding created by otftotfm on Sun Sep 15 08:04:33 2019 +%%AutoEnc_oxrcs32fufh3byays4pa7s2jle +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding -/AutoEnc_uki32udkpngyrxct2hw2wzv3rg [ +/AutoEnc_oxrcs32fufh3byays4pa7s2jle [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Italic.otf STEP-Italic-sup-t2c' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Italic.otf STEP-Italic-sup-t2c' diff --git a/fonts/step/enc/a_p2lhbt.enc b/fonts/step/enc/a_p2lhbt.enc new file mode 100644 index 0000000000..651ffe6622 --- /dev/null +++ b/fonts/step/enc/a_p2lhbt.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_p2lhbtkttb5ssoinjyxgzmofkc +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 +% Command line follows encoding +/AutoEnc_p2lhbtkttb5ssoinjyxgzmofkc [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A +%10 + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /afii10050 /uni0492 /afii10051 /afii10060 /uni04BA /uni0496 /uni0498 /afii10058 + /afii10056 /uni049A /uni04A0 /uni049C /.notdef /uni04A2 /.notdef /afii10054 +%90 + /uni04E8 /uni04AA /afii10062 /uni04AE /uni04B0 /uni04B2 /afii10145 /uni04B8 + /uni04B6 /afii10053 /uni04D8 /afii10059 /afii10023 /uni2116 /currency /section +%A0 + /afii10098 /uni0493 /afii10099 /afii10108 /uni04BB /uni0497 /uni0499 /afii10106 + /afii10104 /uni049B /uni04A1 /uni049D /.notdef /uni04A3 /.notdef /afii10102 +%B0 + /uni04E9 /uni04AB /afii10110 /uni04AF /uni04B1 /uni04B3 /afii10193 /uni04B9 + /uni04B7 /afii10101 /afii10846 /afii10107 /afii10071 /quotedblbase /guillemotleft /guillemotright +%C0 + /afii10017 /afii10018 /afii10019 /afii10020 /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 /afii10030 /afii10031 /afii10032 /afii10033 +%D0 + /afii10034 /afii10035 /afii10036 /afii10037 /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 /afii10046 /afii10047 /afii10048 /afii10049 +%E0 + /afii10065 /afii10066 /afii10067 /afii10068 /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 /afii10078 /afii10079 /afii10080 /afii10081 +%F0 + /afii10082 /afii10083 /afii10084 /afii10085 /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t2a +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-numr-t2a' diff --git a/fonts/step/enc/a_psybls.enc b/fonts/step/enc/a_psybls.enc index 483d9cf66e..c4ac3edff4 100644 --- a/fonts/step/enc/a_psybls.enc +++ b/fonts/step/enc/a_psybls.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_psyblsm2m3fsejbbcufwpd5t7f -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding /AutoEnc_psyblsm2m3fsejbbcufwpd5t7f [ %00 @@ -54,11 +54,11 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern % --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl diff --git a/fonts/step/enc/a_q6ipx2.enc b/fonts/step/enc/a_q6ipx2.enc index f9aa5176a9..330607d424 100644 --- a/fonts/step/enc/a_q6ipx2.enc +++ b/fonts/step/enc/a_q6ipx2.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_q6ipx2lntlxny52g2fzgkoszuc -% Encoding created by otftotfm on Tue Sep 10 00:12:32 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:07 2020 % Command line follows encoding /AutoEnc_q6ipx2lntlxny52g2fzgkoszuc [ %00 @@ -54,11 +54,11 @@ /ffl /ffi /ff /fl /l /fi /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl STEP-Bold.otf STEP-Bold-tlf-ts1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Bold.otf STEP-Bold-tlf-ts1' diff --git a/fonts/step/enc/a_g5azuq.enc b/fonts/step/enc/a_qqe53s.enc index 5da426777b..33af447fda 100644 --- a/fonts/step/enc/a_g5azuq.enc +++ b/fonts/step/enc/a_qqe53s.enc @@ -1,9 +1,9 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_g5azuqbshumv747xgidntafvmb -% Encoding created by otftotfm on Sun Sep 15 08:04:27 2019 +%%AutoEnc_qqe53son6okjabwf47lmft2t5h +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding -/AutoEnc_g5azuqbshumv747xgidntafvmb [ +/AutoEnc_qqe53son6okjabwf47lmft2t5h [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /question @@ -51,13 +51,14 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef %F0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /ffl /ffi /ff /fl /l /fi /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --feature=liga -% STEP-Regular.otf STEP-Regular-tosf-ts1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Regular.otf STEP-Regular-tlf-ts1' diff --git a/fonts/step/enc/a_yl3m5r.enc b/fonts/step/enc/a_rcc5m6.enc index 461f37345e..67c6f7ba0c 100644 --- a/fonts/step/enc/a_yl3m5r.enc +++ b/fonts/step/enc/a_rcc5m6.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_yl3m5rrvbckr47jveh5i73j3of -% Encoding created by otftotfm on Sun Sep 15 07:14:44 2019 +%%AutoEnc_rcc5m6gnxq7qmubuxfvmjp4szb +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 % Command line follows encoding -/AutoEnc_yl3m5rrvbckr47jveh5i73j3of [ +/AutoEnc_rcc5m6gnxq7qmubuxfvmjp4szb [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_j /f_f_j + /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /f_f_j /.notdef %10 - /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=liga STEP-Italic.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Italic.otf % STEP-Italic-tlf-t2b' diff --git a/fonts/step/enc/a_rcz4zw.enc b/fonts/step/enc/a_rcz4zw.enc deleted file mode 100644 index 5fb1abe961..0000000000 --- a/fonts/step/enc/a_rcz4zw.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_rcz4zwebmwkdxdjjnztfpdimig -% Encoding created by otftotfm on Sun Sep 15 08:04:31 2019 -% Command line follows encoding -/AutoEnc_rcz4zwebmwkdxdjjnztfpdimig [ -%00 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk -%10 - /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef -%20 - /uni2423 /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle - /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction -%30 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef -%40 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%50 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%60 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%70 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%80 - /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand - /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /uni20A4 /.notdef /.notdef /.notdef /.notdef /trademark - /uni2031 /.notdef /.notdef /uni2116 /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section - /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef -%B0 - /degree /plusminus /twosuperior /threesuperior /.notdef /mu /paragraph /periodcentered - /.notdef /onesuperior /ordmasculine /.notdef /onequarter /onehalf /threequarters /uni20AC -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --feature=liga -% STEP-Italic.otf STEP-Italic-tosf-ts1' diff --git a/fonts/step/enc/a_redus5.enc b/fonts/step/enc/a_redus5.enc index 384ee86235..44b5d606c1 100644 --- a/fonts/step/enc/a_redus5.enc +++ b/fonts/step/enc/a_redus5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_redus5fqyucraank777ybmhnvb -% Encoding created by otftotfm on Tue Sep 10 00:12:28 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding /AutoEnc_redus5fqyucraank777ybmhnvb [ %00 @@ -54,11 +54,11 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern % --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl % --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl diff --git a/fonts/step/enc/a_rgssq4.enc b/fonts/step/enc/a_rgssq4.enc index 6178235a80..c2e78a04ef 100644 --- a/fonts/step/enc/a_rgssq4.enc +++ b/fonts/step/enc/a_rgssq4.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_rgssq43eoy3k6fmyic7tlnmsea -% Encoding created by otftotfm on Sun Sep 15 07:14:49 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:10 2020 % Command line follows encoding /AutoEnc_rgssq43eoy3k6fmyic7tlnmsea [ %00 @@ -54,10 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=liga STEP-BoldItalic.otf -% STEP-BoldItalic-tlf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-BoldItalic.otf STEP-BoldItalic-tlf-lgr' diff --git a/fonts/step/enc/a_rx4otu.enc b/fonts/step/enc/a_rx4otu.enc index 2d800d006e..1502810246 100644 --- a/fonts/step/enc/a_rx4otu.enc +++ b/fonts/step/enc/a_rx4otu.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_rx4otumgzhwozbsf7ska3wdndh -% Encoding created by otftotfm on Sun Sep 15 07:14:50 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:09 2020 % Command line follows encoding /AutoEnc_rx4otumgzhwozbsf7ska3wdndh [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=sups --ligkern=* {KL} * -% --feature=liga STEP-BoldItalic.otf STEP-BoldItalic-sup-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-BoldItalic.otf STEP-BoldItalic-sup-lgr' diff --git a/fonts/step/enc/a_udjv2r.enc b/fonts/step/enc/a_ryuwvo.enc index c757239392..612a23e21b 100644 --- a/fonts/step/enc/a_udjv2r.enc +++ b/fonts/step/enc/a_ryuwvo.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_udjv2re637bexrctoohgrumhkb -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 +%%AutoEnc_ryuwvo4wcj7t7rldr633dkj7he +% Encoding created by otftotfm on Thu Feb 6 13:37:54 2020 % Command line follows encoding -/AutoEnc_udjv2re637bexrctoohgrumhkb [ +/AutoEnc_ryuwvo4wcj7t7rldr633dkj7he [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-sup-t2a' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-sup-t2a' diff --git a/fonts/step/enc/a_smf27h.enc b/fonts/step/enc/a_smf27h.enc deleted file mode 100644 index f33fe15689..0000000000 --- a/fonts/step/enc/a_smf27h.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_smf27heo5h22qs3alntfz4rh3d -% Encoding created by otftotfm on Sun Sep 15 08:04:29 2019 -% Command line follows encoding -/AutoEnc_smf27heo5h22qs3alntfz4rh3d [ -%00 - /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.sinf /one.sinf /two.sinf /three.sinf /four.sinf /five.sinf /six.sinf /seven.sinf - /eight.sinf /nine.sinf /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=sinf --ligkern=* {KL} * --feature=liga -% STEP-Regular.otf STEP-Regular-inf-ot1' diff --git a/fonts/step/enc/a_smrcla.enc b/fonts/step/enc/a_smrcla.enc index 096338c706..2eb0eeeded 100644 --- a/fonts/step/enc/a_smrcla.enc +++ b/fonts/step/enc/a_smrcla.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_smrclajsycaupxlyfmzu5xmnvh -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:00 2020 % Command line follows encoding /AutoEnc_smrclajsycaupxlyfmzu5xmnvh [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga --feature=sinf --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-inf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sinf +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf +% STEP-Regular-inf-ot1' diff --git a/fonts/step/enc/a_cqqmgz.enc b/fonts/step/enc/a_sycgav.enc index 05894f6042..32f576aa5f 100644 --- a/fonts/step/enc/a_cqqmgz.enc +++ b/fonts/step/enc/a_sycgav.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_cqqmgz632o6ljjpxim45qo4oph -% Encoding created by otftotfm on Sun Sep 15 08:04:27 2019 +%%AutoEnc_sycgav5acgoxwy5tcbhwcmhpdc +% Encoding created by otftotfm on Thu Feb 6 13:38:00 2020 % Command line follows encoding -/AutoEnc_cqqmgz632o6ljjpxim45qo4oph [ +/AutoEnc_sycgav5acgoxwy5tcbhwcmhpdc [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=onum --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tosf-sc-t2c' diff --git a/fonts/step/enc/a_tded26.enc b/fonts/step/enc/a_tded26.enc deleted file mode 100644 index 30090578d6..0000000000 --- a/fonts/step/enc/a_tded26.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_tded26ibmwcxsj75ymofi6t4ng -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 -% Command line follows encoding -/AutoEnc_tded26ibmwcxsj75ymofi6t4ng [ -%00 - /.notdef /Euro.sc /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron.sc /guilsinglright /oe.sc /uni017E.sc /asciitilde /Ydieresis -%A0 - /.notdef /exclamdown.sc /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown.sc -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc - /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc -%F0 - /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide - /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf -% STEP-Regular-tlf-sc-ly1' diff --git a/fonts/step/enc/a_ibvqy3.enc b/fonts/step/enc/a_tmbyhw.enc index b31a72d6c7..82144ec27d 100644 --- a/fonts/step/enc/a_ibvqy3.enc +++ b/fonts/step/enc/a_tmbyhw.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_ibvqy3uhrdvx5p52h2vfgd4ndb -% Encoding created by otftotfm on Sun Sep 15 07:14:38 2019 +%%AutoEnc_tmbyhwvciiizienosjksfmublh +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding -/AutoEnc_ibvqy3uhrdvx5p52h2vfgd4ndb [ +/AutoEnc_tmbyhwvciiizienosjksfmublh [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,13 +51,15 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=onum --feature=liga -% STEP-Regular.otf STEP-Regular-tosf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf +% STEP-Regular-tosf-lgr' diff --git a/fonts/step/enc/a_tpegoz.enc b/fonts/step/enc/a_tpegoz.enc index ff80a4c866..52f889fb3c 100644 --- a/fonts/step/enc/a_tpegoz.enc +++ b/fonts/step/enc/a_tpegoz.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_tpegozswdw5qsbgqvweky5yczc -% Encoding created by otftotfm on Tue Sep 10 00:12:29 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:57 2020 % Command line follows encoding /AutoEnc_tpegozswdw5qsbgqvweky5yczc [ %00 @@ -54,12 +54,13 @@ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=liga --feature=smcp -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall -% STEP-Regular.otf STEP-Regular-tlf-sc-ly1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --unicoding=germandbls =: SSsmall STEP-Regular.otf +% STEP-Regular-tlf-sc-ly1' diff --git a/fonts/step/enc/a_tqaent.enc b/fonts/step/enc/a_tqaent.enc index a9a9db0928..a2f7991211 100644 --- a/fonts/step/enc/a_tqaent.enc +++ b/fonts/step/enc/a_tqaent.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_tqaent5xephwt3gq5v75glgnka -% Encoding created by otftotfm on Sun Sep 15 07:14:47 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:05 2020 % Command line follows encoding /AutoEnc_tqaent5xephwt3gq5v75glgnka [ %00 @@ -54,10 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=sups --ligkern=* {KL} * -% --feature=liga STEP-Bold.otf STEP-Bold-sup-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Bold.otf STEP-Bold-sup-lgr' diff --git a/fonts/step/enc/a_trfpj6.enc b/fonts/step/enc/a_trfpj6.enc deleted file mode 100644 index a0072cd786..0000000000 --- a/fonts/step/enc/a_trfpj6.enc +++ /dev/null @@ -1,64 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_trfpj642md3rxfhfcpj4y4codd -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 -% Command line follows encoding -/AutoEnc_trfpj642md3rxfhfcpj4y4codd [ -%00 - /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron - /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright -%10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef -%20 - /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen -%80 - /uni0102 /uni0104 /uni0106 /uni010C /uni010E /uni011A /uni0118 /uni011E - /uni0139 /uni013D /Lslash /uni0143 /uni0147 /uni014A /uni0150 /uni0154 -%90 - /uni0158 /uni015A /Scaron /uni015E /uni0164 /uni0162 /uni0170 /uni016E - /Ydieresis /uni0179 /Zcaron /uni017B /uni0132 /uni0130 /uni0111.sc /section -%A0 - /uni0103.sc /uni0105.sc /uni0107.sc /uni010D.sc /uni010F.sc /uni011B.sc /uni0119.sc /uni011F.sc - /uni013A.sc /uni013E.sc /lslash.sc /uni0144.sc /uni0148.sc /uni014B /uni0151.sc /uni0155.sc -%B0 - /uni0159.sc /uni015B.sc /scaron.sc /uni015F.sc /uni0165.sc /uni0163.sc /uni0171.sc /uni016F.sc - /ydieresis.sc /uni017A.sc /uni017E.sc /uni017C.sc /uni0133.sc /exclamdown.sc /questiondown.sc /sterling -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef -%E0 - /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc - /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc -%F0 - /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc - /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap -% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=smcp --unicoding=germandbls =: SSsmall --feature=liga -% STEP-Regular.otf STEP-Regular-tlf-sc-t1' diff --git a/fonts/step/enc/a_gwwgis.enc b/fonts/step/enc/a_txv6lr.enc index ac2e417cf5..13650e6c47 100644 --- a/fonts/step/enc/a_gwwgis.enc +++ b/fonts/step/enc/a_txv6lr.enc @@ -1,21 +1,21 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_gwwgis5ryxlw3474z7ct2afhcg -% Encoding created by otftotfm on Sun Sep 15 08:04:30 2019 +%%AutoEnc_txv6lrgmzhrqjd32dcx6v4d7sb +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 % Command line follows encoding -/AutoEnc_gwwgis5ryxlw3474z7ct2afhcg [ +/AutoEnc_txv6lrgmzhrqjd32dcx6v4d7sb [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright %10 /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash %30 - /zero.sinf /one.sinf /two.sinf /three.sinf /four.sinf /five.sinf /six.sinf /seven.sinf - /eight.sinf /nine.sinf /colon /semicolon /less /equal /greater /question + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question %40 /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O @@ -54,11 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls ] def % Command line: 'otftotfm --automatic --encoding=fontools_t1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern -% --feature=sinf --ligkern=* {KL} * --feature=liga STEP-Regular.otf -% STEP-Regular-inf-t1' +% --feature=liga --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-numr-t1' diff --git a/fonts/step/enc/a_u5xlv2.enc b/fonts/step/enc/a_u5xlv2.enc deleted file mode 100644 index 9fc3420253..0000000000 --- a/fonts/step/enc/a_u5xlv2.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_u5xlv2ii3jlt5vn2ej4je5hhyb -% Encoding created by otftotfm on Sun Sep 15 08:04:28 2019 -% Command line follows encoding -/AutoEnc_u5xlv2ii3jlt5vn2ej4je5hhyb [ -%00 - /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi.sc /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash -%20 - /space /exclam.sc /quotedblright /numbersign /dollar.sc /percent /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown.sc /equal /questiondown.sc /question.sc -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc - /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -%70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=smcp --unicoding=germandbls =: SSsmall -% --feature=liga STEP-Regular.otf STEP-Regular-tlf-sc-ot1' diff --git a/fonts/step/enc/a_uda4d5.enc b/fonts/step/enc/a_uda4d5.enc index 68f3a7c11d..049710d1a5 100644 --- a/fonts/step/enc/a_uda4d5.enc +++ b/fonts/step/enc/a_uda4d5.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uda4d5bmfcmbgrfg4tfrk2i5oe -% Encoding created by otftotfm on Tue Sep 10 00:12:30 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:59 2020 % Command line follows encoding /AutoEnc_uda4d5bmfcmbgrfg4tfrk2i5oe [ %00 @@ -54,12 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga --feature=onum --feature=smcp -% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i -% =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall -% STEP-Regular.otf STEP-Regular-tosf-sc-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum +% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =: +% SSsmall STEP-Regular.otf STEP-Regular-tosf-sc-ot1' diff --git a/fonts/step/enc/a_qboisw.enc b/fonts/step/enc/a_ufgsbs.enc index 6c7d8d80de..1bfeb26f23 100644 --- a/fonts/step/enc/a_qboisw.enc +++ b/fonts/step/enc/a_ufgsbs.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_qboiswtnlmpg7fuqtlqb4npkfa -% Encoding created by otftotfm on Sun Sep 15 08:04:30 2019 +%%AutoEnc_ufgsbssgxbse62jzlskinsk43c +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding -/AutoEnc_qboiswtnlmpg7fuqtlqb4npkfa [ +/AutoEnc_ufgsbssgxbse62jzlskinsk43c [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=sinf --ligkern=* -% {KL} * --feature=liga STEP-Regular.otf STEP-Regular-inf-t2c' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-inf-t2c' diff --git a/fonts/step/enc/a_uhrokn.enc b/fonts/step/enc/a_uhrokn.enc index bb372d38f2..e1fde9c36d 100644 --- a/fonts/step/enc/a_uhrokn.enc +++ b/fonts/step/enc/a_uhrokn.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uhroknkfblgpgraqzbt5w3zc5f -% Encoding created by otftotfm on Tue Sep 10 00:12:28 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:53 2020 % Command line follows encoding /AutoEnc_uhroknkfblgpgraqzbt5w3zc5f [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl --ligkern=* {KL} * STEP-Regular.otf STEP-Regular-sup-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Regular.otf +% STEP-Regular-sup-ot1' diff --git a/fonts/step/enc/a_uip2yp.enc b/fonts/step/enc/a_uip2yp.enc index 021baaf3d8..64e3b66a8b 100644 --- a/fonts/step/enc/a_uip2yp.enc +++ b/fonts/step/enc/a_uip2yp.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_uip2yptzr33tn7ngi6lpkt3n3g -% Encoding created by otftotfm on Sun Sep 15 07:14:47 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:06 2020 % Command line follows encoding /AutoEnc_uip2yptzr33tn7ngi6lpkt3n3g [ %00 @@ -54,10 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=liga STEP-Bold.otf -% STEP-Bold-tlf-lgr' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Bold.otf STEP-Bold-tlf-lgr' diff --git a/fonts/step/enc/a_4t3tqv.enc b/fonts/step/enc/a_umr5bj.enc index 8c8c62f297..b6dc18b035 100644 --- a/fonts/step/enc/a_4t3tqv.enc +++ b/fonts/step/enc/a_umr5bj.enc @@ -1,12 +1,12 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_4t3tqvnsrnrr7oa2swnby43faf -% Encoding created by otftotfm on Sun Sep 15 08:04:26 2019 +%%AutoEnc_umr5bj6zeheqilfqb36yiknh5b +% Encoding created by otftotfm on Thu Feb 6 13:37:59 2020 % Command line follows encoding -/AutoEnc_4t3tqvnsrnrr7oa2swnby43faf [ +/AutoEnc_umr5bj6zeheqilfqb36yiknh5b [ %00 /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB - /.notdef /uni1FBC /.notdef /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB %10 /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 /Euro.sc /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron @@ -33,9 +33,9 @@ /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 %90 /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C - /uni1F74 /uni1F21 /uni1F20 /uni038A /.notdef /uni1F91 /uni1F90 /uni0389 + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 %A0 - /uni03AE /uni1F25 /uni1F24 /uni1F23 /.notdef /uni1F95 /uni1F94 /uni1F93 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 %B0 /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 @@ -51,14 +51,16 @@ /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 %F0 /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 - /uni1FB3 /.notdef /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_lgr -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=GREEK -% FONT ENCODING - LGR --feature=kern --feature=onum --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=onum --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tosf-sc-lgr' diff --git a/fonts/step/enc/a_v7z4fi.enc b/fonts/step/enc/a_v7z4fi.enc index 0dd42d7172..4b5ff8b806 100644 --- a/fonts/step/enc/a_v7z4fi.enc +++ b/fonts/step/enc/a_v7z4fi.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_v7z4fimdvhp2rqfjqw263pz7th -% Encoding created by otftotfm on Tue Sep 10 00:12:31 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding /AutoEnc_v7z4fimdvhp2rqfjqw263pz7th [ %00 @@ -54,11 +54,11 @@ /ffl /ffi /ff /fl /l /fi /i /f ] def % Command line: 'otftotfm --automatic --encoding=fontools_ts1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT COMPANION SYMBOLS 1---TS1 --feature=onum --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl STEP-Italic.otf STEP-Italic-tlf-ts1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Italic.otf STEP-Italic-tlf-ts1' diff --git a/fonts/step/enc/a_tpkmtb.enc b/fonts/step/enc/a_vca5tb.enc index 00546e7657..c7a15106b7 100644 --- a/fonts/step/enc/a_tpkmtb.enc +++ b/fonts/step/enc/a_vca5tb.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_tpkmtbcbyp6rgp6tbh7vsoag3h -% Encoding created by otftotfm on Sun Sep 15 07:14:40 2019 +%%AutoEnc_vca5tbmb4ke2q5djqneq7xlpzf +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding -/AutoEnc_tpkmtbcbyp6rgp6tbh7vsoag3h [ +/AutoEnc_vca5tbmb4ke2q5djqneq7xlpzf [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=liga -% STEP-Regular.otf STEP-Regular-tlf-t2a' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf +% STEP-Regular-tlf-t2a' diff --git a/fonts/step/enc/a_vmnawy.enc b/fonts/step/enc/a_vmnawy.enc index e68e905bc2..3809e80f0d 100644 --- a/fonts/step/enc/a_vmnawy.enc +++ b/fonts/step/enc/a_vmnawy.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vmnawypb3wx7vmuipufjnhaqic -% Encoding created by otftotfm on Tue Sep 10 00:18:14 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 % Command line follows encoding /AutoEnc_vmnawypb3wx7vmuipufjnhaqic [ %00 @@ -54,9 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga STEP-Regular.otf STEP-Regular-tlf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl STEP-Regular.otf STEP-Regular-tlf-ot1' diff --git a/fonts/step/enc/a_vzhqhy.enc b/fonts/step/enc/a_vzhqhy.enc index c11a0a6a71..7ac051caaa 100644 --- a/fonts/step/enc/a_vzhqhy.enc +++ b/fonts/step/enc/a_vzhqhy.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_vzhqhyyynotemelfpertpk2dya -% Encoding created by otftotfm on Tue Sep 10 00:12:31 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:01 2020 % Command line follows encoding /AutoEnc_vzhqhyyynotemelfpertpk2dya [ %00 @@ -54,11 +54,12 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=liga --feature=sups --ligkern=f i =: fi -% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff -% l =: ffl --ligkern=* {KL} * STEP-Italic.otf STEP-Italic-sup-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * STEP-Italic.otf +% STEP-Italic-sup-ot1' diff --git a/fonts/step/enc/a_w7y2wc.enc b/fonts/step/enc/a_w7y2wc.enc new file mode 100644 index 0000000000..5d281b6a3d --- /dev/null +++ b/fonts/step/enc/a_w7y2wc.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_w7y2wchpjh5s4ibhn2rioueklb +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 +% Command line follows encoding +/AutoEnc_w7y2wchpjh5s4ibhn2rioueklb [ +%00 + /.notdef /.notdef /circumflex /tilde /dieresis /.notdef /ring /caron + /breve /.notdef /dotaccent /cedilla /ogonek /.notdef /.notdef /.notdef +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /uni01C3 /.notdef /.notdef /.notdef /.notdef /.notdef /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /.notdef /.notdef /.notdef /equal /.notdef /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /.notdef /bracketright /.notdef /.notdef +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /.notdef /.notdef /.notdef /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /.notdef /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /.notdef /uni02A6 /.notdef /.notdef + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /.notdef /.notdef /.notdef +%C0 + /.notdef /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /.notdef /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Italic.otf STEP-Italic-sup-t3' diff --git a/fonts/step/enc/a_wql5wd.enc b/fonts/step/enc/a_wql5wd.enc deleted file mode 100644 index 885de1ab45..0000000000 --- a/fonts/step/enc/a_wql5wd.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_wql5wdufgatxrvgre3iyrd2qlc -% Encoding created by otftotfm on Sun Sep 15 08:04:32 2019 -% Command line follows encoding -/AutoEnc_wql5wdufgatxrvgre3iyrd2qlc [ -%00 - /.notdef /uni20AC /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero.sups /one.sups /two.sups /three.sups /four.sups /five.sups /six.sups /seven.sups - /eight.sups /nine.sups /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=sups --ligkern=* {KL} -% * --feature=liga STEP-Italic.otf STEP-Italic-sup-ly1' diff --git a/fonts/step/enc/a_wzfdme.enc b/fonts/step/enc/a_wzfdme.enc index 5c32a664e2..9c42455d9b 100644 --- a/fonts/step/enc/a_wzfdme.enc +++ b/fonts/step/enc/a_wzfdme.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_wzfdmegp5f532c6rbcwcodplae -% Encoding created by otftotfm on Sun Sep 15 07:14:38 2019 +% Encoding created by otftotfm on Thu Feb 6 13:37:58 2020 % Command line follows encoding /AutoEnc_wzfdmegp5f532c6rbcwcodplae [ %00 @@ -54,10 +54,12 @@ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis ] def % Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern --feature=onum --feature=liga +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=onum --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl % STEP-Regular.otf STEP-Regular-tosf-ly1' diff --git a/fonts/step/enc/a_nm54me.enc b/fonts/step/enc/a_x67loa.enc index caa37590d4..e034d63a86 100644 --- a/fonts/step/enc/a_nm54me.enc +++ b/fonts/step/enc/a_x67loa.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_nm54mexvdshf6gkeeqqd2tnjlg -% Encoding created by otftotfm on Sun Sep 15 08:04:33 2019 +%%AutoEnc_x67loaaomj4biwtlvapaqc56of +% Encoding created by otftotfm on Thu Feb 6 13:38:02 2020 % Command line follows encoding -/AutoEnc_nm54mexvdshf6gkeeqqd2tnjlg [ +/AutoEnc_x67loaaomj4biwtlvapaqc56of [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /.notdef /.notdef %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2b -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2B --feature=kern --feature=sups --ligkern=* -% {KL} * --feature=liga STEP-Italic.otf STEP-Italic-sup-t2b' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2B --feature=kern +% --feature=liga --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% --ligkern=* {KL} * STEP-Italic.otf STEP-Italic-sup-t2b' diff --git a/fonts/step/enc/a_x7ixiy.enc b/fonts/step/enc/a_x7ixiy.enc new file mode 100644 index 0000000000..cc39909ce2 --- /dev/null +++ b/fonts/step/enc/a_x7ixiy.enc @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_x7ixiy6lbtdwarsdyiingze6ed +% Encoding created by otftotfm on Thu Feb 6 13:38:03 2020 +% Command line follows encoding +/AutoEnc_x7ixiy6lbtdwarsdyiingze6ed [ +%00 + /ff /fi /circumflex /tilde /dieresis /fl /ring /caron + /breve /ffi /dotaccent /cedilla /ogonek /ffl /f_j /f_f_j +%10 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /uni01C3 /.notdef /.notdef /.notdef /.notdef /.notdef /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /.notdef /.notdef /.notdef /equal /.notdef /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /.notdef /bracketright /.notdef /.notdef +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /.notdef /.notdef /.notdef /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /.notdef /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /.notdef /uni02A6 /.notdef /.notdef + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /.notdef /.notdef /.notdef +%C0 + /.notdef /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /.notdef /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga --ligkern=f +% i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi +% --ligkern=ff l =: ffl STEP-Italic.otf STEP-Italic-tlf-t3' diff --git a/fonts/step/enc/a_xnivr2.enc b/fonts/step/enc/a_xnivr2.enc index 20a6168d91..695cb527ae 100644 --- a/fonts/step/enc/a_xnivr2.enc +++ b/fonts/step/enc/a_xnivr2.enc @@ -1,7 +1,7 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT %%AutoEnc_xnivr2fhskf5fkog6dneyn6cvf -% Encoding created by otftotfm on Tue Sep 10 00:18:17 2019 +% Encoding created by otftotfm on Thu Feb 6 13:38:04 2020 % Command line follows encoding /AutoEnc_xnivr2fhskf5fkog6dneyn6cvf [ %00 @@ -54,10 +54,11 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def % Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern --feature=onum --feature=liga STEP-Italic.otf -% STEP-Italic-tosf-ot1' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=onum +% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i +% =: ffi --ligkern=ff l =: ffl STEP-Italic.otf STEP-Italic-tosf-ot1' diff --git a/fonts/step/enc/a_xscnug.enc b/fonts/step/enc/a_xscnug.enc new file mode 100644 index 0000000000..75bad7d96f --- /dev/null +++ b/fonts/step/enc/a_xscnug.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_xscnugpa6dudmqbz7dhiqvbflf +% Encoding created by otftotfm on Thu Feb 6 13:38:06 2020 +% Command line follows encoding +/AutoEnc_xscnugpa6dudmqbz7dhiqvbflf [ +%00 + /uni02CB /uni02CA /circumflex /tilde /dieresis /uni02BA /ring /caron + /breve /uni02C9 /dotaccent /cedilla /ogonek /space /uni030D /uni030E +%10 + /uni030F /uni0311 /uni0321 /uni0322 /uni02BE /uni02BF /uni032A /uni032B + /uni02DF /dotlessi /uni0237 /uni02D6 /uni02D4 /uni02D5 /uni033A /uni033B +%20 + /uni033C /uni01C3 /uni02C8 /.notdef /.notdef /.notdef /uni0360 /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /uni0289 /uni0268 /uni028C /uni025C /uni0265 /uni0250 /uni0252 /uni0264 + /uni0275 /uni0258 /uni02D0 /uni02D1 /.notdef /equal /uni2322 /question +%40 + /uni0259 /uni0251 /uni03B2 /uni0255 /eth /uni025B /uni0278 /uni0263 + /uni0266 /uni026A /uni029D /uni0281 /uni028E /uni0271 /uni014B /uni0254 +%50 + /uni0294 /uni0295 /uni027E /uni0283 /uni03B8 /uni028A /uni028B /uni026F + /uni03C7 /uni028F /uni0292 /bracketleft /uni02BD /bracketright /.notdef /.notdef +%60 + /uni02BB /a /b /c /d /e /f /uni0261 + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /uni01C1 /uni01C0 /uni01C2 /uni02DE /uni02CC +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /uni2502 /uni2551 /.notdef /.notdef /uni2197 /uni2198 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /uni0180 /uni0111 /.notdef /.notdef /uni1D07 /g /.notdef /uni0285 + /.notdef /uni029E /uni019A /uni03BB /.notdef /.notdef /.notdef /.notdef +%B0 + /uni03C9 /uni03C9 /uni0286 /uni01AB /.notdef /uni02A6 /.notdef /.notdef + /uni0293 /.notdef /afii10094 /afii10092 /uni02C0 /uni02C2 /uni02C3 /.notdef +%C0 + /uni1D00 /uni0188 /uni0297 /uni02A4 /uni025A /uni029A /uni025E /uni025D + /.notdef /uni029B /uni0267 /uni029C /uni0269 /.notdef /uni0199 /uni029F +%D0 + /uni026E /uni0277 /uni01A5 /uni02A0 /uni027C /uni027A /uni01AD /uni0276 + /uni0287 /uni02A7 /uni1D1C /uni0296 /uni02A1 /uni02A2 /.notdef /.notdef +%E0 + /uni0299 /uni0253 /uni0257 /uni0256 /uni0260 /uni0262 /ae /ccedilla + /uni0127 /uni025F /uni0284 /uni026B /uni026C /uni026D /uni0270 /uni0273 +%F0 + /uni0274 /uni0272 /uni0298 /uni027D /uni0279 /uni027B /uni0280 /oe + /oslash /uni0282 /uni0288 /uni028D /uni0290 /uni0291 /thorn /uni0195 +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t3 +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX IPA ENCODING --feature=kern --feature=liga +% --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Bold.otf STEP-Bold-sup-t3' diff --git a/fonts/step/enc/a_xwhxeh.enc b/fonts/step/enc/a_xwhxeh.enc deleted file mode 100644 index 16c105f199..0000000000 --- a/fonts/step/enc/a_xwhxeh.enc +++ /dev/null @@ -1,63 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_xwhxehzm72pk7cdiqig32k3reh -% Encoding created by otftotfm on Tue Sep 10 00:05:50 2019 -% Command line follows encoding -/AutoEnc_xwhxehzm72pk7cdiqig32k3reh [ -%00 - /.notdef /uni20AC /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /less /equal /greater /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /tilde /dieresis -%80 - /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl - /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus -%90 - /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis -%A0 - /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section - /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron -%B0 - /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered - /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown -%C0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis -%D0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls -%E0 - /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla - /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis -%F0 - /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide - /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ly1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TYPEWRITER AND WINDOWS ANSI --feature=kern STEP-Regular.otf -% STEP-Regular-tlf-ly1' diff --git a/fonts/step/enc/a_aoap6m.enc b/fonts/step/enc/a_y3uxyj.enc index eae2d4b11b..a30dec01a7 100644 --- a/fonts/step/enc/a_aoap6m.enc +++ b/fonts/step/enc/a_y3uxyj.enc @@ -1,14 +1,14 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_aoap6mljf3uvqa5ina244n2ide -% Encoding created by otftotfm on Sun Sep 15 07:14:40 2019 +%%AutoEnc_y3uxyj7grbfj5gojh7tyhib2ef +% Encoding created by otftotfm on Thu Feb 6 13:37:56 2020 % Command line follows encoding -/AutoEnc_aoap6mljf3uvqa5ina244n2ide [ +/AutoEnc_y3uxyj7grbfj5gojh7tyhib2ef [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 - /quotedblleft /quotedblright /f_j /f_f_j /.notdef /endash /emdash /.notdef + /quotedblleft /quotedblright /f_f_j /.notdef /.notdef /endash /emdash /f_j /.notdef /dotlessi /uni0237 /ff /fi /fl /ffi /ffl %20 /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright @@ -54,10 +54,12 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2c -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2C --feature=kern --feature=liga -% STEP-Regular.otf STEP-Regular-tlf-t2c' +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2C --feature=kern +% --feature=liga --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl STEP-Regular.otf +% STEP-Regular-tlf-t2c' diff --git a/fonts/step/enc/a_ya3dy4.enc b/fonts/step/enc/a_ya3dy4.enc new file mode 100644 index 0000000000..d5375ba57d --- /dev/null +++ b/fonts/step/enc/a_ya3dy4.enc @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_ya3dy4kxwfctu4iiequlsj22jh +% Encoding created by otftotfm on Thu Feb 6 13:37:55 2020 +% Command line follows encoding +/AutoEnc_ya3dy4kxwfctu4iiequlsj22jh [ +%00 + /endash /uni032F /.notdef /.notdef /.notdef /.notdef /uni03DB /uni03DB + /.notdef /uni1FBC /uni1FCC /uni1FFC /uni0391 /uni03AB /uni03B1 /uni03CB +%10 + /uni0316 /uni0317 /uni03DF /uni03D9 /uni032E /uni03D8 /uni03DA /uni03E0 + /Euro /perthousand /uni0259 /uni03E1 /quoteleft /quoteright /breve /macron +%20 + /uni1FC1 /exclam /dieresis /uni0385 /uni1FED /percent /periodcentered /uni0384 + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr + /eight.numr /nine.numr /colon /uni0387 /uni1FFE /equal /uni1FBF /semicolon +%40 + /uni1FDF /uni0391 /uni0392 /uni1FDD /uni2206 /uni0395 /uni03A6 /uni0393 + /uni0397 /uni0399 /uni0398 /uni039A /uni039B /uni039C /uni039D /uni039F +%50 + /uni03A0 /uni03A7 /uni03A1 /uni03A3 /uni03A4 /uni03A5 /uni1FDE /uni2126 + /uni039E /uni03A8 /uni0396 /bracketleft /uni1FCF /bracketright /uni1FCE /uni1FCD +%60 + /uni1FEF /uni03B1 /uni03B2 /uni03C2 /uni03B4 /uni03B5 /uni03D5 /uni03B3 + /uni03B7 /uni03B9 /uni03B8 /uni03BA /uni03BB /mu /uni03BD /uni03BF +%70 + /uni03C0 /uni03C7 /uni03C1 /uni03C3 /uni03C4 /uni03C5 /.notdef /uni03C9 + /uni03BE /uni03C8 /uni03B6 /guillemotleft /uni037A /guillemotright /uni1FC0 /emdash +%80 + /uni1F70 /uni1F01 /uni1F00 /uni1F03 /uni1FB2 /uni1F81 /uni1F80 /uni1F83 + /uni03AC /uni1F05 /uni1F04 /uni1F02 /uni1FB4 /uni1F85 /uni1F84 /uni1F82 +%90 + /uni1FB6 /uni1F07 /uni1F06 /uni03DD /uni1FB7 /uni1F87 /uni1F86 /uni038C + /uni1F74 /uni1F21 /uni1F20 /uni038A /uni1FC2 /uni1F91 /uni1F90 /uni0389 +%A0 + /uni03AE /uni1F25 /uni1F24 /uni1F23 /uni1FC4 /uni1F95 /uni1F94 /uni1F93 + /uni1FC6 /uni1F27 /uni1F26 /uni1F22 /uni1FC7 /uni1F97 /uni1F96 /uni1F92 +%B0 + /uni1F7C /uni1F61 /uni1F60 /uni1F63 /uni1FF2 /uni1FA1 /uni1FA0 /uni1FA3 + /uni03CE /uni1F65 /uni1F64 /uni1F62 /uni1FF4 /uni1FA5 /uni1FA4 /uni1FA2 +%C0 + /uni1FF6 /uni1F67 /uni1F66 /uni03DC /uni1FF7 /uni1FA7 /uni1FA6 /uni0388 + /uni1F76 /uni1F31 /uni1F30 /uni1F33 /uni1F7A /uni1F51 /uni1F50 /uni1F53 +%D0 + /uni03AF /uni1F35 /uni1F34 /uni1F32 /uni03CD /uni1F55 /uni1F54 /uni1F52 + /uni1FD6 /uni1F37 /uni1F36 /uni03AA /uni1FE6 /uni1F57 /uni1F56 /uni03AB +%E0 + /uni1F72 /uni1F11 /uni1F10 /uni1F13 /uni1F78 /uni1F41 /uni1F40 /uni1F43 + /uni03AD /uni1F15 /uni1F14 /uni1F12 /uni03CC /uni1F45 /uni1F44 /uni1F42 +%F0 + /uni03CA /uni1FD2 /uni0390 /uni1FD7 /uni03CB /uni1FE2 /uni03B0 /uni1FE7 + /uni1FB3 /uni1FC3 /uni1FF3 /uni1FE5 /uni1FE4 /uni0386 /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_lgr +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=GREEK FONT ENCODING - LGR --feature=kern --feature=liga +% --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff +% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * +% STEP-Regular.otf STEP-Regular-numr-lgr' diff --git a/fonts/step/enc/a_nk3vlt.enc b/fonts/step/enc/a_ylmzrw.enc index 6f845589bc..4d71ccaa2a 100644 --- a/fonts/step/enc/a_nk3vlt.enc +++ b/fonts/step/enc/a_ylmzrw.enc @@ -1,15 +1,15 @@ % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT -%%AutoEnc_nk3vltoqgqyi7sukj5xqlbemta -% Encoding created by otftotfm on Sun Sep 15 08:04:26 2019 +%%AutoEnc_ylmzrwzpqky2myuuq7gsayfh5h +% Encoding created by otftotfm on Thu Feb 6 13:37:59 2020 % Command line follows encoding -/AutoEnc_nk3vltoqgqyi7sukj5xqlbemta [ +/AutoEnc_ylmzrwzpqky2myuuq7gsayfh5h [ %00 /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron /breve /macron /dotaccent /cedilla /ogonek /uni04C0 /uni2329 /uni232A %10 /quotedblleft /quotedblright /.notdef /.notdef /.notdef /endash /emdash /.notdef - /.notdef /dotlessi.sc /uni0237 /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /dotlessi.sc /uni0237 /ff.sc /fi.sc /fl.sc /ffi.sc /ffl.sc %20 /space /exclam.sc /quotedbl /numbersign /dollar.sc /percent /ampersand.sc /quoteright /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash @@ -54,11 +54,13 @@ /afii10090 /afii10091 /afii10092 /afii10093 /afii10094 /afii10095 /afii10096 /afii10097 ] def % Command line: 'otftotfm --automatic --encoding=fontools_t2a -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% CYRILLIC FONT ENCODING - T2A --feature=kern --feature=onum --feature=smcp -% --unicoding=germandbls =: SSsmall --feature=liga STEP-Regular.otf +% --tfm-directory=../new/fonts/tfm/public/step +% --vf-directory=../new/fonts/vf/public/step +% --type1-directory=../new/fonts/type1/public/step +% --encoding-directory=../new/fonts/enc/dvips/step +% --map-file=../new/fonts/map/dvips/step/STEP.map --no-updmap +% --coding-scheme=TEX CYRILLIC FONT ENCODING - T2A --feature=kern +% --feature=liga --feature=onum --feature=smcp --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --unicoding=germandbls =: SSsmall STEP-Regular.otf % STEP-Regular-tosf-sc-t2a' diff --git a/fonts/step/enc/a_zjx4yp.enc b/fonts/step/enc/a_zjx4yp.enc deleted file mode 100644 index 5d78318390..0000000000 --- a/fonts/step/enc/a_zjx4yp.enc +++ /dev/null @@ -1,62 +0,0 @@ -% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT - -%%AutoEnc_zjx4ypn5upwpjpr6rzv66vciib -% Encoding created by otftotfm on Tue Sep 10 00:05:49 2019 -% Command line follows encoding -/AutoEnc_zjx4ypn5upwpjpr6rzv66vciib [ -%00 - /uni0393 /uni2206 /uni0398 /uni039B /uni039E /uni03A0 /uni03A3 /uni03A5 - /uni03A6 /uni03A8 /uni2126 /.notdef /.notdef /.notdef /.notdef /.notdef -%10 - /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring - /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash -%20 - /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -%30 - /zero /one /two /three /four /five /six /seven - /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question -%40 - /at /A /B /C /D /E /F /G - /H /I /J /K /L /M /N /O -%50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent -%60 - /quoteleft /a /b /c /d /e /f /g - /h /i /j /k /l /m /n /o -%70 - /p /q /r /s /t /u /v /w - /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis -%80 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%90 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%A0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef -%B0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%C0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%D0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%E0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -%F0 - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef - /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef -] def -% Command line: 'otftotfm --automatic --encoding=fontools_ot1 -% --tfm-directory=fonts/tfm/public/step --vf-directory=fonts/vf/public/step -% --type1-directory=fonts/type1/public/step -% --truetype-directory=fonts/truetype/public/step -% --encoding-directory=fonts/enc/dvips/step -% --map-file=fonts/map/dvips/step/STEP.map --no-updmap --coding-scheme=TEX -% TEXT --feature=kern STEP-Regular.otf STEP-Regular-tlf-ot1' diff --git a/fonts/step/latex/LGRSTEP-Dnom.fd b/fonts/step/latex/LGRSTEP-Dnom.fd new file mode 100644 index 0000000000..015860a9de --- /dev/null +++ b/fonts/step/latex/LGRSTEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{LGRSTEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for LGR/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{LGR}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{LGR}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-lgr +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{LGR}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/LGRSTEP-Inf.fd b/fonts/step/latex/LGRSTEP-Inf.fd index fc6fbdbfcb..ea688727ce 100644 --- a/fonts/step/latex/LGRSTEP-Inf.fd +++ b/fonts/step/latex/LGRSTEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LGRSTEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for LGR/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for LGR/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{LGR}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/LGRSTEP-Numr.fd b/fonts/step/latex/LGRSTEP-Numr.fd new file mode 100644 index 0000000000..9a92a692e1 --- /dev/null +++ b/fonts/step/latex/LGRSTEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{LGRSTEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for LGR/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{LGR}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{LGR}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-lgr +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{LGR}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/LGRSTEP-Sup.fd b/fonts/step/latex/LGRSTEP-Sup.fd index bb80eba287..4fd03bb4c0 100644 --- a/fonts/step/latex/LGRSTEP-Sup.fd +++ b/fonts/step/latex/LGRSTEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LGRSTEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for LGR/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for LGR/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -29,59 +37,59 @@ % ---- regular ---- -\DeclareFontShape{LGR}{STEP-Sup}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-sup-lgr -}{} - \DeclareFontShape{LGR}{STEP-Sup}{regular}{n}{ <-> \STEP@@scale STEP-Regular-sup-lgr }{} +\DeclareFontShape{LGR}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-lgr +}{} + \DeclareFontShape{LGR}{STEP-Sup}{regular}{sl}{ <-> ssub * STEP-Sup/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LGR}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it -}{} - \DeclareFontShape{LGR}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl + <-> alias * STEP-Sup/regular/sl }{} \DeclareFontShape{LGR}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n + <-> alias * STEP-Sup/regular/n +}{} + +\DeclareFontShape{LGR}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it }{} % b --> bold \DeclareFontShape{LGR}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n -}{} - -\DeclareFontShape{LGR}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{LGR}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} -\DeclareFontShape{LGR}{STEP-Sup}{bx}{sl}{ - <-> ssub * STEP-Sup/b/sl +\DeclareFontShape{LGR}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it }{} \DeclareFontShape{LGR}{STEP-Sup}{bx}{it}{ <-> ssub * STEP-Sup/b/it }{} +\DeclareFontShape{LGR}{STEP-Sup}{bx}{sl}{ + <-> ssub * STEP-Sup/b/sl +}{} + \DeclareFontShape{LGR}{STEP-Sup}{bx}{n}{ <-> ssub * STEP-Sup/b/n }{} diff --git a/fonts/step/latex/LGRSTEP-TLF.fd b/fonts/step/latex/LGRSTEP-TLF.fd index 9c59db798b..b48ea00585 100644 --- a/fonts/step/latex/LGRSTEP-TLF.fd +++ b/fonts/step/latex/LGRSTEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LGRSTEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for LGR/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for LGR/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,66 +20,78 @@ \DeclareFontFamily{LGR}{STEP-TLF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LGR}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-lgr +\DeclareFontShape{LGR}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-lgr }{} -\DeclareFontShape{LGR}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-lgr +\DeclareFontShape{LGR}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{LGR}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LGR}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-lgr +\DeclareFontShape{LGR}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-lgr }{} -\DeclareFontShape{LGR}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-lgr +\DeclareFontShape{LGR}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{LGR}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-lgr +}{} + +\DeclareFontShape{LGR}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LGR}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl +\DeclareFontShape{LGR}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc }{} -\DeclareFontShape{LGR}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{LGR}{STEP-TLF}{m}{n}{ + <-> alias * STEP-TLF/regular/n }{} -\DeclareFontShape{LGR}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n +\DeclareFontShape{LGR}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl +}{} + +\DeclareFontShape{LGR}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it }{} % b --> bold -\DeclareFontShape{LGR}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n +\DeclareFontShape{LGR}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it }{} \DeclareFontShape{LGR}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl + <-> alias * STEP-TLF/bold/sl }{} -\DeclareFontShape{LGR}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{LGR}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n +}{} + +\DeclareFontShape{LGR}{STEP-TLF}{bx}{it}{ + <-> ssub * STEP-TLF/b/it }{} \DeclareFontShape{LGR}{STEP-TLF}{bx}{n}{ @@ -82,8 +102,4 @@ <-> ssub * STEP-TLF/b/sl }{} -\DeclareFontShape{LGR}{STEP-TLF}{bx}{it}{ - <-> ssub * STEP-TLF/b/it -}{} - \endinput diff --git a/fonts/step/latex/LGRSTEP-TOsF.fd b/fonts/step/latex/LGRSTEP-TOsF.fd index debcfb0b15..ea69215140 100644 --- a/fonts/step/latex/LGRSTEP-TOsF.fd +++ b/fonts/step/latex/LGRSTEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LGRSTEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for LGR/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for LGR/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,70 +20,74 @@ \DeclareFontFamily{LGR}{STEP-TOsF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LGR}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-lgr +\DeclareFontShape{LGR}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-lgr }{} -\DeclareFontShape{LGR}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-lgr +\DeclareFontShape{LGR}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{STEP-TOsF}{regular}{sl}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{LGR}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LGR}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-lgr +\DeclareFontShape{LGR}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-lgr }{} -\DeclareFontShape{LGR}{STEP-TOsF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tosf-lgr +\DeclareFontShape{LGR}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{STEP-TOsF}{bold}{sl}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{LGR}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-lgr +}{} + +\DeclareFontShape{LGR}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LGR}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl +\DeclareFontShape{LGR}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it }{} -\DeclareFontShape{LGR}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{LGR}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl }{} \DeclareFontShape{LGR}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n +}{} + +\DeclareFontShape{LGR}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc }{} % b --> bold -\DeclareFontShape{LGR}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n -}{} - \DeclareFontShape{LGR}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{LGR}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{LGR}{STEP-TOsF}{bx}{n}{ - <-> ssub * STEP-TOsF/b/n +\DeclareFontShape{LGR}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n }{} \DeclareFontShape{LGR}{STEP-TOsF}{bx}{it}{ @@ -86,4 +98,8 @@ <-> ssub * STEP-TOsF/b/sl }{} +\DeclareFontShape{LGR}{STEP-TOsF}{bx}{n}{ + <-> ssub * STEP-TOsF/b/n +}{} + \endinput diff --git a/fonts/step/latex/LY1STEP-Dnom.fd b/fonts/step/latex/LY1STEP-Dnom.fd new file mode 100644 index 0000000000..d038306708 --- /dev/null +++ b/fonts/step/latex/LY1STEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{LY1STEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for LY1/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-ly1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{LY1}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/LY1STEP-Inf.fd b/fonts/step/latex/LY1STEP-Inf.fd index 27f373229b..0c1e1bfc74 100644 --- a/fonts/step/latex/LY1STEP-Inf.fd +++ b/fonts/step/latex/LY1STEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LY1STEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for LY1/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for LY1/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{LY1}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/LY1STEP-Numr.fd b/fonts/step/latex/LY1STEP-Numr.fd new file mode 100644 index 0000000000..3f22d86793 --- /dev/null +++ b/fonts/step/latex/LY1STEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{LY1STEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for LY1/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{LY1}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-ly1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{LY1}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/LY1STEP-Sup.fd b/fonts/step/latex/LY1STEP-Sup.fd index bcd515cbec..210d2d6abf 100644 --- a/fonts/step/latex/LY1STEP-Sup.fd +++ b/fonts/step/latex/LY1STEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LY1STEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for LY1/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for LY1/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- bold ---- -\DeclareFontShape{LY1}{STEP-Sup}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-sup-ly1 -}{} - \DeclareFontShape{LY1}{STEP-Sup}{bold}{n}{ <-> \STEP@@scale STEP-Bold-sup-ly1 }{} +\DeclareFontShape{LY1}{STEP-Sup}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-sup-ly1 +}{} + \DeclareFontShape{LY1}{STEP-Sup}{bold}{sl}{ <-> ssub * STEP-Sup/bold/it }{} @@ -29,59 +37,59 @@ % ---- regular ---- -\DeclareFontShape{LY1}{STEP-Sup}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-sup-ly1 -}{} - \DeclareFontShape{LY1}{STEP-Sup}{regular}{n}{ <-> \STEP@@scale STEP-Regular-sup-ly1 }{} +\DeclareFontShape{LY1}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-ly1 +}{} + \DeclareFontShape{LY1}{STEP-Sup}{regular}{sl}{ <-> ssub * STEP-Sup/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LY1}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl -}{} - \DeclareFontShape{LY1}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it + <-> alias * STEP-Sup/regular/it }{} \DeclareFontShape{LY1}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n + <-> alias * STEP-Sup/regular/n +}{} + +\DeclareFontShape{LY1}{STEP-Sup}{m}{sl}{ + <-> alias * STEP-Sup/regular/sl }{} % b --> bold \DeclareFontShape{LY1}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n -}{} - -\DeclareFontShape{LY1}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{LY1}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} -\DeclareFontShape{LY1}{STEP-Sup}{bx}{n}{ - <-> ssub * STEP-Sup/b/n +\DeclareFontShape{LY1}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it }{} \DeclareFontShape{LY1}{STEP-Sup}{bx}{sl}{ <-> ssub * STEP-Sup/b/sl }{} +\DeclareFontShape{LY1}{STEP-Sup}{bx}{n}{ + <-> ssub * STEP-Sup/b/n +}{} + \DeclareFontShape{LY1}{STEP-Sup}{bx}{it}{ <-> ssub * STEP-Sup/b/it }{} diff --git a/fonts/step/latex/LY1STEP-TLF.fd b/fonts/step/latex/LY1STEP-TLF.fd index 8af5458713..9d02212340 100644 --- a/fonts/step/latex/LY1STEP-TLF.fd +++ b/fonts/step/latex/LY1STEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LY1STEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for LY1/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for LY1/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -29,49 +37,57 @@ % ---- regular ---- -\DeclareFontShape{LY1}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-ly1 -}{} - \DeclareFontShape{LY1}{STEP-TLF}{regular}{it}{ <-> \STEP@@scale STEP-Italic-tlf-ly1 }{} +\DeclareFontShape{LY1}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-ly1 +}{} + \DeclareFontShape{LY1}{STEP-TLF}{regular}{sl}{ <-> ssub * STEP-TLF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{LY1}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl +}{} + \DeclareFontShape{LY1}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n + <-> alias * STEP-TLF/regular/n }{} -\DeclareFontShape{LY1}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl +\DeclareFontShape{LY1}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc }{} \DeclareFontShape{LY1}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it + <-> alias * STEP-TLF/regular/it }{} % b --> bold \DeclareFontShape{LY1}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it + <-> alias * STEP-TLF/bold/it }{} -\DeclareFontShape{LY1}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl +\DeclareFontShape{LY1}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n }{} -\DeclareFontShape{LY1}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n +\DeclareFontShape{LY1}{STEP-TLF}{b}{sl}{ + <-> alias * STEP-TLF/bold/sl }{} \DeclareFontShape{LY1}{STEP-TLF}{bx}{it}{ diff --git a/fonts/step/latex/LY1STEP-TOsF.fd b/fonts/step/latex/LY1STEP-TOsF.fd index 7dc0fad7af..964fb6aca7 100644 --- a/fonts/step/latex/LY1STEP-TOsF.fd +++ b/fonts/step/latex/LY1STEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{LY1STEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for LY1/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for LY1/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,70 +20,74 @@ \DeclareFontFamily{LY1}{STEP-TOsF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{LY1}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-ly1 +\DeclareFontShape{LY1}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-ly1 +\DeclareFontShape{LY1}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-ly1 }{} -\DeclareFontShape{LY1}{STEP-TOsF}{regular}{sl}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{LY1}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{LY1}{STEP-TOsF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tosf-ly1 +\DeclareFontShape{LY1}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-ly1 }{} -\DeclareFontShape{LY1}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{STEP-TOsF}{bold}{sl}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{LY1}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{LY1}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl -}{} - \DeclareFontShape{LY1}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it + <-> alias * STEP-TOsF/regular/it }{} \DeclareFontShape{LY1}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n +}{} + +\DeclareFontShape{LY1}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc +}{} + +\DeclareFontShape{LY1}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl }{} % b --> bold \DeclareFontShape{LY1}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it -}{} - -\DeclareFontShape{LY1}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{LY1}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n + <-> alias * STEP-TOsF/bold/n }{} -\DeclareFontShape{LY1}{STEP-TOsF}{bx}{it}{ - <-> ssub * STEP-TOsF/b/it +\DeclareFontShape{LY1}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl }{} \DeclareFontShape{LY1}{STEP-TOsF}{bx}{sl}{ @@ -86,4 +98,8 @@ <-> ssub * STEP-TOsF/b/n }{} +\DeclareFontShape{LY1}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + \endinput diff --git a/fonts/step/latex/OT1STEP-Dnom.fd b/fonts/step/latex/OT1STEP-Dnom.fd new file mode 100644 index 0000000000..fa7196d87d --- /dev/null +++ b/fonts/step/latex/OT1STEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{OT1STEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for OT1/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-ot1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{OT1}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/OT1STEP-Inf.fd b/fonts/step/latex/OT1STEP-Inf.fd index e648ff8fbc..e63d0f32cc 100644 --- a/fonts/step/latex/OT1STEP-Inf.fd +++ b/fonts/step/latex/OT1STEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{OT1STEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for OT1/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for OT1/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{OT1}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/OT1STEP-Numr.fd b/fonts/step/latex/OT1STEP-Numr.fd new file mode 100644 index 0000000000..bc525db698 --- /dev/null +++ b/fonts/step/latex/OT1STEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{OT1STEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for OT1/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{OT1}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-ot1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{OT1}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/OT1STEP-Sup.fd b/fonts/step/latex/OT1STEP-Sup.fd index 2eac599fae..9a92e9fac1 100644 --- a/fonts/step/latex/OT1STEP-Sup.fd +++ b/fonts/step/latex/OT1STEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{OT1STEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for OT1/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for OT1/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- bold ---- -\DeclareFontShape{OT1}{STEP-Sup}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-sup-ot1 -}{} - \DeclareFontShape{OT1}{STEP-Sup}{bold}{it}{ <-> \STEP@@scale STEP-BoldItalic-sup-ot1 }{} +\DeclareFontShape{OT1}{STEP-Sup}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-sup-ot1 +}{} + \DeclareFontShape{OT1}{STEP-Sup}{bold}{sl}{ <-> ssub * STEP-Sup/bold/it }{} @@ -42,36 +50,40 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{OT1}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n + <-> alias * STEP-Sup/regular/n }{} \DeclareFontShape{OT1}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl + <-> alias * STEP-Sup/regular/sl }{} \DeclareFontShape{OT1}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it + <-> alias * STEP-Sup/regular/it }{} % b --> bold -\DeclareFontShape{OT1}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n +\DeclareFontShape{OT1}{STEP-Sup}{b}{sl}{ + <-> alias * STEP-Sup/bold/sl }{} -\DeclareFontShape{OT1}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl +\DeclareFontShape{OT1}{STEP-Sup}{b}{n}{ + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{OT1}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it + <-> alias * STEP-Sup/bold/it +}{} + +\DeclareFontShape{OT1}{STEP-Sup}{bx}{it}{ + <-> ssub * STEP-Sup/b/it }{} \DeclareFontShape{OT1}{STEP-Sup}{bx}{n}{ @@ -82,8 +94,4 @@ <-> ssub * STEP-Sup/b/sl }{} -\DeclareFontShape{OT1}{STEP-Sup}{bx}{it}{ - <-> ssub * STEP-Sup/b/it -}{} - \endinput diff --git a/fonts/step/latex/OT1STEP-TLF.fd b/fonts/step/latex/OT1STEP-TLF.fd index 03addb67a2..e960e97831 100644 --- a/fonts/step/latex/OT1STEP-TLF.fd +++ b/fonts/step/latex/OT1STEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{OT1STEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for OT1/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for OT1/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,70 +20,74 @@ \DeclareFontFamily{OT1}{STEP-TLF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{OT1}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-ot1 +\DeclareFontShape{OT1}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{OT1}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-ot1 }{} +\DeclareFontShape{OT1}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it +}{} -% ---- regular ---- -\DeclareFontShape{OT1}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-ot1 +% ---- bold ---- + +\DeclareFontShape{OT1}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-ot1 +\DeclareFontShape{OT1}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{OT1}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{OT1}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc +}{} + \DeclareFontShape{OT1}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n + <-> alias * STEP-TLF/regular/n }{} \DeclareFontShape{OT1}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl + <-> alias * STEP-TLF/regular/sl }{} \DeclareFontShape{OT1}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it + <-> alias * STEP-TLF/regular/it }{} % b --> bold -\DeclareFontShape{OT1}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n -}{} - -\DeclareFontShape{OT1}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl +\DeclareFontShape{OT1}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it }{} -\DeclareFontShape{OT1}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{OT1}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n }{} -\DeclareFontShape{OT1}{STEP-TLF}{bx}{it}{ - <-> ssub * STEP-TLF/b/it +\DeclareFontShape{OT1}{STEP-TLF}{b}{sl}{ + <-> alias * STEP-TLF/bold/sl }{} \DeclareFontShape{OT1}{STEP-TLF}{bx}{sl}{ @@ -86,4 +98,8 @@ <-> ssub * STEP-TLF/b/n }{} +\DeclareFontShape{OT1}{STEP-TLF}{bx}{it}{ + <-> ssub * STEP-TLF/b/it +}{} + \endinput diff --git a/fonts/step/latex/OT1STEP-TOsF.fd b/fonts/step/latex/OT1STEP-TOsF.fd index 694df48df7..13474e74d3 100644 --- a/fonts/step/latex/OT1STEP-TOsF.fd +++ b/fonts/step/latex/OT1STEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{OT1STEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for OT1/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for OT1/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,78 +20,86 @@ \DeclareFontFamily{OT1}{STEP-TOsF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{OT1}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-ot1 +\DeclareFontShape{OT1}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-ot1 +\DeclareFontShape{OT1}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TOsF}{regular}{sl}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{OT1}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{OT1}{STEP-TOsF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tosf-ot1 +\DeclareFontShape{OT1}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-ot1 }{} -\DeclareFontShape{OT1}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{STEP-TOsF}{bold}{sl}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{OT1}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{OT1}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it +}{} + \DeclareFontShape{OT1}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl + <-> alias * STEP-TOsF/regular/sl }{} -\DeclareFontShape{OT1}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{OT1}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc }{} \DeclareFontShape{OT1}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n }{} % b --> bold -\DeclareFontShape{OT1}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n -}{} - \DeclareFontShape{OT1}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{OT1}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{OT1}{STEP-TOsF}{bx}{n}{ - <-> ssub * STEP-TOsF/b/n +\DeclareFontShape{OT1}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n }{} -\DeclareFontShape{OT1}{STEP-TOsF}{bx}{it}{ - <-> ssub * STEP-TOsF/b/it +\DeclareFontShape{OT1}{STEP-TOsF}{bx}{n}{ + <-> ssub * STEP-TOsF/b/n }{} \DeclareFontShape{OT1}{STEP-TOsF}{bx}{sl}{ <-> ssub * STEP-TOsF/b/sl }{} +\DeclareFontShape{OT1}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + \endinput diff --git a/fonts/step/latex/T1STEP-Dnom.fd b/fonts/step/latex/T1STEP-Dnom.fd new file mode 100644 index 0000000000..47d29e1e52 --- /dev/null +++ b/fonts/step/latex/T1STEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T1STEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for T1/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-t1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T1}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T1STEP-Inf.fd b/fonts/step/latex/T1STEP-Inf.fd index 7fedbc6c4b..f27a34fc39 100644 --- a/fonts/step/latex/T1STEP-Inf.fd +++ b/fonts/step/latex/T1STEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T1STEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for T1/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for T1/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T1}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/T1STEP-Numr.fd b/fonts/step/latex/T1STEP-Numr.fd new file mode 100644 index 0000000000..2cdbcc7619 --- /dev/null +++ b/fonts/step/latex/T1STEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T1STEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for T1/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{T1}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-t1 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T1}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T1STEP-Sup.fd b/fonts/step/latex/T1STEP-Sup.fd index 7bcacf9528..0efed317cf 100644 --- a/fonts/step/latex/T1STEP-Sup.fd +++ b/fonts/step/latex/T1STEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T1STEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for T1/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for T1/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -29,61 +37,61 @@ % ---- regular ---- -\DeclareFontShape{T1}{STEP-Sup}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-sup-t1 -}{} - \DeclareFontShape{T1}{STEP-Sup}{regular}{it}{ <-> \STEP@@scale STEP-Italic-sup-t1 }{} +\DeclareFontShape{T1}{STEP-Sup}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-sup-t1 +}{} + \DeclareFontShape{T1}{STEP-Sup}{regular}{sl}{ <-> ssub * STEP-Sup/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T1}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl +\DeclareFontShape{T1}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it }{} -\DeclareFontShape{T1}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it +\DeclareFontShape{T1}{STEP-Sup}{m}{sl}{ + <-> alias * STEP-Sup/regular/sl }{} \DeclareFontShape{T1}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n + <-> alias * STEP-Sup/regular/n }{} % b --> bold -\DeclareFontShape{T1}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it -}{} - \DeclareFontShape{T1}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} \DeclareFontShape{T1}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n + <-> alias * STEP-Sup/bold/n }{} -\DeclareFontShape{T1}{STEP-Sup}{bx}{n}{ - <-> ssub * STEP-Sup/b/n +\DeclareFontShape{T1}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it }{} -\DeclareFontShape{T1}{STEP-Sup}{bx}{it}{ - <-> ssub * STEP-Sup/b/it +\DeclareFontShape{T1}{STEP-Sup}{bx}{n}{ + <-> ssub * STEP-Sup/b/n }{} \DeclareFontShape{T1}{STEP-Sup}{bx}{sl}{ <-> ssub * STEP-Sup/b/sl }{} +\DeclareFontShape{T1}{STEP-Sup}{bx}{it}{ + <-> ssub * STEP-Sup/b/it +}{} + \endinput diff --git a/fonts/step/latex/T1STEP-TLF.fd b/fonts/step/latex/T1STEP-TLF.fd index 6257935ba1..4e975261fb 100644 --- a/fonts/step/latex/T1STEP-TLF.fd +++ b/fonts/step/latex/T1STEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T1STEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for T1/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for T1/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,66 +20,78 @@ \DeclareFontFamily{T1}{STEP-TLF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T1}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-t1 }{} -\DeclareFontShape{T1}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-t1 +\DeclareFontShape{T1}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-t1 }{} -\DeclareFontShape{T1}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{T1}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-t1 }{} +\DeclareFontShape{T1}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it +}{} -% ---- regular ---- -\DeclareFontShape{T1}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-t1 +% ---- bold ---- + +\DeclareFontShape{T1}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-t1 +\DeclareFontShape{T1}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-t1 }{} -\DeclareFontShape{T1}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{T1}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T1}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n + <-> alias * STEP-TLF/regular/n +}{} + +\DeclareFontShape{T1}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc }{} \DeclareFontShape{T1}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl + <-> alias * STEP-TLF/regular/sl }{} \DeclareFontShape{T1}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it + <-> alias * STEP-TLF/regular/it }{} % b --> bold \DeclareFontShape{T1}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl + <-> alias * STEP-TLF/bold/sl +}{} + +\DeclareFontShape{T1}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n }{} \DeclareFontShape{T1}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it + <-> alias * STEP-TLF/bold/it }{} -\DeclareFontShape{T1}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n +\DeclareFontShape{T1}{STEP-TLF}{bx}{n}{ + <-> ssub * STEP-TLF/b/n }{} \DeclareFontShape{T1}{STEP-TLF}{bx}{sl}{ @@ -82,8 +102,4 @@ <-> ssub * STEP-TLF/b/it }{} -\DeclareFontShape{T1}{STEP-TLF}{bx}{n}{ - <-> ssub * STEP-TLF/b/n -}{} - \endinput diff --git a/fonts/step/latex/T1STEP-TOsF.fd b/fonts/step/latex/T1STEP-TOsF.fd index 94bc3c3f2d..c31aa12b17 100644 --- a/fonts/step/latex/T1STEP-TOsF.fd +++ b/fonts/step/latex/T1STEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T1STEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for T1/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for T1/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- bold ---- -\DeclareFontShape{T1}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-t1 -}{} - \DeclareFontShape{T1}{STEP-TOsF}{bold}{n}{ <-> \STEP@@scale STEP-Bold-tosf-t1 }{} +\DeclareFontShape{T1}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-t1 +}{} + \DeclareFontShape{T1}{STEP-TOsF}{bold}{sl}{ <-> ssub * STEP-TOsF/bold/it }{} @@ -29,61 +37,69 @@ % ---- regular ---- -\DeclareFontShape{T1}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-t1 -}{} - \DeclareFontShape{T1}{STEP-TOsF}{regular}{it}{ <-> \STEP@@scale STEP-Italic-tosf-t1 }{} +\DeclareFontShape{T1}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-t1 +}{} + \DeclareFontShape{T1}{STEP-TOsF}{regular}{sl}{ <-> ssub * STEP-TOsF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T1}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T1}{STEP-TOsF}{m}{n}{ + <-> alias * STEP-TOsF/regular/n +}{} + +\DeclareFontShape{T1}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc }{} \DeclareFontShape{T1}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl + <-> alias * STEP-TOsF/regular/sl }{} -\DeclareFontShape{T1}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n +\DeclareFontShape{T1}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it }{} % b --> bold -\DeclareFontShape{T1}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n +\DeclareFontShape{T1}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{T1}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl +\DeclareFontShape{T1}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n }{} \DeclareFontShape{T1}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{T1}{STEP-TOsF}{bx}{sl}{ <-> ssub * STEP-TOsF/b/sl }{} -\DeclareFontShape{T1}{STEP-TOsF}{bx}{it}{ - <-> ssub * STEP-TOsF/b/it -}{} - \DeclareFontShape{T1}{STEP-TOsF}{bx}{n}{ <-> ssub * STEP-TOsF/b/n }{} +\DeclareFontShape{T1}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + \endinput diff --git a/fonts/step/latex/T2ASTEP-Dnom.fd b/fonts/step/latex/T2ASTEP-Dnom.fd new file mode 100644 index 0000000000..f44b71def7 --- /dev/null +++ b/fonts/step/latex/T2ASTEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2ASTEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for T2A/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2A}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{T2A}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-t2a +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2A}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2ASTEP-Inf.fd b/fonts/step/latex/T2ASTEP-Inf.fd index 55be08f3a9..1ea64aaebd 100644 --- a/fonts/step/latex/T2ASTEP-Inf.fd +++ b/fonts/step/latex/T2ASTEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2ASTEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for T2A/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for T2A/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T2A}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/T2ASTEP-Numr.fd b/fonts/step/latex/T2ASTEP-Numr.fd new file mode 100644 index 0000000000..6d9d3e0036 --- /dev/null +++ b/fonts/step/latex/T2ASTEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2ASTEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for T2A/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2A}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{T2A}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-t2a +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2A}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2ASTEP-Sup.fd b/fonts/step/latex/T2ASTEP-Sup.fd index 19f1a8c51f..2a11e76daf 100644 --- a/fonts/step/latex/T2ASTEP-Sup.fd +++ b/fonts/step/latex/T2ASTEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2ASTEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for T2A/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for T2A/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,70 +20,66 @@ \DeclareFontFamily{T2A}{STEP-Sup}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{T2A}{STEP-Sup}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-sup-t2a +\DeclareFontShape{T2A}{STEP-Sup}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-sup-t2a }{} -\DeclareFontShape{T2A}{STEP-Sup}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-sup-t2a +\DeclareFontShape{T2A}{STEP-Sup}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-sup-t2a }{} -\DeclareFontShape{T2A}{STEP-Sup}{regular}{sl}{ - <-> ssub * STEP-Sup/regular/it +\DeclareFontShape{T2A}{STEP-Sup}{bold}{sl}{ + <-> ssub * STEP-Sup/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T2A}{STEP-Sup}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-sup-t2a +\DeclareFontShape{T2A}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-t2a }{} -\DeclareFontShape{T2A}{STEP-Sup}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-sup-t2a +\DeclareFontShape{T2A}{STEP-Sup}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-sup-t2a }{} -\DeclareFontShape{T2A}{STEP-Sup}{bold}{sl}{ - <-> ssub * STEP-Sup/bold/it +\DeclareFontShape{T2A}{STEP-Sup}{regular}{sl}{ + <-> ssub * STEP-Sup/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T2A}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it +\DeclareFontShape{T2A}{STEP-Sup}{m}{n}{ + <-> alias * STEP-Sup/regular/n }{} \DeclareFontShape{T2A}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl + <-> alias * STEP-Sup/regular/sl }{} -\DeclareFontShape{T2A}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n +\DeclareFontShape{T2A}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it }{} % b --> bold -\DeclareFontShape{T2A}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n +\DeclareFontShape{T2A}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it }{} \DeclareFontShape{T2A}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} -\DeclareFontShape{T2A}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it -}{} - -\DeclareFontShape{T2A}{STEP-Sup}{bx}{sl}{ - <-> ssub * STEP-Sup/b/sl +\DeclareFontShape{T2A}{STEP-Sup}{b}{n}{ + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{T2A}{STEP-Sup}{bx}{it}{ @@ -86,4 +90,8 @@ <-> ssub * STEP-Sup/b/n }{} +\DeclareFontShape{T2A}{STEP-Sup}{bx}{sl}{ + <-> ssub * STEP-Sup/b/sl +}{} + \endinput diff --git a/fonts/step/latex/T2ASTEP-TLF.fd b/fonts/step/latex/T2ASTEP-TLF.fd index caa8c6f007..7799c6fd17 100644 --- a/fonts/step/latex/T2ASTEP-TLF.fd +++ b/fonts/step/latex/T2ASTEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2ASTEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for T2A/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for T2A/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,76 +20,84 @@ \DeclareFontFamily{T2A}{STEP-TLF}{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{T2A}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-t2a +\DeclareFontShape{T2A}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-t2a }{} -\DeclareFontShape{T2A}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-t2a +\DeclareFontShape{T2A}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-t2a }{} -\DeclareFontShape{T2A}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{T2A}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T2A}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-t2a +\DeclareFontShape{T2A}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-t2a }{} -\DeclareFontShape{T2A}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-t2a +\DeclareFontShape{T2A}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-t2a }{} -\DeclareFontShape{T2A}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{T2A}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-t2a +}{} + +\DeclareFontShape{T2A}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T2A}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n +\DeclareFontShape{T2A}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it }{} -\DeclareFontShape{T2A}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl +\DeclareFontShape{T2A}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc }{} -\DeclareFontShape{T2A}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{T2A}{STEP-TLF}{m}{n}{ + <-> alias * STEP-TLF/regular/n +}{} + +\DeclareFontShape{T2A}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl }{} % b --> bold +\DeclareFontShape{T2A}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it +}{} + \DeclareFontShape{T2A}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n + <-> alias * STEP-TLF/bold/n }{} \DeclareFontShape{T2A}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl + <-> alias * STEP-TLF/bold/sl }{} -\DeclareFontShape{T2A}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{T2A}{STEP-TLF}{bx}{it}{ + <-> ssub * STEP-TLF/b/it }{} \DeclareFontShape{T2A}{STEP-TLF}{bx}{n}{ <-> ssub * STEP-TLF/b/n }{} -\DeclareFontShape{T2A}{STEP-TLF}{bx}{it}{ - <-> ssub * STEP-TLF/b/it -}{} - \DeclareFontShape{T2A}{STEP-TLF}{bx}{sl}{ <-> ssub * STEP-TLF/b/sl }{} diff --git a/fonts/step/latex/T2ASTEP-TOsF.fd b/fonts/step/latex/T2ASTEP-TOsF.fd index fad905a306..8620bc56b6 100644 --- a/fonts/step/latex/T2ASTEP-TOsF.fd +++ b/fonts/step/latex/T2ASTEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2ASTEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for T2A/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for T2A/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,66 +20,78 @@ \DeclareFontFamily{T2A}{STEP-TOsF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T2A}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-t2a +\DeclareFontShape{T2A}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-t2a }{} -\DeclareFontShape{T2A}{STEP-TOsF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tosf-t2a +\DeclareFontShape{T2A}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-t2a }{} -\DeclareFontShape{T2A}{STEP-TOsF}{bold}{sl}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{T2A}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-t2a }{} +\DeclareFontShape{T2A}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it +}{} -% ---- regular ---- -\DeclareFontShape{T2A}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-t2a +% ---- bold ---- + +\DeclareFontShape{T2A}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-t2a }{} -\DeclareFontShape{T2A}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-t2a +\DeclareFontShape{T2A}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-t2a }{} -\DeclareFontShape{T2A}{STEP-TOsF}{regular}{sl}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T2A}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{T2A}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it +}{} + \DeclareFontShape{T2A}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl + <-> alias * STEP-TOsF/regular/sl }{} -\DeclareFontShape{T2A}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T2A}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc }{} \DeclareFontShape{T2A}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n }{} % b --> bold \DeclareFontShape{T2A}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n + <-> alias * STEP-TOsF/bold/n +}{} + +\DeclareFontShape{T2A}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl }{} \DeclareFontShape{T2A}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it + <-> alias * STEP-TOsF/bold/it }{} -\DeclareFontShape{T2A}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl +\DeclareFontShape{T2A}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it }{} \DeclareFontShape{T2A}{STEP-TOsF}{bx}{n}{ @@ -82,8 +102,4 @@ <-> ssub * STEP-TOsF/b/sl }{} -\DeclareFontShape{T2A}{STEP-TOsF}{bx}{it}{ - <-> ssub * STEP-TOsF/b/it -}{} - \endinput diff --git a/fonts/step/latex/T2BSTEP-Dnom.fd b/fonts/step/latex/T2BSTEP-Dnom.fd new file mode 100644 index 0000000000..0d7216bfd1 --- /dev/null +++ b/fonts/step/latex/T2BSTEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2BSTEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for T2B/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2B}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{T2B}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-t2b +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2B}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2BSTEP-Inf.fd b/fonts/step/latex/T2BSTEP-Inf.fd index 3ccb5b08ca..6ca1615396 100644 --- a/fonts/step/latex/T2BSTEP-Inf.fd +++ b/fonts/step/latex/T2BSTEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2BSTEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for T2B/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for T2B/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T2B}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/T2BSTEP-Numr.fd b/fonts/step/latex/T2BSTEP-Numr.fd new file mode 100644 index 0000000000..7588b44d96 --- /dev/null +++ b/fonts/step/latex/T2BSTEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2BSTEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for T2B/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2B}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{T2B}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-t2b +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2B}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2BSTEP-Sup.fd b/fonts/step/latex/T2BSTEP-Sup.fd index ac8b071a1d..d2f2e7bebb 100644 --- a/fonts/step/latex/T2BSTEP-Sup.fd +++ b/fonts/step/latex/T2BSTEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2BSTEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for T2B/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for T2B/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- regular ---- -\DeclareFontShape{T2B}{STEP-Sup}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-sup-t2b -}{} - \DeclareFontShape{T2B}{STEP-Sup}{regular}{n}{ <-> \STEP@@scale STEP-Regular-sup-t2b }{} +\DeclareFontShape{T2B}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-t2b +}{} + \DeclareFontShape{T2B}{STEP-Sup}{regular}{sl}{ <-> ssub * STEP-Sup/regular/it }{} @@ -42,40 +50,36 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T2B}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl + <-> alias * STEP-Sup/regular/sl }{} -\DeclareFontShape{T2B}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it +\DeclareFontShape{T2B}{STEP-Sup}{m}{n}{ + <-> alias * STEP-Sup/regular/n }{} -\DeclareFontShape{T2B}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n +\DeclareFontShape{T2B}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it }{} % b --> bold \DeclareFontShape{T2B}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{T2B}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} \DeclareFontShape{T2B}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it -}{} - -\DeclareFontShape{T2B}{STEP-Sup}{bx}{sl}{ - <-> ssub * STEP-Sup/b/sl + <-> alias * STEP-Sup/bold/it }{} \DeclareFontShape{T2B}{STEP-Sup}{bx}{it}{ @@ -86,4 +90,8 @@ <-> ssub * STEP-Sup/b/n }{} +\DeclareFontShape{T2B}{STEP-Sup}{bx}{sl}{ + <-> ssub * STEP-Sup/b/sl +}{} + \endinput diff --git a/fonts/step/latex/T2BSTEP-TLF.fd b/fonts/step/latex/T2BSTEP-TLF.fd index 8050b7432a..74a08e5cb7 100644 --- a/fonts/step/latex/T2BSTEP-TLF.fd +++ b/fonts/step/latex/T2BSTEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2BSTEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for T2B/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for T2B/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,18 @@ % ---- regular ---- -\DeclareFontShape{T2B}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-t2b +\DeclareFontShape{T2B}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-t2b }{} \DeclareFontShape{T2B}{STEP-TLF}{regular}{n}{ <-> \STEP@@scale STEP-Regular-tlf-t2b }{} +\DeclareFontShape{T2B}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-t2b +}{} + \DeclareFontShape{T2B}{STEP-TLF}{regular}{sl}{ <-> ssub * STEP-TLF/regular/it }{} @@ -29,59 +41,63 @@ % ---- bold ---- -\DeclareFontShape{T2B}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-t2b -}{} - \DeclareFontShape{T2B}{STEP-TLF}{bold}{it}{ <-> \STEP@@scale STEP-BoldItalic-tlf-t2b }{} +\DeclareFontShape{T2B}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-t2b +}{} + \DeclareFontShape{T2B}{STEP-TLF}{bold}{sl}{ <-> ssub * STEP-TLF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T2B}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it -}{} - \DeclareFontShape{T2B}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl + <-> alias * STEP-TLF/regular/sl }{} \DeclareFontShape{T2B}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n + <-> alias * STEP-TLF/regular/n +}{} + +\DeclareFontShape{T2B}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc +}{} + +\DeclareFontShape{T2B}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it }{} % b --> bold \DeclareFontShape{T2B}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it + <-> alias * STEP-TLF/bold/it }{} \DeclareFontShape{T2B}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl + <-> alias * STEP-TLF/bold/sl }{} \DeclareFontShape{T2B}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n -}{} - -\DeclareFontShape{T2B}{STEP-TLF}{bx}{sl}{ - <-> ssub * STEP-TLF/b/sl + <-> alias * STEP-TLF/bold/n }{} \DeclareFontShape{T2B}{STEP-TLF}{bx}{it}{ <-> ssub * STEP-TLF/b/it }{} +\DeclareFontShape{T2B}{STEP-TLF}{bx}{sl}{ + <-> ssub * STEP-TLF/b/sl +}{} + \DeclareFontShape{T2B}{STEP-TLF}{bx}{n}{ <-> ssub * STEP-TLF/b/n }{} diff --git a/fonts/step/latex/T2BSTEP-TOsF.fd b/fonts/step/latex/T2BSTEP-TOsF.fd index d77dea1be3..cb53fbd609 100644 --- a/fonts/step/latex/T2BSTEP-TOsF.fd +++ b/fonts/step/latex/T2BSTEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2BSTEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for T2B/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for T2B/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,70 +20,74 @@ \DeclareFontFamily{T2B}{STEP-TOsF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T2B}{STEP-TOsF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tosf-t2b +\DeclareFontShape{T2B}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-t2b }{} -\DeclareFontShape{T2B}{STEP-TOsF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tosf-t2b +\DeclareFontShape{T2B}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-t2b }{} -\DeclareFontShape{T2B}{STEP-TOsF}{bold}{sl}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{T2B}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-t2b }{} +\DeclareFontShape{T2B}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it +}{} -% ---- regular ---- -\DeclareFontShape{T2B}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-t2b +% ---- bold ---- + +\DeclareFontShape{T2B}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-t2b }{} -\DeclareFontShape{T2B}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-t2b +\DeclareFontShape{T2B}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-t2b }{} -\DeclareFontShape{T2B}{STEP-TOsF}{regular}{sl}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T2B}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{T2B}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it +}{} + \DeclareFontShape{T2B}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n }{} -\DeclareFontShape{T2B}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl +\DeclareFontShape{T2B}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc }{} -\DeclareFontShape{T2B}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T2B}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl }{} % b --> bold -\DeclareFontShape{T2B}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n -}{} - -\DeclareFontShape{T2B}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{T2B}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{T2B}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl +\DeclareFontShape{T2B}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n }{} -\DeclareFontShape{T2B}{STEP-TOsF}{bx}{n}{ - <-> ssub * STEP-TOsF/b/n +\DeclareFontShape{T2B}{STEP-TOsF}{b}{it}{ + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{T2B}{STEP-TOsF}{bx}{it}{ @@ -86,4 +98,8 @@ <-> ssub * STEP-TOsF/b/sl }{} +\DeclareFontShape{T2B}{STEP-TOsF}{bx}{n}{ + <-> ssub * STEP-TOsF/b/n +}{} + \endinput diff --git a/fonts/step/latex/T2CSTEP-Dnom.fd b/fonts/step/latex/T2CSTEP-Dnom.fd new file mode 100644 index 0000000000..2219901d15 --- /dev/null +++ b/fonts/step/latex/T2CSTEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2CSTEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for T2C/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2C}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{T2C}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-t2c +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2C}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2CSTEP-Inf.fd b/fonts/step/latex/T2CSTEP-Inf.fd index 6c89439f39..d265360c17 100644 --- a/fonts/step/latex/T2CSTEP-Inf.fd +++ b/fonts/step/latex/T2CSTEP-Inf.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2CSTEP-Inf.fd} - [2019/09/19 (autoinst) Font definitions for T2C/STEP-Inf.] + [2020/02/06 (autoinst) Font definitions for T2C/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -19,13 +27,13 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{T2C}{STEP-Inf}{m}{n}{ - <-> ssub * STEP-Inf/regular/n + <-> alias * STEP-Inf/regular/n }{} \endinput diff --git a/fonts/step/latex/T2CSTEP-Numr.fd b/fonts/step/latex/T2CSTEP-Numr.fd new file mode 100644 index 0000000000..3e6315ee7e --- /dev/null +++ b/fonts/step/latex/T2CSTEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T2CSTEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for T2C/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T2C}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{T2C}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-t2c +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T2C}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T2CSTEP-Sup.fd b/fonts/step/latex/T2CSTEP-Sup.fd index ae2f5c0714..cd2ef71b25 100644 --- a/fonts/step/latex/T2CSTEP-Sup.fd +++ b/fonts/step/latex/T2CSTEP-Sup.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2CSTEP-Sup.fd} - [2019/09/19 (autoinst) Font definitions for T2C/STEP-Sup.] + [2020/02/06 (autoinst) Font definitions for T2C/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- bold ---- -\DeclareFontShape{T2C}{STEP-Sup}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-sup-t2c -}{} - \DeclareFontShape{T2C}{STEP-Sup}{bold}{n}{ <-> \STEP@@scale STEP-Bold-sup-t2c }{} +\DeclareFontShape{T2C}{STEP-Sup}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-sup-t2c +}{} + \DeclareFontShape{T2C}{STEP-Sup}{bold}{sl}{ <-> ssub * STEP-Sup/bold/it }{} @@ -29,61 +37,61 @@ % ---- regular ---- -\DeclareFontShape{T2C}{STEP-Sup}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-sup-t2c -}{} - \DeclareFontShape{T2C}{STEP-Sup}{regular}{n}{ <-> \STEP@@scale STEP-Regular-sup-t2c }{} +\DeclareFontShape{T2C}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-t2c +}{} + \DeclareFontShape{T2C}{STEP-Sup}{regular}{sl}{ <-> ssub * STEP-Sup/regular/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T2C}{STEP-Sup}{m}{n}{ - <-> ssub * STEP-Sup/regular/n +\DeclareFontShape{T2C}{STEP-Sup}{m}{sl}{ + <-> alias * STEP-Sup/regular/sl }{} -\DeclareFontShape{T2C}{STEP-Sup}{m}{sl}{ - <-> ssub * STEP-Sup/regular/sl +\DeclareFontShape{T2C}{STEP-Sup}{m}{n}{ + <-> alias * STEP-Sup/regular/n }{} \DeclareFontShape{T2C}{STEP-Sup}{m}{it}{ - <-> ssub * STEP-Sup/regular/it + <-> alias * STEP-Sup/regular/it }{} % b --> bold \DeclareFontShape{T2C}{STEP-Sup}{b}{n}{ - <-> ssub * STEP-Sup/bold/n + <-> alias * STEP-Sup/bold/n }{} \DeclareFontShape{T2C}{STEP-Sup}{b}{sl}{ - <-> ssub * STEP-Sup/bold/sl + <-> alias * STEP-Sup/bold/sl }{} \DeclareFontShape{T2C}{STEP-Sup}{b}{it}{ - <-> ssub * STEP-Sup/bold/it + <-> alias * STEP-Sup/bold/it }{} \DeclareFontShape{T2C}{STEP-Sup}{bx}{n}{ <-> ssub * STEP-Sup/b/n }{} -\DeclareFontShape{T2C}{STEP-Sup}{bx}{it}{ - <-> ssub * STEP-Sup/b/it -}{} - \DeclareFontShape{T2C}{STEP-Sup}{bx}{sl}{ <-> ssub * STEP-Sup/b/sl }{} +\DeclareFontShape{T2C}{STEP-Sup}{bx}{it}{ + <-> ssub * STEP-Sup/b/it +}{} + \endinput diff --git a/fonts/step/latex/T2CSTEP-TLF.fd b/fonts/step/latex/T2CSTEP-TLF.fd index 87bfb7871a..8e0b401856 100644 --- a/fonts/step/latex/T2CSTEP-TLF.fd +++ b/fonts/step/latex/T2CSTEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2CSTEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for T2C/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for T2C/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,66 +20,74 @@ \DeclareFontFamily{T2C}{STEP-TLF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{T2C}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-t2c +\DeclareFontShape{T2C}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-t2c }{} -\DeclareFontShape{T2C}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-t2c +\DeclareFontShape{T2C}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-t2c }{} -\DeclareFontShape{T2C}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{T2C}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-t2c }{} +\DeclareFontShape{T2C}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it +}{} -% ---- regular ---- -\DeclareFontShape{T2C}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-t2c +% ---- bold ---- + +\DeclareFontShape{T2C}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-t2c }{} -\DeclareFontShape{T2C}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-t2c +\DeclareFontShape{T2C}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-t2c }{} -\DeclareFontShape{T2C}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{T2C}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular +\DeclareFontShape{T2C}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it +}{} + \DeclareFontShape{T2C}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n + <-> alias * STEP-TLF/regular/n }{} -\DeclareFontShape{T2C}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl +\DeclareFontShape{T2C}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc }{} -\DeclareFontShape{T2C}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{T2C}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl }{} % b --> bold -\DeclareFontShape{T2C}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n +\DeclareFontShape{T2C}{STEP-TLF}{b}{sl}{ + <-> alias * STEP-TLF/bold/sl }{} -\DeclareFontShape{T2C}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{T2C}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n }{} -\DeclareFontShape{T2C}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl +\DeclareFontShape{T2C}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it }{} \DeclareFontShape{T2C}{STEP-TLF}{bx}{it}{ diff --git a/fonts/step/latex/T2CSTEP-TOsF.fd b/fonts/step/latex/T2CSTEP-TOsF.fd index 1afc2daf47..0ffdcaecc1 100644 --- a/fonts/step/latex/T2CSTEP-TOsF.fd +++ b/fonts/step/latex/T2CSTEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{T2CSTEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for T2C/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for T2C/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,18 @@ % ---- regular ---- -\DeclareFontShape{T2C}{STEP-TOsF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tosf-t2c -}{} - \DeclareFontShape{T2C}{STEP-TOsF}{regular}{n}{ <-> \STEP@@scale STEP-Regular-tosf-t2c }{} +\DeclareFontShape{T2C}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-t2c +}{} + +\DeclareFontShape{T2C}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-t2c +}{} + \DeclareFontShape{T2C}{STEP-TOsF}{regular}{sl}{ <-> ssub * STEP-TOsF/regular/it }{} @@ -42,48 +54,52 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{T2C}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n +\DeclareFontShape{T2C}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it }{} \DeclareFontShape{T2C}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl + <-> alias * STEP-TOsF/regular/sl }{} -\DeclareFontShape{T2C}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{T2C}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc +}{} + +\DeclareFontShape{T2C}{STEP-TOsF}{m}{n}{ + <-> alias * STEP-TOsF/regular/n }{} % b --> bold \DeclareFontShape{T2C}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n + <-> alias * STEP-TOsF/bold/n }{} -\DeclareFontShape{T2C}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{T2C}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{T2C}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl +\DeclareFontShape{T2C}{STEP-TOsF}{b}{it}{ + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{T2C}{STEP-TOsF}{bx}{it}{ <-> ssub * STEP-TOsF/b/it }{} -\DeclareFontShape{T2C}{STEP-TOsF}{bx}{sl}{ - <-> ssub * STEP-TOsF/b/sl -}{} - \DeclareFontShape{T2C}{STEP-TOsF}{bx}{n}{ <-> ssub * STEP-TOsF/b/n }{} +\DeclareFontShape{T2C}{STEP-TOsF}{bx}{sl}{ + <-> ssub * STEP-TOsF/b/sl +}{} + \endinput diff --git a/fonts/step/latex/T3STEP-Dnom.fd b/fonts/step/latex/T3STEP-Dnom.fd new file mode 100644 index 0000000000..9cf0c89ca2 --- /dev/null +++ b/fonts/step/latex/T3STEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-t3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T3STEP-Inf.fd b/fonts/step/latex/T3STEP-Inf.fd new file mode 100644 index 0000000000..30be8feee0 --- /dev/null +++ b/fonts/step/latex/T3STEP-Inf.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-Inf.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-Inf}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-Inf}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-inf-t3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-Inf}{m}{n}{ + <-> alias * STEP-Inf/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T3STEP-Numr.fd b/fonts/step/latex/T3STEP-Numr.fd new file mode 100644 index 0000000000..9b977b4273 --- /dev/null +++ b/fonts/step/latex/T3STEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-t3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/T3STEP-Sup.fd b/fonts/step/latex/T3STEP-Sup.fd new file mode 100644 index 0000000000..8fc7567ad7 --- /dev/null +++ b/fonts/step/latex/T3STEP-Sup.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-Sup.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-Sup}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-t3 +}{} + +\DeclareFontShape{T3}{STEP-Sup}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-sup-t3 +}{} + +\DeclareFontShape{T3}{STEP-Sup}{regular}{sl}{ + <-> ssub * STEP-Sup/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{T3}{STEP-Sup}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-sup-t3 +}{} + +\DeclareFontShape{T3}{STEP-Sup}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-sup-t3 +}{} + +\DeclareFontShape{T3}{STEP-Sup}{bold}{sl}{ + <-> ssub * STEP-Sup/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it +}{} + +\DeclareFontShape{T3}{STEP-Sup}{m}{sl}{ + <-> alias * STEP-Sup/regular/sl +}{} + +\DeclareFontShape{T3}{STEP-Sup}{m}{n}{ + <-> alias * STEP-Sup/regular/n +}{} + + +% b --> bold + +\DeclareFontShape{T3}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it +}{} + +\DeclareFontShape{T3}{STEP-Sup}{b}{sl}{ + <-> alias * STEP-Sup/bold/sl +}{} + +\DeclareFontShape{T3}{STEP-Sup}{b}{n}{ + <-> alias * STEP-Sup/bold/n +}{} + +\DeclareFontShape{T3}{STEP-Sup}{bx}{n}{ + <-> ssub * STEP-Sup/b/n +}{} + +\DeclareFontShape{T3}{STEP-Sup}{bx}{sl}{ + <-> ssub * STEP-Sup/b/sl +}{} + +\DeclareFontShape{T3}{STEP-Sup}{bx}{it}{ + <-> ssub * STEP-Sup/b/it +}{} + +\endinput diff --git a/fonts/step/latex/T3STEP-TLF.fd b/fonts/step/latex/T3STEP-TLF.fd new file mode 100644 index 0000000000..2f7162a390 --- /dev/null +++ b/fonts/step/latex/T3STEP-TLF.fd @@ -0,0 +1,105 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-TLF.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-TLF}{} + + +% ---- bold ---- + +\DeclareFontShape{T3}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-t3 +}{} + +\DeclareFontShape{T3}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it +}{} + +\DeclareFontShape{T3}{STEP-TLF}{m}{n}{ + <-> alias * STEP-TLF/regular/n +}{} + +\DeclareFontShape{T3}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc +}{} + +\DeclareFontShape{T3}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl +}{} + + +% b --> bold + +\DeclareFontShape{T3}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n +}{} + +\DeclareFontShape{T3}{STEP-TLF}{b}{sl}{ + <-> alias * STEP-TLF/bold/sl +}{} + +\DeclareFontShape{T3}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it +}{} + +\DeclareFontShape{T3}{STEP-TLF}{bx}{sl}{ + <-> ssub * STEP-TLF/b/sl +}{} + +\DeclareFontShape{T3}{STEP-TLF}{bx}{n}{ + <-> ssub * STEP-TLF/b/n +}{} + +\DeclareFontShape{T3}{STEP-TLF}{bx}{it}{ + <-> ssub * STEP-TLF/b/it +}{} + +\endinput diff --git a/fonts/step/latex/T3STEP-TOsF.fd b/fonts/step/latex/T3STEP-TOsF.fd new file mode 100644 index 0000000000..6b990b4889 --- /dev/null +++ b/fonts/step/latex/T3STEP-TOsF.fd @@ -0,0 +1,105 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{T3STEP-TOsF.fd} + [2020/02/06 (autoinst) Font definitions for T3/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{T3}{STEP-TOsF}{} + + +% ---- bold ---- + +\DeclareFontShape{T3}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{T3}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-t3 +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-t3 +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{T3}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{m}{n}{ + <-> alias * STEP-TOsF/regular/n +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{T3}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{b}{it}{ + <-> alias * STEP-TOsF/bold/it +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{bx}{n}{ + <-> ssub * STEP-TOsF/b/n +}{} + +\DeclareFontShape{T3}{STEP-TOsF}{bx}{sl}{ + <-> ssub * STEP-TOsF/b/sl +}{} + +\endinput diff --git a/fonts/step/latex/TS1STEP-TLF.fd b/fonts/step/latex/TS1STEP-TLF.fd index de84bf953c..897eec8c7e 100644 --- a/fonts/step/latex/TS1STEP-TLF.fd +++ b/fonts/step/latex/TS1STEP-TLF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{TS1STEP-TLF.fd} - [2019/09/19 (autoinst) Font definitions for TS1/STEP-TLF.] + [2020/02/06 (autoinst) Font definitions for TS1/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -12,66 +20,70 @@ \DeclareFontFamily{TS1}{STEP-TLF}{} -% ---- bold ---- +% ---- regular ---- -\DeclareFontShape{TS1}{STEP-TLF}{bold}{n}{ - <-> \STEP@@scale STEP-Bold-tlf-ts1 +\DeclareFontShape{TS1}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{STEP-TLF}{bold}{it}{ - <-> \STEP@@scale STEP-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{STEP-TLF}{bold}{sl}{ - <-> ssub * STEP-TLF/bold/it +\DeclareFontShape{TS1}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it }{} -% ---- regular ---- +% ---- bold ---- -\DeclareFontShape{TS1}{STEP-TLF}{regular}{it}{ - <-> \STEP@@scale STEP-Italic-tlf-ts1 +\DeclareFontShape{TS1}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-ts1 }{} -\DeclareFontShape{TS1}{STEP-TLF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tlf-ts1 +\DeclareFontShape{TS1}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{STEP-TLF}{regular}{sl}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{TS1}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular \DeclareFontShape{TS1}{STEP-TLF}{m}{sl}{ - <-> ssub * STEP-TLF/regular/sl + <-> alias * STEP-TLF/regular/sl }{} -\DeclareFontShape{TS1}{STEP-TLF}{m}{it}{ - <-> ssub * STEP-TLF/regular/it +\DeclareFontShape{TS1}{STEP-TLF}{m}{n}{ + <-> alias * STEP-TLF/regular/n }{} -\DeclareFontShape{TS1}{STEP-TLF}{m}{n}{ - <-> ssub * STEP-TLF/regular/n +\DeclareFontShape{TS1}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it }{} % b --> bold +\DeclareFontShape{TS1}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n +}{} + \DeclareFontShape{TS1}{STEP-TLF}{b}{sl}{ - <-> ssub * STEP-TLF/bold/sl + <-> alias * STEP-TLF/bold/sl }{} \DeclareFontShape{TS1}{STEP-TLF}{b}{it}{ - <-> ssub * STEP-TLF/bold/it + <-> alias * STEP-TLF/bold/it }{} -\DeclareFontShape{TS1}{STEP-TLF}{b}{n}{ - <-> ssub * STEP-TLF/bold/n +\DeclareFontShape{TS1}{STEP-TLF}{bx}{sl}{ + <-> ssub * STEP-TLF/b/sl }{} \DeclareFontShape{TS1}{STEP-TLF}{bx}{n}{ @@ -82,8 +94,4 @@ <-> ssub * STEP-TLF/b/it }{} -\DeclareFontShape{TS1}{STEP-TLF}{bx}{sl}{ - <-> ssub * STEP-TLF/b/sl -}{} - \endinput diff --git a/fonts/step/latex/TS1STEP-TOsF.fd b/fonts/step/latex/TS1STEP-TOsF.fd index 993ba25bed..6533b17ae5 100644 --- a/fonts/step/latex/TS1STEP-TOsF.fd +++ b/fonts/step/latex/TS1STEP-TOsF.fd @@ -1,7 +1,15 @@ -%% Generated by autoinst on 2019/09/19 +%% Generated by autoinst on 2020/02/06 %% \ProvidesFile{TS1STEP-TOsF.fd} - [2019/09/19 (autoinst) Font definitions for TS1/STEP-TOsF.] + [2020/02/06 (autoinst) Font definitions for TS1/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi \expandafter\ifx\csname STEP@scale\endcsname\relax \let\STEP@@scale\@empty @@ -14,14 +22,14 @@ % ---- regular ---- -\DeclareFontShape{TS1}{STEP-TOsF}{regular}{n}{ - <-> \STEP@@scale STEP-Regular-tosf-ts1 -}{} - \DeclareFontShape{TS1}{STEP-TOsF}{regular}{it}{ <-> \STEP@@scale STEP-Italic-tosf-ts1 }{} +\DeclareFontShape{TS1}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-ts1 +}{} + \DeclareFontShape{TS1}{STEP-TOsF}{regular}{sl}{ <-> ssub * STEP-TOsF/regular/it }{} @@ -42,48 +50,48 @@ }{} % -% Extra 'ssub' rules to map the standard NFSS codes to our fancy names +% Extra 'alias' rules to map the standard NFSS codes to our fancy names % % m --> regular -\DeclareFontShape{TS1}{STEP-TOsF}{m}{sl}{ - <-> ssub * STEP-TOsF/regular/sl +\DeclareFontShape{TS1}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it }{} -\DeclareFontShape{TS1}{STEP-TOsF}{m}{it}{ - <-> ssub * STEP-TOsF/regular/it +\DeclareFontShape{TS1}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl }{} \DeclareFontShape{TS1}{STEP-TOsF}{m}{n}{ - <-> ssub * STEP-TOsF/regular/n + <-> alias * STEP-TOsF/regular/n }{} % b --> bold -\DeclareFontShape{TS1}{STEP-TOsF}{b}{n}{ - <-> ssub * STEP-TOsF/bold/n +\DeclareFontShape{TS1}{STEP-TOsF}{b}{it}{ + <-> alias * STEP-TOsF/bold/it }{} \DeclareFontShape{TS1}{STEP-TOsF}{b}{sl}{ - <-> ssub * STEP-TOsF/bold/sl + <-> alias * STEP-TOsF/bold/sl }{} -\DeclareFontShape{TS1}{STEP-TOsF}{b}{it}{ - <-> ssub * STEP-TOsF/bold/it +\DeclareFontShape{TS1}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n }{} \DeclareFontShape{TS1}{STEP-TOsF}{bx}{n}{ <-> ssub * STEP-TOsF/b/n }{} -\DeclareFontShape{TS1}{STEP-TOsF}{bx}{it}{ - <-> ssub * STEP-TOsF/b/it -}{} - \DeclareFontShape{TS1}{STEP-TOsF}{bx}{sl}{ <-> ssub * STEP-TOsF/b/sl }{} +\DeclareFontShape{TS1}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + \endinput diff --git a/fonts/step/latex/TS3STEP-Dnom.fd b/fonts/step/latex/TS3STEP-Dnom.fd new file mode 100644 index 0000000000..0fceccfcc0 --- /dev/null +++ b/fonts/step/latex/TS3STEP-Dnom.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-Dnom.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-Dnom}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-Dnom}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-dnom-ts3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-Dnom}{m}{n}{ + <-> alias * STEP-Dnom/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/TS3STEP-Inf.fd b/fonts/step/latex/TS3STEP-Inf.fd new file mode 100644 index 0000000000..d126da0836 --- /dev/null +++ b/fonts/step/latex/TS3STEP-Inf.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-Inf.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-Inf}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-Inf}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-inf-ts3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-Inf}{m}{n}{ + <-> alias * STEP-Inf/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/TS3STEP-Numr.fd b/fonts/step/latex/TS3STEP-Numr.fd new file mode 100644 index 0000000000..98ac929771 --- /dev/null +++ b/fonts/step/latex/TS3STEP-Numr.fd @@ -0,0 +1,39 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-Numr.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-Numr}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-Numr}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-numr-ts3 +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-Numr}{m}{n}{ + <-> alias * STEP-Numr/regular/n +}{} + +\endinput diff --git a/fonts/step/latex/TS3STEP-Sup.fd b/fonts/step/latex/TS3STEP-Sup.fd new file mode 100644 index 0000000000..20c9224bc5 --- /dev/null +++ b/fonts/step/latex/TS3STEP-Sup.fd @@ -0,0 +1,97 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-Sup.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-Sup}{} + + +% ---- bold ---- + +\DeclareFontShape{TS3}{STEP-Sup}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-sup-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-sup-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{bold}{sl}{ + <-> ssub * STEP-Sup/bold/it +}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-Sup}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-sup-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-sup-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{regular}{sl}{ + <-> ssub * STEP-Sup/regular/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-Sup}{m}{it}{ + <-> alias * STEP-Sup/regular/it +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{m}{n}{ + <-> alias * STEP-Sup/regular/n +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{m}{sl}{ + <-> alias * STEP-Sup/regular/sl +}{} + + +% b --> bold + +\DeclareFontShape{TS3}{STEP-Sup}{b}{it}{ + <-> alias * STEP-Sup/bold/it +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{b}{n}{ + <-> alias * STEP-Sup/bold/n +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{b}{sl}{ + <-> alias * STEP-Sup/bold/sl +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{bx}{sl}{ + <-> ssub * STEP-Sup/b/sl +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{bx}{n}{ + <-> ssub * STEP-Sup/b/n +}{} + +\DeclareFontShape{TS3}{STEP-Sup}{bx}{it}{ + <-> ssub * STEP-Sup/b/it +}{} + +\endinput diff --git a/fonts/step/latex/TS3STEP-TLF.fd b/fonts/step/latex/TS3STEP-TLF.fd new file mode 100644 index 0000000000..b9c298356a --- /dev/null +++ b/fonts/step/latex/TS3STEP-TLF.fd @@ -0,0 +1,105 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-TLF.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-TLF}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-TLF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tlf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tlf-sc-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tlf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{regular}{sl}{ + <-> ssub * STEP-TLF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS3}{STEP-TLF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tlf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tlf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{bold}{sl}{ + <-> ssub * STEP-TLF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-TLF}{m}{sl}{ + <-> alias * STEP-TLF/regular/sl +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{m}{sc}{ + <-> alias * STEP-TLF/regular/sc +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{m}{n}{ + <-> alias * STEP-TLF/regular/n +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{m}{it}{ + <-> alias * STEP-TLF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{TS3}{STEP-TLF}{b}{n}{ + <-> alias * STEP-TLF/bold/n +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{b}{sl}{ + <-> alias * STEP-TLF/bold/sl +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{b}{it}{ + <-> alias * STEP-TLF/bold/it +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{bx}{it}{ + <-> ssub * STEP-TLF/b/it +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{bx}{n}{ + <-> ssub * STEP-TLF/b/n +}{} + +\DeclareFontShape{TS3}{STEP-TLF}{bx}{sl}{ + <-> ssub * STEP-TLF/b/sl +}{} + +\endinput diff --git a/fonts/step/latex/TS3STEP-TOsF.fd b/fonts/step/latex/TS3STEP-TOsF.fd new file mode 100644 index 0000000000..008a2396f4 --- /dev/null +++ b/fonts/step/latex/TS3STEP-TOsF.fd @@ -0,0 +1,105 @@ +%% Generated by autoinst on 2020/02/06 +%% +\ProvidesFile{TS3STEP-TOsF.fd} + [2020/02/06 (autoinst) Font definitions for TS3/STEP-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname STEP@scale\endcsname\relax + \let\STEP@@scale\@empty +\else + \edef\STEP@@scale{s*[\csname STEP@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS3}{STEP-TOsF}{} + + +% ---- regular ---- + +\DeclareFontShape{TS3}{STEP-TOsF}{regular}{it}{ + <-> \STEP@@scale STEP-Italic-tosf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{regular}{n}{ + <-> \STEP@@scale STEP-Regular-tosf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{regular}{sc}{ + <-> \STEP@@scale STEP-Regular-tosf-sc-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{regular}{sl}{ + <-> ssub * STEP-TOsF/regular/it +}{} + + +% ---- bold ---- + +\DeclareFontShape{TS3}{STEP-TOsF}{bold}{n}{ + <-> \STEP@@scale STEP-Bold-tosf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{bold}{it}{ + <-> \STEP@@scale STEP-BoldItalic-tosf-ts3 +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{bold}{sl}{ + <-> ssub * STEP-TOsF/bold/it +}{} + +% +% Extra 'alias' rules to map the standard NFSS codes to our fancy names +% + +% m --> regular + +\DeclareFontShape{TS3}{STEP-TOsF}{m}{sl}{ + <-> alias * STEP-TOsF/regular/sl +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{m}{n}{ + <-> alias * STEP-TOsF/regular/n +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{m}{sc}{ + <-> alias * STEP-TOsF/regular/sc +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{m}{it}{ + <-> alias * STEP-TOsF/regular/it +}{} + + +% b --> bold + +\DeclareFontShape{TS3}{STEP-TOsF}{b}{it}{ + <-> alias * STEP-TOsF/bold/it +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{b}{sl}{ + <-> alias * STEP-TOsF/bold/sl +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{b}{n}{ + <-> alias * STEP-TOsF/bold/n +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{bx}{n}{ + <-> ssub * STEP-TOsF/b/n +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{bx}{sl}{ + <-> ssub * STEP-TOsF/b/sl +}{} + +\DeclareFontShape{TS3}{STEP-TOsF}{bx}{it}{ + <-> ssub * STEP-TOsF/b/it +}{} + +\endinput diff --git a/fonts/step/map/STEP.map b/fonts/step/map/STEP.map index a4cea3c3d1..ca62da410d 100644 --- a/fonts/step/map/STEP.map +++ b/fonts/step/map/STEP.map @@ -1,115 +1,163 @@ % Automatically maintained by otftotfm or other programs. Do not edit. -STEP-Regular-tosf-ot1 STEP-Regular "AutoEnc_arx325ysxapto7rbr5oxz7i4ng ReEncodeFont" <[a_arx325.enc <STEP-Regular.pfb -STEP-Regular-tosf-t1--base STEP-Regular "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Regular.pfb -STEP-Regular-tosf-ly1--base STEP-Regular "AutoEnc_wzfdmegp5f532c6rbcwcodplae ReEncodeFont" <[a_wzfdme.enc <STEP-Regular.pfb -STEP-Regular-tosf-lgr--base STEP-Regular "AutoEnc_ibvqy3uhrdvx5p52h2vfgd4ndb ReEncodeFont" <[a_ibvqy3.enc <STEP-Regular.pfb -STEP-Regular-tosf-t2a STEP-Regular "AutoEnc_4esb2f6gx7nn6xs5jmfw72t6sc ReEncodeFont" <[a_4esb2f.enc <STEP-Regular.pfb -STEP-Regular-tosf-t2b STEP-Regular "AutoEnc_zdolkrfnk3chtgd4snby5cvx6h ReEncodeFont" <[a_zdolkr.enc <STEP-Regular.pfb -STEP-Regular-tosf-t2c STEP-Regular "AutoEnc_6sfsu6zxbipue7dxiizrlsmcsb ReEncodeFont" <[a_6sfsu6.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-ot1--base STEP-Regular "AutoEnc_2gbaamnqda5zy57ukhxpyyizdd ReEncodeFont" <[a_2gbaam.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-t1--base STEP-Regular "AutoEnc_h6i53aavcxektk7bv4vgxmvtjh ReEncodeFont" <[a_h6i53a.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-ly1--base STEP-Regular "AutoEnc_mjsrjirk5qjig7z325uxmrjslc ReEncodeFont" <[a_mjsrji.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-lgr--base STEP-Regular "AutoEnc_4t3tqvnsrnrr7oa2swnby43faf ReEncodeFont" <[a_4t3tqv.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-t2a STEP-Regular "AutoEnc_nk3vltoqgqyi7sukj5xqlbemta ReEncodeFont" <[a_nk3vlt.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-t2b STEP-Regular "AutoEnc_mmhgd3qmcw7a7hu4c3d5lxil7g ReEncodeFont" <[a_mmhgd3.enc <STEP-Regular.pfb -STEP-Regular-tosf-sc-t2c STEP-Regular "AutoEnc_cqqmgz632o6ljjpxim45qo4oph ReEncodeFont" <[a_cqqmgz.enc <STEP-Regular.pfb -STEP-Regular-tosf-ts1--base STEP-Regular "AutoEnc_g5azuqbshumv747xgidntafvmb ReEncodeFont" <[a_g5azuq.enc <STEP-Regular.pfb +STEP-Regular-dnom-ot1 STEP-Regular "AutoEnc_6hfbmizkntdqsdu23vmrez5d3e ReEncodeFont" <[a_6hfbmi.enc <STEP-Regular.pfb +STEP-Regular-dnom-ly1--base STEP-Regular "AutoEnc_a6xuhyxsgg5a7iurgljjbv74eb ReEncodeFont" <[a_a6xuhy.enc <STEP-Regular.pfb +STEP-Regular-dnom-t1--base STEP-Regular "AutoEnc_gz42ofuhq54n5pec5qj53m547g ReEncodeFont" <[a_gz42of.enc <STEP-Regular.pfb +STEP-Regular-dnom-lgr--base STEP-Regular "AutoEnc_kv7n4vwyezn55a5usu2m2kg2lb ReEncodeFont" <[a_kv7n4v.enc <STEP-Regular.pfb +STEP-Regular-dnom-t2a STEP-Regular "AutoEnc_lz3c5zxic7xcakua4g2fm6gk6f ReEncodeFont" <[a_lz3c5z.enc <STEP-Regular.pfb +STEP-Regular-dnom-t2b STEP-Regular "AutoEnc_jwptb5oa3fohpafoeom2d5u44f ReEncodeFont" <[a_jwptb5.enc <STEP-Regular.pfb +STEP-Regular-dnom-t2c STEP-Regular "AutoEnc_4mxykn5ds7lewtr3g34vemowvf ReEncodeFont" <[a_4mxykn.enc <STEP-Regular.pfb +STEP-Regular-dnom-t3--base STEP-Regular "AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh ReEncodeFont" <[a_mkgnjm.enc <STEP-Regular.pfb +STEP-Regular-dnom-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb +STEP-Regular-sup-ot1 STEP-Regular "AutoEnc_uhroknkfblgpgraqzbt5w3zc5f ReEncodeFont" <[a_uhrokn.enc <STEP-Regular.pfb +STEP-Regular-sup-ly1--base STEP-Regular "AutoEnc_kleesj547dbi7re2iv6m6tuo7h ReEncodeFont" <[a_kleesj.enc <STEP-Regular.pfb +STEP-Regular-sup-t1--base STEP-Regular "AutoEnc_redus5fqyucraank777ybmhnvb ReEncodeFont" <[a_redus5.enc <STEP-Regular.pfb +STEP-Regular-sup-lgr--base STEP-Regular "AutoEnc_k7io4acxtg5swkprclsazi2mrd ReEncodeFont" <[a_k7io4a.enc <STEP-Regular.pfb +STEP-Regular-sup-t2a STEP-Regular "AutoEnc_ryuwvo4wcj7t7rldr633dkj7he ReEncodeFont" <[a_ryuwvo.enc <STEP-Regular.pfb +STEP-Regular-sup-t2b STEP-Regular "AutoEnc_lwp5cc4anrslqode44l5vadmja ReEncodeFont" <[a_lwp5cc.enc <STEP-Regular.pfb +STEP-Regular-sup-t2c STEP-Regular "AutoEnc_evkz3b5i3bh3pbdxq2uftiowob ReEncodeFont" <[a_evkz3b.enc <STEP-Regular.pfb +STEP-Regular-sup-t3--base STEP-Regular "AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh ReEncodeFont" <[a_mkgnjm.enc <STEP-Regular.pfb +STEP-Regular-sup-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb +STEP-Regular-numr-ot1 STEP-Regular "AutoEnc_hbts53j6ntkkpnj6z2l3eekpsf ReEncodeFont" <[a_hbts53.enc <STEP-Regular.pfb +STEP-Regular-numr-ly1--base STEP-Regular "AutoEnc_bm4xhnnbsywwnnh7phbc3bu5cg ReEncodeFont" <[a_bm4xhn.enc <STEP-Regular.pfb +STEP-Regular-numr-t1--base STEP-Regular "AutoEnc_txv6lrgmzhrqjd32dcx6v4d7sb ReEncodeFont" <[a_txv6lr.enc <STEP-Regular.pfb +STEP-Regular-numr-lgr--base STEP-Regular "AutoEnc_ya3dy4kxwfctu4iiequlsj22jh ReEncodeFont" <[a_ya3dy4.enc <STEP-Regular.pfb +STEP-Regular-numr-t2a STEP-Regular "AutoEnc_p2lhbtkttb5ssoinjyxgzmofkc ReEncodeFont" <[a_p2lhbt.enc <STEP-Regular.pfb +STEP-Regular-numr-t2b STEP-Regular "AutoEnc_7jxw4dvfpezgqjni5c7gkvjsug ReEncodeFont" <[a_7jxw4d.enc <STEP-Regular.pfb +STEP-Regular-numr-t2c STEP-Regular "AutoEnc_2a2bfutyw3cydpuvgayzzhw4kf ReEncodeFont" <[a_2a2bfu.enc <STEP-Regular.pfb +STEP-Regular-numr-t3--base STEP-Regular "AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh ReEncodeFont" <[a_mkgnjm.enc <STEP-Regular.pfb +STEP-Regular-numr-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb STEP-Regular-tlf-ot1 STEP-Regular "AutoEnc_vmnawypb3wx7vmuipufjnhaqic ReEncodeFont" <[a_vmnawy.enc <STEP-Regular.pfb -STEP-Regular-tlf-t1--base STEP-Regular "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Regular.pfb STEP-Regular-tlf-ly1--base STEP-Regular "AutoEnc_fwzjjsdtgttfryokfd3fi7fteg ReEncodeFont" <[a_fwzjjs.enc <STEP-Regular.pfb -STEP-Regular-tlf-lgr--base STEP-Regular "AutoEnc_7a5nqn4qkklivdhmf4t7cf2aqg ReEncodeFont" <[a_7a5nqn.enc <STEP-Regular.pfb -STEP-Regular-tlf-t2a STEP-Regular "AutoEnc_tpkmtbcbyp6rgp6tbh7vsoag3h ReEncodeFont" <[a_tpkmtb.enc <STEP-Regular.pfb -STEP-Regular-tlf-t2b STEP-Regular "AutoEnc_bw7ysdvcjxgu4vfmbvtfdldwob ReEncodeFont" <[a_bw7ysd.enc <STEP-Regular.pfb -STEP-Regular-tlf-t2c STEP-Regular "AutoEnc_aoap6mljf3uvqa5ina244n2ide ReEncodeFont" <[a_aoap6m.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-ot1--base STEP-Regular "AutoEnc_u5xlv2ii3jlt5vn2ej4je5hhyb ReEncodeFont" <[a_u5xlv2.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-t1--base STEP-Regular "AutoEnc_trfpj642md3rxfhfcpj4y4codd ReEncodeFont" <[a_trfpj6.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-ly1--base STEP-Regular "AutoEnc_tded26ibmwcxsj75ymofi6t4ng ReEncodeFont" <[a_tded26.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-lgr--base STEP-Regular "AutoEnc_75yyfjutdbubmopv24xecrtonc ReEncodeFont" <[a_75yyfj.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-t2a STEP-Regular "AutoEnc_zbkikvjwmppaex3l6qmpylsj4f ReEncodeFont" <[a_zbkikv.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-t2b STEP-Regular "AutoEnc_wmhjjeo7epgt4jrd6s42vlu3ub ReEncodeFont" <[a_wmhjje.enc <STEP-Regular.pfb -STEP-Regular-tlf-sc-t2c STEP-Regular "AutoEnc_gl5exx5b3b7ke7u4wf2d62y34h ReEncodeFont" <[a_gl5exx.enc <STEP-Regular.pfb -STEP-Regular-tlf-ts1--base STEP-Regular "AutoEnc_g5azuqbshumv747xgidntafvmb ReEncodeFont" <[a_g5azuq.enc <STEP-Regular.pfb -STEP-Regular-sup-ot1 STEP-Regular "AutoEnc_xy7ndglw2sj5toqiv4iypmda7f ReEncodeFont" <[a_xy7ndg.enc <STEP-Regular.pfb -STEP-Regular-sup-t1--base STEP-Regular "AutoEnc_owwokhtavhrfpkanoznibuh3wc ReEncodeFont" <[a_owwokh.enc <STEP-Regular.pfb -STEP-Regular-sup-ly1--base STEP-Regular "AutoEnc_4otmjhxnoga3myzripff6thsbe ReEncodeFont" <[a_4otmjh.enc <STEP-Regular.pfb -STEP-Regular-sup-lgr--base STEP-Regular "AutoEnc_gkokmlkyki5eotgtrabmu3lc5c ReEncodeFont" <[a_gkokml.enc <STEP-Regular.pfb -STEP-Regular-sup-t2a STEP-Regular "AutoEnc_udjv2re637bexrctoohgrumhkb ReEncodeFont" <[a_udjv2r.enc <STEP-Regular.pfb -STEP-Regular-sup-t2b STEP-Regular "AutoEnc_n6yyi4idhseyslirzpfmgupuve ReEncodeFont" <[a_n6yyi4.enc <STEP-Regular.pfb -STEP-Regular-sup-t2c STEP-Regular "AutoEnc_jhwfjojyvnh7u5vludvx7snmqa ReEncodeFont" <[a_jhwfjo.enc <STEP-Regular.pfb -STEP-Regular-inf-ot1 STEP-Regular "AutoEnc_smf27heo5h22qs3alntfz4rh3d ReEncodeFont" <[a_smf27h.enc <STEP-Regular.pfb -STEP-Regular-inf-t1--base STEP-Regular "AutoEnc_gwwgis5ryxlw3474z7ct2afhcg ReEncodeFont" <[a_gwwgis.enc <STEP-Regular.pfb -STEP-Regular-inf-ly1--base STEP-Regular "AutoEnc_q3sghvy6nc344dfczo2y5t5v5a ReEncodeFont" <[a_q3sghv.enc <STEP-Regular.pfb -STEP-Regular-inf-lgr--base STEP-Regular "AutoEnc_5k2pnmzfkunfo4t7vudptjo2zh ReEncodeFont" <[a_5k2pnm.enc <STEP-Regular.pfb -STEP-Regular-inf-t2a STEP-Regular "AutoEnc_ds5txz57vvqv4oby42lruskomb ReEncodeFont" <[a_ds5txz.enc <STEP-Regular.pfb -STEP-Regular-inf-t2b STEP-Regular "AutoEnc_nys5r4dgskbgyqqmwngas2vb4b ReEncodeFont" <[a_nys5r4.enc <STEP-Regular.pfb -STEP-Regular-inf-t2c STEP-Regular "AutoEnc_qboiswtnlmpg7fuqtlqb4npkfa ReEncodeFont" <[a_qboisw.enc <STEP-Regular.pfb -STEP-Italic-tosf-ot1 STEP-Italic "AutoEnc_xnivr2fhskf5fkog6dneyn6cvf ReEncodeFont" <[a_xnivr2.enc <STEP-Italic.pfb -STEP-Italic-tosf-t1--base STEP-Italic "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Italic.pfb -STEP-Italic-tosf-ly1--base STEP-Italic "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-Italic.pfb -STEP-Italic-tosf-lgr--base STEP-Italic "AutoEnc_ffybipfnd2vxumndzixaxp2nfe ReEncodeFont" <[a_ffybip.enc <STEP-Italic.pfb -STEP-Italic-tosf-t2a STEP-Italic "AutoEnc_l6bj4gjfubzihhvyhvyzdkj7rc ReEncodeFont" <[a_l6bj4g.enc <STEP-Italic.pfb -STEP-Italic-tosf-t2b STEP-Italic "AutoEnc_vjmilfn6kdcna7ohcrnlaodj2e ReEncodeFont" <[a_vjmilf.enc <STEP-Italic.pfb -STEP-Italic-tosf-t2c STEP-Italic "AutoEnc_hamrvakza32ug57drgurbdzz5a ReEncodeFont" <[a_hamrva.enc <STEP-Italic.pfb -STEP-Italic-tosf-ts1--base STEP-Italic "AutoEnc_rcz4zwebmwkdxdjjnztfpdimig ReEncodeFont" <[a_rcz4zw.enc <STEP-Italic.pfb +STEP-Regular-tlf-t1--base STEP-Regular "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Regular.pfb +STEP-Regular-tlf-lgr--base STEP-Regular "AutoEnc_bonk4u2tudx56qwz5smarjh4gc ReEncodeFont" <[a_bonk4u.enc <STEP-Regular.pfb +STEP-Regular-tlf-t2a STEP-Regular "AutoEnc_vca5tbmb4ke2q5djqneq7xlpzf ReEncodeFont" <[a_vca5tb.enc <STEP-Regular.pfb +STEP-Regular-tlf-t2b STEP-Regular "AutoEnc_47wiacjqsu3ew2zjmpd46uciph ReEncodeFont" <[a_47wiac.enc <STEP-Regular.pfb +STEP-Regular-tlf-t2c STEP-Regular "AutoEnc_y3uxyj7grbfj5gojh7tyhib2ef ReEncodeFont" <[a_y3uxyj.enc <STEP-Regular.pfb +STEP-Regular-tlf-t3--base STEP-Regular "AutoEnc_lihfjgv3vupwhkt2vv7aci5sab ReEncodeFont" <[a_lihfjg.enc <STEP-Regular.pfb +STEP-Regular-tlf-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-ot1--base STEP-Regular "AutoEnc_3rxxvmfdkzw2bb2vslwun3wcvc ReEncodeFont" <[a_3rxxvm.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-ly1--base STEP-Regular "AutoEnc_tpegozswdw5qsbgqvweky5yczc ReEncodeFont" <[a_tpegoz.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-t1--base STEP-Regular "AutoEnc_f5fqnwwm6rxoebmbovt27qs3ze ReEncodeFont" <[a_f5fqnw.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-lgr--base STEP-Regular "AutoEnc_nm3vu2lhmuudfad6nlgiyndg3b ReEncodeFont" <[a_nm3vu2.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-t2a STEP-Regular "AutoEnc_ccwxvqnpuqsptwylqziucxsosb ReEncodeFont" <[a_ccwxvq.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-t2b STEP-Regular "AutoEnc_np5cf6erosuj3ial4boipzvx2e ReEncodeFont" <[a_np5cf6.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-t2c STEP-Regular "AutoEnc_hgebcav3ea2nc3kwuhkgiczfda ReEncodeFont" <[a_hgebca.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-t3--base STEP-Regular "AutoEnc_gwrxgcjfqvuxewenbxuboytpfd ReEncodeFont" <[a_gwrxgc.enc <STEP-Regular.pfb +STEP-Regular-tlf-sc-ts3 STEP-Regular "AutoEnc_lws4feyiqaqi74pq2i32ouy7ph ReEncodeFont" <[a_lws4fe.enc <STEP-Regular.pfb +STEP-Regular-tlf-ts1--base STEP-Regular "AutoEnc_qqe53son6okjabwf47lmft2t5h ReEncodeFont" <[a_qqe53s.enc <STEP-Regular.pfb +STEP-Regular-tosf-ot1 STEP-Regular "AutoEnc_arx325ysxapto7rbr5oxz7i4ng ReEncodeFont" <[a_arx325.enc <STEP-Regular.pfb +STEP-Regular-tosf-ly1--base STEP-Regular "AutoEnc_wzfdmegp5f532c6rbcwcodplae ReEncodeFont" <[a_wzfdme.enc <STEP-Regular.pfb +STEP-Regular-tosf-t1--base STEP-Regular "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Regular.pfb +STEP-Regular-tosf-lgr--base STEP-Regular "AutoEnc_tmbyhwvciiizienosjksfmublh ReEncodeFont" <[a_tmbyhw.enc <STEP-Regular.pfb +STEP-Regular-tosf-t2a STEP-Regular "AutoEnc_mpy73sznerivipkumbh73vnfsa ReEncodeFont" <[a_mpy73s.enc <STEP-Regular.pfb +STEP-Regular-tosf-t2b STEP-Regular "AutoEnc_msql4jcsar3vqj7vxjvu7uknxc ReEncodeFont" <[a_msql4j.enc <STEP-Regular.pfb +STEP-Regular-tosf-t2c STEP-Regular "AutoEnc_inbzfqkmyoahjdxehi5asbemxd ReEncodeFont" <[a_inbzfq.enc <STEP-Regular.pfb +STEP-Regular-tosf-t3--base STEP-Regular "AutoEnc_lihfjgv3vupwhkt2vv7aci5sab ReEncodeFont" <[a_lihfjg.enc <STEP-Regular.pfb +STEP-Regular-tosf-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-ot1--base STEP-Regular "AutoEnc_uda4d5bmfcmbgrfg4tfrk2i5oe ReEncodeFont" <[a_uda4d5.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-ly1--base STEP-Regular "AutoEnc_fha2fnmd65jpomnyva6gdxuzrc ReEncodeFont" <[a_fha2fn.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-t1--base STEP-Regular "AutoEnc_gbbiodczspubz7um2ydud7w3rg ReEncodeFont" <[a_gbbiod.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-lgr--base STEP-Regular "AutoEnc_umr5bj6zeheqilfqb36yiknh5b ReEncodeFont" <[a_umr5bj.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-t2a STEP-Regular "AutoEnc_ylmzrwzpqky2myuuq7gsayfh5h ReEncodeFont" <[a_ylmzrw.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-t2b STEP-Regular "AutoEnc_4zqdxylwr57usbb5onvgqm2dwa ReEncodeFont" <[a_4zqdxy.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-t2c STEP-Regular "AutoEnc_sycgav5acgoxwy5tcbhwcmhpdc ReEncodeFont" <[a_sycgav.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-t3--base STEP-Regular "AutoEnc_gwrxgcjfqvuxewenbxuboytpfd ReEncodeFont" <[a_gwrxgc.enc <STEP-Regular.pfb +STEP-Regular-tosf-sc-ts3 STEP-Regular "AutoEnc_lws4feyiqaqi74pq2i32ouy7ph ReEncodeFont" <[a_lws4fe.enc <STEP-Regular.pfb +STEP-Regular-tosf-ts1--base STEP-Regular "AutoEnc_qqe53son6okjabwf47lmft2t5h ReEncodeFont" <[a_qqe53s.enc <STEP-Regular.pfb +STEP-Regular-inf-ot1 STEP-Regular "AutoEnc_smrclajsycaupxlyfmzu5xmnvh ReEncodeFont" <[a_smrcla.enc <STEP-Regular.pfb +STEP-Regular-inf-ly1--base STEP-Regular "AutoEnc_dy6wlvjqeexx7lmrwomwxoz45g ReEncodeFont" <[a_dy6wlv.enc <STEP-Regular.pfb +STEP-Regular-inf-t1--base STEP-Regular "AutoEnc_psyblsm2m3fsejbbcufwpd5t7f ReEncodeFont" <[a_psybls.enc <STEP-Regular.pfb +STEP-Regular-inf-lgr--base STEP-Regular "AutoEnc_bmbu3pxj2aya4uwkdq3cf4uegh ReEncodeFont" <[a_bmbu3p.enc <STEP-Regular.pfb +STEP-Regular-inf-t2a STEP-Regular "AutoEnc_6wpl7buwjdrtsxouyaqqtjemaf ReEncodeFont" <[a_6wpl7b.enc <STEP-Regular.pfb +STEP-Regular-inf-t2b STEP-Regular "AutoEnc_7z23fdntpjvtoxdomx5x27gjge ReEncodeFont" <[a_7z23fd.enc <STEP-Regular.pfb +STEP-Regular-inf-t2c STEP-Regular "AutoEnc_ufgsbssgxbse62jzlskinsk43c ReEncodeFont" <[a_ufgsbs.enc <STEP-Regular.pfb +STEP-Regular-inf-t3--base STEP-Regular "AutoEnc_mkgnjm3lzdg76ai76p2wwoqibh ReEncodeFont" <[a_mkgnjm.enc <STEP-Regular.pfb +STEP-Regular-inf-ts3 STEP-Regular "AutoEnc_7wspdkwrzvzs4fppzhk5xwu37g ReEncodeFont" <[a_7wspdk.enc <STEP-Regular.pfb +STEP-Italic-sup-ot1 STEP-Italic "AutoEnc_vzhqhyyynotemelfpertpk2dya ReEncodeFont" <[a_vzhqhy.enc <STEP-Italic.pfb +STEP-Italic-sup-ly1--base STEP-Italic "AutoEnc_l3q5rorzcm56k52hiv3drw2w2g ReEncodeFont" <[a_l3q5ro.enc <STEP-Italic.pfb +STEP-Italic-sup-t1--base STEP-Italic "AutoEnc_redus5fqyucraank777ybmhnvb ReEncodeFont" <[a_redus5.enc <STEP-Italic.pfb +STEP-Italic-sup-lgr--base STEP-Italic "AutoEnc_oqx7v66vilwb22ocpaqstjso6h ReEncodeFont" <[a_oqx7v6.enc <STEP-Italic.pfb +STEP-Italic-sup-t2a STEP-Italic "AutoEnc_kxamvpabvpkxbgdwdbbwpy56hc ReEncodeFont" <[a_kxamvp.enc <STEP-Italic.pfb +STEP-Italic-sup-t2b STEP-Italic "AutoEnc_x67loaaomj4biwtlvapaqc56of ReEncodeFont" <[a_x67loa.enc <STEP-Italic.pfb +STEP-Italic-sup-t2c STEP-Italic "AutoEnc_oxrcs32fufh3byays4pa7s2jle ReEncodeFont" <[a_oxrcs3.enc <STEP-Italic.pfb +STEP-Italic-sup-t3 STEP-Italic "AutoEnc_w7y2wchpjh5s4ibhn2rioueklb ReEncodeFont" <[a_w7y2wc.enc <STEP-Italic.pfb +STEP-Italic-sup-ts3 STEP-Italic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-Italic.pfb STEP-Italic-tlf-ot1 STEP-Italic "AutoEnc_f2t6y63dugrvub3dgjtr74io6f ReEncodeFont" <[a_f2t6y6.enc <STEP-Italic.pfb -STEP-Italic-tlf-t1--base STEP-Italic "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Italic.pfb STEP-Italic-tlf-ly1--base STEP-Italic "AutoEnc_574n7ukwqi5rtsbom2vrpemh2f ReEncodeFont" <[a_574n7u.enc <STEP-Italic.pfb +STEP-Italic-tlf-t1--base STEP-Italic "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Italic.pfb STEP-Italic-tlf-lgr--base STEP-Italic "AutoEnc_5xngggi7yvni7khor6dyjejhwg ReEncodeFont" <[a_5xnggg.enc <STEP-Italic.pfb -STEP-Italic-tlf-t2a STEP-Italic "AutoEnc_n35jrcm4jegjkvm2ry2xjfqlfc ReEncodeFont" <[a_n35jrc.enc <STEP-Italic.pfb -STEP-Italic-tlf-t2b STEP-Italic "AutoEnc_yl3m5rrvbckr47jveh5i73j3of ReEncodeFont" <[a_yl3m5r.enc <STEP-Italic.pfb -STEP-Italic-tlf-t2c STEP-Italic "AutoEnc_j4ep6ii6tr3ueedfni4g24rpbe ReEncodeFont" <[a_j4ep6i.enc <STEP-Italic.pfb -STEP-Italic-tlf-ts1--base STEP-Italic "AutoEnc_rcz4zwebmwkdxdjjnztfpdimig ReEncodeFont" <[a_rcz4zw.enc <STEP-Italic.pfb -STEP-Italic-sup-ot1 STEP-Italic "AutoEnc_aevneqdjmhye2cweb4twqm4tah ReEncodeFont" <[a_aevneq.enc <STEP-Italic.pfb -STEP-Italic-sup-t1--base STEP-Italic "AutoEnc_owwokhtavhrfpkanoznibuh3wc ReEncodeFont" <[a_owwokh.enc <STEP-Italic.pfb -STEP-Italic-sup-ly1--base STEP-Italic "AutoEnc_wql5wdufgatxrvgre3iyrd2qlc ReEncodeFont" <[a_wql5wd.enc <STEP-Italic.pfb -STEP-Italic-sup-lgr--base STEP-Italic "AutoEnc_oqx7v66vilwb22ocpaqstjso6h ReEncodeFont" <[a_oqx7v6.enc <STEP-Italic.pfb -STEP-Italic-sup-t2a STEP-Italic "AutoEnc_ahbw5kumdoqogltknq2u6mtp3b ReEncodeFont" <[a_ahbw5k.enc <STEP-Italic.pfb -STEP-Italic-sup-t2b STEP-Italic "AutoEnc_nm54mexvdshf6gkeeqqd2tnjlg ReEncodeFont" <[a_nm54me.enc <STEP-Italic.pfb -STEP-Italic-sup-t2c STEP-Italic "AutoEnc_uki32udkpngyrxct2hw2wzv3rg ReEncodeFont" <[a_uki32u.enc <STEP-Italic.pfb -STEP-Bold-tosf-ot1 STEP-Bold "AutoEnc_arx325ysxapto7rbr5oxz7i4ng ReEncodeFont" <[a_arx325.enc <STEP-Bold.pfb -STEP-Bold-tosf-t1--base STEP-Bold "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Bold.pfb -STEP-Bold-tosf-ly1--base STEP-Bold "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-Bold.pfb -STEP-Bold-tosf-lgr--base STEP-Bold "AutoEnc_fdcm6hiopqqtst63f3lyxqzk5e ReEncodeFont" <[a_fdcm6h.enc <STEP-Bold.pfb -STEP-Bold-tosf-t2a STEP-Bold "AutoEnc_4esb2f6gx7nn6xs5jmfw72t6sc ReEncodeFont" <[a_4esb2f.enc <STEP-Bold.pfb -STEP-Bold-tosf-t2b STEP-Bold "AutoEnc_zdolkrfnk3chtgd4snby5cvx6h ReEncodeFont" <[a_zdolkr.enc <STEP-Bold.pfb -STEP-Bold-tosf-t2c STEP-Bold "AutoEnc_6sfsu6zxbipue7dxiizrlsmcsb ReEncodeFont" <[a_6sfsu6.enc <STEP-Bold.pfb -STEP-Bold-tosf-ts1--base STEP-Bold "AutoEnc_jothuwzuwlqu7b5axau6m6xotf ReEncodeFont" <[a_jothuw.enc <STEP-Bold.pfb +STEP-Italic-tlf-t2a STEP-Italic "AutoEnc_5mws5yjbkq62ojguqjd6o3nu4e ReEncodeFont" <[a_5mws5y.enc <STEP-Italic.pfb +STEP-Italic-tlf-t2b STEP-Italic "AutoEnc_rcc5m6gnxq7qmubuxfvmjp4szb ReEncodeFont" <[a_rcc5m6.enc <STEP-Italic.pfb +STEP-Italic-tlf-t2c STEP-Italic "AutoEnc_l3aktjan2xnmksttgcnbfubkwa ReEncodeFont" <[a_l3aktj.enc <STEP-Italic.pfb +STEP-Italic-tlf-t3 STEP-Italic "AutoEnc_x7ixiy6lbtdwarsdyiingze6ed ReEncodeFont" <[a_x7ixiy.enc <STEP-Italic.pfb +STEP-Italic-tlf-ts3 STEP-Italic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-Italic.pfb +STEP-Italic-tlf-ts1--base STEP-Italic "AutoEnc_v7z4fimdvhp2rqfjqw263pz7th ReEncodeFont" <[a_v7z4fi.enc <STEP-Italic.pfb +STEP-Italic-tosf-ot1 STEP-Italic "AutoEnc_xnivr2fhskf5fkog6dneyn6cvf ReEncodeFont" <[a_xnivr2.enc <STEP-Italic.pfb +STEP-Italic-tosf-ly1--base STEP-Italic "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-Italic.pfb +STEP-Italic-tosf-t1--base STEP-Italic "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Italic.pfb +STEP-Italic-tosf-lgr--base STEP-Italic "AutoEnc_ffybipfnd2vxumndzixaxp2nfe ReEncodeFont" <[a_ffybip.enc <STEP-Italic.pfb +STEP-Italic-tosf-t2a STEP-Italic "AutoEnc_2b3rql4ayra2c6tnlxree55uke ReEncodeFont" <[a_2b3rql.enc <STEP-Italic.pfb +STEP-Italic-tosf-t2b STEP-Italic "AutoEnc_gnavrknqq2g5dbcml7wtxmoi7d ReEncodeFont" <[a_gnavrk.enc <STEP-Italic.pfb +STEP-Italic-tosf-t2c STEP-Italic "AutoEnc_e4dxwhawvuxpgl3z4f4ifnvowe ReEncodeFont" <[a_e4dxwh.enc <STEP-Italic.pfb +STEP-Italic-tosf-t3 STEP-Italic "AutoEnc_x7ixiy6lbtdwarsdyiingze6ed ReEncodeFont" <[a_x7ixiy.enc <STEP-Italic.pfb +STEP-Italic-tosf-ts3 STEP-Italic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-Italic.pfb +STEP-Italic-tosf-ts1--base STEP-Italic "AutoEnc_v7z4fimdvhp2rqfjqw263pz7th ReEncodeFont" <[a_v7z4fi.enc <STEP-Italic.pfb +STEP-Bold-sup-ot1 STEP-Bold "AutoEnc_uhroknkfblgpgraqzbt5w3zc5f ReEncodeFont" <[a_uhrokn.enc <STEP-Bold.pfb +STEP-Bold-sup-ly1--base STEP-Bold "AutoEnc_l3q5rorzcm56k52hiv3drw2w2g ReEncodeFont" <[a_l3q5ro.enc <STEP-Bold.pfb +STEP-Bold-sup-t1--base STEP-Bold "AutoEnc_redus5fqyucraank777ybmhnvb ReEncodeFont" <[a_redus5.enc <STEP-Bold.pfb +STEP-Bold-sup-lgr--base STEP-Bold "AutoEnc_tqaent5xephwt3gq5v75glgnka ReEncodeFont" <[a_tqaent.enc <STEP-Bold.pfb +STEP-Bold-sup-t2a STEP-Bold "AutoEnc_ryuwvo4wcj7t7rldr633dkj7he ReEncodeFont" <[a_ryuwvo.enc <STEP-Bold.pfb +STEP-Bold-sup-t2b STEP-Bold "AutoEnc_lwp5cc4anrslqode44l5vadmja ReEncodeFont" <[a_lwp5cc.enc <STEP-Bold.pfb +STEP-Bold-sup-t2c STEP-Bold "AutoEnc_evkz3b5i3bh3pbdxq2uftiowob ReEncodeFont" <[a_evkz3b.enc <STEP-Bold.pfb +STEP-Bold-sup-t3--base STEP-Bold "AutoEnc_xscnugpa6dudmqbz7dhiqvbflf ReEncodeFont" <[a_xscnug.enc <STEP-Bold.pfb +STEP-Bold-sup-ts3 STEP-Bold "AutoEnc_knoumuabumrlzfmvr6xbmqoese ReEncodeFont" <[a_knoumu.enc <STEP-Bold.pfb STEP-Bold-tlf-ot1 STEP-Bold "AutoEnc_vmnawypb3wx7vmuipufjnhaqic ReEncodeFont" <[a_vmnawy.enc <STEP-Bold.pfb -STEP-Bold-tlf-t1--base STEP-Bold "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Bold.pfb STEP-Bold-tlf-ly1--base STEP-Bold "AutoEnc_574n7ukwqi5rtsbom2vrpemh2f ReEncodeFont" <[a_574n7u.enc <STEP-Bold.pfb +STEP-Bold-tlf-t1--base STEP-Bold "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-Bold.pfb STEP-Bold-tlf-lgr--base STEP-Bold "AutoEnc_uip2yptzr33tn7ngi6lpkt3n3g ReEncodeFont" <[a_uip2yp.enc <STEP-Bold.pfb -STEP-Bold-tlf-t2a STEP-Bold "AutoEnc_tpkmtbcbyp6rgp6tbh7vsoag3h ReEncodeFont" <[a_tpkmtb.enc <STEP-Bold.pfb -STEP-Bold-tlf-t2b STEP-Bold "AutoEnc_bw7ysdvcjxgu4vfmbvtfdldwob ReEncodeFont" <[a_bw7ysd.enc <STEP-Bold.pfb -STEP-Bold-tlf-t2c STEP-Bold "AutoEnc_aoap6mljf3uvqa5ina244n2ide ReEncodeFont" <[a_aoap6m.enc <STEP-Bold.pfb -STEP-Bold-tlf-ts1--base STEP-Bold "AutoEnc_jothuwzuwlqu7b5axau6m6xotf ReEncodeFont" <[a_jothuw.enc <STEP-Bold.pfb -STEP-Bold-sup-ot1 STEP-Bold "AutoEnc_xy7ndglw2sj5toqiv4iypmda7f ReEncodeFont" <[a_xy7ndg.enc <STEP-Bold.pfb -STEP-Bold-sup-t1--base STEP-Bold "AutoEnc_owwokhtavhrfpkanoznibuh3wc ReEncodeFont" <[a_owwokh.enc <STEP-Bold.pfb -STEP-Bold-sup-ly1--base STEP-Bold "AutoEnc_wql5wdufgatxrvgre3iyrd2qlc ReEncodeFont" <[a_wql5wd.enc <STEP-Bold.pfb -STEP-Bold-sup-lgr--base STEP-Bold "AutoEnc_tqaent5xephwt3gq5v75glgnka ReEncodeFont" <[a_tqaent.enc <STEP-Bold.pfb -STEP-Bold-sup-t2a STEP-Bold "AutoEnc_udjv2re637bexrctoohgrumhkb ReEncodeFont" <[a_udjv2r.enc <STEP-Bold.pfb -STEP-Bold-sup-t2b STEP-Bold "AutoEnc_n6yyi4idhseyslirzpfmgupuve ReEncodeFont" <[a_n6yyi4.enc <STEP-Bold.pfb -STEP-Bold-sup-t2c STEP-Bold "AutoEnc_jhwfjojyvnh7u5vludvx7snmqa ReEncodeFont" <[a_jhwfjo.enc <STEP-Bold.pfb -STEP-BoldItalic-tosf-ot1 STEP-BoldItalic "AutoEnc_xnivr2fhskf5fkog6dneyn6cvf ReEncodeFont" <[a_xnivr2.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-t1--base STEP-BoldItalic "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-ly1--base STEP-BoldItalic "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-lgr--base STEP-BoldItalic "AutoEnc_bt7ykxvwumt3qi445zhivci3zg ReEncodeFont" <[a_bt7ykx.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-t2a STEP-BoldItalic "AutoEnc_l6bj4gjfubzihhvyhvyzdkj7rc ReEncodeFont" <[a_l6bj4g.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-t2b STEP-BoldItalic "AutoEnc_vjmilfn6kdcna7ohcrnlaodj2e ReEncodeFont" <[a_vjmilf.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-t2c STEP-BoldItalic "AutoEnc_hamrvakza32ug57drgurbdzz5a ReEncodeFont" <[a_hamrva.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tosf-ts1--base STEP-BoldItalic "AutoEnc_rcz4zwebmwkdxdjjnztfpdimig ReEncodeFont" <[a_rcz4zw.enc <STEP-BoldItalic.pfb +STEP-Bold-tlf-t2a STEP-Bold "AutoEnc_vca5tbmb4ke2q5djqneq7xlpzf ReEncodeFont" <[a_vca5tb.enc <STEP-Bold.pfb +STEP-Bold-tlf-t2b STEP-Bold "AutoEnc_47wiacjqsu3ew2zjmpd46uciph ReEncodeFont" <[a_47wiac.enc <STEP-Bold.pfb +STEP-Bold-tlf-t2c STEP-Bold "AutoEnc_y3uxyj7grbfj5gojh7tyhib2ef ReEncodeFont" <[a_y3uxyj.enc <STEP-Bold.pfb +STEP-Bold-tlf-t3--base STEP-Bold "AutoEnc_6auynrhkdbc7hohp7yh4ug5n5f ReEncodeFont" <[a_6auynr.enc <STEP-Bold.pfb +STEP-Bold-tlf-ts3 STEP-Bold "AutoEnc_knoumuabumrlzfmvr6xbmqoese ReEncodeFont" <[a_knoumu.enc <STEP-Bold.pfb +STEP-Bold-tlf-ts1--base STEP-Bold "AutoEnc_q6ipx2lntlxny52g2fzgkoszuc ReEncodeFont" <[a_q6ipx2.enc <STEP-Bold.pfb +STEP-Bold-tosf-ot1 STEP-Bold "AutoEnc_arx325ysxapto7rbr5oxz7i4ng ReEncodeFont" <[a_arx325.enc <STEP-Bold.pfb +STEP-Bold-tosf-ly1--base STEP-Bold "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-Bold.pfb +STEP-Bold-tosf-t1--base STEP-Bold "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-Bold.pfb +STEP-Bold-tosf-lgr--base STEP-Bold "AutoEnc_fdcm6hiopqqtst63f3lyxqzk5e ReEncodeFont" <[a_fdcm6h.enc <STEP-Bold.pfb +STEP-Bold-tosf-t2a STEP-Bold "AutoEnc_mpy73sznerivipkumbh73vnfsa ReEncodeFont" <[a_mpy73s.enc <STEP-Bold.pfb +STEP-Bold-tosf-t2b STEP-Bold "AutoEnc_msql4jcsar3vqj7vxjvu7uknxc ReEncodeFont" <[a_msql4j.enc <STEP-Bold.pfb +STEP-Bold-tosf-t2c STEP-Bold "AutoEnc_inbzfqkmyoahjdxehi5asbemxd ReEncodeFont" <[a_inbzfq.enc <STEP-Bold.pfb +STEP-Bold-tosf-t3--base STEP-Bold "AutoEnc_6auynrhkdbc7hohp7yh4ug5n5f ReEncodeFont" <[a_6auynr.enc <STEP-Bold.pfb +STEP-Bold-tosf-ts3 STEP-Bold "AutoEnc_knoumuabumrlzfmvr6xbmqoese ReEncodeFont" <[a_knoumu.enc <STEP-Bold.pfb +STEP-Bold-tosf-ts1--base STEP-Bold "AutoEnc_q6ipx2lntlxny52g2fzgkoszuc ReEncodeFont" <[a_q6ipx2.enc <STEP-Bold.pfb +STEP-BoldItalic-sup-ot1 STEP-BoldItalic "AutoEnc_vzhqhyyynotemelfpertpk2dya ReEncodeFont" <[a_vzhqhy.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-ly1--base STEP-BoldItalic "AutoEnc_l3q5rorzcm56k52hiv3drw2w2g ReEncodeFont" <[a_l3q5ro.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-t1--base STEP-BoldItalic "AutoEnc_redus5fqyucraank777ybmhnvb ReEncodeFont" <[a_redus5.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-lgr--base STEP-BoldItalic "AutoEnc_rx4otumgzhwozbsf7ska3wdndh ReEncodeFont" <[a_rx4otu.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-t2a STEP-BoldItalic "AutoEnc_kxamvpabvpkxbgdwdbbwpy56hc ReEncodeFont" <[a_kxamvp.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-t2b STEP-BoldItalic "AutoEnc_x67loaaomj4biwtlvapaqc56of ReEncodeFont" <[a_x67loa.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-t2c STEP-BoldItalic "AutoEnc_oxrcs32fufh3byays4pa7s2jle ReEncodeFont" <[a_oxrcs3.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-t3 STEP-BoldItalic "AutoEnc_w7y2wchpjh5s4ibhn2rioueklb ReEncodeFont" <[a_w7y2wc.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-sup-ts3 STEP-BoldItalic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-BoldItalic.pfb STEP-BoldItalic-tlf-ot1 STEP-BoldItalic "AutoEnc_f2t6y63dugrvub3dgjtr74io6f ReEncodeFont" <[a_f2t6y6.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tlf-t1--base STEP-BoldItalic "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-BoldItalic.pfb STEP-BoldItalic-tlf-ly1--base STEP-BoldItalic "AutoEnc_574n7ukwqi5rtsbom2vrpemh2f ReEncodeFont" <[a_574n7u.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-t1--base STEP-BoldItalic "AutoEnc_euweyhuge6v7wdejsqavpzeplf ReEncodeFont" <[a_euweyh.enc <STEP-BoldItalic.pfb STEP-BoldItalic-tlf-lgr--base STEP-BoldItalic "AutoEnc_rgssq43eoy3k6fmyic7tlnmsea ReEncodeFont" <[a_rgssq4.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tlf-t2a STEP-BoldItalic "AutoEnc_n35jrcm4jegjkvm2ry2xjfqlfc ReEncodeFont" <[a_n35jrc.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tlf-t2b STEP-BoldItalic "AutoEnc_yl3m5rrvbckr47jveh5i73j3of ReEncodeFont" <[a_yl3m5r.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tlf-t2c STEP-BoldItalic "AutoEnc_j4ep6ii6tr3ueedfni4g24rpbe ReEncodeFont" <[a_j4ep6i.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-tlf-ts1--base STEP-BoldItalic "AutoEnc_rcz4zwebmwkdxdjjnztfpdimig ReEncodeFont" <[a_rcz4zw.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-ot1 STEP-BoldItalic "AutoEnc_aevneqdjmhye2cweb4twqm4tah ReEncodeFont" <[a_aevneq.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-t1--base STEP-BoldItalic "AutoEnc_owwokhtavhrfpkanoznibuh3wc ReEncodeFont" <[a_owwokh.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-ly1--base STEP-BoldItalic "AutoEnc_wql5wdufgatxrvgre3iyrd2qlc ReEncodeFont" <[a_wql5wd.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-lgr--base STEP-BoldItalic "AutoEnc_rx4otumgzhwozbsf7ska3wdndh ReEncodeFont" <[a_rx4otu.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-t2a STEP-BoldItalic "AutoEnc_ahbw5kumdoqogltknq2u6mtp3b ReEncodeFont" <[a_ahbw5k.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-t2b STEP-BoldItalic "AutoEnc_nm54mexvdshf6gkeeqqd2tnjlg ReEncodeFont" <[a_nm54me.enc <STEP-BoldItalic.pfb -STEP-BoldItalic-sup-t2c STEP-BoldItalic "AutoEnc_uki32udkpngyrxct2hw2wzv3rg ReEncodeFont" <[a_uki32u.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-t2a STEP-BoldItalic "AutoEnc_5mws5yjbkq62ojguqjd6o3nu4e ReEncodeFont" <[a_5mws5y.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-t2b STEP-BoldItalic "AutoEnc_rcc5m6gnxq7qmubuxfvmjp4szb ReEncodeFont" <[a_rcc5m6.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-t2c STEP-BoldItalic "AutoEnc_l3aktjan2xnmksttgcnbfubkwa ReEncodeFont" <[a_l3aktj.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-t3 STEP-BoldItalic "AutoEnc_x7ixiy6lbtdwarsdyiingze6ed ReEncodeFont" <[a_x7ixiy.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-ts3 STEP-BoldItalic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tlf-ts1--base STEP-BoldItalic "AutoEnc_v7z4fimdvhp2rqfjqw263pz7th ReEncodeFont" <[a_v7z4fi.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-ot1 STEP-BoldItalic "AutoEnc_xnivr2fhskf5fkog6dneyn6cvf ReEncodeFont" <[a_xnivr2.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-ly1--base STEP-BoldItalic "AutoEnc_7if24zmdcuftd3wtwdwvm6cqnf ReEncodeFont" <[a_7if24z.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-t1--base STEP-BoldItalic "AutoEnc_enu25gmebasuw3a34724to465g ReEncodeFont" <[a_enu25g.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-lgr--base STEP-BoldItalic "AutoEnc_bt7ykxvwumt3qi445zhivci3zg ReEncodeFont" <[a_bt7ykx.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-t2a STEP-BoldItalic "AutoEnc_2b3rql4ayra2c6tnlxree55uke ReEncodeFont" <[a_2b3rql.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-t2b STEP-BoldItalic "AutoEnc_gnavrknqq2g5dbcml7wtxmoi7d ReEncodeFont" <[a_gnavrk.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-t2c STEP-BoldItalic "AutoEnc_e4dxwhawvuxpgl3z4f4ifnvowe ReEncodeFont" <[a_e4dxwh.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-t3 STEP-BoldItalic "AutoEnc_x7ixiy6lbtdwarsdyiingze6ed ReEncodeFont" <[a_x7ixiy.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-ts3 STEP-BoldItalic "AutoEnc_4h34hbq4ch4oad2ednx5l76a6h ReEncodeFont" <[a_4h34hb.enc <STEP-BoldItalic.pfb +STEP-BoldItalic-tosf-ts1--base STEP-BoldItalic "AutoEnc_v7z4fimdvhp2rqfjqw263pz7th ReEncodeFont" <[a_v7z4fi.enc <STEP-BoldItalic.pfb diff --git a/fonts/step/opentype/STEP-Bold.otf b/fonts/step/opentype/STEP-Bold.otf Binary files differindex 21e51b4478..91abce6485 100644 --- a/fonts/step/opentype/STEP-Bold.otf +++ b/fonts/step/opentype/STEP-Bold.otf diff --git a/fonts/step/opentype/STEP-BoldItalic.otf b/fonts/step/opentype/STEP-BoldItalic.otf Binary files differindex ffdb24a566..ce311c61b0 100644 --- a/fonts/step/opentype/STEP-BoldItalic.otf +++ b/fonts/step/opentype/STEP-BoldItalic.otf diff --git a/fonts/step/opentype/STEP-Italic.otf b/fonts/step/opentype/STEP-Italic.otf Binary files differindex ae5832671e..171f6a85d4 100644 --- a/fonts/step/opentype/STEP-Italic.otf +++ b/fonts/step/opentype/STEP-Italic.otf diff --git a/fonts/step/opentype/STEP-Regular.otf b/fonts/step/opentype/STEP-Regular.otf Binary files differindex 30539bf84f..18160c799f 100644 --- a/fonts/step/opentype/STEP-Regular.otf +++ b/fonts/step/opentype/STEP-Regular.otf diff --git a/fonts/step/opentype/STEPMath-Bold.otf b/fonts/step/opentype/STEPMath-Bold.otf Binary files differindex f362e176ff..2c517bd32b 100644 --- a/fonts/step/opentype/STEPMath-Bold.otf +++ b/fonts/step/opentype/STEPMath-Bold.otf diff --git a/fonts/step/opentype/STEPMath-Regular.otf b/fonts/step/opentype/STEPMath-Regular.otf Binary files differindex d5bd9d0627..f4d2eba5e3 100644 --- a/fonts/step/opentype/STEPMath-Regular.otf +++ b/fonts/step/opentype/STEPMath-Regular.otf diff --git a/fonts/step/tfm/STEP-Bold-sup-t3--base.tfm b/fonts/step/tfm/STEP-Bold-sup-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..4829ca2240 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-sup-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Bold-sup-t3.tfm b/fonts/step/tfm/STEP-Bold-sup-t3.tfm Binary files differnew file mode 100644 index 0000000000..51aa1c1bc2 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-sup-t3.tfm diff --git a/fonts/step/tfm/STEP-Bold-sup-ts3.tfm b/fonts/step/tfm/STEP-Bold-sup-ts3.tfm Binary files differnew file mode 100644 index 0000000000..45746af233 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-sup-ts3.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-t2a.tfm b/fonts/step/tfm/STEP-Bold-tlf-t2a.tfm Binary files differindex 93a504ca6b..55214e6761 100644 --- a/fonts/step/tfm/STEP-Bold-tlf-t2a.tfm +++ b/fonts/step/tfm/STEP-Bold-tlf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-t2b.tfm b/fonts/step/tfm/STEP-Bold-tlf-t2b.tfm Binary files differindex ba8d5f49fc..177aa34c3f 100644 --- a/fonts/step/tfm/STEP-Bold-tlf-t2b.tfm +++ b/fonts/step/tfm/STEP-Bold-tlf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-t2c.tfm b/fonts/step/tfm/STEP-Bold-tlf-t2c.tfm Binary files differindex b753938cff..608326239a 100644 --- a/fonts/step/tfm/STEP-Bold-tlf-t2c.tfm +++ b/fonts/step/tfm/STEP-Bold-tlf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-t3--base.tfm b/fonts/step/tfm/STEP-Bold-tlf-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..4e85214de4 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tlf-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-t3.tfm b/fonts/step/tfm/STEP-Bold-tlf-t3.tfm Binary files differnew file mode 100644 index 0000000000..a14d118c77 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tlf-t3.tfm diff --git a/fonts/step/tfm/STEP-Bold-tlf-ts3.tfm b/fonts/step/tfm/STEP-Bold-tlf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..66d285b52e --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tlf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-t2a.tfm b/fonts/step/tfm/STEP-Bold-tosf-t2a.tfm Binary files differindex 85cc238bb7..ef05c267f0 100644 --- a/fonts/step/tfm/STEP-Bold-tosf-t2a.tfm +++ b/fonts/step/tfm/STEP-Bold-tosf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-t2b.tfm b/fonts/step/tfm/STEP-Bold-tosf-t2b.tfm Binary files differindex e83d876ff7..08d9ad6e6d 100644 --- a/fonts/step/tfm/STEP-Bold-tosf-t2b.tfm +++ b/fonts/step/tfm/STEP-Bold-tosf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-t2c.tfm b/fonts/step/tfm/STEP-Bold-tosf-t2c.tfm Binary files differindex 975288d0c3..b1aab8d624 100644 --- a/fonts/step/tfm/STEP-Bold-tosf-t2c.tfm +++ b/fonts/step/tfm/STEP-Bold-tosf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-t3--base.tfm b/fonts/step/tfm/STEP-Bold-tosf-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..4e85214de4 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tosf-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-t3.tfm b/fonts/step/tfm/STEP-Bold-tosf-t3.tfm Binary files differnew file mode 100644 index 0000000000..a14d118c77 --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tosf-t3.tfm diff --git a/fonts/step/tfm/STEP-Bold-tosf-ts3.tfm b/fonts/step/tfm/STEP-Bold-tosf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..66d285b52e --- /dev/null +++ b/fonts/step/tfm/STEP-Bold-tosf-ts3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-sup-t3.tfm b/fonts/step/tfm/STEP-BoldItalic-sup-t3.tfm Binary files differnew file mode 100644 index 0000000000..d8422943a0 --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-sup-t3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-sup-ts3.tfm b/fonts/step/tfm/STEP-BoldItalic-sup-ts3.tfm Binary files differnew file mode 100644 index 0000000000..cce524df4a --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-sup-ts3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm b/fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm Binary files differindex 200653d898..5d58907d0d 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tlf-t2a.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm b/fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm Binary files differindex 07e51efd19..1ac0a27c23 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tlf-t2b.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm b/fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm Binary files differindex a321e3f088..b8dab3353f 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tlf-t2c.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tlf-t3.tfm b/fonts/step/tfm/STEP-BoldItalic-tlf-t3.tfm Binary files differnew file mode 100644 index 0000000000..d574c76b10 --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-tlf-t3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tlf-ts3.tfm b/fonts/step/tfm/STEP-BoldItalic-tlf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..b3fd9d0e75 --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-tlf-ts3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm b/fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm Binary files differindex 9cd7c8eec0..35fdeee07c 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tosf-t2a.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm b/fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm Binary files differindex 1a298cd9c3..29fea638c3 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tosf-t2b.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm b/fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm Binary files differindex f68fc8a3cc..88f1d92e9a 100644 --- a/fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm +++ b/fonts/step/tfm/STEP-BoldItalic-tosf-t2c.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tosf-t3.tfm b/fonts/step/tfm/STEP-BoldItalic-tosf-t3.tfm Binary files differnew file mode 100644 index 0000000000..d574c76b10 --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-tosf-t3.tfm diff --git a/fonts/step/tfm/STEP-BoldItalic-tosf-ts3.tfm b/fonts/step/tfm/STEP-BoldItalic-tosf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..b3fd9d0e75 --- /dev/null +++ b/fonts/step/tfm/STEP-BoldItalic-tosf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Italic-sup-t3.tfm b/fonts/step/tfm/STEP-Italic-sup-t3.tfm Binary files differnew file mode 100644 index 0000000000..ce9516d32e --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-sup-t3.tfm diff --git a/fonts/step/tfm/STEP-Italic-sup-ts3.tfm b/fonts/step/tfm/STEP-Italic-sup-ts3.tfm Binary files differnew file mode 100644 index 0000000000..c606bfc974 --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-sup-ts3.tfm diff --git a/fonts/step/tfm/STEP-Italic-tlf-t2a.tfm b/fonts/step/tfm/STEP-Italic-tlf-t2a.tfm Binary files differindex 095dcf63a6..8f51bc64b0 100644 --- a/fonts/step/tfm/STEP-Italic-tlf-t2a.tfm +++ b/fonts/step/tfm/STEP-Italic-tlf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Italic-tlf-t2b.tfm b/fonts/step/tfm/STEP-Italic-tlf-t2b.tfm Binary files differindex 6b2f31913e..fb3308e5ff 100644 --- a/fonts/step/tfm/STEP-Italic-tlf-t2b.tfm +++ b/fonts/step/tfm/STEP-Italic-tlf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Italic-tlf-t2c.tfm b/fonts/step/tfm/STEP-Italic-tlf-t2c.tfm Binary files differindex db6844c990..ed37ac7510 100644 --- a/fonts/step/tfm/STEP-Italic-tlf-t2c.tfm +++ b/fonts/step/tfm/STEP-Italic-tlf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Italic-tlf-t3.tfm b/fonts/step/tfm/STEP-Italic-tlf-t3.tfm Binary files differnew file mode 100644 index 0000000000..80c66213f6 --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-tlf-t3.tfm diff --git a/fonts/step/tfm/STEP-Italic-tlf-ts3.tfm b/fonts/step/tfm/STEP-Italic-tlf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..5390f9ae43 --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-tlf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Italic-tosf-t2a.tfm b/fonts/step/tfm/STEP-Italic-tosf-t2a.tfm Binary files differindex 623e2eb26f..f8295c92b2 100644 --- a/fonts/step/tfm/STEP-Italic-tosf-t2a.tfm +++ b/fonts/step/tfm/STEP-Italic-tosf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Italic-tosf-t2b.tfm b/fonts/step/tfm/STEP-Italic-tosf-t2b.tfm Binary files differindex e8b5039f7b..f37cec331a 100644 --- a/fonts/step/tfm/STEP-Italic-tosf-t2b.tfm +++ b/fonts/step/tfm/STEP-Italic-tosf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Italic-tosf-t2c.tfm b/fonts/step/tfm/STEP-Italic-tosf-t2c.tfm Binary files differindex cd822610d9..81972e378c 100644 --- a/fonts/step/tfm/STEP-Italic-tosf-t2c.tfm +++ b/fonts/step/tfm/STEP-Italic-tosf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Italic-tosf-t3.tfm b/fonts/step/tfm/STEP-Italic-tosf-t3.tfm Binary files differnew file mode 100644 index 0000000000..80c66213f6 --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-tosf-t3.tfm diff --git a/fonts/step/tfm/STEP-Italic-tosf-ts3.tfm b/fonts/step/tfm/STEP-Italic-tosf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..5390f9ae43 --- /dev/null +++ b/fonts/step/tfm/STEP-Italic-tosf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-dnom-lgr--base.tfm Binary files differnew file mode 100644 index 0000000000..0406bf853b --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-lgr.tfm b/fonts/step/tfm/STEP-Regular-dnom-lgr.tfm Binary files differnew file mode 100644 index 0000000000..c3541f510e --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-ly1--base.tfm b/fonts/step/tfm/STEP-Regular-dnom-ly1--base.tfm Binary files differnew file mode 100644 index 0000000000..fd0d0289f2 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-ly1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-ly1.tfm b/fonts/step/tfm/STEP-Regular-dnom-ly1.tfm Binary files differnew file mode 100644 index 0000000000..4f12938e36 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-ly1.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-ot1.tfm b/fonts/step/tfm/STEP-Regular-dnom-ot1.tfm Binary files differnew file mode 100644 index 0000000000..8640562e11 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-ot1.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t1--base.tfm b/fonts/step/tfm/STEP-Regular-dnom-t1--base.tfm Binary files differnew file mode 100644 index 0000000000..4a83b14b1c --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t1.tfm b/fonts/step/tfm/STEP-Regular-dnom-t1.tfm Binary files differnew file mode 100644 index 0000000000..88bd9e850e --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t1.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t2a.tfm b/fonts/step/tfm/STEP-Regular-dnom-t2a.tfm Binary files differnew file mode 100644 index 0000000000..205dce1d0d --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t2b.tfm b/fonts/step/tfm/STEP-Regular-dnom-t2b.tfm Binary files differnew file mode 100644 index 0000000000..e488dbd297 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t2c.tfm b/fonts/step/tfm/STEP-Regular-dnom-t2c.tfm Binary files differnew file mode 100644 index 0000000000..d73b7e9d6c --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t3--base.tfm b/fonts/step/tfm/STEP-Regular-dnom-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..9501985162 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-t3.tfm b/fonts/step/tfm/STEP-Regular-dnom-t3.tfm Binary files differnew file mode 100644 index 0000000000..ced6f9090a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-dnom-ts3.tfm b/fonts/step/tfm/STEP-Regular-dnom-ts3.tfm Binary files differnew file mode 100644 index 0000000000..0a17469441 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-dnom-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm Binary files differindex 37264f4f59..3266348d43 100644 --- a/fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-inf-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-inf-lgr.tfm b/fonts/step/tfm/STEP-Regular-inf-lgr.tfm Binary files differindex 6396fc8d95..867c2fecd9 100644 --- a/fonts/step/tfm/STEP-Regular-inf-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-inf-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-inf-t3--base.tfm b/fonts/step/tfm/STEP-Regular-inf-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..9501985162 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-inf-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-inf-t3.tfm b/fonts/step/tfm/STEP-Regular-inf-t3.tfm Binary files differnew file mode 100644 index 0000000000..ced6f9090a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-inf-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-inf-ts3.tfm b/fonts/step/tfm/STEP-Regular-inf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..0a17469441 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-inf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-numr-lgr--base.tfm Binary files differnew file mode 100644 index 0000000000..e25097a676 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-lgr.tfm b/fonts/step/tfm/STEP-Regular-numr-lgr.tfm Binary files differnew file mode 100644 index 0000000000..47790cfe56 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-ly1--base.tfm b/fonts/step/tfm/STEP-Regular-numr-ly1--base.tfm Binary files differnew file mode 100644 index 0000000000..128f323e89 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-ly1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-ly1.tfm b/fonts/step/tfm/STEP-Regular-numr-ly1.tfm Binary files differnew file mode 100644 index 0000000000..dd0e99b834 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-ly1.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-ot1.tfm b/fonts/step/tfm/STEP-Regular-numr-ot1.tfm Binary files differnew file mode 100644 index 0000000000..dd17191c9d --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-ot1.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t1--base.tfm b/fonts/step/tfm/STEP-Regular-numr-t1--base.tfm Binary files differnew file mode 100644 index 0000000000..c38c8f0241 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t1.tfm b/fonts/step/tfm/STEP-Regular-numr-t1.tfm Binary files differnew file mode 100644 index 0000000000..94fd3f8942 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t1.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t2a.tfm b/fonts/step/tfm/STEP-Regular-numr-t2a.tfm Binary files differnew file mode 100644 index 0000000000..3091f86fa5 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t2b.tfm b/fonts/step/tfm/STEP-Regular-numr-t2b.tfm Binary files differnew file mode 100644 index 0000000000..d00233a31b --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t2c.tfm b/fonts/step/tfm/STEP-Regular-numr-t2c.tfm Binary files differnew file mode 100644 index 0000000000..d35148ca93 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t3--base.tfm b/fonts/step/tfm/STEP-Regular-numr-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..9501985162 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-t3.tfm b/fonts/step/tfm/STEP-Regular-numr-t3.tfm Binary files differnew file mode 100644 index 0000000000..ced6f9090a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-numr-ts3.tfm b/fonts/step/tfm/STEP-Regular-numr-ts3.tfm Binary files differnew file mode 100644 index 0000000000..0a17469441 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-numr-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm Binary files differindex 757a5bd612..7618f4783d 100644 --- a/fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-sup-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-sup-lgr.tfm b/fonts/step/tfm/STEP-Regular-sup-lgr.tfm Binary files differindex e21e4e81eb..44882baa1d 100644 --- a/fonts/step/tfm/STEP-Regular-sup-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-sup-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-sup-t3--base.tfm b/fonts/step/tfm/STEP-Regular-sup-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..9501985162 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-sup-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-sup-t3.tfm b/fonts/step/tfm/STEP-Regular-sup-t3.tfm Binary files differnew file mode 100644 index 0000000000..ced6f9090a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-sup-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-sup-ts3.tfm b/fonts/step/tfm/STEP-Regular-sup-ts3.tfm Binary files differnew file mode 100644 index 0000000000..0a17469441 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-sup-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm Binary files differindex 30f3720494..48078edd95 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-lgr.tfm b/fonts/step/tfm/STEP-Regular-tlf-lgr.tfm Binary files differindex 6a06b4e2d5..ff4b097e88 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm Binary files differindex 583e952708..6167c3c6b9 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm Binary files differindex 123d444c24..44343c1f37 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm Binary files differindex 66e1d88b61..472defd7e8 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-ly1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm Binary files differindex 47add8efc1..e756ef8f57 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-ly1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm Binary files differindex 187cace825..61856b7d28 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-ot1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm Binary files differindex ca608ce199..d228dbecd0 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-ot1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm Binary files differindex 695660c4a0..38821ed0e3 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm Binary files differindex b69f67653b..f828c803dd 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm Binary files differindex a5925c00c8..9cf05f3183 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm Binary files differindex 36755cbc20..318ac6dd04 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm Binary files differindex 0d7f77e551..5a00f4ec2e 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t3--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..e13c3fdf10 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-t3.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-t3.tfm Binary files differnew file mode 100644 index 0000000000..5129aeb20b --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-sc-ts3.tfm b/fonts/step/tfm/STEP-Regular-tlf-sc-ts3.tfm Binary files differnew file mode 100644 index 0000000000..4c87184a2a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-sc-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-t2a.tfm b/fonts/step/tfm/STEP-Regular-tlf-t2a.tfm Binary files differindex afa2889127..613ac33951 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-t2a.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-t2b.tfm b/fonts/step/tfm/STEP-Regular-tlf-t2b.tfm Binary files differindex ebacc89bc1..636ff4e7d6 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-t2b.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-t2c.tfm b/fonts/step/tfm/STEP-Regular-tlf-t2c.tfm Binary files differindex 2d10991f7c..2c4b5ea06a 100644 --- a/fonts/step/tfm/STEP-Regular-tlf-t2c.tfm +++ b/fonts/step/tfm/STEP-Regular-tlf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-t3--base.tfm b/fonts/step/tfm/STEP-Regular-tlf-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..dd0058f69e --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-t3.tfm b/fonts/step/tfm/STEP-Regular-tlf-t3.tfm Binary files differnew file mode 100644 index 0000000000..0eada3d0b4 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tlf-ts3.tfm b/fonts/step/tfm/STEP-Regular-tlf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..b51072fb27 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tlf-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm Binary files differindex 89db92da48..cc54d71069 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-lgr.tfm b/fonts/step/tfm/STEP-Regular-tosf-lgr.tfm Binary files differindex f85ae66f65..a44a284271 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm Binary files differindex fa9e910826..04e9eb9bc4 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-lgr--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm Binary files differindex 78cd509b10..27af72621c 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-lgr.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm Binary files differindex 828a115095..7477afe370 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-ly1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm Binary files differindex b76be726a2..e0f3f24c4f 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-ly1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm Binary files differindex a431bb7cb2..a5d13bda9e 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-ot1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm Binary files differindex e2ff629c53..5f9ad55e98 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-ot1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm Binary files differindex 3c2f1d91f3..43f0217724 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t1--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm Binary files differindex 2ff976cb86..96a2cacfad 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t1.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm Binary files differindex f16d034fe9..98c9514028 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm Binary files differindex 67e6f26608..030eca275b 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm Binary files differindex 671d264b2d..98d44ef7aa 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t3--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..e13c3fdf10 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-t3.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-t3.tfm Binary files differnew file mode 100644 index 0000000000..5129aeb20b --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-sc-ts3.tfm b/fonts/step/tfm/STEP-Regular-tosf-sc-ts3.tfm Binary files differnew file mode 100644 index 0000000000..4c87184a2a --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-sc-ts3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-t2a.tfm b/fonts/step/tfm/STEP-Regular-tosf-t2a.tfm Binary files differindex 0fa692a16d..cc1eb62b4c 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-t2a.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-t2a.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-t2b.tfm b/fonts/step/tfm/STEP-Regular-tosf-t2b.tfm Binary files differindex cee8b0d8e6..685ff1cccc 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-t2b.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-t2b.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-t2c.tfm b/fonts/step/tfm/STEP-Regular-tosf-t2c.tfm Binary files differindex e10bfda8ac..b6138d65c9 100644 --- a/fonts/step/tfm/STEP-Regular-tosf-t2c.tfm +++ b/fonts/step/tfm/STEP-Regular-tosf-t2c.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-t3--base.tfm b/fonts/step/tfm/STEP-Regular-tosf-t3--base.tfm Binary files differnew file mode 100644 index 0000000000..dd0058f69e --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-t3--base.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-t3.tfm b/fonts/step/tfm/STEP-Regular-tosf-t3.tfm Binary files differnew file mode 100644 index 0000000000..0eada3d0b4 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-t3.tfm diff --git a/fonts/step/tfm/STEP-Regular-tosf-ts3.tfm b/fonts/step/tfm/STEP-Regular-tosf-ts3.tfm Binary files differnew file mode 100644 index 0000000000..b51072fb27 --- /dev/null +++ b/fonts/step/tfm/STEP-Regular-tosf-ts3.tfm diff --git a/fonts/step/type1/STEP-Bold.pfb b/fonts/step/type1/STEP-Bold.pfb Binary files differindex 2c8dec0cfd..40247474c5 100644 --- a/fonts/step/type1/STEP-Bold.pfb +++ b/fonts/step/type1/STEP-Bold.pfb diff --git a/fonts/step/type1/STEP-BoldItalic.pfb b/fonts/step/type1/STEP-BoldItalic.pfb Binary files differindex 7bb58cff38..b8aa961a8a 100644 --- a/fonts/step/type1/STEP-BoldItalic.pfb +++ b/fonts/step/type1/STEP-BoldItalic.pfb diff --git a/fonts/step/type1/STEP-Italic.pfb b/fonts/step/type1/STEP-Italic.pfb Binary files differindex 4870c67666..9d19080b71 100644 --- a/fonts/step/type1/STEP-Italic.pfb +++ b/fonts/step/type1/STEP-Italic.pfb diff --git a/fonts/step/type1/STEP-Regular.pfb b/fonts/step/type1/STEP-Regular.pfb Binary files differindex 8c35cffc9c..37a64b4bcb 100644 --- a/fonts/step/type1/STEP-Regular.pfb +++ b/fonts/step/type1/STEP-Regular.pfb diff --git a/fonts/step/vf/STEP-Bold-sup-t3.vf b/fonts/step/vf/STEP-Bold-sup-t3.vf Binary files differnew file mode 100644 index 0000000000..f3fd6aed80 --- /dev/null +++ b/fonts/step/vf/STEP-Bold-sup-t3.vf diff --git a/fonts/step/vf/STEP-Bold-tlf-t3.vf b/fonts/step/vf/STEP-Bold-tlf-t3.vf Binary files differnew file mode 100644 index 0000000000..dfc46fd61a --- /dev/null +++ b/fonts/step/vf/STEP-Bold-tlf-t3.vf diff --git a/fonts/step/vf/STEP-Bold-tosf-t3.vf b/fonts/step/vf/STEP-Bold-tosf-t3.vf Binary files differnew file mode 100644 index 0000000000..d07d490770 --- /dev/null +++ b/fonts/step/vf/STEP-Bold-tosf-t3.vf diff --git a/fonts/step/vf/STEP-Regular-dnom-lgr.vf b/fonts/step/vf/STEP-Regular-dnom-lgr.vf Binary files differnew file mode 100644 index 0000000000..80ebce7b0e --- /dev/null +++ b/fonts/step/vf/STEP-Regular-dnom-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-dnom-ly1.vf b/fonts/step/vf/STEP-Regular-dnom-ly1.vf Binary files differnew file mode 100644 index 0000000000..d8027a9d21 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-dnom-ly1.vf diff --git a/fonts/step/vf/STEP-Regular-dnom-t1.vf b/fonts/step/vf/STEP-Regular-dnom-t1.vf Binary files differnew file mode 100644 index 0000000000..fdffb26277 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-dnom-t1.vf diff --git a/fonts/step/vf/STEP-Regular-dnom-t3.vf b/fonts/step/vf/STEP-Regular-dnom-t3.vf Binary files differnew file mode 100644 index 0000000000..fa76b774cb --- /dev/null +++ b/fonts/step/vf/STEP-Regular-dnom-t3.vf diff --git a/fonts/step/vf/STEP-Regular-inf-lgr.vf b/fonts/step/vf/STEP-Regular-inf-lgr.vf Binary files differindex f0cdab9736..d2b3c271a6 100644 --- a/fonts/step/vf/STEP-Regular-inf-lgr.vf +++ b/fonts/step/vf/STEP-Regular-inf-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-inf-t3.vf b/fonts/step/vf/STEP-Regular-inf-t3.vf Binary files differnew file mode 100644 index 0000000000..270a3ddb0f --- /dev/null +++ b/fonts/step/vf/STEP-Regular-inf-t3.vf diff --git a/fonts/step/vf/STEP-Regular-numr-lgr.vf b/fonts/step/vf/STEP-Regular-numr-lgr.vf Binary files differnew file mode 100644 index 0000000000..98f7a1eaff --- /dev/null +++ b/fonts/step/vf/STEP-Regular-numr-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-numr-ly1.vf b/fonts/step/vf/STEP-Regular-numr-ly1.vf Binary files differnew file mode 100644 index 0000000000..efe36025ee --- /dev/null +++ b/fonts/step/vf/STEP-Regular-numr-ly1.vf diff --git a/fonts/step/vf/STEP-Regular-numr-t1.vf b/fonts/step/vf/STEP-Regular-numr-t1.vf Binary files differnew file mode 100644 index 0000000000..9a5c907558 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-numr-t1.vf diff --git a/fonts/step/vf/STEP-Regular-numr-t3.vf b/fonts/step/vf/STEP-Regular-numr-t3.vf Binary files differnew file mode 100644 index 0000000000..455158bd15 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-numr-t3.vf diff --git a/fonts/step/vf/STEP-Regular-sup-lgr.vf b/fonts/step/vf/STEP-Regular-sup-lgr.vf Binary files differindex ea5493042c..180f667e79 100644 --- a/fonts/step/vf/STEP-Regular-sup-lgr.vf +++ b/fonts/step/vf/STEP-Regular-sup-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-sup-t3.vf b/fonts/step/vf/STEP-Regular-sup-t3.vf Binary files differnew file mode 100644 index 0000000000..2defcf88d6 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-sup-t3.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-lgr.vf b/fonts/step/vf/STEP-Regular-tlf-lgr.vf Binary files differindex 5bb6087d07..d7a4c268f4 100644 --- a/fonts/step/vf/STEP-Regular-tlf-lgr.vf +++ b/fonts/step/vf/STEP-Regular-tlf-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf b/fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf Binary files differindex d793e499b6..1d6c44e869 100644 --- a/fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf +++ b/fonts/step/vf/STEP-Regular-tlf-sc-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf b/fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf Binary files differindex 6618283c48..6afd196baa 100644 --- a/fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf +++ b/fonts/step/vf/STEP-Regular-tlf-sc-ly1.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf b/fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf Binary files differindex bb47a70d3d..f3fc1656ab 100644 --- a/fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf +++ b/fonts/step/vf/STEP-Regular-tlf-sc-ot1.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-sc-t1.vf b/fonts/step/vf/STEP-Regular-tlf-sc-t1.vf Binary files differindex ae57019404..91681d1b1b 100644 --- a/fonts/step/vf/STEP-Regular-tlf-sc-t1.vf +++ b/fonts/step/vf/STEP-Regular-tlf-sc-t1.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-sc-t3.vf b/fonts/step/vf/STEP-Regular-tlf-sc-t3.vf Binary files differnew file mode 100644 index 0000000000..9a82718891 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-tlf-sc-t3.vf diff --git a/fonts/step/vf/STEP-Regular-tlf-t3.vf b/fonts/step/vf/STEP-Regular-tlf-t3.vf Binary files differnew file mode 100644 index 0000000000..7aef276975 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-tlf-t3.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-lgr.vf b/fonts/step/vf/STEP-Regular-tosf-lgr.vf Binary files differindex 5333fd3fae..fb37c395d0 100644 --- a/fonts/step/vf/STEP-Regular-tosf-lgr.vf +++ b/fonts/step/vf/STEP-Regular-tosf-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf b/fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf Binary files differindex e0a0374545..24a43bc6d9 100644 --- a/fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf +++ b/fonts/step/vf/STEP-Regular-tosf-sc-lgr.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf b/fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf Binary files differindex 5e5c22e1f9..3b5911753e 100644 --- a/fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf +++ b/fonts/step/vf/STEP-Regular-tosf-sc-ly1.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf b/fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf Binary files differindex d21f3c47f4..3c0ff001af 100644 --- a/fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf +++ b/fonts/step/vf/STEP-Regular-tosf-sc-ot1.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-sc-t1.vf b/fonts/step/vf/STEP-Regular-tosf-sc-t1.vf Binary files differindex 9b569689b0..c550f11e0d 100644 --- a/fonts/step/vf/STEP-Regular-tosf-sc-t1.vf +++ b/fonts/step/vf/STEP-Regular-tosf-sc-t1.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-sc-t3.vf b/fonts/step/vf/STEP-Regular-tosf-sc-t3.vf Binary files differnew file mode 100644 index 0000000000..005c64c259 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-tosf-sc-t3.vf diff --git a/fonts/step/vf/STEP-Regular-tosf-t3.vf b/fonts/step/vf/STEP-Regular-tosf-t3.vf Binary files differnew file mode 100644 index 0000000000..c7f46870f0 --- /dev/null +++ b/fonts/step/vf/STEP-Regular-tosf-t3.vf diff --git a/macros/latex/contrib/erw-l3/README.md b/macros/latex/contrib/erw-l3/README.md index e5b41e28d7..a50f369134 100644 --- a/macros/latex/contrib/erw-l3/README.md +++ b/macros/latex/contrib/erw-l3/README.md @@ -1,8 +1,7 @@ ---------------------------------------------------------------- -erw-l3 --- Utilities built around expl3 -Source repository: https://github.com/rogard/erw-l3 -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt +#### erw-l3 --- Utilities built around expl3 +- Source repository: https://github.com/rogard/erw-l3 +- Released under the LaTeX Project Public License v1.3c or later; see http://www.latex-project.org/lppl.txt ---------------------------------------------------------------- diff --git a/macros/latex/contrib/erw-l3/erw-l3.dtx b/macros/latex/contrib/erw-l3/erw-l3.dtx index 6fcffe4ca4..b538f3dd77 100644 --- a/macros/latex/contrib/erw-l3/erw-l3.dtx +++ b/macros/latex/contrib/erw-l3/erw-l3.dtx @@ -70,11 +70,14 @@ and the derived files erw-l3.ins, \expandafter\endgroup \fi %</internal> +%<package>\RequirePackage{expl3}[2018/06/01] +%<package>\RequirePackage{xparse}[2018/02/01] +%<package>\RequirePackage{l3keys2e} %<package>\ProvidesExplPackage -%<package> {erw-l3} % Package name -%<package> {2019/10/12} % Release date -%<package> {0.1.5} % Release version -%<package> {Utilities built around expl3} % Description +%<package> {erw-l3} % Package name +%<package> {2020/02/05} % Release date +%<package> {0.1.6} % Release version +%<package> {Utilities built around expl3} % Description % %<*driver> \documentclass[full]{l3doc} @@ -718,9 +721,6 @@ and the derived files erw-l3.ins, % \fi % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\RequirePackage{expl3}[2018/06/01] -\RequirePackage{xparse}[2018/02/01] -\RequirePackage{l3keys2e} \ExplSyntaxOn \msg_new:nnn{erw}{generic}{#1} % \end{macrocode} @@ -1187,6 +1187,7 @@ and the derived files erw-l3.ins, %\changes{0.1.5}{2019/12/12}{Rearranged frontend/backend sections} %\changes{0.1.5}{2019/12/12}{Split Section Preliminaries into Conventions and Requirement.} %\changes{0.1.5}{2019/12/12}{Removed \pkg{disambig}} +%\changes{0.1.6}{2020/02/05}{Fixed critical bug preventing \pkg{erw-l3} from working without explicit inclusion of \pkg{expl3}} % % % \begin{thebibliography}{1} % diff --git a/macros/latex/contrib/erw-l3/erw-l3.ins b/macros/latex/contrib/erw-l3/erw-l3.ins deleted file mode 100644 index 9ce820375b..0000000000 --- a/macros/latex/contrib/erw-l3/erw-l3.ins +++ /dev/null @@ -1,68 +0,0 @@ -%% -%% This is file `erw-l3.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% erw-l3.dtx (with options: `install') -%% ---------------------------------------------------------------- -%% erw-l3 Utilities built around expl3 -%% Released under the LaTeX Project Public License v1.3c or later -%% See http://www.latex-project.org/lppl.txt -%% ---------------------------------------------------------------- -%% -\input docstrip.tex -\keepsilent -\askforoverwritefalse -\preamble ----------------------------------------------------------------- -erw-l3 Utilities built around expl3 -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -\endpreamble -\postamble - -Copyright (C) 2018 by Erwann Rogard - -This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License (LPPL), either -version 1.3c of this license or (at your option) any later -version. The latest version of this license is in the file: - -http://www.latex-project.org/lppl.txt - -This work is "maintained" (as per LPPL maintenance status) by -Erwann Rogard. - -This work consists of the file erw-l3.dtx -and the derived files erw-l3.ins, - erw-l3.pdf and - erw-l3.sty. - -\endpostamble -\generate{ - \file{\jobname.sty}{\from{\jobname.dtx}{package}} -} -\endbatchfile -%% -%% Copyright (C) 2018 by Erwann Rogard -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License (LPPL), either -%% version 1.3c of this license or (at your option) any later -%% version. The latest version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Erwann Rogard. -%% -%% This work consists of the file erw-l3.dtx -%% and the derived files erw-l3.ins, -%% erw-l3.pdf and -%% erw-l3.sty. -%% -%% -%% End of file `erw-l3.ins'. diff --git a/macros/latex/contrib/erw-l3/erw-l3.pdf b/macros/latex/contrib/erw-l3/erw-l3.pdf Binary files differindex c9c9dc788d..bbcff81588 100644 --- a/macros/latex/contrib/erw-l3/erw-l3.pdf +++ b/macros/latex/contrib/erw-l3/erw-l3.pdf diff --git a/macros/latex/contrib/euclideangeometry/README.txt b/macros/latex/contrib/euclideangeometry/README.txt new file mode 100644 index 0000000000..28e984c559 --- /dev/null +++ b/macros/latex/contrib/euclideangeometry/README.txt @@ -0,0 +1,52 @@ +%% +%% This is file `README.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% euclideangeometry.dtx (with options: `readme') +%% +%% Copyright (C) 2020 Claudio Beccari all rights reserved. +%% License information appended +%% +File README.txt for package euclideangeometry + [2020-02-02 v.0.1.2 Extension package for curve2e] + +The package bundle euclideangeometry is composed of the following files + +euclideangeometry.dtx +euclideangeometry.pdf +euclideangeometry-man.tex +euclideangeometry-man.pdf +README.txt + +euclideangeometry.dtx is the documented TeX source file of package +euclideangeometry.sty; you get euclideangeometry.sty, +euclideangeometry.pdf by running pdflatex on euclideangeometry.dtx. + +README.txt, this file, contains general information. + +euclideangeometry-man.tex and euclideangeometry-man.pdf are +the source file and the readable document containing the end +user manual. +In other words euclideangeometry.pdf is oriented towards the +developers and euclideangeometry-man.pdf to the end users. + +Claudio Beccari + +claudio dot beccari at gmail dot com +%% +%% Distributable under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" +%% +%% This work consists of files: +%% 1) euclideangeometry.dtx, and the derived files euclideangeometry.sty +%% and euclideangeometry.pdf, +%% 2) euclideangeometry-man.tex and the derived file euclideangeometry-man.pdf, +%% 3) the auxiliary derived file README.txt +%% +%% +%% End of file `README.txt'. diff --git a/macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf b/macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf Binary files differnew file mode 100644 index 0000000000..1364546e34 --- /dev/null +++ b/macros/latex/contrib/euclideangeometry/euclideangeometry-man.pdf diff --git a/macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex b/macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex new file mode 100644 index 0000000000..9c668874fa --- /dev/null +++ b/macros/latex/contrib/euclideangeometry/euclideangeometry-man.tex @@ -0,0 +1,1657 @@ +% !TEX encoding = UTF-8 Unicode +% !TEX TS-program = pdflatex + +\documentclass[11pt,titlepage]{article}\errorcontextlines=100 +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english]{babel} +\usepackage{lmodern,textcomp,mflogo} +\usepackage{amsmath,fancyvrb,graphicx,verbatim,afterpage,trace} +\usepackage{etoolbox,enumitem,xspace,xcolor,euclideangeometry} +\usepackage{url} + +\AfterEndPreamble{% +\apptocmd{\TeX}{{}\xspace}{}{} +\apptocmd{\LaTeX}{{}\xspace}{}{}} + +\newcommand\heart[3]{% +\edef\X{\fpeval{#1*16*(sind(#2)^3)}} +\edef\Y{\fpeval{#1*(13*cosd(#2) - 5*cosd(2*#2) + - 2*cosd(3*#2) -cosd(4*#2)+2.4)}} +\CopyVect\X,\Y to#3} +\let\cuore\heart + +\begin{document} + +\begin{titlepage} +\thispagestyle{empty} +\centering +\textsc{\large Claudio Beccari}\\[2ex] +\texttt{claudio dot beccari at gmail dot com} + +\vspace{\stretch{2}} + +{\LARGE\scshape The \pack{euclideangeometry} package\\ +{\large user manual}\par} + +\vspace{\baselineskip} + + +\GetFileInfo{euclideangeometry.sty} +Version \fileversion\ of \filedate + +\vspace*{\stretch{5}} +\end{titlepage} + + \begin{abstract} + This file further extends the functionalities of the \pack{curve2e} + package, which, on turn, is an extension of the \pack{pict2e} package + to the standard \env{picture} environment as defined in the \LaTeX\ + kernel source file. + + The \pack{curve2e} package was upgraded a the beginning of 2020; the + material + of this new package, might have been included in the former one, but is + is sospecific, that we preferred defining a standalone one; this package + takes care of requesting the packages it depends from. + + The purpose is to provide the tools to draw most of the geometrical + constructions that a high school instructor or bachelor degree professor + might need to teach geometry. The connection to Euclide depends on the + fact that in its times calculations were made with ruler, compass, and, + apparently, also with ellipsograph, + + The user of this package has available all the machinery provided by + the \pack{pict2e} and \pack{curve2e} packages, in order to define new functionalities + and build macros that draw the necessary lines, circles, and other such + objects, as they would have done in the ancient times. Actually just one + macro is programmed to solve a linear system of equations + \end{abstract} + + \tableofcontents + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section*{Warning} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +The \pack{euclideangeometry} package requires the advanced functionalities of the \LaTeX\!3 (L3) language; if such functionalities are not available for any reason (incomplete/basic installation of the \TeX system; legacy installation of the \TeX system; the \TeX system has not been updated; \dots) input of this package is stopped, the whole job is aborted, and a visible message is issued. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section{Introduction} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + The \pack{picture} environment has been available since the very beginning + of \LaTeX in 1985. At that time it was a very simple environment + that allowed to draw very simple line graphics with many limitations. + When \LaTeX was upgraded from \LaTeX\!2.09 to \LaTeXe in 1994, Leslie + Lamport announced an upgrade that eventually became available in 2003 + with package \pack{pict2e}; in 2006 I wrote the \pack{curve2e} package that added + many more functionalities; both packages were upgraded during these + years; and now line graphics with the \env{picture} environment can perform + pretty well. The package \pack{euclideangeometry} adds even more specific + functionalities in order to produce geometric drawings as they were + possible in the old times, when calculus and analytic geometry were + not available. + + In these years other drawing programs were made available to the \TeX + community; \pack{PSTricks} and \pack{TikZ} are the most known ones, but there are + other less known packages, that perform very well; among the latter + I would like to mention \pack{xpicture}, that relies on \pack{pict2e} and + \pack{curve2e}, but extends the functionalities with a very smart handling + of coordinate systems, that allow to draw many line drawings suitable + for teaching geometry in high schools and introductory courses in the + university bachelor degree programs. + + This package \pack{euclideangeomery} in a certain way follows the same + path of \pack{xpicture} but it avoids defining a new user language + interface; rather it builds new macros by using the same philosophy of + the recent \pack{curve2e} package. + + It is worth mentioning that now \pack{curve2e} accepts coordinates in both + cartesian and polar form; it allows to identify specific points of the + drawing with macros, so the same macro can be used over and over again to + address the same points.The package can draw lines, vectors, arcs + with no arrow tips, or with one arrow tip, or with arrow tips at both ends, + arcs included. The macros for drawing poly lines, polygons, circles, + generic curves (by means of Bézier cubic or quadratic splines) are + already available; such facilities are well documented and exemplified + in the user manual of \pack{curve2e} package. + + In what follows there will be several figures drawn with this package; + in the background there is a red grid where the meshes are + 10\,\cs{unitlenth} apart in both directions; they should help to + understand the position of the various drawings on the picture canvas. + This grid is useful also to the end user, while s/he is working on a + particular drawing, but when the drawing is finished, the user can + delete the grid command or comment ot that line of code. + For what regards the commands used to render the images, their codes can + be found in the documented code file \pack{euclideangeometry.pdf}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section{Installing \pack{euclideangeometry}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + You are not supposed to manually install package \pack{euclideangeometry}. + In facts you have to work with a complete and updated/upgraded \TeX + installation, otherwise this package won't work; this means that + you have done your updating after 2020-01-18. And this package is already + present in any modern updated complete installation of the \TeX system. + Nevertheless the package will load \pack{curve2e} with the wrong version + and file date, but this package will abort its own loading. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section{Loading \pack{euclideangeometry}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + If you want to use the \pack{euclideangeometry} package, we suggest you load it with the following command: +\begin{flushleft}\obeylines +\cs{usepackage}\oarg{options}\Marg{euclideangeomery} +\end{flushleft} + The package will take care of managing the possible \meta{options} + and to call \pack{curve2e} with the specified options; on turn + \pack{curve2e} calls \pack{pict2e} passing on the \meta{options}; such + \meta{options} are only those usable by \pack{pict2e} because neither + \pack{curve2e} nor \pack{euclideangeometry} use any option. If the + user is invoking \pack{euclideangeometry}, it is certain s/he does + not want to use the native picture environment, but the modern + extended one; therefore the only meaningful possible options are + \opt{latex} and\opt{pstricks}; such options influence only the shape + of the arrow tips; with option \opt{latex} they are triangular, + while with \opt{pstricks} they have the shape of a stealth + aircraft. The difference is very small; therefore we imagine that + even if these options are available, they might never be used. + + Nothing happens if the user forgets this mechanism; therefore if s/he + loads \pack{curve2e} and/or \pack{pict2e}, before + \pack{euclideangeomentry} the only problem that might arise is an + “Option clash†error message; if two of these packages are selected + with different arrow tips; not impossible, of course, by we deem + it very unlikely. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section{Available commands} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + The commands available with the first extension \pack{pict2e} to the native + \amb{picture} environment, maintain their names but do not maintain the + same restrictions; in particular there are the following improvements. +\begin{enumerate}[noitemsep] + \item Lines and vectors are drawn as usual by \cs{put}ting in place + their forms, but their inclinations are not limited to a limited + number of slope parameters, originally specified with reciprocally + prime single digit values not exceeding~6 for lines, and~4 for vectors; + the length of these sloped objects is still their horizontal component; + now, the slopes may be described with any signed fractional number not + exceeding $2^{30}-1$ in absolute value; it still is a limited number of + slopes, but their combinations are practically countless. +% +\item There is no restriction on the minimum length of lines and vectors. +% +\item Circles and dots can be drawn at any size, not at that dozen + or so of finite sizes that were accepted with the original environment. +% +\item Ovals may be specified the corner curvature; the default + size of the quarter circles that make up the oval corners may be + specified; if no specification is given the radius of such corners + is the maximum that can be fitted in the oval; in practice it is + half the shortest value between the oval height and width. + +\item The quadratic Bézier splines do not require the specification + of the number of dots that were used by the native environment to + draw “arbitrary†curves; now they are drawn with continuous curved + lines. +\end{enumerate} + Some new commands were added by \pack{pict2e} +\begin{enumerate}[noitemsep] + +\item The third degree (cubic) Bézier splines are sort of new; certainly + now they are traced with continuous lines; if it is desired, it is + possible to replace the continuous line with a number of dots so as + to have a (unevenly) dotted curve. It suffices to specify the number + of dots the curve should be made with. + +\item\cs{arc} and \cs{arc*} draw an arc or a filled circular sector, + with their centers at the axes origin; therefore they need to be put + in place somewhere else by means of the usual \cs{put} command. + +\item The new command \cs{Line} traces a segment from one given point + to another point; it is very convenient to specify the end points + instead of the slope the line must have to go form the starting + point to the ending one. The command does not require the \cs{put} + command to put the segment in place; nevertheless it can be shifted + somewhere else with \cs{put} if it becomes necessary. + +\item the new command \cs{polyline} draws a sequence of connected + segments that form a piecewise linear “curveâ€; the way segments are + joined to one another depend from the “join†specifiers that + \pack{pict2e} has introduced; they will be described further on. + +\item \cs{polygon} and \cs{polygon*} produce closed paths as it would + be possible when using \cs{polyline} and specifying the last point + coincident with the first point of that curve. The closed path is + filled with the default color if the asterisk is used. +\end{enumerate} + + There were also the low level commands user interfaces to the various + drivers; these drivers really exist, but \pack{pict2e} + knows how to detect the correct language of the necessary drive; + the user is therefore allowed to pretend to ignore the existence + of such drivers; s/he can simply use these commands; their names are + almost self explanatory. +\begin{enumerate}[noitemsep] +\item \cs{moveto} Sets the start of a line tracing to an initial point. + +\item \cs{lineto} traces a segment up to a specified point. + +\item \cs{curveto} traces a third degree Bézier up to the third specified + point, while using the other two ones as control points.\footnote{If + these terms are unfamiliar, please read the \pack{pict2e} documentation.} + + \item \cs{circlearc} traces a circumference arc from the last line + point to a specified destination; its center, its angle amplitude, its + initial point are among the specified arguments, but the reader should + check on the \pack{pict2e} documentation for the details. + +\item[]\mbox{\bfseries Attention!} Notice that these commands produce + just information to trace lines, but by themselves they do not trace + anything; in order to actually trace the curve or do other operations + with what has been done after the user finished describing the line to + trace, the following low level commands must be used. + +\item A \cs{closepath} is necessary if it is desired to + join the last position to the initial one. But if the last point + specified coincides with the very first one, a closed loop is + effectively already completed. + +\item If a \cs{strokepath} command is used the line is drawn. + +\item If a \cs{fillpath} command is used, the line loop is filled by + the current color. Notice, if the described line is not a closed loop, + this filling command acts as if the line first point and last point were + joined by a straight line. + +\end{enumerate} + + While describing a line with the above low level commands, or with + the previous high level commands, lines and segments join and finish + as described hereafter; the following commands must be used, possibly + within a group, before actually tracing a specific line made up with + several joined lines or curves. Notice that their effect is just + visible with lines as thin as 1\,pt, and very visible with thicker + lines. +\begin{enumerate}[noitemsep] +\item \cs{buttcap} truncates each line with a sharp cut perpendicular + to the line axis exactly through the line end point (default). + +\item \cs{roundcap} adds a semicircle to the very end of each line. + +\item \cs{squarecap} adds the half square to the very end of each line. + +\item \cs{miterjoin} joins two (generally straight) lines with a miter + (or mitre) joint; this means that the borders of the line are prolonged + until they meet; it is very nice when the junction angle is not far away + from, or is larger than $90^\circ$. Apparently for \pack{pict2e} this + type of joint is the default. + +\item \cs{roundjoin} joins each (generally straight) line with + a \cs{roundcap}; it is good in most circumstances. + +\item \cs{beveljoin} joins two (generally straight) lines with a miter + joint truncated with a sharp cut perpendicular to the bisector of the + lines axes; with acute angles it is better than the miter joint, but + when angles are very small, even this joint is not adequate. +\end{enumerate} + + Notice that \cs{buttcap} is the default, but in general it might be + better to declare the \cs{roundcap} for the whole document. + + We do not go further in the description of the new \pack{pict2e} + modified and new new commands; the reader unfamiliar with programmable + drawing and the \pack{pic2e} extensions can consult that package + documentation. Actually all commands have been redefined or modified + by \pack{curve2e} in order to render them at least compatible with + both the cartesian and polar coordinates. In oder to have a better understanding of these details, see figure~\ref{fig:joins}\footnote{The \cs{polyline} macro has the default join of type bevel; remember to specify a different join type if you want a different one.}. + + \begin{figure}[!htb] \centering + \makebox[\textwidth]{\unitlength=0.009\textwidth + \begin{picture}(130,50) + \GraphGrid(130,50) + \linethickness{4mm} + \buttcap\miterjoin + \put(10,10){\polyline[\miterjoin](0,0)(30,0)(30,30) + \put(0,-10){\makebox(30,10)[b]{\cs{buttcap},\cs{miterjoin}}}} + \roundcap\roundjoin + \put(50,10){\polyline[\roundjoin](0,0)(30,0)(30,30) + \put(0,-10){\makebox(30,10)[b]{\cs{roundcap},\cs{roundjoin}}}} + \squarecap\beveljoin + \put(90,10){\polyline(0,0)(30,0)(30,30) + \put(0,-10){\makebox(30,10)[b]{\cs{squarecap},\cs{beveljoin}}}} + \end{picture}} + \caption{Different caps and joins}\label{fig:joins} + \end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%>>> +\section{\pack{curve2e} extensions} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + Again we do not enter into the details, because the user can read the + new user manual \file{curve2e-manual.pdf} simply by entering and + executing the \verb|texdoc curve2e-manual| command into a terminal or + command prompt window; this new manual is available with version~2.2.0 + (or higher) of \pack{curve2e} and it contains the extensions and sample + codes for (simple) sample drawings; some examples are not so simple, but + show the power of this package upgrade. + + The most important two changes are $(a)$ the choice of different + coordinates for addressing points on the drawing canvas, and $(b)$ + the possibility of using macros to identify specific points. + As already mentioned, such changes have been applied also to most, + if not all\footnote{I assume I have upgraded all such commands; if not, + please, send me a bug notice; I will acknowledge your contribution.} + commands defined by \pack{pict2e}. + + \pack{curve2e} defines a lot of operations the user can do with + the point coordinates; this is done by assuming they are complex + numbers, or vectors, or roto\-amplification operators, and making + with such entities a lot of actions compatible with their “incarnation". + For example multiplying a vector by a roto\`amplification operator, + in spite the fact that internally they are both represented by ordered + pairs of (generally) fractional numbers, means simply obtaining a new + vector rotated and scaled with respect to the original one; the point + addressed by the first vector, becomes another point in a different + precise position. + + Below you see several examples of usage of such commands; but here space + will be saved if a short list is made concerning these “complex number†+ operations. + + Remember the double nature of such complex numbers: +\[ +z = x + \iu y = m\eu^{\iu \phi} +\] + therefore addition and subtraction are simply done with +\[ +z_1 \pm z_2 = x_1 \pm x_2 +\iu (y_1 \pm y_2) +\] + Multiplications and divisions are simply done with +\begin{align*} +z_1 z_2 &=( m_1 m_2) \eu^{\iu(\phi_1 + \phi_2)} \\ +z_1/z_2 &=( m_1/m_2) \eu^{\iu(\phi_1 - \phi_2)} +\end{align*} + Squares and square roots\footnote{The square root of a complex number + has two values; here we do not go into the details on how \pack{curve2e} + choses one or the other value. In practice, the \pack{curve2e} macros + that use square roots, work mostly on scalars to find magnitudes that + are always positive.} are simply done with: +\begin{align*} +z^2 &= m^2\eu^{\iu 2\phi}\\ +\sqrt{z} &= \sqrt{m}\eu^{\iu\phi/2} +\end{align*} + The complex conjugate of a complex number is shown with a superscript + asterisk: +\[\text{if } z= x+\iu y \text{ then } z^\star = x- \iu y\] + and from these simple formal rules many results can be obtained; + and therefore several macros must be defined. + + But let us summarise. Here is a short list with a minimum of + explanation of the commands functionalities introduced by + \pack{curve2e}. The user notices that many commands rely on + a delimited argument command syntax; the first arguments can + generally be introduced with point macros, as well as numerical + coordinates (no matter if cartesian and polar ones) while + the output(s) should always be in form of point macro(s). Parentheses + for delimiting the ordered couples or the point macros are seldom + required. On the other side, the variety of multiple optional + arguments, sometimes requires the use of different delimiters, + most often than not the signs~\texttt{<~>}, in addition to the + usual brackets. These syntax functionalities are available with the + \pack{xparse} and \pack{xfp} packages, that render the language~L3 + very useful and effective. + + Handling of complex numbers is done with the following commands. + New commands to draw special objects, are also described. +\begin{enumerate}[noitemsep] +% +\item Cartesian and polar coordinates; they are distinguished by + their separator; cartesian coordinates are the usual comma separated + couple \meta{$x,y$}; polar coordinates are specified with a colon + separated couple \meta{$\theta{:}\,\rho$}. In general they are + specified within parentheses, but some commands require them without + any parentheses. In what follows a generic math symbol, such as for + example $P_1$, is used to indicate a complex number that addresses + a particular point, irrespective of the chosen coordinate type, + or a macro defined to contain those coordinates. + +\item The complex number/vector operations already available with + \pack{curve2e} are the following; we specify “macro†because in general + macros are used, instead of explicit numerical values, but for input + vector macros it is possible to use the comma or colon separated ordered + couple; “versor†means “unit vectorâ€; angles are always expressed in + degrees; output quantities are everything follows the key word + \texttt{to}; output quantities are alway supposed to be in the form + of control sequences. +\begin{itemize}\small +\item \cs{MakeVectorFrom}\meta{number,number}\meta{numeric macro} to\meta{vector macro} +\item \cs{CopyVect}\meta{vector macro} to\meta{vector macro} +\item \cs{ModOfVect}\meta{vector macro} to\meta{modulus macro} +\item \cs{DirOfVect}\meta{vector macro} to\meta{versor macro} +\item \cs{ModAndDirOfVect}\meta{vector macro} to\meta{modulus macro} + and\meta{versor macro} +\item \cs{ModAndAngleOfVect}\meta{vector macro} to \meta{modulus macro} + and\meta{angle macro} +\item \cs{DistanceAndDirOfVect}\meta{1st vector macro} + minus\meta{2nd vector macro} to\meta{distance macro} + and\meta{versor macro} +\item \cs{XpartOfVect}\meta{vector macro} to\meta{numerical macro} +\item \cs{YpartOfVect}\meta{vector macro} to\meta{numerical macro} +\item \cs{DirFromAngle}\meta{angle macro} to\meta{versor macro} +\item \cs{ArgOfVect}\meta{vector macro} to\meta{angle macro} +\item \cs{ScaleVect}\meta{vector macro} by\meta{scale factor} + to\meta{vector macro} +\item \cs{ConjVect}\meta{vector macro} to\meta{conjugate vector macro} +\item \cs{SubVect}\meta{subtrahend vector} from\meta{minuend vector} + to\meta{vector macro} +\item \cs{AddVect}\meta{1st vector} and\meta{2nd vector} + to\meta{vector macro} +\item \cs{Multvect}\marg{1st vector}\meta{$\star$}\marg{2nd vector}\meta{$ + \star$}\meta{output vector macro}\newline the asterisks are optional; + either one changes the \meta{2nd vector} into its complex conjugate +\item \cs{MultVect}\meta{1st vector}\meta{$\star$}\meta{2nd vector} + to\meta{vector macro}\newline discouraged; maintained for backward + compatibility; the only optional asterisk changes the \meta{2nd vector} + into its complex conjugate +\item \cs{Divvect}\marg{dividend vector}\marg{divisor vector}\marg{output + vector macro} +\item \cs{DivVect}\meta{dividend vector}\meta{divisor vector} + to\meta{vector macro}\newline maintained for backwards + compatibility +\end{itemize} + +\item A new command \cs{segment}\parg{$P_1$}\parg{$P_2$} draws a line that + joins the specified points. + +\item Command \cs{Dashline}\parg{$P_1$}\parg{$P_2$}\marg{dash length} + draws a dashed line between the specified points; the + \meta{dash length} is specified as a coefficient of + \cs{unitlenth} so they are proportioned to the diagram scale. The gap + between dashes is just as wide as the dashes; they are recomputed by + the command in order to slightly adjust the \meta{dash length} so + that the line starts at point $P_1$ with a dash, and ends at $P_2$ + again with a dash. + +\item Command \cs{Dotline}\parg{$P_1$}\parg{$P_2$}\marg{gap}\oarg{diameter} + traces a dotted line between the specified points with dots \meta{gap} + units apart, starting and ending with a dot at the specified points. + Optionally the absolute diameter of the dots may be specified: a + diameter of 1\,pt (default) is visible, but it might be too small; + a diameter of 1\,mm is really very black, and may be too large; if + the diameter is specified without dimensions they are assumed by + default to be typographic points. + +\item Command \cs{polyline}, \cs{polygon} and \cs{polygon*} are redefined + to accept both coordinate kinds. + +\item Commands \cs{VECTOR}\parg{$P_1$}\parg{$P_2$} (and \cs{VVECTOR}, with the same syntax) draw vectors with one arrow tip at the end, or arrow tips at both ends respectively. + +\item New commands \cs{Arc}\parg{center}\parg{start}\marg{angle} and, + with the same syntax, \cs{VectorArc} and \cs{VectorARC} draw + arcs without or with arrow tip(s), with the specified \meta{center}, + starting at point \meta{start}, with an aperture of \meta{angle} + degrees (not radians). \cs{Arc} draws the arc without arrow tips; + \cs{VectorArc} draws the arc with one arrow tip at the end point; + \cs{VectorARC} draws an arc with arrow tips at both ends. + +\item Command \cs{multiput} has been redefined to accept optional + arguments, besides the use of coordinates of both kinds. The new syntax + is the following: +\begin{flushleft}\obeylines +\cs{multiput}\oarg{shift}\parg{origin}\parg{step}\marg{number}\marg{object}\oarg{handler} +\end{flushleft} + where, if you neglect the first and the last (optional) arguments, + you have the original syntax; the \meta{origin} point is where the first + \meta{object} is placed; \meta{step} is the displacement of a new + \meta{object} relative to the previous one; \meta{number} is the + total number of \meta{object}s put in place by the command; possibly + the number may be an integer expression computed with the \cs{inteval} + function of the L3~language, accessed through the \pack{xfp} package + already loaded by \pack{curve2e}. The new features are \meta{shift}, + that is used to displace the whole drawing somewhere else (in case + some fine tuning is required), and \meta{handler}; the latter is a + powerful means to control both the object to be set in place and its + position; further on there will be examples that show that the object + can be put not only on straight paths, but also un other curves, + including parabolas, circles, and other shapes. + +\item Another version of repetitive commands \cs{xmultiput} is very + similar to \cs{multiput} but the iterations are controlled in a + different way so that it is possible also to draw continuous + curves describing analytical functions even with parametric + equations. Further on there will be some examples. + +\item The preloaded \pack{xfp} package provides two important + functionalities, i.e. two L3 “functionsâ€, \cs{fpeval} and \cs{inteval}; + the latter executes expressions on integer numbers containing the usual + operators \texttt{+, -, *, /}; the division quotient is rounded to the + nearest (positive or negative) integer. The former operates with real + fractional numbers and, in addition to the usual arithmetical operators as + \cs{inteval}, it can use many mathematical functions, from square roots, + to exponentials, logarithms, trigonometric and hyperbolic direct and + inverse functions\footnote{The implementation of inverse hyperbolic + function is on the L3~Team “to do†list.}, plus other ones. Normally + fractional numbers are operated on decimal strings, with 16 fractional + places, and 14 integer places but the L3~functions accept also scientific + notation. The user can specify truncation or rounding to a specified + number of digits. Such integer and fractional mathematical operations + are already integrated in most computations performed by \pack{curve2e}. + +\item \pack{curve2e} provides two more L3 functions: \cs{fptest} and + \cs{fpdowhile} with the following syntax: +\begin{flushleft}\obeylines +\cs{fptest}\marg{test}\marg{true}\marg{false} +\cs{fpdowhile}\marg{test}\marg{actions} +\end{flushleft} + For both macros the \meta{test} is a logical F3~expression; its operands + are logical constants, logical values, logical numeric comparisons; its + operators are the typical \texttt{||}, \texttt{\&\&}, and \texttt{!}, + respectively for OR, AND, and NOT. The logical numerical comparisons + are mathematical constants or expressions connected with relation + operators, such as \texttt{>, =, <}; such operators may be negated with + the NOT operator; therefore, for example, \texttt{!>} means “not greater + thanâ€, therefore “lower or equal toâ€. + +\item The above tests are very useful to control both \cs{fptest} and + \cs{fpdowhile}. The logical \meta{test} result lets \cs{fptest} execute + only the \meta{true} or the \meta{false} code. Before using \cs{fpdowhile} + the \meta{test} expression must be initialised to be \texttt{true}; + the \meta{actions} should contain some code to be iteratively executed, + but they must contain some assignments, typically a change in an + iteration counter, such that eventually the \meta{test} logical + expression becomes \texttt{false}. Lacking this assignments, the + loop continues to infinity, or better, until a fatal error message + is issued that informs that the program working memory is exhausted. + +\item Such new commands are already used to code the \cs{multiput} and + \cs{xmultiput} commands, but they are available also to the user who can + operate in a very advanced way; further on, some examples will show + some advanced drawings. + +\item General curves can be drawn by \pack{pic2e} command \cs{curve} + that is sort of difficult to use, because the user has to specify + also the control points of the third order Bézier splines. Some other + new commands are available with \pack{curve2e}, that are supposed + to be easier to use; they are described in the following items. + +\item The new command \cs{Curve} joins a sequence of third order + splines by simply specifying the node-direction coordinates; i.e. at the + junction of two consecutive splines, in a certain interpolation node the + final previous spline tangent has the same direction of the tangent + at the second spline first node; if a change of direction is required, an + optional new direction can be specified. Therefore this triplet of + information has the following syntax: +\begin{flushleft} + \parg{node}\aarg{direction}\oarg{new direction} +\end{flushleft} + Evidently the \meta{new direction} is specified only for the nodes + that correspond to a cusp. A variation of the command arguments is + available by optionally specifying the “looseness†of the curve: +\begin{flushleft} +\parg{node}\aarg{direction\texttt{;}start\texttt{,}end}\oarg{\dots} +\end{flushleft} + where \meta{start} is the spline starting “looseness†and \meta{end} + is the spline ending one. These (generally different) values + are an index of how far is the control point from the adjacent node. + With this functionality the user has a very good control on the curve + shape and curvature. + +\item A similar command \cs{Qurve} works almost the same way, but it + traces a quadratic Bézier spline; this one is specified only with two + nodes an a single control point, therefore is less configurable than + cubic splines; the same final line requires several quadratic splines + when just a single cubic spline might do the same job. Notice also that + quadratic splines are just parabolic arcs, therefore without inflections, + while a cubic spline can have one inflexion. + +\item A further advanced variation is obtained with the new + \cs{CurveBetween} command that creates a single cubic spline between two + given points with the following syntax: +\begin{flushleft}\ttfamily +\cs{CurveBetween}\meta{node1} And\meta{node2} WithDirs \meta{dir1} + And\meta{dir2} +\end{flushleft} + +\item A similar variant command is defined with the following syntax: +\begin{flushleft}\ttfamily + \cs{CbezierBetween}\meta{node1} And\meta{node2} WithDirs\meta{dir1} + And\meta{dir2}\\ +\qquad UsingDists\meta{dist1} And\meta{dist2} +\end{flushleft} + Usage examples are shown in section~\ref{sec:examples} +\end{enumerate} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{ Euclidean geometry commands} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + With the already large power of \pack{curve2e} there was a push towards + specialised applications; the first of which was, evidently, geometry; + that kind of geometry that was used in the ancient times when + mathematicians did not have available the sophisticated means they + have today; they did not even have a positional numerical notation, that + arrived in the “west†of the world we are familiar with, just by + the XI-XII century; before replacing the roman numbering system another + couple of centuries passed by; real numbers with the notation we use + today with a decimal separator, had to wait till the XVI century (at + least); many things that naw are taught in elementary school were + still a sort of magic until the end of XVIII century. + + Even a simple algebraic second degree equation was a problem. + In facts the Renaissance was the artistic period when the classical + proportions were brought back to the artists who could not solve the + simple equation where a segment of unit length is divided in two + unequal parts $x$ and $1-x$ such that the following proportion exists + among the various parts and the whole segment: +\[ +\frac{x}{1} = \frac{1-x}{x} \Longrightarrow x = \frac{1}{x} - 1 +\] + today we cam solve the problem by manipulating that simple proportion + to get +\[ + x^2 + x -1 = 0 +\] + and we know that the equation has two solution of opposite signs, and that + their magnitudes are the reciprocal of one another. Since we are + interested in their magnitudes, we adapt the solutions in the form +\begin{equation} + x_{1,2} = \frac{\sqrt{5} \pm 1}{2}= \sqrt{1+0.5^2}\pm 0.5 \Longrightarrow +\begin{cases}x_1=1.618\ldots\\x_2=0.618\ldots \end{cases}\label{equ:aureo} +\end{equation} + The larger number is called the \emph{golden number} and the smaller + one the \emph{golden section}. + + Luca Pacioli, by the turn of centuries XV–XVI, was the tutor of + Guidubaldo, the heir of Federico di Montefeltro, Duke of + Urbino\footnote{If you never visited this Renaissance city and its Ducal + Palace, consider visiting it; it is one of the many UNESCO Heritage + places.}; he wrote the famous book \emph{De Diuina Proportione} that + contained also the theory of the golden section accompanied by beautiful + drawings of many Platonic solids and other non convex ones, drawn by + Leonardo da Vinci. Everything was executed with perfect etchings, even the + construction of the golden section; in its basic form\footnote{The third + formula in equation~\eqref{equ:aureo} is written in such a way as to + explain the graphical construction in figure~\ref{fig:aureo}.} it is + replicated in figure~\ref{fig:aureo}. +\begin{figure} +\begin{Esempio}[\setfontsize{7}](0.40) +\unitlength=0.005\linewidth +\begin{picture}(170,140)(0,-70) +\GraphGrid(0,-70)(170,140) +\VECTOR(0,0)(170,0) +\Pbox(170,0)[t]{x}[0] +\Pbox(100,0)[t]{\mathrm{1}}[2] +\Pbox(0,0)[r]{O}[2] +\Arc(100,0)(50,0){-90} +\segment(100,0)(100,70) +\segment(0,0)(100,50) +\Pbox(50,0)[tr]{\mathrm{0.5}}[2] +\ModAndAngleOfVect100,50 to\M and\A +\Arc(0,0)(\M,0){\A}\Pbox(\M,0)[bl]{C}[2] +\Arc(\M,0)(\M,-50){90} +\Arc(\M,0)(\M,-50){-90} +\Pbox(\fpeval{\M-50},0)[b]{\mathit{x_2}}[3] +\Pbox(\fpeval{\M+50},0)[b]{\mathit{x_1}}[3] +\put(\M,0){\Vector(-70:50)} +\Pbox(120,-25)[bl]{\mathit{r}=\mathrm{0.5}}[0] +\thicklines +\segment(0,0)(100,0) +\end{picture} +\end{Esempio} +\caption{The golden section $x_2$ and the golden number $x_1$}\label{fig:aureo} +\end{figure} + By the way figure~\ref{fig:aureo} shows also the code that is used + for the drawing done completely with the facilities available just with \pack{curv2e}. It is also a usage example of several commands. + + Illiteracy was very widespread; books were expensive and were + common just in the wealthy people mansions. + + Mathematicians in the classical times B.C. up to the artists in the + Renaissance, had no other means but to use geometrical constructions with + ruler and compass. Even today in schools where calculus is not yet + taught as a normal subject, possibly not in certainly high school degree + courses, but certainly not in elementary and junior high schools, the + instructors have to recourse to geometrical constructions. Sometimes, as + in Italy, access to public universities is open with no restrictions to + all students with a high school diploma for degree courses that are + more vocational than cultural. Therefore such students in some university + degree courses have to frequent upgrading courses in order to master some + more mathematics compared to what they studied during their basic + education. + + The instructors nowadays very often prepare some booklets with their + lessons; such documents, especially in electronic form, are a nice help + for many students. And \LaTeX is used to write such documents. + Therefore this extension module is mostly dedicated to such instructors. + + The contents of this module is not exhaustive; it just shows a way to + use the \pack{curve2e} facilities to extend it to be suited for the + kind of geometry they teach. + + Here we describe the new commands provided by this package; then in + section~\ref{sec:examples} we show their usage by means examples. + +\begin{enumerate}[noitemsep] +\item Command \cs{IntersectionOfLines} is a fundamental one; its syntax is + the following: +\begin{ttsintassi} +\cs{IntersecionOfLines}\parg{point1}\parg{dir1} and\parg{point2}\parg{dir2} to\meta{vector} +\end{ttsintassi} + were each line is identified with its \meta{point} and its direction + \meta{dir}; the intersection coordinates go to the output \meta{vector}. + +\item A second command\cs{IntersectionOfSegments} does almost the same + work, but the coordinates of a segment define also its direction, + which is the argument of the difference of the terminal nodes of each + segment; the syntax therefore is the following: +\begin{ttsintassi} +\cs{IntersectionOfSegments}\parg{point11}\parg{point12} + and\parg{point21}\parg{point22}to\meta{vector} +\end{ttsintassi} + Again the intersection point coordinates go to the output \meta{vector}. + The first segment is between points 11 and 12, and, similarly, the second + segment is between points 21 and 22. + +\item Command \cs{ThreePointCircle} draws a circle that goes through three + given points; the syntax is the following: +\begin{ttsintassi} + \cs{ThreePointCircle}\meta{$\star$}\parg{point1}\parg{point2}\parg{point3} +\end{ttsintassi} + A sub product of this macro is formed by the vector \cs{C} that contains + the coordinates of the center of the circle, that might be useful even + if the circle is not drawn; the optional asterisk, if present, does not + draw the circle, but the center is available. + +\item Alternatively +\begin{ttsintassi} + \cs{ThreePointCircleCenter}\parg{point1}\parg{point2}\parg{point3}to\meta{vector} +\end{ttsintassi} + computes the three point circle center assigning its coordinates to + \meta{vector}. + +\item Command \cs{CircleWithCenter} draws a circle given its center and it + radius; in facts the syntax is the following: +\begin{ttsintassi} +\cs{CircleWithCenter}\meta{center} Radius\meta{Radius} +\end{ttsintassi} + This macro does not require the \cs{put} command to put the circle + in place. + +\item A similar macro \cs{Circlewithcenter} does almost the same; its + syntax is the following: +\begin{ttsintassi} +\cs{Circlewithcenter}\meta{center} radius\meta{radius} +\end{ttsintassi} + Apparently these two commands do the same, but, no, they behave + differently: in the former command the \meta{Radius} is a vector the + modulus of which si computed and used as the radius; in the latter + command the \meta{radius} is a scalar and (its magnitude) is directly + used. + +\item Command with syntax: +\begin{ttsintassi} +\cs{AxisOf}\meta{point1} and\meta{point2} to \meta{point3} and\meta{point4} +\end{ttsintassi} + is used to determine the axis of a segment; the given + segment is specified with its end points \meta{point1} and \meta{point2} + and the axis is determined by point \meta{point3} and \meta{point4}; + actually \meta{point3} is the middle point of the given segment. + +\item These two commands with syntax: +\begin{ttsintassi} +\cs{SegmentCenter}\parg{point1}\parg{point2}to\meta{center} +\cs{MiddlePointOf}\parg{point1}\parg{point2}to\meta{center} +\end{ttsintassi} + determine just the middle point between two given points. They are + totally equivalent, aliases to one another; sometimes it is more + convenient to use a name, sometimes the other; it helps reading the + code and maintaining it. + +\item Given a triangle and a specific vertex, it is possible to determine + the middle point of the opposite side; it is not very difficult, but it + is very handy to have all the necessary elements to draw the median line. + The simple syntax is the following: +\begin{ttsintassi} +\cs{TriangleMedianBase}\meta{vertex} on\meta{base1} and\meta{base2} +\qquad to\meta{base middle point} +\end{ttsintassi} + +\item A similar command \cs{TriangleHeightBase} is used to determine the + intersection of the height segment from one vertex to the opposite base; + with triangles that have an obtuse angle, the height base might lay + externally to one of the bases adjacent to such an angle. The syntax is + the following +\begin{ttsintassi} +\cs{TriangleHeigthtBase}\meta{vertex} on\meta{base1} and\meta{base2} to\meta{height base} +\end{ttsintassi} + +\item Similarly there is the \cs{TriangleBisectorBase} macro with + a similar syntax: +\begin{ttsintassi} +\cs{TriangleBisectorBase}\meta{vertex} on\meta{base1} and\meta{base2} +\qquad to\meta{bisector base} +\end{ttsintassi} + +\item A triangle \emph{barycenter} is the point where its median lines + intersect; command \cs{TriangleBarycenter} determines its coordinates + with the following syntax. +\begin{ttsintassi} +\cs{TriangleBarycenter}\parg{vertex1}\parg{vertex2}\parg{vertex3} to\meta{barycenter} +\end{ttsintassi} + +\item A triangle \emph{orthocenter} is the point where its height lines + intersect; command \cs{TriangleOrthocenter} determines its coordinates + with the following syntax: +\begin{ttsintassi} +\cs{TriangleOrthocenter}\parg{vertex1}\parg{vertex2}\parg{vertex3} to\meta{orthocenter} +\end{ttsintassi} + +\item A triangle \emph{incenter} is the point where its bisector lines + intersect; command \cs{TriangleIncenter} determines its coordinates + with the following syntax: +\begin{ttsintassi} +\cs{TriangleIncenter}\parg{vertex1}\parg{vertex2}\parg{vertex3} to\meta{incenter} +\end{ttsintassi} + +\item The distance of a specified point from a given segment or line is + computed with the following command +\begin{ttsintassi} +\cs{DistanceOfPoint}\meta{point} from\parg{point1}\parg{point2} to\meta{distance} +\end{ttsintassi} + where \meta{point} specifies the point and \meta{point1} and \meta{point2} + identify two points on a segment or a line; \meta{distance} is a scalar + value. + +\item In a construction that will be examined in section~\ref{sec:examples} + we need to determine an ellipse axis if the other axis and the focal + distance are know; actually it solves the relation +\begin{equation}a^2= b^2 +c^2\label{equ:axes-foci}\end{equation} + that connects such three quantities; $a$ is always the largest of the + three quantities; therefore the macro tests if the first entry is larger + than the second one: if is is, it computes a Pitagorean difference, + otherwise the user should pay attention to use as the first entry the + smaller among $b$ and $c$, so as to compute a Pitagorean sum. The command + is the following: +\begin{ttsintassi} +\cs{AxisFromAxisAndFocus}\meta{axis or focus} and\meta{focus or axis} +\qquad to\meta{other axis or focus} +\end{ttsintassi} + The word “axis†stands for “semi axis lengthâ€; the word “focus" stands + for “focal semi distanceâ€; actually the macro works equally well with + full lengths, instead of half lengths; its is important not to mix + full and half lengths. Such lengths are expressed as factors of + \cs{unitlength}, not as absolute values. This command is described + again when dealing with the specific problem referred to at the + beginning of this list item; the description is going to be more + detailed and another macro is added to avoid possible errors. + +\item Given a segment, i.e. the coordinates of its end points, it is + useful to have a macro that computes its length; at the same time it is + useful to to compute its direction; this operation is not the same as to + compute modulus and argument of a vector, but consists in computing such + quantities from the difference of the vectors pointing to the segment + end points. These two macros are the following: +\begin{ttsintassi} +\cs{SegmentLength}\parg{point1}\parg{point2} to\meta{length} +\cs{SegmentArg}\parg{point1}\parg{point2} to\meta{argument} +\end{ttsintassi} + The \meta{argument} is computed in the interval $-180^\circ < \phi \leq + +180^\circ$; it represents the argument of the vector that goes from + \meta{point1} to \meta{point2}, therefore the user must pay attention to + the order s/he enters the end points coordinates. + +\item The next command \cs{SymmetricalPointOf} is used to find the + reflection of a specified point with respect to a fixed point; of course + the latter is the middle point of the couple, but the unknown to be + determined is not the center of a segment, but one of its end points. + The syntax is the following: +\begin{ttsintassi} +\cs{SymmetricalPointOf}\meta{point1} respect\meta{fixed} to\meta{point2} +\end{ttsintassi} + +\item Command \cs{RegPolygon} draws a regular polygon inscribed within + a circle of given radius and center, with a specified number of sides; + optional arguments allow to specify color and thickness of the sides, + or the polygon interior color; this macro operates differently from the + one for drawing ellipses, that draws simultaneously an ellipse with + the border of a color and the interior of another one; with this macro the + user who wants to achieve this effect must superimpose to polygons with + different settings; but it would not be too difficult to arrange a new + macro or to modify this one in order to get “bicolor†polygons. + It is not necessary for the purpose of this package, therefore we + let the user express his/her phantasy with other macros. The actual + syntax is the following: +\begin{ttsintassi} +\cs{RegPolygon}\meta{$\star$}\parg{center}\marg{radius}\marg{sides}\oarg{angle}\aarg{settings} +\end{ttsintassi} + The initial optional asterisk specifies if the interior has to be + coloured; if yes, the \meta{settings} refer to the color of the + interior; if not, the \meta{settings} refer to the thickness and + color of the sides; no \meta{settings} imply sides drawn with the + default line thickness, generally the one corresponding to \cs{thinlines}, + and the default color (generally black) for the sides or the interior. + By default the first vertex is set to an angle of $0^\circ$ with + respect to the \meta{center}; the optional \meta{angle} modifies + this value to what is necessary for a particular polygon. The + \meta{center} itself is optional, in the sense that if it is not + specified the center lays in the origin of the \env{picture} axes; if this + argument is specified, the polygon center is displaced accordingly. + The number of sides in theory may be very high, but it is not wise + to exceed a couple of dozen sides; if the number of sides is too + high, the polygon becomes undistinguishable from a circumference. + +\item Several macros are dedicated to ellipses; their names are spelled + in Italian, “ellisseâ€, because the name “ellipse†is already taken by + other packages; with Italian user command names there should be no + interference with other packages, or the risk is reduced to + a minimum. The various macros are \cs{ellisse}, \cs{Sellisse}, + \cs{Xellisse}, \cs{XSellisse}, \cs{EllisseConFuoco} \cs{EllisseSteiner}; + the last two control sequence names are aliased with the corresponding + English ones \cs{EllipseWithFocus} and \cs{SteinerEllipse}. For the + other four ones it is wise to avoid English names for the reasons + explained above. After all the Italian and the English names are very + similar and are pronounced almost identically. + + {\tolerance=3000 Actually \cs{ellisse} is practically a shorthand for + \cs{Sellisse} because + some optional arguments are already fixed, but the meaning of + \cs{fillstroke} depends on the presence or absence of an initial + asterisk; similarly \cs{Xellisse} is a sort of a shorthand for + \cs{XSellisse}; in facts those commands, that contain + an ‘S’ in their names, can optionally perform also the affine + \emph{shear} transformation, while those without the ‘S’ do not execute + such transformation. Figure~\ref{fig:shear} displays a normal ellipse + with its bounding rectangle, and the same ellipse to which the shear + affine transformation is applied; the labeled points represent the + third order Bézier spline nodes and control points.\par} +\begin{figure}[!htb] +\dimendef\Wmp=2000 \Wmp=\dimexpr(\textwidth-\columnsep)/2\relax +\begin{minipage}{\Wmp}\centering +\unitlength=0.007\linewidth +\begin{picture}(100,70)(-50,-35) +\XSellisse(0,0){50}{25}* +\end{picture} +\end{minipage} +\hfill +\begin{minipage}{\Wmp}\centering +\unitlength=0.007\linewidth +\begin{picture}(100,70)(-50,-35) +\XSellisse(0,0)<20>{50}{25}* +\end{picture} +\end{minipage} +\caption{The effect of shearing an ellipse with its bounding rectangle}\label{fig:shear} +\end{figure} + +\item The syntax of those six commands are the following: +\begin{ttsintassi} +\cs{Sellisse}\meta{$\star$}\marg{semiaxis-h}\marg{semiaxis-v}\oarg{shear} +\cs{ellisse}\meta{$\star$}\marg{semiaxis-h}\marg{semiaxis-v} +\cs{XSellisse}\meta{$\star$}\parg{center}\oarg{angle}\aarg{shear}\marg{semiaxis-h}\% +\qquad \marg{semiaxis-v}\meta{$\star$}\oarg{settings1}\oarg{settings2} +\cs{Xellisse}\meta{$\star$}\parg{center}\oarg{angle}\marg{semiaxis-h}\% +\qquad\marg{semiaxis-v}\oarg{settings1}\marg{settings2} +\cs{EllipseWithFocus}\meta{$\star$}\parg{vertex1}\parg{vertex2}\parg{vertex3}\parg{focus} +\cs{SteinerEllipse}\meta{$\star$}\parg{vertex1}\parg{vertex2}\parg{vertex3}\oarg{diameter} +\end{ttsintassi} + All require the semi axis lengths; the \meta{semiaxis-h} and + \meta{semiaxis-v} refer to the semi axes before possible rotation by + \meta{angle} degrees, and do not make assumptions on which axis is the + larger one. The optional parameter \meta{shear} is the angle in degrees + by which the vertical coordinate lines are rotated by effect of shearing. + If \meta{shear}, that by default equals zero, is not set + to another value, the asterisks of command \cs{Sellisse} and + \cs{XSellisse} do not have any effect. Otherwise the asterisk of + \cs{Sellisse} forces to draw the ellipse bounding box (rectangle before + shearing, parallelogram after shearing) as shown together with some + marked special points (the vertices, spline nodes and control points + of the quarter circles or quarter ellipses) in figure~\ref{fig:shear}. + For \cs{ellipse} the asterisk implies filling, instead of stroking the + ellipse contour. + The \meta{setting}~1 and~2 refer to the color filling and/or border + color, and contour thickness, as already explained. For the + \cs{EllipseWithFocus}, the \meta{focus} contains the coordinates + of one of the two ellipse foci; such coordinates should point to + some position \emph{inside} the triangle. The \cs{SteinerEllipse} + requires less data, in the sense that such ellipse is unique; it + is the ellipse internally tangent to the triangle at its side middle + points. + +\end{enumerate} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Examples}\label{sec:examples} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + Here we can show some examples of the advanced \pack{curve2e} commands + and of what can be done with this \pack{euclideangeometry} extension. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Straight and curved vectors} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + Figure~\ref{fig:vectors} shows some vectors and vector arcs with the + code used to draw them; as usual some points are described with cartesian + coordinates and some with polar ones. + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{8.5}](0.45) +\unitlength=0.01\linewidth +\begin{picture}(100,60) +\GraphGrid(100,60) +\put(0,30){\vector(1,2){10}} +\put(20,30){\Vector(10,20)} +\VECTOR(40,30)(50,50) +\VVECTOR(60,30)(70,60) +\Arc(100,60)(80,60){90} +\VectorArc(0,0)(20,0){90} +\VectorARC(100,0)(80,0){-90} +\polyvector(30,0)(35,10)(55,20)(60,0) +\end{picture} +\end{Esempio} +\caption{Some vectors and vector arcs}\label{fig:vectors} +\end{figure} + + +\begin{figure*}[!tb] +\begin{Esempio}*[\setfontsize{10}]\centering +\unitlength=0.006\linewidth\begin{picture}(120,90) +% +\RegPolygon(9,20){20}{6}<\linethickness{3pt}\color{red}> +\RegPolygon(55,20){20}{7}[90] +\RegPolygon(100,20){20}{8}[22.5]<\linethickness{0.5ex}\color{blue}> +% +\put(0,50){% + \RegPolygon(9,20){20}{3}\RegPolygon(9,20){20}{3}[30] + \RegPolygon(9,20){20}{3}[60]\RegPolygon(9,20){20}{3}[90] +% + \RegPolygon*(55,20){20}{4}<\color{green}> + \RegPolygon(55,20){20}{4}<\linethickness{1ex}> +% + \RegPolygon*(100,20){20}{4}[45]<\color{orange}> + \RegPolygon(100,20){20}{4}[45]<\linethickness{1ex}\color{blue}> +} +\end{picture} +\end{Esempio} +\caption{A variety of polygons and their codes}\label{fig:variety-of-polygons} +\end{figure*} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Polygons} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + Figures~\ref{fig:pentagon} and~\ref{fig:filled-pentagon} display + a normal and a color filled pentagon with their codes. + Figure~\ref{fig:variety-of-polygons} shows a variety of polygons + with their codes. + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{10}](0.8) +\unitlength=0.5mm +\begin{picture}(40,32)(-20,-17) +\polyline(90:20)(162:20)(234:20)(306:20)(378:20)(90:20) +\end{picture} +\end{Esempio} +\caption{A normal polygon drawn with \cs{polyline}} +\label{fig:pentagon} +\end{figure} + + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{10}](0.8) +\unitlength=.5mm +\begin{picture}(40,32)(-20,-20) +\color{magenta} +\polygon*(90:20)(162:20)(234:20)(306:20)(378:20) +\end{picture} +\end{Esempio} +\caption{A filled polygon drawn with \cs{polygon}} +\label{fig:filled-pentagon} +\end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \subsection{Dashed and dotted lines} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + For dotted lines there is a possibility of specifying the dot size; + it can be specified with an explicit unit of measure, or, if no unit is + specified, it is assumed to be “pointsâ€. The \cs{Dotline} takes care + of transforming the implied or the explicit dimension in multiples of + \cs{unitlength}. Figure~\ref{fig:DashDot} shows some examples with their + codes. + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{10}](0.65) +\unitlength=1mm +\begin{picture}(40,40) +\GraphGrid(40,40) +\Dashline(0,0)(40,10){4} +\put(0,0){\circle*{2}} +\Dashline(40,10)(0,25){4} +\put(40,10){\circle*{2}} +\Dashline(0,25)(20,40){4} +\put(0,25){\circle*{2}} +\put(20,40){\circle*{2}} +\Dotline(0,0)(40,40){2}[0.75mm] +\put(40,40){\circle*{2}} +\end{picture} +\end{Esempio} +\caption{Dashed and dotted lines}\label{fig:DashDot} +\end{figure} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Generic curves} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + With the \cs{Curve} macro it is possible to make line art or filled shapes. Figures~\ref{fig:hearts} show the same shape, the first just stroked and the second color filled. + +\begin{figure}[!htp] +\begin{Esempio}[\setfontsize{9}](0.65) +\unitlength=8mm\relax +\begin{picture}(5,5) +\put(0,0){\framebox(5,5){}}\thicklines\roundcap +\Curve(2.5,0)<0.1,1>(5,3.5)<0,1>% + (4,5)<-1,0>(2.5,3.5)<-0.1,-1.2>[-0.1,1.2]% + (1,5)<-1,0>(0,3.5)<0,-1>(2.5,0)<0.1,-1> +\end{picture} +\end{Esempio} + +\vspace*{2\baselineskip} + +\begin{Esempio}[\setfontsize{9}](0.65) +\unitlength=8mm\relax +\begin{picture}(5,5) +\put(0,0){\framebox(5,5){}}\thicklines\roundcap +\color{orange}\relax +\Curve*(2.5,0)<0.1,1>(5,3.5)<0,1>% +(4,5)<-1,0>(2.5,3.5)<-0.1,-1.2>[-0.1,1.2]% +(1,5)<-1,0>(0,3.5)<0,-1>(2.5,0)<0.1,-1> +\end{picture} +\end{Esempio} +\caption{A stroked and a filled heart shaped contour} +\label{fig:hearts} +\end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{The \cs{multiput} command} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + The new \cs{multiput} and \cs{xmultiput} commands are extensions of the + original \cs{multiput} macro; both are used to put a number of objects + according to a discrete law; but they can produce surprising effects. + Figure~\ref{fig:multiput} displays several examples. As it possible + to see, the black dots are evenly distributed along the canvas diagonal; + the green filled squares are along a sloping down line inclined by + $15^\circ$ as specified by the polar coordinates of the \meta{increment}; + the blue filled triangles are distributed along a parabola; the red + stroked diamonds are distributed along a half sine wave. + +\noindent\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{8}](0.55) +\unitlength=0.01\linewidth +\begin{picture}(100,100) +\GraphGrid(100,100) +\multiput(0,0)(10,10){11}{\circle*{2}} +\color{blue!70!white} +\multiput(0,0)(10,0){11}{% +\RegPolygon*{2}{3}<\color{blue!70!white}>}% + [\GetCoord(\R)\X\Y + \edef\X{\fpeval{\X+10}} + \edef\Y{\fpeval{(\X/10)**2}} + \CopyVect\X,\Y to\R] +\multiput(0,0)(10,1){11}{% +\RegPolygon{2}{4}<\color{magenta}>}% + [\GetCoord(\R)\X\Y + \edef\X{\fpeval{\X+10}} + \edef\Y{\fpeval{sind(\X*1.8)*100}} + \CopyVect\X,\Y to\R] +\multiput(50,50)(-15:5){11}{% +\RegPolygon*{2}{4}[45]<\color{green!60!black}>} +\end{picture} +\end{Esempio} +\caption{Some examples of the \meta{handler} optional argument} +\label{fig:multiput} +\end{figure} + + Another interesting construction is a clock quadrant; this is shown + in figure~\ref{fig:orologio} + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{9.5}](0.525) +\unitlength=0.0095\linewidth +\begin{picture}(100,100) +\GraphGrid(100,100) +\put(50,50){\thicklines\circle{100}} +\xmultiput[50,50](60:35)(-30:1){12}% + {\makebox(0,0){\circle*{2}}}% + [\MultVect\R by\D to\R]% +\xmultiput[50,50](60:40)(-30:1){12}% + {\ArgOfVect\R to\Ang + \rotatebox{\fpeval{\Ang-90}}% + {\makebox(0,0)[b]{% + \Roman{multicnt}}}}% + [\Multvect{\R}{\D}\R] +\thicklines\put(50,50){\circle*{4}} +\put(50,50){\Vector(37.5:30)} +\put(50,50){\Vector(180:33)} +\end{picture} +\end{Esempio} +\caption{Usage example of the \texttt{\string\xmultiput} command} +\label{fig:orologio} +\end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \subsection{Drawing mathematical functions} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + Figure~\ref{fig:iperbole} shows an equilateral hyperbola; since it + has asymptotes, the drawing must be carefully done avoiding overflows, + parts of drawing out of the \env{picture} area. Nevertheless + the possibility of describing mathematical functions in terms of L3 + functions (in spite of the same name, they are completely different + things) makes it possible to exploit the \meta{settings} argument to + do the job with \cs{xmultiput}. + +\begin{figure*}[!tp] +\begin{Esempio}[\setfontsize{9}](0.5)% +\unitlength=0.008\linewidth +\begin{picture}(100,100) +\GraphGrid(100,100) +\VECTOR(0,0)(100,0)\Pbox(100,0)[tr]{x}[0] +\VECTOR(0,0)(0,100)\Pbox(0,100)[tr]{y}[0] +\Pbox(0,0)[r]{O}[3pt] +\thicklines +\moveto(10,100)\countdef\I=2560 \I=11 +\xmultiput(0,0)(1,0){101}% + {\lineto(\I,\fpeval{1000/\I})}% + [\advance\I by1 \value{multicnt}=\I] +\strokepath +\end{picture} +\end{Esempio} +\caption{An equilateral hyperbola drawn with a thinly sampled piecewise + continuous line}\label{fig:iperbole} +\end{figure*} + + A more complicated drawing can be done by expressing the function to draw + with parametric equations; the idea is to code the math formulas +\[\begin{cases} +x(t) = f_1(t)\\ +y(t) = f_2(t) +\end{cases}\] +because it is easy to code the $x$ and the $y$ component and use the + \cs{fpdowhile} command to trace the curve with a piecewise continuous + line; actually a continuous line with a piecewise continuous derivative; + it is important to sample the curve in a sufficient dense way. + A heart shaped mathematical function taken from the internet + \footnote{\url{http://mathworld.wolfram.com/HeartCurve.html} reports + several formulas, including the cardioid, but the one we use here is + a different function} is the following +\begin{align*} +x(t) &= \sin^3(t)\\ +y(t) &= \dfrac{13\cos(t)-5\cos(2t)-2\cos(3t)-\cos(4t)}{16} +\end{align*} + Figure~\ref{fig:math-heart} displays the graph, and its code, and, most + important, the L3 definition of the parametric equations. Compared to + the previous equations we applied a scale factor and added the final + term \texttt(2.4) in order to shift a little bit the drawing so as to + vertically center it . + +\begin{figure*}[!tbp] +\begin{minipage}{\textwidth} +\def\codefraction{0.5} +\dimendef\Wuno=2000 \Wuno=\codefraction\textwidth +\dimendef\Wdue=2002 \Wdue=\dimexpr\textwidth-\columnsep-\Wuno\relax +\begin{minipage}{\Wuno}\setfontsize{6.9}% +\begin{verbatim} +% Parametric equations of the "heart" +\providecommand\heart[3]{% +\edef\X{\fpeval{#1*16*(sind(#2)^3)}} +\edef\Y{\fpeval{#1*(13*cosd(#2) - 5*cosd(2*#2) + - 2*cosd(3*#2) -cosd(4*#2)+2.4)}} +\CopyVect\X,\Y to#3} +% +% Drawing +\unitlength=0,005\linewidth +\begin{picture}(200,200)(-100,-100) +\GraphGrid(-100,-100)(200,200) +\VECTOR(-100,0)(100,0)\Pbox(100,0)[tr]{x}[0] +\VECTOR(0,-100)(0,100)\Pbox(0,100)[tl]{y}[0] +\Pbox(0,0)[tr]{O}\linethickness{1pt}\bgroup +\edef\scala{\fpeval{100/16}} +\countdef\I=2560 \I=0\roundjoin +\fpdowhile{\I !>360}{\heart\scala\I\Punto +\ifnum\I=0 \moveto(\Punto)\else \lineto(\Punto)\fi +\advance\I by 3}\strokepath\egroup +\end{picture}\end{verbatim} +\end{minipage} +\hfill +\begin{minipage}{\Wdue}\raggedleft +\setfontsize{8}% +% +\providecommand\heart[3]{% +\edef\X{\fpeval{#1*16*(sind(#2)^3)}} +\edef\Y{\fpeval{#1*(13*cosd(#2) - 5*cosd(2*#2) + - 2*cosd(3*#2) -cosd(4*#2)+2.4)}} +\CopyVect\X,\Y to#3} +% +\unitlength=0,005\linewidth +\begin{picture}(200,200)(-100,-100) +\GraphGrid(-100,-100)(200,200) +\VECTOR(-100,0)(100,0)\Pbox(100,0)[tr]{x}[0] +\VECTOR(0,-100)(0,100)\Pbox(0,100)[tl]{y}[0] +\Pbox(0,0)[tr]{O}\linethickness{1pt}\bgroup +\edef\scala{\fpeval{100/16}} +\countdef\I=2560 \I=0\roundjoin +\fpdowhile{\I !>360}{\heart\scala\I\Punto +\ifnum\I=0 \moveto(\Punto)\else \lineto(\Punto)\fi +\advance\I by 3}\strokepath\egroup +\end{picture} +\end{minipage} +\end{minipage} +\caption{A heart shaped mathematical function drawn with a thinly sampled + piecewise continuous line}\label{fig:math-heart} +\end{figure*} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Triangles and their special lines} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + Triangles have special lines; they are the median, the height, and the + bisector lines. They join each vertex with a specific point of the + apposite side, respectively with the middle point, the intersection + with the side perpendicular line, and the intersection with the bisector + line. Figure~\ref{fig:MHBlines} displays the construction of the three + special lines relative to a specific vertex. Thanks to the macros + described earlier in this list, this drawing is particularly simple; most + of the code is dedicated to labelling the various points and to + assign coordinate values to the macros that are going to use them + in a symbolic way. The generic triangle (not a regular polygon) requires + one line, and the determination of the intersections of the lines with + the suitable triangle side, and their tracing requires two code lines + each. + +\begin{figure}[!tb]\centering +\begin{Esempio}[\setfontsize{6.9}](0.4) +\unitlength=0.008\linewidth +\begin{picture}(100,100)(0,-10) +\GraphGrid(0,-10)(100,100) +\def\Puno{0,0} \def\Pdue{0,80} \def\Ptre{100,60} + {\thicklines\polygon(\Puno)(\Pdue)(\Ptre)}% + \Pbox(\Puno)[tc]{P_1}[1] +\Pbox(\Pdue)[bc]{P_2}[1]\Pbox(\Ptre)[bc]{P_3}[1] + % Median + \TriangleMedianBase\Puno on \Pdue and \Ptre to\M + \Pbox(\M)[bc]{M}[1.5]\segment(\Puno)(\M) +% Height + \TriangleHeightBase\Puno on \Pdue and\Ptre to\H + \Dotline(\Puno)(\H){2}[1.5]\Pbox(\H)[bc]{H}[1.5] +% Bisector + \TriangleBisectorBase\Puno on\Pdue and\Ptre to\B + \Dashline(\Puno)(\B){3}\Pbox(\B)[b]{B}[1.5] +\end{picture} +\end{Esempio} +\caption{A triangle with the median, the height, and the bisector lines + from a specific vertex}\label{fig:MHBlines} +\end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \subsection{Special triangle centers} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + Each triplet of a triangle special lines of the same kind intersect each + other in a special point; the median lines intersect in the + \emph{barycenter}, the height lines in the \emph{orthocenter}, the + bisectors lines in the \emph{incenter}; these centers may be those of + special circles: Figures~\ref{fig:barycenter} to~\ref{fig:circumcenter}; + the \emph{incircle}, centered in the incenter, + has a special name, because it has the property of being tangent to all + the three triangle sides; there is also the circumcircle that passes + through the three vertices, its center is the intersection of the + three side axes. There is also the \emph{nine point circle}. + Figures~\ref{fig:barycenter}, \ref{fig:orthocenter}, \ref{fig:incenter}, + and~\ref{fig:circumcenter} display the necessary constructions and, + possibly, also the special circles they are centers of. + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{6.5}](0.45) +\unitlength=0.008\linewidth +\begin{picture}(100,100)(0,-10) +\GraphGrid(0,-10)(100,100) +\def\Puno{0,0}\def\Pdue{0,80}\def\Ptre{100,60} +{\linethickness{0.6pt}\polygon(\Puno)(\Pdue)(\Ptre)}% +\Pbox(\Puno)[tl]{P_1}[1.5]% +\Pbox(\Pdue)[bl]{P_2}[1.5]\Pbox(\Ptre)[bc]{P_3}[1.5] + \TriangleMedianBase\Puno on\Pdue and \Ptre to\Mu + \TriangleMedianBase\Pdue on\Ptre and \Puno to\Md + \TriangleMedianBase\Ptre on\Puno and \Pdue to\Mt +\Dotline(\Puno)(\Mu){3}[1.5] +\Dotline(\Pdue)(\Md){3}[1.5] +\Dotline(\Ptre)(\Mt){3}[1.5] +\IntersectionOfSegments(\Puno)(\Mu)and(\Pdue)(\Md)to\C +\Pbox(\C)[t]{B}[2] +\end{picture} +\end{Esempio} +\caption{Determination of the barycenter}\label{fig:barycenter} +\end{figure} + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{6.5}](0.45) +\unitlength=0.008\linewidth +\begin{picture}(100,100)(0,-10) +\GraphGrid(0,-10)(100,100) +\def\Puno{0,0}\def\Pdue{0,80}\def\Ptre{100,60} +{\linethickness{0.6pt}\polygon(\Puno)(\Pdue)(\Ptre)}% +\Pbox(\Puno)[tl]{P_1}[1.5]% +\Pbox(\Pdue)[bl]{P_2}[1.5]\Pbox(\Ptre)[bc]{P_3}[1.5] + \TriangleHeightBase\Puno on\Pdue and \Ptre to\Hu + \TriangleHeightBase\Pdue on\Ptre and \Puno to\Hd + \TriangleHeightBase\Ptre on\Puno and \Pdue to\Ht +\Dotline(\Puno)(\Hu){3}[1.5] +\Dotline(\Pdue)(\Hd){3}[1.5] +\Dotline(\Ptre)(\Ht){3}[1.5] +\IntersectionOfSegments(\Puno)(\Hu)and(\Pdue)(\Hd)to\C +\Pbox(\C)[t]{H}[2] +\end{picture} +\end{Esempio} +\caption{Determination of the orthocenter}\label{fig:orthocenter} +\end{figure} + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{6}](0.45) +\unitlength=0.008\linewidth +\begin{picture}(100,100)(0,-10) +\GraphGrid(0,-10)(100,100) +\def\Puno{0,0}\def\Pdue{0,80}\def\Ptre{100,60} +{\linethickness{0.6pt}% + \polygon(\Puno)(\Pdue)(\Ptre)}% +\Pbox(\Puno)[tl]{P_1}[1.5]% +\Pbox(\Pdue)[bl]{P_2}[1.5] +\Pbox(\Ptre)[bc]{P_3}[1.5] + \TriangleBisectorBase\Puno on\Pdue and \Ptre to\Iu + \TriangleBisectorBase\Pdue on\Ptre and \Puno to\Id + \TriangleBisectorBase\Ptre on\Puno and \Pdue to\It +\Dotline(\Puno)(\Iu){3}[1.5] +\Dotline(\Pdue)(\Id){3}[1.5] +\Dotline(\Ptre)(\It){3}[1.5] +\IntersectionOfSegments(\Puno)(\Iu)% + and(\Pdue)(\Id)to\C +\Pbox(\C)[t]{I}[2] +\DistanceOfPoint\C from(\Puno)(\Pdue)to\R +\Circlewithcenter\C radius\R +\end{picture} +\end{Esempio} +\caption{Determination of the incenter and of the incircle}\label{fig:incenter} +\end{figure} + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{6.25}](0.45) +\unitlength=0.01\linewidth +\begin{picture}(100,110) +\GraphGrid(100,110) +\CopyVect20,10to\Pu \Pbox(\Pu)[t]{P_1} +\CopyVect10,90to\Pd \Pbox(\Pd)[br]{P_2} +\CopyVect100,70to\Pt \Pbox(\Pt)[l]{P_3} +{\linethickness{0.6pt}\polygon(\Pu)(\Pd)(\Pt)}% +\AxisOf\Pd and\Pu to\Mu\Du +\AxisOf\Pu and\Pt to\Md\Dd +\AxisOf\Pt and\Pd to\Mt\Dt +\IntersectionOfLines(\Mu)(\Du)and(\Md)(\Dd)to\C +\AddVect\Mu and\Du to\Du\Dotline(\Mu)(\Du){3}[2] +\AddVect\Md and\Dd to\Dd\Dotline(\Md)(\Dd){3}[2] +\AddVect\Mt and\Dt to\Dt\Dotline(\Mt)(\Dt){3}[2] +\Pbox(\C)[t]{C}[2.5] +\ThreePointCircle*(\Pu)(\Pd)(\Pt) +\end{picture}\end{Esempio} +\caption{Determination of the circumcenter and of the circumcircle}\label{fig:circumcenter} +\end{figure} + + Although these examples require some new simple macros, described + in the previous sections; some more more examples can be made that require + more complex macros. Even these macros are just examples. For other + applications it is probably necessary to add more macros. + + Let us proceed with the construction of the Steiner ellipse: given a + triangle, there exists only one ellipse that is internally tangent to + the side middle points. + + The geometrical construction goes on this way; suppose you have to draw + the Steiner ellipse of triangle $T$; finding the side middle points + has already been shown, but the process to build the ellipse is still + to be found. So let us chose a side to work as the base of triangle $T$, + and perform an affine shear transformation parallel to the base + so as to move the vertex of triangle $T$, opposite to the base, to the + base axis, we get another triangle $T_1$ that is isosceles; if it is + not yet so, let us make another compression/expansion affine + transformation, so as to get an equilateral triangle $T_2$; this last + triangle is particularly simple to handle, because its Steiner ellipse + reduces to its incircle. If we apply in reverse order the above + transformations we get the Steiner ellipse we were looking for. + The only difficult part is the affine shear transformation. + + The L3 functions we already created take care of all such + transformations, but with an optional asterisk we can draw the + intermediate passages where triangles $T_2$ and $T_1$ have their base + shifted and rotated to be horizontal, so that some translations and + rotations are also necessary. Figure~\ref{fig:Steiner-finale} displays + the final result and the code necessary to build it. + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{8}](0.5) +\unitlength=0.01\linewidth +\begin{picture}(100,110) +\GraphGrid(100,110)% +\SteinerEllipse(10,10)(90,20)(60,105)[2] +\end{picture}\end{Esempio} +\caption{The Steiner ellipse of a given triangle} +\label{fig:Steiner-finale} +\end{figure} + + With just the addition of an asterisk we can draw the whole geometrical + construction; see figure~\ref{fig:Steiner-intermedio} + +\begin{figure}[!htb] +\begin{Esempio}[\setfontsize{8}](0.5) +\unitlength=0.01\linewidth +\begin{picture}(100,110)(0,-10) +\GraphGrid(0,-10)(100,110)% +\SteinerEllipse*(10,10)(90,20)(60,105)[2] +\end{picture}\end{Esempio} +\caption{The construction of the Steiner ellipse of a given triangle} +\label{fig:Steiner-intermedio} +\end{figure} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{A triangle internally tangent ellipse given one of its foci} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + It is possible to draw an ellipse that is internally tangent to + a triangle if one of its foci is specified; without this specification + the problem is not definite, and the number o such ellipses is countless. + But with the focus specification, just one ellipse exists with that + tangency constraint. It suffices to find the other focus and at least + one point of tangency, because the focal distance and the sum of + distances of that tangency point from the foci, is sufficient to + determine all the parameters required to draw the ellipse. + +\begin{figure}[!tb]\centering +\begin{Esempio}[\setfontsize{7}](0.375) +\unitlength=0.0065\linewidth +\begin{picture}(150,150)(-30,-20) +\GraphGrid(-30,-20)(150,150) +\EllipseWithFocus% + (10,40)(110,10)(0,110)(20,60) +\end{picture}\end{Esempio} +\caption{An ellipse internally tangent to a triangle, given a focus} +\label{fig:ellisse-interna-finale} +\end{figure} + +\begin{figure}[!tb] +\begin{Esempio}[\setfontsize{7}](0.375) +\unitlength0.0065\linewidth +\begin{picture}(150,150)(-30,-20) +\GraphGrid(-30,-20)(150,150) +\EllipseWithFocus*% + (10,40)(110,10)(0,110)(20,60) +\end{picture}\end{Esempio} +\caption{Construction of the ellipse of figure~\ref{fig:ellisse-interna-finale}}\label{fig:ellisse-interna} +\end{figure} + + + The geometrical construction is rather complicated; the steps to follow + are the following: +\begin{itemize}[noitemsep] + +\item draw the triangle and the given focus $\mathsf{F}$; + +\item Find the symmetrical points $\mathsf G_i$ of this focus with + respect to the sides of the triangle; + +\item use these three points $\mathsf G_i$ as the vertices of a triangle + with which to draw its circumcircle, actually only its center is of + interest, because it represents the second focus $\mathsf F'$; the + inter focal distance $2c$; is just le length of vector $F' -F$; + +\item join with segments each symmetrical point $\mathsf G_i$ with the + second focus $\mathsf F'$ and find their intersections $\mathsf T_i$ + with the triangle sides; they represent the tangency points of the + ellipse to be drawn; + +\item use one of these tangency points to find its distances from the + foci; their sum gives the ellipse larger axis length $2a$; + +\item equation~\eqref{equ:axes-foci} allows to find the second axis + length; the segment that joins the foci has the required inclination + of the main axis; therefore all necessary pieces of information to + draw the ellipse are known. + +\end{itemize} + Figures~\ref{fig:ellisse-interna-finale} and~\ref{fig:ellisse-interna} + display the construction steps and the final result. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \section{Conclusion} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + We have shown that the \amb{picture} environment, extended with + this package \pack{euclideangeometry} (that takes care of loading + \pack{curve2e} and \pack{pict2e}) can make important diagrams that + certainly were not foreseen by Leslie Lamport when he first wrote the + code for the initial \env{picture} environment. + + The reader can easily understand that this package is far from being + exhaustive for all geometrical problema]s to be solved with ruler and + compass; it shows a way to add more commands to approach further problems; + if any author, who creates new commands, would like to contribute more + macros to this package, I will be happy to integrate his/her contribution + to a new version of this package; depending on the contribution, I would + be very happy to add its author name to this package author list; for + simpler contributions each contributor will be duly acknowledged. + + Creating new macros to solve more problems is pleasant and more + difficult is the problem, greater is the satisfaction in solving it. + + +\begin{center} + Have fun with \LaTeX and its potential applications! +\end{center} + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/euclideangeometry/euclideangeometry.dtx b/macros/latex/contrib/euclideangeometry/euclideangeometry.dtx new file mode 100644 index 0000000000..6078fe5cfa --- /dev/null +++ b/macros/latex/contrib/euclideangeometry/euclideangeometry.dtx @@ -0,0 +1,1588 @@ +% \iffalse +% !TEX encoding = UTF-8 Unicode +%<*internal> +\begingroup +\input docstrip.tex +\keepsilent +\preamble + + Copyright (C) 2020 Claudio Beccari all rights reserved. + License information appended + +\endpreamble + +\postamble + +Distributable under the LaTeX Project Public License, +version 1.3c or higher (your choice). The latest version of +this license is at: http://www.latex-project.org/lppl.txt + +This work is "maintained" + +This work consists of files: +1) euclideangeometry.dtx, and the derived files euclideangeometry.sty + and euclideangeometry.pdf, +2) euclideangeometry-man.tex and the derived file euclideangeometry-man.pdf, +3) the auxiliary derived file README.txt + +\endpostamble +\askforoverwritefalse + +\generate{\file{euclideangeometry.sty}{\from{euclideangeometry.dtx}{package}}} +\generate{\file{README.txt}{\from{euclideangeometry.dtx}{readme}}} + +\def\tmpa{plain} +\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi +\endgroup +%</internal> +% \fi +% +% \iffalse +%<*driver> +\ProvidesFile{euclideangeometry.dtx}% +%</driver> +%<package>\NeedsTeXFormat{LaTeX2e}[2019/01/01] +%<package>\ProvidesPackage{euclideangeometry}% +%<readme>File README.txt for package euclideangeometry +%<*package|readme> + [2020-02-02 v.0.1.2 Extension package for curve2e] +%</package|readme> +%<*driver> +\documentclass{ltxdoc}\errorcontextlines=100 +\hfuzz 10pt +\usepackage[utf8]{inputenc} +\usepackage{lmodern,textcomp} +\usepackage{mflogo} +\usepackage{multicol,amsmath,fancyvrb,graphicx,verbatim} +\usepackage{etoolbox,enumitem,xspace,xcolor,euclideangeometry} +\providecommand*\diff{\mathop{}\!\mathrm{d}} +\renewcommand\meta[1]{{\normalfont\textlangle\textit{#1}\textrangle}} +\renewcommand\marg[1]{\texttt{\{\meta{#1}\}}} +\providecommand\Marg{} +\renewcommand*\Marg[1]{\texttt{\{#1\}}} +\providecommand\oarg{} +\renewcommand*\oarg[1]{\texttt{[\meta{#1}]}} +\providecommand\Oarg{} +\renewcommand*\Oarg[1]{\texttt{[#1]}} +\providecommand\aarg{} +\renewcommand*\aarg[1]{\texttt{<\meta{#1}>}} +\providecommand\Aarg{} +\renewcommand*\Aarg[1]{\texttt{<#1>}} +\providecommand\parg{} +\renewcommand*\parg[1]{\texttt{(\meta{#1})}} +\providecommand\Parg{} +\renewcommand*\Parg[1]{\texttt{(#1)}} +\providecommand\pack{} +\renewcommand*\pack[1]{{\textsf{#1}}} +\providecommand\opt{} +\renewcommand*\opt[1]{{\normalfont\textsl{#1}}}\let\opz\opt +\providecommand\env{} +\renewcommand*\env[1]{{\normalfont\textit{\bfseries#1}}}\let\amb\env + +\providecommand\TB{\mbox{\normalfont\slshape TUGboat}\xspace} + +\AfterEndPreamble{% +\apptocmd{\TeX}{{}\xspace}{}{} +\apptocmd{\LaTeX}{{}\xspace}{}{}} + + +\begin{document}\errorcontextlines=100 +\GetFileInfo{euclideangeometry.dtx} +\title{The \textsf{euclideangeometry} package} +\author{Claudio Beccari\\[1ex]\texttt{claudio dot beccari at gmail dot com}} +\date{Version \fileversion~--~Last revised \filedate.} +\maketitle +\columnseprule=0.4pt +\begin{multicols}{2} + \tableofcontents + \end{multicols} + \DocInput{euclideangeometry.dtx} +\end{document} +%</driver> +% \fi +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section*{Preface} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% This file contains the documented code of \pack{euclideangeometry}. +% The user manual source file \file{euclideangeometry-man.tex} and the +% readable document is \file{euclideangeometry.pdf}; it should already be +% installed with your updated complete \TeX system installation. + +% Please refer to the user manual before using this package. +% \CheckSum{1557} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\StopEventually{} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%\iffalse +%<*package> +%\fi +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{The code} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Checking the date of a sufficiently recent \texttt{curve2e} +% package} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This package has been already identified by the commands extracted +% by the |docstrip| package, during the |.dtx| file compilation. +% Therefore we start providing the |\GetFileInfo| in case the package +% is used outside a “documented \TeX\ sourceâ€; we just provide the +% definition from the |ltxdoc| class code. +% \begin{macrocode} +\makeatletter +\providecommand\GetFileInfo{} +\renewcommand\GetFileInfo[1]{% + \def\filename{#1}% + \def\@tempb##1 v.##2 ##3\relax##4\relax{% + \def\filedate{##1}\def\fileversion{##2}\def\fileinfo{##3}}% + \edef\@tempa{\csname ver@#1\endcsname}% + \expandafter\@tempb\@tempa\relax? ? \relax\relax} +% \end{macrocode} +% +% But in order to make the file date comparison for loading a suitable +% version of |curve2e| we need to strip away its date dash signs, +% so we define the |\cleanfiledate| macro that defines a |\FileDate| macro +% with a purely numerical string, suitable for numerical comparisons; +% if the fetched class file is so old that the date is not in the ISO +% format (for example with slashes instead of dashes) the macro fails +% and the interpreter comparison algorithm produces \TeX\ error messages. +% \begin{macrocode} +\def\cleanfiledate#1-#2-#3!{\unless\ifx#3\empty +\edef\FileDate{#1#2#3}\else\unless\ifx#2\empty +\edef\FileDate{#1#2}\else\edef\FileDate{#1}\fi\fi} +% \end{macrocode} +% In any case, if the test checks that the |curve2e| file date is too old; +% it warns the user with an emphasised error message on the console, +% loading this |euclideangeometry| package is stopped and the whole +% job aborts. The emphasised error message appears like this: +%\begin{flushleft}\ttfamily\obeylines +%************************************************************* +%Package curve2e too old +%Be sure that your TeX installation is complete and up to date +%************************************************************* +%Input of euclideangeometry is stopped and job aborted +%************************************************************* +%\end{flushleft} +% This message should be sufficiently strong in order to avoid using +% this package with a vintage version of \TeXLive or Mik\TeX. +% \begin{macrocode} +\RequirePackage{curve2e} +\GetFileInfo{curve2e.sty} +\expandafter\cleanfiledate\filedate! + +\ifnum\FileDate<20200118 +\typeout{*************************************************************} +\typeout{Package curve2e too old} +\typeout{Be sure that your TeX installation is complete and up to date} +\typeout{*************************************************************} +\typeout{Input of euclideangeometry stopped and job aborted} +\typeout{*************************************************************} +\expandafter\@@end\fi + +% \end{macrocode} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Service macros} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The following macros are useful for typesetting the manual; but they +% might be useful also for the final user; they mostly define commands +% that classify the various entities of the programming language with +% (generally different) font families, series and shapes; but the commands +% that receive the “name of an argument†enclose this name between math +% angle brackets. +% \begin{macrocode} +\providecommand\file{} +\renewcommand*\file[1]{{\normalfont\texttt{#1}}} +\providecommand\prog{} +\renewcommand*\prog[1]{{\normalfont\texttt{#1}}} +\newcommand*\conta[1]{\texttt{\slshape#1}} +\providecommand\cs{} +\renewcommand\cs[1]{{\normalfont\texttt{\char92#1}}} +\providecommand\meta{} +\renewcommand*\meta[1]{{\normalfont$\langle$\textit{#1}$\rangle$}} +\providecommand\marg{} +\renewcommand*\marg[1]{{\ttfamily \char123\meta{#1}\char125}} +\newcommand*\Marg[1]{{\normalfont\ttfamily\{#1\}}}\let\Arg\Marg +\providecommand\oarg{} +\renewcommand*\oarg[1]{{\ttfamily[\meta{#1}]}} +\newcommand*\Oarg[1]{{\ttfamily[#1]}} +\newcommand*\aarg[1]{{\ttfamily{<\meta{#1}>}}} +\newcommand*\Aarg[1]{{\ttfamily<#1>}} +\newcommand*\Bambiente[1]{\texttt{\char92begin\{#1\}}} +\newcommand*\Eambiente[1]{\texttt{\char92end\{#1\}}} +\newcommand*\garg[1]{\texttt{(\splitgarg#1,!)}}\let\parg\garg +\newcommand*\Garg[1]{\texttt{(#1)}}\let\Parg\Garg + \def\secgarg#1,{#1} + \def\splitgarg#1,#2!{% + \ifstrequal{#2}{}{\meta{#1}}{\meta{#1},\meta{\secgarg#2}}} +\providecommand\pack{} +\renewcommand*\pack[1]{{\normalfont\textsf{#1}}} +\providecommand\opt{} +\renewcommand*\opt[1]{{\normalfont\textsl{#1}}}\let\opz\opt +\providecommand\env{} +\renewcommand*\env[1]{{\normalfont\textit{\bfseries#1}}}\let\amb\env +% \end{macrocode} +% The next commands are defined in the |babel-italian| module for |babel|; +% |\ped| introduces a subscript in math mode, but the command may be used +% also in text mode; the same holds true also for |\ap| that introduces +% a superscript. |\unit| is a shorthand for attaching the units of measure +% in math upright roman font, with an unbreakable space between the measure +% and its units; |\sigla| is the Italian equivalent of |\acronym|, that +% avoids any conflict with other packages; |\iu| (alias|\gei|) typesets +% the imaginary unit in roman font according to the ISO regulations; +% |\eu| defines the roman type “eâ€, the Neper number, as a math operator; +% we all know that “e†is not an operator, but it is used very often as +% the base of an exponential, therefore, in math mode it is better to +% leave the necessary space before and after it, without any space between +% it and its exponent. +% \begin{macrocode} +\providecommand*\ped[1]{\ensuremath{_{\mathrm{#1}}}} +\providecommand*\ap[1]{\ensuremath{^{\mathrm{#1}}}} +\providecommand*\unit[1]{\ensuremath{\,\mathrm{#1}}} +\providecommand*\sigla[1]{\textsc{\lowercase{#1}}} +\providecommand*\iu{\ensuremath{\mathrm{i}}}\let\gei\iu +\providecommand*\eu{\ensuremath{\mathop{\mathrm{e}}\nolimits}} +% \end{macrocode} +% +% The next code is used to typeset the logo of \Ars logo, and the logo +% of \LyX; the other command |\GuIT| typesets equally well the \GuIT logo; +% if necessary the |\RequirePackage| macro loads the |xspace| package; +% therefore these macros do not require any special terminator of the +% control sequence name, because the |\xspace| command takes care of the +% necessary space; this command avoids inserting any space if macros are +% followed by any reasonable sign different form a space, such as +% punctuation marks, parentheses, quotation marks, and so on. +% +% \begin{macrocode} +\DeclareRobustCommand*{\Ars}{% + \textsf{\lower -.48ex\hbox{\rotatebox{-20}{A}}\kern -.3em{rs}}% + \kern -.05em\TeX\unskip\kern -.17em\lower -.357ex\hbox{nica}\xspace} + +\DeclareRobustCommand*\LyX{% + L\kern-0.2em\raisebox{-0.5ex}{Y}\kern-0.2em{X}\xspace} + +\definecolor{verdeguit}{rgb}{0, 0.40, 0} +\RequirePackage{iftex} +\def\GuIT{\mbox{\color{verdeguit}\def\I{\textcolor{black}{I}}% +\ifPDFTeX + \usefont{T1}{lmr}{m}{sc} +\else + \usefont{TU}{lmr}{m}{sc} +\fi +g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} +% \end{macrocode} +% The following macros |\usecs| and |\whilenum| allow the use the internal +% \LaTeX control sequence names that contain a |@| sign. They are not so +% useful in this package, but they might be useful for the end user. +% \begin{macrocode} +\providecommand*\usecs[1]{\csname#1\endcsname} +\providecommand*\whilenum[2]{\usecs{@whilenum}#1\do{#2}} +% \end{macrocode} +% Accordingly the following two macros, and their English aliases, allow +% to delay the output of a (possibly floating) object to a page of the +% desired parity; they are not infallible, because the the |\afterpage| +% command defined by package |afterpage| (loaded if necessary) operates +% on the typesetting program output routine and the object to be delayed +% might be lost on the way, or might get delayed too much; these facts +% take place very seldom, but are not impossible, the solution is to move +% back several paragraphs the command with is argument. +% \begin{macrocode} +\RequirePackage{afterpage} +\providecommand\supaginapari[1]{% + \afterpage{% + \ifodd\value{page}\expandafter\@firstoftwo + \else\expandafter\@secondoftwo + \fi{\supaginapari{#1}}{#1} + } +}\let\onevenpage\supaginapari +\providecommand\supaginadispari[1]{% + \afterpage{% + \ifodd\value{page}\expandafter\@secondoftwo + \else\expandafter\@firstoftwo + \fi{\supaginadispari{#1}}{#1} + } +}\let\onoddpage\supaginadispari +% \end{macrocode} +% The following \LaTeX related logos are provided so as to make them +% coherent with the smart final space we have discussed above. The real +% difference is that it is necessary to use tue |etoolbox| facilities; +% therefore the package is (possibly) loaded. With it we add at the end +% of their original definition the |\xspace| command. But what is the +% “original definitionâ€? Of course |\TeX| and |\LaTeX| macros are defined +% within the \LaTeX kernel, but the user might have loaded other packages +% that have redefined them; therefore these patches are applied only at +% the preamble end, so if other definitions were provided by other +% packages loaded in the preamble, such redefinitions are patched. +% Only |\XeLaTeX| is completely redefined, because the other existing +% definitions work correctly only with OpenType fonts; with Type~1 fonts +% and oblique fonts (italics, slanted, etc.) the reversed “E†generally +% is inclined in the wrong direction; by rotating it, instead of +% reflecting it, the “E†might not be the best, but al least slants in +% the right direction. +% \begin{macrocode} +\RequirePackage{etoolbox} +\AfterEndPreamble{% +\apptocmd{\TeX}{{}\xspace}{}{} +\apptocmd{\LaTeX}{{}\xspace}{}{}} + +\DeclareRobustCommand*\TeXLive{\TeX\ Live\xspace} +\DeclareRobustCommand*\MiKTeX{MiK\TeX} +\DeclareRobustCommand*\MacTeX{Mac\TeX} +\DeclareRobustCommand*\pdfLaTeX{pdf\/\LaTeX} +\DeclareRobustCommand*\LuaLaTeX{Lua\LaTeX} +\DeclareRobustCommand*\XeLaTeX{X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi +\lower.5ex\hbox{\rotatebox[origin=c]{180}{E}}% +\ifdim\fontdimen1\font=0pt\kern-0.15em\else\kern-0.275em\fi +\LaTeX} +\DeclareRobustCommand*\TikZ{Ti\emph{k}Z\xspace} +\DeclareRobustCommand*\TUGboat{\textsl{TUG\-boat}\xspace} +% \end{macrocode} +% The following command is useful to output two column floats when +% typesetting in |twocolumn| mode. +% \begin{macrocode} +\renewcommand\dbltopfraction{1.} +% \end{macrocode} +% This apparently useless command becomes useful to separate a font +% selection command or the |\item| command from the following text so +% as to allow hyphenation in what follows; it is just a very innocent +% dirty trick, but it works. +% \begin{macrocode} +\def\hz{\hskip0pt} +% \end{macrocode} +% Here we have a command that allows to display some framed code; it is +% usable also to display the syntax of some commands; and when doing this +% action the full range of service macros at the beginning of this section +% play the best of their role. The English aliases for the opening and +% closing environments are also provided. Attention: do not use |\\| +% commands to specify new lines, unless you want to produce empty/blank +% lines; within this environment the source code “end of line†characters +% are not treated as spaces, but are actually executed according to their +% name. +% \begin{macrocode} +\newenvironment{ttsintassi}{\begin{lrbox}{0} +\minipage{\dimexpr\linewidth-2\fboxrule-2\fboxsep}\ttfamily\obeylines}% +{\endminipage\end{lrbox}\center\fbox{\box0}\endcenter} +\let\ttsyntax\ttsintassi \let\endttsyntax\endttsintassi +% \end{macrocode} +% The following macro probably will migrate to |curve2e|; meanwhile +% this redefinition is useful in order to save some input and to make +% a more flexible macro. We used it virtually in every picture we +% inserted in the user manual of this package; of course the user does +% not need to have any drawing superimposed onto a red grid. Actually +% the grid is useful while drawing; when the image is complete, the +% grid command may be deleted or its line commented out. The purpose +% of this macro is to avoid the |\put| command to place the grid; and +% since its reference point in the original definition is arbitrary, +% the connection with real coordinates is very small and might become +% confusing or of little help. +% Now the syntax is the following: +%\begin{ttsyntax} +%\cs(GraphGrid)\parg{reference point or dimensions}\parg{overall dimensions} +%\end{ttsyntax} +% where the second argument is optional; if it is missing, the first +% argument contains the \meta{overall dimensions}, otherwise it +% contains the lower left corner coordinate that represent the +% \meta{reference point} that an internal |\put| command will use +% to place the grid; if no \meta{reference point} is specified, the +% reference point is \texttt{0,0}, and the grid is |\put| with its +% lower left corner in the origin of the |picture| coordinates. +% \begin{macrocode} + +\unless\ifcsname Gr@phGrid\endcsname +\let\originalGraphGrid\GraphGrid +\RenewDocumentCommand\GraphGrid{r() d()}{% +\IfValueTF{#2}{\put(#1){\originalGraphGrid(#2)}}% + {\put(0,0){\originalGraphGrid(#1)}}}\fi +% \end{macrocode} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\subsection{Labelling} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% While doing any graphical geometrical drawing it is necessary to label +% points, lines, angles and other such items. Non measurable labels should +% be in upright sans serif font, according to the ISO regulations, but here +% we are dealing witt point identified by macros the contain their +% (cartesian or polar) coordinates that very often are both labels +% and math variables. +% +% Here we provide a versatile macro that can do several things. Its name +% is |\Pbox| and it produces a box containing the label in math format. By +% default the point label is typeset with the math font variant produced +% by command |\mathsf|, but the macro is sufficiently versatile to allow +% other settings; It accepts several optional arguments, therefore it syntax is particular: +%\begin{ttsyntax} +%\cs{Pbox}\parg{coordinates}\oarg{alignment}\marg{label}\oarg{diameter}\meta{$\star$}\aarg{angle} +%\end{ttsyntax} +% where \meta{coordinates} are the coordinates where to possibly set a +% black dot with the specified \meta{diameter}; in any case it is the +% reference point of the \meta{label}; the \meta{alignment} is formed by +% the usual letters \texttt{t, b, c, l, r} that can be paired in a +% coherent way (for example the couple \texttt{tb} is evidently +% incoherent, as well as \texttt{lr}), but in absence of this optional +% specification, the couple \texttt{cc} is assumed; most often than +% not, the label position becomes such that when the user reviews the +% document drafts, s/he understands immediately that s/he forgot to specify +% some reasonable \meta{alignment} codes. Think of the \meta{alignment} +% letters as the position of the reference point with respect to the +% the \meta{label} optical center. The optional \meta{angle} argument +% produces a rotation of the whole label by that angle; it may be used +% in several circumstances, especially when the label is just text, to +% produce, for example, a sideways legend. It is useful also when the +% labels are produced within a rotated box, in order to counterrotate them. +% +% The optional asterisk draws a frame around the \emph{label}. Notice that +% the separator between the visible or the invisible frame and the box +% contents varies according the the fact the the \meta{alignment} +% specification contains just one or two letter codes; this is useful, +% because the diagonal position of the label should be optically equal +% to the gap that exists between the reference point and the \meta{label} +% box. +% +% If the \meta{diameter} is zero, no dot is drawn, the whole \meta{label} +% is typeset with the |\mathit| math font; otherwise only the first symbol +% of a math expression si typeset in sans serif. The presence of subscripts +% makes the labels appear more distant from their reference point; the same +% is true when math symbols, even without subscripts, are used, because +% of the oblique nature of the math letters alphabet. +% +% If some text has to be printed as a label, it suffices to surround it +% with dollar signs, that switch back to text mode when the default mode +% is the math one. With this kind of textual labels it might be convenient +% to use the optional asterisk to frame the text. +% \begin{macrocode} +\providecommand\Pbox{} +\RenewDocumentCommand\Pbox{D(){0,0} O{cc} m O{0.5ex} s D<>{0}}{% +\put(#1){\rotatebox{#6}{\makebox(0,0){% +\dimendef\Dim=2566\relax +\settowidth\Dim{#2}% +\edef\Rapp{\fpeval{\Dim/{1ex}}}% +\fptest{\Rapp > 1.5}{\fboxsep=0.5ex}{\fboxsep=0.75ex}% +\IfBooleanTF{#5}{\fboxrule=0.4pt}{\fboxrule=0pt}% +\fptest{#4 = 0sp}% + {\makebox(0,0)[#2]{\fbox{$\relax#3\relax$}}}% + {\edef\Diam{\fpeval{(#4)/\unitlength}}% + \makebox(0,0){\circle*{\Diam}}% + \makebox(0,0)[#2]{\fbox{$\relax\mathsf#3\relax$}}% + }}}% +}\ignorespaces} +% \end{macrocode} +% The following command, to be used always within a group, or a +% environment or inside a box, works only with piecewise continuously +% scalable font collection, such as, for example, the Latin Modern +% fonts, or with continuously scalable fonts, such as, for example, +% the Times ones. They let the operator select, for the scope of the +% command ,any size, even fractional so as to fine adjust the text +% width in the space allowed for it; it is particularly useful with +% the monospaced fonts, that forbid hyphenation, and therefore cannot +% be adjusted to the current line width. +% \begin{macrocode} +\DeclareRobustCommand\setfontsize[2][1.2]{% + \linespread{#1}\fontsize{#2}{#2}\selectfont} +% \end{macrocode} +% With OpenType fonts there should not be any problems even with math +% fonts; with Type~1 fonts the only scalable fonts I know of, are the +% LibertinusMath fonts, usable through the LibertinusT1math package, are +% also the only ones that have 8~bit encoded math fonts (256 +% glyph fonts), while the standard default Type~1 math fonts are just +% 7~bit encoded (128 glyphs fonts). +% +% Another useful labelling command is |Zbox|; this command is an +% evolution of a command that I been using for years in several +% documents of mine. It uses some general text, not necessarily +% connected to a particular point of the |picture| environment, +% as a legend; It can draw short text as a simple horizontal box, +% and longer texts as a vertical box of specified width and height +% +% Is syntax is the following: +%\begin{ttsyntax} +%\cs{Zbox}\parg{position}\parg(dimensions)\oarg{alignment}\marg{text} +%\end{ttsyntax} +% where \meta{position} is where the reference point of the box has +% to be put in the picture; \meta{dimensions} are optional; if not +% specified, the box is a horizontal one, and it is as wide as its +% contents; if it is specified, it must be a comma separated list +% of two integer or fractional numbers that are the width and the +% height of the box; if the height is specified as zero, the width +% specifies a horizontal box of that width; \meta{alignment} is optional +% and is formed by one or two coherent letter codes from the usual set +% \texttt{t, b, c, l, r}; if the \meta{alignment} is absent, the +% default alignment letters are \texttt{bl}, i.e. the box reference +% point is the bottom left corner; \meta{text} contains general text, +% even containing some math. +% \begin{macrocode} + +\def\EUGsplitArgs(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}} + +\providecommand\Zbox{} +\RenewDocumentCommand\Zbox{R(){0,0} D(){0,0} O{bl} m}{% +\EUGsplitArgs(#2)\ZboxX\ZboxY % separa la x e la y della scatola +\fboxsep=2\unitlength +\ifnum\ZboxX=\csuse{z@} + \def\ZTesto{\fbox{#4}}% +\else + \ifnum\ZboxY=\csuse{z@} + \def\ZTesto{\fbox{\parbox{\ZboxX\unitlength}{#4}}}% + \else + \def\ZTesto{% + \setbox2560=\hbox{\fbox{% + \parbox[c][\ZboxY\unitlength][c]{\ZboxX\unitlength}{#4}}}% + \dimen2560=\dimexpr(\ht2560 +\dp2560)/2\relax + \ht2560=\dimen2560\relax + \dp2560=\dimen2560\relax + \box2560% + }% + \fi +\fi +\put(#1){\makebox(0,0)[#3]{\ZTesto}}\ignorespaces} +% \end{macrocode} + +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\subsection{The \texttt{Example} environment} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Another very useful facility is the |Esempio| environment; +% it has an English alias |Example|, but we suggest to use the Italian +% name, because it is safer in order to avoid conflicts with other packages; +% this environment is very handy to typeset a stretch of code side by +% side its typeset result obtained by executing it; it has advantages and +% disadvantages, though. A similar environment was used to show the +% examples in the \emph{The \LaTeX Companion}; another similar environment +% may be used from the |tcolorbox| package (by T.F.~Sturm, read its +% documentation by using the terminal command |texdoc tcolorbox|) +% environment |tcolorbox| and using the keyword |sidebyside| among the +% options; package |fancyvrb| also offers a similar environment. +% The critical disadvantage is that that you cannot use any of these +% environments, not even this |Esempio| one, when typesetting a +% documented \TeX file, such as the one you are reading now. In facts +% the |.dtx| file has all text lines that start with a comment character, +% and the code parts, to be output to a |.sty|, or |.cls|, or whatever +% other file used by the \TeX system to format documents, are explicitly +% marked with the special delimiters \verb*|% \begin{macrocode}| and +% \verb*|% \end{macrocode}|. +% +% Therefore with those packages and with this |Esempio| environment +% the code you want to show appears with all lines with a |%| at the +% beginning. This certainly does not help the description of a software +% and this is the very reason why this package has a separate +% |euclideangeometry-man| manual typeset with the |article| class. +% +% Nevertheless this environment makes use of the facilities of the +% |verbatim| environment. +% +% \begin{macrocode} +\RequirePackage{verbatim} +\newwrite\example@out +\ProvideDocumentEnvironment{Esempio}{s O{\normalsize} D(){0.40}} +{\par\addvspace{3.0ex plus 0.8ex minus 0.5ex}\vskip -\parskip +\dimendef\Wboxu=2570 \dimendef\Wboxd=2572 +\Wboxu=#3\textwidth\relax +\Wboxd=\dimexpr\linewidth-\columnsep-\Wboxu\relax +\begingroup +\@bsphack +\immediate\openout\example@out\jobname-temp.tex +\let\do\@makeother\dospecials\catcode`\^^M\active +\def\verbatim@processline{% + \immediate\write\example@out{\the\verbatim@line}}% +\verbatim@start\relax}% +{\immediate\closeout\example@out\@esphack\endgroup +\begin{minipage}{\textwidth}% +\IfBooleanTF{#1}{\begin{minipage}{\textwidth}}{\begin{minipage}{\Wboxu}}% +#2\relax +\verbatiminput{\jobname-temp.tex} +\end{minipage}% +\IfBooleanTF{#1}{\par\bigskip}{\hfill}% +\IfBooleanTF{#1}{\begin{minipage}{\textwidth}}{\begin{minipage}{\Wboxd}}% +\raggedleft +\input{\jobname-temp} +\end{minipage} +\end{minipage}\par +%\medskip +%\par\addvspace{3.0ex plus 0.8ex minus 0.5ex}\vskip -\parskip +} +% \end{macrocode} + +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Service macros for ellipses} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The |\ellisse| has a control sequence name in Italian; it differs for +% just one letter from the name |ellipse| English name, but we cannot use +% the latter one because it may conflict with other packages loaded by +% the user; actually this command and the next one are just shortcuts +% for executing more general commands with specific sets of arguments. +% For details and syntax, please refer yourself to +% section~\ref{ssec:ellissi} +% \begin{macrocode} + +\NewDocumentCommand\ellisse{ s m m}{% +\IfBooleanTF{#1}% + {\let\fillstroke\fillpath}% + {\let\fillstroke\strokepath}% +\Sellisse{#2}{#3}% +} + +\NewDocumentCommand\Xellisse{ s D(){0,0} O{0} m m O{} o}{% +\IfBooleanTF{#1}% + {\XSellisse*(#2)[#3]{#4}{#5}[#6][#7]}% + {\XSellisse(#2)[#3]{#4}{#5}[#6][#7]}% +} +% \end{macrocode} +% +% We do not know if the following macro |\polyvector| may be useful for +% euclidean geometry constructions, but it may be useful in block +% diagrams; it is simply a polyline where the last segment is a geometrical +% vector. As in polyline the number of recursions is done until the last +% specified coordinate pair; recognising that it is the last one, instead +% of drawing a segment, the macro draws a vector. +% +% \begin{macrocode} + +\def\polyvector(#1){\roundcap\def\EUGpreviouspoint{#1}\EUGpolyvector} +\def\EUGpolyvector(#1){% +\@ifnextchar({% + \segment(\EUGpreviouspoint)(#1)\def\EUGpreviouspoint{#1}\EUGpolyvector}% + {\VECTOR(\EUGpreviouspoint)(#1)}% +} +% \end{macrocode} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Processing lines and segments} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% The next macros are functional for the geometric constructions we are +% going to make: finding the intersection of lines or segments, +% finding the lengths and arguments of segments, directions, distances, +% distance of a point from a line or a segment, the symmetrical +% point of a another one specified with respect to a given center of +% symmetry; the axes of segments, the solutions of the relationship +% between the semi axes of an ellipse and the semi focal distance, +% and so on. +% +% Most of these commands have delimited arguments; the delimiters +% may be the usual parentheses, but they may be keywords; many +% commands contain the keyword \texttt{to}, not necessarily the +% last one; the arguments before such keyword may be entered as +% ordered comma separated numerical couples, or comma separated +% macros the containing scalar values; or they may be macros that +% contain the ordered couples representing vectors or directions; +% they all may be in cartesian or polar form. Remember that such +% ordered couples are complex numbers, representable by +% vectors applied to the origin of the axes; therefore sometimes it is +% necessary that the underlying commands execute some vector +% differences so as to work with generic vectors. +% +% On the opposite the output values, i.e. the argument after that +% \texttt{to} keyword, should be tokens that can receive a definition, +% in general macros, to which the user should assign a mnemonic name; +% s/he should use such macros for further computations or for drawing +% commands. +% +% The first and principal command is |\IntersectionOfLines| and +% it has the following syntax: +%\begin{ttsyntax} +%\cs{IntersectionOfLines}\parg{point1}\parg{dir1}and\parg{point2}\parg{dir2}to\meta{crossing} +%\end{ttsyntax} +% where \meta{point1} and \meta{dir1} are respectively a point of the +% first line and its \emph{direction}, not a second point, but the +% \emph{direction} — it is important to stress this point; similarly +% for the second line; the output is stored in +% the macro that identifies the \meta{crossing} point. The directions +% do not need to be expressed with unit vectors, but the lines must not +% be parallel or anti parallel (equal directions or differing by +% $180^\circ$); the macro contains a test that checks this anomalous +% situation because an intersection at infinity or too far away +% ($2^{14}-1$ typographical points, approximately 5,758\,m) is of no +% interest; in case, no warning message is issued, the result is +% put to \texttt{0,0}, and the remaining computations become nonsense. +% It is a very unusual situation and I never encountered~it; +% nevertheless\dots + +% \begin{macrocode} + +\def\IntersectionOfLines(#1)(#2)and(#3)(#4)to#5{\bgroup +\def\IntPu{#1}\def\Uu{#2}\def\IntPd{#3}\def\Ud{#4}% + \DirOfVect\Uu to\Du + \DirOfVect\Ud to\Dd + \XpartOfVect\Du to \a \YpartOfVect\Du to \b + \XpartOfVect\Dd to \c \YpartOfVect\Dd to \d + \XpartOfVect\IntPu to \xu \YpartOfVect\IntPu to \yu + \XpartOfVect\IntPd to \xd \YpartOfVect\IntPd to \yd + \edef\Den{\fpeval{-(\a*\d-\b*\c)}}% + \fptest{abs(\Den)<1e-5}{% almost vanishing determinant + \def#5{0,0}% + }{% Determinant OK + \edef\Numx{\fpeval{(\c*(\b*\xu-\a*\yu)-\a*(\d*\xd-\c*\yd))/\Den}}% + \edef\Numy{\fpeval{(\d*(\b*\xu-\a*\yu)-\b*(\d*\xd-\c*\yd))/\Den}}% + \CopyVect\Numx,\Numy to\Paux + \edef\x{\egroup\noexpand\edef\noexpand#5{\Paux}}\x\ignorespaces}} +% \end{macrocode} +% +% The |IntersectionOfSegments| macro is similar but in input it +% contains the end points of two segments: internally it uses +% |\IntersectionOfLines| and to do so it has to determine the +% directions of both segments. The syntax is the following: +%\begin{ttsyntax} +%\cs{IntersectionOfSegments}\parg{point11}\parg{point12}and\parg{point21}\parg{point22} +%\qquad to\meta{crossing} +%\end{ttsyntax} +% The \meta{crossing} point might fall outside one or both segments. +% It is up to the users to find out if the result is meaningful +% or nonsense. Two non parallel lines are infinitely long in both +% directions and any \meta{crossing} point is acceptable; with +% segments the situation might become nonsense. +% \begin{macrocode} + +\def\IntersectionOfSegments(#1)(#2)and(#3)(#4)to#5{% +\SubVect#1from#2to\IoSvectu \DirOfVect\IoSvectu to\DirIoSVecu +\SubVect#3from#4to\IoSvectd \DirOfVect\IoSvectd to\DirIoSVecd +\IntersectionOfLines(#1)(\DirIoSVecu)and(#3)(\DirIoSVecd)to#5\ignorespaces} +% \end{macrocode} +% +% An application of the above intersections is formed by the next +% two macros; they find the axes of a couple of sides of a triangle +% and use their base point and direction to identify two lines the +% intersection of which is the circumcenter; the distance of one +% base point from the circumcenter is the radius of the circumcircle +% that can be drawn with the usual macros. We have to describe +% the macros |\AxisOf| and |CircleWithCenter| and we will do it in +% a little while. Meanwhile the syntax of the whole macro is the +% following: +%\begin{ttsyntax} +%\cs{ThreePointCircle}\meta{$\star$}\parg{vetex1}\parg{vertex2}\parg{vertex3} +%\end{ttsyntax} +% where the three vertices are the three points where the circle +% must pass, but they identify also a triangle. Its side axes +% intersect in one point that by construction is at the same +% distance from the three vertices, therefore it is the center of +% the circle that passes through the three vertices. A sub product +% of the computations is the macro |\C| that contains the center +% coordinates. If the optional asterisk is used the whole drawing +% is executed, while if it is missing, only the |\C| macro remains +% available but the user is responsible to save/copy its value +% into another macro; for this reason another macro should be more +% easy to use; its syntax is the following: +%\begin{ttsyntax} +%\cs{ThreePointCircleCenter}\parg{vetex1}\parg{vertex2}\parg{vertex3} +%\qquad to\meta{center} +%\end{ttsyntax} +% where the vertices have the same meaning, but\meta{center} is +% the user chosen macro that contains the center coordinates. +% +% \begin{macrocode} + +\NewDocumentCommand\ThreePointCircle{s d() d() d()}{% +\AxisOf#2and#3to\Mu\Du \AxisOf#2and#4to\Md\Dd +\IntersectionOfLines(\Mu)(\Du)and(\Md)(\Dd)to\C +\SubVect#2from\C to\R +\IfBooleanTF{#1}{\CircleWithCenter\C Radius\R}{}\ignorespaces} + +\NewDocumentCommand\ThreePointCircleCenter{d() d() d() m}{% +\ThreePointCircle(#1)(#2)(#3)\CopyVect\C to#4} +% \end{macrocode} +% +% There are some useful commands that help creating |picture| +% diagrams in an easier way; for example one of the above described +% commands internally uses |\CircleWithCenter|. It is well known +% that the native |picture| command |\circle| requires the +% specification of the diameter but many |euclideangeometry| +% commands already get the distance of two points, or the magnitude +% of a segment, or similar objects that may be used as a radius, rather +% than the diameter; why should we not have macros that simultaneously +% compute the require diameter and draw the circle. Here there are two +% such macros; they are similar to one another but their names differ in +% capitalisation, but also in the way they use the available input +% information. The syntax is the following: +%\begin{ttsyntax} +%\cs{CircleWithCenter}\meta{center} Radius\meta{Radius} +%\cs{Circlewithcenter}\meta{center} radius\meta{radius} +%\end{ttsyntax} +% where in both cases \meta{center} is a vector/ordered couple +% that points to the circle center. On the contrary \meta{Radius} +% is a vector obtained through previous calculations, while +% \meta{radius} is a scalar containing a previously calculated length. +% \begin{macrocode} +\def\CircleWithCenter#1Radius#2{\put(#1){\ModOfVect#2to\CWR +\circle{\fpeval{2*\CWR}}}\ignorespaces} +% +\def\Circlewithcenter#1radius#2{\put(#1){\circle{\fpeval{2*abs(#2)}}}% +\ignorespaces} +% \end{macrocode} +% +% As announced, here we have a macro to compute the axis of a segment; +% given two points $P_1$ and $P_2$, for example the end points of a +% segment, or better the end point of the vector that goes from +% $P_1$ to $P_2$, the macro determines the segment middle point and +% a second point the lays on the perpendicular at a distance equal to half +% the first two points distance; this second point lays at the left of +% vector $P_2-P_1$, therefore it is important to select the right initial +% vector, in order to have the second axis point on the desired side. +%\begin{ttsyntax} +%\cs{AxisOf}\meta{P1} and\meta{P2} to\meta{Axis1}\meta{Axis2} +%\end{ttsyntax} +% Macros |\SegmentCenter| and |\MiddlePointOf| are alias to one another; +% their syntax is: +%\begin{ttsyntax} +%\cs{SegmentCenter}\parg{P1}\parg{P2}to\meta{center} +%\cs{MiddlePointOf}\parg{P1}\parg{P2}to\meta{center} +%\end{ttsyntax} +% \meta{P1}, \meta{p2} and \meta{center} are all vectors. +% \begin{macrocode} + +\def\AxisOf#1and#2to#3#4{% +\SubVect#1from#2to\Base \ScaleVect\Base by0.5to\Base +\AddVect\Base and#1to#3 \MultVect\Base by0,1to#4} + +\def\SegmentCenter(#1)(#2)to#3{\AddVect#1and#2to\Segm +\ScaleVect\Segm by0.5to#3\ignorespaces} + +\let\MiddlePointOf\SegmentCenter +% \end{macrocode} +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Triangle special points} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Here we have the macros to find the special points on a triangle +% side that are the “foot†of special lines from one vertex to the +% opposite side. We already described the circumcircle and the +% circumcenter, but that is a separate case, because the circumcenter +% is not the intersection of special lines from one vertex to the +% opposite base. The special lines we are interested in here are +% the height, the median, and the bisector +% The macros have the same aspect |\Triangle...Base|, where the dots +% are replaced with each of the (capitalised) special line names. +% Their syntaxes are therefore very similar: +%\begin{ttsyntax} +%\cs{TriangleMedianBase}\meta{vertex} on\meta{base1} and\meta{base2} to\meta{M} +%\cs{TriangleHeightBase}\meta{vertex} on\meta{base1} and\meta{base2} to\meta{H} +%\cs{TrinagleBisectorBase}\meta{vertex} on\meta{base1} and\meta{base2} to\meta{B} +%\end{ttsyntax} +% where \meta{vertex} contains one of the vertices coordinates, and +% \meta{base1} and \meta{base2} are the end points of the side +% opposite to that triangle vertex; \meta{M}, meta{H}, and \meta{B} +% are the intersections of these special lines from the \meta{vertex} +% to the opposite side; in order, they are the foot of the median, +% the foot of the height; the foot of the bisector. The construction +% of the median foot \meta{M} is trivial because this foot is the base +% center; the construction of the height foot is a little more +% complicated, because it is necessary to find the exact direction +% of the perpendicular from the vertex to the base in order to +% find the intersection \meta{H}; the construction of the bisector +% base implies finding the exact direction of the two sides starting at the +% \meta{vertex}, and taking the mean direction, which is trivial if +% polar coordinates are used; at this point the bisector line is completely +% determined and the intersection with the base line \meta{B} is +% easily obtained. +% \begin{macrocode} + +\def\TriangleMedianBase#1on#2and#3to#4{% +\SubVect#1from#2to\TMBu \SubVect#1from#3to\TMBd +\SubVect\TMBu from\TMBd to\Base +\ScaleVect\Base by0.5to\TMBm\AddVect#2and\TMBm to#4\ignorespaces} +% +\def\TriangleHeightBase#1on#2and#3to#4{% +\SubVect#2from#3to\Base +\ArgOfVect\Base to\Ang \CopyVect\fpeval{\Ang+90}:1 to\Perp +\IntersectionOfLines(#1)(\Perp)and(#2)(\Base)to#4\ignorespaces} +% +\def\TriangleBisectorBase#1on#2and#3to#4{% +\SubVect#2from#1to\Luno \SubVect#3from#1to\Ldue +\SubVect#2from#3to\Base +\ArgOfVect\Luno to\Arguno \ArgOfVect\Ldue to\Argdue +\edef\ArgBis{\fpeval{(\Arguno+\Argdue)/2}}% +\CopyVect \ArgBis:1to \Bisect +\IntersectionOfLines(#2)(\Base)and(#1)(\Bisect)to#4\ignorespaces} +% \end{macrocode} +% Having defined the previous macros, it becomes very easy to create +% the macros to find the\emph{barycenter}, the \emph{orthocenter}, +% the\emph{incenter}; for the \emph{circumcenter} and the +% \emph{circumcircle} we have already solved the question with the +% |\ThreePointCircleCenter| and the |ThreePointCircle| macros; for +% homogeneity, we create here their aliases with the same form as +% the new “center†macros. Actually, for the “circle†macros, +% once the center is known, there is no problem with the circumcircle, +% while for the incircle it suffices a macro to determine the distance +% of the incenter from one of the triangle sides; such a macro is going to +% be defined in a little while; it is more general than simply to +% determine the radius of the incircle. +% \begin{macrocode} + +\let\TriangleCircumcenter\ThreePointCircleCenter +\let\TriangleCircummcircle\ThreePointCircle +% \end{macrocode} +% +% The other “center†macros are the following; they all consist +% in finding two of the specific triangle lines, and finding their +% intersection. Therefore for the barycenter we intersect two +% median lines; for the orthocenter we intersect two height lines; +% for the incenter we intersect two bisector lines; +% \begin{macrocode} + +\def\TriangleBarycenter(#1)(#2)(#3)to#4{% +\TriangleMedianBase#1on#2and#3to\Pa +\TriangleMedianBase#2on#3and#1to\Pb +\DistanceAndDirOfVect#1minus\Pa to\ModPa and\AngPa +\DistanceAndDirOfVect#2minus\Pb to\ModPb and\AngPb +\IntersectionOfLines(#1)(\AngPa)and(#2)(\AngPb)to#4} + +\def\TriangleOrthocenter(#1)(#2)(#3)to#4{% +\TriangleHeightBase#1on#2and#3to\Pa +\TriangleHeightBase#2on#3and#1to\Pb +\DistanceAndDirOfVect#1minus\Pa to\ModPa and\AngPa +\DistanceAndDirOfVect#2minus\Pb to\ModPb and\AngPb +\IntersectionOfLines(#1)(\AngPa)and(#2)(\AngPb)to#4} + +\def\TriangleIncenter(#1)(#2)(#3)to#4{% +\TriangleBisectorBase#1on#2and#3to\Pa +\TriangleBisectorBase#2on#3and#1to\Pb +\DistanceAndDirOfVect#1minus\Pa to\ModPa and\AngPa +\DistanceAndDirOfVect#2minus\Pb to\ModPb and\AngPb +\IntersectionOfLines(#1)(\AngPa)and(#2)(\AngPb)to#4} +% \end{macrocode} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\subsection{Other specific service macros}\label{ssec:ellissi} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% And here it comes the general macro to determine the distance +% of a point from a segment or from a line that contains that +% segment; it may be used for determining the radius of the +% incenter, but it is going to be used also for other purposes. +% Its syntax is the following: +%\begin{ttsyntax} +%\cs{DistanceOfPoint}\meta{point} from\parg{P1}\parg{P2}to\meta{distance} +%\end{ttsyntax} +% where \meta{point} is a generic point; \meta{P1} and \meta{P2} +% are a segment end points, or two generic points on a line; +% \meta{distance} is the macro that receives the computed scalar +% distance value. +% \begin{macrocode} + +\def\DistanceOfPoint#1from(#2)(#3)to#4{% +\SubVect#2from#3to\Base \MultVect\Base by0,1to\AB +\IntersectionOfLines(#1)(\AB)and(#2)(\Base)to\D +\SubVect#1from\D to\D +\ModOfVect\D to#4} +% \end{macrocode} +% The following macros are specific to solve other little geometrical +% problems that arise when creating more complicated constructions. +% +% The |\AxisFromAxisAndFocus| is an unhappy name that describes +% the solution of an ellipse relationship between the ellipse axes +% and the focal distance +%\begin{equation} a^2 = b^2 + c^2\label{equ:axes-foci}\end{equation} +% This relation exists between the “semi†values, but it works equally +% well with the full values. Evidently $a$ is the largest quantity and +% refers to the main ellipse axis, the one that passes through the two +% foci; $b$ refers to the other shorter ellipse axis and $c$ refers to +% the foci; $b$ and $c$ are smaller than $a$, but there is no specific +% relationship among these two quantities It goes by itself that +% these statements apply to a veritable ellipse, not to a circle, +% that is the special case where $b=a$ and $c=0$. +% +% Since to solve the above equation we have one unknown and two +% known data, but we do not know what they represent, we have to +% assume some relationship exist between the known data; therefore +% if $a$ is known it must be entered as the first macro argument; +% otherwise $a$ is the unknown and the first Argument has to be the +% smaller one among $b$ and $c$. Since $b$ and$c$ may come from other +% computation the user has a dilemma: which is the smaller one? +% But this is a wrong approach; of course if the user knows which is the +% smaller, s/he can use the macro by entering the data in the proper +% order; but the user is determining the main axis, therefore it better +% that s/he uses directly the second macro |\MainAxisFromAxisAndFocus| +% that directly computes $a$ disregarding the order with which $b$ +% and $c$ are entered; the macro name suggests to enter $b$ first +% and $c$ second, but it is irrelevant thanks to the sum properties. +% Summarising: +%\begin{itemize}[noitemsep] +%\item if the main axis is known use |\AxisFromAxisAndFocus| by +% entering the main axis as the first argument; otherwise +%\item ~ +% \begin{itemize} +% \item if it is known which is smaller among $b$ and $c$, it is +% possible to use |\AxisFromAxisAndFocus| by entering the smaller +% one as the first argument; otherwise +% \item determine the main axis by using |\MainAxisFromAxisAndFocus| +% \end{itemize} +%\end{itemize} +% Their syntaxes of these two commands are basically the following: +%\begin{ttsyntax} +%\cs{AxisFromAxisAndFocus}\meta{main axis} and\meta{axis or focus} to\meta{focus or axis} +%\cs{MainAxisFromAxisAndFocus}\meta{axis or focus} and\meta{focus or axis} to\meta{main axis} +%\end{ttsyntax} +% but it is possible to enter the data in a different way with the +% first command; the described syntax is the suggested one. +% Evidently \meta{axis or focus} and \meta{focus or axis} imply +% that if you specify the focus in one of the two, you have to +% specify the axis in the other one. +% \begin{macrocode} + +\def\AxisFromAxisAndFocus#1and#2to#3{% +\fptest{abs(#1)>abs(#2)}% + {\edef#3{\fpeval{sqrt(#1**2-#2**2)}}}% + {\edef#3{\fpeval{sqrt(#2**2+#1**2)}}}} + +\def\MainAxisFromAxisAndFocus#1and#2to#3{% +\edef#3{\fpeval{sqrt(#2**2+#1**2)}}} +% \end{macrocode} +% The following macros allow to determine some scalar values relative +% to segments; in the second one the order of the segment end points is +% important, because the computed argument refers to the vector $P_2 - P_1$. +% Their syntaxes are the following: +%\begin{ttsyntax} +%\cs{SegmentLength}\parg{P1}\parg{P2}to\meta{length} +%\cs{SegmentArg}\parg{P1}\parg{P2}to\meta{argument} +%\end{ttsyntax} +% Both \meta{length} and \meta{argument} are macros that contain +% scalar quantities; the argument is in the range +% $-180^\circ <\Phi \leq +180^\circ$. +% \begin{macrocode} + +\def\SegmentLength(#1)(#2)to#3{\SubVect#1from#2to\Segm +\ModOfVect\Segm to#3} + +\def\SegmentArg(#1)(#2)to#3{\SubVect#1from#2to\Segm +\GetCoord(\Segm)\SegmX\SegmY\edef#3{\fpeval{atand(\SegmY,\SegmX)}}% +\ignorespaces} +% \end{macrocode} +% +% In the following sections we need some transformations, in +% particular the affine shear one. The macros we define here are +% not for general use, but are specific for the purpose of this package. +% +% The fist macro shears a segment, or better a vector that goes +% from point $P_1$ to point $P_2$ with a horizontal shear +% factor/angle $\alpha$; the origin of the vector does not vary +% and remains $P_1$ but the arrow tip of the vector is moved +% according to the shear factor; in practice this shearing macro +% is valid only for vectors that start from any point laying on +% the $x$ axis. The shear factor $\alpha$ is the angle of the +% \emph{clock wise} rotation vector operator by which the vertical +% coordinate lines get rotated with respect to their original position. +% The syntax is the following: +%\begin{ttsyntax} +%\cs{ShearVect}\parg{P1}\parg{P2}by\meta{shear} to\meta{vector} +%\end{ttsyntax} +% where \meta{P1} and \meta{P2} are the initial and final points of the +% vector to be sheared with the \meta{shear} angle, and the result is put +% in the output \meta{vector} +% \begin{macrocode} + +\def\ShearVect(#1)(#2)by#3to#4{% +\SubVect#1from#2to\AUX +\GetCoord(\AUX)\Aux\Auy +\edef\Aux{\fpeval{\Aux + #3*\Auy}}% +\edef\Auy{\fpeval{\Auy}}% +\AddVect\Aux,\Auy and#1to#4\ignorespaces} + +% \end{macrocode} +% Again we have another different |\ScaleVector| macro that takes in input +% the starting and ending points of a vector, and scales the vector +% independently of the initial point. +% \begin{macrocode} + +\def\ScaleVector(#1)(#2)by#3to#4{% +% Scala per il fattore #3 il vettore da #1 a #2 +\SubVect#1from#2to\AUX +\ScaleVect\AUX by#3to\AUX +\AddVect\AUX and#1to#4\ignorespaces} +% \end{macrocode} +% +% The following macro to draw a possibly sheared ellipse appears +% complicated; but in reality it is not much different from a +% “normal†ellipse drawing command. In oder to do the whole work +% the ellipse center is set in the origin of the axes, therefore +% it is not altered by the shearing process; everything else is +% horizontally sheared by the shear angle $\alpha$. In particular the +% 12~nodes and control point that are required by the Bézier +% splines that draw the four ellipse quarters. It is this multitude +% of shearing commands that makes the macro mach longer and apparently +% complicated. +% The syntax is the following: +%\begin{ttsyntax} +%\cs{Sellisse}\meta{$\star$}\marg{h-axis}\marg{v-axis}\oarg{shear} +% \end{ttsyntax} +% where the optional asterisk is used to mark and label the Bézier +% spline nodes and the control points of the possibly sheared ellipse; +% without the asterisk the ellipse is drawn without any “decorationâ€; +% the optional \meta{shear} is as usual the angle of the sheared +% vertical coordinate lines; its default value is zero. +% \begin{macrocode} +% +\NewDocumentCommand\Sellisse{s m m O{0}}{\bgroup +\CopyVect#2,#3to\Ptr \ScaleVect\Ptr by-1to\Pbl +\CopyVect#2,-#3to\Pbr \ScaleVect\Pbr by-1to\Ptl +\edef\Ys{\fpeval{tand{#4}}}% +\edef\K{\fpeval{4*(sqrt(2)-1)/3}}% +% +\ShearVect(0,0)(0,#3)by\Ys to\Pmt +\ShearVect(0,0)(0,-#3)by\Ys to\Pmb +\ShearVect(0,0)(#2,0)by\Ys to\Pmr +\ShearVect(0,0)(-#2,0)by\Ys to\Pml +% +\ShearVect(\Pmr)(\Ptr)by\Ys to\Ptr +\ShearVect(\Pml)(\Ptl)by\Ys to\Ptl +\ShearVect(\Pmr)(\Pbr)by\Ys to\Pbr +\ShearVect(\Pml)(\Pbl)by\Ys to\Pbl +% +\IfBooleanTF{#1}{\Pbox(\Ptr)[bl]{P_{tr}}\Pbox(\Pbl)[tr]{P_{bl}}% +\Pbox(\Pbr)[tl]{P_{br}}\Pbox(\Ptl)[br]{P_{tl}}% +\polygon(\Pbr)(\Ptr)(\Ptl)(\Pbl)}{}% +% +\ScaleVector(\Pmr)(\Ptr)by\K to\Crt +\ScaleVector(\Pmr)(\Pbr)by\K to\Crb +\ScaleVector(\Pml)(\Ptl)by\K to\Clt +\ScaleVector(\Pml)(\Pbl)by\K to\Clb +\ScaleVector(\Pmt)(\Ptr)by\K to\Ctr +\ScaleVector(\Pmt)(\Ptl)by\K to\Ctl +\ScaleVector(\Pmb)(\Pbr)by\K to\Cbr +\ScaleVector(\Pmb)(\Pbl)by\K to\Cbl +% +\IfBooleanTF{#1}{% + \Pbox(\Crt)[l]{C_{rt}}\Pbox(\Crb)[l]{C_{rb}} + \Pbox(\Clt)[r]{C_{lt}}\Pbox(\Clb)[r]{C_{lb}} + \Pbox(\Ctr)[b]{C_{tr}}\Pbox(\Ctl)[b]{C_{tl}} + \Pbox(\Cbr)[t]{C_{br}}\Pbox(\Cbl)[t]{C_{bl}} +% +\Pbox(\Pmr)[l]{P_{mr}}\Pbox(\Pmt)[b]{P_{mt}}% +\Pbox(\Pml)[r]{P_{ml}}\Pbox(\Pmb)[t]{P_{mb}}% +% +\polygon(\Pbr)(\Ptr)(\Ptl)(\Pbl)\thicklines}{}% +% +\moveto(\Pmr) +\curveto(\Crt)(\Ctr)(\Pmt) +\curveto(\Ctl)(\Clt)(\Pml) +\curveto(\Clb)(\Cbl)(\Pmb) +\curveto(\Cbr)(\Crb)(\Pmr) +\fillstroke +\egroup} + +% \end{macrocode} +% This user macro is used to call the |\Sellisse| macro with +% the desired parameters, but also to act with it on order +% to fill or stroke the ellipse contour, and to select some +% settings such as the contour line thickness, or the color +% of the ellipse contour or interior. +% the syntax is the following: +%\begin{ttsyntax} +%\cs{XSellisse}\meta{$\star$1}\parg{center}\oarg{angle}\aarg{shear}\marg{h-axis}\marg{v axis}\meta{$\star$2}\oarg{settings1}\oarg{settings2} +%\end{ttsyntax} +% where there are two optional asterisks, \meta{$\star$1} and +% \meta{$\star$2}; the first one controls the coloring of the ellipse: +% if present the interior is filled, if absent the contour is stroked; the +% second one controls the way a possibly sheared ellipse appears: +% if present, the construction is shown, if absent only the final result +% is shown; \meta{center} is optional: if present, the ellipse center is +% specified; if absent, its center is at the origin of the picture axes; +% \meta{angle} is optional with default value zero: if absent, +% the ellipse is not rotated and the \meta{h-axis} remains horizontal, +% while the \meta{v-axis} remains vertical, while if present and with a +% non vanishing value, the ellipse is rotated counterclockwise +% the amount specified, and, of course, if the value is negative, +% the rotation is clockwise. The optional parameter \meta{shear}, +% if present, shears the ellipse paralle the \meta{h-axis} direction; +% the \meta{settings1} and \meta{settings2} operate as described +% for command \cs{Xellisse}. +% \begin{macrocode} + +\NewDocumentCommand\XSellisse{ s D(){0,0} O{0} D<>{0} m m s O{} o }% + {\IfBooleanTF#1{\let\fillstroke\fillpath}% + {\let\fillstroke\strokepath}% + \put(#2){\rotatebox{#3}{#8\relax + \IfBooleanTF{#7}{\Sellisse*{#5}{#6}[#4]}% + {\Sellisse{#5}{#6}[#4]}% + \IfValueTF{#9}{\let\fillstroke\strokepath + #9\Sellisse{#5}{#7}[#4]}{}}}% + \ignorespaces} +% \end{macrocode} +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Regular polygons and special ellipses} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% We finally arrive to more complex macros used to create special +% polygons and special ellipses. +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsubsection{Regular polygons} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Regular polygons are not that special; it is possible to draw them +% by using the |\multiput| or |\xmultiput| commands, but a single +% command that does everything by itself with more built in +% functionalities is much handier. The new command |\RegPolygon| +% has the following syntax: +%\begin{ttsyntax} +%\cs{RegPoligon}\meta{$\star$}\parg{center}\marg{radius}\marg{number}\oarg{angle}\aarg{settings} +%\end{ttsyntax} +% where \meta{$\star$} is an optional asterisk; its presence means +% that the polygon interior is filled, instead of the polygon +% contour being stroked; the \meta{center} specification of the +% polygon is optional; if it is omitted, the polygon center goes +% to the origin of the |picture| coordinates; \meta{radius} is the +% mandatory radius of the circumscribed circle, or, in other words, +% the distance of each polygon vertex form the \meta{center}; the +% mandatory \meta{number} is an integer that specifies the number of +% polygon sides; the first vertex that is being drawn by this +% command, has an angle of zero degrees with respect to the +% \meta{center}; if a different initial \meta{angle} different from +% zero is desired, it is specified through this optional argument; +% possibly the angle bracketed optional \meta{setting} parameter +% may be used to specify, for example, the line thickness for the +% contour, and/or the color for the polygon contour or interior. +% See the documentation \file{euclideangeometry-man.pdf} for more +% information and usage examples. +% \begin{macrocode} + +\NewDocumentCommand\RegPolygon{s D(){0,0} m m O{0} D<>{\relax} }{{% +\countdef\I=258 \I=0 +\CopyVect#5:#3to\P +\CopyVect\fpeval{360/#4}:1to\R +\put(#2){#6\relax + \moveto(\P)\fpdowhile{\I < #4}% + {\MultVect\P by\R to\P%\GetCoord(\P)\X\Y + \lineto(\P)\advance\I by 1}% + \IfBooleanTF{#1}% + {\fillpath}{#6\strokepath}}}\ignorespaces} +%%%%%%%%% +\def\DirOfVect#1to#2{\GetCoord(#1)\t@X\t@Y +\ModOfVect#1to\@tempa +\unless\ifdim\@tempa\p@=\z@ + \DividE\t@X by\@tempa to\t@X + \DividE\t@Y by\@tempa to\t@Y +\fi\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}% +% \end{macrocode} +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsubsection{The Steiner ellipse} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The construction of the Steiner ellipse is very peculiar; it is +% almost intuitive that any triangle has infinitely many internal +% tangent ellipses; therefore it is necessary to state some other +% constraints to find one specific ellipse out from this unlimited set. +% +% One such ellipse is the Steiner one, obtained by adding the +% constraint that the ellipse be tangent to the median points +% of the triangle sides. But one thing is the definition, and +% another totally different one is to find the parameters of +% such an ellipse; and working with ruler and compass, it is +% necessary to find a procedure to draw such an ellipse. +% +% The construction described here and implemented with the +% |SteinerEllipse| macro is based on the following steps, each +% one requiring the use of some of the commands and/or +% transformations described in the previous sections. +%\begin{enumerate}[noitemsep] +%^^A +%\item Given a generic triangle (the coordinates of its three +% vertices) it is not necessary, but it is clearer to explain, +% if the triangle is shifted and rotated so as to have one of +% its sides horizontal, and the third vertex in the upper part +% of the |picture| drawing. So we first perform the initial +% shift and rotation and memorise the parameters of this +% transformation so that, at the end of the procedure, we can +% put back the triangle (and its Steiner ellipse) in its +% original position. Let us call this shifted and rotated triangle +% with the symbol $T_0$. +%^^A +%\item We transform $T_0$ with an affine shear transformation into an +% isosceles triangle $T_1$ that has the same base and the same +% height as $T_0$. We memorise the shear “angle†so as to proceed +% to an inverse transformation when the following steps are completed: +% let be $\alpha$ this shear angle; geometrically it represents the +% angle of the sheared vertical coordinate lines with respect +% to the original vertical position.\label{enum:shear} +%^^A +%\item With another affine vertical scaling transformation we transform $T_1$ into an equilateral triangle $T_2$; the ratio of the vertical +% transformation equals the ratio between the $T_2$ to the +% $T_1$ heights; we memorise this ratio for the reverse transformation +% at the end of the procedure.\label{enum:ratio} +%^^A +%\item The Steiner ellipse of the equilateral triangle $T_2$ is its +% incircle. We are almost done; we just have to proceed to the +% inverse transformations; getting back from $T_2$ to $T_1$ first implies +% transforming the incircle of $T_2$ into an ellipse with its +% vertical axis scaled by the inverse ratio memorised in +% step~\ref{enum:ratio}. +%^^A +%\item The second inverse transformation by the shear angle is easy +% with the passage from $T_1$ to $T_0$, but it would be more difficult +% for transforming the ellipse into the sheared ellipse. We have already +% defined the |\Sellipse| and the |\XSellipse| macros that may take +% care of the ellipse shear transformation; we already memorised the +% shear angle in step~\ref{enum:shear}, therefore the whole procedure, +% except for putting back the triangle, is almost done. +%^^A +%\item Eventually we perform the last shifting and rotating transformation +% and the whole construction is completed. +%^^A +%\end{enumerate} +% +% The new macro Steiner ellipse has therefore the following syntax: +%\begin{ttsyntax} +%\cs{SteinerEllipse}\meta{$\star$}\parg{P1}\parg{P2}\parg{P3}\oarg{diameter} +%\end{ttsyntax} +% where \meta{P1}, \meta{P2}, \meta{P3} are the vertices of the +% triangle; \meta{$\star$} is an optional asterisk; without it +% the maro draws only the final result, that contains only the +% given triangle and its Steiner ellipse; on the opposite, if the asterisk +% is used the whole construction from $T_0$ to its Steiner ellipse +% is drawn; the labelling of points is done with little dots of +% the default \meta{diameter} or a specified value; by default it is a 1\,pt +% diameter, but sometimes it would be better to use a slightly +% larger value (remembering that 1\,mm — about three points — +% is already too much). +% Please refer to the documentation file \file{euclideangeometry-man.pdf} +% for usage examples and suggestions. +% \begin{macrocode} +% + +\NewDocumentCommand\SteinerEllipse{s d() d() d() O{1}}{\bgroup +% +\IfBooleanTF{#1}{}{\put(#2)}{% + \CopyVect0,0to\Pu + \SubVect#2from#3to\Pd + \SubVect#2from#4to\Pt + \ModAndAngleOfVect\Pd to\M and\Rot + \MultVect\Pd by-\Rot:1 to\Pd \MultVect\Pt by-\Rot:1 to\Pt + \IfBooleanTF{#1}{}{\rotatebox{\Rot}}{\makebox(0,0)[bl]{% + \Pbox(\Pu)[r]{P_1}[#5]<-\Rot>\Pbox(\Pd)[t]{P_2}[#5]<-\Rot> + \Pbox(\Pt)[b]{P_3}[#5]<-\Rot>% + \polygon(\Pu)(\Pd)(\Pt)% + \edef\B{\fpeval{\M/2}}\edef\H{\fpeval{\B*tand(60)}} + \IfBooleanTF{#1}{\Pbox(\B,\H)[b]{H}[#5] + \polygon(\Pu)(\B,\H)(\Pd)}{}% + \edef\R{\fpeval{\B*tand(30)}} + \IfBooleanTF{#1}{\Pbox(\B,\R)[bl]{C}[#5] + \Circlewithcenter\B,\R radius{\R}}{}% + \GetCoord(\Pt)\Xt\Yt\edef\VScale{\fpeval{\Yt/\H}} + \IfBooleanTF{#1}{\polyline(\Pu)(\B,\Yt)(\Pd) + \Pbox(\B,\Yt)[b]{V}[#5]}{}% + \edef\Ce{\fpeval{\R*\VScale}} + \IfBooleanTF{#1}{\Xellisse(\B,\Ce){\R}{\Ce} + \Pbox(\B,\Ce)[r]{C_e}[#5]\Pbox(\B,0)[t]{B}[#5]}{}% + \SubVect\B,0 from\Pt to\SlMedian + \IfBooleanTF{#1}{\Dotline(\B,0)(\Pt){2}[1.5]}{}% + \ModAndAngleOfVect\SlMedian to\Med and\Alfa + \edef\Alfa{\fpeval{90-\Alfa}} + \IfBooleanTF{#1}{\Dotline(\B,\Yt)(\B,0){2}[1.5] + \Pbox(\fpeval{\B+\Ce*tand{\Alfa}},\Ce)[l]{C_i}[#5] + \VectorArc(\B,0)(\B,15){-\Alfa} + \Pbox(\fpeval{\B+2.5},14)[t]{\alpha}[0]}{}% + \edef\a{\R}\edef\b{\Ce}% +\CopyVect\fpeval{\B+\Ce*tand{\Alfa}},\Ce to\CI +\XSellisse(\CI)<\Alfa>{\R}{\Ce} +}}}% +\egroup\ignorespaces} +\let\EllisseSteiner\SteinerEllipse +% \end{macrocode} +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%\subsubsection{The ellipse that is internally tangent to a triangle while one of its foci is prescribed} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% We now are going to tackle another problem. As we said before, any +% triangle has an infinite set of internally tangent circles, unless +% some further constraint is specified. +% +% Another problem of this kind is the determination and geometrical +% construction of an internally tangent ellipse when one focus is +% specified; of course since the whole ellipse is totally internal +% to the triangle, we assume that the user has already verified +% that the coordinates of the focus fall inside the triangle. +% We are not going to check this feature in place of the user; +% after all, if the user draws the triangle within a |picture| image, +% together with the chosen focus, is suffices a glance to verify that +% such focus lays within the triangle perimeter. +% +% The geometrical construction is quite complicated, but it is +% described in a paper by Estevão V.~Candia on \TB~2019 \textbf{40}(3); +% it consists of the following steps. +%\begin{enumerate}[noitemsep] +%^^A +%\item Suppose you have specified a triangle by means of its three +% vertices, and a point inside it to play the role of a focus; it +% is necessary to find the other focus and the main axis length in +% order to have a full description of the ellipse. +%^^A +%\item To do so, it is necessary to find the focus three symmetrical +% points with respect to the three sides. +%^^A +%\item The center of the three point circle through these symmetrical +% points is the second focus. +%^^A +%\item The lines that join the second focus to the three symmetrical +% points of the first focus, intersect the triangle sides in three +% points that result to be the tangency points of the ellipse to the +% triangle. +%^^A +%\item Chosen one of these tangency points and computing the sum of its +% distances from both foci, the total length of the ellipsis main axis +% is found. +%^^A +%\item Knowing both foci, the total inter focal distance is found, +% therefore equation~\eqref{equ:axes-foci} allows to find the other +% axis length. +%^^A +%\item The inclination of the focal segment gives us the the rotation +% to which the ellipse is subject, and the middle point of such +% segment gives the ellipse center. +%^^A +%\item At this point we have all the necessary elements to draw +% the ellipse. +%^^A +%\end{enumerate} +% +% We need another little macro to find the symmetrical points; +% if the focus $F$ and its symmetrical point $P$ with respect +% to a side/segment, the intersection of such segment $F-P$ with +% the side is the segment middle point $M$; from this property +% we derive the formula $P= 2M -F$. Now $M$ is also the +% intersection of the line passing through $F$ and perpendicular +% to the side. Therefore it is particularly simple to compute, +% but its better to have available a macro that does the whole +% work; here it is, but it assumes the the center of symmetry is +% already known: +% \begin{macrocode} + +\def\SymmetricalPointOf#1respect#2to#3{\ScaleVect#2by2to\Segm +\SubVect#1from\Segm to#3\ignorespaces} +% \end{macrocode} +% And its syntax is the following: +%\begin{ttsyntax} +%\cs{SymmetricalPointOf}\meta{focus} respect\meta{symmetry center} +%\qquad to\meta{symmetrical point} +%\end{ttsyntax} +% where the argument names are self explanatory. +% +% The overall macro that executes all the passages described in +% the above enumeration follows; the reader can easily recognise +% the various steps, since the names of the macros are self +% explanatory; the $G_i$ point names are the symmetrical ones +% to the first focus $F$; the $M_i$ points are the centers of +% symmetry; the $F'$ point is the second focus; the $T_i$ points +% are the tangency points. The macro |\EllipseWithFOcus| has the +% following syntax: +%\begin{ttsyntax} +%\cs{EllipseWithFocus}\meta{$\star$}\parg{P1}\parg{P2}\parg{P3}\parg{focus} +%\end{ttsyntax} +% where \meta{P1}, \meta{P2}, \meta{P3} are the triangle vertices +% and \meta{focus} contains the first focus coordinates; the +% optional asterisk, as usual, selects the construction steps +% versus the final result: no asterisk, no construction steps. +% \begin{macrocode} + +\NewDocumentCommand\EllipseWithFocus{s d() d() d() d()}{\bgroup% +\CopyVect#2to\Pu +\CopyVect#3to\Pd +\CopyVect#4to\Pt +\CopyVect#5to\F +\polygon(\Pu)(\Pd)(\Pt) +\Pbox(\Pu)[r]{P_1}[1.5pt]\Pbox(\Pd)[t]{P_2}[1.5pt] +\Pbox(\Pt)[b]{P_3}[1.5pt]\Pbox(\F)[b]{F}[1.5pt] +\SegmentArg(\Pu)(\Pt)to\At +\SegmentArg(\Pu)(\Pd)to\Ad +\SegmentArg(\Pd)(\Pt)to\Au +\IntersectionOfLines(\Pu)(\At:1)and(\F)(\fpeval{\At+90}:1)to\Mt +\IntersectionOfLines(\Pd)(\Ad:1)and(\F)(\fpeval{\Ad+90}:1)to\Md +\IntersectionOfLines(\Pd)(\Au:1)and(\F)(\fpeval{\Au+90}:1)to\Mu +\IfBooleanTF{#1}{\Pbox(\Mt)[br]{M_3}[1.5pt]\Pbox(\Md)[t]{M_2}[1.5pt] + \Pbox(\Mu)[b]{M_1}[1.5pt]}{} +\SymmetricalPointOf\F respect\Mu to\Gu +\IfBooleanTF{#1}{\Pbox(\Gu)[l]{G_1}[1.5pt]}{} +\SymmetricalPointOf\F respect \Md to\Gd +\IfBooleanTF{#1}{\Pbox(\Gd)[t]{G_2}[1.5pt]}{} +\SymmetricalPointOf\F respect \Mt to\Gt +\IfBooleanTF{#1}{\Pbox(\Gt)[r]{G_3}[1.5pt]}{} +\IfBooleanTF{#1}{\ThreePointCircle*(\Gu)(\Gd)(\Gt)}% + {\ThreePointCircle(\Gu)(\Gd)(\Gt)} +\CopyVect\C to\Fp \Pbox(\Fp)[l]{F'}[1.5pt] +\IfBooleanTF{#1}{% +\Dotline(\F)(\Gt){2}[1.5pt] +\Dotline(\F)(\Gd){2}[1.5pt] +\Dotline(\F)(\Gu){2}[1.5pt]}{} +\IntersectionOfSegments(\Pu)(\Pt)and(\Fp)(\Gt)to\Tt +\IntersectionOfSegments(\Pu)(\Pd)and(\Fp)(\Gd)to\Td +\IntersectionOfSegments(\Pd)(\Pt)and(\Fp)(\Gu)to\Tu +\IfBooleanTF{#1}{\Pbox(\Tu)[l]{T_1}[1.5pt] +\Pbox(\Td)[b]{T_2}[1.5pt] +\Pbox(\Tt)[tl]{T_3}[1.5pt] +\Dashline(\Fp)(\Gu){1}\Dashline(\Fp)(\Gd){1}\Dashline(\Fp)(\Gt){1}}{} +\DistanceAndDirOfVect\Fp minus\Tt to\DFp and\AFu +\DistanceAndDirOfVect\F minus\Tt to\DF and\AF +\SegmentCenter(\F)(\Fp)to\CE \Pbox(\CE)[b]{C}[1.5pt] +\edef\a{\fpeval{(\DFp+\DF)/2}} +\SegmentArg(\F)(\Fp)to\AngFocalAxis +\SegmentLength(\F)(\CE)to\c +\AxisFromAxisAndFocus\a and\c to\b +\Xellisse(\CE)[\AngFocalAxis]{\a}{\b}[\thicklines] +\VECTOR(-30,0)(120,0)\Pbox(120,0)[t]{x}[0] +\VECTOR(0,-20)(0,130)\Pbox(0,130)[r]{y}[0]\Pbox(0,0)[tr]{O}[1.5pt] +\egroup\ignorespaces} +\let\EllisseConFuoco\EllipseWithFocus +% \end{macrocode} +% +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{Comments on this package} +%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% In general we found very comfortable to draw ellipses and +% to define macros to draw not only such shapes or filled elliptical +% areas, but also to create “legends†with coloured backgrounds and +% borders; such applications found their way in other works. +% But here we dealt with other geometrical problems. The accompanying +% document |euclideangeometry-man.pdf| describes much clearly with +% examples what you can do with the macros described in this package. +% In facts, this file just describes the package macros, and it gives +% some ideas on how to extend the ability of |curve2e| to draw geometrical +% diagrams. +% The users who would like to modify or to add some functionalities +% are invited to do so; I will certainly acknowledge their contributions +% and even add their names to the list of authors. +% +% As long as I can, I enjoy playing with \LaTeX and its wonderful +% facilities; but, taking into consideration my age, I would invite +% the users to consider the possibility of assuming the maintenance +% of this package. +% +%\iffalse +%</package> +%\fi +% +%\iffalse +%<*readme> +%^^A\fi +% \section{The \texttt{README.txt} file} +% The following is the text that forms the contents of the |README.txt| +% file that accompanies the package. We found it handy to have it in +% the documented source, because in this way certain pieces of +% information don't need to be repeated again and again in different +% files. +% \begin{macrocode} +The package bundle euclideangeometry is composed of the following files + +euclideangeometry.dtx +euclideangeometry.pdf +euclideangeometry-man.tex +euclideangeometry-man.pdf +README.txt + +euclideangeometry.dtx is the documented TeX source file of package +euclideangeometry.sty; you get euclideangeometry.sty, +euclideangeometry.pdf by running pdflatex on euclideangeometry.dtx. + +README.txt, this file, contains general information. + +euclideangeometry-man.tex and euclideangeometry-man.pdf are +the source file and the readable document containing the end +user manual. +In other words euclideangeometry.pdf is oriented towards the +developers and euclideangeometry-man.pdf to the end users. + + +Claudio Beccari + +claudio dot beccari at gmail dot com +% \end{macrocode} +%^^A\iffalse +%</readme> +%\fi +% \Finale +%^^A <driver>\endinput diff --git a/macros/latex/contrib/euclideangeometry/euclideangeometry.pdf b/macros/latex/contrib/euclideangeometry/euclideangeometry.pdf Binary files differnew file mode 100644 index 0000000000..6246a0b604 --- /dev/null +++ b/macros/latex/contrib/euclideangeometry/euclideangeometry.pdf diff --git a/macros/latex/contrib/metastr/README.txt b/macros/latex/contrib/metastr/README.txt new file mode 100644 index 0000000000..45f64fedc2 --- /dev/null +++ b/macros/latex/contrib/metastr/README.txt @@ -0,0 +1,37 @@ +metastr v1.0 +Copyright 2020 Niklas Beisert + +metastr is a LaTeX2e package +to store and compose strings in a structured way. +This can serve several purposes such as: +manage and write document metadata; +use templates for formatting document data; +assist in assembling and displaying document license information; +facilitate basic internationalisation and localisation. + +The package consists of the files + + README.txt readme file + metastr.ins installation file + metastr.dtx source file + metastr.sty package file + metasamp.tex sample latex file + metastr.pdf manual + +The distribution consists of the files +README.txt, metastr.ins and metastr.dtx. + +Run "(pdf)latex metastr.dtx" to compile the manual metastr.pdf. + +Run "latex metastr.ins" to create the package metastr.sty +and the sample metasamp.tex. +Copy the file metastr.sty to an appropriate directory of your LaTeX +distribution, e.g. texmf-root/tex/latex/metastr. + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. diff --git a/macros/latex/contrib/metastr/metastr.dtx b/macros/latex/contrib/metastr/metastr.dtx new file mode 100644 index 0000000000..474c224f9a --- /dev/null +++ b/macros/latex/contrib/metastr/metastr.dtx @@ -0,0 +1,3323 @@ +% \iffalse +% +% metastr.dtx Copyright (C) 2020 Niklas Beisert +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Niklas Beisert. +% +% This work consists of the files metastr.dtx and metastr.ins +% and the derived files metastr.sty and metasamp.tex. +% +%<package|sample>\NeedsTeXFormat{LaTeX2e}[1996/12/01] +%<package>\ProvidesPackage{metastr}[2020/02/06 v1.0 Metadata Strings Storage] +%<sample>\ProvidesFile{metasamp.tex}[2020/02/06 v1.0 sample for metastr] +%<*driver> +\def\thedate#1{2020/02/06}\def\theversion#1{v1.0} +\ProvidesFile{metastr.dtx}[\thedate{} \theversion{} metastr reference manual file] +\PassOptionsToClass{10pt,a4paper}{article} +\documentclass{ltxdoc} + +\usepackage[margin=35mm]{geometry} +\usepackage{hyperref} +\usepackage{hyperxmp} +\usepackage[usenames]{color} +\usepackage[utf8]{inputenc} +\usepackage{babel} +\usepackage{graphicx} +\usepackage{ccicons} +\newcommand{\translate}[1]{\ignorespaces} + +\IfFileExists{doclicense.sty}{}{% + \GenericWarning{please install package `doclicense'}} + +\hypersetup{colorlinks=true} +\hypersetup{pdfstartview=FitH} +\hypersetup{pdfpagemode=UseNone} +\hypersetup{keeppdfinfo} +\hypersetup{pdfsource={}} +\hypersetup{pdflang={en-UK}} +\hypersetup{pdfcopyright={Copyright 2020 Niklas Beisert. + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version 1.3 + of this license or (at your option) any later version.}} +\hypersetup{pdflicenseurl={http://www.latex-project.org/lppl.txt}} +\hypersetup{pdfcontactaddress={ETH Zurich, ITP, HIT K, + Wolfgang-Pauli-Strasse 27}} +\hypersetup{pdfcontactpostcode={8093}} +\hypersetup{pdfcontactcity={Zurich}} +\hypersetup{pdfcontactcountry={Switzerland}} +\hypersetup{pdfcontactemail={nbeisert@itp.phys.ethz.ch}} +\hypersetup{pdfcontacturl={http://people.phys.ethz.ch/\xmptilde nbeisert/}} + +\newcommand{\secref}[1]{\hyperref[#1]{section \ref*{#1}}} + +\parskip1ex +\parindent0pt +\let\olditemize\itemize +\def\itemize{\olditemize\parskip0pt} + +\begin{document} + +\title{The \textsf{metastr} Package} +\hypersetup{pdftitle={The metastr Package}} +\author{Niklas Beisert\\[2ex] + Institut f\"ur Theoretische Physik\\ + Eidgen\"ossische Technische Hochschule Z\"urich\\ + Wolfgang-Pauli-Strasse 27, 8093 Z\"urich, Switzerland\\[1ex] + \href{mailto:nbeisert@itp.phys.ethz.ch} + {\texttt{nbeisert@itp.phys.ethz.ch}}} +\hypersetup{pdfauthor={Niklas Beisert}} +\hypersetup{pdfsubject={Manual for the LaTeX2e Package metastr}} +\date{\thedate{}, \theversion{}} +\maketitle + +\begin{abstract}\noindent +\textsf{metastr} is a \LaTeXe{} package +to store and compose strings in a structured way. +This can serve several purposes such as: +manage and write document metadata; +use templates for formatting document data; +assist in assembling and displaying document license information; +facilitate basic internationalisation and localisation. +\end{abstract} + +\begingroup +\parskip0ex +\tableofcontents +\endgroup + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Introduction} + +This package provides some basic functionality +to store and compose strings. +The main goal is to keep relevant information +for the document in a structured way +such that it can be accessed and used by conveniently +using some standardised methods. + +The package has the following goals, tasks and features: +% +\begin{itemize} +\item +manage document metadata and write them to the PDF output file; +\item +set up and use templates for formatting document data, e.g.\ for title pages; +\item +assist in assembling and displaying document license information; +\item +facilitate basic internationalisation and localisation; +\item +provide preset texts and common license statements +in different languages. +\end{itemize} +% +Using the structures provided by the packages makes particular sense +if you can rely on predefined text and formatting or if you have a couple +of similar documents for which you can define suitable templates. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Usage} +\label{sec:usage} + +To use the package \textsf{metastr}, add the command +% +\begin{center} +|\usepackage{metastr}| +\end{center} +% +to the preamble of the \LaTeX{} document. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Defining Strings} +\label{sec:def} + +\DescribeMacro{\metadef} +\DescribeMacro{\metaset} +The package supplies registers for storing data. +Registers need to be declared before they can be filled or used +(unless the package option |checkdef=false| is set, +see \secref{sec:options}). +A new register \textit{reg} is declared by the command: +% +\begin{center} +|\metadef{|\textit{reg}|}| +\end{center} +% +The register \textit{reg} can be filled +with the value \textit{def} +by the command: +% +\begin{center} +|\metaset{|\textit{reg}|}{|\textit{def}|}| +\end{center} +% + +The package declares a couple of registers for storing standard metadata. +The basic set of registers consists of: +% +\begin{center} +\begin{tabular}{ll} +|title| & document title +\\ +|subtitle| & document subtitle +\\ +|author| & document author +\\ +|location| & location associated to the document +\\ +|date| & document date +\\ +|subject| & `subject' of the document +\\ +|keywords| & (a list of) keywords describing the document +\\ +|titletext| & composition register for title +\end{tabular} +\end{center} +% + +The register |titletext| composes information +for printing the title +(such as |title|, |subtitle|, |author|, |location| and |date|). +It can serve a similar purpose as the \LaTeX{} command |\maketitle|. + +Finally, there are some auxiliary registers: +% +\begin{center} +\begin{tabular}{ll} +|language| & +main language of the document +\\ +|url| & +URL of the document or additional info on it +\\ +|urlmessage| & +message to describe the document URL +\\ +|source| & +name of the source file +\\ +|draft| & +indicator of draft version +\end{tabular} +\end{center} +% +The register |language| specifies +the main language used in the document. +This should be a two-letter language code (\textit{ln}) +potentially followed by two-letter country code +(\textit{ln}|-|\textit{CN}) such as |en| or |en-GB|. +The language has some impact on selecting +register variants, see \secref{sec:variants} and \secref{sec:language}, +it should therefore be set by the command: +% +\begin{center} +|\metasetlang|[|*|]|{|\textit{ln-CN}|}| +\end{center} +% +The starred version declares the language for PDF metadata +rather than the document contents. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Working with Strings} +\label{sec:work} + +\DescribeMacro{\metaget} +A register \textit{reg} can be read out by the macro: +% +\begin{center} +|\metaget[]{|\textit{reg}|}{|\textit{def}|}| +\end{center} +% +Note that the (empty) argument in square brackets is mandatory, +it cannot be left out, see \secref{sec:variants} +for further details on its purpose. +This is because |\metaget| must be robust so that its output +can be processed for writing (optional arguments make a macro fragile). +In case the register \textit{reg} has not been filled, +|\metaget| returns nothing. + +\DescribeMacro{\metaif} +Sometimes one may want to test whether a register is filled or not, +e.g.\ in order to display a default value otherwise. +This can be achieved by the conditional: +% +\begin{center} +|\metaif[]{|\textit{reg}|}{|\textit{true}|}{|\textit{false}|}| +\end{center} +% +If the register \textit{reg} is filled, return \textit{true} +otherwise \textit{false}. +Again, the argument in square brackets is mandatory. + +\DescribeMacro{\metaunset} +The following command cleans a register \textit{reg} +which has previously been filled: +% +\begin{center} +|\metaunset{|\textit{reg}|}| +\end{center} +% +Note that cleaning is different from filling an empty string +when it comes to the conditional |\metaif| +which evaluates true for an empty string but false for a clean register. + +\DescribeMacro{\metaappend} +\DescribeMacro{\metaprepend} +\DescribeMacro{\metaaddsep} +The content of registers can be manipulated by some commands. +To append or prepend a string to a register, +use the commands: +% +\begin{center} +\begin{tabular}{l} +|\metaappend{|\textit{reg}|}{|\textit{def}|}|\\ +|\metaprepend{|\textit{reg}|}{|\textit{def}|}|\\ +|\metaaddsep{|\textit{reg}|}{|\textit{sep}|}{|\textit{def}|}| +\end{tabular} +\end{center} +% +The latter command |\metaaddsep| is designed to compose lists with separators, +it appends the separator \textit{sep} +and the value \textit{def} unless the register is clean, +in which case it is set to \textit{def} without the separator \textit{sep}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{String Variants} +\label{sec:variants} + +A versatile feature of the registers is that they can be provided +in several variants. +These variants can be used for producing different representations +of the same register depending on the intended situation. +For example, a title could be given in a fully formatted version +|print| for printing, a bare version for metadata +and a shortened version for headings. +Similarly, translations to different languages +could be stored as different versions of the same register, +see \secref{sec:language}. +Moreover, certain attributes related to the registers +could be stored in additional variants. + +For example, the register |titletext| exists in +the default variant (mainly intended for writing out metadata) +and the |print| variant +(for printing out a combination of title data on the title page). +The default variant expands to a combination +of |draft|, |title| and |subtitle| +(as far as filled): +% +\begin{center} +[\textit{draft}: ]\textit{title}[ -- \textit{subtitle}] +\end{center} +% +The |print| variant is accessed by the command: +% +\begin{center} +|\metapick[print]{titletext}| +\end{center} +% +It expands to four lines +containing |title|, |subtitle| + |draft|, |author| and |location| + |date| +(as far as filled): +% +\begin{center} +\textit{title}\\ +\textit{subtitle} |\par| \textit{draft}\\ +\textit{author}\\ +\textit{location}, \textit{date} +\end{center} +% +The formatting style of each line is given +by the variant |style| of the first register on this line; +the vertical space above each line is +produced by the variant |skip|. +Two items on a single line are separated by the variant |sep| +of the second register; +an unfilled |sep| variant puts the two items on individual lines +(by default this applies to |subtitle| and |draft|). +In this way the layout of the title display on the title page +can be adjusted conveniently +(by default it mimics the \LaTeX{} command |\maketitle| +in the class \textsf{article}). + +Variants are always specified by an argument |[|\textit{var}|]| +in square brackets preceding the register |{|\textit{reg}|}|. +This argument is optional for commands +which set registers and which can be fragile; +it is however \emph{mandatory} for macros which read +the register content and whose output needs to be expandable +into the output stream +(even though the register is not optional, +it is more uniform to stick with square brackets to specify the variant). +The main declaration involving variants is: +% +\begin{center} +|\metaset[|\textit{var}|]{|\textit{reg}|}{|\textit{def}|}| +\end{center} +% +This command defines the register \textit{reg} in variant \textit{var} +as \textit{def}. +The default variant is the empty string, +while the variant |print| is intended for printed output. +The variant string is obtained by: +% +\begin{center} +|\metaget[|\textit{var}|]{|\textit{reg}|}| +\end{center} + +\DescribeMacro{\metapick} +The variant mechanism can become powerful +through macros which fall back to default variants +if the desired variant has not been filled explicitly: +% +\begin{center} +|\metapick[|\textit{var}|]{|\textit{reg}|}| +\end{center} +% +This macro tests whether the variant \textit{var}, +the language variant \textit{ln} +specified through |\metasetlang{|\textit{ln}|}|, +the generic (empty) variant +or a fallback language variant have been specified. +If so, their value is returned (in this order of preference). +Importantly, the intended variant \textit{var} is passed along +to the evaluation of \textit{reg} as the argument `|#1|' in +the definition string \textit{def} of |\metaset|. +This allows to define a register in one generic variant +which composes other registers in more specific variants. +To that end reference registers should be accessed by the construct: +% +\begin{center} +|\metaset{|\textit{reg1}|}{|\ldots|\metapick[#1]{|\textit{reg2}|}|\ldots|}| +\end{center} +% +When this register is accessed by +|\metapick[|\textit{var}|]{|\textit{reg1}|}|, +it will read the default variant of \textit{reg1} +which will pass on to \textit{reg2} in \textit{var} +(rather than in the default variant). + +\DescribeMacro{\metaifpick} +\DescribeMacro{\metacompose} +There also exist a corresponding conditional: +% +\begin{center} +|\metaifpick[|\textit{var}|]{|\textit{reg}|}|% + |{|\textit{true}|}{|\textit{false}|}| +\end{center} +% +This command tests whether any of the above variants \textit{var} +have been filled. +Another convenient macro to more efficiently compose strings is: +% +\begin{center} +|\metacompose[|\textit{var}|]{|\textit{reg}|}|% + |{|\textit{prefix}|}{|\textit{postfix}|}{|\textit{empty}|}| +\end{center} +% +It returns the intended register value with prefix string \textit{prefix} +and suffix string \textit{suffix} if any of the above variants +have been filled; otherwise it returns \textit{empty}. +For example, the prefix and/or suffix could be separators for +displaying the content of an optional register. + +In dealing with variants, +the following commands specify the variant \textit{var} +as an optional argument |[|\textit{var}|]|: +% +\begin{center} +\begin{tabular}{l} +|\metaset[|\textit{var}|]{|\textit{reg}|}{|\textit{def}|}|\\ +|\metaunset[|\textit{var}|]{|\textit{reg}|}|\\ +|\metaappend[|\textit{var}|]{|\textit{reg}|}{|\textit{def}|}|\\ +|\metaprepend[|\textit{var}|]{|\textit{reg}|}{|\textit{def}|}|\\ +|\metaaddsep[|\textit{var}|]{|\textit{reg}|}{|\textit{sep}|}{|\textit{def}|}| +\end{tabular} +\end{center} +% +For the following macros, specifying the variant \textit{var} +as |[|\textit{var}|]| is \emph{mandatory}: +% +\begin{center} +|\metaget[|\textit{var}|]{|\textit{reg}|}|\\ +|\metapick[|\textit{var}|]{|\textit{reg}|}|\\ +|\metaifpick[|\textit{var}|]{|\textit{reg}|}|% + |{|\textit{true}|}{|\textit{false}|}|\\ +|\metacompose[|\textit{var}|]{|\textit{reg}|}|% + |{|\textit{prefix}|}{|\textit{postfix}|}| +\end{center} +% +Here, the default variant is accessed by an empty argument \textit{var}. + +To illustrate a construction using variants, +let us consider the above register |titletext|. +It is defined in the generic variant as: +% +\begin{center} +\begin{tabular}{l} +|\metaset{titletext}{%|\\ +| \metacompose[#1]{draft}{}{: }{}%|\\ +| \metapick[#1]{title}%|\\ +| \metacompose[#1]{subtitle}{\metaget[sep]{subtitle}}{}{}}| +\end{tabular} +\end{center} +% +This expands to the prefix `\textit{draft}: ' (if available), +the main title `\textit{title}' +and the suffix ` -- \textit{subtitle}' (if available). +The |print| variant to output a full title for the document is defined by: +% +\begin{center} +\begin{tabular}{l} +|\metaset[print]{titletext}{%|\\ +| \metatitleline[print]{title}%|\\ +| \metatitlelinetwo[print]{subtitle}[print]{draft}%|\\ +| \metatitleline[print]{author}%|\\ +| \metatitlelinetwo[print]{location}[print]{date}}| +\end{tabular} +\end{center} +% +Here, the macros |\metatitleline|[|two|] produce a title line +consisting of one or two items. +The single-item version is defined as: +% +\begin{center} +\begin{tabular}{l} +|\def\metatitleline[#1]#2{%|\\ +| \metacompose[#1]{#2}|\\ +| {\metaget[skip]{#2}\begingroup\metaget[style]{#2}}|\\ +| {\par\endgroup}{}}| +\end{tabular} +\end{center} +% +If register |#2| is filled, +this expands to the vertical skip defined by the variant |skip| +and an encapsulated paragraph of the register value +in the layout defined by the variant |style|. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Write Document Metadata} +\label{sec:meta} + +The contents of certain registers can be written out to +PDF files as metadata using the package \textsf{hyperref} +and the extension \textsf{hyperxmp}. + +\DescribeMacro{\metawritepdfinfo} +The basic metadata registers are written out by |\metawritepdfinfo| +using \textsf{hyperref}. +The mapping between \textsf{metastr} registers +and \textsf{hyperref} |\hypersetup| options is given by: +% +\begin{center} +\begin{tabular}{l@{\quad$\to$\quad}l} +|titletext| & |pdftitle| +\\ +|author| & |pdfauthor| +\\ +|subject| & |pdfsubject| +\\ +|keywords| & |pdfkeywords| +\end{tabular} +\end{center} +% +Here, |titletext| is used instead of |title| to compose information +from the registers |draft|, |title| and |subtitle| (as far as filled). +Note that |\metawritepdfinfo| will be effective +only when invoked before the contents of the first page are written out. + +\DescribeMacro{\metawritepdfaux} +Auxiliary metadata is written out using \textsf{hyperxmp} +by the command |\metawritepdfaux| with the mapping: +% +\begin{center} +\begin{tabular}{l@{\quad$\to$\quad}l} +|url| & |pdfurl| +\\ +|source| & |pdfsource| +\end{tabular} +\end{center} + +\DescribeMacro{\metawritepdfpreamble} +Some metadata must be written out sufficiently early, +i.e.\ in the document preamble, in order to go into effect. +These include the language settings, +and they are written out by |\metawritepdfpreamble| +with the mapping: +% +\begin{center} +\begin{tabular}{l@{\quad$\to$\quad}l} +|language| & |pdflang| +\\ +|language| variant |[meta]| & |pdfmetalang| +\\ + & |keeppdfinfo| +\end{tabular} +\end{center} +% +Note that |pdfmetalang| is a setting of \textsf{hyperxmp} +and will be ignored if the package is not loaded. +Furthermore, the \textsf{hyperxmp} option |keeppdfinfo| +will be set unless the package option |xmppdfinfo=false| is set. + +\DescribeMacro{\metawritepdfcontact} +A contact can be specified within PDF files +in a standardised format using \textsf{hyperxmp}. +The command |\metawritepdfcontact| passes on the following +registers with the mapping: +% +\begin{center} +\begin{tabular}{l@{\quad$\to$\quad}l} +|contactaddress| & |pdfcontactaddress| +\\ +|contactpostcode| & |pdfcontactpostcode| +\\ +|contactcity| & |pdfcontactcity| +\\ +|contactregion| & |pdfcontactregion| +\\ +|contactcountry| & |pdfcontactcountry| +\\ +|contactemail| & |pdfcontactemail| +\\ +|contacturl| & |pdfcontacturl| +\end{tabular} +\end{center} + +\DescribeMacro{\metawritepdfrights} +A document copyright statement, see \secref{sec:rights}, +is recorded within the PDF file by |\metawritepdfrights| +using \textsf{hyperxmp} with the mapping: +% +\begin{center} +\begin{tabular}{l@{\quad$\to$\quad}l} +|rightstext| & |pdfcopyright| +\\ +|licenseurl| & |pdflicenseurl| +\end{tabular} +\end{center} +% + +\DescribeMacro{\metawritepdf} +\DescribeMacro{writepdf} +Finally, it makes sense to write out PDF metadata automatically. +This is controlled by filling or clearing certain variants \textit{var} +of the register |writepdf|: +% +\begin{center} +\begin{tabular}{rl} +&|\metaset[|\textit{var}|]{writepdf}{}|\\ +or&|\metaunset[|\textit{var}|]{writepdf}| +\end{tabular} +\end{center} +% +If the variant |auto| is filled (default), +PDF metadata is written automatically +at the beginning of the |document| block +by calling |\metawritepdf|. +The command |\metawritepdf| calls +the commands |\metawritepdf|\ldots{} +depending on whether the variants |info|, |aux|, |preamble|, +|contact|, |rights| of the register |writepdf| are filled; +the variants |info|, |aux|, |preamble| are enabled by default, +the variants |contact|, |rights| need to be enabled explicitly. + +Note that the basic metadata such as |author| and |title| +do not have to be defined already in the preamble, +but (depending on the combination of drivers and packages) +they can be set before the contents of the first page +are shipped out to the PDF file. +If the basic registers are to be declared on the first page, +one should disable their automatic writing by +|\metaunset[info]{writepdf}|. +When the corresponding registers have been filled, +(but no later than the end of the first page), +they need to be written manually +by invoking |\metawritepdfinfo|. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Copyright and Licenses} +\label{sec:rights} + +Specifying a copyright statement and a license is very useful because it +makes the allowed (re)use of the provided material evident to the reader. +However, it also takes some efforts to set things up properly. +The package \textsf{metastr} provides some default texts to +state the license for a couple of well-established licenses. +For instance, the set of Creative Commons licenses has become a standard +to mark the intended (re)use of a document involving creative content. +For documents related to software, there is a number of +standard software licenses to choose from. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{Registers.} + +The package declares the following registers to state the copyright: +% +\begin{center} +\begin{tabular}{ll} +|copyrightmark| & `\copyright' (|print| variant) or ``Copyright'' +\\ +|copyrightdate| & copyright date +\\ +|copyrightowner| & copyright owner +\\ +|copyrightstatement| & combines: +|...mark| + |...date| + |...owner| +\\ +|copyrightmessage| & a message explaining the copyright situation +\end{tabular} +\end{center} +% +The package declares the following registers to state the license: +% +\begin{center} +\begin{tabular}{ll} +|licensemessage| & licensing message +\\ +|licenseprovider| & license provider +\\ +|licenseversion| & license version +\\ +|licenselogo| & license logo inclusion +\\ +|licenselogomessage| & display the license logo +\\ +|licenseurl| & URL with license text and details +\\ +|licenseurlmessage| & display the license URL +\end{tabular} +\end{center} +% +Furthermore, there are some related auxiliary registers: +% +\begin{center} +\begin{tabular}{ll} +|partof| & specifies the work this document is a part of +\\ +|partofmessage| & a message declaring being part of +\\ +|attributionmessage| & a message declaring attributions +\\ +|rightstext| & a composition template for all of the above +\end{tabular} +\end{center} +% +The above information is compiled automatically in the register |rightstext|. +It can be written as PDF metadata +as well as printed with formatting: +% +\begin{center} +|\metapick[print]{rightstext}| +\end{center} +% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{Presets.} + +The package provides a couple of presets +for commonly used copyright statements and licenses. +These are selected by: +% +\begin{center} +\begin{tabular}{l} +|\metacopyright{|\textit{preset}|}|\\ +|\metalicense{|\textit{preset}|}| +\end{tabular} +\end{center} +% +The following \textit{preset} values +provide the associated copyright statements: +% +\begin{center} +\begin{tabular}{ll} +|plain| & This work is protected by copyright. +\\ +|parts| & This work as well as its parts is protected by copyright. +\\ +|doc| & This document is protected by copyright. +\\ +|doc-parts| & This document as well as its parts is protected by copyright. +\\ +|reserved| & All rights reserved. +\\ +|publicdomain| & This work is dedicated to the public domain. +\end{tabular} +\end{center} +% +The following \textit{preset} values +provide the associated license statements: +% +\begin{center} +\begin{tabular}{ll} +|consent| & +\parbox[t]{0.75\textwidth}{\raggedright + Reproduction of any part of this work in any form + without prior written consent + \textit{of the author} + is not permissible. +} +\\ +\vphantom{$\hat A$}% +|consent-noncom| & +\parbox[t]{0.75\textwidth}{\raggedright + Reproduction of any part of this work in any form + without prior written consent + \textit{of the author} + is permissible only for private, scientific and non-commercial use. + \vphantom{g}} +\\ +\vphantom{$\hat A$}% +|lppl| & +\parbox[t]{0.75\textwidth}{\raggedright + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version \textit{1.3} + of this license or (at your option) any later version.\\ + \url{http://www.latex-project.org/lppl.txt} +} +\end{tabular} +\end{center} +% +The license URL will be selected where available. +The italicised parts of the license statement can be customised +by the registers |licenseversion| and |licenseprovider|. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{Creative Commons Licenses.} + +A Creative Commons license can be selected by the command: +% +\begin{center} +|\metalicensecc{|\textit{license}|}| +\end{center} +% +The parameter \textit{license} specifies the type of CC license: +% +\begin{center} +\begin{tabular}{ll} +|by| & Attribution \\ +|by-sa| & Attribution-ShareAlike \\ +|by-nd| & Attribution-NoDerivatives \\ +|by-nc| & Attribution-NonCommercial \\ +|by-nc-sa| & Attribution-NonCommercial-ShareAlike \\ +|by-nc-nd| & Attribution-NonCommercial-NoDerivatives \\ +|zero| & CC0 public domain declaration \\ +|pd| & generic public domain declaration +\end{tabular} +\end{center} +% +The appropriate license URL and CC logo is selected +by the command as well, e.g. +% +\begin{center} +\includegraphics{doclicense-CC-by-sa}\\ +\url{https://creativecommons.org/licenses/by-sa/4.0/} +\end{center} +% +Note that |pd| is not a CC license, but it declares +that the document is in the public domain by +|\metacopyright{publicdomain}| +and it selects the corresponding CC logo for public domain content. + +A version of the CC license can be specified by +the register |licenseversion|. +The default version is |4.0| (international), further available versions are +|3.0| (unported) as well as |2.5|, |2.0|, |1.0| (generic). +For the CC0 license |zero|, the only available version is |1.0| (universal) +which is the default. + +Displaying the logo requires (manual) loading +of the package \textsf{graphicx}; +furthermore the package \textsf{doclicense} containing the logo files +must be present. +The display of the logo can be disabled by the package option |cclogo=false|. +The logo display is coded by the following definitions +which can be customised: +% +\begin{center} +\begin{tabular}{l} +|\metaset[print]{licenselogomessage}{%|\\ +| \centerline{\metapick[#1]{licenselogo}}}|\\ +|\metaset[cmd]{licenselogo}{\includegraphics{#1}}| +\end{tabular} +\end{center} + +Various registers and variants of the selected CC license exist. +The registers specific to CC licenses are: +% +\begin{center} +\begin{tabular}{ll} +|licencecc| & CC license identifier +\\ +|licenceccver| & CC license version +\\ +|licenceccfull| & full license descriptor +\end{tabular} +\end{center} +% +The variants specific to CC licenses are: +% +\begin{center} +\begin{tabular}{ll} +\textit{ln} & representation in language \textit{ln} +\\ +|icon| & CC icon (package \textsf{ccicons} required), +e.g. \ccLogo\ccAttribution\ccShareAlike +\\ +|url| & license URL +\\ +|ident| & CC identifier, e.g.\ `BY-SA' +\\ +|short| & short form, e.g.\ `CC BY-SA' +\\ +|logo| & logo filename (package \textsf{doclicense}) +\end{tabular} +\end{center} +% +For example, a full license descriptor is displayed by +|\metapick[]{licenseccfull}|: +Creative Commons License ``Attribution-ShareAlike 4.0 International''. +The license icon can be displayed by +|\metaget[icon]{licensecc}|: \ccLogo\ccAttribution\ccShareAlike{} +(this requires the package \textsf{ccicons} to be loaded). +Note that displaying the full license message |licensemessage| +in variant |print| in some languages +may produce quotation marks not declared in default fonts +causing an error; this can be avoided to some extent by +loading an appropriate packages for internationalisation +such as \textsf{babel}. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Languages} +\label{sec:language} + +A principal application of the register variants is to +implement internationalisation and localisation. +Evidently, this is a tricky subject +due to various particularities of languages, +but the register variants can be used +to specify and select different language representations +for some commonly used text elements. +For example, the copyright and license statements in \secref{sec:rights} +are internationalised (to some extent). +This makes them conveniently usable in the appropriate language. +Note that the language presets to be loaded +need to be specified explicitly by the package option |loadlang|, +see \secref{sec:options}. + +The idea is to understand the variant \textit{var} +of a register \textit{reg} to be its representation in the language +\textit{var}=\textit{ln}[|-|\textit{CN}]. +The default (empty) variant as well as specific purpose variants +(such as |print|) should be provided in the +document language or a fallback language (such as English). +The macro |\metapick[|\textit{var}|]{|\textit{reg}|}| +then selects the appropriate language representation +or falls back to the default language. +Here \textit{var} can specify a particular language or a particular purpose. +Then, |\metapick| will pick (in this order of preference): +% +\begin{itemize} +\item +the language or purpose \textit{var}, +\item +the document language specified by |\metasetlang| (if available), +\item +the document language specified by |\metasetlang| +with country code stripped (if available), +\item +the default variant, +\item +the fallback language (first of package option |loadlang|). +\end{itemize} +% +Note that nesting of |\metapick| +via |\metapick[#1]{|\textit{reg}|}| +passes along the original variant +\textit{var} in the parameter |#1|. +This mechanism allows to specify some non-specific elements +in a universal language while the appropriate language is +selected where available. + +\macro{\metaterm} +\macro{\metatranslate} +\macro{\metasettest} +The package reserves registers of the form |term-|\textit{term} +for storing terms in various (language) representations. +A couple of such term registers describing common entities in typesetting +are defined by the package: +% +\begin{center} +\begin{tabular}[t]{ll} +|title|&Title\\ +|abstract|&Abstract\\ +|copyright|&Copyright\\ +|preface|&Preface\\ +|part|&Part\\ +|chapter|&Chapter\\ +|section|&Section\\ +|subsection|&Subsection\\ +|paragraph|&Paragraph +\end{tabular} +\qquad\qquad +\begin{tabular}[t]{ll} +|appendix|&Appendix\\ +|page|&Page\\ +|figure|&Figure\\ +|table|&Table\\ +|contents|&Contents\\ +|listfigure|&List of Figures\\ +|listtable|&List of Tables\\ +|references|&References\\ +|index|&Index\\ +|draft|&DRAFT +\end{tabular} +\end{center} +% +These are provided in different languages for convenient +internationalisation +(this can be viewed as a low-key implementation of some of the features +of the \href{https://ctan.org/pkg/babel}{\textsf{babel}} package). +Additional term registers can be defined by the user. +Term registers are accessed by the macros: +% +\begin{center} +\begin{tabular}{l} +|\metaterm{|\textit{term}|}|\\ +|\metatranslate[|\textit{ln}|]{|\textit{term}|}|\\ +|\metasetterm[|\textit{ln}|]{|\textit{reg}|}{|\textit{def}|}| +\end{tabular} +\end{center} +% +The macro |\metaterm| obtains the term \textit{term} +in the default language +(it invokes |\metapick[]| with empty variant), +while |\metatranslate| uses any other language \textit{ln}. +The macro |\metasetterm| declares and fills a term register \textit{term} +(in a particular language \textit{ln}). +Note that therefore it is not necessary to declare term registers +explicitly by |\metadef|. + +The PDF metadata are written out in the metadata language variant +specified by |\metasetlang*|; +otherwise in the default document language +specified by |\metasetlang| is used. +Some registers can even be written out +in several alternative language versions +using the package \textsf{hyperxmp}, +namely |title|, |subject| and |rightstext|. +The set of alternative languages is specified by +(before invoking the respective command |\metawritepdf...|): +% +\begin{center} +\begin{tabular}{l} +|\metaset[altlang]{title}{|\textit{languages}|}|\\ +|\metaset[altlang]{subject}{|\textit{languages}|}|\\ +|\metaset[altlang]{rightstext}{|\textit{languages}|}| +\end{tabular} +\end{center} +% +Here, \textit{languages} is a comma-separated list of language identifiers +and for each identifier \textit{ln} +the information is written out in the respective language variant. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Package Options} +\label{sec:options} + +General options for the package can be selected by the commands: +% +\begin{center} +\begin{tabular}{rl} +&|\usepackage[|\textit{opts}|]{metastr}| +\\ +or&|\PassOptionsToPackage{|\textit{opts}|}{metastr}| +\end{tabular} +\end{center} +% +|\PassOptionsToPackage| must be used before |\usepackage|. +\textit{opts} is a comma-separated list of options. + +The following options are available: +% +\begin{itemize} +\item |hyperref|[|=true|\textbar|false|] +(no value implies |true|, initially set to |true|) -- +use the package \textsf{hyperref} to write metadata to PDF. +\item |hyperxmp|[|=true|\textbar|false|] +(no value implies |true|, initially set to |true|) -- +use the auxiliary package \textsf{hyperxmp} +to write additional metadata to PDF. +\item |checkdef|[|=true|\textbar|false|] +(no value implies |true|, initially set to |true|) -- +check whether registers have been previously declared +when filling them. +\item |cclogo|[|=true|\textbar|false|] +(no value implies |true|, initially set to |true|) -- +display CC logo from \textsf{doclicense} package. +\item |cclogocurr=dollar|\textbar|euro|\textbar|yen| +(initially set to |dollar|) -- +select currency symbol for Creative Commons NonCommercial logos. +\item |xmppdfinfo|[|=true|\textbar|false|] +(no value implies |true|, initially set to |true|) -- +write the basic PDF info block +when using the auxiliary package \textsf{hyperxmp}; +if this option is set, +\textsf{hyperxmp} is loaded with the option |keeppdfinfo|. +\item |draft|[|=true|\textbar|false|] +(no value implies |true|, initially set to |false|) -- +fill |draft| register with ``DRAFT''. +\item |course|[|=true|\textbar|false|] +(no value implies |true|, initially set to |false|) -- +Setup extended registers for course materials, see \secref{sec:extras}. +\item |loadlang=|\textit{ln-1}\texttt{\textbar}\textit{ln-2}% + \texttt{\textbar}|...|\texttt{\textbar}\textit{ln-n} +(bar-separated list w/o spaces, initially set to |en|) -- +Load presets for languages \textit{ln-1}, \textit{ln-2}, \ldots, \textit{ln-n}, +see \secref{sec:language}. +The first language \textit{ln-1} serves as the fallback variant. +Available internationalisations currently consist of: +\begin{center} +\begin{tabular}{ll} +|en|& English\\ +|de|& German\\ +|fr|& French\\ +|es|& Spanish +\end{tabular} +\end{center} +\end{itemize} +% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Extras} +\label{sec:extras} + +The package can provide some special purpose registers on request. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{Course Materials.} + +A couple of registers for course materials are provided +upon setting the package option |course|: +% +\begin{center} +\begin{tabular}{ll} +|course| & title of course +\\ +|material| & description of document material +\\ +|period| & period where course takes place +\\ +|institution| & institution where course is given +\\ +|instructor| & instructor of course +\end{tabular} +\end{center} +% + +The variant |course| of the register |titletext| displays a +compilation of these registers for display on a title page: +% +\begin{center} +\textit{course}\\ +\textit{material} |\par| \textit{draft}\\ +\textit{institution}, \textit{period}\\ +\textit{instructor} +\end{center} +% +Furthermore, the registers +|title|, |subtitle|, |author|, |location| and |date| are +diverted to |course|, |material|, |instructor|, +|institution| and |period| respectively. +Consequently, their values are automatically written as PDF metadata, +but it is certainly possible to override them with custom values. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Information} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Copyright} + +Copyright \copyright{} 2020 Niklas Beisert + +This work may be distributed and/or modified under the +conditions of the \LaTeX{} Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + \url{http://www.latex-project.org/lppl.txt} +and version 1.3 or later is part of all distributions of \LaTeX{} +version 2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Niklas Beisert. + +This work consists of the files |README.txt|, |metastr.ins| and |metastr.dtx| +as well as the derived files |metastr.sty|, |metasamp.tex| and |metastr.pdf|. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Files and Installation} + +The package consists of the files: +% +\begin{center} +\begin{tabular}{ll} + |README.txt| & readme file \\ + |metastr.ins| & installation file \\ + |metastr.dtx| & source file \\ + |metastr.sty| & package file \\ + |metasamp.tex| & sample file \\ + |metastr.pdf| & manual +\end{tabular} +\end{center} +% +The distribution consists of the files +|README.txt|, |metastr.ins| and |metastr.dtx|. +% +\begin{itemize} +\item +Run (pdf)\LaTeX{} on |metastr.dtx| +to compile the manual |metastr.pdf| (this file). +\item +Run \LaTeX{} on |metastr.ins| to create the package |metastr.sty| +and the samples consisting of |metasamp.tex|. +Copy the file |metastr.sty| to an appropriate directory of your \LaTeX{} +distribution, e.g.\ \textit{texmf-root}|/tex/latex/metastr|. +\end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Related Packages} + +The package makes use of other packages available at CTAN: +\begin{itemize} +\item +This package uses the package +\href{http://ctan.org/pkg/hyperref}{\textsf{hyperref}} +to write basic metadata to a PDF file. +Compatibility with the \textsf{hyperref} package +has been tested with v7.00c (2019/11/10). +\item +This package uses the package \textsf{keyval} +from the \textsf{graphics} bundle +to process the options for the package, environments and macros. +Compatibility with the \textsf{keyval} package +has been tested with v1.15 (2014/10/28). +\item +This package can use the package +\href{http://ctan.org/pkg/hyperxmp}{\textsf{hyperxmp}} +to write extended metadata to a PDF file. +Compatibility with the \textsf{hyperxmp} package +has been tested with v4.1 (2019/04/05). +\item +This package can use the Creative Commons license icon files +included in the package +\href{http://ctan.org/pkg/doclicense}{\textsf{doclicense}}. +Compatibility with the \textsf{doclicense} package +has been tested with v1.10.0 (2019/06/05). +\item +This package can use the Creative Commons license icon fonts +included in the package +\href{http://ctan.org/pkg/ccicons}{\textsf{ccicons}}. +Compatibility with the \textsf{ccicons} package +has been tested with v1.6 (2017/10/30). +\item +Icon files are displayed by means of the +\href{http://ctan.org/pkg/graphicx}{\textsf{graphicx}} package. +The package needs to be loaded explicitly. +Compatibility with the \textsf{graphicx} package +has been tested with v1.1a (2017/06/01). +\end{itemize} + +There are several other \LaTeX{} packages +which store and write basic metadata +for some specific purposes: +% +\begin{itemize} +\item +The package \href{http://ctan.org/pkg/hyperref}{\textsf{hyperref}} +writes the arguments of |\author| and |\title| +unless the package option |pdfusetitle=false| is declared (at load time). +\item +The package \href{http://ctan.org/pkg/hyperxmp}{\textsf{hyperxmp}} +writes the arguments of |\author| and |\title|. +\item +The package \href{http://ctan.org/pkg/exframe}{\textsf{exframe}} +writes the |\exercisedata| registers +|author|, |title|, |subject| and |keyword| +unless the package option |pdfdata=off| is specified. +\item +The package \href{http://ctan.org/pkg/beamer}{\textsf{beamer}} +writes the arguments of |\author|, |\title|, |\subject| and |\keywords|. +\item +The package \href{http://ctan.org/pkg/gitver}{\textsf{gitver}} +writes |pdfsubject| unless the package option |nopdfinfo| is specified. +\item +Various packages to prepare articles for publication in journals. +\end{itemize} +% +Their mechanisms may be in competition +with the ones of the present package \textsf{metastr}. +In order to make the packages work together on the same set of data, +the most promising option which should work in many cases is the following: +Fill the registers of \textsf{metastr} +with the desired values. +Then pass them on to the structures +of the other package(s) using |\metaget| or |\metapick|. +Since the latter commands are robust, +the other structures ought to be able to handle them without further ado. +To avoid potential conflicts, multiple writing of (basic) metadata +should be disabled. For the \textsf{metastr} package this is achived by: +% +\begin{center} +\begin{tabular}{rl} +&|\metaunset[info]{writepdf}|\\ +or&|\metaunset[auto]{writepdf}| +\end{tabular} +\end{center} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Feature Suggestions} +\label{sec:suggestions} + +The following is a list of features which may be useful for future +versions of this package: +% +\begin{itemize} +\item +Presets for GNU and other software licenses. +\item +Registers for publication data. +% editor, preprint, doi, publisher, publication, (volume, page), version ... +\item +Further translations of copyright and license statements. +\item +Export translations to files +\item +Make use of the \textsf{babel} package for translations of basic terms. +\end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Revision History} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\paragraph{v1.0:} 2020/02/06 + +\begin{itemize} +\item +first version, published on CTAN +\end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\appendix + +\settowidth\MacroIndent{\rmfamily\scriptsize 0000\ } + + \DocInput{metastr.dtx} + +\end{document} +%</driver> +% \fi +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{Sample} +% \label{sec:sample} +%\iffalse +%<*sample> +%\fi +% +% This section provides an example of how to apply +% some of the \textsf{metastr} mechanisms and licenses. +% +% Some lines in the example are commented by |%%| for easy experimenting. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Preamble.} +% +% Standard document class: +% \begin{macrocode} +\documentclass[12pt]{article} +% \end{macrocode} + +% Use package \textsf{geometry} to set the page layout; +% adjust the paragraph shape: +% \begin{macrocode} +\usepackage{geometry} +\geometry{layout=a4paper} +\geometry{paper=a4paper} +\geometry{margin=2.5cm} +\parindent0pt +\parskip1ex +% \end{macrocode} + +% Declare some options for the package \textsf{hyperref}; +% it does not hurt to load it explicitly +% although \textsf{metastr} will invoke it by default if not loaded: +% \begin{macrocode} +\PassOptionsToPackage{bookmarks=true}{hyperref} +\usepackage{hyperref} +% \end{macrocode} + +% Set some options for the \textsf{metastr} package: +% \begin{macrocode} +\PassOptionsToPackage{draft}{metastr} +\PassOptionsToPackage{loadlang=en|de|fr|es}{metastr} +%%\PassOptionsToPackage{loadlang=en|fr|es}{metastr} +%%\PassOptionsToPackage{loadlang=de|en}{metastr} +\PassOptionsToPackage{cclogocurr=euro}{metastr} +% \end{macrocode} + +% Include the \textsf{metastr} package along with +% \textsf{graphicx}, \textsf{babel} +% and \textsf{ccicons} (where available): +% \begin{macrocode} +\usepackage{metastr} +\usepackage{graphicx} +\usepackage{babel} +\IfFileExists{ccicons.sty}{\usepackage{ccicons}}{} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Some Adjustments.} +% +% Declare some term to be translated; +% doesn't hurt to declare a couple of variants: +% \begin{macrocode} +\metasetterm[en]{Zurich}{Zurich} +\metasetterm[de]{Zurich}{Z\"rich} +\metasetterm[fr]{Zurich}{Zurich} +\metasetterm[es]{Zurich}{Z\'urich} +\metasetterm[it]{Zurich}{Zurigo} +\metasetterm[pt]{Zurich}{Zurique} +% \end{macrocode} + +% Define |subject| to combine |location| and |date| +% (as far as filled): +% \begin{macrocode} +\metaset{subject}{\metacompose[#1]{location}{location: } + {\metacompose[#1]{date}{, date: }{}{}} + {\metacompose[#1]{date}{date: }{}{}}} +% \end{macrocode} + +% Adjust title display: +% \begin{macrocode} +\metaset[skip]{subtitle}{\vspace{1ex}} +\metaset[skip]{author}{\vspace{2ex}} +\metaset[skip]{location}{\vspace{1ex}} +\metaset[skip]{date}{\vspace{1ex}} +\metaset[style]{title}{\LARGE\bfseries} +\metaset[style]{author}{\large\scshape} +\metaset[sep]{draft}{ -- } +%%\metaunset[sep]{date} +% \end{macrocode} + +% Write title also in english and german; +% write rights as PDF metadata also in English and Spanish: +% \begin{macrocode} +\metaset[altlang]{title}{en,de} +\metaset[altlang]{rightstext}{en,es} +\metaset[rights]{writepdf}{} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Set Document Data.} +% +% Set the document language: +% \begin{macrocode} +\metasetlang{en} +%%\metasetlang{de} +%%\metasetlang{de-CH} +%%\metasetlang{fr} +% \end{macrocode} + +% Define some document data: +% \begin{macrocode} +\metaset[en]{title}{A metastr Sample} +\metaset[de]{title}{Ein metastr Beispiel} +\metaset[print]{title}{A \textsf{metastr} Sample} +\metaset{subtitle}{Illustration of some features} +\metaset{author}{Niklas Beisert} +\metaset{keywords}{composition of title, application of licenses, translations} +\metaset{location}{\metatranslate[#1]{Zurich}} +\metaset{date}{2020/02/06} +\metaset{partof}{The metastr Package} +\metaset[print]{partof}{The \textsf{metastr} Package} +% \end{macrocode} + +% Copyright settings: +% \begin{macrocode} +\metaset{copyrightowner}{\metapick[#1]{author}} +\metaset{copyrightdate}{2020} +\metacopyright{doc} +%%\metacopyright{reserved} +% \end{macrocode} + +% License settings: +% \begin{macrocode} +%%\metaset{licenseversion}{1.2} +%%\metalicense{lppl} +% \end{macrocode} + +% Creative Commons License use: +% \begin{macrocode} +%%\metaset{licenseversion}{3.0} +\metalicensecc{by-sa} +%%\metalicensecc{by-nc-sa} +%%\metalicensecc{zero} +%%\metalicensecc{pd} +% \end{macrocode} + +% Scale the CC logo a bit: +% \begin{macrocode} +\metaset[cmd]{licenselogo}{\includegraphics[scale=0.75]{#1}} +% \end{macrocode} + +% Start document body: +% \begin{macrocode} +\begin{document} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Header.} +% +% Display title block: +% \begin{macrocode} +\pdfbookmark[1]{\metaterm{title}}{title} +\begin{center} +\metapick[print]{titletext} +\end{center} +% \end{macrocode} + +% Display fineprint in fine print: +% \begin{macrocode} +\vspace{1ex}\hrule\par\vspace{1ex} +\begingroup\footnotesize +\pdfbookmark[1]{\metaterm{copyright}}{copyright} +\metapick[print]{rightstext} +\endgroup +\vspace{1ex}\hrule\par\vspace{1ex} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Content.} +% +% Some useful content: +% \begin{macrocode} +\section{Metadata Inspection} + +The metadata stored in this example PDF can be inspected with +the tool \texttt{pdfinfo}: + +\begin{tabular}{l} +\verb+pdfinfo metasamp.pdf+\\ +\verb+pdfinfo -meta metasamp.pdf | less+ +\end{tabular} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Translations.} +% +% Demonstration of terms and translations: +% \begin{macrocode} +\section{Translations} + +\begin{tabular}{ll} +document language:&\metaterm{Zurich}\\ +Spanish:&\metatranslate[es]{Zurich} +\end{tabular} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Creative Commons.} +% +% Demonstrate some CC terms: +% \begin{macrocode} +\metaif[]{cc@type}{ % only if a CC license is in use +\section{Creative Commons} +some representations of the selected license: +\begin{itemize} +\item license identifier: + \metapick[]{licensecc} +\item \texttt{short} identifier: + \metapick[short]{licensecc} +\item full form: + \metapick[]{licenseccfull} +\item \texttt{ident} form: + \metapick[ident]{licensecc} +\item \texttt{short} form: + \metapick[short]{licenseccfull} +\IfFileExists{ccicons.sty} + {\item \texttt{icon} forms: + -- \metapick[icon]{licensecc} + -- \metapick[icon]{licenseccfull} --}{} +\item \texttt{url} form: + \metapick[url]{licenseccfull} +\end{itemize} +}{} +% \end{macrocode} + +% End of document body: +% \begin{macrocode} +\end{document} +% \end{macrocode} +%\iffalse +%</sample> +%\fi +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \section{Implementation} +% \label{sec:implementation} +%\iffalse +%<*package> +%\fi +% +% This section describes the implementation of the package |metastr.sty|. + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Package Setup} +% \label{sec:imp-setup} +% +% The package declares a couple of setup options. +% +% It loads the package \textsf{keyval} +% for extended options processing. +% \begin{macrocode} +\RequirePackage{keyval} +% \end{macrocode} + +% \macro{hyperref} +% \macro{hyperxmp} +% \macro{checkdef} +% \macro{cclogo} +% \macro{cclogocurr} +% \macro{xmppdfinfo} +% Store the selected package options in some corresponding internal macros: +% \begin{macrocode} +\newif\ifmstr@opt@hyperref\mstr@opt@hyperreftrue +\newif\ifmstr@opt@hyperxmp\mstr@opt@hyperxmptrue +\newif\ifmstr@opt@checkdef\mstr@opt@checkdeftrue +\newif\ifmstr@opt@xmppdfinfo\mstr@opt@xmppdfinfotrue +\newif\ifmstr@opt@course\mstr@opt@coursefalse +\newif\ifmstr@opt@draft\mstr@opt@draftfalse +\newif\ifmstr@opt@cclogo\mstr@opt@cclogotrue +\def\mstr@opt@cclogocurr{dollar} +\def\mstr@opt@loadlang{en} +\def\mstr@group{mstr@} +\define@key{\mstr@group}{hyperref}[true] + {\csname mstr@opt@hyperref#1\endcsname} +\define@key{\mstr@group}{hyperxmp}[true] + {\csname mstr@opt@hyperxmp#1\endcsname} +\define@key{\mstr@group}{checkdef}[true] + {\csname mstr@opt@checkdef#1\endcsname} +\define@key{\mstr@group}{xmppdfinfo}[true] + {\csname mstr@opt@xmppdfinfo#1\endcsname} +\define@key{\mstr@group}{cclogo}[true]{\csname mstr@opt@cclogo#1\endcsname} +\define@key{\mstr@group}{cclogocurr}{\def\mstr@opt@cclogocurr{#1}} +\define@key{\mstr@group}{loadlang}{\def\mstr@opt@loadlang{#1}} +\define@key{\mstr@group}{course}[true]{\csname mstr@opt@course#1\endcsname} +\define@key{\mstr@group}{draft}[true]{\csname mstr@opt@draft#1\endcsname} +% \end{macrocode} + +% Pass undeclared options on to \textsf{keyval} processing: +% \begin{macrocode} +\DeclareOption*{\expandafter\setkeys\expandafter\mstr@group% + \expandafter{\CurrentOption}} +% \end{macrocode} + +% Process global options while loading package: +% \begin{macrocode} +\ProcessOptions +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Definitions} +% \label{sec:imp-def} +% +% The following describes the basic definitions +% of the package. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Required Packages.} +% +% The package loads the packages +% \textsf{hyperref} and \textsf{hyperxmp} +% (unless excluded): +% \begin{macrocode} +\ifmstr@opt@hyperref\RequirePackage{hyperref}\fi +\ifmstr@opt@hyperxmp\RequirePackage{hyperxmp}\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{General Definitions.} +% +% \macro{\mstr@exptwo} +% A macro to conveniently expand the third token in line: +% \begin{macrocode} +\def\mstr@exptwo#1{\expandafter#1\expandafter} +% \end{macrocode} +% \macro{\mstr@csdo} +% \macro{\mstr@csdotwo} +% Some macros to conveniently expand |\csname| arguments +% before expanding the macro: +% \begin{macrocode} +\def\mstr@csdo#1#2{\expandafter#1\csname#2\endcsname} +\def\mstr@csdotwo#1#2#3{\mstr@exptwo#1#2\csname#3\endcsname} +% \end{macrocode} +% \macro{\mstr@iftext} +% Check whether macro |#1| equals text |#2|, then do |#3|: +% \begin{macrocode} +\long\def\mstr@iftext#1#2#3{\def\mstr@tmp{#2}\ifx#1\mstr@tmp#3\fi} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Internal Definitions.} +% +% \macro{\mstr@lang@main} +% \macro{\mstr@lang@short} +% \macro{\mstr@lang@fallback} +% \macro{\mstr@lang@meta} +% Predefine language identifiers as empty. +% These define the language for the document text +% (with and without country code), document metadata +% and a fallback language: +% \begin{macrocode} +\let\mstr@lang@main\@empty +\let\mstr@lang@short\@empty +\let\mstr@lang@fallback\@empty +\let\mstr@lang@meta\@empty +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Interface Definitions.} +% +% \macro{\metatilde} +% \macro{\metacomma} +% Define a macro for the tilde character (mostly for use within URLs); +% recycle the definitions from \textsf{hyperxmp} if available: +% \begin{macrocode} +\ifdefined\xmptilde +\let\metatilde\xmptilde +\let\metacomma\xmpcomma +\else +\def\metatilde{~} +\def\metacomma{,} +\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Declare Registers.} +% +% \macro{\metadef} +% Declare a register: +% \begin{macrocode} +\newcommand{\metadef}[1]{% + \mstr@csdo\let{mstr@def@#1}\relax} +% \end{macrocode} + +% \macro{\mstr@verify} +% Verify the declaration of a register; +% throw an error if undeclared; +% disable checking for package option |checkdef=false|: +% \begin{macrocode} +\newcommand{\mstr@verify}[1]{% + \ifcsname mstr@def@#1\endcsname\else + \PackageError{metastr}{register `#1' undefined}{}% + \fi} +\ifmstr@opt@checkdef\else\def\mstr@verify#1{}\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Set Registers.} +% +% \macro{\mstr@setbare} +% Store the register value in the macro +% |\mstr@data@|\textit{reg}|@|\textit{var}; +% define one argument to pass along original variant: +% \begin{macrocode} +\long\def\mstr@setbare[#1]#2#3{% + \mstr@csdo\gdef{mstr@data@#2@#1}##1{#3}} +% \end{macrocode} + +% \macro{\mstr@set} +% Set the register value; verify whether the register has been declared: +% \begin{macrocode} +\long\def\mstr@set[#1]#2#3{\mstr@verify{#2}% + \mstr@setbare[#1]{#2}{#3}} +% \end{macrocode} + +% \macro{\metaset} +% Interface macro for setting register +% with optional variant argument: +% \begin{macrocode} +\newcommand{\metaset}{\@ifnextchar[{\mstr@set}{\mstr@set[]}} +% \end{macrocode} + +% \macro{\mstr@unset} +% Clear a register value: +% \begin{macrocode} +\long\def\mstr@unset[#1]#2{\mstr@verify{#2}% + \mstr@csdotwo\global\let{mstr@data@#2@#1}\@undefined} +% \end{macrocode} + +% \macro{\metaunset} +% Interface macro for clearing register +% with optional variant argument: +% \begin{macrocode} +\newcommand{\metaunset}{\@ifnextchar[{\mstr@unset}{\mstr@unset[]}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Register Conditionals.} +% +% \macro{\metaif} +% If-then-else structure checking whether register variant is filled: +% \begin{macrocode} +\long\def\metaif[#1]#2#3#4{% + \ifcsname mstr@data@#2@#1\endcsname #3\else #4\fi} +% \end{macrocode} + +% \macro{\metaifpick} +% If-then-else structure checking if the register in either of the variants +% |#1|, |\mstr@lang@main|, |\mstr@lang@short|, +% default and |\mstr@lang@fallback| +% is filled; +% |#1| may in fact be a comma-separated list of variants (without spaces): +% \begin{macrocode} +\long\def\mstr@ifloop[#1,#2]#3#4#5{% + \metaif[#1]{#3}{#4}{\if @#2@#5\else\mstr@ifloop[#2]{#3}{#4}{#5}\fi}} +\long\def\metaifpick[#1]#2#3#4{% + \mstr@ifloop + [#1,\mstr@lang@main,\mstr@lang@short,,\mstr@lang@fallback,] + {#2}{#3}{#4}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Manipulate Registers.} +% +% \macro{\mstr@append} +% Append some string to a register value: +% \begin{macrocode} +\long\def\mstr@append[#1]#2#3{% + \mstr@csdotwo\let\mstr@tmpa{mstr@data@#2@#1}% + \def\mstr@tmpb##1{\mstr@set[#1]{#2}{##1#3}}% + \mstr@exptwo\mstr@tmpb{\mstr@tmpa{##1}}} +% \end{macrocode} + +% \macro{\mstr@prepend} +% Prepend some string to a register value: +% \begin{macrocode} +\long\def\mstr@prepend[#1]#2#3{% + \mstr@csdotwo\let\mstr@tmpa{mstr@data@#2@#1}% + \def\mstr@tmpb##1{\mstr@set[#1]{#2}{#3##1}}% + \mstr@exptwo\mstr@tmpb{\mstr@tmpa{##1}}} +% \end{macrocode} + +% \macro{\mstr@addsep} +% Append a string to a register value separated by |#1| +% if the string was previously filled: +% \begin{macrocode} +\long\def\mstr@addsep[#1]#2#3#4{% + \metaif[#1]{#2}{\mstr@append[#1]{#2}{#3#4}}{\mstr@set[#1]{#2}{#4}}} +% \end{macrocode} + +% \macro{\metaappend} +% \macro{\metaprepend} +% \macro{\metaaddsep} +% Interface macros for appending, prepending +% and adding with separator: +% \begin{macrocode} +\newcommand{\metaappend}{% + \@ifnextchar[{\mstr@append}{\mstr@append[]}} +\newcommand{\metaprepend}{% + \@ifnextchar[{\mstr@prepend}{\mstr@prepend[]}} +\newcommand{\metaaddsep}{% + \@ifnextchar[{\mstr@addsep}{\mstr@addsep[]}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Read Register Values.} +% +% \macro{\mstr@getbare} +% Read a register value +% while passing along the original variant as an argument: +% \begin{macrocode} +\def\mstr@getbare[#1]#2#3{\csname mstr@data@#2@#1\endcsname{#3}} +% \end{macrocode} + +% \macro{\metaget} +% Interface function to read register value +% with mandatory variant argument in square brackets; +% return nothing if register clean: +% \begin{macrocode} +\def\metaget[#1]#2{% + \metaif[#1]{#2}{\mstr@getbare[#1]{#2}{#1}}{}}% +% \end{macrocode} + +% \macro{\metacompose} +% \macro{\metapick} +% |\metapick| returns a filled register value among the variants +% |#1|, |\mstr@lang@main|, |\mstr@lang@short|, default +% and |\mstr@lang@fallback| +% (in this order of preference), otherwise it returns nothing; +% |#1| may in fact be a comma-separated list of variants (without spaces); +% |\metacompose| sandwiches the value between |#3| and |#4| if found, +% and otherwise returns |#5|: +% \begin{macrocode} +\long\def\mstr@composeloop[#1,#2]#3#4#5#6#7{% + \metaif[#1]{#4}{#5\mstr@getbare[#1]{#4}{#3}#6} + {\if @#2@#7\else\mstr@composeloop[#2]{#3}{#4}{#5}{#6}{#7}\fi}} +\long\def\metacompose[#1]#2#3#4#5{% + \mstr@composeloop + [#1,\mstr@lang@main,\mstr@lang@short,,\mstr@lang@fallback,]{#1} + {#2}{#3}{#4}{#5}}% +\def\metapick[#1]#2{\metacompose[#1]{#2}{}{}{}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Language Selection.} +% +% \macro{language} +% Declare language register: +% \begin{macrocode} +\metadef{language} +% \end{macrocode} +% \macro{\metasetlang} +% Set language and extract short forms: +% \begin{macrocode} +\def\mstr@lang@split#1#2-#3@{% + \mstr@csdo\gdef{mstr@lang@#1}{#2}} +\newcommand{\mstr@setlang@main}[1]{% + \metaset{language}{#1}% + \gdef\mstr@lang@main{#1}% + \mstr@lang@split{short}#1-@% + \metaset[short]{language}{\mstr@lang@short}% + \metaif[meta]{language}{}{\mstr@lang@split{meta}#1-@}} +\newcommand{\mstr@setlang@meta}[1]{% + \metaset[meta]{language}{#1}% + \mstr@lang@split{meta}#1-@% + \metaset[metashort]{language}{\mstr@lang@meta}} +\newcommand{\metasetlang}{% + \@ifstar\mstr@setlang@meta\mstr@setlang@main} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Terms.} +% +% \macro{\metaterm} +% \macro{\metatranslate} +% \macro{\metasetterm} +% Macros for filling and reading term registers: +% \begin{macrocode} +\newcommand{\metaterm}{\metatranslate[]} +\def\metatranslate[#1]#2{\metapick[#1]{term-#2}} +\long\def\mstr@setterm[#1]#2#3{% + \metadef{term-#2}\mstr@setbare[#1]{term-#2}{#3}} +\newcommand{\metasetterm}{\@ifnextchar[{\mstr@setterm}{\mstr@setterm[]}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Automatic Writing to PDF.} +% +% \macro{writepdf} +% Declare register |writepdf| to control automatic +% writing of metadata to PDF files: +% \begin{macrocode} +\metadef{writepdf} +\metaset[auto]{writepdf}{} +\metaset[preamble]{writepdf}{} +\metaset[info]{writepdf}{} +\metaset[aux]{writepdf}{} +% \end{macrocode} + +% \macro{\mstr@ifwritepdf} +% Auxiliary macro to write some type of metadata if switch activated, +% disable switch afterwards: +% \begin{macrocode} +\long\def\mstr@ifwritepdf[#1]#2{% + \metaif[#1]{writepdf}{#2\metaunset[#1]{writepdf}}{}} +% \end{macrocode} + +% \macro{\metawritepdf} +% Write selected types of metadata to PDF file: +% \begin{macrocode} +\newcommand{\metawritepdf}{% + \mstr@ifwritepdf[preamble]{\metawritepdfpreamble}% + \mstr@ifwritepdf[info]{\metawritepdfinfo}% + \mstr@ifwritepdf[aux]{\metawritepdfaux}% + \mstr@ifwritepdf[contact]{\metawritepdfcontact}% + \mstr@ifwritepdf[rights]{\metawritepdfrights}% +} +% \end{macrocode} + +% \macro{\mstr@begindoc} +% Hook for writing data to PDF file; +% this is the last chance to write the preamble set of data to the PDF: +% \begin{macrocode} +\newcommand{\mstr@begindoc}{% + \mstr@ifwritepdf[preamble]{\metawritepdfpreamble}% + \mstr@ifwritepdf[auto]{\metawritepdf}% +} +% \end{macrocode} + +% Hook |\mstr@begindoc| to begining of |document| block +% before all other hooks are called: +% \begin{macrocode} +\begingroup +\toks@\expandafter{\expandafter\mstr@begindoc\@begindocumenthook}% +\xdef\@begindocumenthook{\the\toks@}% +\endgroup +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Basic Registers} +% \label{sec:imp-basic} +% +% The following defines a set of basic and auxiliary registers. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Declarations.} +% +% \macro{draft} +% Declare register to state draft mode: +% \begin{macrocode} +\metadef{draft} +% \end{macrocode} +% Set draft text (if |draft| option set): +% \begin{macrocode} +\ifmstr@opt@draft +\metaset{draft}{\metatranslate[#1]{draft}} +\fi +% \end{macrocode} + +% \macro{title} +% \macro{subtitle} +% \macro{author} +% \macro{date} +% \macro{location} +% \macro{subject} +% \macro{keywords} +% Basic registers: +% \begin{macrocode} +\metadef{title} +\metadef{subtitle} +\metadef{author} +\metadef{date} +\metadef{location} +\metadef{subject} +\metadef{keywords} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Title Composition.} +% +% \macro{titletext} +% Declare register to compose title display (analogous to |\maketitle|): +% \begin{macrocode} +\metadef{titletext} +% \end{macrocode} + +% \macro{\metatitleline} +% \macro{\metatitlelinetwo} +% Macros to print a formatted title line +% with one or two items; +% variant |skip| produces vertical skip before the item, +% variant |style| sets the text style, +% variant |sep| defines the separator between +% two items or undefined for two independent lines: +% \begin{macrocode} +\def\metatitleline[#1]#2{% + \metacompose[#1]{#2} + {\metaget[skip]{#2}\begingroup\metaget[style]{#2}} + {\par\endgroup}{}} +\def\metatitlelinetwo[#1]#2[#3]#4{% + \metaif[sep]{#4} + {\metacompose[#1]{#2} + {\metaget[skip]{#2}\begingroup\metaget[style]{#2}} + {\metacompose[#3]{#4}{\metaget[sep]{#4}}{}{}\par\endgroup} + {\metatitleline[#3]{#4}}} + {\metatitleline[#1]{#2}\metatitleline[#3]{#4}}} +% \end{macrocode} + +% Set default layout and spacing: +% \begin{macrocode} +\metaset[style]{title}{\LARGE} +\metaset[style]{subtitle}{\large} +\metaset[style]{draft}{\large} +\metaset[style]{author}{\large} +\metaset[style]{location}{\large} +\metaset[style]{date}{\large} +\metaset[skip]{subtitle}{\vspace{1.5em}} +\metaset[skip]{draft}{\vspace{1.5em}} +\metaset[skip]{author}{\vspace{3em}} +\metaset[skip]{location}{\vspace{1.5em}} +\metaset[skip]{date}{\vspace{1.5em}} +\metaset[sep]{subtitle}{ -- } +\metaset[sep]{date}{, } +% \end{macrocode} +% Preset for |titletext| in generic and |print| variants: +% \begin{macrocode} +\metaset{titletext}{% + \metacompose[#1]{draft}{}{: }{}% + \metapick[#1]{title}% + \metacompose[#1]{subtitle}{\metaget[sep]{subtitle}}{}{}} +\metaset[print]{titletext}{% + \metatitleline[print]{title}% + \metatitlelinetwo[print]{subtitle}[print]{draft}% + \metatitleline[print]{author}% + \metatitlelinetwo[print]{location}[print]{date}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Further Registers.} +% +% \macro{url} +% \macro{urlmessage} +% Registers for document URL and message to display it: +% \begin{macrocode} +\metadef{url} +\metadef{urlmessage} +% \end{macrocode} +% Print URL as hyperlink: +% \begin{macrocode} +\metaset[print]{url}{\url{\metaget[]{url}}} +% \end{macrocode} +% URL message default text (translated): +% \translate{urlmessage} +% \begin{macrocode} +% \metaset{urlmessage}{% +% The current version of this work can be found at: +% \metapick[#1]{url}.} +% \end{macrocode} + +% \macro{partof} +% \macro{partofmessage} +% Registers for document URL and message to display it: +% \begin{macrocode} +\metadef{partof} +\metadef{partofmessage} +% \end{macrocode} +% part of message default text (translated): +% \translate{partofmessage} +% \begin{macrocode} +% \metaset{partofmessage}{% +% This document is part of the work: \metapick[#1]{partof}.} +% \end{macrocode} + +% \macro{source} +% Register for source name: +% \begin{macrocode} +\metadef{source} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Write to PDF.} +% +% \macro{\metawritepdfpreamble} +% Write some registers to PDF that need to be written +% before the start of the document: +% \begin{macrocode} +\newcommand{\metawritepdfpreamble}{\ifdefined\hypersetup + \ifmstr@opt@xmppdfinfo + \ifdefined\xmptilde\hypersetup{keeppdfinfo}\fi\fi + \metaif[]{language} + {\hypersetup{pdflang={\metaget[]{language}}}}{}% + \ifdefined\xmptilde + \metaif[meta]{language} + {\hypersetup{pdfmetalang={\metaget[meta]{language}}}}{}% + \fi\fi} +% \end{macrocode} + +% \macro{\metawritepdfinfo} +% Write the basic registers to PDF; +% also write alternative language representations +% of |pdftitle| and |pdfsubject|: +% \begin{macrocode} +\newcommand{\metawritepdfinfo}{\ifdefined\hypersetup + \metaifpick[\mstr@lang@meta]{author} + {\hypersetup{pdfauthor={\metapick[\mstr@lang@meta]{author}}}}{}% + \metaifpick[\mstr@lang@meta]{title} + {\hypersetup{pdftitle={\metapick[\mstr@lang@meta]{titletext}}}}{}% + \metaifpick[\mstr@lang@meta]{subject} + {\hypersetup{pdfsubject={\metapick[\mstr@lang@meta]{subject}}}}{}% + \metaifpick[\mstr@lang@meta]{keywords} + {\hypersetup{pdfkeywords={\metapick[\mstr@lang@meta]{keywords}}}}{}% + \ifdefined\xmptilde + \metaif[altlang]{title}{% + \@for\mstr@tmp:=\mstr@data@title@altlang{}\do{% + \metaifpick[\mstr@tmp]{title} + {\XMPLangAlt{\mstr@tmp}{pdftitle= + {\metapick[\mstr@tmp]{titletext}}}}{}}% + \metaunset[altlang]{title}}{}% + \metaif[altlang]{subject}{% + \@for\mstr@tmp:=\mstr@data@subject@altlang{}\do{% + \metaifpick[\mstr@tmp]{subject} + {\XMPLangAlt{\mstr@tmp}{pdfsubject= + {\metapick[\mstr@tmp]{subject}}}}{}}% + \metaunset[altlang]{subject}}{}% + \fi\fi} +% \end{macrocode} + +% \macro{\metawritepdfaux} +% Write auxiliary registers to PDF: +% \begin{macrocode} +\newcommand{\metawritepdfaux}{\ifdefined\hypersetup\ifdefined\xmptilde + \metaif[]{url} + {\hypersetup{pdfurl={\metaget[]{url}}}}{}% + \hypersetup{pdfsource={}}% + \metaif[]{source} + {\hypersetup{pdfsource={\metaget[]{source}}}}{}% +\fi\fi} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Copyright and License} +% \label{sec:imp-rights} +% +% The following defines some registers concerning +% copyright and licensing. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Rights Composition.} +% +% \macro{rightstext} +% Declare a register to compose copyright and license information: +% \begin{macrocode} +\metadef{rightstext} +% \end{macrocode} +% Define generic version of composition register: +% \begin{macrocode} +\metaset{rightstext}{% + \metaifpick[]{partof}{\metacompose[#1]{partofmessage}{}{ }{}}{}% + \metapick[#1]{copyrightstatement}% + \metacompose[#1]{copyrightmessage}{ }{}{}% + \metacompose[#1]{licensemessage}{ }{}{}% + \metaif[]{licenseurl}{\metacompose[#1]{licenseurlmessage}{ }{}{}}{}% + \metaif[]{url}{\metacompose[#1]{urlmessage}{ }{}{}}{}% +} +% \end{macrocode} +% Define print version of composition register; +% variant |sep| contains code to separate parts of the message: +% \begin{macrocode} +\metaset[skip]{rightstext}{\par\addvspace\medskipamount} +\metaset[print]{rightstext}{% + \metaifpick[]{partof}{% + \metacompose[#1]{partofmessage}{}{\metaget[skip]{rightstext}}{}}{}% + \metacompose[#1]{copyrightstatement}{}{\metaget[skip]{rightstext}}{}% + \metacompose[#1]{copyrightmessage}{}{ }{}% + \metacompose[#1]{licensemessage}{}{ }{}% + \metaif[]{licenselogo}{% + \metacompose[#1]{licenselogomessage} + {\metaget[skip]{rightstext}}{\metaget[skip]{rightstext}}{}}{}% + \metaif[]{licenseurl}{\metacompose[#1]{licenseurlmessage}{ }{ }{}}{}% + \metaif[]{url}{\metacompose[#1]{urlmessage} + {\metaget[skip]{rightstext}}{}{}}{} + \metacompose[#1]{attributionmessage}{\metaget[skip]{rightstext}}{}{}% +} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Copyright Composition.} +% +% \macro{copyright...} +% Declare registers to specify document copyright: +% \begin{macrocode} +\metadef{copyrightmark} +\metadef{copyrightdate} +\metadef{copyrightowner} +\metadef{copyrightstatement} +\metadef{copyrightmessage} +% \end{macrocode} + +% \macro{copyrightmark} +% The copyright sign or word: +% \begin{macrocode} +\metaset{copyrightmark}{Copyright} +\metaset[print]{copyrightmark}{\copyright} +% \end{macrocode} + +% \macro{copyrightstatement} +% Assemble the copyright statement from available fragments; +% proper spacing makes this a bit tedious: +% \begin{macrocode} +\metaset{copyrightstatement}{\metaifpick[#1]{copyrightdate}% + {\metapick[#1]{copyrightmark} \metapick[#1]{copyrightdate}% + \metacompose[#1]{copyrightowner}{ }{}{}.} + {\metaifpick[#1]{copyrightowner} + {\metapick[#1]{copyrightmark} \metapick[#1]{copyrightowner}.}{}}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License Composition.} +% +% \macro{license...} +% Declare registers to specify document license: +% \begin{macrocode} +\metadef{licenseversion} +\metadef{licenseprovider} +\metadef{licensemessage} +\metadef{licenselogo} +\metadef{licenselogomessage} +\metadef{licenseurl} +\metadef{licenseurlmessage} +% \end{macrocode} + +% \macro{attributionmessage} +% Declare a register for the attribution message: +% \begin{macrocode} +\metadef{attributionmessage} +% \end{macrocode} + +% \macro{licenseurlmessage} +% Message to declare URL at which the relevant license +% or further details can be found (translated): +% \translate{licenseurlmessage} +% \begin{macrocode} +% \metaset{licenseurlmessage}{% +% To view a copy of this license, visit: \metapick[#1]{licenseurl}.} +% \end{macrocode} + +% \macro{licenseurl} +% In |print| version, pass plain |licenseurl| through |\url|: +% \begin{macrocode} +\metaset[print]{licenseurl}{\url{\metaget[]{licenseurl}}} +% \end{macrocode} + +% \macro{licenselogo} +% \macro{licenselogomessage} +% Display license logo, by default align centrally; +% abuse the variant argument for passing the file name argument +% to |\includegraphics|: +% \begin{macrocode} +\metaset[print]{licenselogomessage}{% + \centerline{\metapick[#1]{licenselogo}}} +\metaset[cmd]{licenselogo}{\includegraphics{#1}} +\metaset[print]{licenselogo}{% + \mstr@getbare[cmd]{licenselogo}{\metaget[]{licenselogo}}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Write to PDF.} +% +% \macro{\metawritepdfrights} +% Write rights information +% (rights text, alternative language representations, license url) +% to PDF via \textsf{hyperxmp}: +% \begin{macrocode} +\newcommand{\metawritepdfrights}{\ifdefined\hypersetup\ifdefined\xmptilde + \metaifpick[\mstr@lang@meta]{rightstext} + {\hypersetup{pdfcopyright= + {\metapick[\mstr@lang@meta]{rightstext}}}}{}% + \metaif[altlang]{rightstext} + {\@for\mstr@tmp:=\mstr@data@rightstext@altlang{}\do + {\XMPLangAlt{\mstr@tmp}{pdfcopyright= + {\metapick[\mstr@tmp]{rightstext}}}}}{} + \metaifpick[\mstr@lang@meta]{licenseurl} + {\hypersetup{pdflicenseurl= + {\metapick[\mstr@lang@meta]{licenseurl}}}}{}% +\fi\fi} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Copyright Presets.} +% +% \macro{copyright@...} +% Declare some copyright presets: +% \begin{macrocode} +\metadef{copyright@plain} +\metadef{copyright@parts} +\metadef{copyright@doc} +\metadef{copyright@doc-parts} +\metadef{copyright@reserved} +\metadef{copyright@publicdomain} +% \end{macrocode} +% \macro{plain} +% \macro{parts} +% \macro{doc} +% \macro{doc-parts} +% \macro{reserved} +% Some plain copyright messages (translated): +% \translate{copyright@plain} +% \translate{copyright@parts} +% \translate{copyright@doc} +% \translate{copyright@doc-parts} +% \translate{copyright@reserved} +% \begin{macrocode} +% \metaset{copyright@plain}{% +% This work is protected by copyright.} +% \metaset{copyright@parts}{% +% This work as well as its parts is protected by copyright.} +% \metaset{copyright@doc}{% +% This document is protected by copyright.} +% \metaset{copyright@doc-parts}{% +% This document as well as its parts is protected by copyright.} +% \metaset{copyright@reserved}{All rights reserved.} +% \end{macrocode} +% \macro{publicdomain} +% A public domain declaration (translated): +% \translate{copyright@publicdomain} +% \begin{macrocode} +% \metaset{copyright@publicdomain} +% {This work is dedicated to the public domain.} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License Presets.} +% +% \macro{license@...} +% Declare some license presets +% \begin{macrocode} +\metadef{license@consent} +\metadef{license@consent-noncom} +\metadef{license@lppl} +% \end{macrocode} + +% \macro{consent} +% A license to reproduce with prior written consent (translated): +% \translate{license@consent} +% \begin{macrocode} +% \metaset{license@consent}{% +% Reproduction of any part of this work in any form +% without prior written consent +% \metacompose[#1]{licenseprovider}{}{}{of the author} +% is not permissible.} +% \end{macrocode} + +% \macro{consent-noncom} +% A license to reproduce +% for private, scientific and non-commercial purposes +% or with prior written consent (translated): +% \translate{license@consent-noncom} +% \begin{macrocode} +% \metaset{license@consent-noncom}{% +% Reproduction of any part of this work in any form +% without prior written consent +% \metapick[#1]{licenseprovider}{}{}{of the author} +% is permissible only for private, scientific and non-commercial use.} +% \end{macrocode} + +% \macro{lppl} +% \LaTeX{} project public license (translated): +% \translate{license@lppl} +% \begin{macrocode} +\metaset[url]{license@lppl}{http://www.latex-project.org/lppl.txt} +% \metaset{license@lppl}{% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version +% \metaif[]{licenseversion}{\metaget[]{licenseversion}}{1.3} +% of this license or (at your option) any later version.} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Selection Code.} +% +% \macro{\metacopyright} +% \macro{\metalicense} +% Set a copyright or license message: +% \begin{macrocode} +\newcommand{\metacopyright}[1]{% + \metaset{copyrightmessage}{\metapick[##1]{copyright@#1}}} +\newcommand{\metalicense}[1]{% + \metaset{licensemessage}{\metapick[##1]{license@#1}}% + \metaif[url]{license@#1}{% + \metaset{licenseurl}{\metaget[url]{license@#1}}}{}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Creative Commons} +% \label{sec:imp-cc} +% +% The following implements the scheme of Creative Commons licenses. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Declarations.} +% +% \macro{cc@type} +% \macro{cc@class} +% |cc@type| stores the selected CC license type; +% |cc@class| is `|@zero|' for the CC0 public domain dedication +% and empty otherwise: +% \begin{macrocode} +\metadef{cc@type} +\metadef{cc@class} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Text Components and Internationalisation.} +% +% CC license declarations are composed +% from several elements which can be conveniently internationalised. +% +% The following registers store various terms used in CC licenses: +% \translate{term-cc@...} +% \begin{macrocode} +\metasetterm{cc@sep}{-} +\metasetterm{cc@quotel}{\textquotedblleft} +\metasetterm{cc@quoter}{\textquotedblright} +\metasetterm{cc@cc}{Creative Commons} +\metasetterm{cc@zero}{CC0} +\metasetterm{cc@by}{Attribution} +\metasetterm{cc@sa}{ShareAlike} +\metasetterm{cc@nd}{NoDerivatives} +\metasetterm{cc@nc}{NonCommercial} +\metasetterm{cc@unported}{Unported} +\metasetterm{cc@generic}{Generic} +\metasetterm{cc@intl}{International} +\metasetterm{cc@univ}{Universal} +\metasetterm{cc@pd}{Public Domain} +\metasetterm{cc@license}{License} +\metasetterm{cc@pddecl}{Public Domain Dedication} +% \end{macrocode} + +% \macro{cc@pd} +% \macro{cc@zero} +% \macro{cc@by...} +% The following template registers store the combinations +% for the various CC licenses: +% \begin{macrocode} +\metadef{cc@pd} +\metadef{cc@zero} +\metadef{cc@by} +\metadef{cc@by-sa} +\metadef{cc@by-nd} +\metadef{cc@by-nc} +\metadef{cc@by-nc-sa} +\metadef{cc@by-nc-nd} +% \end{macrocode} +% Fill the registers: +% \begin{macrocode} +\metaset{cc@zero}{\metatranslate[#1]{cc@zero}} +\metaset{cc@by}{\metatranslate[#1]{cc@by}} +\metaset{cc@by-sa}{% + \metatranslate[#1]{cc@by}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@sa}} +\metaset{cc@by-nd}{% + \metatranslate[#1]{cc@by}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@nd}} +\metaset{cc@by-nc}{% + \metatranslate[#1]{cc@by}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@nc}} +\metaset{cc@by-nc-sa}{% + \metatranslate[#1]{cc@by}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@nc}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@sa}} +\metaset{cc@by-nc-nd}{% + \metatranslate[#1]{cc@by}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@nc}\metatranslate[#1]{cc@sep}% + \metatranslate[#1]{cc@nd}} +% \end{macrocode} + +% \macro{cc@n.n} +% \macro{cc@n.n@zero} +% The following registers store the various versions for CC licenses: +% \begin{macrocode} +\metadef{cc@1.0@zero} +\metadef{cc@1.0} +\metadef{cc@2.0} +\metadef{cc@2.5} +\metadef{cc@3.0} +\metadef{cc@4.0} +% \end{macrocode} +% Fill the registers: +% \begin{macrocode} +\metaset{cc@1.0@zero}{\metatranslate[#1]{cc@univ}} +\metaset{cc@1.0}{\metatranslate[#1]{cc@generic}} +\metaset{cc@2.0}{\metatranslate[#1]{cc@generic}} +\metaset{cc@2.5}{\metatranslate[#1]{cc@generic}} +\metaset{cc@3.0}{\metatranslate[#1]{cc@unported}} +\metaset{cc@4.0}{\metatranslate[#1]{cc@intl}} +% \end{macrocode} + +% \macro{cc@license} +% \macro{cc@license@zero} +% \macro{cc@license@pd} +% The following registers store the term ``CC license'': +% \begin{macrocode} +\metadef{cc@license} +\metadef{cc@license@zero} +\metadef{cc@license@pd} +% \end{macrocode} +% Fill the registers (translated): +% \translate{cc@license} +% \translate{cc@license@zero} +% \translate{cc@license@pd} +% \begin{macrocode} +% \metaset{cc@license}{% +% \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@license}} +% \metaset{cc@license@zero}{% +% \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@pddecl}} +\metaset{cc@license@pd}{\metatranslate[#1]{cc@pddecl}} +% \end{macrocode} + +% \macro{cc@message} +% \macro{cc@message@zero} +% The following registers contain presets for the CC license messages: +% \begin{macrocode} +\metadef{cc@message} +\metadef{cc@message@zero} +% \end{macrocode} +% Fill the registers (translated): +% \translate{cc@message} +% \translate{cc@message@zero} +% \begin{macrocode} +% \metaset{cc@message}{% +% This work is licensed under the +% \metapick[#1]{licenseccfull} (\metapick[short]{licenseccfull}).} +% \metaset{cc@message@zero}{% +% This work is dedicated to the public domain by means of the +% \metapick[#1]{licenseccfull} (\metapick[short]{licenseccfull}).} +% \end{macrocode} + +% \macro{licensecc} +% \macro{licenseccver} +% \macro{licenseccfull} +% |licensecc| and |licenseccver| +% represent the name and version of the selected CC license; +% |licenseccfull| contains a full representation of the selected CC license: +% \begin{macrocode} +\metadef{licensecc} +\metadef{licenseccver} +\metadef{licenseccfull} +% \end{macrocode} +% Fill the registers: +% \begin{macrocode} +\metaset{licensecc}{% + \metapick[#1]{cc@\metaget[]{cc@type}}} +\metaset{licenseccver}{% + \metaget[]{licenseversion} + \metapick[#1]{cc@\metaget[]{licenseversion}\metaget[]{cc@class}}} +\metaset{licenseccfull}{% + \metapick[#1]{cc@license\metaget[]{cc@class}} + \metatranslate[#1]{cc@quotel}% + \metapick[#1]{licensecc} + \metapick[#1]{licenseccver}% + \metatranslate[#1]{cc@quoter}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License Identifier.} +% +% \macro{ident} +% Compose the license identifier by |ident| variant: +% \begin{macrocode} +\metaset[ident]{licenseccver}{\metaget[]{licenseversion}} +\metaset[ident]{licenseccfull}{% + \metapick[ident]{licensecc} \metaget[ident]{licenseccver}} +\metasetterm[ident]{cc@sep}{-} +\metasetterm[ident]{cc@cc}{CC} +\metasetterm[ident]{cc@by}{BY} +\metasetterm[ident]{cc@sa}{SA} +\metasetterm[ident]{cc@nd}{ND} +\metasetterm[ident]{cc@nc}{NC} +\metasetterm[ident]{cc@zero}{CC0} +% \end{macrocode} +% +% \macro{short} +% Compose the short license identifier by |short| variant: +% \begin{macrocode} +\metaset[short]{licensecc}{% + \metaget[short]{cc@license\metaget[]{cc@class}}% + \metapick[short]{cc@\metaget[]{cc@type}}} +\metaset[short]{licenseccver}{\metaget[]{licenseversion}} +\metaset[short]{licenseccfull}{% + \metapick[short]{licensecc} \metaget[short]{licenseccver}} +\metasetterm[short]{cc@sep}{-} +\metasetterm[short]{cc@cc}{CC} +\metasetterm[short]{cc@by}{BY} +\metasetterm[short]{cc@sa}{SA} +\metasetterm[short]{cc@nd}{ND} +\metasetterm[short]{cc@nc}{NC} +\metasetterm[short]{cc@zero}{CC0} +\metaset[short]{cc@license}{CC } +\metaset[short]{cc@license@zero}{} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License Logo.} +% +% \macro{logo} +% |logo| variants used for the license logo +% provided by the \textsf{doclicense} package: +% \begin{macrocode} +\metaset[logo]{cc@pd}{doclicense-CC-pd} +\metaset[logo]{cc@zero}{doclicense-CC-zero} +\metaset[logo]{cc@by}{doclicense-CC-by} +\metaset[logo]{cc@by-sa}{doclicense-CC-by-sa} +\metaset[logo]{cc@by-nd}{doclicense-CC-by-nd} +\metaset[logo]{cc@by-nc}{doclicense-CC-by-nc} +\metaset[logo]{cc@by-nc-sa}{doclicense-CC-by-nc-sa} +\metaset[logo]{cc@by-nc-nd}{doclicense-CC-by-nc-nd} +% \end{macrocode} +% Use euro sign versions: +% \begin{macrocode} +\mstr@iftext\mstr@opt@cclogocurr{euro}{ +\metaset[logo]{cc@by-nc}{doclicense-CC-by-nc-eu} +\metaset[logo]{cc@by-nc-sa}{doclicense-CC-by-nc-sa-eu} +\metaset[logo]{cc@by-nc-nd}{doclicense-CC-by-nc-nd-eu}} +% \end{macrocode} + +% \macro{\mstr@setcclogo} +% Use the Creative Commons logos +% included in the \textsf{doclicense} package: +% \begin{macrocode} +\newcommand{\mstr@setcclogo}{% + \ifmstr@opt@cclogo + \IfFileExists{doclicense.sty}{% + \ifdefined\includegraphics + \metaset{licenselogo}{% + \metapick[logo]{licensecc}} + \fi}{\GenericWarning{please install package `doclicense'}}% + \fi} +% \end{macrocode} + +% \macro{icon} +% |icon| variants used for the license icons +% provided by the \textsf{ccicons} package: +% \begin{macrocode} +\metaset[icon]{licensecc}{% + \metaget[icon]{cc@license\metaget[]{cc@class}}% + \metapick[icon]{cc@\metaget[]{cc@type}}} +\metaset[icon]{licenseccver}{\metaget[]{licenseversion}} +\metaset[icon]{licenseccfull}{% + \metaget[icon]{licensecc} + \metaget[icon]{licenseccver}} +\metasetterm[icon]{cc@sep}{} +\metasetterm[icon]{cc@cc}{\ccLogo} +\metasetterm[icon]{cc@pd}{\ccPublicDomain} +\metasetterm[icon]{cc@zero}{\ccZero} +\metasetterm[icon]{cc@by}{\ccAttribution} +\metasetterm[icon]{cc@sa}{\ccShareAlike} +\metasetterm[icon]{cc@nd}{\ccNoDerivatives} +\metasetterm[icon]{cc@nc}{\ccNonCommercial} +\metaset[icon]{cc@license}{\metatranslate[#1]{cc@cc}} +\metaset[icon]{cc@license@zero}{\metatranslate[#1]{cc@cc}} +\metaset[icon]{cc@license@pd}{\metatranslate[#1]{cc@pd}} +\metaset[icon]{copyrightmark}{\ccCopy} +% \end{macrocode} +% Use euro or yen sign versions: +% \begin{macrocode} +\mstr@iftext\mstr@opt@cclogocurr{euro}{ + \metasetterm[icon]{cc@nc}{\ccNonCommercialEU}} +\mstr@iftext\mstr@opt@cclogocurr{yen}{ + \metasetterm[icon]{cc@nc}{\ccNonCommercialJP}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License URL.} +% +% \macro{url} +% The |url| variant of compounds are used for the license URL. +% \begin{macrocode} +\metaset[url]{licenseccver}{\metaget[]{licenseversion}} +\metaset[url]{licenseccfull}{% + \metaget[url]{cc@license\metaget[]{cc@class}}/% + \metapick[url]{licensecc}/% + \metaget[url]{licenseccver}/} +\metaset[url]{cc@license}{https://creativecommons.org/licenses} +\metaset[url]{cc@license@zero}{https://creativecommons.org/publicdomain} +\metaset[url]{cc@zero}{zero} +\metaset[url]{cc@by}{by} +\metaset[url]{cc@by-sa}{by-sa} +\metaset[url]{cc@by-nd}{by-nd} +\metaset[url]{cc@by-nc}{by-nc} +\metaset[url]{cc@by-nc-sa}{by-nc-sa} +\metaset[url]{cc@by-nc-nd}{by-nc-nd} +% \end{macrocode} + +% Declare registers for internationalisation of deed URL: +% \begin{macrocode} +\metadef{cc@url} +\metadef{cc@url@deed} +% \end{macrocode} +% Fill registers: +% \translate{cc@url@deed} +% \begin{macrocode} +\metaset{cc@url@deed}{} +\metaset{cc@url}{\metapick[url]{licenseccfull}\metapick[#1]{cc@url@deed}} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{License Preset.} +% +% \macro{\metalicensecc} +% Set the CC license of type `|#1|': +% \begin{macrocode} +\newcommand{\metalicensecc}[1]{% + \def\mstr@tmpl{#1}% + \def\mstr@tmp{pd}% + \ifx\mstr@tmpl\mstr@tmp + \metaset{cc@class}{@pd}% + \metacopyright{publicdomain}% + \metaset{cc@type}{pd}% + \else + \def\mstr@tmp{zero}% + \ifx\mstr@tmpl\mstr@tmp + \metaset{cc@class}{@zero}% + \metaif[]{licenseversion}{}{\metaset{licenseversion}{1.0}}% + \else + \metaset{cc@class}{}% + \metaif[]{licenseversion}{}{\metaset{licenseversion}{4.0}}% + \fi + \metaset{cc@type}{#1}% + \metaset{licenseurl}{\metapick[##1]{cc@url}}% + \metaset{licensemessage} + {\metapick[##1]{cc@message\metaget[]{cc@class}}}% + \fi + \mstr@setcclogo} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Contact Information} +% \label{sec:imp-contact} +% +% The following describes an interface +% to store and write contact information. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Declarations.} +% +% \macro{contact...} +% Contact register declarations: +% \begin{macrocode} +\metadef{contactaddress} +\metadef{contactpostcode} +\metadef{contactcity} +\metadef{contactregion} +\metadef{contactcountry} +\metadef{contactemail} +\metadef{contacturl} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Write to PDF.} +% +% \macro{\metawritepdfcontact} +% Write contact information to PDF via \textsf{hyperxmp}: +% \begin{macrocode} +\newcommand{\metawritepdfcontact}{\ifdefined\hypersetup\ifdefined\xmptilde + \metaifpick[\mstr@lang@meta]{contactaddress}{% + \hypersetup{pdfcontactaddress= + {\metapick[\mstr@lang@meta]{contactaddress}}}}{}% + \metaifpick[\mstr@lang@meta]{contactpostcode}{% + \hypersetup{pdfcontactpostcode= + {\metapick[\mstr@lang@meta]{contactpostcode}}}}{}% + \metaifpick[\mstr@lang@meta]{contactcity}{% + \hypersetup{pdfcontactcity= + {\metapick[\mstr@lang@meta]{contactcity}}}}{}% + \metaifpick[\mstr@lang@meta]{contactregion}{% + \hypersetup{pdfcontactregion= + {\metapick[\mstr@lang@meta]{contactregion}}}}{}% + \metaifpick[\mstr@lang@meta]{contactcountry}{% + \hypersetup{pdfcontactcountry= + {\metapick[\mstr@lang@meta]{contactcountry}}}}{}% + \metaifpick[\mstr@lang@meta]{contactemail}{% + \hypersetup{pdfcontactemail= + {\metapick[\mstr@lang@meta]{contactemail}}}}{}% + \metaifpick[\mstr@lang@meta]{contacturl}{% + \hypersetup{pdfcontacturl= + {\metapick[\mstr@lang@meta]{contacturl}}}}{}% +\fi\fi} +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Extras} +% \label{sec:imp-extra} +% +% The following defines some extras to be activated by package options. +% +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Course Metadata.} +% +% Include structures for course materials: +% \begin{macrocode} +\ifmstr@opt@course +% \end{macrocode} + +%\macro{institution} +%\macro{instructor} +%\macro{course} +%\macro{material} +%\macro{period} +% Declare course structures: +% \begin{macrocode} +\metadef{institution} +\metadef{instructor} +\metadef{course} +\metadef{material} +\metadef{period} +% \end{macrocode} + +% Preset formatting styles: +% \begin{macrocode} +\metaset[style]{course}{\LARGE\bfseries} +\metaset[style]{material}{\large} +\metaset[style]{institution}{\large} +\metaset[style]{period}{\large} +\metaset[style]{instructor}{\scshape\Large} +\metaset[skip]{material}{\vspace{2ex}} +\metaset[skip]{institution}{\vspace{4ex}} +\metaset[skip]{period}{\vspace{4ex}} +\metaset[skip]{instructor}{\vspace{6ex}} +\metaset[sep]{period}{, } +% \end{macrocode} + +% Fill |titletext| in |course| variant to display +% relevant title data for the course material: +% \begin{macrocode} +\metaset[course]{titletext}{% + \metatitleline[print]{course}% + \metatitlelinetwo[print]{material}[print]{draft}% + \metatitlelinetwo[print]{institution}[print]{period}% + \metatitleline[print]{instructor}} +% \end{macrocode} + +% Inherit title, subtitle, author and date: +% \begin{macrocode} +\metaset{title}{\metapick[#1]{course}} +\metaset{subtitle}{\metapick[#1]{material}} +\metaset{author}{\metapick[#1]{instructor}} +\metaset{date}{\metapick[#1]{period}} +\metaset{location}{\metapick[#1]{institution}} +% \end{macrocode} + +% \begin{macrocode} +\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \subsection{Translations} +% \label{sec:imp-translate} +% +% Determine all desired international versions to be loaded; +% use first one as fallback language: +% \begin{macrocode} +\def\mstr@loadlangloop#1|#2&{% + \mstr@csdo\let{mstr@lang@#1}\relax% + \ifx\mstr@lang@fallback\@empty\def\mstr@lang@fallback{#1}\fi% + \if @#2@\else\mstr@loadlangloop#2&\fi} +\expandafter\mstr@loadlangloop\mstr@opt@loadlang|& +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{English.} +% +% Check whether to load English strings: +% \begin{macrocode} +\ifdefined\mstr@lang@en +% \end{macrocode} + +% Terms: +% \begin{macrocode} +\metasetterm[en]{title}{Title} +\metasetterm[en]{abstract}{Abstract} +\metasetterm[en]{copyright}{Copyright} +\metasetterm[en]{preface}{Preface} +\metasetterm[en]{part}{Part} +\metasetterm[en]{chapter}{Chapter} +\metasetterm[en]{section}{Section} +\metasetterm[en]{subsection}{Subsection} +\metasetterm[en]{paragraph}{Paragraph} +\metasetterm[en]{appendix}{Appendix} +\metasetterm[en]{page}{Page} +\metasetterm[en]{figure}{Figure} +\metasetterm[en]{table}{Table} +\metasetterm[en]{contents}{Contents} +\metasetterm[en]{listfigure}{List of Figures} +\metasetterm[en]{listtable}{List of Tables} +\metasetterm[en]{references}{References} +\metasetterm[en]{index}{Index} +\metasetterm[en]{draft}{DRAFT} +% \end{macrocode} + +% General purpose messages: +% \begin{macrocode} +\metaset[en]{urlmessage}{% + The current version of this work can be found at: \metapick[#1]{url}.} +\metaset[en]{partofmessage}{% + This document is part of the work: \metapick[#1]{partof}.} +\metaset[en]{licenseurlmessage}{% + To view a copy of this license, visit: \metapick[#1]{licenseurl}.} +% \end{macrocode} +% Copyright statements: +% \begin{macrocode} +\metaset[en]{copyright@plain}{% + This work is protected by copyright.} +\metaset[en]{copyright@parts}{% + This work as well as its parts is protected by copyright.} +\metaset[en]{copyright@doc}{% + This document is protected by copyright.} +\metaset[en]{copyright@doc-parts}{% + This document as well as its parts is protected by copyright.} +\metaset[en]{copyright@reserved}{All rights reserved.} +\metaset[en]{copyright@publicdomain} + {This work is dedicated to the public domain.} +% \end{macrocode} +% License statements: +% \begin{macrocode} +\metaset[en]{license@consent}{% + Reproduction of any part of this work in any form + without prior written consent + \metacompose[#1]{licenseprovider}{}{}{of the author} + is not permissible.} +\metaset[en]{license@consent-noncom}{% + Reproduction of any part of this work in any form + without prior written consent + \metacompose[#1]{licenseprovider}{}{}{of the author} + is permissible only for private, scientific and non-commercial use.} +\metaset[en]{license@lppl}{% + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version + \metaif[]{licenseversion}{\metaget[]{licenseversion}}{1.3} + of this license or (at your option) any later version.} +% \end{macrocode} +% Creative Commons license composition: +% \begin{macrocode} +\metaset[en]{cc@url@deed}{deed.en} +\metaset[en]{cc@message}{% + This work is licensed under the + \metapick[en]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[en]{cc@message@zero}{% + This work is dedicated to the public domain by means of the + \metapick[#1]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[en]{cc@license}{% + \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@license}} +\metaset[en]{cc@license@zero}{% + \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@pddecl}} +\metasetterm[en]{cc@sep}{-} +\metasetterm[en]{cc@quotel}{\textquotedblleft} +\metasetterm[en]{cc@quoter}{\textquotedblright} +\metasetterm[en]{cc@by}{Attribution} +\metasetterm[en]{cc@sa}{ShareAlike} +\metasetterm[en]{cc@nd}{NoDerivatives} +\metasetterm[en]{cc@nc}{NonCommercial} +\metasetterm[en]{cc@unported}{Unported} +\metasetterm[en]{cc@generic}{Generic} +\metasetterm[en]{cc@intl}{International} +\metasetterm[en]{cc@univ}{Universal} +\metasetterm[en]{cc@license}{License} +\metasetterm[en]{cc@pd}{Public Domain} +\metasetterm[en]{cc@pddecl}{Public Domain Dedication} +% \end{macrocode} + +% \begin{macrocode} +\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{German.} +% +% Check whether to load German strings: +% \begin{macrocode} +\ifdefined\mstr@lang@de +% \end{macrocode} + +% Terms: +% \begin{macrocode} +\metasetterm[de]{title}{Titel} +\metasetterm[de]{abstract}{Zusammenfassung} +\metasetterm[de]{copyright}{Urheberrechte} +\metasetterm[de]{preface}{Vorwort} +\metasetterm[de]{part}{Teil} +\metasetterm[de]{chapter}{Kapitel} +\metasetterm[de]{section}{Abschnitt} +\metasetterm[de]{subsection}{Unterabschnitt} +\metasetterm[de]{paragraph}{Absatz} +\metasetterm[de]{appendix}{Anhang} +\metasetterm[de]{page}{Seite} +\metasetterm[de]{figure}{Abbildung} +\metasetterm[de]{table}{Tabelle} +\metasetterm[de]{contents}{Inhaltsverzeichnis} +\metasetterm[de]{listfigure}{Abbildungsverzeichnis} +\metasetterm[de]{listtable}{Tabellenverzeichnis} +\metasetterm[de]{references}{Literatur} +\metasetterm[de]{index}{Index} +\metasetterm[de]{draft}{ENTWURF} +% \end{macrocode} + +% General purpose messages: +% \begin{macrocode} +\metaset[de]{urlmessage}{% + Die aktuelle Version dieses Werks befindet sich unter: + \metapick[#1]{url}.} +\metaset[de]{partofmessage}{% + Dieses Dokument ist Teil des Werks: \metapick[#1]{partof}.} +\metaset[de]{licenseurlmessage}{% + Die Lizenz kann eingesehen werden unter: + \metapick[#1]{licenseurl}.} +% \end{macrocode} +% Copyright statements: +% \begin{macrocode} +\metaset[de]{copyright@plain}{% + Dieses Werk ist urheberrechtlich gesch\"utzt.} +\metaset[de]{copyright@parts}{% + Dieses Werk sowie seine Teile sind urheberrechtlich gesch\"utzt.} +\metaset[de]{copyright@doc}{% + Dieses Dokument ist urheberrechtlich gesch\"utzt.} +\metaset[de]{copyright@doc-parts}{% + Dieses Dokument sowie seine Teile sind urheberrechtlich gesch\"utzt.} +\metaset[de]{copyright@reserved}{Alle Rechte vorbehalten.} +\metaset[de]{copyright@publicdomain} + {Dieses Werk ist gemeinfrei.} +% \end{macrocode} +% License statements: +% \begin{macrocode} +\metaset[de]{license@consent}{% + Reproduktion eines Teils dieses Werks in beliebiger Form + ohne vorg\"angige schriftliche Erlaubnis + \metacompose[#1]{licenseprovider}{}{}{des Verfassers} + ist nicht gestattet.} +\metaset[de]{license@consent-noncom}{% + Reproduktion eines Teils dieses Werks in beliebiger Form + ohne vorg\"angige schriftliche Erlaubnis + \metacompose[#1]{licenseprovider}{}{}{des Verfassers} + ist nur zum privaten, wissenschaftlichen + und nicht-gewerblichen Gebrauch gestattet.} +\metaset[de]{license@lppl}{% + Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, + entweder Version + \metaif[]{licenseversion}{\metaget[]{licenseversion}}{1.3} + oder (nach Ihrer Wahl) jede sp\"atere Version, + verteilt und/oder ver\"andert werden.} +% \end{macrocode} +% Creative Commons license composition: +% \begin{macrocode} +\metaset[de]{cc@url@deed}{deed.de} +\metaset[de]{cc@message}{% + Dieses Werk ist lizensiert unter der + \metapick[de]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[de]{cc@message@zero}{% + Dieses Werk ist gemeinfrei deklariert mittels der + \metapick[de]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[de]{cc@license}{% + \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@license}} +\metaset[de]{cc@license@zero}{% + \metatranslate[#1]{cc@cc} \metatranslate[#1]{cc@pddecl}} +\metasetterm[de]{cc@sep}{ -- } +\metasetterm[de]{cc@quotel}{\quotedblbase} +\metasetterm[de]{cc@quoter}{\textquotedblleft} +\metasetterm[de]{cc@by}{Namensnennung} +\metasetterm[de]{cc@sa}{Weitergabe unter gleichen Bedingungen} +\metasetterm[de]{cc@nd}{Keine Bearbeitungen} +\metasetterm[de]{cc@nc}{Nicht kommerziell} +\metasetterm[de]{cc@unported}{Unportiert} +\metasetterm[de]{cc@generic}{Generisch} +\metasetterm[de]{cc@intl}{International} +\metasetterm[de]{cc@univ}{Universell} +\metasetterm[de]{cc@license}{Lizenz} +\metasetterm[de]{cc@pd}{Gemeinfrei} +\metasetterm[de]{cc@pddecl}{Gemeinfrei Deklaration} +% \end{macrocode} + +% \begin{macrocode} +\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{French.} +% +% Disclaimer: professional assistance with translations needed. +% +% Check whether to load French strings: +% \begin{macrocode} +\ifdefined\mstr@lang@fr +% \end{macrocode} + +% Terms: +% \begin{macrocode} +\metasetterm[fr]{title}{Titre} +\metasetterm[fr]{abstract}{R\'esum\'e} +\metasetterm[fr]{copyright}{Droits d'Auteur} +\metasetterm[fr]{preface}{Pr\'eface} +\metasetterm[fr]{part}{Partie} +\metasetterm[fr]{chapter}{Chapitre} +\metasetterm[fr]{section}{Section} +\metasetterm[fr]{subsection}{Sous-Section} +\metasetterm[fr]{paragraph}{Paragraphe} +\metasetterm[fr]{appendix}{Annexe} +\metasetterm[fr]{page}{Page} +\metasetterm[fr]{figure}{Figure} +\metasetterm[fr]{table}{Table} +\metasetterm[fr]{contents}{Table des Mati\`eres} +\metasetterm[fr]{listfigure}{Table des Figures} +\metasetterm[fr]{listtable}{Liste des Tableaux} +\metasetterm[fr]{references}{R\'ef\'erences} +\metasetterm[fr]{index}{Index} +\metasetterm[fr]{draft}{BROUILLON} +% \end{macrocode} + +% General purpose messages: +% \begin{macrocode} +\metaset[fr]{urlmessage}{% + La version actuelle de cet \oe uvre se trouve \`a l'adresse: + \metapick[#1]{url}.} +\metaset[fr]{partofmessage}{% + Ce document fait partie de la \oe uvre: \metapick[#1]{partof}.} +\metaset[fr]{licenseurlmessage}{% + Pour voir une copie de cette licence, visitez: + \metapick[#1]{licenseurl}.} +% \end{macrocode} +% Copyright statements: +% \begin{macrocode} +\metaset[fr]{copyright@plain}{% + Cette \oe uvre est prot\'eg\'ee par le droit d'auteur.} +\metaset[fr]{copyright@parts}{% + Cette \oe uvre ainsi que ses parties + sont prot\'eg\'ees par le droit d'auteur.} +\metaset[fr]{copyright@doc}{% + Ce document est prot\'eg\'es par le droit d'auteur.} +\metaset[fr]{copyright@doc-parts}{% + Ce document ainsi que ses parties + sont prot\'eg\'es par le droit d'auteur.} +\metaset[fr]{copyright@reserved}{Tous les droits sont r\'eserv\'es.} +\metaset[fr]{copyright@publicdomain} + {Cette \oe uvre est du domaine public.} +% \end{macrocode} +% Creative Commons license composition: +% \begin{macrocode} +\metaset[fr]{cc@url@deed}{deed.fr} +\metaset[fr]{cc@message}{% + Cette \oe uvre est mise \`a disposition selon les termes de la + \metapick[fr]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[fr]{cc@message@zero}{% + Cette \oe uvre est d\'eclar\'ee du domaine public par le + \metapick[fr]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[fr]{cc@license}{% + \metatranslate[#1]{cc@license} \metatranslate[#1]{cc@cc}} +\metaset[fr]{cc@license@zero}{% + \metatranslate[#1]{cc@pddecl} \metatranslate[#1]{cc@cc}} +\metasetterm[fr]{cc@sep}{ -- } +\metasetterm[fr]{cc@quotel}{\guillemotleft} +\metasetterm[fr]{cc@quoter}{\guillemotright} +\metasetterm[fr]{cc@by}{Attribution} +\metasetterm[fr]{cc@sa}{Partage dans les M\^emes Conditions} +\metasetterm[fr]{cc@nd}{Pas de Modification} +\metasetterm[fr]{cc@nc}{Pas d'Utilisation Commerciale} +\metasetterm[fr]{cc@unported}{Non Transpos\'e} +\metasetterm[fr]{cc@generic}{G\'en\'erique} +\metasetterm[fr]{cc@intl}{International} +\metasetterm[fr]{cc@univ}{Universel} +\metasetterm[fr]{cc@license}{Licence} +\metasetterm[fr]{cc@pd}{Domaine Public} +\metasetterm[fr]{cc@pddecl}{Transfert dans le Domaine Public} +% \end{macrocode} + +% \begin{macrocode} +\fi +% \end{macrocode} + +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \paragraph{Spanish.} +% +% Disclaimer: professional assistance with translations needed. +% +% Check whether to load Spanish strings: +% \begin{macrocode} +\ifdefined\mstr@lang@es +% \end{macrocode} + +% Terms: +% \begin{macrocode} +\metasetterm[es]{chapter}{Cap\'itulo} +\metasetterm[es]{section}{Secci\'on} +\metasetterm[es]{subsection}{Subsecci\'on} +\metasetterm[es]{paragraph}{P\'arrafo} +\metasetterm[es]{title}{T\'itulo} +\metasetterm[es]{abstract}{Resumen} +\metasetterm[es]{copyright}{Derechos de Autor} +\metasetterm[es]{preface}{Prefacio} +\metasetterm[es]{part}{Parte} +\metasetterm[es]{appendix}{Ap\'endice} +\metasetterm[es]{page}{P\'agina} +\metasetterm[es]{figure}{Figura} +\metasetterm[es]{table}{Cuadro} +\metasetterm[es]{contents}{\'Indice} +\metasetterm[es]{listfigure}{\'Indice de Figuras} +\metasetterm[es]{listtable}{\'Indice de Cuadros} +\metasetterm[es]{references}{Referencias} +\metasetterm[es]{index}{\'Indice Alfab\'etico} +\metasetterm[es]{draft}{BORRADOR} +% \end{macrocode} + +% General purpose messages: +% \begin{macrocode} +\metaset[es]{urlmessage}{% + La versi\'on actual de esta obra se puede encontrar en: + \metapick[#1]{url}.} +\metaset[es]{partofmessage}{% + Este documento es parte de la obra: \metapick[#1]{partof}.} +\metaset[es]{licenseurlmessage}{% + Para ver una copia de esta licencia, visite: + \metapick[#1]{licenseurl}.} +% \end{macrocode} +% Copyright statements: +% \begin{macrocode} +\metaset[es]{copyright@plain}{% + Esta obra est\'a protegida por derechos de autor.} +\metaset[es]{copyright@parts}{% + Esta obra y sus partes est\'an protegidas por derechos de autor.} +\metaset[es]{copyright@doc}{% + Este documento est\'a protegido por derechos de autor.} +\metaset[es]{copyright@doc-parts}{% + Este documento y sus partes est\'an protegidos por derechos de autor.} +\metaset[es]{copyright@reserved}{Todos los derechos reservados.} +\metaset[es]{copyright@publicdomain} + {Esta obra es de dominio p\'ublico.} +% \end{macrocode} +% Creative Commons license composition: +% \begin{macrocode} +\metaset[es]{cc@url@deed}{deed.es} +\metaset[es]{cc@message}{% + Esta obra est\'a bajo la + \metapick[es]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[es]{cc@message@zero}{Esta obra est\'a dedicada + al dominio p\'ublico por la + \metapick[es]{licenseccfull} (\metapick[short]{licenseccfull}).} +\metaset[es]{cc@license}{% + \metatranslate[#1]{cc@license} \metatranslate[#1]{cc@cc}} +\metaset[es]{cc@license@zero}{% + \metatranslate[#1]{cc@pddecl} \metatranslate[#1]{cc@cc}} +\metasetterm[es]{cc@sep}{-} +\metasetterm[es]{cc@quotel}{\textquotedblleft} +\metasetterm[es]{cc@quoter}{\textquotedblright} +\metasetterm[es]{cc@by}{Atribuci\'on} +\metasetterm[es]{cc@sa}{CompartirIgual} +\metasetterm[es]{cc@nd}{SinDerivadas} +\metasetterm[es]{cc@nc}{NoComercial} +\metasetterm[es]{cc@unported}{No Portada} +\metasetterm[es]{cc@generic}{Gen\'erica} +\metasetterm[es]{cc@intl}{Internacional} +\metasetterm[es]{cc@univ}{Universal} +\metasetterm[es]{cc@license}{Licencia} +\metasetterm[es]{cc@pd}{Dominio P\'ublico} +\metasetterm[es]{cc@pddecl}{Dedicaci\'on de Dominio P\'ublico} +% \end{macrocode} + +% \begin{macrocode} +\fi +% \end{macrocode} + +%\iffalse +%</package> +%\fi +% +\endinput diff --git a/macros/latex/contrib/metastr/metastr.ins b/macros/latex/contrib/metastr/metastr.ins new file mode 100644 index 0000000000..9202cf129c --- /dev/null +++ b/macros/latex/contrib/metastr/metastr.ins @@ -0,0 +1,29 @@ +\def\batchfile{metastr.ins} +\input docstrip.tex + +\keepsilent +\preamble + +Copyright (C) 2020 Niklas Beisert + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +\endpreamble + +% the style and sample files +\generate{\askforoverwritefalse +\file{metastr.sty}{\from{metastr.dtx}{package}} +\file{metasamp.tex}{\from{metastr.dtx}{sample}} +} + +\Msg{***********************************************************************} +\Msg{* Done. Please copy the file metastr.sty to an appropriate directory *} +\Msg{* of your LaTeX distribution, e.g. texmf-root/tex/latex/metastr. *} +\Msg{***********************************************************************} +\endbatchfile diff --git a/macros/latex/contrib/metastr/metastr.pdf b/macros/latex/contrib/metastr/metastr.pdf Binary files differnew file mode 100644 index 0000000000..e52d38b60f --- /dev/null +++ b/macros/latex/contrib/metastr/metastr.pdf diff --git a/macros/latex/contrib/tkz-doc/couverture.tex b/macros/latex/contrib/tkz-doc/couverture.tex new file mode 100644 index 0000000000..25092db22d --- /dev/null +++ b/macros/latex/contrib/tkz-doc/couverture.tex @@ -0,0 +1,92 @@ +%<--------- Couverture des documentations -------------------------------- + +%<------------------ Make Title ------------------------------------------ + +\renewcommand\maketitle{% +\null +\AddToShipoutPicture*{% +\setlength\unitlength{1mm} +\put(0,0){% + \makebox(0,0)[lb]{% + \color{myblue!10}\rule{\paperwidth}{\paperheight}% + }% + }% +\put(0,0){% + \makebox(0,0)[lb]{% + \color{myblue}\rule{40mm}{\paperheight}% + }% + }% +\put(20,270){% 270 en portrait 180 + \rotatebox{90}{% + \makebox(0,0)[r]{% + \fontsize{30}{30}\color{myblue!50!white}% + \bfseries + \selectfont{\@title\ \tkzversionofpack}\hfill% + }% + }% + }% +\put(60,60){% +\begin{pgfpicture} +\pgfsys@transformxyscale{.5}{.5} +\pgfmathdeclarerandomlist{color}{{myblue}{DarkBlue}{SteelBlue}{blue}{MidnightBlue}} + \foreach \a in {1,...,5}{% + \pgfmathrandominteger{\x}{1}{300}% + \pgfmathrandominteger{\y}{1}{200}% + \pgfmathrandominteger{\r}{20}{100}% + \pgfmathrandominteger{\s}{5}{95}% + \pgfmathrandominteger{\o}{50}{80}% + \pgfmathrandomitem{\c}{color}% + \pgfdeclareradialshading{ballshading}{% + \pgfpoint{-10bp}{10bp}}% + {% + color(0bp)=(\c!15!white); + color(9bp)=(\c!75!white); + color(18bp)=(\c!70!black); + color(25bp)=(\c!50!black); + color(50bp)=(black)% + }% + \pgfsetfillopacity{\o/100}% + \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt} + \pgfshadepath{ballshading}{\s}% + \pgfusepath{}% + }% + \end{pgfpicture}} +\put(80,150){ +\begin{tikzpicture}[scale=.75,rotate=60] +\tkzDefPoints{00/0/A,12/0/B,6/12*sind(60)/C} +\foreach \density in {20,30,...,240}{% + \tkzDrawPolygon[fill=teal!\density](A,B,C) + \pgfnodealias{X}{A} + \tkzDefPointWith[linear,K=.15](A,B) \tkzGetPoint{A} + \tkzDefPointWith[linear,K=.15](B,C) \tkzGetPoint{B} + \tkzDefPointWith[linear,K=.15](C,X) \tkzGetPoint{C} + } +\end{tikzpicture}% +} +\put(60,250){% 60,250 en portait 120,180 + \makebox(0,0)[l]{% + \begin{tikzpicture} + \nodeshadowedone(2,-1.25){\fontsize{60}{60} + \selectfont{\tkznamecollection}} + \end{tikzpicture} + }% + }% +\put(120,40){% + \makebox(0,0)[l]{% + \fontsize{17}{21} + \textcolor{sectioncolor}{\selectfont{\tkzauthorofpack}}% + }% + }% +\put(120,20){% + \makebox(0,0)[l]{% + \textcolor{sectioncolor}{\url{\tkzurlauthorcom}}% + }% + }% +\put(120,30){% + \makebox(0,0)[l]{% + \textcolor{sectioncolor}{\today \ \ Documentation V.\tkzversionofdoc}}% + }% + }% +\setcounter{footnote}{0}% +}% +%<----------------------- End Couverture ----------------------------> diff --git a/macros/latex/contrib/tkz-doc/tkz-doc.cfg b/macros/latex/contrib/tkz-doc/tkz-doc.cfg new file mode 100644 index 0000000000..7c09cefcc3 --- /dev/null +++ b/macros/latex/contrib/tkz-doc/tkz-doc.cfg @@ -0,0 +1,82 @@ +% Copyright 2011 by Alain Matthes +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. + +% original tkz-doc.cfg +% +% If you modify this original file, YOUR CHANGES WILL BE LOST when it is +% updated. Instead, put your changes in the entire copy of tkz-base.cfg +% and save the file in a directory part of your TEXINPUTS environment +% variable. +%=============================================================================== + +\def\fileversion{1.2c} +\def\filedate{2020/02/03} + +% ============= colors ========================================================= + +% \definecolor [⟨type⟩]{⟨name⟩}{⟨model-list⟩}{⟨spec-list⟩} +% \providecolor [⟨type⟩]{⟨name⟩}{⟨model-list⟩}{⟨spec-list⟩} +% \colorlet [⟨type⟩]{⟨name⟩}[⟨num model⟩]{⟨color⟩} +\definecolor{myblue}{RGB}{020,120,180} +\definecolor{fondpaille}{cmyk}{0,0,0.1,0} +\definecolor{bistre}{rgb}{.75,.50,.30} +\definecolor{textcolor}{RGB}{0, 0, 0} +\providecolor{bistre}{rgb}{.75,.50,.30} +\definecolor{mygray}{gray}{0.1} + +\colorlet{sectioncolor}{MidnightBlue} +\colorlet{titlecolorbox}{gray!10} +\colorlet{pdflinkcolor}{myblue} +\colorlet{pdfurlcolor}{MidnightBlue} +\colorlet{pdffilecolor}{Peach} +\colorlet{stringcolor}{myblue!40!black!100} +\colorlet{commencolor}{blue!0!black!100} + +\colorlet{graphicbackground}{white} +\colorlet{codebackground}{lightgray!30} +\colorlet{codeonlybackground}{lightgray!30} +\colorlet{numbackground}{white} +\colorlet{textcodecolor}{darkgray} +\colorlet{numcolor}{MidnightBlue} + +\definecolor{Salmon}{RGB}{178,51,51} +\definecolor{BrickRed}{RGB}{233,49,16} +\definecolor{TealBlue}{RGB}{16,83,165} +\definecolor{ForestGreen}{RGB}{10,112,43} +\definecolor{Tangerine}{RGB}{244,176,108} +\definecolor{DarkBrown}{RGB}{130,65,0} +\definecolor{blueGrey}{rgb}{0.4,0.48,0.53} +\def\tkzred{\color{red}} +\def\tkzblue{\color{blue}} +%--------------- mots importants et macros --------------------------------- +\newcommand*{\BS}{\texttt{\char92}} +\newcommand*{\tkz}{T{\em k}Z} +\newcommand*{\PGF}{\tkzname{PGF}} +\newcommand*{\TIKZ}{TikZ} +\newcommand*{\pdf}{\textsc{pdf}} +\newcommand*{\pgfname}{\textsc{pgf}} +\newcommand*{\tikzname}{Ti{\em k}Z} +\newcommand*{\tkzdft}[1]{{\texttt{#1}}} +\newcommand*{\tkzAttention}[3]{\ \\\llap{\textcolor{#3}{#1\hskip #2}}} +\newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}} +\newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}} +\newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}} +\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{#1}}}} +\newcommand*{\tkzimp}[1]{\textbf{#1}} +\newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}} +\providecommand\LaTeX{L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX} +\providecommand\LATEX{\LaTeX} +\renewcommand\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000} +\providecommand\TEX{\TeX} +%------------------------------------------------------------------------------- +\def\tkz@background@color{white} +\def\tkz@text@color{black} +\global\edef\tkz@suc@bkc{\tkz@background@color} +\global\edef\tkz@suc@txt{\tkz@text@color} +%------------------------------------------------------------------------------- +\endinput + diff --git a/macros/latex/contrib/tkz-doc/tkz-doc.cls b/macros/latex/contrib/tkz-doc/tkz-doc.cls index 0cd1e5ce28..0e1eb6ade7 100644 --- a/macros/latex/contrib/tkz-doc/tkz-doc.cls +++ b/macros/latex/contrib/tkz-doc/tkz-doc.cls @@ -1,6 +1,7 @@ -% Copyright (C) 2009 Alain Matthes +% tkz-doc.cls +% Copyright (C) 2020 Alain Matthes % encoding : utf8 -% engine : pdflatex +% engine : lualatex % H I G H L Y E X P E R I M E N T A L % This file may be distributed and/or modified % @@ -11,302 +12,126 @@ % See the file doc/generic/pgf/licenses/LICENSE for more details.% % See http://www.latex-project.org/lppl.txt for details. % +% tkz-doc class for use with the tkz documentation +% ( AlterMundus Collection ). % -% ``tkz-doc'' class for use with the tkz documentation ( AlterMundus Collection ). -% -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% tkz-doc.cls encodage : utf8 % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% Créé par Alain Matthes le 2009-02-22. % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %% Objet : Classe LaTeX et Styles pour créer des documentations. -%<---------------------------------------------------------------------------> %<-------------- Définitions relatives au package ---------------------------> \newcommand*{\PackageName}{tkz-doc} -\newcommand*{\PackageVersion}{1.1 d} -\newcommand*{\filedate}{2018/09/19} +\newcommand*{\PackageVersion}{1.2c} +\newcommand*{\filedate}{2020/02/03} %<---------------------- Identification Part --------------------------------> -% -%<---------------------------------------------------------------------------> \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesClass{\PackageName}% -[\filedate\space Version:\space\PackageVersion\space tkz documentation class] +\ProvidesClass{\PackageName}[% + \filedate\space Version:\space\PackageVersion\space % + tkz documentation class based on scrartcl] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax -\LoadClass[titlepage,oneside]{scrartcl} -\PassOptionsToPackage{usenames,dvipsnames,svgnames}{xcolor} -\ifx\e@alloc\@undefined - \RequirePackage{etex} -\fi -\RequirePackage[utf8]{inputenc} -\RequirePackage{xkeyval}[2005/11/25] +\LoadClass[titlepage,a4paper]{scrartcl} +%<----------------- loading some packages ----------------------------------> +% dvipsnames loads a set of 68 cmyk colors as defined in the dvips driver. +% svgnames loads a set of 151 rgb color names +% obsolete usenames +\PassOptionsToPackage{dvipsnames,svgnames}{xcolor} +%<-------------------------------------------------------------------------->- +\KOMAoptions{twoside=false} +%<-------------------------------------------------------------------------->- \RequirePackage{framed,eso-pic} -\RequirePackage{amsmath,amssymb} -\RequirePackage{textcomp} -\RequirePackage[upright]{fourier} -\RequirePackage[scaled=0.85]{berasans} -\RequirePackage[scaled=0.85]{beramono} \RequirePackage[bottom,stable,ragged]{footmisc} -\RequirePackage[automark,nouppercase]{scrpage2} - - +\RequirePackage[automark,markcase=ignoreuppercase]{scrlayer-scrpage} +%<------------- define important words ----------------------------------> +\InputIfFileExists{tkz-doc.cfg}{\typeout{Local configuration file tkz-doc.cfg found and used}}{\typeout{tkz-doc.cfg not found}} + %<-------------------------------------------------------------------------->- \pagestyle{scrheadings} \clearscrheadings \clearscrplain -\ohead{\textcolor{Peach}{\pagemark}} -\ihead{\textcolor{Peach}{\headmark}} -\rofoot{\textcolor{Peach}{\namecollection}} -\lofoot{\textcolor{Peach}{\nameofpack}} +\ohead{\textcolor{sectioncolor}{\pagemark}} +\ihead{\textcolor{sectioncolor}{\headmark}} +\rofoot{\textcolor{sectioncolor}{\tkznamecollection}} +\lofoot{\textcolor{sectioncolor}{\tkznameofpack}} + \automark[subsection]{section} -\setheadsepline{.4pt}[\color{Peach}] -\setfootsepline{.4pt}[\color{Peach}] +\KOMAoptions{headsepline=.4pt} +\addtokomafont{headsepline}{\color{sectioncolor}} + +\KOMAoptions{footsepline=.4pt} +\addtokomafont{footsepline}{\color{sectioncolor}} + \setheadwidth[0pt]{text} \setfootwidth[0pt]{text} \renewcommand{\footnoterule}{\vspace*{-3pt}{% - \color{Peach}\hrule width 2in height 0.4pt} - \vspace*{2.6pt}} -\deffootnote{1.5em}{1em}{\makebox[1.5em][l]{% - \thefootnotemark}} + \color{sectioncolor}\hrule width 2in height 0.4pt}\vspace*{2.6pt}} +\deffootnote{1.5em}{1em}{\makebox[1.5em][l]{\thefootnotemark}} \addtolength{\skip\footins}{\baselineskip}% -%<------------------– En-tête et pied de page ------------------------------> -% -%<---------------------------------------------------------------------------> +%<------------------– En-tête et pied de page ------------------------------ \pagenumbering{arabic} -\newcommand\SectionFontStyle{\sffamily} +\newcommand\SectionFontStyle{\ttfamily} \setkomafont{sectioning}{\bfseries\SectionFontStyle} \setkomafont{pagenumber}{\bfseries\SectionFontStyle} -\setkomafont{pagehead}{\small\sffamily} -\setkomafont{pagefoot}{\small\sffamily} +\setkomafont{pagehead}{\small\ttfamily} +\setkomafont{pagefoot}{\small\ttfamily} \setkomafont{descriptionlabel}{\itshape} \addtokomafont{sectioning}{\color{sectioncolor}} \renewcommand*{\raggedsection}{\raggedright} -%<---------------------------------------------------------------------------> -% -%<---------------------------------------------------------------------------> +%<--------------------------------------------------------------------------- \newcounter{cnt}\setcounter{cnt}{1} \setcounter{secnumdepth}{3}% \setcounter{tocdepth}{3} +\color{blue} +%<------------------ Éxécution et chargement ----------------------------- -\color{Maroon} -\usepackage{titlesec} -\titleformat{\section}[frame] -{\normalfont} -{\filright\footnotesize\enspace SECTION \thesection\enspace} -{8pt} -{\Large\bfseries\filcenter} -\titleformat{\subsection}[block] {\large\bfseries\filright}{\fbox{\thesubsection}}{2em}{}% -%<------------------ Éxécution et chargement -------------------------------> -% -%<---------------------------------------------------------------------------> -% ------------------–Fin Taille des fontes -------------------------------> -\RequirePackage{makeidx} -\@twocolumnfalse -\makeindex -\RequirePackage{calc} \RequirePackage{tikz} -% We need lots of libraries... -\usetikzlibrary{% - arrows,% - calc,% - fit,% - patterns,% - plotmarks,% - shapes.geometric,% - shapes.misc,% - shapes.symbols,% - shapes.arrows,% - backgrounds,% - topaths,% - trees,% - matrix,% - folding,% - fadings,% - through,% - positioning,% - scopes,% - decorations.shapes,% - decorations.text,% - decorations.pathreplacing,% - decorations.pathmorphing,% - decorations.markings,% - shadows} - -\RequirePackage{multido} -\RequirePackage{lscape} -\RequirePackage{graphicx} -\RequirePackage{array} -\RequirePackage{multicol} -\RequirePackage{multirow} +\usetikzlibrary{babel, + decorations.shapes, + decorations.text, + decorations.pathreplacing, + decorations.pathmorphing, + decorations.markings, + shadows} \RequirePackage{tabularx,ragged2e} -\RequirePackage{booktabs} \RequirePackage[bottom,stable,ragged]{footmisc} - - \raggedbottom -% colors -\definecolor{fondpaille}{cmyk}{0,0,0.1,0} -\definecolor{bistre}{rgb}{.75,.50,.30} -\providecolor{bistre}{rgb}{.75,.50,.30} -\colorlet{graphicbackground}{fondpaille} -\colorlet{codebackground}{fondpaille!92!Maroon} -\colorlet{sectioncolor}{Maroon} -\definecolor{textcolor}{RGB}{0, 0, 0} -\colorlet{titlecolorbox}{fondpaille!92!Maroon} -\colorlet{pdflinkcolor}{blue} -\colorlet{pdfurlcolor}{blue} -\colorlet{pdffilecolor}{Peach} -\colorlet{stringcolor}{green!40!black!100} -\colorlet{commencolor}{blue!0!black!100} - \newbox\tkzbox - +%<--------------- some macros -------------------------------------------- \def\nodeshadowedone(#1,#2)#3{% -\node[Mahogany,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox}; -\node[above,yscale=#2,inner sep=0pt,xslant=#1,Peach!60]{\box\tkzbox}; +\node[myblue,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox}; +\node[above,yscale=#2,inner sep=0pt,xslant=#1,myblue!60]{\box\tkzbox}; }% -%<--------------------------- Indexation ------------------------------------> -\newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}} -\newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}} -\newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} -\newcommand*{\IargNameEnv}[2]{\tkzname{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} -\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}} -\newcommand*{\IoptNameEnv}[2]{\tkzname{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}} -\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n -\newcommand*{\Iarg}[2]{% - \index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} -\newcommand*{\IargName}[2]{\tkzname{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} -\newcommand*{\IoptName}[2]{\tkzname{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} -\newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} -\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}} -\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}} -\newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}} -\newcommand*{\NameLib}[1]{\tkzname{#1}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}} -\newcommand*{\NameSys}[1]{\index{Operating System !#1@\texttt{#1}}} -\newcommand*{\NameDist}[1]{\index{TeX Distributions !#1@\texttt{#1}}} -\newcommand*{\NameFonct}[1]{\index{Functions !#1@\texttt{#1}}} -\newcommand*{\NamePack}[1]{\index{Package !#1@\texttt{#1}}} - -\newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} -\newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} -\newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} -\newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily #3\\} - -\newcommand*{\tkzNamePack}[1]{\tkzname{#1}\NamePack{#1}} -\newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}} -\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}} -%<--------------------------------------------------------------------------> -%<--------------------------------------------------------------------------> + % some of the macros below are absolete +\def\nameoffile#1{\gdef\@nameoffile{#1}} +\def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}} +\long\def\defoffile#1{\protected@xdef\@defoffile{\@defoffile{#1}}} +\let\@defoffile\@empty +%<------------------------------------------------------------------------- \newcommand*{\addbs}[1]{\texttt{\textbackslash#1}} \newcommand*{\@CellCode}[1]{} \newcommand*{\thead}{\noalign{\iffalse}\fi\@thead} \newcommand*{\@thead}[1][\em\ttfamily]{\gdef\@CellCode{#1}\iffalse{\fi}} \newcommand*{\tbody}{\noalign{\gdef\@CellCode{}}} \newcolumntype{I}{>{\@CellCode}} -%<--------------------------------- Couverture ----------------------------> -%<--------------------------------- Make Title ----------------------------> -\renewcommand\maketitle{% -\null -\AddToShipoutPicture*{% -\setlength\unitlength{1mm} -\put(0,0){\makebox(0,0)[lb]{\color{Peach!10}\rule{\paperwidth}{\paperheight}}} -\put(0,0){\makebox(0,0)[lb]{\color{Mahogany}\rule{40mm}{\paperheight}}} -\put(20,270){\rotatebox{90}{% -\makebox(0,0)[r]{\fontsize{60}{60}\color{orange!50!white}% -\bfseries \selectfont{\@title\ \versionofpack}\hfill}}}% - \put(60,80){% - \begin{pgfpicture} -\pgfmathdeclarerandomlist{color}{{Peach}{Orange}{Red}{Brown}} -\foreach \a in {1,...,5}{% - \pgfmathrandominteger{\x}{1}{300} - \pgfmathrandominteger{\y}{1}{200} - \pgfmathrandominteger{\r}{20}{100} - \pgfmathrandominteger{\s}{5}{95} - \pgfmathrandominteger{\o}{50}{80} - \pgfmathrandomitem{\c}{color} - \pgfdeclareradialshading{ballshading}{\pgfpoint{-10bp}{10bp}} - {color(0bp)=(\c!15!white); color(9bp)=(\c!75!white); - color(18bp)=(\c!70!black); color(25bp)=(\c!50!black); color(50bp)=(black)} - \pgfsetfillopacity{\o/100} - \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt} - \pgfshadepath{ballshading}{\s} - \pgfusepath{} -}% -\end{pgfpicture}} -\put(60,250){\makebox(0,0)[l]{% -\begin{tikzpicture} -\nodeshadowedone(2,-1.25){\fontsize{60}{60}\selectfont{\namecollection}}; -\end{tikzpicture} -}}% -\put(130,40){\makebox(0,0)[l]{% -\fontsize{17}{21} -\textcolor{Mahogany}{\selectfont{\authorofpack}}}} -\put(130,20){\makebox(0,0)[l]{% -\textcolor{Mahogany}{\url{\urlauthor} \ \url{\urlauthorcom}}}} -\put(130,30){\makebox(0,0)[l]{\textcolor{Mahogany}{\today}}}} -%<----------------------------- End Couverture ----------------------------> -\setcounter{footnote}{0}% -} -%<----------------------------- def macro arg opt----------------------------> - % some of the macros below are absolete -\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}} -\def\cmd@to@cs#1#2{\char\number`#2\relax} -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\providecommand\marg[1]{{\ttfamily\char`\{}\opt{\meta{#1}}{\ttfamily\char`\}}} -\providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}} -\providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}} -\newcommand\opt[1]{{\color{Maroon}#1}} -\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}} -\newcommand*{\var}[1]{\{\opt{\meta{#1}}\}} -\newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)} -\newcommand*{\vara}[1]{\{#1\}} - - -\DeclareRobustCommand\meta[1]{% -\ensuremath\langle - \ifmmode \expandafter \nfss@text \fi - {% - \meta@font@select - \edef\meta@hyphen@restore - {\hyphenchar\the\font\the\hyphenchar\font}% - \hyphenchar\font\m@ne - \language\l@nohyphenation - \/#1\/% - \meta@hyphen@restore - }\ensuremath\rangle -} -\def\meta@font@select{\itshape} -% %<-------------------------- NewMacroBox -----------------------------------> - \newcommand*{\ActivBoxName}{} \newenvironment{NewMacroBox}[2]{% \parindent=0pt \renewcommand*{\ActivBoxName}{#1} -\def\FrameCommand{\color{Maroon} -{\vrule width 1pt\hspace{3pt}}% -}% +\def\FrameCommand{\color{myblue}{\vrule width 1pt\hspace{3pt}}}% \MakeFramed{\advance\hsize-\width}% \noindent \makebox[0pt][l]{% -\hspace{-4pt}% -\setlength{\fboxrule}{1pt}% -\setlength{\fboxsep}{3pt}% -\fcolorbox{Maroon}{titlecolorbox}{% -\rule{6pt}{0pt}% -\makebox[\width+6pt][l]{\tkzcname{#1#2}}% -}% + \hspace{-4pt}% + \setlength{\fboxrule}{1pt}% + \setlength{\fboxsep}{3pt}% + \fcolorbox{sectioncolor}{titlecolorbox}{% + \rule{6pt}{0pt}% + \makebox[\width+6pt][l]{\tkzcname{#1#2}}% + }% }\\*[.5\baselineskip]% \noindent % \ignorespaces\tkzcname{#1#3} \Imacro{#1}% -\color{Maroon}}{% +}% +{% \par\noindent% \makebox[0pt][l]{% \hspace{-6pt}% @@ -321,6 +146,7 @@ \par\medskip }% %<----------------- end NewMacroBox -----------------------------------------> + %<----------------------------- NewEnvBox -----------------------------------> \let\fram@d=\MakeFramed \let\endfram@d=\endMakeFramed @@ -328,35 +154,30 @@ \parindent=0pt \renewcommand*{\ActivBoxName}{#1} %\gdef\tkzEnvMacro{#1} -\def\FrameCommand{\color{Maroon} -{\vrule width 1pt\hspace{3pt}}% -}% +\def\FrameCommand{\color{sectioncolor}{\vrule width 1pt\hspace{3pt}}}% \MakeFramed{\advance\hsize-\width}% \noindent \makebox[0pt][l]{% - \hspace{-4pt}% \setlength{\fboxrule}{1pt}% \setlength{\fboxsep}{3pt}% -\fcolorbox{Maroon}{titlecolorbox}{% +\fcolorbox{sectioncolor}{titlecolorbox}{% \rule{6pt}{0pt}% \makebox[\width+6pt][l]{% - \tkzcname{\textcolor{Maroon}{begin}\{\ActivBoxName\}}{\oarg{options}}% + \tkzcname{\textcolor{sectioncolor}{begin}\{\ActivBoxName\}}{\oarg{options}}% \hspace*{.25cm}\meta{environment contents}\hspace*{.25cm}% - \tkzcname{\textcolor{Maroon}{end}\{\ActivBoxName\}}}% + \tkzcname{\textcolor{sectioncolor}{end}\{\ActivBoxName\}}}% }% }\\*[.5\baselineskip]% \noindent % \ignorespaces\tkzcname{#1#3} \Ienv{#1} -\color{Maroon}}{% +\color{myblue}}{% \par\noindent% \makebox[0pt][l]{% - \hspace{-6pt}% \rule{6pt}{1pt}% \rule{\textwidth}{1pt}% - \hspace{-1pt}% \rule{1pt}{10pt}% }% @@ -366,83 +187,70 @@ \par\medskip } %<------------------- end NewEnvBox -----------------------------------------> -\def\nameoffile#1{\gdef\@nameoffile{#1}} -\def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}} -\long\def\defoffile#1{ - \protected@xdef\@defoffile{\@defoffile{#1}}% -} -\let\@defoffile\@empty -\def\nameoffile#1{\gdef\@nameoffile{#1}} -\def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}} -\long\def\defoffile#1{\protected@xdef\@defoffile{\@defoffile{#1}}% -} -\let\@defoffile\@empty - -\newcommand*{\red}{\color{red}} -\newcommand*{\blue}{\color{BlueViolet}} -\newcommand*{\BS}{\texttt{\char92}} -\newcommand*{\tkz}{Ti{\em k}Z} -\newcommand*{\orange}{\color{Orange}} -\newcommand*{\blanc}{\color{White}} -\newcommand*{\PGF}{\tkzname{PGF}} -\newcommand*{\TIKZ}{\tkzname{Ti\emph{k}Z}} -\newcommand*{\beamer}{\textsc{beamer}} -\newcommand*{\pdf}{\textsc{pdf}} -\newcommand*{\pgfname}{\textsc{pgf}} -\newcommand*{\tikzname}{Ti\emph{k}Z} -\newcommand*{\pstricks}{\textsc{pstricks}} - -\newcommand*{\tkzdft}[1]{{\texttt{#1}}} -\providecommand\LaTeX{% - L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX} -\providecommand\LATEX{\LaTeX} -\renewcommand\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX% - \spacefactor1000 } - \providecommand\TEX{\TeX} - \newcommand*{\tkzAttention}[3]{\ \\\llap{\textcolor{#3}{#1\hskip #2}}} -\newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}} -\newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}} -\newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}} -\newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}} - -\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{Maroon}{#1}}}} -\newcommand*{\tkzimp}[1]{\textbf{#1}} -\newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{Maroon}{\textbackslash#1}}}} -\newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{Maroon}{\textbackslash#1}}}} -%<--------------------------- presentation ----------------------------------> -% \providecommand\href[2]{\texttt{#1}} +%<----------------------------- def macro arg opt----------------------------> +\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}} +\def\cmd@to@cs#1#2{\char\number`#2\relax} +\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\providecommand\marg[1]{{\ttfamily\char`\{}\opt{\meta{#1}}{\ttfamily\char`\}}} +\providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}} +\providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}} +\newcommand\opt[1]{{\color{myblue}#1}} +\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}} +\newcommand*{\var}[1]{\{\opt{\meta{#1}}\}} +\newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)} +\newcommand*{\vara}[1]{\{#1\}} +% -- Macros pour indexation ------------------------------------------------- +\newcommand*{\tkzNamePack}[1]{\tkzname{#1}\NamePack{#1}} +\newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}} +\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}} +\newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}} +\newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}} +\newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} +\newcommand*{\IargNameEnv}[2]{\texttt{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} +\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}} +\newcommand*{\IoptNameEnv}[2]{\texttt{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}} +\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n +\newcommand*{\Iarg}[2]{\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} +\newcommand*{\IargName}[2]{\texttt{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} +\newcommand*{\IoptName}[2]{\texttt{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} +\newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} +\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}} +\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}} +\newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}} +\newcommand*{\NameLib}[1]{\texttt{\textcolor{MidnightBlue}#1}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}} +\newcommand*{\NameSys}[1]{\texttt{#1}\index{Operating System !#1@\texttt{#1}}} +\newcommand*{\NameDist}[1]{\texttt{\textcolor{MidnightBlue}#1}\index{TeX Distributions !#1@\texttt{#1}}} +\newcommand*{\NameFonct}[1]{\index{Functions !#1@\texttt{#1}}} +\newcommand*{\NamePack}[1]{\index{Package !#1@\texttt{#1}}} +\newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} +\newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} +\newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} +\newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily #3\\} +\newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{MidnightBlue}{% + \textbackslash#1}}}} +\newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{% + \textbackslash#1}}}} -\newcommand\presentation{% - \thispagestyle{empty}% - \par\vspace*{3 cm} - \begin{center} - {\Huge \@nameoffile} - \end{center} - \par\vspace*{3 cm} - \noindent - \newlength{\@lx}\settowidth{\@lx}{\huge \namecollection}% - \advance\@lx3em\quad - \href{\urlauthor}{% - \rotatebox{90}{\hspace*{1.5em}{\huge \namecollection}}} - \textcolor{Mahogany}{\rule{2pt}{\@lx}}\quad% - \begin{minipage}[b]{.90\textwidth} - {% - \noindent\hfill - \raggedleft\Large - \href{mailto:al.ma@mac.com}{\textcolor{blue}{\authorofpack}}\par - }% - \emph{\@defoffile}\par - %[\nameofdoc\ \dateofdoc]\par\medskip - \end{minipage} +\DeclareRobustCommand\meta[1]{% +\ensuremath\langle + \ifmmode \expandafter \nfss@text \fi + {% + \meta@font@select + \edef\meta@hyphen@restore + {\hyphenchar\the\font\the\hyphenchar\font}% + \hyphenchar\font\m@ne + \language\l@nohyphenation + \/#1\/% + \meta@hyphen@restore + }\ensuremath\rangle } -%<---------------------- end presentation ----------------------------------> +\def\meta@font@select{} \renewcommand*{\idx@heading}{% \idx@@heading{\indexname}% - % \@mkboth{\indexname}{\indexname}% } \renewenvironment{theindex}{% - \@restonecoltrue + \@restonecoltrue \columnseprule \z@ \columnsep 35\p@ \idx@heading% @@ -454,29 +262,54 @@ }{% \if@restonecol\onecolumn\else\clearpage\fi } - -\def\tkz@background@color{white} -\def\tkz@text@color{black} -\global\edef\tkz@suc@bkc{\tkz@background@color} -\global\edef\tkz@suc@txt{\tkz@text@color} +%<----------- set colors of the document -------------------------- \pgfkeys{/tkzsetupcolor/.cd, background/.code = {\global\edef\tkz@suc@bkc{#1}}, - text/.code = {\global\edef\tkz@suc@txt{#1}}} - + text/.code = {\global\edef\tkz@suc@txt{#1}}} \def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{% \tkz@SetUpColors[]}} \def\tkz@SetUpColors[#1]{% \begingroup -\pgfkeys{tkzsetupcolor/.cd, - background = \tkz@background@color, - text = \tkz@text@color} -\pgfqkeys{/tkzsetupcolor}{#1} -\pagecolor{\tkz@suc@bkc} -\color{\tkz@suc@txt}} + \pgfkeys{tkzsetupcolor/.cd, + background = \tkz@background@color, + text = \tkz@text@color} + \pgfqkeys{/tkzsetupcolor}{#1} + \pagecolor{\tkz@suc@bkc} + \color{\tkz@suc@txt} +\endgroup} + +%<--------------------------------------------------------------------- + +\input{couverture} +%<--------- presentation première page ---------------------------------> +\newcommand\presentation{% + \thispagestyle{empty}% + \par\vspace*{3 cm} + \begin{center} + {\textcolor{myblue}{\Huge \@nameoffile}} + \end{center} + \par\vspace*{3 cm} + \noindent + \newlength{\tkz@lx}\settowidth{\tkz@lx}{\huge \tkznamecollection}% + \advance\tkz@lx3em\quad + \href{\tkzurlauthor}{% + \rotatebox{90}{\hspace*{1.5em}{% + \textcolor{sectioncolor}{\Huge \tkznamecollection}}}} + \textcolor{sectioncolor}{\rule{2pt}{\tkz@lx}}\quad% + \begin{minipage}[b]{.90\textwidth} + {% + \noindent\hfill + \raggedleft\Large + \href{mailto:al.ma@mac.com}{\textcolor{sectioncolor}{\tkzauthorofpack}}\par + }% + {\@defoffile} + \par + \end{minipage} +} +%<----------------- end presentation ----------------------------------> -%<---------------------------------------------------------------------------> \endinput -%<---------------------------------------------------------------------------> +%<--------------------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/macros/latex/contrib/tkz-doc/tkzexample.sty b/macros/latex/contrib/tkz-doc/tkzexample.sty index a39fbe5bc6..f790ee3925 100644 --- a/macros/latex/contrib/tkz-doc/tkzexample.sty +++ b/macros/latex/contrib/tkz-doc/tkzexample.sty @@ -15,8 +15,8 @@ % %<---------------------------------------------------------------------------> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkzexample}[2018/09/19 v1.1 d (code and graphic ) ] -\RequirePackage{fixltx2e,calc,mdframed,fancyvrb} +\ProvidesPackage{tkzexample}[2011/06/04 v1.1 c (code and graphic ) ] +\RequirePackage{calc,mdframed,fancyvrb} \newif\iftkzcodesaved \DeclareOption{saved}{\tkzcodesavedtrue} \ProcessOptions\relax diff --git a/macros/latex/contrib/tkz/tkz-base/README b/macros/latex/contrib/tkz/tkz-base/README index 58252fe03e..636e7df906 100644 --- a/macros/latex/contrib/tkz/tkz-base/README +++ b/macros/latex/contrib/tkz/tkz-base/README @@ -1,6 +1,6 @@ % encodage utf8 -readme-tkz-base.txt V3.01 c 2020/01/24 +readme-tkz-base.txt V3.02 c 2020/02/06 The package tkz-base provides some tools like a Cartesian (rectangular) coordinate system to other packages like tkz-euclide or tkz-fct. With this package, you can draw coordinate axis, grids, draw points, the @@ -61,12 +61,13 @@ Other examples can be found on my site http://altermundus.fr (en français) Compatibility ------------- -The new package tkz-base 3.01c is *not* fully compatible with the version 1.16 but the differences are minor +The new package tkz-base 3.02c is *not* fully compatible with the version 1.16 but the differences are minor History ------- --- 3.01c this version +-- 3.02c correction of bugs, new code +-- 3.01c correction of bugs, new code -- 1.16 correction of bugs -- 1.13 first version diff --git a/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf b/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf Binary files differindex f89b3b18d5..eb42a519f9 100644 --- a/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf +++ b/macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex new file mode 100644 index 0000000000..74950a060f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-BB.tex @@ -0,0 +1,236 @@ +\section{Gestion de la bounding box} +La bounding box initiale après usage de la macro \tkzcname{tkzInit} est définie par le rectangle basé sur les points $(0,0)$ et $(10,10)$. La macro \tkzcname{tkzInit} permet de modifier cette bounding box initiale en utilisant les arguments (\tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin}, et \tkzname{ymax}). Bien sûr tout tracé extérieur modifie la bounding box. \TIKZ tient à jour cette bounding box. Il est possible d'influer sur ce comportement soit directement avec des commandes ou des options de \TIKZ comme une commande comme \tkzcname{useasboundingbox} ou l'option \tkzname{use as bounding box}. Une conséquence possible est de réserver une boite pour une figure mais la figure peut déborder de la boite et se repandre au-dessus du texte principal. +La commande suivante \tkzcname{pgfresetboundingbox} permet d'effacer une bounding box et d'en établir une nouvelle. + +%Enfin Il est parfois utile de contenir une figure dans une b + +%current bounding box or current path bounding box remember picture et overlay + +%<---------------------------------------------------------------------------> +% tkzShowBB +%<---------------------------------------------------------------------------> +\subsection{tkzShowBB} +La macro la plus simple. +\begin{NewMacroBox}{tkzShowBB}{\oarg{local options}} +Cette macro permet de visualiser la bounding box. Un cadre rectangulaire entoure celle-ci. Cette macro accepte les options de \TIKZ. +\end{NewMacroBox} + + +\subsubsection{Exemple 2 avec \tkzcname{tkzShowBB}} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tkzInit[ymax=5,xmax=8] + \tkzGrid + \tkzDefPoint(3,0){A} + \begin{scope} + \tkzClipBB + \tkzDrawCircle[R](A,5 cm) + \tkzShowBB + \end{scope} +\tkzDrawCircle[R,red](A,4 cm) +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +% tkzClipBB +%<---------------------------------------------------------------------------> +\subsection{tkzClipBB} +\begin{NewMacroBox}{tkzClipBB}{}% +Il s'agit de limiter les futures constructions à la bounding box actuelle. +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzClipBB} et les bissectrices} + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture} + \tkzInit[xmin=-3,xmax=6, ymin=-1,ymax=6] + \tkzDefPoint(0,0){O}\tkzDefPoint(3,1){I} + \tkzDefPoint(1,4){J} + \tkzDefLine[bisector](I,O,J) \tkzGetPoint{i} + \tkzDefLine[bisector out](I,O,J) \tkzGetPoint{j} + \tkzDrawPoints(O,I,J,i,j) + \tkzClipBB + \tkzDrawLines[add = 1 and 2,color=red](O,I O,J) + \tkzDrawLines[add = 1 and 2,color=blue](O,i O,j) + \tkzShowBB + \end{tikzpicture} +\end{tkzexample} + + +%<---------------------------------------------------------------------------> +% tkzSetBB +%<---------------------------------------------------------------------------> +\subsection{tkzSetBB} +\begin{NewMacroBox}{tkzSetBB}{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$} ou bien {\parg{$A$} \parg{$B$}}} +{Cette macro permet de définir le rectangle ayant pour coordonnées $(x_A~;~y_A$) et $(x_B~;~y_B)$ comme la nouvelle bounding box.} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzShowBB}} +\begin{tkzexample}[latex=8cm,small] +above\\ +left +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,3){B} + \tkzDefPoint(1,1){C} + \tkzSetBB(A)(2,2) + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,C) + \tkzShowBB +\end{tikzpicture}right +\end{tkzexample} +%<---------------------------------------------------------------------------> +% tkzSaveBB +%<---------------------------------------------------------------------------> +\subsection{tkzSaveBB}{} +\begin{NewMacroBox}{tkzSaveBB}{} +Cette macro permet de sauvegarder la bounding box, autrement dit elle enregistre les coordonnées de deux points qui définissent un rectangle. +\end{NewMacroBox} + +\begin{tkzexample}[latex=7cm,small] +Une figure au-dessus du texte\\ +\begin{tikzpicture} + \begin{scope} + \tkzSetBB(0,0)(6,2) \tkzShowBB[fill=blue!20] + \tkzSaveBB + \end{scope} + \tkzDefPoint(3,3){A}\tkzShowBB + \tkzDrawCircle[R,fill=yellow,opacity=.2](A,2cm) + \tkzRestoreBB +\end{tikzpicture} +\end{tkzexample} + + + + +%<---------------------------------------------------------------------------> +% tkzRestoreBB +%<---------------------------------------------------------------------------> +\subsection{tkzRestoreBB} +\begin{NewMacroBox}{tkzRestoreBB}{} +Cette macro récupère la sauvegarde de la bounding box. Comme vous le constater, la figure déborde de la boîte. La bounding box a été réduite. +\end{NewMacroBox} +\subsubsection{Exemple d'utilisation de \tkzcname{tkzRestoreBB}} +\begin{tkzexample}[latex=8cm,small] + \vspace{ 2cm} +Start\\ +\begin{tikzpicture} + \tkzDefPoint(-2,-2){A} + \tkzDefPoint(2,1){B} + \tkzDefPoint(0,0){O} + \tkzSaveBB + \tkzShowBB[red,line width=1pt] + \tkzRestoreBB + \tkzDrawCircle(O,B) + \tkzClipBB + \tkzFillCircle[gray!20](O,B) +\end{tikzpicture} +End +\end{tkzexample} + + +%<---------------------------------------------------------------------------> +% tkzClip +%<---------------------------------------------------------------------------> +\subsection{tkzClip} +\begin{NewMacroBox}{tkzClip}{\oarg{local options}} +Le rôle de cette macro est de rendre invisible ce qui est hors du rectangle défini par $(xmin~;~ymin)$ et $(xmax~;~ymax)$. + +\medskip +\begin{tabular}{lll} +\hline +options & défaut & définition \\ +\midrule +\TOline{space} {1} {valeur ajoutée à droite, à gauche, en bas et en haut du background} +\bottomrule +\end{tabular} + +\medskip + +{Le rôle de l'option \tkzname{space} est d'agrandir la partie visible du dessin. Cette partie devient le rectangle définit par $(xmin-space~;~ymin-space)$ et $(xmax+space~;~ymax+space)$. \tkzname{space} peut être négatif! L'unité est le cm et ne doit pas être indiquée. } +\end{NewMacroBox} + +\subsubsection{Premier exemple avec \tkzcname{tkzClip}} \hypertarget{clip}{} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid + \tkzAxeXY + \draw[red] (-1,-1)--(5,5); +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid + \tkzAxeXY + \tkzClip + \draw[red] (-1,-1)--(5,5); +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +Il est possible d'ajouter un peu d'espace \tkzcname{tkzClip[space]} + +\subsubsection{\tkzcname{tkzClip} et l'option \tkzname{space}} +Les dimensions pour définir le rectangle clippé sont \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} et \tkzname{ymax+1}. +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid \tkzAxeXY + \draw[red] (-0.5,-0.5)--(3.5,3.5); +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid \tkzAxeXY + \tkzClip[space=-0.5] + \draw[red] (-0.5,-0.5)--(3.5,3.5); +\end{tikzpicture} +\end{tkzexample} + +\subsection{style tkzreverseclip} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5] + \pgfinterruptboundingbox + \tkzDefPoints{-.5/0/P1,.5/0/P2} + \foreach \i [count=\j from 3] in {2,...,7}{% + \tkzDefShiftPoint[P\i]({45*(\i-1)}:1 cm){P\j} + } + \endpgfinterruptboundingbox + \tkzClipOutPolygon(P1,P2,P3,P4,P5,P6,P7,P8) + \tkzCalcLength[cm](P1,P5)\tkzGetLength{r} + \begin{scope}[blend group=screen] + \foreach \i in {1,...,8}{% + \pgfmathparse{100-5*\i} + \tkzFillCircle[R,color=blue!% + \pgfmathresult](P\i,\r) + } + \end{scope} +\end{tikzpicture} +\end{tkzexample} + + +\subsection{option tikz : trim left or right} +voir le \tkzimp{pgfmanual} + +\subsection{Commandes de TikZ \tkzcname{pgfinterruptboundingbox} et \tkzcname{endpgfinterruptboundingbox}} +Cette commande interrompt temporairement le calcul de la boîte et configure une nouvelle boîte + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} +\tkzDefPoint(0,5){A}\tkzDefPoint(5,4){B} +\tkzDefPoint(0,0){C}\tkzDefPoint(5,1){D} +\pgfinterruptboundingbox + \tkzInterLL(A,B)(C,D)\tkzGetPoint{I} +\endpgfinterruptboundingbox +\tkzClipBB + \tkzDrawCircle(I,B) +\tkzDrawSegments(A,B C,D A,C) +\end{tikzpicture} +\end{tkzexample} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex new file mode 100644 index 0000000000..0b9f62af9a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-axes.tex @@ -0,0 +1,515 @@ +\section{Macros pour les axes} + + \tkzHandBomb\ Attention ces macros ont été modifiées. Il est désormais plus faciles d'utiliser les stiles de \TIKZ\ . \tkzcname{tkzDrawX} permet de tracer un axe, \tkzcname{tkzLabelX} place des graduations et enfin dans les cas simples \tkzcname{tkzAxeX} trace et gradue. Les options de \TIKZ sont accessibles. +Pour les graduations, il est possible d'utiliser des fractions. +%<---------------------------------------------------------------------> +% tkzDrawX +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzDrawX}} \hypertarget{dx}{} +\begin{NewMacroBox}{tkzDrawX}{\oarg{local options}} +Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut. +Les options sont celles de \TIKZ\ plus les suivantes~: + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{color} {black} {couleur de l'axe et des ticks} +\TOline{noticks} {false} {pas de ticks sur l'axe} +\TOline{right space}{0,5 cm} {prolongement de l'axe à droite} +\TOline{left space} {0 cm} {prolongement de l'axe à gauche} +\TOline{label} {$x$} {nom attribué au label} +\TOline{trig} {0} {si <>0 pi/trig est l'unité} +\TOline{tickwd} {0.8pt} {épaisseur du tick} +\TOline{tickup} {1pt} {hauteur du tick au dessus de l'axe} +\TOline{tickdn} {1pt} {profondeur du tick en dessus de l'axe} +\bottomrule +\end{tabular} + +\medskip +\begin{tikzpicture}[>=latex,scale=2] + \draw[line width=2 pt](0,0)--(4,0); + \draw[fill] (2cm-6pt,-14pt) rectangle (2cm+6pt,+14pt); + \draw[<->](2cm-6.5pt,18pt) -- (2cm+6.5pt,+18pt); + \node[above] at (2cm,20pt) {tickwd}; + \draw[<->](2cm+10pt,1pt) -- (2cm+10pt,+14pt); + \node[right] at (2cm+10pt,8pt) {tickup}; + \draw[<->](2cm+10pt,-1pt) -- (2cm+10pt,-14pt); + \node[right] at (2cm+10pt,-8pt) {tickdn}; +\end{tikzpicture} + +\medskip +{Cette macro permet de tracer l'axe des abscisses. Le plus important est de tester l'ensemble des options. Ci-dessus, vous avez les valeurs qui définissent un tick. Sinon les options de \TIKZ\ s'appliquent et en particulier \tkzname{text}, \tkzname{color}, \tkzname{fill} et \tkzname{font}. } +\end{NewMacroBox} + +\subsubsection{Sans tick,ni label} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5] + \tkzDrawX[label={},noticks] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Placement du label} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5] + \tkzDrawX[label = quantité, + above left = 8pt] +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Couleur du label et de l'axe} +La couleur du label est obtenue avec l'option \tkzname{text}, celle de l'axe avec l'option \tkzname{color}. + +L'option \tkzname{ right=12pt} décale le label $x$ de 12 pt. + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5] + \tkzDrawX[text=blue,color=red, + right=12pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{right space}} +Cela ajoute un peu d'espace après le dernier tick. +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} +\tkzInit[xmax=0.4,xstep=0.1] +\tkzDrawX[text=blue,color=red, + right=12pt,right space=1] +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Axe trigonométrique avec l'option \tkzname{trig=1}}\hypertarget{newm}{} +Si number=0 alors l'axe est gradué de cm en cm, sinon l'axe est gradué à l'aide des multiples de $\frac{\pi}{number}$ + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] + \tkzDrawX[trig=1] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Axe trigonométrique avec l'option \tkzname{trig=2} } + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] + \tkzDrawX[trig=2] +\end{tikzpicture} +\end{tkzexample} + +\newpage +%<---------------------------------------------------------------------> +% tkzLabelX +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzLabelX}}\hypertarget{lx}{} +\begin{NewMacroBox}{tkzLabelX}{\oarg{local options}} +Cette macro permet de placer des graduations. L'option \tkzname{orig} peut de nouveau être utilisée, mais son comportement est inversée. Par défaut, la valeur à l'origine est placée. +Les options sont celles de \TIKZ, plus les suivantes~: + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{frac} {0}{si <>0 graduations = num/frac "frac est un entier"} +\TOline{trig} {0}{si <>0 pi/trig "trig est un entier"} +\TOline{font} {\BS textstyle} { taille de la graduation.} +\TOline{color} {black} {couleur des graduations} +\TOline{step} {1} {intervalle entre deux graduations} +\TOline{np off} {false} {désactivation de numprint} +\TOline{orig} {true} {affiche la graduation de l'origine} +\bottomrule +\end{tabular} + +{\tkzname{frac} et \tkzname{trig} sont des nombres entiers permettant de passer à une écriture fractionnaire ou trigonométrique.} +\end{NewMacroBox} + +\subsubsection{Position des graduations} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} +\tkzInit[xmax=.5,xstep=0.1] +\tkzDrawX[label=$t$,text=blue,color=red] +\tkzLabelX[text=blue,below = 3pt] +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Position des graduations avec \tkzname{xlabel style}} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzInit[xmin=1000,xmax=4000,xstep=1000] + \tkzDrawX + \tikzset{xlabel style/.append style={rotate=-30}} + \tkzLabelX[below right=3 pt,inner sep = 1pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Dates avec \tkzname{np off}} +Pour les dates, il faut désactiver numprint. +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzInit[xmin=2000,xmax=2004] + \tkzDrawX + \tikzset{xlabel style/.append style={rotate=-30}} + \tkzLabelX[np off,below right=3 pt,inner sep =1pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzname{frac}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} +\tkzInit[xmax=1.75,xstep=0.33333] +\tkzDrawX[label=$t$,text=blue,color=red] +\tkzLabelX[frac=3,text=blue,below = 6pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzname{trig}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] + \tkzDrawX[trig=2] + \tkzLabelX[trig=2,text=blue,below = 8pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Taille des graduations} +Deux possibilités. Il est possible de définir le style employé par défaut pour le mode math : + +\begin{tkzltxexample}[small] +\let\tkzmathstyle\textstyle +\end{tkzltxexample} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] + \tkzDrawX[trig=2] + \tkzLabelX[trig=2,text=blue,below = 8pt] +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] + \let\tkzmathstyle\textstyle + \tkzDrawX[trig=2] + \tkzLabelX[trig=2,text=blue, + below = 8pt] +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] + \tkzDrawX[trig=2] + \tkzLabelX[trig=2,text=blue, + below = 8pt,node font=\small] +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] + \tkzDrawX[trig=2] + \tkzLabelX[trig=2,text=blue, + below = 8pt,node font=\scriptsize] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Couleur des graduations} +Il s'agit ici de bien utiliser les options \tkzname{color}, \tkzname{text} et \tkzname{fill} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin = -2,xmax = 3, + ymin = -2,ymax = 2] + \tkzDrawX[color = red, + label = $\displaystyle\frac{1}{t}$, + below = 6pt] + \tkzLabelX[text=blue] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Tracés des axes avant la graduation} +Dans certains cas, il est préférable de placer \tkzcname{tkzDrawXY} après \tkzcname{tkzLabelX} et \tkzcname{tkzLabelY}. + +Cela permet d'éviter des problèmes d'affichage. + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} +\tkzInit[xmin = -1,xmax = 4, + ymin = -1,ymax = 1] +\tkzDrawXY \tkzLabelX \tkzLabelY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Graduations (exceptées à l'origine) avant les tracés } + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin = -1,xmax = 4, + ymin = -1,ymax = 1] + \tkzLabelX[orig=false] + \tkzLabelY[orig=false] + \tkzDrawXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Graduations uniquement positives avant les tracés } + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] + \tkzLabelX \tkzLabelY + \tkzDrawXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Pas de graduations à l'origine } + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] + \tkzLabelX[orig] \tkzLabelY[orig] + \tkzDrawXY +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------> +% tkzAxeX +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzAxeX}}\hypertarget{ax}{} +\begin{NewMacroBox}{tkzAxeX}{\oarg{local options}} +Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut ainsi que les graduations. Elle combine les deux macros \tkzcname{tkzDrawX} et \tkzcname{tkzLabelX}. Elle doit être utilisée que dans les cas simples. + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{label} {$x$}{nom attribué au label} +\TOline{trig} {0}{graduation fraction de $\pi$} +\TOline{frac} {0}{graduation fractionnaire, de dénominateur « frac »} +\TOline{swap} {false}{permet de lancer \tkzcname{tkzLabelX} avant \tkzcname{tkzDrawX}} +\bottomrule +\end{tabular} + +{\tkzname{text} définit la couleur des graduations.} +\end{NewMacroBox} + +\subsubsection{exemple avec \tkzcname{tkzAxeX}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=0.5,xstep=0.1,ymax=1] + \tkzGrid + \tkzAxeX[text=blue] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Usage de \tkzname{pi} et \tkzcname{tkzAxeX}} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzInit[xmax=4,ymax=3.5] + \let\tkzmathstyle\displaystyle + \tkzLabelX[orig = false, frac = 4,below = 10pt] + \tkzDrawX[label = $t$] + \tkzAxeY[trig=2] +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Option \tkzname{frac} et \tkzname{trig}} +Dans cet exemple, on positionne le label $t$ ainsi que les graduations. \tkzcname{below=10pt} sert à placer les graduations en-dessous. +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzInit[xmax=9,xstep=3,ymax=3.5] + \tkzLabelX[below=10pt,orig=false,frac=3] + \tkzDrawX[label = $t$] + \tkzAxeY[trig=2] +\end{tikzpicture} +\end{tkzexample} + +%<---------------------------------------------------------------------> +% tkzDrawY +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzDrawY}} \hypertarget{dy}{} +\begin{NewMacroBox}{tkzDrawY}{\oarg{local options}} +Cette macro permet de tracer l'axe des ordonnées avec des ticks par défaut. +Les options sont celles de \TIKZ\ plus les suivantes~: + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{color} {black} {couleur de l'axe et des ticks} +\TOline{noticks} {false} {pas de ticks sur l'axe} +\TOline{up space} {0,5 cm} {prolongement de l'axe en haut} +\TOline{down space} {0 cm}{prolongement de l'axe en bas} +\TOline{label} {$x$}{nom attribué au label} +\TOline{trig} {0}{si <>0 pi/trig est l'unité} +\TOline{tickwd} {0.8pt}{épaisseur du tick} +\TOline{ticklt} {1pt}{hauteur du tick au dessus de l'axe} +\TOline{tickrt} {1pt}{profondeur du tick en dessus de l'axe} +\end{tabular} +\end{NewMacroBox} + +\subsection{\tkzcname{tkzLabelY}} \hypertarget{ly}{} +\begin{NewMacroBox}{tkzLabelY}{\oarg{local options}} +Cette macro permet de tracer l'axe des abscisses avec des ticks par défaut. +Les options sont celles de \TIKZ\ plus les suivantes~: + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{color} {black} {couleur des graduations} +\TOline{frac} {0}{si <>0 les graduations sont des fractions dénominateur=frac} +\TOline{font} {\BS textstyle} { taille de la graduation.} +\TOline{step} {1} {intervalle entre deux graduations} +\bottomrule +\end{tabular} + +{\tkzname{frac} et \tkzname{trig} sont des nombres entiers permettant de passer à une écriture fractionnaire ou trigonométrique.} +\end{NewMacroBox} + +%<---------------------------------------------------------------------> +% tkzAxeY +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzAxeY}}\hypertarget{ay}{} +\begin{NewMacroBox}{tkzAxeY}{\oarg{local options}} +Cette macro combine les deux macros : +\tkzcname{tkzDrawY} \tkzcname{tkzLabelY} +Voir \tkzcname{tkzAxeX} pour les options +\end{NewMacroBox} +%<---------------------------------------------------------------------> +% tkzAxeXY +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzAxeXY}} \hypertarget{axy}{} +\begin{NewMacroBox}{tkzAxeXY}{\oarg{local options}} +Cette macro combine les quatre macros : +\tkzcname{tkzDrawX}\tkzcname{tkzDrawY} \tkzcname{tkzLabelX}\tkzcname{tkzLabelY} + +{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous, mais cela signifie que les mêmes options sont appliquées aux deux macros. Ainsi il n'est pas possible de modifier \tkzname{label}} +\end{NewMacroBox} + +\subsubsection{Couleur des axes, des graduations} + +\begin{tkzexample}[latex=6cm] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=3] + \tkzAxeXY[label={},text=blue] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{\{label=\{\}\}}} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] + \tkzAxeXY[label={},text=blue,trig=2] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{swap}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} +\tkzInit[xmin=-2,xmax=2,ymin=-2,ymax=2] +\tkzAxeXY[label={},swap] +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------> +% tkzDrawXY +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzDrawXY}} \hypertarget{dxy}{} +\begin{NewMacroBox}{tkzDrawXY}{\oarg{local options}} +Cette macro combine les deux macros : +\tkzcname{tkzDrawX}\tkzcname{tkzDrawY} + +{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous} +\end{NewMacroBox} + +\subsubsection{Couleur commune et labels vides} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1] + \tkzDrawXY[label={},color=red] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Deux axes trigonométriques} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] + \tkzDrawXY[label={},color=red,trig=4] +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------> +% tkzLabelXY +%<---------------------------------------------------------------------> +\subsection{\tkzcname{tkzLabelXY}} \hypertarget{lxy}{} +\begin{NewMacroBox}{tkzLabelXY}{\oarg{local options}} +Cette macro combine les deux macros : + + \tkzcname{tkzLabelX}\tkzcname{tkzLabelY} + +{Il est nécessaire d'utiliser des options communes comme dans l'exemple ci-dessous} +\end{NewMacroBox} + +\subsubsection{} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1] + \tkzDrawXY[label={},color=red] + \tkzLabelXY[text=blue] +\end{tikzpicture} +\end{tkzexample} + +%<---------------------------------------------------------------------> +% tkzSetUpAxis +%<---------------------------------------------------------------------> +\subsection{Modifier les valeurs par des défauts des axes} \hypertarget{axis}{} + +\begin{NewMacroBox}{tkzSetUpAxis}{\oarg{local options}} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{line width}{|0.4pt|}{line width définit la largeur du trait} +\TOline{tickwd}{|0.8pt|}{épaisseur du tick } +\TOline{ticka}{|1pt|}{partie droite ou au dessus du tick } +\TOline{tickb}{|1pt|}{partie gauche ou en dessous du tick } +\TOline{font}{|\tkzcname{textstyle}|}{taille de la graduation.} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Modification des axes par défaut} + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture}[scale=1] + \tkzInit[ymax=2,xmax=4] + \tkzSetUpAxis[line width=1pt,tickwd=1pt, + ticka=3pt, tickb=0pt] + \tkzAxeXY + \end{tikzpicture} +\end{tkzexample} + +Il faut lancer de nouveau \tkzcname{tkzSetUpAxis } pour récupérer les valeurs par défaut. + +\medskip +\begin{tkzltxexample}[small] +\tkzSetUpAxis[line width=1pt,tickwd=1pt,ticka=2pt,tickb=2pt] +\end{tkzltxexample} + +\tkzSetUpAxis[line width=1pt,tickwd=1pt,ticka=2pt,tickb=2pt] + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex new file mode 100644 index 0000000000..746340983a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-compilation.tex @@ -0,0 +1,122 @@ +\section{Compilation des exemples} +%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> +\subsection{Test de l'installation} +Le code ci-dessous permet de tester votre installation de \tkzname{tkz-base}. Je vous signale que \NamePack{xfp}, tout comme \NamePack{numprint} doit être présent ainsi que la version 3.01 (ou plus) de \tkzNamePack{pgf}. Tous les exemples ainsi que cette documentation ont été compilés à l'aide de Lua\LATEX\ + +\medskip +\begin{minipage}{0.45\textwidth} +{%\setlength\linewidth{12cm} +\begin{tkzltxexample}[right margin=6pt] +\documentclass{standalone} +\usepackage{tkz-base} +\begin{document} +\begin{tikzpicture} + \tkzInit[xmax=4,ymax=4] + \tkzGrid + \tkzAxeXY +\end{tikzpicture} +\end{document} +\end{tkzltxexample}} +\end{minipage} +\begin{minipage}{0.45\textwidth} +\begin{tikzpicture} + \tkzInit[xmax=4,ymax=4] + \tkzGrid + \tkzAxeXY +\end{tikzpicture} +\end{minipage} + +\emph{Remarques sur ce test} + +\begin{enumerate} +\item La compilation de ce document et des exemples est obtnue avec \tkzimp{luaLatex-dev}. +\item En principe, \tkzNamePack{tkz-base} n'est pas chargé par l'utilisateur, il sera chargé par un autre package comme \tkzNamePack{tkz-euclide} ou \tkzNamePack{tkz-fct}. \tkzNamePack{tkz-base} charge \tkzNamePack{numprint} avec l'option \tkzNamePack{autolanguage}, \tkzNamePack{xfp} et bien sûr {\TIKZ}. + +\item +\TIKZ\ était parfois allergique aux caractères actifs, il semblerait que la version 3. de pgf est réglé ces problèmes. En cas de difficulté, il est recommandé de charger la librairie \NameLib{babel} avec \tkzcname{usetikzlabry\{babel\}}. Une autre possibilité est de compiler avec \tkzname{lualatex}. +\end{enumerate} + + +\subsection{Pourquoi \tkzNamePack{xfp} et \tkzNamePack{numprint}} + +\tkzNamePack{xfp} remplace désormais \tkzNamePack{fp} dans ce package. Un des avantages pour l'utilisateur est une syntace simplifiée. Il permet de gérer des calculs sur des grands nombres ou des très petits avec précision. Cela ralentit un peu la compilation, aussi il est préférable de ne pas en abuser. \tkzNamePack{xfp} est avant tout utilisé, pour obtenir des graduations correctes. + +\tkzNamePack{numprint} était présent quand j'ai commencé à écrire cette série de packages, depuis \tkzNamePack{siunitx} s'est développé et je peux comprendre que certains le préfèrent. Dans une prochaine version, j'ai prévu de laisser le choix du package pour l'affichage des nombres. + + +% \newpage +% \section{Les macros} +% +% Le package vous fournit les macros essentielles suivantes, qui sont données avec leurs principales options et valeurs par défaut~: +% +% \bigskip +% \begin{enumerate} +% \item Macros générales +% \medskip +% \begin{itemize}\setlength{\itemsep}{6pt} +% +% \item \tkzhname{\hyperlink{obj}{usetkzobj}}\var{all} ou \var{circles,lines,polygons,etc.} +% \item \tkzhname{\hyperlink{init}{tkzInit}}[xmin=0,xmax=10,xstep=1,ymin=0,ymax=10,ystep=1] +% \item \tkzhname{\hyperlink{grid}{tkzGrid}}[sub,color=darkgray,line width=.4pt] +% \item \tkzhname{\hyperlink{clip}{tkzClip}}[space=1] +% \item \tkzhname{\hyperlink{rep}{tkzRep}}[xlabel=$\vec{\imath}$,ylabel=$\vec{\jmath}$] +% \item \tkzhname{\hyperlink{text}{tkzText}}[color=black,text=black,fill=white]\parg{point}\var{un texte} +% \item \tkzhname{\hyperlink{legend}{tkzLegend}}[options]\var{mark/couleur/size/texte} +% \end{itemize} +% \item Macros sur les axes +% \medskip +% \begin{itemize}\setlength{\itemsep}{4pt} +% \item \tkzhname{\hyperlink{ax}{tkzAxeX}}[label=$x$,color=black,trig,frac] +% \item \tkzhname{\hyperlink{dx}{tkzDrawX}}[noticks,label=$x$] +% \item \tkzhname{\hyperlink{lx}{tkzLabelX}}[trig,frac,np off] +% \item \tkzhname{\hyperlink{ay}{tkzAxeY}}[label=$y$,color=black] +% \item \tkzhname{\hyperlink{dy}{tkzDrawY}}[noticks,label=$y$] +% \item \tkzhname{\hyperlink{ly}{tkzLabelY}}[trig,frac,np off] +% \item \tkzhname{\hyperlink{axy}{tkzAxeXY}}[label=\{\},color=black,frac] +% \item \tkzhname{\hyperlink{dxy}{tkzDrawXY}}[label=\{\},color=black,frac] +% \item \tkzhname{\hyperlink{lxy}{tkzLabelXY}}[trig,frac,np off] +% \end{itemize} +% +% \item Macros sur les points +% +% \medskip +% \begin{itemize}\setlength{\itemsep}{4pt} +% \item \tkzhname{\hyperlink{tdp}{tkzDefPoint}}\parg{$x,y$}\marg{name} ou bien \parg{$a:r$}\marg{name} +% \item \tkzhname{\hyperlink{tdps}{tkzDefPoints}}\marg{$x_1$/$y_1$/name,$x_2$/$y_2$/name} +% \item \tkzhname{\hyperlink{tdsp}{tkzDefShiftPoint}}[point]\parg{$x,y$ ou $a:r$ }\marg{name} +% \item \tkzhname{\hyperlink{tdrp}{tkzDrawPoint}}[options]\parg{name} +% \item \tkzhname{\hyperlink{tdrps}{tkzDrawPoints}}[options]\parg{n1,n2,...} +% \item \tkzhname{\hyperlink{tlp}{tkzLabelPoint}}[options]\parg{name}\var{label} +% \item \tkzhname{\hyperlink{tlps}{tkzLabelPoints}}\parg{n1,n2,...} +% \item \tkzhname{\hyperlink{tlps}{tkzLabelPoints}}\parg{n1,n2,...} \item \tkzhname{\hyperlink{tpsc}{tkzPointShowCoord}}[options]\parg{point} \end{itemize} +% +% \item Macros sur les segments +% +% \medskip +% \begin{itemize}\setlength{\itemsep}{4pt} +% \item \tkzhname{\hyperlink{tds}{tkzDrawSegment}}[options]\parg{name,name} +% \item \tkzhname{\hyperlink{tdss}{tkzDrawSegments}}[options]\parg{$pt_1,pt_2$ $pt_3,pt_4$} +% \item \tkzhname{\hyperlink{tdpos}{tkzDrawPolySeg}}[options]\parg{$pt_1,pt_2,pt_3,...$ ,...} +% \item \tkzhname{\hyperlink{tls}{tkzLabelSegment}}[options]\parg{name,name}\marg{label} +% \item \tkzhname{\hyperlink{tlss}{tkzLabelSegments}}[options]\parg{n1,n2 n3,n4 ...} +% \item \tkzhname{\hyperlink{tms}{tkzMarkSegment}}[mark=none,pos=.5,size=4pt]\parg{name,name} +% \item \tkzhname{\hyperlink{tmss}{tkzMarkSegments}}[options]\parg{n1,n2 n3,n4 ...} +% \end{itemize} +% +% \item Autres macros +% +% \medskip +% \begin{itemize}\setlength{\itemsep}{4pt} +% \item \tkzhname{\hyperlink{thl}{tkzHLine}}[options]\marg{$v$} +% \item \tkzhname{\hyperlink{thls}{tkzHLines}}[options]\marg{$v_1,v_2,...$} +% \item \tkzhname{\hyperlink{tvl}{tkzVLine}}[options]\marg{$v$} +% \item \tkzhname{\hyperlink{tvls}{tkzVLines}}[options]\marg{$v_1,v_2,...$} +% \item \tkzhname{\hyperlink{tht}{tkzHTick}}[options]\marg{$v$} +% \item \tkzhname{\hyperlink{thts}{tkzHTicks}}[options]\marg{$v_1,v_2,...$} +% \item \tkzhname{\hyperlink{tvt}{tkzVTick}}[options]\marg{$v$} +% \item \tkzhname{\hyperlink{tvts}{tkzVTicks}}[options]\marg{$v_1,v_2,...$} \end{itemize} +% +% \end{enumerate} + + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex new file mode 100644 index 0000000000..f6de017439 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-divers.tex @@ -0,0 +1,240 @@ +\section{Droites parallèles aux axes} + +\subsection{ Tracer une ligne horizontale avec \tkzcname{tkzHLine}} \hypertarget{thl}{} +\begin{NewMacroBox}{tkzHLine}{\oarg{local options}\marg{decimal number}} +\tkzHandBomb La syntaxe est celle de \tkzname{xfp}! + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzHLine\{1\}}}{Trace la droite $y=1$} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{color }{|black| }{ couleur du trait} +\TOline{line width}{|0.6pt| }{ épaisseur du point} +\TOline{style }{|solid|}{ style du trait } +\bottomrule +\end{tabular} + +{voir les options les lignes dans \TIKZ} +\end{NewMacroBox} + +\subsubsection{Ligne horizontale } + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=2] + \tkzInit[xmax=3,ymax=1.5] + \tkzAxeXY + \tkzHLine[color = blue, + style = dashed, + line width = 2pt]{1} +\end{tikzpicture} +\end{tkzexample} + + + +\subsubsection{Ligne horizontale et valeur calculée par \tkzname{xfp} } +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-3,xmax=3,ymin=-2,ymax=1.5] + \foreach\v in {-1,1} + {\tkzHLine[color=red]{\v*pi/2}} + \tkzDrawY + \tkzAxeX[trig=2] + \tkzLabelY +\end{tikzpicture} +\end{tkzexample} + +\subsection{Lignes horizontales avec \tkzcname{tkzHLines} } +\hypertarget{thls}{} +\begin{NewMacroBox}{tkzHLines}{\oarg{local options}\marg{list of values}} +\tkzHandBomb La syntaxe est celle de \tkzname{xfp} ! + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{list of values}{\tkzcname{tkzHLines\{1,4\}}}{Trace les droites $x=1$ et $x=4$} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Lignes horizontales} + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=4] + \tkzAxeXY + \tkzHLines[color = magenta]{1,...,3} +\end{tikzpicture} +\end{tkzexample} + + +\subsection{ Tracer une ligne verticale avec \tkzcname{tkzVLine}} \hypertarget{tvl}{} +\begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}} +\tkzHandBomb La syntaxe est celle de \tkzname{xfp} ! +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzVLine\{1\}}}{Trace la droite $x=1$} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{color }{|black| }{ couleur du trait} +\TOline{line width}{|0.6pt| }{ épaisseur du point} +\TOline{style }{|solid|}{ style du trait } +\bottomrule +\end{tabular} + +{voir les options les lignes dans \TIKZ} +\end{NewMacroBox} + + +\subsubsection{Ligne verticale } + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=2] + \tkzInit[xmax=3,ymax=1] + \tkzAxeXY + \tkzVLine[color = blue, + style = dashed, + line width = 2pt]{1/3} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Ligne verticale et valeur calculée par \tkzname{xfp} } +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=7,ymin=-1,ymax=1] + \foreach\v in {1,2} + {\tkzVLine[color=red]{\v*pi}} + \tkzDrawY + \tkzAxeX[trig=2] + \tkzLabelY +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Lignes verticales avec \tkzcname{tkzVLines} } +\hypertarget{tvls}{} +\begin{NewMacroBox}{tkzVLines}{\oarg{local options}\marg{list of values}} +\tkzHandBomb La syntaxe est celle de \tkzname{xfp} ! + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{list of values}{\tkzcname{tkzVLines\{1,4\}}}{Trace les droites $x=1$ et $x=4$} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Lignes verticales} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzAxeXY + \tkzVLines[color = green]{1,2,...,4} +\end{tikzpicture} +\end{tkzexample} + +\newpage +\section{Ticks sur les axes} +%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> +\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzHTick}} \hypertarget{tht}{} +\begin{NewMacroBox}{tkzHTick}{\oarg{local options}\marg{decimal number}} + + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzHTick\{1\}}}{l'abscisse du tick est 1} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{mark }{* }{ disque plein} +\TOline{mark size}{3 pt }{taille du symbole} +\TOline{mark options}{ vide}{permet d'utiliser color par exemple} +\bottomrule +\end{tabular} + +{voir les options de \TIKZ} +\end{NewMacroBox} + +\subsubsection{exemple} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=6] + \tkzDrawX + \tkzHTick[mark=ball,mark size=3pt]{pi/2} + \tkzHTick[mark=*, + mark options={color=purple}]{2*exp(1)} +\end{tikzpicture} +\end{tkzexample} + +\subsection{ Tracer des ticks sur l'axe des ordonnées \tkzcname{tkzHTicks}} \hypertarget{thts}{} +\begin{NewMacroBox}{tkzHTicks}{\oarg{local options}\marg{list of numbers}} + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzHTicks\{1\}}}{l'abscisse du tick est 1} +\bottomrule +\end{tabular} + +{voir les options de \TIKZ.} +\end{NewMacroBox} + +\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzVTick}} \hypertarget{tvt}{} +\begin{NewMacroBox}{tkzVTick}{\oarg{local options}\marg{decimal number}} + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzVTick\{1\}}}{l'abscisse du tick est 1} +\bottomrule +\end{tabular} + +{voir les options de \TIKZ.} + +\end{NewMacroBox} + +\subsection{ Tracer des ticks sur l'axe des abscisses \tkzcname{tkzVTicks}} \hypertarget{tvts}{} +\begin{NewMacroBox}{tkzVTicks}{\oarg{local options}\marg{decimal number}} + +\begin{tabular}{lll} + \toprule +arguments & exemple & définition \\ +\midrule +\TAline{decimal number}{\tkzcname{tkzVTicks\{1,3\}}}{les ordonnées des ticks sont 1 et 3} +\bottomrule +\end{tabular} + +{voir les options de \TIKZ.} +\end{NewMacroBox} + + \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex new file mode 100644 index 0000000000..2285181433 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-example.tex @@ -0,0 +1,26 @@ +\section{Quelques exemples} + +Voici un exemple très simple qui vous montre qu'une fois le repère défini, il est facile de travailler avec les outils de mon module. Il est cependant possible d'utiliser les outils de Tikz, mais dans ce cas il faut revenir au système de coordonnées d'origine. + +\subsection{Recette en fonction du mois} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture} + \tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=1000] + \tkzClip[space=2] + \tkzAxeX[label=mois,below=10pt] + \tkzAxeY[label=Recette] + \tkzDefPoint(1,2000){A} + \tkzDefPoint(2,3000){B} + \tkzDefPoint(4,2500){C} + \tkzDefPoint(5,4200){D} + \tkzDrawSegments[color=brown!50](A,B B,C C,D) + \tkzDrawMarks[mark=ball](A,B,C,D) + \tkzText[draw,color = red,fill = red!10,text width=3cm](5,6000)% + {\begin{center}\color{blue}% + Recette en fonction du mois\end{center}% + } +\end{tikzpicture} +\end{tkzexample} + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex new file mode 100644 index 0000000000..ed02903a96 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-faq.tex @@ -0,0 +1,28 @@ +\section{FAQ} + +\subsection{Questions générales} + \begin{itemize}\setlength{\itemsep}{10pt} + \item \tkzimp{Pourquoi \tkzNamePack{tkz-base} ?} J'avais besoin en tant que professeur de Mathématiques d'outils permettant d'écrire mes cours et mes exercices rapidement. \TIKZ\ était parfait pour cela, mais je perdai trop de temps sur des détails. J'ai voulu créer une syntaxe à la fois proche de celle de \LATEX\ et des mathématiques afin de mieux mémoriser. J'ai créé ainsi un module pour chaque branche des mathématiques que j'enseignais. \tkzNamePack{tkz-base} est la partie commune de tous ces modules. \tkzNamePack{tkz-euclide} et \tkzNamePack{tkz-berge} sont ceux pour lesquels je me suis le plus investi. + + \item \tkzimp{Relation avec Ti\emph{k}Z ?} \TIKZ\ est un superbe package permettant de décrire des dessins. Mes packages sont basés sur lui. Cela dit, cela n'est aucunement comparable. Mes packages ne sont utiles que pour des personnes voulant créer des figures de mathématiques. + \end{itemize} + +\subsection{Erreurs les plus fréquentes} + \begin{itemize}\setlength{\itemsep}{10pt} + +\item \tkzimp{Error unknown option : label options} Cette option n'existe plus . Vous pouvez maintenant directement utiliser les options de \TIKZ. + + \item \tkzimp{Error avec \tkzcname{tkzDrawPoint} ou \tkzcname{tkzDefPoint} }\tkzcname{tkzDrawPoint(A,B)} alors qu'il faut \tkzcname{tkzDrawPoints}. C'est vrai avec toutes les macros qui permettent de définir plusieurs objets. La forme singulière permmet d'utiliser des options personnalisées. En revanche il est possible d'utiliser la forme pluriel pour un unique objet. + + + \item \tkzimp{propagation d'un style} Il est possible de restreindre la propagation d'un style en plaçant un morceau de code dans un groupe ou dans un environnement \tkzimp{scope} ou bien entre des parenthèses. + + \item \tkzimp{L'emploi de la virgule} même dans un mode Mathématique \$2,5\$ nécessite d'être protégé dans un groupe TeX par exemple \{\$2,5\$\}. + + \item +\item \tkzcname{tkzDrawSegments\{B,B' C,C'\}} est une erreur. Seules, les macros qui définissent un objet utilisent des accolades. + \item Si une erreur survient dans un calcul lors d'un passage de paramètres, alors il est préférable de faire ces calculs avant d'appeler la macro. + \item Ne pas mélanger la syntaxe de \tkzNamePack{pgfmath} et celle de \tkzNamePack{xfp}. + \end{itemize} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex new file mode 100644 index 0000000000..6dadd23134 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-grid.tex @@ -0,0 +1,169 @@ +\section{Utilisation de \tkzcname{tkzGrid}} \hypertarget{grid}{} + +\begin{NewMacroBox}{tkzGrid}{\oarg{local options}\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}} + Quelques changements pour cette macro. Tout d'abord, pour simplifier actuellement la couleur de la grille la plus fine est déterminée automatiquement à partir de la grille principale, même processus pour l'épaisseur. Ce comportement pourra être modifié à l'aide de styles. + +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TAline{\parg{$x_A~;~y_A$} \parg{$x_B~;~y_B$}}{(xmin,ymin)(xmax,ymax)} {trace une grille} +\end{tabular} + + +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{sub}{true} {demande une sous grille } +\TOline{color}{darkgray}{couleur de la grille principale} +\TOline{subxstep}{0.2} {le pas des sous-graduations pour l'axe des abscisses} +\TOline{subystep}{0.2}{le pas des sous-graduations pour l'axe des ordonnées } +\TOline{line width}{0.4pt} {épaisseur des traits de la grille principale} +\bottomrule +\end{tabular} + +\medskip +{Les valeurs par défaut peuvent être changées dans le fichier de configuration ou encore par des macros. La couleur de la seconde grille est celle de la grille principale, mais moins intense. Même comportement pour l'épaisseur du trait. Voir les exemples pour modifier ce comportement.} +\end{NewMacroBox} + +\subsubsection{\tkzcname{tkzGrid} et l'option \tkzname{sub}} +L'option \tkzname{sub} permet d'afficher une grille secondaire plus fine. +Il est préférable de lancer \tkzcname{tkzGrid} en premier, + pour éviter que la grille se superpose à d'autres éléments . +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=2] + \tkzGrid[sub] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{sub}} +L'option \tkzname{sub} permet d'afficher un grille secondaire plus fine. Certains paramètres sont mofiables. + + +\begin{tkzexample}[latex=6cm,small] +\def\tkzCoeffSubColor{20} +\def\tkzCoeffSubLw{0.2} +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=2] + % on peut modifier le pas pour la seconde grille + \tkzGrid[sub,color=orange, + subxstep=.5,subystep=.5] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Presque par défaut} +\begin{tkzexample}[width=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzGrid[color=orange] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Sous grille en plus, option \tkzname{sub}} +\begin{tkzexample}[width=7cm,small] + \begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzGrid[sub,color=orange] + \tkzGrid[color=orange] + \tkzAxeXY + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Changement de maille} +\begin{tkzexample}[width=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzGrid[color = orange, + sub, + subxstep = 0.1, + subystep = 0.1] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} et \tkzname{subystep}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} +\tkzInit[xmax=.5,xstep=.1, + ymax=.2,ystep=.1] +\tkzGrid[sub, + subxstep = 0.05, + subystep = 0.05, + color=orange] +\tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Avec des intervalles importants} + +\begin{tkzexample}[width=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=100,xstep=20, + ymax=3000,ystep=1000] + \tkzGrid[sub,subxstep=10, + subystep=500, + color=orange] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzGrid} et les arguments} + +La grille peut avoir une taille quelconque. +\begin{tkzexample}[width=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=100,xstep=20, + ymax=3000,ystep=1000] + \tkzGrid[sub,subxstep=10, + subystep=500, + color=orange] + (-20,-1000)(115,4000)% + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Usage de \tkzname{pi} avec \tkzcname{tkzGrid}} +\begin{tkzexample}[width=8cm,small] +\begin{tikzpicture}[scale=.75] + \tkzInit[xmax=6.5,ymax=6.5] + \tkzGrid[xstep=pi,ystep=pi/2,sub, + subxstep=pi/4,subystep=pi/4] + \tkzLabelX[label=$t$,orig=false,trig=4, + below=6pt,font=\scriptsize] + \tkzLabelY[trig=2,font=\scriptsize] + \tkzDrawXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Options \tkzname{frac} et \tkzname{trig} avec \tkzcname{tkzGrid}} +\begin{tkzexample}[width=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=9,xstep=3,ymax=4] + \tkzGrid[xstep=1,ystep=pi/2,sub, + subxstep=1,subystep=pi/4] + \tkzLabelX[label=$t$,orig=false,frac=3, + below=6pt,font=\scriptsize] + \tkzLabelY[trig=2,font=\scriptsize] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Utilisation d'une grille de répérage} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tikzset{xaxe style/.style ={-}} + \tkzInit[xmax=15,ymax=15] + \tkzClip + \tkzGrid[sub,color=orange] + \tkzLabelX[label= ] \tkzLabelY[label= ] + \tkzDrawXY + \node[opacity=.5] at (8,6){% + \includegraphics[scale=.5]{tiger}}; +\end{tikzpicture} +\end{tkzexample} + + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex new file mode 100644 index 0000000000..b39ac0178e --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-initialisation.tex @@ -0,0 +1,207 @@ +\section{Présentation de \tkzname{tkz-base}} + +\subsection{Exemple qui pose un problème } + +Le code suivant donne une erreur + +\begin{tkzltxexample}[right margin=7cm] +\begin{tikzpicture} + \draw (0,0)--(600,0); +\end{tikzpicture} +\end{tkzltxexample} + {\color{red} Latex Error: ... Dimension too large.} + +En effet, l'unité par défaut est le cm or \TEX\ ne peut pas stocker une dimension supérieure à 575 cm, c'est ce qui entraîne une erreur. \TEX\ cependant, peut stocker des entiers allant jusqu'à $2^{31}-1$, aussi il est possible de travailler en premier sur des entiers puis de définir les dimensions. + +\begin{tkzltxexample}[right margin=7cm] +\begin{tikzpicture}[x=0.01 cm] + \draw (0,0)--(600 cm,0); +\end{tikzpicture} +\end{tkzltxexample} + +{\color{red} Latex Error: ... Dimension too large.} + +Le code précédent donne encore une erreur. En effet, 600 cm est une dimension + et ne tient pas compte du changement d'unité. Correct est : + +\begin{tkzltxexample}[right margin=7cm] +\begin{tikzpicture}[x=0.01 cm] + \draw (0,0)--(600,0); +\end{tikzpicture} +\end{tkzltxexample} + +Cette fois, la dimension stockée est 6 cm ce qui est acceptable. Il est possible avec \TEX\ de manipuler de grands nombres entiers, mais en revanche les dimensions ne peuvent excéder \numprint{16384} pt soit 5,75 m environ. + +Avec \TEX, il est aussi possible de travailler avec le package \tkzname{xfp} , qui lui permet de travailler sur des intervalles plus importants, mais au prix d'une certaine lenteur. C'est la méthode que j'ai privilégiée pour certains calculs sensibles qui requièrent une bonne précision comme des calculs de mesure d'angles ou de longueur de segment, mais il est nécessaire une fois un nombre trouvé de l'attribuer à une dimension. On retrouve toujours les mêmes contraintes. + +\subsection{Le rôle de \tkzname{tkz-base}} +Le code suivant donne une erreur non parce que \numprint{6000000} est un trop grand nombre, mais parce que \numprint{0.000001} cm est une trop petite dimension. + + {\color{red} Latex Error:} + +\begin{tkzltxexample}[right margin=7cm] +\begin{tikzpicture}[x=0.000001 cm] + \coordinate (x) at (6000000,0); + \draw (0,0)--(x); +\end{tikzpicture} +\end{tkzltxexample} + +Avec \tkzname{tkz-base}, il sera possible de travailler avec des coordonnées quelconques, mais il faudra pour cela utiliser les macros du package. + +\tkzNamePack{tkz-base} permet de simplifier l'utilisation d'intervalles de valeurs divers. Ce package est utilisé par plusieurs de mes packages comme \tkzname{tkz-tukey}, un package pour dessiner les représentations graphi-ques en statistiques élémentaires, \tkzNamePack{tkz-fct} qui permet de dessiner les représentations graphiques des fonctions à l'aide du logiciel \tkzname{gnuplot}, ainsi qu'avec \tkzname{tkz-euclide} pour la géométrie euclidienne. + +Premièrement, il faut savoir qu'il n'est pas nécessaire de s'occuper avec \TIKZ\ de la taille du support (bounding box), cependant il est parfois nécessaire, soit de tracer une grille, soit de tracer des axes, soit de travailler avec une unité différente que le centimètre, soit finalement de contrôler la taille de ce qui sera affiché. + Pour cela, il faut avoir préparé le repère dans lequel vous allez travailler, c'est le rôle de \tkzNamePack{tkz-base} et de sa macro principale \tkzNameMacro{tkzInit}. Par exemple, si l'on veut travailler sur un carré de 10 cm de côté, mais tel que l'unité soit le dm alors il faudra utiliser. + +\begin{tkzltxexample}[right margin=7cm] +\tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1] +\end{tkzltxexample} + +\tkzname{xstep=0.1} signifie que 1cm représente la graduation $0.1$ ainsi la graduation $1$ se trouve à $10$ cm de l'origine. + +En revanche pour des valeurs de $x$ comprises entre \numprint{0} et \numprint{10000} et des valeurs de $y$ comprises entre \numprint{0} et \numprint{100000}, il faudra écrire + +\begin{tkzltxexample}[right margin=6cm] +\tkzInit[xmax=10000,ymax=100000,xstep=1000,ystep=10000] +\end{tkzltxexample} +Le résultat est toujours un carré de 10 cm de côté. + +Tout cela a peu de sens pour faire de la géométrie euclidienne, et dans ce cas, il est recommandé de laisser l'unité graphique égale à 1 cm. Je n'ai d'ailleurs pas testé si toutes les macros destinées à la géométrie euclidienne acceptaient d'autres valeurs que \tkzname{xstep=1} et \tkzname{ystep=1}. En revanche pour certains dessins, il est intéressant de fixer les valeurs extrêmes et de « clipper » le rectangle de définition afin de contrôler au mieux la taille de la figure. + +\subsection{Syntaxe de \tkzname{tkz-base}} + +J'ai essayé de généraliser la syntaxe suivante : +\begin{itemize} + \item la syntaxe est proche de celle de \LATEX, pas besoin « ; »; + \item toutes les macros ont un nom commençant par \tkzname{tkz}; + \item les accolades sont utilisées pour passer un paramètre qui sera la référence d'un objet créé par la macro; + \item les parenthèses sont utilisées pour faire référence à un objet déjà créé ou bien pour un couple de coordonnées; + \item les crochets sont nécessaires pour faire passer des arguments optionnels ou bien encore des options, certains choix sont parfois obligatoires. L'emploi de la virgule même dans un mode Math nécessite d'être protégé dans un groupe TeX; + \item les blancs (espace) sont interdits entre [...] et (...), [...] et \{...\}, ainsi qu'entre (...) et \{...\} mais il est possible de mettre des espaces entre les arguments optionnels passés [...]. + +\end{itemize} + + +\newpage +\section{Initialisation \tkzcname{tkzInit}} +\subsection{La macro principale \tkzcname{tkzInit}} +\begin{NewMacroBox}{tkzInit}{\oarg{local options}}\hypertarget{init}{} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{xmin} {0} {valeur minimum des abscisses en cm} +\TOline{xmax} {10} {valeur maximum des abscisses en cm} +\TOline{xstep}{1} {différence entre deux graduations en $x$} +\TOline{ymin} {0} {valeur minimum des ordonnées en cm } +\TOline{ymax} {10} {valeur maximum des ordonnées en cm} +\TOline{ystep}{1} {différence entre deux graduations en $y$} +\bottomrule +\end{tabular} + +\medskip + +{Le rôle de \tkzname{tkzInit} est de définir un repère \textcolor{red}{orthogonal} et une partie rectangulaire du plan dans laquelle vous allez placer vos dessins à l'aide de coordonnées cartésiennes. Le repère n'est pas obligatoirement normé. +Cette macro permet de définir votre environnement de travail comme avec une calculatrice.} +\end{NewMacroBox} + +\subsubsection{Modification de la taille du dessin avec \tkzcname{tkzInit}} +Cette macro prépare le terrain et définit plusieurs constantes. Il est tout à fait possible de faire une figure plus grande que le rectangle prédéfini. +De plus, comme vous pouvez le constater, il est possible d'utiliser les commandes de \TIKZ\ au milieu de celles de \tkzname{tkz} mais {\color{red} attention aux unités ! il faut réserver cette possibilité que pour des cas exceptionnels}. + +\begin{tkzexample}[latex=10cm,small] +\begin{tikzpicture} + \tkzInit[xmax=8,ymax=6] + \tkzGrid + \tkzAxeXY + \draw[blue](-1,0)--(6,7); +\end{tikzpicture} +\end{tkzexample} +%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> + +\subsubsection{Rôle de \tkzname{xstep} , \tkzname{ystep}} + +\tkzHandBomb\ Attention, une graduation est représentée par 1 cm, sauf si vous redimensionnez la figure avec l'option \tkzname{scale}. Dans l'exemple ci-dessous \tkzname{xstep} = 2 correspond à 1 cm, donc entre 0 et 10, il nous faudra 5 cm. De même \tkzname{ystep}=400, il y a donc 2 cm entre 0 et 800. Il n'est pas possible d'utiliser les options de \TIKZ, \tkzname{x=...} et \tkzname{y=...}. + +\medskip +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=10,xstep=2,ymax=800,ystep=400] + \tkzGrid + \tkzAxeXY + +\end{tikzpicture} +\end{tkzexample} + +\subsection{Autre exemple avec \tkzname{xstep} et \tkzname{ystep}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,xstep=1,ymax=2,ystep=.5] + \tkzGrid + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Origine personnalisée.} + +\medskip +Il est important de remarquer que l'on peut placer un point sans rien calculer. + + +\begin{tkzexample}[latex=10cm,small] +\begin{tikzpicture} + \tkzInit[xmin=20, + xmax=50, + xstep=10, + ymin=5000, + ymax=5150, + ystep=50] + \tkzAxeXY + \tkzDefPoint(30,5100){A} + \tkzDrawPoint(A) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Utilisation des décimaux } + +\medskip +Il est préférable d'écrire les différents arguments relatifs à un axe avec le même nombre de décimales. +\tkzname{numprint} est utilisé pour afficher les graduations correctement. + + Dans l'exemple suivant, \tkzname{numprint} utilise les conventions françaises pour l'écriture des nombres car j'ai utilisé : + +\tkzcname{usepackage[french]\{babel\} } + +\medskip + +\begin{tkzexample}[small] +\begin{tikzpicture} + \tkzInit[xmin=0.00, xmax=0.05, + ymin=1.2200,ymax=1.2215, + xstep=0.01, ystep=0.0005] + \tkzAxeXY + \tkzDefPoint(.04,1.22025){I} + \tkzDrawPoint(I) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Valeurs négatives} + +\medskip + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin = -40, + xmax = 60, + ymin = -40, + ymax = 60, + xstep = 20, + ystep = 20] + \tkzAxeXY +\end{tikzpicture} +\end{tkzexample} + + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex new file mode 100644 index 0000000000..49c9246b47 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-installation.tex @@ -0,0 +1,41 @@ +\section{Installation} + +\NamePack{tkz-base} est désormais sur le serveur du \tkzname{CTAN}\footnote{\NamePack{tkz-base} fait partie de \NameDist{TeXLive} et \tkzname{tlmgr} permet de l'installer, il fait aussi partie de \NameDist{MikTeX} sous \NameSys{Windows}}. Si vous voulez tester une version beta, il vous suffit de placer les fichiers suivants dans un dossier texmf que votre système pourra trouver. + +\subsection{Fichiers présents} +%–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> +Avant de tester l'installation, vous pouvez vérifier que le dossier \tkzname{tkzbase} contient les fichiers suivants~: + +\begin{itemize} +\item \tkzname{tkz-base.cfg} +\item \tkzname{tkz-base.sty} +\item \tkzname{tkz-lib-marks.tex} +\item \tkzname{tkz-obj-axes.tex} +\item \tkzname{tkz-obj-grids.tex} +\item \tkzname{tkz-obj-marks.tex} +\item \tkzname{tkz-obj-points.tex} +\item \tkzname{tkz-obj-rep.tex} +\item \tkzname{tkz-tools-arith.tex} +\item \tkzname{tkz-tools-base.tex} +\item \tkzname{tkz-tools-BB.tex} +\item \tkzname{tkz-tools-math.tex} +\item \tkzname{tkz-tools-misc.tex} +\item \tkzname{tkz-tools-modules.tex} +\item \tkzname{tkz-tools-print.tex} +\item \tkzname{tkz-tools-text.tex} +\item \tkzname{tkz-tools-utilities.tex} +\end{itemize} + +Celui qui contient les principales macros est \tkzname{tkz-tools-base.tex} +, il est appelé par \tkzname{tkz-base} qui gère l'ensemble des fichiers. +Les différents outils sont dans les fichiers commençant par \tkzname{tkz-tools}, les objets mathématiques créés le sont dans des fichiers dont le nom a pour préfixe \tkzname{tkz-obj}. Enfin \tkzname{tkz-base.cfg} dont la présence n'est pas obligatoire permet de modifier beaucoup de valeurs par défaut. + +De plus, \TIKZ\ est chargé avec les librairies suivantes~: + +\begin{tkzltxexample}[] +\usetikzlibrary{angles, arrows, arrows.meta ,babel, calc, decorations, decorations.markings, +decorations.pathreplacing, intersections, patterns, plotmarks, positioning, quotes, +shapes.misc,shapes.misc, through} +\end{tkzltxexample} + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex new file mode 100644 index 0000000000..2b745068a5 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex @@ -0,0 +1,158 @@ +%!TEX TS-program = lualatex +% encoding : utf8 +% documentation of tkz-base.sty +% Copyright (C) 2020 Alain Matthes +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License , either version 1.3 +% of this license or (at your option) any later version and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details.% +% See http://www.latex-project.org/lppl.txt for details. + +% TKZdoc-base-main is the french documentation of tkz-base +% +\documentclass[DIV = 14, + fontsize = 10, + headinclude = false, + index = totoc, + footinclude = false, + twoside, + headings = small + ]{tkz-doc} +\usepackage{etoc} +\gdef\tkznameofpack{tkz-base} +\gdef\tkzversionofpack{3.02c} +\gdef\tkzdateofpack{2020/02/06} +\gdef\tkznameofdoc{doc-tkz-base} +\gdef\tkzversionofdoc{3.02c} +\gdef\tkzdateofdoc{2020/02/06} +\gdef\tkzauthorofpack{Alain Matthes} +\gdef\tkzadressofauthor{} +\gdef\tkznamecollection{AlterMundus} +\gdef\tkzurlauthor{} +\gdef\tkzengine{lualatex} +\gdef\tkzurlauthorcom{http://altermundus.fr} +% -- Packages --------------------------------------------------- +\usepackage[dvipsnames,svgnames]{xcolor} +\usepackage{calc} +\usepackage{tkz-euclide} +\usepackage[colorlinks]{hyperref} +\hypersetup{ + linkcolor=BrickRed, + citecolor=Green, + filecolor=Mulberry, + urlcolor=NavyBlue, + menucolor=BrickRed, + runcolor=Mulberry, + linkbordercolor=BrickRed, + citebordercolor=Green, + filebordercolor=Mulberry, + urlbordercolor=NavyBlue, + menubordercolor=BrickRed, + runbordercolor=Mulberry, + pdfsubject={Cartesian System}, + pdfauthor={\tkzauthorofpack}, + pdftitle={\tkznameofpack}, + pdfkeywords={tikz, pgf, pdf, pdflatex, graphique, euclide,lualatex, + geometry, points, maths, line, circle, angle ,polygon}, + pdfcreator={\tkzengine} +} +\usepackage{tkzexample} +\usepackage{mathtools} +\usepackage{unicode-math} +\usepackage{fourier-otf} +\setmainfont[Ligatures=TeX]{TeX Gyre Pagella} +\setmathfont{TeX Gyre Pagella Math} +\usepackage{datetime,multicol,lscape} +\usepackage[french]{babel} +\usepackage[autolanguage]{numprint} +\usepackage{ulem} +\usepackage{microtype} +\usepackage{array,multirow,multido,booktabs} +\usepackage{shortvrb,fancyvrb} +\renewcommand{\labelitemi}{\lefthand} +\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb +\pdfcompresslevel=9 +\setlength\parindent{0pt} +\RequirePackage{makeidx} +%\@twocolumnfalse +\makeindex +% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}} +% \renewenvironment{tkzexample}[1][]{% +% \tkz@killienc \VerbatimOut{tkzbase-\tkzref.tex}% +% }{% +% \endVerbatimOut +% } +%<---------------------------------------------------------------------------> +\begin{document} + +\parindent=0pt +\author{\tkzauthorofpack} +\title{\tkznameofpack} +\date{\today} +\clearpage +\thispagestyle{empty} +\maketitle + +\clearpage% next première page présentation +\tkzSetUpColors[background=white,text=darkgray] + +\let\rmfamily\ttfamily +\nameoffile{\tkznameofpack} +\defoffile{\tkzname{\tkznameofpack} est un package basé sur \TIKZ\space permettant d'obtenir des graphiques le plus simplement possible. Il est la base sur laquelle sera construite une série de packages ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Le rôle de \tkzname{\tkznameofpack} est essentiellement de fournir une macro permettant de définir un repère orthogonal, et de laisser le choix à l'utilisateur des unités graphiques. Ce package nécessite la version égale ou supérieure à 3 de \TIKZ.} + +\presentation + +\vspace*{1cm} +\noindent\space Je souhaite remercier \textbf{Till~Tantau} pour avoir créé le merveilleux outil \href{http://sourceforge.net/projects/pgf/}{Ti\emph{k}Z}. + +\vspace*{12pt} +\noindent\space Je remercie \textbf{Yve~Combe} pour avoir partagé son travail sur le rapporteur et les constructions à l'aide du compas. Je souhaite remercier également, \tkzimp{David~Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang~Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John~Kitzmiller} et \tkzimp{Dimitri~Kapetas} pour leurs exemples, et enfin \tkzimp{Gaétan~Marris} pour ses remarques et corrections. + +\vspace*{12pt} +\noindent\space Vous trouverez de nombreux exemples sur mon site~: +\href{http://altermundus.fr}{altermundus.fr} + +\vfill +Vous pouvez envoyer vos remarques, et les rapports sur des erreurs que vous aurez constatées à l'adresse suivante~: \href{mailto:al.ma@mac.com}{\textcolor{pdfurlcolor}{\tkzauthorofpack}}. + +This file can be redistributed and/or modified under the terms of the LATEX +Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ archives. + + +\clearpage +\tableofcontents + +\clearpage +\newpage + +\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex} +%<------------- includes ----------------------------------------------- +\include{TKZdoc-base-news} +\include{TKZdoc-base-installation} +\include{TKZdoc-base-compilation} +\include{TKZdoc-base-initialisation} +\include{TKZdoc-base-axes} +\include{TKZdoc-base-grid} +\include{TKZdoc-base-point} +\include{TKZdoc-base-style} +\include{TKZdoc-base-BB} +\include{TKZdoc-base-tools} +\include{TKZdoc-base-obj} +\include{TKZdoc-base-rep} +\include{TKZdoc-base-divers} +\include{TKZdoc-base-marks} +\include{TKZdoc-base-texte} +\include{TKZdoc-base-faq} +%<------------------------------------------------------------------------ +\clearpage\newpage +\makeatletter + +\begin{multicols}{2} +\small\printindex +\end{multicols} +\end{document} + diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex new file mode 100644 index 0000000000..97f9fabb12 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-marks.tex @@ -0,0 +1,192 @@ +\section{Marks, marques ou symboles} + +J'ai distingué les points utilisés en géométrie euclidienne et les « marks » ou symboles que l'on peut rencontrés en statistiques. + +Pour positionner le symbole, on utilise la macro \tkzcname{tkzDefPoint} pour définir correctement un point, puis la macro \tkzcname{tkzDrawMark} pour tracer le symbole. + +Il est fréquent d'avoir à tracer un nuage de points, j'ai donc créé une macro qui permet de définir plusieurs points rapidement. + +Un symbole "mark" peut être mise à l'échelle , ce qui est parfois utile, mais en revanche si on modifie différemment les abscisses et les ordonnées alors les "marks" sont déformées. + +Rappel: il était déjà possible de créer un nuage de points avec la macro \tkzcname{tkzDefPoints}, mais cela impose de donner une référence (un nom) à chaque point, ce qui est parfois fastidieux. La macro \tkzcname{tkzSetOfPoints} permet de définir des points \tkzname{tkzPt1}, \tkzname{tkzPt2},etc. +La macro \tkzcname{tkzDefSetOfPoints} a été défini + + +C'est ce qu'on appelle fréquemment « nuage de points». La différence par rapport à la macro \tkzcname{tkzDefPoints}, c'est que la référence aux points est donnée par un préfixe (par défaut tkzPt) et le numéro du point. +Les points ne sont pas tracés. Voir +\hyperlink{label_tkzDefSetOfPoints}{tkzDefSetOfPoints} + +\subsection{\tkzcname{tkzDrawSetOfPoints}} + +\begin{NewMacroBox}{tkzDrawSetOfPoints}{\oarg{local options}} +Permet de placer des symboles sur les points définis par \tkzcname{tkzDefSetOfPoints}. + +\medskip +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{prefix} {tkzPt} {préfixe des noms des points} +\end{tabular} +\end{NewMacroBox} + + \subsubsection{Tracé d'un nuage avec \tkzcname{tkzDrawSetOfPoints}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=0.75] +\tkzInit[xmax=6,ymin=1000,ymax=5000,ystep=1000] +\tkzDrawX[label=$m$,below=10pt] +\tkzDrawY[label=$R(m)$,above=10pt] +\tkzLabelX[font=\scriptsize] +\tkzLabelY[font=\scriptsize] +\tkzDefSetOfPoints[show]{1/2000,2/3000,4/2500,5/4200} +\tkzDrawSetOfPoints[mark=ball,mark size=3pt] +\end{tikzpicture} +\end{tkzexample} + +\newpage +\subsection{\tkzcname{tkzJoinSetOfPoints}} + +\begin{NewMacroBox}{tkzJoinSetOfPoints}{\oarg{local options}} +Permet de joindre les symboles par des segments de droite. Il est possible d'utiliser bien sûr toutes les options de \TIKZ. + +\medskip +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{prefix} {tkzPt} {préfixe des noms des points} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Lier les points d'un nuage avec \tkzcname{tkzJoinSetOfPoints}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] +\tkzInit[xmax=5, + ymin=1000,ymax=6000,ystep=1000] +\tkzDrawX[label=$m$,below=13pt] +\tkzDrawY[label=$R(m)$] +\tkzLabelX[font=\scriptsize] +\tkzLabelY[font=\scriptsize] +\tkzDefSetOfPoints{% + 1/2000,2/3000,4/2500,5/4200} +\tkzJoinSetOfPoints[% + thick, + color=brown] +\tkzDrawSetOfPoints[% + mark=ball + ,mark size=3pt] +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Utilisation des points d'un nuage} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] +\tkzInit[xmax=5,ymin=1000, + ymax=6000,ystep=1000] +\tkzGrid[color=orange!30] +\tkzDrawX[label=$m$,below=13pt] +\tkzDrawY[label=$R(m)$] +\tkzLabelX[font=\scriptsize] +\tkzLabelY[font=\scriptsize] +\tkzDefSetOfPoints[prefix=P]{% + 1/2000,2/3000,3/2000,4/2500,5/4200} +\tkzDrawPolySeg[% + color=brown!50, + line width=2pt](P1,P2,P3,P4,P5) +\end{tikzpicture} +\end{tkzexample} + +% \subsection{Mark option \tkzname{mark} et \tkzname{size}} +\subsection{\tkzcname{tkzSetUpMark}} + +\begin{NewMacroBox}{tkzSetUpMark}{\oarg{local options}} +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{liste}{no default}{exemple \tkzcname{tkzSetUpMark[mark=heart]}} +\end{tabular} + +\end{NewMacroBox} + +\subsubsection{Deux nuages} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} +\tkzInit[xmax=5.5,ymin=1000,% + ymax=6000,ystep=2000] +\tkzGrid[color=orange!30] +\tkzDrawX[label=$m$,below=13pt] +\tkzDrawY[above left,label=$R(m)$] +\tkzLabelX[below right,font=\scriptsize] +\tkzLabelY[font=\scriptsize] +\tkzDefSetOfPoints{1/2000,2/3000,3/2000, + 4/2500,5/4200} +\tkzDefSetOfPoints[prefix=P]{1/3200,2/4100, + 3/3300,4/3300,5/5000} +\tkzSetUpMark[mark=heart,color=black, + fill=red!30,size=4pt] +\tkzJoinSetOfPoints[thick,color=blue,double] +\tkzDrawSetOfPoints +\tkzJoinSetOfPoints[prefix=P,thick,color=orange] +\tkzDrawSetOfPoints[prefix=P,mark=square*, + mark size=4pt, + mark options={color=blue,fill=blue!40}] +\tkzText[draw,color = red, + fill = orange!20](3,5800)% + {Recette en fonction du mois} + \end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzDrawMark}} + +\begin{NewMacroBox}{tkzDrawMark}{\oarg{local options}\parg(point)} +Place un symbole. Plus efficace que la suivante pour placer un seul symbole. + +\medskip +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{prefix} {tkzPt} {préfixe des noms des points} +\end{tabular} +\end{NewMacroBox} + + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzInit[xmax=3,ymax=1] + \tkzAxeXY + \tkzDrawMark[mark=ball](1,.5) + \end{tikzpicture} +\end{tkzexample} + + +\subsection{\tkzcname{tkzDrawMarks}} + +\begin{NewMacroBox}{tkzDrawMarks}{\oarg{local options}\parg(list of points)} +Permet de placer une série de marques. + +\medskip +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{prefix} {tkzPt} {préfixe des noms des points} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Mark et nuage; utilisation de \tkzcname{tkzDrawMarks}} +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzInit[xmax=6,ymin=1000, + ymax=5000,ystep=1000] + \tkzAxeXY + \tkzDefSetOfPoints[prefix=P]{% + 1/2000, + 2/3000, + 4/2500, + 5/4200} + \tkzDrawSegments[color=brown!50]% +(P1,P2 P2,P3 P3,P4) + \tkzDrawMarks[mark=ball](P1,P2,P3,P4) + \end{tikzpicture} +\end{tkzexample} + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex new file mode 100644 index 0000000000..4ef552e71c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex @@ -0,0 +1,29 @@ +\section{Nouveautés et présentation} + +Ce package est le socle en particulier de \tkzNamePack{tkz-euclide} et de \tkzNamePack{tkz-fct}. Il fournit un repère cartésien qui sera défini avec la macro \tkzcname{tkzInit}. Le package a été modifié et des transferts d' objets entre \tkzimp{tkz-base} et \tkzimp{tkz-euclide} ont été effectués. +Dans le futur, les macros de définition seront isolées. + +La nouveauté principale est le remplacement récent du package \tkzNamePack{fp} par \tkzNamePack{xfp}. L'apparition de celui-ci est un pas vers la version 3 de \LATEX. + Le prochain pas sera la création d'un nouveau paquet + +Voici quelques unes des modifications. Le package |tkz-euclide| apporte davantage de nouveautés. +\vspace{2cm} + \begin{itemize}\setlength{\itemsep}{10pt} +\item Amélioration du code +\item Avec \tkzimp{tkz-euclide} charge tous les objets, donc plus besoin de placer \tkzcname{usetkzobj{all}}. +\item Correction de bugs +\item La "bounding box" est désormais contrôlée dans chaque macro (enfin je l'espère) cela permet d'éviter l'utilisation de \tkzcname{tkzInit} suivi de \tkzcname{tkzClip} +\item Ajout de macros concernant la "bounding box" : \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB} etc. +\item Logiquement la plupart des macros acceptent les options de TikZ. J'ai donc retiré les options "doublons". +\item Suppression de l'option "label options" +\item Les points aléatoires sont désormais dans \tkzimp{tkz-euclide} et la macro \tkzcname{tkzGetRandPointOn} est remplacée par \tkzcname{tkzDefRandPointOn}. Pour des raisons d'homogénéité, il faut récupérer les points avec \tkzcname{tkzGetPoint}. +\item Les options \tkzimp{end} et \tkzimp{start} qui permettaient de donner un label à une droite sont supprimées. Il faut désormais utiliser la macro \tkzcname{tkzLabelLine} + +\item Introduction des librairies \NameLib{quotes} et \NameLib{angles} cela permet de donner un label à un point.même si je ne suis pas favorable à cette pratique. + +\item La notion de vecteur disparait pour tracer un vecteur il suffit de passer "->" en option de \tkzcname{tkzDrawSegment}. + +\item Apparition de la macro \tkzcname{usetkztool} qui permet de charger de nouveaux "outils". +\end{itemize} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex new file mode 100644 index 0000000000..ea697451c6 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-obj.tex @@ -0,0 +1,109 @@ +\section{Utilisation des objets complémentaires ou des outils} + +\subsection{Objets complémentaires} +Ces objets complémentaires peuvent être des points particuliers, des droites, des cercles, des arcs, etc. + +Il est possible d'utiliser certains de ces objets, sans charger complètement \tkzname{tkz-euclide}, mais en utilisant la macro \tkzcname{usetkzobj}. + +\tkzname{tkz-base} charge les objets les plus utilisés, marqués «~présent~» dans la liste ci-dessous. Cette liste a évolué et le peut encore.. + +\begin{NewMacroBox}{usetkzobj}{\var{liste d'objets}} \hypertarget{obj}{} + +\begin{tabular}{lll} +options & & définition \\ +\midrule +\TAline{axes} {présent} {tracer des axes } +\TAline{circles} {présent} {tracer, nommer des circles, } +\TAline{grids} {présent} {tracer des grilles } +\TAline{lines} {présent} {tracer, nommer des droites } +\TAline{marks} {présent} {tracer des marques} +\TAline{points} {présent} {définir, nommer, tracer des points } +\TAline{rep} {présent} {définir, tracer un repère} +\TAline{segments} {présent} {étiqueter, tracer des segments} + +\TAline{defcircles} {absent} {définir des cercles} +\TAline{deflines} {absent} {définir des droites} +\TAline{defpointsby} {absent} {définir des points obtenus par une transformation} +\TAline{defpointsrnd} {absent} {définir des points aléatoires} +\TAline{defpointswith}{absent} {définir des points obtenus vectoriellement} + +\TAline{angles} {absent} {définir, nommer, tracer des angles} +\TAline{arcs} {absent} {définir, tracer des arcs} +\TAline{compass} {absent} {afficher des traces de compas} +\TAline{polygons} {absent} {définir, nommer, tracer des polygones} +\TAline{protractor}{absent} {tracer un rapporteur} +\TAline{sectors} {absent} {définir, nommer, tracer des secteurs} +\TAline{show} {absent} {afficher les traces de compas d'une construction} +\TAline{triangles} {absent} {définir, nommer, tracer des triangles} +\end{tabular} +\end{NewMacroBox} + +\subsection{\tkzcname{usetkzobj\{defcircles\}}} + +\begin{tkzexample}[latex=8 cm,small] +\begin{tikzpicture}[scale=0.75] + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefPoint(3,3){C} + \tkzDefCircle[in](A,B,C) + \tkzGetPoint{I}\tkzGetLength{rI} + \tkzDrawCircle[R](I,\rI) + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C,I) + \tkzLabelPoints(A,B,C,I) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Outils complémentaires} +\tkzHandBomb\ Attention, il faut utiliser \tkzname{tkz-euclide} pour avoir la possibilité d'utiliser des outils comme les transformations ou encore les intersections. + +\begin{NewMacroBox}{usetkztool}{\var{liste d'objets}} \hypertarget{obj}{} + +\begin{tabular}{lll} +options & & définition \\ +\midrule +\TAline{BB} {présent} {outils permettant de trvailler sur la Bounding Box (BB)} +\TAline{arith} {présent} {outils sur les nombres entiers "macros dans TikZ >=3"} +\TAline{base} {présent} {macro \tkzcname{tkzInit} base essentielle} +\TAline{math} {présent} {outils mathématiques de base} +\TAline{print} {présent} {définir, nommer, tracer des points particuliers} +\TAline{text} {présent} {outils permettant de travailler sur des textes} +\TAline{utilities} {présent} {utilitaires} +\TAline{intersections} {absent} {intersection de droites, de cercles, de droite et de cercle} +\end{tabular} + \end{NewMacroBox} + + \subsection{Exemple} + \begin{minipage}{0.45\textwidth} + \begin{tkzltxexample}[small] + \documentclass[border=.25cm]{standalone} + \usepackage{tkz-base} + \usetkztool{intersections} + + \begin{document} + \begin{tikzpicture} + \tkzDefPoints{0/0/A,2/2/B,1/2/C} + \tkzDrawCircles(A,B C,B) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B,C) + \tkzInterCC(A,B)(C,B) + \tkzGetPoints{D}{E} + \tkzDrawPoints[red](D,E) + \end{tikzpicture} + \end{document} + \end{tkzltxexample} +\end{minipage} + \begin{minipage}{0.45\textwidth} + \begin{tikzpicture} + \tkzDefPoints{0/0/A,2/2/B,1/2/C} + \tkzDrawCircles(A,B C,B) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B,C) + \tkzInterCC(A,B)(C,B) + \tkzGetPoints{D}{E} + \tkzDrawPoints[red](D,E) + \end{tikzpicture} +\end{minipage} + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex new file mode 100644 index 0000000000..13d1dfdba8 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-point.tex @@ -0,0 +1,684 @@ +\section{Les points} + +J'ai fait une distinction entre le point utilisé en géométrie euclidienne et le point pour représenter un élément d'un nuage statistique. Dans le premier cas, j'utilise comme objet un \tkzname{node}, ce qui se traduit par le fait que la représentation du point ne peut être modifiée par un \tkzname{scale}; dans le second cas, j'utilise comme objet un \tkzname{plot mark}. Ce dernier peut être mis à l'échelle et posséder des formes plus variées que le node. + +La nouvelle macro est \tkzNameMacro{tkzDefPoint}, celle-ci permet d'utiliser des options propres à \TIKZ\ comme shift et les valeurs sont traitées avec tkz-base. De plus, si des calculs sont nécessaires alors c'est le package \tkzNamePack{xfp} qui s'en charge. On peut utiliser les coordonnées cartésiennes ou polaires. + +\subsection{Définition d'un point en coordonnées cartésiennes : \tkzcname{tkzDefPoint}} \hypertarget{tdp}{} + +\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\var{name} ou \parg{a:r}\var{name}} + +\begin{tabular}{lll} +\toprule +arguments & défaut & définition \\ +\midrule +\TAline{x,y}{no default}{x et y sont deux dimensions, par défaut en cm.} +\TAline{a:r}{no default}{a est un angle en degré, r une dimension} +\bottomrule +\end{tabular} + +\medskip +\noindent{Les arguments obligatoires de cette macro sont deux dimensions exprimées avec des décimaux, dans le premier cas ce sont deux mesures de longueur, dans le second ce sont une mesure de longueur et la mesure d'un angle en degré} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{shift} {(0,0)} {espacement entre deux valeurs} + \bottomrule +\end{tabular} + +\medskip +\noindent{Toutes les options de \TIKZ\ que l'on peut appliquer à \tkzname{coordinate}, sont applicables (enfin je l'espère!) comme par exemple l'option \tkzname{label} définit avec la librairie \tkzname{quotes}.} +\end{NewMacroBox} + +\subsubsection{Utilisation de \tkzname{shift}} +\tkzname{shift} permet de placer les points par rapport à un autre. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[trim left=-1cm] + \tkzDefPoint(2,3){A} + \tkzDefPoint[shift={(2,3)}](31:3){B} + \tkzDefPoint[shift={(2,3)}](158:3){C} + \tkzDrawSegments[color=red,line width=1pt](A,B A,C) + \tkzDrawPoints[color=red](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Placer un label avec la librairie \tkzname{quotes} } +Je préfère ne pas mélanger les opérations et utiliser \tkzcname{tkzLabelPoint} pour placer les labels. voir la section 17.10.4 The Quotes Syntax. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[trim left=-1cm] + \tkzDefPoint["-60:$A_n$" ](2,3){A} + \tkzDefPoint[shift={(2,3)},% + "$B_n$" above left](31:3){B} + \tkzDefPoint[shift={(2,3)},% + "$C_n$" above right](158:3){C} + \tkzDrawSegments[color=red,% + line width=1pt](A,B A,C) + \tkzDrawPoints[color=red](A,B,C) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Rotation avec \tkzname{shift} et \tkzname{scope} } +Préférable pour effectuer une rotation, est d'utiliser un environnement \tkzNameEnv{scope}. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75,rotate=90] + \tkzDefPoint[label=right:$A_n$](2,3){A} + \begin{scope}[shift={(A)}] + \tkzDefPoint[label= right:$B_n$](31:3){B} + \tkzDefPoint[label= right:$C_n$](158:3){C} + \end{scope} + \tkzDrawSegments[color=red,% + line width=1pt](A,B A,C) + \tkzDrawPoints[color=red](A,B,C) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Formules et coordonnées} +Il faut ici respecter la syntaxe de \tkzNamePack{xfp}. Il est toujours possible de passer par \tkzNamePack{pgfmath} mais dans ce cas, il faut calculer les coordonnées avant d'utiliser la macro \tkzcname{tkzDefPoint}. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.75] + \tkzInit[xmax=6,ymax=6] + \tkzGrid + \tkzSetUpPoint[shape = circle,color = red,% + size = 4,fill = red!30] + \tkzDefPoint(-1+1,-1+4){O} + \tkzDefPoint({3*ln(exp(1))},{exp(1)}){A} + \tkzDefPoint({4*sin(pi/6)},{4*cos(pi/6)}){B} + \tkzDefPoint({4*sin(pi/3)},{4*cos(pi/3)}){B'} + \tkzDefPoint[shift={(1,3)}](30:3){A'} + \tkzDrawPoints(O,A,B) + \tkzDrawPoints[color=red,shape=cross out](B',A') + \tkzLabelPoints(A,O,B,B',A') +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Scope et \tkzcname{tkzDefPoint} } +On peut tout d'abord utiliser l'environnement \tkzNameEnv{scope} de \TIKZ\ +Dans l'exemple suivant, nous avons un moyen de définir un triangle isocèle. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \begin{scope}[rotate=30] + \tkzDefPoint(2,3){A} + \begin{scope}[shift=(A)] + \tkzDefPoint(90:5){B} + \tkzDefPoint(30:5){C} + \end{scope} + \end{scope} +\tkzDrawSegments[color=blue](A,B B,C C,A) +\tkzDrawPoints(A,B,C) +\tkzLabelPoints[above](B,C) +\tkzLabelPoints[below](A) +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +\subsection{Définition de points en coordonnées cartésiennes : \tkzcname{tkzDefPoints}} \hypertarget{tdps}{} + +\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\var{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}} +$x_1$ et $y_1$ sont les coordonnées d'un point référencé $n_1$ + +\begin{tabular}{lll} +\toprule +arguments & exemple & \\ +\midrule +\TAline{$x_i/y_i/n_i$}{\tkzcname{tkzDefPoints\{0/0/O,2/2/A\}}}{} +\end{tabular} +\end{NewMacroBox} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{% x y name + 0 /0 /A, + 2 /0 /B, + 2 /2 /C, + 0 /2 /D} + \tkzDrawSegments(D,A A,B B,C C,D) + % or with tkz-euclide + % \tkzDrawPolygon(A,...,D) + \tkzDrawPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\newpage +%<---------------------------------------------------------------------------> +\subsection{Point relativement à un autre : \tkzcname{tkzDefShiftPoint}} +\hypertarget{tdsp}{} +\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{x,y}\var{name} ou \parg{a:r}\var{name}} +\begin{tabular}{lll} +arguments & défaut & définition \\ +\midrule +\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.} +\TAline{(a:r)}{no default}{a est un angle en degré, r une dimension} +\TAline{point} {no default} {\tkzcname{tkzDefShiftPoint}[A](0:4)\{B\}} +\bottomrule +\end{tabular} + +\emph{Pas d'option. Le nom du point est obligatoire.} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzDefShiftPoint}} +Cette macro permet de placer un point relativement à un autre. Cela revient à une translation. Voici comment construire un triangle isocèle de sommet principal A et d'angle au sommet de $30$ degrés. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=-30] + \tkzDefPoint(2,3){A} + \tkzDefShiftPoint[A](0:4){B} + \tkzDefShiftPoint[A](30:4){C} + \tkzDrawSegments(A,B B,C C,A) + \tkzMarkSegments[mark=|,color=red](A,B A,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints[above](A,C) + \tkzLabelPoints(B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Point relativement à un autre : \tkzcname{tkzDefShiftPointCoord}} + +\begin{NewMacroBox}{tkzDefShiftPointCoord}{\oarg{a,b}\parg{x,y}\var{name} ou \parg{a:r}\var{name}} +{Il s'agit d'effectuer une translation de vecteur $(a,b)$ au point défini par rapport à l'oigine.} + +\medskip +\begin{tabular}{lll} +\toprule +arguments & défaut & définition \\ +\midrule +\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.} +\TAline{(a:r)}{no default}{a est un angle en degré, r une dimension} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & exemple \\ +\midrule +\TOline{a,b} {no default} {\tkzcname{tkzDefShiftPointCoord}[2,3](0:4)\{B\}} + \bottomrule +\end{tabular} + +L'option est obligatoire +\end{NewMacroBox} + + +\subsubsection{Triangle équilatéral avec \tkzcname{tkzDefShiftPointCoord}} +Voyons comment obtenir un triangle équilatéral (il y a beaucoup plus simple) + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(2,3){A} + \tkzDefShiftPointCoord[2,3](30:4){B} + \tkzDefShiftPointCoord[2,3](-30:4){C} + \tkzDrawSegments(A,B B,C C,A) + % or \tkzDrawPolygon + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoint[left](A){$A$} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Triangle isocèle avec \tkzcname{tkzDefShiftPointCoord}} +Voyons comment obtenir un triangle isocèle dont l'angle principal est de 30 degrés. La rotation est possible. $AB=AC=5$ et $\widehat{BAC}$ + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=15] + \tkzDefPoint(2,3){A} + \tkzDefShiftPointCoord[2,3](15:5){B} + \tkzDefShiftPointCoord[2,3](-15:5){C} + \tkzDrawSegments(A,B B,C C,A) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoint[left](A){$A$} +\end{tikzpicture} +\end{tkzexample} + + +%<---------------------------------------------------------------------------> +\subsection{Tracer des points \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{} + +\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{point}} +\begin{tabular}{lll} +arguments & défaut & définition \\ +\midrule +\TAline{point} {no default} {un nom ou une référence est demandé} +\bottomrule +\end{tabular} + +\medskip +\noindent{L'argument est obligatoire, mais il n'est pas nécessaire (bien que recommandé) d'utiliser une référence; un couple de coordonnées place entre accolades est acceptée. Le disque prend la couleur du cercle, mais 50\% plus claire. Il est possible de tout modifier. Le point est un node et donc il est invariant si le dessin est modifié par une mise à l'échelle.} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}} +\TOline{size} {2 pt} {taille du disque} +\TOline{color} {black}{la couleur par défaut peut être changée} +\bottomrule +\end{tabular} + +\medskip +\noindent{On peut créer d'autres formes comme \tkzname{cross}} +\end{NewMacroBox} + +\subsubsection{Style des points par défaut} + +\begin{tkzexample}[latex=5cm,small] + \begin{tikzpicture} + \tkzDefPoint(1,3){A} + \tkzDrawPoint(A) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Modification du style} +La définition par défaut dans le fichier \tkzname{tkz-base.cfg} + +\begin{tkzltxexample}[small] +\tikzset{point style/.style={draw = \tkz@euc@pointcolor, + inner sep = 0pt, + shape = \tkz@euc@pointshape, + minimum size = \tkz@euc@pointsize, + fill = \tkz@euc@pointcolor!50}} +\end{tkzltxexample} + +\begin{tkzexample}[latex=5cm,small] + \begin{tikzpicture} + \tikzset{point style/.style={% + draw = blue, + inner sep = 0pt, + shape = circle, + minimum size = 6pt, + fill = red!20}} + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){O} + \tkzDrawPoint(A) + \tkzDrawPoint(B) + \tkzDrawPoint(O) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple de tracés de points} +Il faut remarquer que \tkzname{scale} ne touche pas à la forme des points. Ce qui est normal. La plupart du temps, on se contente d'une seule forme de points que l'on pourra définir dès le début, soit avec une macro, soit en modifiant un fichier de configuration. + +\begin{tkzexample}[latex=5cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){O} + \tkzDrawPoint[shape=cross out,size=12,color=red](A) + \tkzDrawPoint[shape=cross,size=12,color=blue](B) + \tkzDrawPoint[size=12,color=green](O) + \tkzDrawPoint[size=12,color=blue,fill=yellow]({2,2}) + \end{tikzpicture} +\end{tkzexample} + +Il est possible de tracer plusieurs points en une seule fois, mais cette macro est un peu plus lente que la précédente. De plus on doit se contenter des mêmes options pour tous les points. + +\newpage +\subsection{Tracer des points \tkzcname{tkzDrawPoints}} +\hypertarget{tdrps}{} +\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}} +\begin{tabular}{lll} +arguments & défaut & définition \\ +\midrule +\TAline{liste de points}{no default}{exemple \tkzcname{tkzDrawPoints(A,B,C)}} +\bottomrule +\end{tabular} + +\medskip +\emph{Attention au « s » final, un oubli entraîne des erreurs en cascade si vous tentez de tracer des points multiples. Les options sont les mêmes que pour la macro précédente. } +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzDefPoint} et \tkzcname{tkzDrawPoints} } + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){O} + \tkzDrawPoints[size=8,color=red](A,B,O) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple plus complexe } + +\begin{tkzexample}[latex=7cm] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B} + \tkzDefPoint[label=below:$\mathcal{C}$, + shift={(2,3)}](-30:5.5){E} + \begin{scope}[shift=(A)] + \tkzDefPoint(30:5){C} + \end{scope} + \tkzCalcLength[cm](A,B)\tkzGetLength{rAB} + \tkzDrawCircle[R](A,\rAB cm) + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above](A) +\end{tikzpicture} +\end{tkzexample} + +\newpage +%<---------------------------------------------------------------------------> +\subsection{Ajouter un label à un point \tkzcname{tkzLabelPoint}} +\hypertarget{tlp}{} +\emph{Il est possible d'ajouter plusieurs labels à un même point en utilisant plusieurs fois cette macro.} + +\begin{NewMacroBox}{tkzLabelPoint}{\oarg{local options}\parg{point}\var{label}} +\begin{tabular}{lll} +arguments & exemple & \\ +\midrule +\TAline{point}{\tkzcname{tkzLabelPoint(A)\{\$A\_1\$\}}}{} +options & défaut & définition\\ +\midrule +\TOline{TikZ options}{}{couleur,position etc.} +\bottomrule +\end{tabular} + +\medskip +{En option, on peut utiliser tous les styles de \TIKZ\ , en particulier le placement avec \tkzname{above}, \tkzname{right}, \dots} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzLabelPoint}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefPoint(0,3){C} + \tkzDrawSegments(A,B B,C C,A) + \tkzDrawPoints(A,B,C) + \tkzLabelPoint[left,red](A){$A$} + \tkzLabelPoint[right,blue](B){$B$} + \tkzLabelPoint[above,purple](C){$C$} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{label et référence} + La référence d'un point est l'objet qui permet d'utiliser le point, le label est le nom du point qui sera affiché. + +\begin{tkzexample}[latex=8cm,small] + \begin{tikzpicture} + \tkzInit[xmax=1,xstep=0.15,ymax=.5] + \tkzAxeX \tkzDrawY[noticks] + \tkzDefPoint(0.22,0.25){A} + \tkzDrawPoint(A) + \tkzLabelPoint[above](A){$A_1$} + \end{tikzpicture} + \end{tkzexample} +%<---------------------------------------------------------------------------> +\subsection{Ajouter des labels aux points \tkzcname{tkzLabelPoints}} +Il est possible de placer plusieurs labels rapidement quand les références des points sont identiques aux labels et quand les labels sont placés de la même manière par rapport aux points. Par défaut, c'est \tkzname{below right} qui a été choisi. +\hypertarget{tlps}{} + +\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}} +\begin{tabular}{lll} +arguments & exemple & résultat \\ +\midrule +\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Affichage de A, B et C} +\bottomrule +\end{tabular} + +\medskip + \emph{Cette macro diminue le nombre de lignes de codes, mais il n'est pas évident que tous les points aient besoin du même positionnement des labels.} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzLabelPoints}} +\begin{tkzexample}[latex = 7cm,small] +\begin{tikzpicture} + \tkzDefPoint(2,3){A} + \tkzDefShiftPoint[A](30:2){B} + \tkzDefShiftPoint[A](30:5){C} + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B,C) +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +% tkzAutoLabelPoints +%<---------------------------------------------------------------------------> +\subsection{Position automatique des labels \tkzcname{tkzAutoLabelPoints}} +Le label d'un point est placé suivant une direction définie par un centre et un point \tkzname{center}. La distance au point est déterminé par un pourcentage de la distance entre le centre et le point. Ce pourcentage est donné par \tkzname{dist}. +\begin{NewMacroBox}{tkzLabelPoints}{\oarg{local options}\parg{$A_1,A_2,...$}} +\begin{tabular}{lll} +arguments & exemple & résultat \\ +\midrule +\TAline{list of points}{\tkzcname{tkzLabelPoint(A,B,C)}}{Affichage de A, B et C} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzcname{tkzAutoLabelPoints}} +Ici les points sont positionnés par rapport au centre de gravité de $A,B,C \text{et} O$ +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(2,1){O} + \tkzDefRandPointOn[circle=center O radius 1.5cm] + \tkzGetPoint{A} + \tkzDrawCircle(O,A) + \tkzDefPointBy[rotation=center O angle 100](A) + \tkzGetPoint{C} + \tkzDefPointBy[rotation=center O angle 78](A) + \tkzGetPoint{B} + \tkzDrawPoints(O,A,B,C) + \tkzDrawSegments(C,B B,A A,O O,C) + \tkzDefCentroid(A,B,C,O) + \tkzDrawPoint(tkzPointResult) + \tkzAutoLabelPoints[center=tkzPointResult, + dist=.3,red](O,A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple avec \tkzcname{tkzAutoLabelPoints}} +Cette fois la référence est $O$ et la distance est par défaut de $0.15$ +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(2,1){O} + \tkzDefRandPointOn[circle=center O radius 1.5cm] + \tkzGetPoint{A} + \tkzDrawCircle(O,A) + \tkzDefPointBy[rotation=center O angle 100](A) + \tkzGetPoint{C} + \tkzDefPointBy[rotation=center O angle 78](A) + \tkzGetPoint{B} + \tkzDrawPoints(O,A,B,C) + \tkzDrawSegments(C,B B,A A,O O,C) + \tkzAutoLabelPoints[center=O,red](A,B,C) +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> + +\subsection{Style des points avec \tkzcname{tkzSetUpPoint}} + Il est important de comprendre que la taille d'un point dépend de la taille d'une ligne. +\begin{NewMacroBox}{tkzSetUpPoint}{\oarg{local options}} +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{shape}{circle}{possible : circle, cross, cross out} +\TOline{size}{current }{ la taille du point est size * line width } +\TOline{color}{current}{exemple \tkzcname{tkzLabelPoint(A,B,C)}} +\TOline{fill}{current!50}{exemple \tkzcname{tkzLabelPoint(A,B,C)}} \bottomrule +\end{tabular} + +\end{NewMacroBox} + +Il s'agit d'une macro permettant de choisir un \hypertarget{setupoint}{style} pour les points. La macro \tkzcname{tkzDrawSegments} est décrite \hyperlink{segs}{ici}. + +\subsubsection{Exemple simple avec \tkzcname{tkzSetUpPoint}} +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture} + \tkzSetUpPoint[shape = cross out, + color=blue] + \tkzInit[xmax=100,xstep=20,ymax=.5] + \tkzDefPoint(20,1){A} + \tkzDefPoint(80,0){B} + \tkzDrawLine(A,B) + \tkzDrawPoints(A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple avec \tkzcname{tkzSetUpPoint}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] + \tkzDefPoint(0,0){A} + \tkzDefPoint(02.25,04.25){B} + \tkzDefPoint(4,0){C} + \tkzDefPoint(3,2){D} + \tkzDrawSegments(A,B A,C A,D) + \tkzSetUpPoint[shape=cross out,size=4,] + \tkzDrawPoints(A,B,C,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Utilisation de\tkzcname{tkzSetUpPoint} dans un groupe} +Seuls les points du groupe sont affectés par les modifications. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] + \tkzDefPoint(0,0){A} + \tkzDefPoint(02.25,04.25){B} + \tkzDefPoint(4,0){C} + \tkzDefPoint(3,2){D} + \tkzDrawSegments(A,B A,C A,D) +{\tkzSetUpPoint[shape=cross out, + fill= blue!70!black!!50, + size=4,color=blue!70!black!30] + \tkzDrawPoints(A,B)} + \tkzSetUpPoint[fill= blue!70!black!!50,size=4, + color=blue!70!black!30] + \tkzDrawPoints(C,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +\subsection{Montrer les coordonnées des points \tkzcname{tkzPointShowCoord}} +Cette macro permet d'afficher les coordonnées d'un point et de tracer des flèches pour préciser l'abscisse et l'ordonnée. Le point est donné par sa référence (son nom). Il est possible de donner un couple de coordonnées. + + \begin{NewMacroBox}{tkzPointShowCoord}{\oarg{local options}\parg{point}} + \hypertarget{tpsc}{} +\begin{tabular}{lll} +\toprule +argument & exemple & explication \\ +\midrule +\TAline{\parg{ref}}{\tkzcname{tkzPointShowCoord}(A)}{ Montre les coordonnées du point A} +\bottomrule + \end{tabular} + + \medskip +\begin{tabular}{lll} +%\toprule +option & défaut & explication \\ +\midrule +\TOline{xlabel}{empty}{label pour l'abscisse} +\TOline{xstyle}{empty}{style pour le node du label de l'abscisse} +\TOline{noxdraw}{false}{booléen pour ne pas tracer de flèche vers $(x'x)$} +\end{tabular} + \end{NewMacroBox} + +\subsubsection{styles par défaut} + +\begin{tkzltxexample}[small] +\tikzset{arrow coord style/.style={dashed, + \tkz@euc@linecolor, + >=latex', + ->}} +\tikzset{xcoord style/.style={\tkz@euc@labelcolor, + font=\normalsize,text height=1ex, + inner sep = 0pt, + outer sep = 0pt, + fill=\tkz@fillcolor, + below=3pt}} +\tikzset{ycoord style/.style={\tkz@euc@labelcolor, + font=\normalsize,text height=1ex, + inner sep = 0pt, + outer sep = 0pt, + fill=\tkz@fillcolor, + left=3pt}} +\end{tkzltxexample} + +\subsubsection{Exemple avec \tkzcname{tkzPointShowCoord}} +Sans les options, on n'obtient que les flèches. + + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=1.5] + \tkzInit[xmax=3,ymax=2] + \tkzAxeXY + \tkzDefPoint(2,1){a} + \tkzPointShowCoord(a) + \tkzDrawPoint(a) + \tkzLabelPoint(a){$A_1$} + \tkzPointShowCoord({1,2}) + \tkzDrawPoint({1,2}) + \tkzLabelPoint({1,2}){$A_2$} + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple avec \tkzcname{tkzPointShowCoord} et \tkzname{xstep}} +Sans les options, on n'obtient que les flèches. + + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[xscale=3,yscale=2] + \tkzInit[xmax=15,ymax=15, + xstep=10,ystep=10] + \tkzAxeXY + \tkzDefPoint(10,10){a} \tkzDrawPoint(a) + \tkzPointShowCoord(a) + \tkzLabelPoint(a){$A_1$} + \end{tikzpicture} +\end{tkzexample} + + +\subsection{\tkzcname{tkzDefSetOfPoints}} % (fold) +\noindent\space : Il était déjà possible de créer un nuage de points avec la macro \tkzcname{tkzDefPoints}, mais cela impose de donner une référence (un nom) à chaque point, ce qui est parfois fastidieux. La macro \tkzcname{tkzSetOfPoints} permet de définir des points \tkzname{tkzPt1}, \tkzname{tkzPt2},etc. + +C'est ce qu'on appelle fréquemment \hypertarget{label_tkzDefSetOfPoints}{« nuage de points»}. La différence par rapport à la macro \tkzcname{tkzDefPoints}, c'est que la référence aux points est donnée par un préfixe (par défaut tkzPt) et le numéro du point. +Les points ne sont pas tracés. + +\begin{NewMacroBox}{tkzDefSetOfPoints}{\oarg{local options}\var{$x_1/y_1,x_2/y_2,\ldots,x_n/y_n$}} + +\begin{tabular}{lll} + +arguments & défaut & définition \\ +\midrule +\TAline{$x_n/y_n$}{no default}{Liste de couples $x_n/y_n$ séparés par des virgules} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} + +options & défaut & définition \\ +\midrule +\TOline{prefix} {tkzPt} {préfixe pour les noms des points} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Création d'un nuage avec \tkzcname{tkzDefSetOfPoints}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[ymax=4,xmax=5] + \tkzAxeXY + \tkzDefSetOfPoints[prefix=P]% + {1/2,4/3,2/2.5} + \tkzDrawPoints(P1,P2,P3) + \tkzLabelPoints(P1,P2,P3) +\end{tikzpicture} +\end{tkzexample} + +\endinput + +
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex new file mode 100644 index 0000000000..10e5ba6934 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-rep.tex @@ -0,0 +1,58 @@ +\section{Utilisation d'un repère} + +\subsection{Repère avec \tkzcname{tkzRep}} + +\hypertarget{rep}{} + +\begin{NewMacroBox}{tkzRep}{\oarg{local options}} +\begin{tabular}{lll} +options & défaut & définition \\ +\midrule +\TOline{line width}{|0.8pt|}{line width définit la largeur du trait } +\TOline{xlabel}{|$\vec{\imath}$|}{étiquette pour l'axe des abscisses} +\TOline{ylabel}{|$\vec{\jmath}$|}{étiquette pour l'axe des ordonnées} +\TOline{posxlabel }{|below=2pt|} {Position de l'étiquette} +\TOline{posylabel }{|left=2pt|} {Position de l'étiquette } +\TOline{xnorm}{|1|} {norme du vecteur en x} +\TOline{ynorm}{|1|}{norme du vecteur en y} +\TOline{color}{|black|}{couleur des traits} +\TOline{colorlabel}{|black|}{couleur des étiquettes } +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Quelques styles modifiables } + \begin{tkzltxexample}[small] + \tikzset{xlabel style/.style = {below = 3 pt, + inner sep = 1pt, + outer sep = 0pt} + } + \tikzset{ylabel style/.style = {left = 3 pt, + inner sep = 1pt, + outer sep = 0pt}} + \tikzset{xaxe style/.style = {> = latex, ->} + } + \tikzset{yaxe style/.style = {> = latex, ->} + } + \end{tkzltxexample} + +\subsubsection{Exemple d'utilisation } + + +\begin{tkzexample}[small] +\begin{tikzpicture} + \tikzset{xaxe style/.style={-}} + \tikzset{yaxe style/.style={-}} + \tkzInit[xmax=4,ymax=4] + \tkzGrid + \tkzDrawX + \tkzDrawY + \tkzRep[color=red,ynorm=2] +\end{tikzpicture} +\end{tkzexample} + + + +\vspace{12pt} +sPour ceux qui utilisent \tkzname{frenchb} avec \tkzname{babel}, en cas de problème avec la version 3 de pgf, il suffit de charger la librairie \tkzname{babel}. \TIKZ\ a été en effet parfois allergique aux caractères actifs. + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex new file mode 100644 index 0000000000..080a568db7 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-style.tex @@ -0,0 +1,77 @@ +\section{Utilisation des styles} + +\subsection{Modification de \tkzname{tkz-base.cfg}} +\tkzname{tkz-base.sty} possède un fichier de configuration par défaut. Son existence n'est pas obligatoire, mais s'il existe, vous pouvez le modifier pour obtenir des styles par défaut différents. Je ne donne qu'une description rapide de ce fichier, car il risque d'évoluer prochainement. + +Dans \tkzname{tkz-base.cfg}, on peut régler les axes, le repère ( si on l'utilise), la grille, etc. ainsi que les styles qui sont liés à ces objets. + Il est possible de modifier les styles des points et des segments. + +Il est aussi possible de définir les dimensions d'un dessin par défaut en modifiant \tkzname{xmin}, \tkzname{xmax}, \tkzname{ymin} et \tkzname{ymax}. + + +\begin{tkzltxexample}[small] +\def\tkz@xa{0} +\def\tkz@xb{10} +\def\tkz@ya{0} +\def\tkz@yb{10} +\end{tkzltxexample} + +Ces lignes permettent de définir les valeurs de \tkzname{xmin}, \tkzname{xmax}, etc. + +Vous pouvez les modifier, par exemple~: + +\begin{tkzltxexample}[small] +\def\tkz@xa{-5} +\def\tkz@xb{-5} +\def\tkz@ya{5} +\def\tkz@yb{5} +\end{tkzltxexample} + +Voici une liste des styles utilisés que vous trouverez dans \tkzname{tkz-base.cfg} + +\begin{itemize} +\item xlabel style +\item xaxe style +\item ylabel style +\item yaxe style +\item rep style +\item line style +\item point style +\item mark style +\item compass style +\item vector style +\item arrow coord style +\item xcoord style +\item ycoord style +\end{itemize} + +\subsection{Utilisation \tkzcname{tikzset}} +Il est préférable d'utiliser désormais \tkzcname{tikzset} plutôt que \tkzcname{tikzstyle}\ et il est possible de s'inspirer de \tkzname{tkz-base.cfg}. + +Si vous voulez modifier l'aspect des axes du repère, par exemple placer des flèches à chaque extrémité ou bien les supprimer. Ceci peut se faire dans \tkzname{tkz-base.cfg} ou bien dans votre code. + +\begin{tkzltxexample}[small] +\tikzset{xaxe style/.style ={>=latex,<->}} +\end{tkzltxexample} + +La transformation sera valable pour tout le document. Il faut noter que \tkzname{xmin} a été modifié, en effet la flèche et le trait correspondant à la graduation se confondent. + +\begin{tkzexample}[latex=7cm,small] +\tikzset{xaxe style/.style = {<->}} +\tikzset{xlabel style/.style={below=6pt}} +\begin{tikzpicture} + \tkzInit[xmin=-0.5,xmax=5] + \tkzDrawX + \tkzLabelX +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Macros de configuration} + + \begin{itemize} + \item {\color{blue}{\textbackslash}\hyperlink{setupoint}{tkzSetUpPoint}} + \item {\color{blue}{\textbackslash}\hyperlink{axis}{tkzSetUpAxis}} +\end{itemize} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex new file mode 100644 index 0000000000..8b7fb13c48 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-texte.tex @@ -0,0 +1,154 @@ +\section{Textes et Légendes} + +\subsection{Placer un titre} +On peut bien sûr utiliser \TIKZ, mais la macro que je propose permet de placer le texte en utilisant les unités choisies pour le dessin. + +\emph{les options sont toujours celles de \TIKZ, en particulier les suivantes~:} +\begin{NewMacroBox}{tkzText}{\oarg{local options}\parg{point}\var{text}} +Le point peut soit être donné par ses coordonnées, soit par son nom. +\hypertarget{text}{} + +\begin{tabular}{lll} +\toprule +options & défaut & définition\\ +\midrule +\TOline{color }{|black|}{couleur courante} +\TOline{text }{|black|}{couleur du texte} +\TOline{fill }{|white|}{couleur du fond} +\TOline{opacity }{|1| }{opacité} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Un titre} + +\begin{tkzexample}[latex=8cm] +\begin{tikzpicture} + \tkzInit[xmax = 6, ymin = 1000,% + ymax = 4000,ystep = 1000] + \tkzAxeXY + \tkzText[draw, + line width = 1pt,% + color = red,% + fill = orange!20](3,4000)% + {Recette en fonction du mois} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Draft} + +\begin{tkzexample}[latex=8cm] +\begin{tikzpicture} + \tkzInit[xmax = 6, ymin = 1000,% + ymax = 4000,ystep = 1000] + \tkzGrid \tkzAxeXY + \tkzText[draw,opacity=.2, + rotate=45,inner sep=.6 cm, + line width = 1pt, + color = black, + fill = purple!20](3,2500) + {\Huge DRAFT} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Texte avec un point} +Il est possible de donner la référence d'un point à la place de ses coordonnées. + +\begin{tkzexample}[latex=8cm] +\begin{tikzpicture} + \tkzInit[ymax=5,xmax=6] + \tkzAxeXY + \tkzDefPoint(3,3){A} + \tkzText[draw,opacity=.6, + inner sep=.6 cm, + line width = 1pt, + color = black, + fill = purple!20](A) + {Mon texte} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Format du texte} + L'option \tkzname{text width} est intéressante, voir le pgfmanual pour plus d'informations. +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[ymax=5,xmax=6] + \tkzAxeXY + \tkzText[draw,opacity=.6, + inner sep=.6 cm, + line width = 1pt, + color = black, + fill = purple!20, + text width=3cm](3,3) + {Mon texte\\ Référence} +\end{tikzpicture} +\end{tkzexample} + +\subsection{Placer des légendes} +Il y a deux façons d'utiliser cette macro. Soit on place des légendes pour des courbes. Alors, il faut représenter des lignes avec leur style propre, soit il s'agit de différencier des symboles (mark). + +\begin{NewMacroBox}{tkzLegend}{\oarg{local options}\var{mark/couleur/size/text}}\hypertarget{legend}{} +Les arguments diffèrent en fonction du booléen \tkzname{line}. + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition\\ +\midrule +\TOline{line}{false}{booléen :ligne ou symbole} +\end{tabular} + +Avec |line=true| + +\begin{tabular}{lll} +\toprule +arguments & défaut & exemple\\ +\midrule +\TAline{style/line width/couleur/texte}{pas de défaut}{dashed/1pt/red/Recette} +\end{tabular} + +\medskip +Avec |line=false| + +\begin{tabular}{lll} +\toprule +arguments & défaut & exemple\\ +\midrule +\TAline{mark/mark size/couleur/texte}{pas de défaut}{heart/1ex/red!30/Recette produit A} +\end{tabular} + +\medskip +{On peut modifier la longueur de la ligne dans \tkzname{tkz-base.cfg}} +\begin{tkzltxexample}[] + \def\tkz@legend@line@len{.5cm} +\end{tkzltxexample} +\end{NewMacroBox} + +\subsubsection{Légendes avec des symboles} + +\begin{tkzexample}[vbox] + \begin{tikzpicture} +\tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=2000] +\tkzGrid[color=orange!30] +\tkzDrawX[below right,label=Mois] +\tkzDrawY[above left,label=Recette] +\tkzLabelX +\tkzLabelY +\tkzDefSetOfPoints{1/2000,2/3000,3/2000,4/2500,5/4200,6/4800,7/4600, + 8/5200,9/6200,10/7000,11/7400,12/10000} +\tkzDefSetOfPoints[prefix=P]{1/3200,2/4100,3/3300,4/3300,5/5000,6/5500,7/5200,8/4000, + 9/3000,10/6000,11/8400,12/9000} +\tkzSetUpMark[mark=heart,color=black,fill=red!30,size=4pt] +\tkzJoinSetOfPoints[thick,color=brown,double] +\tkzDrawSetOfPoints +\tkzJoinSetOfPoints[prefix=P,thick,color=orange,double] +\tkzDrawSetOfPoints[prefix=P,mark=square*,mark size=4pt, + mark options={color=blue,fill=blue!40}] +\tkzLegend[draw,rounded corners,fill=orange!20,text=brown, + line width=2pt](5,10000){heart/1ex/red!30/Recette produit A,% + square*/0.75ex/blue!40/Recette produit B} +\end{tikzpicture} +\end{tkzexample} + + + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex new file mode 100644 index 0000000000..6a92b89bf2 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-tools.tex @@ -0,0 +1,393 @@ +\section{Outils divers} + +\subsection{Dupliquer un segment} + +Il s'agit de construire un segment sur une demi-droite donnée de même longueur qu'un segment donné. + +\begin{NewMacroBox}{tkzDuplicateSegment}{\parg{pt1,pt2}\parg{pt3,pt4}\marg{pt5}} +Il s'agit de créer un segment sur une demi-droite donnée de même longueur qu'un segment donné . Il s'agit en fait de la définition d'un point. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(pt1,pt2)(pt3,pt4)\{pt5\}} {\tkzcname{tkzDuplicateLen}(A,B)(E,F)\{C\}}{AC=EF et $C \in [AB)$} \\ +\bottomrule +\end{tabular} + +\medskip +La macro \tkzcname{tkzDuplicateLength} est identique à celle-ci. +\end{NewMacroBox} + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,-3){B} + \tkzDefPoint(2,5){C} + \tkzDrawSegments[red](A,B A,C) + \tkzDuplicateSegment(A,B)(A,C) \tkzGetPoint{D} + \tkzDrawSegment[green](A,D) + \tkzDrawPoints[color=red](A,B,C,D) + \tkzLabelPoints[above right=3pt](A,B,C,D) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Proportion d'or avec \tkzcname{tkzDuplicateSegment}} + + \begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=-90,scale=.75] + \tkzInit[xmax=10,ymax=10] + \tkzClip[space=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(10,0){B} + \tkzDefMidPoint(A,B) \tkzGetPoint{I} + \tkzDefPointWith[orthogonal,K=-.75](B,A) + \tkzGetPoint{C} + \tkzInterLC(B,C)(B,I) \tkzGetSecondPoint{D} + \tkzDuplicateSegment(B,D)(D,A) \tkzGetPoint{E} + \tkzInterLC(A,B)(A,E) \tkzGetPoints{N}{M} + \tkzDrawArc[delta=10](D,E)(B) + \tkzDrawArc[delta=10](A,M)(E) + \tkzDrawLines(A,B B,C A,D) + \tkzDrawArc[delta=10](B,D)(I) + \tkzDrawPoints(A,B,D,C,M,I,N) + \tkzLabelPoints(A,B,D,C,M,I,N) +\end{tikzpicture} + \end{tkzexample} +% <--------------------------------------------------------------------> + % About Angles +% <--------------------------------------------------------------------> + \subsection{Déterminer une pente} +Il s'agit de déterminer si elle existe, la pente d'une droite définie par deux points. Aucune vérification de l'existence n'est faite. + +\begin{NewMacroBox}{tkzFindSlope}{\parg{pt1,pt2}\marg{name of macro}} +Le résultat est stocké dans une macro. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(pt1,pt2){pt3}} {\tkzcname{tkzFindSlope}(A,B)\{slope\}}{\tkzcname{slope} donnera le résultat de $\frac{y_B-y_A}{x_B-x_A}$} \\ +\bottomrule +\end{tabular} + +\medskip +\tkzHandBomb\ Attention à ne pas avoir $x_B=x_A$ +\end{NewMacroBox} + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzInit[xmax=4,ymax=5]\tkzGrid[sub] + \tkzDefPoint(1,2){A} \tkzDefPoint(3,4){B} + \tkzDefPoint(3,2){C} \tkzDefPoint(3,1){D} + \tkzDrawSegments(A,B A,C A,D) + \tkzDrawPoints[color=red](A,B,C,D) + \tkzLabelPoints(A,B,C,D) + \tkzFindSlope(A,B){SAB} \tkzFindSlope(A,C){SAC} + \tkzFindSlope(A,D){SAD} + \pgfkeys{/pgf/number format/.cd,fixed,precision=2} + \tkzText[fill=Gold!50,draw=brown](1,4)% + {La pente de (AB) est : $\pgfmathprintnumber{\SAB}$} + \tkzText[fill=Gold!50,draw=brown](1,3.5)% + {La pente de (AC) est : $\pgfmathprintnumber{\SAC}$} + \tkzText[fill=Gold!50,draw=brown](1,3)% + {La pente de (AD) est : $\pgfmathprintnumber{\SAD}$} +\end{tikzpicture} +\end{tkzexample} + +\subsection{Angle formé par une droite avec l'axe horizontal} +Beaucoup plus intéressante que la précédente. Le résultat est compris entre -180 degrés et +180 degrés. + +\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{pt1,pt2}} +Le résultat est stocké dans une macro \tkzcname{tkzAngleResult}. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(pt1,pt2)} {\tkzcname{tkzFindSlopeAngle}(A,B)}{\tkzcname{tkzGetAngle} peut récupèrer le résultat} +\bottomrule +\end{tabular} + +\medskip +{Si la récupération n'est pas nécessaire, il est possible d'utiliser \tkzcname{tkzAngleResult}} +\end{NewMacroBox} + + +\subsubsection{Exemple d'utilisation de \tkzcname{tkzFindSlopeAngle}} +Voici une autre version de la construction d'une médiatrice + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoint(0,0){A} \tkzDefPoint(3,2){B} + \tkzDefLine[mediator](A,B) \tkzGetPoints{I}{J} + \tkzCalcLength[cm](A,B) \tkzGetLength{dAB} + \tkzFindSlopeAngle(A,B) \tkzGetAngle{tkzangle} + \begin{scope}[rotate=\tkzangle] + \tikzset{arc/.style={color=gray,delta=10}} + \tkzDrawArc[R,arc](B,3/4*\dAB)(120,240) + \tkzDrawArc[R,arc](A,3/4*\dAB)(-45,60) + \tkzDrawLine(I,J) \tkzDrawSegment(A,B) + \end{scope} + \tkzDrawPoints(A,B,I,J) \tkzLabelPoints(A,B) + \tkzLabelPoints[right](I,J) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Récupérer un angle} +Dans l'exemple précédent, j'ai utilisé la macro \tkzcname{tkzGetAngle} qui permet de récupérer un angle. + +\begin{NewMacroBox}{tkzGetAngle}{\marg{name of macro}} +Cette macro récupère \tkzcname{tkzAngleResult} et stocke le résultat dans une nouvelle macro. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{name of macro} {\tkzcname{tkzGetAngle}\{ang\}}{\tkzcname{ang} contient la valeur de l'angle.} +\end{tabular} +\end{NewMacroBox} + +\subsection{Exemple d'utilisation de \tkzcname{tkzGetAngle}} + + Il s'agit ici que $(AB)$ soit la bissectrice de $\widehat{CAD}$, tel que la pente $AD$ soit nulle. On récupère la pente de $(AB)$ puis on effectue deux rotations. + + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoint(1,5){A} \tkzDefPoint(5,2){B} + \tkzDrawSegment(A,B) + \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang} + \tkzDefPointBy[rotation= center A angle \tkzang ](B) + \tkzGetPoint{C} + \tkzDefPointBy[rotation= center A angle -\tkzang ](B) + \tkzGetPoint{D} + \tkzCompass[length=1,dashed,color=red](A,C) + \tkzCompass[delta=10,brown](B,C) + \tkzDrawPoints(A,B,C,D) + \tkzLabelPoints(B,C,D) + \tkzLabelPoints[above left](A) + \tkzDrawSegments[style=dashed,color=orange!30](A,C A,D) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Angle formé par trois points} + + +\begin{NewMacroBox}{tkzFindAngle}{\parg{pt1,pt2,pt3}} +Le résultat est stocké dans une macro \tkzcname{tkzAngleResult}. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(pt1,pt2,pt3)} {\tkzcname{tkzFindAngle}(A,B,C)}{\tkzcname{tkzAngleResult} donne l'angle ($\overrightarrow{BA},\overrightarrow{BC}$)} +\bottomrule +\end{tabular} + +\medskip +Le résultat est compris entre -180 degrés et +180 degrés. pt2 est le sommet et \tkzcname{tkzGetAngle} peut récupérer l'angle. +\end{NewMacroBox} + +\subsection{Exemple d'utilisation de \tkzcname{tkzFindAngle} } + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7] + \tkzClip + \tkzDefPoint (0,0){O} \tkzDefPoint (6,0){A} + \tkzDefPoint (5,5){B} \tkzDefPoint (3,4){M} + \tkzFindAngle (A,O,M) \tkzGetAngle{an} + \tkzDefPointBy[rotation=center O angle \an](A) + \tkzGetPoint{C} + \tkzDrawSector[fill = blue!50,opacity=.5](O,A)(C) + \tkzFindAngle(M,B,A) \tkzGetAngle{am} + \tkzDefPointBy[rotation = center O angle \am](A) + \tkzGetPoint{D} + \tkzDrawSector[fill = red!50,opacity = .5](O,A)(D) + \tkzDrawPoints(O,A,B,M,C,D) + \tkzLabelPoints(O,A,B,M,C,D) + \edef\an{\fpeval{round(\an,2)}}\edef\am{\fpeval{round(\am,2)}} + \tkzDrawSegments(M,B B,A) + \tkzText(4,2){$\widehat{AOC}=\widehat{AOM}=\an^{\circ}$} + \tkzText(1,4){$\widehat{AOD}=\widehat{MBA}=\am^{\circ}$} +\end{tikzpicture} +\end{tkzexample} + +\subsection{Longueur d'un segment \tkzcname{tkzCalcLength}} +Il existe dans \TIKZ\ une option \tkzname{veclen}. Cette option + permet de calculer AB si A et B sont deux points. + +Le seul problème pour moi est que la version de \TIKZ\ n'est pas assez précise dans certains cas particuliers. Ma version utilise le package \tkzNamePack{xfp} et est plus lente, mais plus précise + +\begin{NewMacroBox}{tkzCalcLength}{\oarg{local options}\parg{pt1,pt2}\marg{name of macro}} +Le résultat est stocké dans une macro. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(pt1,pt2)\{name of macro\}} {\tkzcname{tkzCalcLength}(A,B)\{dAB\}}{\tkzcname{dAB} donne $AB$ en pt} +\bottomrule +\end{tabular} + +\medskip + +Une seule option + +\begin{tabular}{lll} + +\toprule + options & défaut & exemple \\ +\midrule +\TOline{cm} {false}{\tkzcname{tkzCalcLength}[cm](A,B)\{dAB\} \tkzcname{dAB} donne AB en cm} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Construction d'un carré au compas} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDrawLine[add= .6 and .2](A,B) + \tkzCalcLength[cm](A,B)\tkzGetLength{dAB} + \tkzDefLine[perpendicular=through A](A,B) + \tkzDrawLine(A,tkzPointResult) \tkzGetPoint{D} + \tkzShowLine[orthogonal=through A,gap=2](A,B) + \tkzMarkRightAngle(B,A,D) + \tkzVecKOrth[-1](B,A)\tkzGetPoint{C} + \tkzCompasss(A,D D,C) + \tkzDrawArc[R](B,\dAB)(80,110) + \tkzDrawPoints(A,B,C,D) + \tkzDrawSegments[color=gray,style=dashed](B,C C,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Transformation de pt en cm ou de cm en pt} +Pas sûr que cela soit nécessaire et il ne s'agit que d'une division par 28,45274 et d'un multiplication par ce même nombre. Les macros sont : + +\begin{NewMacroBox}{tkzpttocm}{\parg{nombre}\marg{name of macro}} +Le résultat est stocké dans une macro. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(nombre){name of macro}} {\tkzcname{tkzpttocm}(120)\{len\}}{\tkzcname{len} donne un nombre de tkzname{cm}} +\bottomrule +\end{tabular} + +\medskip +Il faudra utiliser \tkzcname{len} accompagné de \tkzname{cm} +\end{NewMacroBox} + +\subsection{changement d'unité} +\begin{NewMacroBox}{tkzcmtopt}{\parg{nombre}\marg{name of macro}} +Le résultat est stocké dans une macro. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(nombre)\{name of macro\}}{\tkzcname{tkzcmtopt}(5)\{len\}}{\tkzcname{len} longueur en \tkzname{pts}} +\bottomrule +\end{tabular} + +\medskip +\noindent{Le résultat s'utilise avec \tkzcname{len}\tkzname{pt}} +\end{NewMacroBox} + +\subsubsection{Exemple} +La macro \tkzcname{tkzDefCircle[radius](A,B)} définit le rayon que l'on récupère avec \tkzcname{tkzGetLength}, mais ce résultat est en \tkzname{pt}. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,-4){B} + \tkzDefCircle[through](A,B) + \tkzGetLength{rABpt} + \tkzpttocm(\rABpt){rABcm} + \tkzDrawCircle(A,B) + \tkzDrawPoints(A,B) + \tkzLabelPoints(A,B) + \tkzDrawSegment[dashed](A,B) + \tkzLabelSegment(A,B){% + $\pgfmathprintnumber{\rABcm}$} +\end{tikzpicture} +\end{tkzexample} + +%<--------------------------------------------------------------------------–> +% Coordonnées d'un point +% result in #2x et #2y #1 est le point et on récupère ses coordonnées +% usage soit A un point \tkzGetPointCoord(A){V} alors \Vx = xA et \Vy = yA +% en cm +% tkzGetPointCoord avec [#1] cm ou bien pt ?? todo +%<--------------------------------------------------------------------------–> +\begin{NewMacroBox}{tkzGetPointCoord}{\parg{$A$}\marg{name of macro}} +Stocke dans deux macros les coordonnées d'un point + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetPointCoord}(A)\{A\}}{\tkzcname{Ax} et \tkzcname{Ay} donnent les coordonnées de $A$} + +\end{tabular} + +\medskip +Si le nom de la macro est \tkzname{p}, alors \tkzcname{px} et \tkzcname{py} donnent les coordonnées du point choisi avec le cm comme. +\end{NewMacroBox} + +\subsubsection{Transfert de coordonnées avec \tkzcname{tkzGetPointCoord}} + +\begin{tkzexample}[width=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=3] + \tkzGrid[sub,orange] + \tkzAxeXY + \tkzDefPoint(1,0){A} + \tkzDefPoint(4,2){B} + \tkzGetPointCoord(A){a} + \tkzGetPointCoord(B){b} + \tkzDefPoint(\ax,\ay){C} + \tkzDefPoint(\bx,\by){D} + \tkzDrawPoints[color=red](C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Somme de vecteurs avec \tkzcname{tkzGetPointCoord}} +\begin{tkzexample}[width=6cm,small] +\begin{tikzpicture}[>=latex] + \tkzDefPoint(1,4){a} + \tkzDefPoint(3,2){b} + \tkzDefPoint(1,1){c} + \tkzDrawSegment[->,red](a,b) + \tkzGetPointCoord(c){c} + \draw[color=blue,->](a) -- ([shift=(b)]\cx,\cy) ; + \draw[color=purple,->](b) -- ([shift=(b)]\cx,\cy) ; + \tkzDrawSegment[->,blue](a,c) + \tkzDrawSegment[->,purple](b,c) +\end{tikzpicture} +\end{tkzexample} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/doc/latex/tiger.pdf b/macros/latex/contrib/tkz/tkz-base/doc/latex/tiger.pdf Binary files differnew file mode 100644 index 0000000000..d69cc73ffc --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/doc/latex/tiger.pdf diff --git a/macros/latex/contrib/tkz/tkz-base/examples/how_to_compile.txt b/macros/latex/contrib/tkz/tkz-base/examples/how_to_compile.txt deleted file mode 100644 index 784c4a6fd0..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/how_to_compile.txt +++ /dev/null @@ -1,2 +0,0 @@ -If you want to compile the file tkzbase-6-1-1.tex. -You add \input{tkzbase-6-1-1} inside the environment "document"
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/examples/main.tex b/macros/latex/contrib/tkz/tkz-base/examples/main.tex deleted file mode 100644 index 831c906046..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/main.tex +++ /dev/null @@ -1,11 +0,0 @@ -% !TEX TS-program = pdflatex -% Created by Alain Matthes on 2020-01-23. -% Copyright (c) 2020 __ AlterMundus __. - -\documentclass{standalone} -%\usepackage{xcolor} -\usepackage{tkz-euclide} %you can add tkz-fct etc. - -\begin{document} -\input{tkzeuclide-5-0-0} -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx new file mode 100644 index 0000000000..11b016acaa --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/preamble-standalone.ltx @@ -0,0 +1,6 @@ +\documentclass{standalone} +\usepackage{tkz-euclide,tkz-fct} + + + + diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf b/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf Binary files differnew file mode 100644 index 0000000000..d69cc73ffc --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tiger.pdf diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex new file mode 100644 index 0000000000..8c7886f4bd --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-1.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 1 (Section 5.1.1 : Modification de la taille du dessin avec \tkzcname{tkzInit}) + +\begin{tikzpicture} + \tkzInit[xmax=8,ymax=6] + \tkzGrid + \tkzAxeXY + \draw[blue](-1,0)--(6,7); +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex new file mode 100644 index 0000000000..954aa48816 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-1-2.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 2 (Section 5.1.2 : Rôle de \tkzname{xstep} , \tkzname{ystep}) + +\begin{tikzpicture} + \tkzInit[xmax=10,xstep=2,ymax=800,ystep=400] + \tkzGrid + \tkzAxeXY + +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex new file mode 100644 index 0000000000..212196601f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-0.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 3 (Section 5.2 : Autre exemple avec \tkzname{xstep} et \tkzname{ystep}) + +\begin{tikzpicture} + \tkzInit[xmax=5,xstep=1,ymax=2,ystep=.5] + \tkzGrid + \tkzAxeXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex index be997b8ec2..867807404a 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 4 (Section 5.2.1 : Origine personnalisée.) + \begin{tikzpicture} \tkzInit[xmin=20, xmax=50, @@ -9,3 +14,5 @@ \tkzDefPoint(30,5100){A} \tkzDrawPoint(A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex index 7e58acc5f5..1d288602f4 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 5 (Section 5.2.2 : Utilisation des décimaux ) + \begin{tikzpicture} \tkzInit[xmin=0.00, xmax=0.05, ymin=1.2200,ymax=1.2215, @@ -6,3 +11,5 @@ \tkzDefPoint(.04,1.22025){I} \tkzDrawPoint(I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex index 2270c44d0a..29d77080c2 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-05-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 6 (Section 5.2.3 : Valeurs négatives) + \begin{tikzpicture} \tkzInit[xmin = -40, xmax = 60, @@ -7,3 +12,5 @@ ystep = 20] \tkzAxeXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex new file mode 100644 index 0000000000..8077c1b259 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-1.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 7 (Section 6.1.1 : Sans tick,ni label) + +\begin{tikzpicture} + \tkzInit[xmax=5] + \tkzDrawX[label={},noticks] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex index cadb2d3273..1b0d99beed 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-2.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 8 (Section 6.1.2 : Placement du label) + \begin{tikzpicture} \tkzInit[xmax=5] \tkzDrawX[label = quantité, above left = 8pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex new file mode 100644 index 0000000000..36443b5bcc --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-3.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 9 (Section 6.1.3 : Couleur du label et de l'axe) + +\begin{tikzpicture} + \tkzInit[xmax=5] + \tkzDrawX[text=blue,color=red, + right=12pt] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex index 02f19c31f7..87db2e3eb0 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-4.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 10 (Section 6.1.4 : Option \tkzname{right space}) + \begin{tikzpicture} \tkzInit[xmax=0.4,xstep=0.1] \tkzDrawX[text=blue,color=red, right=12pt,right space=1] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex new file mode 100644 index 0000000000..8d7a45cf48 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-5.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 11 (Section 6.1.5 : Axe trigonométrique avec l'option \tkzname{trig=1}}\hypertarget{newm}{) + +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] + \tkzDrawX[trig=1] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex new file mode 100644 index 0000000000..f9db52caa3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-1-6.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 12 (Section 6.1.6 : Axe trigonométrique avec l'option \tkzname{trig=2} ) + +\begin{tikzpicture} + \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] + \tkzDrawX[trig=2] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex index 6502cc53fd..28f9be281e 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-10-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-10-1.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 36 (Section 6.10.1 : Modification des axes par défaut) + \begin{tikzpicture}[scale=1] \tkzInit[ymax=2,xmax=4] \tkzSetUpAxis[line width=1pt,tickwd=1pt, ticka=3pt, tickb=0pt] \tkzAxeXY - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex index c801c49345..36af00a240 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-1.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 13 (Section 6.2.1 : Position des graduations) + \begin{tikzpicture} \tkzInit[xmax=.5,xstep=0.1] \tkzDrawX[label=$t$,text=blue,color=red] \tkzLabelX[text=blue,below = 3pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex new file mode 100644 index 0000000000..50db8e8130 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-10.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 25 (Section 6.2.10 : Graduations uniquement positives avant les tracés ) + +\begin{tikzpicture} + \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] + \tkzLabelX \tkzLabelY + \tkzDrawXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex new file mode 100644 index 0000000000..76ae96380e --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-11.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 26 (Section 6.2.11 : Pas de graduations à l'origine ) + +\begin{tikzpicture} + \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] + \tkzLabelX[orig] \tkzLabelY[orig] + \tkzDrawXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex index ed8ac64b13..4e5617cd4d 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-2.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 14 (Section 6.2.2 : Position des graduations avec \tkzname{xlabel style}) + \begin{tikzpicture} \tkzInit[xmin=1000,xmax=4000,xstep=1000] \tkzDrawX \tikzset{xlabel style/.append style={rotate=-30}} \tkzLabelX[below right=3 pt,inner sep = 1pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex index 5d69b33581..a6539ed2be 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-3.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 15 (Section 6.2.3 : Dates avec \tkzname{np off}) + \begin{tikzpicture} \tkzInit[xmin=2000,xmax=2004] \tkzDrawX \tikzset{xlabel style/.append style={rotate=-30}} \tkzLabelX[np off,below right=3 pt,inner sep =1pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex index eb6b46d9f7..348c6035d9 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-4.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-4.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 16 (Section 6.2.4 : \tkzname{frac}) + \begin{tikzpicture} \tkzInit[xmax=1.75,xstep=0.33333] \tkzDrawX[label=$t$,text=blue,color=red] \tkzLabelX[frac=3,text=blue,below = 6pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex index 1c24c2cb3a..928aa50064 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-5.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-5.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 17 (Section 6.2.5 : \tkzname{trig}) + \begin{tikzpicture} \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] \tkzDrawX[trig=2] \tkzLabelX[trig=2,text=blue,below = 8pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex index 134dccc7a7..fd03f94ea8 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-6.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-6.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 21 (Section 6.2.6 : Taille des graduations) + \begin{tikzpicture} \tkzInit[xmin=0,xmax=5,ymin=-1,ymax=1] \tkzDrawX[trig=2] \tkzLabelX[trig=2,text=blue, below = 8pt,node font=\scriptsize] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-7.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex index f7d9ebe0a8..5f5ceaf5e7 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-7.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 22 (Section 6.2.7 : Couleur des graduations) + \begin{tikzpicture} \tkzInit[xmin = -2,xmax = 3, ymin = -2,ymax = 2] @@ -6,3 +11,5 @@ below = 6pt] \tkzLabelX[text=blue] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex new file mode 100644 index 0000000000..6f570d9ebb --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-8.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 23 (Section 6.2.8 : Tracés des axes avant la graduation) + +\begin{tikzpicture} +\tkzInit[xmin = -1,xmax = 4, + ymin = -1,ymax = 1] +\tkzDrawXY \tkzLabelX \tkzLabelY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-9.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex index a578543157..75a1504371 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-9.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-2-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 24 (Section 6.2.9 : Graduations (exceptées à l'origine) avant les tracés ) + \begin{tikzpicture} \tkzInit[xmin = -1,xmax = 4, ymin = -1,ymax = 1] @@ -5,3 +10,5 @@ \tkzLabelY[orig=false] \tkzDrawXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex new file mode 100644 index 0000000000..a1bd770560 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-1.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 27 (Section 6.3.1 : exemple avec \tkzcname{tkzAxeX}) + +\begin{tikzpicture} + \tkzInit[xmax=0.5,xstep=0.1,ymax=1] + \tkzGrid + \tkzAxeX[text=blue] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex index cdc65a97e4..c55a9404e0 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 28 (Section 6.3.2 : Usage de \tkzname{pi} et \tkzcname{tkzAxeX}) + \begin{tikzpicture} \tkzInit[xmax=4,ymax=3.5] \let\tkzmathstyle\displaystyle @@ -5,3 +10,5 @@ \tkzDrawX[label = $t$] \tkzAxeY[trig=2] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex index a9aecd51e6..4fe8998bd2 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-3-3.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 29 (Section 6.3.3 : Option \tkzname{frac} et \tkzname{trig}) + \begin{tikzpicture} \tkzInit[xmax=9,xstep=3,ymax=3.5] \tkzLabelX[below=10pt,orig=false,frac=3] \tkzDrawX[label = $t$] \tkzAxeY[trig=2] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex new file mode 100644 index 0000000000..5c095c9410 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-1.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 30 (Section 6.7.1 : Couleur des axes, des graduations) + +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=3] + \tkzAxeXY[label={},text=blue] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex new file mode 100644 index 0000000000..694bca684b --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-2.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 31 (Section 6.7.2 : Option \tkzname{\{label=\{\}\}}) + +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] + \tkzAxeXY[label={},text=blue,trig=2] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex new file mode 100644 index 0000000000..6e42c271f2 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-7-3.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 32 (Section 6.7.3 : Option \tkzname{swap}) + +\begin{tikzpicture} +\tkzInit[xmin=-2,xmax=2,ymin=-2,ymax=2] +\tkzAxeXY[label={},swap] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex new file mode 100644 index 0000000000..f4ac76b2a1 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-1.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 33 (Section 6.8.1 : Couleur commune et labels vides) + +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1] + \tkzDrawXY[label={},color=red] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex new file mode 100644 index 0000000000..2b073b0a11 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-8-2.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 34 (Section 6.8.2 : Deux axes trigonométriques) + +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] + \tkzDrawXY[label={},color=red,trig=4] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-9-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex index a7c0e02916..ccf072a536 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-9-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-06-9-1.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 35 (Section 6.9.1 : ) + \begin{tikzpicture} \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1] \tkzDrawXY[label={},color=red] \tkzLabelXY[text=blue] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex new file mode 100644 index 0000000000..5841706ebd --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-1.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 37 (Section 7.0.1 : \tkzcname{tkzGrid} et l'option \tkzname{sub}) + +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=2] + \tkzGrid[sub] + \tkzAxeXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-10.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex index ae10a76778..78a09aedc5 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-10.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-10.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 46 (Section 7.0.10 : Options \tkzname{frac} et \tkzname{trig} avec \tkzcname{tkzGrid}) + \begin{tikzpicture} \tkzInit[xmax=9,xstep=3,ymax=4] \tkzGrid[xstep=1,ystep=pi/2,sub, @@ -6,3 +11,5 @@ below=6pt,font=\scriptsize] \tkzLabelY[trig=2,font=\scriptsize] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-11.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex index 20ef6c25ea..af0c00b4c6 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-11.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-11.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 47 (Section 7.0.11 : Utilisation d'une grille de répérage) + \begin{tikzpicture}[scale=.5] \tikzset{xaxe style/.style ={-}} \tkzInit[xmax=15,ymax=15] @@ -8,3 +13,5 @@ \node[opacity=.5] at (8,6){% \includegraphics[scale=.5]{tiger}}; \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex index fef08eda5c..ef654d6576 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-2.tex @@ -1,9 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 38 (Section 7.0.2 : Option \tkzname{sub}) + \def\tkzCoeffSubColor{20} \def\tkzCoeffSubLw{0.2} \begin{tikzpicture} \tkzInit[xmax=4, ymax=2] - % on peut modifier le pas pour la seconde grille - \tkzGrid[sub,color=bistre, + \tkzGrid[sub,color=orange, subxstep=.5,subystep=.5] \tkzAxeXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex new file mode 100644 index 0000000000..55a1ac33f7 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-3.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 39 (Section 7.0.3 : Presque par défaut) + +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzGrid[color=orange] + \tkzAxeXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex new file mode 100644 index 0000000000..b21740a6ec --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-4.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 40 (Section 7.0.4 : Sous grille en plus, option \tkzname{sub}) + + \begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzGrid[sub,color=orange] + \tkzGrid[color=orange] + \tkzAxeXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex index 6493d712cb..fe8278d87a 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-5.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 41 (Section 7.0.5 : Changement de maille) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=2] \tkzGrid[color = orange, @@ -6,3 +11,5 @@ subystep = 0.1] \tkzAxeXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex new file mode 100644 index 0000000000..f3934d4e7e --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-6.tex @@ -0,0 +1,16 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 42 (Section 7.0.6 : Option \tkzname{xstep}, \tkzname{xstep}, \tkzname{subxstep} et \tkzname{subystep}) + +\begin{tikzpicture} +\tkzInit[xmax=.5,xstep=.1, + ymax=.2,ystep=.1] +\tkzGrid[sub, + subxstep = 0.05, + subystep = 0.05, + color=orange] +\tkzAxeXY +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-7.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex index 1588569118..bd901dbdea 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-7.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-7.tex @@ -1,8 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 43 (Section 7.0.7 : Avec des intervalles importants) + \begin{tikzpicture} \tkzInit[xmax=100,xstep=20, ymax=3000,ystep=1000] \tkzGrid[sub,subxstep=10, subystep=500, - color=bistre] + color=orange] \tkzAxeXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-8.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex index 33d3007ef5..369e0346de 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-8.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-8.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 44 (Section 7.0.8 : \tkzcname{tkzGrid} et les arguments) + \begin{tikzpicture} \tkzInit[xmax=100,xstep=20, ymax=3000,ystep=1000] @@ -7,3 +12,5 @@ (-20,-1000)(115,4000)% \tkzAxeXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-9.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex index 9426c131df..88e1b387cd 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-9.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-07-0-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 45 (Section 7.0.9 : Usage de \tkzname{pi} avec \tkzcname{tkzGrid}) + \begin{tikzpicture}[scale=.75] \tkzInit[xmax=6.5,ymax=6.5] \tkzGrid[xstep=pi,ystep=pi/2,sub, @@ -7,3 +12,5 @@ \tkzLabelY[trig=2,font=\scriptsize] \tkzDrawXY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex index e55a31ca55..538d1c8a5e 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 48 (Section 8.1.1 : Utilisation de \tkzname{shift}) + \begin{tikzpicture}[trim left=-1cm] \tkzDefPoint(2,3){A} \tkzDefPoint[shift={(2,3)}](31:3){B} @@ -5,3 +10,5 @@ \tkzDrawSegments[color=red,line width=1pt](A,B A,C) \tkzDrawPoints[color=red](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex index 3f50d28330..2623303a1d 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 49 (Section 8.1.2 : Placer un label avec la librairie \tkzname{quotes} ) + \begin{tikzpicture}[trim left=-1cm] \tkzDefPoint["-60:$A_n$" ](2,3){A} \tkzDefPoint[shift={(2,3)},% @@ -8,3 +13,5 @@ line width=1pt](A,B A,C) \tkzDrawPoints[color=red](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex index 2a8c154194..203c63bca8 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-3.tex @@ -1,10 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 50 (Section 8.1.3 : Rotation avec \tkzname{shift} et \tkzname{scope} ) + \begin{tikzpicture}[scale=.75,rotate=90] \tkzDefPoint[label=right:$A_n$](2,3){A} \begin{scope}[shift={(A)}] \tkzDefPoint[label= right:$B_n$](31:3){B} \tkzDefPoint[label= right:$C_n$](158:3){C} - \end{scope} +\end{scope} \tkzDrawSegments[color=red,% line width=1pt](A,B A,C) \tkzDrawPoints[color=red](A,B,C) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex index 49b5312299..4a913277f9 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 51 (Section 8.1.4 : Formules et coordonnées) + \begin{tikzpicture}[scale=.75] \tkzInit[xmax=6,ymax=6] \tkzGrid @@ -12,3 +17,5 @@ \tkzDrawPoints[color=red,shape=cross out](B',A') \tkzLabelPoints(A,O,B,B',A') \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex index 22ac90ccb0..71b40b54a8 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-1-5.tex @@ -1,13 +1,20 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 52 (Section 8.1.5 : Scope et \tkzcname{tkzDefPoint} ) + \begin{tikzpicture}[scale=1] \begin{scope}[rotate=30] \tkzDefPoint(2,3){A} \begin{scope}[shift=(A)] \tkzDefPoint(90:5){B} \tkzDefPoint(30:5){C} - \end{scope} - \end{scope} +\end{scope} +\end{scope} \tkzDrawSegments[color=blue](A,B B,C C,A) \tkzDrawPoints(A,B,C) \tkzLabelPoints[above](B,C) \tkzLabelPoints[below](A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex index 433c45c6de..75ce5e5f9b 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 67 (Section 8.10.1 : Exemple simple avec \tkzcname{tkzSetUpPoint}) + \begin{tikzpicture} \tkzSetUpPoint[shape = cross out, color=blue] @@ -7,3 +12,5 @@ \tkzDrawLine(A,B) \tkzDrawPoints(A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex index 2e8364a34d..af30936f71 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 68 (Section 8.10.2 : Exemple avec \tkzcname{tkzSetUpPoint}) + \begin{tikzpicture} \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] \tkzDefPoint(0,0){A} @@ -9,3 +14,5 @@ \tkzDrawPoints(A,B,C,D) \tkzLabelPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex index 4b69e98f7d..1966b2321d 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-10-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-10-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 69 (Section 8.10.3 : Utilisation de\tkzcname{tkzSetUpPoint} dans un groupe) + \begin{tikzpicture} \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] \tkzDefPoint(0,0){A} @@ -6,11 +11,13 @@ \tkzDefPoint(3,2){D} \tkzDrawSegments(A,B A,C A,D) {\tkzSetUpPoint[shape=cross out, - fill= MidnightBlue!50, - size=4,color=MidnightBlue] + fill= blue!70!black!!50, + size=4,color=blue!70!black!30] \tkzDrawPoints(A,B)} - \tkzSetUpPoint[fill= MidnightBlue!50,size=4, - color=MidnightBlue] + \tkzSetUpPoint[fill= blue!70!black!!50,size=4, + color=blue!70!black!30] \tkzDrawPoints(C,D) \tkzLabelPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex index 9737015487..6d3cbba045 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 70 (Section 8.11.2 : Exemple avec \tkzcname{tkzPointShowCoord}) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmax=3,ymax=2] \tkzAxeXY @@ -8,4 +13,6 @@ \tkzPointShowCoord({1,2}) \tkzDrawPoint({1,2}) \tkzLabelPoint({1,2}){$A_2$} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex index 5e1d6b6079..08eb2e72a5 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-11-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-11-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 71 (Section 8.11.3 : Exemple avec \tkzcname{tkzPointShowCoord} et \tkzname{xstep}) + \begin{tikzpicture}[xscale=3,yscale=2] \tkzInit[xmax=15,ymax=15, xstep=10,ystep=10] @@ -5,4 +10,6 @@ \tkzDefPoint(10,10){a} \tkzDrawPoint(a) \tkzPointShowCoord(a) \tkzLabelPoint(a){$A_1$} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-12-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex index a9a9e5ca5d..0e93a17423 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-12-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-12-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 72 (Section 8.12.1 : Création d'un nuage avec \tkzcname{tkzDefSetOfPoints}) + \begin{tikzpicture} \tkzInit[ymax=4,xmax=5] \tkzAxeXY @@ -6,3 +11,5 @@ \tkzDrawPoints(P1,P2,P3) \tkzLabelPoints(P1,P2,P3) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex index 7efb14f1e3..e8054b2516 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 53 (Section 8.2 : Définition de points en coordonnées cartésiennes : \tkzcname{tkzDefPoints}} \hypertarget{tdps}{) + \begin{tikzpicture}[scale=1] \tkzDefPoints{% x y name 0 /0 /A, @@ -5,7 +10,7 @@ 2 /2 /C, 0 /2 /D} \tkzDrawSegments(D,A A,B B,C C,D) - % or with tkz-euclide - % \tkzDrawPolygon(A,...,D) \tkzDrawPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex index 0b77749050..d257e0aef3 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 54 (Section 8.3.1 : Exemple avec \tkzcname{tkzDefShiftPoint}) + \begin{tikzpicture}[rotate=-30] \tkzDefPoint(2,3){A} \tkzDefShiftPoint[A](0:4){B} @@ -8,3 +13,5 @@ \tkzLabelPoints[above](A,C) \tkzLabelPoints(B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex index 70b2f9fc35..55a1505122 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-1.tex @@ -1,10 +1,16 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 55 (Section 8.4.1 : Triangle équilatéral avec \tkzcname{tkzDefShiftPointCoord}) + \begin{tikzpicture}[scale=1] \tkzDefPoint(2,3){A} \tkzDefShiftPointCoord[2,3](30:4){B} \tkzDefShiftPointCoord[2,3](-30:4){C} \tkzDrawSegments(A,B B,C C,A) - % or \tkzDrawPolygon \tkzDrawPoints(A,B,C) \tkzLabelPoints(B,C) \tkzLabelPoint[left](A){$A$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex index 63f7a3258f..7dfed953ea 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-4-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-4-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 56 (Section 8.4.2 : Triangle isocèle avec \tkzcname{tkzDefShiftPointCoord}) + \begin{tikzpicture}[rotate=15] \tkzDefPoint(2,3){A} \tkzDefShiftPointCoord[2,3](15:5){B} @@ -7,3 +12,5 @@ \tkzLabelPoints(B,C) \tkzLabelPoint[left](A){$A$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex new file mode 100644 index 0000000000..732ae0063c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-1.tex @@ -0,0 +1,11 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 57 (Section 8.5.1 : Style des points par défaut) + + \begin{tikzpicture} + \tkzDefPoint(1,3){A} + \tkzDrawPoint(A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex index bd630be496..ad47b2b3d0 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 58 (Section 8.5.2 : Modification du style) + \begin{tikzpicture} \tikzset{point style/.style={% draw = blue, @@ -11,4 +16,6 @@ \tkzDrawPoint(A) \tkzDrawPoint(B) \tkzDrawPoint(O) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex index 3dab78ef89..8317c88a26 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-5-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 59 (Section 8.5.3 : Exemple de tracés de points) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(1,3){A} \tkzDefPoint(4,1){B} @@ -6,4 +11,6 @@ \tkzDrawPoint[shape=cross,size=12,color=blue](B) \tkzDrawPoint[size=12,color=green](O) \tkzDrawPoint[size=12,color=blue,fill=yellow]({2,2}) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex new file mode 100644 index 0000000000..73acc0f134 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-1.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 60 (Section 8.6.1 : Exemple avec \tkzcname{tkzDefPoint} et \tkzcname{tkzDrawPoints} ) + + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){O} + \tkzDrawPoints[size=8,color=red](A,B,O) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex index 9f1d52f4ce..4d85b00658 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-6-2.tex @@ -1,10 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 61 (Section 8.6.2 : Exemple plus complexe ) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B} \tkzDefPoint[label=below:$\mathcal{C}$, shift={(2,3)}](-30:5.5){E} \begin{scope}[shift=(A)] \tkzDefPoint(30:5){C} - \end{scope} +\end{scope} \tkzCalcLength[cm](A,B)\tkzGetLength{rAB} \tkzDrawCircle[R](A,\rAB cm) \tkzDrawSegment(A,B) @@ -12,3 +17,5 @@ \tkzLabelPoints(B,C) \tkzLabelPoints[above](A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex index e134b8f952..9bc9a1ae50 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 62 (Section 8.7.1 : Exemple avec \tkzcname{tkzLabelPoint}) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} @@ -8,3 +13,5 @@ \tkzLabelPoint[right,blue](B){$B$} \tkzLabelPoint[above,purple](C){$C$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex index bba4cbf443..431c86c364 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-7-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-7-2.tex @@ -1,7 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 63 (Section 8.7.2 : label et référence) + \begin{tikzpicture} \tkzInit[xmax=1,xstep=0.15,ymax=.5] \tkzAxeX \tkzDrawY[noticks] \tkzDefPoint(0.22,0.25){A} \tkzDrawPoint(A) \tkzLabelPoint[above](A){$A_1$} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex index c60b9d2bb0..66a43be645 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-8-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-8-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 64 (Section 8.8.1 : Exemple avec \tkzcname{tkzLabelPoints}) + \begin{tikzpicture} \tkzDefPoint(2,3){A} \tkzDefShiftPoint[A](30:2){B} @@ -5,3 +10,5 @@ \tkzDrawPoints(A,B,C) \tkzLabelPoints(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex index 4cbf3600cb..7e774c8f0c 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-1.tex @@ -1,6 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 65 (Section 8.9.1 : Exemple avec \tkzcname{tkzAutoLabelPoints}) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(2,1){O} - \tkzDefRandPointOn[circle=center O radius 1.5cm]{A} + \tkzDefRandPointOn[circle=center O radius 1.5cm] + \tkzGetPoint{A} \tkzDrawCircle(O,A) \tkzDefPointBy[rotation=center O angle 100](A) \tkzGetPoint{C} @@ -13,3 +19,5 @@ \tkzAutoLabelPoints[center=tkzPointResult, dist=.3,red](O,A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex index 2334354184..37b826266e 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-9-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-08-9-2.tex @@ -1,6 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 66 (Section 8.9.2 : Exemple avec \tkzcname{tkzAutoLabelPoints}) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(2,1){O} - \tkzDefRandPointOn[circle=center O radius 1.5cm]{A} + \tkzDefRandPointOn[circle=center O radius 1.5cm] + \tkzGetPoint{A} \tkzDrawCircle(O,A) \tkzDefPointBy[rotation=center O angle 100](A) \tkzGetPoint{C} @@ -10,3 +16,5 @@ \tkzDrawSegments(C,B B,A A,O O,C) \tkzAutoLabelPoints[center=O,red](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-10-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex index cf627547bc..8c8c53c77b 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-10-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-09-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 73 (Section 9.2 : Utilisation \tkzcname{tikzset}) + \tikzset{xaxe style/.style = {<->}} \tikzset{xlabel style/.style={below=6pt}} \begin{tikzpicture} @@ -5,3 +10,5 @@ \tkzDrawX \tkzLabelX \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex index 447f11373e..a1ca8c9cec 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 74 (Section 10.1.1 : Exemple 2 avec \tkzcname{tkzShowBB}) + \begin{tikzpicture}[scale=.5] \tkzInit[ymax=5,xmax=8] \tkzGrid @@ -6,6 +11,8 @@ \tkzClipBB \tkzDrawCircle[R](A,5 cm) \tkzShowBB - \end{scope} +\end{scope} \tkzDrawCircle[R,red](A,4 cm) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex index aacd2388f1..56aef71172 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 75 (Section 10.2.1 : Exemple avec \tkzcname{tkzClipBB} et les bissectrices) + \begin{tikzpicture} \tkzInit[xmin=-3,xmax=6, ymin=-1,ymax=6] \tkzDefPoint(0,0){O}\tkzDefPoint(3,1){I} @@ -9,4 +14,6 @@ \tkzDrawLines[add = 1 and 2,color=red](O,I O,J) \tkzDrawLines[add = 1 and 2,color=blue](O,i O,j) \tkzShowBB - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex index 101bed7930..93e52676c4 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 76 (Section 10.3.1 : Exemple avec \tkzcname{tkzShowBB}) + above\\ left \begin{tikzpicture} @@ -9,3 +14,5 @@ left \tkzDrawPoints(A,C) \tkzShowBB \end{tikzpicture}right + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-4-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex index 20a3b8acad..41b4729807 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-4-0.tex @@ -1,10 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 77 (Section 10.4 : tkzSaveBB}{) + Une figure au-dessus du texte\\ \begin{tikzpicture} \begin{scope} \tkzSetBB(0,0)(6,2) \tkzShowBB[fill=blue!20] \tkzSaveBB - \end{scope} +\end{scope} \tkzDefPoint(3,3){A}\tkzShowBB \tkzDrawCircle[R,fill=yellow,opacity=.2](A,2cm) \tkzRestoreBB \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex index 5667f1eeb2..6e5090700a 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 78 (Section 10.5.1 : Exemple d'utilisation de \tkzcname{tkzRestoreBB}) + \vspace{ 2cm} Start\\ \begin{tikzpicture} @@ -12,3 +17,5 @@ Start\\ \tkzFillCircle[gray!20](O,B) \end{tikzpicture} End + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex new file mode 100644 index 0000000000..983695583a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-1.tex @@ -0,0 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 80 (Section 10.6.1 : Premier exemple avec \tkzcname{tkzClip}} \hypertarget{clip}{) + +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid + \tkzAxeXY + \tkzClip + \draw[red] (-1,-1)--(5,5); +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex new file mode 100644 index 0000000000..a195d2bace --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-6-2.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 82 (Section 10.6.2 : \tkzcname{tkzClip} et l'option \tkzname{space}) + +\begin{tikzpicture} + \tkzInit[xmax=3, ymax=3] + \tkzGrid \tkzAxeXY + \tkzClip[space=-0.5] + \draw[red] (-0.5,-0.5)--(3.5,3.5); +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-7-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex index b8bbbb37e8..0105da1029 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-7-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 83 (Section 10.7 : style tkzreverseclip) + \begin{tikzpicture}[scale=.5] \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5] \pgfinterruptboundingbox @@ -11,8 +16,10 @@ \begin{scope}[blend group=screen] \foreach \i in {1,...,8}{% \pgfmathparse{100-5*\i} - \tkzFillCircle[R,color=MidnightBlue!% + \tkzFillCircle[R,color=blue!% \pgfmathresult](P\i,\r) } - \end{scope} +\end{scope} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-9-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex index 52b79d04b0..92ecb76b09 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-9-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10-9-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 84 (Section 10.9 : Commandes de TikZ \tkzcname{pgfinterruptboundingbox} et \tkzcname{endpgfinterruptboundingbox}) + \begin{tikzpicture} \tkzDefPoint(0,5){A}\tkzDefPoint(5,4){B} \tkzDefPoint(0,0){C}\tkzDefPoint(5,1){D} @@ -8,3 +13,5 @@ \tkzDrawCircle(I,B) \tkzDrawSegments(A,B C,D A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex index 65822571b6..6c97a27ac7 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 85 (Section 11.1 : Dupliquer un segment) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(2,-3){B} @@ -7,4 +12,6 @@ \tkzDrawSegment[green](A,D) \tkzDrawPoints[color=red](A,B,C,D) \tkzLabelPoints[above right=3pt](A,B,C,D) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex index ae926c1f1a..9e9ef3e234 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 86 (Section 11.1.1 : Proportion d'or avec \tkzcname{tkzDuplicateSegment}) + \begin{tikzpicture}[rotate=-90,scale=.75] \tkzInit[xmax=10,ymax=10] \tkzClip[space=1] @@ -16,3 +21,5 @@ \tkzDrawPoints(A,B,D,C,M,I,N) \tkzLabelPoints(A,B,D,C,M,I,N) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex index bb3223027d..0033453009 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 92 (Section 11.10.1 : Exemple) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){A} \tkzDefPoint(3,-4){B} @@ -11,3 +16,5 @@ \tkzLabelSegment(A,B){% $\pgfmathprintnumber{\rABcm}$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex index 3a975adeb6..70b18e5c65 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 93 (Section 11.10.2 : Transfert de coordonnées avec \tkzcname{tkzGetPointCoord}) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=3] \tkzGrid[sub,orange] @@ -10,3 +15,5 @@ \tkzDefPoint(\bx,\by){D} \tkzDrawPoints[color=red](C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex index 600cc01cfc..6e082f1e94 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-10-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-10-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 94 (Section 11.10.3 : Somme de vecteurs avec \tkzcname{tkzGetPointCoord}) + \begin{tikzpicture}[>=latex] \tkzDefPoint(1,4){a} \tkzDefPoint(3,2){b} @@ -9,3 +14,5 @@ \tkzDrawSegment[->,blue](a,c) \tkzDrawSegment[->,purple](b,c) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex index c367b54f8f..50621b6fa7 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 87 (Section 11.2 : Déterminer une pente) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmax=4,ymax=5]\tkzGrid[sub] \tkzDefPoint(1,2){A} \tkzDefPoint(3,4){B} @@ -15,3 +20,5 @@ \tkzText[fill=Gold!50,draw=brown](1,3)% {La pente de (AD) est : $\pgfmathprintnumber{\SAD}$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex index 43b62c1276..a6ea1b43c4 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 88 (Section 11.3.1 : Exemple d'utilisation de \tkzcname{tkzFindSlopeAngle}) + \begin{tikzpicture} \tkzInit \tkzDefPoint(0,0){A} \tkzDefPoint(3,2){B} @@ -9,7 +14,9 @@ \tkzDrawArc[R,arc](B,3/4*\dAB)(120,240) \tkzDrawArc[R,arc](A,3/4*\dAB)(-45,60) \tkzDrawLine(I,J) \tkzDrawSegment(A,B) - \end{scope} +\end{scope} \tkzDrawPoints(A,B,I,J) \tkzLabelPoints(A,B) \tkzLabelPoints[right](I,J) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-5-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex index ac826cc80a..913e1f8f7b 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-5-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 89 (Section 11.5 : Exemple d'utilisation de \tkzcname{tkzGetAngle}) + \begin{tikzpicture} \tkzInit \tkzDefPoint(1,5){A} \tkzDefPoint(5,2){B} @@ -8,9 +13,11 @@ \tkzDefPointBy[rotation= center A angle -\tkzang ](B) \tkzGetPoint{D} \tkzCompass[length=1,dashed,color=red](A,C) - \tkzCompass[delta=10,Maroon](B,C) + \tkzCompass[delta=10,brown](B,C) \tkzDrawPoints(A,B,C,D) \tkzLabelPoints(B,C,D) \tkzLabelPoints[above left](A) - \tkzDrawSegments[style=dashed,color=bistre](A,C A,D) + \tkzDrawSegments[style=dashed,color=orange!30](A,C A,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-7-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex index 722cf5e2bc..808b679507 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-7-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 90 (Section 11.7 : Exemple d'utilisation de \tkzcname{tkzFindAngle} ) + \begin{tikzpicture} \tkzInit[xmin=-1,ymin=-1,xmax=7,ymax=7] \tkzClip @@ -13,8 +18,10 @@ \tkzDrawSector[fill = red!50,opacity = .5](O,A)(D) \tkzDrawPoints(O,A,B,M,C,D) \tkzLabelPoints(O,A,B,M,C,D) - \edef\an{\fpeval{round(\an,2)}}\edef\am{\fpeval{round(\am,2)}} + \edef\an{\fpeval{round(\an,2)}}\edef\am{\fpeval{round(\am,2)}} \tkzDrawSegments(M,B B,A) \tkzText(4,2){$\widehat{AOC}=\widehat{AOM}=\an^{\circ}$} \tkzText(1,4){$\widehat{AOD}=\widehat{MBA}=\am^{\circ}$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex index 4fce5d5edf..59d9de8751 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-12-8-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-11-8-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 91 (Section 11.8.1 : Construction d'un carré au compas) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} \tkzDrawLine[add= .6 and .2](A,B) @@ -13,3 +18,5 @@ \tkzDrawSegments[color=gray,style=dashed](B,C C,D) \tkzLabelPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-13-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex index 50a329e519..023650f51c 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-13-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 95 (Section 12.2 : \tkzcname{usetkzobj\{defcircles\}}) + \begin{tikzpicture}[scale=0.75] \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} @@ -9,3 +14,5 @@ \tkzDrawPoints(A,B,C,I) \tkzLabelPoints(A,B,C,I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-14-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex index c4953be507..c66dfa6197 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-14-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 96 (Section 13.1.2 : Exemple d'utilisation ) + \begin{tikzpicture} \tikzset{xaxe style/.style={-}} \tikzset{yaxe style/.style={-}} @@ -7,3 +12,5 @@ \tkzDrawY \tkzRep[color=red,ynorm=2] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex index c74e062ca0..49a248f1e9 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 97 (Section 14.1.1 : Ligne horizontale ) + \begin{tikzpicture}[scale=2] \tkzInit[xmax=3,ymax=1.5] \tkzAxeXY @@ -5,3 +10,5 @@ style = dashed, line width = 2pt]{1} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex index 491659cdc7..c84051b4d3 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 98 (Section 14.1.2 : Ligne horizontale et valeur calculée par \tkzname{xfp} ) + \begin{tikzpicture} \tkzInit[xmin=-3,xmax=3,ymin=-2,ymax=1.5] \foreach\v in {-1,1} @@ -6,3 +11,5 @@ \tkzAxeX[trig=2] \tkzLabelY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex new file mode 100644 index 0000000000..4c4655c5b0 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-2-1.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 99 (Section 14.2.1 : Lignes horizontales) + +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=4] + \tkzAxeXY + \tkzHLines[color = magenta]{1,...,3} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex index 1280ab3e36..a7df1b4e1a 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 100 (Section 14.3.1 : Ligne verticale ) + \begin{tikzpicture}[scale=2] \tkzInit[xmax=3,ymax=1] \tkzAxeXY @@ -5,3 +10,5 @@ style = dashed, line width = 2pt]{1/3} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex index f80b01cfc7..daef50e813 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-3-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-3-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 101 (Section 14.3.2 : Ligne verticale et valeur calculée par \tkzname{xfp} ) + \begin{tikzpicture} \tkzInit[xmax=7,ymin=-1,ymax=1] \foreach\v in {1,2} @@ -6,3 +11,5 @@ \tkzAxeX[trig=2] \tkzLabelY \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex new file mode 100644 index 0000000000..a99c3ef605 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14-4-1.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 102 (Section 14.4.1 : Lignes verticales) + +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=2] + \tkzAxeXY + \tkzVLines[color = green]{1,2,...,4} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-16-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex index c58f08c1d9..ef2396cd2f 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-16-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 103 (Section 15.1.1 : exemple) + \begin{tikzpicture} \tkzInit[xmax=6] \tkzDrawX @@ -5,3 +10,5 @@ \tkzHTick[mark=*, mark options={color=purple}]{2*exp(1)} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex index 5414b56805..7ab9ca2616 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 104 (Section 16.1.1 : Tracé d'un nuage avec \tkzcname{tkzDrawSetOfPoints}) + \begin{tikzpicture}[scale=0.75] \tkzInit[xmax=6,ymin=1000,ymax=5000,ystep=1000] \tkzDrawX[label=$m$,below=10pt] @@ -7,3 +12,5 @@ \tkzDefSetOfPoints[show]{1/2000,2/3000,4/2500,5/4200} \tkzDrawSetOfPoints[mark=ball,mark size=3pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex index 79a1a993e2..6bf283b235 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 105 (Section 16.2.1 : Lier les points d'un nuage avec \tkzcname{tkzJoinSetOfPoints}) + \begin{tikzpicture}[scale=1] \tkzInit[xmax=5, ymin=1000,ymax=6000,ystep=1000] @@ -9,8 +14,10 @@ 1/2000,2/3000,4/2500,5/4200} \tkzJoinSetOfPoints[% thick, - color=Maroon] + color=brown] \tkzDrawSetOfPoints[% mark=ball - ,mark size=3pt] + ,mark size=3pt] \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex index 4f02808f0c..c85bc8df02 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 106 (Section 16.2.2 : Utilisation des points d'un nuage) + \begin{tikzpicture}[scale=.5] \tkzInit[xmax=5,ymin=1000, ymax=6000,ystep=1000] @@ -9,6 +14,8 @@ \tkzDefSetOfPoints[prefix=P]{% 1/2000,2/3000,3/2000,4/2500,5/4200} \tkzDrawPolySeg[% - color=Maroon!50, + color=brown!50, line width=2pt](P1,P2,P3,P4,P5) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex index e6a73da41b..e1cb88d884 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 107 (Section 16.3.1 : Deux nuages) + \begin{tikzpicture} \tkzInit[xmax=5.5,ymin=1000,% ymax=6000,ystep=2000] @@ -21,4 +26,6 @@ \tkzText[draw,color = red, fill = orange!20](3,5800)% {Recette en fonction du mois} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex new file mode 100644 index 0000000000..17a612f8a3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-4-0.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 108 (Section 16.4 : \tkzcname{tkzDrawMark}) + + \begin{tikzpicture} + \tkzInit[xmax=3,ymax=1] + \tkzAxeXY + \tkzDrawMark[mark=ball](1,.5) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex index 4cc9233acf..3e402c9286 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 109 (Section 16.5.1 : Mark et nuage; utilisation de \tkzcname{tkzDrawMarks}) + \begin{tikzpicture} \tkzInit[xmax=6,ymin=1000, ymax=5000,ystep=1000] @@ -7,7 +12,9 @@ 2/3000, 4/2500, 5/4200} - \tkzDrawSegments[color=Maroon!50]% + \tkzDrawSegments[color=brown!50]% (P1,P2 P2,P3 P3,P4) \tkzDrawMarks[mark=ball](P1,P2,P3,P4) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex index b5bf9c0a67..ef3219c2df 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 110 (Section 17.1.1 : Un titre) + \begin{tikzpicture} \tkzInit[xmax = 6, ymin = 1000,% ymax = 4000,ystep = 1000] @@ -8,3 +13,5 @@ fill = orange!20](3,4000)% {Recette en fonction du mois} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex index 035e8b7cff..b30125a31b 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 111 (Section 17.1.2 : Draft) + \begin{tikzpicture} \tkzInit[xmax = 6, ymin = 1000,% ymax = 4000,ystep = 1000] @@ -9,3 +14,5 @@ fill = purple!20](3,2500) {\Huge DRAFT} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex index 2e9627af54..284cf4a651 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 112 (Section 17.1.3 : Texte avec un point) + \begin{tikzpicture} \tkzInit[ymax=5,xmax=6] \tkzAxeXY @@ -9,3 +14,5 @@ fill = purple!20](A) {Mon texte} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex index dd7c64ab26..ed7485f538 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 113 (Section 17.1.4 : Format du texte) + \begin{tikzpicture} \tkzInit[ymax=5,xmax=6] \tkzAxeXY @@ -9,3 +14,5 @@ text width=3cm](3,3) {Mon texte\\ Référence} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex index a51b858f6f..b44df9de0f 100644 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-18-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-base/examples/tkzBase-17-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 114 (Section 17.2.1 : Légendes avec des symboles) + \begin{tikzpicture} \tkzInit[xmax=12,ymin=1000,ymax=11000,ystep=2000] \tkzGrid[color=orange!30] @@ -10,12 +15,14 @@ \tkzDefSetOfPoints[prefix=P]{1/3200,2/4100,3/3300,4/3300,5/5000,6/5500,7/5200,8/4000, 9/3000,10/6000,11/8400,12/9000} \tkzSetUpMark[mark=heart,color=black,fill=red!30,size=4pt] -\tkzJoinSetOfPoints[thick,color=Maroon,double] +\tkzJoinSetOfPoints[thick,color=brown,double] \tkzDrawSetOfPoints \tkzJoinSetOfPoints[prefix=P,thick,color=orange,double] \tkzDrawSetOfPoints[prefix=P,mark=square*,mark size=4pt, mark options={color=blue,fill=blue!40}] -\tkzLegend[draw,rounded corners,fill=fondpaille,text=Maroon, +\tkzLegend[draw,rounded corners,fill=orange!20,text=brown, line width=2pt](5,10000){heart/1ex/red!30/Recette produit A,% square*/0.75ex/blue!40/Recette produit B} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-1.tex deleted file mode 100644 index 022d31c9c6..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-1.tex +++ /dev/null @@ -1,7 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=3, ymax=3] - \tkzGrid - \tkzAxeXY - \tkzClip - \draw[red] (-1,-1)--(5,5); -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-2.tex deleted file mode 100644 index 483673326c..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-11-6-2.tex +++ /dev/null @@ -1,6 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=3, ymax=3] - \tkzGrid \tkzAxeXY - \tkzClip[space=-0.5] - \draw[red] (-0.5,-0.5)--(3.5,3.5); -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-2-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-2-1.tex deleted file mode 100644 index 8d6f47fdf2..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-2-1.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5,ymax=4] - \tkzAxeXY - \tkzHLines[color = magenta]{1,...,3} -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-4-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-4-1.tex deleted file mode 100644 index 140faf25c4..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-15-4-1.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5,ymax=2] - \tkzAxeXY - \tkzVLines[color = green]{1,2,...,4} -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-4-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-4-0.tex deleted file mode 100644 index 0e4f49f1cc..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-17-4-0.tex +++ /dev/null @@ -1,5 +0,0 @@ - \begin{tikzpicture} - \tkzInit[xmax=3,ymax=1] - \tkzAxeXY - \tkzDrawMark[mark=ball](1,.5) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-1.tex deleted file mode 100644 index baee4179a9..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-1.tex +++ /dev/null @@ -1,6 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=8,ymax=6] - \tkzGrid - \tkzAxeXY - \draw[blue](-1,0)--(6,7); -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-2.tex deleted file mode 100644 index ea7015f9cc..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-1-2.tex +++ /dev/null @@ -1,6 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=10,xstep=2,ymax=800,ystep=400] - \tkzGrid - \tkzAxeXY - -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-0.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-0.tex deleted file mode 100644 index 25063c640b..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-6-2-0.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5,xstep=1,ymax=2,ystep=.5] - \tkzGrid - \tkzAxeXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-1.tex deleted file mode 100644 index 6775c8ebb7..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-1.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5] - \tkzDrawX[label={},noticks] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-3.tex deleted file mode 100644 index 838efdfffe..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-3.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5] - \tkzDrawX[text=blue,color=red, - right=12pt] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-5.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-5.tex deleted file mode 100644 index a4bb316888..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-5.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] - \tkzDrawX[trig=1] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-6.tex deleted file mode 100644 index 718bfec395..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-1-6.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=0,xmax=4,ymin=-1,ymax=1] - \tkzDrawX[trig=2] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-10.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-10.tex deleted file mode 100644 index 0fb251c111..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-10.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] - \tkzLabelX \tkzLabelY - \tkzDrawXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-11.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-11.tex deleted file mode 100644 index f1a1d5c2d5..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-11.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=2,ymin=2,xmax=4,ymax=4] - \tkzLabelX[orig] \tkzLabelY[orig] - \tkzDrawXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-8.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-8.tex deleted file mode 100644 index ce7e698216..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-2-8.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} -\tkzInit[xmin = -1,xmax = 4, - ymin = -1,ymax = 1] -\tkzDrawXY \tkzLabelX \tkzLabelY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-1.tex deleted file mode 100644 index a36bb1baf7..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-3-1.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=0.5,xstep=0.1,ymax=1] - \tkzGrid - \tkzAxeX[text=blue] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-1.tex deleted file mode 100644 index f82f71d985..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-1.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=3] - \tkzAxeXY[label={},text=blue] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-2.tex deleted file mode 100644 index 12fd934bf2..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-2.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] - \tkzAxeXY[label={},text=blue,trig=2] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-3.tex deleted file mode 100644 index 1958d523b9..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-7-3.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} -\tkzInit[xmin=-2,xmax=2,ymin=-2,ymax=2] -\tkzAxeXY[label={},swap] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-1.tex deleted file mode 100644 index ff87ca281b..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-1.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=1] - \tkzDrawXY[label={},color=red] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-2.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-2.tex deleted file mode 100644 index 56d8cc12cb..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-7-8-2.tex +++ /dev/null @@ -1,4 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=-1,xmax=4,ymin=-1,ymax=2] - \tkzDrawXY[label={},color=red,trig=4] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-1.tex deleted file mode 100644 index cd881a455b..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-1.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=4, ymax=2] - \tkzGrid[sub] - \tkzAxeXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-3.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-3.tex deleted file mode 100644 index 2640a9e2eb..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-3.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=5,ymax=2] - \tkzGrid[color=orange] - \tkzAxeXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-4.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-4.tex deleted file mode 100644 index 1cbbce4c31..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-4.tex +++ /dev/null @@ -1,6 +0,0 @@ - \begin{tikzpicture} - \tkzInit[xmax=5,ymax=2] - \tkzGrid[sub,color=orange] - \tkzGrid[color=orange] - \tkzAxeXY - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-6.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-6.tex deleted file mode 100644 index 96f7cd217a..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-8-0-6.tex +++ /dev/null @@ -1,9 +0,0 @@ -\begin{tikzpicture} -\tkzInit[xmax=.5,xstep=.1, - ymax=.2,ystep=.1] -\tkzGrid[sub, - subxstep = 0.05, - subystep = 0.05, - color=bistre] -\tkzAxeXY -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-1.tex deleted file mode 100644 index 2fcc778e07..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-5-1.tex +++ /dev/null @@ -1,4 +0,0 @@ - \begin{tikzpicture} - \tkzDefPoint(1,3){A} - \tkzDrawPoint(A) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-1.tex b/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-1.tex deleted file mode 100644 index 51f88b11ab..0000000000 --- a/macros/latex/contrib/tkz/tkz-base/examples/tkzbase-9-6-1.tex +++ /dev/null @@ -1,6 +0,0 @@ - \begin{tikzpicture}[scale=.5] - \tkzDefPoint(1,3){A} - \tkzDefPoint(4,1){B} - \tkzDefPoint(0,0){O} - \tkzDrawPoints[size=8,color=red](A,B,O) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg index 743c14da90..b3a5fd9547 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.cfg @@ -1,5 +1,5 @@ % tkz-base.cfg -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % @@ -10,9 +10,9 @@ % and save the file in a directory part of your TEXINPUTS environment % variable. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-base.cfg} +\def\fileversion{3.02c} +\def\filedate{2020/02/04} +\typeout{2020/02/04 3.02c tkz-base.cfg} %<------ colors ---------------------------------------–> \def\tkz@backgroundcolor{white} \def\tkz@textcolor{black} @@ -166,4 +166,7 @@ %<--------------------------- vector --------------------------------------–> \tikzset{vector style/.style={>=latex,->} } +\tikzset{ tkzdotted/.style={% + dash pattern=on 0.4\pgflinewidth off #1\pgflinewidth,line cap=round, shorten >=#1\pgflinewidth/2,shorten <=#1\pgflinewidth/2, + tkzdotted/.default=2}} \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty index 8c39f0dcd7..e52f3076ee 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-base.sty @@ -1,5 +1,5 @@ % tkz-base.sty % this file -% Copyright 2011 by Alain Matthes +% Copyright 2020\"\" by Alain Matthes % % This file may be distributed and/or modified % @@ -11,9 +11,9 @@ %<--------------------------------------------------------------------------–> % Objet : Outils pour la création de graphiques géométriques %<--------------------------------------------------------------------------–> -\typeout{2020/01/23 3.01c tkz-base.sty} +\typeout{2020/01/24 3.02c tkz-base.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-base}[2020/01/23 3.01c tkz-base] +\ProvidesPackage{tkz-base}[2020/01/24 3.02c tkz-base] \ifx\e@alloc\@undefined \RequirePackage{etex} \fi @@ -26,13 +26,18 @@ calc, decorations, decorations.markings, - decorations.pathreplacing, + decorations.pathreplacing, + decorations.shapes, + decorations.text, + decorations.pathmorphing, intersections, patterns, plotmarks, positioning, quotes, + shadows, shapes.misc, + snakes, through } % Pour les les labels sur les axes diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex index 0579d1ad25..0c62abe0cf 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-lib-marks.tex @@ -1,13 +1,13 @@ % tkz-lib-marks.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-lib-symbols.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-lib-symbols.tex} \makeatletter %<--------------------------------------------------------------------------–> % Création des symboles @@ -54,7 +54,16 @@ \pgfpathlineto{\pgfqpoint{1\pgfplotmarksize}{\pgfplotmarksize}} \pgfusepathqstroke } - +\pgfdeclareplotmark{s|||} +{% + \pgfpathmoveto{\pgfqpoint{-0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{0.25\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{1\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{1.75\pgfplotmarksize}{\pgfplotmarksize}} + \pgfusepathqstroke +} % z \pgfdeclareplotmark{z} {% diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex index ce1ce98fdc..ebfd985c1f 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-axes.tex @@ -1,12 +1,12 @@ % tkz-obj-axes.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-axes.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-axes.tex} \newif\ifinteger \makeatletter \def\removedot#1.{#1} diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex index f2bd6a5ffc..46892db8e2 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-grids.tex @@ -1,27 +1,27 @@ % tkz-obj-grids.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-grids.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-grids.tex} \makeatletter %<--------------------------------------------------------------------------–> % Setup Grid %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzsugrid/.cd, - line width/.store in = \tkz@sug@lw, - color/.store in = \tkz@sug@color, - line width = \tkz@grid@lw, - color = \tkz@grid@color +\pgfkeys{/tkzsugrid/.cd, + line width/.store in = \tkz@sug@lw, + color/.store in = \tkz@sug@color, + line width = \tkz@grid@lw, + color = \tkz@grid@color } \def\tkzSetUpGrid{\pgfutil@ifnextchar[{\tkz@SetUpGrid}{\tkz@SetUpGrid[]}} \def\tkz@SetUpGrid[#1]{% \begingroup -\pgfqkeys{/@tkzsugrid}{#1} +\pgfqkeys{/tkzsugrid}{#1} \global\let\tkz@grid@lw\tkz@sug@lw \global\let\tkz@grid@color\tkz@sug@color \endgroup @@ -29,10 +29,10 @@ %<--------------------------------------------------------------------------–> % tkzGrid %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzGrid/.cd, +\pgfkeys{/tkzGrid/.cd, color/.code = {\def\tkz@gd@color{#1}% \edef\tkz@gd@subcolor{% - \tkz@gd@color!\tkzCoeffSubColor}}, + \tkz@gd@color!\tkzCoeffSubColor}}, subxstep/.store in = {\tkz@gd@subxstep}, subystep/.store in = {\tkz@gd@subystep}, ratio/.store in = {\tkz@gd@ratio}, @@ -40,20 +40,20 @@ \edef\tkz@gd@sublw{\tkz@gd@ratio\tkz@gd@lw}}, sub/.is if = tkz@gd@sub, sub/.default = true , - sub = false, - color = \tkz@grid@color, - ratio = 0.75, - subxstep = \tkz@grid@xstep, - subystep = \tkz@grid@ystep, - line width = \tkz@grid@lw, - /@tkzGrid/.search also = {/tikz}, + sub = false, + color = \tkz@grid@color, + ratio = 0.75, + subxstep = \tkz@grid@xstep, + subystep = \tkz@grid@ystep, + line width = \tkz@grid@lw, + /tkzGrid/.search also= {/tikz}, } %<--------------------------------------------------------------------------–> \def\tkzGrid{\pgfutil@ifnextchar[{\tkz@Grid}{\tkz@Grid[]}} \def\tkz@Grid[#1]{\@ifnextchar({\tkz@@Grid[#1]}% {\tkz@@Grid[#1](\tkz@tmp@xa,\tkz@tmp@ya)(\tkz@tmp@xb,\tkz@tmp@yb)}} \def\tkz@@Grid[#1](#2,#3)(#4,#5){% - \pgfqkeys{/@tkzGrid}{#1} + \pgfqkeys{/tkzGrid}{#1} \begingroup \edef\tkz@gxa{\fpeval{(#2-\tkz@init@xorigine)/\tkz@init@xstep}} \edef\tkz@gxb{\fpeval{(#4-\tkz@init@xorigine)/\tkz@init@xstep}} diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex index 3eec108b22..44d97388c0 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-marks.tex @@ -1,13 +1,13 @@ %tkz-obj-marks.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-marks.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-marks.tex} \makeatletter %<-------------------------------------------------------------------------–> % Setup Marks @@ -39,9 +39,9 @@ }% %<-------------------------------------------------------------------------–> \pgfkeys{/tkzjoinmk/.cd, - prefix/.store in = \tkz@pref, - prefix=tkzPt, - /tkzjoinmk/.search also={/tikz} + prefix/.store in = \tkz@pref, + prefix=tkzPt, + /tkzjoinmk/.search also={/tikz} } \def\tkzJoinSetOfPoints{\pgfutil@ifnextchar[{\tkz@JoinSetOfPoints}{% \tkz@JoinSetOfPoints[]}} @@ -94,10 +94,10 @@ color/.store in = \tkz@sum@mk@color, fill/.store in = \tkz@sum@mk@fill, mark/.store in = \tkz@sum@mk@mark, - mark = \tkz@mk@mark, - color = \tkz@mk@color, - fill = \tkz@mk@color!50, - size = \tkz@mk@size + mark = \tkz@mk@mark, + color = \tkz@mk@color, + fill = \tkz@mk@color!50, + size = \tkz@mk@size } \def\tkzSetUpMark{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpMark}{% \tkzActivOff\tkz@SetUpMark[]}} diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex index 39f2c391cc..5676d60a6b 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-points.tex @@ -1,13 +1,13 @@ % tkz-obj-points.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-points.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-points.tex} %<--------------------------------------------------------------------------–> % init def point %<--------------------------------------------------------------------------–> @@ -80,7 +80,7 @@ %<--------------------------------------------------------------------------–> % options pour point definition %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzpt/.cd, +\pgfkeys{/tkzPt/.cd, polar/.is if = tkz@pt@polar, polar/.default = true, polar = false @@ -89,8 +89,8 @@ % tkz@ptStar %<--------------------------------------------------------------------------–> \def\tkz@ptStar[#1](#2,#3)#{% -\pgfkeys{/@tkzpt/.cd, polar = false} -\pgfqkeys{/@tkzpt}{#1} +\pgfkeys{/tkzPt/.cd, polar = false} +\pgfqkeys{/tkzPt}{#1} \iftkz@pt@polar% \edef\tkz@x{\fpeval{#3*cosd(#2)}} \edef\tkz@y{\fpeval{#3*sind(#2)}} @@ -146,21 +146,21 @@ %<--------------------------------------------------------------------------–> % tkzSetUpPoint définit la forme d'un point %<--------------------------------------------------------------------------–> -\pgfkeys{/@setuppt/.cd, - size/.store in = \tkz@pt@size, - color/.store in = \tkz@pt@color, - fill/.store in = \tkz@pt@fill, - shape/.store in = \tkz@pt@shape, - size = \tkz@euc@pointsize, - color = \tkz@euc@pointcolor, - fill = \tkz@euc@pointcolor, - shape = \tkz@euc@pointshape, - /@setuppt/.search also = {/tikz}, - } -\def\tkzSetUpPoint{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpPoint}{% - \tkzActivOff\tkz@SetUpPoint[]}} +\pgfkeys{/tkzsetuppt/.cd, + size/.store in = \tkz@pt@size, + color/.store in = \tkz@pt@color, + fill/.store in = \tkz@pt@fill, + shape/.store in = \tkz@pt@shape, + size = \tkz@euc@pointsize, + color = \tkz@euc@pointcolor, + fill = \tkz@euc@pointcolor, + shape = \tkz@euc@pointshape, + /tkzsetuppt/.search also = {/tikz}, + } +\def\tkzSetUpPoint{\pgfutil@ifnextchar[{\tkz@SetUpPoint}{% + \tkz@SetUpPoint[]}} \def\tkz@SetUpPoint[#1]{% -\pgfqkeys{/@setuppt}{#1} +\pgfqkeys{/tkzsetuppt}{#1} % redefine point style with new values \tikzset{point style/.style={draw = \tkz@pt@color, inner sep = 0pt, @@ -173,17 +173,17 @@ %<--------------------------------------------------------------------------–> % Draw Point %<--------------------------------------------------------------------------–> -\pgfkeys{/@drawpoint/.cd, +\pgfkeys{/tkzdrawpt/.cd, size/.code = {\tikzset{point style/.append style={minimum size = #1}}}, size = \tkz@euc@pointsize, - /@drawpoint/.search also = {/tikz}, + /tkzdrawpt/.search also = {/tikz}, } %<-------------------------------------------------------------------------- \def\tkzDrawPoint{\pgfutil@ifnextchar[{\tkz@DrawPoint}{\tkz@DrawPoint[]}} \def\tkz@DrawPoint[#1](#2){% \begingroup - \pgfqkeys{/@drawpoint}{#1} - \node[point style,/@drawpoint/.cd,#1] at (#2) {};%2016 + \pgfqkeys{/tkzdrawpt}{#1} + \node[point style,/tkzdrawpt/.cd,#1] at (#2) {};%2016 \endgroup } %<--------------------------------------------------------------------------–> @@ -191,8 +191,8 @@ %<--------------------------------------------------------------------------–> \def\tkz@drawpts[#1](#2){% \begingroup - \pgfqkeys{/@drawpoint}{#1} - \foreach \point in {#2}{\node[point style,/@drawpoint/.cd,#1] at (\point) {};} %2016 + \pgfqkeys{/tkzdrawpt}{#1} + \foreach \point in {#2}{\node[point style,/tkzdrawpt/.cd,#1] at (\point) {};} %2016 \endgroup } %<--------------------------------------------------------------------------–> @@ -240,25 +240,25 @@ %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzautolab/.cd, +\pgfkeys{/tkzautolab/.cd, center/.store in = \tkz@center, dist/.store in = \tkz@dist, dist = 0.15, - /@tkzautolab/.search also = {/tikz}, + /tkzautolab/.search also = {/tikz}, } \def\tkzAutoLabelPoints{\pgfutil@ifnextchar[{\tkz@AutoLabelPoints}{% \tkz@AutoLabelPoints[]}}% \def\tkz@AutoLabelPoints[#1](#2){% \begingroup -\pgfqkeys{/@tkzautolab}{#1} +\pgfqkeys{/tkzautolab}{#1} \foreach \point in {#2}{ - \path (\tkz@center) -- ($ (\point) + \tkz@dist*($(\point)-(\tkz@center)$) $) node[/@tkzautolab/.cd,#1]{$\point$};} + \path (\tkz@center) -- ($ (\point) + \tkz@dist*($(\point)-(\tkz@center)$) $) node[/tkzautolab/.cd,#1]{$\point$};} \endgroup }% %<--------------------------------------------------------------------------–> % PointShowCoord %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzprcoord/.cd, +\pgfkeys{/tkzprcoord/.cd, xlabel/.store in = \tkz@xlabel, ylabel/.store in = \tkz@ylabel, xstyle/.code = {\tikzset{xcoord style/.append style={#1}}}, @@ -273,19 +273,19 @@ ystyle = {}, noxdraw = false, noydraw = false, - /@tkzprcoord/.search also = {/tikz}, + /tkzprcoord/.search also = {/tikz}, } \def\tkzPointShowCoord{\pgfutil@ifnextchar[{\tkz@PointShowCoord}{\tkz@PointShowCoord[]}} \def\tkz@PointShowCoord[#1](#2){% \begingroup -\pgfqkeys{/@tkzprcoord}{#1} +\pgfqkeys{/tkzprcoord}{#1} % 2019 for showcoord \iftkznodedefined{tkz@xline}{}{% \path (0,0) --(1,0) node(tkz@xline){}; \path (0,0) --(0,1) node(tkz@yline){}; } -\iftkz@coord@noxdraw\else\draw[arrow coord style,/@tkzprcoord/.cd,#1] (#2)--(#2 |- tkz@xline);\fi -\iftkz@coord@noydraw\else\draw[arrow coord style,/@tkzprcoord/.cd,#1] (#2)--(#2 -| tkz@yline);\fi +\iftkz@coord@noxdraw\else\draw[arrow coord style,/tkzprcoord/.cd,#1] (#2)--(#2 |- tkz@xline);\fi +\iftkz@coord@noydraw\else\draw[arrow coord style,/tkzprcoord/.cd,#1] (#2)--(#2 -| tkz@yline);\fi \ifx\tkzutil@empty\tkz@xlabel \else \path (#2)--(#2 |- tkz@xline) @@ -298,6 +298,7 @@ \fi \endgroup } +\let\tkzShowPointCoord\tkzPointShowCoord %<--------------------------------------------------------------------------–> % Coordonnées d'un point % result in #2x et #2y #1 est le point et on récupère ses coordonnées @@ -322,6 +323,5 @@ \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{center}} } \let\tkzGetPointxy\tkzGetPointCoord -%<--------------------------------------------------------------------------–> \makeatother \endinput diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex index d66e9fc895..2406dc791f 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-obj-rep.tex @@ -1,18 +1,18 @@ % tkz-obj-rep.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-rep.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-rep.tex} \makeatletter %<--------------------------------------------------------------------------–> % repère %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzRep/.cd, +\pgfkeys{/tkzRep/.cd, line width/.store in = \tkz@Rep@lw, xlabel/.store in = \tkz@Rep@xlabel, ylabel/.store in = \tkz@Rep@ylabel, @@ -31,13 +31,13 @@ ynorm = 1, color = \tkz@sur@color,% remove ? colorlabel = \tkz@sur@colorlabel, - /@tkzRep/.search also={/tikz}, + /tkzRep/.search also={/tikz}, } %<--------------------------------------------------------------------------–> \def\tkzRep{\pgfutil@ifnextchar[{\tkz@Rep}{% \tkz@Rep[]}} \def\tkz@Rep[#1]{% -\pgfqkeys{/@tkzRep}{#1} +\pgfqkeys{/tkzRep}{#1} \begingroup \protected@edef\tkz@temp{% \noexpand\draw [ line width=\tkz@Rep@lw, diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex index 81b1bd4ed5..f9e58d75f0 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-BB.tex @@ -1,21 +1,21 @@ % tkz-tools-BB.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-BB.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-BB.tex} \makeatletter %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzClip/.cd, +\pgfkeys{/tkzClip/.cd, space/.store in = {\tkz@CLI@space}, space = {}} \def\tkzClip{\pgfutil@ifnextchar[{\tkz@Clip}{\tkz@Clip[]}} \def\tkz@Clip[#1]{% -\pgfqkeys{/@tkzClip}{#1} +\pgfqkeys{/tkzClip}{#1} \ifx\tkzutil@empty\tkz@CLI@space \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); \else diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex index 296c53fe34..4232b3a635 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-arith.tex @@ -1,11 +1,11 @@ % tkz-tools-arith.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-arith.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-arith.tex} % 1.161 test if "isfactor" is already defined % now with pgf 3.0 gcd isprime isodd iseven are defined %<--------------------------------------------------------------------------–> @@ -13,7 +13,7 @@ %<--------------------------------------------------------------------------–> % [About integers numbers] %<--------------------------------------------------------------------------–> -\ProvidesFile{tkz-tool-arith.tex}[tkz-tool-arith 3.00 c] +\ProvidesFile{tkz-tool-arith.tex}[tkz-tool-arith 3.02 c] % \edef\tkzAtCode{\the\catcode`\@} % \catcode`\@=11\relax \makeatletter diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex index 926ed2347e..fbd631d2ee 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-base.tex @@ -1,12 +1,12 @@ % tkz-tools-base.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. % utf8 encoding -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-base.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-base.tex} \makeatletter %<--------------------------------------------------------------------------–> \global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016 @@ -15,7 +15,7 @@ \global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016 %<--------------------------------------------------------------------------–> \pgfkeys{ - /@tkzInit/.cd, + /tkzInit/.cd, xmin/.store in = \tkz@init@xmin, xmax/.store in = \tkz@init@xmax, xstep/.store in = \tkz@init@xstep, @@ -35,7 +35,7 @@ \def\tkzInit{\pgfutil@ifnextchar[{\tkz@Init}{\tkz@Init[]}} \def\tkz@Init[#1]{% - \pgfqkeys{/@tkzInit}{#1} + \pgfqkeys{/tkzInit}{#1} \ifx\tkzfctloaded\undefined \else \tkz@tkzf@fct=0 % only if tkz-fct loaded diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex index c6579e0902..f42d57397b 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-math.tex @@ -1,11 +1,11 @@ % tkz-tools-math.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-math.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-math.tex} \makeatletter %<--------------------------------------------------------------------------> % \tkzpointnormalised normalise un point A-->A' tq ||v(OA')=1|| @@ -41,14 +41,14 @@ % \veclen mais avec fp % option cm le résultat est en cm sinon en pt %<--------------------------------------------------------------------------> -\pgfkeys{@CalcLength/.cd, +\pgfkeys{tkzcalclen/.cd, cm/.is if = tkzLengthIncm, cm/.default = true} \def\tkzCalcLength{\pgfutil@ifnextchar[{\tkz@CalcLength}{\tkz@CalcLength[]}} \def\tkz@CalcLength[#1](#2,#3){% -\pgfkeys{@CalcLength/.cd, cm = false} -\pgfqkeys{/@CalcLength}{#1}% +\pgfkeys{tkzcalclen/.cd, cm = false} +\pgfqkeys{/tkzcalclen}{#1}% \begingroup \tkz@@CalcLength(#2,#3){tkzLengthResult} \iftkzLengthIncm diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex index e47c7d8a5c..2bd39efc4b 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-misc.tex @@ -1,11 +1,11 @@ % tkz-tools-misc.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-misc.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-misc.tex} \makeatletter %<--------------------------------------------------------------------------–> % hline pb avec line diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex index e0e69f639f..81525e824a 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-modules.tex @@ -1,11 +1,11 @@ % tkz-tools-modules -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-utilities.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-utilities.tex} \makeatletter %<------------- % chargement des modules ----------------------------------> \def\tkz@obj@all{angles,arcs,compass,defcircles,deflines,defpoints,defpointsby,defpointsrnd,defpointswith,polygons,protractor,sectors,show,triangles}% diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex index 72aa8e8f7c..20e53a8b48 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-print.tex @@ -1,11 +1,11 @@ % tkz-tool-print.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-print.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-print.tex} \makeatletter %<------------- tkzPrintFrac ----------------------------------> \def\tkzPrintFrac#1#2{% diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex index c676da2402..b9397961cd 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-text.tex @@ -1,11 +1,11 @@ % tkz-tools-text.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-text.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-text.tex} \makeatletter %<--------------------------------------------------------------------------–> % tkzText diff --git a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex index cba0a88f80..70739d9a4b 100644 --- a/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex +++ b/macros/latex/contrib/tkz/tkz-base/latex/tkz-tools-utilities.tex @@ -1,11 +1,11 @@ % tkz-tools-utilities -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-utilities.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-utilities.tex} \makeatletter % for testing results \def\extractxy#1{% @@ -45,14 +45,14 @@ %<------ Initialisation of the colors with tkzSetUpColors -----------------> % Première macro SetUpColors %%%%%%%%%%%%%%%%%%%%% %Possible -\pgfkeys{/setupcolor/.is family} +\pgfkeys{/tkzsucolor/.is family} \def\setupcolorkeys#1{% - \pgfkeys{/setupcolor,#1}} + \pgfkeys{/tkzsucolor,#1}} \setupcolorkeys{ background/.estore in = \setupcolor@background, text/.estore in = \setupcolor@text, @initial/.style = {background=white,text=black}, - @apply/.code = {\pagecolor{\setupcolor@background}% + @apply/.code = {\pagecolor{\setupcolor@background}% \color{\setupcolor@text}% }, } diff --git a/macros/latex/contrib/tkz/tkz-euclide/README b/macros/latex/contrib/tkz/tkz-euclide/README index b8617b381b..8728f0a6de 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/README +++ b/macros/latex/contrib/tkz/tkz-euclide/README @@ -1,6 +1,6 @@ -% encodage utf8 + % encodage utf8 -------------------- english readme ---------------------------------------- -readme-tkz-euclide.txt V3.01 c 2020/01/24 +readme-tkz-euclide.txt V3.02 c 2020/02/06 tkz-euclide is a package (latex) which allows you to draw  two-dimensional geometric figures, in other words to create figures of Euclidean geometry. It uses a Cartesian coordinate system orthogonal provided by the tkz-base package as well as tools to define the unique coordinates of points and to manipulate them. The idea is to allow you to follow step by step a construction that would be done by hand as naturally as possible. @@ -16,8 +16,8 @@ archives in directory macros/latex/base/lppl.txt. Features -------- - -- needs xfp and numprint; - -- requires and automatically loads PGF/TikZ 3; + -- needs tkz-base !!, xfp and numprint; + -- requires and automatically loads PGF/TikZ > 3; -- compiles with utf8, pdflatex and lualatex; Installation @@ -62,12 +62,13 @@ Other examples are on my site : http://altermundus.fr (en français) Compatibility ------------- -The new package tkz-euclide 3.01c is *not* fully compatible with the version 1.16 but the differences are minor. +The new package tkz-euclide 3.02c is *not* fully compatible with the version 1.16 but the differences are minor. History ------- --- 3.01 this version +-- 3.02 replacement french documentation by english documentation, correction of bugs. +-- 3.01 replacement fp for xfp, addition of some macros, correction of bugs -- 1.16 correction of bugs -- 1.13 first version diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf b/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf Binary files differindex f9310bb886..aabaae0c69 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex new file mode 100644 index 0000000000..0725aa2c3a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-FAQ.tex @@ -0,0 +1,35 @@ +\section{FAQ} + +\subsection{Most common errors} + For the moment, I'm basing myself on my own, because having changed syntax several times, I've made a number of mistakes. This section is going to be expanded. + + \begin{itemize}\setlength{\itemsep}{10pt} + + \item \tkzcname{tkzDrawPoint(A,B)} when it is necessary \tkzcname{tkzDrawPoints} + +\item \tkzcname{tkzGetPoint(A)} When defining an object, use braces and not brackets, so write~: \tkzcname{tkzGetPoint\{A\}} + +\item \tkzcname{tkzGetPoint\{A\}} in place of \tkzcname{tkzGetFirstPoint\{A\}}. When a macro gives two points as results, either we retrieve these points using \tkzcname{tkzGetPoints\{A\}\{B\}}, or we retrieve only one of the two points, using \tkzcname{tkzGetFirstPoint\{A\}} or +\tkzcname{tkzGetSecondPoint\{A\}}. These two points can be used with the reference \tkzname{tkzFirstPointResult} or +\tkzname{tkzSecondPointResult}. It is possible that a third point is given as \tkzname{tkzPointResult}. + +\item \tkzcname{tkzDrawSegment(A,B A,C)} when you need \tkzcname{tkzDrawSegments}. It is possible to use only the versions with an "s" but it is less efficient! + +\item Mixing options and arguments; all macros that use a circle need to know the radius of the circle. If the radius is given by a measure then the option includes a \tkzname{R}. + +\item \tkzcname{tkzDrawSegments[color = gray,style=dashed]\{B,B' C,C'\}} is a mistake. Only macros that define an object use braces. + +\item The angles are given in degrees, more rarely in radians. + +\item If an error occurs in a calculation when passing parameters, then it is better to make these calculations before calling the macro. + +\item Do not mix the syntax of \tkzNamePack{pgfmath} and \tkzNamePack{xfp}. I've often chosen \tkzNamePack{xfp} but if you prefer pgfmath then do your calculations before passing parameters. + +\item Use of \tkzcname{tkzClip} : In order to get accurate results, I avoided using normalized vectors. The advantage of normalization is to control the dimension of the manipulated objects, the disadvantage is that with TeX, this implies inaccuracies. These inaccuracies are often small, in the order of a thousandth, but they lead to disasters if the drawing is enlarged. Not normalizing implies that some points are far away from the working area and \tkzcname{tkzClip} allows you to reduce the size of the drawing. + + +\item An error occurs if you use the macro \tkzcname{tkzDrawAngle} + with too small an angle. The error is produced by the \NameLib{decoration} library when you want to place a mark on an arc. Even if the mark is absent, the error is still present. It is possible to get around this difficulty with the option \tkzname{mkpos=.2} for example, which will place the mark before the arc. Another possibility is to use the macro \tkzcname{tkzFillAngle}. + + \end{itemize} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex new file mode 100644 index 0000000000..f4516e05d3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-angles.tex @@ -0,0 +1,515 @@ +\section{Les angles} + +\subsection{Colorier un angle : fill} + +L'opération la plus simple +\begin{NewMacroBox}{tkzFillAngle}{\oarg{local options}\parg{A,O,B}} +O est le sommet de l'angle. OA et OB sont les côtés. Attention l'angle est déterminé avec l'ordre des points. + +\medskip + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{size}{1 cm}{cette option détermine le rayon du secteur angulaire colorié} + +\bottomrule +\end{tabular} + +\medskip +Il faut ajouter bien sûr tous les styles de \TIKZ\ comme par exemple l'usage de fill \index{fill} ou encore shade \index{shade} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzname{size}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoints{0/0/O,2.5/0/A,1.5/2/B} + \tkzFillAngle[size=2cm, fill=gray!10](A,O,B) + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Changement de l'ordre des points} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoints{0/0/O,2.5/0/A,1.5/2/B} + \tkzFillAngle[size=2cm,fill=gray!10](B,O,A) + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoints{0/0/O,5/0/A,3/4/B} + % Don't forget {} to get, () to use + \tkzFillAngle[size=4cm,left color=white, + right color=red!50](A,O,B) + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) +\end{tikzpicture} +\end{tkzexample} + +\begin{NewMacroBox}{tkzFillAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.} +Avec des options communes, il existe une macro pour de mutiples angles + \end{NewMacroBox} + +\subsubsection{Multiples angles} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=0.75] + \tkzDefPoint(0,0){B} + \tkzDefPoint(8,0){C} + \tkzDefPoint(0,8){A} + \tkzDefPoint(8,8){D} + \tkzDrawPolygon(B,C,D,A) + \tkzDefTriangle[equilateral](B,C) + \tkzGetPoint{M} + \tkzInterLL(D,M)(A,B) \tkzGetPoint{N} + \tkzDefPointBy[rotation=center N angle -60](D) + \tkzGetPoint{L} + \tkzInterLL(N,L)(M,B) \tkzGetPoint{P} + \tkzInterLL(M,C)(D,L) \tkzGetPoint{Q} + \tkzDrawSegments(D,N N,L L,D B,M M,C) + \tkzDrawPoints(L,N,P,Q,M,A,D) + \tkzLabelPoints[left](N,P,Q) + \tkzLabelPoints[above](M,A,D) + \tkzLabelPoints(L,B,C) + \tkzMarkAngles(C,B,M B,M,C M,C,B% + D,L,N L,N,D N,D,L) + \tkzFillAngles[fill=red!20,opacity=.2](C,B,M% + B,M,C M,C,B D,L,N L,N,D N,D,L) +\end{tikzpicture} +\end{tkzexample} + + \newpage +\subsection{Marquer un angle mark} +Opération plus délicate car les options sont nombreuses. Les symboles utilisés pour le marquage outre ceux de TikZ sont définis dans le fichier |tkz-lib-marks.tex| et désignés par les caractères suivants:\begin{tkzltxexample}[] +|, ||,|||, z, s, x, o, oo +\end{tkzltxexample} + +Leurs définitions est la suivante + +\begin{tkzltxexample}[] +\pgfdeclareplotmark{||} + %double bar +{% + \pgfpathmoveto{\pgfqpoint{2\pgflinewidth}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{2\pgflinewidth}{-\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{-2\pgflinewidth}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{-2\pgflinewidth}{-\pgfplotmarksize}} + \pgfusepathqstroke +} +\end{tkzltxexample} + +\begin{tkzltxexample}[] + %triple bar + \pgfdeclareplotmark{|||} + {% + \pgfpathmoveto{\pgfqpoint{0 pt}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{0 pt}{-\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{-3\pgflinewidth}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{-3\pgflinewidth}{-\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{3\pgflinewidth}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{3\pgflinewidth}{-\pgfplotmarksize}} + \pgfusepathqstroke + } +\end{tkzltxexample} + +\begin{tkzltxexample}[] + % An bar slant + \pgfdeclareplotmark{s|} + {% + \pgfpathmoveto{\pgfqpoint{-.70710678\pgfplotmarksize}% + {-.70710678\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{.70710678\pgfplotmarksize}% + {.70710678\pgfplotmarksize}} + \pgfusepathqstroke + } +\end{tkzltxexample} + + +\begin{tkzltxexample}[] + % An double bar slant + \pgfdeclareplotmark{s||} + {% + \pgfpathmoveto{\pgfqpoint{-0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{0.25\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{1\pgfplotmarksize}{\pgfplotmarksize}} + \pgfusepathqstroke + } +\end{tkzltxexample} + + +\begin{tkzltxexample}[] + % z + \pgfdeclareplotmark{z} + {% + \pgfpathmoveto{\pgfqpoint{0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{-0.75\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{0.75\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathlineto{\pgfqpoint{-0.75\pgfplotmarksize}{\pgfplotmarksize}} + \pgfusepathqstroke + } +\end{tkzltxexample} + +\begin{tkzltxexample}[] + % s + \pgfdeclareplotmark{s} + {% + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{-\pgfplotmarksize}{\pgfplotmarksize}} + {\pgfpoint{\pgfplotmarksize}{\pgfplotmarksize}} + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{\pgfplotmarksize}{-\pgfplotmarksize}} + {\pgfpoint{-\pgfplotmarksize}{-\pgfplotmarksize}} + \pgfusepathqstroke + } +\end{tkzltxexample} + +\begin{tkzltxexample}[] + % infinity + \pgfdeclareplotmark{oo} + {% + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{.5\pgfplotmarksize}{1\pgfplotmarksize}} + {\pgfpoint{\pgfplotmarksize}{0pt}} + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{-.5\pgfplotmarksize}{1\pgfplotmarksize}} + {\pgfpoint{-\pgfplotmarksize}{0pt}} + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{.5\pgfplotmarksize}{-1\pgfplotmarksize}} + {\pgfpoint{\pgfplotmarksize}{0pt}} + \pgfpathmoveto{\pgfqpoint{0pt}{0pt}} + \pgfpathcurveto + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{-.5\pgfplotmarksize}{-1\pgfplotmarksize}} + {\pgfpoint{-\pgfplotmarksize}{0pt}} + \pgfusepathqstroke + } +\end{tkzltxexample} + +\newpage + + +% \tkzMarkAngle(B, A, C) +% +% Marque d'angle +% arc de cercle (simple/double/triple) et marque d'églité. +% +% Par défaut: +% arc = simple +% mksize = 1cm (rayon de l'arc) +% style traits pleins +% mkpos ? position: 0.5 (position de la marque) +% mark rien du tout (ignoré si type est utilisé) +% +% Paramètres (optionnels) +% arc : l, ll, lll +% mksize : 1cm +% gap : 3pt +% dist : 1? +% style : type de traits +% mkpos : 0.5 +% mark : none , |, ||,|||, z, s, x, o, oo mais tous les +% % symboles de tikz sont permis + +\begin{NewMacroBox}{tkzMarkAngle}{\oarg{local options}\parg{A,O,B}} +O est le sommet. Attention les arguments varient en fonction des options. Plusieurs marquages sont possibles. Vous pouvez simplement tracer un arc ou bian ajouter une marque sur cet arc. Le style de l'arc est choisi avec l'option \tkzname{arc}, le rayon de l'arc est donné par \tkzname{mksize}, l'arc peut bien sûr être colorié. + +\medskip + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{arc}{l}{choix parmi l, ll et lll simple, double ou triple.} +\TOline{size}{1 cm}{rayon de l'arc.} +\TOline{mark}{none}{choix parmi s.} +\TOline{mksize}{4pt}{taille du symbol (mark).} +\TOline{mkcolor}{black}{couleur du symbole (mark).} +\TOline{mkpos}{0.5}{position du symbole sur l'arc.} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzname{mark = x}} +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/O,5/0/A,3/4/B} + \tkzMarkAngle[size = 4cm,mark = x, + arc=ll,mkcolor = red](A,O,B) + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) + \end{tikzpicture} +\end{tkzexample} +\DeleteShortVerb{\|} +\subsubsection{Exemple avec \tkzname{mark =||}} +\MakeShortVerb{\|} +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/O,5/0/A,3/4/B} + \tkzMarkAngle[size = 4cm,mark = ||, + arc=ll,mkcolor = red](A,O,B) + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) + \end{tikzpicture} +\end{tkzexample} + +\begin{NewMacroBox}{tkzMarkAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.} +Avec des options communes, il existe une macro pour de mutiples angles + \end{NewMacroBox} + + +\subsection{Label dans un angle} + +\begin{NewMacroBox}{tkzLabelAngle}{\oarg{local options}\parg{A,O,B}} +Une seule option \tkzname{dist} qui n'est pas indispensable car l'option \tkzname{pos} de \TIKZ\ fonctionne très bien. + +\begin{tabular}{lll} + \toprule +options & default & definition \\ +\midrule +\TOline{pos}{1}{ ou dist, permet de contrôler la distance du sommet au label.} +\bottomrule +\end{tabular} + +\medskip +Il est possible de déplacer le label avec toutes les options de TikZ : rotate, shift, below, etc. +\end{NewMacroBox} + +\subsubsection{Exemple avec \tkzname{pos}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/O,5/0/A,3/4/B} + \tkzMarkAngle[size = 4cm,mark = ||, + arc=ll,color = red](A,O,B)% + \tkzDrawLines(O,A O,B) + \tkzDrawPoints(O,A,B) + \tkzLabelAngle[pos=2,draw,circle, + fill=blue!10](A,O,B){$\alpha$} +\end{tikzpicture} +\end{tkzexample} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=30] + \tkzDefPoint(2,1){S} + \tkzDefPoint(7,3){T} + \tkzDefPointBy[rotation=center S angle 60](T) + \tkzGetPoint{P} + \tkzDefLine[bisector,normed](T,S,P) + \tkzGetPoint{s} + \tkzDrawPoints(S,T,P) + \tkzDrawPolygon[color=blue](S,T,P) + \tkzDrawLine[dashed,color=blue,add=0 and 3](S,s) + \tkzLabelPoint[above right](P){$P$} + \tkzLabelPoints(S,T) + \tkzMarkAngle[size = 1.8cm,mark = |,arc=ll, + color = blue](T,S,P) + \tkzMarkAngle[size = 2.1cm,mark = |,arc=l, + color = blue](T,S,s) + \tkzMarkAngle[size = 2.3cm,mark = |,arc=l, + color = blue](s,S,P) + \tkzLabelAngle[pos = 1.5](T,S,P){$60^{\circ}$}% + \tkzLabelAngles[pos = 2.7](T,S,s s,S,P){$30^{\circ}$}% +\end{tikzpicture} +\end{tkzexample} + +\begin{NewMacroBox}{tkzLabelAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.} +Avec des options communes, il existe une macro pour de mutiples angles + \end{NewMacroBox} + +\subsection{Marquer un angle droit} + +\begin{NewMacroBox}{tkzMarkRightAngle}{\oarg{local options}\parg{A,O,B}} +L'option \tkzname{german} permet de changer le style du dessin. L'option \tkzname{size} permet de modifier la taille du dessin. +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{german}{normal}{ german arc avec point intérieur.} +\TOline{size}{0.2}{ taille d'un coté.} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Exemple de marquage d'un angle droit} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P} + \tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H} + \tkzDrawLines[add=.5 and .5](P,H) + \tkzMarkRightAngle[fill=blue!20,size=.5,draw](A,H,P) + \tkzDrawPoints[](A,B,P,H) + \tkzDrawLines[add=.5 and .5](A,B) + \tkzMarkRightAngle[fill=red!20,size=.8](B,H,P) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple de marquage d'un angle droit, german style} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P} + \tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H} + \pgfresetboundingbox + \tkzDrawLines[add=.5 and .5](P,H) + \tkzMarkRightAngle[german,size=.5,draw](A,H,P) + \tkzDrawPoints[](A,B,P,H) + \tkzDrawLines[add=.5 and .5,fill=blue!20](A,B) + \tkzMarkRightAngle[german,size=.8](P,H,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Mélange de styles} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(2,5){C} + \tkzDefPointBy[projection=onto B--A](C) + \tkzGetPoint{H} + \tkzDrawLine(A,B) + \tkzDrawLine[add = .5 and .2,color=red](C,H) + \tkzMarkRightAngle[,size=1,color=red](C,H,A) + \tkzMarkRightAngle[german,size=.8,color=blue](B,H,C) + \tkzFillAngle[opacity=.2,fill=blue!20,size=.8](B,H,C) + \tkzLabelPoints(A,B,C,H) + \tkzDrawPoints(A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple complet} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[rotate=-90] +\tkzDefPoint(0,1){A} +\tkzDefPoint(2,4){C} +\tkzDefPointWith[orthogonal normed,K=7](C,A) +\tkzGetPoint{B} +\tkzDrawSegment[green!60!black](A,C) +\tkzDrawSegment[green!60!black](C,B) +\tkzDrawSegment[green!60!black](B,A) +\tkzDrawLine[altitude,dashed,color=magenta](B,C,A) +\tkzGetPoint{P} +\tkzLabelPoint[left](A){$A$} +\tkzLabelPoint[right](B){$B$} +\tkzLabelPoint[above](C){$C$} +\tkzLabelPoint[left](P){$P$} +\tkzLabelSegment[auto](B,A){$c$} +\tkzLabelSegment[auto,swap](B,C){$a$} +\tkzLabelSegment[auto,swap](C,A){$b$} +\tkzMarkAngle[size=1cm,color=cyan,mark=|](C,B,A) +\tkzMarkAngle[size=1cm,color=cyan,mark=|](A,C,P) +\tkzMarkAngle[size=0.75cm,color=orange,mark=||](P,C,B) +\tkzMarkAngle[size=0.75cm,color=orange,mark=||](B,A,C) +\tkzMarkRightAngle[german](A,C,B) +\tkzMarkRightAngle[german](B,P,C) +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzMarkRightAngles}} +\begin{NewMacroBox}{tkzMarkRightAngles}{\oarg{local options}\parg{A,O,B}\parg{A',O',B'}etc.} +Avec des options communes, il existe une macro pour de mutiples angles + \end{NewMacroBox} + +\subsection{\tkzcname{tkzGetAngle}} +\begin{NewMacroBox}{tkzGetAngle}{\parg{macro}} +Attribue la valeur d'un angle à une macro. + \end{NewMacroBox} + +\subsection{\tkzcname{tkzFindAngle}} +\begin{NewMacroBox}{tkzFindAngle}{\parg{A,O,B}} +Détermine la valeur de l'angle en degrés. + \end{NewMacroBox} + +\subsubsection{Vérication de la mesure d'un angle} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(-1,1){A} + \tkzDefPoint(5,2){B} + \tkzDefEquilateral(A,B) + \tkzGetPoint{C} + \tkzDrawPolygon(A,B,C) + \tkzFindAngle(B,A,C) + \tkzGetAngle{angleBAC} + \edef\angleBAC{\fpeval{round(\angleBAC)}} + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B) + \tkzLabelPoint[right](C){$C$} + \tkzLabelAngle(B,A,C){\angleBAC$^\circ$} + \tkzMarkAngle[size=1.5cm](B,A,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Détermination des trois angles d'un triangle} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=1.25,rotate=30] + \tkzDefPoints{0.5/1.5/A, 3.5/4/B, 6/2.5/C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints[below](A,C) + \tkzLabelPoints[above](B) + \tkzMarkAngle[size=1cm](B,C,A) + \tkzFindAngle(B,C,A) + \tkzGetAngle{angleBCA} + \edef\angleBCA{\fpeval{round(\angleBCA,2)}} + \tkzLabelAngle[pos = 1](B,C,A){$\angleBCA^{\circ}$} + \tkzMarkAngle[size=1cm](C,A,B) + \tkzFindAngle(C,A,B) + \tkzGetAngle{angleBAC} + \edef\angleBAC{\fpeval{round(\angleBAC,2)}} + \tkzLabelAngle[pos = 1.8](C,A,B){% + $\angleBAC^{\circ}$} + \tkzMarkAngle[size=1cm](A,B,C) + \tkzFindAngle(A,B,C) + \tkzGetAngle{angleABC} + \edef\angleABC{\fpeval{round(\angleABC,2)}} + \tkzLabelAngle[pos = 1](A,B,C){$\angleABC^{\circ}$} + \end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzFindSlopeAngle}} +\begin{NewMacroBox}{tkzFindSlopeAngle}{\parg{A,B}} +Détermine la pente de la droite (AB). + \end{NewMacroBox} + + \subsubsection{Pliage} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoint(1,5){A} + \tkzDefPoint(5,2){B} \tkzDrawSegment(A,B) + \tkzFindSlopeAngle(A,B)\tkzGetAngle{tkzang} + \tkzDefPointBy[rotation= center A angle \tkzang ](B) + \tkzGetPoint{C} + \tkzDefPointBy[rotation= center A angle -\tkzang ](B) + \tkzGetPoint{D} + \tkzCompass[length=1](A,C) + \tkzCompass[delta=10](B,C) \tkzDrawPoints(A,B,C,D) + \tkzLabelPoints(B,C,D) \tkzLabelPoints[above left](A) + \tkzDrawSegments[style=dashed,color=orange](A,C A,D) +\end{tikzpicture} +\end{tkzexample} + + +\endinput +% \tkzGetAngle +% \tkzNormalizeAngle +% \tkzFindSlopeAngle +% \tkzFindAngle + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex new file mode 100644 index 0000000000..91d130cabd --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-arcs.tex @@ -0,0 +1,138 @@ +\section{Les arcs} + +\begin{NewMacroBox}{tkzDrawArc}{\oarg{local options}\parg{O,\dots}\parg{\dots} } + +Cette macro trace un arc de centre O. Suivant les options, les arguments diffèrent. Il s'agit de déterminer un point de départ et un point d'arrivée. Soit le point de départ est donné, c'est ce qu'il y a de plus simple, soit on donne le rayon de l'arc. Dans ce dernier cas, il est nécessaire d'avoir deux angles. On peut soit donner directement les angles, soit donner des nodes qui associés au centre permettront de les déterminer. + +\medskip + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)} +\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur } +\TOline{R}{towards}{On donne le rayon et deux angles} +\TOline{R with nodes}{towards}{On donne le rayon et deux points} +\TOline{delta}{0}{angle ajouté de chaque côté } +\bottomrule +\end{tabular} + +\medskip +Il faut ajouter bien sûr tous les styles de \TIKZ pour les tracés + +\medskip + +\begin{tabular}{lll} +\toprule +options & arguments & exemple \\ +\midrule +\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzDrawArc[delta=10](O,A)(B)}} +\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzDrawArc[rotate,color=red](O,A)(90)}} +\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzDrawArc[R,color=blue](O,2 cm)(30,90)}} +\TOline{R with nodes}{\parg{pt,$r$}\parg{pt,pt}}{\tkzcname{tkzDrawArc[R with nodes](O,2 cm)(A,B)}} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +Quelques exemples : + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{towards}} +Il est inutile de mettre \tkzname{towards}. Dans ce premier exemple l'arc part de A et va sur B. L'arc qui va de B vers A est différent. On obtient le saillant en allant dans le sens direct du cercle trigonométrique. +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDefPointBy[rotation= center O angle 90](A) + \tkzGetPoint{B} + \tkzDrawArc[color=blue,<->](O,A)(B) + \tkzDrawArc(O,B)(A) + \tkzDrawLines[add = 0 and .5](O,A O,B) + \tkzDrawPoints(O,A,B) + \tkzLabelPoints[below](O,A,B) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{towards}} +Dans celui-ci, l'arc part de A mais s'arrête sur la droite (OB). + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDefPoint(1,1){B} + \tkzDrawArc[color=blue,->](O,A)(B) + \tkzDrawArc[color=gray](O,B)(A) + \tkzDrawArc(O,B)(A) + \tkzDrawLines[add = 0 and .5](O,A O,B) + \tkzDrawPoints(O,A,B) + \tkzLabelPoints[below](O,A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{rotate}} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-2){A} + \tkzDefPoint(60:2){B} + \tkzDrawLines[add = 0 and .5](O,A O,B) + \tkzDrawArc[rotate,color=red](O,A)(180) + \tkzDrawPoints(O,A,B) + \tkzLabelPoints[below](O,A,B) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{R}} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/O} + \tikzset{compass style/.append style={<->}} + \tkzDrawArc[R,color=orange,double](O,3cm)(270,360) + \tkzDrawArc[R,color=blue,double](O,2cm)(0,270) + \tkzDrawPoint(O) + \tkzLabelPoint[below](O){$O$} +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{R with nodes}} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDefPoint(1,1){B} + \tkzCalcLength(B,A)\tkzGetLength{radius} + \tkzDrawArc[R with nodes](B,\radius pt)(A,O) +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzDrawArc} et \tkzname{delta}} +Cette option permet un peu comme \tkzcname{tkzCompass} de placer un arc et de déborder de chaque côté. delta est une mesure en degré. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzDefPointBy[rotation= center A angle 60](B) + \tkzGetPoint{C} + \tkzSetUpLine[color=gray] + \tkzDefPointBy[symmetry= center C](A) + \tkzGetPoint{D} + \tkzDrawSegments(A,B A,D) + \tkzDrawLine(B,D) + \tkzSetUpCompass[color=orange] + \tkzDrawArc[delta=10](A,B)(C) + \tkzDrawArc[delta=10](B,C)(A) + \tkzDrawArc[delta=10](C,D)(D) + \tkzDrawPoints(A,B,C,D) + \tkzLabelPoints(A,B,C,D) + \tkzMarkRightAngle(D,B,A) +\end{tikzpicture} +\end{tkzexample} + + + \endinput + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex new file mode 100644 index 0000000000..4f10a56293 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-base.tex @@ -0,0 +1,61 @@ +\section{Summary of tkz-base} + +\subsection{Utility of \tkzname{tkz-base}} + +First of all, you don't have to deal with \TIKZ\ the size of the bounding box. Early versions of \tkzNamePack{tkz-euclide} did not control the size of the bounding box, now the size of the bounding box is limited. + + However, it is sometimes necessary to control the size of what will be displayed. + To do this, you need to have prepared the bounding box you are going to work in, this is the role of \tkzNamePack{tkz-base} and its main macro \tkzNameMacro{tkzInit}. It is recommended to leave the graphic unit equal to 1 cm. For some drawings, it is interesting to fix the extreme values (xmin,xmax,ymin and ymax) and to "clip" the definition rectangle in order to control the size of the figure as well as possible. + +The two macros in \tkzNamePack{tkz-base} that are useful for \tkzNamePack{tkz-euclide} are: +\begin{itemize} + \item \tkzcname{tkzInit} + \item \tkzcname{tkzClip} +\end{itemize} +\vspace{20pt} + +To this, I added macros directly linked to the bounding box. You can now view it, backup it, restore it (see the documentation of \tkzNamePack{tkz-base} section BB) + +\subsection{\tkzcname{tkzInit} et \tkzcname{tkzShowBB}} +The rectangle around the figure shows you the bounding box. +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=3,ymin=-1, ymax=3] + \tkzGrid + \tkzShowBB[red,line width=2pt] +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzClip}} +The role of this macro is to "clip" the initial rectangle so that only the paths contained in this rectangle are drawn. + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=3] + \tkzAxeXY + \tkzGrid + \tkzClip + \draw[red] (-1,-1)--(5,2); +\end{tikzpicture} +\end{tkzexample} + +It is possible to add a bit of space +\begin{tkzltxexample}[] + \tkzClip[space=1] +\end{tkzltxexample} + +\subsection{\tkzcname{tkzClip} et l'option \tkzname{space}} +This option allows you to add some space around the "clipped" rectangle. +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=3] + \tkzAxeXY + \tkzGrid + \tkzClip[space=1] + \draw[red] (-1,-1)--(5,2); +\end{tikzpicture} +\end{tkzexample} +the dimensions of the "clipped" rectangle are \tkzname{xmin-1}, \tkzname{ymin-1}, \tkzname{xmax+1} et \tkzname{ymax+1}. + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex new file mode 100644 index 0000000000..66bbea6c76 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-circles.tex @@ -0,0 +1,652 @@ +\section{The Circles} + +Among the following macros, one will allow you to draw a circle, which is not a real feat. To do this, you will need to know the center of the circle and either the radius of the circle or a point on the circumference. It seemed to me that the most frequent use was to draw a circle with a given centre passing through a given point. This will be the default method, otherwise you will have to use the \tkzname{R} option. There are a large number of special circles, for example the circle circumscribed by a triangle. + +\begin{itemize} + \item I have created a first macro \tkzcname{tkzDefCircle} which allows, according to a particular circle, to retrieve its center and the measurement of the radius in cm. This recovery is done with the macros \tkzcname{tkzGetPoint} and \tkzcname{tkzGetLength}, + + \item then a macro \tkzcname{tkzDrawCircle} + + \item then a macro that allows you to color in a disc, but without drawing the circle \tkzcname{tkzFillCircle} + + \item sometimes, it is necessary for a drawing to be contained in a disk this is the role assigned to \tkzcname{tkzClipCircle}, + + + \item It finally remains to be able to give a label to designate a circle and if several possibilities are offered, we will see here \tkzcname{tkzLabelCircle}. +\end{itemize} + + +\subsection{Characteristics of a circle : \tkzcname{tkzDefCircle}} + +This macro allows you to retrieve the characteristics (center and radius) of certain circles. + +\begin{NewMacroBox}{tkzDefCircle}{\oarg{local options}\parg{A,B} ou \parg{A,B,C}} +\tkzHandBomb\ Attention the arguments are lists of two or three points. This macro is either used in partnership with \tkzcname{tkzGetPoint} and/or \tkzcname{tkzGetLength} to obtain the center and the radius of the circle, or by using \tkzname{tkzPointResult} and \tkzname{tkzLengthResult} if it is not necessary to keep the results. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{\parg{pt1,pt2} or \parg{pt1,pt2,pt3}}{\parg{A,B}} {$[AB]$ is radius $A$ is the center} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & derror & definition \\ +\midrule +\TOline{through} {through}{circle characterized by two points defining a radius} +\TOline{diameter} {through}{circle characterized by two points defining a diameter} +\TOline{circum} {through}{circle circumscribed of a triangle} +\TOline{in} {through}{incircle a triangle} +\TOline{ex} {through}{excircle of a triangle} +\TOline{euler or nine}{through}{Euler's Circle} +\TOline{spieker} {through}{Spieker Circle} +\TOline{apollonius} {through}{circle of Apollonius} +\TOline{orthogonal} {through}{circle of given centre orthogonal to another circle} +\TOline{orthogonal through}{through}{circle orthogonal circle passing through 2 points} +\TOline{K} {1}{coefficient used for a circle of Apollonius} + \bottomrule +\end{tabular} + +{In the following examples, I draw the circles with a macro not yet presented, but this is not necessary. In some cases you may only need the center or the radius.} +\end{NewMacroBox} + + \subsubsection{Example with a random point and the option \tkzimp{through}} + +\begin{tkzexample}[latex=7 cm,small] + \begin{tikzpicture}[scale=1] + \tkzDefPoint(0,4){A} + \tkzDefPoint(2,2){B} + \tkzDefMidPoint(A,B) \tkzGetPoint{I} + \tkzDefRandPointOn[segment = I--B] + \tkzGetPoint{C} + \tkzDefCircle[through](A,C) + \tkzGetLength{rACpt} + \tkzpttocm(\rACpt){rACcm} + \tkzDrawCircle(A,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B,C) + \tkzLabelCircle[draw,fill=orange, + text width=3cm,text centered, + font=\scriptsize](A,C)(-90)% + {La mesure du rayon est : + \rACpt pt soit \rACcm cm} + \end{tikzpicture} + \end{tkzexample} + + \subsubsection{Example with the option \tkzimp{diameter}} + It is simpler here to search directly for the middle of AB + \begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,2){B} + \tkzDefCircle[diameter](A,B) + \tkzGetPoint{O} + \tkzDrawCircle[blue,fill=blue!20](O,B) + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,O) + \tkzLabelPoints(A,B,O) + \end{tikzpicture} + \end{tkzexample} + + \subsubsection{Circles inscribed and circumscribed for a given triangle} + You can also obtain the center of the inscribed circle and its projection on one side of the triangle with \tkzcname{tkzGetFirstPoint{I}} et \tkzcname{tkzGetSecondPoint{Ib}}. + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(2,2){A} + \tkzDefPoint(5,-2){B} + \tkzDefPoint(1,-2){C} + \tkzDefCircle[in](A,B,C) + \tkzGetPoint{I} \tkzGetLength{rIN} + \tkzDefCircle[circum](A,B,C) + \tkzGetPoint{K} \tkzGetLength{rCI} + \tkzDrawPoints(A,B,C,I,K) + \tkzDrawCircle[R,blue](I,\rIN pt) + \tkzDrawCircle[R,red](K,\rCI pt) + \tkzLabelPoints[below](B,C) + \tkzLabelPoints[above left](A,I,K) + \tkzDrawPolygon(A,B,C) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Example with the option \tkzimp{ex}} +We want to define an excircle of a triangle relativement au point C + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C} + \tkzDefCircle[ex](B,C,A) + \tkzGetPoint{Jc} \tkzGetLength{rc} + \tkzDefPointBy[projection=onto A--C ](Jc) + \tkzGetPoint{Xc} + \tkzDefPointBy[projection=onto A--B ](Jc) + \tkzGetPoint{Yc} + \tkzGetPoint{I} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawCircle[R,color=lightgray](Jc,\rc pt) + % possible \tkzDrawCircle[ex](A,B,C) + \tkzDrawCircle[in,color=red](A,B,C) \tkzGetPoint{I} + \tkzDefPointBy[projection=onto A--C ](I) + \tkzGetPoint{F} + \tkzDefPointBy[projection=onto A--B ](I) + \tkzGetPoint{D} + \tkzDrawLines[add=0 and 2.2,dashed](C,A C,B) + \tkzDrawSegments[dashed](Jc,Xc I,D I,F Jc,Yc) + \tkzMarkRightAngles(A,F,I B,D,I Jc,Xc,A Jc,Yc,B) + \tkzDrawPoints(B,C,A,I,D,F,Xc,Jc,Yc) + \tkzLabelPoints(B,A,Jc,I,D,Xc,Yc) + \tkzLabelPoints[above left](C) + \tkzLabelPoints[left](F) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Euler's circle for a given triangle} + +We verify that this circle passes through the middle of each side. +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(5,3.5){A} + \tkzDefPoint(0,0){B} \tkzDefPoint(7,0){C} + \tkzDefCircle[euler](A,B,C) + \tkzGetPoint{E} \tkzGetLength{rEuler} + \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc} + \tkzDrawPoints(A,B,C,E,Ma,Mb,Mc) + \tkzDrawCircle[R,blue](E,\rEuler pt) + \tkzDrawPolygon(A,B,C) + \tkzLabelPoints[below](B,C) + \tkzLabelPoints[left](A,E) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Coloured Apollonius circles for a given segment} + +\begin{tkzexample}[latex=9cm,small] +\begin{tikzpicture}[scale=0.75] + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefCircle[apollonius,K=2](A,B) + \tkzGetPoint{K1} + \tkzGetLength{rAp} + \tkzDrawCircle[R,color = blue!50!black, + fill=blue!20,opacity=.4](K1,\rAp pt) + \tkzDefCircle[apollonius,K=3](A,B) + \tkzGetPoint{K2} \tkzGetLength{rAp} + \tkzDrawCircle[R,color=red!50!black, + fill=red!20,opacity=.4](K2,\rAp pt) + \tkzLabelPoints[below](A,B,K1,K2) + \tkzDrawPoints(A,B,K1,K2) + \tkzDrawLine[add=.2 and 1](A,B) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Circles exinscribed to a given triangle} + You can also get the center and the projection of it on one side of the triangle. + + with \tkzcname{tkzGetFirstPoint\{Jb\}} and \tkzcname{tkzGetSecondPoint\{Tb\}}. + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefPoint(1,2.5){C} + \tkzDefCircle[ex](A,B,C) \tkzGetPoint{I} + \tkzGetLength{rI} + \tkzDefCircle[ex](C,A,B) \tkzGetPoint{J} + \tkzGetLength{rJ} + \tkzDefCircle[ex](B,C,A) \tkzGetPoint{K} + \tkzGetLength{rK} + \tkzDefCircle[in](B,C,A) \tkzGetPoint{O} + \tkzGetLength{rO} + \tkzDrawLines[add=1.5 and 1.5](A,B A,C B,C) + \tkzDrawPoints(I,J,K) + \tkzDrawPolygon(A,B,C) + \tkzDrawPolygon[dashed](I,J,K) + \tkzDrawCircle[R,blue!50!black](O,\rO) + \tkzDrawSegments[dashed](A,K B,J C,I) + \tkzDrawPoints(A,B,C) + \tkzDrawCircles[R](J,{\rJ} I,{\rI} K,{\rK}) + \tkzLabelPoints(A,B,C,I,J,K) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Spieker circle} +The incircle of the medial triangle $M_AM_BM_C$ is the Spieker circle + +\begin{tkzexample}[latex=8cm, small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C} + \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc} + \tkzDefTriangleCenter[spieker](A,B,C) + \tkzGetPoint{Sp} + \tkzDrawPolygon[blue](A,B,C) + \tkzDrawPolygon[red](Ma,Mb,Mc) + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Ma,Mb,Mc,Sp) + \tkzDrawCircle[in,red](Ma,Mb,Mc) + \tkzAutoLabelPoints[center=Sp,dist=.3](Ma,Mb,Mc) + \tkzLabelPoints[blue,right](Sp) + \tkzAutoLabelPoints[center=Sp](A,B,C) +\end{tikzpicture} +\end{tkzexample} + + + \subsubsection{Orthogonal circle passing through two given points} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){A} + \tkzDrawCircle(O,A) + \tkzDefPoint(-1.5,-1.5){z1} + \tkzDefPoint(1.5,-1.25){z2} + \tkzDefCircle[orthogonal through=z1 and z2](O,A) + \tkzGetPoint{c} + \tkzDrawCircle[thick,color=red](tkzPointResult,z1) + \tkzDrawPoints[fill=red,color=black, + size=4](O,A,z1,z2,c) + \tkzLabelPoints(O,A,z1,z2,c) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Orthogonal circle of given center} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/O,1/0/A} + \tkzDefPoints{1.5/1.25/B,-2/-3/C} + \tkzDefCircle[orthogonal from=B](O,A) + \tkzGetPoints{z1}{z2} + \tkzDefCircle[orthogonal from=C](O,A) + \tkzGetPoints{t1}{t2} + \tkzDrawCircle(O,A) + \tkzDrawCircle[thick,color=red](B,z1) + \tkzDrawCircle[thick,color=red](C,t1) + \tkzDrawPoints(t1,t2,C) + \tkzDrawPoints(z1,z2,O,A,B) + \tkzLabelPoints(O,A,B,C) +\end{tikzpicture} +\end{tkzexample} + + +%<----------------------------------------------------------------------------> +% Tangente +%<----------------------------------------------------------------------------> +\subsection{Tangent to a circle} +Two constructions are proposed. The first one is the construction of a tangent to a circle at a given point of this circle and the second one is the construction of a tangent to a circle passing through a given point outside a disc. + +\begin{NewMacroBox}{tkzDefTangent}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,dim}} +The parameter in brackets is the center of the circle or the center of the circle and a point on the circle or the center and the radius. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{\parg{pt1,pt2 or \parg{pt1,dim}} }{\parg{A,B} or \parg{A,2cm}} {$[AB]$ is radius $A$ is the center} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{at=pt}{at}{tangent to a point on the circle} +\TOline{from=pt} {at}{tangent to a circle passing through a point} +\TOline{from with R=pt} {at}{idem, but the circle is defined by center = radius} +\bottomrule +\end{tabular} + +The tangent is not drawn. A second point of the tangent is given by \tkzname{tkzPointResult}. +\end{NewMacroBox} + + \subsubsection{Example of a tangent passing through a point on the circle } +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(6,6){E} + \tkzDefRandPointOn[circle=center O radius 4cm] + \tkzGetPoint{A} + \tkzDrawSegment(O,A) + \tkzDrawCircle(O,A) + \tkzDefTangent[at=A](O) + \tkzGetPoint{h} + \tkzDrawLine[add = 4 and 3](A,h) + \tkzMarkRightAngle[fill=red!30](O,A,h) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Example of tangents passing through an external point } + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=0.75] + \tkzDefPoint(3,3){c} + \tkzDefPoint(6,3){a0} + \tkzRadius=1 cm + \tkzDrawCircle[R](c,\tkzRadius) + \foreach \an in {0,10,...,350}{ + \tkzDefPointBy[rotation=center c angle \an](a0) + \tkzGetPoint{a} + \tkzDefTangent[from with R = a](c,\tkzRadius) + \tkzGetPoints{e}{f} + \tkzDrawLines[color=magenta](a,f a,e) + \tkzDrawSegments(c,e c,f) + }% +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Example of Andrew Mertz } + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(100:8){A}\tkzDefPoint(50:8){B} + \tkzDefPoint(0,0){C} \tkzDefPoint(0,4){R} + \tkzDrawCircle(C,R) + \tkzDefTangent[from = A](C,R) \tkzGetPoints{D}{E} + \tkzDefTangent[from = B](C,R) \tkzGetPoints{F}{G} + \tkzDrawSector[fill=blue!80!black,opacity=0.5](A,D)(E) + \tkzFillSector[color=red!80!black,opacity=0.5](B,F)(G) + \tkzInterCC(A,D)(B,F) \tkzGetSecondPoint{I} + \tkzDrawPoint[color=black](I) + \end{tikzpicture} +\end{tkzexample} +\url{http://www.texample.net/tikz/examples/} + +\section{Draw, Label The Circles} + +Among the following macros, one will allow you to draw a circle, which is not a real feat. To do this, you will need to know the center of the circle and either the radius of the circle or a point on the circumference. It seemed to me that the most frequent use was to draw a circle with a given centre passing through a given point. This will be the default method, otherwise you will have to use the \tkzname{R} option. + +\begin{itemize} + \item I created a first macro \tkzcname{tkzDrawCircle}, + + \item then a macro that allows you to color a disc, but without drawing the circle. \tkzcname{tkzFillCircle}, + + \item sometimes, it is necessary for a drawing to be contained in a disc is the role assigned to \tkzcname{tkzClipCircle}, + + + \item It finally remains to be able to give a label to designate a circle and if several possibilities are offered, we will see here \tkzcname{tkzLabelCircle}. +\end{itemize} + +\subsection{Draw a circle} +\begin{NewMacroBox}{tkzDrawCircle}{\oarg{local options}\parg{A,B}} +\tkzHandBomb\ Attention the arguments are lists of two points. The circles that can be drawn are the same as in the previous macro. An additional option \tkzname{R} to give directly a measure. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{\parg{pt1,pt2 pt3,pt4 ...}}{\parg{A,B C,D}} {List of two points} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{through}{through}{circle with two points defining a radius} +\TOline{diameter}{through}{circle with two points defining a diameter} +\TOline{R} {through}{circle characterized by a point and the measurement of a radius} + \bottomrule +\end{tabular} + +\medskip +Of course, you have to add all the styles of \TIKZ for the tracings... +\end{NewMacroBox} + + \subsubsection{Circles and styles, draw a circle and color the disc} + We'll see that it's possible to colour in a disc while tracing the circle. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(3,0){A} + % cercle de centre O et passant par A + \tkzDrawCircle[color=blue,style=dashed](O,A) + % cercle de diamètre $[OA]$ + \tkzDrawCircle[diameter,color=red,% + line width=2pt,fill=red!40,% + opacity=.5](O,A) + % cercle de centre O et de rayon = exp(1) cm + \edef\rayon{\fpeval{exp(1)}} + \tkzDrawCircle[R,color=orange](O,\rayon cm) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Drawing circles} +\begin{NewMacroBox}{tkzDrawCircles}{\oarg{local options}\parg{A,B C,D}} +\tkzHandBomb\ Attention, the arguments are lists of two points. The circles that can be drawn are the same as in the previous macro. An additional option \tkzname{R} to give directly a measure. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{\parg{pt1,pt2 pt3,pt4 ...}}{\parg{A,B C,D}} {List of two points} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{through}{through}{circle with two points defining a radius} +\TOline{diameter}{through}{circle with two points defining a diameter} +\TOline{R} {through}{circle characterized by a point and the measurement of a radius} + \bottomrule +\end{tabular} + +\medskip +Of course, you have to add all the styles of \TIKZ for the tracings... +\end{NewMacroBox} + + \subsubsection{Circles defined by a triangle.} + +\begin{tkzexample}[latex=9cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,0){B} + \tkzDefPoint(3,2){C} + \tkzDrawPolygon(A,B,C) + \tkzDrawCircles(A,B B,C C,A) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B,C) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Concentric circles.} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDrawCircles[R](A,1cm A,2cm A,3cm) + \tkzDrawPoint(A) + \tkzLabelPoints(A) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Exinscribed circles.} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] +\tkzDefPoints{0/0/A,4/0/B,1/2.5/C} +\tkzDrawPolygon(A,B,C) +\tkzDefCircle[ex](B,C,A) +\tkzGetPoint{Jc} \tkzGetSecondPoint{Tc} +\tkzGetLength{rJc} +\tkzDrawCircle[R](Jc,{\rJc pt}) +\tkzDrawLines[add=0 and 1](C,A C,B) +\tkzDrawSegment(Jc,Tc) +\tkzMarkRightAngle(Jc,Tc,B) +\tkzDrawPoints(A,B,C,Jc,Tc) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Cardioid} + Based on an idea by O. Reboux made with pst-eucl (Pstricks module) by D. Rodriguez. + + Its name comes from the Greek kardia (heart), in reference to its shape, and was given to it by Johan Castillon. Wikipedia + + \begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,0){A} + \foreach \ang in {5,10,...,360}{% + \tkzDefPoint(\ang:2){M} + \tkzDrawCircle(M,A) + } + \end{tikzpicture} + \end{tkzexample} + +\subsection{Draw a semicircle} +\begin{NewMacroBox}{tkzDrawSemiCircle}{\oarg{local options}\parg{A,B} ou \parg{A,B,C}} +\tkzHandBomb\ Attention the arguments are lists of two or three points. This macro is either used in partnership with \tkzcname{tkzGetPoint} and/or \tkzcname{tkzGetLength} to obtain the center and the radius of the circle, or by using \\ \tkzname{tkzPointResult} and \tkzname{tkzLengthResult} if it is not necessary to keep the results. + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{through} {through}{circle characterized by two points defining a radius} +\TOline{diameter} {through}{circle characterized by two points defining a diameter} + \bottomrule +\end{tabular} + + +\end{NewMacroBox} + + +\subsection{Colouring a disc} +This was possible with the previous macro, but disk tracing was mandatory, this is no longer the case. + +\begin{NewMacroBox}{tkzFillCircle}{\oarg{local options}\parg{A,B}} +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{radius} {radius}{two points define a radius} +\TOline{R} {radius}{a point and the measurement of a radius } +\bottomrule +\end{tabular} + +\medskip +You don't need to put \tkzname{radius} because that's the default option. Of course, you have to add all the styles of \TIKZ for the plots. +\end{NewMacroBox} + + \subsubsection{Example from a sangaku} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmin=0,xmax = 6,ymin=0,ymax=6] + \tkzDefPoint(0,0){B} \tkzDefPoint(6,0){C}% + \tkzDefSquare(B,C) \tkzGetPoints{D}{A} + \tkzClipPolygon(B,C,D,A) + \tkzDefMidPoint(A,D) \tkzGetPoint{F} + \tkzDefMidPoint(B,C) \tkzGetPoint{E} + \tkzDefMidPoint(B,D) \tkzGetPoint{Q} + \tkzDefTangent[from = B](F,A) \tkzGetPoints{G}{H} + \tkzInterLL(F,G)(C,D) \tkzGetPoint{J} + \tkzInterLL(A,J)(F,E) \tkzGetPoint{K} + \tkzDefPointBy[projection=onto B--A](K) + \tkzGetPoint{M} + \tkzFillPolygon[color = green](A,B,C,D) + \tkzFillCircle[color = orange](B,A) + \tkzFillCircle[color = blue!50!black](M,A) + \tkzFillCircle[color = purple](E,B) + \tkzFillCircle[color = yellow](K,Q) +\end{tikzpicture} +\end{tkzexample} + + + +\newpage +\subsection{Clipping a disc} + +\begin{NewMacroBox}{tkzClipCircle}{\oarg{local options}\parg{A,B} or \parg{A,r}} + + +\medskip +\begin{tabular}{lll} +\toprule +arguments & exemple & explication \\ +\midrule +\TAline{\parg{A,B} or \parg{A,r}}{\parg{A,B} or \parg{A,2cm}} {AB radius or diameter } +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{radius} {radius}{circle characterized by two points defining a radius} +\TOline{R} {radius}{circle characterized by a point and the measurement of a radius } +\bottomrule +\end{tabular} + +\medskip +It is not necessary to put \tkzname{radius} because that is the default option. +\end{NewMacroBox} + + \subsubsection{Example} +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] + \tkzGrid \tkzClip + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,2){O} + \tkzDefPoint(4,4){B} + \tkzDefPoint(6,6){C} + \tkzDrawPoints(O,A,B,C) + \tkzLabelPoints(O,A,B,C) + \tkzDrawCircle(O,A) + \tkzClipCircle(O,A) + \tkzDrawLine(A,C) + \tkzDrawCircle[fill=red!20,opacity=.5](C,O) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Giving a label to a circle} +\begin{NewMacroBox}{tkzLabelCircle}{\oarg{local options}\parg{A,B}\parg{angle}\marg{label}} +\begin{tabular}{lll} +\toprule + +options & default & definition \\ +\midrule +\TOline{radius} {radius}{circle characterized by two points defining a radius} +\TOline{R} {radius}{circle characterized by a point and the measurement of a radius } +\bottomrule +\end{tabular} + +\medskip +You don't need to put \tkzname{radius} because that's the default option. We can use the styles from \TIKZ. The label is created and therefore "passed" between braces. +\end{NewMacroBox} + +\subsubsection{Example} +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} \tkzDefPoint(2,0){N} + \tkzDefPointBy[rotation=center O angle 50](N) + \tkzGetPoint{M} + \tkzDefPointBy[rotation=center O angle -20](N) + \tkzGetPoint{P} + \tkzDefPointBy[rotation=center O angle 125](N) + \tkzGetPoint{P'} + \tkzLabelCircle[above=4pt](O,N)(120){$\mathcal{C}$} + \tkzDrawCircle(O,M) + \tkzFillCircle[color=blue!20,opacity=.4](O,M) + \tkzLabelCircle[R,draw,fill=orange,% + text width=2cm,text centered](O,3 cm)(-60)% + {Le cercle\\ $\mathcal{C}$} + \tkzDrawPoints(M,P)\tkzLabelPoints[right](M,P) +\end{tikzpicture} +\end{tkzexample} + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex new file mode 100644 index 0000000000..0521c58722 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-compass.tex @@ -0,0 +1,113 @@ +\section{Utilisation du compas} + +\subsection{Macro principale \tkzcname{tkzCompass}} +\begin{NewMacroBox}{tkzCompass}{\oarg{local options}\parg{A,B}} +Cette macro permet de laisser une trace de compas autrement dit un arc en un point désigné. Il faut indiquer le centre. Plusieurs options spécifiques vont modifier l'aspect de l'arc ainsi que les options de TikZ comme le style, la couleur, l'épaisseur du trait etc. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{delta} {0}{Modifie l'angle de l'arc en l'augmentant symétriquement} +\TOline{length}{1}{Modifie la longueur} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Option \tkzname{length}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(1,1){A} + \tkzDefPoint(6,1){B} + \tkzInterCC[R](A,4cm)(B,3cm) + \tkzGetPoints{C}{D} + \tkzDrawPoint(C) + \tkzCompass[color=red,length=1.5](A,C) + \tkzCompass[color=red](B,C) + \tkzDrawSegments(A,B A,C B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option \tkzname{delta}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzInterCC[R](A,4cm)(B,3cm) + \tkzGetPoints{C}{D} + \tkzDrawPoints(A,B,C) + \tkzCompass[color=red,delta=20](A,C) + \tkzCompass[color=red,delta=20](B,C) + \tkzDrawPolygon(A,B,C) + \tkzMarkAngle(A,C,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Multiples constructions \tkzcname{tkzCompasss}} +\begin{NewMacroBox}{tkzCompasss}{\oarg{local options}\parg{pt1,pt2 pt3,pt4,...}} +\tkzHandBomb\ Attention les arguments sont des listes de deux points. Cela permet d'économiser quelques lignes de codes. +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{delta} {0}{Modifie l'angle de l'arc en l'augmentant symétriquement} +\TOline{length}{1}{Modifie la longueur} +\end{tabular} +\end{NewMacroBox} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(2,2){A} \tkzDefPoint(5,-2){B} + \tkzDefPoint(3,4){C} \tkzDrawPoints(A,B) + \tkzDrawPoint[color=red,shape=cross out](C) + \tkzCompasss[color=orange](A,B A,C B,C C,B) + \tkzShowLine[mediator,color=red, + dashed,length = 2](A,B) + \tkzShowLine[parallel = through C, + color=blue,length=2](A,B) + \tkzDefLine[mediator](A,B) \tkzGetPoints{i}{j} + \tkzDefLine[parallel=through C](A,B) \tkzGetPoint{D} + \tkzDrawLines[add=.6 and .6](C,D A,C B,D) + \tkzDrawLines(i,j) \tkzDrawPoints(A,B,C,i,j,D) + \tkzLabelPoints(A,B,C,i,j,D) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Macro de configuration \tkzcname{tkzSetUpCompass}} + +\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}} +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{line width} {0.4pt}{épaisseur du trait} +\TOline{color} {black!50}{couleur du trait} +\TOline{style} {solid}{style du trait solid, dashed,dotted,...} +\end{tabular} +\end{NewMacroBox} + +\begin{tkzltxexample}[] + \tkzSetUpCompass[color=blue,line width=.3 pt] +\end{tkzltxexample} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75, + showbi/.style={bisector,size=2,gap=3}] + \tkzSetUpCompass[color=blue,line width=.3 pt] + \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} + \tkzDrawPolygon(A,B,C) + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzShowLine[showbi](B,A,C) + \tkzShowLine[showbi](C,B,A) + \tkzInterLL(A,a)(B,b) \tkzGetPoint{I} + \tkzDefPointBy[projection= onto A--B](I) + \tkzGetPoint{H} + \tkzDrawCircle[radius,color=gray](I,H) + \tkzDrawSegments[color=gray!50](I,H) + \tkzDrawLines[add=0 and -.2,color=blue!50 ](A,a B,b) + \tkzShowBB +\end{tikzpicture} +\end{tkzexample} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex new file mode 100644 index 0000000000..7c5c13b33c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-config.tex @@ -0,0 +1,204 @@ +\section{Customization} + +\subsection{\tkzcname{tkzSetUpLine}} \label{tkzsetupline} +It is a macro that allows you to define the style of all the lines. +It is a macro that allows you to define the style of all the lines. + +\begin{NewMacroBox}{tkzSetUpLine}{\oarg{local options}} +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{color}{black}{colour of the construction arcs} +\TOline{line width}{0.4pt}{thickness of the construction arcs} +\TOline{style}{solid}{style des arcs de cercle de construction} +\TOline{add}{.2 and .2}{changing the length of a segment} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Example 1 change line width} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} +\begin{scope}[rotate=-90] + \tkzDefPoint(10,6){C} + \tkzDefPoint( 0,6){A} + \tkzDefPoint(10,0){B} + \tkzDefPointBy[projection = onto B--A](C) + \tkzGetPoint{H} + \tkzDrawPolygon(A,B,C) + \tkzMarkRightAngle[size=.4,fill=blue!20](B,C,A) + \tkzMarkRightAngle[size=.4,fill=red!20](B,H,C) + \tkzDrawSegment[color=red](C,H) +\end{scope} + \tkzSetUpLine[color=blue,line width=1pt] + \tkzLabelSegment[below](C,B){$a$} + \tkzLabelSegment[right](A,C){$b$} + \tkzLabelSegment[left](A,B){$c$} + \tkzLabelSegment[color=red](C,H){$h$} + \tkzDrawPoints(A,B,C) + \tkzLabelPoints[above left](H) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above](A) +\end{tikzpicture} +\end{tkzexample} + + + + +\subsubsection{Example 2 change style of line} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(1,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,1){C} \tkzDefPoint(5,1){D} + \tkzDefPoint(1,2){E} \tkzDefPoint(6,2){F} + \tkzDefPoint(0,4){A'}\tkzDefPoint(3,4){B'} + \tkzDrawSegments(A,B C,D E,F) + \tkzDrawLine(A',B') + \tkzSetUpLine[style=dashed,color=gray] + \tkzCompass(A',B') + \tkzCalcLength[cm](C,D) \tkzGetLength{rCD} + \tkzDrawCircle[R](A',\rCD cm) + \tkzCalcLength[cm](E,F) \tkzGetLength{rEF} + \tkzDrawCircle[R](B',\rEF cm) + \tkzInterCC[R](A',\rCD cm)(B',\rEF cm) + \tkzGetPoints{I}{J} + \tkzSetUpLine[color=red] \tkzDrawLine(A',B') + \tkzDrawSegments(A',I B',I) + \tkzDrawPoints(A,B,C,D,E,F,A',B',I,J) + \tkzLabelPoints(A,B,C,D,E,F,A',B',I,J) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Example 3 extend lines} +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzSetUpLine[add=.5 and .5] + \tkzDefPoints{0/0/A,4/0/B,1/3/C} + \tkzDrawLines(A,B B,C A,C) + \end{tikzpicture} +\end{tkzexample} + + +\subsection{\tkzcname{tkzSetUpPoint}} + + + \begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}} + \begin{tabular}{lll} + options & default & definition \\ + \midrule + \TOline{color}{black}{ point color} + \TOline{size}{3pt}{point size} + \TOline{fill}{black!50}{Inside point color} + \TOline{shape}{circle}{point shape circle or cross} + \end{tabular} + \end{NewMacroBox} + +\subsubsection{use of\tkzcname{tkzSetUpPoint}} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzSetUpPoint[shape = cross out,color=blue] + \tkzInit[xmax=100,xstep=20,ymax=.5] + \tkzDefPoint(20,1){A} + \tkzDefPoint(80,0){B} + \tkzDrawLine(A,B) + \tkzDrawPoints(A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{use of\tkzcname{tkzSetUpPoint} inside a group} +\begin{tkzexample}[latex=8cm,small] + \begin{tikzpicture} + \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] + \tkzDefPoint(0,0){A} + \tkzDefPoint(02.25,04.25){B} + \tkzDefPoint(4,0){C} + \tkzDefPoint(3,2){D} + \tkzDrawSegments(A,B A,C A,D) + {\tkzSetUpPoint[shape=cross out, + fill= teal!50, + size=4,color=teal] + \tkzDrawPoints(A,B)} + \tkzSetUpPoint[fill= teal!50,size=4, + color=teal] + \tkzDrawPoints(C,D) + \tkzLabelPoints(A,B,C,D) + \end{tikzpicture} +\end{tkzexample} + + + +\subsection{\tkzcname{tkzSetUpCompass}} + +\begin{NewMacroBox}{tkzSetUpCompass}{\oarg{local options}} +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{color}{black}{color of construction arcs} +\TOline{line width}{0.4pt}{thickness of construction arcs} +\TOline{style}{solid}{style of the building arcs} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{use of\tkzcname{tkzSetUpCompass} with bisector} + + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=0.75] + \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} + \tkzDrawPolygon(A,B,C) + \tkzSetUpCompass[color=red,line width=.2 pt] + \tkzDefLine[bisector](A,C,B) \tkzGetPoint{c} + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzShowLine[bisector,size=2,gap=3](A,C,B) + \tkzShowLine[bisector,size=2,gap=3](B,A,C) + \tkzShowLine[bisector,size=1,gap=2](C,B,A) + \tkzDrawLines[add=0 and 0 ](B,b C,c) + \tkzDrawLine[add=0 and -.4 ](A,a) + \tkzLabelPoints(A,B) \tkzLabelPoints[above](C) + \end{tikzpicture} + \end{tkzexample} + +\subsubsection{Another example of of\tkzcname{tkzSetUpCompass}} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=1,rotate=90] + \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} + \tkzDrawPolygon(A,B,C) + \tkzSetUpCompass[color=brown, + line width=.3 pt,style=tkzdotted] + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzInterLL(A,a)(B,b) \tkzGetPoint{I} + \tkzDefPointBy[projection= onto A--B](I) + \tkzGetPoint{H} + \tkzMarkRightAngle(I,H,A) + \tkzDrawCircle[radius,color=red](I,H) + \tkzDrawSegments[color=red](I,H) + \tkzDrawLines[add=0 and -.5,,color=red](A,a) + \tkzDrawLines[add=0 and 0,color=red](B,b) + \tkzShowLine[bisector,size=2,gap=3](B,A,C) + \tkzShowLine[bisector,size=1,gap=3](C,B,A) + \tkzLabelPoints(A,B,C) + \end{tikzpicture} +\end{tkzexample} + +\subsection{Own style} +You can set the normal style with |tkzSetUpPoint| and your own style + +\begin{tkzexample}[vbox,small] +\tkzSetUpPoint[color=blue!50!white, fill=gray!20!red!50!white] +\tikzset{/tikz/mystyle/.style={ + color=blue!20!black, + fill=blue!20}} + \begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(0,1){A} + \tkzDrawPoints(O) % general style + \tkzDrawPoints[mystyle,size=4](A) % my style + \tkzLabelPoints(O,A) + \end{tikzpicture} +\end{tkzexample} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex new file mode 100644 index 0000000000..4a380e355f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-exemples.tex @@ -0,0 +1,550 @@ +\section{Des exemples} +\subsection{Quelques exemples intéressants} + +\subsubsection{Triangles isocèles semblables} + +Ce qui suit provient de l'excellent site \textbf{Descartes et les Mathématiques}. Je n'ai pas modifié le texte et je ne suis l'auteur que de la programmation des figures. + +\url{http://debart.pagesperso-orange.fr/seconde/triangle.html} + +Bibliographie : Géométrie au Bac - Tangente, hors série no 8 - Exercice 11, page 11 + +Élisabeth Busser et Gilles Cohen : 200 nouveaux problèmes du Monde - POLE 2007 + +Affaire de logique n° 364 - Le Monde 17 février 2004 + + +Deux énoncés ont été proposés, l'un par la revue \emph{Tangente}, et l'autre par le journal \emph{Le Monde}. + +\vspace*{2cm} +\emph{Rédaction de la revue Tangente} : \textcolor{orange}{On construit deux triangles isocèles semblables AXB et BYC de sommets principaux X et Y, tels que A, B et C soient alignés et que ces triangles soient « indirect ». Soit $\alpha$ l'angle au sommet $\widehat{AXB}$ = $\widehat{BYC}$. On construit ensuite un troisième triangle isocèle XZY semblable aux deux premiers, de sommet principal Z et « indirect ».\\ +On demande de démontrer que le point Z appartient à la droite (AC).} + +\vspace*{2cm} +\emph{Rédaction du Monde} : \textcolor{orange}{On construit deux triangles isocèles semblables AXB et BYC de sommets principaux X et Y, tels que A, B et C soient alignés et que ces triangles soient « indirect ». Soit $\alpha$ l'angle au sommet $\widehat{AXB}$ = $\widehat{BYC}$. Le point Z du segment [AC] est équidistant des deux sommets X et Y.\\ +Sous quel angle voit-il ces deux sommets ?} + +\vspace*{2cm} Les constructions et leurs codes associés sont sur les deux pages suivantes, mais vous pouvez chercher avant de regarder. La programmation respecte (il me semble ...), mon raisonnement dans les deux cas. +\newpage + + \subsubsection{version revue "Tangente"} +\begin{tkzexample}[] +\begin{tikzpicture}[scale=.8,rotate=60] + \tkzDefPoint(6,0){X} \tkzDefPoint(3,3){Y} + \tkzDefShiftPoint[X](-110:6){A} \tkzDefShiftPoint[X](-70:6){B} + \tkzDefShiftPoint[Y](-110:4.2){A'} \tkzDefShiftPoint[Y](-70:4.2){B'} + \tkzDefPointBy[translation= from A' to B ](Y) \tkzGetPoint{Y} + \tkzDefPointBy[translation= from A' to B ](B') \tkzGetPoint{C} + \tkzInterLL(A,B)(X,Y) \tkzGetPoint{O} + \tkzDefMidPoint(X,Y) \tkzGetPoint{I} + \tkzDefPointWith[orthogonal](I,Y) + \tkzInterLL(I,tkzPointResult)(A,B) \tkzGetPoint{Z} + \tkzDefCircle[circum](X,Y,B) \tkzGetPoint{O} + \tkzDrawCircle(O,X) + \tkzDrawLines[add = 0 and 1.5](A,C) \tkzDrawLines[add = 0 and 3](X,Y) + \tkzDrawSegments(A,X B,X B,Y C,Y) \tkzDrawSegments[color=red](X,Z Y,Z) + \tkzDrawPoints(A,B,C,X,Y,O,Z) + \tkzLabelPoints(A,B,C,Z) \tkzLabelPoints[above right](X,Y,O) +\end{tikzpicture} +\end{tkzexample} +\newpage +\subsubsection{version "Le Monde"} + +\begin{tkzexample}[] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefPoint(9,0){C} + \tkzDefPoint(1.5,2){X} + \tkzDefPoint(6,4){Y} + \tkzDefCircle[circum](X,Y,B) \tkzGetPoint{O} + \tkzDefMidPoint(X,Y) \tkzGetPoint{I} + \tkzDefPointWith[orthogonal](I,Y) \tkzGetPoint{i} + \tkzDrawLines[add = 2 and 1,color=orange](I,i) + \tkzInterLL(I,i)(A,B) \tkzGetPoint{Z} + \tkzInterLC(I,i)(O,B) \tkzGetSecondPoint{M} + \tkzDefPointWith[orthogonal](B,Z) \tkzGetPoint{b} + \tkzDrawCircle(O,B) + \tkzDrawLines[add = 0 and 2,color=orange](B,b) + \tkzDrawSegments(A,X B,X B,Y C,Y A,C X,Y) + \tkzDrawSegments[color=red](X,Z Y,Z) + \tkzDrawPoints(A,B,C,X,Y,Z,M,I) + \tkzLabelPoints(A,B,C,Z) + \tkzLabelPoints[above right](X,Y,M,I) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Hauteurs d'un triangle} + +Ce qui suit provient encore de l'excellent site \textbf{Descartes et les Mathématiques}. + +\url{http://debart.pagesperso-orange.fr/geoplan/geometrie_triangle.html} + +Les trois hauteurs d'un triangle sont concourantes au même point H. + +\begin{tkzexample}[latex=7cm] +\begin{tikzpicture}[scale=.8] + \tkzDefPoint(0,0){C} + \tkzDefPoint(7,0){B} + \tkzDefPoint(5,6){A} + \tkzDrawPolygon(A,B,C) + \tkzDefMidPoint(C,B) + \tkzGetPoint{I} + \tkzDrawArc(I,B)(C) + \tkzInterLC(A,C)(I,B) + \tkzGetSecondPoint{B'} + \tkzInterLC(A,B)(I,B) + \tkzGetFirstPoint{C'} + \tkzInterLL(B,B')(C,C') + \tkzGetPoint{H} + \tkzInterLL(A,H)(C,B) + \tkzGetPoint{A'} + \tkzDefCircle[circum](A,B',C') + \tkzGetPoint{O} + \tkzDrawCircle[color=red](O,A) + \tkzDrawSegments[color=orange](B,B' C,C' A,A') + \tkzMarkRightAngles(C,B',B B,C',C C,A',A) + \tkzDrawPoints(A,B,C,A',B',C',H) + \tkzLabelPoints(A,B,C,A',B',C',H) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Hauteurs - autre construction} + +\begin{tkzexample}[latex=7cm] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(0,0){A} + \tkzDefPoint(8,0){B} + \tkzDefPoint(3.5,10){C} + \tkzDefMidPoint(A,B) + \tkzGetPoint{O} + \tkzDefPointBy[projection=onto A--B](C) + \tkzGetPoint{P} + \tkzInterLC(C,A)(O,A) + \tkzGetSecondPoint{M} + \tkzInterLC(C,B)(O,A) + \tkzGetFirstPoint{N} + \tkzInterLL(B,M)(A,N) + \tkzGetPoint{I} + \tkzDrawCircle[diameter](A,B) + \tkzDrawSegments(C,A C,B A,B B,M A,N) + \tkzMarkRightAngles[fill=brown!20](A,M,B A,N,B A,P,C) + \tkzDrawSegment[style=dashed,color=orange](C,P) + \tkzLabelPoints(O,A,B,P) + \tkzLabelPoint[left](M){$M$} + \tkzLabelPoint[right](N){$N$} + \tkzLabelPoint[above](C){$C$} + \tkzLabelPoint[above right](I){$I$} + \tkzDrawPoints[color=red](M,N,P,I) + \tkzDrawPoints[color=brown](O,A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\subsection{Different authors} + +\subsubsection{ Square root of the integers } +How to get $1$, $\sqrt{2}$, $\sqrt{3}$ with a rule and a compass. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){a0} + \tkzDrawSegment[blue](O,a0) + \foreach \i [count=\j] in {0,...,10}{% + \tkzDefPointWith[orthogonal normed](a\i,O) + \tkzGetPoint{a\j} + \tkzDrawPolySeg[color=blue](a\i,a\j,O)} + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Circle and tangent} +We have a point A $(8,2)$, a circle with center A and radius=3cm and a line + $\delta$ $y=4$. The line intercepts the circle at B. We want to draw the tangent at the circle in B. + + +\begin{tkzexample}[] +\begin{tikzpicture} + \edef\alphaR{\fpeval{asin(2/3)}} + \edef\xB{8-3*cos(\alphaR)} + \tkzDrawX[noticks,label=$(d)$] + \tkzDefPoint["$A$" above right](8,2){A} + \tkzDefPoint[color=red,"$O$" above right](0,0){O} + \tkzDefPoint["$B$" above left](\xB,4){B} + \tkzDefLine[orthogonal=through B](A,B) \tkzGetPoint{b} + \tkzDefPoint(1,0){i} + \tkzInterLL(B,b)(O,i) \tkzGetPoint{B'} + \tkzDrawSegment[line width=1pt](A,B) + \tkzHLine[color=red,style=dashed]{4} + \tkzText[above](12,4){$\delta$} + \tkzDrawCircle[R,color=blue,line width=.8pt](A,3 cm) + \tkzDrawPoint(B') + \tkzDrawLine(B,B') + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{About right triangle} + +We have a segment $[AB]$ and we want to determine a point $C$ such as $AC=8 cm$ and $ABC$ is a right triangle in $B$. + +\begin{tkzexample}[latex=7cm] +\begin{tikzpicture} + \tkzDefPoint["$A$" left](2,1){A} + \tkzDefPoint(6,4){B} + \tkzDrawSegment(A,B) + \tkzDrawPoint[color=red](A) + \tkzDrawPoint[color=red](B) + \tkzDefPointWith[orthogonal,K=-1](B,A) + \tkzDrawLine[add = .5 and .5](B,tkzPointResult) + \tkzInterLC[R](B,tkzPointResult)(A,8 cm) + \tkzGetPoints{C}{J} + \tkzDrawPoint[color=red](C) + \tkzCompass(A,C) + \tkzMarkRightAngle(A,B,C) + \tkzDrawLine[color=gray,style=dashed](A,C) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Archimedes} + +This is an ancient problem proved by the great Greek mathematician Archimedes . +The figure below shows a semicircle, with diameter $AB$. A tangent line is drawn and touches the semicircle at $B$. An other tangent line at a point, $C$, on the semicircle is drawn. We project the point $C$ on the segment$[AB]$ on a point $D$ . The two tangent lines intersect at the point $T$. + +Prove that the line $(AT)$ bisects $(CD)$ + +\begin{tkzexample}[] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){A}\tkzDefPoint(6,0){D} + \tkzDefPoint(8,0){B}\tkzDefPoint(4,0){I} + \tkzDefLine[orthogonal=through D](A,D) + \tkzInterLC[R](D,tkzPointResult)(I,4 cm) \tkzGetFirstPoint{C} + \tkzDefLine[orthogonal=through C](I,C) \tkzGetPoint{c} + \tkzDefLine[orthogonal=through B](A,B) \tkzGetPoint{b} + \tkzInterLL(C,c)(B,b) \tkzGetPoint{T} + \tkzInterLL(A,T)(C,D) \tkzGetPoint{P} + \tkzDrawArc(I,B)(A) + \tkzDrawSegments(A,B A,T C,D I,C) \tkzDrawSegment[color=orange](I,C) + \tkzDrawLine[add = 1 and 0](C,T) \tkzDrawLine[add = 0 and 1](B,T) + \tkzMarkRightAngle(I,C,T) + \tkzDrawPoints(A,B,I,D,C,T) + \tkzLabelPoints(A,B,I,D) \tkzLabelPoints[above right](C,T) + \tkzMarkSegment[pos=.25,mark=s|](C,D) \tkzMarkSegment[pos=.75,mark=s|](C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple : Dimitris Kapeta} + +You need in this example to use \tkzname{mkpos=.2} with \tkzcname{tkzMarkAngle} because the measure of $ \widehat{CAM}$ is too small. +Another possiblity is to use \tkzcname{tkzFillAngle}. + + +\begin{tkzexample}[] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2.5,0){N} + \tkzDefPoint(-4.2,0.5){M} + \tkzDefPointBy[rotation=center O angle 30](N) + \tkzGetPoint{B} + \tkzDefPointBy[rotation=center O angle -50](N) + \tkzGetPoint{A} + \tkzInterLC(M,B)(O,N) \tkzGetFirstPoint{C} + \tkzInterLC(M,A)(O,N) \tkzGetSecondPoint{A'} + \tkzMarkAngle[mkpos=.2, size=0.5](A,C,B) + \tkzMarkAngle[mkpos=.2, size=0.5](A,M,C) + \tkzDrawSegments(A,C M,A M,B) + \tkzDrawCircle(O,N) + \tkzLabelCircle[above left](O,N)(120){$\mathcal{C}$} + \tkzMarkAngle[mkpos=.2, size=1.2](C,A,M) + \tkzDrawPoints(O, A, B, M, B, C) + \tkzLabelPoints[right](O,A,B) + \tkzLabelPoints[above left](M,C) + \tkzLabelPoint[below left](A'){$A'$} +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Example : John Kitzmiller } + +Prove $\bigtriangleup LKJ$ is equilateral + + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=2] + \tkzDefPoint[label=below left:A](0,0){A} + \tkzDefPoint[label=below right:B](6,0){B} + \tkzDefTriangle[equilateral](A,B) \tkzGetPoint{C} + \tkzMarkSegments[mark=|](A,B A,C B,C) + \tkzDefBarycentricPoint(A=1,B=2) \tkzGetPoint{C'} + \tkzDefBarycentricPoint(A=2,C=1) \tkzGetPoint{B'} + \tkzDefBarycentricPoint(C=2,B=1) \tkzGetPoint{A'} + \tkzInterLL(A,A')(C,C') \tkzGetPoint{J} + \tkzInterLL(C,C')(B,B') \tkzGetPoint{K} + \tkzInterLL(B,B')(A,A') \tkzGetPoint{L} + \tkzLabelPoint[above](C){C} + \tkzDrawPolygon(A,B,C) \tkzDrawSegments(A,J B,L C,K) + \tkzMarkAngles[fill= orange,size=1cm,opacity=.3](J,A,C K,C,B L,B,A) + \tkzLabelPoint[right](J){J} + \tkzLabelPoint[below](K){K} + \tkzLabelPoint[above left](L){L} + \tkzMarkAngles[fill=orange, opacity=.3,thick,size=1,](A,C,J C,B,K B,A,L) + \tkzMarkAngles[fill=green, size=1, opacity=.5](A,C,J C,B,K B,A,L) + \tkzFillPolygon[color=yellow, opacity=.2](J,A,C) + \tkzFillPolygon[color=yellow, opacity=.2](K,B,C) + \tkzFillPolygon[color=yellow, opacity=.2](L,A,B) + \tkzDrawSegments[line width=3pt,color=cyan,opacity=0.4](A,J C,K B,L) + \tkzDrawSegments[line width=3pt,color=red,opacity=0.4](A,L B,K C,J) + \tkzMarkSegments[mark=o](J,K K,L L,J) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple : John Kitzmiller } +Prove $\dfrac{AC}{CE}=\dfrac{BD}{DF} \qquad$ + +Another interesting example from John, you can see how to use some extra options like \tkzname{decoration} and \tkzname{postaction} from \TIKZ\ with \tkzname{tkz-euclide}. + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=2,decoration={markings, + mark=at position 3cm with {\arrow[scale=2]{>}}}] + \tkzDefPoints{0/0/E, 6/0/F, 0/1.8/P, 6/1.8/Q, 0/3/R, 6/3/S} + \tkzDrawLines[postaction={decorate}](E,F P,Q R,S) + \tkzDefPoints{3.5/3/A, 5/3/B} + \tkzDrawSegments(E,A F,B) + \tkzInterLL(E,A)(P,Q) \tkzGetPoint{C} + \tkzInterLL(B,F)(P,Q) \tkzGetPoint{D} + \tkzLabelPoints[above right](A,B) + \tkzLabelPoints[below](E,F) + \tkzLabelPoints[above left](C) + \tkzDrawSegments[style=dashed](A,F) + \tkzInterLL(A,F)(P,Q) \tkzGetPoint{G} + \tkzLabelPoints[above right](D,G) + \tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](A,C A,G) + \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](C,E G,F) + \tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](B,D) + \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](D,F) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple : John Kitzmiller } +Prove $\dfrac{BC}{CD}=\dfrac{AB}{AD} \qquad$ (Angle Bisector) + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=2] + \tkzDefPoints{0/0/B, 5/0/D} \tkzDefPoint(70:3){A} + \tkzDrawPolygon(B,D,A) + \tkzDefLine[bisector](B,A,D) \tkzGetPoint{a} + \tkzInterLL(A,a)(B,D) \tkzGetPoint{C} + \tkzDefLine[parallel=through B](A,C) \tkzGetPoint{b} + \tkzInterLL(A,D)(B,b) \tkzGetPoint{P} + \begin{scope}[decoration={markings, + mark=at position .5 with {\arrow[scale=2]{>}}}] + \tkzDrawSegments[postaction={decorate},dashed](C,A P,B) + \end{scope} + \tkzDrawSegment(A,C) \tkzDrawSegment[style=dashed](A,P) + \tkzLabelPoints[below](B,C,D) \tkzLabelPoints[above](A,P) + \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](B,C P,A) + \tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](C,D A,D) + \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](A,B) + \tkzMarkAngles[size=0.7](B,A,C C,A,D) + \tkzMarkAngles[size=0.7, fill=green, opacity=0.5](B,A,C A,B,P) + \tkzMarkAngles[size=0.7, fill=yellow, opacity=0.3](B,P,A C,A,D) + \tkzMarkAngles[size=0.7, fill=green, opacity=0.6](B,A,C A,B,P B,P,A C,A,D) + \tkzLabelAngle[pos=1](B,A,C){1} \tkzLabelAngle[pos=1](C,A,D){2} + \tkzLabelAngle[pos=1](A,B,P){3} \tkzLabelAngle[pos=1](B,P,A){4} + \tkzMarkSegments[mark=|](A,B A,P) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Exemple : author John Kitzmiller } +Prove $\overline{AG}\cong\overline{EF} \qquad$ (Detour) + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=2] + \tkzDefPoint(0,3){A} \tkzDefPoint(6,3){E} \tkzDefPoint(1.35,3){B} + \tkzDefPoint(4.65,3){D} \tkzDefPoint(1,1){G} \tkzDefPoint(5,5){F} + \tkzDefMidPoint(A,E) \tkzGetPoint{C} + \tkzFillPolygon[yellow, opacity=0.4](B,G,C) + \tkzFillPolygon[yellow, opacity=0.4](D,F,C) + \tkzFillPolygon[blue, opacity=0.3](A,B,G) + \tkzFillPolygon[blue, opacity=0.3](E,D,F) + \tkzMarkAngles[size=0.6,fill=green](B,G,A D,F,E) + \tkzMarkAngles[size=0.6,fill=orange](B,C,G D,C,F) + \tkzMarkAngles[size=0.6,fill=yellow](G,B,C F,D,C) + \tkzMarkAngles[size=0.6,fill=red](A,B,G E,D,F) + \tkzMarkSegments[mark=|](B,C D,C) \tkzMarkSegments[mark=s||](G,C F,C) + \tkzMarkSegments[mark=o](A,G E,F) \tkzMarkSegments[mark=s](B,G D,F) + \tkzDrawSegment[color=red](A,E) + \tkzDrawSegment[color=blue](F,G) + \tkzDrawSegments(A,G G,B E,F F,D) + \tkzLabelPoints[below](C,D,E,G) \tkzLabelPoints[above](A,B,F) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example from Indonesia} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=3] + \tkzDefPoints{0/0/A,2/0/B} + \tkzDefSquare(A,B) \tkzGetPoints{C}{D} + \tkzDefPointBy[rotation=center D angle 45](C)\tkzGetPoint{G} + \tkzDefSquare(G,D)\tkzGetPoints{E}{F} + \tkzInterLL(B,C)(E,F)\tkzGetPoint{H} + \tkzFillPolygon[gray!10](D,E,H,C,D) + \tkzDrawPolygon(A,...,D)\tkzDrawPolygon(D,...,G) + \tkzDrawSegment(B,E) + \tkzMarkSegments[mark=|,size=3pt,color=gray](A,B B,C C,D D,A E,F F,G G,D D,E) + \tkzMarkSegments[mark=||,size=3pt,color=gray](B,E E,H) + \tkzLabelPoints[left](A,D) + \tkzLabelPoints[right](B,C,F,H) + \tkzLabelPoints[above](G)\tkzLabelPoints[below](E) + \tkzMarkRightAngles(D,A,B D,G,F) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Another example from Indonesia} +\begin{tkzexample}[vbox,small] + \begin{tikzpicture}[pol/.style={fill=brown!40,opacity=.5}, + seg/.style={tkzdotted,color=gray}, + hidden pt/.style={fill=gray!40}, + mra/.style={color=gray!70,tkzdotted,/tkzrightangle/size=.2}, + scale=3] + \tkzSetUpPoint[size=2] + \tkzDefPoints{0/0/A,2.5/0/B,1.33/0.75/D,0/2.5/E,2.5/2.5/F} + \tkzDefLine[parallel=through D](A,B) \tkzGetPoint{I1} + \tkzDefLine[parallel=through B](A,D) \tkzGetPoint{I2} + \tkzInterLL(D,I1)(B,I2) \tkzGetPoint{C} + \tkzDefLine[parallel=through E](A,D) \tkzGetPoint{I3} + \tkzDefLine[parallel=through D](A,E) \tkzGetPoint{I4} + \tkzInterLL(E,I3)(D,I4) \tkzGetPoint{H} + \tkzDefLine[parallel=through F](E,H) \tkzGetPoint{I5} + \tkzDefLine[parallel=through H](E,F) \tkzGetPoint{I6} + \tkzInterLL(F,I5)(H,I6) \tkzGetPoint{G} + \tkzDefMidPoint(G,H) \tkzGetPoint{P} + \tkzDefMidPoint(G,C) \tkzGetPoint{Q} + \tkzDefMidPoint(B,C) \tkzGetPoint{R} + \tkzDefMidPoint(A,B) \tkzGetPoint{S} + \tkzDefMidPoint(A,E) \tkzGetPoint{T} + \tkzDefMidPoint(E,H) \tkzGetPoint{U} + \tkzDefMidPoint(A,D) \tkzGetPoint{M} + \tkzDefMidPoint(D,C) \tkzGetPoint{N} + \tkzInterLL(B,D)(S,R) \tkzGetPoint{L} + \tkzInterLL(H,F)(U,P) \tkzGetPoint{K} + \tkzDefLine[parallel=through K](D,H) \tkzGetPoint{I7} + \tkzInterLL(K,I7)(B,D) \tkzGetPoint{O} + + \tkzFillPolygon[pol](P,Q,R,S,T,U) + \tkzDrawSegments[seg](K,O K,L P,Q R,S T,U + C,D H,D A,D M,N B,D) + \tkzDrawSegments(E,H B,C G,F G,H G,C Q,R S,T U,P H,F) + \tkzDrawPolygon(A,B,F,E) + \tkzDrawPoints(A,B,C,E,F,G,H,P,Q,R,S,T,U,K) + \tkzDrawPoints[hidden pt](M,N,O,D) + \tkzMarkRightAngle[mra](L,O,K) + \tkzMarkSegments[mark=|,size=1pt,thick,color=gray](A,S B,S B,R C,R + Q,C Q,G G,P H,P + E,U H,U E,T A,T) + + \tkzLabelAngle[pos=.3](K,L,O){$\alpha$} + \tkzLabelPoints[below](O,A,S,B) + \tkzLabelPoints[above](H,P,G) + \tkzLabelPoints[left](T,E) + \tkzLabelPoints[right](C,Q) + \tkzLabelPoints[above left](U,D,M) + \tkzLabelPoints[above right](L,N) + \tkzLabelPoints[below right](F,R) + \tkzLabelPoints[below left](K) + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Three circles} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoints{0/0/A,8/0/B,0/4/a,8/4/b,8/8/c} + \tkzDefTriangle[equilateral](A,B) \tkzGetPoint{C} + \tkzDrawPolygon(A,B,C) + \tkzDefSquare(A,B) \tkzGetPoints{D}{E} + \tkzClipBB + \tkzDefMidPoint(A,B) \tkzGetPoint{M} + \tkzDefMidPoint(B,C) \tkzGetPoint{N} + \tkzDefMidPoint(A,C) \tkzGetPoint{P} + \tkzDrawSemiCircle[gray,dashed](M,B) + \tkzDrawSemiCircle[gray,dashed](A,M) + \tkzDrawSemiCircle[gray,dashed](A,B) + \tkzDrawCircle[gray,dashed](B,A) + \tkzInterLL(A,N)(M,a) \tkzGetPoint{Ia} + \tkzDefPointBy[projection = onto A--B](Ia) + \tkzGetPoint{ha} + \tkzDrawCircle[gray](Ia,ha) + \tkzInterLL(B,P)(M,b) \tkzGetPoint{Ib} + \tkzDefPointBy[projection = onto A--B](Ib) + \tkzGetPoint{hb} + \tkzDrawCircle[gray](Ib,hb) + \tkzInterLL(A,c)(M,C) \tkzGetPoint{Ic} + \tkzDefPointBy[projection = onto A--C](Ic) + \tkzGetPoint{hc} + \tkzDrawCircle[gray](Ic,hc) + \tkzInterLL(A,Ia)(B,Ib) \tkzGetPoint{G} + \tkzDrawCircle[gray,dashed](G,Ia) + \tkzDrawPolySeg(A,E,D,B) + \tkzDrawPoints(A,B,C) + \tkzDrawPoints(G,Ia,Ib,Ic) + \tkzDrawSegments[gray,dashed](C,M A,N B,P M,a M,b A,a a,b b,B A,D Ia,ha) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{"The" Circle of APOLLONIUS} + +\begin{tkzexample}[vbox,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefTriangleCenter[euler](A,B,C) \tkzGetPoint{N} + \tkzDefTriangleCenter[circum](A,B,C) \tkzGetPoint{O} + \tkzDefTriangleCenter[lemoine](A,B,C) \tkzGetPoint{K} + \tkzDefTriangleCenter[spieker](A,B,C) \tkzGetPoint{Sp} + \tkzDefExCircle(A,B,C) \tkzGetPoint{Jb} + \tkzDefExCircle(C,A,B) \tkzGetPoint{Ja} + \tkzDefExCircle(B,C,A) \tkzGetPoint{Jc} + \tkzDefPointBy[projection=onto B--C ](Jc) \tkzGetPoint{Xc} + \tkzDefPointBy[projection=onto B--C ](Jb) \tkzGetPoint{Xb} + \tkzDefPointBy[projection=onto A--B ](Ja) \tkzGetPoint{Za} + \tkzDefPointBy[projection=onto A--B ](Jb) \tkzGetPoint{Zb} + \tkzDefLine[parallel=through Xc](A,C) \tkzGetPoint{X'c} + \tkzDefLine[parallel=through Xb](A,B) \tkzGetPoint{X'b} + \tkzDefLine[parallel=through Za](C,A) \tkzGetPoint{Z'a} + \tkzDefLine[parallel=through Zb](C,B) \tkzGetPoint{Z'b} + \tkzInterLL(Xc,X'c)(A,B) \tkzGetPoint{B'} + \tkzInterLL(Xb,X'b)(A,C) \tkzGetPoint{C'} + \tkzInterLL(Za,Z'a)(C,B) \tkzGetPoint{A''} + \tkzInterLL(Zb,Z'b)(C,A) \tkzGetPoint{B''} + \tkzDefPointBy[reflection= over Jc--Jb](B') \tkzGetPoint{Ca} + \tkzDefPointBy[reflection= over Jc--Jb](C') \tkzGetPoint{Ba} + \tkzDefPointBy[reflection= over Ja--Jb](A'')\tkzGetPoint{Bc} + \tkzDefPointBy[reflection= over Ja--Jb](B'')\tkzGetPoint{Ac} + \tkzDefCircle[circum](Ac,Ca,Ba) \tkzGetPoint{Q} + \tkzDrawCircle[circum](Ac,Ca,Ba) + \tkzDefPointWith[linear,K=1.1](Q,Ac) \tkzGetPoint{nAc} + \tkzClipCircle[through](Q,nAc) + \tkzDrawLines[add=1.5 and 1.5,dashed](A,B B,C A,C) + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPolygon[dashed,color=blue](Ja,Jb,Jc) + \tkzDrawCircles[ex](A,B,C B,C,A C,A,B) + \tkzDrawLines[add=0 and 0,dashed](Ca,Bc B,Za A,Ba B',C') + \tkzDrawLine[add=1 and 1,dashed](Xb,Xc) + \tkzDrawLine[add=7 and 3,blue](O,K) + \tkzDrawLine[add=8 and 15,red](N,Sp) + \tkzDrawLines[add=10 and 10](K,O N,Sp) + \tkzDrawSegments(Ba,Ca Bc,Ac) + \tkzDrawPoints(A,B,C,N,Ja,Jb,Jc,Xb,Xc,B',C',Za,Zb,Ba,Ca,Bc,Ac,Q,Sp,K,O) + \tkzLabelPoints(A,B,C,N,Ja,Jb,Jc,Xb,Xc,B',C',Za,Zb,Ba,Ca,Bc,Ac,Q,Sp) + \tkzLabelPoints[above](K,O) + \end{tikzpicture} +\end{tkzexample} + + + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex new file mode 100644 index 0000000000..a7ea937443 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-installation.tex @@ -0,0 +1,57 @@ + \section{Installation} + +\tkzNamePack{tkz-euclide} and \tkzNamePack{tkz-base} are now on the server of the \tkzname{CTAN}\footnote{\tkzNamePack{tkz-base} and \tkzNamePack{tkz-euclide} are part of \NameDist{TeXLive} and \tkzname{tlmgr} allows you to install them. These packages are also part of \NameDist{MikTeX} under \NameSys{Windows}}. If you want to test a beta version, just put the following files in a texmf folder that your system can find. +You will have to check several points : + +\begin{itemize}\setlength{\itemsep}{5pt} +\item The \tkzNamePack{tkz-base} and \tkzNamePack{tkz-euclide} folders must be located on a path recognized by \tkzname{latex}. +\item The \tkzNamePack{xfp} {footnote{\tkzNamePack{xfp}} replaces \tkzNamePack{fp}}, \tkzNamePack{numprint} , \tkzNamePack{tikz 3.00} must be installed as they are mandatory, for the proper functioning of \tkzNamePack{tkz-euclide}. +\item This documentation and all examples were obtained with \tkzname{lualatex-dev} but \tkzname{pdflatex} should be suitable. +\end{itemize} + +\subsection{List of folder files \tkzname{tkzbase} et \tkzname{tkzeuclide}} + +In the folder \tkzname{base} : + +\begin{itemize} +\item \tkzname{tkz-base.cfg} +\item \tkzname{tkz-base.sty} +\item \tkzname{tkz-lib-marks.tex} +\item \tkzname{tkz-obj-axes.tex} +\item \tkzname{tkz-obj-grids.tex} +\item \tkzname{tkz-obj-marks.tex} +\item \tkzname{tkz-obj-points.tex} +\item \tkzname{tkz-obj-rep.tex} +\item \tkzname{tkz-tools-arith.tex} +\item \tkzname{tkz-tools-base.tex} +\item \tkzname{tkz-tools-BB.tex} +\item \tkzname{tkz-tools-math.tex} +\item \tkzname{tkz-tools-misc.tex} +\item \tkzname{tkz-tools-modules.tex} +\item \tkzname{tkz-tools-print.tex} +\item \tkzname{tkz-tools-text.tex} +\item \tkzname{tkz-tools-utilities.tex} +\end{itemize} + +In the \tkzname{euclide} : + +\begin{itemize} +\item \tkzname{tkz-euclide.sty} +\item \tkzname{tkz-obj-eu-angles.tex} +\item \tkzname{tkz-obj-eu-arcs.tex} +\item \tkzname{tkz-obj-eu-circles.tex} +\item \tkzname{tkz-obj-eu-compass.tex} +\item \tkzname{tkz-obj-eu-draw-circles.tex} +\item \tkzname{tkz-obj-eu-draw-lines.tex} +\item \tkzname{tkz-obj-eu-draw-polygons.tex} +\item \tkzname{tkz-obj-eu-lines.tex} +\item \tkzname{tkz-obj-eu-points-by.tex} +\item \tkzname{tkz-obj-eu-points-rnd.tex} +\item \tkzname{tkz-obj-eu-points-with.tex} +\item \tkzname{tkz-obj-eu-points.tex} +\item \tkzname{tkz-obj-eu-polygons.tex} +\item \tkzname{tkz-obj-eu-protractor.tex} +\item \tkzname{tkz-obj-eu-sectors.tex} +\end{itemize} +\tkzHandBomb\ Now \tkzname{tkz-euclide} loads all the files. +\endinput diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex new file mode 100644 index 0000000000..70492509f7 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-intersec.tex @@ -0,0 +1,390 @@ +\section{Intersections} + +It is possible to determine the coordinates of the points of intersection between two straight lines, a straight line and a circle, and two circles. + +The associated commands have no optional arguments and the user must determine the existence of the intersection points himself. + +\subsection{Intersection de deux droites} + + \begin{NewMacroBox}{tkzInterLL}{\parg{$A,B$}\parg{$C,D$}} +Defines the intersection point \tkzname{tkzPointResult} of the two lines $(AB)$ and $(CD)$. The known points are given in pairs (two per line) in brackets, and the resulting point can be retrieved with the macro \tkzcname{tkzDefPoint}. + +\end{NewMacroBox} + +\medskip +\subsubsection{Example of intersection between two straight lines} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=-45,scale=.75] + \tkzDefPoint(2,1){A} + \tkzDefPoint(6,5){B} + \tkzDefPoint(3,6){C} + \tkzDefPoint(5,2){D} + \tkzDrawLines(A,B C,D) + \tkzInterLL(A,B)(C,D) + \tkzGetPoint{I} + \tkzDrawPoints[color=blue](A,B,C,D) + \tkzDrawPoint[color=red](I) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Intersection of a straight line and a circle} % (fold) +\label{sub:intersection_d_une_droite_et_d_un_cercle} + +As before, the line is defined by a couple of points. The circle + is also defined by a couple: +\begin{itemize} +\item $(O,C)$ which is a pair of points, the first is the centre and the second is any point on the circle. +\item $(O,r)$ The $r$ measure is the shelf measure. It is expressed soint en \emph{cm}, that is to say in \emph{pt}. +\end{itemize} + +\begin{NewMacroBox}{tkzInterLC}{\oarg{options}\parg{$A,B$}\parg{$O,C$} or \parg{$O,r$} or \parg{$O,C,D$}} +So the arguments are two couples. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{N} {N} { (O,C) determines the circle} +\TOline{R} {N} { (O, 1 cm) ou (O, 120 pt)} +\TOline{with nodes}{N} { (O,C,D) CD is a radius} +\bottomrule +\end{tabular} + +\medskip +The macro defines the intersection points $I$ and $J$ of the line $(AB)$ and the center circle $O$ with radius $r$ if they exist; otherwise, an error will be reported in the .log file. +\end{NewMacroBox} + +\subsubsection{Simple example of a line-circle intersection} + +In the following example, the drawing of the circle uses two points and the intersection of the straight line and the circle uses two pairs of points + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzInit[xmax=5,ymax=4] + \tkzDefPoint(1,1){O} + \tkzDefPoint(0,4){A} + \tkzDefPoint(5,0){B} + \tkzDefPoint(3,3){C} + \tkzInterLC(A,B)(O,C) \tkzGetPoints{D}{E} + \tkzDrawCircle(O,C) + \tkzDrawPoints[color=blue](O,A,B,C) + \tkzDrawPoints[color=red](D,E) + \tkzDrawLine(A,B) + \tkzLabelPoints[above right](O,A,B,C,D,E) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{More complex example of a line-circle intersection} +\url{http://gogeometry.com/problem/p190_tangent_circle} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(0,0){A} + \tkzDefPoint(8,0){B} + \tkzDefMidPoint(A,B) + \tkzGetPoint{O} + \tkzDrawCircle(O,B) + \tkzDefMidPoint(O,B) + \tkzGetPoint{O'} + \tkzDrawCircle(O',B) + \tkzDefTangent[from=A](O',B) + \tkzGetSecondPoint{E} + \tkzInterLC(A,E)(O,B) + \tkzGetSecondPoint{D} + \tkzDefPointBy[projection=onto A--B](D) + \tkzGetPoint{F} + \tkzMarkRightAngle(D,F,B) + \tkzDrawSegments(A,D A,B D,F) + \tkzDrawSegments[color=red,line width=1pt, + opacity=.4](A,O F,B) + \tkzDrawPoints(A,B,O,O',E,D) + \tkzLabelPoints(A,B,O,O',E,D) +\end{tikzpicture} +\end{tkzexample} + + +\newpage +\subsubsection{Circle defined by a center and a measure, and special cases} +Let's look at some special cases like straight lines tangent to the circle. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,8){A} \tkzDefPoint(8,0){B} + \tkzDefPoint(8,8){C} \tkzDefPoint(4,4){I} + \tkzDefPoint(2,7){E} \tkzDefPoint(6,4){F} + \tkzDrawCircle[R](I,4 cm) + \tkzInterLC[R](A,C)(I,4 cm) \tkzGetPoints{I1}{I2} + \tkzInterLC[R](B,C)(I,4 cm) \tkzGetPoints{J1}{J2} + \tkzInterLC[R](A,B)(I,4 cm) \tkzGetPoints{K1}{K2} + \tkzDrawPoints[color=red](I1,J1,K1,K2) + \tkzDrawLines(A,B B,C A,C) + \tkzInterLC[R](E,F)(I,4 cm) \tkzGetPoints{I2}{J2} + \tkzDrawPoints[color=blue](E,F) + \tkzDrawPoints[color=red](I2,J2) + \tkzDrawLine(I2,J2) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{More complex example} +\tkzHandBomb\ Be careful with the syntax. First of all, calculations for the points can be done during the passage of the arguments, but the syntax of \tkzname{xfp} must be respected. You can see that I use the term \tkzname{pi} because \NamePack{xfp} works in radians!. Furthermore, when calculations require the use of parentheses, they must be inserted in a group... \TEX \{ \dots \}. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,1){J} + \tkzDefPoint(0,0){O} + \tkzDrawArc[R,line width=1pt,color=red](J,2.5 cm)(180,0) + \foreach \i in {0,-5,-10,...,-85,-90}{ + \tkzDefPoint({2.5*cosd(\i)},{1+2.5*sind(\i)}){P} + \tkzDrawSegment[color=orange](J,P) + \tkzInterLC[R](P,J)(O,1 cm) + \tkzGetPoints{M}{N} + \tkzDrawPoints[red](N) + } + \foreach \i in {-90,-95,...,-175,-180}{ + \tkzDefPoint({2.5*cosd(\i)},{1+2.5*sind(\i)}){P} + \tkzDrawSegment[color=orange](J,P) + \tkzInterLC[R](P,J)(O,1 cm) + \tkzGetPoints{M}{N} + \tkzDrawPoints[red](M) + } +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Calculation of radius dimension} + With \tkzname{pgfmath} and \tkzcname{pgfmathsetmacro} + +The radius measurement may be the result of a calculation that is not done within the intersection macro, but before. +A length can be calculated in several ways. It is possible of course, + to use the module \tkzname{pgfmath} and the macro \tkzcname{pgfmathsetmacro}. In some cases, the results obtained are not precise enough, so the following calculation $0.0002 \div 0.0001$ gives $1.98$ with pgfmath while xfp will give $2$. + +\subsubsection{Calculation of radius dimension 1} +With \tkzname{xfp} and \tkzcname{fpeval} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzDefPoint(2,2){A} + \tkzDefPoint(5,4){B} + \tkzDefPoint(4,4){O} + \edef\tkzLen{\fpeval{0.0002/0.0001}} + \tkzDrawCircle[R](O,\tkzLen cm) + \tkzInterLC[R](A,B)(O, \tkzLen cm) + \tkzGetPoints{I}{J} + \tkzDrawPoints[color=blue](A,B) + \tkzDrawPoints[color=red](I,J) + \tkzDrawLine(I,J) +\end{tikzpicture} + \end{tkzexample} + +\subsubsection{Calculation of radius dimension 2} + With \TEX\ and \tkzcname{tkzLength}. + + This dimension was created with \tkzcname{newdimen}. 2 cm has been transformed into points. It is of course possible to use \TEX to calculate. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoints{2/2/A,5/4/B,4/4/0} + \tkzLength=2cm + \tkzDrawCircle[R](O,\tkzLength) + \tkzInterLC[R](A,B)(O,\tkzLength) + \tkzGetPoints{I}{J} + \tkzDrawPoints[color=blue](A,B) + \tkzDrawPoints[color=red](I,J) + \tkzDrawLine(I,J) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Squares in half a disc} +A Sangaku look! It is a question of proving that one can inscribe in a half-disc, two squares, and to determine the length of their respective sides according to the radius. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,8/0/B,4/0/I} + \tkzDefSquare(A,B) \tkzGetPoints{C}{D} + \tkzInterLC(I,C)(I,B)\tkzGetPoints{E'}{E} + \tkzInterLC(I,D)(I,B)\tkzGetPoints{F'}{F} + \tkzDefPointsBy[projection = onto A--B](E,F){H,G} + \tkzDefPointsBy[symmetry = center H](I){J} + \tkzDefSquare(H,J)\tkzGetPoints{K}{L} + \tkzDrawSector[fill=brown!30](I,B)(A) + \tkzFillPolygon[color=red!40](H,E,F,G) + \tkzFillPolygon[color=blue!40](H,J,K,L) + \tkzDrawPolySeg[color=red](H,E,F,G) + \tkzDrawPolySeg[color=red](J,K,L) + \tkzDrawPoints(E,G,H,F,J,K,L) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option "with nodes"} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.75] +\tkzDefPoints{0/0/A,4/0/B,1/1/D,2/0/E} +\tkzDefTriangle[equilateral](A,B) +\tkzGetPoint{C} +\tkzDrawCircle(C,A) +\tkzInterLC[with nodes](D,E)(C,A,B) +\tkzGetPoints{F}{G} +\tkzDrawPolygon(A,B,C) +\tkzDrawPoints(A,...,G) +\tkzDrawLine(F,G) +\end{tikzpicture} +\end{tkzexample} + +\clearpage \newpage +\subsection{Intersection of two circles} + +The most frequent case is that of two circles defined by their center and a point, but as before the option \tkzname{R} allows to use the radius measurements. + +\begin{NewMacroBox}{tkzInterCC}{\oarg{options}\parg{$O,A/r$}\parg{$O',A'/r'$}\marg{$I$}\marg{$J$}} + +\medskip +\begin{tabular}{lll} +\toprule +options & defect & definition \\ +\midrule +\TOline{N} {N} {OA and O'A' are radii, O and O' are the centres} +\TOline{R} {N} {$r$ et $r'$ shave dimensions and measure the radii} +\TOline{with nodes} {N} {$r$ et $r'$ are dimensions and measure the radii} +\end{tabular} + +\medskip + +This macro defines the intersection point(s) $I$ and $J$ of the two center circles $O$ and $O'$. If the two circles do not have a common point then the macro ends with an error that is not handled. \\ +It is also possible to use directly \tkzcname{tkzInterCCN} and \tkzcname{tkzInterCCR}. +\end{NewMacroBox} + + +\subsubsection{Construction of an equilateral triangle} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[trim left=-1cm,scale=.5] + \tkzDefPoint(1,1){A} + \tkzDefPoint(5,1){B} + \tkzInterCC(A,B)(B,A)\tkzGetPoints{C}{D} + \tkzDrawPoint[color=black](C) + \tkzDrawCircle[dashed](A,B) + \tkzDrawCircle[dashed](B,A) + \tkzCompass[color=red](A,C) + \tkzCompass[color=red](B,C) + \tkzDrawPolygon(A,B,C) + \tkzMarkSegments[mark=s|](A,C B,C) + \tkzLabelPoints[](A,B) + \tkzLabelPoint[above](C){$C$} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example a mediator} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,2){B} + \tkzDrawCircle[color=blue](B,A) + \tkzDrawCircle[color=blue](A,B) + \tkzInterCC(B,A)(A,B)\tkzGetPoints{M}{N} + \tkzDrawLine(A,B) + \tkzDrawPoints(M,N) + \tkzDrawLine[color=red](M,N) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{An isosceles triangle.} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=120,scale=.75] + \tkzDefPoint(1,2){A} + \tkzDefPoint(4,0){B} + \tkzInterCC[R](A,4cm)(B,4cm) + \tkzGetPoints{C}{D} + \tkzDrawCircle[R,dashed](A,4 cm) + \tkzDrawCircle[R,dashed](B,4 cm) + \tkzCompass[color=red](A,C) + \tkzCompass[color=red](B,C) + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints[color=blue](A,B,C) + \tkzMarkSegments[mark=s|](A,C B,C) + \tkzLabelPoints[](A,B) + \tkzLabelPoint[above](C){$C$} +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Segment trisection} + The idea here is to divide a segment with a ruler and a compass into three segments of equal length. + +\begin{tkzexample}[latex=9cm,small] +\begin{tikzpicture}[scale=.8] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,2){B} + \tkzInterCC(A,B)(B,A) + \tkzGetPoints{C}{D} + \tkzInterCC(D,B)(B,A) + \tkzGetPoints{A}{E} + \tkzInterCC(D,B)(A,B) + \tkzGetPoints{F}{B} + \tkzInterLC(E,F)(F,A) + \tkzGetPoints{D}{G} + \tkzInterLL(A,G)(B,E) + \tkzGetPoint{O} + \tkzInterLL(O,D)(A,B) + \tkzGetPoint{J} + \tkzInterLL(O,F)(A,B) + \tkzGetPoint{I} + \tkzDrawCircle(D,A) + \tkzDrawCircle(A,B) + \tkzDrawCircle(B,A) + \tkzDrawCircle(F,A) + \tkzDrawSegments[color=red](O,G + O,B O,D O,F) + \tkzDrawPoints(A,B,D,E,F,G,I,J) + \tkzLabelPoints(A,B,D,E,F,G,I,J) + \tkzDrawSegments[blue](A,B B,D A,D% + A,F F,G E,G B,E) + \tkzMarkSegments[mark=s|](A,I I,J J,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Angle trisection} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tikzset{arc/.style={color=gray,style=dashed}} + \tkzDefPoints{0/0/a,0/5/I,5/0/J} + \tkzDrawArc[angles](O,I)(0,90) + \tkzDrawArc[angles,/tikz/arc](I,O)(90,180) + \tkzDrawArc[angles,/tikz/arc](J,O)(-90,0) + \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C} + \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A} + \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K} + \tkzDrawPoints(A,B,K) + \foreach \point in {I,A,B,J,K}{% + \tkzDrawSegment(O,\point)} +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{with the option \tkzimp{with nodes}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/a,0/5/B,5/0/C} + \tkzDefPoint(54:5){F} + \tkzDrawCircle[color=gray](A,C) + \tkzInterCC[with nodes](A,A,C)(C,B,F) + \tkzGetPoints{a}{e} + \tkzInterCC(A,C)(a,e) \tkzGetFirstPoint{b} + \tkzInterCC(A,C)(b,a) \tkzGetFirstPoint{c} + \tkzInterCC(A,C)(c,b) \tkzGetFirstPoint{d} + \tkzDrawPoints(a,b,c,d,e) + \tkzDrawPolygon[color=red](a,b,c,d,e) + \foreach \vertex/\num in {a/36,b/108,c/180, + d/252,e/324}{% + \tkzDrawPoint(\vertex) + \tkzLabelPoint[label=\num:$\vertex$](\vertex){} + \tkzDrawSegment[color=gray,style=dashed](A,\vertex) + } +\end{tikzpicture} +\end{tkzexample} + + \endinput + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex new file mode 100644 index 0000000000..6ae71f7cb5 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-lines.tex @@ -0,0 +1,623 @@ +\section{The straight lines} + +It is of course essential to draw straight lines, but before this can be done, it is necessary to be able to define certain particular lines such as mediators, bisectors, parallels or even perpendiculars. The principle is to determine two points on the straight line. + + +\subsection{Definition of straight lines} + +\begin{NewMacroBox}{tkzDefLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}} +The argument is a list of two or three points. Depending on the case, the macro defines one or two points necessary to obtain the line sought. Either the macro \tkzcname{tkzGetPoint} or the macro \tkzcname{tkzGetPoints} must be used. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{mediator}{}{mediator. Two points are defined} +\TOline{perpendicular=through\ldots}{}{perpendicular to a straight line passing through a point} +\TOline{orthogonal=through\ldots}{}{see above } +\TOline{parallel=through\ldots}{}{parallel to a straight line passing through a point} +\TOline{bisector}{}{bisector of an angle defined by three points} +\TOline{bisector out}{}{Exterior Angle Bisector} +\TOline{tangent=at\ldots }{}{tangent to a circle at a given point} +\TOline{tangent=from\ldots}{}{tangent to a circle(O,A) passing through a given point} +\TOline{tangent=from with R\ldots}{}{tangent to a circle(O,r) passing through a given point} +\TOline{K}{1}{Coefficient for the perpendicular line} + \bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Example with \tkzname{mediator}} +\begin{tkzexample}[latex=5 cm,small] +\begin{tikzpicture}[rotate=25] + \tkzInit + \tkzDefPoints{-2/0/A,1/2/B} + \tkzDefLine[mediator](A,B) \tkzGetPoints{C}{D} + \tkzDefPointWith[linear,K=.75](C,D) \tkzGetPoint{D} + \tkzDefMidPoint(A,B) \tkzGetPoint{I} + \tkzFillPolygon[color=orange!30](A,C,B,D) + \tkzDrawSegments(A,B C,D) + \tkzMarkRightAngle(B,I,C) + \tkzDrawSegments(D,B D,A) + \tkzDrawSegments(C,B C,A) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example avec \tkzname{orthogonal} et \tkzname{parallel}} +\begin{tkzexample}[latex=5 cm,small] +\begin{tikzpicture} + \tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-0.7/1/C} + \tkzDrawLine(A,B) + \tkzLabelLine[pos=1.25,left](A,B){$(d_1)$} + \tkzDrawPoints(A,B,C) + \tkzDefLine[orthogonal=through C](B,A) \tkzGetPoint{c} + \tkzDrawLine(C,c) + \tkzLabelLine[pos=1.25,left](C,c){$(\delta)$} + \tkzInterLL(A,B)(C,c) \tkzGetPoint{I} + \tkzMarkRightAngle(C,I,B) + \tkzDefLine[parallel=through C](A,B) \tkzGetPoint{c'} + \tkzDrawLine(C,c') + \tkzLabelLine[pos=1.25,left](C,c'){$(d_2)$} + \tkzMarkRightAngle(I,C,c') +\end{tikzpicture} +\end{tkzexample} + + +\newpage +\subsubsection{An envelope} +Based on a figure from O. Reboux with pst-eucl by D Rodriguez. + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1] + \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6] + \tkzClip + \tkzDefPoint(0,0){O} + \tkzDefPoint(132:4){A} + \tkzDefPoint(5,0){B} + \foreach \ang in {5,10,...,360}{% + \tkzDefPoint(\ang:5){M} + \tkzDefLine[mediator](A,M) + \tkzDrawLine[color=magenta,add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{A parable} +Based on a figure from O. Reboux with pst-eucl by D Rodriguez. +It is not necessary to name the two points that define the mediator. + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1.25] + \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6] + \tkzClip + \tkzDefPoint(0,0){O} + \tkzDefPoint(132:5){A} + \tkzDefPoint(4,0){B} + \foreach \ang in {5,10,...,360}{% + \tkzDefPoint(\ang:4){M} + \tkzDefLine[mediator](A,M) + \tkzDrawLine[color=magenta, + add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)} + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Drawing a tangent option \tkzimp{from with R} and \tkzimp{at}} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(6,6){E} + \tkzDefRandPointOn[circle=center O radius 4cm] + \tkzGetPoint{A} + \tkzDefRandPointOn[circle=center O radius 4cm] + \tkzGetPoint{B} + \tkzDrawSegments(O,A O,B) + \tkzDrawCircle(O,A) + \tkzDefTangent[from with R=E](O,4cm) + \tkzGetSecondPoint{k} + \tkzDefTangent[at=A](O) + \tkzGetPoint{h} + \tkzDrawPoints(E) + \tkzDrawLine[add = .5 and .5](A,h) + \tkzDrawLine[add = .5 and .5](E,k) + \tkzMarkRightAngle[fill=red!30](O,A,h) + \end{tikzpicture} +\end{tkzexample} + + + +\subsubsection{Drawing a tangent option \tkzimp{from}} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){B} + \tkzDefPoint(0,8){A} + \tkzDefSquare(A,B) + \tkzGetPoints{C}{D} + \tkzDrawSquare(A,B) + \tkzClipPolygon(A,B,C,D) + \tkzDefPoint(4,8){F} + \tkzDefPoint(4,0){E} + \tkzDefPoint(4,4){Q} + \tkzFillPolygon[color = green](A,B,C,D) + \tkzDrawCircle[fill = orange](B,A) + \tkzDrawCircle[fill = purple](E,B) + \tkzDefTangent[from=B](F,A) + \tkzInterLL(F,tkzFirstPointResult)(C,D) + \tkzInterLL(A,tkzPointResult)(F,E) + \tkzDrawCircle[fill = yellow](tkzPointResult,Q) + \tkzDefPointBy[projection= onto B--A](tkzPointResult) + \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A) +\end{tikzpicture} +\end{tkzexample} + + +\section{Drawing, naming the lines} + +The following macros are simply used to draw, name lines + + +\subsection{Draw a straight line} + +To draw a normal straight line, just give a couple of points. You can use the \tkzname{add} option to extend the line.( This option is due to \tkzimp{Mark Wibrow} ). + +In the special case of lines defined in a triangle, the number of arguments is a list of three points (the vertices of the triangle). The second point is where the line will come from. The first and last points determine the target segment. The old method has therefore been slightly modified. So for \tkzcname{tkzDrawMedian}, instead of |(A,B)(C)| you have to write |(B,C,A)| where C is the point that will be linked to the middle of the segment |[A,B]|. + + +\begin{tkzltxexample}[] + \tikzset{% + add/.style args={#1 and #2}{ + to path={% + ($(\tikztostart)!-#1!(\tikztotarget)$)--($(\tikztotarget)!-#2!(\tikztostart)$)% + \tikztonodes}}} +\end{tkzltxexample} + + \begin{NewMacroBox}{tkzDrawLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3} } +The arguments are a list of two points or three points. + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{median}{none}{ [median](A,B,C) median from B} +\TOline{altitude}{none}{[altitude](C,A,B) altitude from A} +\TOline{bisector}{none}{[bisector](B,C,A) bisector from C } +\TOline{none}{none}{ draw the straight line A,B } +\TOline{add= nb1 and nb2}{.2 and .2}{Extends the segment} + \bottomrule +\end{tabular} + +\medskip +\tkzname{add} defines the length of the line passing through the points pt1 and pt2. Both numbers are percentages. The styles of \TIKZ\ are accessible for plots +\end{NewMacroBox} + +\subsubsection{Examples of right-hand plots with \tkzname{add}} + +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-2,xmax=3,ymin=-2.25,ymax=2.25] + \tkzClip[space=.25] + \tkzDefPoint(0,0){A} \tkzDefPoint(2,0.5){B} + \tkzDefPoint(0,-1){C}\tkzDefPoint(2,-0.5){D} + \tkzDefPoint(0,1){E} \tkzDefPoint(2,1.5){F} + \tkzDefPoint(0,-2){G} \tkzDefPoint(2,-1.5){H} + \tkzDrawLine(A,B) \tkzDrawLine[add = 0 and .5](C,D) + \tkzDrawLine[add = 1 and 0](E,F) + \tkzDrawLine[add = 0 and 0](G,H) + \tkzDrawPoints(A,B,C,D,E,F,G,H) + \tkzLabelPoints(A,B,C,D,E,F,G,H) +\end{tikzpicture} +\end{tkzexample} + +\newpage +It is possible to draw several lines, but with the same options. +\begin{NewMacroBox}{tkzDrawLines}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}} +Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ\ are available for the draws. +\end{NewMacroBox} + +\subsubsection{Example with \tkzcname{tkzDrawLines}} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,0){B} + \tkzDefPoint(1,2){C} + \tkzDefPoint(3,2){D} + \tkzDrawLines(A,B C,D A,C B,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example with the option \tkzname{add}} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(3,1){I} + \tkzDefPoint(1,4){J} + \tkzDefLine[bisector](I,O,J) + \tkzGetPoint{i} + \tkzDefLine[bisector out](I,O,J) + \tkzGetPoint{j} + \tkzDrawLines[add = 1 and .5,color=red](O,I O,J) + \tkzDrawLines[add = 1 and .5,color=blue](O,i O,j) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Medians in a triangle} + +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) + \tkzSetUpLine[color=blue] + \tkzDrawLine[median](B,C,A) + \tkzDrawLine[median](C,A,B) + \tkzDrawLine[median](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Altitudes in a triangle} + +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) + \tkzSetUpLine[color=magenta] + \tkzDrawLine[altitude](B,C,A) + \tkzDrawLine[altitude](C,A,B) + \tkzDrawLine[altitude](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Bisectors in a triangle} +You have to give the angles in a straight line. + +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) + \tkzSetUpLine[color=purple] + \tkzDrawLine[bisector](B,C,A) + \tkzDrawLine[bisector](C,A,B) + \tkzDrawLine[bisector](A,B,C) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Add labels on a straight line \tkzcname{tkzLabelLine}} + + \begin{NewMacroBox}{tkzLabelLine}{\oarg{local options}\parg{pt1,pt2}\marg{label}} + + \begin{tabular}{lll} + \toprule + arguments & default & definition \\ + \midrule + \TAline{label}{}{example \tkzcname{tkzLabelLine(A,B)\{$\delta$\}}} + \bottomrule + \end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{pos}{.5}{pos est une option de \TIKZ\ mais essentielle dans ce cas} + \bottomrule +\end{tabular} + +\medskip +As an option, and in addition to the \tkzname{pos}, you can use all styles of \TIKZ\ , especially the placement with \tkzname{above}, \tkzname{right}, \dots + + \end{NewMacroBox} + +\subsubsection{Example with \tkzcname{tkzLabelLine}} +An important option is \tkzname{pos}, it's the one that allows you to place the label along the right. The value of \tkzname{pos} can be greater than 1 or negative. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/A,3/0/B,1/1/C} + \tkzDefLine[perpendicular=through C,K=-1](A,B) + \tkzGetPoint{c} + \tkzDrawLines(A,B C,c) + \tkzLabelLine[pos=1.25,blue,right](C,c){$(\delta)$} + \tkzLabelLine[pos=-0.25,red,left](C,c){encore $(\delta)$} +\end{tikzpicture} +\end{tkzexample} + +\section{Draw, Mark segments} + +There is, of course, a macro to simply draw a segment (it would be possible, as for a half line, to create a style with \tkzcname{add}) . + +\subsection{Draw a segment \tkzcname{tkzDrawSegment}} + + + \begin{NewMacroBox}{tkzDrawSegment}{\oarg{local options}\parg{pt1,pt2}} +The arguments are a list of two points. The styles of \TIKZ are available for the drawings + +\medskip +\begin{tabular}{lll} +argument & example & definition \\ +\midrule +\TAline{(pt1,pt2)}{(A,B)}{draw the segment $[A,B]$} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +options & exemple & définition \\ +\midrule +\TOline{options de TikZ}{}{all TikZ options are valid.} +\TOline{add}{}{add = kl and kr ; allows the segment to be extended to the left and right} +\TOline{dim}{}{dim = label,dim,option ; allows you to add dimensions to a figure.} +\bottomrule +\end{tabular} + +This is of course equivalent to \tkzcname{draw (A)--(B);} +\end{NewMacroBox} + +\subsubsection{Example with point references} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,1){B} + \tkzDrawSegment[color=red,thin](A,B) + \tkzDrawPoints(A,B) + \tkzLabelPoints(A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example of extending an option segment \tkzimp{add}} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefTriangleCenter[euler](A,B,C) + \tkzGetPoint{E} + \tkzDrawCircle[euler,red](A,B,C) + \tkzDrawLines[add=.5 and .5](A,B A,C B,C) + \tkzDrawPoints(A,B,C,E) + \tkzLabelPoints(A,B,C,E) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example of adding dimensions (technical figure) option \tkzimp{dim}} + \begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=2] + \pgfkeys{/pgf/number format/.cd,fixed,precision=2} + % Define the first two points + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefPoint(1,1){C} + % Draw the triangle and the points + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) + % Label the sides + \tkzCalcLength[cm](A,B)\tkzGetLength{ABl} + \tkzCalcLength[cm](B,C)\tkzGetLength{BCl} + \tkzCalcLength[cm](A,C)\tkzGetLength{ACl} + % add dim + \tkzDrawSegment[dim={\pgfmathprintnumber\BCl, + 6pt,transform shape}](C,B) + \tkzDrawSegment[dim={\pgfmathprintnumber\ACl, + 6pt,transform shape}](A,C) + \tkzDrawSegment[dim={\pgfmathprintnumber\ABl, + -6pt,transform shape}](A,B) + \end{tikzpicture} + \end{tkzexample} + +\bigskip +If the options are the same we can plot several segments with the same macro. + +\newpage +\subsection{Drawing segments \tkzcname{tkzDrawSegments}} + \hypertarget{tdss}{} + + \begin{NewMacroBox}{tkzDrawSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}} +The arguments are a two-point couple list. The styles of \TIKZ are available for the plots +\end{NewMacroBox} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=3,ymin=-1,ymax=2] + \tkzClip[space=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,1){B} + \tkzDefPoint(3,0){C} + \tkzDrawSegments(A,B B,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,C) + \tkzLabelPoints[above](B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Place an arrow on segment} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tikzset{ + arr/.style={postaction=decorate, + decoration={markings, + mark=at position .5 with {\arrow[thick]{#1}} + }}} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDrawSegments[arr=stealth](A,B) + \tkzDrawPoints(A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Mark a segment \tkzcname{tkzMarkSegment}} +\hypertarget{tms}{} + + \begin{NewMacroBox}{tkzMarkSegment}{\oarg{local options}\parg{pt1,pt2}} +The macro allows you to place a mark on a segment. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{pos}{.5}{position of the mark} +\TOline{color}{black}{color of the mark} +\TOline{mark}{none}{choice of the mark} +\TOline{size}{4pt}{size of the mark} +\bottomrule +\end{tabular} + +Possible marks are those provided by \TIKZ, but other marks have been created based on an idea by Yves Combe. +\end{NewMacroBox} + +\subsubsection{Several marks } +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoint(2,1){A} + \tkzDefPoint(6,4){B} + \tkzDrawSegment(A,B) + \tkzMarkSegment[color=brown,size=2pt, + pos=0.4, mark=z](A,B) + \tkzMarkSegment[color=blue, + pos=0.2, mark=oo](A,B) + \tkzMarkSegment[pos=0.8, + mark=s,color=red](A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Use of \tkzname{mark}} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoint(2,1){A} + \tkzDefPoint(6,4){B} + \tkzDrawSegment(A,B) + \tkzMarkSegment[color=gray, + pos=0.2,mark=s|](A,B) + \tkzMarkSegment[color=gray, + pos=0.4,mark=s||](A,B) + \tkzMarkSegment[color=brown, + pos=0.6,mark=||](A,B) + \tkzMarkSegment[color=red, + pos=0.8,mark=|||](A,B) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Marking segments \tkzcname{tkzMarkSegments}} +\hypertarget{tmss}{} + +\begin{NewMacroBox}{tkzMarkSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}} +Arguments are a list of pairs of points separated by spaces. The styles of \TIKZ\ are available for plots. +\end{NewMacroBox} + +\subsubsection{Marques pour un triangle isocèle} +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C} + \tkzDrawSegments(O,A A,B) + \tkzDrawPoints(O,A,B) + \tkzDrawLine(O,B) + \tkzMarkSegments[mark=||,size=6pt](O,A A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Another marking} + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A}\tkzDefPoint(3,2){B} + \tkzDefPoint(4,0){C}\tkzDefPoint(2.5,1){P} + \tkzDrawPolygon(A,B,C) + \tkzDefEquilateral(A,P) \tkzGetPoint{P'} + \tkzDefPointsBy[rotation=center A angle 60](P,B){P',C'} + \tkzDrawPolygon(A,P,P') + \tkzDrawPolySeg(P',C',A,P,B) + \tkzDrawSegment(C,P) + \tkzDrawPoints(A,B,C,C',P,P') + \tkzMarkSegments[mark=s|,size=6pt, + color=blue](A,P P,P' P',A) + \tkzMarkSegments[mark=||,color=orange](B,P P',C') + \tkzLabelPoints(A,C) \tkzLabelPoints[below](P) + \tkzLabelPoints[above right](P',C',B) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\hypertarget{tls}{} + \begin{NewMacroBox}{tkzLabelSegment}{\oarg{local options}\parg{pt1,pt2}\marg{label}} +This macro allows you to place a label along a segment or a line. The options are those of \TIKZ\ for example \tkzname{pos} + +\medskip +\begin{tabular}{lll} +argument & example & definition \\ +\midrule +\TAline{label}{\tkzcname{tkzLabelSegment(A,B)\{$5$\}}}{label text} +\TAline{(pt1,pt2)}{(A,B)}{label along $[A,B]$} +\bottomrule +\end{tabular} + + +\medskip +\begin{tabular}{lll} +options & default & definition \\ +\midrule +\TOline{pos}{.5}{label's position} +\end{tabular} +\end{NewMacroBox} + + \subsubsection{Labels multiples} +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture} +\tkzInit +\tkzDefPoint(0,0){A} +\tkzDefPoint(6,0){B} +\tkzDrawSegment(A,B) +\tkzLabelSegment[above,pos=.8](A,B){$a$} +\tkzLabelSegment[below,pos=.2](A,B){$4$} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Labels and right-angled triangle} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=-60] +\tikzset{label seg style/.append style = {% + color = red, + }} +\tkzDefPoint(0,1){A} +\tkzDefPoint(2,4){C} +\tkzDefPointWith[orthogonal normed,K=7](C,A) +\tkzGetPoint{B} +\tkzDrawPolygon[green!60!black](A,B,C) +\tkzDrawLine[altitude,dashed,color=magenta](B,C,A) +\tkzGetPoint{P} +\tkzLabelPoint[left](A){$A$} +\tkzLabelPoint[right](B){$B$} +\tkzLabelPoint[above](C){$C$} +\tkzLabelPoint[below](P){$P$} +\tkzLabelSegment[](B,A){$c$} +\tkzLabelSegment[swap](B,C){$a$} +\tkzLabelSegment[swap](C,A){$b$} +\tkzMarkAngles[size=1cm, + color=cyan,mark=|](C,B,A A,C,P) +\tkzMarkAngle[size=0.75cm, + color=orange,mark=||](P,C,B) +\tkzMarkAngle[size=0.75cm, + color=orange,mark=||](B,A,C) +\tkzMarkRightAngles[german](A,C,B B,P,C) +\end{tikzpicture} +\end{tkzexample} + +\hypertarget{tlss}{} + \begin{NewMacroBox}{tkzLabelSegments}{\oarg{local options}\parg{pt1,pt2 pt3,pt4 ...}} +The arguments are a two-point couple list. The styles of \TIKZ\ are available for plotting. +\end{NewMacroBox} + +\subsubsection{Labels for an isosceles triangle} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C} + \tkzDrawSegments(O,A A,B) + \tkzDrawPoints(O,A,B) + \tkzDrawLine(O,B) + \tkzLabelSegments[color=red,above=4pt](O,A A,B){$a$} +\end{tikzpicture} +\end{tkzexample} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex new file mode 100644 index 0000000000..49e8abe71f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-main.tex @@ -0,0 +1,165 @@ +% !TEX TS-program = lualatex +% encoding : utf8 +% doc de tkz-euclide.sty +% Created by Alain Matthes on 2020-01-02. +% Copyright (C) 2020 Alain Matthes +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License , either version 1.3 +% of this license or (at your option) any later version and/or +% 2. under the GNU Public License. +% +% See the file doc/generic/pgf/licenses/LICENSE for more details.% +% See http://www.latex-project.org/lppl.txt for details. + +% TKZdoc-euclide-main is the french doc of tkz-euclide +\documentclass[DIV = 14, + fontsize = 10, + headinclude = false, + index = totoc, + footinclude = false, + twoside, + headings = small + ]{tkz-doc} +\usepackage{etoc} +\gdef\tkznameofpack{tkz-euclide} +\gdef\tkzversionofpack{3.02c} +\gdef\tkzdateofpack{2020/02/06} +\gdef\tkznameofdoc{doc-tkz-euclide} +\gdef\tkzversionofdoc{3.02c} +\gdef\tkzdateofdoc{2020/02/06} +\gdef\tkzauthorofpack{Alain Matthes} +\gdef\tkzadressofauthor{} +\gdef\tkznamecollection{AlterMundus} +\gdef\tkzurlauthor{} +\gdef\tkzengine{lualatex} +\gdef\tkzurlauthorcom{http://altermundus.fr} +% -- Packages --------------------------------------------------- +\usepackage[dvipsnames,svgnames]{xcolor} +\usepackage{calc} +\usepackage{tkz-euclide} +\usepackage[colorlinks]{hyperref} +\hypersetup{ + linkcolor=BrickRed, + citecolor=Green, + filecolor=Mulberry, + urlcolor=NavyBlue, + menucolor=BrickRed, + runcolor=Mulberry, + linkbordercolor=BrickRed, + citebordercolor=Green, + filebordercolor=Mulberry, + urlbordercolor=NavyBlue, + menubordercolor=BrickRed, + runbordercolor=Mulberry, + pdfsubject={Euclidean Geometry}, + pdfauthor={\tkzauthorofpack}, + pdftitle={\tkznameofpack}, + pdfcreator={\tkzengine} +} +\usepackage{tkzexample} +\usepackage{mathtools} +\usepackage{unicode-math} +\usepackage{fourier-otf} +\setmainfont[Ligatures=TeX]{TeX Gyre Pagella} +\setmathfont{TeX Gyre Pagella Math} +\usepackage{datetime,multicol,lscape} +\usepackage[english]{babel} +\usepackage[autolanguage]{numprint} +\usepackage{ulem} +\usepackage{microtype} +\usepackage{array,multirow,multido,booktabs} +\usepackage{shortvrb,fancyvrb} +\renewcommand{\labelitemi}{\lefthand} +\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb +\pdfcompresslevel=9 +\setlength\parindent{0pt} +\RequirePackage{makeidx} +%\@twocolumnfalse +\makeindex +% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}} +% \renewenvironment{tkzexample}[1][]{% +% \tkz@killienc \VerbatimOut{tkzeuclide-\tkzref.tex}% +% }{% +% \endVerbatimOut +% } +%<---------------------------------------------------------------------------> +\begin{document} + +\author{\tkzauthorofpack} +\title{\tkznameofpack} +\date{\today} +\clearpage +\thispagestyle{empty} +\maketitle + +\clearpage +\tkzSetUpColors[background=white,text=darkgray] + +\let\rmfamily\ttfamily +\nameoffile{\tkznameofpack} +\defoffile{\lefthand\ +The \tkzname{\tkznameofpack} is a set of convenient macros for drawing in a plane ( fundamental two-dimensional object) with a Cartesian coordinate system. It handles the more classic situations in Euclidean Geometry. \tkzname{\tkznameofpack} is built on top of PGF and its associated front-end \TIKZ\ and is a (La)TeX-friendly drawing package. The aim is to provide a high-level user interface to build graphics relatively simply. It uses a Cartesian coordinate system orthogonal provided by the \tkzimp{tkz-base} package as well as tools to define the unique coordinates of points and to manipulate them. The idea is to allow you to follow step by step a construction that would be done by hand as naturally as possible.\\ +Now the package needs the version 3.0 of \TIKZ. English is not my native language so there might be some errors. +} + + + + +\presentation + +\vspace*{1cm} +\lefthand\ Firstly, I would like to thank \textbf{Till Tantau} for the beautiful LATEX package, namely \href{http://sourceforge.net/projects/pgf/}{Ti\emph{k}Z}. + +\vspace*{12pt} +\lefthand\ I received much valuable advices, remarks, corrections and examples from \tkzimp{Jean-Côme Charpentier} , \tkzimp{Josselin Noirel}, \tkzimp{Manuel Pégourié-Gonnard}, \tkzimp{Franck Pastor} , \tkzimp{David Arnold}, \tkzimp{Ulrike Fischer},\tkzimp{Stefan Kottwitz} \tkzimp{Christian Tellechea}, \tkzimp{Nicolas Kisselhoff},\tkzimp{David Arnold}, \tkzimp{Wolfgang Büchel}, \tkzimp{John Kitzmiller},\tkzimp{Dimitri Kapetas},\tkzimp{Gaétan Marris},\tkzimp{Mark Wibrow}, \tkzimp{Yve Combe} for his work on protractor, \tkzimp{Dimitri Kapetas}, \tkzimp{Gaétan Marris} and \tkzimp{Paul Gaborit} . + +\vspace*{12pt} +\lefthand\ I would also like to thank Eric Weisstein, Creator of MathWorld ~: +\href{http://mathworld.wolfram.com/about/author.html}{MathWorld} + +\vspace*{12pt} +\lefthand\ You can find some examples on my site~: +\href{http://altermundus.fr}{altermundus.fr} \hspace{2cm} under construction ! + +\vfill +Please report typos or any other comments to this documentation to ~: \href{mailto:al.ma@mac.com}{\textcolor{blue}{Alain Matthes}}. + +This file can be redistributed and/or modified under the terms of the LATEX +Project Public License Distributed from \href{http://www.ctan.org/}{CTAN}\ archives. + +\clearpage +\tableofcontents + +\clearpage \newpage + +\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex} + +\include{TKZdoc-euclide-presentation} +\include{TKZdoc-euclide-installation} +\include{TKZdoc-euclide-news} +\include{TKZdoc-euclide-points} +\include{TKZdoc-euclide-pointby} +\include{TKZdoc-euclide-pointwith} +\include{TKZdoc-euclide-rnd} +\include{TKZdoc-euclide-lines} +\include{TKZdoc-euclide-triangles} +\include{TKZdoc-euclide-polygons} +\include{TKZdoc-euclide-circles} +\include{TKZdoc-euclide-intersec} +\include{TKZdoc-euclide-angles} +\include{TKZdoc-euclide-sectors} +\include{TKZdoc-euclide-arcs} +\include{TKZdoc-euclide-compass} +\include{TKZdoc-euclide-show} +\include{TKZdoc-euclide-rapporteur} +\include{TKZdoc-euclide-exemples} +\include{TKZdoc-euclide-config} +\include{TKZdoc-euclide-base} +\include{TKZdoc-euclide-FAQ} +\clearpage\newpage +\begin{multicols}{2} +\small\printindex +\end{multicols} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex new file mode 100644 index 0000000000..b11a4622e0 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex @@ -0,0 +1,42 @@ +\section{News and compatibility} + + +Some changes have been made to make the syntax more homogeneous and especially to distinguish the definition and search for coordinates from the rest, i.e. drawing, marking and labelling. +In the future, the definition macros being isolated, it will be easier to introduce a phase of coordinate calculations using \tkzimp{Lua}. + +An important novelty is the recent replacement of the \tkzNamePack{fp} package by \tkzNamePack{xfp}. This is to improve the calculations a little bit more and to make it easier to use. + + +Here are some of the changes. +\vspace{1cm} + \begin{itemize}\setlength{\itemsep}{10pt} +\item Improved code and bug fixes. +\item With \tkzimp{tkz-euclide} loads all objects, so there's no need to place. \tkzcname{usetkzobj{all}}. +\item The bounding box is now controlled in each macro (hopefully) to avoid the use of \tkzcname{tkzInit} followed by \tkzcname{tkzClip}. +\item Added macros for the bounding box: \tkzcname{tkzSaveBB} \tkzcname{tkzClipBB} and so on. +\item Logically most macros accept TikZ options. So I removed the "duplicate" options when possible; thus the "label options" option is removed. + +\item Random points are now in \tkzimp{tkz-euclide} and the macro \tkzcname{tkzGetRandPointOn} is replaced by \tkzcname{tkzDefRandPointOn}. For homogeneity reasons, the points must be retrieved with \tkzcname{tkzGetPoint}. + +\item The options \tkzimp{end} and \tkzimp{start} which allowed to give a label to a straight line are removed. You now have to use the macro \tkzcname{tkzLabelLine} + +\item Introduction of the libraries \NameLib{quotes} and \NameLib{angles} it allows to give a label to a point, even if I am not in favour of this practice. + +\item The notion of vector disappears to draw a vector just pass "->" as an option to \tkzcname{tkzDrawSegment}. +\item Many macros still exist, but are obsolete and will disappear: +\begin{itemize} + \item |\tkzDrawMedians| trace and create midpoints on the sides of a triangle. The creation and drawing separation is not respected so it is preferable to first create the coordinates of these points with |\tkzSpcTriangle[median]| and then to choose the ones you are going to draw with |\tkzDrawSegments| or |\tkzDrawLines|. + \item |\tkzDrawMedians(A,B)(C)| is now spelled |\tkzDrawMedians(A,C,B)|. This defines the median from $C$. + \item Another example |\tkzDrawTriangle[equilateral]| was handy but it is better to get the third point with |\tkzDefTriangle[equilateral]| and then draw with |\tkzDrawPolygon|. + + \item |\tkzDefRandPointOn| replaced by |\tkzGetRandPointOn| + \item now |\tkzTangent| is |\tkzDefTangent| + \item You can use |global path name| if you want find intersection but it's very slow like in TikZ. + +\end{itemize} + + +\item Appearance of the macro \tkzcname{usetkztool} which allows to load new "tools". +\end{itemize} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex new file mode 100644 index 0000000000..413087202a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-obj.tex @@ -0,0 +1,29 @@ +\section{Utilisation des objets complémentaires} + +Ces objets complémentaires peuvent être des points, des segments, des droites. +Il est possible d'utiliser certains de ces objets sans charger complètement \tkzname{tkz-euclide} mais en utilisant la macro \tkzcname{usetkzobj}. Attention, il faut utiliser \tkzname{tkz-euclide} pour avoir la possibilité d'utiliser des outils comme les transformations ou encore les intersections. + +Voici la liste actuelle des objets et ceux qui sont chargés par défaut par \tkzname{tkz-base}. +\begin{NewMacroBox}{usetkzobj}{\marg{liste d'objets}} + +\begin{tabular}{lll} +options & & définition \\ +\midrule +\TAline{all} {absent} {tous les objets sont chargés} +\TAline{points}{présent}{définir, nommer, tracer des points } +\TAline{lines}{absent} {définir, nommer, tracer des droites} +\TAline{segments} {présent}{définir, nommer, tracer des segments} +\TAline{vectors} {absent}{définir, nommer, tracer des des vecteurs} +\TAline{circles} {absent}{définir, nommer, tracer des cercles} +\TAline{polygons}{absent}{définir, nommer, tracer des quadrilatères} +\TAline{arcs} {absent}{définir, nommer, tracer des arcs} +\TAline{sectors}{absent}{définir, nommer, tracer des secteurs} +\TAline{protractor}{absent}{tracer un rapporteur} +\TAline{marks}{présent}{définir, nommer, tracer des marques} +\end{tabular} + \end{NewMacroBox} + + +\subsubsection{\tkzcname{usetkzobj\{points,segments\}}} + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex new file mode 100644 index 0000000000..35046719d0 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointby.tex @@ -0,0 +1,294 @@ +\section{Definition of points by transformation; \tkzcname{tkzDefPointBy} } +These transformations are: + +\begin{enumerate} + \item the translation; + \item l'homothety; + \item orthogonal reflection or symmetry; + \item central symmetry; + \item orthogonal projection; + \item rotation (degrees or radians); + \item inversion with respect to a circle +\end{enumerate} + +The choice of transformations is made through the options. There are two macros, one for the transformation of a single point \tkzcname{tkzDefPointBy} and the other for the transformation of a list of points \tkzcname{tkzDefPointsBy}. By default the image of $A$ is $A'$. For example, we'll write~: +\begin{tkzltxexample}[] +\tkzDefPointBy[translation= from A to A'](B) the result is in \tkzname{tkzPointResult}} +\end{tkzltxexample} + +\medskip +\begin{NewMacroBox}{tkzDefPointBy}{\oarg{local options}\parg{pt}} +The argument is a simple existing point and its image is stored in \tkzname{tkzPointResult}. If you want to keep this point then the macro \tkzcname{tkzGetPoint\{M\}} allows you to assign the name \tkzname{M} to the point. + +\begin{tabular}{lll} +\toprule +arguments & definition & examples \\ +\midrule +\TAline{pt} {existing point name} {$(A)$} +\bottomrule +\end{tabular} + +\begin{tabular}{lll} +options & & examples \\ +\midrule +\TOline{translation}{= from \#1 to \#2}{[translation=from A to B](E)} +\TOline{homothety} {= center \#1 ratio \#2}{[homothety=center A ratio .5](E)} +\TOline{reflection} {= over \#1--\#2}{[reflection=over A--B](E)} +\TOline{symmetry } {= center \#1}{[symmetry=center A](E)} +\TOline{projection }{= onto \#1--\#2}{[projection=onto A--B](E)} +\TOline{rotation } {= center \#1 angle \#2}{[rotation=center O angle 30](E)} +\TOline{rotation in rad}{= center \#1 angle \#2}{rotation=center O angle pi/3} +\TOline{inversion}{= center \#1 through \#2}{[inversion =center O through A](E)} +\bottomrule +\end{tabular} + +The image is only defined and not drawn. +\end{NewMacroBox} + +\subsection{Orthogonal reflection or symmetry } + +\subsubsection{Example of reflection} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1] + \tkzInit[ymin=-4,ymax=6,xmin=-7,xmax=3] + \tkzClip + \tkzDefPoints{1.5/-1.5/C,-4.5/2/D} + \tkzDefPoint(-4,-2){O} + \tkzDefPoint(-2,-2){A} + \foreach \i in {0,1,...,4}{% + \pgfmathparse{0+\i * 72} + \tkzDefPointBy[rotation=% + center O angle \pgfmathresult](A) + \tkzGetPoint{A\i} + \tkzDefPointBy[reflection = over C--D](A\i) + \tkzGetPoint{A\i'}} + \tkzDrawPolygon(A0, A2, A4, A1, A3) + \tkzDrawPolygon(A0', A2', A4', A1', A3') + \tkzDrawLine[add= .5 and .5](C,D) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Homothety} +\subsubsection{Example of homothety and projection} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1.25] + \tkzInit \tkzClip + \tkzDefPoint(0,1){A} \tkzDefPoint(6,3){B} \tkzDefPoint(3,6){C} + \tkzDrawLines[add= 0 and .3](A,B A,C) + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDrawLine[add=0 and 0,color=magenta!50 ](A,a) + \tkzDefPointBy[homothety=center A ratio .5](a) \tkzGetPoint{a'} + \tkzDefPointBy[projection = onto A--B](a') \tkzGetPoint{k} + \tkzDrawSegment[blue](a',k) + \tkzDrawPoints(a,a',k,A) + \tkzDrawCircle(a',k) + \tkzLabelPoints(a,a',k,A) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{The projection } +\subsubsection{Example of projection} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1.5] + \tkzInit[xmin=-3,xmax=5,ymax=4] \tkzClip[space=.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(0,4){B} + \tkzDrawTriangle[pythagore](B,A) \tkzGetPoint{C} + \tkzDefLine[bisector](B,C,A) \tkzGetPoint{c} + \tkzInterLL(C,c)(A,B) \tkzGetPoint{D} + \tkzDrawSegment(C,D) + \tkzDrawCircle(D,A) + \tkzDefPointBy[projection=onto B--C](D) \tkzGetPoint{G} + \tkzInterLC(C,D)(D,A) \tkzGetPoints{E}{F} + \tkzDrawPoints(A,C,F) \tkzLabelPoints(A,C,F) + \tkzDrawPoints(B,D,E,G) + \tkzLabelPoints[above right](B,D,E,G) + \end{tikzpicture} + \end{tkzexample} + + + +\newpage +\subsection{Symmetry } +\subsubsection{Example of symmetry} + +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDefPoint(2,2){B} + \tkzDefPointsBy[symmetry=center O](B,A){} + \tkzDrawLine(A,A') + \tkzDrawLine(B,B') + \tkzMarkAngle[mark=s,arc=lll, + size=2 cm,mkcolor=red](A,O,B) + \tkzLabelAngle[pos=1,circle,draw, + fill=blue!10](A,O,B){$60^{\circ}$} + \tkzDrawPoints(A,B,O,A',B') + \tkzLabelPoints(A,B,O,A',B') +\end{tikzpicture} +\end{tkzexample} + + +\newpage +\subsection{Rotation } +\subsubsection{Example of rotation} + + +\begin{tkzexample}[latex=8cm,small] + \begin{tikzpicture}[scale=1] + \tkzInit + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzDrawSegment(A,B) + \tkzDefPointBy[rotation=% + center A angle 60](B) + \tkzGetPoint{C} + \tkzDefPointBy[symmetry=% + center C](A) + \tkzGetPoint{D} + \tkzDrawSegment(A,tkzPointResult) + \tkzDrawLine(B,D) + \tkzDrawArc[delta=10](A,B)(C) + \tkzDrawArc[delta=10](B,C)(A) + \tkzDrawArc[delta=10](C,D)(D) + \tkzMarkRightAngle(D,B,A) +\end{tikzpicture} +\end{tkzexample} + + +\subsection{Rotation in radian } +\subsubsection{Example of rotation in radian} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture} + \tkzDefPoint["$A$" left](1,5){A} + \tkzDefPoint["$B$" right](5,2){B} + \tkzDefPointBy[rotation in rad= center A angle pi/3](B) + \tkzGetPoint{C} + + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,C) + \tkzCompass[color=red](A,C) + \tkzCompass[color=red](B,C) + + \tkzLabelPoints(C) +\end{tikzpicture} +\end{tkzexample} + + +\newpage +\subsection{Inversion with respect to a circle } +\subsubsection{Inversion of points} + + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){A} + \tkzDrawCircle(O,A) + \tkzDefPoint(-1.5,-1.5){z1} + \tkzDefPoint(0.35,0){z2} + \tkzDrawPoints[color=black, + fill=red,size=4](O,z1,z2) + \tkzDefPointBy[inversion =% + center O through A](z1) + \tkzGetPoint{Z1} + \tkzDefPointBy[inversion =% + center O through A](z2) + \tkzGetPoint{Z2} + \tkzDrawPoints[color=black, + fill=red,size=4](Z1,Z2) + \tkzDrawSegments(z1,Z1 z2,Z2) + \tkzLabelPoints(O,A,z1,z2,Z1,Z2) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Point Inversion: Orthogonal Circles} + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){A} + \tkzDrawCircle(O,A) + \tkzDefPoint(0.5,-0.25){z1} + \tkzDefPoint(-0.5,-0.5){z2} + \tkzDefPointBy[inversion = % + center O through A](z1) + \tkzGetPoint{Z1} + \tkzCircumCenter(z1,z2,Z1) + \tkzGetPoint{c} + \tkzDrawCircle(c,Z1) + \tkzDrawPoints[color=black, + fill=red,size=4](O,z1,z2,Z1,O,A) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\section{Transformation of multiple points; \tkzcname{tkzDefPointsBy} } + +Variant of the previous macro for defining multiple images. +You must give the names of the images as arguments, or indicate that the names of the images are formed from the names of the antecedents, leaving the argument empty. + +\begin{tkzltxexample}[] +\tkzDefPointsBy[translation= from A to A'](B,C){} the images are B' and C'. +\tkzDefPointsBy[translation= from A to A'](B,C){D,E} the images are D and E +\tkzDefPointsBy[translation= from A to A'](B) the image is B'. +\end{tkzltxexample} + +\begin{NewMacroBox}{tkzDefPointsBy}{\oarg{local options}\parg{list of points}\marg{list of points}} +\begin{tabular}{lll} +\toprule +arguments & exemples & \\ +\midrule +\TAline{\parg{liste de pts}\marg{list of pts}}{(A,B)\{E,F\}}{E is the image of A and F is the image of B.} \\ +\bottomrule +\end{tabular} + +\medskip +If the list of images is empty then the name of the image is the name of the antecedent to which " ' " is added. + +\medskip +\begin{tabular}{lll} +\toprule +options & & exemples \\ +\midrule +\TOline{translation = from \#1 to \#2}{}{[translation=from A to B](E)\{\}} +\TOline{homothety = center \#1 ratio \#2}{}{[homothety=center A ratio .5](E)\{F\}} +\TOline{reflection = over \#1--\#2}{}{[reflection=over A--B](E)\{F\}} +\TOline{symmetry = center \#1}{}{[symmetry=center A](E)\{F\}} +\TOline{projection = onto \#1--\#2}{}{[projection=onto A--B](E)\{F\}} +\TOline{rotation = center \#1 angle \#2}{}{[rotation=center angle 30](E)\{F\}} +\TOline{rotation in rad = center \#1 angle \#2}{}{par exemple angle pi/3} +\bottomrule +\end{tabular} + +\medskip +The points are only defined and not drawn. +\end{NewMacroBox} + +\subsection{Example de translation} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} \tkzDefPoint(4,2){A'} + \tkzDefPoint(3,0){B} \tkzDefPoint(1,2){C} + \tkzDefPointsBy[translation= from A to A'](B,C){} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPolygon[color=red](A',B',C') + \tkzDrawPoints[color=blue](A,B,C) + \tkzDrawPoints[color=red](A',B',C') + \tkzLabelPoints(A,B,A',B') + \tkzLabelPoints[above](C,C') + \tkzDrawSegments[color = gray,->, + style=dashed](A,A' B,B' C,C') +\end{tikzpicture} +\end{tkzexample} + +\endinput diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex new file mode 100644 index 0000000000..9cea12304c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-points.tex @@ -0,0 +1,870 @@ +\section{Definition of a point} + + Points can be specified in any of the following ways: +\begin{itemize} +\item Cartesian coordinates +\item Polar coordinates +\item Named points +\item Relative points +\end{itemize} + +Even if it's possible, I think it's a bad idea to work directly with coordinates. Preferable is to use named points. +A point is defined if it has a name linked to a unique pair of decimal numbers. + Let $(x,y)$ or $(a:d)$ i.e. ( $x$ abscissa, $y$ ordinate) or ($a$ angle : $d$ distance ). + This is possible because the plan has been provided with an orthonormed Cartesian coordinate system. The working axes are supposed to be (ortho)normed with unity equal to $1cm $ or something equivalent like $0.39370~in$. + Now by default if you use a grid or axes, the rectangle used is defined by the coordinate points~: $(0,0)$ et $(10,10)$. It's the macro \tkzcname{tkzInit} of the package \tkzNamePack{tkz-base} that creates this rectangle. Look at the following two codes and the result of their compilation: + +\begin{tkzexample}[latex=10cm,small] +\begin{tikzpicture} + \tkzGrid + \tkzDefPoint(0,0){O} + \tkzDrawPoint[red](O) + \tkzShowBB[line width=2pt, + orange] +\end{tikzpicture} +\end{tkzexample} + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(5,5){A} + \tkzDrawSegment[blue](O,A) + \tkzDrawPoints[red](O,A) + \tkzShowBB[line width=2pt,orange] +\end{tikzpicture} +\end{tkzexample} + + The Cartesian coordinate $(a,b)$ refers to the + point $a$ centimeters in the $x$-direction and $b$ centimeters in the + $y$-direction. + + A point in polar coordinates requires an angle $\alpha$, in degrees, + and distance from the origin, $d$. Unlike Cartesian coordinates, the + distance does not have a default dimensional unit, so one must be + supplied. The \tikz{} syntax for a point specified in polar + coordinates is $(\alpha:r\:dim)$, where {\em dim} is a dimensional + unit such as \texttt{cm}, \texttt{pt}, \texttt{in}, or any other + \TeX-based unit. Other than syntax and the required dimensional unit, + this follows usual mathematical usage. + + +\begin{minipage}[b]{0.5\textwidth} + Cartesian coordinates +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[scale=1] + \tkzInit[xmax=5,ymax=5] + \tkzDefPoints{0/0/O,1/0/I,0/1/J} + \tkzDrawXY[noticks,>=latex] + \tkzDefPoint(3,4){A} + \tkzDrawPoints(O,A) + \tkzLabelPoint(A){$A_1 (x_1,y_1)$} + \tkzShowPointCoord[xlabel=$x_1$,ylabel=$y_1$](A) + \tkzLabelPoints(O,I) + \tkzLabelPoints[left](J) + \tkzDrawPoints[shape=cross](I,J) +\end{tikzpicture} +\end{tkzexample}% +\end{minipage} +\begin{minipage}[b]{0.5\textwidth} + Polar coordinates +\begin{tkzexample}[vbox,small] +\begin{tikzpicture}[,scale=1] + \tkzInit[xmax=5,ymax=5] + \tkzDefPoints{0/0/O,1/0/I,0/1/J} + \tkzDefPoint(40:4){P} + \tkzDrawXY[noticks,>=triangle 45] + \tkzDrawSegment[dim={$r$, + 16pt,above=6pt}](O,P) + \tkzDrawPoints(O,P) + \tkzMarkAngle[mark=none,->](I,O,P) + \tkzFillAngle[fill=blue!20, + opacity=.5](I,O,P) + \tkzLabelAngle[pos=1.25](I,O,P){$\alpha$} + \tkzLabelPoint(P){$P (\alpha : r )$} + \tkzDrawPoints[shape=cross](I,J) + \tkzLabelPoints(O,I) + \tkzLabelPoints[left](J) +\end{tikzpicture} +\end{tkzexample} +\end{minipage}% + +The \tkzNameMacro{tkzDefPoint} macro is used to define a point by assigning coordinates to it. This macro is based on \tkzNameMacro{coordinate}, a macro of \TIKZ\ . It can use \TIKZ-specific options such as \IoptName{TikZ}{shift}. If calculations are required then the \tkzNamePack{xfp} package is chosen. We can use Cartesian or polar coordinates. + +\subsection{Defining a named point \tkzcname{tkzDefPoint}} + +\begin{NewMacroBox}{tkzDefPoint}{\oarg{local options}\parg{x,y}\marg{name} ou \parg{a:r}\marg{name}} + +\begin{tabular}{lll} +\toprule +arguments & défaut & définition \\ +\midrule +\TAline{(x,y)}{no default}{x et y sont deux dimensions, par défaut en cm.} +\TAline{(a:d)}{no default}{a est un angle en degré, d une dimension} +\TAline{\{name\}}{no default}{Nom attribué au point : $A$, $T_a$ ,$P1$ etc ...} +\bottomrule +\end{tabular} + +\medskip +{Les arguments obligatoires de cette macro sont deux dimensions exprimées avec des décimaux, dans le premier cas ce sont deux mesures de longueur, dans le second ce sont une mesure de longueur et la mesure d'un angle en degré} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{label} {no default} {permet de placer un label à une distance prédéfinie} +\TOline{shift} {no default} {Ajoute (x,y) ou (a:d) à toutes les coordonnées} + \bottomrule +\end{tabular} + +\end{NewMacroBox} + + \subsubsection{Cartesian coordinates } + + \begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefPoint(0,3){C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) + \end{tikzpicture} + \end{tkzexample} + + \subsubsection{Calculations with \tkzNamePack{xfp}} + + \begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzInit[xmax=4,ymax=4] + \tkzGrid + \tkzDefPoint(-1+2,sqrt(4)){O} + \tkzDefPoint({3*ln(exp(1))},{exp(1)}){A} + \tkzDefPoint({4*sin(pi/6)},{4*cos(pi/6)}){B} + \tkzDrawPoints[color=blue](O,B,A) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Polar coordinates } + +\begin{tkzexample}[latex=7cm,small] + \begin{tikzpicture} + \foreach \an [count=\i] in {0,60,...,300} + { \tkzDefPoint(\an:3){A_\i}} + \tkzDrawPolygon(A_1,A_...,A_6) + \tkzDrawPoints(A_1,A_...,A_6) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Calculations and coordinates} +You must follow the syntax of \tkzNamePack{fxp} here. It is always possible to go through \tkzNamePack{pgfmath} but in this case, the coordinates must be calculated before using the macro \tkzcname{tkzDefPoint}. + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture}[scale=.5] + \foreach \an [count=\i] in {0,2,...,358} + { \tkzDefPoint(\an:sqrt(sqrt(\an mm))){A_\i}} + \tkzDrawPoints(A_1,A_...,A_180) + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Relative points} + +First, we can use the \tkzNameEnv{scope} environment from \TIKZ\ .. +In the following example, we have a way to define an equilateral triangle. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzSetUpLine[color=blue!60] + \begin{scope}[rotate=30] + \tkzDefPoint(2,3){A} + \begin{scope}[shift=(A)] + \tkzDefPoint(90:5){B} + \tkzDefPoint(30:5){C} + \end{scope} + \end{scope} + \tkzDrawPolygon(A,B,C) +\tkzLabelPoints[above](B,C) +\tkzLabelPoints[below](A) +\tkzDrawPoints(A,B,C) +\end{tikzpicture} +\end{tkzexample} + +%<---------------------------------------------------------------------------> +\subsection{Point relative to another : \tkzcname{tkzDefShiftPoint}} +\begin{NewMacroBox}{tkzDefShiftPoint}{\oarg{Point}\parg{x,y}\marg{name} ou \parg{a:d}\marg{name}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{(x,y)}{no default}{x and y are two dimensions, by default in cm.} +\TAline{(a:d)}{no default}{a is an angle in degrees, d is a dimension} + +\midrule +options & default & definition \\ + +\midrule +\TOline{[pt]} {no default} {\tkzcname{tkzDefShiftPoint}[A](0:4)\{B\}} +\bottomrule +\end{tabular} + +\end{NewMacroBox} + +\subsubsection{Isosceles triangle with \tkzcname{tkzDefShiftPoint}} +This macro allows you to place one point relative to another. This is equivalent to a translation. Here is how to construct an isosceles triangle with main vertex A and angle at vertex of $30^{\circ} $. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=-30] + \tkzDefPoint(2,3){A} + \tkzDefShiftPoint[A](0:4){B} + \tkzDefShiftPoint[A](30:4){C} + \tkzDrawSegments(A,B B,C C,A) + \tkzMarkSegments[mark=|, + color=red](A,B A,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above left](A) +\end{tikzpicture} +\end{tkzexample} + + + +\subsubsection{Equilateral triangle} +Let's see how to get an equilateral triangle (there is much simpler) + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(2,3){A} + \tkzDefShiftPoint[A](30:4){B} + \tkzDefShiftPoint[A](-30:4){C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above left](A) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Parallelogram} +There's a simpler way +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(60:3){B} + \tkzDefShiftPointCoord[B](30:4){C} + \tkzDefShiftPointCoord[A](30:4){D} + \tkzDrawPolygon(A,...,D) + \tkzDrawPoints(A,...,D) +\end{tikzpicture} +\end{tkzexample} + +%<---------------------------------------------------------------------------> + +\subsection{Definition of multiple points : \tkzcname{tkzDefPoints}} + +\begin{NewMacroBox}{tkzDefPoints}{\oarg{local options}\marg{$x_1/y_1/n_1,x_2/y_2/n_2$, ...}} +$x_i$ et $y_i$ are the coordinates of a referenced point $n_i$ + +\begin{tabular}{lll} +\toprule +arguments & default & example \\ +\midrule +\TAline{$x_i/y_i/n_i$}{}{\tkzcname{tkzDefPoints\{0/0/O,2/2/A\}}} +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{label} {no default} {allows you to place a label at a predefined distance} +\TOline{shift} {no default} {Adds (x,y) or (a:d) to all coordinates} + \bottomrule +\end{tabular} + +\end{NewMacroBox} + +\subsection{Create a triangle} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,4/0/B,4/3/C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Create a square} +Note here the syntax for drawing the polygon. +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,2/0/B,2/2/C,0/2/D} + \tkzDrawPolygon(A,...,D) + \tkzDrawPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\section{Special points} +The introduction of the dots was done in \tkzname{tkz-base}, the most important macro being \tkzcname{tkzDefPoint}. Here are some special points. + +%<---------------------------------------------------------------------------> +\subsection{Middle of a segment \tkzcname{tkzDefMidPoint}} +It is a question of determining the middle of a segment. + +\begin{NewMacroBox}{tkzDefMidPoint}{\parg{pt1,pt2}} +The result is in \tkzname{tkzPointResult}. We can access it with \tkzcname{tkzGetPoint}. + + \medskip +\begin{tabular}{lll} +\toprule +arguments & default & definition \\ +\midrule +\TAline{(pt1,pt2)}{no default}{pt1 and pt2 are two points} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Use of \tkzcname{tkzDefMidPoint}} +Review the use of \tkzcname{tkzDefPoint} in \NamePack{tkz-base}. +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(2,3){A} + \tkzDefPoint(4,0){B} + \tkzDefMidPoint(A,B) \tkzGetPoint{C} + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints[right](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Barycentric coordinates } + +$pt_1$, $pt_2$, \dots, $pt_n$ being $n$ points, they define $n$ vectors $\overrightarrow{v_1}$, $\overrightarrow{v_2}$, \dots, $\overrightarrow{v_n}$ with the origin of the referential as the common endpoint. $\alpha_1$, $\alpha_2$, +\dots $\alpha_n$ is $n$ numbers, the vector obtained by : +\begin{align*} + \frac{\alpha_1 \overrightarrow{v_1} + \alpha_2 \overrightarrow{v_2} + \cdots + \alpha_n \overrightarrow{v_n}}{\alpha_1 + + \alpha_2 + \cdots + \alpha_n} +\end{align*} +defines a single point. + +\begin{NewMacroBox}{tkzDefBarycentricPoint}{\parg{pt1=$\alpha_1$,pt2=$\alpha_2$,\ldots}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{(pt1=$\alpha_1$,pt2=$\alpha_2$,\ldots)}{no default}{Each point has a assigned weight} +\bottomrule +\end{tabular} + +\medskip +You need at least two points. +\end{NewMacroBox} + + +\subsubsection{Using \tkzcname{tkzDefBarycentricPoint} with two points} +In the following example, we obtain the barycentre of points A and B with coefficients 1 and 2, in other words: +\[ + \overrightarrow{AI}= \frac{2}{3}\overrightarrow{AB} +\] + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(2,3){A} + \tkzDefShiftPointCoord[2,3](30:4){B} + \tkzDefBarycentricPoint(A=1,B=2) + \tkzGetPoint{I} + \tkzDrawPoints(A,B,I) + \tkzDrawLine(A,B) + \tkzLabelPoints(A,B,I) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Using \tkzcname{tkzDefBarycentricPoint} with three points} + +This time M is simply the centre of gravity of the triangle. For reasons of simplification and homogeneity, there is also \tkzcname{tkzCentroid} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.8] + \tkzDefPoint(2,1){A} + \tkzDefPoint(5,3){B} + \tkzDefPoint(0,6){C} + \tkzDefBarycentricPoint(A=1,B=1,C=1) + \tkzGetPoint{M} + \tkzDefMidPoint(A,B) \tkzGetPoint{C'} + \tkzDefMidPoint(A,C) \tkzGetPoint{B'} + \tkzDefMidPoint(C,B) \tkzGetPoint{A'} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A',B',C') + \tkzDrawPoints(A,B,C,M) + \tkzDrawLines[add=0 and 1](A,M B,M C,M) + \tkzLabelPoint(M){$M$} + \tkzAutoLabelPoints[center=M](A,B,C) + \tkzAutoLabelPoints[center=M,above right](A',B',C') +\end{tikzpicture} +\end{tkzexample} + +\subsection{Internal Similitude Center} +The centres of the two homotheties in which two circles correspond are called external and internal centres of similitude. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.75,rotate=-30] + \tkzDefPoint(0,0){O} + \tkzDefPoint(4,-5){A} + \tkzDefIntSimilitudeCenter(O,3)(A,1) + \tkzGetPoint{I} + \tkzExtSimilitudeCenter(O,3)(A,1) + \tkzGetPoint{J} + \tkzDefTangent[from with R= I](O,3 cm) + \tkzGetPoints{D}{E} + \tkzDefTangent[from with R= I](A,1 cm) + \tkzGetPoints{D'}{E'} + \tkzDefTangent[from with R= J](O,3 cm) + \tkzGetPoints{F}{G} + \tkzDefTangent[from with R= J](A,1 cm) + \tkzGetPoints{F'}{G'} + \tkzDrawCircle[R,fill=red!50,opacity=.3](O,3 cm) + \tkzDrawCircle[R,fill=blue!50,opacity=.3](A,1 cm) + \tkzDrawSegments[add = .5 and .5,color=red](D,D' E,E') + \tkzDrawSegments[add= 0 and 0.25,color=blue](J,F J,G) + \tkzDrawPoints(O,A,I,J,D,E,F,G,D',E',F',G') + \tkzLabelPoints[font=\scriptsize](O,A,I,J,D,E,F,G,D',E',F',G') +\end{tikzpicture} +\end{tkzexample} + +\clearpage \newpage +\section{Special points relating to a triangle} + +\subsection{Triangle center : \tkzcname{tkzDefTriangleCenter}} + +This macro allows you to define the center of a triangle. + + +\begin{NewMacroBox}{tkzDefTriangleCenter}{\oarg{local options}\parg{A,B,C}} +\tkzHandBomb\ Be careful, the arguments are lists of three points. This macro is used in conjunction with \tkzcname{tkzGetPoint} to get the center you are looking for. You can use \tkzname{tkzPointResult} if it is not necessary to keep the results. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & default & definition \\ + +\midrule +\TAline{(pt1,pt2,pt3)}{no default}{three points} +\midrule +options & default & definition \\ +\midrule +\TOline{ortho} {circum}{Intersection of the altitudes of a triangle} +\TOline{centroid} {circum}{centre of gravity. Intersection of the medians } +\TOline{circum}{circum}{circle center circumscribed} +\TOline{in} {circum}{centre du cercle inscrit dans à un triangle } +\TOline{ex} {circum}{center of a circle exinscribed to a triangle } +\TOline{euler}{circum}{centre of Euler's circle } +\TOline{symmedian} {circum}{Lemoine's point or symmedian centre or Grebe's point } +\TOline{spieker} {circum}{Spieker Circle Center} +\TOline{nagel}{circum}{Nagel Centre} +\TOline{mittenpunkt} {circum}{or else MiddlePoint center} +\TOline{feuerbach}{circum}{Feuerbach Point} + +\end{tabular} +\end{NewMacroBox} + +\subsubsection{\IoptName{tkzDefTriangleCenter}{ortho}} + The intersection H of the three altitudes of a triangle is called the orthocenter. + + +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,1){B} + \tkzDefPoint(1,4){C} + \tkzClipPolygon(A,B,C) + \tkzDefTriangleCenter[ortho](B,C,A) + \tkzGetPoint{H} + \tkzDefSpcTriangle[orthic,name=H](A,B,C){a,b,c} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPoints(A,B,C,H) + \tkzDrawLines[add=0 and 1](A,Ha B,Hb C,Hc) + \tkzLabelPoint(H){$H$} + \tkzAutoLabelPoints[center=H](A,B,C) + \tkzMarkRightAngles(A,Ha,B B,Hb,C C,Hc,A) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\IoptName{tkzDefTriangleCenter}{centroid}} + +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{-1/1/A,5/1/B} + \tkzDefEquilateral(A,B) + \tkzGetPoint{C} + \tkzDefTriangleCenter[centroid](A,B,C) + \tkzGetPoint{G} + \tkzDrawPolygon[color=brown](A,B,C) + \tkzDrawPoints(A,B,C,G) + \tkzDrawLines[add = 0 and 2/3](A,G B,G C,G) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\IoptName{tkzDefTriangleCenter}{circum}} + +\begin{tkzexample}[latex=6cm,small] + \begin{tikzpicture} + \tkzDefPoints{0/1/A,3/2/B,1/4/C} + \tkzDefTriangleCenter[circum](A,B,C) + \tkzGetPoint{G} + \tkzDrawPolygon[color=brown](A,B,C) + \tkzDrawCircle(G,A) + \tkzDrawPoints(A,B,C,G) + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{\IoptName{tkzDefTriangleCenter}{in}} + In geometry, the incircle or inscribed circle of a triangle is the largest circle contained in the triangle; it touches (is tangent to) the three sides. The center of the incircle is a triangle center called the triangle's incenter. + The center of the incircle, called the incenter, can be found as the intersection of the three internal angle bisectors. The center of an excircle is the intersection of the internal bisector of one angle (at vertex A, for example) and the external bisectors of the other two. The center of this excircle is called the excenter relative to the vertex A, or the excenter of A.[3] Because the internal bisector of an angle is perpendicular to its external bisector, it follows that the center of the incircle together with the three excircle centers form an orthocentric system.(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle}) + + \medskip + We get the centre of the inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}. + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/1/A,3/2/B,1/4/C} + \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I} + \tkzDefPointBy[projection=onto A--C](I) + \tkzGetPoint{Ib} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPoints(A,B,C,I) + \tkzDrawLines[add = 0 and 2/3](A,I B,I C,I) + \tkzDrawCircle(I,Ib) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\IoptName{tkzDefTriangleCenter}{ex}} + + +An excircle or escribed circle of the triangle is a circle lying outside the triangle, tangent to one of its sides and tangent to the extensions of the other two. Every triangle has three distinct excircles, each tangent to one of the triangle's sides. +(\url{https://en.wikipedia.org/wiki/Incircle_and_excircles_of_a_triangle}) + + + We get the centre of an inscribed circle of the triangle. The result is of course in \tkzname{tkzPointResult}. We can retrieve it with \tkzcname{tkzGetPoint}. + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/1/A,3/2/B,1/4/C} + \tkzDefCircle[ex](B,C,A) + \tkzGetFirstPoint{J_c} + \tkzGetSecondPoint{Tc} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPoints(A,B,C,J_c) + \tkzDrawCircle[red](J_c,Tc) + \tkzDrawLines[add=1.5 and 0](A,C B,C) + \tkzLabelPoints(J_c) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Utilisation de \IoptName{tkzDefTriangleCenter}{euler} } +This macro allows to obtain the center of the circle of the nine points or euler's circle or Feuerbach's circle. +The nine-point circle, also called Euler's circle or the Feuerbach circle, is the circle that passes through the perpendicular feet $H_A$, $H_B$, and $H_C$ dropped from the vertices of any reference triangle ABC on the sides opposite them. Euler showed in 1765 that it also passes through the midpoints $M_A$, $M_B$, $M_C$ of the sides of ABC. By Feuerbach's theorem, the nine-point circle also passes through the midpoints $E_A$, $E_B$, and $E_C$ of the segments that join the vertices and the orthocenter H. These points are commonly referred to as the Euler points. (\url{http://mathworld.wolfram.com/Nine-PointCircle.html}) + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[medial, + name=M](A,B,C){_A,_B,_C} + \tkzDefTriangleCenter[euler](A,B,C) + \tkzGetPoint{N} % I= N nine points + \tkzDefTriangleCenter[ortho](A,B,C) + \tkzGetPoint{H} + \tkzDefMidPoint(A,H) \tkzGetPoint{E_A} + \tkzDefMidPoint(C,H) \tkzGetPoint{E_C} + \tkzDefMidPoint(B,H) \tkzGetPoint{E_B} + \tkzDefSpcTriangle[ortho,name=H](A,B,C){_A,_B,_C} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawCircle(N,E_A) + \tkzDrawSegments[blue](A,H_A B,H_B C,H_C) + \tkzDrawPoints(A,B,C,N,H) + \tkzDrawPoints[red](M_A,M_B,M_C) + \tkzDrawPoints[blue]( H_A,H_B,H_C) + \tkzDrawPoints[green](E_A,E_B,E_C) + \tkzAutoLabelPoints[center=N, + font=\scriptsize](A,B,C,% + M_A,M_B,M_C,% + H_A,H_B,H_C,% + E_A,E_B,E_C) + \tkzLabelPoints[font=\scriptsize](H,N) + \tkzMarkSegments[mark=s|,size=3pt, + color=blue,line width=1pt](B,E_B E_B,H) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Using option \IoptName{tkzDefTriangleCenter}{symmedian}} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzDefPoint(1,4){C} + \tkzDefTriangleCenter[symmedian](A,B,C)\tkzGetPoint{K} + \tkzDefTriangleCenter[median](A,B,C)\tkzGetPoint{G} + \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I} + \tkzDefSpcTriangle[centroid,name=M](A,B,C){a,b,c} + \tkzDefSpcTriangle[incentral,name=I](A,B,C){a,b,c} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawPoints(A,B,C,K) + \tkzDrawLines[add = 0 and 2/3,blue](A,K B,K C,K) + \tkzDrawSegments[red,dashed](A,Ma B,Mb C,Mc) + \tkzDrawSegments[orange,dashed](A,Ia B,Ib C,Ic) + \tkzDrawLine(G,I) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Using option \IoptName{tkzDefTriangleCenter}{nagel}} + +Let$ Ta$ be the point at which the $Ja$ excircle meets the side BC of a triangle $ABC$, and define Tband Tc similarly. Then the lines $ATa$, $BTb$, and $CTc$ concur in the Nagel point $Na$. +\href{http://mathworld.wolfram.com/NagelPoint.html}{Weisstein, Eric W. "Nagel point." From MathWorld--A Wolfram Web Resource. } + + +\begin{tkzexample}[latex=8cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/A,6/0/B,4/6/C} + \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc} + \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc} + \tkzDrawPoints(Ja,Jb,Jc,Ta,Tb,Tc) + \tkzLabelPoints(Ja,Jb,Jc,Ta,Tb,Tc) + \tkzDrawPolygon[blue](A,B,C) + \tkzDefTriangleCenter[nagel](A,B,C) \tkzGetPoint{Na} + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Na) + \tkzLabelPoints[blue](B,C,A) + \tkzLabelPoints[red](Na) + \tkzDrawLines[add=0 and 1](A,Ta B,Tb C,Tc) + \tkzShowBB\tkzClipBB + \tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A) + \tkzDrawCircles[ex,gray](A,B,C C,A,B B,C,A) + \tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc) + \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C Jb,Tb,A Jc,Tc,B) + \end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Option Triangle "mittenpunkt"} +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/A,6/0/B,4/6/C} + \tkzDefSpcTriangle[centroid](A,B,C){Ma,Mb,Mc} + \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc} + \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc} + \tkzDefTriangleCenter[mittenpunkt](A,B,C) + \tkzGetPoint{Mi} + \tkzDrawPoints(Ma,Mb,Mc,Ja,Jb,Jc) + \tkzClipBB + \tkzDrawPolygon[blue](A,B,C) + \tkzDrawLines[add=0 and 1](Ja,Ma + Jb,Mb Jc,Mc) + \tkzDrawLines[add=1 and 1](A,B A,C B,C) + \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Mi) + \tkzLabelPoints[red](Mi) + \tkzLabelPoints[left](Mb) + \tkzLabelPoints(Ma,Mc,Jb,Jc) + \tkzLabelPoints[above left](Ja,Jc) + \tkzShowBB +\end{tikzpicture} +\end{tkzexample} +%<---------------------------------------------------------------------------> +%<---------------------------------------------------------------------------> +\clearpage \newpage +\section{Draw a point} +\subsubsection{Drawing points \tkzcname{tkzDrawPoint}} \hypertarget{tdrp}{} + +\begin{NewMacroBox}{tkzDrawPoint}{\oarg{local options}\parg{name}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{name of point} {no default} {Only one point name is accepted} +\bottomrule +\end{tabular} + +\medskip +The argument is required. The disc takes the color of the circle, but lighter. It is possible to change everything. The point is a node and therefore it is invariant if the drawing is modified by scaling. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}} +\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}} +\TOline{color} {black}{the default color can be changed } +\bottomrule +\end{tabular} + +\medskip +{We can create other forms such as \tkzname{cross}} +\end{NewMacroBox} + +\subsubsection{Example of point drawings} +Note that \tkzname{scale} does not affect the shape of the dots. Which is normal. Most of the time, we are satisfied with a single point shape that we can define from the beginning, either with a macro or by modifying a configuration file. + + +\begin{tkzexample}[latex=5cm,small] + \begin{tikzpicture}[scale=.5] + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){O} + \tkzDrawPoint[color=red](A) + \tkzDrawPoint[fill=blue!20,draw=blue](B) + \tkzDrawPoint[color=green](O) + \end{tikzpicture} +\end{tkzexample} + +It is possible to draw several points at once but this macro is a little slower than the previous one. Moreover, we have to make do with the same options for all the points. + +\hypertarget{tdrps}{} +\begin{NewMacroBox}{tkzDrawPoints}{\oarg{local options}\parg{liste}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{points list}{no default}{example \tkzcname{tkzDrawPoints(A,B,C)}} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{shape} {circle}{Possible \tkzname{cross} ou \tkzname{cross out}} +\TOline{size} {6}{$6 \times$ \tkzcname{pgflinewidth}} +\TOline{color} {black}{the default color can be changed } +\bottomrule +\end{tabular} + +\medskip +\tkzHandBomb\ Beware of the final "s", an oversight leads to cascading errors if you try to draw multiple points. The options are the same as for the previous macro. +\end{NewMacroBox} + +\subsubsection{First example} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){C} + \tkzDrawPoints[size=6,color=red, + fill=red!50](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Second example} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B} + \tkzDefPoint[label=below:$\mathcal{C}$, + shift={(2,3)}](-30:5.5){E} + \begin{scope}[shift=(A)] + \tkzDefPoint(30:5){C} + \end{scope} + \tkzCalcLength[cm](A,B)\tkzGetLength{rAB} + \tkzDrawCircle[R](A,\rAB cm) + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above](A) +\end{tikzpicture} +\end{tkzexample} + +\section{Point on line or circle} +\subsection{Point on a line} + +\begin{NewMacroBox}{tkzDefPointOnLine}{\oarg{local options}\parg{A,B}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{pt1,pt2} {no default} {Two points to define a line} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{pos=nb} {}{nb is a decimal } +\bottomrule +\end{tabular} + +\medskip + +\end{NewMacroBox} + +\subsubsection{Use of option \tkzname{pos} 1} +\begin{tkzexample}[latex=9cm,small] + \begin{tikzpicture} + \tkzDefPoints{0/0/A,4/0/B} + \tkzDrawLine[red](A,B) + \tkzDefPointOnLine[pos=1.2](A,B) + \tkzGetPoint{P} + \tkzDefPointOnLine[pos=-0.2](A,B) + \tkzGetPoint{R} + \tkzDefPointOnLine[pos=0.5](A,B) + \tkzGetPoint{S} + \tkzDrawPoints(A,B,P) + \tkzLabelPoints(A,B) + \tkzLabelPoint[above](P){pos=$1.2$} + \tkzLabelPoint[above](R){pos=$-.2$} + \tkzLabelPoint[above](S){pos=$.5$} + \tkzDrawPoints(A,B,P,R,S) + \tkzLabelPoints(A,B) + \end{tikzpicture} +\end{tkzexample} + +\subsection{Point on a circle} + +\begin{NewMacroBox}{tkzDefPointOnCircle}{\oarg{local options}\parg{A,B}} +\begin{tabular}{lll} +arguments & default & definition \\ +\midrule +\TAline{pt1,pt2} {no default} {Two points to define a line} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{angle} {0}{angle formed with the abscissa axis} +\TOline{center} {tkzPointResult}{circle center} +\TOline{radius} {|\tkzLengthResult pt|}{radius circle} +\bottomrule +\end{tabular} + + +\end{NewMacroBox} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/A,4/0/B,0.8/3/C} + \tkzDefPointOnCircle[angle=90,center=B, + radius=1 cm] + \tkzGetPoint{I} + \tkzDrawCircle[R,teal](B,1cm) + \tkzDrawPoint[teal](I) + \tkzDefCircle[circum](A,B,C) + \tkzGetPoint{G} \tkzGetLength{rG} + \tkzDefPointOnCircle[angle=30,center=G, + radius=\rG pt] + \tkzGetPoint{J} + \tkzDrawPoints(A,B,C) + \tkzDrawCircle(G,J) + \tkzDrawPoint(G) + \tkzDrawPoint[red](J) +\end{tikzpicture} +\end{tkzexample} + + +\endinput + + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex new file mode 100644 index 0000000000..98c1ef0c6d --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-pointwith.tex @@ -0,0 +1,270 @@ +\section{Defining points using a vector} + +\subsection{\tkzcname{tkzDefPointWith}} +There are several possibilities to create points that meet certain vector conditions. +This can be done with \tkzcname{tkzDefPointWith}. The general principle is as follows, two points are passed as arguments, i.e. a vector. The different options allow to obtain a new point forming with the first point ( with some exceptions) a collinear vector or a vector orthogonal to the first vector. Then the length is either proportional to that of the first one, or proportional to the unit. Since this point is only used temporarily, it does not have to be named immediately. The result is in \tkzcname{tkzPointResult}. The macro \tkzNameMacro{tkzGetPoint} allows you to retrieve the point and name it differently. + + There are options to define the distance between the given point and the obtained point. +In the general case this distance is the distance between the 2 points given as arguments if the option is of the "normed" type then the distance between the given point and the obtained point is 1 cm. Then the $K$ option allows to obtain multiples. + +\begin{NewMacroBox}{tkzDefPointWith}{\parg{pt1,pt2}} + It is in fact the definition of a point meeting vectorial conditions. + +\medskip + +\begin{tabular}{lll} +\toprule +arguments & definition & explication \\ +\midrule +\TAline{(pt1,pt2)} {point couple}{the result is a point in \tkzcname{tkzPointResult} } \\ + +\bottomrule +\end{tabular} + +\medskip +In what follows, it is assumed that the point is recovered by \tkzNameMacro{tkzGetPoint\{C\}} + +\begin{tabular}{lll} +\toprule +options & exemple & explication \\ +\midrule +\TOline{orthogonal}{[orthogonal](A,B)}{$AC=AB$ et $\overrightarrow{AC} \perp \overrightarrow{AB}$} +\TOline{orthogonal normed}{[orthogonal normed](A,B)}{$AC=1$ et $\overrightarrow{AC} \perp \overrightarrow{AB}$} +\TOline{linear}{[linear](A,B)}{$\overrightarrow{AC}=K \times \overrightarrow{AB}$} +\TOline{linear normed}{[linear normed](A,B)}{$AC=K$ et $\overrightarrow{AC}=k\times \overrightarrow{AB}$ } +\TOline{colinear= at \#1}{[colinear= at C](A,B)}{$\overrightarrow{CD}= \overrightarrow{AB}$ } +\TOline{colinear normed= at \#1}{[colinear normed= at C](A,B)}{$\overrightarrow{CD}= \overrightarrow{AB}$ } +\TOline{K}{[linear](A,B),K=2}{$\overrightarrow{AC}=2\times \overrightarrow{AB}$} + \bottomrule +\end{tabular} + +\end{NewMacroBox} + +\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{colinear at}} + $(\overrightarrow{AB}=\overrightarrow{CD})$ +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1.2, + vect/.style={->,shorten >=3pt,>=latex'}] + \tkzDefPoint(2,3){A} \tkzDefPoint(4,2){B} + \tkzDefPoint(0,1){C} + \tkzDefPointWith[colinear=at C](A,B) + \tkzGetPoint{D} + \tkzDrawPoints[color=red](A,B,C,D) + \tkzLabelPoints[above right=3pt](A,B,C,D) + \tkzDrawSegments[vect](A,B C,D) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{colinear at} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[vect/.style={->, + shorten >=3pt,>=latex'}] + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzDefPoint(1,2){C} + \tkzDefPointWith[colinear=at C](A,B) + \tkzGetPoint{G} + \tkzDefPointWith[colinear=at C,K=0.5](A,B) + \tkzGetPoint{H} + \tkzLabelPoints(A,B,C,G,H) + \tkzDrawPoints(A,B,C,G,H) + \tkzDrawSegments[vect](A,B C,H) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{colinear $K=\frac{\sqrt{2}}{2}$} + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[vect/.style={->, + shorten >=3pt,>=latex'}] + \tkzDefPoint(1,1){A} + \tkzDefPoint(4,2){B} + \tkzDefPoint(2,2){CU} + \tkzDefPointWith[colinear=at C,K=sqrt(2)/2](A,B) + \tkzGetPoint{D} + \tkzDrawPoints[color=red](A,B,C,D) + \tkzDrawSegments[vect](A,B C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{orthogonal}} +$K=-1$ afin que $(\overrightarrow{AC},\overrightarrow{AB})$ détermine un angle positif. AB=AC puisque $|K|=1$ +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=1.2, + vect/.style={->,shorten >=3pt,>=latex'}] + \tkzDefPoint(2,3){A} + \tkzDefPoint(4,2){B} + \tkzDefPointWith[orthogonal,K=-1](A,B) + \tkzGetPoint{C} + \tkzDrawPoints[color=red](A,B,C) + \tkzLabelPoints[right=3pt](A,B,C) + \tkzDrawSegments[vect](A,B A,C) + \tkzMarkRightAngle(B,A,C) +\end{tikzpicture} +\end{tkzexample} + + + +\subsubsection{ orthogonal simple} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(1,2){O} + \tkzDefPoint(2,5){I} + \tkzDefPointWith[orthogonal](O,I) + \tkzGetPoint{J} + \tkzDefPointWith[orthogonal,K=-1](O,I) + \tkzGetPoint{K} + \tkzDrawSegment(O,I) + \tkzDrawSegments[->](O,J O,K) + \tkzMarkRightAngles(I,O,J I,O,K) + \tkzDrawPoints(O,I,J,K) + \tkzLabelPoints(O,I,J,K) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{advanced orthogonal} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,6/0/B} + \tkzDefMidPoint(A,B) + \tkzGetPoint{I} + \tkzDefPointWith[orthogonal,K=-.75](B,A) + \tkzGetPoint{C} + \tkzInterLC(B,C)(B,I) + \tkzGetPoints{D}{F} + \tkzDuplicateSegment(B,F)(A,F) + \tkzGetPoint{E} + \tkzDrawArc[delta=10](F,E)(B) + \tkzInterLC(A,B)(A,E) + \tkzGetPoints{N}{M} + \tkzDrawArc[delta=10](A,M)(E) + \tkzDrawLines(A,B B,C A,F) + \tkzCompass(B,F) + \tkzDrawPoints(A,B,C,F,M,E) + \tkzLabelPoints(A,B,C,F,M,E) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{segment colinear and orthogonal} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.2, + vect/.style={->,shorten >=3pt,>=latex'}] + \tkzDefPoint(2,1){A} + \tkzDefPoint(6,2){B} + \tkzDefPointWith[orthogonal,K=.5](A,B) + \tkzGetPoint{C} + \tkzDefPointWith[colinear=at C,K=.5](A,B) + \tkzGetPoint{D} + \tkzMarkRightAngle[fill=gray!20](B,A,C) + \tkzDrawSegments[vect](A,B A,C C,D) + \tkzDrawPoints(A,...,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{orthogonal normed}, K=1} +AC=1 + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.2, + vect/.style={->,shorten >=3pt,>=latex'}] + \tkzDefPoint(2,3){A} \tkzDefPoint(4,2){B} + \tkzDefPointWith[orthogonal normed](A,B) + \tkzGetPoint{C} + \tkzDrawPoints[color=red](A,B,C) + \tkzDrawSegments[vect](A,B A,C) + \tkzMarkRightAngle[fill=gray!20](B,A,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDefPointWith} et \tkzname{orthogonal normed} K=2} +$K=2$ donc AC=2. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.2, + vect/.style={->,shorten >=3pt,>=latex'}] + \tkzDefPoint(2,3){A} \tkzDefPoint(5,1){B} + \tkzDefPointWith[orthogonal normed,K=2](A,B) + \tkzGetPoint{C} + \tkzDrawPoints[color=red](A,B,C) + \tkzDrawCircle[R](A,2cm) + \tkzDrawSegments[vect](A,B A,C) + \tkzMarkRightAngle[fill=gray!20](B,A,C) + \tkzLabelPoints[above=3pt](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{linear} } + Ici $K=0.5$ +This amounts to applying a homothety or a multiplication of a vector by a real. Here is the middle of $[AB]$. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.2] + \tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B} + \tkzDefPointWith[linear,K=0.5](A,B) + \tkzGetPoint{C} + \tkzDrawPoints[color=red](A,B,C) + \tkzDrawSegment(A,B) + \tkzLabelPoints[above right=3pt](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDefPointWith} \tkzname{linear normed}} +In the following example AC=1 and C belongs to $(AB)$. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.2] + \tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B} + \tkzDefPointWith[linear normed](A,B) + \tkzGetPoint{C} + \tkzDrawPoints[color=red](A,B,C) + \tkzDrawSegment(A,B) + \tkzLabelSegment(A,C){$1$} + \tkzLabelPoints[above right=3pt](A,B,C) +\end{tikzpicture} +\end{tkzexample} + + + +%<--------------------------------------------------------------------------–> +% tkzGetVectxy +%<--------------------------------------------------------------------------–> + + +\subsection{\tkzcname{tkzGetVectxy} } +Retrieving the coordinates of a vector + +\begin{NewMacroBox}{tkzGetVectxy}{\parg{$A,B$}\var{text}} +Allows to obtain the coordinates of a vector + +\medskip +\begin{tabular}{lll} +\toprule +arguments & example & explication \\ + +\midrule + +\TAline{(point)\{name of macro\}} {\tkzcname{tkzGetVectxy}(A,B)\{V\}}{\tkzcname{Vx},\tkzcname{Vy} : coordinates of $\overrightarrow{AB}$} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Coordinate transfer with \tkzcname{tkzGetVectxy}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,1){A} + \tkzDefPoint(4,2){B} + \tkzGetVectxy(A,B){v} + \tkzDefPoint(\vx,\vy){V} + \tkzDrawSegment[->,color=red](O,V) + \tkzDrawSegment[->,color=blue](A,B) + \tkzDrawPoints(A,B,O) + \tkzLabelPoints(A,B,O,V) +\end{tikzpicture} +\end{tkzexample} + + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex new file mode 100644 index 0000000000..fe50b39e2c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-polygons.tex @@ -0,0 +1,351 @@ +\section{Definition of polygons} + +\subsection{Defining the points of a square} \label{def_square} + We have seen the definitions of some triangles. Let us look at the definitions of some quadrilaterals and regular polygons. + + \begin{NewMacroBox}{tkzDefSquare}{\parg{pt1,pt2}} + +The square is defined in the forward direction. From two points, two more points are obtained such that the four taken in order form a square. The square is defined in the forward direction. The results are in \tkzname{tkzFirstPointResult} and \tkzname{tkzSecondPointResult}.\\ +We can rename them with \tkzcname{tkzGetPoints} + +\medskip +\begin{tabular}{lll} +\toprule +Arguments & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2}}{\tkzcname{tkzDefSquare}\parg{A,B}}{The square is defined in the direct direction} +\bottomrule + \end{tabular} +\end{NewMacroBox} + +\subsubsection{Using \tkzcname{tkzDefSquare} with two points} + +Note the inversion of the first two points and the result. + +\begin{tkzexample}[latex=4cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B} + \tkzDefSquare(A,B) + \tkzDrawPolygon[color=red](A,B,tkzFirstPointResult,% + tkzSecondPointResult) + \tkzDefSquare(B,A) + \tkzDrawPolygon[color=blue](B,A,tkzFirstPointResult,% + tkzSecondPointResult) +\end{tikzpicture} +\end{tkzexample} + + We may only need one point to draw an isosceles right-angled triangle so we use \tkzcname{tkzGetFirstPoint} or \tkzcname{tkzGetSecondPoint} + +\subsubsection{Use of \tkzcname{tkzDefSquare} to obtain an isosceles right-angled triangle} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefSquare(A,B) \tkzGetFirstPoint{C} + \tkzDrawPolygon[color=blue,fill=blue!30](A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Pythagorean Theorem and \tkzcname{tkzDefSquare} } +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] +\tkzInit +\tkzDefPoint(0,0){C} +\tkzDefPoint(4,0){A} +\tkzDefPoint(0,3){B} +\tkzDefSquare(B,A)\tkzGetPoints{E}{F} +\tkzDefSquare(A,C)\tkzGetPoints{G}{H} +\tkzDefSquare(C,B)\tkzGetPoints{I}{J} +\tkzFillPolygon[fill = red!50 ](A,C,G,H) +\tkzFillPolygon[fill = blue!50 ](C,B,I,J) +\tkzFillPolygon[fill = purple!50](B,A,E,F) +\tkzFillPolygon[fill = orange,opacity=.5](A,B,C) +\tkzDrawPolygon[line width = 1pt](A,B,C) +\tkzDrawPolygon[line width = 1pt](A,C,G,H) +\tkzDrawPolygon[line width = 1pt](C,B,I,J) +\tkzDrawPolygon[line width = 1pt](B,A,E,F) +\tkzLabelSegment[](A,C){$a$} +\tkzLabelSegment[](C,B){$b$} +\tkzLabelSegment[swap](A,B){$c$} +\end{tikzpicture} +\end{tkzexample} + +\subsection{Definition of parallelogram} + +\subsection{Defining the points of a parallelogram} +It is a matter of completing three points in order to obtain a parallelogram. + \begin{NewMacroBox}{tkzDefParallelogram}{\parg{pt1,pt2,pt3}} +From three points, another point is obtained such that the four taken in order form a parallelogram. The result is in \tkzname{tkzPointResult}. \\ +We can rename it with the name \tkzcname{tkzGetPoint}... + +\begin{tabular}{lll} +\toprule +arguments & default & definition \\ +\midrule +\TAline{\parg{pt1,pt2,pt3}}{no default}{Three points are necessary} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Example of a parallelogram definition} + +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,3/0/B,4/2/C} + \tkzDefParallelogram(A,B,C) + \tkzGetPoint{D} + \tkzDrawPolygon(A,B,C,D) + \tkzLabelPoints(A,B) + \tkzLabelPoints[above right](C,D) + \tkzDrawPoints(A,...,D) +\end{tikzpicture} +\end{tkzexample} + + + +\subsubsection{Simple example} +Explanation of the definition of a parallelogram +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,3/0/B,4/2/C} + \tkzDefPointWith[colinear= at C](B,A) + \tkzGetPoint{D} + \tkzDrawPolygon(A,B,C,D) + \tkzLabelPoints(A,B) + \tkzLabelPoints[above right](C,D) + \tkzDrawPoints(A,...,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Construction of the golden rectangle } + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5] + \tkzInit[xmax=14,ymax=10] + \tkzClip[space=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(8,0){B} + \tkzDefMidPoint(A,B)\tkzGetPoint{I} + \tkzDefSquare(A,B)\tkzGetPoints{C}{D} + \tkzDrawSquare(A,B) + \tkzInterLC(A,B)(I,C)\tkzGetPoints{G}{E} + \tkzDrawArc[style=dashed,color=gray](I,E)(D) + \tkzDefPointWith[colinear= at C](E,B) + \tkzGetPoint{F} + \tkzDrawPoints(C,D,E,F) + \tkzLabelPoints(A,B,C,D,E,F) + \tkzDrawSegments[style=dashed,color=gray]% +(E,F C,F B,E) +\end{tikzpicture} +\end{tkzexample} + + + + +\subsection{Drawing a square} + + \begin{NewMacroBox}{tkzDrawSquare}{\oarg{local options}\parg{pt1,pt2}} +The macro draws a square but not the vertices. It is possible to color the inside. The order of the points is that of the direct direction of the trigonometric circle. + +\medskip +\begin{tabular}{lll} +\toprule +arguments & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2}}{|\tkzcname{tkzDrawSquare}|\parg{A,B}}{|\tkzcname{tkzGetPoints\{C\}\{D\}}|} +\bottomrule + \end{tabular} + +\medskip + \begin{tabular}{lll} + options & example & explication \\ + \midrule + \TOline{Options TikZ}{|red,line width=1pt|}{} + \bottomrule + \end{tabular} +\end{NewMacroBox} + +\subsubsection{The idea is to inscribe two squares in a semi-circle.} + +\begin{tkzexample}[latex=6 cm,small] +\begin{tikzpicture}[scale=.75] + \tkzInit[ymax=8,xmax=8] + \tkzClip[space=.25] \tkzDefPoint(0,0){A} + \tkzDefPoint(8,0){B} \tkzDefPoint(4,0){I} + \tkzDefSquare(A,B) \tkzGetPoints{C}{D} + \tkzInterLC(I,C)(I,B) \tkzGetPoints{E'}{E} + \tkzInterLC(I,D)(I,B) \tkzGetPoints{F'}{F} + \tkzDefPointsBy[projection=onto A--B](E,F){H,G} + \tkzDefPointsBy[symmetry = center H](I){J} + \tkzDefSquare(H,J) \tkzGetPoints{K}{L} + \tkzDrawSector[fill=yellow](I,B)(A) + \tkzFillPolygon[color=red!40](H,E,F,G) + \tkzFillPolygon[color=blue!40](H,J,K,L) + \tkzDrawPolySeg[color=red](H,E,F,G) + \tkzDrawPolySeg[color=red](J,K,L) + \tkzDrawPoints(E,G,H,F,J,K,L) +\end{tikzpicture} +\end{tkzexample} + +\subsection{The golden rectangle} + \begin{NewMacroBox}{tkzDefGoldRectangle}{\parg{point,point}} +The macro determines a rectangle whose size ratio is the number $\Phi$. The created points are in \tkzname{tkzFirstPointResult} and \tkzname{tkzSecondPointResult}. They can be obtained with the macro \tkzcname{tkzGetPoints}. The following macro is used to draw the rectangle. + +\begin{tabular}{lll} +\toprule +arguments & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2}}{\parg{A,B}}{Si C et D sont créés alors $AB/BC=\Phi$} + \end{tabular} +\end{NewMacroBox} + + \begin{NewMacroBox}{tkzDrawGoldRectangle}{\oarg{local options}\parg{point,point}} +\begin{tabular}{lll} +arguments & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2}}{\parg{A,B}}{Draws the golden rectangle based on the segment $[AB]$} + \end{tabular} + +\medskip + \begin{tabular}{lll} + options & example & explication \\ + \midrule + \TOline{Options TikZ}{|red,line width=1pt|}{} + \bottomrule + \end{tabular} + +\end{NewMacroBox} + +% +\subsubsection{Golden Rectangles} + +\begin{tkzexample}[latex=6 cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} + \tkzDefGoldRectangle(A,B) \tkzGetPoints{C}{D} + \tkzDefGoldRectangle(B,C) \tkzGetPoints{E}{F} + \tkzDrawPolygon[color=red,fill=red!20](A,B,C,D) + \tkzDrawPolygon[color=blue,fill=blue!20](B,C,E,F) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Drawing a polygon} + + \begin{NewMacroBox}{tkzDrawPolygon}{\oarg{local options}\parg{liste de points}} +Just give a list of points and the macro plots the polygon using the \TIKZ\ options present. + +\begin{tabular}{lll} +\toprule +arguments & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2,pt3,...}}{|\BS tkzDrawPolygon[gray,dashed](A,B,C)|}{Drawing a triangle} + \end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule +options & default & example \\ +\midrule +\TOline{Options TikZ}{...}{|\BS tkzDrawPolygon[red,line width=2pt](A,B,C)|} + \end{tabular} +\end{NewMacroBox} + +\subsubsection{Draw a polygon 1} + +\begin{tkzexample}[latex=7cm, small] +\begin{tikzpicture} [rotate=18,scale=1.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2.25,0.2){B} + \tkzDefPoint(2.5,2.75){C} + \tkzDefPoint(-0.75,2){D} + \tkzDrawPolygon[fill=black!50!blue!20!](A,B,C,D) + \tkzDrawSegments[style=dashed](A,C B,D) +\end{tikzpicture}\end{tkzexample} + + +\subsection{Clip a polygon} + \begin{NewMacroBox}{tkzClipPolygon}{\oarg{local options}\parg{points list}} +This macro makes it possible to contain the different plots in the designated polygon. + +\medskip +\begin{tabular}{lll} +\toprule +options & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2}}{\parg{A,B}}{} +%\bottomrule + \end{tabular} +\end{NewMacroBox} +\subsubsection{Simple Example} +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] + \tkzClip[space=.5] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) + \tkzDefPoint(0,2){D} \tkzDefPoint(2,0){E} + \tkzDrawPoints(D,E) \tkzLabelPoints(D,E) + \tkzClipPolygon(A,B,C) + \tkzDrawLine[color=red](D,E) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example Sangaku in a square} +\begin{tkzexample}[latex=7cm, small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} + \tkzDefSquare(A,B) \tkzGetPoints{C}{D} + \tkzDrawPolygon(B,C,D,A) + \tkzClipPolygon(B,C,D,A) + \tkzDefPoint(4,8){F} + \tkzDefTriangle[equilateral](C,D) + \tkzGetPoint{I} + \tkzDrawPoint(I) + \tkzDefPointBy[projection=onto B--C](I) + \tkzGetPoint{J} + \tkzInterLL(D,B)(I,J) \tkzGetPoint{K} + \tkzDefPointBy[symmetry=center K](B) + \tkzGetPoint{M} + \tkzDrawCircle(M,I) + \tkzCalcLength(M,I) \tkzGetLength{dMI} + \tkzFillPolygon[color = orange](A,B,C,D) + \tkzFillCircle[R,color = yellow](M,\dMI pt) + \tkzFillCircle[R,color = blue!50!black](F,4 cm)% +\end{tikzpicture} +\end{tkzexample} + +\subsection{Color a polygon} + \begin{NewMacroBox}{tkzFillPolygon}{\oarg{local options}\parg{points list}} +You can color by drawing the polygon, but in this case you color the inside of the polygon without drawing it. + +\medskip +\begin{tabular}{lll} +\toprule +options & example & explication \\ +\midrule +\TAline{\parg{pt1,pt2,\dots}}{\parg{A,B,\dots}}{} +%\bottomrule + \end{tabular} +\end{NewMacroBox} + +\subsubsection{Color a polygon} +\begin{tkzexample}[latex=7cm, small] +\begin{tikzpicture}[scale=0.7] +\tkzInit[xmin=-3,xmax=6,ymin=-1,ymax=6] +\tkzDrawX[noticks] +\tkzDrawY[noticks] +\tkzDefPoint(0,0){O} \tkzDefPoint(4,2){A} +\tkzDefPoint(-2,6){B} +\tkzPointShowCoord[xlabel=$x$,ylabel=$y$](A) +\tkzPointShowCoord[xlabel=$x'$,ylabel=$y'$,% + ystyle={right=2pt}](B) +\tkzDrawSegments[->](O,A O,B) +\tkzLabelSegment[above=3pt](O,A){$\vec{u}$} +\tkzLabelSegment[above=3pt](O,B){$\vec{v}$} +\tkzMarkAngle[fill= yellow,size=1.8cm,% + opacity=.5](A,O,B) +\tkzFillPolygon[red!30,opacity=0.25](A,B,O) +\tkzLabelAngle[pos = 1.5](A,O,B){$\alpha$} +\end{tikzpicture} +\end{tkzexample} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex new file mode 100644 index 0000000000..d3a282366d --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex @@ -0,0 +1,561 @@ +\section{Presentation and Overview} + +\subsection{Why tkz-euclide ?} +My initial goal was to provide myself and other mathematics teachers with a tool to quickly create Euclidean geometry figures without investing too much effort in learning a new programming language. +Of course, tkz-euclide is for math teachers who use latex and makes it possible to easily create correct drawings by means of LaTeX. + +It appeared that the simplest method was to reproduce the one used to obtain construction by hand. +To describe a construction, you must of course define the objects but also the actions that you perform. It seemed to me that a syntax close to the language of mathematicians and their students would be more easily understandable; moreover, it also seemed to me that this syntax should be close to that of LaTeX. +The objects of course are points, segments, lines, triangles, polygons and circles. As for actions, I considered five to be sufficient, namely: define, create, draw, mark and label. + +The syntax is perhaps too verbose but it is, I believe, easily accessible. +As a result, the students like teachers were able to easily access this tool + +\subsection{tkz-euclide vs TikZ} + +I love programming with TikZ and without TikZ I would never have had the idea to create tkz-euclide but never forget that behind it there is TikZ and that it is always possible to insert code from TikZ. tkz-euclide doesn't prevent you from using TikZ. +That said, I don't think mixing syntax is a good thing. + +There is no need to compare TikZ and tkz-euclide. The latter is not addressed to the same audience as Tikz. The first one allows you to do a lot of things, the second one only does geometry drawings. The first one can do everything the second one does, but the second one will more easily do what you want. + +\subsection{How it works} + +\subsubsection{Example Part I gold triangle} +\begin{center} +\begin{tikzpicture} + +\tkzDefPoint(0,0){C} % possible \tkzDefPoint[label=below:$C$](0,0){C} but don't do this +\tkzDefPoint(2,6){B} +% We get D and E with a rotation +\tkzDefPointBy[rotation= center B angle 36](C) \tkzGetPoint{D} +\tkzDefPointBy[rotation= center B angle 72](C) \tkzGetPoint{E} +% Toget A we use an intersection of lines +\tkzInterLL(B,E)(C,D) \tkzGetPoint{A} +\tkzInterLL(C,E)(B,D) \tkzGetPoint{H} +% drawing +\tkzDrawArc[delta=10](B,C)(E) +\tkzDrawPolygon(C,B,D) +\tkzDrawSegments(D,A B,A C,E) +% angles +\tkzMarkAngles(C,B,D E,A,D) %this is to draw the arcs +\tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} +\tkzMarkRightAngle(B,H,C) +\tkzDrawPoints(A,...,E) +% Label only now +\tkzLabelPoints[below left](C,A) +\tkzLabelPoints[below right](D) +\tkzLabelPoints[above](B,E) +\end{tikzpicture} +\end{center} + +Let's analyze the figure +\begin{enumerate} + \item CBD and DBE are isosceles triangles; BC=BE and BD is a bisector of the angle CBE.From this we deduce that the CBD and DBE angles are equal and have the same measure $\alpha$. + \[\widehat{BAC} +\widehat{ABC} + \widehat{BCA}=180^\circ \text{in the triangle} BAC\] + \[3\alpha + \widehat{BCA}=180^\circ \text{in the triangle} CBD\] + then + \[\alpha + 2\widehat{BCA}=180^\circ \] soit + \[\widehat{BCA}=90^\circ -\alpha/2 \] + finally \[\widehat{CBD}=\alpha=36^\circ \] + the triangle CBD is a "gold" triangle +\end{enumerate} + +How construct a gold triangle or an angle of $36^\circ$ ? + +\begin{itemize} + \item We place the fixed points $C$ and $D$.|\tkzDefPoint(0,0){C}| and |\tkzDefPoint(4,0){D}|. + \item We construct a square $CDef$ and we construct the midpoint $m$ of $Cf$. + We can do all of this with a compass and a rule. + \item Then we trace an arc with center m through e. This arc cross the line $Cf$ at $n$ + \item Now the two arcs with center $C$ et $D$ and radius $Cn$ define the point $B$. +\end{itemize} + + +\begin{minipage}{.4\textwidth} + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefSquare(C,D) + \tkzGetPoints{e}{f} + \tkzDefMidPoint(C,f) + \tkzGetPoint{m} + \tkzInterLC(C,f)(m,e) + \tkzGetSecondPoint{n} + \tkzInterCC[with nodes](C,C,n)(D,C,n) + \tkzGetFirstPoint{B} + \tkzDrawSegment[brown,dashed](f,n) + \pgfinterruptboundingbox + \tkzDrawPolygon[brown,dashed](C,D,e,f) + \tkzDrawArc[brown,dashed](m,e)(n) + \tkzCompass[brown,dashed,delta=20](C,B) + \tkzCompass[brown,dashed,delta=20](D,B) + \endpgfinterruptboundingbox + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \end{tikzpicture} +\end{minipage} +\begin{minipage}{.6\textwidth} + \begin{tkzexample}[code only,small] + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefSquare(C,D) + \tkzGetPoints{e}{f} + \tkzDefMidPoint(C,f) + \tkzGetPoint{m} + \tkzInterLC(C,f)(m,e) + \tkzGetSecondPoint{n} + \tkzInterCC[with nodes](C,C,n)(D,C,n) + \tkzGetFirstPoint{B} + \tkzDrawSegment[brown,dashed](f,n) + \pgfinterruptboundingbox + \tkzDrawPolygon[brown,dashed](C,D,e,f) + \tkzDrawArc[brown,dashed](m,e)(n) + \tkzCompass[brown,dashed,delta=20](C,B) + \tkzCompass[brown,dashed,delta=20](D,B) + \endpgfinterruptboundingbox + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \end{tikzpicture} + \end{tkzexample} +\end{minipage} + + +After building the golden triangle $BCD$, we build the point $A$ by noticing that $BD=DA$. Then we get the point $E$ and finally the point $F$. This is done with already intersections of defined objects (line and circle). + + +\begin{center} + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefSquare(C,D) + \tkzGetPoints{e}{f} + \tkzDefMidPoint(C,f) + \tkzGetPoint{m} + \tkzInterLC(C,f)(m,e) + \tkzGetSecondPoint{n} + \tkzInterCC[with nodes](C,C,n)(D,C,n) + \tkzGetFirstPoint{B} + \tkzInterLC(C,D)(D,B) \tkzGetSecondPoint{A} + \tkzInterLC(B,A)(B,D) \tkzGetSecondPoint{E} + \tkzInterLL(B,D)(C,E) \tkzGetPoint{F} + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \tkzDrawPolygon(B,C,D) + \tkzDrawSegments(D,A A,B C,E) + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPoints(A,...,F) + \tkzMarkRightAngle[fill=blue!20](B,F,C) + \tkzFillAngles[fill=blue!10](C,B,D E,A,D) + \tkzMarkAngles(C,B,D E,A,D) + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzLabelPoints[below](A,C,D,E) + \tkzLabelPoints[above right](B,F) + \end{tikzpicture} +\end{center} + + + +\begin{tkzexample}[code only,small] + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefSquare(C,D) + \tkzGetPoints{e}{f} + \tkzDefMidPoint(C,f) + \tkzGetPoint{m} + \tkzInterLC(C,f)(m,e) + \tkzGetSecondPoint{n} + \tkzInterCC[with nodes](C,C,n)(D,C,n) + \tkzGetFirstPoint{B} + \tkzInterLC(C,D)(D,B) \tkzGetSecondPoint{A} + \tkzInterLC(B,A)(B,D) \tkzGetSecondPoint{E} + \tkzInterLL(B,D)(C,E) \tkzGetPoint{F} + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \tkzDrawPolygon(B,C,D) + \tkzDrawSegments(D,A A,B C,E) + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPoints(A,...,F) + \tkzMarkRightAngle[fill=blue!20](B,F,C) + \tkzFillAngles[fill=blue!10](C,B,D E,A,D) + \tkzMarkAngles(C,B,D E,A,D) + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzLabelPoints[below](A,C,D,E) + \tkzLabelPoints[above right](B,F) + \end{tikzpicture} +\end{tkzexample} + +\subsubsection{Example Part II two others methods gold and euclide triangle} + +tkz-euclide knows how to define a "gold" or "euclide" triangle. We can define BCD and BCA comme des triangles d'or + + + \begin{center} + \begin{tkzexample}[code only,small] + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefTriangle[gold](C,D) + \tkzGetPoint{B} + \tkzDefTriangle[gold](B,C) + \tkzGetPoint{A} + \tkzInterLC(B,A)(B,D) \tkzGetSecondPoint{E} + \tkzInterLL(B,D)(C,E) \tkzGetPoint{F} + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \tkzDrawPolygon(B,C,D) + \tkzDrawSegments(D,A A,B C,E) + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPoints(A,...,F) + \tkzMarkRightAngle[fill=blue!20](B,F,C) + \tkzFillAngles[fill=blue!10](C,B,D E,A,D) + \tkzMarkAngles(C,B,D E,A,D) + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzLabelPoints[below](A,C,D,E) + \tkzLabelPoints[above right](B,F) + \end{tikzpicture} + \end{tkzexample} + \end{center} + +Voici une dernière méthode qui utilise des rotations + +\begin{center} + \begin{tkzexample}[code only,small] + \begin{tikzpicture} + \tkzDefPoint(0,0){C} % possible + % \tkzDefPoint[label=below:$C$](0,0){C} + % but don't do this + \tkzDefPoint(2,6){B} + % We get D and E with a rotation + \tkzDefPointBy[rotation= center B angle 36](C) \tkzGetPoint{D} + \tkzDefPointBy[rotation= center B angle 72](C) \tkzGetPoint{E} + % To get A we use an intersection of lines + \tkzInterLL(B,E)(C,D) \tkzGetPoint{A} + \tkzInterLL(C,E)(B,D) \tkzGetPoint{H} + % drawing + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPolygon(C,B,D) + \tkzDrawSegments(D,A B,A C,E) + % angles + \tkzMarkAngles(C,B,D E,A,D) %this is to draw the arcs + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzMarkRightAngle(B,H,C) + \tkzDrawPoints(A,...,E) + % Label only now + \tkzLabelPoints[below left](C,A) + \tkzLabelPoints[below right](D) + \tkzLabelPoints[above](B,E) + \end{tikzpicture} + \end{tkzexample} +\end{center} + + +\subsubsection{Complete but minimal example} + + +A unit of length being chosen, the example shows how to obtain a segment of length $\sqrt{a}$ from a segment of length $a$, using a ruler and a compass. + +$IB=a$, $AI=1$ + +\vspace{12pt} +\hypertarget{firstex}{} + +\begin{tikzpicture}[scale=1,ra/.style={fill=gray!20}] + % fixed points + \tkzDefPoint(0,0){A} + \tkzDefPoint(1,0){I} + % calculation + \tkzDefPointBy[homothety=center A ratio 10 ](I) \tkzGetPoint{B} + \tkzDefMidPoint(A,B) \tkzGetPoint{M} + \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{i} + \tkzInterLC(I,i)(M,B) \tkzGetSecondPoint{C} + \tkzDrawSegment[style=orange](I,C) + \tkzDrawArc(M,B)(A) + \tkzDrawSegment[dim={$1$,-16pt,}](A,I) + \tkzDrawSegment[dim={$a/2$,-10pt,}](I,M) + \tkzDrawSegment[dim={$a/2$,-16pt,}](M,B) + \tkzMarkRightAngle[ra](A,I,C) + \tkzDrawPoints(I,A,B,C,M) + \tkzLabelPoint[left](A){$A(0,0)$} + \tkzLabelPoints[above right](I,M) + \tkzLabelPoints[above left](C) + \tkzLabelPoint[right](B){$B(10,0)$} + \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$} +\end{tikzpicture} + +\emph{Commentaires} + +\begin{itemize} +\item The Preamble + + + Let us first look at the preamble. If you need it, you have to load \tkzname{xcolor} before \tkzname{tkz-euclide}, that is, before \TIKZ\ . \TIKZ\ may cause problems with the active characters , but... + provides a library in its latest version that's supposed to solve these problems \NameLib{babel}. + +\begin{tkzltxexample}[] +\documentclass{standalone} % or another class + % \usepackage{xcolor} % before tikz or tkz-euclide if necessary +\usepackage{tkz-euclide} % no need to load TikZ + % \usetkzobj{all} is no longer necessary + % \usetikzlibrary{babel} if there are problems with the active characters +\end{tkzltxexample} + +The following code consists of several parts: + + \item Definition of fixed points: the first part includes the definitions of the points necessary for the construction, these are the fixed points. The macros \tkzcname{tkkzInit} and \tkzcname{tkkzClip} in most cases are not necessary. + +\begin{tkzltxexample}[] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){I} + \tkzDefPoint(10,0){B} +\end{tkzltxexample} + + \item The second part is dedicated to the creation of new points from the fixed points; + a $B$ point is placed at $10 cm$ from $A$. The middle of $[AB]$ is defined by $M$ and then the orthogonal line to the $(AB)$ line is searched for at the $I$ point. Then we look for the intersection of this line with the semi-circle of center $M$ passing through $A$. + +\begin{tkzltxexample}[] + \tkzDefPointBy[homothety=center A ratio 10 ](I) + \tkzGetPoint{B} + \tkzDefMidPoint(A,B) + \tkzGetPoint{M} + \tkzDefPointWith[orthogonal](I,M) + \tkzGetPoint{H} + \tkzInterLC(I,H)(M,A) + \tkzGetSecondPoint{B} + \end{tkzltxexample} + + + \item The third one includes the different drawings; + \begin{tkzltxexample}[] + \tkzDrawSegment[style=dashed](I,H) + \tkzDrawPoints(O,I,A,B,M) + \tkzDrawArc(M,A)(O) + \tkzDrawSegment[dim={$1$,-16pt,}](O,I) % voir la documentation pour l'usage de dim + \tkzDrawSegment[dim={$a/2$,-10pt,}](I,M) + \tkzDrawSegment[dim={$a/2$,-16pt,}](M,A) + \end{tkzltxexample} + +\item Marking: the fourth is devoted to marking; + + +\begin{tkzltxexample}[] + \tkzMarkRightAngle(A,I,B) + \end{tkzltxexample} + + \item Labelling: the latter only deals with the placement of labels. +\begin{tkzltxexample}[] + \tkzLabelPoint[left](O){$A(0,0)$} + \tkzLabelPoint[right](A){$B(10,0)$} + \tkzLabelSegment[right=4pt](I,B){$\sqrt{a^2}=a \ (a>0)$} +\end{tkzltxexample} + + +\item The full code: + + +\begin{tkzexample}[code only] + \begin{tikzpicture}[scale=1,ra/.style={fill=gray!20}] + % fixed points + \tkzDefPoint(0,0){A} + \tkzDefPoint(1,0){I} + % calculation + \tkzDefPointBy[homothety=center A ratio 10 ](I) \tkzGetPoint{B} + \tkzDefMidPoint(A,B) \tkzGetPoint{M} + \tkzDefPointWith[orthogonal](I,M) \tkzGetPoint{i} + \tkzInterLC(I,i)(M,B) \tkzGetSecondPoint{C} + + \tkzDrawSegment[style=orange](I,C) + \tkzDrawArc(M,B)(A) + \tkzDrawSegment[dim={$1$,-16pt,}](A,I) + \tkzDrawSegment[dim={$a/2$,-10pt,}](I,M) + \tkzDrawSegment[dim={$a/2$,-16pt,}](M,B) + \tkzMarkRightAngle[ra](A,I,C) + \tkzDrawPoints(I,A,B,C,M) + \tkzLabelPoint[left](A){$A(0,0)$} + \tkzLabelPoints[above right](I,M) + \tkzLabelPoints[above left](C) + \tkzLabelPoint[right](B){$B(10,0)$} + \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$} + \end{tikzpicture} +\end{tkzexample} +\end{itemize} + +\newpage +\subsection{The Elements of tkz code} +In this paragraph, we start looking at the "rules" and "symbols" used to create a figure with tkz-euclide. + + The primitive objects are points. You can refer to a point at any time using the name given when defining it. (it is possible to assign a different name later on). + +\medskip +In general, tkz-euclide macros have a name beginning with tkz. There are four main categories starting with~: +|\tkzDef...| |\tkzDraw...| |\tkzMark...| et |\tkzLabel...| + +Among the first category, |\tkzDefPoint| allows you to define fixed points. It will be studied in detail later. Here we will see in detail the macro DefTriangle |\tkzDefTriangle|. + +This macro makes it possible to associate to a pair of points a third point in order to define a certain triangle |\tkzDefTriangle(A,B)|. The obtained point is referenced |tkzPointResult| and it is possible to choose another reference with |\tkzGetPoint{C}| for example. +Parentheses are used to pass arguments. In |(A,B)| $A$ and $B$ are the points with which a third will be defined. + +However, in |{C}| we use braces to retrieve the new point. +In order to choose a certain type of triangle among the following choices : + |equilateral|, |halftone|, |pythagoras|, |school|, |golden or sublime|, |euclide|, |gold|, |cheops|... + and |two angles| you just have to choose between hooks, for example~: + +|\tkzDefTriangle[euclide](A,B) \tkzGetPoint{C}| + +\begin{minipage}{0.5\textwidth} + \begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,8/0/B} + \foreach \tr in {equilateral,half,pythagore,% + school,golden,euclide, gold,cheops} + {\tkzDefTriangle[\tr](A,B) \tkzGetPoint{C} + \tkzDrawPoint(C) + \tkzLabelPoint[right](C){\tr} + \tkzDrawSegments(A,C C,B)} + \tkzDrawPoints(A,B) + \tkzDrawSegments(A,B) + \end{tikzpicture} +\end{minipage} +\begin{minipage}{0.5\textwidth} + \begin{tkzexample}[code only,small] + \begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,8/0/B} + \foreach \tr in {equilateral,half,pythagore,% + school,golden,euclide, gold,cheops} + {\tkzDefTriangle[\tr](A,B) \tkzGetPoint{C} + \tkzDrawPoint(C) + \tkzLabelPoint[right](C){\tr} + \tkzDrawSegments(A,C C,B)} + \tkzDrawPoints(A,B) + \tkzDrawSegments(A,B) + \end{tikzpicture} + \end{tkzexample} + +\end{minipage} + + +\subsection{Conventions} + +For this documentation, I used the geometric French and personal conventions for naming the points: +\begin{itemize} +\item $O$ is a center for a circle, a rotation, etc.; +\item $M$ defined a midpoint; +\item $H$ defined the foot of an altitude; +\item $P'$ is the image of $P$ by a transformation ; +\item $a$ defined an angle (degree), $r$ the length of a radius, $d$ a length (or dimension); +\item ($x_1$,$y_1$) coordinates of the point $A_1$, ($x_A$,$y_A$) coordinates of the point $A$; +\item $[AB]$ a line segment, $(AB)$ a line. +\end{itemize} + +\subsection{How to use the tkz-euclide package ?} +\subsubsection{Let's look at a classic example} +In order to show the right way, we will see how to build an equilateral triangle. Several possibilities are open to us, we are going to follow the steps of Euclid. + +\begin{itemize} +\item First of all you have to use a document class. The best choice to test your code is to create a single figure with the class \tkzname{standalone}\index{standalone}. +\begin{verbatim} +\documentclass{standalone} +\end{verbatim} +\item Then load the tkz-euclide package: +\begin{verbatim} +\usepackage{tkz-euclide} +\end{verbatim} + + You don't need to load \TIKZ\ because the tkz-euclide package works on top of TikZ and loads it. + \item {\color{red} \bomb \sout{|\BS usetkzobj{all}| }} + With the new version 3.02 you don't need this line anymore. All objects are now loaded. + \item Start the document and open a TikZ picture environment: +\begin{verbatim} +\begin{document} +\begin{tikzpicture} +\end{verbatim} + +\item Now we define two fixed points: +\begin{verbatim} +\tkzDefPoint(O,O){A} +\tkzDefPoint(5,2){B} +\end{verbatim} + +\item Two points define two circles, let's use these circles : + + circle with center $A$ through $B$ and circle with center $B$ through $A$. These two circles have two points in common. +\begin{verbatim} +\tkzInterCC(A,B)(B,A) +\end{verbatim} +we can get the points of intersection with +\begin{verbatim} +\tkzGetPoints{C}{D} +\end{verbatim} + +\item All the necessary points are obtained, we can move on to the final steps including the plots. +\begin{verbatim} +\tkzDrawPolygon(A,B,C)% The triangle +\end{verbatim} +\item Draw all points A,B,C and D : +\begin{verbatim} +\tkzDrawPoints(A,...,D) +\end{verbatim} + +\item The final step, we print labels to the points and use options for positioning:\\ +\begin{verbatim} +\tkzLabelPoints[below left](A) +\tkzLabelPoints(B,D) +\tkzLabelPoint (above] (C){$C$} +\end{verbatim} +\item We finally close both environments +\begin{verbatim} +\end{tikzpicture} +\end{document} +\end{verbatim} + +\item The complete code + +\begin{tkzexample}[latex=8cm,small] + \begin{tikzpicture}[scale=.5] + % fixed points + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,2){B} + % calculus + \tkzInterCC(A,B)(B,A) + \tkzGetPoints{C}{D} + % drawings + \tkzDrawCircles[gray,dashed](A,B B,A) + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,...,D) + % marking + \tkzMarkSegments[mark=s||](A,B B,C C,A) + % labelling + \tkzLabelSegments[swap](A,B){$c$} + \tkzLabelPoints(A,B,D) + \tkzLabelPoints[above](C) +\end{tikzpicture} +\end{tkzexample} + + \end{itemize} + +\subsubsection{"Set, Calculate, Draw, Mark, Label"} +The title could have been : \texttt{Separation of Calculus and Drawings} + +When a document is prepared using the LaTeX system, the source code of the document can be divided into two parts: the document body and the preamble. +Under this methodology, publications can be structured, styled and typeset with minimal effort. +I propose a similar methodology for creating figures with tkz-euclide. + +The first part defines the fixed points, the second part allows the creation of new points. These are the two main parts. All that is left to do is to draw, mark and label. + + + + +\endinput + + + + + + + + + + + + + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex new file mode 100644 index 0000000000..a528e9bb57 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rapporteur.tex @@ -0,0 +1,49 @@ +\section{Rapporteurs} + + +D'après une idée de Yves Combe., la macro suivante permet de dessiner un rapporteur. + + +\begin{NewMacroBox}{tkzProtractor}{\oarg{local options}\parg{$O,A$}} + +\medskip +\begin{tabular}{lll} +\toprule +options & défaut & définition \\ +\midrule +\TOline{lw} {0.4 pt} { épaisseur des lignes} +\TOline{scale} {1} { ratio : permet d'ajuster la taille du rapporteur} \TOline{return} {false} { sens indirect du cercle trigonométrique} +\end{tabular} +\end{NewMacroBox} + + +\subsection{Le rapporteur circulaire} + +Mesure dans le sens direct + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] +\tkzDefPoint(2,0){A}\tkzDefPoint(0,0){O} +\tkzDefShiftPoint[A](31:5){B} +\tkzDefShiftPoint[A](158:5){C} +\tkzDrawPoints(A,B,C) +\tkzDrawSegments[color = red, + line width = 1pt](A,B A,C) + \tkzProtractor[scale = 1](A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Le rapporteur circulaire, transparent et retourné} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.5] + \tkzDefPoint(2,3){A} + \tkzDefShiftPoint[A](31:5){B} + \tkzDefShiftPoint[A](158:5){C} + \tkzDrawSegments[color=red,line width=1pt](A,B A,C) + \tkzProtractor[return](A,C) +\end{tikzpicture} +\end{tkzexample} + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex new file mode 100644 index 0000000000..37e0fdb6ba --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-rnd.tex @@ -0,0 +1,177 @@ +\section{Random point definition} +%<---------------------------------------------------------------------------> +% points random +%<---------------------------------------------------------------------------> +At the moment there are four possibilities: +\begin{enumerate} + \item point in a rectangle, + \item on a segment, + \item on a straight line, + \item on a circle. +\end{enumerate} + +\subsection{Obtaining random points} +This is the new version that replaces \tkzcname{tkzGetRandPointOn} +\begin{NewMacroBox}{tkzDefRandPointOn}{\oarg{local options}} +{The result is a point with a random position that can be named with the macro \tkzcname{tkzGetPoint}. It is possible to use \tkzname{tkzPointResult} if it is not necessary to retain the results..} + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{rectangle=pt1 and pt2} {}{[rectangle=A and B]} +\TOline{segment= pt1--pt2} {}{[segment=A--B]} +\TOline{line=pt1--pt2}{}{[line=A--B]} +\TOline{circle =center pt1 radius dim}{}{[circle = center A radius 2cm]} +\TOline{circle through=center pt1 through pt2}{}{[circle through= center A through B]} +\TOline{disk through=center pt1 through pt2}{}{[disk through=center A through B]} + \bottomrule +\end{tabular} + +\end{NewMacroBox} + +\subsection{Random point in a rectangle} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=5]\tkzGrid + \tkzDefPoints{0/0/A,2/2/B,5/5/C} + \tkzDefRandPointOn[rectangle = A and B] + \tkzGetPoint{a} + \tkzDefRandPointOn[rectangle = B and C] + \tkzGetPoint{d} + \tkzDrawLine(a,d) + \tkzDrawPoints(A,B,C,a,d) + \tkzLabelPoints(A,B,C,a,d) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Random point on a segment} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] \tkzGrid + \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D} + \tkzDefRandPointOn[segment = A--B]\tkzGetPoint{a} + \tkzDefRandPointOn[segment = C--D]\tkzGetPoint{d} + \tkzDrawPoints(A,B,C,D,a,d) + \tkzLabelPoints(A,B,C,D,a,d) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Random point on a straight line} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] \tkzGrid + \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D} + \tkzDefRandPointOn[line = A--B]\tkzGetPoint{a} + \tkzDefRandPointOn[line = C--D]\tkzGetPoint{d} + \tkzDrawPoints(A,B,C,D,a,d) + \tkzLabelPoints(A,B,C,D,a,d) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Example of random points} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoints{0/0/A,2/2/B,-1/-1/C} + \tkzDefCircle[through=](A,C) + \tkzGetLength{rAC} + \tkzDrawCircle(A,C) + \tkzDrawCircle(A,B) + \tkzDefRandPointOn[rectangle=A and B] + \tkzGetPoint{a} + \tkzDefRandPointOn[segment=A--B] + \tkzGetPoint{b} + \tkzDefRandPointOn[circle=center A radius \rAC pt] + \tkzGetPoint{d} + \tkzDefRandPointOn[circle through= center A through B] + \tkzGetPoint{c} + \tkzDefRandPointOn[disk through=center A through B] + \tkzGetPoint{e} + \tkzLabelPoints[above right=3pt](A,B,C,a,b,...,e) + \tkzDrawPoints[](A,B,C,a,b,...,e) + \tkzDrawRectangle(A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Random point on a circle} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] \tkzGrid + \tkzDefPoints{3/2/A,1/1/B} + \tkzCalcLength[cm](A,B) \tkzGetLength{rAB} + \tkzDrawCircle[R](A,\rAB cm) + \tkzDefRandPointOn[circle = center A radius + \rAB cm]\tkzGetPoint{a} + \tkzDrawSegment(A,a) + \tkzDrawPoints(A,B,a) + \tkzLabelPoints(A,B,a) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Random example and circle of Apollonius} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{0/0/A,3/0/B} + \def\coeffK{2} + \tkzApolloniusCenter[K=\coeffK](A,B) + \tkzGetPoint{P} + \tkzDefApolloniusPoint[K=\coeffK](A,B) + \tkzGetPoint{M} + \tkzDefApolloniusRadius[K=\coeffK](A,B) + \tkzDrawCircle[R,color = blue!50!black, + fill=blue!20, + opacity=.4](tkzPointResult,\tkzLengthResult pt) + \tkzDefRandPointOn[circle through= center P through M] + \tkzGetPoint{N} + \tkzDrawPoints(A,B,P,M,N) + \tkzLabelPoints(A,B,P,M,N) + \tkzDrawSegments[red](N,A N,B) + \tkzDrawPoints(A,B) + \tkzDrawSegments[red](A,B) + \tkzLabelCircle[R,draw,fill=green!10,% + text width=3cm,% + text centered](P,\tkzLengthResult pt-20pt)(-120)% + { $MA/MB=\coeffK$\\$NA/NB=\coeffK$} +\end{tikzpicture} +\end{tkzexample} + + + +\subsection{Middle of a compass segment} + To conclude this section, here is a more complex example. It involves determining the middle of a segment, using only a compass. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoint(0,0){A} + \tkzDefRandPointOn[circle= center A radius 4cm] + \tkzGetPoint{B} + \tkzDrawPoints(A,B) + \tkzDefPointBy[rotation= center A angle 180](B) + \tkzGetPoint{C} + \tkzInterCC[R](A,4 cm)(B,4 cm) + \tkzGetPoints{I}{I'} + \tkzInterCC[R](A,4 cm)(I,4 cm) + \tkzGetPoints{J}{B} + \tkzInterCC(B,A)(C,B) + \tkzGetPoints{D}{E} + \tkzInterCC(D,B)(E,B) + \tkzGetPoints{M}{M'} + \tikzset{arc/.style={color=brown,style=dashed,delta=10}} + \tkzDrawArc[arc](C,D)(E) + \tkzDrawArc[arc](B,E)(D) + \tkzDrawCircle[color=brown,line width=.2pt](A,B) + \tkzDrawArc[arc](D,B)(M) + \tkzDrawArc[arc](E,M)(B) + \tkzCompasss[color=red,style=solid](B,I I,J J,C) + \tkzDrawPoints(B,C,D,E,M) + \tkzLabelPoints(A,B,M) + \end{tikzpicture} + \end{tkzexample} + +\endinput + +
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex new file mode 100644 index 0000000000..e615d1c0a0 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-sectors.tex @@ -0,0 +1,241 @@ +\section{Les secteurs} + +\subsection{\tkzcname{tkzDrawSector}} +\begin{NewMacroBox}{tkzDrawSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}} +\tkzHandBomb\ Attention les arguments varient en fonction des options. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)} +\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur } +\TOline{R}{towards}{On donne le rayon et deux angles} +\TOline{R with nodes}{towards}{On donne le rayon et deux points} +\bottomrule +\end{tabular} + +\medskip +Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés + +\medskip + +\begin{tabular}{lll} +\toprule +options & arguments & exemple \\ +\midrule +\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzDrawSector(O,A)(B)}} +\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzDrawSector[rotate,color=red](O,A)(90)}} +\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzDrawSector[R,color=blue](O,2 cm)(30,90)}} +\TOline{R with nodes}{\parg{pt,$r$}\parg{pt,pt}}{\tkzcname{tkzDrawSector[R with nodes](O,2 cm)(A,B)}} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +Quelques exemples : + +\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{towards}} +Il est inutile de mettre \tkzname{towards}. Il est possible d'utiliser \tkzimp{fill} en option. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){O} + \tkzDefPoint(-30:3){A} + \tkzDefPointBy[rotation = center O angle -60](A) + \tkzDrawSector[fill=red!50](O,A)(tkzPointResult) + \begin{scope}[shift={(-60:1cm)}] + \tkzDefPoint(0,0){O} + \tkzDefPoint(-30:3){A} + \tkzDefPointBy[rotation = center O angle -60](A) + \tkzDrawSector[fill=blue!50](O,tkzPointResult)(A) + \end{scope} +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{rotate}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=2] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,2){A} + \tkzDrawSector[rotate,draw=red!50!black,% + fill=red!20](O,A)(30) + \tkzDrawSector[rotate,draw=blue!50!black,% + fill=blue!20](O,A)(-30) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDrawSector[R,draw=white,% + fill=red!50](O,2cm)(30,90) + \tkzDrawSector[R,draw=white,% + fill=red!60](O,2cm)(90,180) + \tkzDrawSector[R,draw=white,% + fill=red!70](O,2cm)(180,270) + \tkzDrawSector[R,draw=white,% + fill=red!90](O,2cm)(270,360) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoint(0,0){O} + \tkzDefPoint(4,-2){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(3,3){C} + \tkzDrawSector[R with nodes,% + fill=blue!20](O,1 cm)(B,C) + \tkzDrawSector[R with nodes,% + fill=red!20](O,1.25 cm)(A,B) +\tkzDrawSegments(O,A O,B O,C) +\tkzDrawPoints(O,A,B,C) +\tkzLabelPoints(A,B,C) +\tkzLabelPoints[left](O) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{\tkzcname{tkzDrawSector} et \tkzname{R with nodes}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} [scale=.5] + \tkzDefPoint(-1,-2){A} + \tkzDefPoint(1,3){B} + \tkzDefRegPolygon[side,sides=6](A,B) + \tkzGetPoint{O} + \tkzDrawPolygon[fill=black!10, + draw=blue](P1,P...,P6) + \tkzLabelRegPolygon[sep=1.05](O){A,...,F} + \tkzDrawCircle[dashed](O,A) + \tkzLabelSegment[above,sloped, + midway](A,B){\(A B = 16m\)} + \foreach \i [count=\xi from 1] in {2,...,6,1} + {% + \tkzDefMidPoint(P\xi,P\i) + \path (O) to [pos=1.1] node {\xi} (tkzPointResult) ; + } + \tkzDefRandPointOn[segment = P3--P5] + \tkzGetPoint{S} + \tkzDrawSegments[thick,dashed,red](A,S S,B) + \tkzDrawPoints(P1,P...,P6,S) + \tkzLabelPoint[left,above](S){$S$} + \tkzDrawSector[R with nodes,fill=red!20](S,2 cm)(A,B) + \tkzLabelAngle[pos=1.5](A,S,B){$\alpha$} +\end{tikzpicture} +\end{tkzexample} + +\subsection{\tkzcname{tkzFillSector}} +\begin{NewMacroBox}{tkzFillSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}} +\tkzHandBomb\ Attention les arguments varient en fonction des options. + +\medskip + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{towards}{towards}{O est le centre et l'arc par de A vers (OB)} +\TOline{rotate} {towards}{l'arc part de A et l'angle détermine sa longueur } +\TOline{R}{towards}{On donne le rayon et deux angles} +\TOline{R with nodes}{towards}{On donne le rayon et deux points} +\bottomrule +\end{tabular} + +\medskip +Il faut ajouter bien sûr tous les styles de \TIKZ pour les tracés + +\medskip +\begin{tabular}{lll} +\toprule +options & arguments & exemple \\ +\midrule +\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzFillSector(O,A)(B)}} +\TOline{rotate} {\parg{pt,pt}\parg{an}}{\tkzcname{tkzFillSector[rotate,color=red](O,A)(90)}} +\TOline{R}{\parg{pt,$r$}\parg{an,an}}{\tkzcname{tkzFillSector[R,color=blue](O,2 cm)(30,90)}} +\TOline{R with nodes}{\parg{pt,$r$}\parg{pt,pt}}{\tkzcname{tkzFillSector[R with nodes](O,2 cm)(A,B)}} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{\tkzcname{tkzFillSector} et \tkzname{towards}} +Il est inutile de mettre \tkzname{towards} et vous remarquerez que les contours ne sont pas tracés,seule la surface est colorée. +\begin{tkzexample}[latex=5.75cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(0,0){O} + \tkzDefPoint(-30:3){A} + \tkzDefPointBy[rotation = center O angle -60](A) + \tkzFillSector[fill=red!50](O,A)(tkzPointResult) + \begin{scope}[shift={(-60:1cm)}] + \tkzDefPoint(0,0){O} + \tkzDefPoint(-30:3){A} + \tkzDefPointBy[rotation = center O angle -60](A) + \tkzFillSector[color=blue!50](O,tkzPointResult)(A) + \end{scope} +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{\tkzcname{tkzFillSector} et \tkzname{rotate}} +\begin{tkzexample}[latex=5.75cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} \tkzDefPoint(2,2){A} + \tkzFillSector[rotate,color=red!20](O,A)(30) + \tkzFillSector[rotate,color=blue!20](O,A)(-30) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\subsection{\tkzcname{tkzClipSector}} +\begin{NewMacroBox}{tkzClipSector}{\oarg{local options}\parg{O,\dots}\parg{\dots}} +\tkzHandBomb\ Attention les arguments varient en fonction des options. + +\medskip + +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{towards}{towards}{O est le centre et le secteur part de A vers (OB)} +\TOline{rotate} {towards}{le secteur part de A et l'angle détermine son amplitude } +\TOline{R}{towards}{On donne le rayon et deux angles} +\bottomrule +\end{tabular} + +\medskip +Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés + +\medskip +\begin{tabular}{lll} +\toprule +options & arguments & exemple \\ +\midrule +\TOline{towards}{\parg{pt,pt}\parg{pt}}{\tkzcname{tkzClipSector(O,A)(B)}} +\TOline{rotate} {\parg{pt,pt}\parg{angle}}{\tkzcname{tkzClipSector[rotate](O,A)(90)}} +\TOline{R}{\parg{pt,$r$}\parg{angle 1,angle 2}}{\tkzcname{tkzClipSector[R](O,2 cm)(30,90)}} +\bottomrule +\end{tabular} +\end{NewMacroBox} + +\subsubsection{\tkzcname{tkzClipSector}} +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(2,-1){A} + \tkzDefPoint(1,1){B} + \tkzDrawSector[color=blue,dashed](O,A)(B) + \tkzDrawSector[color=blue](O,B)(A) + \tkzClipBB + \begin{scope} + \tkzClipSector(O,B)(A) + \draw[fill=gray!20] (-1,0) rectangle (3,3); + \end{scope} + \tkzDrawPoints(A,B,O) +\end{tikzpicture} +\end{tkzexample} + +\endinput + diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex new file mode 100644 index 0000000000..0d45ff2230 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-show.tex @@ -0,0 +1,218 @@ +\section{The Show} + +\subsection{Montrer les constructions de certaines lignes \tkzcname{tkzShowLine}} + + \begin{NewMacroBox}{tkzShowLine}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}} +Ces constructions concernent les médiatrices, les droites perpendiculaires ou parallèles passant par un point donné et les bissectrices. Les arguments sont donc des listes de deux ou bien de trois points. Plusieurs options permettent l'ajustement des constructions. L'idée de cette macro revient à \tkzimp{Yves Combe} + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{mediator}{mediator}{affiche les constructions d'une médiatrice} +\TOline{perpendicular}{mediator}{constructions pour une perpendiculaire} +\TOline{orthogonal}{mediator}{idem} +\TOline{bisector}{mediator}{constructions pour une bissectrice} +\TOline{K}{1}{cercle inscrit dans à un triangle } +\TOline{length}{1}{ en cm, longueur d'un arc} +\TOline{ratio} {.5}{rapport entre les longueurs des arcs} +\TOline{gap}{2}{placement le point de construction} +\TOline{size}{1}{rayon d'un arc (voir bissectrice)} + \bottomrule +\end{tabular} + +Il faut ajouter bien sûr tous les styles de \TIKZ\ pour les tracés +\end{NewMacroBox} + +\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{parallel}} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-1.5/2/C} + \tkzDrawLine(A,B) + \tkzDefLine[parallel=through C](A,B) \tkzGetPoint{c} + \tkzShowLine[parallel=through C](A,B) + \tkzDrawLine(C,c) \tkzDrawPoints(A,B,C,c) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{perpendicular}} + +\begin{tkzexample}[latex=5cm,small] +\begin{tikzpicture} +\tkzDefPoints{0/0/A, 3/2/B, 2/2/C} +\tkzDefLine[perpendicular=through C,K=-.5](A,B) \tkzGetPoint{c} +\tkzShowLine[perpendicular=through C,K=-.5,gap=3](A,B) +\tkzDefPointBy[projection=onto A--B](c)\tkzGetPoint{h} +\tkzMarkRightAngle[fill=lightgray](A,h,C) +\tkzDrawLines[add=1 and 1](A,B C,c) +\tkzDrawPoints(A,B,C,h,c) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{bisector}} + +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture}[scale=1.25] + \tkzDefPoints{0/0/A, 4/2/B, 1/4/C} + \tkzDrawPolygon(A,B,C) + \tkzSetUpCompass[color=brown,line width=.1 pt] + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzInterLL(A,a)(B,b) \tkzGetPoint{I} + \tkzDefPointBy[projection = onto A--B](I) + \tkzGetPoint{H} + \tkzShowLine[bisector,size=2,gap=3,blue](B,A,C) + \tkzShowLine[bisector,size=2,gap=3,blue](C,B,A) + \tkzDrawCircle[radius,color=blue,% + line width=.2pt](I,H) + \tkzDrawSegments[color=red!50](I,tkzPointResult) + \tkzDrawLines[add=0 and -0.3,color=red!50](A,a B,b) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Exemple de \tkzcname{tkzShowLine} et \tkzname{mediator}} +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture} +\tkzDefPoint(2,2){A} +\tkzDefPoint(5,4){B} +\tkzDrawPoints(A,B) +\tkzShowLine[mediator,color=orange,length=1](A,B) +\tkzGetPoints{i}{j} +\tkzDrawLines[add=-0.1 and -0.1](i,j) +\tkzDrawLines(A,B) +\tkzLabelPoints[below =3pt](A,B) +\end{tikzpicture} +\end{tkzexample} + +\subsection{Constructions de certaines transformations \addbs{tkzShowTransformation}} + + \begin{NewMacroBox}{tkzShowTransformation}{\oarg{local options}\parg{pt1,pt2} ou \parg{pt1,pt2,pt3}} +Ces constructions concernent les symétries orthogonales, les symétries centrales, les projections orthogonales et les translations. Plusieurs options permettent l'ajustement des constructions. L'idée de cette macro revient à \tkzimp{Yves Combe} + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{reflection= over pt1--pt2}{reflection}{constructions d'une symétrie orthogonale} +\TOline{symmetry=center pt}{reflection}{constructions d'une symétrie centrale} +\TOline{projection=onto pt1--pt2}{reflection}{constructions d'une projection} +\TOline{translation=from pt1 to pt2}{reflection}{constructions d'une translation} +\TOline{K}{1}{cercle inscrit dans à un triangle } +\TOline{length}{1}{longueur d'un arc} +\TOline{ratio} {.5}{rapport entre les longueurs des arcs} +\TOline{gap}{2}{placement le point de construction} +\TOline{size}{1}{rayon d'un arc (voir bissectrice)} +\end{tabular} +\end{NewMacroBox} + +\subsubsection{Exemple d'utilisation de \tkzcname{tkzShowTransformation}} + + +\begin{tkzexample}[latex=6cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(0,0){O} \tkzDefPoint(2,-2){A} + \tkzDefPoint(70:4){B} \tkzDrawPoints(A,O,B) + \tkzLabelPoints(A,O,B) + \tkzDrawLine[add= 2 and 2](O,A) + \tkzDefPointBy[translation=from O to A](B) + \tkzGetPoint{C} + \tkzDrawPoint[color=orange](C) \tkzLabelPoints(C) + \tkzShowTransformation[translation=from O to A,% + length=2](B) + \tkzDrawSegments[->,color=orange](O,A B,C) + \tkzDefPointBy[reflection=over O--A](B) \tkzGetPoint{E} + \tkzDrawSegment[blue](B,E) + \tkzDrawPoint[color=blue](E)\tkzLabelPoints(E) + \tkzShowTransformation[reflection=over O--A,size=2](B) + \tkzDefPointBy[symmetry=center O](B) \tkzGetPoint{F} + \tkzDrawSegment[color=green](B,F) + \tkzDrawPoint[color=green](F)\tkzLabelPoints(F) + \tkzShowTransformation[symmetry=center O,% + length=2](B) + \tkzDefPointBy[projection=onto O--A](C) + \tkzGetPoint{H} + \tkzDrawSegments[color=magenta](C,H) + \tkzDrawPoint[color=magenta](H)\tkzLabelPoints(H) + \tkzShowTransformation[projection=onto O--A,% + color=red,size=3,gap=-2](C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Autre exemple d'utilisation de \tkzcname{tkzShowTransformation}} + +Vous retouverez cette figure, mais sans les traits de construction +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoints{0/0/A,8/0/B,3.5/10/I} + \tkzDefMidPoint(A,B) \tkzGetPoint{O} + \tkzDefPointBy[projection=onto A--B](I) + \tkzGetPoint{J} + \tkzInterLC(I,A)(O,A) \tkzGetPoints{M'}{M} + \tkzInterLC(I,B)(O,A) \tkzGetPoints{N}{N'} + \tkzDrawSemiCircle[diameter](A,B) + \tkzDrawSegments(I,A I,B A,B B,M A,N) + \tkzMarkRightAngles(A,M,B A,N,B) + \tkzDrawSegment[style=dashed,color=blue](I,J) + \tkzShowTransformation[projection=onto A--B, + color=red,size=3,gap=-3](I) + \tkzDrawPoints[color=red](M,N) + \tkzDrawPoints[color=blue](O,A,B,I) + \tkzLabelPoints(O) + \tkzLabelPoints[above right](N,I) + \tkzLabelPoints[below left](M,A) +\end{tikzpicture} +\end{tkzexample} + +%<---------------------------------------------------------------------------> +\section{Différents points} +%<---------------------------------------------------------------------------> + +\subsection{\tkzcname{tkzDefEquiPoints}} +Cette macro permet d'obtenir deux points d'une droite équidistants d'un point donné. + +\begin{NewMacroBox}{tkzDefEquiPoints}{\oarg{local options}\parg{pt1,pt2}} +\begin{tabular}{lll} +arguments & défaut & définition \\ +\midrule +\TAline{(pt1,pt2)}{no default}{liste non ordonnée de deux points} +\bottomrule +\end{tabular} + +\medskip +\begin{tabular}{lll} +\toprule \\ +options & default & definition \\ +\midrule +\TOline{dist} {2 cm} {moitié de la distance entre les deux points} +\TOline{from=pt} {no default} {point de référence} +\TOline{show} {false} {si true affiche les traces de compas} +\TOline{/compass/delta} {0} {taille des traces de compas } + +\end{tabular} +\end{NewMacroBox} + + +\subsubsection{Utilisation de \tkzcname{tkzDefEquiPoints} avec des options} + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture} + \tkzSetUpCompass[color=purple,line width=1pt] + \tkzDefPoint(0,1){A} + \tkzDefPoint(5,2){B} + \tkzDefPoint(3,4){C} + \tkzDefEquiPoints[from=C,dist=1,show, + /tkzcompass/delta=20](A,B) + \tkzGetPoints{E}{H} + \tkzDrawLines[color=blue](C,E C,H A,B) + \tkzDrawPoints[color=blue](A,B,C) + \tkzDrawPoints[color=red](E,H) + \tkzLabelPoints(E,H) + \tkzLabelPoints[color=blue](A,B,C) +\end{tikzpicture} +\end{tkzexample} +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex new file mode 100644 index 0000000000..13cf231e45 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-triangles.tex @@ -0,0 +1,380 @@ +\section{Les triangles} + +\subsection{Définition des triangles \tkzcname{tkzDefTriangle}} +Les macros suivantes vont permettre de définir ou de construire un triangle à partir \tkzname{au moins} de deux points. + + Pour le moment, il est possible de définir les triangles suivants : + \begin{itemize} +\item \tkzname{two angles} détermine un triangle connaissant deux angles, +\item \tkzname{equilateral} détermine un triangle équilatéral, +\item \tkzname{half} détermine un triangle rectangle tel que le rapport des mesures des deux côtés adjacents à l'angle droit soit égal à $2$, +\item \tkzname{pythagore} détermine un triangle rectangle dont les mesures des côtés sont proportionnelles à 3, 4 et 5, +\item \tkzname{school} détermine un triangle rectangle dont les angles sont 30, 60 et 90 degrés, +\item \tkzname{golden} détermine un triangle rectangle tel que le rapport des mesures des deux côtés adjacents à l'angle droit soit égal $\Phi=1,618034$, J'ai choisi comme dénomination « triangle doré » car il rpovient du rectangle d'or et j'ai conservé la dénomination « triangle d'or » ou encore « triangle d'Euclide » pour le triangle isocèle dont les angles à la base sont de 72 degrés, + +\item \tkzname{gold} ou \tkzname{euclide} pour le triangle d'or, + +\item \tkzname{cheops} détermine un troisième point tel que le triangle soit isocèle dont les mesures des côtés sont proportionnelles à $2$, $\Phi$ et $\Phi$. +\end{itemize} + +\begin{NewMacroBox}{tkzDefTriangle}{\oarg{local options}\parg{A,B}} +les points sont ordonnés car le triangle est construit en suivant le sens direct du cercle trigonométrique. Cette macro est soit utilisée en partenariat avec \tkzcname{tkzGetPoint} soit en utilisant \tkzname{tkzPointResult} s'il n'est pas nécessaire de conserver le nom. + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{two angles= \#1 and \#2}{no defaut}{triangle connaissant deux angles} +\TOline{equilateral} {no defaut}{triangle équilatéral } +\TOline{pythagore}{no defaut}{proportionnel au triangle de pythagore 3-4-5} +\TOline{school} {no defaut}{ angles de 30, 60 et 90 degrés } +\TOline{gold}{no defaut}{ angles de 72, 72 et 36 degrés, $A$ est le sommet } +\TOline{euclide} {no defaut}{identique au précédent mais $[AB]$ est la base} +\TOline{golden} {no defaut}{rectangle en B et $AB/AC = \Phi$} +\TOline{cheops} {no defaut}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.} +\end{tabular} + +\medskip +\tkzcname{tkzGetPoint} permet de stocker le point sinon \tkzname{tkzPointResult} permet une utilisation immédiate. +\end{NewMacroBox} + +\subsubsection{triangle doré (golden)} +\begin{tkzexample}[latex=6 cm,small] +\begin{tikzpicture}[scale=.8] +\tkzInit[xmax=5,ymax=3] \tkzClip[space=.5] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefTriangle[golden](A,B)\tkzGetPoint{C} + \tkzDrawPolygon(A,B,C) \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B) \tkzDrawBisector(A,C,B) + \tkzLabelPoints[above](C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{triangle équilatéral}\label{def_equilateral} +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefTriangle[equilateral](A,B) + \tkzGetPoint{C} + \tkzDrawPolygon(A,B,C) + \tkzDefTriangle[equilateral](B,A) + \tkzGetPoint{D} + \tkzDrawPolygon(B,A,D) + \tkzDrawPoints(A,B,C,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{triangle d'or (euclide)} +\begin{tkzexample}[latex=7 cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefTriangle[euclide](A,B)\tkzGetPoint{C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) + \tkzLabelPoints(A,B) + \tkzLabelPoints[above](C) + \tkzDrawBisector(A,C,B) +\end{tikzpicture} +\end{tkzexample} + +\newpage +\subsection{Tracé des triangles} + \begin{NewMacroBox}{tkzDrawTriangle}{\oarg{local options}\parg{A,B}} +Macro semblable à la macro précédente mais les côtés sont tracés. + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{two angles= \#1 and \#2}{no defaut}{triangle connaissant deux angles} +\TOline{equilateral} {no defaut}{triangle équilatéral } +\TOline{pythagore}{no defaut}{proportionnel au triangle de pythagore 3-4-5} +\TOline{school} {no defaut}{les angles sont 30, 60 et 90 degrés } +\TOline{gold}{no defaut}{les angles sont 72, 72 et 36 degrés, $A$ est le sommet } +\TOline{euclide} {no defaut}{identique au précédent mais $[AB]$ est la base} +\TOline{golden} {no defaut}{rectangle en B et $AB/AC = \Phi$} +\TOline{cheops} {no defaut}{isocèle en C et $AC/AB = \frac{\Phi}{2}$} +\bottomrule + \end{tabular} + +\medskip +Dans toutes ses définitions, les dimensions du triangle dépendent des deux points de départ. +\end{NewMacroBox} + + +\subsubsection{triangle de Pythagore} +Ce triangle a des côtés dont les longueurs sont proportionnelles à 3, 4 et 5. + +\begin{tkzexample}[latex=6 cm,small] +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDrawTriangle[pythagore,fill=blue!30](A,B) + \tkzMarkRightAngles(A,B,tkzPointResult) +\end{tikzpicture} +\end{tkzexample} + + + \subsubsection{triangle 30 60 90 (school)} + Les angles font 30, 60 et 90 degrés. + +\begin{tkzexample}[latex=6 cm,small] +\begin{tikzpicture} +\tkzInit[ymin=-2.5,ymax=0,xmin=-5,xmax=0] +\tkzClip[space=.5] +\begin{scope}[rotate=-180] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDrawTriangle[school,fill=red!30](A,B) + \tkzMarkRightAngles(B,A,tkzPointResult) +\end{scope} +\end{tikzpicture} +\end{tkzexample} + + +\section{Triangles spécifiques avec \tkzcname{tkzDefSpcTriangle}} + +Les centres de certains triangles ont été définis dans la section "points", ici il s'agit de déterminer les trois sommets de triangles spécifiques. + +\begin{NewMacroBox}{tkzDefSpcTriangle}{\oarg{local options}\parg{A,B,C}} +The order of the points is important! + + +\medskip +\begin{tabular}{lll} +\toprule +options & default & definition \\ +\midrule +\TOline{in or incentral}{centroid}{triangle connaissant deux angles} +\TOline{ex or excentral} {centroid}{triangle équilatéral } +\TOline{extouch}{centroid}{proportionnel au triangle de pythagore 3-4-5} +\TOline{intouch or contact} {centroid}{ angles de 30, 60 et 90 degrés } +\TOline{centroid or medial}{centroid}{ angles de 72, 72 et 36 degrés, $A$ est le sommet } +\TOline{orthic} {centroid}{identique au précédent mais $[AB]$ est la base} +\TOline{feuerbach} {centroid}{rectangle en B et $AB/AC = \Phi$} +\TOline{euler} {centroid}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.} +\TOline{tangential} {centroid}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.} +\TOline{name} {no defaut}{AC=BC, AC et BC sont proportionnels à $2$ et $\Phi$.} +\midrule +\end{tabular} + +\medskip +\tkzcname{tkzGetPoint} permet de stocker le point sinon \tkzname{tkzPointResult} permet une utilisation immédiate. +\end{NewMacroBox} + +\subsubsection{\tkzcname{tkzDefSpcTriangle} option "medial" ou "centroid"} +The geometric centroid of the polygon vertices of a triangle is the point $G$ (sometimes also denoted $M$) which is also the intersection of the triangle's three triangle medians. The point is therefore sometimes called the median point. The centroid is always in the interior of the triangle.\\ +\href{http://mathworld.wolfram.com/TriangleCentroid.html}{Weisstein, Eric W. "Centroid triangle" From MathWorld--A Wolfram Web Resource.} + +In the following example, we obtain the Euler circle which passes through the previously defined points. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=90,scale=.75] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefTriangleCenter[centroid](A,B,C) + \tkzGetPoint{M} + \tkzDefSpcTriangle[medial,name=M](A,B,C){_A,_B,_C} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawSegments[dashed,red](A,M_A B,M_B C,M_C) + \tkzDrawPolygon[color=red](M_A,M_B,M_C) + \tkzDrawPoints(A,B,C,M) + \tkzDrawPoints[red](M_A,M_B,M_C) +\tkzAutoLabelPoints[center=M,font=\scriptsize]% +(A,B,C,M_A,M_B,M_C) + \tkzLabelPoints[font=\scriptsize](M) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option : "in" ou "incentral"} +The Incentral triangle is the triangle whose vertices are determined by +the intersections of the reference triangle’s angle bisectors with the +respective opposite sides.\\ +\href{http://mathworld.wolfram.com/ContactTriangle.html}{Weisstein, Eric W. "Incentral triangle" From MathWorld--A Wolfram Web Resource.} + + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoints{ 0/0/A,5/0/B,1/3/C} + \tkzDefSpcTriangle[in,name=I](A,B,C){a,b,c} + \tkzInCenter(A,B,C)\tkzGetPoint{I} + \tkzDrawPolygon[red](A,B,C) + \tkzDrawPolygon[blue](Ia,Ib,Ic) + \tkzDrawPoints(A,B,C,I,Ia,Ib,Ic) + \tkzDrawCircle[in](A,B,C) + \tkzDrawSegments[dashed](A,Ia B,Ib C,Ic) + \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]% +(Ia,Ib,Ic) + \tkzAutoLabelPoints[center=I,red,font=\scriptsize]% +(A,B,C) +(A,B,C,Ia,Ib,Ic) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option : "ex" ou "Excentral"} +The excentral triangle of a triangle $ABC$ is the triangle $JaJbJc$ with vertices corresponding to the excenters of $ABC$. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.6] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[excentral,name=J](A,B,C){a,b,c} + \tkzDefSpcTriangle[extouch,name=T](A,B,C){a,b,c} + \tkzDrawPolygon[blue](A,B,C) + \tkzDrawPolygon[red](Ja,Jb,Jc) + \tkzDrawPoints(A,B,C) + \tkzDrawPoints[red](Ja,Jb,Jc) + \tkzLabelPoints(A,B,C) + \tkzLabelPoints[red](Jb,Jc) + \tkzLabelPoints[red,above](Ja) + \tkzClipBB \tkzShowBB + \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) +\end{tikzpicture} +\end{tkzexample} + + +\subsubsection{Option : "intouch"} +The contact triangle of a triangle ABC, also called the intouch triangle, is the triangle formed by the points of tangency of the incircle of $ABC$ with $ABC$.\\ +\href{http://mathworld.wolfram.com/ContactTriangle.html}{Weisstein, Eric W. "Contact triangle" From MathWorld--A Wolfram Web Resource.} + +We obtain the intersections of the bisectors with the sides. +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[intouch,name=x](A,B,C){a,b,c} + \tkzInCenter(A,B,C)\tkzGetPoint{I} + \tkzDrawPolygon[red](A,B,C) + \tkzDrawPolygon[blue](xa,xb,xc) + \tkzDrawPoints[red](A,B,C) + \tkzDrawPoints[blue](xa,xb,xc) + \tkzDrawCircle[in](A,B,C) + \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]% +(xa,xb,xc) + \tkzAutoLabelPoints[center=I,red,font=\scriptsize]% +(A,B,C) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option : "extouch"} +The extouch triangle $TaTbTc$ is the triangle formed by the points of tangency of a triangle $ABC$ with its excircles $Ja$, $Jb$, and $Jc$. The points $Ta$, $Tb$, and $Tc$ can also be constructed as the points which bisect the perimeter of $A_1A_2A_3$ starting at $A$, $B$, and $C$.\\ +\href{http://mathworld.wolfram.com/ExtouchTriangle.html}{Weisstein, Eric W. "Extouch triangle" From MathWorld--A Wolfram Web Resource.} + +We obtain the points of contact of the exinscribed circles as well as the triangle formed by the centres of the exinscribed circles. + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.7] +\tkzDefPoints{0/0/A,6/0/B,0.8/4/C} +\tkzDefSpcTriangle[excentral, + name=J](A,B,C){a,b,c} +\tkzDefSpcTriangle[extouch, + name=T](A,B,C){a,b,c} +\tkzDefTriangleCenter[nagel](A,B,C) +\tkzGetPoint{Na} +\tkzDefTriangleCenter[centroid](A,B,C) +\tkzGetPoint{G} +\tkzDrawPoints[blue](Ja,Jb,Jc) +\tkzClipBB \tkzShowBB +\tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) +\tkzDrawLines[add=1 and 1](A,B B,C C,A) +\tkzDrawSegments[gray](A,Ta B,Tb C,Tc) +\tkzDrawSegments[gray](Ja,Ta Jb,Tb Jc,Tc) +\tkzDrawPolygon[blue](A,B,C) +\tkzDrawPolygon[red](Ta,Tb,Tc) +\tkzDrawPoints(A,B,C,Na) +\tkzLabelPoints(Na) +\tkzAutoLabelPoints[center=Na,blue](A,B,C) +\tkzAutoLabelPoints[center=G,red, + dist=.4](Ta,Tb,Tc) +\tkzMarkRightAngles[fill=gray!15](Ja,Ta,B + Jb,Tb,C Jc,Tc,A) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option : "feuerbach"} +The Feuerbach triangle is the triangle formed by the three points of tangency of the nine-point circle with the excircles.\\ +\href{http://mathworld.wolfram.com/FeuerbachTriangle.html}{Weisstein, Eric W. "Feuerbach triangle" From MathWorld--A Wolfram Web Resource.} + + The points of tangency define the Feuerbach triangle. + + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefPoint(0.5,2.5){C} + \tkzDefCircle[euler](A,B,C) \tkzGetPoint{N} + \tkzDefSpcTriangle[feuerbach, + name=F](A,B,C){_a,_b,_c} + \tkzDefSpcTriangle[excentral, + name=J](A,B,C){_a,_b,_c} + \tkzDefSpcTriangle[extouch, + name=T](A,B,C){_a,_b,_c} + \tkzDrawPoints[blue](J_a,J_b,J_c,F_a,F_b,F_c,A,B,C) + \tkzClipBB \tkzShowBB + \tkzDrawCircle[purple](N,F_a) + \tkzDrawPolygon(A,B,C) + \tkzDrawPolygon[blue](F_a,F_b,F_c) + \tkzDrawCircles[gray](J_a,F_a J_b,F_b J_c,F_c) + \tkzAutoLabelPoints[center=N,dist=.3, + font=\scriptsize](A,B,C,F_a,F_b,F_c,J_a,J_b,J_c) +\end{tikzpicture} +\end{tkzexample} + +\subsubsection{Option Triangle "tangential"} +The tangential triangle is the triangle $T_AT_BT_C $formed by the lines tangent to the circumcircle of a given triangle ABC at its vertices. It is therefore antipedal triangle of ABC with respect to the circumcenter O.\\ +\href{http://mathworld.wolfram.com/TangentialTriangle.html}{Weisstein, Eric W. "Tangential Triangle." From MathWorld--A Wolfram Web Resource. } + + +\begin{tkzexample}[latex=8cm,small] +\begin{tikzpicture}[scale=.5,rotate=80] + \tkzDefPoints{0/0/A,6/0/B,1.8/4/C} + \tkzDefSpcTriangle[tangential, + name=T](A,B,C){a,b,c} + \tkzDrawPolygon[red](A,B,C) + \tkzDrawPolygon[blue](Ta,Tb,Tc) + \tkzDrawPoints[red](A,B,C) + \tkzDrawPoints[blue](Ta,Tb,Tc) + \tkzDefCircle[circum](A,B,C) + \tkzGetPoint{O} + \tkzDrawCircle(O,A) + \tkzLabelPoints[red](A,B,C) + \tkzLabelPoints[blue](Ta,Tb,Tc) +\end{tikzpicture} +\end{tkzexample} + + \subsubsection{Option Triangle "euler"} +The Euler triangle of a triangle ABC is the triangle $E_AE_BE_C$ whose vertices are the midpoints of the segments joining the orthocenter H with the respective vertices. The vertices of the triangle are known as the Euler points, and lie on the nine-point circle. + +\begin{tkzexample}[latex=7cm,small] +\begin{tikzpicture}[rotate=90,scale=1.25] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[medial, + name=M](A,B,C){_A,_B,_C} + \tkzDefTriangleCenter[euler](A,B,C) + \tkzGetPoint{N} % I= N nine points + \tkzDefTriangleCenter[ortho](A,B,C) + \tkzGetPoint{H} + \tkzDefMidPoint(A,H) \tkzGetPoint{E_A} + \tkzDefMidPoint(C,H) \tkzGetPoint{E_C} + \tkzDefMidPoint(B,H) \tkzGetPoint{E_B} + \tkzDefSpcTriangle[ortho,name=H](A,B,C){_A,_B,_C} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawCircle(N,E_A) + \tkzDrawSegments[blue](A,H_A B,H_B C,H_C) + \tkzDrawPoints(A,B,C,N,H) + \tkzDrawPoints[red](M_A,M_B,M_C) + \tkzDrawPoints[blue]( H_A,H_B,H_C) + \tkzDrawPoints[green](E_A,E_B,E_C) + \tkzAutoLabelPoints[center=N,font=\scriptsize]% +(A,B,C,M_A,M_B,M_C,H_A,H_B,H_C,E_A,E_B,E_C) +\tkzLabelPoints[font=\scriptsize](H,N) +\tkzMarkSegments[mark=s|,size=3pt, + color=blue,line width=1pt](B,E_B E_B,H) + \tkzDrawPolygon[color=red](M_A,M_B,M_C) +\end{tikzpicture} +\end{tkzexample} + + +\endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/how_to_compile.txt b/macros/latex/contrib/tkz/tkz-euclide/examples/how_to_compile.txt deleted file mode 100644 index 096675e543..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/how_to_compile.txt +++ /dev/null @@ -1,2 +0,0 @@ -If you want to compile the file tkzeuclide-7-5-3.tex. -You add \input{tkzeuclide-7-5-3} inside the environment "document"
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/main.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/main.tex deleted file mode 100644 index 831c906046..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/main.tex +++ /dev/null @@ -1,11 +0,0 @@ -% !TEX TS-program = pdflatex -% Created by Alain Matthes on 2020-01-23. -% Copyright (c) 2020 __ AlterMundus __. - -\documentclass{standalone} -%\usepackage{xcolor} -\usepackage{tkz-euclide} %you can add tkz-fct etc. - -\begin{document} -\input{tkzeuclide-5-0-0} -\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx new file mode 100644 index 0000000000..11b016acaa --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/preamble-standalone.ltx @@ -0,0 +1,6 @@ +\documentclass{standalone} +\usepackage{tkz-euclide,tkz-fct} + + + + diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex new file mode 100644 index 0000000000..a64287e178 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-1.tex @@ -0,0 +1,34 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 2 (Section 1.3.1 : Example Part I gold triangle) + + \begin{tikzpicture} + \tkzDefPoint(0,0){C} + \tkzDefPoint(4,0){D} + \tkzDefSquare(C,D) + \tkzGetPoints{e}{f} + \tkzDefMidPoint(C,f) + \tkzGetPoint{m} + \tkzInterLC(C,f)(m,e) + \tkzGetSecondPoint{n} + \tkzInterCC[with nodes](C,C,n)(D,C,n) + \tkzGetFirstPoint{B} + \tkzInterLC(C,D)(D,B) \tkzGetSecondPoint{A} + \tkzInterLC(B,A)(B,D) \tkzGetSecondPoint{E} + \tkzInterLL(B,D)(C,E) \tkzGetPoint{F} + \tkzDrawPoints(C,D,B) + \tkzDrawPolygon(B,...,D) + \tkzDrawPolygon(B,C,D) + \tkzDrawSegments(D,A A,B C,E) + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPoints(A,...,F) + \tkzMarkRightAngle[fill=blue!20](B,F,C) + \tkzFillAngles[fill=blue!10](C,B,D E,A,D) + \tkzMarkAngles(C,B,D E,A,D) + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzLabelPoints[below](A,C,D,E) + \tkzLabelPoints[above right](B,F) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex new file mode 100644 index 0000000000..78e0fd8fd2 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-2.tex @@ -0,0 +1,32 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 4 (Section 1.3.2 : Example Part II two others methods gold and euclide triangle) + + \begin{tikzpicture} + \tkzDefPoint(0,0){C} % possible + % \tkzDefPoint[label=below:$C$](0,0){C} + % but don't do this + \tkzDefPoint(2,6){B} + % We get D and E with a rotation + \tkzDefPointBy[rotation= center B angle 36](C) \tkzGetPoint{D} + \tkzDefPointBy[rotation= center B angle 72](C) \tkzGetPoint{E} + % To get A we use an intersection of lines + \tkzInterLL(B,E)(C,D) \tkzGetPoint{A} + \tkzInterLL(C,E)(B,D) \tkzGetPoint{H} + % drawing + \tkzDrawArc[delta=10](B,C)(E) + \tkzDrawPolygon(C,B,D) + \tkzDrawSegments(D,A B,A C,E) + % angles + \tkzMarkAngles(C,B,D E,A,D) %this is to draw the arcs + \tkzLabelAngles[pos=1.5](C,B,D E,A,D){$\alpha$} + \tkzMarkRightAngle(B,H,C) + \tkzDrawPoints(A,...,E) + % Label only now + \tkzLabelPoints[below left](C,A) + \tkzLabelPoints[below right](D) + \tkzLabelPoints[above](B,E) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-5-0-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex index d1ec248e52..193e91a237 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-5-0-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-3-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 5 (Section 1.3.3 : Complete but minimal example) + \begin{tikzpicture}[scale=1,ra/.style={fill=gray!20}] % fixed points \tkzDefPoint(0,0){A} @@ -20,4 +25,6 @@ \tkzLabelPoints[above left](C) \tkzLabelPoint[right](B){$B(10,0)$} \tkzLabelSegment[right=4pt](I,C){$IC=\sqrt{a}$} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex new file mode 100644 index 0000000000..41afbdc227 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-4-0.tex @@ -0,0 +1,18 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 6 (Section 1.4 : The Elements of tkz code) + + \begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,8/0/B} + \foreach \tr in {equilateral,half,pythagore,% + school,golden,euclide, gold,cheops} + {\tkzDefTriangle[\tr](A,B) \tkzGetPoint{C} + \tkzDrawPoint(C) + \tkzLabelPoint[right](C){\tr} + \tkzDrawSegments(A,C C,B)} + \tkzDrawPoints(A,B) + \tkzDrawSegments(A,B) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex new file mode 100644 index 0000000000..ea6d953b25 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-01-6-1.tex @@ -0,0 +1,25 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 7 (Section 1.6.1 : Let's look at a classic example) + + \begin{tikzpicture}[scale=.5] + % fixed points + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,2){B} + % calculus + \tkzInterCC(A,B)(B,A) + \tkzGetPoints{C}{D} + % drawings + \tkzDrawCircles[gray,dashed](A,B B,A) + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,...,D) + % marking + \tkzMarkSegments[mark=s||](A,B B,C C,A) + % labelling + \tkzLabelSegments[swap](A,B){$c$} + \tkzLabelPoints(A,B,D) + \tkzLabelPoints[above](C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex new file mode 100644 index 0000000000..94ab543939 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-0-0.tex @@ -0,0 +1,24 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 11 (Section 4 : Definition of a point) + +\begin{tikzpicture}[,scale=1] + \tkzInit[xmax=5,ymax=5] + \tkzDefPoints{0/0/O,1/0/I,0/1/J} + \tkzDefPoint(40:4){P} + \tkzDrawXY[noticks,>=triangle 45] + \tkzDrawSegment[dim={$r$, + 16pt,above=6pt}](O,P) + \tkzDrawPoints(O,P) + \tkzMarkAngle[mark=none,->](I,O,P) + \tkzFillAngle[fill=blue!20, + opacity=.5](I,O,P) + \tkzLabelAngle[pos=1.25](I,O,P){$\alpha$} + \tkzLabelPoint(P){$P (\alpha : r )$} + \tkzDrawPoints[shape=cross](I,J) + \tkzLabelPoints(O,I) + \tkzLabelPoints[left](J) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex new file mode 100644 index 0000000000..c38c3de860 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-1.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 12 (Section 4.1.1 : Cartesian coordinates ) + + \begin{tikzpicture} + \tkzInit[xmax=5,ymax=5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDefPoint(0,3){C} + \tkzDrawPolygon(A,B,C) + \tkzDrawPoints(A,B,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex new file mode 100644 index 0000000000..d17061d346 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-2.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 13 (Section 4.1.2 : Calculations with \tkzNamePack{xfp}) + +\begin{tikzpicture}[scale=1] + \tkzInit[xmax=4,ymax=4] + \tkzGrid + \tkzDefPoint(-1+2,sqrt(4)){O} + \tkzDefPoint({3*ln(exp(1))},{exp(1)}){A} + \tkzDefPoint({4*sin(pi/6)},{4*cos(pi/6)}){B} + \tkzDrawPoints[color=blue](O,B,A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex new file mode 100644 index 0000000000..27a95601b9 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-3.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 14 (Section 4.1.3 : Polar coordinates ) + + \begin{tikzpicture} + \foreach \an [count=\i] in {0,60,...,300} + { \tkzDefPoint(\an:3){A_\i}} + \tkzDrawPolygon(A_1,A_...,A_6) + \tkzDrawPoints(A_1,A_...,A_6) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex new file mode 100644 index 0000000000..ff7508f4b5 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-4.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 15 (Section 4.1.4 : Calculations and coordinates) + + \begin{tikzpicture}[scale=.5] + \foreach \an [count=\i] in {0,2,...,358} + { \tkzDefPoint(\an:sqrt(sqrt(\an mm))){A_\i}} + \tkzDrawPoints(A_1,A_...,A_180) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex index fb4de23048..6d4830eb98 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 16 (Section 4.1.5 : Relative points) + \begin{tikzpicture}[scale=1] \tkzSetUpLine[color=blue!60] \begin{scope}[rotate=30] @@ -5,10 +10,12 @@ \begin{scope}[shift=(A)] \tkzDefPoint(90:5){B} \tkzDefPoint(30:5){C} - \end{scope} - \end{scope} +\end{scope} +\end{scope} \tkzDrawPolygon(A,B,C) \tkzLabelPoints[above](B,C) \tkzLabelPoints[below](A) \tkzDrawPoints(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex index fee838752a..33389d4696 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 17 (Section 4.2.1 : Isosceles triangle with \tkzcname{tkzDefShiftPoint}) + \begin{tikzpicture}[rotate=-30] \tkzDefPoint(2,3){A} \tkzDefShiftPoint[A](0:4){B} @@ -9,3 +14,5 @@ \tkzLabelPoints(B,C) \tkzLabelPoints[above left](A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex index 8e18b9319c..794969f7c0 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 18 (Section 4.2.2 : Equilateral triangle) + \begin{tikzpicture}[scale=1] \tkzDefPoint(2,3){A} \tkzDefShiftPoint[A](30:4){B} @@ -7,3 +12,5 @@ \tkzLabelPoints(B,C) \tkzLabelPoints[above left](A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex index d6b6aba0f9..9b2cf82063 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-5-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 19 (Section 4.2.3 : Parallelogram) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(60:3){B} @@ -6,3 +11,5 @@ \tkzDrawPolygon(A,...,D) \tkzDrawPoints(A,...,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex index 7baa5d2f80..71598e7cd8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-4-0.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 20 (Section 4.4 : Create a triangle) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,4/0/B,4/3/C} \tkzDrawPolygon(A,B,C) \tkzDrawPoints(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex index 49b9008cad..87885436eb 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-04-5-0.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 21 (Section 4.5 : Create a square) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,2/0/B,2/2/C,0/2/D} \tkzDrawPolygon(A,...,D) \tkzDrawPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex index 2de647b249..e655da2683 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 22 (Section 5.1.1 : Use of \tkzcname{tkzDefMidPoint}) + \begin{tikzpicture}[scale=1] \tkzDefPoint(2,3){A} \tkzDefPoint(4,0){B} @@ -6,3 +11,5 @@ \tkzDrawPoints(A,B,C) \tkzLabelPoints[right](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex index e44974aee6..9df81202fd 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 23 (Section 5.2.1 : Using \tkzcname{tkzDefBarycentricPoint} with two points) + \begin{tikzpicture} \tkzDefPoint(2,3){A} \tkzDefShiftPointCoord[2,3](30:4){B} @@ -7,3 +12,5 @@ \tkzDrawLine(A,B) \tkzLabelPoints(A,B,I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex index 60178e199e..0b04be6dad 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 24 (Section 5.2.2 : Using \tkzcname{tkzDefBarycentricPoint} with three points) + \begin{tikzpicture}[scale=.8] \tkzDefPoint(2,1){A} \tkzDefPoint(5,3){B} @@ -15,3 +20,5 @@ \tkzAutoLabelPoints[center=M](A,B,C) \tkzAutoLabelPoints[center=M,above right](A',B',C') \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex new file mode 100644 index 0000000000..38fa5d98cf --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-05-3-0.tex @@ -0,0 +1,29 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 25 (Section 5.3 : Internal Similitude Center) + +\begin{tikzpicture}[scale=.75,rotate=-30] + \tkzDefPoint(0,0){O} + \tkzDefPoint(4,-5){A} + \tkzDefIntSimilitudeCenter(O,3)(A,1) + \tkzGetPoint{I} + \tkzExtSimilitudeCenter(O,3)(A,1) + \tkzGetPoint{J} + \tkzDefTangent[from with R= I](O,3 cm) + \tkzGetPoints{D}{E} + \tkzDefTangent[from with R= I](A,1 cm) + \tkzGetPoints{D'}{E'} + \tkzDefTangent[from with R= J](O,3 cm) + \tkzGetPoints{F}{G} + \tkzDefTangent[from with R= J](A,1 cm) + \tkzGetPoints{F'}{G'} + \tkzDrawCircle[R,fill=red!50,opacity=.3](O,3 cm) + \tkzDrawCircle[R,fill=blue!50,opacity=.3](A,1 cm) + \tkzDrawSegments[add = .5 and .5,color=red](D,D' E,E') + \tkzDrawSegments[add= 0 and 0.25,color=blue](J,F J,G) + \tkzDrawPoints(O,A,I,J,D,E,F,G,D',E',F',G') + \tkzLabelPoints[font=\scriptsize](O,A,I,J,D,E,F,G,D',E',F',G') +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex index 4c61a52db4..dd99b48968 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 26 (Section 6.1.1 : \IoptName{tkzDefTriangleCenter}{ortho}) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(5,1){B} @@ -9,7 +14,9 @@ \tkzDrawPolygon[color=blue](A,B,C) \tkzDrawPoints(A,B,C,H) \tkzDrawLines[add=0 and 1](A,Ha B,Hb C,Hc) - \tkzLabelPoint(M){$M$} + \tkzLabelPoint(H){$H$} \tkzAutoLabelPoints[center=H](A,B,C) \tkzMarkRightAngles(A,Ha,B B,Hb,C C,Hc,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex index 1bc90b5f4f..640a06ed5d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-2.tex @@ -1,10 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 27 (Section 6.1.2 : \IoptName{tkzDefTriangleCenter}{centroid}) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{-1/1/A,5/1/B} \tkzDefEquilateral(A,B) \tkzGetPoint{C} \tkzDefTriangleCenter[centroid](A,B,C) \tkzGetPoint{G} - \tkzDrawPolygon[color=Maroon](A,B,C) + \tkzDrawPolygon[color=brown](A,B,C) \tkzDrawPoints(A,B,C,G) \tkzDrawLines[add = 0 and 2/3](A,G B,G C,G) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex new file mode 100644 index 0000000000..0277dd685e --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-3.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 28 (Section 6.1.3 : \IoptName{tkzDefTriangleCenter}{circum}) + + \begin{tikzpicture} + \tkzDefPoints{0/1/A,3/2/B,1/4/C} + \tkzDefTriangleCenter[circum](A,B,C) + \tkzGetPoint{G} + \tkzDrawPolygon[color=brown](A,B,C) + \tkzDrawCircle(G,A) + \tkzDrawPoints(A,B,C,G) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex index 1a6cd619bc..64638de5a7 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 29 (Section 6.1.4 : \IoptName{tkzDefTriangleCenter}{in}) + \begin{tikzpicture} \tkzDefPoints{0/1/A,3/2/B,1/4/C} \tkzDefTriangleCenter[in](A,B,C)\tkzGetPoint{I} @@ -8,3 +13,5 @@ \tkzDrawLines[add = 0 and 2/3](A,I B,I C,I) \tkzDrawCircle(I,Ib) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex index ca30906a40..e7a180434b 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 30 (Section 6.1.5 : \IoptName{tkzDefTriangleCenter}{ex}) + \begin{tikzpicture}[scale=.5] \tkzDefPoints{0/1/A,3/2/B,1/4/C} \tkzDefCircle[ex](B,C,A) @@ -9,3 +14,5 @@ \tkzDrawLines[add=1.5 and 0](A,C B,C) \tkzLabelPoints(J_c) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex index d03e41f164..2e6e8ea628 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-6.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 31 (Section 6.1.6 : Utilisation de \IoptName{tkzDefTriangleCenter}{euler} ) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} \tkzDefSpcTriangle[medial, @@ -26,3 +31,5 @@ \tkzMarkSegments[mark=s|,size=3pt, color=blue,line width=1pt](B,E_B E_B,H) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex index 1ba2517fdc..031afaeb83 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-7.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 32 (Section 6.1.7 : Using option \IoptName{tkzDefTriangleCenter}{symmedian}) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(5,0){B} @@ -14,3 +19,5 @@ \tkzDrawSegments[orange,dashed](A,Ia B,Ib C,Ic) \tkzDrawLine(G,I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex new file mode 100644 index 0000000000..9ed2e4cdc4 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-8.tex @@ -0,0 +1,26 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 33 (Section 6.1.8 : Using option \IoptName{tkzDefTriangleCenter}{nagel}) + + \begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/A,6/0/B,4/6/C} + \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc} + \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc} + \tkzDrawPoints(Ja,Jb,Jc,Ta,Tb,Tc) + \tkzLabelPoints(Ja,Jb,Jc,Ta,Tb,Tc) + \tkzDrawPolygon[blue](A,B,C) + \tkzDefTriangleCenter[nagel](A,B,C) \tkzGetPoint{Na} + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Na) + \tkzLabelPoints[blue](B,C,A) + \tkzLabelPoints[red](Na) + \tkzDrawLines[add=0 and 1](A,Ta B,Tb C,Tc) + \tkzShowBB\tkzClipBB + \tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A) + \tkzDrawCircles[ex,gray](A,B,C C,A,B B,C,A) + \tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc) + \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C Jb,Tb,A Jc,Tc,B) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex index 3308bd3049..75f79a104d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-7.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-06-1-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 34 (Section 6.1.9 : Option Triangle "mittenpunkt") + \begin{tikzpicture}[scale=.5] \tkzDefPoints{0/0/A,6/0/B,4/6/C} \tkzDefSpcTriangle[centroid](A,B,C){Ma,Mb,Mc} @@ -7,15 +12,18 @@ \tkzGetPoint{Mi} \tkzDrawPoints(Ma,Mb,Mc,Ja,Jb,Jc) \tkzClipBB - \tkzDrawPolygon[](A,B,C) + \tkzDrawPolygon[blue](A,B,C) \tkzDrawLines[add=0 and 1](Ja,Ma Jb,Mb Jc,Mc) \tkzDrawLines[add=1 and 1](A,B A,C B,C) - \tkzDrawCircles[dashed](Ja,Ta Jb,Tb Jc,Tc) - \tkzDrawPoints(B,C,A,Mi) - \tkzLabelPoints(B,C,A,Mi) + \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Mi) + \tkzLabelPoints[red](Mi) \tkzLabelPoints[left](Mb) \tkzLabelPoints(Ma,Mc,Jb,Jc) \tkzLabelPoints[above left](Ja,Jc) \tkzShowBB \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex index 56d8ee7691..a384d79ccf 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 35 (Section 7.0.2 : Example of point drawings) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(1,3){A} \tkzDefPoint(4,1){B} @@ -5,4 +10,6 @@ \tkzDrawPoint[color=red](A) \tkzDrawPoint[fill=blue!20,draw=blue](B) \tkzDrawPoint[color=green](O) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex new file mode 100644 index 0000000000..72c4c2a189 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-3.tex @@ -0,0 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 36 (Section 7.0.3 : First example) + +\begin{tikzpicture} + \tkzDefPoint(1,3){A} + \tkzDefPoint(4,1){B} + \tkzDefPoint(0,0){C} + \tkzDrawPoints[size=6,color=red, + fill=red!50](A,B,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex index 9f1d52f4ce..6f4a965fee 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-10-0-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-07-0-4.tex @@ -1,10 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 37 (Section 7.0.4 : Second example) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(2,3){A} \tkzDefPoint(5,-1){B} \tkzDefPoint[label=below:$\mathcal{C}$, shift={(2,3)}](-30:5.5){E} \begin{scope}[shift=(A)] \tkzDefPoint(30:5){C} - \end{scope} +\end{scope} \tkzCalcLength[cm](A,B)\tkzGetLength{rAB} \tkzDrawCircle[R](A,\rAB cm) \tkzDrawSegment(A,B) @@ -12,3 +17,5 @@ \tkzLabelPoints(B,C) \tkzLabelPoints[above](A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex new file mode 100644 index 0000000000..60d9222e9c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-1-1.tex @@ -0,0 +1,24 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 38 (Section 8.1.1 : Use of option \tkzname{pos} 1) + + \begin{tikzpicture} + \tkzDefPoints{0/0/A,4/0/B} + \tkzDrawLine[red](A,B) + \tkzDefPointOnLine[pos=1.2](A,B) + \tkzGetPoint{P} + \tkzDefPointOnLine[pos=-0.2](A,B) + \tkzGetPoint{R} + \tkzDefPointOnLine[pos=0.5](A,B) + \tkzGetPoint{S} + \tkzDrawPoints(A,B,P) + \tkzLabelPoints(A,B) + \tkzLabelPoint[above](P){pos=$1.2$} + \tkzLabelPoint[above](R){pos=$-.2$} + \tkzLabelPoint[above](S){pos=$.5$} + \tkzDrawPoints(A,B,P,R,S) + \tkzLabelPoints(A,B) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex new file mode 100644 index 0000000000..b59a15d8ea --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-08-2-0.tex @@ -0,0 +1,24 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 39 (Section 8.2 : Point on a circle) + +\begin{tikzpicture} + \tkzDefPoints{0/0/A,4/0/B,0.8/3/C} + \tkzDefPointOnCircle[angle=90,center=B, + radius=1 cm] + \tkzGetPoint{I} + \tkzDrawCircle[R,teal](B,1cm) + \tkzDrawPoint[teal](I) + \tkzDefCircle[circum](A,B,C) + \tkzGetPoint{G} \tkzGetLength{rG} + \tkzDefPointOnCircle[angle=30,center=G, + radius=\rG pt] + \tkzGetPoint{J} + \tkzDrawPoints(A,B,C) + \tkzDrawCircle(G,J) + \tkzDrawPoint(G) + \tkzDrawPoint[red](J) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex index 476573282f..ed29933234 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 40 (Section 9.1.1 : Example of reflection) + \begin{tikzpicture}[scale=1] \tkzInit[ymin=-4,ymax=6,xmin=-7,xmax=3] \tkzClip @@ -6,9 +11,14 @@ \tkzDefPoint(-2,-2){A} \foreach \i in {0,1,...,4}{% \pgfmathparse{0+\i * 72} - \tkzDefPointBy[rotation=center O angle \pgfmathresult](A) \tkzGetPoint{A\i} - \tkzDefPointBy[reflection = over C--D](A\i) \tkzGetPoint{A\i'}} + \tkzDefPointBy[rotation=% + center O angle \pgfmathresult](A) + \tkzGetPoint{A\i} + \tkzDefPointBy[reflection = over C--D](A\i) + \tkzGetPoint{A\i'}} \tkzDrawPolygon(A0, A2, A4, A1, A3) \tkzDrawPolygon(A0', A2', A4', A1', A3') \tkzDrawLine[add= .5 and .5](C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex index da42148d17..05d6c6a05a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 41 (Section 9.2.1 : Example of homothety and projection) + \begin{tikzpicture}[scale=1.25] \tkzInit \tkzClip \tkzDefPoint(0,1){A} \tkzDefPoint(6,3){B} \tkzDefPoint(3,6){C} @@ -11,3 +16,5 @@ \tkzDrawCircle(a',k) \tkzLabelPoints(a,a',k,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex index b063a58112..ced8e2745c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 42 (Section 9.3.1 : Example of projection) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmin=-3,xmax=5,ymax=4] \tkzClip[space=.5] \tkzDefPoint(0,0){A} @@ -12,4 +17,6 @@ \tkzDrawPoints(A,C,F) \tkzLabelPoints(A,C,F) \tkzDrawPoints(B,D,E,G) \tkzLabelPoints[above right](B,D,E,G) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex index 28f09e524c..5c52a48c78 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 43 (Section 9.4.1 : Example of symmetry) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -5,8 +10,12 @@ \tkzDefPointsBy[symmetry=center O](B,A){} \tkzDrawLine(A,A') \tkzDrawLine(B,B') - \tkzMarkAngle[mark=s,arc=lll,size=2 cm,mkcolor=red](A,O,B) - \tkzLabelAngle[pos=1,circle,draw,fill=blue!10](A,O,B){$60^{\circ}$} + \tkzMarkAngle[mark=s,arc=lll, + size=2 cm,mkcolor=red](A,O,B) + \tkzLabelAngle[pos=1,circle,draw, + fill=blue!10](A,O,B){$60^{\circ}$} \tkzDrawPoints(A,B,O,A',B') \tkzLabelPoints(A,B,O,A',B') \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex new file mode 100644 index 0000000000..c0f119a85d --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-5-1.tex @@ -0,0 +1,25 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 44 (Section 9.5.1 : Example of rotation) + + \begin{tikzpicture}[scale=1] + \tkzInit + \tkzDefPoint(0,0){A} + \tkzDefPoint(5,0){B} + \tkzDrawSegment(A,B) + \tkzDefPointBy[rotation=% + center A angle 60](B) + \tkzGetPoint{C} + \tkzDefPointBy[symmetry=% + center C](A) + \tkzGetPoint{D} + \tkzDrawSegment(A,tkzPointResult) + \tkzDrawLine(B,D) + \tkzDrawArc[delta=10](A,B)(C) + \tkzDrawArc[delta=10](B,C)(A) + \tkzDrawArc[delta=10](C,D)(D) + \tkzMarkRightAngle(D,B,A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex index c76759cf1d..6bab89ec36 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-6-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-6-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 45 (Section 9.6.1 : Example of rotation in radian) + \begin{tikzpicture} \tkzDefPoint["$A$" left](1,5){A} \tkzDefPoint["$B$" right](5,2){B} @@ -11,3 +16,5 @@ \tkzLabelPoints(C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex new file mode 100644 index 0000000000..bd131e4c5f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-1.tex @@ -0,0 +1,26 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 46 (Section 9.7.1 : Inversion of points) + +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){A} + \tkzDrawCircle(O,A) + \tkzDefPoint(-1.5,-1.5){z1} + \tkzDefPoint(0.35,0){z2} + \tkzDrawPoints[color=black, + fill=red,size=4](O,z1,z2) + \tkzDefPointBy[inversion =% + center O through A](z1) + \tkzGetPoint{Z1} + \tkzDefPointBy[inversion =% + center O through A](z2) + \tkzGetPoint{Z2} + \tkzDrawPoints[color=black, + fill=red,size=4](Z1,Z2) + \tkzDrawSegments(z1,Z1 z2,Z2) + \tkzLabelPoints(O,A,z1,z2,Z1,Z2) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex new file mode 100644 index 0000000000..4d943a54f1 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-09-7-2.tex @@ -0,0 +1,22 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 47 (Section 9.7.2 : Point Inversion: Orthogonal Circles) + +\begin{tikzpicture}[scale=1.5] + \tkzDefPoint(0,0){O} + \tkzDefPoint(1,0){A} + \tkzDrawCircle(O,A) + \tkzDefPoint(0.5,-0.25){z1} + \tkzDefPoint(-0.5,-0.5){z2} + \tkzDefPointBy[inversion = % + center O through A](z1) + \tkzGetPoint{Z1} + \tkzCircumCenter(z1,z2,Z1) + \tkzGetPoint{c} + \tkzDrawCircle(c,Z1) + \tkzDrawPoints[color=black, + fill=red,size=4](O,z1,z2,Z1,O,A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-12-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex index ac4964b5c1..179a48984a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-12-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10-1-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 48 (Section 10.1 : Example de translation) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(4,2){A'} \tkzDefPoint(3,0){B} \tkzDefPoint(1,2){C} @@ -11,3 +16,5 @@ \tkzDrawSegments[color = gray,->, style=dashed](A,A' B,B' C,C') \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex index 11fa637627..c2f47fac43 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 49 (Section 11.1.1 : \tkzcname{tkzDefPointWith} et \tkzname{colinear at}) + \begin{tikzpicture}[scale=1.2, vect/.style={->,shorten >=3pt,>=latex'}] \tkzDefPoint(2,3){A} \tkzDefPoint(4,2){B} @@ -8,3 +13,5 @@ \tkzLabelPoints[above right=3pt](A,B,C,D) \tkzDrawSegments[vect](A,B C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-10.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex index f51b6990c9..553572a317 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-10.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-10.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 58 (Section 11.1.10 : \tkzcname{tkzDefPointWith} \tkzname{linear} ) + \begin{tikzpicture}[scale=1.2] \tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B} \tkzDefPointWith[linear,K=0.5](A,B) @@ -6,3 +11,5 @@ \tkzDrawSegment(A,B) \tkzLabelPoints[above right=3pt](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-11.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex index a348d741b2..2977b90624 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-11.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-11.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 59 (Section 11.1.11 : \tkzcname{tkzDefPointWith} \tkzname{linear normed}) + \begin{tikzpicture}[scale=1.2] \tkzDefPoint(1,3){A} \tkzDefPoint(4,2){B} \tkzDefPointWith[linear normed](A,B) @@ -7,3 +12,5 @@ \tkzLabelSegment(A,C){$1$} \tkzLabelPoints[above right=3pt](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex index 464e81c6bd..7ff8f22bef 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-2.tex @@ -1,5 +1,10 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 50 (Section 11.1.2 : colinear at) + \begin{tikzpicture}[vect/.style={->, - shorten >=3pt,>=latex'}] + shorten >=3pt,>=latex'}] \tkzDefPoint(0,0){A} \tkzDefPoint(5,0){B} \tkzDefPoint(1,2){C} @@ -9,5 +14,7 @@ \tkzGetPoint{H} \tkzLabelPoints(A,B,C,G,H) \tkzDrawPoints(A,B,C,G,H) - \tkzDrawSegments[vect](A,B C,H) + \tkzDrawSegments[vect](A,B C,H) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex index 60d7f7a1bb..645719cca9 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-3.tex @@ -1,5 +1,10 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 51 (Section 11.1.3 : colinear $K=\frac{\sqrt{2}}{2}$) + \begin{tikzpicture}[vect/.style={->, - shorten >=3pt,>=latex'}] + shorten >=3pt,>=latex'}] \tkzDefPoint(1,1){A} \tkzDefPoint(4,2){B} \tkzDefPoint(2,2){CU} @@ -8,3 +13,5 @@ \tkzDrawPoints[color=red](A,B,C,D) \tkzDrawSegments[vect](A,B C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex index 0f9366c2af..a0bc38ede3 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-4.tex @@ -1,7 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 52 (Section 11.1.4 : \tkzcname{tkzDefPointWith} et \tkzname{orthogonal}) + \begin{tikzpicture}[scale=1.2, vect/.style={->,shorten >=3pt,>=latex'}] \tkzDefPoint(2,3){A} - \tkzDefPoint(4,2){B} + \tkzDefPoint(4,2){B} \tkzDefPointWith[orthogonal,K=-1](A,B) \tkzGetPoint{C} \tkzDrawPoints[color=red](A,B,C) @@ -9,3 +14,5 @@ \tkzDrawSegments[vect](A,B A,C) \tkzMarkRightAngle(B,A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex index f4d040e71c..b01a8b5ca0 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 53 (Section 11.1.5 : orthogonal simple) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(1,2){O} \tkzDefPoint(2,5){I} @@ -11,3 +16,5 @@ \tkzDrawPoints(O,I,J,K) \tkzLabelPoints(O,I,J,K) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex index 068aeb6d69..b455e51a52 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-6.tex @@ -1,19 +1,26 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 54 (Section 11.1.6 : advanced orthogonal) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/A,6/0/B} \tkzDefMidPoint(A,B) - \tkzGetPoint{I} + \tkzGetPoint{I} \tkzDefPointWith[orthogonal,K=-.75](B,A) \tkzGetPoint{C} \tkzInterLC(B,C)(B,I) - \tkzGetPoints{D}{F} + \tkzGetPoints{D}{F} \tkzDuplicateSegment(B,F)(A,F) \tkzGetPoint{E} \tkzDrawArc[delta=10](F,E)(B) \tkzInterLC(A,B)(A,E) - \tkzGetPoints{N}{M} + \tkzGetPoints{N}{M} \tkzDrawArc[delta=10](A,M)(E) \tkzDrawLines(A,B B,C A,F) \tkzCompass(B,F) \tkzDrawPoints(A,B,C,F,M,E) \tkzLabelPoints(A,B,C,F,M,E) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex index 5025f0cdfe..4f824311be 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-7.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 55 (Section 11.1.7 : segment colinear and orthogonal) + \begin{tikzpicture}[scale=1.2, vect/.style={->,shorten >=3pt,>=latex'}] \tkzDefPoint(2,1){A} @@ -10,3 +15,5 @@ \tkzDrawSegments[vect](A,B A,C C,D) \tkzDrawPoints(A,...,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex index dbe2bb3b6e..5bcb0f65bd 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-8.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-8.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 56 (Section 11.1.8 : \tkzcname{tkzDefPointWith} \tkzname{orthogonal normed}, K=1) + \begin{tikzpicture}[scale=1.2, vect/.style={->,shorten >=3pt,>=latex'}] \tkzDefPoint(2,3){A} \tkzDefPoint(4,2){B} @@ -7,3 +12,5 @@ \tkzDrawSegments[vect](A,B A,C) \tkzMarkRightAngle[fill=gray!20](B,A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex index 4e69660705..42519ab258 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-1-9.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-1-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 57 (Section 11.1.9 : \tkzcname{tkzDefPointWith} et \tkzname{orthogonal normed} K=2) + \begin{tikzpicture}[scale=1.2, vect/.style={->,shorten >=3pt,>=latex'}] \tkzDefPoint(2,3){A} \tkzDefPoint(5,1){B} @@ -9,3 +14,5 @@ \tkzMarkRightAngle[fill=gray!20](B,A,C) \tkzLabelPoints[above=3pt](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex index 390379750b..747d00d946 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-13-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 60 (Section 11.2.1 : Coordinate transfer with \tkzcname{tkzGetVectxy}) + \begin{tikzpicture} \tkzDefPoint(0,0){O} \tkzDefPoint(1,1){A} @@ -9,3 +14,5 @@ \tkzDrawPoints(A,B,O) \tkzLabelPoints(A,B,O,V) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex index 5dd1da2c1a..8301f5ad87 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 61 (Section 12.2 : Random point in a rectangle) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5]\tkzGrid \tkzDefPoints{0/0/A,2/2/B,5/5/C} @@ -9,3 +14,5 @@ \tkzDrawPoints(A,B,C,a,d) \tkzLabelPoints(A,B,C,a,d) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex index d237b81332..08286630a5 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-3-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 62 (Section 12.3 : Random point on a segment) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5] \tkzGrid \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D} @@ -6,3 +11,5 @@ \tkzDrawPoints(A,B,C,D,a,d) \tkzLabelPoints(A,B,C,D,a,d) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex index d75b58c5f1..d07f36751f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 63 (Section 12.4 : Random point on a straight line) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5] \tkzGrid \tkzDefPoints{0/0/A,2/2/B,3/3/C,5/5/D} @@ -6,3 +11,5 @@ \tkzDrawPoints(A,B,C,D,a,d) \tkzLabelPoints(A,B,C,D,a,d) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex index 2545f20b5b..394404b53a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 64 (Section 12.4.1 : Example of random points) + \begin{tikzpicture} \tkzDefPoints{0/0/A,2/2/B,-1/-1/C} \tkzDefCircle[through=](A,C) @@ -18,3 +23,5 @@ \tkzDrawPoints[](A,B,C,a,b,...,e) \tkzDrawRectangle(A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-6-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex index 0d8639e9c5..42d1f9e15b 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 65 (Section 12.5 : Random point on a circle) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5] \tkzGrid \tkzDefPoints{3/2/A,1/1/B} @@ -9,3 +14,5 @@ \tkzDrawPoints(A,B,a) \tkzLabelPoints(A,B,a) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex index 35e28352eb..cfedad22b4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 66 (Section 12.5.1 : Random example and circle of Apollonius) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,3/0/B} \def\coeffK{2} @@ -21,3 +26,5 @@ text centered](P,\tkzLengthResult pt-20pt)(-120)% { $MA/MB=\coeffK$\\$NA/NB=\coeffK$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-7-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex index e04b606698..000691ea21 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-14-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12-6-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 67 (Section 12.6 : Middle of a compass segment) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(0,0){A} \tkzDefRandPointOn[circle= center A radius 4cm] @@ -22,4 +27,6 @@ \tkzCompasss[color=red,style=solid](B,I I,J J,C) \tkzDrawPoints(B,C,D,E,M) \tkzLabelPoints(A,B,M) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex index d4fabaab5b..08b6b72102 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 68 (Section 13.1.1 : Example with \tkzname{mediator}) + \begin{tikzpicture}[rotate=25] \tkzInit \tkzDefPoints{-2/0/A,1/2/B} @@ -10,3 +15,5 @@ \tkzDrawSegments(D,B D,A) \tkzDrawSegments(C,B C,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex index 2eea88ee9c..b15124718c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 69 (Section 13.1.2 : Example avec \tkzname{orthogonal} et \tkzname{parallel}) + \begin{tikzpicture} \tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-0.7/1/C} \tkzDrawLine(A,B) @@ -13,3 +18,5 @@ \tkzLabelLine[pos=1.25,left](C,c'){$(d_2)$} \tkzMarkRightAngle(I,C,c') \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex index 4049c8dc95..754b8d2c98 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 70 (Section 13.1.3 : An envelope) + \begin{tikzpicture}[scale=1] \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6] \tkzClip @@ -9,3 +14,5 @@ \tkzDefLine[mediator](A,M) \tkzDrawLine[color=magenta,add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex index cb58fa3452..bf3c722eaf 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 71 (Section 13.1.4 : A parable) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-6,ymin=-6,xmax=6,ymax=6] \tkzClip @@ -9,4 +14,6 @@ \tkzDefLine[mediator](A,M) \tkzDrawLine[color=magenta, add= 4 and 4](tkzFirstPointResult,tkzSecondPointResult)} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex index 60e7b1c695..c08103fbba 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 72 (Section 13.1.5 : Drawing a tangent option \tkzimp{from with R} and \tkzimp{at}) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){O} \tkzDefPoint(6,6){E} @@ -15,4 +20,6 @@ \tkzDrawLine[add = .5 and .5](A,h) \tkzDrawLine[add = .5 and .5](E,k) \tkzMarkRightAngle[fill=red!30](O,A,h) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex index 1347aecde9..f9c12b5df1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-15-1-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13-1-6.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 73 (Section 13.1.6 : Drawing a tangent option \tkzimp{from}) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){B} \tkzDefPoint(0,8){A} @@ -18,3 +23,5 @@ \tkzDefPointBy[projection= onto B--A](tkzPointResult) \tkzDrawCircle[fill = blue!50!black](tkzPointResult,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex index 7a40607519..b4a79c00dc 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 74 (Section 14.1.1 : Examples of right-hand plots with \tkzname{add}) + \begin{tikzpicture} \tkzInit[xmin=-2,xmax=3,ymin=-2.25,ymax=2.25] \tkzClip[space=.25] @@ -7,7 +12,9 @@ \tkzDefPoint(0,-2){G} \tkzDefPoint(2,-1.5){H} \tkzDrawLine(A,B) \tkzDrawLine[add = 0 and .5](C,D) \tkzDrawLine[add = 1 and 0](E,F) -\tkzDrawLine[add = 0 and 0](G,H) + \tkzDrawLine[add = 0 and 0](G,H) \tkzDrawPoints(A,B,C,D,E,F,G,H) \tkzLabelPoints(A,B,C,D,E,F,G,H) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex index 6be6387813..38871e6f02 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 75 (Section 14.1.2 : Example with \tkzcname{tkzDrawLines}) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(2,0){B} @@ -6,3 +11,5 @@ \tkzDrawLines(A,B C,D A,C B,D) \tkzLabelPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex index 18739883b8..bc6fa74542 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 76 (Section 14.1.3 : Example with the option \tkzname{add}) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){O} \tkzDefPoint(3,1){I} @@ -9,3 +14,5 @@ \tkzDrawLines[add = 1 and .5,color=red](O,I O,J) \tkzDrawLines[add = 1 and .5,color=blue](O,i O,j) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex index 1accd70ba9..614db1b70f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-4.tex @@ -1,5 +1,9 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 77 (Section 14.1.4 : Medians in a triangle) + \begin{tikzpicture}[scale=1.25] - \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] \tkzClip \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) \tkzSetUpLine[color=blue] @@ -7,3 +11,5 @@ \tkzDrawLine[median](C,A,B) \tkzDrawLine[median](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex index d323b4e1de..0fa5586acc 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-5.tex @@ -1,5 +1,9 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 78 (Section 14.1.5 : Altitudes in a triangle) + \begin{tikzpicture}[scale=1.25] - \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] \tkzClip \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) \tkzSetUpLine[color=magenta] @@ -7,3 +11,5 @@ \tkzDrawLine[altitude](C,A,B) \tkzDrawLine[altitude](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex index 7dabe9e81a..dea9390282 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-1-6.tex @@ -1,5 +1,9 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 79 (Section 14.1.6 : Bisectors in a triangle) + \begin{tikzpicture}[scale=1.5] - \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] \tkzClip \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) \tkzSetUpLine[color=purple] @@ -7,3 +11,5 @@ \tkzDrawLine[bisector](C,A,B) \tkzDrawLine[bisector](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex index 2ea57441cc..98cd8c990a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-16-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 80 (Section 14.2.1 : Example with \tkzcname{tkzLabelLine}) + \begin{tikzpicture} \tkzDefPoints{0/0/A,3/0/B,1/1/C} \tkzDefLine[perpendicular=through C,K=-1](A,B) @@ -6,3 +11,5 @@ \tkzLabelLine[pos=1.25,blue,right](C,c){$(\delta)$} \tkzLabelLine[pos=-0.25,red,left](C,c){encore $(\delta)$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex index cad85c29c5..d61e0491bd 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 81 (Section 15.1.1 : Example with point references) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){A} \tkzDefPoint(2,1){B} @@ -5,3 +10,5 @@ \tkzDrawPoints(A,B) \tkzLabelPoints(A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex index 2d79844eb2..a51b731c18 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 82 (Section 15.1.2 : Example of extending an option segment \tkzimp{add}) + \begin{tikzpicture} \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} \tkzDefTriangleCenter[euler](A,B,C) @@ -6,4 +11,6 @@ \tkzDrawLines[add=.5 and .5](A,B A,C B,C) \tkzDrawPoints(A,B,C,E) \tkzLabelPoints(A,B,C,E) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex index 2cc2068bc3..64d616fde2 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 83 (Section 15.1.3 : Example of adding dimensions (technical figure) option \tkzimp{dim}) + \begin{tikzpicture}[scale=2] \pgfkeys{/pgf/number format/.cd,fixed,precision=2} % Define the first two points @@ -18,4 +23,6 @@ 6pt,transform shape}](A,C) \tkzDrawSegment[dim={\pgfmathprintnumber\ABl, -6pt,transform shape}](A,B) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex index e2efe5a28f..678362bd28 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 84 (Section 15.2 : Drawing segments \tkzcname{tkzDrawSegments}) + \begin{tikzpicture} \tkzInit[xmin=-1,xmax=3,ymin=-1,ymax=2] \tkzClip[space=1] @@ -9,3 +14,5 @@ \tkzLabelPoints(A,C) \tkzLabelPoints[above](B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex new file mode 100644 index 0000000000..cff3b62052 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-2-1.tex @@ -0,0 +1,18 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 85 (Section 15.2.1 : Place an arrow on segment) + +\begin{tikzpicture} + \tikzset{ + arr/.style={postaction=decorate, + decoration={markings, + mark=at position .5 with {\arrow[thick]{#1}} + }}} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDrawSegments[arr=stealth](A,B) + \tkzDrawPoints(A,B) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex index 37c9305c21..8c6e4ec492 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-1.tex @@ -1,11 +1,18 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 86 (Section 15.3.1 : Several marks ) + \begin{tikzpicture} \tkzDefPoint(2,1){A} \tkzDefPoint(6,4){B} \tkzDrawSegment(A,B) - \tkzMarkSegment[color=Maroon,size=2pt, + \tkzMarkSegment[color=brown,size=2pt, pos=0.4, mark=z](A,B) \tkzMarkSegment[color=blue, pos=0.2, mark=oo](A,B) \tkzMarkSegment[pos=0.8, mark=s,color=red](A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex index b532bdbe81..26cb6fb913 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-3-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-3-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 87 (Section 15.3.2 : Use of \tkzname{mark}) + \begin{tikzpicture} \tkzDefPoint(2,1){A} \tkzDefPoint(6,4){B} @@ -6,8 +11,10 @@ pos=0.2,mark=s|](A,B) \tkzMarkSegment[color=gray, pos=0.4,mark=s||](A,B) - \tkzMarkSegment[color=Maroon, + \tkzMarkSegment[color=brown, pos=0.6,mark=||](A,B) \tkzMarkSegment[color=red, pos=0.8,mark=|||](A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex index a350f99961..1b5701802d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 88 (Section 15.4.1 : Marques pour un triangle isocèle) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C} \tkzDrawSegments(O,A A,B) @@ -5,3 +10,5 @@ \tkzDrawLine(O,B) \tkzMarkSegments[mark=||,size=6pt](O,A A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex index 618e7d219a..c4bfea9313 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 89 (Section 15.5 : Another marking) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,0){A}\tkzDefPoint(3,2){B} \tkzDefPoint(4,0){C}\tkzDefPoint(2.5,1){P} @@ -14,3 +19,5 @@ \tkzLabelPoints(A,C) \tkzLabelPoints[below](P) \tkzLabelPoints[above right](P',C',B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex index 65bbee7805..e2987c9905 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 90 (Section 15.5.1 : Labels multiples) + \begin{tikzpicture} \tkzInit \tkzDefPoint(0,0){A} @@ -6,3 +11,5 @@ \tkzLabelSegment[above,pos=.8](A,B){$a$} \tkzLabelSegment[below,pos=.2](A,B){$4$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex index 2798efaf6d..41c37c42a5 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-2.tex @@ -1,7 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 91 (Section 15.5.2 : Labels and right-angled triangle) + \begin{tikzpicture}[rotate=-60] \tikzset{label seg style/.append style = {% - color = red, - }} + color = red, + }} \tkzDefPoint(0,1){A} \tkzDefPoint(2,4){C} \tkzDefPointWith[orthogonal normed,K=7](C,A) @@ -24,3 +29,5 @@ color=orange,mark=||](B,A,C) \tkzMarkRightAngles[german](A,C,B B,P,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex index 450c9c3fd1..d20e641496 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-17-5-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15-5-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 92 (Section 15.5.3 : Labels for an isosceles triangle) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/O,2/2/A,4/0/B,6/2/C} \tkzDrawSegments(O,A A,B) @@ -5,3 +10,5 @@ \tkzDrawLine(O,B) \tkzLabelSegments[color=red,above=4pt](O,A A,B){$a$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex index d276812b75..4d4374b3f6 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 93 (Section 16.1.1 : triangle doré (golden)) + \begin{tikzpicture}[scale=.8] \tkzInit[xmax=5,ymax=3] \tkzClip[space=.5] \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} @@ -6,3 +11,5 @@ \tkzLabelPoints(A,B) \tkzDrawBisector(A,C,B) \tkzLabelPoints[above](C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex index 231cc7e7d6..47605fcc6f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 94 (Section 16.1.2 : triangle équilatéral) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} @@ -10,3 +15,5 @@ \tkzDrawPoints(A,B,C,D) \tkzLabelPoints(A,B,C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex index d438bc7942..11f13d0f52 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 95 (Section 16.1.3 : triangle d'or (euclide)) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} \tkzDefTriangle[euclide](A,B)\tkzGetPoint{C} @@ -7,3 +12,5 @@ \tkzLabelPoints[above](C) \tkzDrawBisector(A,C,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex new file mode 100644 index 0000000000..dbb9772f1d --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-1.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 96 (Section 16.2.1 : triangle de Pythagore) + +\begin{tikzpicture} + \tkzDefPoint(0,0){A} + \tkzDefPoint(4,0){B} + \tkzDrawTriangle[pythagore,fill=blue!30](A,B) + \tkzMarkRightAngles(A,B,tkzPointResult) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex new file mode 100644 index 0000000000..9bbceb668a --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16-2-2.tex @@ -0,0 +1,16 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 97 (Section 16.2.2 : triangle 30 60 90 (school)) + +\begin{tikzpicture} +\tkzInit[ymin=-2.5,ymax=0,xmin=-5,xmax=0] +\tkzClip[space=.5] +\begin{scope}[rotate=-180] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDrawTriangle[school,fill=red!30](A,B) + \tkzMarkRightAngles(B,A,tkzPointResult) +\end{scope} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex new file mode 100644 index 0000000000..e1a75b5d37 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-1.tex @@ -0,0 +1,21 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 98 (Section 17.0.1 : \tkzcname{tkzDefSpcTriangle} option "medial" ou "centroid") + +\begin{tikzpicture}[rotate=90,scale=.75] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefTriangleCenter[centroid](A,B,C) + \tkzGetPoint{M} + \tkzDefSpcTriangle[medial,name=M](A,B,C){_A,_B,_C} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawSegments[dashed,red](A,M_A B,M_B C,M_C) + \tkzDrawPolygon[color=red](M_A,M_B,M_C) + \tkzDrawPoints(A,B,C,M) + \tkzDrawPoints[red](M_A,M_B,M_C) +\tkzAutoLabelPoints[center=M,font=\scriptsize]% +(A,B,C,M_A,M_B,M_C) + \tkzLabelPoints[font=\scriptsize](M) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex index dc76c83991..7d41f95ce8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-2.tex @@ -1,11 +1,22 @@ -\begin{tikzpicture}[scale=1.5] +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 99 (Section 17.0.2 : Option : "in" ou "incentral") + +\begin{tikzpicture}[scale=1] \tkzDefPoints{ 0/0/A,5/0/B,1/3/C} \tkzDefSpcTriangle[in,name=I](A,B,C){a,b,c} \tkzInCenter(A,B,C)\tkzGetPoint{I} \tkzDrawPolygon[red](A,B,C) \tkzDrawPolygon[blue](Ia,Ib,Ic) \tkzDrawPoints(A,B,C,I,Ia,Ib,Ic) - \tkzLabelPoints(A,B,C,I,Ia,Ib,Ic) \tkzDrawCircle[in](A,B,C) \tkzDrawSegments[dashed](A,Ia B,Ib C,Ic) + \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]% +(Ia,Ib,Ic) + \tkzAutoLabelPoints[center=I,red,font=\scriptsize]% +(A,B,C) +(A,B,C,Ia,Ib,Ic) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex new file mode 100644 index 0000000000..1a8293accd --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-3.tex @@ -0,0 +1,21 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 100 (Section 17.0.3 : Option : "ex" ou "Excentral") + +\begin{tikzpicture}[scale=.6] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[excentral,name=J](A,B,C){a,b,c} + \tkzDefSpcTriangle[extouch,name=T](A,B,C){a,b,c} + \tkzDrawPolygon[blue](A,B,C) + \tkzDrawPolygon[red](Ja,Jb,Jc) + \tkzDrawPoints(A,B,C) + \tkzDrawPoints[red](Ja,Jb,Jc) + \tkzLabelPoints(A,B,C) + \tkzLabelPoints[red](Jb,Jc) + \tkzLabelPoints[red,above](Ja) + \tkzClipBB \tkzShowBB + \tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex new file mode 100644 index 0000000000..77666ae907 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-4.tex @@ -0,0 +1,21 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 101 (Section 17.0.4 : Option : "intouch") + +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} + \tkzDefSpcTriangle[intouch,name=x](A,B,C){a,b,c} + \tkzInCenter(A,B,C)\tkzGetPoint{I} + \tkzDrawPolygon[red](A,B,C) + \tkzDrawPolygon[blue](xa,xb,xc) + \tkzDrawPoints[red](A,B,C) + \tkzDrawPoints[blue](xa,xb,xc) + \tkzDrawCircle[in](A,B,C) + \tkzAutoLabelPoints[center=I,blue,font=\scriptsize]% +(xa,xb,xc) + \tkzAutoLabelPoints[center=I,red,font=\scriptsize]% +(A,B,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex new file mode 100644 index 0000000000..208bb86297 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-5.tex @@ -0,0 +1,33 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 102 (Section 17.0.5 : Option : "extouch") + +\begin{tikzpicture}[scale=.7] +\tkzDefPoints{0/0/A,6/0/B,0.8/4/C} +\tkzDefSpcTriangle[excentral, + name=J](A,B,C){a,b,c} +\tkzDefSpcTriangle[extouch, + name=T](A,B,C){a,b,c} +\tkzDefTriangleCenter[nagel](A,B,C) +\tkzGetPoint{Na} +\tkzDefTriangleCenter[centroid](A,B,C) +\tkzGetPoint{G} +\tkzDrawPoints[blue](Ja,Jb,Jc) +\tkzClipBB \tkzShowBB +\tkzDrawCircles[gray](Ja,Ta Jb,Tb Jc,Tc) +\tkzDrawLines[add=1 and 1](A,B B,C C,A) +\tkzDrawSegments[gray](A,Ta B,Tb C,Tc) +\tkzDrawSegments[gray](Ja,Ta Jb,Tb Jc,Tc) +\tkzDrawPolygon[blue](A,B,C) +\tkzDrawPolygon[red](Ta,Tb,Tc) +\tkzDrawPoints(A,B,C,Na) +\tkzLabelPoints(Na) +\tkzAutoLabelPoints[center=Na,blue](A,B,C) +\tkzAutoLabelPoints[center=G,red, + dist=.4](Ta,Tb,Tc) +\tkzMarkRightAngles[fill=gray!15](Ja,Ta,B + Jb,Tb,C Jc,Tc,A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex new file mode 100644 index 0000000000..82ae803be6 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-6.tex @@ -0,0 +1,27 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 103 (Section 17.0.6 : Option : "feuerbach") + +\begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(3,0){B} + \tkzDefPoint(0.5,2.5){C} + \tkzDefCircle[euler](A,B,C) \tkzGetPoint{N} + \tkzDefSpcTriangle[feuerbach, + name=F](A,B,C){_a,_b,_c} + \tkzDefSpcTriangle[excentral, + name=J](A,B,C){_a,_b,_c} + \tkzDefSpcTriangle[extouch, + name=T](A,B,C){_a,_b,_c} + \tkzDrawPoints[blue](J_a,J_b,J_c,F_a,F_b,F_c,A,B,C) + \tkzClipBB \tkzShowBB + \tkzDrawCircle[purple](N,F_a) + \tkzDrawPolygon(A,B,C) + \tkzDrawPolygon[blue](F_a,F_b,F_c) + \tkzDrawCircles[gray](J_a,F_a J_b,F_b J_c,F_c) + \tkzAutoLabelPoints[center=N,dist=.3, + font=\scriptsize](A,B,C,F_a,F_b,F_c,J_a,J_b,J_c) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex index 384b9963a8..b71f602432 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 104 (Section 17.0.7 : Option Triangle "tangential") + \begin{tikzpicture}[scale=.5,rotate=80] \tkzDefPoints{0/0/A,6/0/B,1.8/4/C} \tkzDefSpcTriangle[tangential, @@ -12,3 +17,5 @@ \tkzLabelPoints[red](A,B,C) \tkzLabelPoints[blue](Ta,Tb,Tc) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex index 211cc71637..d5041da322 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17-0-8.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 105 (Section 17.0.8 : Option Triangle "euler") + \begin{tikzpicture}[rotate=90,scale=1.25] \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} \tkzDefSpcTriangle[medial, @@ -24,3 +29,5 @@ color=blue,line width=1pt](B,E_B E_B,H) \tkzDrawPolygon[color=red](M_A,M_B,M_C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex index ada53493da..faead36ac4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 106 (Section 18.1.1 : Using \tkzcname{tkzDefSquare} with two points) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B} \tkzDefSquare(A,B) @@ -7,3 +12,5 @@ \tkzDrawPolygon[color=blue](B,A,tkzFirstPointResult,% tkzSecondPointResult) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex index 23e0a85573..82a8f36d92 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-2.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 107 (Section 18.1.2 : Use of \tkzcname{tkzDefSquare} to obtain an isosceles right-angled triangle) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B} \tkzDefSquare(A,B) \tkzGetFirstPoint{C} \tkzDrawPolygon[color=blue,fill=blue!30](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex index 2ff0bbf24f..915ff3b88a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 108 (Section 18.1.3 : Pythagorean Theorem and \tkzcname{tkzDefSquare} ) + \begin{tikzpicture}[scale=.5] \tkzInit \tkzDefPoint(0,0){C} @@ -18,3 +23,5 @@ \tkzLabelSegment[](C,B){$b$} \tkzLabelSegment[swap](A,B){$c$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex index 2d6b95b7ff..beb81b3d88 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 109 (Section 18.3.1 : Example of a parallelogram definition) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,3/0/B,4/2/C} \tkzDefParallelogram(A,B,C) @@ -7,3 +12,5 @@ \tkzLabelPoints[above right](C,D) \tkzDrawPoints(A,...,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex index 695e68316e..1ccd775cd7 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 110 (Section 18.3.2 : Simple example) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,3/0/B,4/2/C} \tkzDefPointWith[colinear= at C](B,A) @@ -7,3 +12,5 @@ \tkzLabelPoints[above right](C,D) \tkzDrawPoints(A,...,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex index 7a0ec301b9..bd138f15e9 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-3-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-3-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 111 (Section 18.3.3 : Construction of the golden rectangle ) + \begin{tikzpicture}[scale=.5] \tkzInit[xmax=14,ymax=10] \tkzClip[space=1] @@ -15,3 +20,5 @@ \tkzDrawSegments[style=dashed,color=gray]% (E,F C,F B,E) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex index 5c07f233fd..8941995398 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 112 (Section 18.4.1 : The idea is to inscribe two squares in a semi-circle.) + \begin{tikzpicture}[scale=.75] \tkzInit[ymax=8,xmax=8] \tkzClip[space=.25] \tkzDefPoint(0,0){A} @@ -15,3 +20,5 @@ \tkzDrawPolySeg[color=red](J,K,L) \tkzDrawPoints(E,G,H,F,J,K,L) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex index 1e87cc36d3..be38a5cd00 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 113 (Section 18.5.1 : Golden Rectangles) + \begin{tikzpicture}[scale=.6] \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} \tkzDefGoldRectangle(A,B) \tkzGetPoints{C}{D} @@ -5,3 +10,5 @@ \tkzDrawPolygon[color=red,fill=red!20](A,B,C,D) \tkzDrawPolygon[color=blue,fill=blue!20](B,C,E,F) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex new file mode 100644 index 0000000000..8be32ed78c --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-6-1.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 114 (Section 18.6.1 : Draw a polygon 1) + +\begin{tikzpicture} [rotate=18,scale=1.5] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2.25,0.2){B} + \tkzDefPoint(2.5,2.75){C} + \tkzDefPoint(-0.75,2){D} + \tkzDrawPolygon[fill=black!50!blue!20!](A,B,C,D) + \tkzDrawSegments[style=dashed](A,C B,D) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex new file mode 100644 index 0000000000..3045821ae3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-1.tex @@ -0,0 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 115 (Section 18.7.1 : Simple Example) + +\begin{tikzpicture}[scale=1.25] + \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] + \tkzClip[space=.5] + \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) + \tkzDefPoint(0,2){D} \tkzDefPoint(2,0){E} + \tkzDrawPoints(D,E) \tkzLabelPoints(D,E) + \tkzClipPolygon(A,B,C) + \tkzDrawLine[color=red](D,E) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex index 6c5492a5ee..9b070480a7 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-7-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 116 (Section 18.7.2 : Example Sangaku in a square) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} \tkzDefSquare(A,B) \tkzGetPoints{C}{D} @@ -18,3 +23,5 @@ \tkzFillCircle[R,color = yellow](M,\dMI pt) \tkzFillCircle[R,color = blue!50!black](F,4 cm)% \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex index b69484368a..d1c480a078 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-7-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18-8-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 117 (Section 18.8.1 : Color a polygon) + \begin{tikzpicture}[scale=0.7] \tkzInit[xmin=-3,xmax=6,ymin=-1,ymax=6] \tkzDrawX[noticks] @@ -15,3 +20,5 @@ \tkzFillPolygon[red!30,opacity=0.25](A,B,O) \tkzLabelAngle[pos = 1.5](A,O,B){$\alpha$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex index 0ad9d2a9b6..b3166a802f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 118 (Section 19.1.1 : Example with a random point and the option \tkzimp{through}) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,4){A} \tkzDefPoint(2,2){B} @@ -10,9 +15,11 @@ \tkzDrawCircle(A,C) \tkzDrawPoints(A,B,C) \tkzLabelPoints(A,B,C) - \tkzLabelCircle[draw,fill=Gold,% - text width=3cm,text centered, - font=\scriptsize](A,C)(-90)% + \tkzLabelCircle[draw,fill=orange, + text width=3cm,text centered, + font=\scriptsize](A,C)(-90)% {La mesure du rayon est : \rACpt pt soit \rACcm cm} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex index e7b34c99f3..ced687050c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-7.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-10.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 127 (Section 19.1.10 : Orthogonal circle of given center) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/O,1/0/A} \tkzDefPoints{1.5/1.25/B,-2/-3/C} @@ -12,3 +17,5 @@ \tkzDrawPoints(z1,z2,O,A,B) \tkzLabelPoints(O,A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex new file mode 100644 index 0000000000..9238806027 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-2.tex @@ -0,0 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 119 (Section 19.1.2 : Example with the option \tkzimp{diameter}) + + \begin{tikzpicture}[scale=1] + \tkzDefPoint(0,0){A} + \tkzDefPoint(2,2){B} + \tkzDefCircle[diameter](A,B) + \tkzGetPoint{O} + \tkzDrawCircle[blue,fill=blue!20](O,B) + \tkzDrawSegment(A,B) + \tkzDrawPoints(A,B,O) + \tkzLabelPoints(A,B,O) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex index 5fbdc3260f..cd1e96675e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 120 (Section 19.1.3 : Circles inscribed and circumscribed for a given triangle) + \begin{tikzpicture}[scale=1] \tkzDefPoint(2,2){A} \tkzDefPoint(5,-2){B} @@ -13,3 +18,5 @@ \tkzLabelPoints[above left](A,I,K) \tkzDrawPolygon(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex new file mode 100644 index 0000000000..19eb9c017f --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-4.tex @@ -0,0 +1,32 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 121 (Section 19.1.4 : Example with the option \tkzimp{ex}) + +\begin{tikzpicture}[scale=.75] + \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C} + \tkzDefCircle[ex](B,C,A) + \tkzGetPoint{Jc} \tkzGetLength{rc} + \tkzDefPointBy[projection=onto A--C ](Jc) + \tkzGetPoint{Xc} + \tkzDefPointBy[projection=onto A--B ](Jc) + \tkzGetPoint{Yc} + \tkzGetPoint{I} + \tkzDrawPolygon[color=blue](A,B,C) + \tkzDrawCircle[R,color=lightgray](Jc,\rc pt) + % possible \tkzDrawCircle[ex](A,B,C) + \tkzDrawCircle[in,color=red](A,B,C) \tkzGetPoint{I} + \tkzDefPointBy[projection=onto A--C ](I) + \tkzGetPoint{F} + \tkzDefPointBy[projection=onto A--B ](I) + \tkzGetPoint{D} + \tkzDrawLines[add=0 and 2.2,dashed](C,A C,B) + \tkzDrawSegments[dashed](Jc,Xc I,D I,F Jc,Yc) + \tkzMarkRightAngles(A,F,I B,D,I Jc,Xc,A Jc,Yc,B) + \tkzDrawPoints(B,C,A,I,D,F,Xc,Jc,Yc) + \tkzLabelPoints(B,A,Jc,I,D,Xc,Yc) + \tkzLabelPoints[above left](C) + \tkzLabelPoints[left](F) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex index bce823f482..6ba01e0077 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-5.tex @@ -1,11 +1,19 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 122 (Section 19.1.5 : Euler's circle for a given triangle) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(5,3.5){A} \tkzDefPoint(0,0){B} \tkzDefPoint(7,0){C} \tkzDefCircle[euler](A,B,C) \tkzGetPoint{E} \tkzGetLength{rEuler} - \tkzDrawPoints(A,B,C,E) + \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc} + \tkzDrawPoints(A,B,C,E,Ma,Mb,Mc) \tkzDrawCircle[R,blue](E,\rEuler pt) \tkzDrawPolygon(A,B,C) \tkzLabelPoints[below](B,C) \tkzLabelPoints[left](A,E) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex index df2e141919..d157b65d28 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-6.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 123 (Section 19.1.6 : Coloured Apollonius circles for a given segment) + \begin{tikzpicture}[scale=0.75] \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} @@ -14,3 +19,5 @@ \tkzDrawPoints(A,B,K1,K2) \tkzDrawLine[add=.2 and 1](A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex index f68e7e7026..fb7dca4286 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 124 (Section 19.1.7 : Circles exinscribed to a given triangle) + \begin{tikzpicture}[scale=.6] \tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B} @@ -20,3 +25,5 @@ \tkzDrawCircles[R](J,{\rJ} I,{\rI} K,{\rK}) \tkzLabelPoints(A,B,C,I,J,K) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex new file mode 100644 index 0000000000..21cc8385d4 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-8.tex @@ -0,0 +1,21 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 125 (Section 19.1.8 : Spieker circle) + +\begin{tikzpicture}[scale=1] + \tkzDefPoints{ 0/0/A,4/0/B,0.8/4/C} + \tkzDefSpcTriangle[medial](A,B,C){Ma,Mb,Mc} + \tkzDefTriangleCenter[spieker](A,B,C) + \tkzGetPoint{Sp} + \tkzDrawPolygon[blue](A,B,C) + \tkzDrawPolygon[red](Ma,Mb,Mc) + \tkzDrawPoints[blue](B,C,A) + \tkzDrawPoints[red](Ma,Mb,Mc,Sp) + \tkzDrawCircle[in,red](Ma,Mb,Mc) + \tkzAutoLabelPoints[center=Sp,dist=.3](Ma,Mb,Mc) + \tkzLabelPoints[blue,right](Sp) + \tkzAutoLabelPoints[center=Sp](A,B,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex index 0ff0838882..d5bd2678d4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-1-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-1-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 126 (Section 19.1.9 : Orthogonal circle passing through two given points) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,0){O} \tkzDefPoint(1,0){A} @@ -11,3 +16,5 @@ size=4](O,A,z1,z2,c) \tkzLabelPoints(O,A,z1,z2,c) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex index ee96507851..e370a90725 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 128 (Section 19.2.1 : Example of a tangent passing through a point on the circle ) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){O} \tkzDefPoint(6,6){E} @@ -10,3 +15,5 @@ \tkzDrawLine[add = 4 and 3](A,h) \tkzMarkRightAngle[fill=red!30](O,A,h) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex index adf7aee1df..bdaac686b0 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 129 (Section 19.2.2 : Example of tangents passing through an external point ) + \begin{tikzpicture}[scale=0.75] \tkzDefPoint(3,3){c} \tkzDefPoint(6,3){a0} @@ -12,3 +17,5 @@ \tkzDrawSegments(c,e c,f) }% \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex index a39c9a1f22..0cb9cec7fb 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-21-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 130 (Section 19.2.3 : Example of Andrew Mertz ) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(100:8){A}\tkzDefPoint(50:8){B} \tkzDefPoint(0,0){C} \tkzDefPoint(0,4){R} @@ -8,4 +13,6 @@ \tkzFillSector[color=red!80!black,opacity=0.5](B,F)(G) \tkzInterCC(A,D)(B,F) \tkzGetSecondPoint{I} \tkzDrawPoint[color=black](I) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex index 43155310bf..8e58ae04d4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-1-1.tex @@ -1,13 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 131 (Section 20.1.1 : Circles and styles, draw a circle and color the disc) + \begin{tikzpicture} \tkzDefPoint(0,0){O} \tkzDefPoint(3,0){A} - % cercle de centre O et passant par A \tkzDrawCircle[color=blue,style=dashed](O,A) - % cercle de diamètre $[OA]$ \tkzDrawCircle[diameter,color=red,% line width=2pt,fill=red!40,% opacity=.5](O,A) - % cercle de centre O et de rayon = exp(1) cm \edef\rayon{\fpeval{exp(1)}} \tkzDrawCircle[R,color=orange](O,\rayon cm) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex index 70022aba09..a5ceb7175f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 132 (Section 20.2.1 : Circles defined by a triangle.) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(2,0){B} @@ -7,3 +12,5 @@ \tkzDrawPoints(A,B,C) \tkzLabelPoints(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex index baa5197b8d..ac9c968404 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-2.tex @@ -1,6 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 133 (Section 20.2.2 : Concentric circles.) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDrawCircles[R](A,1cm A,2cm A,3cm) \tkzDrawPoint(A) \tkzLabelPoints(A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex index 1cdae93240..cf37487d36 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 134 (Section 20.2.3 : Exinscribed circles.) + \begin{tikzpicture}[scale=1] \tkzDefPoints{0/0/A,4/0/B,1/2.5/C} \tkzDrawPolygon(A,B,C) @@ -10,3 +15,5 @@ \tkzMarkRightAngle(Jc,Tc,B) \tkzDrawPoints(A,B,C,Jc,Tc) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex index 8949866765..e0efc4e8a9 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-2-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-2-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 135 (Section 20.2.4 : Cardioid) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){O} \tkzDefPoint(2,0){A} @@ -5,4 +10,6 @@ \tkzDefPoint(\ang:2){M} \tkzDrawCircle(M,A) } - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex index 19d2ee8b32..997b49528c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 136 (Section 20.4.1 : Example from a sangaku) + \begin{tikzpicture} \tkzInit[xmin=0,xmax = 6,ymin=0,ymax=6] \tkzDefPoint(0,0){B} \tkzDefPoint(6,0){C}% @@ -10,10 +15,12 @@ \tkzInterLL(F,G)(C,D) \tkzGetPoint{J} \tkzInterLL(A,J)(F,E) \tkzGetPoint{K} \tkzDefPointBy[projection=onto B--A](K) - \tkzGetPoint{M} + \tkzGetPoint{M} \tkzFillPolygon[color = green](A,B,C,D) \tkzFillCircle[color = orange](B,A) \tkzFillCircle[color = blue!50!black](M,A) \tkzFillCircle[color = purple](E,B) \tkzFillCircle[color = yellow](K,Q) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex index 693ccd8b0a..00000d1304 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-5-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-5-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 137 (Section 20.5.1 : Example) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5] \tkzGrid \tkzClip @@ -12,3 +17,5 @@ \tkzDrawLine(A,C) \tkzDrawCircle[fill=red!20,opacity=.5](C,O) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex new file mode 100644 index 0000000000..d9b0db98a3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20-6-1.tex @@ -0,0 +1,23 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 138 (Section 20.6.1 : Example) + +\begin{tikzpicture} + \tkzDefPoint(0,0){O} \tkzDefPoint(2,0){N} + \tkzDefPointBy[rotation=center O angle 50](N) + \tkzGetPoint{M} + \tkzDefPointBy[rotation=center O angle -20](N) + \tkzGetPoint{P} + \tkzDefPointBy[rotation=center O angle 125](N) + \tkzGetPoint{P'} + \tkzLabelCircle[above=4pt](O,N)(120){$\mathcal{C}$} + \tkzDrawCircle(O,M) + \tkzFillCircle[color=blue!20,opacity=.4](O,M) + \tkzLabelCircle[R,draw,fill=orange,% + text width=2cm,text centered](O,3 cm)(-60)% + {Le cercle\\ $\mathcal{C}$} + \tkzDrawPoints(M,P)\tkzLabelPoints[right](M,P) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex index 1b3105765a..f65c476c83 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 139 (Section 21.1.1 : Example of intersection between two straight lines) + \begin{tikzpicture}[rotate=-45,scale=.75] \tkzDefPoint(2,1){A} \tkzDefPoint(6,5){B} @@ -9,3 +14,5 @@ \tkzDrawPoints[color=blue](A,B,C,D) \tkzDrawPoint[color=red](I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex index 98b596114f..0aa2171586 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 140 (Section 21.2.1 : Simple example of a line-circle intersection) + \begin{tikzpicture}[scale=.75] \tkzInit[xmax=5,ymax=4] \tkzDefPoint(1,1){O} @@ -11,3 +16,5 @@ \tkzDrawLine(A,B) \tkzLabelPoints[above right](O,A,B,C,D,E) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex index 6983d24ed0..1b1472086b 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 141 (Section 21.2.2 : More complex example of a line-circle intersection) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} @@ -20,3 +25,5 @@ \tkzDrawPoints(A,B,O,O',E,D) \tkzLabelPoints(A,B,O,O',E,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex index 2f4e52bac0..d5e11a7c13 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 142 (Section 21.2.3 : Circle defined by a center and a measure, and special cases) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,8){A} \tkzDefPoint(8,0){B} \tkzDefPoint(8,8){C} \tkzDefPoint(4,4){I} @@ -13,3 +18,5 @@ \tkzDrawPoints[color=red](I2,J2) \tkzDrawLine(I2,J2) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex index 3d1924a2f3..3f1f3c7798 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 143 (Section 21.2.4 : More complex example) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,1){J} \tkzDefPoint(0,0){O} @@ -17,3 +22,5 @@ \tkzDrawPoints[red](M) } \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex index 93125ba98f..50a5e0823e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-6.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 144 (Section 21.2.6 : Calculation of radius dimension 1) + \begin{tikzpicture} \tkzDefPoint(2,2){A} \tkzDefPoint(5,4){B} @@ -10,3 +15,5 @@ \tkzDrawPoints[color=red](I,J) \tkzDrawLine(I,J) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex new file mode 100644 index 0000000000..e1c50f98dd --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-7.tex @@ -0,0 +1,17 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 145 (Section 21.2.7 : Calculation of radius dimension 2) + +\begin{tikzpicture} + \tkzDefPoints{2/2/A,5/4/B,4/4/0} + \tkzLength=2cm + \tkzDrawCircle[R](O,\tkzLength) + \tkzInterLC[R](A,B)(O,\tkzLength) + \tkzGetPoints{I}{J} + \tkzDrawPoints[color=blue](A,B) + \tkzDrawPoints[color=red](I,J) + \tkzDrawLine(I,J) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex index d25d796e12..1529306d69 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-8.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-8.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 146 (Section 21.2.8 : Squares in half a disc) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/A,8/0/B,4/0/I} \tkzDefSquare(A,B) \tkzGetPoints{C}{D} @@ -6,10 +11,12 @@ \tkzDefPointsBy[projection = onto A--B](E,F){H,G} \tkzDefPointsBy[symmetry = center H](I){J} \tkzDefSquare(H,J)\tkzGetPoints{K}{L} - \tkzDrawSector[fill=Maroon!30](I,B)(A) + \tkzDrawSector[fill=brown!30](I,B)(A) \tkzFillPolygon[color=red!40](H,E,F,G) \tkzFillPolygon[color=blue!40](H,J,K,L) \tkzDrawPolySeg[color=red](H,E,F,G) \tkzDrawPolySeg[color=red](J,K,L) \tkzDrawPoints(E,G,H,F,J,K,L) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex index 4312b4957a..f7efc3d2bb 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-9.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-2-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 147 (Section 21.2.9 : Option "with nodes") + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/A,4/0/B,1/1/D,2/0/E} \tkzDefTriangle[equilateral](A,B) @@ -9,3 +14,5 @@ \tkzDrawPoints(A,...,G) \tkzDrawLine(F,G) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex index 4b7811624a..8e9d4b6419 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 148 (Section 21.3.1 : Construction of an equilateral triangle) + \begin{tikzpicture}[trim left=-1cm,scale=.5] \tkzDefPoint(1,1){A} \tkzDefPoint(5,1){B} @@ -12,3 +17,5 @@ \tkzLabelPoints[](A,B) \tkzLabelPoint[above](C){$C$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex index 92788e4448..39232148c8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 149 (Section 21.3.2 : Example a mediator) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(0,0){A} \tkzDefPoint(2,2){B} @@ -8,3 +13,5 @@ \tkzDrawPoints(M,N) \tkzDrawLine[color=red](M,N) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex index af783dc912..cf947a87ca 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 150 (Section 21.3.3 : An isosceles triangle.) + \begin{tikzpicture}[rotate=120,scale=.75] \tkzDefPoint(1,2){A} \tkzDefPoint(4,0){B} @@ -13,3 +18,5 @@ \tkzLabelPoints[](A,B) \tkzLabelPoint[above](C){$C$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex index 0a4fbabee6..47f624f418 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-3-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 151 (Section 21.3.4 : Segment trisection) + \begin{tikzpicture}[scale=.8] \tkzDefPoint(0,0){A} \tkzDefPoint(3,2){B} @@ -27,3 +32,5 @@ A,F F,G E,G B,E) \tkzMarkSegments[mark=s|](A,I I,J J,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex new file mode 100644 index 0000000000..60258c92f8 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-5.tex @@ -0,0 +1,20 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 152 (Section 21.3.5 : Angle trisection) + +\begin{tikzpicture} + \tikzset{arc/.style={color=gray,style=dashed}} + \tkzDefPoints{0/0/a,0/5/I,5/0/J} + \tkzDrawArc[angles](O,I)(0,90) + \tkzDrawArc[angles,/tikz/arc](I,O)(90,180) + \tkzDrawArc[angles,/tikz/arc](J,O)(-90,0) + \tkzInterCC(O,I)(I,O)\tkzGetPoints{B}{C} + \tkzInterCC(O,I)(J,O)\tkzGetPoints{D}{A} + \tkzInterCC(I,O)(J,O)\tkzGetPoints{L}{K} + \tkzDrawPoints(A,B,K) + \foreach \point in {I,A,B,J,K}{% + \tkzDrawSegment(O,\point)} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex new file mode 100644 index 0000000000..9d8708cf16 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21-3-6.tex @@ -0,0 +1,25 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 153 (Section 21.3.6 : with the option \tkzimp{with nodes}) + +\begin{tikzpicture}[scale=.5] + \tkzDefPoints{0/0/a,0/5/B,5/0/C} + \tkzDefPoint(54:5){F} + \tkzDrawCircle[color=gray](A,C) + \tkzInterCC[with nodes](A,A,C)(C,B,F) + \tkzGetPoints{a}{e} + \tkzInterCC(A,C)(a,e) \tkzGetFirstPoint{b} + \tkzInterCC(A,C)(b,a) \tkzGetFirstPoint{c} + \tkzInterCC(A,C)(c,b) \tkzGetFirstPoint{d} + \tkzDrawPoints(a,b,c,d,e) + \tkzDrawPolygon[color=red](a,b,c,d,e) + \foreach \vertex/\num in {a/36,b/108,c/180, + d/252,e/324}{% + \tkzDrawPoint(\vertex) + \tkzLabelPoint[label=\num:$\vertex$](\vertex){} + \tkzDrawSegment[color=gray,style=dashed](A,\vertex) + } +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex index d540c6cfde..8c37a7e617 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 154 (Section 22.1.1 : Exemple avec \tkzname{size}) + \begin{tikzpicture} \tkzInit \tkzDefPoints{0/0/O,2.5/0/A,1.5/2/B} @@ -5,3 +10,5 @@ \tkzDrawLines(O,A O,B) \tkzDrawPoints(O,A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex index 06c1ef5916..715832f9b8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 156 (Section 22.1.2 : Changement de l'ordre des points) + \begin{tikzpicture} \tkzInit \tkzDefPoints{0/0/O,5/0/A,3/4/B} @@ -7,3 +12,5 @@ \tkzDrawLines(O,A O,B) \tkzDrawPoints(O,A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex index 9a3b074d55..ebb3dfbb9f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 157 (Section 22.1.3 : Multiples angles) + \begin{tikzpicture}[scale=0.75] \tkzDefPoint(0,0){B} \tkzDefPoint(8,0){C} @@ -21,3 +26,5 @@ \tkzFillAngles[fill=red!20,opacity=.2](C,B,M% B,M,C M,C,B D,L,N L,N,D N,D,L) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex index 974edf526d..51b68f1e22 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-1.tex @@ -1,7 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 158 (Section 22.2.1 : Exemple avec \tkzname{mark = x}) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/O,5/0/A,3/4/B} \tkzMarkAngle[size = 4cm,mark = x, arc=ll,mkcolor = red](A,O,B) \tkzDrawLines(O,A O,B) \tkzDrawPoints(O,A,B) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex index 9d63fd90ec..a8b52efe9b 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-2-2.tex @@ -1,7 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 159 (Section 22.2.2 : Exemple avec \tkzname{mark =||}) + \begin{tikzpicture}[scale=.75] \tkzDefPoints{0/0/O,5/0/A,3/4/B} \tkzMarkAngle[size = 4cm,mark = ||, arc=ll,mkcolor = red](A,O,B) \tkzDrawLines(O,A O,B) \tkzDrawPoints(O,A,B) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex index f29510f187..47b1752381 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 161 (Section 22.3.1 : Exemple avec \tkzname{pos}) + \begin{tikzpicture}[rotate=30] \tkzDefPoint(2,1){S} \tkzDefPoint(7,3){T} @@ -19,3 +24,5 @@ \tkzLabelAngle[pos = 1.5](T,S,P){$60^{\circ}$}% \tkzLabelAngles[pos = 2.7](T,S,s s,S,P){$30^{\circ}$}% \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex index e1d4e7a667..6ddd6bb111 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 162 (Section 22.4.1 : Exemple de marquage d'un angle droit) + \begin{tikzpicture} \tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P} \tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H} @@ -7,3 +12,5 @@ \tkzDrawLines[add=.5 and .5](A,B) \tkzMarkRightAngle[fill=red!20,size=.8](B,H,P) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex index 1592570ec3..5e0dcb4a87 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 163 (Section 22.4.2 : Exemple de marquage d'un angle droit, german style) + \begin{tikzpicture} \tkzDefPoints{0/0/A,3/1/B,0.9/-1.2/P} \tkzDefPointBy[projection = onto B--A](P) \tkzGetPoint{H} @@ -8,3 +13,5 @@ \tkzDrawLines[add=.5 and .5,fill=blue!20](A,B) \tkzMarkRightAngle[german,size=.8](P,H,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex index c916444fa5..95ed0f5cc1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 164 (Section 22.4.3 : Mélange de styles) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(0,0){A} \tkzDefPoint(4,1){B} @@ -12,3 +17,5 @@ \tkzLabelPoints(A,B,C,H) \tkzDrawPoints(A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex index 79de801c37..fb1c7dd8bd 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-4-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-4-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 165 (Section 22.4.4 : Exemple complet) + \begin{tikzpicture}[rotate=-90] \tkzDefPoint(0,1){A} \tkzDefPoint(2,4){C} @@ -22,3 +27,5 @@ \tkzMarkRightAngle[german](A,C,B) \tkzMarkRightAngle[german](B,P,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex index bfeee8fcd3..95d407fc1c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 166 (Section 22.7.1 : Vérication de la mesure d'un angle) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(-1,1){A} \tkzDefPoint(5,2){B} @@ -13,3 +18,5 @@ \tkzLabelAngle(B,A,C){\angleBAC$^\circ$} \tkzMarkAngle[size=1.5cm](B,A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex index f85ea68b91..7eb4f82bc5 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-7-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-7-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 167 (Section 22.7.2 : Détermination des trois angles d'un triangle) + \begin{tikzpicture}[scale=1.25,rotate=30] \tkzDefPoints{0.5/1.5/A, 3.5/4/B, 6/2.5/C} \tkzDrawPolygon(A,B,C) @@ -20,4 +25,6 @@ \tkzGetAngle{angleABC} \edef\angleABC{\fpeval{round(\angleABC,2)}} \tkzLabelAngle[pos = 1](A,B,C){$\angleABC^{\circ}$} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-8-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex index d2a8bf4e78..6f4efbdff2 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-24-8-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22-8-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 168 (Section 22.8.1 : Pliage) + \begin{tikzpicture} \tkzDefPoint(1,5){A} \tkzDefPoint(5,2){B} \tkzDrawSegment(A,B) @@ -9,5 +14,7 @@ \tkzCompass[length=1](A,C) \tkzCompass[delta=10](B,C) \tkzDrawPoints(A,B,C,D) \tkzLabelPoints(B,C,D) \tkzLabelPoints[above left](A) - \tkzDrawSegments[style=dashed,color=bistre](A,C A,D) + \tkzDrawSegments[style=dashed,color=orange](A,C A,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex index bfe7933081..12af0238a8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 169 (Section 23.1.1 : \tkzcname{tkzDrawSector} et \tkzname{towards}) + \begin{tikzpicture}[scale=1] \tkzDefPoint(0,0){O} \tkzDefPoint(-30:3){A} @@ -8,5 +13,7 @@ \tkzDefPoint(-30:3){A} \tkzDefPointBy[rotation = center O angle -60](A) \tkzDrawSector[fill=blue!50](O,tkzPointResult)(A) - \end{scope} +\end{scope} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex index a79b62bb96..a50a6f5099 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 170 (Section 23.1.2 : \tkzcname{tkzDrawSector} et \tkzname{rotate}) + \begin{tikzpicture}[scale=2] \tkzDefPoint(0,0){O} \tkzDefPoint(2,2){A} @@ -6,3 +11,5 @@ \tkzDrawSector[rotate,draw=blue!50!black,% fill=blue!20](O,A)(-30) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex index 4347159406..fe10e558cf 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 171 (Section 23.1.3 : \tkzcname{tkzDrawSector} et \tkzname{R}) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -10,3 +15,5 @@ \tkzDrawSector[R,draw=white,% fill=red!90](O,2cm)(270,360) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex index 5d9c7cfa55..cf0a6d0315 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 172 (Section 23.1.4 : \tkzcname{tkzDrawSector} et \tkzname{R}) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,0){O} \tkzDefPoint(4,-2){A} @@ -12,3 +17,5 @@ \tkzLabelPoints(A,B,C) \tkzLabelPoints[left](O) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex index f5368e5d18..a53cce0c9a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 173 (Section 23.1.5 : \tkzcname{tkzDrawSector} et \tkzname{R with nodes}) + \begin{tikzpicture} [scale=.5] \tkzDefPoint(-1,-2){A} \tkzDefPoint(1,3){B} @@ -22,3 +27,5 @@ \tkzDrawSector[R with nodes,fill=red!20](S,2 cm)(A,B) \tkzLabelAngle[pos=1.5](A,S,B){$\alpha$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex index e4b3651497..cb566d7e1b 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 174 (Section 23.2.1 : \tkzcname{tkzFillSector} et \tkzname{towards}) + \begin{tikzpicture}[scale=.6] \tkzDefPoint(0,0){O} \tkzDefPoint(-30:3){A} @@ -8,5 +13,7 @@ \tkzDefPoint(-30:3){A} \tkzDefPointBy[rotation = center O angle -60](A) \tkzFillSector[color=blue!50](O,tkzPointResult)(A) - \end{scope} +\end{scope} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex index 037db1d490..df408c5272 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-2-2.tex @@ -1,5 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 175 (Section 23.2.2 : \tkzcname{tkzFillSector} et \tkzname{rotate}) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){O} \tkzDefPoint(2,2){A} \tkzFillSector[rotate,color=red!20](O,A)(30) \tkzFillSector[rotate,color=blue!20](O,A)(-30) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex index 4573f7dd11..91c586f5c6 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-25-3-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23-3-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 176 (Section 23.3.1 : \tkzcname{tkzClipSector}) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -8,6 +13,8 @@ \begin{scope} \tkzClipSector(O,B)(A) \draw[fill=gray!20] (-1,0) rectangle (3,3); - \end{scope} +\end{scope} \tkzDrawPoints(A,B,O) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex index 0c53e42379..b0b2cf7202 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-1-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 177 (Section 24.1 : \tkzcname{tkzDrawArc} et \tkzname{towards}) + \begin{tikzpicture} \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -9,3 +14,5 @@ \tkzDrawPoints(O,A,B) \tkzLabelPoints[below](O,A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex index 0460c12fa2..84b29c8aff 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 178 (Section 24.2 : \tkzcname{tkzDrawArc} et \tkzname{towards}) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -9,3 +14,5 @@ \tkzDrawPoints(O,A,B) \tkzLabelPoints[below](O,A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex index bb198c5f80..93f76879c3 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-3-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 179 (Section 24.3 : \tkzcname{tkzDrawArc} et \tkzname{rotate}) + \begin{tikzpicture} \tkzDefPoint(0,0){O} \tkzDefPoint(2,-2){A} @@ -7,3 +12,5 @@ \tkzDrawPoints(O,A,B) \tkzLabelPoints[below](O,A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex index 670c9005c6..5d6510e912 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-4-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 180 (Section 24.4 : \tkzcname{tkzDrawArc} et \tkzname{R}) + \begin{tikzpicture} \tkzDefPoints{0/0/O} \tikzset{compass style/.append style={<->}} @@ -6,3 +11,5 @@ \tkzDrawPoint(O) \tkzLabelPoint[below](O){$O$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-5-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex index 6502588b88..23ede67eef 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-5-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 181 (Section 24.5 : \tkzcname{tkzDrawArc} et \tkzname{R with nodes}) + \begin{tikzpicture} \tkzDefPoint(0,0){O} \tkzDefPoint(2,-1){A} @@ -5,3 +10,5 @@ \tkzCalcLength(B,A)\tkzGetLength{radius} \tkzDrawArc[R with nodes](B,\radius pt)(A,O) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-6-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex index 97d9c8c473..cc9585049e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-26-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24-6-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 182 (Section 24.6 : \tkzcname{tkzDrawArc} et \tkzname{delta}) + \begin{tikzpicture} \tkzInit \tkzDefPoint(0,0){A} @@ -17,3 +22,5 @@ \tkzLabelPoints(A,B,C,D) \tkzMarkRightAngle(D,B,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex index 963751ee6c..0f008bc0bc 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 183 (Section 25.1.1 : Option \tkzname{length}) + \begin{tikzpicture} \tkzDefPoint(1,1){A} \tkzDefPoint(6,1){B} @@ -8,3 +13,5 @@ \tkzCompass[color=red](B,C) \tkzDrawSegments(A,B A,C B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex index a1fa345499..746db992e2 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 184 (Section 25.1.2 : Option \tkzname{delta}) + \begin{tikzpicture} \tkzDefPoint(0,0){A} \tkzDefPoint(5,0){B} @@ -9,3 +14,5 @@ \tkzDrawPolygon(A,B,C) \tkzMarkAngle(A,C,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex index d482cd74d3..1cffbd27c4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 185 (Section 25.2 : Multiples constructions \tkzcname{tkzCompasss}) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(2,2){A} \tkzDefPoint(5,-2){B} \tkzDefPoint(3,4){C} \tkzDrawPoints(A,B) @@ -13,3 +18,5 @@ \tkzDrawLines(i,j) \tkzDrawPoints(A,B,C,i,j,D) \tkzLabelPoints(A,B,C,i,j,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex index a5f54ae66d..706b2255ca 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-27-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25-3-0.tex @@ -1,5 +1,10 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 186 (Section 25.3 : Macro de configuration \tkzcname{tkzSetUpCompass}) + \begin{tikzpicture}[scale=.75, - showbi/.style={bisector,size=2,gap=3}] + showbi/.style={bisector,size=2,gap=3}] \tkzSetUpCompass[color=blue,line width=.3 pt] \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} \tkzDrawPolygon(A,B,C) @@ -9,9 +14,11 @@ \tkzShowLine[showbi](C,B,A) \tkzInterLL(A,a)(B,b) \tkzGetPoint{I} \tkzDefPointBy[projection= onto A--B](I) - \tkzGetPoint{H} + \tkzGetPoint{H} \tkzDrawCircle[radius,color=gray](I,H) \tkzDrawSegments[color=gray!50](I,H) \tkzDrawLines[add=0 and -.2,color=blue!50 ](A,a B,b) - \tkzShowBB + \tkzShowBB \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex index d811ea5e81..690427362c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 187 (Section 26.1.1 : Exemple de \tkzcname{tkzShowLine} et \tkzname{parallel}) + \begin{tikzpicture} \tkzDefPoints{-1.5/-0.25/A,1/-0.75/B,-1.5/2/C} \tkzDrawLine(A,B) @@ -5,3 +10,5 @@ \tkzShowLine[parallel=through C](A,B) \tkzDrawLine(C,c) \tkzDrawPoints(A,B,C,c) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex index f65806086e..edb0c11dd1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 188 (Section 26.1.2 : Exemple de \tkzcname{tkzShowLine} et \tkzname{perpendicular}) + \begin{tikzpicture} \tkzDefPoints{0/0/A, 3/2/B, 2/2/C} \tkzDefLine[perpendicular=through C,K=-.5](A,B) \tkzGetPoint{c} @@ -7,3 +12,5 @@ \tkzDrawLines[add=1 and 1](A,B C,c) \tkzDrawPoints(A,B,C,h,c) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex index 53a63eeed5..cb5639c088 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 189 (Section 26.1.3 : Exemple de \tkzcname{tkzShowLine} et \tkzname{bisector}) + \begin{tikzpicture}[scale=1.25] \tkzDefPoints{0/0/A, 4/2/B, 1/4/C} \tkzDrawPolygon(A,B,C) @@ -14,3 +19,5 @@ \tkzDrawSegments[color=red!50](I,tkzPointResult) \tkzDrawLines[add=0 and -0.3,color=red!50](A,a B,b) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex index 45e5e8bb47..4a90c17713 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 190 (Section 26.1.4 : Exemple de \tkzcname{tkzShowLine} et \tkzname{mediator}) + \begin{tikzpicture} \tkzDefPoint(2,2){A} \tkzDefPoint(5,4){B} @@ -8,3 +13,5 @@ \tkzDrawLines(A,B) \tkzLabelPoints[below =3pt](A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex index 9b1a67fe58..7a6f39ed3d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 191 (Section 26.2.1 : Exemple d'utilisation de \tkzcname{tkzShowTransformation}) + \begin{tikzpicture}[scale=.6] \tkzDefPoint(0,0){O} \tkzDefPoint(2,-2){A} \tkzDefPoint(70:4){B} \tkzDrawPoints(A,O,B) @@ -25,3 +30,5 @@ \tkzShowTransformation[projection=onto O--A,% color=red,size=3,gap=-2](C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex index 4190880fc9..5d233157d1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-28-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 192 (Section 26.2.2 : Autre exemple d'utilisation de \tkzcname{tkzShowTransformation}) + \begin{tikzpicture}[scale=.6] \tkzDefPoints{0/0/A,8/0/B,3.5/10/I} \tkzDefMidPoint(A,B) \tkzGetPoint{O} @@ -17,3 +22,5 @@ \tkzLabelPoints[above right](N,I) \tkzLabelPoints[below left](M,A) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-29-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex index 8d6f266286..674791cac8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-29-1-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27-1-1.tex @@ -1,10 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 193 (Section 27.1.1 : Utilisation de \tkzcname{tkzDefEquiPoints} avec des options) + \begin{tikzpicture} \tkzSetUpCompass[color=purple,line width=1pt] \tkzDefPoint(0,1){A} \tkzDefPoint(5,2){B} \tkzDefPoint(3,4){C} \tkzDefEquiPoints[from=C,dist=1,show, - /compass/delta=20](A,B) + /tkzcompass/delta=20](A,B) \tkzGetPoints{E}{H} \tkzDrawLines[color=blue](C,E C,H A,B) \tkzDrawPoints[color=blue](A,B,C) @@ -12,3 +17,5 @@ \tkzLabelPoints(E,H) \tkzLabelPoints[color=blue](A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-1-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex index 2d6d85ca2d..0a4e8657e4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-1-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 194 (Section 28.1 : Le rapporteur circulaire) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(2,0){A}\tkzDefPoint(0,0){O} \tkzDefShiftPoint[A](31:5){B} @@ -7,3 +12,5 @@ line width = 1pt](A,B A,C) \tkzProtractor[scale = 1](A,B) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex index e5a2083e53..ba0005a4fc 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-30-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28-2-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 195 (Section 28.2 : Le rapporteur circulaire, transparent et retourné) + \begin{tikzpicture}[scale=.5] \tkzDefPoint(2,3){A} \tkzDefShiftPoint[A](31:5){B} @@ -5,3 +10,5 @@ \tkzDrawSegments[color=red,line width=1pt](A,B A,C) \tkzProtractor[return](A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex index cca399bbfe..57fc3d3ef4 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 196 (Section 29.1.2 : version revue "Tangente") + \begin{tikzpicture}[scale=.8,rotate=60] \tkzDefPoint(6,0){X} \tkzDefPoint(3,3){Y} \tkzDefShiftPoint[X](-110:6){A} \tkzDefShiftPoint[X](-70:6){B} @@ -15,3 +20,5 @@ \tkzDrawPoints(A,B,C,X,Y,O,Z) \tkzLabelPoints(A,B,C,Z) \tkzLabelPoints[above right](X,Y,O) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex index a48aeff702..82e98b1c95 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 197 (Section 29.1.3 : version "Le Monde") + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,0){A} \tkzDefPoint(3,0){B} @@ -19,3 +24,5 @@ \tkzLabelPoints(A,B,C,Z) \tkzLabelPoints[above right](X,Y,M,I) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex index efb277291e..9b70cff832 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 198 (Section 29.1.4 : Hauteurs d'un triangle) + \begin{tikzpicture}[scale=.8] \tkzDefPoint(0,0){C} \tkzDefPoint(7,0){B} @@ -22,3 +27,5 @@ \tkzDrawPoints(A,B,C,A',B',C',H) \tkzLabelPoints(A,B,C,A',B',C',H) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex index 9aa39ec374..5a32879967 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-1-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-1-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 199 (Section 29.1.5 : Hauteurs - autre construction) + \begin{tikzpicture}[scale=.75] \tkzDefPoint(0,0){A} \tkzDefPoint(8,0){B} @@ -14,13 +19,15 @@ \tkzGetPoint{I} \tkzDrawCircle[diameter](A,B) \tkzDrawSegments(C,A C,B A,B B,M A,N) - \tkzMarkRightAngles[fill=Maroon!20](A,M,B A,N,B A,P,C) + \tkzMarkRightAngles[fill=brown!20](A,M,B A,N,B A,P,C) \tkzDrawSegment[style=dashed,color=orange](C,P) \tkzLabelPoints(O,A,B,P) \tkzLabelPoint[left](M){$M$} \tkzLabelPoint[right](N){$N$} \tkzLabelPoint[above](C){$C$} - \tkzLabelPoint[fill=fondpaille,above right](I){$I$} + \tkzLabelPoint[above right](I){$I$} \tkzDrawPoints[color=red](M,N,P,I) - \tkzDrawPoints[color=Maroon](O,A,B,C) + \tkzDrawPoints[color=brown](O,A,B,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex index 1c473fcdfb..c673e80b66 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-1.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-1.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 200 (Section 29.2.1 : Square root of the integers ) + \begin{tikzpicture}[scale=1.5] \tkzDefPoint(0,0){O} \tkzDefPoint(1,0){a0} @@ -6,4 +11,6 @@ \tkzDefPointWith[orthogonal normed](a\i,O) \tkzGetPoint{a\j} \tkzDrawPolySeg[color=blue](a\i,a\j,O)} - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-10.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex index e01dd07d0f..86353f826f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-10.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-10.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 209 (Section 29.2.10 : Example from Indonesia) + \begin{tikzpicture}[scale=3] \tkzDefPoints{0/0/A,2/0/B} \tkzDefSquare(A,B) \tkzGetPoints{C}{D} @@ -14,3 +19,5 @@ \tkzLabelPoints[above](G)\tkzLabelPoints[below](E) \tkzMarkRightAngles(D,A,B D,G,F) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex new file mode 100644 index 0000000000..b5717e72ce --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-11.tex @@ -0,0 +1,58 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 210 (Section 29.2.11 : Another example from Indonesia) + + \begin{tikzpicture}[pol/.style={fill=brown!40,opacity=.5}, + seg/.style={tkzdotted,color=gray}, + hidden pt/.style={fill=gray!40}, + mra/.style={color=gray!70,tkzdotted,/tkzrightangle/size=.2}, + scale=3] + \tkzSetUpPoint[size=2] + \tkzDefPoints{0/0/A,2.5/0/B,1.33/0.75/D,0/2.5/E,2.5/2.5/F} + \tkzDefLine[parallel=through D](A,B) \tkzGetPoint{I1} + \tkzDefLine[parallel=through B](A,D) \tkzGetPoint{I2} + \tkzInterLL(D,I1)(B,I2) \tkzGetPoint{C} + \tkzDefLine[parallel=through E](A,D) \tkzGetPoint{I3} + \tkzDefLine[parallel=through D](A,E) \tkzGetPoint{I4} + \tkzInterLL(E,I3)(D,I4) \tkzGetPoint{H} + \tkzDefLine[parallel=through F](E,H) \tkzGetPoint{I5} + \tkzDefLine[parallel=through H](E,F) \tkzGetPoint{I6} + \tkzInterLL(F,I5)(H,I6) \tkzGetPoint{G} + \tkzDefMidPoint(G,H) \tkzGetPoint{P} + \tkzDefMidPoint(G,C) \tkzGetPoint{Q} + \tkzDefMidPoint(B,C) \tkzGetPoint{R} + \tkzDefMidPoint(A,B) \tkzGetPoint{S} + \tkzDefMidPoint(A,E) \tkzGetPoint{T} + \tkzDefMidPoint(E,H) \tkzGetPoint{U} + \tkzDefMidPoint(A,D) \tkzGetPoint{M} + \tkzDefMidPoint(D,C) \tkzGetPoint{N} + \tkzInterLL(B,D)(S,R) \tkzGetPoint{L} + \tkzInterLL(H,F)(U,P) \tkzGetPoint{K} + \tkzDefLine[parallel=through K](D,H) \tkzGetPoint{I7} + \tkzInterLL(K,I7)(B,D) \tkzGetPoint{O} + + \tkzFillPolygon[pol](P,Q,R,S,T,U) + \tkzDrawSegments[seg](K,O K,L P,Q R,S T,U + C,D H,D A,D M,N B,D) + \tkzDrawSegments(E,H B,C G,F G,H G,C Q,R S,T U,P H,F) + \tkzDrawPolygon(A,B,F,E) + \tkzDrawPoints(A,B,C,E,F,G,H,P,Q,R,S,T,U,K) + \tkzDrawPoints[hidden pt](M,N,O,D) + \tkzMarkRightAngle[mra](L,O,K) + \tkzMarkSegments[mark=|,size=1pt,thick,color=gray](A,S B,S B,R C,R + Q,C Q,G G,P H,P + E,U H,U E,T A,T) + + \tkzLabelAngle[pos=.3](K,L,O){$\alpha$} + \tkzLabelPoints[below](O,A,S,B) + \tkzLabelPoints[above](H,P,G) + \tkzLabelPoints[left](T,E) + \tkzLabelPoints[right](C,Q) + \tkzLabelPoints[above left](U,D,M) + \tkzLabelPoints[above right](L,N) + \tkzLabelPoints[below right](F,R) + \tkzLabelPoints[below left](K) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-11.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex index 0e564d3ccb..9d59631303 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-11.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-12.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 211 (Section 29.2.12 : Three circles) + \begin{tikzpicture}[scale=1.5] \tkzDefPoints{0/0/A,8/0/B,0/4/a,8/4/b,8/8/c} \tkzDefTriangle[equilateral](A,B) \tkzGetPoint{C} @@ -30,3 +35,5 @@ \tkzDrawPoints(G,Ia,Ib,Ic) \tkzDrawSegments[gray,dashed](C,M A,N B,P M,a M,b A,a a,b b,B A,D Ia,ha) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-12.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex index 7034319c4f..1a6f14bfb8 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-12.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-13.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 212 (Section 29.2.13 : "The" Circle of APOLLONIUS) + \begin{tikzpicture}[scale=.5] \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} \tkzDefTriangleCenter[euler](A,B,C) \tkzGetPoint{N} @@ -40,4 +45,6 @@ \tkzDrawPoints(A,B,C,N,Ja,Jb,Jc,Xb,Xc,B',C',Za,Zb,Ba,Ca,Bc,Ac,Q,Sp,K,O) \tkzLabelPoints(A,B,C,N,Ja,Jb,Jc,Xb,Xc,B',C',Za,Zb,Ba,Ca,Bc,Ac,Q,Sp) \tkzLabelPoints[above](K,O) - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex index 47c8f5aa9c..3e4d69b6e5 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-2.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-2.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 201 (Section 29.2.2 : Circle and tangent) + \begin{tikzpicture} \edef\alphaR{\fpeval{asin(2/3)}} \edef\xB{8-3*cos(\alphaR)} @@ -14,4 +19,6 @@ \tkzDrawCircle[R,color=blue,line width=.8pt](A,3 cm) \tkzDrawPoint(B') \tkzDrawLine(B,B') - \end{tikzpicture} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex index 1ce86d3030..5e34acb890 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-3.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-3.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 202 (Section 29.2.3 : About right triangle) + \begin{tikzpicture} \tkzDefPoint["$A$" left](2,1){A} \tkzDefPoint(6,4){B} @@ -13,3 +18,5 @@ \tkzMarkRightAngle(A,B,C) \tkzDrawLine[color=gray,style=dashed](A,C) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex index 776f45de17..9043a7862f 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-4.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-4.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 203 (Section 29.2.4 : Archimedes) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,0){A}\tkzDefPoint(6,0){D} \tkzDefPoint(8,0){B}\tkzDefPoint(4,0){I} @@ -15,3 +20,5 @@ \tkzLabelPoints(A,B,I,D) \tkzLabelPoints[above right](C,T) \tkzMarkSegment[pos=.25,mark=s|](C,D) \tkzMarkSegment[pos=.75,mark=s|](C,D) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-5.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex index 7018e92f9b..3c691fd04e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-5.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-5.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 204 (Section 29.2.5 : Exemple : Dimitris Kapeta) + \begin{tikzpicture}[scale=1.25] \tkzDefPoint(0,0){O} \tkzDefPoint(2.5,0){N} @@ -19,3 +24,5 @@ \tkzLabelPoints[above left](M,C) \tkzLabelPoint[below left](A'){$A'$} \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex index 4679a43741..e3e2f35be1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-6.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-6.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 205 (Section 29.2.6 : Example : John Kitzmiller ) + \begin{tikzpicture}[scale=2] \tkzDefPoint[label=below left:A](0,0){A} \tkzDefPoint[label=below right:B](6,0){B} @@ -24,3 +29,5 @@ \tkzDrawSegments[line width=3pt,color=red,opacity=0.4](A,L B,K C,J) \tkzMarkSegments[mark=o](J,K K,L L,J) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex index f83abadd82..16133d1b7d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-7.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-7.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 206 (Section 29.2.7 : Exemple : John Kitzmiller ) + \begin{tikzpicture}[scale=2,decoration={markings, mark=at position 3cm with {\arrow[scale=2]{>}}}] \tkzDefPoints{0/0/E, 6/0/F, 0/1.8/P, 6/1.8/Q, 0/3/R, 6/3/S} @@ -17,3 +22,5 @@ \tkzDrawSegments[color=teal, line width=3pt, opacity=0.4](B,D) \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](D,F) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-8.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex index f7e05f7c8b..7314c830de 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-8.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-8.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 207 (Section 29.2.8 : Exemple : John Kitzmiller ) + \begin{tikzpicture}[scale=2] \tkzDefPoints{0/0/B, 5/0/D} \tkzDefPoint(70:3){A} \tkzDrawPolygon(B,D,A) @@ -8,7 +13,7 @@ \begin{scope}[decoration={markings, mark=at position .5 with {\arrow[scale=2]{>}}}] \tkzDrawSegments[postaction={decorate},dashed](C,A P,B) - \end{scope} +\end{scope} \tkzDrawSegment(A,C) \tkzDrawSegment[style=dashed](A,P) \tkzLabelPoints[below](B,C,D) \tkzLabelPoints[above](A,P) \tkzDrawSegments[color=magenta, line width=3pt, opacity=0.4](B,C P,A) @@ -22,3 +27,5 @@ \tkzLabelAngle[pos=1](A,B,P){3} \tkzLabelAngle[pos=1](B,P,A){4} \tkzMarkSegments[mark=|](A,B A,P) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-9.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex index 7c340929a9..350113e117 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-31-2-9.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29-2-9.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 208 (Section 29.2.9 : Exemple : author John Kitzmiller ) + \begin{tikzpicture}[scale=2] \tkzDefPoint(0,3){A} \tkzDefPoint(6,3){E} \tkzDefPoint(1.35,3){B} \tkzDefPoint(4.65,3){D} \tkzDefPoint(1,1){G} \tkzDefPoint(5,5){F} @@ -17,3 +22,5 @@ \tkzDrawSegments(A,G G,B E,F F,D) \tkzLabelPoints[below](C,D,E,G) \tkzLabelPoints[above](A,B,F) \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex new file mode 100644 index 0000000000..65261c69a5 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-1.tex @@ -0,0 +1,29 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 213 (Section 30.1.1 : Example 1 change line width) + +\begin{tikzpicture} +\begin{scope}[rotate=-90] + \tkzDefPoint(10,6){C} + \tkzDefPoint( 0,6){A} + \tkzDefPoint(10,0){B} + \tkzDefPointBy[projection = onto B--A](C) + \tkzGetPoint{H} + \tkzDrawPolygon(A,B,C) + \tkzMarkRightAngle[size=.4,fill=blue!20](B,C,A) + \tkzMarkRightAngle[size=.4,fill=red!20](B,H,C) + \tkzDrawSegment[color=red](C,H) +\end{scope} + \tkzSetUpLine[color=blue,line width=1pt] + \tkzLabelSegment[below](C,B){$a$} + \tkzLabelSegment[right](A,C){$b$} + \tkzLabelSegment[left](A,B){$c$} + \tkzLabelSegment[color=red](C,H){$h$} + \tkzDrawPoints(A,B,C) + \tkzLabelPoints[above left](H) + \tkzLabelPoints(B,C) + \tkzLabelPoints[above](A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex new file mode 100644 index 0000000000..ce3f561f2e --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-2.tex @@ -0,0 +1,27 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 214 (Section 30.1.2 : Example 2 change style of line) + +\begin{tikzpicture}[scale=.6] + \tkzDefPoint(1,0){A} \tkzDefPoint(4,0){B} + \tkzDefPoint(1,1){C} \tkzDefPoint(5,1){D} + \tkzDefPoint(1,2){E} \tkzDefPoint(6,2){F} + \tkzDefPoint(0,4){A'}\tkzDefPoint(3,4){B'} + \tkzDrawSegments(A,B C,D E,F) + \tkzDrawLine(A',B') + \tkzSetUpLine[style=dashed,color=gray] + \tkzCompass(A',B') + \tkzCalcLength[cm](C,D) \tkzGetLength{rCD} + \tkzDrawCircle[R](A',\rCD cm) + \tkzCalcLength[cm](E,F) \tkzGetLength{rEF} + \tkzDrawCircle[R](B',\rEF cm) + \tkzInterCC[R](A',\rCD cm)(B',\rEF cm) + \tkzGetPoints{I}{J} + \tkzSetUpLine[color=red] \tkzDrawLine(A',B') + \tkzDrawSegments(A',I B',I) + \tkzDrawPoints(A,B,C,D,E,F,A',B',I,J) + \tkzLabelPoints(A,B,C,D,E,F,A',B',I,J) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex new file mode 100644 index 0000000000..0452f420a3 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-1-3.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 215 (Section 30.1.3 : Example 3 extend lines) + + \begin{tikzpicture} + \tkzSetUpLine[add=.5 and .5] + \tkzDefPoints{0/0/A,4/0/B,1/3/C} + \tkzDrawLines(A,B B,C A,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex new file mode 100644 index 0000000000..1472372575 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-1.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 216 (Section 30.2.1 : use of\tkzcname{tkzSetUpPoint}) + +\begin{tikzpicture} + \tkzSetUpPoint[shape = cross out,color=blue] + \tkzInit[xmax=100,xstep=20,ymax=.5] + \tkzDefPoint(20,1){A} + \tkzDefPoint(80,0){B} + \tkzDrawLine(A,B) + \tkzDrawPoints(A,B) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex new file mode 100644 index 0000000000..313205c831 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-2-2.tex @@ -0,0 +1,23 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 217 (Section 30.2.2 : use of\tkzcname{tkzSetUpPoint} inside a group) + + \begin{tikzpicture} + \tkzInit[ymin=-0.5,ymax=3,xmin=-0.5,xmax=7] + \tkzDefPoint(0,0){A} + \tkzDefPoint(02.25,04.25){B} + \tkzDefPoint(4,0){C} + \tkzDefPoint(3,2){D} + \tkzDrawSegments(A,B A,C A,D) + {\tkzSetUpPoint[shape=cross out, + fill= teal!50, + size=4,color=teal] + \tkzDrawPoints(A,B)} + \tkzSetUpPoint[fill= teal!50,size=4, + color=teal] + \tkzDrawPoints(C,D) + \tkzLabelPoints(A,B,C,D) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex new file mode 100644 index 0000000000..3b30aef8e2 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-1.tex @@ -0,0 +1,21 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 218 (Section 30.3.1 : use of\tkzcname{tkzSetUpCompass} with bisector) + + \begin{tikzpicture}[scale=0.75] + \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} + \tkzDrawPolygon(A,B,C) + \tkzSetUpCompass[color=red,line width=.2 pt] + \tkzDefLine[bisector](A,C,B) \tkzGetPoint{c} + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzShowLine[bisector,size=2,gap=3](A,C,B) + \tkzShowLine[bisector,size=2,gap=3](B,A,C) + \tkzShowLine[bisector,size=1,gap=2](C,B,A) + \tkzDrawLines[add=0 and 0 ](B,b C,c) + \tkzDrawLine[add=0 and -.4 ](A,a) + \tkzLabelPoints(A,B) \tkzLabelPoints[above](C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex new file mode 100644 index 0000000000..a09172bba7 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-3-2.tex @@ -0,0 +1,26 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 219 (Section 30.3.2 : Another example of of\tkzcname{tkzSetUpCompass}) + + \begin{tikzpicture}[scale=1,rotate=90] + \tkzDefPoints{0/1/A, 8/3/B, 3/6/C} + \tkzDrawPolygon(A,B,C) + \tkzSetUpCompass[color=brown, + line width=.3 pt,style=tkzdotted] + \tkzDefLine[bisector](B,A,C) \tkzGetPoint{a} + \tkzDefLine[bisector](C,B,A) \tkzGetPoint{b} + \tkzInterLL(A,a)(B,b) \tkzGetPoint{I} + \tkzDefPointBy[projection= onto A--B](I) + \tkzGetPoint{H} + \tkzMarkRightAngle(I,H,A) + \tkzDrawCircle[radius,color=red](I,H) + \tkzDrawSegments[color=red](I,H) + \tkzDrawLines[add=0 and -.5,,color=red](A,a) + \tkzDrawLines[add=0 and 0,color=red](B,b) + \tkzShowLine[bisector,size=2,gap=3](B,A,C) + \tkzShowLine[bisector,size=1,gap=3](C,B,A) + \tkzLabelPoints(A,B,C) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex new file mode 100644 index 0000000000..149bdfe307 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30-4-0.tex @@ -0,0 +1,18 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 220 (Section 30.4 : Own style) + +\tkzSetUpPoint[color=blue!50!white, fill=gray!20!red!50!white] +\tikzset{/tikz/mystyle/.style={ + color=blue!20!black, + fill=blue!20}} + \begin{tikzpicture} + \tkzDefPoint(0,0){O} + \tkzDefPoint(0,1){A} + \tkzDrawPoints(O) % general style + \tkzDrawPoints[mystyle,size=4](A) % my style + \tkzLabelPoints(O,A) +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex new file mode 100644 index 0000000000..b60291f277 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-2-0.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 221 (Section 31.2 : \tkzcname{tkzInit} et \tkzcname{tkzShowBB}) + +\begin{tikzpicture} + \tkzInit[xmin=-1,xmax=3,ymin=-1, ymax=3] + \tkzGrid + \tkzShowBB[red,line width=2pt] +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex index c80a756aaa..62f5ee84a1 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-3-0.tex @@ -1,3 +1,8 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 222 (Section 31.3 : \tkzcname{tkzClip}) + \begin{tikzpicture} \tkzInit[xmax=4, ymax=3] \tkzAxeXY @@ -5,3 +10,5 @@ \tkzClip \draw[red] (-1,-1)--(5,2); \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex new file mode 100644 index 0000000000..30ec471939 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31-4-0.tex @@ -0,0 +1,14 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 223 (Section 31.4 : \tkzcname{tkzClip} et l'option \tkzname{space}) + +\begin{tikzpicture} + \tkzInit[xmax=4, ymax=3] + \tkzAxeXY + \tkzGrid + \tkzClip[space=1] + \draw[red] (-1,-1)--(5,2); +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-5-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-5-1.tex deleted file mode 100644 index 8a1ff71d7c..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-5-1.tex +++ /dev/null @@ -1,15 +0,0 @@ - \begin{tikzpicture}[scale=1.2,rotate=-90] - \tkzInit - \tkzDefPoint(0,0){A} \tkzDefPoint(5,0){B} - \tkzDrawSegment(A,B) - \tkzDefPointBy[rotation= center A angle 60](B) - \tkzGetPoint{C} - \tkzDefPointBy[symmetry= center C](A) - \tkzGetPoint{D} - \tkzDrawSegment(A,tkzPointResult) - \tkzDrawLine(B,D) - \tkzDrawArc[delta=10](A,B)(C) - \tkzDrawArc[delta=10](B,C)(A) - \tkzDrawArc[delta=10](C,D)(D) - \tkzMarkRightAngle(D,B,A) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-1.tex deleted file mode 100644 index 68c0cedbaa..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-1.tex +++ /dev/null @@ -1,15 +0,0 @@ -\begin{tikzpicture}[scale=2] - \tkzDefPoint(0,0){O} - \tkzDefPoint(1,0){A} - \tkzDrawCircle(O,A) - \tkzDefPoint(-1.5,-1.5){z1} - \tkzDefPoint(0.35,0){z2} - \tkzDrawPoints[color=black,fill=red,size=4](O,z1,z2) - \tkzDefPointBy[inversion = center O through A](z1) - \tkzGetPoint{Z1} - \tkzDefPointBy[inversion = center O through A](z2) - \tkzGetPoint{Z2} - \tkzDrawPoints[color=black,fill=red,size=4](Z1,Z2) - \tkzDrawSegments(z1,Z1 z2,Z2) - \tkzLabelPoints(O,A,z1,z2,Z1,Z2) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-2.tex deleted file mode 100644 index 89ef4d3b9a..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-11-7-2.tex +++ /dev/null @@ -1,12 +0,0 @@ -\begin{tikzpicture}[scale=3] - \tkzDefPoint(0,0){O} - \tkzDefPoint(1,0){A} - \tkzDrawCircle(O,A) - \tkzDefPoint(0.5,-0.25){z1} - \tkzDefPoint(-0.5,-0.5){z2} - \tkzDefPointBy[inversion = center O through A](z1) - \tkzGetPoint{Z1} - \tkzCircumCenter(z1,z2,Z1)\tkzGetPoint{c} - \tkzDrawCircle(c,Z1) - \tkzDrawPoints[color=black,fill=red,size=4](O,z1,z2,Z1,O,A) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-1.tex deleted file mode 100644 index 08a4e70069..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-1.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzDefPoint(0,0){A} - \tkzDefPoint(4,0){B} - \tkzDrawTriangle[pythagore,fill=blue!30](A,B) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-2.tex deleted file mode 100644 index b315e5d77b..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-18-2-2.tex +++ /dev/null @@ -1,8 +0,0 @@ -\begin{tikzpicture} -\tkzInit[ymin=-2.5,ymax=0,xmin=-5,xmax=0] -\tkzClip[space=.5] - \begin{scope}[rotate=-180] - \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} - \tkzDrawTriangle[school,fill=red!30](A,B) - \end{scope} -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-3.tex deleted file mode 100644 index 4c50c4d99c..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-3.tex +++ /dev/null @@ -1,12 +0,0 @@ -\begin{tikzpicture}[scale=.5,rotate=60] - \tkzDefPoints{0/0/A,6/0/B,0.8/4/C} - \tkzDefSpcTriangle[excentral,name=J](A,B,C){a,b,c} - \tkzDefSpcTriangle[extouch,name=T](A,B,C){a,b,c} - \tkzDrawCircles[red](Ja,Ta Jb,Tb Jc,Tc) - \tkzDrawLines[add=1 and 1](A,B B,C C,A) - \tkzDrawPolygon(A,B,C) - \tkzDrawPolygon[blue](Ja,Jb,Jc) - \tkzDrawPoints(A,B,C) - \tkzDrawPoints[blue](Ja,Jb,Jc) - \tkzLabelPoints(A,B,C) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-4.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-4.tex deleted file mode 100644 index 72d2ddff8b..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-4.tex +++ /dev/null @@ -1,17 +0,0 @@ -\begin{tikzpicture}[scale=.75,rotate=60] - \tkzDefPoint(0,0){A} - \tkzDefPoint(3,0){B} - \tkzDefPoint(0.5,2.5){C} - \tkzDefCircle[euler](A,B,C) \tkzGetPoint{N} - \tkzDefSpcTriangle[feuerbach,name=F](A,B,C){_a,_b,_c} - \tkzDefSpcTriangle[excentral,name=J](A,B,C){_a,_b,_c} - \tkzDefSpcTriangle[extouch,name=T](A,B,C){_a,_b,_c} - \tkzDrawCircle[red](N,F_a) - % \tkzDrawCircle[in](A,B,C) - \tkzDrawPolygon(A,B,C) - \tkzDrawPolygon[blue](F_a,F_b,F_c) - \tkzDrawPoints[blue](J_a,J_b,J_c,F_a,F_b,F_c,A,B,C)) - \tkzDrawCircles[purple](J_a,F_a J_b,F_b J_c,F_c) - \tkzAutoLabelPoints[center=N,dist=.3, - font=\scriptsize](A,B,C,F_a,F_b,F_c,J_a,J_b,J_c) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-6.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-6.tex deleted file mode 100644 index 2983b4249e..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-19-0-6.tex +++ /dev/null @@ -1,22 +0,0 @@ - \begin{tikzpicture}[scale=.4] - \tkzDefPoints{% x y name - 0 /0 /A, - 6 /0 /B, - 4 /6 /C} - - \tkzDefSpcTriangle[ex](A,B,C){Ja,Jb,Jc} - \tkzDefSpcTriangle[extouch](A,B,C){Ta,Tb,Tc} - \tkzDrawPoints(Ja,Jb,Jc,Ta,Tb,Tc) - \tkzLabelPoints(Ja,Jb,Jc,Ta,Tb,Tc) - \tkzDrawPolygon[](A,B,C) - \tkzDefTriangleCenter[nagel](A,B,C) - \tkzGetPoint{Na} - \tkzDrawPoints(B,C,A,Na) - \tkzLabelPoints(B,C,A,Na) - \tkzShowBB\tkzClipBB - \tkzDrawLines[add=1 and 1,dashed](A,B B,C C,A) - \tkzDrawCircles[dashed](Ja,Ta Jb,Tb Jc,Tc) - \tkzDrawSegments[dashed](Ja,Ta Jb,Tb Jc,Tc) - \tkzMarkRightAngles[fill=gray!20](Ja,Ta,C - Jb,Tb,A Jc,Tc,B) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-1.tex deleted file mode 100644 index f654bcee82..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-20-6-1.tex +++ /dev/null @@ -1,35 +0,0 @@ -\begin{tikzpicture} [rotate=18,scale=1.5] - \tkzDefPoint(0,0){A} - \tkzDefPoint(2.25,0.2){B} - \tkzDefPoint(2.5,2.75){C} - \tkzDefPoint(-0.75,2){D} - \tkzDrawPolygon[fill=black!50!blue!20!](A,B,C,D) - \tkzDrawSegments[style=dashed](A,C B,D) -\end{tikzpicture}\end{tkzexample} - - -\subsection{Clipper un polygone} - \begin{NewMacroBox}{tkzClipPolygon}{\oarg{local options}\parg{liste de points}} -Cette macro permet de contenir les différentes tracés dans le polygone désigné. - -\medskip -\begin{tabular}{lll} -\toprule -options & exemple & explication \\ -\midrule -\TAline{\parg{pt1,pt2}}{\parg{A,B}}{} -%\bottomrule - \end{tabular} -\end{NewMacroBox} -\subsubsection{Exemple simple avec \tkzcname{tkzClipPolygon}} -\begin{tkzexample}[latex=7 cm,small] -\begin{tikzpicture}[scale=1.25] - \tkzInit[xmin=0,xmax=4,ymin=0,ymax=3] - \tkzClip[space=.5] - \tkzDefPoint(0,0){A} \tkzDefPoint(4,0){B} - \tkzDefPoint(1,3){C} \tkzDrawPolygon(A,B,C) - \tkzDefPoint(0,2){D} \tkzDefPoint(2,0){E} - \tkzDrawPoints(D,E) \tkzLabelPoints(D,E) - \tkzClipPolygon(A,B,C) - \tkzDrawLine[color=red](D,E) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-6-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-6-1.tex deleted file mode 100644 index 439677fb19..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-22-6-1.tex +++ /dev/null @@ -1,16 +0,0 @@ -\begin{tikzpicture} - \tkzDefPoint(0,0){O} \tkzDefPoint(2,0){N} - \tkzDefPointBy[rotation=center O angle 50](N) - \tkzGetPoint{M} - \tkzDefPointBy[rotation=center O angle -20](N) - \tkzGetPoint{P} - \tkzDefPointBy[rotation=center O angle 125](N) - \tkzGetPoint{P'} - \tkzLabelCircle[above=4pt](O,N)(120){$\mathcal{C}$} - \tkzDrawCircle(O,M) - \tkzFillCircle[color=blue!20,opacity=.4](O,M) - \tkzLabelCircle[R,draw,fill=Gold,% - text width=2cm,text centered](O,3 cm)(-60)% - {Le cercle\\ $\mathcal{C}$} - \tkzDrawPoints(M,P)\tkzLabelPoints[right](M,P) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-7.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-7.tex deleted file mode 100644 index 21775947e7..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-23-2-7.tex +++ /dev/null @@ -1,10 +0,0 @@ -\begin{tikzpicture} - \tkzDefPoints{2/2/A,5/4/B,4/4/0} - \tkzLength=2cm - \tkzDrawCircle[R](O,\tkzLength pt) - \tkzInterLC[R](A,B)(O,\tkzLength pt) - \tkzGetPoints{I}{J} - \tkzDrawPoints[color=blue](A,B) - \tkzDrawPoints[color=red](I,J) - \tkzDrawLine(I,J) -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-2-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-2-0.tex deleted file mode 100644 index b113d42898..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-2-0.tex +++ /dev/null @@ -1,5 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmin=-1,xmax=3,ymin=-1, ymax=3] - \tkzGrid - \tkzShowBB[red,line width=2pt] -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-4-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-4-0.tex deleted file mode 100644 index 2a0df0756e..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-6-4-0.tex +++ /dev/null @@ -1,7 +0,0 @@ -\begin{tikzpicture} - \tkzInit[xmax=4, ymax=3] - \tkzAxeXY - \tkzGrid - \tkzClip[space=1] - \draw[red] (-1,-1)--(5,2); -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-1.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-1.tex deleted file mode 100644 index 99a4a10e09..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-1.tex +++ /dev/null @@ -1,10 +0,0 @@ -\begin{tikzpicture}[rotate=90] - \tkzDefPoint[label=right:$A_n$](2,3){A} - \begin{scope}[shift={(A)}] - \tkzDefPoint[label= right:$B_n$](31:3){B} - \tkzDefPoint[label= right:$C_n$](158:3){C} - \end{scope} - \tkzDrawSegments[color=red,% - line width=1pt](A,B A,C) - \tkzDrawPoints[color=red](A,B,C) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-2.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-2.tex deleted file mode 100644 index 0180cdf0c0..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-7-1-2.tex +++ /dev/null @@ -1,16 +0,0 @@ -\begin{tikzpicture}[scale=1] - \tkzInit[xmax=6,ymax=6] - \tkzGrid - \tkzDefPoint(-1+1,-1+4){O} - \tkzDefPoint({3*ln(exp(1))},{exp(1)}){A} - \tkzDefPoint({4*sin(pi/6)},{4*cos(pi/6)}){B} - \tkzDefPoint({4*sin(pi/3)},{4*cos(pi/3)}){B'} - \tkzDefPoint(30:5){C} - \tkzDefPoint[shift={(1,3)}](45:4){A'} - \begin{scope}[shift=(A)] - \tkzDefPoint(30:3){C'} - \end{scope} - \tkzDrawPoints[color=blue](O,B,C) - \tkzDrawPoints[color=red](B',A,A',C') - \tkzLabelPoints(A,O,B,B',A',C,C') -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-3-0.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-3-0.tex deleted file mode 100644 index 5c7e97e8df..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-8-3-0.tex +++ /dev/null @@ -1,16 +0,0 @@ -\begin{tikzpicture}[scale=.75,rotate=-30] - \tkzDefPoint(0,0){O} - \tkzDefPoint(4,-5){A} - \tkzDefIntSimilitudeCenter(O,3)(A,1) \tkzGetPoint{I} - \tkzExtSimilitudeCenter(O,3)(A,1) \tkzGetPoint{J} - \tkzDefTangent[from with R= I](O,3 cm) \tkzGetPoints{D}{E} - \tkzDefTangent[from with R= I](A,1 cm) \tkzGetPoints{D'}{E'} - \tkzDefTangent[from with R= J](O,3 cm) \tkzGetPoints{F}{G} - \tkzDefTangent[from with R= J](A,1 cm) \tkzGetPoints{F'}{G'} - \tkzDrawCircle[R,fill=red!50,opacity=.3](O,3 cm) - \tkzDrawCircle[R,fill=blue!50,opacity=.3](A,1 cm) - \tkzDrawSegments[add = .5 and .5,color=red](D,D' E,E') - \tkzDrawSegments[add= 0 and 0.25,color=blue](J,F J,G) - \tkzDrawPoints(O,A,I,J,D,E,F,G,D',E',F',G') - \tkzLabelPoints[font=\scriptsize](O,A,I,J,D,E,F,G,D',E',F',G') -\end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-3.tex b/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-3.tex deleted file mode 100644 index ed4b53eb0f..0000000000 --- a/macros/latex/contrib/tkz/tkz-euclide/examples/tkzeuclide-9-1-3.tex +++ /dev/null @@ -1,8 +0,0 @@ - \begin{tikzpicture} - \tkzDefPoints{0/1/A,3/2/B,1/4/C} - \tkzDefTriangleCenter[circum](A,B,C) - \tkzGetPoint{G} - \tkzDrawPolygon[color=Maroon](A,B,C) - \tkzDrawCircle(G,A) - \tkzDrawPoints(A,B,C,G) - \end{tikzpicture} diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty index 9a611c9943..5c86e5c0af 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-euclide.sty @@ -1,17 +1,24 @@ % tkz-euclide.sty -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. %<------------------------------------------------------------–> -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-euclide.sty} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-euclide.sty} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-euclide}[2020/01/23 3.01c for euclidan geometry ] +\ProvidesPackage{tkz-euclide}[2020/01/24 3.02c for euclidan geometry ] \RequirePackage{tkz-base} +\makeatletter +\@ifpackagelater{tkz-base}{2020/01/24}{% + % Package is new enough +}{% + \PackageError{tkz-euclide}{Package tkz-base is too old , you need a recent version}% +} +\makeatother \DeclareOption*{}%% Ne rien faire quand une option est inconnue \ProcessOptions %<----------------------------------------------------------–> diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex index caa19116be..bce07ea8a9 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-angles.tex @@ -1,11 +1,11 @@ % tkz-tool-eu-angles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tool-eu-angles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tool-eu-angles.tex} \makeatletter %<--------------------------------------------------------------------------–> \newdimen\tkz@arcsize% from julian julian@d-and-j.net @@ -17,13 +17,13 @@ %<--------------------------------------------------------------------------–> \def\tkzDrawArcRAN[#1](#2,#3)(#4,#5){% \begingroup - \draw[shift = {(#2)},/drawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); + \draw[shift = {(#2)},/tkzdrawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); \endgroup } %<--------------- tkzPathArcRAN ---------------------------------- \def\tkzPathArcRAN[#1](#2,#3)(#4,#5){% \begingroup - \path[shift = {(#2)},/drawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); + \path[shift = {(#2)},/tkzdrawarc/.cd,#1] (#4:#3) arc (#4:#5:#3); \endgroup } %<--------------------------------------------------------------------------–> @@ -179,8 +179,8 @@ \pgfkeys{/tkzlabelangle/.cd, dist/.store in = \tkzlabeldist, angle/.store in = \tkzlabelangle, - dist = 1, - angle = {}, + dist = 1, + angle = {}, /tkzlabelangle/.search also={/tikz} } \def\tkzLabelAngle{\pgfutil@ifnextchar[{\tkz@LabelAngle}{\tkz@LabelAngle[]}} diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex index 7c0584c8f0..c8ef72c3e6 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-arcs.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-arcs.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-arcs.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-arcs.tex} \makeatletter %<------------------------------ Arcs -------------------------------------– % options : delta @@ -14,7 +14,7 @@ % \pgfkeys{/tikz/.cd,delta/.code={\def\tkz@delta{#1}}} \gdef\tkz@numa{0} -\pgfkeys{/drawarc/.cd, +\pgfkeys{/tkzdrawarc/.cd, type/.is choice, type/towards/.code = \def\tkz@numa{0}, type/rotate/.code = \def\tkz@numa{1}, @@ -36,12 +36,12 @@ type/.default = towards, delta/.store in = \tkz@delta, delta = 0, - /drawarc/.search also = {/tikz} + /tkzdrawarc/.search also = {/tikz} } \def\tkzDrawArc{\pgfutil@ifnextchar[{\tkz@DrawArc}{\tkz@DrawArc[]}} \def\tkz@DrawArc[#1](#2,#3)(#4){% \begingroup -\pgfqkeys{/drawarc}{#1} +\pgfqkeys{/tkzdrawarc}{#1} \ifcase\tkz@numa% \tkzDrawArcTowards[#1](#2,#3)(#4) \or% 1 @@ -131,7 +131,7 @@ \edef\tkz@FirstAngle{\pgfmathresult}% \pgfmathadd{\tkz@SecondAngle}{\tkz@delta} \edef\tkz@SecondAngle{\pgfmathresult} - \draw[shift = {(#2)},compass style,/drawarc/.cd,#1]% + \draw[shift = {(#2)},compass style,/tkzdrawarc/.cd,#1]% (\tkz@FirstAngle:#3) arc (\tkz@FirstAngle:\tkz@SecondAngle:#3); \endgroup } diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex index aa1b259d8a..9a3a726658 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-circles.tex @@ -1,12 +1,12 @@ % tkz-obj-eu-circles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-circles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-circles.tex} \makeatletter %<--------------------------------------------------------------------------–> % tkzCircle center and one point @@ -16,30 +16,30 @@ % no need to define a circle with R tikz uses this method. % through instead of radius \def\tkz@numc{0} -\pgfkeys{/tkzDefCircle/.cd, +\pgfkeys{/tkzcircle/.cd, through/.code = \def\tkz@numc{0}, radius/.code = \def\tkz@numc{0}, diameter/.code = \def\tkz@numc{1}, circum/.code = \def\tkz@numc{2}, in/.code = \def\tkz@numc{3}, - ex/.code = \def\tkz@numc{4},% new + ex/.code = \def\tkz@numc{4}, euler/.code = \def\tkz@numc{5}, nine/.code = \def\tkz@numc{5}, apollonius/.code = \def\tkz@numc{6}, - orthogonal from/.code args = {#1}{\def\tkz@ptfrom{#1}, + orthogonal from/.code args = {#1}{\def\tkz@ptfrom{#1} \def\tkz@numc{7}}, orthogonal through/.code args = {#1 and #2}{\def\tkz@ptone{#1} \def\tkz@pttwo{#2} \def\tkz@numc{8}}, spieker/.code = \def\tkz@numc{9}, - K/.code = \def\tkz@koeff{#1},% apollonius + K/.code = \def\tkz@koeff{#1}, K = 1, through } \def\tkzDefCircle{\pgfutil@ifnextchar[{\tkz@DefCircle}{\tkz@DefCircle[]}} \def\tkz@DefCircle[#1](#2){% \begingroup -\pgfqkeys{/tkzDefCircle}{#1} +\pgfqkeys{/tkzcircle}{#1} \ifcase\tkz@numc% \tkzDefCircleThrough(#2)% \or% 1 @@ -63,7 +63,6 @@ \fi \endgroup } - %<--------------------------------------------------------------------------–> % Circum Circle %<--------------------------------------------------------------------------–> @@ -150,7 +149,7 @@ %<--------------------------------------------------------------------------–> % Apollonius radius %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusR/.cd, +\pgfkeys{/tkzapor/.cd, K/.code = \def\tkz@koeff{#1},% apollonius K = 1 } @@ -158,7 +157,7 @@ \tkz@DefApolloniusRadius}{\tkz@DefApolloniusRadius[]}} \def\tkz@DefApolloniusRadius[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusR}{#1} + \pgfqkeys{/tkzapor}{#1} \tkz@VecK[\tkz@koeff/(1+\tkz@koeff)](#2,#3) \pgfnodealias{apo@pta}{tkzPointResult} \tkz@VecK[\tkz@koeff/(\tkz@koeff-1)](#2,#3) @@ -171,28 +170,28 @@ % Apollonius point %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusP/.cd, - K/.code = \def\tkz@koeff{#1},% apollonius - K = 1 +\pgfkeys{/tkzapop/.cd, + K/.code = \def\tkz@koeff{#1},% apollonius + K = 1 } \def\tkzDefApolloniusPoint{\pgfutil@ifnextchar[{\tkz@DefApolloniusPoint}{\tkz@DefApolloniusPoint[]}} \def\tkz@DefApolloniusPoint[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusP}{#1} + \pgfqkeys{/tkzapop}{#1} \tkzDefBarycentricPoint(#2=1,#3=\tkz@koeff) \endgroup } %<--------------------------------------------------------------------------–> % Apollonius center %<--------------------------------------------------------------------------–> -\pgfkeys{/tkzApolloniusC/.cd, - K/.code = \def\tkz@koeff{#1},% apollonius - K = 1 +\pgfkeys{/tkzapoc/.cd, + K/.code = \def\tkz@koeff{#1},% apollonius + K = 1 } \def\tkzApolloniusCenter{\pgfutil@ifnextchar[{\tkz@ApolloniusCenter}{\tkz@ApolloniusCenter[]}} \def\tkz@ApolloniusCenter[#1](#2,#3){% \begingroup - \pgfqkeys{/tkzApolloniusC}{#1} + \pgfqkeys{/tkzapoc}{#1} \tkz@VecK[\tkz@koeff/(1+\tkz@koeff)](#2,#3) \pgfnodealias{tkzFirstPointResult}{tkzPointResult} \tkz@VecK[\tkz@koeff/(\tkz@koeff-1)](#2,#3) @@ -227,7 +226,7 @@ \pgfnodealias{tkz@spka}{tkzPointResult} \tkzDefMidPoint(#1,#2) \tkzUProjection(#1,#2)(tkzPointResult) - \tkzCalcLength(tkz@spka,tkzPointResult) + \tkzCalcLength(tkz@spka,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex index e0f00f678d..dd1c46863a 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-compass.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-compass.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-compass.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-compass.tex} \makeatletter %<--------------------------------------------------------------------------–> % Author Alain Matthes @@ -17,7 +17,7 @@ % Setup Compass %<--------------------------------------------------------------------------–> \pgfkeys{% - setupcompass/.cd, + tkzsucompass/.cd, line width/.code = {\global\edef\tkz@compass@lw{#1}}, color/.code = {\global\edef\tkz@compass@color{#1}}, style/.code = {\global\edef\tkz@compass@style{#1}}, @@ -29,12 +29,12 @@ %<--------------------------------------------------------------------------–> \def\tkz@SetUpCompass[#1]{% \pgfkeys{% - setupcompass/.cd, + tkzsucompass/.cd, line width = \tkz@euc@compasswidth, color = \tkz@euc@compasscolor, style = \tkz@euc@compassstyle } -\pgfqkeys{/setupcompass}{#1} +\pgfqkeys{/tkzsucompass}{#1} \tikzset{compass style/.style={color = \tkz@compass@color, line width = \tkz@compass@lw, style = \tkz@compass@style @@ -52,10 +52,10 @@ %<--------------------------------------------------------------------------–> \pgfkeys{ - /compass/delta/.code = {\def\tkz@delta{#1}}, - /compass/length/.code = {\def\tkz@length{#1}}, - /compass/ratio/.code = {\def\tkz@ratio{#1}}, - /compass/.unknown/.code = {\let\searchname=\pgfkeyscurrentname + /tkzcompass/delta/.code = {\def\tkz@delta{#1}}, + /tkzcompass/length/.code = {\def\tkz@length{#1}}, + /tkzcompass/ratio/.code = {\def\tkz@ratio{#1}}, + /tkzcompass/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, /tikz/\searchname/.retry=#1}} } @@ -64,18 +64,18 @@ \def\tkz@Compass[#1](#2,#3){% \begingroup \pgfkeys{% - compass/.cd, + tkzcompass/.cd, length = 1, delta = 0, ratio = .5 } -\pgfkeys{compass/.cd,#1} +\pgfkeys{tkzcompass/.cd,#1} \tkzCalcLength(#2,#3)\tkzGetLength{tkz@tempLen} \ifnum\tkz@delta=0 % \pgfmathsetmacro{\tkz@delta}{min(deg(\tkz@length cm/ \tkz@tempLen pt),180)/2} \fi \tkzFindSlopeAngle(#2,#3)\tkzGetAngle{tkz@angle}% - \draw[shift ={(#2)},/compass/.cd,compass style,#1]% + \draw[shift ={(#2)},/tkzcompass/.cd,compass style,#1]% (\tkz@angle-\tkz@delta:\tkz@tempLen pt)% arc (\tkz@angle-\tkz@delta:\tkz@angle+\tkz@delta:\tkz@tempLen pt); %}; diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex index 20a07f6fa6..f8a0a05558 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-circles.tex @@ -1,12 +1,12 @@ % tkz-obj-eu-draw-circles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-draw-circles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-draw-circles.tex} \makeatletter %for compatibility %<--------------------------------------------------------------------------–> @@ -37,7 +37,7 @@ } \def\tkz@numdc{0} -\pgfkeys{/DrawCircle/.cd, +\pgfkeys{/tkzdrawc/.cd, through/.code = \def\tkz@numdc{0}, R/.code = \def\tkz@numdc{1}, diameter/.code = \def\tkz@numdc{2}, @@ -55,7 +55,7 @@ K/.store in = \tkz@koeff,% apollonius through, K = 1, - /DrawCircle/.search also={/tikz} + /tkzdrawc/.search also={/tikz} } %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> @@ -64,7 +64,7 @@ \def\tkzDrawCircle{\pgfutil@ifnextchar[{\tkz@DrawCircle}{\tkz@DrawCircle[]}} \def\tkz@DrawCircle[#1](#2){% \begingroup -\pgfqkeys{/DrawCircle}{#1} +\pgfqkeys{/tkzdrawc}{#1} \ifcase\tkz@numdc% \tkzDefCircleThrough(#2) \or% 1 @@ -86,7 +86,7 @@ \or% 8 \tkzDefOrthoThroughCircle(#2,\tkz@ptone,\tkz@pttwo) \fi - \draw[line style,/DrawCircle/.cd,#1] + \draw[line style,/tkzdrawc/.cd,#1] (tkzPointResult) circle (\tkzLengthResult pt); \endgroup } @@ -114,20 +114,20 @@ %<--------------------------------------------------------------------------–> % #2 #3 rayon \def\tkz@numdsc{0} -\pgfkeys{/@SemiCircle/.cd, +\pgfkeys{/tkzdrawsc/.cd, through/.code = \def\tkz@numdsc{0}, diameter/.code = \def\tkz@numdsc{1}, swap/.is if = tkz@sawp@sc, swap/.default = true, swap = false, through, - /@SemiCircle/.search also={/tikz} + /tkzdrawsc/.search also={/tikz} } \def\tkzDrawSemiCircle{\pgfutil@ifnextchar[{\tkz@DrawSemiCircle}{% \tkz@DrawSemiCircle[]}} \def\tkz@DrawSemiCircle[#1](#2){% \begingroup -\pgfqkeys{/@SemiCircle}{#1} +\pgfqkeys{/tkzdrawsc}{#1} \ifcase\tkz@numdsc% \tkzDrawSemiCircleThrough(#2) \or% @@ -202,7 +202,7 @@ } %<--------------------------- Clip Circle ---------------------------------–> \def\tkz@numcc{0} -\pgfkeys{/clipcircle/.cd, +\pgfkeys{/tkzclipc/.cd, through/.code = \def\tkz@numcc{0}, R/.code = \def\tkz@numcc{1}, through} @@ -210,7 +210,7 @@ \def\tkzClipCircle{\pgfutil@ifnextchar[{\tkz@ClipCircle}{\tkz@ClipCircle[]}} \def\tkz@ClipCircle[#1](#2,#3){% -\pgfqkeys{/clipcircle}{#1} +\pgfqkeys{/tkzclipc}{#1} \ifcase\tkz@numcc \tkzCalcLength(#2,#3) \clip (#2) circle (\tkzLengthResult pt); @@ -222,11 +222,11 @@ % attention radius circle is defined by center and a point on the circle % R defined by center and the value of the radius \def\tkz@numlc{0} -\pgfkeys{/labelcircle/.cd, +\pgfkeys{/tkzlabelc/.cd, through/.code = \def\tkz@numlc{0}, R/.code = \def\tkz@numlc{1}, through, - /labelcircle/.search also={/tikz} + /tkzlabelc/.search also={/tikz} } \def\tkzLabelCircle{\pgfutil@ifnextchar[{\tkz@LabelCircle}{% @@ -235,14 +235,14 @@ % #4 angle #5 the label \def\tkz@LabelCircle[#1](#2,#3)(#4)#5{% \begingroup -\pgfqkeys{/labelcircle}{#1} +\pgfqkeys{/tkzlabelc}{#1} \ifcase\tkz@numlc \tkzURotateAngle(#2,#4)(#3) - \node[/labelcircle/.cd,#1] at (tkzPointResult) {#5}; + \node[/tkzlabelc/.cd,#1] at (tkzPointResult) {#5}; \or% 1 \path (#2)--++(#3,0) coordinate (tkzPointResult); \tkzURotateAngle(#2,#4)(tkzPointResult) - \node[/labelcircle/.cd,#1] at (tkzPointResult) {#5}; + \node[/tkzlabelc/.cd,#1] at (tkzPointResult) {#5}; \fi \endgroup } diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex index 76923e844b..d837c35a1d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-lines.tex @@ -1,20 +1,20 @@ % tkz-obj-eu-draw-lines.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-draw-lines.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-draw-lines.tex} \makeatletter \def\tkz@numdl{0} -\pgfkeys{/DrawLine/.cd, +\pgfkeys{/tkzdrawl/.cd, median/.code = \def\tkz@numdl{0}, altitude/.code = \def\tkz@numdl{1}, bisector/.code = \def\tkz@numdl{2}, none/.code = \def\tkz@numdl{3}, none, - /DrawLine/.search also={/tikz} + /tkzdrawl/.search also={/tikz} } %<--------------------------------------------------------------------------–> % Drawing a line > @@ -22,7 +22,7 @@ \def\tkzDrawLine{\pgfutil@ifnextchar[{\tkz@DrawLine}{\tkz@DrawLine[]}} \def\tkz@DrawLine[#1](#2){% \begingroup -\pgfqkeys{/DrawLine}{#1} +\pgfqkeys{/tkzdrawl}{#1} \ifcase\tkz@numdl% \tkzDrawMedian[#1](#2) \or% 1 @@ -42,7 +42,7 @@ \def\tkzDrawSLine{\pgfutil@ifnextchar[{\tkz@DrawSLine}{\tkz@DrawSLine[]}} \def\tkz@DrawSLine[#1](#2,#3){% \begingroup -\draw[#1] (#2) to (#3); +\draw[line style,#1] (#2) to (#3); \endgroup }% %<--------------------------------------------------------------------------–> @@ -52,7 +52,7 @@ \def\tkz@Median[#1](#2,#3,#4){% \begingroup \tkzDefMidPoint(#2,#4) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -62,7 +62,7 @@ \def\tkz@Altitude[#1](#2,#3,#4){% \begingroup \tkzUProjection(#2,#4)(#3) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -73,7 +73,7 @@ \begingroup \tkzDefBisectorLine(#2,#3,#4) \tkzInterLL(#2,#4)(#3,tkzPointResult) - \tkzDrawSLine[add= 0 and 0,/DrawLine/.cd,#1](#3,tkzPointResult) + \tkzDrawSLine[add= 0 and 0,/tkzdrawl/.cd,#1](#3,tkzPointResult) \endgroup } %<--------------------------------------------------------------------------–> @@ -169,7 +169,7 @@ median, name/.store in = \tkz@newpoint@name, name/.initial = {}, - name = {}, + name = {}, /DrawTLines/.search also={/tikz} } %<--------------------------------------------------------------------------–> @@ -220,12 +220,12 @@ % Setup Line %<--------------------------------------------------------------------------–> \pgfkeys{% - setupline/.cd, + tkzsuline/.cd, line width/.code = {\xdef\tkz@line@lw{#1}}, color/.code = {\xdef\tkz@line@color{#1}}, style/.code = {\xdef\tkz@line@style{#1}}, add/.code args = {#1 and #2} {\xdef\tkz@line@left{#1}% - \xdef\tkz@line@right{#2}% + \xdef\tkz@line@right{#2}% } } %<--------------------------------------------------------------------------–> @@ -233,12 +233,12 @@ \tkzActivOff\tkz@SetUpLine[]}} \def\tkz@SetUpLine[#1]{% \pgfkeys{% - setupline/.cd, + tkzsuline/.cd, line width = \tkz@euc@linewidth, color = \tkz@euc@linecolor, style = \tkz@euc@linestyle, add = {\tkz@euc@lineleft} and {\tkz@euc@lineright}} -\pgfqkeys{/setupline}{#1} +\pgfqkeys{/tkzsuline}{#1} %<--------------------------------------------------------------------------–> % Line style %<--------------------------------------------------------------------------–> @@ -252,14 +252,14 @@ %<--------------------------------------------------------------------------–> % draw segment (s) %<--------------------------------------------------------------------------–> -\pgfkeys{/@tkzsegoptions/.cd, - /@tkzsegoptions/.search also={/tikz}, +\pgfkeys{/tkzdraws/.cd, + /tkzdraws/.search also={/tikz}, } \def\tkzDrawSegment{\pgfutil@ifnextchar[{\tkz@DrawSegment}{% \tkz@DrawSegment[]}} \def\tkz@DrawSegment[#1](#2,#3){% \begingroup - \pgfqkeys{/@tkzsegoptions}{#1} + \pgfqkeys{/tkzdraws}{#1} \draw[line style,add=0 and 0,#1] (#2) to (#3); \endgroup }% diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex index 49ce0c7021..6b3764ccc3 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-draw-polygons.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-polygons.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-polygons.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex} \makeatletter %<--------------------------------------------------------------------------–> % Polygon diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex index ee12e06d8a..5246f68455 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-lines.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-lines.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-lines.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-lines.tex} \makeatletter %<--------------------------------------------------------------------------–> % les lignes diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex index bf8793ad09..2ab31570ac 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-by.tex @@ -1,11 +1,11 @@ % tkz-tools-eu-points-by.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-eu-points-by.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-eu-points-by.tex} \makeatletter %<--------------------------------------------------------------------------–> % Transformations Géométriques diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex index ca072cd66d..d11902126d 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-rnd.tex @@ -1,13 +1,13 @@ % tkz-obj-eu-points-rnd.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points-rnd.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points-rnd.tex} %<--------------------------------------------------------------------------–> \makeatletter %<-------------------------------------------------------------------------–> diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex index d73a1ce8cb..6e235de7b3 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points-with.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-points-with.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points-with.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points-with.tex} \makeatletter %<--------------------------------------------------------------------------–> % Vectors diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex index 62600426e7..774faae921 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-points.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-points.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-points.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-points.tex} \makeatletter %add ExCenter %<--------------------------------------------------------------------------–> @@ -354,15 +354,16 @@ %<--------------------------------------------------------------------------–> % Nagel center Na %<--------------------------------------------------------------------------–> -% INa = 3 IG. Nagel point +% INa = 3 IG. Nagel point % correction 02/02/20 \def\tkzNagelCenter(#1,#2,#3){% \begingroup \pgfinterruptboundingbox - \tkzInCenter(#1,#2,#3) - \pgfnodealias{tkz@ptin}{tkzPointResult} - \tkzCentroid(#1,#2,#3) - \pgfnodealias{tkz@cen}{tkzPointResult} - \tkz@VecCoLinear(tkz@ptin,tkz@cen,tkz@ptin) + \tkzDefExcentralTriangle(#1,#2,#3){tkz@a,tkz@b,tkz@c} + \tkzUProjection(#2,#3)(tkz@a) + \pgfnodealias{tkz@tgta}{tkzPointResult} + \tkzUProjection(#1,#2)(tkz@c) + \pgfnodealias{tkz@tgtc}{tkzPointResult} + \tkzInterLL(#1,tkz@tgta)(#3,tkz@tgtc) \endpgfinterruptboundingbox \endgroup } @@ -459,7 +460,31 @@ \pgfnodealias{\csname tkz@ppt3\endcsname\csname tkz@pt3\endcsname}{tkzPointResult} \endgroup } - - +%<--------------------------------------------------------------------------–> +% Point on circle +%<--------------------------------------------------------------------------–> +\pgfkeys{/tkzptcircle/.cd, + angle/.store in = \tkz@angle, + angle = 0 , + center/.store in = \tkz@center, + radius/.store in = \tkz@radius +} +\def\tkzDefPointOnCircle{\pgfutil@ifnextchar[{\tkz@DefPointOnCircle}{\tkz@DefPointOnCircle[]}} +\def\tkz@DefPointOnCircle[#1]{% +\begingroup +\pgfqkeys{/tkzptcircle}{#1} +\path (\tkz@center) --++(\tkz@angle:\tkz@radius) coordinate(tkzPointResult); +\endgroup +} +%<--------------------------------------------------------------------------–> +% Point on line +%<--------------------------------------------------------------------------–> +\def\tkzDefPointOnLine{\pgfutil@ifnextchar[{\tkz@DefPointOnLine}{\tkz@DefPointOnLine[]}} +\def\tkz@DefPointOnLine[#1](#2,#3){% +\begingroup +\path (#2) to [#1] coordinate (tkzPointResult) (#3); +\endgroup +} + \makeatother \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex index 56d0b86fdf..b9b29a666e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-polygons.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-polygons.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-polygons.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-polygons.tex} \makeatletter %<--------------------------------------------------------------------------–> % Polygon diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex index eaeca969fc..b1426b206c 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-protractor.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-protractor.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} - \typeout{2020/01/23 3.01c tkz-obj-eu-protractor.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} + \typeout{2020/01/24 3.02c tkz-obj-eu-protractor.tex} \makeatletter %<--------------------------------------------------------------------------–> % !!! idea from Y. Combe !!! diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex index 538a8f34f9..24fc845673 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-sectors.tex @@ -1,11 +1,11 @@ % tkz-obj-eu-sectors.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-sectors.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-sectors.tex} \makeatletter %<----------------------- Sectors ------------------------------–> \tikzset{sstyle/.style={#1}} diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex index 457fbed257..d1eb78b30e 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-show.tex @@ -1,11 +1,11 @@ %tkz-obj-eu-show.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-show.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-show.tex} \makeatletter %<--------------------------------------------------------------------------–> % finding specific points in a triangle @@ -59,7 +59,7 @@ size/.code = \def\tkz@show@size{#1}, /show/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, - /compass/\searchname/.retry=#1, + /tkzcompass/\searchname/.retry=#1, /tikz/\searchname/.retry=#1}% } } @@ -134,10 +134,12 @@ \def\tkzShowOrthLine{\pgfutil@ifnextchar[{\tkz@ShowOrthLine}{\tkz@ShowOrthLine[]}} \def\tkz@ShowOrthLine[#1](#2,#3)(#4){% \begingroup -\pgfkeys{show/.cd, ratio = .75, +\pgfkeys{show/.cd, + ratio = .75, length = 1, - gap = -1} % ???? -\pgfkeys{show/.cd,#1} %???? + gap = -1, + size = 1} +\pgfkeys{show/.cd,#1} \tkzVecKOrth(#2,#3) \pgfnodealias{tkz@OLtmp}{tkzPointResult} \tkz@VecKCoLinear[1](#2,tkz@OLtmp,#4) @@ -152,9 +154,9 @@ \pgfnodealias{PO@tmp2}{tkzPointResult} \tkz@VecKCoLinear[-1](#2,PO@tmp,tkzPOpoint) \pgfnodealias{PO@tmp1}{tkzPointResult} - \tkz@VecKCoLinear[2](tkzPOpoint,PO@tmp1,tkzPOpoint) + \tkz@VecKCoLinear[\tkz@show@size](tkzPOpoint,PO@tmp1,tkzPOpoint) \pgfnodealias{PO@1}{tkzPointResult} - \tkz@VecKCoLinear[2](tkzPOpoint,PO@tmp2,tkzPOpoint) + \tkz@VecKCoLinear[\tkz@show@size](tkzPOpoint,PO@tmp2,tkzPOpoint) \pgfnodealias{PO@2}{tkzPointResult} \ifdim\tkz@mathLen pt>10 pt\relax \tkz@VecKNorm[1](#4,tkzPOpoint) @@ -237,7 +239,7 @@ translation/.code args={from #1 to #2}{% size/.code = \def\tkz@show@size{#1}, /showtsf/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, - /compass/\searchname/.retry=#1, + /tkzcompass/\searchname/.retry=#1, /tikz/\searchname/.retry=#1}} } %<--------------------------------------------------------------------------–> diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex index 0abc2e8166..5fe6b5d069 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-obj-eu-triangles.tex @@ -3,9 +3,9 @@ % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-obj-eu-triangles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-obj-eu-triangles.tex} \makeatletter %<--------------------------------------------------------------------------–> % Triangle Equilateral @@ -95,13 +95,14 @@ pythagore/.code = \def\tkz@numtr{2}, school/.code = \def\tkz@numtr{3}, golden/.code = \def\tkz@numtr{4}, - sublime/.code = \def\tkz@numtr{4}, + sublime/.code = \def\tkz@numtr{4}, euclide/.code = \def\tkz@numtr{5}, gold/.code = \def\tkz@numtr{6}, cheops/.code = \def\tkz@numtr{7}, two angles/.code args = {#1 and #2} { \def\tkz@numtr{8}% - \def\tkz@alpha{#1}% - \def\tkz@beta{#2}} + \def\tkz@alpha{#1}% + \def\tkz@beta{#2}}, + equilateral } \def\tkzDefTriangle{\pgfutil@ifnextchar[{\tkz@DefTriangle}{\tkz@DefTriangle[]}} @@ -247,9 +248,6 @@ %<--------------------------------------------------------------------------– % InCentral %<--------------------------------------------------------------------------– -% The Incentral triangle is the triangle whose vertices are determined by -% theintersections of the reference triangle’s angle bisectors with the -% respective opposite sides. %<--------------------------------------------------------------------------–> \def\@DefIncentralTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -302,7 +300,6 @@ \let\tkzExcentralTriangle\tkzDefExcentralTriangle %<--------------------------------------------------------------------------–> % Intouch Triangle -% The contact triangle of a triangle ABC, also called the intouch triangle, is the triangle formed by the points of tangency of the incircle of ABC with ABC. %<--------------------------------------------------------------------------–> \def\@DefIntouchTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -328,7 +325,6 @@ \let\tkzDefContactTriangle\tkzDefIntouchTriangle %<--------------------------------------------------------------------------–> % Extouch Triangle -% The extouch triangle T_1T_2T_3 is the triangle formed by the points of tangency of a triangle A_1A_2A_3 with its excircles J_1, J_2, and J_3. %<--------------------------------------------------------------------------–> \def\tkzDefExtouchTriangle{\pgfutil@ifnextchar[{% \tkz@DefExtouchTriangle}{% @@ -349,10 +345,9 @@ \pgfnodealias{\tkz@pttr@name\csname tkz@point2\endcsname}{tkzPointResult} \endgroup } - %<--------------------------------------------------------------------------–> -% Feuerbach triangle The Feuerbach triangle is the triangle formed by the three points of tangency of the nine-point circle with the excircles - +% Feuerbach triangle +%<--------------------------------------------------------------------------–> \def\tkzDefFeuerbachTriangle{\pgfutil@ifnextchar[{% \tkz@DefFeuerbachTriangle}{\tkz@DefFeuerbachTriangle[]}} @@ -402,9 +397,7 @@ \let\tkzDefMedialTriangle\tkzDefCentroidTriangle \let\tkzDefMidpointTriangle\tkzDefCentroidTriangle %<--------------------------------------------------------------------------–> -% OrthicTriangle H Ha Hb Hc -%<--------------------------------------------------------------------------–> -% Orthic Triangle +% Orthic Triangle H Ha Hb Hc %<--------------------------------------------------------------------------–> \def\@DefOrthicTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% @@ -426,8 +419,8 @@ \let\tkzDefAltitudeTriangle\tkzDefOrthicTriangle %<--------------------------------------------------------------------------–> -% The Euler triangle of a triangle ABC is the triangle E_AE_BE_C whose vertices are the midpoints of the segments joining the orthocenter H with the respective vertices. The vertices of the triangle are known as the Euler points, and lie on the nine-point circle. - +% The Euler triangle +%<--------------------------------------------------------------------------–> \def\tkzDefEulerTriangle{\pgfutil@ifnextchar[{% \tkz@DefEulerTriangle}{\tkz@DefEulerTriangle[]}} \def\tkz@DefEulerTriangle[#1](#2,#3,#4)#5{% @@ -449,7 +442,7 @@ \endgroup } %<--------------------------------------------------------------------------–> -% +% TangentialTriangle %<--------------------------------------------------------------------------–> \def\tkzDefTangentialTriangle{\pgfutil@ifnextchar[{% \tkz@DefTangentialTriangle}{\tkz@DefTangentialTriangle[]}} @@ -478,10 +471,6 @@ %<--------------------------------------------------------------------------– % tkzDefSymmedianLine %<--------------------------------------------------------------------------– -% The Incentral triangle is the triangle whose vertices are determined by -% theintersections of the reference triangle’s angle bisectors with the -% respective opposite sides. -%<--------------------------------------------------------------------------–> \def\@DefSymmedianTriangle(#1,#2,#3)(#4,#5){% \def\tkz@tmp{#5}% \tkz@recuplast(#3) diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex index 7385417e27..85595fe4ca 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-angles.tex @@ -1,11 +1,11 @@ % tkz-tools-angles.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-angles.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-angles.tex} \makeatletter %<--------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> diff --git a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex index 8937f914fa..7bb8810796 100644 --- a/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex +++ b/macros/latex/contrib/tkz/tkz-euclide/latex/tkz-tools-intersections.tex @@ -1,11 +1,11 @@ % tkz-tools-intersections.tex -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % This file may be distributed and/or modified % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -\def\fileversion{3.01c} -\def\filedate{2020/01/23} -\typeout{2020/01/23 3.01c tkz-tools-intersections.tex} +\def\fileversion{3.02c} +\def\filedate{2020/01/24} +\typeout{2020/01/24 3.02c tkz-tools-intersections.tex} \makeatletter %<--------------------------------------------------------------------------–> % intersection de deux lignes @@ -234,7 +234,8 @@ \pgfkeys{ /circlecircle/.cd, node/.code = {\global\def\tkz@numcc{0}}, - R/.code = {\global\def\tkz@numcc{1}} + R/.code = {\global\def\tkz@numcc{1}}, +with nodes/.code = {\global\def\tkz@numcc{2}} } %<--------------------------------------------------------------------------–> \def\tkzInterCC{\pgfutil@ifnextchar[{\tkz@InterCC}{\tkz@InterCC[]}} diff --git a/macros/latex/contrib/tkz/tkz-fct/README b/macros/latex/contrib/tkz/tkz-fct/README index 9067153f4d..2b964f04d0 100644 --- a/macros/latex/contrib/tkz/tkz-fct/README +++ b/macros/latex/contrib/tkz/tkz-fct/README @@ -1,93 +1,77 @@ -%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -readme-tkz-fct.txt 06/01/2011 version 1.16 c +%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +readme-tkz-fct.txt 2020/02/06 version 1.2 c -tkz-fct.sty uses tkz-base to draw graph of functions with a Cartesian +tkz-fct.sty uses tkz-base version > 3 to draw graph of functions with a Cartesian (rectangular) coordinate system. Licence -------- +-------------------------- This program can be redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN archives in directory macros/latex/base/lppl.txt. Features --------- - -- needs etex, fp.sty, tkz-base and gnuplot; +-------------------------- + -- needs tkz-base, fp.sty and gnuplot; -- automatically loads the package TikZ; - -- compiles with utf8, pdflatex; - -- compiles using the chain dvi->dvips->ps2pdf; - -- not yet ready for use with TeX and ConText (I need more time and ideas); - -- good news! ready to lualatex but I still need to test. + -- compiles with utf8, pdflatex, lualatex. + Installation ------------- +------------------------- You can experiment with the tkz-fct package by placing all of the distribution files in the directory containing your current tex file. -You can also placing all of the distribution files in the directory : +You can also place all of the distribution files in the directory : /texmf/tex/latex/tkz. How to use it -------------- +-------------------------- To use the package tkz-fct, place the following line in the preamble of your LaTeX document. \usepackage{tkz-fct} +\usepackage[your-language]{babel} +\usepackage[autolanguage]{numprint} -If you use the xcolor package, load that package before tkz-euclide to avoid +If you use the xcolor package, load that package before tkz-fct to avoid package conflicts. \usepackage[usenames,dvipsnames]{xcolor} -\usepackage{amsmath,tkz-fct} +\usepackage{tkz-fct} + +In order to format the numbers correctly, you place the following two lines + +\usepackage[your-language]{babel} +\usepackage[autolanguage]{numprint} Documentation -------------- - Documentation for tkz-fct and tkz-base is available on my sites: +-------------------------- + +Documentation for tkz-fct and tkz-base is available on my site : - http://altermundus.fr (en français) or http://altermundus.fr (in english) + http://altermundus.fr (en français) Examples --------- - All examples given in documentation will be stored on my sites as standalone files, ready for compilation. - -Compatibility -------------- - -The new package tkz-euclide is *not* compatible with older packages tkz-base, tkz-2d, and tkz-arith. +--------------------- +All examples given in documentation will be stored on my site as standalone files, ready for compilation. + History +-------------------------- + +-- 1.2 Add compatibility with tkz-base > 3.01 + add couverture.tex and tkz-doc.cfg -- 1.16 c correction of bugs now default domain is xmin:xmax and not -5:5. -- 1.13 first version -How to get all the examples : - -1) You need to modify the file TKZdoc-fct-main.tex . Replace - \usepackage{tkzexample} by - -\usepackage[saved]{tkzexample} -\def\tkzFileSavedPrefix{tkzFct} - -2) Compile the sources - $ pdflatex TKZdoc-fct-main.tex - You get in your folder all the examples with the prefix tkzFct. - -3) Put all these files in a new folder with the ruby script "addcontent.rb" - Run the script - $ ruby addcontent.rb - You get a folder with all the complete examples. The files begin with - \input{tkzfctpreamble.ltx} - -4) Now you can compile the files. A fine solution is to use a makefile. You - can put the two files tkzfctpreamble.ltx and Makefile inside the last folder - and now you run -$make - +--------------------------------------- Alain Matthes 5 rue de Valence diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf Binary files differnew file mode 100644 index 0000000000..6ea875eb16 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex index 189e2d0427..0f5a4a45ff 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex @@ -1,4 +1,4 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex + \subsection{Courbes de \tkzname{Van der Waals}} \bigskip @@ -36,11 +36,9 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$ \newpage -\subsubsection{ Première courbe avec \emph{b}=1} +\subsubsection{ Première courbe avec $ b=1$} Quelques courbes pour $r\leq\ v \leq\ 6$ - - \medskip \begin{center} \begin{tkzexample}[] @@ -59,7 +57,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$ \newpage -\subsubsection{ Deuxième courbe \emph{b}=1/3 } +\subsubsection{ Deuxième courbe $b=1/3$ } \medskip @@ -80,7 +78,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$ \newpage -\subsubsection{ Troisième courbe \emph{b}=32/27 } +\subsubsection{ Troisième courbe $ b=32/27$ } \medskip @@ -99,9 +97,6 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$ \end{tkzexample} \end{center} - - - \newpage \subsection{Valeurs critiques} \subsubsection{Courbes de \tkzname{Van der Walls} } @@ -144,7 +139,7 @@ définie sur l'intervalle $I=\big]b~;~+\infty\big]$ \tkzFct[color=blue,domain = 0.35:3]{-3/(x*x) +27/(4*(3*x-1))} \tkzFct[color=orange,domain = 0.35:3]{-3/(x*x) +8/(3*x-1)} \tkzFct[color=green,domain = 0.35:3]{-3/(x*x) +7/(3*x-1)} - \tkzText[draw,fill = white,text=Maroon](2,-2)% + \tkzText[draw,fill = white,text=brown](2,-2)% {$f(x)=-\dfrac{3}{x^2}+\dfrac{8\alpha}{3x-1}$ \hspace{.5cm}% avec $\alpha \in% \left\{\dfrac{1}{2}~;~\dfrac{27}{32}~;~\dfrac{7}{8}~;~1\right\}$} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex index c87045bbec..d5dd91cb0d 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex @@ -1,4 +1,4 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex + \section{Macros pour définir des surfaces } Il s'agit par exemple de représenter la partie du plan comprise entre la courbe représentative d'une fonction, l'axe des abscisses et les droites @@ -94,28 +94,28 @@ Cette macro permet de mettre en évidence une surface délimitée par les courbe \toprule options & défaut & explication \\ \midrule -\TOline{between} {a and b}{référence des deux courbes} +\TOline{between} {no default}{référence des deux courbes, obligatoire !} \TOline{domain= min:max}{domain=-5:5}{Les options sont celles de \TIKZ.} \TOline{opacity} {0.5}{transparence} \bottomrule \end{tabular} -\emph{L'option \tkzname{pattern} de \TIKZ\ peut être utile ! } +{L'option \tkzname{pattern} de \TIKZ\ peut être utile ! } \end{NewMacroBox} %<---------------------------------------------------------------------------> \subsection{Surface comprise entre deux courbes en couleur} Par défaut, la surface définie est comprise entre les deux premières courbes. -\begin{tkzexample}[vbox] + \begin{tikzpicture}[scale=1.5] \tkzInit[xmax=5,ymax=5] \tkzGrid \tkzAxeXY \tkzFct[domain = 0:5]{x} \tkzFct[domain = 1:5]{log(x)} - \tkzDrawAreafg[color = orange!50,domain = 1:5] + \tkzDrawAreafg[between=a and b,color = orange!50,domain = 1:5] \end{tikzpicture} -\end{tkzexample} + %<---------------------------------------------------------------------------> \newpage @@ -183,8 +183,8 @@ Ici aussi, attention à l'ordre des références dans l'option \tkzname{between} \tkzAxeXY \tkzFct[domain = -.5:4]{ 4*x-x**2+4/(x**2+1)**2} \tkzFct[domain = -.5:4]{x-1+4/(x**2+1)**2} - \tkzDrawAreafg[color=green,domain = 1:4] - \tkzDrawAreafg[pattern=north west lines,domain = -.5:1] + \tkzDrawAreafg[between=a and b,color=green,domain = 1:4] + \tkzDrawAreafg[between=a and b,pattern=north west lines,domain = -.5:1] \tkzRep \tkzText(2.5,4.5){$C_f$} \tkzText(2.5,1){$C_g$} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex index e4715c712f..1f3666c6e5 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex %<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> \section{Droites particulières} %<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> @@ -25,7 +24,7 @@ options & défaut & définition \\ \bottomrule \end{tabular} -\emph{voir les options les lignes dans \TIKZ} +{voir les options les lignes dans \TIKZ} \end{NewMacroBox} @@ -73,7 +72,7 @@ arguments & exemple & définition \\ \begin{tkzexample}[] \begin{tikzpicture} \tkzInit[xmin=-7,xmax=7,ymin=-1,ymax=1] - \tkzAxeY[gradsize=\scriptstyle] + \tkzAxeY[font=\small] \tkzAxeX[trig=2] \foreach\v in {-2,-1,1,2} {\tkzVLine[color=red]{\v*\FPpi}} @@ -148,7 +147,7 @@ arguments & exemple & définition \\ \tkzHLine[line width=1pt,color=red]{1} \tkzVLine[line width=1pt,color=blue]{2} \tkzDefPoint(1,1){A} - \tkzDrawPoint[fill=white,color=Maroon,size=10](A) + \tkzDrawPoint[fill=white,color=brown,size=6](A) \tkzDefPointByFct[draw,with=b]({1+exp(1)}) \tkzLabelPoint[above right](tkzPointResult){$(1+\text{e}~;~2)$} \tkzText[draw,color = black,fill = brown!20](6,6)% diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex index 4a2fe0a813..8f9a2de207 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex @@ -1,8 +1,6 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Exemples avec les packages \tkzname{alterqcm} et \tkzname{tkz-tab}} - -\shorthandoff{:} +%\shorthandoff{:} \begin{alterqcm}[lq=110mm] \AQmessage{ La figure 1. donne la représentation graphique d'une fonction $f$ définie sur $\mathbf{R}^+$ et la figure 2 celle d'une primitive de $f$ sur $\mathbf{R}^+$. diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex index 1cb39a3a79..1bfa45df41 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Utilisation de Gnuplot} %–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––> \subsection{Mécanisme d'interaction entre \TIKZ\ et \tkzname{Gnuplot}} @@ -6,8 +5,7 @@ \TEX\ est un système logiciel de composition de documents ( text processing programm ). Il permet bien sûr de calculer, mais avec des moyens limités. \TIKZ\ est ainsi limité par \TEX\ pour effectuer des calculs. Pour rappel ±16383.99999 pt est l'intervalle dans lequel \TEX\ stocke ses valeurs. Sachant que 1 cm est égal à 28.45274 pt, on s'aperçoit que \TEX\ ne peut traiter que des dimensions inférieures à 5,75 mètres environ. Bien sûr, cela paraît suffisant, mais malheureusement, pendant un enchaînement de calculs, il est assez facile de dépasser ces limites. -\bigskip - \tkzActivOff +\bigskip \newcommand{\drawpage}[4]{% \begin{scope}[xshift=#1, yshift=#2,font=\footnotesize] \filldraw[fill=white!75!#4,draw=#4, very thin]% @@ -20,62 +18,59 @@ Bien sûr, cela paraît suffisant, mais malheureusement, pendant un enchaînemen \begin{center} \begin{tikzpicture}[>=triangle 45,scale=.75] -\drawpage{0cm}{0cm}{\texttt\blue\begin{minipage}{2cm} +\drawpage{0cm}{0cm}{\texttt\tkzblue\begin{minipage}{2cm} sample.tex with \tkzcname{draw plot[id=fct] function{---.};} \end{minipage}}{blue} -\drawpage{12cm}{0cm}{\texttt \red sample.fct.gnuplot}{red} -\drawpage{12cm}{-14cm}{\texttt\red sample.fct.table}{red} -\drawpage{0cm}{-14cm}{\texttt\blue\begin{minipage}{2cm} -sample.pdf +\drawpage{12cm}{0cm}{\texttt \tkzred sample.fct.gnuplot}{red} +\drawpage{12cm}{-14cm}{\texttt\tkzred sample.fct.table}{red} +\drawpage{0cm}{-14cm}{\texttt\tkzblue\begin{minipage}{2cm} +sample.pdf -\bigskip -\shorthandoff{:} +\bigskip \begin{tikzpicture}[domain=-1.5:.8] - \draw plot[id=f1,samples=200] function{x*x}; + \draw plot[id=f1,samples=200] function{x*x}; \end{tikzpicture} -\end{minipage}}{blue} +\end{minipage}}{blue} -\path (8.05,2.9) node(A) +\path (8.05,2.9) node(A) [diamond,% draw,color = black, fill = red!60,% text = black,% minimum size = 3 cm,% - font = \normalsize] - {{\texttt \tikzname-\TEX}}; - \path (14.1,-4.08) node(B) + font = \normalsize] + {{\texttt \tikzname-\TEX}}; + \path (14.1,-4.08) node(B) [diamond,% draw,color=black,fill=green!60,% text = black,% minimum size = 3 cm,% - font = \normalsize] + font = \normalsize] {{\texttt gnuplot}}; - \path (8.05,-11.1) node(C) + \path (8.05,-11.1) node(C) [diamond,% draw,color = black, fill = red!60,% text = black,% minimum size = 3 cm,% - font = \normalsize] - {{\texttt \tikzname-\TEX}}; + font = \normalsize] + {{\texttt \tikzname-\TEX}}; \draw[->] (4.2,2.9) -- (A.west); \draw[->] (A.east) -- (12,2.9); - \draw[->] (14.1,0) -- (B.north); + \draw[->] (14.1,0) -- (B.north); \draw[->] (B.south) -- (14.1,-8.18); \draw[->] (12 ,-11.1)--(C.east); - \draw[->] (C.west)--(4.2,-11.1); + \draw[->] (C.west)--(4.2,-11.1); \draw[->,magenta] (4.2,2.9) to [ out =-80,in=260] node[below,pos=.5]{étape 1} (12,2.9); - \draw[->,magenta] (14.1,0) to [ out =200,in=160] node[left,pos=.5]{étape 2} (14.1,-8.18); - \draw[->,magenta] (12 ,-11.1) to [ out =110,in=70] node[above,pos=.5]{étape 3} (4.2,-11.1); + \draw[->,magenta] (14.1,0) to [ out =200,in=160] node[left,pos=.5]{étape 2} (14.1,-8.18); + \draw[->,magenta] (12 ,-11.1) to [ out =110,in=70] node[above,pos=.5]{étape 3} (4.2,-11.1); \end{tikzpicture} \end{center} -\newpage - Pour tracer des courbes en 2D en contournant ces problèmes, un moyen simple offert par \TIKZ, est d'utiliser \tkzname{gnuplot}. \tkzname{tkz-fct.sty} s'appuie sur le programme \tkzname{gnuplot} et le package \tkzname{fp.sty}. Le premier est utilisé pour obtenir une liste de points, et le second pour évaluer ponctuellement des valeurs. @@ -97,7 +92,6 @@ On part du fichier \tkzname{sample.tex} suivant : \end{tikzpicture} \end{document} \end{tkzltxexample} - \tkzActivOn La compilation de ce fichier créé avec \TIKZ, produit un fichier nommé \tkzname{sample.f1.gnuplot}. Le nom du fichier est obtenu à partir de \tkzcname{jobname} et de l'option \tkzname{id}. Ainsi un même fichier peut créer plusieurs fichiers distincts. C'est un fichier texte ordinaire, affecté de l'extension \tkzname{gnuplot}. Il contient un préambule indiquant à \tkzname{gnuplot} qu'il doit créer une table contenant les coordonnées d'un certain nombre de points obtenu par la fonction définie par $x\longrightarrow x^2$. Ce nombre de points est défini par l'option \tkzname{samples}. Cette étape ne présente aucune difficulté particulière. Le fichier obtenu peut être traité manuellement avec \tkzname{gnuplot}. Le résultat est le fichier suivant : @@ -125,7 +119,7 @@ Si \tkzname{gnuplot} trouve \tkzname{sample.f1.gnuplot} alors il produit un fich \end{tkzltxexample} -La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'incompatibilité entre \TIKZ\ et les versions récentes de \tkzname{gnuplot} (v>4.2). +La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'incompatibilité entre \TIKZ\ et les versions récentes de \tkzname{gnuplot} (v>4.2). J'espère qu'il en va de même pour les versions de \TIKZ\ > 3. \item \textcolor{red}{\textbf{Étape 3}} @@ -165,11 +159,11 @@ La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'inco Gnuplot est proposé avec la plupart des distributions Linux, et existe pour OS X ainsi que pour Windows. \begin{enumerate} - \item \tkzname{Ubuntu}\NameSys{Linux Ubuntu} ou un autre système Linux: on l'installe en suivant la procédure classique d'installation d'un nouveau paquetage. - \item \tkzname{Windows}\NameSys{Windows XP} Les utilisateurs de Windows doivent se méfier, après avoir téléchargé la bonne version et installé \tkzname{gnuplot} alors il faudra renommé wgnuplot en gnuplot. Ensuite il faudra modifier le \tkzname{path}. Si le chemin du programme est \shorthandoff{:}\tkzname{C:\textbackslash gnuplot} alors il faudra ajouter \tkzname{{C:}\textbackslash gnuplot\textbackslash bin\textbackslash}\shorthandon{:} aux variables environnement (Aller à "Poste de Travail" puis faire "propriétés", dans l'onglet "Avancé", cliquer sur "Variables d'environnement". ). + \item \NameSys{Linux Ubuntu} ou un autre système Linux: on l'installe en suivant la procédure classique d'installation d'un nouveau paquetage. + \item \NameSys{Windows XP} Les utilisateurs de Windows doivent se méfier, après avoir téléchargé la bonne version et installé \tkzname{gnuplot} alors il faudra renommé wgnuplot en gnuplot. Ensuite il faudra modifier le \tkzname{path}. Si le chemin du programme est \tkzname{C:\textbackslash gnuplot} alors il faudra ajouter \tkzname{{C:}\textbackslash gnuplot\textbackslash bin\textbackslash} aux variables environnement (Aller à "Poste de Travail" puis faire "propriétés", dans l'onglet "Avancé", cliquer sur "Variables d'environnement". ). Ensuite pour compiler sous latex, il faudra ajouter au script de compilation l'option \tkzname{--enable-write18 }. - \item \tkzname{OS X}\NameSys{OS X} C'est le système en version Snow Leopard qui pose le plus de problème, car il faut compiler les sources. - Si vous n'utilisez \tkzname{gnuplot} qu'en collaboration avec \TIKZ\ alors il vous suffit de compiler les sources ainsi : + \item \NameSys{OS X} L'installation n'est jamais simple sauf + si vous n'utilisez \tkzname{gnuplot} qu'en collaboration avec \TIKZ\ alors il vous suffit de compiler les sources ainsi : \begin{enumerate} @@ -178,7 +172,7 @@ Ensuite pour compiler sous latex, il faudra ajouter au script de compilation l'o Cela doit donner \begin{tkzltxexample}[] -$ cd /Users/ego/Desktop/gnuplot-4.4.2 +$ cd /Users/you/Desktop/gnuplot-4.4.2 \end{tkzltxexample} \item ensuite taper la ligne suivante et valider @@ -201,8 +195,7 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a \begin{tkzltxexample}[] -\documentclass{scrartcl} -\usepackage[usenames,dvipsnames]{xcolor} +\documentclass{standalone} \usepackage{tkz-fct} \begin{document} \begin{tikzpicture} @@ -213,9 +206,9 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a \end{document} \end{tkzltxexample} -\begin{tkzexample}[latex=8cm] +\begin{tkzexample}[latex=9cm] \begin{tikzpicture} - \tkzInit[xmin=-5,xmax=5,ymax=2] + \tkzInit[xmin=-3,xmax=3,ymax=2] \tkzGrid \tkzAxeXY \end{tikzpicture} @@ -226,8 +219,7 @@ Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler a Il suffit d'ajouter une ligne pour tracer la représentation graphique d'une fonction. \begin{tkzltxexample}[] -\documentclass{scrartcl} -\usepackage[usenames,dvipsnames]{xcolor} +\documentclass{standalone} \usepackage{tkz-fct} \begin{document} \begin{tikzpicture}[scale=1.25] diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex index 19e85867ad..ccdf5bcc5c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex @@ -1,4 +1,4 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex + \section{Quelques exemples} \subsection{Variante intermédiaire : \TIKZ\ + \tkzname{tkz-fct}} @@ -102,8 +102,11 @@ Les codes de \TIKZ\ et de \tkzname{tkz-fct} peuvent se compléter. Ainsi les axe \begin{tkzexample}[vbox] \begin{tikzpicture}[scale=.8] \tkzInit[xmin=5,xmax=40,ymin=0,ymax=350,xstep=2.5,ystep=25] - \tkzAxeX[label=$q$] - \tkzAxeY[label=$C(q)$] \tkzGrid + \tkzDrawX[label=$q$] + \tkzLabelX + \tkzDrawY[label=$C(q)$] + \tkzLabelY + \tkzGrid \tkzFct[domain=5:40]{0.1*\x**2+2*\x+60} \foreach \vv in {5,10,...,40}{% \tkzDefPointByFct(\vv) diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex index b711ddf021..0f48a56e8c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex @@ -1,4 +1,4 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex + \section{Les différentes macros} \tkzname{Gnuplot} détermine les points nécessaires pour tracer la courbe. Le nombre de points est fixé par l'option \tkzname{samples}; dans les premiers exemples la valeur du nombre de points est celle donnée par défaut. Ensuite Tikz va utiliser cette table pour tracer la courbe. C'est donc \tkzname{Tikz} qui trace la courbe. @@ -7,7 +7,7 @@ Cette première macro est la plus importante car elle permet de tracer la représentation graphique d'une fonction continue .\hypertarget{tfct}{} \begin{NewMacroBox}{tkzFct}{\oarg{local options}\var{gnuplot expression}} -\emph{La fonction est donnée en utilisant la syntaxe de gnuplot. x est la variable sauf si \tkzname{xstep} est différent de 1, dans ce cas la variable est \tkzcname{x}.} +{La fonction est donnée en utilisant la syntaxe de gnuplot. x est la variable sauf si \tkzname{xstep} est différent de 1, dans ce cas la variable est \tkzcname{x}.} \medskip \begin{tabular}{lll} @@ -18,7 +18,7 @@ Cette première macro est la plus importante car elle permet de tracer la repré \bottomrule \end{tabular} -\emph{L'expression est de la forme 2*x+1 ; 3*log(x) ; x*exp(x) ; x*x*x+x*x+x. } +{L'expression est de la forme 2*x+1 ; 3*log(x) ; x*exp(x) ; x*x*x+x*x+x. } Les options sont celles de \TIKZ. @@ -110,8 +110,6 @@ Attention, ici \tkzname{ystep=6} or \tkzname{gnuplot} donne $80\div=13$. il fau \begin{tkzexample}[vbox] \begin{tikzpicture}[scale=0.4] \tkzInit[xmax=30,ymax=90,ystep=6] - \tkzAxeX[nograd,noticks,poslabel=right,label=$t$] - \tkzAxeY[nograd,noticks,poslabel=above,label=$P$] \tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0} \tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))} \tkzText[above,color=red](20,80){$P=80$} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex index fda81f58f3..531287c400 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex @@ -1,5 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex - \section{Utilisation \tkzname{pgfmath} et de \tkzname{fp.sty} } %---------------------------------------------------------------------------> \subsection{\tkzname{pgfmath}} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex index f835fd4776..a33f5b995d 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex @@ -1,171 +1,8 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex +\section{Installation de \tkzNamePack{tkz-fct}} + \tkzname{tkz-fct} est présent sur le serveur du \tkzname{CTAN} et fait partie de \NameDist{TeXLive} donc il est bientôt possible de l'installer avec \tkzname{tlmgr}. Ce package fait aussi partie de \NameDist{MikTeX} sous \NameSys{Windows}. -\section{Installation de \tkzname{tkz-fct}} -Il est possible que lorsque vous lirez ce document, \tkzname{tkz-fct} soit présent sur le serveur du \tkzname{CTAN}\footnote{\tkzname{tkz-fct} ne fait pas encore partie de \tkzname{TeXLive} mais il sera bientôt possible de l'installer avec \emph{tlmgr}}. Si \tkzname{tkz-fct} ne fait pas encore partie de votre distribution, cette section vous montre comment l'installer, elle est aussi nécessaire, si vous avez envie d'installer une version plus récente ou personnalisée de \tkzname{tkz-fct}. \emph{Attention, la présence dans mon dossier texmf, des fichiers de \PGF, s'explique par l'utilisation occasionnelle de la version CVS de \PGF}. + Vérifier que \tkzname{TikZ 3..}\index{TikZ@TikZ} est installé car c'est la version minimum pour le bon fonctionnement de \tkzname{tkz-fct}. \tkzNamePack{tkz-base} doit aussi être installé, de même le binaire « gnuplot» doit être installé sur votre ordinateur. \tkzNamePack{fp.sty} est intensément utilisé mais il est présent dans toutes les distributions. -\subsection{Avec TeXLive sous OS X, Linux et Windows}\NameDist{TeXLive} -Créer un dossier \tikz[remember picture,baseline=(n1.base)]\node [fill=blue!30,draw] (n1) {tkz}; avec comme chemin : \textcolor{red!60}{ texmf/tex/latex/tkz}. Le nom « tkz » n'est pas une obligation, tout autre nom est possible. - -\tikz[baseline=(t.base)]\node [fill=blue!30,draw] (t) {texmf}; est un dossier personnel, voici les chemins de ce dossier sur mes deux ordinateurs: - -\medskip -\begin{itemize}\setlength{\itemsep}{5pt} -\item sous OS X \colorbox{blue!30}{\textbf{/Users/ego/Library/texmf}}; -\item sous Ubuntu \colorbox{blue!30}{\textbf{/home/ego/texmf}}. -\end{itemize} - -\medskip -\begin{enumerate} -\item - - Placez le fichier \tikz[remember picture,baseline=(n2.base)]\node [fill=blue!20,draw] (n2) {tkz-fct.sty}; - dans le dossier \tikz[baseline=(p.base)]\node [fill=blue!20,draw] (p) {tkz};. - - - -\medskip -\begin{tikzpicture} [remember picture,rotate=90] - -\node (texmf) at (4,2) [draw,fill=blue!30 ] {texmf}; - -\node (tex) at (6,0) [draw ] {tex}; -\node (doc) at (2,0) [draw ] {doc}; - -\node (texgen) at (7,-2) [draw ] {generic}; -\node (docgen) at (0,-2) [draw ] {generic}; - -\node (latex) at (4,-2) [draw ] {latex}; - -\node (genpgf) at (7,-4) [draw] {pgf}; -\node (latpgf) at (5,-4) [draw] {pgf}; -\node (tkz) at (4,-4) [draw,fill=blue!20 ] {tkz}; - -\node (docpgf) at (0,-4) [draw] {pgf}; - -\node (fct) at (6,-6) [draw,fill=orange!20] {tkz-fct.sty}; -\node (tkb) at (4,-6) [draw,fill=blue!20] {tkzbase}; -\node (tke) at (2,-6) [draw,fill=blue!20] {tkzeuclide}; - -\node (tari) at (9,-11) [draw,fill=green!20] {tkz-tools-arith.tex}; -\node (tuti) at (8,-11) [draw,fill=green!20] {tkz-tools-utilities.tex}; -\node (tmisc) at (7,-11) [draw,fill=green!20] {tkz-tools-misc.tex}; -\node (tmath) at (6,-11) [draw,fill=green!20] {tkz-tools-math.tex}; -\node (tbas) at (5,-11) [draw,fill=green!20] {tkz-tools-base.tex}; -\node (base) at (4,-11) [draw,fill=green!20] {tkz-base.sty}; -\node (cfg) at (3,-11) [draw,fill=red!20] {tkz-base.cfg}; -\node (mark) at (2,-11) [draw,fill=red!20] {tkz-obj-marks.tex}; -\node (pts) at (1,-11) [draw,fill=red!20] {tkz-obj-points.tex}; -\node (seg) at (0,-11) [draw,fill=red!20] {tkz-obj-segments.tex}; - - - -\draw[-open triangle 90](texmf.north east) --(tex.south west) ; -\draw[-open triangle 90](texmf.south east) -- (doc.north west) ; - -\draw[-open triangle 90](tex.north east) --(texgen.south west) ; -\draw[-open triangle 90](tex.south east) -- (latex.north west) ; -\draw[-open triangle 90](texgen.east) -- (genpgf.west) ; - -\draw[-open triangle 90](doc.south east) -- (docgen.north west) ; -\draw[-open triangle 90](docgen.east) -- (docpgf.west) ; - -\draw[-open triangle 90](latex.north east) -- (latpgf.south west) ; -\draw[-open triangle 90](latex.east) -- (tkz.west) ; - -\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](fct.west) ; -\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tkb.west) ; -\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tke.west) ; - -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tari.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tuti.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmisc.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmath.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tbas.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](base.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](cfg.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](mark.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](pts.west) ; -\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](seg.west) ; - -\end{tikzpicture} - -\begin{tikzpicture}[remember picture,overlay] - \path[->,thin,red!50,>=latex] (n1) edge [bend left] (tkz); - \path[->,thin,red!50,>=latex] (n2) edge [bend left] (fct); -\end{tikzpicture} - -\vfill -\newpage -\item Ouvrir un terminal, puis faire \tkzname{sudo texhash} si nécessaire. -\item Vérifier que \tkzname{Ti\emph{k}Z 2.10}\index{TikZ@Ti\emph{k}Z} est installé car c'est la version minimum pour le bon fonctionnement de \tkzname{tkz-fct}. \tkzname{tkz-base} doit aussi être installé, de même le binaire « gnuplot» doit être installé sur votre ordinateur. \tkzname{fp.sty} est intensément utilisé mais il est présent dans toutes les distributions. -\end{enumerate} - - -\subsection{Avec MikTeX sous Windows XP}\NameDist{MikTeX}\NameSys{Windows XP} - -Je ne connais pas grand-chose à ce système mais un utilisateur de mes packages \textbf{Wolfgang Buechel} a eu la gentillesse de me faire parvenir ce qui suit~: - -Pour ajouter \tkzname{tkz-fct.sty} à MiKTeX\footnote{Essai réalisé avec la version \tkzname{2.7}}: - -\begin{itemize}\setlength{\itemsep}{10pt} - \item ajouter un dossier \tkzname{tkz} dans le dossier - \textcolor{red}{\texttt{[MiKTeX-dir]/tex/latex}} - \item copier \tkzname{tkz-fct.sty} et tous les packages nécessaires à son fonctionnement dans le dossier \tkzname{tkz}, - \item mettre à jour MiKTeX, pour cela dans shell DOS lancer la commande \textbf{\textcolor{red}{|mktexlsr -u|}} - - ou bien encore, choisir \textcolor{red}{|Start/Programs/Miktex/Settings/General|} - - puis appuyer sur le bouton \textbf{\textcolor{red}{|Refresh FNDB|}}. -\end{itemize} - -\subsection{Résumé de l'installation} - -Pour résumer, \tkzname{Ti\emph{k}Z 2.10} est nécessaire, ensuite soit \tkzname{tkz-fct} est dans votre distribution et le seul problème est l'installation de \tkzname{gnuplot}; soit il n'est pas dans votre distribution et dans ce cas, il suffit de créer un dossier qui le contiendra ainsi que \tkzname{tkz-base} et les fichiers qui l'accompagnent. - -Au moment où j'écris ces lignes les fichiers nécessaires pour utiliser \tkzname{tkz-fct} sont~: - -\vspace*{8pt} -\begin{itemize} - - \item \tkzname{tkz-fct.sty} un fichier - -\vspace*{20pt} - \item \tkzname{tkz-base} dossier nécessaire qui comprend~: - - \vspace*{8pt} - \begin{itemize} - \item \tkzname{tkz-base.sty} fichier principal - \item \tkzname{tkz-base.cfg} fichier de configuration - \item \tkzname{tkz-tools-base.tex} - \item \tkzname{tkz-tools-arith.tex} - \item \tkzname{tkz-tools-misc.tex} - \item \tkzname{tkz-tools-utilities.tex} - \item \tkzname{tkz-obj-points.tex} - \item \tkzname{tkz-obj-segments.tex} - \item \tkzname{tkz-obj-marks.tex} - \end{itemize} - -\vspace*{20pt} - \item \tkzname{tkz-euclide} dossier qui comprend~: - - \vspace*{8pt} - \begin{itemize} - \item \tkzname{tkz-euclide.sty} fichier principal - \item \tkzname{tkz-tools-intersections.tex} - \item \tkzname{tkz-tools-math.tex} - \item \tkzname{tkz-tools-transformations.tex} - \item \tkzname{tkz-lib-symbols.tex} ajoute des formes nouvelles - \item \tkzname{tkz-obj-lines.tex} - \item \tkzname{tkz-obj-addpoints.tex} compléments sur les points - \item \tkzname{tkz-obj-circles.tex} - \item \tkzname{tkz-obj-arcs.tex} - \item \tkzname{tkz-obj-angles.tex} - \item \tkzname{tkz-obj-polygons.tex} - \item \tkzname{tkz-obj-sectors.tex} - \item \tkzname{tkz-obj-protractor.tex} -\end{itemize} - -\end{itemize} \endinput diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex index fc0925ffd4..52a46a3555 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Labels} Ce qui est souhaitable, c'est de pouvoir nommer les courbes. Prenons comme exemple, la fonction $f$ définie par : diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex index 7e6f2870a8..1293a8885d 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex @@ -1,17 +1,8 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% tkz-fct.sty encodage : utf8 % -% % -% % -% Créé par Alain Matthes le 30/09/2010 % -% Copyright (c) 2009 __Collège Sévigné__ All rights reserved. % -% documentation version : 1.0 % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Fichier .tex de présentation du package tkz-fonction.sty - +% !TEX TS-program = lualatex % encoding : utf8 -% documentation of tkz-fct.sty -% Copyright (C) 2010 Alain Matthes +% doc de tkz-euclide.sty +% Created by Alain Matthes on 2020-01-02. +% Copyright (C) 2020 Alain Matthes % % This file may be distributed and/or modified % @@ -20,126 +11,120 @@ % 2. under the GNU Public License. % % See the file doc/generic/pgf/licenses/LICENSE for more details.% -% See http://www.latex-project.org/lppl.txt for details. - -% ``TKZdoc-fct-main '' is the french documentation of tkz-fct - -\documentclass[DIV=12,fontsize=10,headinclude=false,index=totoc,footinclude=false,headings=small]{tkz-doc} -\usepackage{svn-multi} -\usepackage{tkz-tab,tkz-fct,alterqcm} -\usepackage{tkz-euclide} -\usetkzobj{all} -\tkzSetUpColors[background=fondpaille,text=Maroon] -\def\tkzTabDefaultWritingColor{Maroon} -\def\tkzTabDefaultBackgroundColor{fondpaille} -\usepackage{rotating,fancyvrb} -\usepackage[frenchb]{babel} -\usepackage[autolanguage]{numprint} -\usepackage[pdftex, - unicode, - pdfpagelabels, - colorlinks = true, - urlcolor = blue, - filecolor = pdffilecolor, - linkcolor = blue, - breaklinks = false, - hyperfootnotes = false, - bookmarks = true, - bookmarksopen = true, - linktocpage = true, - pdfsubject = {2d function}, - pdfauthor = {Alain Matthes}, - pdftitle = {tkz-fct}, - pdfkeywords = {fct}, - pdfcreator = {LaTeX}]{hyperref} -\usepackage{url} -\def\UrlFont{\small\ttfamily} -\usepackage{microtype} - -\DisableLigatures{encoding = T1, - family = tt*} -\usepackage[parfill]{parskip} - -\gdef\nameofpack{tkz-fct} -\gdef\versionofpack{1.16 c} -\gdef\dateofpack{2011/06/01} -\gdef\nameofdoc{doc-tkz-fct} -\gdef\versionofdoc{1.16} -\gdef\dateofdoc{2011/06/01} -\gdef\authorofpack{Alain Matthes} -\gdef\adressofauthor{} -\gdef\namecollection{AlterMundus} -\gdef\urlauthor{http://altermundus.fr} -\gdef\urlauthorcom{http://altermundus.com} -\title{The package : tkz-fct.sty} -\author{Alain Matthes} - -\usepackage{shortvrb,ipa} -\makeatletter -\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4em}} -\makeatother -\AtBeginDocument{\MakeShortVerb{\|}} - -\pdfcompresslevel=9 - -\pdfinfo{% -/Title (doc_tkzFct.pdf) -/Creator (TeX) -/Producer (pdfeTeX) -/Author (Alain Matthes) -/CreationDate (\dateofpack) -/Subject (Documentation du package \nameofpack) -/Keywords (tikz, pgf, pdfeTeX, graphiques, fonctions, points, maths, pdflatex, droites)% +% See http://www.latex-project.org/lppl.txt for details. + +% TKZdoc-euclide-main is the french doc of tkz-euclide +\documentclass[DIV = 14, + fontsize = 10, + headinclude = false, + index = totoc, + footinclude = false, + twoside, + headings = small + ]{tkz-doc} +\usepackage{etoc} +\gdef\tkznameofpack{tkz-fct} +\gdef\tkzversionofpack{1.2c} +\gdef\tkzdateofpack{2020/02/03} +\gdef\tkznameofdoc{doc-tkz-fc} +\gdef\tkzversionofdoc{1.2c} +\gdef\tkzdateofdoc{2020/02/03} +\gdef\tkzauthorofpack{Alain Matthes} +\gdef\tkzadressofauthor{} +\gdef\tkznamecollection{AlterMundus} +\gdef\tkzurlauthor{} +\gdef\tkzengine{lualatex} +\gdef\tkzurlauthorcom{http://altermundus.fr} +% -- Packages --------------------------------------------------- +\usepackage[dvipsnames,svgnames]{xcolor} +\usepackage{calc} +\usepackage{tkz-euclide,tkz-fct,alterqcm,tkz-tab} +\usetikzlibrary{babel} +\usetikzlibrary[shapes.geometric] +\usepackage[colorlinks]{hyperref} +\hypersetup{ + linkcolor=BrickRed, + citecolor=Green, + filecolor=Mulberry, + urlcolor=NavyBlue, + menucolor=BrickRed, + runcolor=Mulberry, + linkbordercolor=BrickRed, + citebordercolor=Green, + filebordercolor=Mulberry, + urlbordercolor=NavyBlue, + menubordercolor=BrickRed, + runbordercolor=Mulberry, + pdfsubject={2d function}, + pdfauthor={\tkzauthorofpack}, + pdftitle={\tkznameofpack}, + pdfcreator={\tkzengine} } - - -\newcommand*{\E}{\ensuremath{\mathrm{e}}} -\usepackage{tkzexample} +\usepackage{tkzexample} +\usepackage{mathtools} +\usepackage{unicode-math} +\usepackage{fourier-otf} +\setmainfont[Ligatures=TeX]{TeX Gyre Pagella} +\setmathfont{TeX Gyre Pagella Math} +\usepackage{datetime,multicol} +\usepackage[french]{babel} +\usepackage[autolanguage]{numprint} +\usepackage{microtype} +\usepackage{rotating,ipa} +\usepackage{array,multirow,multido,booktabs} +\usepackage{shortvrb,fancyvrb} +\renewcommand{\labelitemi}{\lefthand} +\AtBeginDocument{\MakeShortVerb{\|}} % link to shortvrb +\pdfcompresslevel=9 +\setlength\parindent{0pt} +\RequirePackage{makeidx} +%\def\tkzFileSavedPrefix{tkzFct} +\makeindex +% \def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}} +% \renewenvironment{tkzexample}[1][]{% +% \tkz@killienc \VerbatimOut{tkzfct-\tkzref.tex}% +% }{% +% \endVerbatimOut +% } % \usepackage[saved]{tkzexample} -% \def\tkzFileSavedPrefix{tkzFct} +%<---------------------------------------------------------------------------> \begin{document} - -%<--------------------- Première page présentation ------------------------–> -\title{\nameofpack} + +\parindent=0pt +\author{\tkzauthorofpack} +\title{\tkznameofpack} \date{\today} \clearpage \thispagestyle{empty} -\maketitle +\maketitle \clearpage -\pagecolor{fondpaille} -\color{Maroon} +\tkzSetUpColors[background=white,text=darkgray] -\nameoffile{\nameofpack} +\let\rmfamily\ttfamily +\nameoffile{\tkznameofpack} -\defoffile{\textbf{tkz-fct.sty} est un package pour créer à l'aide de \TIKZ, des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Ce package existait déjà , et était disponible sur mon site internet. La version « officielle » a pour premier numéro de version 1.13 c (c pour \tkzname{CTAN}); de plus, la syntaxe a évolué et certaines macros ont commencé une mutation qui permettra de rendre l'ensemble de mes packages plus homogène. Ce package nécessite la version 2.1 de \TIKZ.} + \defoffile{\tkzname{\tkznameofpack} est un package pour créer à l'aide de \TIKZ\ , des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques. Ce package nécessite la version 3.x de \TIKZ et une version 3 de tkz-base.} \presentation -\vspace*{24pt} -\noindent\lefthand\ Je souhaite remercier \tkzimp{Till Tantau} pour avoir créé le merveilleux outil \tkzname{\TIKZ}, ainsi que \tkzimp{Michel Bovani} pour \tkzname{fourier}, dont l'association avec \tkzname{utopia} est excellente. +\vspace*{24pt} +\noindent\lefthand\ Je souhaite remercier \tkzimp{Till Tantau} pour avoir créé le merveilleux outil \TIKZ\ . + - \vspace*{12pt} -\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques. +\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques . \vspace*{12pt} -\noindent\lefthand\ Vous trouverez de nombreux exemples sur mes sites~: -\href{http://altermundus.com/pages/download.html}{altermundus.com} ou -\href{http://altermundus.fr/pages/download.html}{altermundus.fr} +\noindent\lefthand\ Vous trouverez de nombreux exemples sur mon site~: +\href{http://altermundus.fr/}{altermundus.fr} -\vfill +\vfill Vous pouvez envoyer vos remarques, et les rapports sur des erreurs que vous aurez constatées à l'adresse suivante~: \href{mailto:al.ma@mac.com}{\textcolor{blue}{Alain Matthes}}. - -This file can be redistributed and/or modified under the terms of the LATEX + +This file can be redistributed and/or modified under the terms of the LATEX Project Public License Distributed from CTAN archives. -\vspace{1cm} -\begin{center} - \begin{tikzpicture}[decoration=snake,color=Peach,line width=1pt] - \draw[decorate] (0,0)--(\textwidth-1cm,0); - \end{tikzpicture} -\end{center} \clearpage \tableofcontents @@ -147,9 +132,9 @@ Project Public License Distributed from CTAN archives. \clearpage \newpage -\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex} -%<---------------------------- the files ------------------------------------> - + \setlength{\parskip}{1ex plus 0.5ex minus 0.2ex} +% %<---------------------------- the files ------------------------------------> +% \include{TKZdoc-fct-why} \include{TKZdoc-fct-installation} \include{TKZdoc-fct-compilation} @@ -158,7 +143,7 @@ Project Public License Distributed from CTAN archives. \include{TKZdoc-fct-label} \include{TKZdoc-fct-tangent} \include{TKZdoc-fct-area} -\include{TKZdoc-fct-riemann} +\include{TKZdoc-fct-riemann} \include{TKZdoc-fct-asymptote} \include{TKZdoc-fct-param} \include{TKZdoc-fct-polar} @@ -170,8 +155,9 @@ Project Public License Distributed from CTAN archives. \include{TKZdoc-fct-fppgf} \include{TKZdoc-fct-faq} \include{TKZdoc-fct-liste} -%<---------------------------------------------------------------------------> - +% %<---------------------------------------------------------------------------> \clearpage\newpage -\printindex +\begin{multicols}{2} +\small\printindex +\end{multicols} \end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex index a99cf86365..102ff07534 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex @@ -1,8 +1,7 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Courbes avec équations paramétrées} \hypertarget{tfpa}{} \begin{NewMacroBox}{tkzFctPar}{\oarg{local options}\marg{$x(t)$}\marg{$y(t)$}} - \emph{$x(t)$ et $y(t)$ sont des expressions utilisant la syntaxe de \tkzname{gnuplot}. La variable est $t$.} + {$x(t)$ et $y(t)$ sont des expressions utilisant la syntaxe de \tkzname{gnuplot}. La variable est $t$.} \medskip \begin{tabular}{lll} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex index cd9ca26441..9368e72ebd 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex @@ -3,7 +3,7 @@ \section{Placer un point sur une courbe} \hypertarget{tptfct}{} \begin{NewMacroBox}{tkzDefPointByFct}{\parg{$decimal number$}} -\emph{Cette macro permet de calculer l'image par la fonction définie précédemment, d'un nombre décimal.} +{Cette macro permet de calculer l'image par la fonction définie précédemment, d'un nombre décimal.} \medskip \begin{tabular}{lll} @@ -23,7 +23,7 @@ \bottomrule \end{tabular} -\emph{C'est donc la dernière fonction définie qui est utilisée. Si une autre fonction, est utilisée alors il faut utiliser l'ancienne macro \tkzcname{tkzFctPt}. Le point est défini sous un nom générique \tkzname{tkzPointResult} mais non tracé. Afin de le tracer il faut utiliser la macro \tkzcname{tkzDrawPoint}.} +{C'est donc la dernière fonction définie qui est utilisée. Si une autre fonction, est utilisée alors il faut utiliser l'ancienne macro \tkzcname{tkzFctPt}. Le point est défini sous un nom générique \tkzname{tkzPointResult} mais non tracé. Afin de le tracer il faut utiliser la macro \tkzcname{tkzDrawPoint}.} \end{NewMacroBox} \subsection{Exemple avec \tkzcname{tkzGetPoint}} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex index 9b23cc5728..907df34ad0 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex @@ -1,9 +1,8 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Courbes en coordonnées polaires} \hypertarget{tfpo}{} \begin{NewMacroBox}{tkzFctPolar}{\oarg{local options}\marg{$f(t)$}} - \emph{$f(t)$ est une expression utilisant la syntaxe de \tkzname{gnuplot}. } + {$f(t)$ est une expression utilisant la syntaxe de \tkzname{gnuplot}. } \medskip \begin{tabular}{lll} @@ -30,7 +29,7 @@ options & défaut & définition \\ \end{tabular} \medskip -\emph{ \tkzname{gnuplot} définit $\pi$ avec \tkzname{pi} et \tkzname{fp.sty} avec \tkzcname{FPpi}. Les valeurs qui déterminent le domaine sont évaluées par \tkzname{fp.sty}. Il est possible d'utiliser soit \tkzname{pi}, soit \tkzcname{FPpi}.} +{ \tkzname{gnuplot} définit $\pi$ avec \tkzname{pi} et \tkzname{fp.sty} avec \tkzcname{FPpi}. Les valeurs qui déterminent le domaine sont évaluées par \tkzname{fp.sty}. Il est possible d'utiliser soit \tkzname{pi}, soit \tkzcname{FPpi}.} \end{NewMacroBox} \subsection{Équation polaire exemple 1} diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex index 718914699c..8f8bdca471 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Symboles} Certains ajoutent aux courbes des symboles afin de donner des indications supplémentaires au lecteur. Voici quelques exemples possibles~: diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex index c2a9c698dd..c1e57ecd2a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Macros pour tracer des tangentes } Si une seule fonction est utilisée, elle est stockée avec comme nom @@ -11,7 +10,7 @@ Dans les autres cas si AT est la longueur de la demi-tangente et si $p$ est la p \subsection{Représentation d'une tangente \tkzcname{tkzDrawTangentLine}} \hypertarget{tdtl}{} \begin{NewMacroBox}{tkzDrawTangentLine}{\oarg{local options}\parg{a}} -\emph{On l'emploie soit juste après l'utilisation de \tkzcname{tkzFct}, sinon il faut donner la référence de la fonction à l'aide de l'option \tkzname{with}.} +{On l'emploie soit juste après l'utilisation de \tkzcname{tkzFct}, sinon il faut donner la référence de la fonction à l'aide de l'option \tkzname{with}.} \medskip \begin{tabular}{lll} @@ -44,7 +43,7 @@ options & défaut & définition \\ \tkzAxeXY \tkzFct[color=red,samples=100,domain = 0:800]% {(1./90000)*\x*\x*\x-(1./100)*\x*\x+(113./36)*\x} - \tkzDrawTangentLine[draw,color=blue,kr=300,kl=450,coord](450) + \tkzDrawTangentLine[draw,color=blue,kr=300,kl=450](450) \tkzText[draw,color = black,fill = brown!50,opacity = 0.8](300,1200)% {$f(x)=\dfrac{1}{90000}x^3 -\dfrac{1}{{100}}x^2 +\dfrac{113}{36}x$} \end{tikzpicture} @@ -160,7 +159,7 @@ Ici, on ne veut que les demi-tangentes comprises entre 0 et 1, pour cela il suff \tkzGrid(0,0)(1,1) \tkzAxeXY \tkzFct[color = red,thick, domain =0:1]{(exp(\x)-1)/(exp(1)-1)} - \tkzSetUpPoint[size=12] + \tkzSetUpPoint[size=6] \tkzDrawTangentLine[draw, kl = 0, kr = 0.4](0) \tkzDrawTangentLine[draw, kl = 0.4,kr = 0 ](1) \tkzText[draw,color = red,fill = orange!20](0.5,0.6)% diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex index 131d1b8b89..6e30744de2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex +++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex @@ -1,4 +1,3 @@ -%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex \section{Fonctionnement} \TIKZ\ apporte différentes possibilités pour obtenir les représentations graphiques des fonctions. J'ai privilégié l'utilisation de \tkzname{gnuplot}, car je trouve \tkzname{pgfmath} trop lent et les résultats trop imprécis. @@ -28,19 +27,15 @@ Les valeurs de $f(x)$ sont comprises entre 0 et $\numprint{1000000}$. En choisis Les valeurs du domaine seront comprises entre $0$ et $10$, mais l'expression donnée à \tkzname{gnuplot}, comportera des \tkzcname{x} équivalents à $x \times 10$, enfin, la valeur finale sera divisée par \tkzname{ystep=100000}. Les valeurs de $f(x)$ resteront ainsi comprises entre $0$ et $10$. \begin{tkzexample}[latex=10cm,small] -\begin{tikzpicture}[scale=.5] - \tkzInit[xmax=100,xstep=10, - ymax=1000000, +\begin{tikzpicture} + \tkzInit[xmax=80,xstep=10, + ymax=800000, ystep=100000] - \tkzAxeX[right] - \tkzAxeY[above] + \tkzAxeXY \tkzGrid \tkzFct[color=red, - domain=0:100]{\x**3} + domain=0:80]{\x**3} \end{tikzpicture} \end{tkzexample} - - - \endinput diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist b/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist deleted file mode 100644 index 935392d700..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/fct.ist +++ /dev/null @@ -1,6 +0,0 @@ -heading_prefix "{\\bfseries\\hfil " -heading_suffix "\\hfil}\\nopagebreak\n" -headings_flag 1 -delim_0 "\\dotfill" -delim_1 "\\dotfill" -delim_2 "\\dotfill" diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex b/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex deleted file mode 100644 index 4b387a6021..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/doc/readme.tex +++ /dev/null @@ -1,16 +0,0 @@ -How to compile the sources - -All these files are in utf8. - -You only need to run - -$ pdflatex TKZdoc-fct-main.tex - -If you want the same index of my documentation -$ cd path-to-the-sources -$ pdflatex TKZdoc-fct-main.tex -$ makeindex -s fct.ist TKZdoc-fct-main.idx -$ pdflatex TKZdoc-fct-main.tex - - -The end
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf Binary files differdeleted file mode 100644 index 822de996e7..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/doc/tkz-fct-screen.pdf +++ /dev/null diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/Makefile b/macros/latex/contrib/tkz/tkz-fct/examples/Makefile deleted file mode 100644 index e6d2c02491..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: doc - -doc: - for datei in $$(ls *tex | cut -d \. -f 1) ; do make $$datei.pdf ; done - -%.pdf: %.tex - pdflatex --shell-escape $*.tex
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt b/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt deleted file mode 100644 index 2d9faf5e37..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/info_fct_tex.txt +++ /dev/null @@ -1,18 +0,0 @@ -2011/01/25 - -This archive contains all the examples of the documentation about tkz-fct. - -You need to compile a file with pdflatex or pfdtex to have in the same directory the file tkzpreamble.ltx. This file in in the archive. - -You can also find a Makefile in the archive. The way to use the Makefile is : - -$ cd <path of the archive> -$ make - -Best regards - -Alain Matthes - - - -
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx b/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx new file mode 100644 index 0000000000..a281c5fee7 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/preamble-standalone.ltx @@ -0,0 +1,6 @@ +\documentclass{standalone} +\usepackage{tkz-euclide,tkz-fct,tkz-tab,alterqcm} + + + + diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex new file mode 100644 index 0000000000..8885200411 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-01-0-0.tex @@ -0,0 +1,16 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 1 (Section 1 : Fonctionnement) + +\begin{tikzpicture} + \tkzInit[xmax=80,xstep=10, + ymax=800000, + ystep=100000] + \tkzAxeXY + \tkzGrid + \tkzFct[color=red, + domain=0:80]{\x**3} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex new file mode 100644 index 0000000000..77080faf3b --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-3-0.tex @@ -0,0 +1,12 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 2 (Section 3.3 : Test de l'installation de tkz-base) + + \begin{tikzpicture} + \tkzInit[xmin=-3,xmax=3,ymax=2] + \tkzGrid + \tkzAxeXY + \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex new file mode 100644 index 0000000000..29df04f010 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-03-4-0.tex @@ -0,0 +1,13 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 3 (Section 3.4 : Test de l'installation de tkz-fct) + +\begin{tikzpicture}[scale=1.25] + \tkzInit[xmin=-5,xmax=5,ymax=2] + \tkzGrid + \tkzAxeXY + \tkzFct[color=red]{2*x**2/(x**2+1)} +\end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex index 4abbf769d1..f7743863d3 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 4 (Section 4.2 : option : \tkzname{samples}) + \begin{tikzpicture}[scale=1] \tkzInit[xmax=5,ymax=2] \tkzGrid[sub] @@ -14,4 +10,4 @@ \tkzFct[samples=400,domain=.5:5]{1/x} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex index 286fb61a4e..d922a48ce1 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 5 (Section 4.3 : options : \tkzname{xstep, ystep}) + \begin{tikzpicture} \tkzInit[xmax= 110,xstep=10, ymax=6,ystep=1] @@ -16,4 +12,4 @@ \tkzFct[domain = 0.1:100 ]{50/\x} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex index 3b084dc581..1b5e701e64 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 6 (Section 4.4 : Modification de \tkzname{xstep} et \tkzname{ystep}) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmax=700,xstep=100,ymax=1200,ystep=400] \tkzGrid(0,0)(700,1200) \tkzAxeXY @@ -14,4 +10,4 @@ {(1./90000)*\x*\x*\x-(1./100)*\x*\x+(113./36)*\x} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex index 97586988b9..415d051f1a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-5-0.tex @@ -1,19 +1,13 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 7 (Section 4.5 : \tkzname{ystep} et les fonctions constantes) + \begin{tikzpicture}[scale=0.4] \tkzInit[xmax=30,ymax=90,ystep=6] - \tkzAxeX[nograd,noticks,poslabel=right,label=$t$] - \tkzAxeY[nograd,noticks,poslabel=above,label=$P$] \tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0} \tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))} \tkzText[above,color=red](20,80){$P=80$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex index 40aff17570..09d5950464 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-6-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 8 (Section 4.6 : Les fonctions affines ou linéaires) + \begin{tikzpicture}[] \tkzInit[ymax=20,ystep=5] \tkzAxeXY @@ -16,4 +12,4 @@ \tkzFct[color=purple,domain=0:10,samples=2]{7.}%7.0/5 =1.2 \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex index 5c559cc799..7189000a8a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-7-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 9 (Section 4.7 : Sous-grille) + \begin{tikzpicture} \tkzInit[xmin=4,xmax=18,xstep=2, ymin=20,ymax=90,ystep=10] @@ -20,4 +16,4 @@ color=brown](6,60)(12,90) \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex new file mode 100644 index 0000000000..19fff86960 --- /dev/null +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-04-8-0.tex @@ -0,0 +1,15 @@ +\input{preamble-standalone.ltx} +\begin{document} + +% Ex. No. 10 (Section 4.8 : Utilisation des macros de \tkzname{tkz-base}) + + \begin{tikzpicture}[scale=2] + \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=3] + \tkzGrid[sub,subxstep=.5,subystep=.5] + \tkzAxeXY + \tkzFct[domain = -3:2]{(2-x)*exp(x)} + \tkzText(-2,1.25){$\mathcal{C}_{f}$} + \tkzDefPoint(2,0){A} \tkzDrawPoint(A) \tkzLabelPoints(A) + \end{tikzpicture} + +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex index ca159081f8..4eba5d8089 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-1-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 11 (Section 5.1 : Exemple avec \tkzcname{tkzGetPoint}) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-2,xmax=2,xstep=1, ymin=-8,ymax=24,ystep=8] @@ -16,4 +12,4 @@ \tkzLabelPoint[above right](A){$A_0$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex index 979a701756..09402c8363 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 12 (Section 5.2 : Exemple avec \tkzcname{tkzGetPoint} et \tkzname{tkzPointResult}) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-2,xmax=2,xstep=1, ymin=-8,ymax=24,ystep=8] @@ -18,4 +14,4 @@ % ou bien \tkzDefPointByFct[draw](.5) \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex index 8dd2cf9127..3164cac52f 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 13 (Section 5.3 : Options \tkzname{draw} et \tkzname{ref}) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-2,xmax=2,xstep=1, ymin=-8,ymax=24,ystep=8] @@ -17,4 +13,4 @@ \tkzLabelPoint[above right](A){$a$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex index fec5273be5..45c7c08d12 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 14 (Section 5.4 : Placer des points sans courbe) + \begin{tikzpicture}[xscale=3,yscale=2] \tkzInit[xmin=-2,xmax=2,xstep=1, ymin=-8,ymax=24,ystep=8] @@ -17,4 +13,4 @@ \tkzDefPointByFct[draw](\va)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex index bbaafc8664..949853f109 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-5-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 15 (Section 5.5 : Placer des points sans se soucier des coordonnées) + \begin{tikzpicture}[scale=1.6] \tkzInit[xmin = 0, xmax = 800, ymin = 0, ymax = 2000, @@ -20,4 +16,4 @@ \tkzDefPointByFct[draw](\va)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex index 4943b0a970..1ea3cb6626 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-5-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-05-6-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 16 (Section 5.6 : Placer des points avec deux fonctions) + \begin{tikzpicture}[scale=4] \tkzInit[xmax=3,ymax=2] \tkzAxeX @@ -27,4 +23,4 @@ (2,0.3){$g(x)=\frac{1}{8}(3x-1)$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex index 1d7a94d24b..808c64d81f 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-6-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-06-1-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 17 (Section 6.1 : Ajouter un label) + \begin{tikzpicture} \tkzInit[xmin=0,xmax=10, ymin=0,ymax=1.2,ystep=0.2] @@ -19,4 +15,4 @@ \tkzText[above right,text=red](tkzPointResult){${\mathcal{C}}_f$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex index 35e273a97b..e1f56e1a0c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-10-2.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-10-2.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 26 (Section 7.10.2 : utilisation de la valeur numérique) + \begin{tikzpicture}[scale=1] \tkzInit[xmax=1,xstep=0.1,ymin=0.0,ymax=1,ystep=0.1] \tkzGrid \tkzAxeXY @@ -14,4 +10,4 @@ \tkzDrawTangentLine[draw,color = red, kr = 0.2,kl = 0.2]({1/exp(1)}) \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex index 71c35c2cbf..ab227375b7 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 18 (Section 7.2 : Tangente avec \tkzname{xstep} et \tkzname{ystep} différents de 1) + \begin{tikzpicture}[xscale=1.5] \tikzset{tan style/.style={-}} \tkzInit[xmin=0,xmax=800,xstep=100, @@ -19,6 +15,6 @@ \tkzText[draw, color = black,% fill = brown!50, opacity = 0.8](300,1200)% {$f(x)=\dfrac{1}{90000}x^3 -\dfrac{1}{{100}}x^2 +\dfrac{113}{36}x$} - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex index ba9f7c0ca1..9a57b5ce99 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 19 (Section 7.3 : Les options \tkzname{kl}, \tkzname{kr} et l'option \tkzname{draw}) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmin=-3,xmax=4,ymin=-4,ymax=2] \tkzGrid \tkzDrawXY \tkzClip @@ -16,6 +12,6 @@ \tkzDrawTangentLine[draw](1) \tkzDrawTangentLine[kr=0,draw](3) \tkzRep - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex index c663f04631..ae9576110a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 20 (Section 7.4 : Tangente et l'option \tkzname{with}) + \begin{tikzpicture}[scale=4] \tkzInit[xmax=3,ymax=2] \tkzAxeXY @@ -25,4 +21,4 @@ {$g(x)=\frac{1}{8}(3x-1)$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex index ff16ab4745..0d04fcbee6 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-5-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 21 (Section 7.5 : Quelques tangentes ) + \begin{tikzpicture}[scale=2] \tkzInit[xmin=-5,xmax=2,ymin=-1, ymax=3] \tkzDrawX @@ -19,4 +15,4 @@ \tkzDrawTangentLine[color=blue,kr=0](1) \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex index 0a1fe9b959..de41164650 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-6-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 22 (Section 7.6 : Demi-tangentes ) + \begin{tikzpicture}[scale=2.75] \tkzInit[xmin=-2,xmax=3,ymax=3] \tkzGrid[color=orange](-2,0)(3,3) @@ -15,6 +11,6 @@ \tkzFct[color = red ,domain = -1:2]{(((x+1)*x)*x)**0.5} \tkzDrawTangentLine(0) \tkzText[draw,color = red,fill = orange!20](2,1){$f(x)=\sqrt{x^3+x^2}$} - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex index 50c06cfed4..0da5e6441f 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-7-0.tex @@ -1,22 +1,18 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 23 (Section 7.7 : Demi-tangentes Courbe de Lorentz ) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1] \tkzGrid(0,0)(1,1) \tkzAxeXY \tkzFct[color = red,thick, domain =0:1]{(exp(\x)-1)/(exp(1)-1)} - \tkzSetUpPoint[size=12] + \tkzSetUpPoint[size=6] \tkzDrawTangentLine[draw, kl = 0, kr = 0.4](0) \tkzDrawTangentLine[draw, kl = 0.4,kr = 0 ](1) \tkzText[draw,color = red,fill = orange!20](0.5,0.6)% {$f(x)=\dfrac{\text{e}^x-1}{\text{e}-1}$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex index a43c8eda8e..f68cf844d9 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-8-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-8-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 24 (Section 7.8 : Série de tangentes) + \begin{tikzpicture}[scale=2] \tikzstyle{tan style}=[-] \tkzInit[xmin=-5,xmax=2,ymin=-1,ymax=3] @@ -19,4 +15,4 @@ \tkzDrawTangentLine[color=blue,line width=.4pt, kr=0,kl=0.5](\x)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex index 94e4f09b22..0604828df7 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-7-9-1.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-07-9-1.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 25 (Section 7.9.1 : Utilisation de \tkzcname{tkzFctLast}) + \begin{tikzpicture}[scale=2] \tikzstyle{tan style}=[-] \tkzInit[xmin=-5,xmax=2,ymin=-1,ymax=3] @@ -19,4 +15,4 @@ \tkzDrawTangentLine[color=blue,line width=.4pt,kr=0,kl=.75](\v)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex index bf66978aaf..6d40969c60 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-10-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-10-0.tex @@ -1,23 +1,19 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 33 (Section 8.10 : Mélange de style) + \begin{tikzpicture}[scale=2.5] \tkzInit[xmin=-1,xmax=4,ymin=0,ymax=5] \tkzGrid \tkzAxeXY \tkzFct[domain = -.5:4]{ 4*x-x**2+4/(x**2+1)**2} \tkzFct[domain = -.5:4]{x-1+4/(x**2+1)**2} - \tkzDrawAreafg[color=green,domain = 1:4] - \tkzDrawAreafg[pattern=north west lines,domain = -.5:1] + \tkzDrawAreafg[between=a and b,color=green,domain = 1:4] + \tkzDrawAreafg[between=a and b,pattern=north west lines,domain = -.5:1] \tkzRep \tkzText(2.5,4.5){$C_f$} \tkzText(2.5,1){$C_g$} \end{tikzpicture}% -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex index ec51f0d78f..634c70b460 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-11-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-11-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 34 (Section 8.11 : Courbes de niveaux) + \begin{tikzpicture}[scale=.75] \tkzInit[xmax=20,ymax=12] \tkzGrid[color=orange,sub](0,0)(20,12) @@ -25,4 +21,4 @@ \tkzDrawAreafg[between= g and e,color=gray!20,domain =12:20] \end{tikzpicture}% -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex index 21df45d74f..a71373a61c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 27 (Section 8.2 : Naissance de la fonction logarithme népérien) + \begin{tikzpicture}[scale=2] \tkzInit[xmin=0,xmax=3,xstep=1, ymin=-2,ymax=2,ystep=1] @@ -28,4 +24,4 @@ \tkzDrawPoints(A,B) \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex index c62f6cc38b..75e39e9064 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 28 (Section 8.3 : Surface simple) + \begin{tikzpicture}[scale=1.75] \tkzInit[xmin=0,xmax=800,xstep=100, ymin=0,ymax=2000,ystep=400] @@ -17,6 +13,6 @@ \tkzDrawPoint(a) \tkzDrawArea[color=orange!50, domain =0:450] \tkzDrawArea[color=orange!80, domain =450:800] - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex index 9ce07d15c7..07050e22a2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 29 (Section 8.4 : Surface et hachures) + \begin{tikzpicture}[scale=2] \tkzInit[xmin=-3,xmax=4,ymin=-2,ymax=4] \tkzGrid(-3,-2)(4,4) @@ -21,4 +17,4 @@ \tkzRep \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex index b5ee2373b6..1fa37f71c5 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-7-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 30 (Section 8.7 : Surface comprise entre deux courbes avec des hachures) + \begin{tikzpicture}[scale=.8] \tkzInit[xmax=5,ymax=5] \tkzGrid @@ -14,6 +10,6 @@ \tkzFct[domain = 0:5]{x} \tkzFct[domain = 1:5]{log(x)} \tkzDrawAreafg[between= a and b,pattern=north west lines,domain = 1:5] - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex index f56e6d1ed6..9073b668a2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-8-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-8-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 31 (Section 8.8 : Surface comprise entre deux courbes avec l'option \tkzname{between}) + \begin{tikzpicture}[scale=1.25] \tkzInit[ymin=-1,xmax=5,ymax=3] \tkzGrid @@ -18,4 +14,4 @@ domain = 1:4] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex index 8fb2018a77..29e26a498c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-9-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-08-9-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 32 (Section 8.9 : Surface comprise entre deux courbes : courbes de Lorentz) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1] \tkzGrid @@ -18,4 +14,4 @@ \tkzDrawAreafg[between = c and a,color=gray!60,domain = 0:1] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex index 008448e5b4..25867a79c9 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-1-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 35 (Section 9.1 : Somme de Riemann) + \begin{tikzpicture}[scale=3.5] \tkzInit[xmax=3,ymax=1.75] \tkzAxeXY @@ -16,4 +12,4 @@ line width=1pt,interval=1./2:exp(1),number=10] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex index 9517111d66..64faec82ce 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 36 (Section 9.2 : Somme de Riemann Inf) + \begin{tikzpicture}[scale=1.75] \tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2] \tkzDrawX \tkzDrawY @@ -14,4 +10,4 @@ \tkzDrawRiemannSumInf[fill=green!40,opacity=.5,interval=-1:5,number=10] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex index 70b221adc5..2f08a96821 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 37 (Section 9.3 : Somme de Riemann Inf et Sup) + \begin{tikzpicture}[scale=1.75] \tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2] \tkzDrawX \tkzDrawY @@ -15,4 +11,4 @@ \tkzDrawRiemannSumInf[fill=green!40,opacity=.5,interval=-1:5,number=10] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex index 14cb4f711a..9e80435a8d 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-9-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-09-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 38 (Section 9.4 : Somme de Riemann Mid) + \begin{tikzpicture}[scale=1.75] \tkzInit[xmin=-3,xmax=6,ymin=-2,ymax=14,ystep=2] \tkzDrawX \tkzDrawY @@ -14,4 +10,4 @@ \tkzDrawRiemannSumMid[fill=blue!40,opacity=.5,interval=-1:5,number=10] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex deleted file mode 100644 index 02a0e3f7e7..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-1-0-0.tex +++ /dev/null @@ -1,21 +0,0 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - -\begin{document} - -\begin{tikzpicture}[scale=.5] - \tkzInit[xmax=100,xstep=10, - ymax=1000000, - ystep=100000] - \tkzAxeX[right] - \tkzAxeY[above] - \tkzGrid - \tkzFct[color=red, - domain=0:100]{\x**3} -\end{tikzpicture} - -\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex index df6a3d865d..4bc5eb21b2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 39 (Section 10.2 : Ligne verticale ) + \begin{tikzpicture}[scale=2] \tkzInit[xmax=3,ymax=2] \tkzAxeXY @@ -18,4 +14,4 @@ line width = 1pt]{1./3} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex index 760e14af9c..14df7d6296 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-3-0.tex @@ -1,16 +1,12 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 40 (Section 10.3 : Lignes verticales) + \begin{tikzpicture} \tkzInit[xmax=5,ymax=5] \tkzAxeXY \tkzVLines[color = green]{1,2,...,4} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex index 406658aab0..749b6e4837 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-4-0.tex @@ -1,18 +1,14 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 41 (Section 10.4 : Ligne verticale et valeur calculée par \tkzname{fp} ) + \begin{tikzpicture} \tkzInit[xmin=-7,xmax=7,ymin=-1,ymax=1] - \tkzAxeY[gradsize=\scriptstyle] + \tkzAxeY[font=\small] \tkzAxeX[trig=2] \foreach\v in {-2,-1,1,2} {\tkzVLine[color=red]{\v*\FPpi}} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex index 4be8cec8f4..16b5e32eb8 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-5-0.tex @@ -1,16 +1,12 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 42 (Section 10.5 : Une ligne horizontale) + \begin{tikzpicture} \tkzInit[xmax=80,xstep=20,ymax=2] \tkzAxeXY \tkzHLine[color=red]{exp(1)-1} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex index 19f17b80ca..9430b809cb 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-6-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 43 (Section 10.6 : Asymptote horizontale) + \begin{tikzpicture}[scale=2.5] \tkzInit[xmax=5,ymin=0.5,ymax=1.5,ystep=0.5] \tkzGrid @@ -15,6 +11,6 @@ \tkzHLine[color=red,style=solid,line width=1.2pt]{1} \tkzDrawTangentLine[draw,color=blue](1) \tkzText[draw,fill = brown!20](2,0.75){$f(x)=x \text{e}^{-x}+1$} - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex index a3b328ec31..0d2cd771c0 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-7-0.tex @@ -1,16 +1,12 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 44 (Section 10.7 : Lignes horizontales) + \begin{tikzpicture} \tkzInit \tkzAxeXY \tkzHLines[color = green]{1,2,...,10} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex index b0bae30e5f..9b8894f47a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-10-8-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 45 (Section 10.8 : Asymptote horizontale et verticale) + \begin{tikzpicture}[scale=1.25] \tkzInit \tkzGrid @@ -16,11 +12,11 @@ \tkzHLine[line width=1pt,color=red]{1} \tkzVLine[line width=1pt,color=blue]{2} \tkzDefPoint(1,1){A} - \tkzDrawPoint[fill=white,color=Maroon,size=10](A) + \tkzDrawPoint[fill=white,color=brown,size=6](A) \tkzDefPointByFct[draw,with=b]({1+exp(1)}) \tkzLabelPoint[above right](tkzPointResult){$(1+\text{e}~;~2)$} \tkzText[draw,color = black,fill = brown!20](6,6)% {$f(x)=\dfrac{1}{\ln^2 (x-1)}+1$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex index e96d94592b..9b7d6f35f4 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-1-0.tex @@ -1,16 +1,12 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 46 (Section 11.1 : Courbe paramétrée exemple 1) + \begin{tikzpicture} \tkzInit[ymax=2.25,ystep=.5] \tkzGrid \tkzAxeXY \tkzFctPar[samples=400,domain=0:2*pi]{(t-sin(t))}{(1-cos(t))} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex index d5a2a7c9e3..65bb2c0219 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 47 (Section 11.2 : Courbe paramétrée exemple 2) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-50,xmax=50,xstep=10, ymin=-50,ymax=50,ystep=10] @@ -15,4 +11,4 @@ \tkzFctPar[smooth,samples=200,domain=0:50]{t*sin(t)}{t*cos(t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex index a7c50423c9..7484370f2b 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 48 (Section 11.3 : Courbe paramétrée exemple 3) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmin=-2,xmax=10,xstep=2,ymin=-10,ymax=4,ystep=2] \tkzGrid[sub] @@ -15,4 +11,4 @@ \tkzFctPar[samples=400,domain=-pi:pi]{exp(t)*sin(t)}{exp(t)*cos(t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex index 76cc471190..6c89c5b7f0 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 49 (Section 11.4 : Courbe paramétrée exemple 4) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-1,xmax=1,xstep=.2, ymin=-1,ymax=1,ystep=.2] @@ -18,4 +14,4 @@ domain=0:2*pi]{(cos(t))**3}{(sin(t))**3} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex index d65a219cd8..b45d54ba54 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-5-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 50 (Section 11.5 : Courbe paramétrée exemple 5) + \begin{tikzpicture}[scale=4] \tkzInit[xmin=-1,xmax=1,ymin=-2,ymax=1] \tkzClip @@ -15,4 +11,4 @@ {(sin(t))**3}{cos(t)-(cos(t))**4} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex index 761dc75065..4fa7ec308c 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-6-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 51 (Section 11.6 : Courbe paramétrée exemple 6) + \begin{tikzpicture}[scale=1.5] \tkzInit[xmin=-.4,xmax=.4,xstep=.1,ymin=0,ymax=.7,ystep=.1] \tkzClip @@ -15,4 +11,4 @@ {sin(t)*cos(t)*log(abs(t))}{sqrt(abs(t))*cos(t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex index 4f30e5b968..45ba1e77f5 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-11-7-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 52 (Section 11.7 : Courbe paramétrée exemple 7) + \begin{tikzpicture}[scale=1.75] \tkzInit[xmin=-20,xmax=20,xstep=5,ymin=-25,ymax=15,ystep=5] \tkzClip @@ -15,4 +11,4 @@ {16*(sin(t))**3}{13*cos(t)-5*cos(2*t)-2*cos(3*t)-cos(4*t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex index d4fbfc1990..844ef3ad7a 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-1-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 53 (Section 12.1 : Équation polaire exemple 1) + \begin{tikzpicture}[scale=0.75] \tkzInit [xmin=-0.5,xmax=0.5, ymin=-0.5,ymax=0.5, @@ -15,4 +11,4 @@ \tkzFctPolar[domain=-2*pi:2*pi]{cos(t)*sin(t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex index 972c5d54c9..a61de63123 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 54 (Section 12.2 : Équation polaire exemple 2) + \begin{tikzpicture}[scale=1.25] \tkzInit [xmin=-1,xmax=1, ymin=-1,ymax=1, @@ -15,4 +11,4 @@ \tkzFctPolar[domain=0:2*pi]{cos(2*t)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex index 68ea16a048..10b89682fa 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-3-0.tex @@ -1,19 +1,15 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 55 (Section 12.3 : Équation polaire Heart) + \begin{tikzpicture}[scale=3] - \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5] - \tkzFctPolar[domain = -pi:pi, - samples = 800, - ball color = red, - shading = ball]% - {2-2*sin(t)+sin(t)*sqrt(abs(cos(t)))/(sin(t)+1.4)} + \tkzInit[xmin=-5,xmax=5,ymin=-5,ymax=5] + \tkzFctPolar[domain = -pi:pi, + samples = 800, + ball color = red, + shading = ball]% + {2-2*sin(t)+sin(t)*sqrt(abs(cos(t)))/(sin(t)+1.4)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex index 04699a9269..901097453b 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-4-0.tex @@ -1,15 +1,11 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 56 (Section 12.4 : Équation polaire exemple 4) + \begin{tikzpicture}[scale=4] \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1] \tkzFctPolar[domain=0:2*pi,samples=400]{ 1-sin(t) } \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex index f912e69c1a..f410535b9b 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-5-0.tex @@ -1,16 +1,12 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 57 (Section 12.5 : Équation polaire Cannabis ou Marijuana Curve) + \begin{tikzpicture}[scale=2.5] \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1] \tkzFctPolar[domain=0:2*pi,samples=1000]% { (1+.9*cos(8*t))*(1+.1*cos(24*t))*(1+.1*cos(200*t))*(1+sin(t)) } \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex index d9504dcfc6..a311f6ae26 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-12-6-0.tex @@ -1,15 +1,11 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 58 (Section 12.6 : Scarabaeus Curve) + \begin{tikzpicture}[scale=2.5] - \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1] - \tkzFctPolar[domain=0:2*pi,samples=400]{1.6*cos(2*t)-3*cos(t) } - \end{tikzpicture} + \tkzInit [xmin=-5,xmax=5,ymin=-5,ymax=5,xstep=1,ystep=1] + \tkzFctPolar[domain=0:2*pi,samples=400]{1.6*cos(2*t)-3*cos(t) } + \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex index 2f6a66113c..071a69d456 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-13-0-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 59 (Section 13 : Symboles) + \begin{tikzpicture} \tkzInit[xmin=-1,xmax=6,ymin=0,ymax=10,xstep=1,ystep=1] \tkzGrid[color=gray] @@ -16,4 +12,4 @@ \tkzFct[{]-},color=green!50!black,domain =3:6,samples=2]{2*\x-4} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex index 67d567bb53..29c14fb7e2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-1-0.tex @@ -1,24 +1,20 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} - \begin{tikzpicture}[scale=3] - \tkzInit[xmin=0,xmax=4,ymin=-1.5,ymax=1.5] - \tkzAxeY[label=$f(x)$] - \tkzDefPoint(1,0){x} \tkzDrawPoint[color=blue,size=0.6pt](x) - \shade[top color=gray!80,bottom color=gray!20] (1,0)% - plot[id=ln,domain=1:2.718] function{log(x)} |-(1,0); - \draw[color=blue] plot[id=ln,domain=0.2:4,samples=200]function{log(x)}; - \tkzAxeX - \tkzText[draw,color= black,fill=brown!50](2,-1)% - {$\mathcal{A} = \int_1^{\text{e}}\ln(x)\text{d}x =% - \big[x\ln(x)\big]_{1}^{\text{e}} = \text{e}$} - \tkzText[draw,color= black,fill=brown!50](2,0.3){$\mathcal{A}$} - \end{tikzpicture} +% Ex. No. 60 (Section 14.1 : Variante intermédiaire : \TIKZ\ + \tkzname{tkz-fct}) + + \begin{tikzpicture}[scale=3] + \tkzInit[xmin=0,xmax=4,ymin=-1.5,ymax=1.5] + \tkzAxeY[label=$f(x)$] + \tkzDefPoint(1,0){x} \tkzDrawPoint[color=blue,size=0.6pt](x) + \shade[top color=gray!80,bottom color=gray!20] (1,0)% + plot[id=ln,domain=1:2.718] function{log(x)} |-(1,0); + \draw[color=blue] plot[id=ln,domain=0.2:4,samples=200]function{log(x)}; + \tkzAxeX + \tkzText[draw,color= black,fill=brown!50](2,-1)% + {$\mathcal{A} = \int_1^{\text{e}}\ln(x)\text{d}x =% + \big[x\ln(x)\big]_{1}^{\text{e}} = \text{e}$} + \tkzText[draw,color= black,fill=brown!50](2,0.3){$\mathcal{A}$} + \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex index b28c809626..af23e82210 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 61 (Section 14.2 : Courbes de \tkzname{Lorentz}) + \begin{tikzpicture}[scale=1] \tkzInit[xmax=1,ymax=1,xstep=0.1,ystep=0.1] \tkzGrid(0,0)(1,1) @@ -25,4 +21,4 @@ \tkzDrawAreafg[between=c and a,color=red!60,domain = 0:1] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex index 43cf4044df..c077890e2f 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-3-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 62 (Section 14.3 : Courbe exponentielle) + \begin{tikzpicture}[scale=1.25] \tkzInit[xmin=-6,xmax=4,ymin=-5,ymax=6] \tkzGrid @@ -20,4 +16,4 @@ \tkzText(-2,-3){($\mathcal{T}$)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex index 290560596a..46da6372b2 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-4-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 63 (Section 14.4 : Axe logarithmique) + \begin{tikzpicture}[scale=0.8] \tkzInit[xmax=14,ymax=12] \draw[thin,->] (0,0) -- (14,0) node[below left] {}; @@ -27,4 +23,4 @@ \tkzLabelPoint(b){$M_{11}$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex index e72e2c5253..e943de9a7d 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-5-0.tex @@ -1,16 +1,15 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 64 (Section 14.5 : Un peu de tout) + \begin{tikzpicture}[scale=.8] \tkzInit[xmin=5,xmax=40,ymin=0,ymax=350,xstep=2.5,ystep=25] - \tkzAxeX[label=$q$] - \tkzAxeY[label=$C(q)$] \tkzGrid + \tkzDrawX[label=$q$] + \tkzLabelX + \tkzDrawY[label=$C(q)$] + \tkzLabelY + \tkzGrid \tkzFct[domain=5:40]{0.1*\x**2+2*\x+60} \foreach \vv in {5,10,...,40}{% \tkzDefPointByFct(\vv) @@ -23,4 +22,4 @@ \tkzDrawSetOfPoints[mark = x,mark size=3pt] \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex index 416c701d18..73f217354f 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-6-1.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 65 (Section 14.6.1 : Le code) + \begin{tikzpicture} \tkzInit[xmin=-1,xmax=1,ymin=-1.8,ymax=1.2,xstep=0.1,ystep=0.2] \tkzGrid @@ -38,4 +34,4 @@ \foreach \v in {-1,-0.8,---.,1}{\tkzDefPointByFct[draw](\v)} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex index 5e37982ce5..48f7a80220 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-1.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 66 (Section 14.7.1 : Tableau de variations) + \begin{tikzpicture} \tkzTab% { $v$ /1,% @@ -21,6 +17,6 @@ {-/ $0$ /,% +/$\dfrac{8}{27b}$ /,% -/ $0$ /}% - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex index d844d5799a..d543f04cc6 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-2.tex @@ -1,21 +1,17 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} - \begin{tikzpicture}[xscale=2,yscale=2.5] - \tkzInit[xmin=0,xmax=6,ymax=0.5,ystep=0.1] - \tkzDrawX[label=$v$] - \tkzDrawY[label=$g(v)$] - \tkzGrid(0,0)(6,0.5) - \tkzFct[color = red,domain =1:6]{(2*(x-1)*(x-1))/(x*x*x)} - \tkzDrawTangentLine[color=blue,draw](3) - \tkzDefPointByFct(1) - \tkzText[draw, fill = brown!30](4,0.1){$g(v)=2\dfrac{(v-1)^2}{v^3}$} - \end{tikzpicture} +% Ex. No. 67 (Section 14.7.2 : Première courbe avec $ b=1$) + + \begin{tikzpicture}[xscale=2,yscale=2.5] + \tkzInit[xmin=0,xmax=6,ymax=0.5,ystep=0.1] + \tkzDrawX[label=$v$] + \tkzDrawY[label=$g(v)$] + \tkzGrid(0,0)(6,0.5) + \tkzFct[color = red,domain =1:6]{(2*(x-1)*(x-1))/(x*x*x)} + \tkzDrawTangentLine[color=blue,draw](3) + \tkzDefPointByFct(1) + \tkzText[draw, fill = brown!30](4,0.1){$g(v)=2\dfrac{(v-1)^2}{v^3}$} + \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex index 52d3f27ede..c46720bfce 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-3.tex @@ -1,21 +1,17 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} - \begin{tikzpicture}[scale=1.2] - \tkzInit[xmin=0,xmax=2,xstep=0.2,ymax=1,ystep=0.1] - \tkzAxeXY - \tkzGrid(0,0)(2,1) - \tkzFct[color = red,domain =1/3:2]{(2*(\x-1./3)*(\x-1./3))/(\x*\x*\x)} - \tkzDrawTangentLine[draw,color=blue,kr=.5,kl=.5](1) - \tkzDefPointByFct(1) - \tkzText[draw,fill = brown!30](1.2,0.3)% - {$g(v)=2\dfrac{\left(v-\dfrac{1}{3}\right)^2}{v^3}$} - \end{tikzpicture} +% Ex. No. 68 (Section 14.7.3 : Deuxième courbe $b=1/3$ ) + + \begin{tikzpicture}[scale=1.2] + \tkzInit[xmin=0,xmax=2,xstep=0.2,ymax=1,ystep=0.1] + \tkzAxeXY + \tkzGrid(0,0)(2,1) + \tkzFct[color = red,domain =1/3:2]{(2*(\x-1./3)*(\x-1./3))/(\x*\x*\x)} + \tkzDrawTangentLine[draw,color=blue,kr=.5,kl=.5](1) + \tkzDefPointByFct(1) + \tkzText[draw,fill = brown!30](1.2,0.3)% + {$g(v)=2\dfrac{\left(v-\dfrac{1}{3}\right)^2}{v^3}$} + \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex index 5c5497a3c3..da73665eeb 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-7-4.tex @@ -1,21 +1,17 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} - \begin{tikzpicture}[scale=1.2] - \tkzInit[xmin=0,xmax=10,ymax=.35,ystep=0.05]; - \tkzAxeXY - \tkzGrid(0,0)(10,.35) - \tkzFct[color = red, - domain =1.185:10]{(2*(\x-32./27)*(\x-32./27))/(\x*\x*\x)} - \tkzDrawTangentLine[draw,color=blue,kr=2,kl=2](3.555) - \tkzText[draw,fill = brown!30](5,0.3)% - {$g(v)=2\dfrac{\left(v-\dfrac{32}{27}\right)^2}{v^3}$} - \end{tikzpicture} +% Ex. No. 69 (Section 14.7.4 : Troisième courbe $ b=32/27$ ) + + \begin{tikzpicture}[scale=1.2] + \tkzInit[xmin=0,xmax=10,ymax=.35,ystep=0.05]; + \tkzAxeXY + \tkzGrid(0,0)(10,.35) + \tkzFct[color = red, + domain =1.185:10]{(2*(\x-32./27)*(\x-32./27))/(\x*\x*\x)} + \tkzDrawTangentLine[draw,color=blue,kr=2,kl=2](3.555) + \tkzText[draw,fill = brown!30](5,0.3)% + {$g(v)=2\dfrac{\left(v-\dfrac{32}{27}\right)^2}{v^3}$} + \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex index a459ea7628..a5c1afc3e3 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-1.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 70 (Section 14.8.1 : Courbes de \tkzname{Van der Walls} ) + \begin{tikzpicture}[scale=4] \tkzInit[xmax=3,ymax=2]; \tkzAxeXY @@ -26,4 +22,4 @@ \tkzText[draw,fill = white,text=green](2,0.4){$g(x) = \dfrac{3x-1}{8}$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex index 35d406fef9..4012a55b00 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-14-8-2.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 71 (Section 14.8.2 : Courbes de \tkzname{Van der Walls} (suite)) + \begin{tikzpicture}[xscale=4,yscale=1.5] \tkzInit[xmin=0,xmax=3,ymax=3,ymin=-4] \tkzGrid(0,-4)(3,3) @@ -17,10 +13,10 @@ \tkzFct[color=blue,domain = 0.35:3]{-3/(x*x) +27/(4*(3*x-1))} \tkzFct[color=orange,domain = 0.35:3]{-3/(x*x) +8/(3*x-1)} \tkzFct[color=green,domain = 0.35:3]{-3/(x*x) +7/(3*x-1)} - \tkzText[draw,fill = white,text=Maroon](2,-2)% + \tkzText[draw,fill = white,text=brown](2,-2)% {$f(x)=-\dfrac{3}{x^2}+\dfrac{8\alpha}{3x-1}$ \hspace{.5cm}% avec $\alpha \in% \left\{\dfrac{1}{2}~;~\dfrac{27}{32}~;~\dfrac{7}{8}~;~1\right\}$} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex index 3ab7a8c04a..10ba742294 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-3.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-1.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 72 (Section 15.0.1 : Première représentation) + \begin{tikzpicture}[xscale=2.25,yscale=1] \tkzInit[xmin=-2,xmax=3,ymin=-1,ymax=6] \tkzDrawX @@ -19,6 +15,6 @@ \tkzDrawPoint(pt2) \tkzPointShowCoord[xlabel=$2$,ylabel=$\text{e}+2$](pt2) \tkzRep - \end{tikzpicture} +\end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex index 6d7fb2fad7..5fc013f510 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-4.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-15-0-2.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 73 (Section 15.0.2 : Seconde représentation) + \begin{tikzpicture}[xscale=2.25,yscale=1] \tkzInit[xmin=-2,xmax=3,ymin=-1,ymax=6] \tkzDrawX @@ -21,4 +17,4 @@ \tkzRep \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex index f38e0fe263..d56bdd5f44 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-1-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 74 (Section 16.1 : \tkzname{pgfmath}) + \begin{tikzpicture} \def\Asmall{0.7 } \def\Abig{3 } \def\B{20}%Herbert Voss \path[fill=blue!40!black,domain=-pi:pi,samples=500,smooth,variable=\t]% @@ -19,4 +15,4 @@ {0.5*\Abig*sin(\t r)+0.5*\Asmall*sin(\B*\t r)}); \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex index 5964b6ad52..d3f8c51548 100644 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex +++ b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-16-2-0.tex @@ -1,12 +1,8 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - +\input{preamble-standalone.ltx} \begin{document} +% Ex. No. 75 (Section 16.2 : \tkzname{fp.sty}) + \begin{tikzpicture} \tkzInit[xmin=-0.2,xmax=0.2,xstep=.1, ymin=-12,ymax=6,ystep=2] @@ -16,4 +12,4 @@ {-5+x*(0.5+4*x*(x*(-2+x*1)))} \end{tikzpicture} -\end{document} +\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex deleted file mode 100644 index a5e1873af9..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-3-0.tex +++ /dev/null @@ -1,16 +0,0 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - -\begin{document} - - \begin{tikzpicture} - \tkzInit[xmin=-5,xmax=5,ymax=2] - \tkzGrid - \tkzAxeXY - \end{tikzpicture} - -\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex deleted file mode 100644 index 93270e1c29..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-3-4-0.tex +++ /dev/null @@ -1,17 +0,0 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - -\begin{document} - -\begin{tikzpicture}[scale=1.25] - \tkzInit[xmin=-5,xmax=5,ymax=2] - \tkzGrid - \tkzAxeXY - \tkzFct[color=red]{2*x**2/(x**2+1)} - \end{tikzpicture} - -\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex deleted file mode 100644 index d8d928beb2..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-4-8-0.tex +++ /dev/null @@ -1,19 +0,0 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - -\begin{document} - - \begin{tikzpicture}[scale=2] - \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=3] - \tkzGrid[sub,subxstep=.5,subystep=.5] - \tkzAxeXY - \tkzFct[domain = -3:2]{(2-x)*exp(x)} - \tkzText(-2,1.25){$\mathcal{C}_{f}$} - \tkzDefPoint(2,0){A} \tkzDrawPoint(A) \tkzLabelPoints(A) - \end{tikzpicture} - -\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex b/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex deleted file mode 100644 index 5b258b1fdd..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/latex/tkzFct-8-6-0.tex +++ /dev/null @@ -1,18 +0,0 @@ -% -% tkz-euclide (14/01/2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Author Alain Matthes -\input{tkzfctpreamble.ltx} - -\begin{document} - - \begin{tikzpicture}[scale=1.5] - \tkzInit[xmax=5,ymax=5] - \tkzGrid \tkzAxeXY - \tkzFct[domain = 0:5]{x} - \tkzFct[domain = 1:5]{log(x)} - \tkzDrawAreafg[color = orange!50,domain = 1:5] - \end{tikzpicture} - -\end{document} diff --git a/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx b/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx deleted file mode 100644 index b2465e4499..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/examples/tkzfctpreamble.ltx +++ /dev/null @@ -1,18 +0,0 @@ -% -% tkzfctpreamble (juin 2011) -% -% Coding (utf8) Creator (TeX) Producer (pdfeTeX) -% Copyright (C) 2010 Alain Matthes -% -\documentclass{scrartcl} -\usepackage[usenames,dvipsnames,svgnames]{xcolor} -\usepackage{amsmath,tkz-tab,tkz-euclide,tkz-fct} -\usetkzobj{all} - -\definecolor{bistre}{rgb}{.75,.50,.30} -\definecolor{Maroon}{rgb}{0.5,0.0,0.0} -\definecolor{fondpaille}{cmyk}{0,0,0.1,0} -\pagecolor{fondpaille} -\color{Maroon} -\tkzSetUpColors[background=fondpaille,text=Maroon] - diff --git a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty index 86aa260a02..881066229b 100644 --- a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty +++ b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty @@ -1,27 +1,17 @@ -% Copyright 2011 by Alain Matthes +% Copyright 2020 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. -% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % - % tkz-fct.sty encodage : utf8 % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % - % Créé par Alain Matthes le 16-01-2011 % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Objet : fonctions numériques en 2D with gnuplot - % constants from tkz-base % \tkz@init@xstep % \tkz@init@ystep +\typeout{2020/02/06 1.2 beta function tkz-fct} %<---------------------------------------------------------------------------> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkz-fct}[2011/06/01 1.16 c function ] +\ProvidesPackage{tkz-fct}[2020/02/06 1.2 beta function ] \newcount\tkz@tkzf@fct \edef\tkzTWOPTCode{\the\catcode`\:} \tkz@tkzf@fct=0 % @@ -29,7 +19,7 @@ %<---------------------------------------------------------------------------> % Initialisation %<---------------------------------------------------------------------------> -\RequirePackage{tkz-base} +\RequirePackage{tkz-base,fp} % % Code from Christian Tellechea 2009 % modified by AM % modified \FP@pow from fp.sty \def\FP@pow#1#2#3{% @@ -82,26 +72,28 @@ \newif\iftkz@draw \newif\iftkz@fp \def\tkz@dmin{-5}\def\tkz@dmax{5} -\pgfkeys{% -/tkzfct/.cd, -domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)} - \FPeval\tkz@max{(#2)}}, -samples/.code = {\edef\tkz@fct@samples{#1}}, -id/.code = {\edef\tkz@fct@id{#1}}, -fp/.is if = tkz@fp, -fp/.default = false, -/tkzfct/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}}} +\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016 +\global\let\tkz@tmp@xb\tkz@init@xmax% modif 2016 +\global\let\tkz@tmp@ya\tkz@init@ymin% modif 2016 +\global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016 +\catcode`\:=12 +\pgfkeys{/@tkzfct/.cd, + domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)} + \FPeval\tkz@max{(#2)}}, + domain = \tkz@tmp@xa:\tkz@tmp@xb, + samples/.store in = \tkz@fct@samples, + id/.store in = \tkz@fct@id, + fp/.is if = tkz@fp, + fp/.default = false, + samples = 200, + fp = true, + id = tkzfct, + /@tkzfct/.search also = {/tikz}, +}% \def\tkzFct{\pgfutil@ifnextchar[{\tkzActivOff\tkz@fct}{\tkz@fct[]}} \def\tkz@fct[#1]#2{% -\pgfkeys{/tkzfct/.cd, -domain = \@xa:\@xb, -samples = 200, -fp = true, -id = tkzfct} -\pgfqkeys{/tkzfct}{#1}% +\pgfqkeys{/@tkzfct}{#1}% \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -116,12 +108,14 @@ id = tkzfct} \def\x{(x*\tkz@init@xstep)}% \expandafter\edef\csname tkzFctgnu\@alph\tkz@tkzf@fct \endcsname{#2}% \expandafter\edef\csname tkzFctgnuLast\endcsname{#2} -\begin{scope}[samples = \tkz@fct@samples,#1] - \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); - \draw[xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm,/tkzfct/.cd]% - plot[id=\tkz@fct@id,domain= \tkz@ba:\tkz@bb]% - function{(#2)/\tkz@init@ystep};% -\end{scope} +% %%%%%%% +\begin{scope} + \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); + \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]% + plot[ samples = \tkz@fct@samples,id=\tkz@fct@id, + domain= \tkz@ba:\tkz@bb] function{(#2)/\tkz@init@ystep};% +\end{scope} +% %%%%%%% \let\tkz@tmp@xstep\tkz@init@xstep \def\tkz@init@xstep{1} \iftkz@fp% @@ -140,27 +134,25 @@ id = tkzfct} %<---------------------------------------------------------------------------> % point d'une courbe (new method) %<---------------------------------------------------------------------------> -\pgfkeys{% -/tkzfctpt/.cd, -draw/.is if = tkz@draw, -draw/.default = true, -with/.code = \global\def\tkz@fct@used{#1}, -ref/.code = \global\def\tkz@fct@ref{#1}} +\pgfkeys{/tkzfctpt/.cd, + draw/.is if = tkz@draw, + draw/.default = true, + with/.store in = \tkz@fct@used, + ref/.store in = \tkz@fct@ref, + draw = false, + with = {}, + ref = {} + } \def\tkzDefPointByFct{\pgfutil@ifnextchar[{\tkz@fctpoint}{\tkz@fctpoint[]}} \def\tkz@fctpoint[#1](#2){% -\pgfkeys{/tkzfctpt/.cd, - draw = false, - with = {}, - ref = {}} \pgfqkeys{/tkzfctpt}{#1} - - \FPeval\x{(#2)}% + \FPeval\x{(#2)}% \ifx\tkzutil@empty\tkz@fct@used \FPeval\tkz@fx{\tkzFctLast} \else \edef\tkz@fct{\csname tkzFct\tkz@fct@used\endcsname} - \FPeval\tkz@fx{\tkz@fct} + \FPeval\tkz@fx{\tkz@fct} \fi \tkzDefPoint(\x,\tkz@fx){tkzPointResult}% \iftkz@draw @@ -174,28 +166,24 @@ ref/.code = \global\def\tkz@fct@ref{#1}} %<---------------------------------------------------------------------------> % tangente \tkzDrawTangentLine %<---------------------------------------------------------------------------> -\pgfkeys{% -/tkztan/.cd, -draw/.is if = tkz@draw, -draw/.default = true, -with/.code = \global\def\tkz@fct@used{#1}, -kr/.code = {\edef\tkz@tan@kr{#1}}, -kl/.code = {\edef\tkz@tan@kl{#1}}, -/tkztan/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}} +\pgfkeys{/@tkztan/.cd, + with/.store in = \tkz@fct@used, + kr/.store in = \tkz@tan@kr, + kl/.store in = \tkz@tan@kl, + draw/.is if = tkz@draw, + draw/.default = true, + draw = false, + with = {}, + kr = 1, + kl = 1, + /@tkztan/.search also = {/tikz}, }% %<---------------------------------------------------------------------------> \def\tkzDrawTangentLine{\pgfutil@ifnextchar[{\tkz@DrawTangentLine}{% \tkz@DrawTangentLine[]}} \def\tkz@DrawTangentLine[#1](#2){% \begingroup -\pgfkeys{/tkztan/.cd, - draw = false, - with = {}, - kr = 1, - kl = 1} -\pgfqkeys{/tkztan}{#1} +\pgfqkeys{/@tkztan}{#1} \FPeval\x{(#2)}% \ifx\tkzutil@empty\tkz@fct@used \FPeval\tkz@img{\tkzFctLast} @@ -219,7 +207,7 @@ kl/.code = {\edef\tkz@tan@kl{#1}}, \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}% \FPmul{\tkz@slope}{\tkz@deltay}{1000000}% \protected@edef\tkz@temp{% -\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp% +\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp% (tkzPointResult)--++(\tkz@krx,-\tkz@kry*\tkz@slope); \fi % demi tgt --> gauche @@ -230,7 +218,7 @@ kl/.code = {\edef\tkz@tan@kl{#1}}, \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img} \FPmul{\tkz@slope}{\tkz@deltay}{-1000000} \protected@edef\tkz@temp{% -\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp% +\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp% (tkzPointResult)--++(-\tkz@klx,\tkz@kly*\tkz@slope); \fi \iftkz@draw @@ -239,29 +227,26 @@ kl/.code = {\edef\tkz@tan@kl{#1}}, \endgroup } %<---------------------------------------------------------------------------> -% tkzArea +% tkzArea %<---------------------------------------------------------------------------> \pgfkeys{% /tkzarea/.cd, -domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)} - \FPeval\tkz@max{(#2)}}, -opacity/.code = {\edef\tkz@fct@opacity{#1}}, -id/.code = {\edef\tkz@fct@id{#1}}, -color/.code = {\edef\tkz@fct@color{#1}}, -samples/.code = {\edef\tkz@fct@samples{#1}}, -/tkzarea/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}}} + domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)} + \FPeval\tkz@max{(#2)}}, + opacity/.store in = \tkz@fct@opacity, + id/.store in = \tkz@fct@id, + color/.store in = \tkz@fct@color, + samples/.store in = \tkz@fct@samples, + domain = -5:5, + color = \tkz@otherlinecolor, + samples = 200, + id = tkzfonct, + opacity = .5, + /tkzarea/.search also = {/tikz} + } \def\tkzArea{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@aire}{\tkz@aire[]}} \def\tkz@aire[#1]{% -\begingroup -\pgfkeys{% -/tkzarea/.cd, -domain = -5:5, -color = \tkz@otherlinecolor, -samples = 200, -id = tkzfonct, -opacity = .5} +\begingroup \pgfqkeys{/tkzarea}{#1} \iftkz@init@NO \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% @@ -287,39 +272,37 @@ opacity = .5} \endgroup } \let\tkzDrawArea\tkzArea + %<---------------------------------------------------------------------------> % tkzAreafg %<---------------------------------------------------------------------------> -\pgfkeys{/tkzareafg/.cd, -domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)} - \FPeval\tkz@max{(#2)}}, -between/.code args={#1 and #2}{\def\tkz@below{#1} - \def\tkz@above{#2}}, -opacity/.code = {\edef\tkz@fct@opacity{#1}}, -id/.code = {\edef\tkz@fct@id{#1}}, -color/.code = {\edef\tkz@fct@color{#1}}, -samples/.code = {\edef\tkz@fct@samples{#1}}, -/tkzareafg/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}}} -\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}} +\pgfkeys{/@tkzareafg/.cd, + domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)} + \FPeval\tkz@max{(#2)}}, + between/.code args ={#1 and #2}{\def\tkz@below{#1} + \def\tkz@above{#2}}, + opacity/.store in = \tkz@fct@opacity, + id/.store in = \tkz@fct@id, + color/.store in = \tkz@fct@color, + samples/.store in = \tkz@fct@samples, + domain = -5:5, + between = a and b, + color = lightgray, + samples = 200, + id = tkzfonct, + opacity = .5, + /@tkzareafg/.search also = {/tikz} + } +\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}} \def\tkz@airefg[#1]{% \begingroup -\pgfkeys{/tkzareafg/.cd, -domain = -5:5, -between = a and b, -color = lightgray, -samples = 200, -id = tkzfonct, -opacity = .5 -} -\pgfqkeys{/tkzareafg}{#1} +\pgfqkeys{/@tkzareafg}{#1} \def\tkz@fctsup{\csname tkzFctgnu\tkz@below\endcsname} \def\tkz@fctinf{\csname tkzFctgnu\tkz@above\endcsname} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@xstep}% -\else +\else \FPset{\tkz@x@delta}{0} \FPset{\tkz@y@delta}{0}% \fi% @@ -329,34 +312,33 @@ opacity = .5 \FPdiv\tkz@bb{\tkz@max}{\tkz@init@xstep} \begin{scope}[domain = \tkz@ba:\tkz@bb, samples = \tkz@fct@samples, - id = \tkz@fct@id] + id = \tkz@fct@id] \clip (\tkz@ba,\tkz@ya)--plot function{(\tkz@fctsup)/\tkz@init@ystep}% --(\tkz@bb,\tkz@ya);% \clip (\tkz@ba,\tkz@yb)--plot function{(\tkz@fctinf)/\tkz@init@ystep}% --(\tkz@bb,\tkz@yb); \fill [color = \tkz@fct@color, fill opacity = \tkz@fct@opacity, - /tkzareafg/.cd, + /@tkzareafg/.cd, #1]% (\tkz@ba,\tkz@ya) rectangle (\tkz@bb,\tkz@yb); \end{scope} \endgroup -} -\let\tkzDrawAreafg\tkzAreafg -\def\tkz@pamin{-5}\def\tkz@pamax{5} +} +\let\tkzDrawAreafg\tkzAreafg +\def\tkz@pamin{-5}\def\tkz@pamax{5} %<---------------------------------------------------------------------------> -% tkzFctPar +% tkzFctPar %<---------------------------------------------------------------------------> -\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}} +\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}} \def\tkz@fctp[#1]#2#3{% \begingroup -\pgfkeys{% -/tkzfct/.cd, -domain = \tkz@pamin:\tkz@pamax, -samples = 200, -fp = true, -id = tkzfct} -\pgfqkeys{/tkzfct}{#1} +\pgfkeys{/@tkzfct/.cd, + domain = \tkz@pamin:\tkz@pamax, + samples = 200, + fp = true, + id = tkzfct} +\pgfqkeys{/@tkzfct}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -369,29 +351,29 @@ id = tkzfct} \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb); \draw [xshift = -\tkz@x@delta cm,% yshift = -\tkz@y@delta cm, - /tkzfct/.cd, #1]% + /@tkzfct/.cd, #1]% plot [parametric,domain = \tkz@min:\tkz@max,% id = tkzparfct]% function {(#2)/\tkz@init@xstep,(#3)/\tkz@init@ystep}; \tkzActivOn \end{scope} \endgroup -} +} %<---------------------------------------------------------------------------> -% tkzFctPolar +% tkzFctPolar %<---------------------------------------------------------------------------> -\def\tkz@pomin{0}\def\tkz@pomax{2*pi} +\def\tkz@pomin{0}\def\tkz@pomax{2*pi} \def\tkzFctPolar{\pgfutil@ifnextchar[{% - \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}} + \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}} \def\tkz@FctPolar[#1]#2{% \begingroup -\pgfkeys{% -/tkzfct/.cd, -domain = \tkz@pomin:\tkz@pomax, -fp = true, -samples = 200, -id = tkzfctpolar} -\pgfqkeys{/tkzfct}{#1} +\pgfkeys{/@tkzfct/.cd, + domain = \tkz@pomin:\tkz@pomax, + fp = true, + samples = 200, + id = tkzfctpolar + } +\pgfqkeys{/@tkzfct}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -399,40 +381,40 @@ id = tkzfctpolar} \FPset{\tkz@x@delta}{0} \FPset{\tkz@y@delta}{0}% \fi% - + \begin{scope} \tkzActivOff \draw [xshift = -\tkz@x@delta cm,% yshift = -\tkz@y@delta cm, - /tkzfct/.cd, #1]% + /@tkzfct/.cd, #1]% plot [raw gnuplot,id = tkzpolarfct]% function { set polar;set samples \tkz@fct@samples ; set trange [\tkz@min:\tkz@max]; plot (#2)/\tkz@init@xstep}; \tkzActivOn \end{scope} \endgroup -} +} %<---------------------------------------------------------------------------> -% tkzDrawRiemannSum +% tkzDrawRiemannSum %<---------------------------------------------------------------------------> -\pgfkeys{/tkzriemann/.cd, -interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)} - \FPeval\tkz@max{(#2)}}, -number/.code = {\edef\tkz@fct@nb{#1}}, -opacity/.code = {\edef\tkz@fct@opacity{#1}}, -color/.code = {\edef\tkz@fct@color{#1}}, -/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{% - \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}} +\pgfkeys{/@tkzriemann/.cd, + interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)} + \FPeval\tkz@max{(#2)}}, + number/.store in = \tkz@fct@nb, + opacity/.store in = \tkz@fct@opacity, + color/.store in = \tkz@fct@color, + /@tkzriemann/.search also = {/tikz}, +} +\def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{% + \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}} \def\tkz@DrawRiemannSum[#1]{% \begingroup -\pgfkeys{% -/tkzriemann/.cd, -interval = 1:2, -number = 10, -opacity = 0.5, -line width = 1pt} -\pgfqkeys{/tkzriemann}{#1} +\pgfkeys{/@tkzriemann/.cd, + interval = 1:2, + number = 10, + opacity = 0.5, + line width = 1pt +} +\pgfqkeys{/@tkzriemann}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -442,39 +424,42 @@ line width = 1pt} \fi% \FPadd\tkz@intwd{\tkz@max}{-\tkz@min} \FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb} -\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} +\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} \begin{scope} \foreach \i in {0,1,...,\tkz@fct@nb}{% \FPeval\x{(\tkz@min+i*\tkz@delta)} \FPeval\tkz@fx{\tkzFcta} \FPadd\tkz@next{\x}{\tkz@delta} - \draw[color=\tkz@fct@color,opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next , \tkz@fx/\tkz@init@ystep ); - } - \end{scope} + \draw[ color=\tkz@fct@color, + opacity=\tkz@fct@opacity, + /@tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next, + \tkz@fx/\tkz@init@ystep ); +} + \end{scope} \endgroup -} +} %<---------------------------------------------------------------------------> -% tkzDrawRiemannSumInf +% tkzDrawRiemannSumInf %<---------------------------------------------------------------------------> -\pgfkeys{/tkzriemann/.cd, -interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)} - \FPeval\tkz@max{(#2)}}, -number/.code = {\edef\tkz@fct@nb{#1}}, -opacity/.code = {\edef\tkz@fct@opacity{#1}}, -color/.code = {\edef\tkz@fct@color{#1}}, -/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{% - \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}} +\pgfkeys{/@tkzriemann/.cd, + interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)} + \FPeval\tkz@max{(#2)}}, + number/.store in = \tkz@fct@nb, + opacity/.store in = \tkz@fct@opacity, + color/.store in = \tkz@fct@color, + /@tkzriemann/.search also = {/tikz}, + } +\def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{% + \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}} \def\tkz@DrawRiemannSumInf[#1]{% \begingroup -\pgfkeys{% -/tkzriemann/.cd, -interval = 1:2, -number = 10, -opacity = 0.5, -line width = 1pt} -\pgfqkeys{/tkzriemann}{#1} +\pgfkeys{/@tkzriemann/.cd, + interval = 1:2, + number = 10, + opacity = 0.5, + line width = 1pt + } +\pgfqkeys{/@tkzriemann}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -484,42 +469,42 @@ line width = 1pt} \fi% \FPadd\tkz@intwd{\tkz@max}{-\tkz@min} \FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb} -\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} - +\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} + \begin{scope} \foreach \i in {0,1,...,\tkz@fct@nb}{% \FPeval\x{(\tkz@min+i*\tkz@delta)} \FPeval\tkz@fx{\tkzFcta} \let\tkz@firstimg\tkz@fx - \let\tkz@firstx\x - \FPadd\tkz@next{\x}{\tkz@delta} - \let\tkzFctTmp\tkzFcta - \FPset\x{\tkz@next} - \FPeval\tkz@fxnext{\tkzFcta} -\ifdim \tkz@fx pt < \tkz@fxnext pt\relax - \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep ); -\else -\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep ); - \fi - } - \end{scope} + \let\tkz@firstx\x + \FPadd\tkz@next{\x}{\tkz@delta} + \let\tkzFctTmp\tkzFcta + \FPset\x{\tkz@next} + \FPeval\tkz@fxnext{\tkzFcta} + \ifdim \tkz@fx pt < \tkz@fxnext pt\relax + \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep ); +\else +\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep ); + \fi + } + \end{scope} \endgroup -} +} %<---------------------------------------------------------------------------> -% tkzDrawRiemannSumSup +% tkzDrawRiemannSumSup %<---------------------------------------------------------------------------> \def\tkzDrawRiemannSumSup{\pgfutil@ifnextchar[{% - \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}} + \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}} \def\tkz@DrawRiemannSumSup[#1]{% \begingroup -\pgfkeys{% -/tkzriemann/.cd, -interval = 1:2, -number = 10, -opacity = 0.5, -line width = 1pt} -\pgfqkeys{/tkzriemann}{#1} +\pgfkeys{/@tkzriemann/.cd, + interval = 1:2, + number = 10, + opacity = 0.5, + line width = 1pt + } +\pgfqkeys{/@tkzriemann}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -529,42 +514,42 @@ line width = 1pt} \fi% \FPadd\tkz@intwd{\tkz@max}{-\tkz@min} \FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb} -\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} - +\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} + \begin{scope} \foreach \i in {0,1,...,\tkz@fct@nb}{% \FPeval\x{(\tkz@min+i*\tkz@delta)} \FPeval\tkz@fx{\tkzFcta} \let\tkz@firstimg\tkz@fx - \let\tkz@firstx\x + \let\tkz@firstx\x \FPadd\tkz@next{\x}{\tkz@delta} \let\tkzFctTmp\tkzFcta \FPset\x{\tkz@next} \FPeval\tkz@fxnext{\tkzFcta} \ifdim \tkz@fx pt > \tkz@fxnext pt\relax - \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep ); -\else -\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep ); - \fi - } - \end{scope} + \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep ); +\else +\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep ); + \fi + } + \end{scope} \endgroup } %<---------------------------------------------------------------------------> -% tkzDrawRiemannSumMid +% tkzDrawRiemannSumMid %<---------------------------------------------------------------------------> \def\tkzDrawRiemannSumMid{\pgfutil@ifnextchar[{% - \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}} + \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}} \def\tkz@DrawRiemannSumMid[#1]{% \begingroup -\pgfkeys{% -/tkzriemann/.cd, -interval = 1:2, -number = 10, -opacity = 0.5, -line width = 1pt} -\pgfqkeys{/tkzriemann}{#1} +\pgfkeys{/@tkzriemann/.cd, + interval = 1:2, + number = 10, + opacity = 0.5, + line width = 1pt + } +\pgfqkeys{/@tkzriemann}{#1} \iftkz@init@NO% \FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}% \FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}% @@ -574,46 +559,43 @@ line width = 1pt} \fi% \FPadd\tkz@intwd{\tkz@max}{-\tkz@min} \FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb} -\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} - +\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1} + \begin{scope} \foreach \i in {0,1,...,\tkz@fct@nb}{% \FPeval\x{(\tkz@min+i*\tkz@delta)} \FPeval\tkz@fx{\tkzFcta} \let\tkz@firstimg\tkz@fx - \let\tkz@firstx\x + \let\tkz@firstx\x \FPadd\tkz@next{\x}{\tkz@delta} \FPset\x{\tkz@next} \FPeval\tkz@fxnext{\tkzFcta} \FPeval\tkz@midimg{(\tkz@firstimg+\tkz@fxnext)/2} - \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep ); - } - \end{scope} + \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep ); + } + \end{scope} \endgroup -} - +} + %<--------------------------------------------------------------------------–> % tkzXH F rien T et [ ou ] %<--------------------------------------------------------------------------–> \def\tkz@ComT{v} % need -\pgfkeys{ - tkzxh/.cd, - posgrad/.code = {\def\tkz@tkzXh@posgrad{#1}}, - left/.code = {\def\tkz@tkzXh@left{#1}}, - right/.code = {\def\tkz@tkzXh@right{#1}}, - color/.code = {\def\tkz@tkzXh@color{#1}}, - } -\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}} +\pgfkeys{/@tkzxh/.cd, + posgrad/.store in = \tkz@tkzXh@posgrad, + left/.store in = \tkz@tkzXh@left, + right/.store in = \tkz@tkzXh@right, + color/.store in = \tkz@tkzXh@color, + posgrad = {below=6 pt}, + color = \tkz@mainlinecolor, + left = {}, + right = {}, + } +\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}} \def\tkz@xh[#1]#2{% -\pgfkeys{/tkzxh/.cd, - posgrad = {below=6 pt}, - color = \tkz@mainlinecolor, - left = {}, - right = {} -} - \pgfqkeys{/tkzxh}{#1} + \pgfqkeys{/@tkzxh}{#1} \begingroup \foreach \xA/\RA/\sA/\xB/\RB/\sB in {#2}{% \tkzDefPoint(\xA,0){deb}\tkzDefPoint(\xB,0){fin} @@ -627,7 +609,7 @@ line width = 1pt} \noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp at (deb){% \tkz@showgrad{\xA}$\numprint{\tkz@result}$};\fi -\ifx\RB\tkz@ComT +\ifx\RB\tkz@ComT \protected@edef\tkz@temp{\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp% at (fin){% \tkz@showgrad{\xB}$\numprint{\tkz@result}$};\fi @@ -640,64 +622,65 @@ line width = 1pt} }% \endgroup }% -%<---------------------------------------------------------------------------> -% tangente obsolete -%<---------------------------------------------------------------------------> -\def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}} - -\def\tkz@Tan[#1]#2(#3)#{ -\pgfkeys{/tkztan/.cd, -draw = false, -with={}, -kr = 1, -kl = 1} -\pgfqkeys{/tkztan}{#1} - \global\edef\tkz@opttan{#1} - \FPeval\x{(#3)}% - \FPeval\tkz@img{#2} - \let\tkz@yy #2% - \let\tkz@xx\x% - \let\tkz@old@img\tkz@img - \tkz@@Tan -} -\def\tkz@@Tan#1{% -\FPdiv{\tkz@old@x}{\x}{1} -\let\tkz@nexpty\tkz@img -\tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1} -\FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep} -\FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep} -\FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep} -\FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep} - % demi tgt--> droite -\FPifzero{\tkz@tan@kr}% -\else -\FPadd{\x}{\tkz@xx}{0.000001}% -\FPeval\tkz@img{\tkz@yy}% -\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}% -\FPmul{\tkz@slope}{\tkz@deltay}{1000000}% -\protected@edef\tkz@temp{ - \noexpand\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp% - (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope); -\fi -% demi tgt --> gauche -\FPifzero{\tkz@tan@kl}% - \else -\FPadd{\x}{\tkz@xx}{-0.000001} -\FPeval\tkz@img{\tkz@yy}% -\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img} -\FPmul{\tkz@slope}{\tkz@deltay}{-1000000} - \protected@edef\tkz@temp{ - \noexpand -\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp% - (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope); - \fi -} +% %<---------------------------------------------------------------------------> +% % tangente obsolete +% %<---------------------------------------------------------------------------> +% \def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}} +% +% \def\tkz@Tan[#1]#2(#3)#{ +% \pgfkeys{/@tkztan/.cd, +% draw = false, +% with = {}, +% kr = 1, +% kl = 1 +% } +% \pgfqkeys{/@tkztan}{#1} +% \global\edef\tkz@opttan{#1} +% \FPeval\x{(#3)}% +% \FPeval\tkz@img{#2} +% \let\tkz@yy #2% +% \let\tkz@xx\x% +% \let\tkz@old@img\tkz@img +% \tkz@@Tan +% } +% \def\tkz@@Tan#1{% +% \FPdiv{\tkz@old@x}{\x}{1} +% \let\tkz@nexpty\tkz@img +% \tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1} +% \FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep} +% \FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep} +% \FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep} +% \FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep} +% % demi tgt--> droite +% \FPifzero{\tkz@tan@kr}% +% \else +% \FPadd{\x}{\tkz@xx}{0.000001}% +% \FPeval\tkz@img{\tkz@yy}% +% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}% +% \FPmul{\tkz@slope}{\tkz@deltay}{1000000}% +% \protected@edef\tkz@temp{ +% \noexpand\draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp% +% (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope); +% \fi +% % demi tgt --> gauche +% \FPifzero{\tkz@tan@kl}% +% \else +% \FPadd{\x}{\tkz@xx}{-0.000001} +% \FPeval\tkz@img{\tkz@yy}% +% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img} +% \FPmul{\tkz@slope}{\tkz@deltay}{-1000000} +% \protected@edef\tkz@temp{ +% \noexpand +% \draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp% +% (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope); +% \fi +% } %<---------------------------------------------------------------------------> % point d'une courbe obsolete %<---------------------------------------------------------------------------> -\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}} +\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}} \def\tkz@fctpt[#1]#2(#3)#{% - \global\edef\tkz@optptfct{#1} + \global\edef\tkz@optptfct{#1} \FPeval\x{(#3)}% \FPeval\tkz@y{#2} \tkz@defpoint @@ -707,7 +690,7 @@ kl = 1} \protected@edef\tkz@temp{ \noexpand \tkzDrawPoint[\tkz@optptfct](#1)}\tkz@temp \let\tkz@init@xstep\tkz@tmp@xstep -} +} %<-------------------------- the end ---------------------------------------> \endinput diff --git a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt b/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt deleted file mode 100644 index 21248704ac..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct-fr.txt +++ /dev/null @@ -1,97 +0,0 @@ -% encodage utf8 ------------------------ french lisez-moi ! ----------------------------------- -readme-tkz-fct.txt 01/06/2011 version 1.16 - -Objet ------ - -tkz-fct.sty utilise tkz-base pour tracer des représentations de fonctions en 2D dans des repères orthogonaux. - -Licence -------- -LaTeX Project Public License - - -Contraintes ----------- - -- ce package nécessite etex.sty, fp.sty, le dossier tkzbase et gnuplot; - -- bien sûr, PGF/TikZ doit être installé en version 2.1 ; - -- ce package fonctionne avec utf8 et pdflatex; - -- la chaîne dvi->dvips->ps2pdf est aussi possible; - -- il ne fonctionne pas encore avec TeX et ConTeXt. - -- les premiers tests que lualatex peut être utilisé - -Installation ------------- -Si vous voulez installer ce package à la main pour tester une version beta, il - suffit de placer le package tkz-fct dans un dossier tkz (par exemple) ici : - /texmf/tex/latex/tkz, à côté du dossier tkzbase. -Il est possible aussi de le mettre dans le dossier avec vos propres fichiers. - -Le plus simple est de récupérer l'archive tkz.zip qui contient l'ensemble de - mes packages liés à tkz-base. - - -Fonctionnement -------------- -Son fonctionnement s'obtient en plaçant la ligne suivante dans le préambule : -\usepackage{tkz-fct} - -Ce package charge tkz-base et TikZ. Si vous avez besoin de xcolor.sty, il - est nécessaire de le charger avant tkz-base, afin d'éviter des conflits - entre packages. - -\usepackage[usenames,dvipsnames]{xcolor} -\usepackage{amsmath,tkz-fct} - -Documentation -------------- - tkz-fct-screen.pdf est actuellement en français mais de nombreux exemples - sont donnés. -Une documentation destinée à l'impression sera bientôt prête. Vous trouverez - ces fichiers sur mes sites : - http://altermundus.fr ou http://altermundus.com - - -Exemples --------- - Tous les exemples donnés dans la documentation, sont stockés sur mes sites - sous forme de fichiers individuels, prêts pour être compilés. - -Historique des versions - --- 1.16 c correction de bugs - maintenant le domaine par défaut est xmin:xmax - - -Comment obtenir tous les exemples de la documentation ------------------------------------------------------ - -1) Il faut modifier l fichier TKZdoc-fct-main.tex . Remplacez - \usepackage{tkzexample} par - -\usepackage[saved]{tkzexample} -\def\tkzFileSavedPrefix{tkzFct} -Les exemples sont enregistrés dans des fichiers ayant comme préfixe tkzFct. - -2) Ensuite il faut compiler les sources - $ pdflatex TKZdoc-fct-main.tex - -3) Placez tous les fichiers dans un dossier avec le script ruby - "addcontent.rb" - Lancez le script - $ ruby addcontent.rb - Vous devez obtenir un dossier "new" avec tous les exemples complétés avec en - particulier la ligne \input{tkzfctpreamble.ltx} - -4) Vous pouvez compiler tous les exemples en une seule fois. Placez les deux -fichiers tkzfctpreamble.ltx and Makefile dans le dernier dossier et lancez -$ make - - - - Alain Matthes - 5 rue de Valence - Paris 75005 - - al (dot) ma (at) mac (dot) com
\ No newline at end of file diff --git a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt b/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt deleted file mode 100644 index 887fafcfca..0000000000 --- a/macros/latex/contrib/tkz/tkz-fct/readme-tkz-fct.txt +++ /dev/null @@ -1,85 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%% english readme %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -readme-tkz-fct.txt 01/06/2011 version 1.16 - -tkz-fct.sty uses tkz-base to draw graph of functions with a Cartesian (rectangular) coordinate system. You need pgf/tikz 2.1 to use this package. You need to install Gnuplot 4.3 or higher. - -Licence -------- - -This program can be redistributed and/or modified under the terms -of the LaTeX Project Public License Distributed from CTAN -archives in directory macros/latex/base/lppl.txt. - -Features --------- - -- needs etex, fp.sty, tkz-base and gnuplot; - -- automatically loads the package TikZ; - -- compiles with utf8, pdflatex; - -- compiles using the chain dvi->dvips->ps2pdf; - -- not yet ready for use with TeX and ConText (I need more time and ideas); - -Installation ------------- - -You can experiment with the tkz-fct package by placing all of the distribution files in the directory containing your current tex file. - -You can also placing all of the distribution files in the directory : -/texmf/tex/latex/tkz. - -How to use it -------------- - -To use the package tkz-fct, place the following line in the preamble of your LaTeX document. - -\usepackage{tkz-fct} - -If you use the xcolor package, load that package before tkz-fct to avoid package conflicts. - -\usepackage[usenames,dvipsnames]{xcolor} -\usepackage{amsmath,tkz-fct} - -Documentation -------------- - Documentation for tkz-fct and tkz-base is available on my sites: - - http://altermundus.fr (en français) or http://altermundus.fr (in english) - - -Examples --------- - All examples given in documentation will be stored on my sites as standalone files, ready for compilation. - -History - --- 1.16 c correction of bugs - now default domain is xmin:xmax and not -5:5. --- 1.13 first version - -How to get all the examples : - -1) You need to modify the file TKZdoc-fct-main.tex . Replace - \usepackage{tkzexample} by - -\usepackage[saved]{tkzexample} -\def\tkzFileSavedPrefix{tkzFct} - -2) Compile the sources - $ pdflatex TKZdoc-fct-main.tex - You get in your folder all the examples with the prefix tkzFct. - -3) Put all these files in a new folder with the ruby script "addcontent.rb" - Run the script - $ ruby addcontent.rb - You get a folder with all the complete examples. The files begin with - \input{tkzfctpreamble.ltx} - -4) Now you can compile the files. A fine solution is to use a makefile . You can put the two files tkzfctpreamble.ltx and Makefile inside the last folder and now you run -$make - - - - Alain Matthes - 5 rue de Valence - Paris 75005 - - al (dot) ma (at) mac (dot) com
\ No newline at end of file diff --git a/support/autosp/MacOSX/autosp b/support/autosp/MacOSX/autosp Binary files differindex 21cf98b5b6..4a3d734e90 100755 --- a/support/autosp/MacOSX/autosp +++ b/support/autosp/MacOSX/autosp diff --git a/support/autosp/MacOSX/rebar b/support/autosp/MacOSX/rebar Binary files differindex 35bdf06a0b..83b55398fc 100755 --- a/support/autosp/MacOSX/rebar +++ b/support/autosp/MacOSX/rebar diff --git a/support/autosp/MacOSX/tex2aspc b/support/autosp/MacOSX/tex2aspc Binary files differindex bdfa4d6bc8..1948ddb493 100755 --- a/support/autosp/MacOSX/tex2aspc +++ b/support/autosp/MacOSX/tex2aspc diff --git a/support/autosp/README b/support/autosp/README index 779d7a9445..c71416bf4c 100644 --- a/support/autosp/README +++ b/support/autosp/README @@ -1,5 +1,5 @@ This is the README for the autosp package, -version 2019-12-22. +version 2020-02-06. autosp is a preprocessor that generates note-spacing commands for MusiXTeX scores. It simplifies the creation diff --git a/support/autosp/doc/barsant2.pdf b/support/autosp/doc/barsant2.pdf Binary files differindex 78b4f76baf..b51af826ba 100644 --- a/support/autosp/doc/barsant2.pdf +++ b/support/autosp/doc/barsant2.pdf diff --git a/support/autosp/doc/geminiani.pdf b/support/autosp/doc/geminiani.pdf Binary files differindex f84f30df39..e849d42f96 100644 --- a/support/autosp/doc/geminiani.pdf +++ b/support/autosp/doc/geminiani.pdf diff --git a/support/autosp/doc/kinder2.pdf b/support/autosp/doc/kinder2.pdf Binary files differindex 3bea428369..786eb52a16 100644 --- a/support/autosp/doc/kinder2.pdf +++ b/support/autosp/doc/kinder2.pdf diff --git a/support/autosp/doc/quod2.pdf b/support/autosp/doc/quod2.pdf Binary files differindex cd371ac188..e3d3798a50 100644 --- a/support/autosp/doc/quod2.pdf +++ b/support/autosp/doc/quod2.pdf diff --git a/support/autosp/doc/quod2A.pdf b/support/autosp/doc/quod2A.pdf Binary files differindex 96aa9875c8..7a64ea16e6 100644 --- a/support/autosp/doc/quod2A.pdf +++ b/support/autosp/doc/quod2A.pdf diff --git a/support/cluttex/CHANGELOG.md b/support/cluttex/CHANGELOG.md index b07933de05..2aa1b99bf1 100644 --- a/support/cluttex/CHANGELOG.md +++ b/support/cluttex/CHANGELOG.md @@ -1,3 +1,13 @@ +Version 0.5 (2020-02-06) +----- + +Changes: + +* New option: `--check-driver` +* Driver options for some packages are always checked when the output format is PDF. +* The color for EXEC messages are now cyan ([Issue #2](https://github.com/minoki/cluttex/issues/2)). +* Some bug-fixes. + Version 0.4 (2019-08-21) ----- diff --git a/support/cluttex/Makefile b/support/cluttex/Makefile index ef12dd5131..ae764ad2ab 100644 --- a/support/cluttex/Makefile +++ b/support/cluttex/Makefile @@ -21,6 +21,7 @@ sources= \ src/texrunner/message.lua \ src/texrunner/fswatcher_windows.lua \ src/texrunner/safename.lua \ + src/texrunner/checkdriver.lua \ src/cluttex.lua bin/cluttex: $(sources) build.lua diff --git a/support/cluttex/README.md b/support/cluttex/README.md index 3ed578337e..80acb125ab 100644 --- a/support/cluttex/README.md +++ b/support/cluttex/README.md @@ -90,6 +90,10 @@ Command-line Options Currently supported packages are `minted` and `epstopdf`. * `--engine-executable=COMMAND` The actual TeX command to use. +* `--check-driver=DRIVER` + Check that the correct driver file is loaded. + `DRIVER` is one of `dvipdfmx`, `dvips`, `dvisvgm`. + Can only be used with `--output-format=dvi`. Options to run auxiliary programs: diff --git a/support/cluttex/bin/cluttex b/support/cluttex/bin/cluttex index a3021e48a0..d3859a69fa 100755 --- a/support/cluttex/bin/cluttex +++ b/support/cluttex/bin/cluttex @@ -1133,8 +1133,9 @@ local function parse_aux_file(auxfile, outdir, report, seen) for l in io.lines(auxfile) do local subauxfile = string_match(l, "\\@input{(.+)}") if subauxfile then - if fsutil.isfile(subauxfile) then - parse_aux_file(pathutil.join(outdir, subauxfile), outdir, report, seen) + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + parse_aux_file(subauxfile_abs, outdir, report, seen) else local dir = pathutil.join(outdir, pathutil.dirname(subauxfile)) if not fsutil.isdir(dir) then @@ -1159,8 +1160,11 @@ local function extract_bibtex_from_aux_file(auxfile, outdir, biblines) end elseif name == "@input" then local subauxfile = string_match(l, "\\@input{(.+)}") - if subauxfile and fsutil.isfile(subauxfile) then - extract_bibtex_from_aux_file(pathutil.join(outdir, subauxfile), outdir, biblines) + if subauxfile then + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + extract_bibtex_from_aux_file(subauxfile_abs, outdir, biblines) + end end end end @@ -1192,17 +1196,19 @@ local texio_write_nl = texio.write_nl -- Packages coded in Lua doesn't follow -output-directory option and doesn't write command to the log file initscript:write(string.format("local output_directory = %q\n", options.output_directory)) + -- tex.jobname may not be available when io.open is called for the first time + initscript:write(string.format("local jobname = %q\n", options.jobname)) initscript:write([==[ local luawritelog local function openluawritelog() if not luawritelog then - luawritelog = assert(io_open(output_directory .. "/" .. tex.jobname .. ".cluttex-fls", "w")) + luawritelog = assert(io_open(output_directory .. "/" .. jobname .. ".cluttex-fls", "w")) end return luawritelog end io.open = function(fname, mode) -- luatexja-ruby - if mode == "w" and fname == tex.jobname .. ".ltjruby" then + if mode == "w" and fname == jobname .. ".ltjruby" then fname = output_directory .. "/" .. fname end if type(mode) == "string" and string.find(mode, "w") ~= nil then @@ -1363,7 +1369,7 @@ return { end package.preload["texrunner.handleoption"] = function(...) local COPYRIGHT_NOTICE = [[ -Copyright (C) 2016,2018-2019 ARATA Mizuki +Copyright (C) 2016-2020 ARATA Mizuki This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1436,6 +1442,8 @@ Options: Enable special support for some shell-escaping packages. Currently supported: minted, epstopdf + --check-driver=DRIVER Check that the correct driver file is loaded. + DRIVER is one of `dvipdfmx', `dvips', `dvisvgm'. --[no-]shell-escape --shell-restricted @@ -1518,6 +1526,10 @@ local option_spec = { long = "package-support", param = true }, + { + long = "check-driver", + param = true + }, -- Options for TeX { long = "synctex", @@ -1621,6 +1633,10 @@ local function set_default_values(options) if options.halt_on_error == nil then options.halt_on_error = true end + + if options.output_format == nil then + options.output_format = "pdf" + end end -- inputfile, engine, options = handle_cluttex_options(arg) @@ -1709,6 +1725,11 @@ local function handle_cluttex_options(arg) end end + elseif name == "check-driver" then + assert(options.check_driver == nil, "multiple --check-driver options") + assert(param == "dvipdfmx" or param == "dvips" or param == "dvisvgm", "wrong value for --check-driver option") + options.check_driver = param + -- Options for TeX elseif name == "synctex" then assert(options.synctex == nil, "multiple --synctex options") @@ -1819,6 +1840,27 @@ local function handle_cluttex_options(arg) set_default_values(options) + if options.output_format == "pdf" then + if options.check_driver ~= nil then + error("--check-driver can only be used when the output format is DVI.") + end + if engine.supports_pdf_generation then + if engine.is_luatex then + options.check_driver = "luatex" + elseif engine.name == "xetex" or engine.name == "xelatex" then + options.check_driver = "xetex" + elseif engine.name == "pdftex" or engine.name == "pdflatex" then + options.check_driver = "pdftex" + else + message.warning("Unknown engine: "..engine.name) + message.warning("Driver check will not work.") + end + else + -- ClutTeX uses dvipdfmx to generate PDF from DVI output. + options.check_driver = "dvipdfmx" + end + end + return inputfile, engine, options end @@ -2127,7 +2169,7 @@ local CMD = { local function exec_msg(commandline) if use_colors then - io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_red, commandline, CMD.reset, "\n") + io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_cyan, commandline, CMD.reset, "\n") else io.stderr:write("[EXEC] ", commandline, "\n") end @@ -2659,8 +2701,194 @@ return { safeinput = safeinput, } end +package.preload["texrunner.checkdriver"] = function(...) +--[[ + Copyright 2020 ARATA Mizuki + + This file is part of ClutTeX. + + ClutTeX is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ClutTeX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. +]] +local assert = assert +local ipairs = ipairs +local error = error +local string = string +local pathutil = require "texrunner.pathutil" +local message = require "texrunner.message" + +local right_values = { + dvips = { + graphics = "dvips", + expl3 = "dvips", + hyperref = "dvips", + xypic = "dvips", + }, + dvipdfmx = { + graphics = "dvipdfmx", + expl3 = "dvipdfmx", + hyperref = "dvipdfmx", + xypic = "pdf", + }, + dvisvgm = { + graphics = "dvisvgm", + expl3 = "dvisvgm", + }, + xetex = { + graphics = "xetex", + expl3 = "xdvipdfmx", + hyperref = "xetex", + xypic = "pdf", + }, + pdftex = { + graphics = "pdftex", + expl3 = "pdfmode", + hyperref = "pdftex", + xypic = "pdf", + }, + luatex = { + graphics = "luatex", + expl3 = "pdfmode", + hyperref = "luatex", + xypic = "pdf", + }, +} + +-- expected_driver: one of "dvips", "dvipdfmx", "dvisvgm", "pdftex", "xetex", "luatex" +local function checkdriver(expected_driver, filelist) + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: expects ", expected_driver) + end + + local loaded = {} + for i,t in ipairs(filelist) do + if t.kind == "input" then + local basename = pathutil.basename(t.path) + loaded[basename] = true + end + end + + local graphics_driver = nil -- "dvipdfmx" | "dvips" | "dvisvgm" | "pdftex" | "luatex" | "xetex" | "unknown" + if loaded["graphics.sty"] or loaded["color.sty"] then + if loaded["dvipdfmx.def"] then + graphics_driver = "dvipdfmx" + elseif loaded["dvips.def"] then + graphics_driver = "dvips" + elseif loaded["dvisvgm.def"] then + graphics_driver = "dvisvgm" + elseif loaded["pdftex.def"] then + graphics_driver = "pdftex" + elseif loaded["luatex.def"] then + graphics_driver = "luatex" + elseif loaded["xetex.def"] then + graphics_driver = "xetex" + else + -- Not supported: dvipdf, dvipsone, emtex, textures, pctexps, pctexwin, pctexhp, pctex32, truetex, tcidvi, vtex + graphics_driver = "unknown" + end + end + local expl3_driver = nil -- "pdfmode" | "dvisvgm" | "xdvipdfmx" | "dvipdfmx" | "dvips" | "unknown" + if loaded["expl3-code.tex"] or loaded["expl3.sty"] or loaded["l3backend-dvips.def"] or loaded["l3backend-dvipdfmx.def"] or loaded["l3backend-xdvipdfmx.def"] or loaded["l3backend-pdfmode.def"] then + if loaded["l3backend-pdfmode.def"] then + expl3_driver = "pdfmode" -- pdftex, luatex + elseif loaded["l3backend-dvisvgm.def"] then + expl3_driver = "dvisvgm" + elseif loaded["l3backend-xdvipdfmx.def"] then + expl3_driver = "xdvipdfmx" + elseif loaded["l3backend-dvipdfmx.def"] then + expl3_driver = "dvipdfmx" + elseif loaded["l3backend-dvips.def"] then + expl3_driver = "dvips" + else + -- TODO: driver=latex2e? + expl3_driver = "unknown" + end + end + local hyperref_driver = nil -- "luatex" | "pdftex" | "xetex" | "dvipdfmx" | "dvips" | "unknown" + if loaded["hyperref.sty"] then + if loaded["hluatex.def"] then + hyperref_driver = "luatex" + elseif loaded["hpdftex.def"] then + hyperref_driver = "pdftex" + elseif loaded["hxetex.def"] then + hyperref_driver = "xetex" + elseif loaded["hdvipdfm.def"] then + hyperref_driver = "dvipdfmx" + elseif loaded["hdvips.def"] then + hyperref_driver = "dvips" + else + -- Not supported: dvipson, dviwind, tex4ht, texture, vtex, vtexhtm, xtexmrk, hypertex + hyperref_driver = "unknown" + end + -- TODO: dvisvgm? + end + local xypic_driver = nil -- "pdf" | "dvips" | "unknown" + if loaded["xy.tex"] then + if loaded["xypdf.tex"] then + xypic_driver = "pdf" -- pdftex, luatex, xetex, dvipdfmx + elseif loaded["xydvips.tex"] then + xypic_driver = "dvips" + else + -- Not supported: dvidrv, dvitops, oztex, 17oztex, textures, 16textures, xdvi + xypic_driver = "unknown" + end + -- TODO: dvisvgm? + end + + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: graphics=", tostring(graphics_driver)) + message.info("checkdriver: expl3=", tostring(expl3_driver)) + message.info("checkdriver: hyperref=", tostring(hyperref_driver)) + message.info("checkdriver: xypic=", tostring(xypic_driver)) + end + + local expected = assert(right_values[expected_driver], "invalid value for expected_driver") + if graphics_driver ~= nil and expected.graphics ~= nil and graphics_driver ~= expected.graphics then + message.diag("The driver option for graphics(x)/color is missing or wrong.") + message.diag("Consider setting '", expected.graphics, "' option.") + end + if expl3_driver ~= nil and expected.expl3 ~= nil and expl3_driver ~= expected.expl3 then + message.diag("The driver option for expl3 is missing or wrong.") + message.diag("Consider setting 'driver=", expected.expl3, "' option when loading expl3.") + end + if hyperref_driver ~= nil and expected.hyperref ~= nil and hyperref_driver ~= expected.hyperref then + message.diag("The driver option for hyperref is missing or wrong.") + message.diag("Consider setting '", expected.hyperref, "' option.") + end + if xypic_driver ~= nil and expected.xypic ~= nil and xypic_driver ~= expected.xypic then + message.diag("The driver option for Xy-pic is missing or wrong.") + if expected_driver == "dvipdfmx" then + message.diag("Consider setting 'dvipdfmx' option or running \\xyoption{pdf}.") + elseif expected_driver == "pdftex" then + message.diag("Consider setting 'pdftex' option or running \\xyoption{pdf}.") + elseif expected.xypic == "pdf" then + message.diag("Consider setting 'pdf' package option or running \\xyoption{pdf}.") + elseif expected.xypic == "dvips" then + message.diag("Consider setting 'dvips' option.") + end + end +end + +--[[ +filelist[i] = {path = ""} +]] + +return { + checkdriver = checkdriver, +} +end --[[ - Copyright 2016,2018-2019 ARATA Mizuki + Copyright 2016-2020 ARATA Mizuki This file is part of ClutTeX. @@ -2678,7 +2906,7 @@ end along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. ]] -CLUTTEX_VERSION = "v0.4" +CLUTTEX_VERSION = "v0.5" -- Standard libraries local coroutine = coroutine @@ -2700,6 +2928,7 @@ local message = require "texrunner.message" local safename = require "texrunner.safename" local extract_bibtex_from_aux_file = require "texrunner.auxfile".extract_bibtex_from_aux_file local handle_cluttex_options = require "texrunner.handleoption".handle_cluttex_options +local checkdriver = require "texrunner.checkdriver".checkdriver os.setlocale("", "ctype") -- Workaround for recent Universal CRT @@ -2729,9 +2958,6 @@ end local jobname = options.jobname assert(jobname ~= "", "jobname cannot be empty") -if options.output_format == nil then - options.output_format = "pdf" -end local output_extension if options.output_format == "dvi" then output_extension = engine.dvi_extension or "dvi" @@ -2955,6 +3181,10 @@ local function single_run(auxstatus, iteration) logfile:close() end + if options.check_driver ~= nil then + checkdriver(options.check_driver, filelist) + end + if options.makeindex then -- Look for .idx files and run MakeIndex for _,file in ipairs(filelist) do diff --git a/support/cluttex/bin/cluttex.bat b/support/cluttex/bin/cluttex.bat index 5779e698db..df0dfd395c 100644 --- a/support/cluttex/bin/cluttex.bat +++ b/support/cluttex/bin/cluttex.bat @@ -1136,8 +1136,9 @@ local function parse_aux_file(auxfile, outdir, report, seen) for l in io.lines(auxfile) do local subauxfile = string_match(l, "\\@input{(.+)}") if subauxfile then - if fsutil.isfile(subauxfile) then - parse_aux_file(pathutil.join(outdir, subauxfile), outdir, report, seen) + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + parse_aux_file(subauxfile_abs, outdir, report, seen) else local dir = pathutil.join(outdir, pathutil.dirname(subauxfile)) if not fsutil.isdir(dir) then @@ -1162,8 +1163,11 @@ local function extract_bibtex_from_aux_file(auxfile, outdir, biblines) end elseif name == "@input" then local subauxfile = string_match(l, "\\@input{(.+)}") - if subauxfile and fsutil.isfile(subauxfile) then - extract_bibtex_from_aux_file(pathutil.join(outdir, subauxfile), outdir, biblines) + if subauxfile then + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + extract_bibtex_from_aux_file(subauxfile_abs, outdir, biblines) + end end end end @@ -1195,17 +1199,19 @@ local texio_write_nl = texio.write_nl -- Packages coded in Lua doesn't follow -output-directory option and doesn't write command to the log file initscript:write(string.format("local output_directory = %q\n", options.output_directory)) + -- tex.jobname may not be available when io.open is called for the first time + initscript:write(string.format("local jobname = %q\n", options.jobname)) initscript:write([==[ local luawritelog local function openluawritelog() if not luawritelog then - luawritelog = assert(io_open(output_directory .. "/" .. tex.jobname .. ".cluttex-fls", "w")) + luawritelog = assert(io_open(output_directory .. "/" .. jobname .. ".cluttex-fls", "w")) end return luawritelog end io.open = function(fname, mode) -- luatexja-ruby - if mode == "w" and fname == tex.jobname .. ".ltjruby" then + if mode == "w" and fname == jobname .. ".ltjruby" then fname = output_directory .. "/" .. fname end if type(mode) == "string" and string.find(mode, "w") ~= nil then @@ -1366,7 +1372,7 @@ return { end package.preload["texrunner.handleoption"] = function(...) local COPYRIGHT_NOTICE = [[ -Copyright (C) 2016,2018-2019 ARATA Mizuki +Copyright (C) 2016-2020 ARATA Mizuki This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1439,6 +1445,8 @@ Options: Enable special support for some shell-escaping packages. Currently supported: minted, epstopdf + --check-driver=DRIVER Check that the correct driver file is loaded. + DRIVER is one of `dvipdfmx', `dvips', `dvisvgm'. --[no-]shell-escape --shell-restricted @@ -1521,6 +1529,10 @@ local option_spec = { long = "package-support", param = true }, + { + long = "check-driver", + param = true + }, -- Options for TeX { long = "synctex", @@ -1624,6 +1636,10 @@ local function set_default_values(options) if options.halt_on_error == nil then options.halt_on_error = true end + + if options.output_format == nil then + options.output_format = "pdf" + end end -- inputfile, engine, options = handle_cluttex_options(arg) @@ -1712,6 +1728,11 @@ local function handle_cluttex_options(arg) end end + elseif name == "check-driver" then + assert(options.check_driver == nil, "multiple --check-driver options") + assert(param == "dvipdfmx" or param == "dvips" or param == "dvisvgm", "wrong value for --check-driver option") + options.check_driver = param + -- Options for TeX elseif name == "synctex" then assert(options.synctex == nil, "multiple --synctex options") @@ -1822,6 +1843,27 @@ local function handle_cluttex_options(arg) set_default_values(options) + if options.output_format == "pdf" then + if options.check_driver ~= nil then + error("--check-driver can only be used when the output format is DVI.") + end + if engine.supports_pdf_generation then + if engine.is_luatex then + options.check_driver = "luatex" + elseif engine.name == "xetex" or engine.name == "xelatex" then + options.check_driver = "xetex" + elseif engine.name == "pdftex" or engine.name == "pdflatex" then + options.check_driver = "pdftex" + else + message.warning("Unknown engine: "..engine.name) + message.warning("Driver check will not work.") + end + else + -- ClutTeX uses dvipdfmx to generate PDF from DVI output. + options.check_driver = "dvipdfmx" + end + end + return inputfile, engine, options end @@ -2130,7 +2172,7 @@ local CMD = { local function exec_msg(commandline) if use_colors then - io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_red, commandline, CMD.reset, "\n") + io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_cyan, commandline, CMD.reset, "\n") else io.stderr:write("[EXEC] ", commandline, "\n") end @@ -2662,8 +2704,194 @@ return { safeinput = safeinput, } end +package.preload["texrunner.checkdriver"] = function(...) +--[[ + Copyright 2020 ARATA Mizuki + + This file is part of ClutTeX. + + ClutTeX is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ClutTeX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. +]] +local assert = assert +local ipairs = ipairs +local error = error +local string = string +local pathutil = require "texrunner.pathutil" +local message = require "texrunner.message" + +local right_values = { + dvips = { + graphics = "dvips", + expl3 = "dvips", + hyperref = "dvips", + xypic = "dvips", + }, + dvipdfmx = { + graphics = "dvipdfmx", + expl3 = "dvipdfmx", + hyperref = "dvipdfmx", + xypic = "pdf", + }, + dvisvgm = { + graphics = "dvisvgm", + expl3 = "dvisvgm", + }, + xetex = { + graphics = "xetex", + expl3 = "xdvipdfmx", + hyperref = "xetex", + xypic = "pdf", + }, + pdftex = { + graphics = "pdftex", + expl3 = "pdfmode", + hyperref = "pdftex", + xypic = "pdf", + }, + luatex = { + graphics = "luatex", + expl3 = "pdfmode", + hyperref = "luatex", + xypic = "pdf", + }, +} + +-- expected_driver: one of "dvips", "dvipdfmx", "dvisvgm", "pdftex", "xetex", "luatex" +local function checkdriver(expected_driver, filelist) + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: expects ", expected_driver) + end + + local loaded = {} + for i,t in ipairs(filelist) do + if t.kind == "input" then + local basename = pathutil.basename(t.path) + loaded[basename] = true + end + end + + local graphics_driver = nil -- "dvipdfmx" | "dvips" | "dvisvgm" | "pdftex" | "luatex" | "xetex" | "unknown" + if loaded["graphics.sty"] or loaded["color.sty"] then + if loaded["dvipdfmx.def"] then + graphics_driver = "dvipdfmx" + elseif loaded["dvips.def"] then + graphics_driver = "dvips" + elseif loaded["dvisvgm.def"] then + graphics_driver = "dvisvgm" + elseif loaded["pdftex.def"] then + graphics_driver = "pdftex" + elseif loaded["luatex.def"] then + graphics_driver = "luatex" + elseif loaded["xetex.def"] then + graphics_driver = "xetex" + else + -- Not supported: dvipdf, dvipsone, emtex, textures, pctexps, pctexwin, pctexhp, pctex32, truetex, tcidvi, vtex + graphics_driver = "unknown" + end + end + local expl3_driver = nil -- "pdfmode" | "dvisvgm" | "xdvipdfmx" | "dvipdfmx" | "dvips" | "unknown" + if loaded["expl3-code.tex"] or loaded["expl3.sty"] or loaded["l3backend-dvips.def"] or loaded["l3backend-dvipdfmx.def"] or loaded["l3backend-xdvipdfmx.def"] or loaded["l3backend-pdfmode.def"] then + if loaded["l3backend-pdfmode.def"] then + expl3_driver = "pdfmode" -- pdftex, luatex + elseif loaded["l3backend-dvisvgm.def"] then + expl3_driver = "dvisvgm" + elseif loaded["l3backend-xdvipdfmx.def"] then + expl3_driver = "xdvipdfmx" + elseif loaded["l3backend-dvipdfmx.def"] then + expl3_driver = "dvipdfmx" + elseif loaded["l3backend-dvips.def"] then + expl3_driver = "dvips" + else + -- TODO: driver=latex2e? + expl3_driver = "unknown" + end + end + local hyperref_driver = nil -- "luatex" | "pdftex" | "xetex" | "dvipdfmx" | "dvips" | "unknown" + if loaded["hyperref.sty"] then + if loaded["hluatex.def"] then + hyperref_driver = "luatex" + elseif loaded["hpdftex.def"] then + hyperref_driver = "pdftex" + elseif loaded["hxetex.def"] then + hyperref_driver = "xetex" + elseif loaded["hdvipdfm.def"] then + hyperref_driver = "dvipdfmx" + elseif loaded["hdvips.def"] then + hyperref_driver = "dvips" + else + -- Not supported: dvipson, dviwind, tex4ht, texture, vtex, vtexhtm, xtexmrk, hypertex + hyperref_driver = "unknown" + end + -- TODO: dvisvgm? + end + local xypic_driver = nil -- "pdf" | "dvips" | "unknown" + if loaded["xy.tex"] then + if loaded["xypdf.tex"] then + xypic_driver = "pdf" -- pdftex, luatex, xetex, dvipdfmx + elseif loaded["xydvips.tex"] then + xypic_driver = "dvips" + else + -- Not supported: dvidrv, dvitops, oztex, 17oztex, textures, 16textures, xdvi + xypic_driver = "unknown" + end + -- TODO: dvisvgm? + end + + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: graphics=", tostring(graphics_driver)) + message.info("checkdriver: expl3=", tostring(expl3_driver)) + message.info("checkdriver: hyperref=", tostring(hyperref_driver)) + message.info("checkdriver: xypic=", tostring(xypic_driver)) + end + + local expected = assert(right_values[expected_driver], "invalid value for expected_driver") + if graphics_driver ~= nil and expected.graphics ~= nil and graphics_driver ~= expected.graphics then + message.diag("The driver option for graphics(x)/color is missing or wrong.") + message.diag("Consider setting '", expected.graphics, "' option.") + end + if expl3_driver ~= nil and expected.expl3 ~= nil and expl3_driver ~= expected.expl3 then + message.diag("The driver option for expl3 is missing or wrong.") + message.diag("Consider setting 'driver=", expected.expl3, "' option when loading expl3.") + end + if hyperref_driver ~= nil and expected.hyperref ~= nil and hyperref_driver ~= expected.hyperref then + message.diag("The driver option for hyperref is missing or wrong.") + message.diag("Consider setting '", expected.hyperref, "' option.") + end + if xypic_driver ~= nil and expected.xypic ~= nil and xypic_driver ~= expected.xypic then + message.diag("The driver option for Xy-pic is missing or wrong.") + if expected_driver == "dvipdfmx" then + message.diag("Consider setting 'dvipdfmx' option or running \\xyoption{pdf}.") + elseif expected_driver == "pdftex" then + message.diag("Consider setting 'pdftex' option or running \\xyoption{pdf}.") + elseif expected.xypic == "pdf" then + message.diag("Consider setting 'pdf' package option or running \\xyoption{pdf}.") + elseif expected.xypic == "dvips" then + message.diag("Consider setting 'dvips' option.") + end + end +end + +--[[ +filelist[i] = {path = ""} +]] + +return { + checkdriver = checkdriver, +} +end --[[ - Copyright 2016,2018-2019 ARATA Mizuki + Copyright 2016-2020 ARATA Mizuki This file is part of ClutTeX. @@ -2681,7 +2909,7 @@ end along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. ]] -CLUTTEX_VERSION = "v0.4" +CLUTTEX_VERSION = "v0.5" -- Standard libraries local coroutine = coroutine @@ -2703,6 +2931,7 @@ local message = require "texrunner.message" local safename = require "texrunner.safename" local extract_bibtex_from_aux_file = require "texrunner.auxfile".extract_bibtex_from_aux_file local handle_cluttex_options = require "texrunner.handleoption".handle_cluttex_options +local checkdriver = require "texrunner.checkdriver".checkdriver os.setlocale("", "ctype") -- Workaround for recent Universal CRT @@ -2732,9 +2961,6 @@ end local jobname = options.jobname assert(jobname ~= "", "jobname cannot be empty") -if options.output_format == nil then - options.output_format = "pdf" -end local output_extension if options.output_format == "dvi" then output_extension = engine.dvi_extension or "dvi" @@ -2958,6 +3184,10 @@ local function single_run(auxstatus, iteration) logfile:close() end + if options.check_driver ~= nil then + checkdriver(options.check_driver, filelist) + end + if options.makeindex then -- Look for .idx files and run MakeIndex for _,file in ipairs(filelist) do diff --git a/support/cluttex/build.lua b/support/cluttex/build.lua index 20c58eaebd..55d900ff02 100644 --- a/support/cluttex/build.lua +++ b/support/cluttex/build.lua @@ -91,6 +91,10 @@ local modules = { name = "texrunner.safename", path = "texrunner/safename.lua", }, + { + name = "texrunner.checkdriver", + path = "texrunner/checkdriver.lua", + }, } local imported_globals = {"io", "os", "string", "table", "package", "require", "assert", "error", "ipairs", "type", "select", "arg"} diff --git a/support/cluttex/doc/Makefile b/support/cluttex/doc/Makefile index ca87048802..0685cc8c58 100644 --- a/support/cluttex/doc/Makefile +++ b/support/cluttex/doc/Makefile @@ -1,12 +1,16 @@ -all: manual.pdf manual-ja.pdf +all: cluttex.pdf cluttex-ja.pdf -manual.pdf: manual.tex - cluttex -e pdflatex -o $@ --make-depends=manual.pdf.dep $< +cluttex.pdf: cluttex.tex + cluttex -e pdflatex -o $@ --make-depends=cluttex.pdf.dep $< -manual-ja.pdf: manual-ja.tex - cluttex -e lualatex -o $@ --make-depends=manual-ja.pdf.dep $< +cluttex-ja.pdf: cluttex-ja.tex + cluttex -e lualatex -o $@ --make-depends=cluttex-ja.pdf.dep $< -.PHONY: all +clean-outdir: + -rm -rf $(shell cluttex -e pdflatex --print-output-directory cluttex.tex) + -rm -rf $(shell cluttex -e lualatex --print-output-directory cluttex-ja.tex) --include manual.pdf.dep --include manual-ja.pdf.dep +.PHONY: all clean-outdir + +-include cluttex.pdf.dep +-include cluttex-ja.pdf.dep diff --git a/support/cluttex/doc/cluttex-ja.pdf b/support/cluttex/doc/cluttex-ja.pdf Binary files differnew file mode 100644 index 0000000000..fb5509749c --- /dev/null +++ b/support/cluttex/doc/cluttex-ja.pdf diff --git a/support/cluttex/doc/manual-ja.tex b/support/cluttex/doc/cluttex-ja.tex index b89675888f..b48cbe8f8b 100644 --- a/support/cluttex/doc/manual-ja.tex +++ b/support/cluttex/doc/cluttex-ja.tex @@ -10,9 +10,9 @@ \renewcommand\sectionautorefname{セクション} \renewcommand\subsectionautorefname{サブセクション} -\title{\ClutTeX{}マニュアル\\（ãƒãƒ¼ã‚¸ãƒ§ãƒ³0.4）} +\title{\ClutTeX{}マニュアル\\（ãƒãƒ¼ã‚¸ãƒ§ãƒ³0.5）} \author{ARATA Mizuki} -\date{2019å¹´8月21æ—¥} +\date{2020å¹´2月6æ—¥} \begin{document} \maketitle @@ -27,6 +27,7 @@ \item 入力ファイルを監視ã—ã€å¤‰æ›´ãŒã‚ã£ãŸå ´åˆã«è‡ªå‹•ã§å†å‡¦ç†ã™ã‚‹ï¼ˆ\texttt{--watch}オプション\footnote{Unixç³»OSã§ã¯ã€åˆ¥é€”プãƒã‚°ãƒ©ãƒ ãŒå¿…è¦ã€‚}） \item MakeIndex, \BibTeX, Biberç‰ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’自動ã§å®Ÿè¡Œã™ã‚‹ï¼ˆ\texttt{--makeindex}オプション, \texttt{--bibtex}オプション, \texttt{--biber}オプション） \item p\TeX 系列ã®å‡¦ç†ç³»ã§PDFを生æˆã™ã‚‹å ´åˆã€åˆ¥é€”\texttt{dvipdfmx}を実行ã™ã‚‹å¿…è¦ãŒãªã„（自動ã§\texttt{dvipdfmx}を実行ã™ã‚‹ï¼‰ + ã‚‚ã—ã‚‚DVIファイルãŒæ¬²ã—ã„ã®ã§ã‚ã‚Œã°ã€\texttt{--output-format=dvi}を指定ã™ã‚Œã°è‰¯ã„。 \end{itemize} ãªã©ãŒã‚る。 @@ -99,6 +100,10 @@ \item[\texttt{--package-support=PKG1[,PKG2,...,PKGn]}] 外部コマンドを実行ã™ã‚‹ãƒ‘ッケージ用ã®å€‹åˆ¥ã®å¯¾ç–を有効ã«ã™ã‚‹ã€‚ ç¾åœ¨ã®ã¨ã“ã‚ã€\texttt{minted}ã¨\texttt{epstopdf}ã«å¯¾å¿œã—ã¦ã„る。 +\item[\texttt{--check-driver=DRIVER}] + ã„ãã¤ã‹ã®ãƒ‘ッケージã«ã¤ã„ã¦ã€æ£ã—ã„ドライãƒãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’検査ã™ã‚‹ã€‚ + \metavar{DRIVER}ã¯\texttt{dvipdfmx}, \texttt{dvips}, or \texttt{dvisvgm}ã®ã„ãšã‚Œã‹ã§ã‚る。 + ã“ã®ã‚ªãƒ—ションã¯\texttt{--output-format=dvi}ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã«ã®ã¿æŒ‡å®šã§ãる。 \end{description} 補助コマンド実行用ã®ã‚ªãƒ—ション： @@ -265,4 +270,12 @@ Unix用コマンドã®ä¸ã«ã¯ã€è‡ªèº«ã®åå‰ã«ã‚ˆã£ã¦æŒ™å‹•ã‚’変ãˆã‚‹ã cluttex -e pdflatex --shell-escape --package-support=minted document.tex \end{verbatim} +\section{ドライãƒãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¤œæŸ»} + +\ClutTeX{}ã¯ã€ã„ãã¤ã‹ã®ãƒ‘ッケージã«ã¤ã„ã¦æ£ã—ã„ドライãƒãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’検査ã™ã‚‹ã“ã¨ãŒã§ãる。 +ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§å¯¾å¿œã—ã¦ã„るパッケージã¯\texpkg{graphics(x)}, \texpkg{color}, \texpkg{expl3}, \texpkg{hyperref}, \texpkg{xy}ã§ã‚る。 + +PDFモードã®å ´åˆã€ãƒ‰ãƒ©ã‚¤ãƒãƒ¼ã®æ¤œæŸ»ã¯å¸¸ã«è¡Œã‚れる。 +DVIモードã§æ¤œæŸ»ã‚’有効ã«ã™ã‚‹ã«ã¯ã€\texttt{--check-driver}オプションを使用ã™ã‚‹ã€‚ + \end{document} diff --git a/support/cluttex/doc/cluttex.pdf b/support/cluttex/doc/cluttex.pdf Binary files differnew file mode 100644 index 0000000000..d9e3f7df04 --- /dev/null +++ b/support/cluttex/doc/cluttex.pdf diff --git a/support/cluttex/doc/manual.tex b/support/cluttex/doc/cluttex.tex index caf99053eb..4666668d08 100644 --- a/support/cluttex/doc/manual.tex +++ b/support/cluttex/doc/cluttex.tex @@ -8,9 +8,9 @@ \newcommand\texpkg[1]{\texttt{#1}} \newcommand\metavar[1]{\textnormal{\textsf{#1}}} -\title{\ClutTeX\ manual\\(Version 0.4)} +\title{\ClutTeX\ manual\\(Version 0.5)} \author{ARATA Mizuki} -\date{2019-08-21} +\date{2020-02-06} \begin{document} \maketitle @@ -25,6 +25,7 @@ Basic features are, \item Watch input files, and re-process documents if changes are detected\footnote{needs an external program if you are on a Unix system}. \item Run MakeIndex, \BibTeX, Biber, if requested. \item Produces a PDF, even if the engine (e.g.\ p\TeX) does not suport direct PDF generation. + If you want a DVI file, use \texttt{--output-format=dvi} option. \end{itemize} The unique feature of this program is that, auxiliary files such as \texttt{.aux} or \texttt{.toc} are created in an isolated location, so you will not be annoyed with these extra files. @@ -94,7 +95,11 @@ Basic options: Print the output directory and exit. \item[\texttt{--package-support=PKG1[,PKG2,...,PKGn]}] Enable special support for shell-escaping packages. - Currently supported packages are `minted` and `epstopdf`. + Currently supported packages are `\texttt{minted}` and `\texttt{epstopdf}`. +\item[\texttt{--check-driver=DRIVER}] + Check that the correct driver file is loaded for certain packages. + \metavar{DRIVER} is one of \texttt{dvipdfmx}, \texttt{dvips}, or \texttt{dvisvgm}. + Can only be used with \texttt{--output-format=dvi}. \end{description} Options for running auxiliary programs: @@ -257,4 +262,12 @@ For example, if you want to typeset a document that uses \texpkg{minted}, run th cluttex -e pdflatex --shell-escape --package-support=minted document.tex \end{verbatim} +\section{Check for driver file} + +\ClutTeX\ can check that the correct driver file is loaded when certain packages are loaded. +Currently, the list of supported packages are \texpkg{graphics}, \texpkg{color}, \texpkg{expl3}, \texpkg{hyperref}, and \texpkg{xy}. + +The check is always done with PDF mode. +To check the driver with DVI mode, use \texttt{--check-driver} option. + \end{document} diff --git a/support/cluttex/doc/manual-ja.pdf b/support/cluttex/doc/manual-ja.pdf Binary files differdeleted file mode 100644 index 72689f7f3e..0000000000 --- a/support/cluttex/doc/manual-ja.pdf +++ /dev/null diff --git a/support/cluttex/doc/manual.pdf b/support/cluttex/doc/manual.pdf Binary files differdeleted file mode 100644 index 089181455e..0000000000 --- a/support/cluttex/doc/manual.pdf +++ /dev/null diff --git a/support/cluttex/src/cluttex.lua b/support/cluttex/src/cluttex.lua index 0ac50f90f7..380deefebe 100644 --- a/support/cluttex/src/cluttex.lua +++ b/support/cluttex/src/cluttex.lua @@ -1,6 +1,6 @@ #!/usr/bin/env texlua --[[ - Copyright 2016,2018-2019 ARATA Mizuki + Copyright 2016-2020 ARATA Mizuki This file is part of ClutTeX. @@ -18,7 +18,7 @@ along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. ]] -CLUTTEX_VERSION = "v0.4" +CLUTTEX_VERSION = "v0.5" -- Standard libraries local table = table @@ -45,6 +45,7 @@ local message = require "texrunner.message" local safename = require "texrunner.safename" local extract_bibtex_from_aux_file = require "texrunner.auxfile".extract_bibtex_from_aux_file local handle_cluttex_options = require "texrunner.handleoption".handle_cluttex_options +local checkdriver = require "texrunner.checkdriver".checkdriver os.setlocale("", "ctype") -- Workaround for recent Universal CRT @@ -74,9 +75,6 @@ end local jobname = options.jobname assert(jobname ~= "", "jobname cannot be empty") -if options.output_format == nil then - options.output_format = "pdf" -end local output_extension if options.output_format == "dvi" then output_extension = engine.dvi_extension or "dvi" @@ -300,6 +298,10 @@ local function single_run(auxstatus, iteration) logfile:close() end + if options.check_driver ~= nil then + checkdriver(options.check_driver, filelist) + end + if options.makeindex then -- Look for .idx files and run MakeIndex for _,file in ipairs(filelist) do diff --git a/support/cluttex/src/texrunner/auxfile.lua b/support/cluttex/src/texrunner/auxfile.lua index 0c69eefd13..d983e2a47e 100644 --- a/support/cluttex/src/texrunner/auxfile.lua +++ b/support/cluttex/src/texrunner/auxfile.lua @@ -31,8 +31,9 @@ local function parse_aux_file(auxfile, outdir, report, seen) for l in io.lines(auxfile) do local subauxfile = string_match(l, "\\@input{(.+)}") if subauxfile then - if fsutil.isfile(subauxfile) then - parse_aux_file(pathutil.join(outdir, subauxfile), outdir, report, seen) + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + parse_aux_file(subauxfile_abs, outdir, report, seen) else local dir = pathutil.join(outdir, pathutil.dirname(subauxfile)) if not fsutil.isdir(dir) then @@ -57,8 +58,11 @@ local function extract_bibtex_from_aux_file(auxfile, outdir, biblines) end elseif name == "@input" then local subauxfile = string_match(l, "\\@input{(.+)}") - if subauxfile and fsutil.isfile(subauxfile) then - extract_bibtex_from_aux_file(pathutil.join(outdir, subauxfile), outdir, biblines) + if subauxfile then + local subauxfile_abs = pathutil.abspath(subauxfile, outdir) + if fsutil.isfile(subauxfile_abs) then + extract_bibtex_from_aux_file(subauxfile_abs, outdir, biblines) + end end end end diff --git a/support/cluttex/src/texrunner/checkdriver.lua b/support/cluttex/src/texrunner/checkdriver.lua new file mode 100644 index 0000000000..65e33b9d21 --- /dev/null +++ b/support/cluttex/src/texrunner/checkdriver.lua @@ -0,0 +1,184 @@ +--[[ + Copyright 2020 ARATA Mizuki + + This file is part of ClutTeX. + + ClutTeX is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ClutTeX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ClutTeX. If not, see <http://www.gnu.org/licenses/>. +]] +local assert = assert +local ipairs = ipairs +local error = error +local string = string +local pathutil = require "texrunner.pathutil" +local message = require "texrunner.message" + +local right_values = { + dvips = { + graphics = "dvips", + expl3 = "dvips", + hyperref = "dvips", + xypic = "dvips", + }, + dvipdfmx = { + graphics = "dvipdfmx", + expl3 = "dvipdfmx", + hyperref = "dvipdfmx", + xypic = "pdf", + }, + dvisvgm = { + graphics = "dvisvgm", + expl3 = "dvisvgm", + }, + xetex = { + graphics = "xetex", + expl3 = "xdvipdfmx", + hyperref = "xetex", + xypic = "pdf", + }, + pdftex = { + graphics = "pdftex", + expl3 = "pdfmode", + hyperref = "pdftex", + xypic = "pdf", + }, + luatex = { + graphics = "luatex", + expl3 = "pdfmode", + hyperref = "luatex", + xypic = "pdf", + }, +} + +-- expected_driver: one of "dvips", "dvipdfmx", "dvisvgm", "pdftex", "xetex", "luatex" +local function checkdriver(expected_driver, filelist) + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: expects ", expected_driver) + end + + local loaded = {} + for i,t in ipairs(filelist) do + if t.kind == "input" then + local basename = pathutil.basename(t.path) + loaded[basename] = true + end + end + + local graphics_driver = nil -- "dvipdfmx" | "dvips" | "dvisvgm" | "pdftex" | "luatex" | "xetex" | "unknown" + if loaded["graphics.sty"] or loaded["color.sty"] then + if loaded["dvipdfmx.def"] then + graphics_driver = "dvipdfmx" + elseif loaded["dvips.def"] then + graphics_driver = "dvips" + elseif loaded["dvisvgm.def"] then + graphics_driver = "dvisvgm" + elseif loaded["pdftex.def"] then + graphics_driver = "pdftex" + elseif loaded["luatex.def"] then + graphics_driver = "luatex" + elseif loaded["xetex.def"] then + graphics_driver = "xetex" + else + -- Not supported: dvipdf, dvipsone, emtex, textures, pctexps, pctexwin, pctexhp, pctex32, truetex, tcidvi, vtex + graphics_driver = "unknown" + end + end + local expl3_driver = nil -- "pdfmode" | "dvisvgm" | "xdvipdfmx" | "dvipdfmx" | "dvips" | "unknown" + if loaded["expl3-code.tex"] or loaded["expl3.sty"] or loaded["l3backend-dvips.def"] or loaded["l3backend-dvipdfmx.def"] or loaded["l3backend-xdvipdfmx.def"] or loaded["l3backend-pdfmode.def"] then + if loaded["l3backend-pdfmode.def"] then + expl3_driver = "pdfmode" -- pdftex, luatex + elseif loaded["l3backend-dvisvgm.def"] then + expl3_driver = "dvisvgm" + elseif loaded["l3backend-xdvipdfmx.def"] then + expl3_driver = "xdvipdfmx" + elseif loaded["l3backend-dvipdfmx.def"] then + expl3_driver = "dvipdfmx" + elseif loaded["l3backend-dvips.def"] then + expl3_driver = "dvips" + else + -- TODO: driver=latex2e? + expl3_driver = "unknown" + end + end + local hyperref_driver = nil -- "luatex" | "pdftex" | "xetex" | "dvipdfmx" | "dvips" | "unknown" + if loaded["hyperref.sty"] then + if loaded["hluatex.def"] then + hyperref_driver = "luatex" + elseif loaded["hpdftex.def"] then + hyperref_driver = "pdftex" + elseif loaded["hxetex.def"] then + hyperref_driver = "xetex" + elseif loaded["hdvipdfm.def"] then + hyperref_driver = "dvipdfmx" + elseif loaded["hdvips.def"] then + hyperref_driver = "dvips" + else + -- Not supported: dvipson, dviwind, tex4ht, texture, vtex, vtexhtm, xtexmrk, hypertex + hyperref_driver = "unknown" + end + -- TODO: dvisvgm? + end + local xypic_driver = nil -- "pdf" | "dvips" | "unknown" + if loaded["xy.tex"] then + if loaded["xypdf.tex"] then + xypic_driver = "pdf" -- pdftex, luatex, xetex, dvipdfmx + elseif loaded["xydvips.tex"] then + xypic_driver = "dvips" + else + -- Not supported: dvidrv, dvitops, oztex, 17oztex, textures, 16textures, xdvi + xypic_driver = "unknown" + end + -- TODO: dvisvgm? + end + + if CLUTTEX_VERBOSITY >= 1 then + message.info("checkdriver: graphics=", tostring(graphics_driver)) + message.info("checkdriver: expl3=", tostring(expl3_driver)) + message.info("checkdriver: hyperref=", tostring(hyperref_driver)) + message.info("checkdriver: xypic=", tostring(xypic_driver)) + end + + local expected = assert(right_values[expected_driver], "invalid value for expected_driver") + if graphics_driver ~= nil and expected.graphics ~= nil and graphics_driver ~= expected.graphics then + message.diag("The driver option for graphics(x)/color is missing or wrong.") + message.diag("Consider setting '", expected.graphics, "' option.") + end + if expl3_driver ~= nil and expected.expl3 ~= nil and expl3_driver ~= expected.expl3 then + message.diag("The driver option for expl3 is missing or wrong.") + message.diag("Consider setting 'driver=", expected.expl3, "' option when loading expl3.") + end + if hyperref_driver ~= nil and expected.hyperref ~= nil and hyperref_driver ~= expected.hyperref then + message.diag("The driver option for hyperref is missing or wrong.") + message.diag("Consider setting '", expected.hyperref, "' option.") + end + if xypic_driver ~= nil and expected.xypic ~= nil and xypic_driver ~= expected.xypic then + message.diag("The driver option for Xy-pic is missing or wrong.") + if expected_driver == "dvipdfmx" then + message.diag("Consider setting 'dvipdfmx' option or running \\xyoption{pdf}.") + elseif expected_driver == "pdftex" then + message.diag("Consider setting 'pdftex' option or running \\xyoption{pdf}.") + elseif expected.xypic == "pdf" then + message.diag("Consider setting 'pdf' package option or running \\xyoption{pdf}.") + elseif expected.xypic == "dvips" then + message.diag("Consider setting 'dvips' option.") + end + end +end + +--[[ +filelist[i] = {path = ""} +]] + +return { + checkdriver = checkdriver, +} diff --git a/support/cluttex/src/texrunner/handleoption.lua b/support/cluttex/src/texrunner/handleoption.lua index d23ee1aefd..a542070038 100644 --- a/support/cluttex/src/texrunner/handleoption.lua +++ b/support/cluttex/src/texrunner/handleoption.lua @@ -1,5 +1,5 @@ local COPYRIGHT_NOTICE = [[ -Copyright (C) 2016,2018-2019 ARATA Mizuki +Copyright (C) 2016-2020 ARATA Mizuki This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,6 +72,8 @@ Options: Enable special support for some shell-escaping packages. Currently supported: minted, epstopdf + --check-driver=DRIVER Check that the correct driver file is loaded. + DRIVER is one of `dvipdfmx', `dvips', `dvisvgm'. --[no-]shell-escape --shell-restricted @@ -154,6 +156,10 @@ local option_spec = { long = "package-support", param = true }, + { + long = "check-driver", + param = true + }, -- Options for TeX { long = "synctex", @@ -257,6 +263,10 @@ local function set_default_values(options) if options.halt_on_error == nil then options.halt_on_error = true end + + if options.output_format == nil then + options.output_format = "pdf" + end end -- inputfile, engine, options = handle_cluttex_options(arg) @@ -345,6 +355,11 @@ local function handle_cluttex_options(arg) end end + elseif name == "check-driver" then + assert(options.check_driver == nil, "multiple --check-driver options") + assert(param == "dvipdfmx" or param == "dvips" or param == "dvisvgm", "wrong value for --check-driver option") + options.check_driver = param + -- Options for TeX elseif name == "synctex" then assert(options.synctex == nil, "multiple --synctex options") @@ -455,6 +470,27 @@ local function handle_cluttex_options(arg) set_default_values(options) + if options.output_format == "pdf" then + if options.check_driver ~= nil then + error("--check-driver can only be used when the output format is DVI.") + end + if engine.supports_pdf_generation then + if engine.is_luatex then + options.check_driver = "luatex" + elseif engine.name == "xetex" or engine.name == "xelatex" then + options.check_driver = "xetex" + elseif engine.name == "pdftex" or engine.name == "pdflatex" then + options.check_driver = "pdftex" + else + message.warning("Unknown engine: "..engine.name) + message.warning("Driver check will not work.") + end + else + -- ClutTeX uses dvipdfmx to generate PDF from DVI output. + options.check_driver = "dvipdfmx" + end + end + return inputfile, engine, options end diff --git a/support/cluttex/src/texrunner/luatexinit.lua b/support/cluttex/src/texrunner/luatexinit.lua index 2e2ad971ef..0135673787 100644 --- a/support/cluttex/src/texrunner/luatexinit.lua +++ b/support/cluttex/src/texrunner/luatexinit.lua @@ -17,17 +17,19 @@ local texio_write_nl = texio.write_nl -- Packages coded in Lua doesn't follow -output-directory option and doesn't write command to the log file initscript:write(string.format("local output_directory = %q\n", options.output_directory)) + -- tex.jobname may not be available when io.open is called for the first time + initscript:write(string.format("local jobname = %q\n", options.jobname)) initscript:write([==[ local luawritelog local function openluawritelog() if not luawritelog then - luawritelog = assert(io_open(output_directory .. "/" .. tex.jobname .. ".cluttex-fls", "w")) + luawritelog = assert(io_open(output_directory .. "/" .. jobname .. ".cluttex-fls", "w")) end return luawritelog end io.open = function(fname, mode) -- luatexja-ruby - if mode == "w" and fname == tex.jobname .. ".ltjruby" then + if mode == "w" and fname == jobname .. ".ltjruby" then fname = output_directory .. "/" .. fname end if type(mode) == "string" and string.find(mode, "w") ~= nil then diff --git a/support/cluttex/src/texrunner/message.lua b/support/cluttex/src/texrunner/message.lua index c7acd43f66..46a9cf77bd 100644 --- a/support/cluttex/src/texrunner/message.lua +++ b/support/cluttex/src/texrunner/message.lua @@ -89,7 +89,7 @@ local CMD = { local function exec_msg(commandline) if use_colors then - io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_red, commandline, CMD.reset, "\n") + io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_cyan, commandline, CMD.reset, "\n") else io.stderr:write("[EXEC] ", commandline, "\n") end diff --git a/support/pmx/OSX/pmxab b/support/pmx/OSX/pmxab Binary files differindex 473ea54cf3..728b070872 100755 --- a/support/pmx/OSX/pmxab +++ b/support/pmx/OSX/pmxab diff --git a/support/pmx/OSX/scor2prt b/support/pmx/OSX/scor2prt Binary files differindex f8cf79945a..acc7524143 100755 --- a/support/pmx/OSX/scor2prt +++ b/support/pmx/OSX/scor2prt diff --git a/support/pmx/README b/support/pmx/README index 492559b1b0..18a886f436 100644 --- a/support/pmx/README +++ b/support/pmx/README @@ -1,11 +1,17 @@ -This is PMX, version 2.8.4 (2018-02-12). PMX provides a preprocessor for MusiXTeX. +This is PMX, version 2.94 (2020-01-27). PMX provides a preprocessor for MusiXTeX. -pmxab builds a TeX input file based on a .pmx input file in a much -simpler language, making most of the layout decisions by itself. It has -most of MusiXTeX's functionality, but it also permits in-line TeX to -give access to virtually all of MusiXTeX. For proof-listening, pmxab will -make a MIDI file of your score. +pmxab builds a TeX input file based on a .pmx input file in +a much simpler language, making most of the layout decisions +by itself. It has most of MusiXTeX's functionality, but it +also permits in-line TeX to give access to virtually all of +MusiXTeX. For proof-listening, pmxab will make a MIDI file +of your score. scor2prt is an auxiliary program that makes parts from a score. -The author of pmxab and scor2prt is Don Simons (dsimons@roadrunner.com). +PMX may be freely copied, duplicated and used in conformance +to the GNU General Public License (Version 3, 29 June, 2007, +see included file gpl.txt). + +The author of pmxab and scor2prt is Don Simons +(dsimons@roadrunner.com). diff --git a/support/pmx/doc/ChangeLog b/support/pmx/doc/ChangeLog new file mode 100644 index 0000000000..6715e9b1e3 --- /dev/null +++ b/support/pmx/doc/ChangeLog @@ -0,0 +1,713 @@ +2.94 + Allow moving dots on main and chord note in 2-note termolos + Add definitions of \hbp and \hbpp to pmx.tex +2.91 + Tweak: insert \stdstemfalse before every user-shortened or lengthened + stem. + This cancels defaul extensions to middle line and also (with 'L') allows + stems that are longer than 4.66 but still don't reach middle line. + Allow alteration of number height in multibar rest, option n. + Fix bug introduced in 2.89 so that the "o" in "mo800" is now OK. +2.90 + Many tweaks to allow gaps at end or middle of a system using + L[n]S[x] and LC[y]. New pmx.tex. +2.88 + Comment out print*,"Changed pathname to..." since it was going + iteration when optimizing linebreaks with the undocumented option Ao. + Add nv back in as argument for getmidi, so loop transferring data + from midivel to midvelc can be executed. This corrects bug and + allows per-instrument change in midi velocities at the start + of any block + Add subroutine inst2chan to transfer midi data as noted above. Works with + Iv but buggy when used with IT and Ib +2.87 + Allow changes to and from octave treble clef. Instrument with it + must only have one staff. + Some fixes for beam multiplicity changes at staff jumps. Must still + use inline for mult. increase at downward staff jump. See sjb.pmx. +2.84 + Bug fix: dots in chordal seconds + Bug fix: Initialize ihornb for non-beamed, down xtup + Bug fix: When using "AT" with 2-note x3c rD. +2.83 + Fix problems when changing to or from octave treble clef. + Fix beaming (or not) and number location for xtups with + multiple rests. Still some problems with number height but + can be band-aided with number height tweak option. + Tweak error messages for options on "R" command. + Allow forced beam height and slope tweaks with 2-note tremolos + Allow chordal note with 2-note tremolos, adding dots as needed. + Fix call to ncmid in beamstrt when setting start height for beam of + 2-note trem, by changing arg from ivx to iv +2.82 + bugfix: beams with rests, not confused with xtups. + x option after slur index to allow slurs to go from one voice to another. + x option also for ties +2.81 + Allow string of rests to end xtup + in chordal half-note 2-note tremolo, make chord notes open. +2.80 + Add 2-note tremolos +2.78 + Expand bufq to 131072 bytes + Expand maxblks tp 9600 + Allow up to 75 pages + Index postscript hairpins from 1 up instead of by voice #. + Add option 'o' to forced beam for open notehead (\hb); set ipl(3) + Add option T[n], n=1,2,3 for single stem tremolo +2.77 + Enable AV+/-x+/-y to add vskip bigh before or after \eject +2.76 +2.75 + Bugfix: unbeamed xtups with dots: in beamn1 and beamid allow dotted 16th, and + 2 or 3 flags on shortened note. +2.74 + Bugfix: allow "0" as argument of @ command on lyrics string. + Check for and allow "\ in centered page headings with P command. + Check for and allow "\ in text dynamics with D command. + For lyrics string starting in xtuplet, insert check for inputting musixlyr. + For staff-crossing beamed xtuplet chords, if 2nd segment of a joined beam + starts with a blank rest, put '\sk' into the TeX. + To enable high-to-both beamed etup staff-crossing chord, for blank + rest at start of forced beam, shift \sk's from before to after \ib..; + so \ib is at start and note in upper voice has a beam to connect to. + Expand range of vertical xtup number shift, now stored in mult(16-22) + Check for and allow \" within lyrics strings, for umlauts. +2.73 (160121) + Dirk's "..." command, to convert "text" into \pmxlyr{text}\ and insert as + inline TeX. Replace all '~' inside "..." and not preceded with '\', by + '\lk '. Right after 2nd ", replace @[a,b][+,-]n with \at{[a,b][+,-]n}\ + Include definitions of \ly and \at in pmx.tex (2 Feb 16). After first ", + add (as type 2 string) '\\input musixlyr \' + After inputting pathname, change any '\' to '/', for Linux compatibility. +2.72 (160110) + Really finalize \mbrest...go back to 3 args to deal with clef changes. + Fine tune centered whole bar rests to deal with clef changes + Fix bug in wsclef when >1 staff per instrument, since \setclef + needs to know instrument and specify clefs on all staves for that + instrument. Ones that were not changed by user will not be printed, + and will be kept the same as before. + Fix bug with arpegii from one voice to another in same staff. +2.71 (151226) + Finalize mbrest mods +2.705 + Fix error message +2.704 (140614) + Octave treble clef + Make horizontal ornament shift (ornhshft) floating +2.703 (140323) + Option v[-]n at end of any figure will alter figdrop for rest of system +2.702 + Stem slurs. Only for ps, assume no other pos'n adjustments. Option "v" +2.701 + oC = coda (\code{10}) + Move iornq(29) (blank barline) to ipl(0) (changes in pmxb, getnote) + oG = new seqno + To do: fix grace note spacing problem (partially done) +2.622 + Redefine midtc(..) and miditran(..); clean up all transpositions/key changes + Kn[+/-...] \ignorenats at signature changes + Fix tie checks in doslur() and dopsslur() to subtract iTransAmt from nolevs + before checking and setting pitch levels levson() and levsoff() + Define midisig separately from isig. Put in common commidisig. + Use for explicit midi signature and for accid corrections to midi piches + in addmidi. +2.621 + Make keyboard rest option work in xtuplets. Created subroutine + chkkbdrests, modified make2bar to include calls to chkkbdrests as rqd. +2.620 + Allow user-defined rest height tweaks at start of beam. +2.619 + At movement break, change \nbinstruments in \newmovement macro; add + 3rd arg to \newmovement in pmx.tex; modify pmxb.for and getnote.for + to remove call to newnoi and change call to \newmovement +2.618 + Add option Ac[l,4] to set vert and horiz size and offsets to properly + center page for letter or a4 paper. +2.617 + In g1etnote, change if-check for note to use index(...) instead + of ichar(charq) since it was messing up gfortran optimizer + After pmxa, search for and remove penultimate line <blank><blank>/ + because it was screwing up linux-compiled versions + Bugfix: Increase dimension of kicrd from 7 to 10 in crdaccs(...) +2.616 (111110) + Allow hairpins to span multiple notes groups (gulps). +2.615+ (110810) + Fix midi when some instruments are transposed, by subtracting + iTransAmt(instno(iv)) from pitch values sent to via addmidi in + make2bar.for (for main notes) and docrd (for chord notes) +2.615 (110725) + Fig bug with size-setting (in topfile) when instrument has >1 staves +2.615 (110724) + Make AS[0|-|s|t]... really set sizes +2.614 + Mod notex.for to fix Terry's bug with raised dotted rests (caused + by double-hboxing). +2.613 + Bugfix: In pmxa, change "do while" limit to keep from overwriting instno. +2.612 + Enhance AS to allow s or t for smallsize or tinysize +2.611 + Error trap for "D" before any notes in a block. +2.610 + Instrument-wise key changes and transposition (incomplete) +2.603 + 101211 In getpmxmod.for, decreased nline by 2 to fix locating errors + following reading in an include file. + 101121 Added some error messages in g1etset.for setup data +2.602 + Correct slur indexing in linebreakslurs. + Account for comment lines in line count for error messages +2.601 + Bug fix: allow 24 slurs with graces +2.60 Changes made make it really big + increase mv (size of midi) ? Note: MIDI can't have >16 voices w/o + major reprogramming, and 16 may also be a problem (icmm) + nm=24 (voices) done + 24 slurs done + 24 simultaneous beams (Replace index 24 by 0, so get 0-23) + bufq*131072 (gfortran only) + getarg syntax (gfortran only) +2.523+ + Fix voice numbering for normal dynamics and text dynamics +2.523 + Version of bigpmx first posted to Hiroaki's web site. +2.522 + 5/26/10 Replace ipl bits 0-7 with ipl2, add new common for it. + With 2.521+ as starting version, incorporate bigpmx mods to allow 24 voices. + 5/13/10 Fix log2 function + 5/15/10 Fix bitwise storage for dynamics, fix segnoo string length. +2.521+ + 091025 Enable dotting 2nd part of linebreak slur or tie. + To adjust barno height due to linebreak slur, use \bnrs instead of + explicitly redefining \raisebarno (pmxb) +2.521 + Bugfix +2.520 + 090519 Enable ligfonts (special figured bass characters) +2.519 + Fix another bug which kept \sk from being output so misaligned some notes. +2.518 + Fix bugs: referencing fig data, char declaration for member of + common/comfig/ +2.517 + Allow figures in voice 1 + any one other. +2.516 + Allow figures in voice #2 +2.515+ to do: Change manual and activate rule against clef change in voice #2. +2.515 + 071222 Changes in getnote to allow auto forced beams to start anywhere. + 071206 In make2bar, shift fermataup7 to left over centered pause. + 070901 In doslur, check for nolev <=2 in case slur ends on rest in 2-line + staff (it was screwing up vertical justification). + n34 for tweaks to midi durations of quarter note septuplets. + To do: In ref250.tex, the tables where 's,t,)' is explained, the line + [+,- i] ... Vertical adjustment of the start of second segment + should it be replaced by + [s +,- i] ... Vertical adjustment of the start of second segment +2.514 + Changes in make2bar to get horizontal spacing right when normal grace + follows after grace + Changes in dograce to get octaves right for any material entered inside + \gaft, which shields transpose register changes from the outside world. +2.513 + In make1bar, near end, for forced beams starting with a rest, copy hgt and + slope tweaks to ALL notes after first, not just the second one, so if + there's more than one rest at start the tweaks are still observed. + In beamid and beamend, add stand-alone triply-flagged notes for xtups. +2.512 + Near end of pmxb, fix error trap to allow redundant 'RD' + Enable multiplicity down-up '][' within xtup. +2.511 + Introduce eskz2 for xtup #'s and bracket lengths, to remove bug caused by + adjusteskz as in bar 7 of barsant. +2.510a + Test: remove restriction on tempo changes in MIDI macros + Send to CM for beta testing. +2.509+ + To do: Correct manual on AS. "-" is for smaller staves. +2.510 + Forgot to declare litq, voltxtq as character in subroutine getgrace +2.509 + Corrected small bug in arpeggio shifting (ivx <= iv in call putarp) +2.508 + Allow graces in xtups. New subroutine getgrace. +2.507 + To do: Raise/lower figures. + To do: Add 24, 29 to list of musicsizes in manual + New sub adjusteskz to account for ask's when computing lengths of + brackets for unbeamed xtups, slopes and horizontal posn's of number + Bug fix: in beamn1, beamid, and beamend, allow unbeamed xtups w/ 2 flags + Add look-left option for keyboard rests, "L" in rest command, set iornq(30) +2.506 + Fix bug with AK, when simultaneous rests have same duration, use defaults. +2.505 + Keyboard rests AK +2.504 + Space after normal grace: option X[n] + Fixed og when nv .ne. noinst, by using sepsymq instead of '&' + (To do) length of xtup bracket when there is added non-collision space. + Trap musicsize if .ne. 16,20,24,29. +2.503 + Enable arpeggio left shift with ?-x + To do: In manual, arpeggio over 2 staves. + Allow musicsize of 24 and 29. Had to define meter font size explicitly, + also change font size for text dynamics, but not much else so far. + Bugfix in beamstrt, introduced in 2415, ip was changed before putxtn + was called, causing error in printing replacement number. +2.502 + Incorporate Dirk Laurie's patch to use { , } , for ties. + Figure height adjustment: append +[n] + Change ec font stuff in pmx.tex per Olivier Vogel's comment (CM email?) +2.501 + Readjust horizontal offset back to .8 in LineBreakTies + Fix zero-subscript (iudorn) in putorn +2.50 + Increase number of text-dynamics (dimension of txtdynq) per block + from 12 to 41. + Slur option n to override altered default curvature. + Allow default ps slur curvature tweaks with Ap+/-c +2.416 + Increase length of textdynq from 24 to 128 + (Todo) Add comment in manual about blank lines at end. + Configuration file: Define subroutine getpmxmod, check path in environment + variable pmxmoddir, check existence, read lines into bufq after setup. + Increase dimension on idynn in dodyn from 4 to 10 for max number + of marks in a bar + Increase allowable # of lines from 2000 to 4000. + (To do) Replace definition of \liftpausc per Olivier. + (To do) Fix extraneous error message if RD is placed at very end. +2.415 + Fix "AT" option: replace putxtn,topfile,beamstrt,beamid to use \xnumt + instead of redefining \xnum. Change font used to \smallfont (as for + normal xtups, + Allow slur to start on rest. +2.414 + Correct bug in crdacc when adding accidental to boundary causes number of + segments to decrease + Special rule for 3-accidental chords: If no 2nds, place them in order + top, bottom, middle. +2.413 + Correct bugs in chordal accidentals, related to left-shifted noteheads + (a) Special problems with downstem when main note needs shifting + (b) Assign 0 rank to boundary segs due to left-shifted noteheads +2.412 + Change default horiz shift of start of seg 2 of linebreak slurs: + -.7 for slurs, -1.2 for ties, + Use height of start of seg 1 slur itself for end of 1 and start of 2. +2.411 + "Apl" activates special treatment of linebreak slur/tie's; breaks all in 2. + "s" option in start of slur/tie as precursor to vert/horiz tweaks for end + of seg 1. of linebreak slur/tie, 2nd "s" for start of seg2. + With "Apl", curvature adjustments on starting slur command apply to seg 1, + those on ending command to seg 2. +2.410 + "AT" to allow Col. S.'s tuplet option. Simply input tuplet.tex and redefine + \xnum, \unbkt, \ovbkt. + "s" option in main xtup input after "x": slope tweak for bracket. mult(4) is + flag, mult(5-9) is tweak value+16 +2.409 + Bugfix in docrd for MIDI: Use original pitch in case main/chord were + switched due to 2nds. + Remove "o" from error message for "A" command. + New syntax: optional instrument number separator ":" in movement + break command to precede a 2-digit instrument. + Conditional output formats for \setname at movement break to allow + instrument numbers >9. + Bugfix in coding to raise barno due to slur over line break (pmxb) + Move date/version data statement in pmxab to a better place. +2.408 + Allow pnotes{x} when x>9.995 (mod is only to format stmt in make2bar). + Bug fix in \liftPAusep in notex.for and in pmx.tex + Character variables for version and date + For up-stem single graces slurred to down-stem, shift slur start left by + 0.8 so slur doesn't get too short. + Initialize and slide mult, same as other full-program variables in /all/. +2.407 + Allow AN[n]"[partname]" to be parsed by scor2prt as filename for part n, +2.406 + Alter PMX: put \dnstrut into \znotes in \starteq (for system spacing + equalization). + Put dimensions of double sharps and flats in crdacc (for chords). + Bugfix: Use sepsymq in LineBreakTies(..) instead of '&' + Use only first 4 bits of mult for multiplicity+8, so rest can be used + for other stuff. + Move stemlength stuff in nacc(27-30) to mult(27-30) to remove conflict. +2.405: Not published but saved for safety. + Option Aph to write \special{header=psslurs.pro} top of each page, so + dviselec will work OK. +2.404 + Allow slur to end on rest, but not start on a rest. Efaults height + of ending is default height of start (before any automatic or user- + defined djustments). User may adjust height as normal from default. +2.403 + Bugfix: turn off repeated beaming patterns.at end of non-last voice. +2.402 + Automatic repeated forced beams. Start with "[:" End with next explicit + forced beam or end of input block. + Increase # of forced beams per line of music per input block from 20 to 40 +2.401 + Optional K-Postscript Linebreak Ties, Apl. New subroutine LineBreakTies. + Makes 1st part normal shape, and starts 2nd part a little further left. + Enable arpeggios in xtuplets. Had to make time itar(narp) a real. +2.40 + Set up WrotePsslurDefaults (logical) so only write defaults on 1st Ap. + Fix non-ps-slur input to \midslur (third signed integer). Do not reverse + sign for down-slurs. +2.359 + Add error exit subroutine stop1 to make exit status g77-compatible.. + Absolute octave on xtup chord note was 2 octave too high, fixed in getnote + Fermata on vertically shifted rest: special trap in putorn() to set height. + Correct multiple grace note spacing for small staves (in dograce, + define wheadpt1 depending on staff size) +2.358 + Allow curvature corrections at start of postscript slur, in dopsslur() + Local slur options p[+|-][s|t] for [nos|s]luradjust,[not|t]ieadjust + Options for [Nos|S]luradjust,[Not|T]ieadjust,[noh|h]alfties: Ap[+|-][s|t|h] + Make t[ID] act like s[ID]t, most mods in spsslur(). + Add spsslur() to read in data for ps slurs, call from getnote. + In beamstrt, save args for SetupB in common comipb to save them for + 2nd call when xtup starts with rest + Add spacing for ornament ")" as if it were accidental, in make2bar(). + Horiz shift start and end of ps ties, dep. on stem dir'n, in dopsslur() + Horiz. shift start of ps grace slur, 2 places in dograce(). + Horiz shift end of grace slur in endslur() + Make st slurs into postscript ties. Separate subroutine dopsslur(), + Non-beamed xtup: "a" in 1st note or rest, before "x" (sets drawbm=.false.) + Allow two D"x" on same note. Introduced jtxtdyn1 in dodyn. +2.357a + Fix missing "end" in backfill.com, too-long lines in g1etnote, getnote +2.357 + Increase dimension for # of lit TeX strings from 52 to 83. + Allow blank rest in middle of xtuplet. Only mods in g*etnote(). +2.356 + Increased some dimensions from 30 to 40 to allow up to 40 pages. + In unbeamed xtups, "n" did not suppress bracket. Fixed in beamstrt(). + Fix parsing of "f,h,H,HH" in sslur. + Fix bug with cdot, note-level for slur termination (in getnote) +2.355 + Midi transposition: IT[+|-][n1][+|-][n2]...[+|-][n(noinst)], + n=# of half-steps. Restrict to mult. of 12 now, to avoid key-sig issues + Make midi recognize ps ties in doslur. + Correct ttieforsl so that it eats 2nd argument properly, using \zcharnote + to get octave right. +2.354 + With postscript slurs, make t-slurs real ties by inserting replacement + macros \tieforisu, etc, defined in pmx.tex + Check for open cresc or decresc at end of input block, using list[de]cresc + Hairpin syntax conditional on postscript slurs. Backup to fill in start + level, using new backfill(...). Separate height tweaks for + start and finish. +2.353 + K-0+n to transpose by half step (rather than just change key) + Allow "rm[n]" when nv>1. Require it in all parts. Just write a stack of + \mbrest's + Enable "Rz"; define \setzalaligne in pmx.tex. Special treatment at end + of input block before movement break, and at start of block after + movement break, using \newmovement rather than \setzalaligne, since + former already redefines \stoppiece. In second case, set rptfg2='z'. + Make clefq(nm) common between pmxb and getnote; change references in + getnote at 'M' to array elements, setting all new clefs as you go. +2.352 + Remove \parskip redefinition from pmx.tex; write it into TeX file when + "Ae" is invoked. + Ap to activate postscript slurs. Add macro \psforts to pmx.tex to redefine + \tslur in case \midslur was used. Allow slur inputs 'f','h','H','HH', + translate them thru mapping to (1,4,5,6) as \midslur params, then let + \psforts translate them back to ps slur macors. +2.351 + Number slurs from 0 up instead of 11 down, anticipating postscript slurs. + Write "\eightrm" instead of "\cmr8" for \figfont with small baseline size. + Increase length of basenameq to 44 characters everywhere. + Increase dimension of mcpitch (midi-chord-pitch) to 20. + Set default systems per page to 1 if nv>7 + In pmxb, move place where isystpg is reset to 0, so that \eject gets + written when there is just one system per page. +2.35 + Cautionary accidentals with 'c' anywhere in note symbol. + NEW pmx.tex with \resetsize to set size to normal or small depending on + current \internote. Used with new coding in dograce() to get right + new size in case user has \setsize'ed some lines to \smallvalue. For + \smallvalue-sized staves, redefine \tinynotesize to give 11-pt font. + Affects pmx.tex. + Continuation figure with fractional length. May now mix with other figures. + If another figure follow Cont-fig, separate with colon. +2.342 + Bugfix in getnote to recognize relative octave shift in grace at start of + input block. + In make2bar, initialize islhgt=0 earlier than before (possible solution + to Suse g77 compile problem that I could not reproduce).. + Bugfix in beamstrt & beamn1 for r2x6 c4D d d d +2.341 + Syntax check: Forced page break page number must be > than previous. + Bugfix: Define ivx when "sliding down" breath/caesure data in pmxb. +2.34 + New pmx.tex with redefined liftpausc + Bug fix with dotted, non-beamed xtups. +2.332 + Fix bugs in horizonal shifts, spacing, for accid's, graces, noteheads. + Allow arbitrary pos. input to W in g1etnote and getnote. +2.331 + Bug-fix in dodyn(..): typo on length of arg of txtdyn +2.33 + Caesura (oc), breath (ob). Set iornq(28), store rest of data in ibcdata() +2.321 + Rescale accidental shifts. Still use 7 bits but now map (0,127) + onto (-1.,5.35) + Fix ihornb bug in dodyn, seen with dynamics on lower-voice non-beamed xtups +2.32 (Noticed after posting) + Prohibit "/" as figure. +2.32 (Posted) + Tidied up accidentals in chords, do spacing. + Still to do: + check for "(" on chord notes in spacing algo + small accids + double accids + autoshift slurs +2.310 + Extra call to precrd ahead of spacing chk, and single-note crd/acc + shifts seem OK, but not multiple. crd/acc shifts not recorded 1st time. +2.309 + Alternate algo for accid shifts in chords. +2.308 + Auto horiz. notehead shifting added to precrd. +2.307 + Auto shifting of multiple accidentals in chords. + "Ao" in main chord note to keep accidentals in order. Set nacc(28). + If there are any manual main or chord note shifts, then + If any manual shift is preceded by "A" then + 1. Auto-shifting proceeds + 2. "A"-shifts add to autoshifts + 3. non-"A" shifts are ignored! + Else (>0 man shifts, none has "A") + No auto-ordering, No autoshifts, + End if + End if +2.306 + Initialize legacy note level to middle C in case user forgets to set + octave. + Shift xtup note? + Shift in elemskips rather than noteheads? +2.305 + Stop pmxb from multiple endvolta's at start of new page. +2.304 + "Sx" in a note means shorten stemlength by x \internotes. "Sx:" turn on + for multiple notes in the voice, "S:" last shortened note. +2.303 + vshrink stuff all OK? Description is in pmxb. +2.302 + Toggle vshrink with "Av". vshrink normally kicks in when \interstaff + hits 20. This still needs work. + Add " /" to last line if last char is not % or /. +2.301 + Check in beamn1 for single note before multiplicity down-up. + allow '.PMX' as well as '.pmx' +2.299 + Correct typo in pmxb involving PMXbarnotrue. + Replacement printed number for xtup: Unsigned integer after 'n' after 'x' + Minor upgrade parsing xtuplet options 'x...' + Correct dimension of nxtinbm in make2bar. +2.298 + Account for doubled xtup notes in subroutine getx (user-defined spaces), + by adding ndoub as an argument.. +2.297 + Created and solved compiler problem. Put drawbm(NM) in its own common. + Add new def'ns [\a|PA]usc, \lift[pa|PA]usc to pmx.tex, use them in make2bar + when \centerbar is used. + Modify \mbrest & \CenterBar in pmx.tex to use \volta@endcor etc. Have PMX + use right 2nd and 3rd args for \mbrest when key, meter, or clef changes. +2.296 + Correct printed numbers for forced beams with multiple xtups. For each beam + make list in setupb by voice of eloff (h-offset) and mtupv (printed #) + Increase lengths of jobname and infileq by 20 characters + Enable whole notes and breves as 1st or last note of xtup in beamn1 and + beamend, and wholes in beamid. +2.295 + Midi balance Ib[n1]:[n2]:...[nn] + Single-slope beam groups [...]-[...] + Trap "i" unless after accidental (main notes, xtups, chord notes) +2.294 + Unequal xtups with "D" to double a note in an xtup. + As above, "F" will (a) increase multiplicity by 1 for marked note and next + one and (b) add a dot to the first one. + Fix bug with e.g. c84 [ .d e.f ] by checking whether forced beam is on + when "." is encountered, then correcting beam start time.(end of getnote) + MIDI velocity (volume) set: Iv[n1]:[n2]:[n3]... +2.293 + Check for single notes spanning bar lines. + Correct various bugs with staff-jumping beams. (1) for 2nd segment, vxtup + must be set in make2bar since beamstrt is not called, fixing problem with + dot at end. (2) add ivjb2 to flag which voice has 2nd segment and fix + problem when >2 staves. + Add nodur to args of dodyn, so can check if stemless and avoid height tweak + Correct bug in getdyn setting flag in idynda2(0) for manual horiz. tweak +2.292a + Undo syntax check for Type 2 or 3 TeX string starting in column 1. + Meanwhile, Werner's problem with a mid-line Type 3 string has gone away?! +2.292 + Allow comments in xtuplets + Enable multiple octave jumps in grace notes. + Allow dynamics in xtuplets. + Fix bug in getdyn searching for end of text string (correct length of lineq + to 128) + Fix bug in dodyn, must ignore horiz. interaction tweak for + user-text (idno = 0) + Syntax check for Type 2 or 3 TeX string starting in column 1 + (NOTE: later undone!) + Syntax check for page number > npages at forced line break. +2.291 + Fix error in AS command (accid spacing for small systems), making only + one spec per staff, nv total. + Stop using MIDI channel 10 +2.29 + Fix error in console output format for # of bytes used in MIDI file. + Fix bug in dograce so no space is added between grace and main note when + there is a MIDI-only accidental. + Fix bug so oes?+4 works. It was too ugly to explain. + ...Different ways of storing accidental specs on input and output. + No longer zap \writezbarno in special situations. + Fix bug in dyntxt level on rest + Line spacing equalization. Add macros \starteq, \endeq, \spread, etc. + Activate with Ae. (Maybe later could input alternate values for + \upamt, \dnamt, \parskip). Put \starteq on 1st note in voice 1 + in the page, and \endeq on 1st note of next-to-last line in page. +2.28 + Flip direction of forced beam "[f..." + Fix beam numbering for staff jumping beams. Uses irest(23,24,29,30) + Fix bug in sliding ip's for txtdyn's + In dyn's allow vert. offsets +/-64, horiz +/-25.6 (store in idnyda2(1-99) +2.27 + Comment out lines in dodyn checking number of dynamic marks found. Voice + order may not be monotonic if two lines on a staff. + Literal dynamic: D"[text]" +2.26 + Allow hairpin start-stop on same note by disabling auto-tweaks in dodyn, + increasing dimension of idynn to 4 to allow 4 symbols on same note. + Increase voltxtq length from 10 to 20. + AS[-/0][-/0]... to inform PMX that "-" voices are small, and rough + accounting for ast's is done by defining effective headwidth + whead1 in makebar2 to be 0.8*whead. +2.25 + Fix logic bug with sepsym's when # of instruments changes. + Slight increases in default offsets for hairpin starts after "p" +2.24 + Hairpins D< or D> as toggle. + Many automatic position tweaks for letter-group dynamics and hairpins. +2.23 + Continued rhythmic shortcuts: space followed by "." or "," +2.22 + In call to doslur, change tno(...) to tnote(...). This was only + used when checking to slurs per stem directions, and should have been + the note duration all along. + MIDI-only accidental, bit 17 in nacc, or 27 in icrdat. + Use "i" anywhere in note symbol. +2.21 + Increase from 20 to 30 dimensions for movement breaks and midi sections. + Fix out-of-order declarations per mutex comments + Add "Bad error" and "Kluging" messages to log file. +2.197 + add /comips/ to save tie-check midi variables + For spacing of clef changes at start of input block, changed integer time + lastnodur to prevtn, so it works with xtups. Possible incompatibility! +2.196 + Fix Ickbug with time check in ncmid() + Interchange \fermataup7 and \pausec to get proper alignment + Enable French violin clef "f", number 7 in PMX, but 9 in MusiXTeX. + Add defn's of \hsp, \hspp to pmx.tex + Fix pre-slurs on xtup chord notes. + Fixed raised PAuse, define \liftPAuse + Replace \zbreve\sk with \breve. + Made "1" work as mtrdenl by doubling it and mtrnuml. BUT WAIT...what + about "o" and 1 as shorthand for 16???? Search for "Kluge" + Added "vo" (voice) as MIDI instrument 55 + Allow 3-digit page numbers (search for "toppageno") + Fix bug caused by prior fix (cancelling accid after bar line was ignored). + Fix double accids in chords +2.194 + Fix bug with accid/tie/barline/chord in addmidi by restructuring accid if + block. + Add meter to MIDI file with every pause + Purify FORTRAN? +2.193 + Increased # of in-line TeX strings from 36 to 52. + Fix entry of # of bytes in header of tempo/meter/key track to allow >255. +2.191 + Event track: Tempos, meters, keys all together. Data in comevent +2.15 + Pretty good midi capability. Still no attention to slurs on chord notes. +2.11 + 11 Dec 99 c rm1 + 11 Dec 99 "oes?", "oe?" + 11 Dec 99 Cancel slur horizontal tweaks with non-stemmed notes + 11 Dec 99 Error message for shifted, repeated ornaments. +2.10 (Version 2.1) + Fix bug with lowdot and xtuplets +2.09 + Fix bug with multiple ornament heights over beams, when one is . or _ + Error message from pmxa if rest on last note of xtup. + Enable 12 slurs. + Reinstate multiple rests at start of xtup. +2.07 + Combine consecutive type-1 TeX strings. + \midslur and \curve as 3rd signed digit in slur termination, + 2 opt.int's. + Fixed breve chord notes in docrd + Check irest(28) as well as vxtup when setting nodur for chord notes, since + vxtup isn't set until 1st *main* note in xtup + Vectorize nolev1, slope, ixrest. Klug fix for xtups with variable spacing. +2.06+ + Make deterministic the beam slope calculation when there are an even # of + slopes in list and middle two are equal magnitude but opposite sign. + pmxa Trap for "o:" before 1st note in block + Partial bug fix for 64th notes in xtuplets. + Make ixrest a vector, since with new time scheme may not finish xtup in + same notes block. + Increase max # of pages from 20 to 30 (dimensions of nsystp,..., in pmxb) +2.06 + Account for changes in nv when computing \interstaff. Add a counter + nistaff(iflb) = # of interstaff spaces per system = nv-1. Set whenever + setting isysflb(iflb). Note nv can only change at a forced line break. + Note also, iflb starts at 0! +2.05 + Automatic start of new notes group with part 2 of staff-jump beam + In make1bar, set irest bit 29 of lowest-voice note at same time, + use as flag when making notes groups. + For now, remove dummy blank line at end...it zaps terminal repeats. +2.02 + Fixed slur-counting bug for multiple, slurred, aftergraces. +2.01 + Increase to ask(1400) + Increase max forced page breaks to 18 + Define pausc for centered pause +2.0a + Insert dummy blank line at very end to handle input files w/o terminal CR-LF +pmx03r + Option m[n] in S symbol to change musicsize (for parts) + Double dotted rests now work. + Write file name to log file + Check existence of input file + Allow 24-char jobname, may end with ".pmx" + Comment out time stuff + Replace 3-argument getarg with 2-argument + iargc + Fix bug with negative noinst due to nint<=int replacement + move lovation of iv in isdat1 to allow iv>7. + Set nm=12 +pmx03q + replace int(x+.001) with nint(x) + Write TeX file name to screen and to pml. + Replace char(...) with chax(...) to sovle msdev bug. + Bug fix: macro terminations when M is on a line by itself. + Bug fix: don't accumulate space for XS in pmxa. + Streamline Macros: use pointers to bufq instead of scratch files +pmx03p + Store input file in single character array bufq. + lbuf(i)*2 is length of line i + ipbuf is position just before next line to be read. +pmx03 + Optimize read/writes +pmx02 + Fix line count (for errors) when there are saved macros +pmx01 + In optimize mode, open/close macros (Watch out for residual zz files!) + Command line input + Option Ao to optimize, otherwise normal processing +c diff --git a/support/pmx/doc/accents.eps b/support/pmx/doc/accents.eps new file mode 100644 index 0000000000..f51f041997 --- /dev/null +++ b/support/pmx/doc/accents.eps @@ -0,0 +1,1145 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: dvips(k) 5.993 Copyright 2013 Radical Eye Software +%%Title: accents.dvi +%%CreationDate: Sun Feb 21 13:36:34 2016 +%%Pages: 1 +%%PageOrder: Ascend +%%BoundingBox: 45 640 443 743 +%%DocumentFonts: TeXMUSIX20-Regular CMBX12 CMR10 CMMI10 +%%DocumentPaperSizes: Letter +%%EndComments +%DVIPSWebPage: (www.radicaleye.com) +%DVIPSCommandLine: dvips -O0.25in,-0.22in -tletter accents +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2016.02.21:1336 +%%BeginProcSet: tex.pro 0 0 +%! +/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S +N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 +mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 +0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ +landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize +mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ +matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round +exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ +statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] +N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin +/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array +/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 +array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N +df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A +definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get +}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} +B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put +}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ +bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A +mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ +SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ +userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X +1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 +index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N +/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3 +def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90 +rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 +N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop +false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A +length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} +forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{ +BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat +{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch +round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 +rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B +/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M} +B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p +-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{ +0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end + +%%EndProcSet +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def +end + +%%EndProcSet +%%BeginFont: CMMI10 +%!PS-AdobeFont-1.0: CMMI10 003.002 +%%Title: CMMI10 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMMI10. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMMI10 known{/CMMI10 findfont dup/UniqueID known{dup +/UniqueID get 5087385 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMMI10 def +/FontBBox {-32 -250 1048 750 }readonly def +/UniqueID 5087385 def +/PaintType 0 def +/FontInfo 10 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMMI10.) readonly def +/FullName (CMMI10) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.04 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +/ascent 750 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 127 /tie put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3C05EF98F858322DCEA45E0874C5 +45D25FE192539D9CDA4BAA46D9C431465E6ABF4E4271F89EDED7F37BE4B31FB4 +7934F62D1F46E8671F6290D6FFF601D4937BF71C22D60FB800A15796421E3AA7 +72C500501D8B10C0093F6467C553250F7C27B2C3D893772614A846374A85BC4E +BEC0B0A89C4C161C3956ECE25274B962C854E535F418279FE26D8F83E38C5C89 +974E9A224B3CBEF90A9277AF10E0C7CAC8DC11C41DC18B814A7682E5F0248674 +11453BC81C443407AF41AF8A831A85A700CFC65E2181BCBFBC7878DFBD546AC2 +1EF6CC527FEEA044B7C8E686367E920F575AD585387358FFF41BCB212922791C +7B0BD3BED7C6D8F3D9D52D0F181CD4D164E75851D04F64309D810A0DEA1E257B +0D7633CEFE93FEF9D2FB7901453A46F8ACA007358D904E0189AE7B7221545085 +EDD3D5A3CEACD6023861F13C8A345A68115425E94B8FDCCEC1255454EC3E7A37 +404F6C00A3BCCF851B929D4FE66B6D8FD1C0C80130541609759F18EF07BCD133 +78CBC4A0D8A796A2574260C6A952CA73D9EB5C28356F5C90D1A59DC788762BFF +A1B6F0614958D09751C0DB2309406F6B4489125B31C5DD365B2F140CB5E42CEE +88BE11C7176E6BBC90D24E40956279FBDC9D89A6C4A1F4D27EC57F496602FBC4 +C854143903A53EF1188D117C49F8B6F2498B4698C25F2C5E8D8BD833206F88FC +BD5B495EB993A26B6055BD0BBA2B3DDFD462C39E022D4A1760C845EA448DED88 +98C44BAAB85CD0423E00154C4741240EB3A2290B67144A4C80C88BE3D59AD760 +E553DAC4E8BA00B06398B1D0DFE96FB89449D4AE18CE8B27AFE75D2B84EFDB44 +143FD887F8FB364D000651912E40B0BAEDDA5AD57A3BC0E411E1AD908C77DCE3 +981985F98E258A9BB3A1B845FC4A21BCC54559E51BC0E6C22F0C38540F8C9490 +88A0E23EA504FA79F8960CC9D58611C519D3ACDC63FB2FBCAE6674357D7F2285 +4BCC9F54D3DA421D744D3A341DA3B494BB526C0734E1A8FC71501745399F7683 +FD17EC3044419A88C3979FD2ABA5B0130907B145A8462AAF0A9B511D2C8A7C7F +347FF6AC057E6512902BFD2918E2CD31DE615F5D643764E900B60287670AE18F +FDE15545D8BC69591A8CBBB275AFFC9B14BD68DF0AAB32268FB84844D4DBC7BB +C591C1AC5102C50A9C7BAAA848DA88B0519F0F5F0813BF055CF0E3C86F633A04 +B779D2E8E656DB1E09A66A85FE21CA8BA5523F472A229E83F2C4E91ABA46C733 +F3C7B5775B06C97782BC225C46385BEBDC61572458EFC5CF4190AB7A9C1C92DA +29F84BAACF552089195966E3AD9E57CC914D20B6962BE80429A16D4DF1ECAA66 +36C4343FADF0B2B48F12E2EB8443C4AA29D00949255F3968617F98B8ABD4CC12 +048B838EE243A21AC808BD295195E4AE9027005F52258BFCA915C8D9AED9A2C0 +80814F79CF943FBE3594C530A22A92E11BE80FCEC1684C4F56712D5846B0749C +9B54A979B315222F209DEE72583B03093EC38F7C5B9F9BCB21DBE8EDDAE9BE8B +75ACE6B12A31083AC8348EC84D1D29D2297A266284B7E9734E207DAF59A25F4E +4AA38509E993C5394FED76E6A2F25462685C4C86C6E8CFC9863338EC1428BDFC +74616BB1BC8948B0ED4C87C15B4405F3A7796F9DB3798FFFE8BD0A94E834817B +D5E9812E308D0CC920470A6F2CD088FCB80462BF7CB3F039A7DF3DAF5B2B5355 +E083A385CD2EAF0FC181E40E96DD7E9AB9EF5C7E6866A13B8A54718E950FE097 +EF0951A357114F18CE9933D28B3A77AA71E3CE884661F13284BCED5D5FD1A86D +543E588FF473DC2CF9A4DC312500135F29C2D0174B32018C8DBD40EF9A232883 +710A1F2AB2CD11312300ACDF789A9B7B93D2035D81D1C84984D92D78A53A00C6 +EDA94B24BBAC1AD17774A4E07E6F74ABD90415965616AD540C8ECD8C3A44EE4F +7F4F6BB6238C5062D63FA59B7BF08BE93FAEA70A2AB08FBEAAF7DBF56B95FD93 +03CA406543BA6C9527D0DF01F5108D31A51778A5EB1C93F27B72B46146A353A2 +01CACBC829603B9989A87CF64528682CCBA0562A8165B185C58A5C6BB72F5E89 +500ACCAAB8ECEFBB2640E99EAEEC4EA979AA793D013D61D8ACF8784FF8D9398F +F6A252A709324FB39509F0B3A4E725E82F53543383C6765BE556CC897C758208 +AA3AD37B0406E4A79F8F0A6C1983FC73E71CD858C0DB66ED66D5D992978614EE +1EA91EBE191E082EBA1FC040AF19A2202575C2EBEB8058833E3520FA03D2F915 +85C1ED337E457B9FEEB0C6EF2735EFDA6E0D05FA641BCF698AC6B97751E8306C +4DF00A39B8581FF53DB8F8525FDB196D85950906CCB59B8EF171349AA3B567B1 +6A00819947A995FB383C3C1709C9A2C113B2E40BB832B7D4A0FBA0B16A2C455F +55809CC425C403E9668DC66BE45B71A81C332FD4DB279D22A2959962304A8F18 +085893DAC61317D24A8F198FDAB95F3B86F0AFD35047B868A9A17037A2829A02 +BAB042F75F349E197A7EED41984C2859754CAFD0251439921C248B463B516951 +2E1322C80D73F9CBCAA63A585450275AC2492E4D3FB78E800F788254DB5E610D +CF788DF5C70FF99892BCDF16133E34B24B77C8F097F546B87C603DDB8998B66E +BACB68BA27462AF54AA405682EC96D701F0D474DECD5F95CA2102DF639EB169E +D518162C2BAE45FF698B6DE15FC6E7DE48C336C40A670FD26952A6BAB09115E1 +991F0073419F2CC2A1C08BE91096936AA0C37E4ED3CCCEE235476074B8FF1125 +6BDE3701F85532D8BB64CCC927CC335281C95EA689706F0AC717DC2CF680C754 +E5EFD7FA4BB8880B2B727A964C876D4A223069D4E6001771F0E23EAD2A4BBC80 +E76675297B2EF05F52BF4E71B3EE2BE3048CF088C79540113C66AE98B2FD3CB1 +B0741A215FD070882C52765009D7D711DAA2508F19AE7DDA15229A856AC49BC3 +4DDF40814FF96500E4B9B02D412E94623C5FDCC76C0FB8E42DF56A904FE49D65 +1DA7C53901B2EA71AB658A464D3ABDE27D9DB8D9E0B48F64E61A2495AD5D8DAB +B5E72424AD017DF37964AF911BD7FA21A5EB4775DC8E95EF0C0EB856B00D89D7 +8172A1DE8530767D317B8256103E53CFB877E10686A04F5A08F8DC58D843DEBA +FD5F40597588663D103689F6EB3EB14D06E18C8078F2538B43E712DF491FC5C6 +AF639256C8C6134B64D560D8476DEA6329D995E46CC4BC78841C59E73648B47E +BFA7DE0846422F738454AE77E822A083405289247BD7C478BE4974F742CD6051 +E99FBB1D1B3FBABFEE855174734EE45E87D0AADF32B1283B911162A9955847FD +38944D70584FAA6B1A7191C5C134B73F98EB632B69E2F0C0F94156787C34C8A3 +7622A029D58F9626B74F8A8A1F3803E0BC20E0EADEB1E99B70F1BD9F980FB751 +2A842843DE42EB142A84D5D3138629AE9EAF6F3479C423E8829C8816FA6EFA27 +DCE5580E65AA9854B1C64163DC318420CD993C15BFD76A8BA1182860A6B03D6D +22B8CF43CFE6C8AB27C64842E239CAE707D3086BADDE1D7C94E3BC96319470D6 +8D26915C575CFDD03271D6BB9DE86A0EB6EEA6E768B224A626C62A9AB48A6EDB +44F70BB5AF991CDF9736D65933E81CC57A78F623F33EC9AF535F2F25FA4EEC90 +D50DB7E87F31E971A75A33A301CA6013EEC5A4E179D695B33DADF2C98364434A +42926776000B610E17524162253F6FA638D6581C18F99EA0BD1D2E24D2424ADF +C05010D08192485153DD03930C7BF45237593E484F9851E6D464FA10FECA5D9E +0C8CCC97DE029030900CDBB491C5CF226DBF903CFE7735D939C3FDF3A20B70CE +66579B28B99313FEE914E295388C7BC8E055A2E54EA3A8206D3C8F4F7C0BA5E6 +E519419FD8CE215F7B8E9BEC604A9E3FE272A0328A24E31997C8A91E0946BCF1 +6943A97CBED2AB9FC636B49828BBB8B89E0BBC2653796431224895ABA5DAC41E +1854BD9764E86147FD7624F736F40DE3B7582EDDFD15C2BDE3F22B5A54D7DF10 +B87A1301CE85CFC061689A890A321412A13314AE96DCD3EDA75035FDD8F4AB9B +897A2C68263A68457032C469987970648BA2D88B1C5375DFEAA35A917B8A952E +EE670427942AEDB3CB599C5746180E392837D371E15D860620ABDB6AA7772C40 +A5E346661673ACA530BE3D8E3FFB895E5DA3DC23B1B43C080C77F7E47847F0F3 +F3AA5CA9E4BF75FC5EBD18D19F21A7DAA3B11CABC6E4070A15F7DBC8B05EB6AA +A02EF1B078EB66D61D6AFE41DA9B36FE7EC9EF94D1EA26282A9871E2CACB3126 +2AD49C2D9B50A6E47D8F2CCAD50992D1B430979A45FD9E76182A19964BB2A1F6 +51779A2B258DC1DF4C2F3074621286831F3848AC152DDD2BA561E6586ADA88D3 +598A2CE2CD048F027CE0008B828BD915887D7785341E8305DF2346ADB76BE99F +87B02173BDC334E9221C8DF54114A6B24C1C5340299512FA6C8C51AB4C8778CE +178CEF531C6D1B5FF0A1BE8EFF767F959BD4C345C52699A29A17B2A230842BF6 +4B011217D6D24EDAC3F6D53482786F1CA33169B90ECD499407D37CE9B70DDF78 +7B7547B32952535BA9ACD1E244447AE3FCED3AF28717083CF9590A09780984D6 +AF0743C82AE4FB3E2BB2856A4153A3967A023FFC35382D6C22D84A924900B6A6 +3DDD400E6D2418DA6C27F2FA34C075C902B89EBAE658B3C9A18EEE449DA5A379 +337DE95CB7AB3F0970CF1A5D8FAD8090E495570FDFB2FBBA79244780D8035547 +C5A55BB21A2270F724BF5D442CDC5BB9F09BE0CAE59B1C2270F0BDACE698F2C5 +DE8F66BFB9634904B161F5BA2B1950048300D69BABD312D58D89C4ED527AF7BA +7DA2478EDC2CDEE3473DD8A8ED9D891CD1FC21F23013228BB3281B71FCE959BD +6F8E9059D682A7FCC5265A0620992D4FA8D78377EB34CE3ECA070EE3707239BC +98907DB0120CE42ABA32CF97127E28382BDDFD685674279F588D4F951216C355 +821361790F64C2CC720DE97E8ECB57326C43EE47367628E05769E106868B54F4 +C33C9951908DF6FC4F5ED2C7787BD8FA591BBB3E9C6C1DA94CC5E38D9B20C886 +7D237572FF46DD896A4D6163408EA6CEFAC398EE041EAE29D577E75326CA17A6 +B072D47A7B13EC441CE6DAA042ECD02134CBFA6809A435050413817193DAEB16 +A5882C8AEA44BCF36E74E9ECCDFE7E19FF5A5DD7A94E5AB4F8702C3DA7F42325 +23C808670A0490F5B373DADE40814FF9650241D3D69C91FBC5ECE728F827D9BF +C928602E05477903449E079164CA39859C4BCA60C579F490AA455F82B5050BB3 +969AFB478E0D4A257B3356EA3CD62051FCE6C6B1929CFF85BFDF166BEF658E10 +3A55E007F38EBBB248B3F0B8ED1925106B499B762E45113AE1AC9DE09644C84B +9C08034B297314EE69BC32DB6E7D7FB9913CE5AC17E7335979E9DCCE2BAB3725 +1976155551F9706A576FE0E3ADCCF72C87683291528ECB749CB0ED291966E239 +B5E3630676BD409E08F85BC1AEC9A2D4135376284A96EA24431243BD6FE8B966 +95F11A4BB53F392E0AEFEA623064FF8A7002367B0A515635CB2D2DDFB9B4A8D7 +FE721754E81BBA548848A235B91AD4E4F7DB19CCE2F61D277FC00AB956EB93BE +44AB4970CA56BF59506C94ED160FB1E25D3DF2988A532BDB787BFB8539D22986 +FDC378AC31444E63C4727FEE121A43751043849E6DCAC5B59D0FC703AAFBBFD4 +E8B7C268F21615AD02CE9DABEFA27B5FE6A6441B619539CAB1F810F1263447AA +633F5DAF483752EF1A0421740E3A811D2D2898CBF53E7F686C9223FD7235F02D +6F90D2D48CC20AB87778DE3C6FB335E0F0EC20B5DC5B65223FE117526DE2C72F +FE839DF93CB2A7D66CD900CB325F891E311BEC932F703FB4FEFA29DB8B9C88DD +375EC71B3D58C7BC59ADA91971A3BDA1ADEA629CE6CC92BD542CDDFAA7706FB2 +6CDDE2DF07E56D6741916AE8E8744339816F3E6C38062747AA9FDA2A2678A6B7 +EFEA870AA3A4D71B25EE3013EAB1DBA34401B867C7A41AE51E0421D41D3BB83C +E120C8FEABA6E5DEC53A689C21426D4BBCB68CB37568761C360E6D4E3596FB7D +F4DEC7918E58C0293D12D6DDA7E9DCDAAD7C939F55CD1BC4A228B31E9A904156 +DA6B40B08E6ACE674618B768DD681C772A3E55FE096CF949CF3B0460ABDCD891 +D17B37B355B29AB5137899C036F31DA026244FA25FB798FBE5105BDA29F46538 +D3D3AC1001A7BCECE64DE94FFE6C354166A0F97256137BDFA07F6E22A3D1D2F4 +9588DBAE95E895BC5E64DDCBBAA8D0A22C229B42CB717FC711E7E9DF793DF80B +9F14754585A3C7E17F37B32924B9F9870DA8635E3E18BD1DCD81EDF01834D9C6 +B33F23C956C2FCBFA47D84422F583459D827D1E120B97694D12F1F54D02379C0 +D288F7104F3FFCF4F76E3494F4ACBD1BE3A15543CC680924C78A473F8E311ADF +8FE00A04C6C393DE61AD3EDA5BC031E2353076A2489391B52632387CA28A7B93 +FBB065A6EF3658AE80B1ADA47E9B2539E73A71FA75645F85ED8ECC257FB4CF26 +B6C912DE9D0F9899E70BECCB934AD32CF49A093371A9F73DE6255EBC39DE1E7F +00D0CBDABD4D0383977E694890E71FBE5C376BE5F3A80C28987417504F515C50 +909F3D31178BB9B1D085BE514F71B910A9085BD6122DDC72A150BFE266920E49 +5661BCB4BAB51D6DEFE32B616963DBD989FCDD1637B294CE4E288655FBEFA1BF +7F25BBF8CF17C2D5FD161A7C2CC9CC7490D9BF15A1D35B3BFA43ADE256E88BDA +BD490D92907C57BAC408A575EC84D6AEE070148C7C9A91C03B09FDBD792E8FF0 +C0B886AAD2EDD86541E5E579359D40E3AC312ACD3D8FD49F71BD533DDF8859B1 +BAF17F1884E331DD07CEEF93B71D492AEBAADF7A263450A7A72210CE630A0D37 +BF024BDC09ACC882816B8C22C62AE38A3A8D0F6EBC2B1B2C0B8161A8B076DD5D +4B779C0788546BB4CF57332230D237856B00D79C28A7C01D11F44B7304F69075 +94B97A745DA43D1BE561372CE611C345A843834E46AD9DDB16CABCD3FA33D6F1 +F6B5C0497F5EE5400B305CDC16A7EC286AA4D45D0EEBB9DA06AC9C5294D68EC9 +E4DC3CA2B92CE8FC0526184A86EDC7AB34D67E60AC12D9CA8FD300235EC968BA +92C6FBDA47572BC5600F25249F60AD287CBDAE980E747FCBE7EE5CD323E733F0 +63553B494D3DDEB9CC1480B5C3BB79A28E419AA65B18CB297AB383419E890E2A +CE6F98C9900CCB4675280A10CF060B8D220DDA1BE55DFA65715EABCC1AFAA271 +B1F8732341613E17B231231A0D24D4D7FC198AE04D89A99C4536217769C6FBD9 +5EE24A6302F97438F7C0E311C878F674B4477A5ADA3952CDE4055AC408B8174E +86F8FB797646DFFFE0ECA25D1BAB9A9F71F3926D3D85AA63E7A8C931D71E79E0 +AF1EAC26FADE468F4FF7F3861D14C10E3BE1F9EAFD6D3A544E8108D5DAB5B180 +3950C74818BC8AF4758A108F462EF1826647A49667F5E482038C54716856D9BC +35F29922846D2148F92F943E951D7438C73D6A60459A8003174036C64E1629CD +155D47FD04B03C023AD67CD5A70C98AB556EEAB8C48169706E5B352F6505D580 +AC945171BFE62E81F8F500438AC3B64D857BA5BC54C2C4BBB237F8FA51296255 +E66A92A61FE13FDE781D393557EB72CEBAD86511035F775FAC39A0479CCD400F +226709118F887F47CC2ECC8F79816D4A945B2845F50AFD62D8C9A9BBF4739496 +9E644BC9F7B04803B7EE75A09EAE94365F6F374B4FCEB0B506C76297564B9B6B +8B812BC3A33929AA94692572B010E6210AEAA312BDFC88BF302244AB9D587A9B +919823FD01DE12438D960944D1977800FEB49E638C32E5B188B1CA033E0C37EE +A142F746367888AA119535F0CCAF7EAA461B790EB089D2D6962E28A398439BB7 +9C9943654D7A2D765B46BC0DD1F915327F369162E1BA1BA83110B93F442905E0 +523BFF5E279508A98568CD5CFD18FABBE9D17265A9081E7BF64155A2CE3C0DF7 +88D00671AD65654709589BAD7EA65BBA811387ABA5CA0BC3F66D3D48597A0D1D +2C268375DF47CCF62166262AE4840AB03BF49BE67A05EF66328EC729F03CA5FF +AD3937FC053E223303565DC771ACF32E63DFB96D5030E787961D72D02C195C66 +B48E9AF0309DC169CFE8D16E2818DA94693A18F027DEA0D916672480464F7E22 +CA6E431FE38D3FC019BDD229E064B72C545C61C6EA55984565CCA88ACB01F744 +3B4593CC8940010E0BAAABF2916AC16E116A1D859D33BA673EB3C4E53A20890C +40AAE11ED78F50CBF337AA14142CAF866D317D14BD18C5D51051A0F07837E003 +01C38255280BF78B391745DAA0113E9DF8BA8A60659187B460BCE00EE2EF8981 +DC7B23EF5FCF822EF5291A4B1A48CE07C78463FDD89CA0A2B44CDE13F73C4354 +99BECB008D72D32547451602077C0D2F8B1B17FCE63228D1436F461BED1B4EA9 +F4EA9D66070141A23B2C6DB64E8173974BFEE3495376 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: CMR10 +%!PS-AdobeFont-1.0: CMR10 003.002 +%%Title: CMR10 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMR10. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMR10 known{/CMR10 findfont dup/UniqueID known{dup +/UniqueID get 5000793 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMR10 def +/FontBBox {-40 -250 1009 750 }readonly def +/UniqueID 5000793 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMR10.) readonly def +/FullName (CMR10) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 18 /grave put +dup 19 /acute put +dup 20 /caron put +dup 21 /breve put +dup 22 /macron put +dup 23 /ring put +dup 24 /cedilla put +dup 25 /germandbls put +dup 26 /ae put +dup 27 /oe put +dup 28 /oslash put +dup 29 /AE put +dup 30 /OE put +dup 31 /Oslash put +dup 32 /suppress put +dup 46 /period put +dup 65 /A put +dup 76 /L put +dup 94 /circumflex put +dup 95 /dotaccent put +dup 97 /a put +dup 108 /l put +dup 111 /o put +dup 125 /hungarumlaut put +dup 126 /tilde put +dup 127 /dieresis put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2DB9B8591E5F01442D8 +569672CF86B91C3F79C5DDC97C190EE0082814A5B5A2A5E77C790F087E729079 +24A5AC880DDED58334DD5E8DC6A0B2BD4F04B17334A74BF8FF5D88B7B678A04A +2255C050CB39A389106B0C672A1912AFA86A49EFD02E61E6509E50EE35E67944 +8FC63D91C3D2794B49A0C2993832BC4CDC8F7BD7575AD61BCDF42E2E421AA93E +3FF9E4FAD980256D8B377043A07FC75D6169338028692CCA8CD1FE92FD60AD26 +D57B7519B80A8F8DCE9CEE5CDF720AF268D3C14099498A843D76E3B6C0328F24 +D36EFE7F5C4E5B5C612786200C8DE3A41EE5F1FFAF4097653CFCDC8F4FD32E0B +03EDB3E413283B9EFB0AC33B055617005BC9B0057FD68C52D1B0E67F0C571685 +767F2AA85ADE4E0104A1C777733D5E318A22A9944336E5B98D965E50D31F357A +8B6EA5A0EA98E1B027CE68C2EDB149EDDD04ED74A1B3D206D471A0C11C11449B +DE190BBFEBC08C9E1B7513B43DA3134D6B11A2516E6E86B67F68C970A320D05E +94FEC57FB347606DF89989C33482BD09D011C55AA920319E7B26A205D3D0F004 +22466F09C0482A164CFB27EF6ED2B040ECCC3DCAF345B5A73676F193D43123B7 +72FD6CFC5E37930E61EBD5A6307E4DE70194E6384EC0D79DB6AD86D3B319A31C +8B0589D0FE28241D8ACE280D0530EE99C80723E560BB72AE9D53F4713181F491 +344B06D3027BA4E9E94D4305BE1D817197C54C8FF56CD6964165F6448ECC8A8A +64B48B4F0FD69299A137589E2491A283509B21A3A5772F75B7602A9F60AE559B +07A58436D04222C73EAEA72DE9A5A441F88D27C11F4F91255EFE280E91A4ACAC +1E98A4E5E6C57B9AE86FD218C3CD8F24A4104156A80F13821384E529783C52C8 +78B94AB3A0096090867ED32E8A30980E737922037F75F062BD83BF4F5929BC51 +CC22AEE2DBBAAA001CFFBFF41D258424FAD888FFF1BEAB796A44E3126159E120 +7E4025C676CF94888A1971AEF8B6764B3AF4A92D36FAF6FC56FD049710EE3782 +BC2CD84FE2473F133BE03C1346B875463F126DCAB15C7A9BCC9A727D23611462 +4E8D2BFD2466600285D79518712B8681ABCD69608E6AA9578F7BD771EC36E01A +5A17BC17E375020ECA59B43790ABEB9DF5F4FBBEF807E5699EFEAC563E1ACC5D +EFA336E75DE6D8248E9381BB110884FDC89C2F9A41EBBC9A8A1F98E6A41F68BE +EE30E25CA148C1EFF42DFF8C214A6537AB11F260B8C329A4947B5FC8DC9C5622 +4DF7BF4FBFB00380D47BABB03BC30627AA74103E553F55278F538EDD8C1E64CE +0F1398CA0AB5A86630139B4A7E8FC02804CAFF3830114640AE50D2FDA3B561B5 +C63AD7EE3347804CBB40FB1E77A6C89735DD870351C3A1811591AB493251B904 +314F65791963C0412377C1D02362C5E9655F1C3D4803CD379A8EF24C48218C2E +DF1165840462BF37DDE1B8D5FF09FA2C3B261E2F1A65ECFBE5D4EAD43B52C029 +EEB3948CB8A252CBAF545C8FA1C31E920E23A12DD7222CEF2D2A513BD758EA13 +DA33BF5FBF1D734653EB83DA2D374A5B9A0CE316F24EE375D6DF6BDA49954C2E +DB25A88821193636119D469BA66E5DAA9C92520FD4F84426A4E54273FA469084 +7517817A6EE3E21176D333825E88046F50B3CF6938AF9BA79A2F51398239EB91 +1A2D07F7FCD948427FF62F40FF95E39FE1A1AA8451411563FD5388472251C155 +69BDE9283B41900B21EB1190D06E6B13B7794FED020D2C1BDD205AE77B084BCE +EF628249398B496DE85B406FC2E1939EF00DFC84C07E26CF72EC401BAAE756E5 +7F6673216E7560D1C2A723CB405EE5CA474A07F61B81F8836482F73DC9516D67 +CE0CB770EAD755B6B356198B4B97EBB29C63456953270CCC8D5650C1D006E69D +38DE2DFEAB27DAD50A817F0D645D30AF5B75A7B53CBD3D2B8D87BD0A7E525AF3 +22F7ADDFCE31716914C2318260C2E2B4664893921B68C5A93334A361D94A759C +0D7B146D6FD94F0442D672BDA0F6432E18F3C5DFA37ADA378D95B75F413C9ED1 +BB5C606A3EC7DFB3F796F59B0478C13FD1900381EFE0BB5242D5B5D34D03AF1D +4BDC93EAF8020E26CA23C8B0E7DDEBBC6762A557067A4CE05A524188A8F02E2F +3625DA38DFCF381727887F5646A3995A8A38A5FB1E5D5EBB395FDD0B7C8E71AD +B48EEDB62AB2CE99D121435EFBBFCEEA69AE9ED8238B60CC7288DE33C766CDFE +15B767B4AE2E6CE0965E77272AC9F86023DA620548CFAC85BC751C44218A29C9 +849F1C2DCBDFAD895B54E51A569952ED50F82DC8A19F367E7E44643854EFD6B3 +FCAEB04E55E4661C82D31E2932611748480EF61FB2FBFB0CFB940BEA81AFCD84 +4C6A6332D7A600170E38A8EAFCD4F93DC153C43175434C86BC747348FAC61B76 +1FEC9027C1A193E55C80F1F20B5317AA0A05AAA36AE235F6E49F06E570FEE798 +84857D7552EA92EF3EFAD52DE39C2F8F43C59E3A957B7B926FC95FC4B60186DF +7F3523EE2AB74E294C8C4BCD8B4975E84849E0FBDA6C0B0F24A636DFA578B122 +CF97BC5089E21E9F5298D1C9F30CB8BAFF6A3A11BB4D9A0A5CF2B18D055C44CA +4FD4D8FE1AF3630907DE7E585AA811F9CD11FB2C8FC791851D651009FA5DF20B +3C33FD2FF848A9E3F5652BD294965A332DD3F246C91B0ADA34017FF2451D1394 +F9C3C95AAC6EC8062BE98E8914D51DA6A164AD13938693D446044859D03A949D +F9AC5DF4A000CDA98BB516D762CB9F6D44B5268FD0C26E88BC4A760C0F75A140 +DEBDECA4F511128B7D2805872160C55236F0A0FA7637FF0D4E94AC079CD3C8A7 +D03A5A56F26B0438B577C46011A10532FEBCAD14FBD6032E224F45691A726886 +56F305231EB2FCDF59C8BBFCB5DBD2D093A0E84D62AC93A2312CA69295E937C4 +8DBA1802B85F54B5E7E6D6216A918F911FF705D3B5CF055F1D873B96283A0B53 +59344D910CD396D883F6F7836BA65FAB4393A773A8F6BC298069E5BA38210EED +49C9D920F718E3FCE692527DC7CCE6963BF744F2C91BC5952564196D60574E86 +87A0FAB21F2DB2BD5A51D7FBD8FC19946D24E5A228462C4772F978E650ADCE3B +8D66B9C21279C531CA1C3A8ECE3420BB65837287A7222CC3673A2A5F8BBFDB60 +C719CD073EF9A23675198462C7C87B24CC92D6AEE5C25AC63855CC3281494342 +D28F3D2FDE0C183486769A4FD5B0143193D31FCB2C2A14E487BBD96D0BADBB64 +D1B56021C363A795BF10E2DB448261C363A54A4AC1182B470C457AA82DF3F5D1 +F4B329806141EBD53CAE309319B94133D7EBDC2D0453A905ADD207364371E178 +0A95C2686E3B34C4A978BFC0EE968C39ABA00889BC5149162C2B54483D44FD3B +5CFF41F611C7E03B94945F414560E874D7CF27FFD0630890D7D7EA66CBD15448 +229059E1C436BB33D69552B5367AB5D53591C4678D0C704DD3EA23F5D9E8A7AC +17D003C19E333E726FFFA2961F33C70F429085F7BFE3E2510F59B78F58B19CB4 +01B48E184BAD9020FECCE3AF52048A056981DAEA02AE78197E65855DDB170616 +F54278395D9EA50DC83761AE759F9CDEF9E1948E7002414FC05286ED793E6662 +3347F2A9AF8917493D7305B92CF93E8E9185F70015F5594084298A6C2F9FD3C0 +689F262AC9FEDC9B89577ECDE92F08D3142209FBCE7B5C0A840CC767BCA56C20 +4E4E545E2BE4D21C53855CEE4CD0AB35D1A604C0FFFF77DBAE4289752276559F +A05FEE65F45ECAF44E95E23FAB6052195C7948AF0B1126482D4E02D72BF8AB03 +DE0F1A632F7672AD9DDE70EDC82AA993678A82BEAD0BC2649C4707FD8509810D +364B5C6FE0E10772E95288C622C2F06C634F4DF8C7FD1432BC9310D5F24FEE3F +7AB324863D6DABAA1576E70643CA79EF4D7DF4105093D66CEE0F3B87D2164A7F +26EA05F5C4645B22D3E1BFD2219657712C168FD90DE801FB0F32759E80DEC1E1 +43CEEB19FED12D757205043FC98FEC62D6A8D8B97BC083B4A0E985AF7850D6FD +8716B9957C1C35A0675BC53DF672C425C79F43FDABAEE7D63F092CF271C9A9D7 +C41F40C4189510987887942E60A412B3EEC84C9A6E1AC7D54D528F5604B72C08 +94B7882621A5BF1F325B92FF96B80878CC550D1AE4D8196E41CB1251856609A5 +C4D3BD05A922D0D45E039D9450DEF8490A3E924E41434194910BF60BA1B08BE1 +B41824345627745541A4F1703E956328F6227D11C74946B38CFB096139979E56 +4E723B889B44C6D78673868C89912F8B4F0B4B485F1587A637B630F92E6072D5 +7F3B44EA6FD96BBD4FC28A6C1D90805E3BE3E42A7BC9C880762966C55BC04E01 +204D083AE976FAE6F37C94F27E68F8C0F28D52B17F6C0FD7C9150701FD78F8CE +B8E8DC9260E3974005EB5CA728171F482D765016C94D4ADFE4A42EF42212BC56 +7E4EEEE8B0D2A7856CD4E44F55C0BAB762F92CB8D64C17022D4BF3A47C12F5E6 +279FC23101FEE93753653CE8CEDC3B75C9CCB29BF1D4554C6120DE8EE750FCBB +E38B5D915206974962E320362E59B3F21B3AB1875703191043D03284D4467346 +CFF2F98CEB4845B73ED8E003E0DC94251B73E13A9B51A3F1430BCF6A21EB9B7A +65E17FA411F53BE6432F1506232B8159E008FA257F884A4A01AC53BE91754D78 +BF14A5B0FBFB9C31BF4908355F8A762052968DF526D118708CCB0B7CB5BEE285 +6DAB6CD2E3934178E60BECB11AAB5478623CF6C50C92F8BB5D1A583609028FA7 +B8A53B791BDC9EF76A124F3F7641857E4BEA0837CB36176EC9A522EA7F41B8D3 +63C37D1145367BD300F17B54522A834BBB74DE12BF9EB26ACE6F24A046D58F89 +4D4B7DF74875F1A0C1C9D97BE0849593D7B398EB4B00BEBC8C8D1497B6EF831A +A35380FFB7F1AFA4D888AA52C9482E8B1755CC209905F98F40D95B44D4DCBCB6 +67423D1BC2F3560FF0A8B4F0CAC352A4EE2C1D946E45AAEC8A6AD40303F3382C +DF0756BFA3B1ED64C169E56ED1C760F2FF0E24DC5C9F41306EF8D2628153D30A +5DCB0791126BEFD4947D7EF08301FE015F2B0008DFFCBF9F2D4D859FD43EC7D9 +C5BE237E9BF6665B7B1BEBB362F0C0C3A8D86010B9C97FA741C97C2E0513386C +9C26C235B14DD2A58BFDAC7B5F63DB4DA6D5D37D0098175A9071590E1DF66A3D +B8173A047C29D7D35557F06132CC920B5460B8AFC11D23D09A4E45D089F5EB51 +963FA1A6256E359D485107FD143B2BF21FDE9DA5744BC2615E86C31C89470CF0 +D06C6397D9FCCB316EA9989430240759D2C4945D941F159FC02327F34B042BAB +B5C3A47C78E8C1A6FBCD396B1A51CC4B020B8AD401841EDABACECDB482D6EC5B +72D2BFEB4556720FADD49D07307C8B22ACB7E310CA4151A85C71EEF70E8D15DE +B3B00F26E0E166C14647A65ADA228A3D1C89025BE059306565DB1B1EFC37D358 +8C1EB024254AFD049BA977BD4C2C605050E17940A89D0D4C5D963E792320F5DB +3706682E03D25D9E02487247819551465092CC22B6B56E93F3AB528038FEC3F0 +668F866707A19B0463BE706EC729D2EE1653AAC7E29BD25BFB3241D4792F5152 +ED415B4E7FA92C2EE5A22E27E8B75542C492E56D811C192E95542A6FE0BFE5A5 +69273C2ABED4300D491B92D2AECDD278404CB84B1BB1BD7AFEC858215837D118 +C0E928BE7E07CFEEB51A6D21375B772B8248C994564014015232A0DA4BEA1754 +3274F407FED0837A236371F1A32056240F2015B1E7F4B2CA72C6B58610A66F13 +407CFFBA5E0A2893C1F572D50F51286E9133B5A84239C9493B0574E77D281D01 +11D00683354A000C9700EAFBC1FD104EA19DFCB87470190E7E2CE26E3A6FD0FF +2620B87B82AC8686B6206B530F17E9348BC7D04B948348802CE53A312443DB87 +4DBBA5313A6A2A8DAB8A1CC9A594FF8C299281C0A261C8CB2226B732FBEEDE40 +2C6ACC74A1A61379E2E1CD5548CD908268A32FA83D8504C442EA0E183ADBF7FF +9FD09C037AB03516ECCA93FF048235BD11A25DB07F164512A079C5392AC7F889 +CE96AE5C8D9580BCAFCC087C35E76EED1A671E87C12E3045E15A687134736DF8 +DA984772AFD189D68571A2ED7256F1E204230E41D3D9DD876F938951714A3973 +0CA9310489F8E807C1C7A4E51AEA5BC030610A5D7263FF7E0F9FDE3E5E37A362 +5B919000BD94D978583B942EB79CF2BEAC33FEBC9A67272EB10865BA8FB75FD7 +9D280AB59F91B96C16C982DE848D76D8FA8620DFD7C80B7DEAE7264350D6FB3A +EF04794DA3305844A7CF718F6D1A4A3AFF6826173A076A1372ABFC54ED3AC6C2 +09C9287FC830556CA694E21CA5342ECA7B10C90AFC4783D841D7B1E34FA3DB7A +2B706F3E21B0FBAB23E7257962FC3BC309CEA2C7239A9D6B44CC96825115ABD2 +AF9A2566D2F3382C01569FBDB94C8D664A5DA0F7DC3DD140CA77C743D7BC1420 +324ECF9E4780280EB119885E96A6C619CE3C0C8E1E264E2DEB137E5DC8149786 +486D65667ECF47B1A1E20E9E6E4FC8323E0BC8E61BDD3BCDFC6575C69C03E31A +EFFC290472CBBD049DE3F840AEE37A2486034240F80E75D8A79E0762377DF660 +52B12EAA16D678990B11A9BFBC03C1D4FCDA9FD4FFBB3E88352438102F10B7C5 +9F04C013B6575B5E948FAB58EA691984A0E54E6B9F3F505FFFEF74D06FA1CDF3 +4B8A95904C8A2763AA8AF5B71D00F5DE09DC1CDF87A08B6D181453063E14C12D +B7BB3775A6E2A901636273D9EEB833EA8CF20FD83AE899E28DADE10EEEC20BD7 +BD93085A4B1AC80AC1AE8280C14767F1A487BD066007A0D050317BD081131A14 +6EA0898ED59E46DA7B6254BDCCBC660686E2EDA0E77A705A653733BB5C5497D0 +B130359F866CF293FB6EF0C2AC5BAA2DB0DED045E2DED3A2612D078333260359 +16CF0CCB272D34767EA069E0F0B0D42327A18529D72E890EDA6195C2688438ED +E9ACDBEED41E81CA8EB5E43C2B09CE266EFCA03F2D7FF57F12B06F9E54FCC6A6 +546676F6FFC5B8B7D3F0982B6FF0D21D949309F0C0B175CC1D0976F8C55C6AED +6E821C39041E22D91AB30922F2B2EC2746BC7DAB484991542FBC82D87B487507 +559AB466F73EE23C2D3194DC5CE4C9AE66D3164613AC5CBB3DB501B64DA7C91B +C7ED2EE9027FC0906820B35D4F2CF66C4F9CE4A884B7C07155BCA884ECA5EB3A +ABB83F84DB1F5639599DC7D3F51241AB5D95C3BCB7AB1EC90B4BC989F74FB354 +04B2D7366A34D335A47B8C00C05CB423482BF6C7970A95545424A08AFF9A035B +7F83F52B65A9799CE76E303B85664B624C65E9CA58184C7BE2BB9D9C86A4DE5A +8165EE3DA2E652B5022EE7893896BABD88931DE1D538F615787645DF5ACBBA0B +A8E5B899A37321AA7D4B283AC9234978C2DD81813A1EE5DB6EC170DAC1B6EF02 +94892635B498765C07A38D2E9DB0B7581B11056C28278F89B0E60998379C07EB +C0EAEDC32AA69B8B836F92A61AFD35688315B2C3F860632FC13E4BDFB63214BC +41CC6859EAB3AC3034449213CAB99FA1D216563419CD6D6CE4E1B56F33E6C654 +7AA9DCB5B05FC068DF02AC32408C8010AD004F6CCA9887830927F8CBCD49CDB5 +18CAC1EAFF815FF2F6F527F936948201565003022C6C7390B4E3C2B219FB4F76 +9F12BD25CA7B3B61D1A2F8DFEE795D04D5428B42FB66E0C254AF7B7A10CEF7FD +E5ADA6B0DE25D015E874D9781C6E58BA3DED8555858792C68064773D72E45B84 +ADAD33B9E15B5A6A25612F737876399278839E3C2111A05D71CA7D9E3F827A2C +A8FC1D6F2939F0631048FFD7F31682DA828E01531857A3BD1BD163518B525EDB +3004C44AEAE92C7D6E49A68F23BC5D249C4F34A7414158B385AEDF0D4068E59E +572F18EA1B164627634D49F5942122649EE6B65CFB15D184DE32D70E116BC5EB +64FDE5E007E243BC3270D1D797D8A63194586DD11A074F3F0B29ABD81E289B58 +C0B3D0FE267EE0682D21664D35522EADAC9FFE1131374EB2AADDB2337DB2A016 +EF151F02BF3BAA09ABE4C1BB62EDA276008395A897AEC52D74BB6747FB9CD5A6 +33DF53752834D0BEA5CD32D55AA3E61DCAE5E57A9D3AD3DED4F1EB816ED38265 +BF356222C354FBF375EC58C2E9FA510419AB80F1B121E0DBB1291EABC3C1681B +9266B0BAA7F004B5D37F7FC2942673BE5FD5E91307DC570EDF6AB622B948DBD7 +507294E341DBDFA8FE1EEE5C4C8248E590D6C483705CB60F40C4860B1EE04F59 +972D72EA028CA0FD447F078A7CD8B1719D6C9C458980A3690A84614077D7D036 +EE1B9492E53D785C12B6AD35172B26943C56487BB7DDF90F0B10B975B4E3B65F +483BC8155E7DAD9D0E23A165C83FC3D6CACC6E5C69CDE3EDEE000C3C6CEB6EC4 +1CE1FA470E7F992C0D5CC50A36A9037DAF6FD2A332787E2DC69F55D9D312A15B +5D2711A37DCF54B21AB4A5DFD1227CBB21912F2881FA513340102CC18D64411A +41FB44D0E3A577D784872CA691EC93BB025AD0760B0D69011C6F6E6000F11FC2 +357FA3ABC25330D3134DE8F40C716B11D0A6E396D355576B9E53C70763B26763 +27EC212DBEF80F9865CDBD6441ABC890E170EFFC12D2D1F2356F8A3D634E5AA9 +137DBDD228B75223D15695B6ED06E7FB334F4F2A5BEB4C0A925139CDAEF7E741 +7850981E2FC2BB60E3AB70FBF4A282CE3CB43CD00D5017219264F47E5F287393 +BDE47F4A0FB2D029B166D01B44818AF5389329FE1DB14432617CA186D413D7FB +DE7A1DE16C177B128893D0DE27431534700371469A49A9C05D6FABB7A8C644DE +59BF031EF5BA8990633918F5A211CC9414A94BE79E2F704DEEEB76DAD21733DE +55FA05C2A592D1E80050D3E2B615F6F492F8D3AA12B7E2928E87443D6FE06977 +66C2C86C378E8C16EACC723052C57A8D7CA479E41B23C66518608AC5D90D8ABF +8C1492282910DA2DF652D357596E3A2D629461953F256D85FFA25FBAE4BF76AE +8BB9A8C848963020A5B15F862E7DCC78F25D7C5647AC7A395E0A83ED0A777D02 +3E226271C826E5FF80FBAF21BC9EA91B74EC159DA81A275C732DACE2E77C4444 +9EF06590F446448C1DADBEF2BCEE271D2BA5DA1874A485BE3CBF2F8211576162 +D806F8F5A1C1D177D8345299B536DCB10CE7B05165DCEEFA72DC1B32829F1580 +5AF829D5869F2C70B0233569EF120DFC5F5FB5FEDADF4E23A07F6C0E1387DD54 +F5C8BD071C4E9F79ED12C18200177C729F813D56D632F88A4EF310FEDE65CF0A +519FB5A109CA9D14EB30F6F4C1B85C7C52B1620851BE2D39031BCFA0821FED4A +2A8D9F8B0FEE253FA7BD5DCFEC68DCAC374CC58F53516ECD13D631D0220B9D12 +A4FB00F763274628831334E1E727FEE910CD83EAF19D803FA4B566D7ACAA1BB5 +BB81CDFB6FEE81AFCC44A5C176DDF5EFF2C02F57FE5DDAEF20AAEE8645E1F5AC +047A8204F464CF29A60BA4DEAE3FFB9A394A21568AA5756B2072DB14584DFAEC +37FF325F2C397C3D4B3BC97F1CC3EEFB3E577C48B5548AF39513A0614101B04C +BDDA982E68D06BEF3405EEEAF0E94D35858F00E6A27320CF515B7B8AF90D0682 +E89F0DE665C15797687C7632A189CF44A025208FBB7013739BC3BBEC27564A3E +4D7B473606A827BE2D3F3CE87AE338F0EC679E1C63E8243807390B2D12C84419 +356DF4AAEBB939DE320592ADCBD738746D3E9F1CCFFB3932AE80CE06895EACC8 +15D11C5043C96E89E9C036EE6C2191D26958AA329DDE6CAB1E9FEF16322F936A +48395AB4A3F9CEAC274305B54CCE2C3B7D51A061E3F7734DE2DB7D9E0B333DAC +A34F1E77B2FC8CF7B612D1D4861AE5458EF2CEE3F3D44FD65FDC0F4AB30BA6AC +4245F76C39075D9EC1A987BD461FC72472E528053EC041E396333C90480C82F2 +BFEE3E5238AB3271A5B75ECE9721E484AEA8DEFA2A7580CE960BFB314E1BCD17 +59871F1D84EBFE2F44AA6A60FF72940BA3ECFA1C2AD0E4174917B2684EF827C7 +9E742336A93039AF47F5F3FD6ED94DC2FD9C5DEB0EC87EBF8DE7F77FCB8A5EA2 +C99F29B4A22D9E9AD1345ACE0F492497BACB4DB51595758AFDC9C644CC5BF728 +A2044B1C0EE6096E008AD67226A9ABBB491C4139F1F5F2B8AB0B4503D1E9AA8E +377610666E66BF183BFCA55397E2CC27E11DCFA24B47253A03A99363DD7B4CE5 +38113E5BC6BCCBCE4D0F09A5DC24D41FDD14AC7C31D7A36B38DE952F20E91B9F +1FFF741056B0E064DF6E7494F86F8C3939211D916712A414BB10FACF6C427A7D +2A858E0999113780E725D31915DB1B2049FA929E4D61960B8408BF7CE6B50320 +2AD177075BED89D832B806286039E75042D590F24D8FE9F50D35EC6BBAFB7C8E +37A821C28E4BCB80DD25CAF8C992AB1C122C7ED7BA6583A6C2EB5F2781310B9F +71EF1D05A873B258256AD59910E1B9D0959793EC2AE0FDEB52BB3553777BF90A +75073302BBE80809A0E934D63F193DF73DB857E80BB677C002F5B67650D9D434 +956C7787A6E90159AA49D316055F12C89AF17686542CC2D5F3E338816E6A00C6 +D1F4A994FD05DD0D2954B32F80C37FD41E6CD2CFF2A335D8E21BDEAC7BDE74DB +E7654F3BBD951BF1781785213D442C049956A04CB4C3DD6BB91A7926694EC48C +B03CF1EACFD31FEE3C7AFFFF0C541ABCE1D7B9AD890D6BC64614C5CF9B2479B4 +E7C3BDF225EDD7CE0EAF2EC676BF0059B715DD5462BA30D79D3DBD0851B8BC5D +A5D6AE5DB8C2A8676394B9AFC566EE1F7C23694636BECCF37854EB8D1A83149B +DB16A1AFE7D791B07EB542990B715D2F0275F485F8A27B768569194196139732 +69D39C7AC30DC3D3C5CD3B5E0513A540D0C7575D56000265BDDF7E05182EAB8A +2552D56AA3C47CCD8C1D6E639E7F193BE97BC04E27182EBC4DAF4EDF918D5DFF +4919FDAB604E024605457F1542C9D6103231E07E329746C603BB348538AA9E7E +A10777B121C420A66285B634B8AB297A5D347483B3D007AA801A46BCA9E0AE04 +79A2DE64C1D02FD6CAB479553AA9B765C965D69113E9FAC007352614C0B6C531 +C06E1725F3921569489DAEBA2A55A24376D02217FB64BD239285BC326D3CA20C +489EEEE1EE3B133ED53C51EAB75CF06C2B39A0898B7CC02FE9FAAE87F5A611B1 +D378B62358BF5E25F65788D4F82CB6337B999E290BB4071162282D094BE1C031 +BC75811A1DD5E64C58133F9A3E0EBC98FE3E53527BB50F8BE40D53CE6E71799B +0C843BA365A2F4BABA71C8F79B55F4F4B85119DC42AD7FBA3CFE5A2C05726643 +A5487ACDE14AD769C9FC397A5AAEFCD3D40868AFE8EE3233385559F8207716EF +512E25143354112A94A8078E716ACFC5623ADEDCB1A2AAC15697873546780162 +645D80F81FABAFA22D9083A3C41D2DE357174437979F6EBF8F421F50EF88D987 +33C2DFE909C8C5A88B62917924175E42D35054A32489D47C933BCE7D86B6E212 +A934304AE22716B20C8EB6F4E3BA93D4195967818AC4CDAD4D349F459C06B793 +E2E898D2E498EC6EE98660AF2E60E5A9821E3FB5D5882F227F5E02F7552A84D1 +5D6CD8EC3984DAC23909C658DDDC822CD31C8BF81F3C97ACB070F0FB855070AE +5D6C0A45E70C0BC64BA6EF14A8EE2797590E6D3576CC4E86F01A83EA8F7A255A +3DD9F7399710FFC6DFDBFD53FDA46C8F4E3CA5C117DCBF87E337517F39CF2A81 +DA04465265B92D93A6176BB021339917ABC323B11AED08B5B3D616DEB8FA7B76 +51CA42570F44CF369F7B491D1916BD5CF6DA9C0E373AF9C87FFDEE82C88D4662 +0819A46222B5CA0725F074B827A868D4872655A2BD4FB49E60F202CF6991AD87 +365EDCDDE2FB1EC836470B81B8C9C85DBBF03EE94C0954BA226146FB8921E919 +8EBC370BCEFD816C3ABA3EDB74B4B0A0C0FCF9D014AD737B1E4E99330959659D +7E66B007D290E2243487507C2378201CE997FFE034CB211FE6A09ED38DD14C29 +490263CB36DA7E7AD15456A98B2CD42EBD483AA357ED46F6FECFB20A448221C2 +75E205F217EDAFED6CA09BCE61E8CBC89F09F91750A1CB36D5E23009C938389C +E30A3886FE98AECCB04093C0DDC1AC4A2265D1A370F7AAFCC119EAC81400B855 +6F77DE10D0077EACE4FAA4B1579EA116FFA6C2438F1EFA03A226E33CFC7B84E3 +41BC8CD681027AFEEAB6C0CF88498A1F22A9523974FCE5B9EFC9DB09F0BBE4F4 +39B2E3492CB90468C5D8B8C94CA7847135E6EC3A7D157D101E7A9750DD47D956 +7F5F4EFE3945BD5CD0F249C067A94120A37D4D22E38D5E473887DE036CBBBA11 +B787067D0B48DC3FAF66EC7E190BBCEF473F3785C5FA226BB9E115F6013EE2A4 +52B9019599553C2346B347A6C8E863921B24278DA29CF6437A796C44BFE76A46 +D8C0539B41792E6BB9F821F8CE3296FE6A233884F91A1EF27A5E189C27712418 +383B0C6AF161ECB1B7CADA28487C67CE56285D3D4DC520D171AC6C66FE1F4182 +FD039DA2F5CA498F00A80DE6B199E69ADB7F2A2612217F9FA876C0B3FBA488DB +5F3AD3F66A5AA600D818F876D2C76AAD1D911CCCFD2670AB6296FA60279A82E0 +E3579DF4826697FB1F0283A69E757D8935884179C5451AF8B399B48DC3C28FFA +A903DD15CD931F9328E806306889A3A8708B089A0BB453B52C71537278B7C081 +6D22FA50FCB41BAC3820EE915955268578F64C07E7499C16184B911E125BA281 +B53B4A29C6B53E99D39B8BA609BFF6403FC8F3C98E06FA6DF9C7AD42F76F0750 +7109D4C9FFDAD720DACFB5D84704E39BAC39CA4834EAE46C01EA49A82F82B438 +760EE11B29E9DF9512827E980E594B34FCF388FE34B8C5A8E15A468A50E7A1B4 +ECCED1D2386F3BD5B9EB4C4A30FB76CDE3917F660B6CBD804F6D1C6AE0403C2D +6B40A6D5F13F2624279924A9A1BE472F17A18D466E40C5FEFE673E4C7CC2CCE6 +A1007F22D5F42C9DD1DE9F35FD693AF04668D139B7ADC4C9CBB6153042EFC469 +91EB6730C4FBF1874AE24D20FE93AFE4948E6D5285AAFAA103FED500328B88FE +F05AB71B6683B2DAD793448FB2ECFC3360B577EDCF1A384230B0E0C1EC47A11E +7A31EB3B224FF6B7BE8201F4BCA49B03780BBC753F789350328C9C422AE18B04 +1C14524B86373BA9C73D98CB661689ABD0D2A966D98AEE56BB6042243ACDBF91 +184AEFDDF2B41942B72B6C3358D233BB6DC8B1761DF56B5F15C00A159F80102D +E7D02DCDFADB7B173F7B37EAF206A731236678E41A14DA8FCD63F26517225F33 +5929F33A68F459299FBABE2094675D7D023B8364FD57138773D1EF33CC620CF7 +9F7506F77EB5951F5D1C51E15FB7EA1369CE5B7148A9D22B34F30880A19A7B99 +A57B26A897BE67183F5D457BF1C4A71380D410C321D2580C33213CC9CB07372C +EDAE3C4111BD41E90DC26CAD0A10AD2104DA0D4BFB3A62282A3F3DFFF850A985 +39C3D57505E266EBC2E91A27A14F0E917B9A8F6681195746A3C7558F3CFCAF00 +C871F110811D0EFCDBA3A9F3F3C56C43003D26486C972D8211C41DC1B4AA2335 +2AB46E4C3F6F3D70BD58A146484F41F0D3ACE414063200AAE1A03BC431E452DC +1359911A5432037E3820545D5262DCD426912116AA1C2CD77C4F82A0CB9C2941 +891A235128E627886D6BAEFED699554DF04BA4F7B9AFEEA8E276FEB648A794E8 +6574A8A647A730DF4EEF6160CBA9A5CB2CEE710542DD0BD787F492CA713F41E7 +D41F3630EF019546860E5872D5C5419E03A1BF2612C4C30C1C4FF61D61F1B9DE +E020DF01A876D068274BBB50F9C6DCCA060524818BF1CABBE668D5C3B6BADBEE +EAAC69E6A7C87B849A5040E293799892A6F516C8E748948532BF285ACD182CD6 +426AB87E99B4A3086C0D40563FAB9873954311D4ECD4071B45A5A18DE65034D0 +CC5768DC673243A7E81D77858E63FCFE7F11E29102901C518A2837DEED861E2D +433DF012A2EC910BBF595C1EC78C641A6316A2268F1DD5393F08D1728139F37D +B2EC3507F7CB271C03FCAED8334EACE169D0DFB7C516C6AE99F17428CCA633BF +2862AB61B33656C96859B7F15937038F75F3C648C3E7D4054EF64DDADC38DF59 +C8460B2B86A2BD6ADB913472083A122FD5378E3F86AEF654A8B0CAEA7480D92F +0333BC18983EE00EAE93CC6C6845BB435E2DAAED437DB4D0AA569322D1E59613 +84FBF63BD521236742C9FAC67070F026EAEC3455C90F1D36E21DFFAF0B828F45 +1AE2E31A0B5B889F84F3F7A2C2BC1BE64CD3D925B4222284727A23837191BEE0 +404C80BDE4CCFB9AA802F3002A2924F449D390BB0BE17AB7384BBA04AC9E6375 +FE9BAD741CD5267EF8BDE5D7CC3F82379973A653EC4EA229981975CA2832C2E8 +2B12307F60C854A327057CA2DC2DE0A5D2E096C832747168BBC25A3F5D47A279 +08FBECD7EAC521F78BDE171FFF2A3B0A3534A3E5466BAA838CB92AFF9F0924FF +69E1675AC424EAD43E622096C792EE26645F1458326424E96582E7F178E8C52B +75FF37BB7F4332DD9B83746022FBC96286ED617F30D6087BDB8D72F20BB9FA08 +AB4090DEBED843C4D8C479494019ED7C604962EB78B915C7332D78A626D76FFD +B3D1BDB0EFC34C0DAC467D633AC93D98B7D56608733918E9BD9A3648564F4308 +3C1EF4617B7B3480C591C3F2AABA930D3162AEDB1E661EBDC830383A9D5CAF97 +11E55EA2D5AE36ACA2155A504947187A4EE6587FFE33198D8D9145770C400B2C +FD8191467179CC979A6FBE6DCD379BBE240514E2F15A362AEDF369A4D9F59C30 +BF14BB039FAD6866B77B8CAF088EEF2F506BBA1977CECCABF7595A94260615D8 +0538013DEC9B305E9255FB5DD2478F07049BEC46D3CEF5D19BB35FE555DA224C +F9BDAFA574C89BC62032085C8514E7D56FE84483E550EBD7FE4E7B4F3925D25C +B59A77177E120E4E9447DD10437B610C53A3184CB168C739E8288273419F3393 +ECB3AC0907CDEFC793B960637F99B884637328F690D0B3CFD6FAEAB79F30D94E +0DB440205A7C7E8500B2A419910DAE632270967D2117044E079B5DC46A7AA32E +C49EA316416F6A5375930A6B2B261BBB7AA059CB4F971B887DA18756C63AF40E +413EC7001D7284DD1772B5AD304A0696EAFD72719DC22B9CD36B19038696F871 +E4E0121CD16AB1A57866017B2102C6595DF82189E330018956CCD377F80301B2 +5EFDDF1C5ED9C7CB2DDC67444F9333A69F835EAD82334D1289FA059A3C0D5E3E +5F6751536A0BD1DC82EEB54BCC8B6385AA1DC3DC759694F69474E1AE46618C6D +49CE13EDE23F7387C697011834C42B47B6408CB2235EF200D7016470436A9DC2 +4D6EC38B7CF0DC4D3D10540B6D884A8CF8B9CA6C08A3A9ED75BBC804E7305EDA +409B97C5B6E7B5C107E5755B3BE89104D40B5DE63173B33D7B8BDFD4E2CE1356 +775BB53D5EC5DADE022EEAAB9004161842E7CA8CF452BA74CB6839FBCDA9B119 +DBECEE1118C073908430BD400CC34D2184FD6315149EFBEF420363062771EBE5 +E9B713DE4118D491FF00E54DE454C726ADB7F1E08137B8B11B937D9421F7377A +D51616DE54341BC82D0EC1564615853F80C33BA1C0F4C15BC485A8CCBEDC1A3A +F638986F53C9E7E917AED236E40DE4220811B76FB5DC312EC0E452D03A24176E +4F33E7082A9C50A057776DCAC54ECFF72DDA6EDE24493D13E3A0A3218FCC9AB0 +0D05389E41F6070DB554201FD0CF869287C990A1525B2C201F31B10586ABEB98 +7F7159C50DC857A15217A30657E3072F7F4A419FEDC6296C7E0F43B16A51E399 +9B03CE2BE43628A1A4EB141D70B634B91DB1711BB8E7CE101D43CB6740D8CC70 +EFC295ED5F578DD576E42D1510A1014A8ADA918043658F4BBAD3574A6133A609 +9B5CF5CC326D63F48C8C468735375DE35A9D64E4484719AADF563235E334F1CD +1882B2FA73AC2EC4B342162D997416B9EC92E83590466066363516F67D419769 +1D58134739543B229703DE48891740B8E656C1B528D31966E3889C0B6706D3BE +C34C93838A1A27722AF8AC284EC003E909131C78A3EFB616425213101789FE1F +D6C344DDCD333087C09C92A32A3C698325FE575968912BC23BA338DEB7D243B1 + +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: CMBX12 +%!PS-AdobeFont-1.0: CMBX12 003.002 +%%Title: CMBX12 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX12. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX12 known{/CMBX12 findfont dup/UniqueID known{dup +/UniqueID get 5000769 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX12 def +/FontBBox {-53 -251 1139 750 }readonly def +/UniqueID 5000769 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX12.) readonly def +/FullName (CMBX12) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 52 /four put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D43A151FEE81296FBE +0CF37DF6A338C826464BA5198991445EC4BE80971DB687336AE8F74B516E333D +2D8AB74D362C559AAE6ACFAE49AEEF4F52E28C869222C1301D041E7A0BC1B608 +1BF728EF9E98F3A12EB2714E7F16B14E055FE1FA0EEFB058860ACADEDA9D0E4C +42E3C6F1E4869471BFAA3760175F3FBD842755A9D7847EBF605F18293B42F557 +FBE2715002669091BB033E1AAD657532F34F7C66E4F04D63ABB07E6CB9D9AEAE +78EDE8B79DD9BC87A1FF445EAA05B5572BB880E69F4DE1F82D7F0E9980AB0C18 +22C448B0B1722D3CC33C56FF287CECB80658B3AF5E7675BE82CEFF3DAD5942EE +A03C955FF979E41E54BCFB5316A9AB8945C403A73180D0961416EC9C92F49811 +4B91BC4C788392994587517718521E416D469F69952149FF7F9224377EBA1065 +4A727BF806A112A7B45B0A1BA1D5A23683960575368D9EAC8C04753BF7465AF7 +95F25C258C63E4FDFFD0B412FD381946AA38C0B961652BCEC30322C47BF4755D +9F91880688AF066E32FFB22E1A52DE741307AD3ED830D6BAA1D1F562919666DC +5E8FD9862AC8600B0AE0BC7FC779252AAC57248744ACC8A8AAFA836BCF09B0DF +9253DFBB1CB77EA8A59D42D1B18FF25E9AED72FA62FEC3F126F030F5D7DED9C3 +CF60FE890BA4A48E39E687BFFAEAB96AE542A6387F6624486037C8924002A511 +BEE5FBFD780AC1D4BEC3FBC47A930BAD0280D444259528B6C565DE11DE36BB65 +9BADC55C1EDA1A80458E98896D782DFB5C137897419602809F9BF8CA39F00C68 +EFB9E076FB324C2963F23CBFED28B9EF70EAA4E4B903225D1F199A7162AB239A +D92D71C18B1B682D04C6A48926275BCB16D413B2A0E953E1257E0B12D8B717CE +2EC84CFBC046A4338A69F454A469B12118E562B4F56C5FFB3CA5D357513E6FFE +947A564B229C7FD873057D5C7CDF03E958294A1003B37D8DF565A70A00A3734B +0138AE5277D383D10C2BD853EF806D3CCDC47739F0E374A3DF3B63638B949ED6 +4EC25869DC1C0B1F4DBDFFCC97382841D8F10F3635C792139A1EC462FDBA379C +BE0990CA2E70FE73137AFBBF30CA54954D7E7377CC50BDD780DDD4C7FDC77AD2 +F3EB1169F14A0041F18160F43C24FAF556DB5D621709FBC544CE55424F7446D4 +6AC07A51C8CD5161AB0AD5084A96FB35D77F1CA155147DEF8D7A590EA6939514 +D4A226588295CE0007BA8A550895511C8D80BBE5CDFB8A50D249C3BDCA974415 +F5557914A9B805782F399E4078DDB6264F1A49A9A5BA45E284A5196E9828EBA8 +481D357B8D9E6ECA631A6204439FDFACE7D7E6A2392726107CB7D2517CD19A24 +FBE592C119626DB221BBB635B6EB84845C16A9585282E34958B961F4A543AF9D +419B6A9105BF185FC767712D923437BE08A9C0EB92AB6792DBDC671029B6FCA6 +7F717FCE379C0F3B51C6CF042A762ED04898FBB4B0105C3C4ADDDC18C51BAA3B +70A93666669547081D9246732CFF74C83EE90DA17F5B4F8BAF47FE4D81590988 +2858C9B96071341FA0A0D23BDD4947FC9BC2297913CFBD4FD6CA4303AB3179AE +0203F1BD502065F90CE9BEA3B52DAFE4A29446082EA0E6B1D7AF1F31D0AD02CC +9A7FACE2CA86E5FE0F6A425B28A5940ECA306891CECDB3CFC7A5BBC76B5D9E8A +C754379ADE80B4D72CE493010317BF21A0CF4A0A55C1246218839DCA3F4D626D +1F4161D38F54AD5142C1CEE95C61D8BB10FAD4B772F4955777AFDE8AE5A837C2 +A2BBB11D0BF5DA2E63D0B75ED421DBA9C789B281B01846B65DC572BA69591969 +21265DB722AE86BD8CAA3D887C975A617ACEDDFB7AAB341F47532AC0F354A530 +7662C089DA3939588774FFA16FC4A52555DED6D6F51DE718BF5F345C23C90198 +17B77CB8B5D53A5CE7A79F3E286B6A59F3F6178AC8BF15C0A15C1A8A95D03B60 +30EBE53DE328CE085CD9A1D49C69AA299C5B58B24334A546F6E274C1B534DC8F +3289553F560C2F81E413ADB92FA0E7DD1C2F39D5FD268EBA97AB7335ECF28257 +96B4EADB7D0778706CB41C7E9C882760E7670936774A1088FFB2011115FDADB3 +B69EBD5108760762521C25C968C3E282DC3400001AC8FB1EA27FF643E3025950 +1D617BB8BB321281708E496277E11DD3AE0023DA9F25AD06B39C7CF527FED27B +57397E88D3DF70EE4FCCEFC8A0927D6B05517E571B3E70ECC99F3CBA32CCD4DE +B8BF22626B6C94FE65598A88AB90D238461EBD9A098DADEA4091AF1CDD7560EC +8E1B9BC2321686E1759E6B8A270C8CB4A254F7368039602EAEAB86ED21CDED91 +8F2DB9889F46981C494C7EAF5E819B91C129F0740B8002B510014985E5791F59 +B16879CC6521D8E9F1C4C1890AC85A78022BE614BEFF318AB2616F0C3F02405E +BB425D1555472A2642BA7686E431DC3FB8A1688B76660D9957C3FDE8D58109AC +21B1234C9DDF3F0FAF93BCF7B2F88A001F23162E1A13E5E9118D51B485B70A91 +D0CBC39CF44413FD8686D9030782DAB58064F5B987E0402AF5B264B17BD31BD4 +FDF63951BECD73ACA6138854EF35B062D01F33073850D9C09A818828C581241F +A625AB3638081DD0F00F946BE5450D38489CECEA4E66B4D85CC8AE0157E2AEE4 +A22A9313829F24D573101D84CC1784D1CED7DFAD5DD966601370C6CCBB723082 +A86BBAF0A5D867D0D2E3CA16E14E5109A29EF02649C47E12E88B3B397D65CACA +DEB9940B92100744D686066F8250FF30E5F13D81428EE238A2E4E07ACE0F5C38 +7D79D4A336D0D26AF9C2B84088ED8ECDF94A1E3FADB45AFDAB46CAD6FF950B0F +07AA2CDF82374DA76C56D29C80138841EB13F0D02ADD32F88B23E282ECC845F9 +BB9AAECE9CDC644AC2D49577A92307A83A99434F6493156DF25DBF0FCF2EC21E +8C50A312C3D19E0609C0038554CF4FEF3ACEB7A833FD54B06EF0D617C2971C89 +E4C06075B09B84A4F78A82152B9A9C540B1D881313C2C74F20ED064A9606EC2C +B56D7BB4797F1EEF4A9B13579CCF311FA4A4DFA62D80FDB7F535CC6526D1AAE5 +45C008EAF024B48C377522F74D939A475970533E645B1BFA81997549AFF26F67 +2AAE6C2EFA357DB3B525276EF330905688777057F4E4CBF584520A534A8587E5 +5A8360891E75A15205E8ADAC4A4E5A6E27D0C4A7D492216E4BC023AB027F37AF +A8DC7579BA50204D5F45A51460C5BD8A5A7F87668CA6451137F2F59E117BBE28 +5C40820882A5546FA76F0CF49F8A6EC445F0647CC3227C400F56E7E9B84A6975 +E85E243CC1666DBAFF4E07EEAF3AF71BDACB30DAEA792F2B8504CAB071544F01 +5D66243D529C479D276FE22F7E275D9E7FA9C6EECA18716B2F213916E32C1D94 +6E32397B41AC6779543218E506569E3544803BBF9B404A983EBA62A494187B30 +8D3DFA4E1237A2E5E08224A60492C09ADAD8775B7CDB830520829BA164209ACB +BCDEB2D574CEBFB7AE4BE72DF4EB1945FEF2458761AD8DCC0D378AEB7DA002C6 +9C14A665DAAA532B0ABA98D7BFB5A6151FF6703385AF7AE8FD315A492FCCDBCB +B825707F9566B3B4943A3C61C3DEFDC31A843A2D67AB06891F3E110DD8C73D3B +B5E4151B51D9F13905D7D94DB9ABBFCAF35F43B6EEE256B1A80ED6D1739D8D5E +8C767F6F0E8704C5345D028A2A6DAFD9BB7AA048B8B895FE9423A7ACE858BADD +595CB074A128DAFE08FDFFD6BDAC0114159A702FDCBF8013804B0CAEAD7AF38E +FAF086A3248AD4FCA1401A85AE2F72E3E6956DC0996FE8ADB18F89B14A208A15 +13F81AF73D0DB72F78C4DA634ADE3C73756CAE6AF2E149C26316DFD93370BE1A +FB4A79F77A67C07CB0A53C78367F21661D4AFE9E27328E077B522B50FD9AE2E3 +DA087BE481515B5DD7BF894A96A84A6C78874100505B7DDE1D22EFCE8D58B3AB +313AB5495F72E2CA4E6AE22C0CB854302B9990372F1661D9F0A517F90686F248 +C5643008B3D29F7296E5C8FD4049886662EFDD4106E17C879F5D41CE84F87E89 +F6A3117C968B95A35940CC29C43E1E0DEF51C1E46B676301F40D59615C3F73DD +DE37B72FF7105DB84227DA5241583272AB1C3CD97AE11C1EE98FFDB5E5F44844 +8FC41BEA5C54B26341AFF6830D9D0A5A2901B0653D8BD0746838194D240FF753 +E99750D3383373F453723D86BE97B571B8B84D8696089B5CFDD53E6C562A2197 +A8C4FB0CC690C27761A816B441029D3D306245052E0C41B53025D8CB7267CFE3 +C17FDFE348E765326F91AEB700CC49162DF748171214252CBC821493DD01AA20 +417D66DF47EBEFFF3E9BB2B0A2BE7D9B8C68BD570FC2EB0FA54CECC318F04C43 +19598BDE93F2F13DC7847354C99059AB20593EE51E94F9D4E9241869D605AAF4 +9D9B5FD88C3798A039A67993C5EC68B6326B132E647F67EACCA7F7AE7F718D85 +12666E90D7C73EF210E344964A38228B236679A2B18F5E081234CAA2458F8D83 +3F0CA308D19663CB12EB904076EF88E556407C33C9380A6A3D68A9EFE65387C1 +A1BCD2D26DFD2AC0881EC30E81C0A4E76C244A2BD822EE88C4A60B480D107E68 +90E419A1F512E865BA922A7830909BC2611A80931CB2E9344529586726614D94 +3AC5200FB9FF68AD9686506C5EFA8788C0AD0251AFE7F95E84683380CDB421C5 +B1A783B6D5F3A6BD1BC1C14B363DB01C87C0796DCDD5BECF41A1A9F43183CF6B +82C2AE49F0BFDC5DEF7729F2E638EE6EA9E4D059EB9BB1B992AD8C82D501A550 +1BF73CBBFE740179B54E193E84A55DCD61B343C1852780FFB44248FC9426AC94 +AA2B3FE20FBA30F6C4D1E0FF3EDCDD8C0F57CCB50CDB0EFE2E04A8927E239C1D +9B026C7929BB48461D4D695FFC766C8A0E545B1BCC2AA068D1865333108E7985 +2D93F9B00EA0A90939D0D3840D59B6CC0CE2C147B2E1A9A4F14270FE3ACF51D5 +99F7349106165AD627CBBB0ABA01ECC6D3A14C1DC1ED23A9DB9865BB4396C51A +31ECD001EAC94B33C34E29C5611148EF3E55DD61813470B8F3CE32564C749414 +3C93C77EA5A3538A0B5AE3FC4DA32813B06772E0E48E25BB39F3F6FDCC077E86 +F86FA50E18FD19EB2F37311CE87F18F3BC85CE7FD71CA92D5C3264E34E04A2E5 +70C79D99F54D6C6D9D527AE45EBB48411221134587D2253E7C8ED7658EDCA34E +5E768DD14E0200470F73C44D006CE8CB35DE1CA3EC10ADC668B0662A7774C891 +84EC95A31DD872F0728D9F65CA80940080E04630BE4DEC77A2C49E3913C39978 +BF145F8832AF2C4385EBCDB15F9D32C22CBA0CF950877717D6F1591D7C0B8047 +8C9BFCB16AF7124ED83137695F3D69228DB633053208C29E0ABA1B06A7FB3EE7 +5625CB44927E2DA6E038A6E62DEBDA2D96A03177982D8FA33BAAF4426E05F4B7 +9C1748B3FF7691F9888E7FF864A10B9DF761A41E6B5CFAD2BDD7E1C4924AC97B +F4B352705316DD1A58637CC12D71C18A5CA691AB2AA8F171590EC24582B1123E +94D4DC587D8F99E18A711776BF4013C96446BFECFEE4C809EA94B169088024DE +0CBD20199A915AA406F0BD5F3D63D1467C49B4691AEBBB35ED6624F2D7BB74BC +E80FD92B9FD04DD9C2BE9B6FD29EC7EC07FAB447511C61DD299C783BC09AE2A4 +7B3CBCA6A20C6631D06D0B2E2482A50612BB7C29B7E7D0A205EB0E8436702581 +596BC996ABD58CD8D5BAAE4B1478195CAFF98FE0141287296C4EFB8D2E7A8442 +F0A3AA9F9264329982532295A176BA1867EF732BBAC49AF485D9D0F7130F617E +7F7DEEF935874D55A22240F8EDE4F247D5F73481373A392D40A8076BD91079E1 +1CE5998BA13D48D56B49A92B4A18430E316405D2E2E391B496A1934671FF1785 +AF42BA3B2D14B8E04014437FD194455C50289DFBA61B5C377BCBDADA48E82DEE +4E70EF5E9DC03064907BCB8BE4D59DE069FB0C0CB140DA54708E630767313F9F +744594AD8A499CFEF733E640A11FD74E46A749F9C7D18D49251BF85C6EB4668D +67598C31A8F90922FEAEAD4B83B6E7184567DC798E4BA1C4C9B3461A478D63CA +054F13B502DACB674EB49D6BB935E5EC82BF99FDA7D47C581AD7F940DF4FC6FA +6C6D25D647033AC69505F0CAC58DE99087F365531A6283CB89CB644688963C3B +8B2203A94294E58739EF23C7803630A1F9121D62BE1977DE2F41687C8CAF87FE +CBD7AD3B98E0D95C8C6E1A7CCB0E09465AA874DC90A0F5DB2C5E7C130297FD39 +EFE63B0350B5139D09E6864D22C3F1150B29196E40EEF9723E71158B7ECFB8E4 +C426FEDCD439420B7F1C251FADA347C9A2C49738B5A17922E1EA93CA7B125B76 +57449EAA9C1D591CAD327D0E98EF2D44D614EE9ED49DD31ACAC0B956620B6BA5 +5BF6D08CA7541059D5ED2EF00AE2EE95488F5645BF6837D9241C0D3959B7580F +C9ECB2BCF3E65C07D52EC9CFB21C11CD4C883E44C173214C900C44D2E1E43DD1 +CE8DFE3DA93C38B548BC4EC46FF91F30CFB97525E1FD4E77686433B20BABF8D2 +848C1CDF1BCF185CFD7A81D2D4BB826E837E2AF35CFC4F419F698DB0C43E9F9C +B0FB628AC9A3CBE9B1FF4A067016E70333E78B32AB2D89C483834B31F5808FDB +77492E099F1504DABCA5722C7860CDCEDB2DDEB512FFCC7D287F4945FD711F28 +87BC3D36173566B81FC2C1290C717A09697DAC6072408E20926D39270121CE58 +3EF97CE12EDD7F87F2C8CFE36C3C0400869C0D813B71C425343EE0CDF717BDD8 +409D5297D0F8F7FDEB0257C0A391F5635E0DB1116058942FF3E7C94D5F2873A7 +A3B0ADAFC3835AF2BE474E6741319BC6695FB37F59AEE388F81F6E66F910000B +72E6BA7531B4378CEFEEDC79CCF4947BA1703823B5AB4F4AD73D9615C66C489D +99D68E49C9BF765B7FC547BAB9640D51D5A7A2396507AB5A4DFF3D14F52422CD +8FCFEAA06A56C6C7FFCD29C9A7A59DDD2A909A9363FE5F1E9629616D25ED38CB +E754C059E4379318CC491C3B1A90128693AC53F80F8210FAEA7EE638902A7D3C +82B95B3F5AE340EC1B648DBB9FB679D6E80B7F426D8671FE7136D97F51E2D2F3 +C9CE9183E4061CA40091A2A70DBB9ECBB19CE3F65ADD0FB346B54BAB182E2CD0 +EAF4C0F402C25573FB344EA771B297BEB615FCD0595172E84ED2A62FF8962634 +23C19076C2A9ECEED5135994EB397303A9619C76DC55E032DA83FBA441BD484A +59F70A5110A8927F6239A14D4E223E189A5462E4A92EAEFFA4B961A2A32B320F +C2B4E8C1821FA67A655B5042C15E4DE1FB3652B55078DB123573C4E986B19DB0 +1C5131F3DFAB271C30A5476B4A19D8FC922E31879C34BAED94C07A4841B8209C +403369FB8E842610D1EB4662B6171A4465FD0E819964F62EC5B0ADC92F08CF90 +1DE0B410FFBAD16F6D355E8AD72CCF67961EDB6CDA82398021007C2D0462E893 +75EB0710AE4A6CDD15077C9DEFC5774EF4A657734D703CE42174259B58E5277E +0DF26BF59AF8D1A3E7DC12E3C12AA4B67CF35B19962F6950C2020B698D971B35 +82FF84E72F72FBB0C54A112BADBAE6C4CAA358BDE6A705AB59332C3850CA3D25 +C7564499BC1319121CE0D93218210C68080AFF33420E3CB3A48BF9EB66BC07C8 +A79D8CD8E78C200FF7CFA3DAED0B9E87E6141C88B436D8FCBA50AC195FCBB9BC +9512B95FE3A37FFAAB39850FCEBD4D50A243EA416E73F53B4B00F3B6EAE0CA06 +0693AAE0FFD5C119D11E5D13743E28D843B0F2EE315A2ED05A510CE53A2D06A7 +0C076D4B6BC2B6A928553E7F0FD472760167DB486A777259FA74245EE37D0125 +47314DEE4B29E5D22180BDB1BDA7D33406FD340DC3991F50800BDC90F7678EF1 +1064986DDA53A77FBE2EDD38E20C41EF86CD50E8EC167344A3F3B3C3BD83CD80 +87BE64CAB701D25CFC0796C099C07882A4332A5588B9900849925FE82DFEB1B3 +306700778714A8D72AD7F55F8836D0C1E2D6761CC3499C1771035D21CF191A2A +9F424F1AAA20430004FE7917E3A6199B483D1CBABA5ECAF65287B7C389E86AF0 +CD55328B3E14C9688832B25EEAA05B69CE25CA606368FC10F30F6D04E5099566 +0F0497F4676676DDEB198758CBC2742F5F5FA5B904616A4F6DDA098FCA6837C1 +D16539998B5F787C29720DDF8A817E5AE94832178857EF7FB6DA2FA0E8BAA5C4 +62DB63EA840133874605DF90C8D027CEFBC212B9E2480DC7D4337D24F5377529 +CF1F14F3FA398C621ECC8AAB77BD1278DB82447A4B3A0784F91EB8706AD2EDEA +8EAFF674B892ED3B33DDD9BF1A5A8E002DDD34D4172E9B51F4716DDDF3E2 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: TeXMUSIX20-Regular +%!PS-AdobeFont-1.0: TeXMUSIX20-Regular 001.000 +%%CreationDate: 01-07-25 at 04.07 +%%VMusage: 1024 35768 +% Generated by Fontographer 4.1.4 +% converted using TeXtrace 0.45 and modified by T. Uchiyama +% ADL: 701 299 0 +%%EndComments +FontDirectory/TeXMUSIX20-Regular known{/TeXMUSIX20-Regular findfont dup/UniqueID known{dup +/UniqueID get 0 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +20 dict begin +/FontInfo 16 dict dup begin +/version (001.000) readonly def +/FullName (TeXMUSIX20-Regular) readonly def +/FamilyName (TeXMUSIX20) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +/Notice (converted using TeXtrace 0.45 and modified by T. Uchiyama) readonly def +/em 1000 def +/ascent 701 def +/descent 299 def +end readonly def +/FontName /TeXMUSIX20-Regular def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 7 /caron put +dup 62 /greater put +dup 71 /G put +dup 132 /Dcaron put +readonly def +/PaintType 0 def +/FontType 1 def +/StrokeWidth 0 def +/FontMatrix[0.001 0 0 0.001 0 0]readonly def +%/UniqueID 0 def +/FontBBox{-619 -1659 3200 1660}readonly def +currentdict end +currentfile eexec +D9D66F633B846AB28EDC112EE8CE6C6736001234F4C7DFDC8C8014E32702D436 +0A505E30AFE960AA59313499738A089E6AEAEFDC84AEBA57A1F9AD647CCB7BE5 +B03F5F4993FB2566BC918B0AB23DB4629AC0D00174ECD9F3286839BBEA5DD0D6 +84E25152E241F0D923ADCB347B5635EE25CE26F509B8F400F2C9CFB67D676ACF +9D516193DA983A07AC65A99BDDE6D09C93F522AF18F5462F7C2C3A7CD58FB034 +810D4645AE7525C1BDF2E062C4D0BB1A115E406B09C9014323678B1FF15AC494 +A82AC85A09051539D2EBF8D4910447B1C8875854670342B6D13D727DDBA5C2FD +52AFE2107B72A73D3A8F8B0516B5D141AA315F37523CA19009A6CEAB11C23A80 +20B8C46718DBF2DBEAB3320A596C8992531F6E70A725359BD09EF9FF2C0E58DD +9EE54192A355EDB81FB6E2391CD91A9BBD4E6637ECE7F9DA1603F49FA9AEF3E7 +27075B080A569EF1014B7F2D4C3687FA1336676537B82BF4590F962C967795F7 +BF6CD740C57389AB77A273920959FE657B87F76B9403C9586FE85C957B0BFF7B +26F4AA603883E02139AC15D1360C26E332527461ABDBAA603802CAE75E08F559 +E16B2E623827BEBD40D4661A6B3D10D6C395EECC916F52F99D9D1F19DE5977BB +73C4EFAEB7FD0052E831BE175C945358083BA2C5690E0CF8B386900A4A51F60D +C8E98236B16D54A1D94E88A062E0E3D8397F5CB503F51A4F9918D3A902AC7DB3 +25B30A154EF106BF4CB8A369599B3496537F22C842825F69154DD87E05CF9ADA +B6C94188CB702F53D00BBEC8ACE69CBBFB8C11099395D7BF0D47EB3E41454D13 +AAAC4392E8C0ADCA1E87A6F844D3AD81EDD4CCDD0FBBFCEEE9C70BAC5B4D4861 +E7B9DB2F4DAD612986007DB8CDB3B5384C3C7D77A2609D2255D4098E7A314D80 +1A553DD03007696C9DA22D9E9AD132F09CDC0144E7C1BB169635A24341DE3589 +96D503CB7BC73A81FC12A743C711916CBEEEF61F7273B238B3C0DF1AF4B190B7 +C820DD8F5FDAF73872074E1C95F4A4B7E1B5DED436C03D1020B9FE9F780FF2C5 +920C97B1584B7E0051107EE7789BFAB0B13F32AD2DC01DB5120BFD6B5FA8E386 +EE743D10E6A9E858979543882C19ABB36FE278EAD1304E84DF80E8CF87A994DE +0DAFBB918B5C13EC0B410CDE19ACC3DCCCC419A6C552410C0CFAAF624006218C +F236274FE535A25B1399748107BCA62DD24FF611AD06154590701B4F54D1E477 +B50B48E13664D702948BD52E67810674BA5D058566DA6CC9723B4A050CCBDA4B +8FD30EBFD87EC56E8066F70BA599EB653CFB284B181180037686575E99E5C0BB +E77A57FEE248B5D5AD7ECD2D17E71639FFB500A3AE87AC4389C467D85208D40E +F57D23C3D8D280B6455358C20778A78B6F1D5236E17313A5B9DA837B94628F42 +62CFA16DCCB7D16B1433B8B5D7E59D83BAF9EFEE967ABDE6667A5ABDD13785C6 +BDF0FA4FD321EF8EDF5FEDB46D9F64D5ED15852FA1F41F9E8A4F21E9D45A7919 +C796EABF32FDFC699847D095F8CAA278EE2B92127A79E961C4923C2F98F628F8 +24114A265B39DADC68B25A2AEF4802D9746A17DC3D6345ADC5F99196A49D9B29 +6A29EF0ECFC8CD39815B445E13FAA9B48F4BF5BB6DBFBF8C128B24B106A11CDD +DD7D273D2A1FC9EFA0EC9EE950E2C7B30D4B1E5F3289E38DB4DC044CE2BBF0ED +BF2D23762517E4629589A75E17FE469086F1E6423491717CAA204608C6CEDFD5 +AD5DAE7C7586E88B5DD6E2EA7FE9125D63DE433831E07CCC89F630326A335B63 +BCC756BC08F5BB5E644F931152933BE70459BA66022B75B583664BFE23E73DDB +97B9DEB35C502B190DC3C129FF9D30718516C65CB75126D1D6136A3E3EC9698E +F30404C85712742E064D97E7623C2DDD4129FEA5A65234B45567B724BC22E278 +AEFCF3E52C1D6079A198BDE7E5E1EB5712E209654F8ADFEDB034D703FC73F0F7 +B5C5C3F1BA997451C0FDEED203FBC64D6E838600BFDAF3CCC06EA0A68FE170FF +0A8B2050073DCD9A381ABA8A0B582B40EAF0CFFA1FF5E4BEC8F946601F1529C3 +A2A56AFB035DE9086EE7CE32B0E6B2C84144272FC9DF80FACA7AC99234542221 +2178C46E51467C3BD8367B53982590483499B5BFE40E9AC667977BD77D742C9D +C1507ABB947CA63C85E2DD14CB702D0B71AB3BF2DD7FE8A158E9EFC4E9DA426F +1EE6D1B53B3C1BA652030C5E5C93B9DD94146D1067AE41BA2AFE91AF21EDD13E +C8CAB19248510182D05A29ACF5FC2E3CF25222317FA3EFDC9646FCD6D295CD77 +A2C5E245853AA3FDF608E5307904A82BB682C38CDDEA8EE2117BCED133EDA549 +E0B87C84689770CBFB3FFF74ABAF0CDB88E61F053B36BE54405953E5DCB6A1FF +39C30A464759A4349A9585277F3BE1C5C25BC779BF20DD62 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark{restore}if +%%EndFont +TeXDict begin 40258431 52099146 1000 600 600 (accents.dvi) +@start /Fa 128[23 127[{}1 83.022 /CMMI10 rf /Fb 128[42 +42 42 13[42 2[23 10[42 1[23 42 17[52 10[62 18[23 13[23 +65 84 75 42 65 60 42 37 62 42 42 42 42 42 18[{}26 83.022 +/CMR10 rf /Fc 203[67 52[{}1 119.552 /CMBX12 rf /Fd 123[266 +60[133 8[0 54[0 7[{}4 166.044 /TeXMUSIX20-Regular rf +end +%%EndProlog +%%BeginSetup +%%Feature: *Resolution 600dpi +TeXDict begin +%%BeginPaperSize: Letter +letter +%%EndPaperSize + end +%%EndSetup +%%Page: 1 1 +TeXDict begin 1 0 bop -214 -117 3288 4 v -214 -76 V -214 +-34 V -214 7 V -214 49 V -214 5 a Fd(G)-51 -39 y Fc(4)-51 +44 y(4)141 194 y Fb(\023)-42 b(o)p 124 90 75 4 v 185 +88 4 146 v 138 88 a Fd(\007)371 194 y Fb(\022)g(o)p 415 +68 V 368 68 a Fd(\007)602 194 y Fb(^)g(o)p 646 47 V 599 +47 a Fd(\007)832 194 y Fb(\177)g(o)p 876 26 V 829 26 +a Fd(\007)p 1058 49 4 168 v 1147 194 a Fb(~)g(o)p 1191 +5 4 146 v 1144 5 a Fd(\007)1378 194 y Fb(\026)g(o)p 1422 +-15 V 1375 -15 a Fd(\007)1617 194 y Fb(_)-32 b(o)p 1604 +109 V 1605 -36 a Fd(\007)1838 194 y Fb(\025)-42 b(o)p +1834 88 V 1835 -57 a Fd(\007)p 2064 49 4 168 v 2153 194 +a Fb(\024)g(o)p 2137 90 75 4 v 2197 88 4 146 v 2150 88 +a Fd(\007)2384 194 y Fb(})g(o)p 2428 68 V 2381 68 a Fd(\007)2594 +194 y Fa(\177)-23 b Fb(oo)p 2658 47 V 2611 47 a Fd(\007)229 +b(>)p 3071 49 4 168 v -214 327 3288 4 v -214 368 V -214 +410 V -214 451 V -214 493 V -214 450 a(G)21 638 y Fb(\030)-39 +b(o)p 2 534 75 4 v 62 532 4 146 v 15 532 a Fd(\007)241 +638 y Fb(o)250 656 y(.)p 285 512 V 238 512 a Fd(\007)464 +638 y Fb(o)464 694 y(\026)p 508 491 V 461 491 a Fd(\007)675 +638 y Fb(\033)p 730 470 V 683 470 a Fd(\007)p 905 493 +4 168 v 969 638 a Fb(\036)p 1035 450 4 146 v 988 450 +a Fd(\007)1204 638 y Fb(\032)p 1257 429 V 1210 429 a +Fd(\007)1419 638 y Fb(\035)p 1432 553 V 1433 408 a Fd(\007)1648 +638 y Fb(\027)-52 b(a)p 1654 532 V 1655 387 a Fd(\007)p +1877 493 4 168 v 1953 625 a Fb(\027)1953 640 y(A)p 1946 +534 75 4 v 2007 532 4 146 v 1960 532 a Fd(\007)2186 638 +y Fb(\034)p 2230 512 V 2183 512 a Fd(\007)2397 638 y +Fb(\037)p 2452 491 4 165 v 2405 491 a Fd(\007)2575 638 +y Fb( )-23 b(l)p 2609 470 4 152 v 2562 470 a Fd(\007)2721 +638 y Fb( )c(L)p 2767 450 4 139 v 2720 450 a Fd(\007)2452 +335 y(\204)2661 325 y(\204)2880 638 y Fb(\031)p 2924 +429 4 126 v 2877 429 a Fd(\007)p 3033 493 4 168 v 3049 +493 25 168 v eop end +%%Trailer + +userdict /end-hook known{end-hook}if +%%EOF diff --git a/support/pmx/doc/examples/prad5x.pmx b/support/pmx/doc/examples/prad5x.pmx new file mode 100644 index 0000000000..1e6e52990e --- /dev/null +++ b/support/pmx/doc/examples/prad5x.pmx @@ -0,0 +1,104 @@ +4 4 3 4 0 3 0 -1 +3 13 16 .1 +\bigfont B. C. +\bigfont Soprano +\bigfont Violin 2 +\bigfont Violin 1 +bttt +.\ +Abp +\\input musixlyr \ +\\input musixdbr \indivbarrules\ +\\setinterinstrument{1}{4pt}\ +\\allbarrules\sepbarrule\ +\\allbarrules\sepmultibarrule\ +\\allbarrules\showbarrule\ +%1S9P2 +%\\interinstrument=0\internote\setinterinstrument1{16\internote}\ +Tt +Cantata "Ah del c\'elebre conf\'in" (1724) +Tc +Jos\'e Pradas Gallen\\1689-1757 +h +Grave +% 1-4 +gd23 | fs4 6 d f | g2,g | fs4 6 d f / +r4 "Ah del c\'e-le-bre con-fin," + b44 g | d+.c b8a a | b2,r | rp / +rp rp r4 g45 b | ad2 / +rp rp r4 b44 g | d+d c8 b a / +% 5-8 +gd23 | a4 6 f a | b2,b | a4 6 f a / +"tro-no~en_ que~ha--bi-ta el a-mor," + d45 b8 c [ d ef ] | f4.ef d8a c | d2,r | rp / +g25,r | rp | r4 b- d | cd2 / +b24,r | rp | r4 d b | f+.ef d8 c / +%9-12 +b23,fs 6 | g,c- t - | c4 t g2 n | c n ,f / +r4 "cu-yo d\'o-ri-co_ pa-la--cio" + d45.a | b g ( ef+ e8 ) da d4.c | c2,r / +b24,r rp rp g+4 e f t / +d25,r rp r4 g d | e c a+ t / +% 13-17 +f42 c+2 | f4.ef d8 6 c 6 | b4 f+2 | b4.af g8 f | ef4 b2 / +r4 "es cen-tro_ no--ble de~un Dios" + c25 | a2 b8 c | d c c4.b | b2,r | rp / +f45 t e.f | f2,r | rp | f4 d b t | b t d2 / +a45 t g2 | fd | r4 r f | d b ef8 f | g4 g oT0 .ef / +% 18-24 +efd2 | a4 6 f2 | ,b f | d-d | b+4 ef-2 | f,c - | f4 6- g2 #5n x147 / +r4 "Es-cu-chad a-ten-ded, que, con dar-me~a--ten--ci\'on los tro-fe-os que" + ef45 b | c f c | d2,r | r4 b c | d ef8 d [ c b ] | a4.b c | c bn b / +ef25,r | rp | r4 c a | b2,r | rp | rp | rp / +efd2 | rp | r4 f c | d d ef | f g8 f ef d | c4.d ef | d ef f / +% 25-31 +c23 - ,d 6 | ef4 6 f2 | b-,ef | c4 - d2 # | g-d | g+4 ef2 | fd / +"pu-do~al--can-zer, sa-breis_ de mi voz." + c25 b4 t | b t a2 | b4 d g- t | g t fs.g | g2,r | rp | rp / +rp rp rp rp r4 b44 c | d ef d | c a b / +ef45 e f | g c- ot .b | b2,b | c4 a ot .g | g d+ d | g g-8 g+ a g | f4 c c / +% 32-37 +f43 d2 | efd | ef4 c2 - | d # ,b 6 | c4 65- d2 # | g-d / +rp rp rp rp rp rp / +c45 d c | b g a | b c b | a2,d | c8 b a4 ot .g | gd2 / +f45 f-8 f+ g f | ef4 b b | ef ef-8 e+ f e | d4 fs g t | g t fs2 ot | gd / +%L7Mn212bt +%% +L7Mn212bt +m4406 +h +Recitat +b02 | a 6 | g 5 x126 / +r4 r8 "E-sa Dei-dad gi-gan-te, e-se que~hor-ror y~ha-la-go~es jun-ta-" + d85 ba c da e | fa f r4 r8 f- ga a | b4 r8 b ba b ba a / +f42 4 x183 f+ d2 5 | c 4 x183 f | e #6 d t / +"men-te, es nie-ve~y ra-yo~ar-dien-te; el Ni-\~no~a-mor ven-da-do~es que triun-fan-te," +b84a a r c f fa f ea | f ea r1 c ca c a4 r8 f | cs+ ca c da d da r4 / +d23 t a 6 t | a t 6-5 b t 4 x183 | b t d 6-5 | ef f4 b- / +"con el vi-so de~ha-la-go~y de fi-ne-za, es ze-\~no,~es so-bre sal-to y~es fi-ne-za." +r4 d85 ea f4 f8 fa | c ca d efa e da r4 | r r8 b f fa g afa | g ga anc ba b fa r4 / +% Aria 1-3 +L10P3Mn41234bttt +b42 r b+ r | a oG 6 r b r | f f1 ef d c b8 f b d / +rp rp oG rp / +rp | r4 oG f15 ef d c b8 f b d | c1 b a g f8 f+ d b d f / +r4 f15 ef d c b8 f b d | c1 oG b a g f8 f+ d8 b1 c d8 b | a f1 g a8 f b1 f f f f f f f / +% 4-6 +ef43 6 e-8 e+ d4 6 d-8 d+ | c4 6- c-8 c+ b4 6 r8 b | a4 6 g -6 d+8 6 ef f f- / +rp rp rp / +ef85 e- g c d d- f b | c c ef- a b b d- g | a f g1 a b c d8 b f a / +g15 c- c c c c c c f b- b b b b b b | ef a- a a a a a a d g- g g g g g g | + c f- g a b c d ef f8 e1 d c8 ot .b / +% 7-9 +b42 r b r | a 6 r b r | f r b r / +"Es_ re--l\'am-pa-go y~es true----------------no y~es" + r4 [ f15 ef ] d c b8a f ba d | c1 b a g f8 f+ d b1 c d8 b | a f1 g a8 f b4 r8 f+ / +b24 r | rp | r4 f15 ef d c b8 f b d / +b24 r | r4 f15 ef d c b8 f b d | c1 b a g f8 f+ d b1 c d8 b / +% 10-12 +f42 f+1 ef d c b8 f b d | ef4 6 ef-8 e+ d4 6 d-8 d+ | c4 6 c8- c+ b4 6 r8 b / +"true-no." f45 f- r2 | rp rp / +c15 b a g f8 f+ d b d f | ef ef- g c d d- f b | c c ef- a b b d- g / +a84 f1 g a8 f b1 f+ f f f f f f | g c- c c c c c c f b- b b b b b b | + ef a- a a a a a a d g- g g g g g g / + diff --git a/support/pmx/doc/gapxmpl.eps b/support/pmx/doc/gapxmpl.eps new file mode 100644 index 0000000000..d84d9a6ace --- /dev/null +++ b/support/pmx/doc/gapxmpl.eps @@ -0,0 +1,1243 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: dvips(k) 5.993 Copyright 2013 Radical Eye Software +%%Title: gapxmpl.dvi +%%CreationDate: Sat Jan 25 14:03:50 2020 +%%Pages: 1 +%%PageOrder: Ascend +%%BoundingBox: 45 234 570 765 +%%DocumentFonts: CMR10 TeXMUSIX20-Regular CMBX12 CMBX8 +%%DocumentPaperSizes: Letter +%%EndComments +%DVIPSWebPage: (www.radicaleye.com) +%DVIPSCommandLine: dvips -O0.25in,-0.22in -tletter gapxmpl +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2020.01.25:1403 +%%BeginProcSet: tex.pro 0 0 +%! +/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S +N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 +mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 +0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ +landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize +mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ +matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round +exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ +statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] +N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin +/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array +/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 +array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N +df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A +definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get +}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} +B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put +}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ +bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A +mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ +SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ +userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X +1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 +index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N +/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3 +def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90 +rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 +N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop +false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A +length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} +forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{ +BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat +{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch +round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 +rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B +/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M} +B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p +-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{ +0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end + +%%EndProcSet +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def +end + +%%EndProcSet +%%BeginFont: CMBX12 +%!PS-AdobeFont-1.0: CMBX12 003.002 +%%Title: CMBX12 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX12. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX12 known{/CMBX12 findfont dup/UniqueID known{dup +/UniqueID get 5000769 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX12 def +/FontBBox {-53 -251 1139 750 }readonly def +/UniqueID 5000769 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX12.) readonly def +/FullName (CMBX12) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 46 /period put +dup 49 /one put +dup 50 /two put +dup 51 /three put +dup 52 /four put +dup 67 /C put +dup 68 /D put +dup 72 /H put +dup 77 /M put +dup 84 /T put +dup 97 /a put +dup 100 /d put +dup 101 /e put +dup 104 /h put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 116 /t put +dup 118 /v put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D43A151FEE81296FBE +0CF37DF6A338C826464BA5198991445EC4BE80971DB687336AE8F74B516E333D +2D8AB74D362C559AAE6ACFAE49AEEF4F52E28C869222C1301D041E7A0BC1B608 +1BF728EF9E98F3A12EB2714E7F16B14E055FE1FA0EEFB058860ACADEDA9D0E4C +42E3C6F1E4869471BFAA3760175F3FBD842755A9D7847EBF605F18293B42F557 +FBE2715002669091BB033E1AAD657532F34F7C66E4F04D63ABB07E6CB9D9AEAE +78EDE8B79DD9BC87A1FF445EAA05B5572BB880E69F4DE1F82D7F0E9980AB0C18 +22C448B0B1722D3CC33C56FF287CECB80658B3AF5E7675BE82CEFF3DAD5942EE +A03C955FF979E41E54BCFB5316A9AB8945C403A73180D0961416EC9C92F49811 +4B91BC4C788392994587517718521E416D469F69952149FF7F9224377EBA1065 +4A727BF806A112A7B45B0A1BA1D5A23683960575368D9EAC8C04753BF7465AF7 +95F25C258C63E4FDFFD0B412FD381946AA38C0B961652BCEC30322C47BF4755D +9F91880688AF066E32FFB22E1A52DE741307AD3ED830D6BAA1D1F562919666DC +5E8FD9862AC8600B0AE0BC7FC779252AAC57248744ACC8A8AAFA836BCF09B0DF +9253DFBB1CB77EA8A59D42D1B18FF25E9AED72FA62FEC3F126F030F5D7DED9C3 +CF60FE890BA4A48E39E687BFFAEAB96AE542A6387F6624486037C8924002A511 +BEE5FBFD780AC1D4BEC3FBC47A930BAD0280D444259528B6C565DE11DE36BB65 +9BADC55C1EDA1A80458E98896D782DFB5C137897419602809F9BF8CA39F00C68 +EFB9E076FB324C2963F23CBFED28B9EF70EAA4E4B903225D1F199A7162AB239A +D92D71C18B1B682D04C6A48926275BCB16D413B2A0E953E1257E0B12D8B717CE +2EC84CFBC046A4338A69F454A469B12118E562B4F56C5FFB3CA5D357513E6FFE +947A564B229C7FD873057D5C7CDF03E958294A1003B37D8DF565A70A00A3734B +0138AE5277D383D10C2BD853EF806D3CCDC47739F0E374A3DF3B63638B949ED6 +4EC25869DC1C0B1F4DBDFFCC97382841D8F10F3635C792139A1EC462FDBA379C +BE0990CA2E70FE73137AFBBF30CA54954D7E7377CC50BDD780DDD4C7FDC77AD2 +F3EB1169F14A0041F18160F43C24FAF556DB5D621709FBC544CE55424F7446D4 +6AC07A51C8CD5161AB0AD5084A96FB35D77F1CA155147DEF8D7A590EA6939514 +D4A226588295CE0007BA8A550895511C8D80BBE5CDFB8A50D249C3BDCA974415 +F5557914A9B805782F399E4078DDB6264F1A49A9A5BA45E284A5196E9828EBA8 +481D357B8D9E6ECA631A6204439FDFACE7D7E6A2392726107CB7D2517CD19A24 +FBE592C119626DB221BBB635B6EB84845C16A9585282E34958B961F4A543AF9D +419B6A9105BF185FC767712D923437BE08A9C0EB92AB6792DBDC671029B6FCA6 +7F717FCE379C0F3B51C6CF042A762ED04898FBB4B0105C3C4ADDDC18C51BAA3B +70A93666669547081D9246732CFF74C83EE90DA17F5B4F8BAF47FE4D81590988 +2858C9B96071341FA0A0D23BDD4947FC9BC2297913CFBD4FD6CA4303AB3179AE +0203F1BD502065F90CE9BEA3B52DAFE4A29446082EA0E6B1D7AF1F31D0AD02CC +9A7FACE2CA86E5FE0F6A425B28A5940ECA306891CECDB3CFC7A5BBC76B5D9E8A +C754379ADE80B4D72CE493010317BF21A0CF4A0A55C1246218839DCA3F4D626D +1F4161D38F54AD5142C1CEE95C61D8BB10FAD4B772F4955777AFDE8AE5A837C2 +A2BBB11D0BF5DA2E63D0B75ED421DBA9C789B281B01846B65DC572BA69591969 +21265DB722AE86BD8CAA3D887C975A617ACEDDFB7AAB341F47532AC0F354A530 +7662C089DA3939588774FFA16FC4A52555DED6D6F51DE718BF5F345C23C90198 +17B77CB8B5D53A5CE7A79F3E286B6A59F3F6178AC8BF15C0A15C1A8A95D03B60 +30EBE53DE328CE085CD9A1D49C69AA299C5B58B24334A546F6E274C1B534DC8F +3289553F560C2F81E413ADB92FA0E7DD1C2F39D5FD268EBA97AB7335ECF28257 +96B4EADB7D0778706CB41C7E9C882760E7670936774A1088FFB2011115FDADB3 +B69EBD5108760762521C25C968C3E282DC3400001AC8FB1EA27FF643E3025950 +1D617BB8BB321281708E496277E11DD3AE0023DA9F25AD06B39C7CF527FED27B +57397E88D3DF70EE4FCCEFC8A0927D6B05517E571B3E70ECC99F3CBA32CCD4DE +B8BF22626B6C94FE65598A88AB90D238461EBD9A098DADEA4091AF1CDD7560EC +8E1B9BC2321686E1759E6B8A270C8CB4A254F7368039602EAEAB86ED21CDED91 +8F2DB9889F46981C494C7EAF5E819B91C129F0740B8002B510014985E5791F59 +B16879CC6521D8E9F1C4C1890AC85A78022BE614BEFF318AB2616F0C3F02405E +BB425D1555472A2642BA7686E431DC3FB8A1688B76660D9957C3FDE8D58109AC +21B1234C9DDF3F0FAF93BCF7B2F88A001F23162E1A13E5E9118D51B485B70A91 +D0CBC39CF44413FD8686D9030782DAB58064F5B987E0402AF5B264B17BD31BD4 +FDF63951BECD73ACA6138854EF35B062D01F33073850D9C09A818828C581241F +A625AB3638081DD0F00F946BE5450D38489CECEA4E66B4D85CC8AE0157E2AEE4 +A22A9313829F24D573101D84CC1784D1CED7DFAD5DD966601370C6CCBB723082 +A86BBAF0A5D867D0D2E3CA16E14E5109A29EF02649C47E12E88B3B397D65CACA +DEB9940B92100744D686066F8250FF30E5F13D81428EE238A2E4E07ACE0F5C38 +7D79D4A336D0D26AF9C2B84088ED8ECDF94A1E3FADB45AFDAB46CAD6FF950B0F +07AA2CDF82374DA76C56D29C80138841EB13F0D02ADD32F88B23E282ECC845F9 +BB9AAECE9CDC644AC2D49577A92307A83A99434F6493156DF25DBF0FCF2EC21E +8C50A312C3D19E0609C0038554CF4FEF3ACEB7A833FD54B06EF0D617C2971C89 +E4C06075B09B84A4F78A82152B9A9C540B1D881313C2C74F20ED064A9606EC2C +B56D7BB4797F1EEF4A9B13579CCF311FA4A4DFA62D80FDB7F535CC6526D1AAE5 +45C008EAF024B48C377522F74D939A475970533E645B1BFA81997549AFF26F67 +2AAE6C2EFA357DB3B525276EF330905688777057F4E4CBF584520A534A8587E5 +5A8360891E75A15205E8ADAC4A4E5A6E27D0C4A7D492216E4BC023AB027F37AF +A8DC7579BA50204D5F45A51460C5BD8A5A7F87668CA6451137F2F59E117BBE28 +5C40820882A5546FA76F0CF49F8A6EC445F0647CC3227C400F56E7E9B84A6975 +E85E243CC1666DBAFF4E07EEAF3AF71BDACB30DAEA792F2B8504CAB071544F01 +5D66243D529C479D276FE22F7E275D9E7FA9C6EECA18716B2F213916E32C1D94 +6E32397B41AC6779543218E506569E3544803BBF9B404A983EBA62A494187B30 +8D3DFA4E1237A2E5E08224A60492C09ADAD8775B7CDB830520829BA164209ACB +BCDEB2D574CEBFB7AE4BE72DF4EB1945FEF2458761AD8DCC0D378AEB7DA002C6 +9C14A665DAAA532B0ABA98D7BFB5A6151FF6703385AF7AE8FD315A492FCCDBCB +B825707F9566B3B4943A3C61C3DEFDC31A843A2D67AB06891F3E110DD8C73D3B +B5E4151B51D9F13905D7D94DB9ABBFCAF35F43B6EEE256B1A80ED6D1739D8D5E +8C767F6F0E8704C5345D028A2A6DAFD9BB7AA048B8B895FE9423A7ACE858BADD +595CB074A128DAFE08FDFFD6BDAC0114159A702FDCBF8013804B0CAEAD7AF38E +FAF086A3248AD4FCA1401A85AE2F72E3E6956DC0996FE8ADB18F89B14A208A15 +13F81AF73D0DB72F78C4DA634ADE3C73756CAE6AF2E149C26316DFD93370BE1A +FB4A79F77A67C07CB0A53C78367F21661D4AFE9E27328E077B522B50FD9AE2E3 +DA087BE481515B5DD7BF894A96A84A6C78874100505B7DDE1D22EFCE8D58B3AB +313AB5495F72E2CA4E6AE22C0CB854302B9990372F1661D9F0A517F90686F248 +C5643008B3D29F7296E5C8FD4049886662EFDD4106E17C879F5D41CE84F87E89 +F6A3117C968B95A35940CC29C43E1E0DEF51C1E46B676301F40D59615C3F73DD +DE37B72FF7105DB84227DA5241583272AB1C3CD97AE11C1EE98FFDB5E5F44844 +8FC41BEA5C54B26341AFF6830D9D0A5A2901B0653D8BD0746838194D240FF753 +E99750D3383373F453723D86BE97B571B8B84D8696089B5CFDD53E6C562A2197 +A8C4FB0CC690C27761A816B441029D3D306245052E0C41B53025D8CB7267CFE3 +C17FDFE348E765326F91AEB700CC49162DF748171214252CBC821493DD01AA20 +417D66DF47EBEFFF3E9BB2B0A2BE7D9B8C68BD570FC2EB0FA54CECC318F04C43 +19598BDE93F2F13DC7847354C99059AB20593EE51E94F9D4E9241869D605AAF4 +9D9B5FD88C3798A039A67993C5EC68B6326B132E647F67EACCA7F7AE7F718D85 +12666E90D7C73EF210E344964A38228B236679A2B18F5E081234CAA2458F8D83 +3F0CA308D19663CB12EB904076EF88E556407C33C9380A6A3D68A9EFE65387C1 +A1BCD2D26DFD2AC0881EC30E81C0A4E76C244A2BD822EE88C4A60B480D107E68 +90E419A1F512E865BA922A7830909BC2611A80931CB2E9344529586726614D94 +3AC5200FB9FF68AD9686506C5EFA8788C0AD0251AFE7F95E84683380CDB421C5 +B1A783B6D5F3A6BD1BC1C14B363DB01C87C0796DCDD5BECF41A1A9F43183CF6B +82C2AE49F0BFDC5DEF7729F2E638EE6EA9E4D059EB9BB1B992AD8C82D501A550 +1BF73CBBFE740179B54E193E84A55DCD61B343C1852780FFB44248FC9426AC94 +AA2B3FE20FBA30F6C4D1E0FF3EDCDD8C0F57CCB50CDB0EFE2E04A8927E239C1D +9B026C7929BB48461D4D695FFC766C8A0E545B1BCC2AA068D1865333108E7985 +2D93F9B00EA0A90939D0D3840D59B6CC0CE2C147B2E1A9A4F14270FE3ACF51D5 +99F7349106165AD627CBBB0ABA01ECC6D3A14C1DC1ED23A9DB9865BB4396C51A +31ECD001EAC94B33C34E29C5611148EF3E55DD61813470B8F3CE32564C749414 +3C93C77EA5A3538A0B5AE3FC4DA32813B06772E0E48E25BB39F3F6FDCC077E86 +F86FA50E18FD19EB2F37311CE87F18F3BC85CE7FD71CA92D5C3264E34E04A2E5 +70C79D99F54D6C6D9D527AE45EBB48411221134587D2253E7C8ED7658EDCA34E +5E768DD14E0200470F73C44D006CE8CB35DE1CA3EC10ADC668B0662A7774C891 +84EC95A31DD872F0728D9F65CA80940080E04630BE4DEC77A2C49E3913C39978 +BF145F8832AF2C4385EBCDB15F9D32C22CBA0CF950877717D6F1591D7C0B8047 +8C9BFCB16AF7124ED83137695F3D69228DB633053208C29E0ABA1B06A7FB3EE7 +5625CB44927E2DA6E038A6E62DEBDA2D96A03177982D8FA33BAAF4426E05F4B7 +9C1748B3FF7691F9888E7FF864A10B9DF761A41E6B5CFAD2BDD7E1C4924AC97B +F4B352705316DD1A58637CC12D71C18A5CA691AB2AA8F171590EC24582B1123E +94D4DC587D8F99E18A711776BF4013C96446BFECFEE4C809EA94B169088024DE +0CBD20199A915AA406F0BD5F3D63D1467C49B4691AEBBB35ED6624F2D7BB74BC +E80FD92B9FD04DD9C2BE9B6FD29EC7EC07FAB447511C61DD299C783BC09AE2A4 +7B3CBCA6A20C6631D06D0B2E2482A50612BB7C29B7E7D0A205EB0E8436702581 +596BC996ABD58CD8D5BAAE4B1478195CAFF98FE0141287296C4EFB8D2E7A8442 +F0A3AA9F9264329982532295A176BA1867EF732BBAC49AF485D9D0F7130F617E +7F7DEEF935874D55A22240F8EDE4F247D5F73481373A392D40A8076BD91079E1 +1CE5998BA13D48D56B49A92B4A18430E316405D2E2E391B496A1934671FF1785 +AF42BA3B2D14B8E04014437FD194455C50289DFBA61B5C377BCBDADA48E82DEE +4E70EF5E9DC03064907BCB8BE4D59DE069FB0C0CB140DA54708E630767313F9F +744594AD8A499CFEF733E640A11FD74E46A749F9C7D18D49251BF85C6EB4668D +67598C31A8F90922FEAEAD4B83B6E7184567DC798E4BA1C4C9B3461A478D63CA +054F13B502DACB674EB49D6BB935E5EC82BF99FDA7D47C581AD7F940DF4FC6FA +6C6D25D647033AC69505F0CAC58DE99087F365531A6283CB89CB644688963C3B +8B2203A94294E58739EF23C7803630A1F9121D62BE1977DE2F41687C8CAF87FE +CBD7AD3B98E0D95C8C6E1A7CCB0E09465AA874DC90A0F5DB2C5E7C130297FD39 +EFE63B0350B5139D09E6864D22C3F1150B29196E40EEF9723E71158B7ECFB8E4 +C426FEDCD439420B7F1C251FADA347C9A2C49738B5A17922E1EA93CA7B125B76 +57449EAA9C1D591CAD327D0E98EF2D44D614EE9ED49DD31ACAC0B956620B6BA5 +5BF6D08CA7541059D5ED2EF00AE2EE95488F5645BF6837D9241C0D3959B7580F +C9ECB2BCF3E65C07D52EC9CFB21C11CD4C883E44C173214C900C44D2E1E43DD1 +CE8DFE3DA93C38B548BC4EC46FF91F30CFB97525E1FD4E77686433B20BABF8D2 +848C1CDF1BCF185CFD7A81D2D4BB826E837E2AF35CFC4F419F698DB0C43E9F9C +B0FB628AC9A3CBE9B1FF4A067016E70333E78B32AB2D89C483834B31F5808FDB +77492E099F1504DABCA5722C7860CDCEDB2DDEB512FFCC7D287F4945FD711F28 +87BC3D36173566B81FC2C1290C717A09697DAC6072408E20926D39270121CE58 +3EF97CE12EDD7F87F2C8CFE36C3C0400869C0D813B71C425343EE0CDF717BDD8 +409D5297D0F8F7FDEB0257C0A391F5635E0DB1116058942FF3E7C94D5F2873A7 +A3B0ADAFC3835AF2BE474E6741319BC6695FB37F59AEE388F81F6E66F910000B +72E6BA7531B4378CEFEEDC79CCF4947BA1703823B5AB4F4AD73D9615C66C489D +99D68E49C9BF765B7FC547BAB9640D51D5A7A2396507AB5A4DFF3D14F52422CD +8FCFEAA06A56C6C7FFCD29C9A7A59DDD2A909A9363FE5F1E9629616D25ED38CB +E754C059E4379318CC491C3B1A90128693AC53F80F8210FAEA7EE638902A7D3C +82B95B3F5AE340EC1B648DBB9FB679D6E80B7F426D8671FE7136D97F51E2D2F3 +C9CE9183E4061CA40091A2A70DBB9ECBB19CE3F65ADD0FB346B54BAB182E2CD0 +EAF4C0F402C25573FB344EA771B297BEB615FCD0595172E84ED2A62FF8962634 +23C19076C2A9ECEED5135994EB397303A9619C76DC55E032DA83FBA441BD484A +59F70A5110A8927F6239A14D4E223E189A5462E4A92EAEFFA4B961A2A32B320F +C2B4E8C1821FA67A655B5042C15E4DE1FB3652B55078DB123573C4E986B19DB0 +1C5131F3DFAB271C30A5476B4A19D8FC922E31879C34BAED94C07A4841B8209C +403369FB8E842610D1EB4662B6171A4465FD0E819964F62EC5B0ADC92F08CF90 +1DE0B410FFBAD16F6D355E8AD72CCF67961EDB6CDA82398021007C2D0462E893 +75EB0710AE4A6CDD15077C9DEFC5774EF4A657734D703CE42174259B58E5277E +0DF26BF59AF8D1A3E7DC12E3C12AA4B67CF35B19962F6950C2020B698D971B35 +82FF84E72F72FBB0C54A112BADBAE6C4CAA358BDE6A705AB59332C3850CA3D25 +C7564499BC1319121CE0D93218210C68080AFF33420E3CB3A48BF9EB66BC07C8 +A79D8CD8E78C200FF7CFA3DAED0B9E87E6141C88B436D8FCBA50AC195FCBB9BC +9512B95FE3A37FFAAB39850FCEBD4D50A243EA416E73F53B4B00F3B6EAE0CA06 +0693AFFEF215D00BFCAD02E45496D7C8F5E99EB9096FC4300D038C1AFD31EC4C +5ACA6B72C1BE7204E37A4CBBCB1EC26AB87F2FF82DE20601025169A5FBD2D060 +62B5B2DBC288C79C33B596832AA18D730AD572C6EDFABCBD36DEA87C0F323C3D +6E537AD3B43C6F3A905597570A8C6B0B4A5E08C08A430B643B6ED36DCAA09B41 +FEFDB90E10C8A8B74EB358437D0CEBB9E03109C593BAC09CA996278246E7CA38 +4F311F23DC5A7F7DB374E0E3D066C874EEE28CFA47054DC41A389203BFB3D601 +BC9A4817F8DAC250A102E7404CA135B33DD66F8FF40D106F52081FBA3E79CE29 +FCA5C502B38C86D8D507AEF30436472D2381DEA09B8B3BCB109BCD72332A9483 +E61ECF0F89A85BC37B8C10FF3F7C0A84FB8D0F4A7898D3F8B06202FF8DCD698B +56544751347E9AA35209B18D3D416E5E034E36D9C5FC0B33B7AA0D46F3A3F925 +7FCAD9D6B9E25671F9AC599A40C37B2439C06FDFDFB3E78DCE515BE82B5BE1AD +2F205E8249407179559DF39CF29120C4B92C5283B609D0445B30F3AC71A1A678 +8F43D8B12D7FD722606252CF4902733EA4B2537462B5BD9C7BFDC2F5C4ECB91A +F64F3B9C6161ECF8A915023D2ADAFB92307C9095DFF4FBB8E732521EB394C4A7 +99D09151340C8F0A3F260DF18DDAB0BA5A946FBE5FB48D7E3DB8167066DD58A1 +321A5D5C85739DC41A1B86D87CA8EF1A936796E59409AB7B28ED527E3256C678 +970EDB788B65D0FFB919652DF4A23EDD2DBC29BD4A7B8B11CEDAEC17A38F1BF3 +6D4C9DE1D951E93EA0DE92E5581D2A3050C7E808CA03C9406A424393CBFA080C +CF0BF49186C8FFF65304F4102B4C771ED77B82E219F27CBCCD0A629D1046EC78 +059C54D64E2FC129488FAE43D7C948310106F403BAD307528DF531EB26B17A5C +C1E86541C32AF9C03BCBDF98BC78ED751C821BFC31D9D602D8E2FDF739298497 +0B6F4976A1EAAB46EFE1719DE1D46F58CFDF82A68AD1ABF82F1679A242250EB9 +BD86DE15586051189667CF3BADB326B061AE07A21697941BE4166BABA34148A3 +4DA613812ED14953A0CC3B36305276839F55542C65A21A346619337BF25CCA6F +5BB02ADDBCCBDE6A05FEA2870D0F2622E85536990306AB20EF99874EC1AF6132 +163BAC621E8DD44794DC61A4F56820031D1B2CB55812D94D18BD4C8F71A181A1 +6F0228A1BB8D3CFAB1250E476E50FE648F0D082609BC154CEB364F964D13E1BE +47663B388D5B9BEBBFFEC5A5934BB5DE77BB16D46EE98CD36018D0AB49E0FF88 +7540B0716A0335BF254B8523680B4C8429F93872FD6AEC7108CE3DFEB1535AEE +AA0D188BB89DBD10340B55ED8FA5FC9092C7F0C6F9BB574674174ABDE43B13BA +23CB424A9E247761830A3F5EDC885D8F9E0D672D63DBAACBD071C370BFF1941D +D42AD48C6DDBDE0B785FFBBE67546A90FA90D79065C1FBA8F8C6475D7577B712 +D44DB1527BCB0EF44889D06AC11A95DA833B2AB813C86021ADD87EBAFAB7BB6F +E05C56A7929F2A6145EA70B7EE8A7D06A74238F3A7DD2C6ED9164549F5ACC15B +62200E4ABB2AE712350F111F557121D5678A21F357066CF840EC5A6837E0FD1F +1D43065851887CE8299F546BDABD920E561CED9653C76406F089EE5338B48388 +5D93D991A3760E1C1BBCBC7C4B4238921EC6CD27B53C85DE0352FCDCF5867DE3 +3C489F086B03762EE7425BE748ECBB0216F5DE2B236E3BCBD37BA5D0AA49DFD8 +0232BD29154DB883E8CB22CE99CBA9C20C386642A62C8A2C5C2D70B995903BE3 +200F625B70E02FF5C7CE74312A191C08FA9C8CAED12090EDEA250D6E2E733C9A +8F5802DD53E6B71BA8000334D2136641C1AA8E527DA4D69B200E6DE15DA4913F +4ACD27070E78B7AB768FB3918067BFC75A05B1063C7567B27A33295058BA18C7 +EFC4F9B519C078AC9135ED29D1165B82E4B9F4EC99A94A23BC4DA6D7C13522AF +5D9565FF13BF765591FB392A5F16403DDA83770DEDE2A146F8E49DEF0350BE78 +4C9E13F0795427889830B6137EDA7DCD74BC653B4A4B7A917D54151797A9D6D9 +DEFA591F8B2685C35CE147EE9DFDCC9E3AAA2510755A802E79DD05D0F0B590A9 +C20C55B229854255E5CACE41DA182FF1D85B3B45BD7BF811DFB11201295141DA +B8BAD0A3BD129B84740CFB7D81E4D43A81544FA24CD9FC16187B25ECC405DD68 +07E1020BE9B8F0364D6BE03D204A4EAE5D4AC2ED74061800D9066C218C0C1D7B +94F5A597BF5C6CEB9115589FD11910352E96E5C84C15B4FD7C652B8000235E7B +24CD96D7C647B1ACF31B3E45CE7683948CB5CFEE1F057DD65C8A42EC4DCE7977 +C230C3FA3219DAAAFD0096C56E65FEEF8DE39117EC6E5FA8125EDDF1E4D20F45 +13442CE7D35B529798F9C180A206CA5B0572A0797DFC8CCC21B695D29361F825 +3C267CF46A6908010166275C7E16130656A10C1017AEEDAB16D781622B4099AF +EC4F190B74145E158399B33AA45C91815CB1A8E3ACF8C1E6F97DD1613B06F65D +108F57EA59D971E3E81013968151A1F17E40EAB4EBF7246426ABBEEE3B5C9ADF +774E19A99512A0F5E5C600D464355273CF256DDD5FEC0DD82C92D53D564158AC +43CE360F2F33D13D235C569C809669E6F11A7F29BAEA9E6F585BE3A93065F8A9 +40815E22C73573FDD775499376ECDE6BE2C40332610CB77C17609B947B07873E +1193BA45205BCCC0D81B72D87FC8A0DC245DDC8245D440BD89BD4867F547CC3A +098F2CD1382E6467AC65E5A616142CFCB27FFDC25D54B0755B6762289CBD27A9 +136CA1F7A82AB3407328D554047962FD70D643150F533008BB59221FC7CD590F +3101C32B1A2AA78F9A76E7920B60E2D836EB18801CC1B2230E4CDC23E7102F3E +AD479933C820559A3F5D2891C1510B66CE9C8E9AAFEA22651C752C7EE0276401 +A93707791720C9EC5F1641E850D01DDA8FC1E97AC0637215E7AC910F4759CBC2 +995DB086DB285BEF4CA5FEBAC9DDF98CC464F61B071B5906CBADE42DC6F31151 +4916B03F9F4F60CA6F2950FB9FDFA29E63FA6762F7EFC4C1F414A80D4EB0401B +718DFC57C500FE57C7C66139DB39D1AC0A39CE7DC57017787C04374978DEC663 +80E87CA7A8671C5D442F4CB3B0BDAFAA432BF6AADA725547892357CFF0E5D141 +EA60C20954BE1B49DDA61A247DFE81486CA38215F6CC8248A4B312DB232CF42B +FD5FC0F49B433A4C211508374B41688E9AA41DEFCD93C9F0E8A0C2AEDABFE47D +6378E5CE48F9003440B3E33018B98863ADCBDD7FA671BF5397773908C6AF7C98 +E547DA56BF1DD5C079935B92B9E02B612EF9521941F1D5F340DF0BD1BC1EC2AA +38045E5EDF02B712DDCEA28E5ABB3049380C60E38CF4F8D12CE696CDE0F53D73 +9962ED5CB6991315C66B8F354CF9989F9C09C9D13B9A65DB14FEB8CED31F0452 +ACBD239EC915362C83D45DA97D03938310FA265C536BB22A0A4B91A9F4B40A3B +17D17A85DDCB89E6BE5D95B5BA9393EC184D58EA612FECE94A62F24AD2CCB86B +C02260AD8EC417E93FC251196D561BB1CB44BE42FB7492E6C18AA18D5D45512D +308662EBA2E802CABE5C356A59CB05C4B9B7B84118A9BAF2BC4A47C0DA2FDBAF +14167ED33BBDFC0925777FF38CFE3768B87907DC25939896584E14F7461E4AD9 +C15E808DDC45BAB75E953A8D1F17A9DEBB8F26164F6C8BE9722275CE02DBF42B +E65D5EA76FE393A6B114AE21C04A1FBA0B70403240A8475A47135FD81A95999F +AA617BA8FDA4DA7AAC318A4E07AA4D7D8A01E467C48A7FF034BED591272A9503 +05A53D4AFA7ECEDA0805EB83EC996BD0F2C0E428943310AC4CFA21E32C28BC05 +4A366498119E9C91CFA93783D7DAEC9CB20717A9E3336E87ED69BF5CDEF78D76 +A281E581B439A12ADC6FA378D3B15E370B68E5BDC6C82420BA165C8E19BEC8FA +B1519B7E08760BCD307140F95346B88706D5E99B9368DFCF788F30BFDD408A04 +47E55E85F969A8A87986C8C5D6F334DB9C21E618346956BA50481A874B22A212 +6902F85FF97E9246A156B1131100E3E2CD3C2BA28DE2D7288B5B431B94F795B1 +9649DD2919596BD6605BE51DAEE36035753074AB6F602D585ED719C952C4A931 +3B310C30D5C491F8A0177E5555FABFDD95749CE25FEC9BF6BBD0C116944D5800 +B9DB8AC2AE09970B9290340488D4AF0165F79FD45C08C7F1AB25FC9EF7E41AC3 +90BC184F7BFC19D0CAE8E8BF7AC9913D3EBC305B8CD90BEBED829C933E86C603 +58E87DE63B7CE41133B1AD7C8EFF48F2D6972CBF763C0DA976246667663C5FCC +BC09EC4F60092780A1D08F517A876E25C61EB21379174F1B7B528B0D7B25180C +622AB398022D524E3ACCCE53D109A8E4AF331725774D99C495FCA69D565EDFCD +D1D9370CFF8C0AB1A9D24AE4619560BF3AD7412A4D09E5247B049AA98014AF01 +CDE1B29A5EEAB01EA2E3783EB83DBEB3CE8CB11B42D2BF31F13AFEFD2045C052 +E920FBE22C27B7B7D9CC0DF132F08C2FB79E12B327E1763C6B2204C164BFF9F8 +FC7C40F6FB3A2BB8DFD03057E4D36E4D7286D79557CE91DD6E3C9FC044087C6B +BDFF6EE48FA8430F0304BF09AEBB390AB0D693AED8CFB6E07F90DB281DF38215 +5E7C0DEAA4F89E401040367B3578C5E9F100B9239774DF937FEE9E68E38B499D +60CA9562C7CFADE74DD827C59CD4DD8EF2F7936710F490A95E94D9F0B8EFC657 +4D354C60A330556CD6799E51498265119F9D8ED542BB3FC97E9B1E15136BF2A7 +B108C48F8D8B77EF4DFB67A15F1F15D332463AF6CCFC6AEE8E93721B59AF6821 +B10CC89EEB0572A72624671A22031563661DC5A4944DC88BC1825171BD6E94D6 +F168B0EC840F33E03AAE8D8760E7FF9258BCB8C8CB9A6752BCC1FA836B4FD9BB +A922969F199BAF6C36A5E0CF6F474AFE360E62F3E96B995056AE44FE8CF72689 +6DDA1FE223AED2F337E7A3547F7D2A3BD04DEC8451BEDC94D5DE3349450D8969 +9274AB9B620CED1FE04E5D4937F16D773F4E3D4748BBBFAD940A0EFB3B0CBB77 +36F050CCAA7D21DEE4ED90AF97200AB81C4227060E27DB22668E86F0B357A38F +C66DCD3EC4AB6240147C3D146D0ADE63A111C9020769D1DC8A36BE8FD73A1E6F +F0CB94FBC0657F9491C14D45A88C5DBAC08C900C2BCC4B43A357A32A52426A01 +EE7A526D7F1C8462ACF9D331D63612E1D35511AEEF5CE9DDC5E850F1940CF994 +DB6442AA86D7C9E9B7BFCCED40FEB6DC6AAA6F868CF3D5C28D4E1C91F3A569C2 +782125312D896FA8C179DFADBB6505A854A4AF8CC620E491676C4643F8EE6546 +B6670A01410F385A06C4E8C650FB212958AFCE844148262246302F14C90B43F5 +8916F6741748A22FE2F91ECFB3B895FE7B0EF22EC80E82208E44C8B8261FE3B8 +FB74758B71A815E424A4A52A95B59C1D86FA +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: CMBX8 +%!PS-AdobeFont-1.0: CMBX8 003.002 +%%Title: CMBX8 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX8. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX8 known{/CMBX8 findfont dup/UniqueID known{dup +/UniqueID get 5000766 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX8 def +/FontBBox {-59 -250 1235 750 }readonly def +/UniqueID 5000766 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX8.) readonly def +/FullName (CMBX8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 49 /one put +dup 53 /five put +dup 56 /eight put +dup 57 /nine put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D4350D67F24B396427 +8808B79FF5CAF896E4A8A31E46499CEE35E6A5AF0CFD175C2DD628620C681947 +A02A01D3C2B715AB79D7FDAB638D887B77DFFEC5C3A9484104D84FCECC7296CE +2A3488AE246E233A8D5B40ED5DCC44558B77422BDE47E0435F960EEC3A26DA9C +E137555F0638511AAA14992C8DDA9A4A11B3F90BD4DAAD1883BBEC357DBD8389 +16EBE2AA8F93C2AD44F383ABE13B8C95B240563FAB987EA98794D301785E1E9F +03DD545E51A6D58B3618E0750208D3AB913F9CE8C3B865D4CB83B90FB24962D6 +142B0204A1E271854F903A2FF600E087EE2FC222326051F155BE709B3E7A808A +487B8AC3CD7D2EAB52C2ED68285F962D06677C2A5015A16B3D12D15D658D89E5 +18513C020222D1A995EA14D7D9CCAC4A552172146B53AA4DCF6DD217B61CFE98 +1E14709295D97DC8B168AFBBA9990F0BFB9F72A5305570A1848A9E2CCA702C77 +DF4F414CDDA4FD7DA25D9B09F05A77F37F1496F2601AA5FBE9B52C1C16FBE860 +A3FCA20DCAA3BBADDA16304242A306400D2BEC9BA12788A5AE0E0CABDCF565BF +474A615DB6A14695E6C7288DE0B852EB91153F8A337E66DB5CB43E8234589F00 +4868530A5216CFCFA0DCDB92D6BDB092855E9BA80682D5679EF88F3152E8C2B9 +E38D0D6F26276BC74B8664E13D4B388124C88D19FFD2448E2743BC02AEB14694 +1AC48CB776F8526FA416549A3C35616E8FA5632AA0D557B90C5CF40BE1B62325 +97E45F7EC4F04CBC178B72A195912CD18498098C901CD35834FD6EEF765CB292 +5A753BAACA557BEA0AF989BDEE0F0C5DF8177084AFC20E7A78BFA536DC28E9DA +FEBFF50E908CA6B5DA15D3CC28A00DBFF8A1D7FF0D82F2A397C0B8B23F959C99 +63BFBA5FC83D7F51CD0EA2E2C925F7F4AAEEC8A0483F50E02E4C0373FA4D7891 +3EDAB498C44A259B6A2E3E176143C12E25C7B880E2E6B96592BE77AEE1190C74 +35F4BA28952C002AB6B3A4B0BD9054855CBDC143CA9D20D20EB111A030D1C979 +86BDE77F3BB47918F4A456513EDCB90B7CF72E97296FE07F51D0DF8C9E666024 +69C209E6A4A5343F3DEDB6F09B06297505F8F8AC2AA857DC545E030DC9337FBC +E48DC186C5DB047D0FF564B444054F7664AC72B7C39F39959BD574C099562FAF +9832B2260D4F1E9FE64F6BE5243308B57499B6220EB4431A53E8D9A3C6BDF5F3 +8D7EA0754D363E897EC68D7E45DB4635D3E7D7176C8C364082D1D6B00D9A7AEE +5E978FC3AC4D9D73E8FAE3086930DA11497F8867E01CAE42CD9D7D1558DA4694 +48501C4729614948B9DD2065E5F13275325302C24E28A22AC2F33304EAE0A317 +FE51288D91EFB7AF68B8B9C3BE1294CBC390862BC28463FBBD62A32E0AE3344C +5F96E2343E5E1662E5626C6014E1F0E661126A00E1E24A4F7A2546C37B701BA8 +F18F93372B48893E3C0449CEA14D228BDB8FD17256DF2FE0767661F6A3972DA9 +33C746E2AFF1EFF2B44159CFF6A570C10260751299D8A30A3BC19239C9FE0DC6 +BAD2AD2558223FF4CA1B672426EBC422A12514F67D9152099848B13E131C0E90 +9037A6DBEC1CB183720F78C37D5EE5BFE81FCB2F615A9595791C6F56210C84FE +62FF6F5F15B866C686D8881212D7B3F4342FD09FC1E4874D35DCDFDB9D506D5A +06E5DB61F496E70C8E8B145B9BB951B2160B6FE86EA7AC1671BC40CDD866A9DB +3103E91EB483E5BE3C037F2D2388A44D8154B216C433FB85231DA4F55D3D4A8E +7FDA4387923679067F13454B02D9F2E2B030FD62C0750576F32F090E9A054DBF +4BBB729B94162C080ECD81F2DB2BD1D65C1D50CE414D0FFB4C7E994B65177F04 +E786CACF71A5690F62AE3AE57F43247B8392D2BBD4E61262EA0CAD3868F33296 +BC7002271448E865DED4324FCD923313969D1355A579F918E6225955A2BD5B7E +C2A0E02809102F295895722930FCCCE6E8DB301635221B57FA589533C2C3BEC4 +9B1958680BE6102180C667E4984C7B9250C5BB231F8E443B98EF07FAE3AC29F0 +B4CC4BE8A3DC0058FB2CCEB90262FC959D5ECC3A887E10E1E43FAE7DFBDE4882 +BA9035B38BB0F69F8659C0094EA643DEBCACFC8EB5C73AA25A1B83B2DA2D1D47 +29A27B554BB9A762D020EC05001DC8559E096F82581B248AF95D6F12FB73E4E9 +58BFF246EB803809F561F8E17E6B1B7B1472FC342761EF29FA2C3890FEEB96FF +6B1A173A74A2A61837BE90AD9574EFD8D65602C63C560DEFBE5F0C1F8250E66B +E7A8C1A68E8445CF67F672E2F11583F70E77F479916339FA7E5672DFD1907CAE +45A5DBD35C535D903442EECF453495A6B256DC635941A6781C426A2E12BAF3BB +73C147A74DDE4925D642BB73D9F2608554D967A0944D38CB29F984379073F6B2 +77301EA7AD503121EAA1AF349D72677869515D0E537AD762304A6A5CF31E8431 +D053D4A1B6C03A4DBE6BDAE2312FBC65F18FC8F4AA546FA69D09DCC722CEE1DA +E02B6F69B69F675AE544ACAEFCDE959350E1EB6C45C162E08E153D1F3151AFF7 +B539D0834CA4B87B06732D5EC077B37373348A5CD7B39811286092ADBDD86931 +3F6867AC5D53E565234847205FEDC23BC1E1166CA113787DEB72AC251FE7FD1E +250557284E533F3B2DA3BB22AFF13428D2537BBAFB70734A7FDDC68AF58A9D3F +DD456ED2E4A0A89C6E22080101412164A955748ED5E689308C96FA5D23D63513 +5B8890A57983C9DAE333B38ADFE356C6CD6BB865C493151B24B9A1FC4D66C491 +12E8637906EBCBD60E76227E8847112135CE4FFB00B396FE3DC237292B8D2EA3 +03B263C1B6CDA2719C0D99B6CEEE6C86CB397C4D0C058BC2EE9D6298612D01BD +31531819BFC228868453DB8EB836AF2394D45A222A21EBDE795E558E84A277F7 +D8591ADCD9E16C34201CB0D0FC1FE62FB107D53DA0D95F61A9A55585A3D106B5 +48B258A35D3AF66995A9DEE4312C0DA4C91CD3AA7FFBB7A5278FACBA05E5BBA0 +F936BC210EA4E107EB883DEBC83BBA0798B665F2DAF2BCFC00D524930B394187 +4712AC73DC2F901BDA21589E9132A50B6F16FE8C6153209BDEEC9025C3C24035 +F8623B3CDF420E064D2D3F1BEDA64E39C8482972C96B38BF7D25C1025A9DC57C +40BE36086161C419BE1B0CB4B653DB07FA28934C41AFE90152A14AF2688FB6A0 +71AEB8175EEA7775C13F2B7C598C30E91EA8DB07ECDDAD64E40A8C8FAA3ACCAE +ECD1296AB2075DE150F10502847E970256A70B7329834B1D80D40AC5C8DF55DD +E3922D85820114F898F87E644EB8F460BFCFF752B635B6D08F46AEF2123A2E86 +913CF1B45DD2D01B8E560EC04230CC8DE7C78EA2970C224B371777430ED41B02 +63C87C9B29161341DAC785F547C2E6256370BF3BD8D7AEC72F6F9A4BDDFB6EFD +45AF0A366B9387A4CD9164326B997BCDCFFE0D25D88E22888889D8E47C5709F7 +CAD17E0DD435B20E767B31521E9E14ADE57C7C9CDC2FD7D09DAF912F6C5CDC34 +6362133B50B8E5954814EFAE6AB8D004AF3CBE097BB0F61FDF1E10170F4EA28D +CD93B802BE124A435403D3BAEBE8C1131718579194420AD650A3986AF9220363 +75155975B60093A9A6CD171834B2E39629041BEDA7CFAC7BA6411A206B09DD78 +CFF14E36304B7FAC838FEC6E4AC6847C6CEC1559B41D81383017668DD230C98B +C317B08B199C270FEAF50868DFE6AD4243EAEB67590855074A248CEF8F64DB80 +D5CCAE6445AE92150058660E861467D0CECF61DCD5D4062CE9DF07CB098B90FB +6CB59553A0956BD6339CAC2FA9C519C46AE9775672DD69D33C0E6D7F626EC2D5 +85070A68A450227CD535911F9E0CCD1BA379C750CD10C4190EC8B979C1E4ECBD +DE2836E85616406FC2DFDA7E27A411276AD1B3900453DC3AD85C7A9BE51CCAEE +315E3E5C31F8E6962721DA166B9660C8087C1F1ABD77950E061A2D924FBF4A89 +3FF5C570ABAC5EED011D2BF94BC1268EE4F2A2CCBCBA29FBCC4B186A3FCDDDD3 +B462305EABECBFD279C9860D5E490EA63D9231638E06EE8D58EE6E926C4A3D3A +C5E957A20F1F99FA05C43BC4D1918DA051656EEF0C498748879BA4258DD73CAB +0F32F20B98014C2B14A77186E43470F0182828955730F440493D34B0877065A7 +6E7B704B27F93DAD747DA77109C541A15F08A694A703E6E7C62BD0A86331EE79 +6C18A6C38923B88BF83BF212C76BA6EAC620CC859F0365F5511821261CE29DC2 +BFEBDE0CD36F0052692C9945077CD606E4841CB991D3C3DE9BE28EC7CBEC2FA6 +75984071CFDFA8857CCDF9005AA8FC549EF295DC701260CB4A5CE8FA0F439B22 +BC2C19D3C14E7B2B6B41AAA158659C307D9C91C2B12331BE152D3EF8FD324B9F +8C3B74D553AADE2B0E89805F47FA2DF36766B8DF01CC2B6B44344BF4B11C7FD3 +186662A11137448ACE7D3F4CA515E0BEC21859D2BB5A25F67C48817404DFA0CA +7B3D11495250150C6A1E32B80334E8F5C52D4769C8BDF3E6E3DA4FF1BC97E009 +A1AFD195205FC741837F21CC2942CC8322F3D6AAB6D330E6CE120E1A15E91987 +AD98FC12019A945B215BC72768F32A7635AB0F0E6E185AC7099F1A0EAEEC5FA0 +341EBECA077B25102310331CA87B74345506156CA5E853728217608416EC8173 +2D24CEE766E2B3B0BE183CF2A8B794E0E0E91C11D59B98DF5F4E5EA119F197B5 +D8800744F9FD45015FCF5E740105ECE72AB5AB7E1CFEB15807A0D1CDE00A44AD +E94EF57AB546990A691FB2E24CB55477B7FAB6F12A28676DB7ECCC014AC70C80 +9199E921F449C232EEB88268A48DD86FCFA2E29FB450FEC618E9E317F4AACC68 +C51EBDB1B9E43F7574B40C0EB05E769D30F1C172645006D799E8C3D7C79DACD4 +FD269ABF9B24B215B534365D79535AE3578D714606D22AAA5A2039FE7A5DD52E +506D293824BEF78F5E1C7228FF9097FF5AE8CB7B46E69C72FB43EEA7110A9EAA +546E9975C54CFD56022EB1B21E00CEC393DFA488C49C90E73D57CAB0324E36CD +0D2F0F0641DC3785CA9BFD680D609392CC2F852056E90276DA93043B14F30BDB +C32808FCF16CD13E4A13B727BEB4FD42B29D6C215AF4811B965822960F6D7CDE +92BBB8FB84B59075FC14075C30CEFD9D095ADD8043FD12452D3C5E4EFABC9671 +6E929D5932C337969F3F5448A2BC8001ACDDA043EE975F35E64D7436FB73B197 +697E87860E071F326C7080E9C2930CBA600C6875ECFA85DD4C3741945004B3C3 +298F2B741302E0FD39D990F20D68542B2FD0D71F52DE1ADF30FFA332306360C7 +C6BE3E6D510A691029D503FBFE96831D332831C69B590025C831281881968B86 +42817BFDCE322355F994FA9C8BE68A9222CC09AF9AB2AAE8BCFDEB69B8481CB5 +75E66873B08A4E8265F369448F0E3BC0C82D82F65216D0C93DE88322EE7D0FD4 +1089A1D6CC3B52F681BAEADB1C82EC3B82949C27C6C340BE7E27020015CF142C +37DC3BA8E4EC2A4FA81E50EE6854C23B3EE301E43D83CF6B82E80ABAA01EC82A +36CFE930297EE3A45783871EC4E77DCCC0923A9FB1654406FC8070BDADBD27D6 +0BA8837A459481ECB63F03DC3007700D360643864AFB3728C5573A20870E5D55 +4F698DB4B5610C30876DE56786D84C71AA9FDD5198B4F3F8918AF319B7FCD04C +F06C90B2CD0CF2241C2055DB68F1CA5CD57990E68F6F832A5820A481B0823F98 +0F4BAE4D7E92F4F2BC118E01ADDB7D527E6BB49E85D37D7E0BE7BEFBD1BF9E1B +9ECE91D28E664284D190010D1578C1F61F02610A9AA6E9527872276E59A25362 +68F74B88959CE84F497D8D89735413981FE4EF573E4E0C02D3F0EED5FC100A4A +563949D21A3E29D86A84C9F945602D9EDA860C6C44492EF219DFEBCC016FA7A4 +AA12A727D4E218D22805E5EC878AEA7D8B5D79E84E74E78FD9E017FEC4220A7F +9ABCD125BA6E9D378BDC19D0B267A323FDD0831C5E7EB7D4A5CE7047F272D3AD +1E25F7C5327127A058C287FEC98BD81144447D5BF73C56472E552C7B1AAF6705 +05286122B612BF5A2AA8C4A6CD64088BAB59B008A43121FBF5692418FFCFAF05 +260D6EB20C680BB73F3988C3E4E3CEFC65BA637FDFBA60E6D9D63E6C7FE196F4 +412367C1F43343EC6FEE8F97FA0E95BF1BC2C15F14CB6C8E8B28248B5EBB6478 +FDDA9D183AFF6A63145824E518377F384740984DC6095FCF3F8B777DD23A221B +AB1ED5EE27C19941184967846B8800E489E1B86F23ABC34237502ABCAF092C77 +38A1720A851E8EED24BFEC9AB4C8D4D7FFC3ED0C1CF4FC73B962EB53725DB67D +983A8C2B9E30F4F85AFAA17D86EEFD57CB17BACFB8BB2204E7CDAC446C679226 +F21D1A5CF2EA719888BC727725346D58479B69213F9EC3520B9C3A1778061AB0 +3B330514114833525D40B3F7F45EE401534732803B807953EE20C9660FB790C2 +71513A220EBE1731295B205324F275FE110D60A77CBB43441472193570E67BD0 +E97D51AEDD94B4DA0D71DE66E18F22F1E6CCB81D1DAD113125743D82DD4BBC8C +190BF7073078FB1235E8A329EC3C69E3D25B37B1BCBDFA50D0C34BA486AB50CE +0F411AE5DDD05BF3ABA16151A06D566860A08B2C634786C823D615BE622BC8DC +36FADBEE389BA4F7A5A32BBAC6403282F02E92ADF11C14F45B51D579631F067E +09C17ACC247837A8B6F66C66574F91317CC12C73D09A75B80CFD11993FEFCED9 +859D36B55033A149ECF0A845F611FAC0A8DEE32B407091C0233808C79857C2C1 +540A530EBFAE98C5D51C955D02FE62C8F207C97D614636AF826A7F2247E56B54 +3B496509DEDA8A277F0100A94376F5FF85586C6721F65F3F6BCF8B19CAAF8E4A +EB16AC97AB71C32FD3DC9E7F1CF02D29ED516BE9F8F0BA027C68A5467A91338C +CB52C099EC4FB72775138197BFF472B4FB75B84D5D45824A705412F13EC5A2DF +363D37E7ED7DEBD14AB754B8F7C829998351F76E0660BBBFAE6DE96BEA394965 +F14D65CD28C593B5056D41FBE0780AE9AFE5F697D3F41FD750D327F5DC23FE02 +1DC31AC1DC74721C939D38710BB1BE55E895C2181365CD2BF61E8B59023253B9 +7694B2215942A702B855A0102029229F2CFB8EBDED2BA9B723CD915E0CF54FD2 +D8B4CA2A0BD43DEB478AC342F292FF590B2FDCFEB7195BA687A7C7D4E17D5E06 +EDA0D7F0195D255CEA7288396CB53A961DC4EC29F949EA8AA48DBFD6BD2BC7C5 +7019E26D342B8BBD0AD9D48E689550DC1FD581EB0D6E4156D107E116D9326BF7 +E29F3479790283C8FA5AD1BF8562D11A26F81783E7B9CB3C74EDB9A2BCEE56F0 +0A6FF68026B320FAA86EF294C07F310B832941D400337C0A1C8DD466F2AEA9C9 +7284F09CF01CB6D17E333AFEAB84DB7E5451829DEE0B97F8D4037877EB32BE6C +871C9B477865AFA9BECE34891B81B4416BF1C82CEBFBBB6757B7032E04E2ED10 +38DC59E06E65379DF10372264804733507A929783916D02CF3158E4AEC0531EB +95502E07ECAAAE6EF0E70EE934263D6C8404739F468228484BC5BF2EDF9BF06C +D5CABBE2E28975711AD2F485846A92D22DB307ED63FDF99120684837B21AE421 +751B4681AF90A153AE3B977850AF1B7FADFB4A0D074AEE539DD1B553D99CF869 +0D589B7C27086CD89458E78A94E33C2610617A56771E56B146D9143488B01742 +017A7EE0444948173C783DB8643039B61CAE1D863047ED474E47A1CB49DC43DA +0099D2BE926D5C8CE61D98B0DF3B532AAB90EE57BC17191EF4119FCDB991ACE4 +B124110BEAD7BC80EC8A205638E2727D8464AFE44C65F47D33F454316DD87FAF +A1C93E7C6C1E357F3E111E41706635476A360F789F0153DD8DBBFD19826BDB1C +AD807F7DC8E3B4FC65AF1AFF2B5F23727E87CBB5B28857BB09DB24DA0108AC68 +5D78CADFEA384D7451C16602F9891FE1A54C2FA09AE44D439F8EDA1737952610 +6ADC59D1E8DFD741EE046B1C12BFA1805CB95465143A974C742CC2A4DE9757F6 +D39720632467BD4C29F7D81E4732EE868C28D22CF1B0F5E3DB01ECE22DB2BA87 +F43A973880DE8BCA102C0CDE55BEA23A80805CF9B4424B33D813EAF6F030D6EC +4A23F5A8AAA20340DF3D3A8D347D38C954F559500326F09B89A79101FC0687AC +D1D9A52D5C7D65C39296EB63F9C68C013B31B5EFB435E39ABE193361F1BD2A7A +522F3DACEE93502E5A25ADA16540CB10C430F2024A97E551274FC768059F812A +9DA535E722F1AE482FE3C289D21FF13DE6B6A7899EDB0637AC219D4FAA55EBBD +9500DC38289468A27FAC7A3BF48D9B8874CE74C2403EF64CE9493FEF5766A661 +89A29CEA44DC51DCEFE71B5F458B42166D07C33579842C28CE6F7BFC6698A1BE +8841E555EA3DC91FC2A8A3938DCC21B9E8DF2179E80F169CB5005C4C1B0A0D33 +2CFD77310C3A420403409EFA81F600CA37A31087D48E30720C8892B1122189BD +7A3CF264B075C24D5AA20BA3251EDBBCD4B52494296F26BFD2D113C95D484C66 +4C6C9E13A1D6456017B5F2EF749BC141AE961B212C2B6AF01282C3209C27684B +7EC90D5FBE7F12F2E8FEDCF61BAA6297CFAC67892E4567A910DB2024A151E2CA +BD149C93371A2262C1027D4B35D4D94635B257B6A011FCC702208E51D86B34E9 +2D8CD2520DB282E7BD39EEE37CC816B98325804045B0748A23BBC25E9650829D +E2A3B98D2BE4EC11699DE708454D414ADDFBC07B3E959E523A2638E369D3220C +D9430EDBFE656FE18B89DFF47059719296198BB464CB2FC9C91F43627C0437EE +E961D9A559087251DDD9410F5A0E4ED72B3331836B848BE8C79B7719BA995222 +12604331FCC84EA0A652885866C8DD3D456BFD9762B551466559741F2CFE7F60 +D676B7E31B920251307043626EC6D0EFC50729F1A28C9E2D267E13DA7DDAC6A5 +ED26E1B062A6E8344563B05CBEAE0959BE0B12541758E533A99941F795E677C8 +41D079306E883C1CD921AD2C06BBE33E181C146645FAF0C83AA91B48EC9818D8 +E97CB4631323560D5F796FF98D1D +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: TeXMUSIX20-Regular +%!PS-AdobeFont-1.0: TeXMUSIX20-Regular 001.000 +%%CreationDate: 01-07-25 at 04.07 +%%VMusage: 1024 35768 +% Generated by Fontographer 4.1.4 +% converted using TeXtrace 0.45 and modified by T. Uchiyama +% ADL: 701 299 0 +%%EndComments +FontDirectory/TeXMUSIX20-Regular known{/TeXMUSIX20-Regular findfont dup/UniqueID known{dup +/UniqueID get 0 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +20 dict begin +/FontInfo 16 dict dup begin +/version (001.000) readonly def +/FullName (TeXMUSIX20-Regular) readonly def +/FamilyName (TeXMUSIX20) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +/Notice (converted using TeXtrace 0.45 and modified by T. Uchiyama) readonly def +/em 1000 def +/ascent 701 def +/descent 299 def +end readonly def +/FontName /TeXMUSIX20-Regular def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 7 /caron put +dup 50 /two put +dup 71 /G put +dup 85 /U put +readonly def +/PaintType 0 def +/FontType 1 def +/StrokeWidth 0 def +/FontMatrix[0.001 0 0 0.001 0 0]readonly def +%/UniqueID 0 def +/FontBBox{-619 -1659 3200 1660}readonly def +currentdict end +currentfile eexec +D9D66F633B846AB28EDC112EE8CE6C6736001234F4C7DFDC8C8014E32702D436 +0A505E30AFE960AA59313499738A089E6AEAEFDC84AEBA57A1F9AD647CCB7BE5 +B03F5F4993FB2566BC918B0AB23DB4629AC0D00174ECD9F3286839BBEA5DD0D6 +84E25152E241F0D923ADCB347B5635EE25CE26F509B8F400F2C9CFB67D676ACF +9D516193DA983A07AC65A99BDDE6D09C93F522AF18F5462F7C2C3A7CD58FB034 +810D4645AE7525C1BDF2E062C4D0BB1A115E406B09C9014323678B1FF15AC494 +A82AC85A09051539D2EBF8D4910447B1C8875854670342B6D13D727DDBA5C2FD +52AFE2107B72A73D3A8F8B0516B5D141AA315F37523CA19009A6CEAB11C23A80 +20B8C46718DBF2DBEAB3320A596C8992531F6E70A725359BD09EF9FF2C0E58DD +9EE54192A355EDB81FB6E2391CD91A9BBD4E6637ECE7F9DA1603F49FA9AEF3E7 +27075B080A569EF1014B7F2D4C3687FA1336676537B82BF4590F962C967795F7 +BF6CD740C57389AB77A273920959FE657B87F76B9403C9586FE85C957B0BFF7B +26F4AA603883E02139AC15D1360C26E332527461ABDBAA603802CAE75E08F559 +E16B2E623827BEBD40D4661A6B3D10D6C395EECC916F52F99D9D1F19DE5977BB +73C4EFAEB7FD0052E831BE175C945358083BA2C5690E0CF8B386900A4A51F60D +C8E98236B16D54A1D94E88A062E0E3D8397F5CB503F51A4F9918D3A902AC7DB3 +25B30A154EF106BF4CB8A369599B3496537F22C842825F69154DD87E05CF9ADA +B6C94188CB702F53D00BBEC8ACE69CBBFB8C11099395D7BF0D47EB3E41454D13 +AAAC4392E8C0ADCA1E87A6F844D3AD81EDD4CCDD0FBBFCEEE9C70BAC5B4D4861 +E7B9DB2F4DAD612986007DB8CDB3B5384C3C7D77A2609D2255D4098E7A314D80 +1A553DD03007696C9DA22D9E9AD132F09CDC0144E7C1BB169635A24341DE3589 +96D503CB7BC73A81FC12A743C711916CBEEEF61F7273B238B3C0DF1AF4B190B7 +C820DD8F5FDAF73872074E1C95F4A4B7E1B5DED436C03D1020B9FE9F780FF2C5 +920C97B1584B7E0051107EE7789BFAB0B13F32AD2DC01DB5120BFD6B5FA8E386 +EE743D10E6A9E858979543882C19ABB36FE278EAD1304E84DF80E8CF87A994DE +0DAFBB918B5C13EC0B410CDE19ACC3DCCCC419A6C552410C0CFAAF624006218C +F236274FE535A25B1399748107BCA62DD24FF611AD06154590701B4F54D1E477 +B50B48E13664D702948BD52E67810674BA5D16DBF37481B4847AB1053F4DCD13 +21E97F4A4EDD6FAB8EC10976E2833BC7BC7091827D64CEDD4200199DD4C2E02D +B3A00B71CB3CCAD44123D9DF9F82EE852E53DC6B974333A0049C05CB65F9BFC6 +D7DE5DEA8F847914575DC2638D68668776CA0A4596E19C3B2067E17D5D9564C9 +487D1BA5971C59AE61F7E99DAEB520C1EB53F7AE28879DFFFA0B75F72B460BC8 +D3C64E90F48FF1FE5481798011345171E6E1B22EC8AA4A0DAAAF03CD98EBFC61 +5FC26C6D9E3C3AC13953E033B235304E2D38FBA249BB40B9EA55026E83069E54 +35D0289834FA3EBCE37FAF01A2C77BB55B28CCC265EDCC5FAE00561E2A365E03 +5A109565AE24568C3E5AB8D80828A9CE717406B80CF697638421FEF9E74E6096 +C7BFB2B05F9937C1A5F6FF971DBC565DB46985D405B31D7B3E97C0ECEBCD68E2 +34DDB4544C1A9323C18606C953ED17153D9713F13C1CE56E6F0C09FAAB8FD11F +CC8ADFDFDE42B6ACFA8AFAF2C8F0CBD7F6A07322E8A5554314FAF58D1C511ED9 +743294F53AF9AFD0A40943F21CDA99CC37594E444B5863D19A02B93CEF93BCB7 +FE8889084DBA449CB89485C0C6BC9B843AC7032C007BDFC6830A98555E8435A6 +E04471265C24CE87455514A41FFA8E051C803BB2D2FC5884D08B528D5F95697D +306D0B77D4901E3A2FEE88ABD43D7A5B88EA7D20802D6E2A5868B88FA3012BA5 +CF53F24BD6ACE03800E20CD7723DA527427D075E1F2031035F5FA47D33D843A5 +A6C719C41DB1B0F2551A72FED8446240933F5E57677DC190566257D1841ABAC2 +A2F1207BF9C8CDFFC2F3790FDA3268A9830D9F9B5822FDB36DE636F629E8379E +9F1C59D80642690249E87D1CF0D1E369D1E34821EBC67CBBCB45790B3A9B73B0 +6A1DC82BD838916B79C22317DEA91B9F364FBDD71FF4A6B1E0575D4108B3554C +23DCAD074DB6C902B30FBAFBFABE56F50212E10B34EB734A2EA7B00947A9DFAD +F3C31C576813190D929DE66B91B9DF680F383D5652865EB561E8D811524FFB16 +EDCFB17C5951166E2DD0FA70DB2C4EA2F0522D6AE227A91BDA3ED6293F260480 +0E994C31D82D26E69AAC153402BBC2CCF1F1ED899E4AA36A15115E62A860C77C +DFC304428A9495AD26F1AD1E57CA4B13A14C35E8A4B80E3416AB4AC06290038D +2C7F1938F8908CB444FF9C6B1A9EBEF6A6A3828AB8DC86282A7782860D500F9E +9D6273930803F9731E32866A1AFF6367D6BA9F6E8CB5CA7F43A060D463405F61 +C97364ED +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark{restore}if +%%EndFont +%%BeginFont: CMR10 +%!PS-AdobeFont-1.0: CMR10 003.002 +%%Title: CMR10 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMR10. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMR10 known{/CMR10 findfont dup/UniqueID known{dup +/UniqueID get 5000793 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMR10 def +/FontBBox {-40 -250 1009 750 }readonly def +/UniqueID 5000793 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMR10.) readonly def +/FullName (CMR10) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 72 /H put +dup 97 /a put +dup 112 /p put +dup 114 /r put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2DB9B8591E5F01442D8 +569672CF86B91C3F79C5DDC97C190EE0082814A5B5A2A5E77C790F087E729079 +24A5AC880DDED58334DD5E8DC6A0B2BD4F04B17334A74BF8FF5D88B7B678A04A +2255C050CB39A389106B0C672A1912AFA86A49EFD02E61E6509E50EE35E67944 +8FC63D91C3D2794B49A0C2993832BC4CDC8F7BD7575AD61BCDF42E2E421AA93E +3FF9E4FAD980256D8B377043A07FC75D6169338028692CCA8CD1FE92FD60AD26 +D57B7519B80A8F8DCE9CEE5CDF720AF268D3C14099498A843D76E3B6C0328F24 +D36EFE7F5C4E5B5C612786200C8DE3A41EE5F1FFAF4097653CFCDC8F4FD32E0B +03EDB3E413283B9EFB0AC33B055617005BC9B0057FD68C52D1B0E67F0C571685 +767F2AA85ADE4E0104A1C777733D5E318A22A9944336E5B98D965E50D31F357A +8B6EA5A0EA98E1B027CE68C2EDB149EDDD04ED74A1B3D206D471A0C11C11449B +DE190BBFEBC08C9E1B7513B43DA3134D6B11A2516E6E86B67F68C970A320D05E +94FEC57FB347606DF89989C33482BD09D011C55AA920319E7B26A205D3D0F004 +22466F09C0482A164CFB27EF6ED2B040ECCC3DCAF345B5A73676F193D43123B7 +72FD6CFC5E37930E61EBD5A6307E4DE70194E6384EC0D79DB6AD86D3B319A31C +8B0589D0FE28241D8ACE280D0530EE99C80723E560BB72AE9D53F4713181F491 +344B06D3027BA4E9E94D4305BE1D817197C54C8FF56CD6964165F6448ECC8A8A +64B48B4F0FD69299A137589E2491A283509B21A3A5772F75B7602A9F60AE559B +07A58436D04222C73EAEA72DE9A5A441F88D27C11F4F91255EFE280E91A4ACAC +1E98A4E5E6C57B9AE86FD218C3CD8F24A4104156A80F13821384E529783C52C8 +78B94AB3A0096090867ED32E8A30980E737922037F75F062BD83BF4F5929BC51 +CC22AEE2DBBAAA001CFFBFF41D258424FAD888FFF1BEAB796A44E3126159E120 +7E4025C676CF94888A1971AEF8B6764B3AF4A92D36FAF6FC56FD049710EE3782 +BC2CD84FE2473F133BE03C1346B875463F126DCAB15C7A9BCC9A727D23611462 +4E8D2BFD2466600285D79518712B8681ABCD69608E6AA9578F7BD771EC36E01A +5A17BC17E375020ECA59B43790ABEB9DF5F4FBBEF807E5699EFEAC563E1ACC5D +EFA336E75DE6D8248E9381BB110884FDC89C2F9A41EBBC9A8A1F98E6A41F68BE +EE30E25CA148C1EFF42DFF8C214A6537AB11F260B8C329A4947B5FC8DC9C5622 +4DF7BF4FBFB00380D47BABB03BC30627AA74103E553F55278F538EDD8C1E64CE +0F1398CA0AB5A86630139B4A7E8FC02804CAFF3830114640AE50D2FDA3B561B5 +C63AD7EE3347804CBB40FB1E77A6C89735DD870351C3A1811591AB493251B904 +314F65791963C0412377C1D02362C5E9655F1C3D4803CD379A8EF24C48218C2E +DF1165840462BF37DDE1B8D5FF09FA2C3B261E2F1A65ECFBE5D4EAD43B52C029 +EEB3948CB8A252CBAF545C8FA1C31E920E23A12DD7222CEF2D2A513BD758EA13 +DA33BF5FBF1D734653EB83DA2D374A5B9A0CE316F24EE375D6DF6BDA49954C2E +DB25A88821193636119D469BA66E5DAA9C92520FD4F84426A4E54273FA469084 +7517817A6EE3E21176D333825E88046F50B3CF6938AF9BA79A2F51398239EB91 +1A2D07F7FCD948427FF62F40FF95E39FE1A1AA8451411563FD5388472251C155 +69BDE9283B41900B21EB1190D06E6B13B7794FED020D2C1BDD205AE77B084BCE +EF628249398B496DE85B406FC2E1939EF00DFC84C07E26CF72EC401BAAE756E5 +7F6673216E7560D1C2A723CB405EE5CA474A07F61B81F8836482F73DC9516D67 +CE0CB770EAD755B6B356198B4B97EBB29C63456953270CCC8D5650C1D006E69D +38DE2DFEAB27DAD50A817F0D645D30AF5B75A7B53CBD3D2B8D87BD0A7E525AF3 +22F7ADDFCE31716914C2318260C2E2B4664893921B68C5A93334A361D94A759C +0D7B146D6FD94F0442D672BDA0F6432E18F3C5DFA37ADA378D95B75F413C9ED1 +BB5C606A3EC7DFB3F796F59B0478C13FD1900381EFE0BB5242D5B5D34D03AF1D +4BDC93EAF8020E26CA23C8B0E7DDEBBC6762A557067A4CE05A524188A8F02E2F +3625DA38DFCF381727887F5646A3995A8A38A5FB1E5D5EBB395FDD0B7C8E71AD +B48EEDB62AB2CE99D121435EFBBFCEEA69AE9ED8238B60CC7288DE33C766CDFE +15B767B4AE2E6CE0965E77272AC9F86023DA620548CFAC85BC751C44218A29C9 +849F1C2DCBDFAD895B54E51A569952ED50F82DC8A19F367E7E44643854EFD6B3 +FCAEB04E55E4661C82D31E2932611748480EF61FB2FBFB0CFB940BEA81AFCD84 +4C6A6332D7A600170E38A8EAFCD4F93DC153C43175434C86BC747348FAC61B76 +1FEC9027C1A193E55C80F1F20B5317AA0A05AAA36AE235F6E49F06E570FEE798 +84857D7552EA92EF3EFAD52DE39C2F8F43C59E3A957B7B926FC95FC4B60186DF +7F3523EE2AB74E294C8C4BCD8B4975E84849E0FBDA6C0B0F24A636DFA578B122 +CF97BC5089E21E9F5298D1C9F30CB8BAFF6A3A11BB4D9A0A5CF2B18D055C44CA +4FD4D8FE1AF3630907DE7E585AA811F9CD11FB2C8FC791851D651009FA5DF20B +3C33FD2FF848A9E3F5652BD294965A332DD3F246C91B0ADA34017FF2451D1394 +F9C3C95AAC6EC8062BE98E8914D51DA6A164AD13938693D446044859D03A949D +F9AC5DF4A000CDA98BB516D762CB9F6D44B5268FD0C26E88BC4A760C0F75A140 +DEBDECA4F511128B7D2805872160C55236F0A0FA7637FF0D4E94AC079CD3C8A7 +D03A5A56F26B0438B577C46011A10532FEBCAD14FBD6032E224F45691A726886 +56F305231EB2FCDF59C8BBFCB5DBD2D093A0E84D62AC93A2312CA69295E937C4 +8DBA1802B85F54B5E7E6D6216A918F911FF705D3B5CF055F1D873B96283A0B53 +59344D910CD396D883F6F7836BA65FAB4393A773A8F6BC298069E5BA38210EED +49C9D920F718E3FCE692527DC7CCE6963BF744F2C91BC5952564196D60574E86 +87A0FAB21F2DB2BD5A51D7FBD8FC19946D24E5A228462C4772F978E650ADCE3B +8D66B9C21279C531CA1C3A8ECE3420BB65837287A7222CC3673A2A5F8BBFDB60 +C719CD073EF9A23675198462C7C87B24CC92D6AEE5C25AC63855CC3281494342 +D28F3D2FDE0C183486769A4FD5B0143193D31FCB2C2A14E487BBD96D0BADBB64 +D1B56021C363A795BF10E2DB448261C363A54A4AC1182B470C457AA82DF3F5D1 +F4B329806141EBD53CAE309319B94133D7EBDC2D0453A905ADD207364371E178 +0A95C2686E3B34C4A978BFC0EE968C39ABA00889BC5149162C2B54483D44FD3B +5CFF41F611C7E03B94945F414560E874D7CF27FFD0630890D7D7EA66CBD15448 +229059E1C436BB33D69552B5367AB5D53591C4678D0C704DD3EA23F5D9E8A7AC +17D003C19E333E726FFFA2961F33C70F429085F7BFE3E2510F59B78F58B19CB4 +01B48E184BAD9020FECCE3AF52048A056981DAEA02AE78197E65855DDB170616 +F54278395D9EA50DC83761AE759F9CDEF9E1948E7002414FC05286ED793E6662 +3347F2A9AF8917493D7305B92CF93E8E9185F70015F5594084298A6C2F9FD3C0 +689F262AC9FEDC9B89577ECDE92F08D3142209FBCE7B5C0A840CC767BCA56C20 +4E4E545E2BE4D21C53855CEE4CD0AB35D1A604C0FFFF77DBAE4289752276559F +A05FEE65F45ECAF44E95E23FAB6052195C7948AF0B1126482D4E02D72BF8AB03 +DE0F1A632F7672AD9DDE70EDC82AA993678A82BEAD0BC2649C4707FD8509810D +364B5C6FE0E10772E95288C622C2F06C634F4DF8C7FD1432BC9310D5F24FEE3F +7AB324863D6DABAA1576E70643CA79EF4D7DF4105093D66CEE0F3B87D2164A7F +26EA05F5C4645B22D3E1BFD2219657712C168FD90DE801FB0F32759E80DEC1E1 +43CEEB19FED12D757205043FC98FEC62D6A8D8B97BC083B4A0E985AF7850D6FD +8716B9957C1C35A0675BC53DF672C425C79F43FDABAEE7D63F092CF271C9A9D7 +C41F40C4189510987887942E60A412B3EEC84C9A6E1AC7D54D528F5604B72C08 +94B7882621A5BF1F325B92FF96B80878CC550D1AE4D8196E41CB1251856609A5 +C4D3BD05A922D0D45E039D9450DEF8490A3E924E41434194910BF60BA1B08BE1 +B41824345627745541A4F1703E956328F6227D11C74946B38CFB096139979E56 +4E723B889B44C6D78673868C89912F8B4F0B4B485F1587A637B630F92E6072D5 +7F3B44EA6FD96BBD4FC28A6C1D90805E3BE3E42A7BC9C880762966C55BC04E01 +204D083AE976FAE6F37C94F27E68F8C0F28D52B17F6C0FD7C9150701FD78F8CE +B8E8DC9260E3974005EB5CA728171F482D765016C94D4ADFE4A42EF42212BC56 +7E4EEEE8B0D2A7856CD4E44F55C0BAB762F92CB8D64C17022D4BF3A47C12F5E6 +279FC23101FEE93753653CE8CEDC3B75C9CCB29BF1D4554C6120DE8EE750FCBB +E38B5D915206974962E320362E59B3F21B3AB1875703191043D03284D4467346 +CFF2F98CEB4845B73ED8E003E0DC94251B73E13A9B51A3F1430BCF6A21EB9B7A +65E17FA411F53BE6432F1506232B8159E008FA257F884A4A01AC53BE91754D78 +BF14A5B0FBFB9C31BF4908355F8A762052968DF526D118708CCB0B7CB5BEE285 +6DAB6CD2E3934178E60BECB11AAB5478623CF6C50C92F8BB5D1A583609028FA7 +B8A53B791BDC9EF76A124F3F7641857E4BEA0837CB36176EC9A522EA7F41B8D3 +63C37D1145367BD300F17B54522A834BBB74DE12BF9EB26ACE6F24A046D58F89 +4D4B7DF74875F1A0C1C9D97BE0849593D7B398EB4B00BEBC8C8D1497B6EF831A +A35380FFB7F1AFA4D888AA52C9482E8B1755CC209905F98F40D95B44D4DCBCB6 +67423D1BC2F3560FF0A8B4F0CAC352A4EE2C1D946E45AAEC8A6AD40303F3382C +DF0756BFA3B1ED64C169E56ED1C760F2FF0E24DC5C9F41306EF8D2628153D30A +5DCB0791126BEFD4947D7EF08301FE015F2B0008DFFCBF9F2D4D859FD43EC7D9 +C5BE237E9BF6665B7B1BEBB362F0C0C3A8D86010B9C97FA741C97C2E0513386C +9C26C235B14DD2A58BFDAC7B5F63DB4DA6D5D37D0098175A9071590E1DF66A3D +B8173A047C29D7D35557F06132CC920B5460B8AFC11D23D09A4E45D089F5EB51 +963FA1A6256E359D485107FD143B2BF21FDE9DA5744BC2615E86C31C89470CF0 +D06C6397D9FCCB316EA9989430240759D2C4945D941F159FC02327F34B042BAB +B5C3A47C78E8C1A6FBCD396B1A51CC4B020B8AD401841EDABACECDB482D6EC5B +72D2BFEB4556720FADD49D07307C8B22ACB7E310CA4151A85C71EEF70E8D15DE +B3B00F26E0E166C14647A65ADA228A3D1C89025BE059306565DB1B1EFC37D358 +8C1EB024254AFD049BA977BD4C2C605050E17940A89D0D4C5D963E792320F5DB +3706682E03D25D9E02487247819551465092CC22B6B56E93F3AB528038FEC3F0 +668F866707A19B0463BE706EC729D2EE1653AAC7E29BD25BFB3241D4792F5152 +ED415B4E7FA92C2EE5A22E27E8B75542C492E56D811C192E95542A6FE0BFE5A5 +69273C2ABED4300D491B92D2AECDD278404CB84B1BB1BD7AFEC858215837D118 +C0E928BE7E07CFEEB51A6D21375B772B8248C994564014015232A0DA4BEA1754 +3274F407FED0837A236371F1A32056240F2015B1E7F4B2CA72C6B58610A66F13 +407CFFBA5E0A2893C1F572D50F51286E9133B5A84239C9493B0574E77D281D01 +11D00683354A000C9700EAFBC1FD104EA19DFCB87470190E7E2CE26E3A6FD0FF +2620B87B82AC8686B6206B530F17E9348BC7D04B948348802CE53A312443DB87 +4DBBA5313A6A2A8DAB8A1CC9A594FF8C299281C0A261C8CB2226B732FBEEDE40 +2C6ACC74A1A61379E2E1CD5548CD908268A32FA83D8504C442EA0E183ADBF7FF +9FD09C037AB03516ECCA93FF048235BD11A25DB07F164512A079C5392AC7F889 +CE96AE5C8D9580BCAFCC087C35E76EED1A671E87C12E3045E15A687134736DF8 +DA984772AFD189D68571A2ED7256F1E204230E41D3D9DD876F938951714A3973 +0CA9310489F8E807C1C7A4E51AEA5BC030610A5D7263FF7E0F9FDE3E5E37A362 +5B919000BD94D978583B942EB79CF2BEAC33FEBC9A67272EB10865BA8FB75FD7 +9D280AB59F91B96C16C982DE848D76D8FA8620DFD7C80B7DEAE7264350D6FB3A +EF04794DA3305844A7CF718F6D1A4A3AFF6826173A076A1372ABFC54ED3AC6C2 +09C9287FC830556CA694E21CA5342ECA7B10C90AFC4783D841D7B1E34FA3DB7A +2B706F3E21B0FBAB23E7257962FC3BC309CEA2C7239A9D6B44CC96825115ABD2 +AF9A2566D2F3382C01569FBDB94C8D664A5DA0F7DC3DD140CA77C743D7BC1420 +324ECF9E4780280EB119885E96A6C619CE3C0C8E1E264E2DEB137E5DC8149786 +486D65667ECF47B1A1E20E9E6E4FC8323E0BC8E61BDD3BCDFC6575C69C03E31A +EFFC290472CBBD049DE3F840AEE37A2486034240F80E75D8A79E0762377DF660 +52B12EAA16D678990B11A9BFBC03C1D4FCDA9FD4FFBB3E88352438102F10B7C5 +9F04C013B6575B5E948FAB58EA691984A0E54E6B9F3F505FFFEF74D06FA1CDF3 +4B8A95904C8A2763AA8AF5B71D00F5DE09DC1CDF87A08B6D181453063E14C12D +B7BB3775A6E2A901636273D9EEB833EA8CF20FD83AE899E28DADE10EEEC20BD7 +BD93085A4B1AC80AC1AE8280C14767F1A487BD066007A0D050317BD081131A14 +6EA0898ED59E46DA7B6254BDCCBC660686E2EDA0E77A705A653733BB5C5497D0 +B130359F866CF293FB6EF0C2AC5BAA2DB0DED045E2DED3A2612D078333260359 +16CF0CCB272D34767EA069E0F0B0D42327A18529D72E890EDA6195C2688438ED +E9ACDBEED41E81CA8EB5E43C2B09CE266EFCA03F2D7FF57F12B06F9E54FCC6A6 +546676F6FFC5B8B7D3F0982B6FF0D21D949309F0C0B175CC1D0976F8C55C6AED +6E821C39041E22D91AB30922F2B2EC2746BC7DAB484991542FBC82D87B487507 +559AB466F73EE23C2D3194DC5CE4C9AE66D3164613AC5CBB3DB501B64DA7C91B +C7ED2EE9027FC0906820B35D4F2CF66C4F9CE4A884B7C07155BCA884ECA5EB3A +ABB83F84DB1F5639599DC7D3F51241AB5D95C3BCB7AB1EC90B4BC989F74FB354 +04B2D7366A34D335A47B8C00C05CB423482BF6C7970A95545424A08AFF9A035B +7F83F52B65A9799CE76E303B85664B624C65E9CA58184C7BE2BB9D9C86A4DE5A +8165EE3DA2E652B5022EE7893896BABD88931DE1D538F615787645DF5ACBBA0B +A8E5B899A37321AA7D4B283AC9234978C2DD81813A1EE5DB6EC170DAC1B6EF02 +94892635B498765C07A38D2E9DB0B7581B11056C28278F89B0E60998379C07EB +C0EAEDC32AA69B8B836F92A61AFD35688315B2C3F860632FC13E4BDFB63214BC +41CC6859EAB3AC3034449213CAB99FA1D216563419CD6D6CE4E1B56F33E6C654 +7AA9DCB5B05FC068DF02AC32408C8010AD004F6CCA9887830927F8CBCD49CDB5 +18CAC1EAFF815FF2F6F527F936948201565003022C6C7390B4E3C2B219FB4F76 +9F12BD25CA7B3B61D1A2F8DFEE795D04D5428B42FB66E0C254AF7B7A10CEF7FD +EC7762B3A0C6518E8855CEBB9937C972EA909F25CA31C33A6AC307FF01317AD7 +58BD08D95697E699B40A3CA81F8A9ADBC5AC368A2D56BD00684494819CF72865 +86D1DE7A349F3C98F89FF38B30D840294DD3E51258FB4208CCAA455C3A13C6F8 +9B4DBC3027B3CAF2C6EF0A5000F53914FC469769D1D2D72D9F57A11C5BB44D8A +1857472CC47B532E2A0CD7BD2F7F99930FE769403B46E25CFC2041759BBC27CB +A60525182B0BAC8AB381658DF10814D8C2A0F73A0415B8AD23DF0A82CC481EAD +70AADE0E2676CAC46D5C39B92C18AAD0147814BF27C8FA6DCA0BBA0FF0775836 +2210962B3400AE0CDF57242EA8A7DA911652D5DF61139650117E65779D80FA5D +F0DE22F7D2CCD0185380E1D346582C2E719ACB75A70367913F69BADAA2F9B4BE +5A76DAF30053CE655A7C984B6BB390F7DE687B10EEA2F1D2F4353AD17B032900 +6E4AF46A848A94E69B6B7F3EC896D42594593A016CB5FD306F41F1E396EA1B59 +8CDC2B459A81B19A090AA25E8D003483A64C21070738838BE7E8F0DA026A315C +DAD06E46B3BFDF5D0A48DEAAA63DC107C8352E4BD2361E66C1CCFE8E3C283C02 +A4655C579BF21B53D1FD37996C682D1B232ED1F6A1B37ED3F17DE0D82EF0E15D +FECF39F8EA9A1804A05B350671BA8D9838EC6FD9269FC73192DDFBD4CEDD9954 +5675E7431A7793960485EAB5778EA899E98988CAFF8DCCEBF494D5676912D5E8 +68E4B6E8380F66A410FF23883099831871EC2B5353AB2F0E8D941BCB25FBF929 +F49068E8F65763CF259036DFEA1AAB44ED4B4F457EFD4B9B0BBED34041206F8F +2CF988CFDEFF949914C4B69F50F6628F9EEC6842B79E4DEF88F1FEE5AC7014E8 +652E21891F7FBB5D720CDA676189F016B1FEABC10785FEEF0F4B11C7658A59CA +73528778D2213CA6DC3A62BE2D64A05860D0930D7EA56788DD87665BF143F034 +85E11FFE1F67FB6D16AD327872C04F8876134E5B5D5D1D811F297520B630C1FC +45D9A4531606AE86CEF0D876894372B84D03D1BAB918DA530B3F2D2A59FED439 +D11DED107279134ECD4728803979CDBBCDC96B5F791E79254ECD13F2577B13AD +665ADBE9C5032A6D6EBB105FA5656E64E8E61C718E533A2C71F469930F296766 +4F0D17A94A65D60F87DE73CD3E463B692A4B59BA7A760DD7A81CDDA23CD0698F +4C6FA5667BE5D25FFF2E69922C496CB4EFE5117A04277C8B701D81BF0951FDC6 +C238657A7D1B2E5FC7E8261F0CAF9CA00E0A0219C771FF38A45647D2F019FEC8 +39F4D48736977F5B21F6961C8A9ACF420971A8B4B3EB237EB85B600FD483DA2A +8717A30EB97DF714C48065871D95F479057A8A29DC524D9781A602791A5E6D1F +F41C00075B1FED387D98CF7EB11374C849D87018D4F17E60D3CEE00CC979AD41 +0F813119C60C8E89BD209DB0CCDDC342CC3D438356296934D03AFCC9B2A2F85E +CF808E3F4F73415A620F8F1D9563FDE6DFF71385693E6B75BFC0436205231264 +EAB0C8398DD7DD9C0DDFF09EAFAA8D67F25F80B39F4A584B94E08408C02326B4 +0E27E034DC75E7E797B53DEB549AF0590C15DB00EFEDAA1F5EFA3F7A08023326 +6EB529F0B4B8DD91CB69558534CCE31AE7E157D0B060877EE4F153EEC4FDC93D +0FEEC724C9AFC18168AE7D0CA13F0B4F66C9F9C1A3BAC53475B5A70CA1B83D37 +D276F00DA0A9318C09C86A3CB60F8FF548AF36F41E219F071A8638431CE2A931 +13031EB40F0EACF90949369A67E8793F1C76C3A2577467242CC0BA47B411DF2A +9D9FA70D335D41F59317F44A60ED73DAB72A2F1AC1D8400534CE5162CB3751D1 +DAC13FBB3B99C04815F958AD5B9B44388979B95C2AE6E66E90645AA34F8C455B +E6EF471BB8E5036B399054FE6BD3B4E612415883B53B6C5971EBED8F462F4DC2 +C59118D0C3921FE8A238D2E3CF0C0DDCAED669667EA5390087B2FC75CAD18883 +113AAADF162B023352069A442B6682C3FF51D628BE1DBBD89A7AAB946AF7132C +1739C239C496145E7DD84FDA4F11EEEA103137618571BDCD4958E166EC99FE60 +AA5334CB63B98D4A88FFAFBD8962186FAABF1E2593031D084359B02ECE352A5C +8B4F4C828D7FF50D459FB6C913BB52FEF3A6D47C338EC99E6FE3FB13AB6FB9F6 +6BECF95B625F9BE81A4C9E5CBFB6407856406CC9C52353EAB3C79BAAEFD69628 +448FB6E92B0345E5D3AD7E0009212A52D33A0DD0870C6834B8CFC8A8488B4BEA +EBBA5C743CA53E8EDEA6034994F5A338B85C4ADD0A28C7A8FB765C4A027ACC65 +C774E5244912470606D852A39CBBE5E41177FFDF5DACF00BCE930F6409136C17 +93AAD1ECAA2A3D88D47656ED2CBC816B173B01048BE9D1E4B54ABC063AA483DA +D551D0ECDC163CEAD83A7B901741578483203BE72E4B676F7A211F72225DB3DB +146BDB01C7EB13041306FB82B973E484683DFB445134A9805F40B22CEFABB5A7 +A66796AC5B925B8021ED155E58FA101CACA594C7503B7E343ACD1B94657EB3E3 +7F509A1F69D934014A04624F43FF1E9BF2F55A8A2A7E3EFCEA27582959FD01BD +E891530114DBC5F754A238B7ED890A1F80E836F340D0286D7334BC5E28D184E6 +A895BDCCEE38F5EC170D3BFB792D2DDA7E57BD2FBD1E6304DD03CD20842B335D +7FA068735311F96609995E26B0F630CDFC5AB855D56CEBEEBF94D111260C0212 +E7EB17ECCCC87FE8878535BCD8619D29EF97ABF0145D6824F0514D9716DEBCFC +9E82635CAEA24178E29C4CE99D72268FE8DDE42697988A4974226A16CA2B5C11 +B169965B9F8FC6BD4CD581D381D212A0A28D4A44AEC567E94EB24EBF471E5C4A +BCBD7576320CCD8530E963D0E26A035ACCEF2F9907FA86DF3301A707606734F0 +FD11DAB90103A5679DE35F079686D41EBB178539ECC9D2642278E664701A2734 +8169C341BDAE29D7D9FF6B70FD7FDEE5AF87A8F2D29A8EB31AA1F43F8EA2B412 +9F373BF55F8B6F39BE1DFCAC77739309DAC06E611A988C7A52803B68778F61D6 +948783D125CF6DCC92A782A220C706FB04EA7F557E7C4ACFBEDFAF9845F260FE +69A02FB078D023D395D0597D33119430301E1AA71C59ACEA32EB0486252C86A4 +39BF53F48ED5FDC8CAE4B4B82FA08AA4AA713467F1B67A0FAA2A3599E4F11969 +5FBFDB5CB6C50DD3456FBE0ED46D519A4DF0460658D5FC6AC70242AAF40CCB42 +D8A7F1EBF6A08226C7E293DF58978F897FC2A064A48C0BA9889256FCCC681003 +270E57A7FA7E122BA9E485BD270A36CFE59DCFF75F52663243F379183287C1FB +9125F74AD6BC865CB040324F31694B34AA9A59952D8379FD1E03B285AFC3D8A7 +763B01901CB9D2D6D7661AC86A5670FD1A669F7A3EBC1F9B51B883477D41E0A2 +180C6EC74730B48E34C6DF5E17BE66FBCAE3E62F906657E24EDB68B65B979C68 +16DA62B2D513971B9495F6C6B2CC9EA0324667DE7CB380EAA91C91E8D1FDFDB9 +48876FAABDA95743B87081DD91C5FB6292B024AD61E5F104174387BBAF158ED5 +81B8A774318D7488E273ECF31FB7C852AA3EAE39D09596729F36AF3C6E0802C3 +3BFF624A3ED426EA821588BA547AE9C95E5A31BD7969B74F8A3EFA328227D35B +3422F6FE038BCF008A0D37533483D4D012DC41B7ED4797A9BA43A3EE01DB61F7 +F25C014CCF48ADDAD0F820F1CA4FB7E6053BB26FD6B034604696092FD747DC1C +10E378A08E09FADC650615435AA6574E3A11FB1314D40F3D0C289B0837A97C0E +4163F7AB434FCC774501B7B6E3B0C4C415271D66F58620A7F1D268F91B3EC459 +C877CBB1D3CB8AF6AD234944E2CFBCA036C06BA266D8DE5AD1402AF05A00A570 +78A6C92833589A5A10257C81646E17D59BF6DA4AC4378A8345D6EF04F624EED5 +C57146972E3CB064E63B6AF8804D9928343F91F44FCE53DC5C04D6D6C78F15DB +135C38C52E710C62E371409C775351D87DED6A18C83BBB94A91C9DA5C57D04E2 +CEF60E5D286D50F568463AF569B78CBDC6B618DCD032198666142BAD655C9BC8 +8D9B5416418E515A03BC75FA4D87E92E98204594211FFCFF7FB7ADA62C5FB21B +84A48FD25D38FEE1BCE41B5B203BD6D57753F53DEC3C4AE8C3EB52A9348E3FE2 +3C1C960705F4B40127CC21392444DAC1CB0AC4A94499459D8756F970D5B930FC +F8A67F620DB3D6E3210034DC9543 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +TeXDict begin 40258431 52099146 1000 600 600 (gapxmpl.dvi) +@start /Fa 145[108 5[108 2[88 108 15[135 84[{}5 172.154 +/CMBX12 rf /Fb 198[41 41 2[41 3[41 49[{}4 66.4176 /CMBX8 +rf /Fc 137[71 1[52 4[67 75 112 37 6[61 75 2[65 19[128 +4[105 3[103 97 14[67 67 67 67 2[37 46[{}18 119.552 /CMBX12 +rf /Fd 170[0 13[133 20[50 42[0 7[{}4 166.044 /TeXMUSIX20-Regular +rf /Fe 141[33 1[46 14[42 24[62 72[{}4 83.022 /CMR10 rf +end +%%EndProlog +%%BeginSetup +%%Feature: *Resolution 600dpi +TeXDict begin +%%BeginPaperSize: Letter +letter +%%EndPaperSize + end +%%EndSetup +%%Page: 1 1 +TeXDict begin 1 0 bop 218 -118 3919 4 v 218 -77 V 218 +-35 V 218 6 V 218 48 V -144 -9 a Fe(Harp)218 4 y Fd(G)355 +-37 y(2)423 -40 y Fc(2)423 43 y(4)415 -286 y(Mo)l(v)l(emen)l(t)46 +b(1)p 712 25 4 146 v 665 25 a Fd(\007)p 1094 4 V 1047 +4 a(\007)p 1427 48 4 168 v 1614 -16 4 146 v 1567 -16 +a(\007)p 1996 4 V 1949 4 a(\007)p 2329 48 4 168 v 2516 +25 4 146 v 2469 25 a(\007)p 2898 4 V 2851 4 a(\007)p +3231 48 4 168 v 3418 -16 4 146 v 3371 -16 a(\007)p 3800 +4 V 3753 4 a(\007)p 4133 48 4 168 v -214 279 1741 4 v +-214 321 V -214 362 V -214 404 V -214 445 V -141 109 +98 4 v -141 202 4 93 v -112 177 a Fb(5)p -47 202 V -141 +205 98 4 v -214 402 a Fd(G)-77 361 y(2)p 102 423 4 146 +v 55 423 a(\007)p 320 402 V 273 402 a(\007)p 490 446 +4 168 v 619 381 4 146 v 572 381 a(\007)p 837 402 V 790 +402 a(\007)p 1007 446 4 168 v 1135 381 4 146 v 1088 381 +a(\007)616 b Fc(Hello)p 1353 402 V 1306 402 a Fd(\007)p +1523 446 4 168 v 2396 279 1741 4 v 2396 321 V 2396 362 +V 2396 404 V 2396 445 V 2469 109 98 4 v 2469 202 4 93 +v 2498 177 a Fb(8)p 2563 202 V 2469 205 98 4 v 2396 402 +a Fd(G)2533 361 y(2)p 2713 423 4 146 v 2666 423 a(\007)p +2931 402 V 2884 402 a(\007)p 3100 446 4 168 v 3229 381 +4 146 v 3182 381 a(\007)p 3447 402 V 3400 402 a(\007)p +3617 446 4 168 v 3745 381 4 146 v 3698 381 a(\007)p 3963 +402 V 3916 402 a(\007)p 4133 446 4 168 v -214 677 4351 +4 v -214 718 V -214 760 V -214 801 V -214 843 V -141 +507 138 4 v -141 599 4 93 v -112 574 a Fb(11)p -7 599 +V -141 602 138 4 v -214 800 a Fd(G)-77 758 y(2)p 180 +820 4 146 v 133 820 a(\007)p 616 800 V 569 800 a(\007)p +1004 843 4 168 v 1210 779 4 146 v 1163 779 a(\007)p 1647 +800 V 1600 800 a(\007)p 2035 843 4 168 v 2241 820 4 146 +v 2194 820 a(\007)p 2677 800 V 2630 800 a(\007)p 3065 +843 4 168 v 3271 779 4 146 v 3224 779 a(\007)p 3708 800 +V 3661 800 a(\007)p 4096 843 4 168 v 4112 843 25 168 +v 218 1420 3919 4 v 218 1462 V 218 1503 V 218 1545 V +218 1587 V 218 1543 a(G)355 1502 y(2)423 1499 y Fc(2)423 +1582 y(4)415 1211 y(Mo)l(v)l(emen)l(t)46 b(2)p 712 1564 +4 146 v 665 1564 a Fd(\007)p 1094 1543 V 1047 1543 a(\007)p +1427 1587 4 168 v 1614 1523 4 146 v 1567 1523 a(\007)p +1996 1543 V 1949 1543 a(\007)p 2329 1587 4 168 v 2516 +1564 4 146 v 2469 1564 a(\007)p 2898 1543 V 2851 1543 +a(\007)p 3231 1587 4 168 v 3418 1523 4 146 v 3371 1523 +a(\007)p 3800 1543 V 3753 1543 a(\007)p 4133 1587 4 168 +v -214 1843 4351 4 v -214 1885 V -214 1926 V -214 1968 +V -214 2009 V -141 1673 98 4 v -141 1766 4 93 v -112 +1741 a Fb(5)p -47 1766 V -141 1769 98 4 v -214 1966 a +Fd(G)-77 1925 y(2)p 181 1987 4 146 v 134 1987 a(\007)p +621 1966 V 574 1966 a(\007)p 1014 2010 4 168 v 1221 1946 +4 146 v 1174 1946 a(\007)1912 1779 y(U)p 1661 1966 V +1614 1966 a(\007)p 2054 2010 4 168 v 2261 1987 4 146 +v 2214 1987 a(\007)p 2701 1966 V 2654 1966 a(\007)p 3093 +2010 4 168 v 3301 1946 4 146 v 3254 1946 a(\007)p 3741 +1966 V 3694 1966 a(\007)p 4133 2010 4 168 v -214 2266 +1741 4 v -214 2308 V -214 2349 V -214 2391 V -214 2432 +V -141 2096 98 4 v -141 2189 4 93 v -112 2164 a Fb(9)p +-47 2189 V -141 2192 98 4 v -214 2389 a Fd(G)-77 2348 +y(2)p 100 2410 4 146 v 53 2410 a(\007)p 313 2389 V 266 +2389 a(\007)p 478 2433 4 168 v 604 2368 4 146 v 557 2368 +a(\007)p 817 2389 V 770 2389 a(\007)p 982 2433 4 168 +v 1108 2368 4 146 v 1061 2368 a(\007)1572 2327 y Fc(D.C.)g(al)1572 +2451 y(Co)t(da)p 1321 2389 V 1274 2389 a Fd(\007)p 1486 +2433 4 168 v 1501 2433 25 168 v 2396 2266 1741 4 v 2396 +2308 V 2396 2349 V 2396 2391 V 2396 2432 V 1122 w(G)2533 +2348 y(2)2264 2161 y Fc(Co)t(da)2663 2202 y Fd(U)p 2711 +2410 4 146 v 2664 2410 a(\007)p 2923 2389 V 2876 2389 +a(\007)p 3088 2433 4 168 v 3215 2368 4 146 v 3168 2368 +a(\007)p 3427 2389 V 3380 2389 a(\007)p 3592 2433 4 168 +v 3719 2368 4 146 v 3672 2368 a(\007)p 3931 2389 V 3884 +2389 a(\007)p 4096 2433 4 168 v 4112 2433 25 168 v 218 +3010 3919 4 v 218 3051 V 218 3093 V 218 3135 V 218 3176 +V 218 3133 a(G)355 3091 y(2)423 3088 y Fc(2)423 3171 +y(4)415 2801 y(Mo)l(v)l(emen)l(t)g(3)p 712 3154 4 146 +v 665 3154 a Fd(\007)p 1094 3133 V 1047 3133 a(\007)p +1427 3176 4 168 v 1614 3112 4 146 v 1567 3112 a(\007)p +1996 3133 V 1949 3133 a(\007)p 2329 3176 4 168 v 2516 +3154 4 146 v 2469 3154 a(\007)p 2898 3133 V 2851 3133 +a(\007)p 3231 3176 4 168 v 3418 3112 4 146 v 3371 3112 +a(\007)p 3800 3133 V 3753 3133 a(\007)p 4133 3176 4 168 +v -214 3408 4351 4 v -214 3449 V -214 3491 V -214 3532 +V -214 3574 V -141 3237 98 4 v -141 3330 4 93 v -112 +3305 a Fb(5)p -47 3330 V -141 3333 98 4 v -214 3531 a +Fd(G)-77 3489 y(2)p 181 3551 4 146 v 134 3551 a(\007)p +621 3531 V 574 3531 a(\007)p 1014 3574 4 168 v 1221 3510 +4 146 v 1174 3510 a(\007)p 1661 3531 V 1614 3531 a(\007)p +2054 3574 4 168 v 2261 3551 4 146 v 2214 3551 a(\007)p +2701 3531 V 2654 3531 a(\007)p 3093 3574 4 168 v 3301 +3510 4 146 v 3254 3510 a(\007)p 3741 3531 V 3694 3531 +a(\007)p 4133 3574 4 168 v -214 3805 3481 4 v -214 3847 +V -214 3888 V -214 3930 V -214 3971 V -141 3635 98 4 +v -141 3728 4 93 v -112 3703 a Fb(9)p -47 3728 V -141 +3731 98 4 v -214 3928 a Fd(G)-77 3887 y(2)p 188 3949 +4 146 v 141 3949 a(\007)p 647 3928 V 600 3928 a(\007)p +1058 3972 4 168 v 1272 3907 4 146 v 1225 3907 a(\007)p +1731 3928 V 1684 3928 a(\007)p 2142 3972 4 168 v 2356 +3907 4 146 v 2309 3907 a(\007)3315 3949 y Fa(The)64 b(end)p +2815 3928 V 2768 3928 a Fd(\007)p 3226 3972 4 168 v 3242 +3972 25 168 v eop end +%%Trailer + +userdict /end-hook known{end-hook}if +%%EOF diff --git a/support/pmx/doc/pmx-install.pdf b/support/pmx/doc/pmx-install.pdf Binary files differindex e4c9429da6..5538f8db89 100644 --- a/support/pmx/doc/pmx-install.pdf +++ b/support/pmx/doc/pmx-install.pdf diff --git a/support/pmx/doc/pmx-install.tex b/support/pmx/doc/pmx-install.tex index e49bfd0f8c..c6bf78dc6d 100644 --- a/support/pmx/doc/pmx-install.tex +++ b/support/pmx/doc/pmx-install.tex @@ -5,7 +5,7 @@ \RequirePackage{hyperref} \usepackage{xcolor} \newcommand{\myurl}[1]{\textcolor{blue}{\underline{\textcolor{black}{\url{#1}}}}} -\newcommand{\pmxVersion}{2.8.4} +\newcommand{\pmxVersion}{2.9.4} \begin{document} \title{Installation of the CTAN PMX Distribution} \author{Bob Tennent\\ @@ -32,25 +32,16 @@ which tree to use\footnote{% and installing files\footnote{% \myurl{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf}}. -\section{Installing \texttt{pmx.tds.zip}} +\section{Installing \texttt{texmf} Files} -In this distribution of PMX, most of the files to be installed -(including macros, documentation, and a processing script) are in -\myurl{http://mirror.ctan.org/install/support/pmx.tds.zip} at CTAN. -The file \verb|pmx.tds.zip| is a zipped TEXMF -hierarchy; simply download it and unzip in the root folder/directory of whichever TEXMF tree -you decide is most appropriate, likely a ``local'' or ``personal'' one. -This should work with any TDS\footnote{% -\myurl{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds}} -compliant TeX distribution, including MikTeX, TeXlive and teTeX. +Copy \verb|tex/pmx.tex| to \verb|/tex/generic/pmx| in a personal or local +TEXMF tree. +Copy files in \verb|doc| to \verb|/tex/doc/generic/pmx| in the TEXMF tree. -After unzipping the archive, update the filename database as necessary, +Update the filename database as necessary, for example, by executing \verb\texhash ~/texmf\ or clicking the button labelled ``Refresh FNDB" in the MikTeX settings program. -Documentation for PMX is installed under \verb\doc/generic/pmx\ -in the TEXMF tree. - \section{Installing \texttt{pmxab} and \texttt{scor2prt}} The next step in the installation is to install @@ -87,6 +78,7 @@ and \texttt{gcc}\footnote{% on your platform, you should be able to build \texttt{pmxab} and \texttt{scor2prt} executables. + To build \texttt{pmxab} and \texttt{scor2prt} for your platform: \begin{enumerate} \item Unpack the \texttt{pmx-\pmxVersion.tar.gz} archive: @@ -112,7 +104,7 @@ as root (admin) to install to the system path, or just \end{list} to install in your own path. \end{enumerate} -You should now have executables \verb\pmxab\ and +You should now have executables \verb\pmxab\ and \verb\scor2prt\ available for use. \section{The \texttt{musixtex.lua} Processing Script} diff --git a/support/pmx/doc/pmx25-284.html b/support/pmx/doc/pmx25-284.html deleted file mode 100644 index 29d811084c..0000000000 --- a/support/pmx/doc/pmx25-284.html +++ /dev/null @@ -1,384 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html"> - <title>PMX 2.84 vs 2.5</title> -</head> - -<body bgcolor="#E1E1E1"> - -<h2>Changes from PMX 2.5 to the Latest Full Release (2.84), 10 February 2018</h2> - -<p>2.501 <strong>(Note: new scor2prt)</strong></p> -<ul> - <li>Bugfix: initialize index in PMX subroutine putorn to eliminate subscript - error detected in some compilers</li> - <li>Bugfix in <strong>scor2prt</strong>: Ignore special treatment of special - symbols if they appear between double quotes.</li> - <li>Tweak: move end of first part of line-break ties slightly to the right.</li> -</ul> - -<p>2.502 <strong>(Note: new pmx.tex)</strong></p> -<ul> - <li>The height of a figured bass vertical stack can now be adjusted upward by - an integral number of \internote by appending "+" and the number. Recall that - it can already be moved downward 4\internote by prepending "_" (underscore). The - two options can be combined to provide full control over the vertical position.</li> - <li>Ties can now be represented with braces "{" before a note and "}" after. Both are - equivalent to "t" after the note. (Thanks to Dirk Laurie).</li> - <li>In <strong>pmx.tex</strong> all the commands of the form - \font\...=\fontid sy1000 have been changed to \font\...=cmsy10 (Thanks to - Olivier Vogel).</li> -</ul> - -<p>2.503</p> -<ul> - <li>Enable arpeggio left shift with ?-[x]</li> - <li>Allow musicsize of 24 and 29.</li> - <li>Bugfix: Fix bug introduced in 2.415 which caused error in printing replacement - number in xtup.</li> -</ul> - -<p>2.504</p> -<ul> - <li>Gap between normal grace and main note: X[x] as option to the G command, - where x is the gap size in notehead widths.</li> - <li>Bugfix: og (segno) now works OK when nv .ne. noinst.</li> -</ul> - -<p>2.505</p> -<ul> - <li>A new global option AK activates special rules for vertical positioning - of rests in two-voice staves. By way of background, without the new option, - rests in two-voice staves have default positions based on - a simple rule that is not context-sensitive: those - in the lower voice (the one before "//") are 4\internote below their - single-voice default positions, and those in the upper line are 2\internote - above the single-voice default. The new option invokes a set of - context-sensitive rules to set the default position. The baseline rule is to - align the rest in a horizontal line with the next following note in the same - bar. If there is no following note in the bar, then it is aligned with the - next prior note. If there are simulataneous rests in both voices, the old - rule is applied. When the AK option is in force, it only affects places - where there are two voices in a staff. It may be toggled on and off at the - beginning of any input block, using - just AK. When the option is in effect, any user-defined tweaks on the height - of a rest will supersede the option for that particular rest, i.e., the tweak - will be applied relative to the single-voice default position.</li> -</ul> - -<p>2.506</p> -<ul> - <li>Fixes a bug in AK. Simultaneous, equal-duration rests will be positioned - according to the default rules.</li> -</ul> - -<p>2.507</p> -<ul> - <li>Enhancement to global option AK for vertical positioning of rests in - two-voice staves (see version 2.505): The option L ("look left") in a rest will cause the - vertical position of that rest to be based on the preceding note, rather than the - following one as is the default when AK has been issued </li> - <li>Partial bugfix: In unbeamed xtuplets, the length of the bracket and position of - the number are now adjusted to account for any inserted hardspaces.</li> - <li>Bugfix: unbeamed xtups with two flags are now allowed.</li> -</ul> - -<p>2.508</p> -<ul> - <li>Allow grace notes in xtuplets.</li> -</ul> - -<p>2.509</p> -<ul> - <li>Correct small bug in arpeggio left-shifting (it got confused when there - was more than one voice on a staff).</li> -</ul> - -<p>2.510</p> -<ul> - <li>Bugfix: Correct omission of character variable declarations in new subroutine getgrace - introduced in 2.508.</li> -</ul> - -<p>2.511 <strong>(Note: new scor2prt named s2p2511.exe)</strong></p> -<ul> - <li>Bugfix: Correct error in horizontal spacing introduced in 2.507.</li> - <li>Experiment: Remove prohibition against tempo changes in MIDI macros.</li> - <li>Bugfix in <strong>scor2prt</strong>: Make it work right when "R" command occurs at end of - input block and "/" is on next line (as produced by M-Tx).</li> -</ul> - -<p>2.512</p> -<ul> - <li>Enable multiplicity down-up "][" within xtuplet</li> -</ul> - -<p>2.513</p> -<ul> - <li>Bugfix: If there is more than one rest at start of a beamed xtuplet marked as a forced - beam, beam height and slope tweaks are now properly handled.</li> - <li>Bugfix: If an xtuplet with multiplicity 2 or 3 starts with a rest, the rest is now printed - correctly.</li> - <li>Bugfix: Unbeamed xtuplets (with option 'a' on first note) with multiplicity 2 or 3 are now printed correctly.</li> -</ul> - -<p>2.514</p> -<ul> - <li>Bugfix: Correct horizontal spacing when after-grace is immediately followed by - normal grace.</li> - <li>Bugfix: Correct transpose register when it has been changed in a single - after-grace.</li> -</ul> - -<p>2.515</p> -<ul> - <li>Bugfix: Correct error in automatic forced beams. Before the fix, if the - beam did not start an integral number of beam durations from the start of - the bar, incorrect results would occur. - <li>Bugfix: Properly center fermata over centered whole-bar rest. </li> -</ul> - -<p>2.516 <strong>(Note: new pmx.tex)</strong></p> -<ul> - <li>Allow figures in voice #2.</li> -</ul> - -<p>2.517</p> -<ul> - <li>Allow figures in two voices, voice 1 and any other one.</li> -</ul> - -<p>2.518</p> -<ul> - <li>Bug fixes in 2-voice figures.</li> -</ul> - -<p>2.519</p> -<ul> - <li>Fix bug that prevented \sk from being output, misaligning some voices.</li> -</ul> - -<p>2.520</p> -<ul> - <li>New feature: special characters 2+, 4+, 5+, 6+, 9+ for figured bass. In the PMX - string for any figure, follow the number by 's'. This uses the font cmrj from the - new package figbas. You must install this font in your TeX setup for this to work.</li> -</ul> - -<p>2.521</p> -<ul> - <li>Bugfix: Font definition syntax corrected so no extra space is introduced.</li> -</ul> - -<p>2.602 <strong>(Note: new pmx.tex; requires eTeX)</strong></p> -<ul> - <li>Allow 24 voices, beams, slurs. Require etex.</li> - <li>Include comment about doubling size of internal buffer to 131072, requiring gfortran for Windows to compile.</li> - <li>Correct slur indexing in linebreakslurs.</li> - <li>Account for comment lines in line count for error messages</li> -</ul> - -<p>2.603 <strong>(Note: new scor2prt)</strong></p> -<ul> - <li>In getpmxmod.for, decrease nline by 2 to fix locating errors - following reading in an include file. - <li>Add some error messages in g1etset.for setup data -</ul> - -<p>2.610</p> -<ul> - <li>Instrument-wise transposition: Ki[instrument #][+/-][trans amt.][+/-][new key]. - For more than one instrument, may immediately repeat everything after "K". Must - either be at start of score (right after setup), or if later, must be preceded - by normal (full score) key - change command K+0[+/-][new key]. Must be used with relative accidentals ("Ar"). - Part(s) to be transposed must be entered in concert key, and will appear transposed - in the score. MIDI behavior not yet - tested. Has not yet been integrated into scor2prt, so for now - if you want to make parts, only use Ki... as score-only (on line after "%%") and/or - instrument only (on same line after %[Instrument #]). -</ul> - -<p>2.613</p> -<ul> - <li>Set error trap if "D" is entered before any notes.</li> - <li>Enhance "AS" to allow spacing adjustments tailored for either smallsize or - tinysize. As before, "AS" must be followed by nv characters, but now they - may be "0" for normal, "-" or "s" for small, or "t" for tiny. Still must - set sizes of instruments with inline TeX.</li> - <li>Bugfix: Fixed broken "K-..." in 2.610. -</ul> - -<p>2.614</p> -<ul> - <li>Bugfix: revise raised dotted rests by separately raising rest and dot. -</ul> - -<p>2.615 <strong>(Note: new scor2prt)</strong></p> -<ul> - <li>Command "AS", described above under 2.163, now also causes staff sizes to change - (in score only, not parts), so inline TeX is no longer needed to change sizes of - selected staves.</li> - <li>Scor2prt transfers partwise transposition commands Ki... (see 2.610 above) - into parts. </li> -</ul> - -<p>2.616</p> -<ul> - <li>"Feature" added: Hairpin dynamics now may span input blocks.</li> -</ul> - -<p>2.617</p> -<ul> - <li>Repaired several obscure bugs related to platform and compiler dependencies; - see pmxab.for for details. - </li> -</ul> - -<p>2.618</p> -<ul> - <li>For letter and a4 paper respectively, commands "Acl" and "Ac4" set horizontal - and vertical sizes and offsets that center the page with no further adjustments - required in dvips. </li> -</ul> - -<p>2.619 <strong>(Note: new pmx.tex)</strong></p> -<ul> - <li> Several changes at movement breaks to improve compatibility with M-Tx - and musixlyr.</li> -</ul> - -<p>2.621</p> -<ul> - <li> Bugfix: Made keyboard rest positioning ("AK" command) work properly - when there are rests are within xtuplets. - Also fine-tune default positioning of number and - bracket in unbeamed xtuplets containing rests. Position of both can still - be overridden with options on first note command for xtuplet.</li> -</ul> - -<p>2.622</p> -<ul> - <li> New option in "K" command: "Kn..." inserts \ignorenats before signature - change, supressing naturals in new signature</li> - <li> Many small fixes in transposition and key changes with "K", "Ki", and - "IT" to make MIDI come out OK. Basic function of "K" and "Ki" unchanged. - "IT[+/- n1][+/- n2]..." now transposes MIDI by \internotes, not half steps - as before. E.g. to transpose MIDI of 2nd instrument out of 3 up by one octave, - use "IT+0+7+0". May also use to untranspose a transposing instrument that - has been entered transposed, to make MIDI come out at concert pitch.</li> -</ul> - -<p>2.70 <strong>(Note: new scor2prt.exe and pmx.tex)</strong></p> -<ul> - <li>Bugfix in AN, to make it behave as advertised, which is to assign user- - defined names to part files rather than using the default.</li> -</ul> - -<p>2.71 <strong>(Note: new pmx.tex and MusiXTeX 1.21)</strong></p> -<ul> - <li>Octave treble clef ("C8" command).</li> - <li>In figured bass, apply vertical shift for remainder of line with - option "v[-](number)" to the figure command</li> - <li>Internal changes in multi-bar rests to accommodate changes in - musixtex.tex.</li> - <li>Slurs aligned with stem ends, postscript slurs only, option "v".</li> - <li>Coda "oC".</li> - <li>New, smaller segno "oG". Unlike "og", must enter on every staff. </li> -</ul> - -<p>2.72 <strong>(Note: new pmx.tex; still requires MusiXTeX 1.21)</strong></p> -<ul> - <li>Bugfix when arpeggios go from one voice to another in the same staff.</li> - <li>Further tweaks in multibar rests.</li> - <li>Tweaks in centered full-bar rests.</li> - <li>Fix bug in clef changes for multi-staff instruments.</li> -</ul> - -<p>2.73 <strong>(Note: new pmx.tex)</strong></p> -<ul> - <li>Enabled lyrics with "[text]".</li> - <li>Internally replace each '\' in pathname in input file with '/', so files made - in Window are compatible with linux systems. -</ul> - -<p>2.74 <strong>(Note: new pmx.tex, new scor2prt)</strong></p> -<ul> - <li>Enabled staff-crossing chords with single stems, as ordinary beams, and as - beamed xtuplets.</li> - <li>Allow \" in lyrics string, for umlaut.</li> - <li>Fix bug in scor2prt that was causing crashes when last line started with %.</li> - <li>Enable note option Lx to lengthen a stem by x \internotes.</li> -</ul> - -<p>2.76</p> -<ul> - <li>Allow accented characters in lyrics.</li> - <li>Behind-the-scenes modifications to allow staff-crossing chords that - are unbeamed or beamed, as illustrated in staffcrossall.pmx.</li> - <li>Modifications to allow accented characters in text strings in - lyrics, page headers, and text dynamics.</li> - <li>Bugfixes in unbeamed, dotted xtuplets.</li> - <li>Increased allowable length of text dynamic strings from 52 to 64 - characters.</li> -</ul> - -<p>2.77</p> -<ul> - <li>Enable AV+/-x+/-y to add vskip bigh before or after \eject.</li> -</ul> - -<p>2.78</p> -<ul> - <li>Expand bufq to 131072 bytes.</li> - <li>Expand maxblks tp 9600.</li> - <li>Allow up to 75 pages.</li> - <li>Index postscript hairpins from 1 up instead of by voice #.</li> - <li>Add option 'o' to forced beam for open notehead (\hb); set ipl(3).</li> - <li>Add option T[n], n=1,2,3 for single stem tremolo.</li> -</ul> - -<p>2.80</p><strong>(Note: new pmx.tex)</strong></p> -<ul> - <li>Add 2-note tremolos.</li> -</ul> - -<p>2.81</p> -<ul> - <li>Allow string of rests to end xtup,</li> - <li>In chordal half-note 2-note tremolo, make chord notes open.</li> -</ul> - -<p>2.82</p> -<ul> - <li>Bugfix: beams with rests, not confused with xtups.</li> - <li>x option after slur index to allow slurs to go from one voice to another.</li> - <li>x option also for ties.</li> -</ul> - -<p>2.83</p> -<ul> - <li>Fix problems when changing to or from octave treble clef.</li> - <li>Fix beaming (or not) and number location for xtups with - multiple rests. Still some problems with number height but - can be band-aided with number height tweak option.</li> - <li>Tweak error messages for options on "R" command.</li> - <li>Allow forced beam height and slope tweaks with 2-note tremolos.</li> - <li>Allow chordal note with 2-note tremolos, adding dots as needed.</li> - <li>Fix call to ncmid in beamstrt when setting start height for beam of - 2-note trem, by changing arg from ivx to iv.</li> -</ul> - -<p>2.84</p> -<ul> - <li>Bug fix: dots in chordal seconds.</li> - <li>Bug fix: Initialize ihornb for non-beamed, down xtup.</li> - <li>Bug fix when using "AT" with 2-note x3c rD.</li> -</ul> - -<p>Revised 12 February 2018, Don Simons (dsimons at roadrunner dot com)</p> -</body> -</html> - diff --git a/support/pmx/doc/pmx284.pdf b/support/pmx/doc/pmx284.pdf Binary files differdeleted file mode 100644 index a62ebabf24..0000000000 --- a/support/pmx/doc/pmx284.pdf +++ /dev/null diff --git a/support/pmx/doc/pmx294.pdf b/support/pmx/doc/pmx294.pdf Binary files differnew file mode 100644 index 0000000000..2a0d2d1887 --- /dev/null +++ b/support/pmx/doc/pmx294.pdf diff --git a/support/pmx/doc/pmx284.tex b/support/pmx/doc/pmx294.tex index ce13127428..69bf5269b8 100644 --- a/support/pmx/doc/pmx284.tex +++ b/support/pmx/doc/pmx294.tex @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% pmx284.tex 12/30/2017 +% pmx294.tex 1/22/2020 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[11pt]{article} @@ -47,7 +47,7 @@ PMX~--~a Preprocessor for \MusiXTeX{}\\ \null\vskip-15pt \Large\sl - Version 2.84~--~20 December 2017\\ + Version 2.94~--~22 January 2020\\ \author{\Large\rm Don \sc Simons\\ \large\sl Dr. Don's PC and Harpsichord Emporium\\ @@ -66,12 +66,18 @@ \maketitle \section*{Preface} -Compared to version 2.80, aside from bug fixes which are documented in the -opening comments in the source code, \PMX version 2.84 allows arbitrary -numbers of rests in xtuplets, chordal notes in 2-note tremolos, and -user-defined adjustments of beam height and slope in 2-note tremolos. +Compared to version 2.84, aside from bug fixes documented in the +opening comments in the source code, \PMX version 2.94 +enables blank gaps at the end or in the middle of a system (\ref{Gaps}), +allows virtually +arbitrary staff jumping beams with multiplicity changes at the jump (\ref{Jumps}), +allows +changes to the vertical position of the number for a multibar rest (\ref{MultibarRest}), +and has more flexibility in setting stem lengths (\ref{Stemlength}). \setcounter{page}1 +% Need extra line to push last line of TOC to next page +~~ \tableofcontents %\setcounter{secnumdepth}1 \pagestyle{headings} @@ -85,11 +91,12 @@ user-defined adjustments of beam height and slope in 2-note tremolos. \font\ded=cmssdc10 scaled \magstep3 \bigskip \setbox4=\vbox{ - \hsize3in\noindent\strut +% \hsize3in\noindent\strut + \hsize4in\noindent\strut \centerline{\ded Dedication} \vskip 3pt The \MusiXTeX~community was stunned by the sudden death of Werner Icking on -\break February 8, 2001. He had been a benevolent patriarch, touching many +February 8, 2001. He had been a benevolent patriarch, touching many of us not only with his technical savvy and gentle guidance, but also his genuine kindness and generosity. His spirit runs deep through all of \PMX. His encouragement @@ -140,10 +147,10 @@ that defines the score and the individual parts. The basic \PMX distribution as of this version of the manual is -\href{http://icking-music-archive.org/software/pmx/pmx276.zip} -{\underline{\tt pmx276.zip}}.\NEW{2.76} It +\href{http://icking-music-archive.org/software/pmx/pmx294.zip} +{\underline{\tt pmx294.zip}}.\NEW{2.94} It contains the FORTRAN sources, binaries that will run in a DOS -window on a PC with WINDOWS95 or higher, manuals for useage and for installation +window on a PC with WINDOWS95 or higher, manuals for usage and for installation in DOS/Windows, and example typesetting files. Alternatively, the \href{http://www.icking-music-archive.org/software/htdocs/Getting_Started_Four_Scenar.html} {\underline{software section}} of the Werner Icking Music Archive (WIMA) has instructions @@ -151,7 +158,7 @@ for acquiring and installing \MusiXTeX~and \PMX on various platforms (Windows, Mac-OSX, Unix-like systems) including using automated procedures from several external \TeX~distribution sites. The packages from those other sites will -all eventually incorporate all the upgrades in {\tt pmx276.zip} but will take +all eventually incorporate all the upgrades in {\tt pmx294.zip} but will take varying amounts of time to do so. \PMX is often upgraded; the most current version will always be available directly from the ``News'' paragraph \href{http://www.icking-music-archive.org/software/htdocs/htdocs.html}{\underline{here}}. @@ -264,6 +271,7 @@ files like you did the original one to create separate parts. To see how the input file is put together, we'll look at {\tt barsant.pmx}. For reference, here are are the first few lines: +\pagebreak \begin{verbatim} %----------------% % @@ -471,8 +479,9 @@ direction of any un-beamed note; {\tt e} or {\tt r} to shift the notehead l{\bf e}ft or {\bf r}ight by its own width; {\tt a} (for {\bf a}lone) which inhibits beaming for this note (or, if the first note of an xtuplet, for the -entire xtuplet); and \NEW{2.80}{\tt T} to insert a {\it tremolo} -on the stem. +entire xtuplet); and \NEW{2.80}{\tt T} to insert a single-note {\it tremolo} +on the stem (not to be confused with a 2-note tremolo, discussed later in +section~\ref{TwoNoteT}). The {\tt T} may be followed by a single digit {\tt 1}, {\tt 2}, or {\tt 3} to indicate the number of slashes in the tremolo symbol; {\tt 1} is the default if no digit @@ -549,7 +558,7 @@ more {\tt +} or {\tt -} . In earlier versions, {\tt +} or {\tt -} was ignored if an octave number was specified. This is a slight backward incompatibility; \PMX prints a warning when it happens. -Stem length \NEW{2.73} can be {\bf s}hortened or {\bf l}engthened by {\it x} +\label{Stemlength}Stem length \NEW{2.73} can be {\bf s}hortened or {\bf l}engthened by {\it x} \bs{\tt internote} with the options {\tt S}{\it x} or {\tt L}{\it x}~. {\it x} is restricted to the range (0.5,4.0) for shortening and 0.5 to 27.5 for lengthening. @@ -663,7 +672,7 @@ note and an extra flag to the next, include {\tt d} in the note command, As an example, an ascending quarter-note triplet scale would be notated\hfil\break {\tt~c44x3~d~e~f4x3~g~a~b4x3~c~d~\dots} -\subsubsection{2-note tremolos} +\subsubsection{2-note tremolos}\label{TwoNoteT} A 2-note tremolo \NEW{2.80}is a special case of an xtuplet. It represent a rapid alternation between two notes. @@ -671,43 +680,58 @@ It is notated with a pair of notes, either beamed or unbeamed, with the possible addition of from one to three indented, disconnected beams between the two note stems. Like an ordinary -xtuplet, it begins with a note name, optional duration and octave level, then +xtuplet, it begins with a note name, optional duration and octave, then the character {\tt x}. The duration applies to the total time value of the -two notes, and is currently limited to either a half note ({\tt 2}), -quarter ({\tt 4}), or eighth ({\tt 8}). The duration may be dotted. +two notes, is currently limited to either a half note ({\tt 2}), +quarter ({\tt 4}), or eighth ({\tt 8}), and may be dotted by including~{\tt d}~after +the duration digit. Next comes a {\tt T}. This is optionally followed by one or two integers from 0 to 3. The first indicates the number of ordinary beams -connecting the two notes; the second, the number of indented beams. +connecting the two notes; the second, the number of indented beams. + +The only other option allowed on the first note is to move the dot. After +the~{\tt d}~enter one or two signed integers, where the first +is a vertical shift in {\tt \bs internote}s, and the second, a horizontal shift +in notehead widths. If the note has both a moved dot and a digit for an explicit octave, +the~{\tt d} must follow the octave number + No other options are allowed, and some options are prohibited, such as zero ordinary beams on anything except a quarter or dotted quarter tremolo. If no -integers are entered, defaults are assigned: (3,0) for a half, (0,3) for a -quarter, and (1,2) for an eighth. After a space, the -second note of the tremolo is entered. If the total duration is a half or dotted -half, the +integers are entered after the~{\tt T}, defaults are assigned: (3,0) for a half, +(0,3) for a quarter, and (1,2) for an eighth. + +After a space, the second note of the tremolo is entered. If the total duration +is a half or dotted half, the noteheads will be open. For a whole note tremolo, two consecutive half note tremolos should be used. As with ordinary xtuplets, the horizontal spacing of the notes will always be the -correct value for notes with half the duration of the total. +correct value for notes with half the duration of the total. If the tremolo duration +is dotted, a dot will appear by default on the second note, and no~{\tt d}~should +be entered there unless the dot needs to be moved, in which case the syntax is as +described above for the first note. Either\NEW{2.84} or both members of the tremolo may include chordal notes, -using the normal {\tt z} notation described in section~\ref{chords}. Also, -if the tremolo is beamed, the height and angle of the beam may be adjusted -after making it a forced beam as described in section!\ref{beams}. - -Some examples are shown below. When two versions are shown for a given duration, +using the normal {\tt z} notation described in section~\ref{chords}. If the +duration is dotted, dots will appear by default on chord notes, and again +no~{\tt d}~should be entered there unless the dot needs to be moved. +If the tremolo is beamed, the height and angle of the beam may be adjusted +after making it a forced beam as described in section~\ref{beams}. + +Some examples of 2-note tremolos are shown below. When two versions are shown +for a given duration, the first is the default. The following \PMX code generates the example. ~ {\tt f24xT a fxT a | fxT20 a fxT20 a /} -{\tt L2 fd24xT a r4 | f24xT a f2xT20 a /} +{\tt L2 fd24xT zefd-2+1 zcd-2+1 a r4 | f24xT a f2xT20 a /} {\tt L3 fd44xT a r8 f44xT a r4 | f44xT02 a fd8xT a r1 f8xT a r4 f8xT11 a /} ~ -\includegraphics[scale=1.0]{tremxmpl3.eps} +\includegraphics[scale=1.0]{tremxmpl4.eps} \subsubsection{Rests} @@ -732,14 +756,6 @@ option {\tt o} (for {\bf o}ff-center) suppresses centering a full bar rest. If you don't exercise this option, then {\it all} full-bar rests will be horizontally centered between bar lines, including pauses ({\tt rp}) as well as normal rests that fill the bar. -\label{MultibarRest}{\tt rm} followed immediately by an integer will generate a -{\bfi m}{\it ulti-bar} -rest, a special combination of characters between two bar lines with an integer -above representing two or more bars of rest. -This command will generally only be used in separate parts -after having been automatically generated by {\bfx scor2prt}. However, it -\NEW{2.4}may be used in a multi-line score, provided it is entered for the same -number of bars in every staff. The default vertical position of a rest depends on whether there are one or two voices in the staff. @@ -777,6 +793,20 @@ The option {\tt K} (for {\bf K}eyboard) in the aligned horizontally with notes in the voice in which they are entered. See section~\ref{Acommands} for a detailed description. + \label{MultibarRest}The command {\tt rm} followed immediately by an +unsigned integer will generate a {\bfi m}{\it ulti-bar} +rest, a special combination of characters between two bar lines +representing two or more bars of rest. The integer will always be printed, +horizontally centered. The integer in the command \NEW{2.91}may optionally +be followed by {\tt n} and then another integer, possibly negative, indicating a +different vertical position for the number relative to the bottom staff line. +The default is 9. To put the number +below the staff use -5 or -6. Once the height is changed it will stay the same until +changed again. The {\tt rm} command will generally only be used in separate parts +that have been automatically generated by {\bfx scor2prt}. However, it +\NEW{2.4}may be used in a multi-line score, provided it is entered for the same +number of bars in every staff. + \subsubsection{Chords}\label{chords} Chordal notes, which always share a stem and the same time value as the @@ -841,8 +871,8 @@ blank rests \bs{\tt rb} inside the force beam. So for example a set of beamed ch that starts only in the lower staff and ends only in the upper could be represented by \begin{verbatim} -{\tt [+28 g83 g g rb ]j / -[jf rb g84 g g ] /} +[+28 g83 g g rb ]j / +[jf rb g84 g g ] / \end{verbatim} This example highlights some other issues, viz., that the beam height or direction of one or both beam groups may need to be altered. Often this will require trial and error. @@ -858,8 +888,8 @@ staff-crossing beamed xtuplets is more robust than for non-xtuplets, and will ad more intuitive coding. So for example, the reverse of the above example, where the beam starts in the upper staff and ends in the lower, could be obtained with \begin{verbatim} -{\tt [+28 rb2x4n g3 g g ]j / -[jf g24x4 g g rb ] /} +[+28 rb2x4n g3 g g ]j / +[jf g24x4 g g rb ] / \end{verbatim} \newdimen\psav\psav=\parindent\parindent=0pt where we used the option {\tt n} to suppress printing the number. As you might expect, more general staff-crossing @@ -1148,9 +1178,14 @@ or {\tt <} . The last two are diminuendo and crescendo, and they are toggles, i.e., the first one of each starts the symbol and the next one ends it. The one surrounded by \NEW{2.76} double quotes is an arbitrary text string no longer than 64 characters, which may include embedded \TeX. -With any dynamic mark, you can also +By default a single note dynamic mark is horizontally centered below the note +to which it is assigned, or below the staff, whichever is lower. Dim. or cresc. +follow the obvious extension of that rule to the starting and ending note taken +together. Examples of the default positions of dynamic marks are contained +in the file {\tt dyntest.pmx}. However, with any dynamic mark you can also enter position shifts, vertical as a signed integer representing -the number of {\tt \bs internote}s, then horizontal as a signed number representing +the number of {\tt \bs internote}s, then (if desired) horizontal as a signed +number representing a number of notehead widths. There can only be one of the letter-groups on each note, but there may also be {\tt D<} and/or {\tt D>} on the same note. These must be entered as separate {\tt D...} commands, and must come in the right order, e.g., @@ -1164,7 +1199,7 @@ Hairpins \NEW{2.7} may span from one input block to the next. There are numerous context-sensistive automagic adjustments to the positions of all the dynamic symbols. If you don't like the result you can adjust the -position as just described. +position as just described. Due to \MusiXTeX's limitations, there are some restrictions on hairpins when using font-based slurs. @@ -1282,8 +1317,50 @@ from its proper position by one notehead width. Each voice must still have the right number of beats, so you will probably need to fill time with blank rests after the first member of the beam in one staff and before the second member in the other. -There can -still only be one staff-jumping beam open at a time. +There can still only be one staff-jumping beam open at a time. + + \label{Jumps}In most cases \NEW{2.91} it is possible within \PMX to set a staff-jumping +beam that changes multiplicity right at the jump. The only cases where the author +hasn't yet found a way are where multiplicity increases and the beam runs +at a height between the notes in the two staves. In that case some inline \TeX\ +is needed. The example below covers all possible combinations of jump direction; +whether the beam runs below all, between, or above all of the notes; and +whether multiplicity stays the same, increases, or decreases at the jump. + +~ +\begin{verbatim} +h4.4i +w5.5i +\\let\nbbut\nbbu\let\nbblt\nbbl\ +% Fixed mult, up jump +[ g83 g ]j rb4 | [u g83 g ]j rb4 | [u+14 g83 g ]j rb4 / +rb4 [j f84 f ] | rb4 [j f84 f ] | rb4 [jl f84 f ] / +% down jump +rb4 [j g83 g ] | rb4 [j g83 g ] | rb4 [ju g83 g ] / +[ f84 f ]j rb4 | [l f84 f ]j rb4 | [l-14 f84 f ]j rb4 / +L2 +% Bar 7 Incr mult, up jump +[ g83 g ]j rb4 | [l+14 g83 g ]j rb4 / +rb4 [j f14 f f8 ] | rb4 \def\nbbu#1{\nbbl{#1}\let\nbbu\nbbut}\ [ju f14 f f8 ] / +[u+14 g83 g ]j rb4 / +rb4 [jl f14 f f8 ] / +% down jump +rb4 [j g13 g g8 ] | rb4 \def\nbbl#1{\nbbu{#1}\let\nbbl\nbblt}\ [j g13 g g8 ] / +[ f84 f ]j rb4 | [u-14 f84 f ]j rb4 / +rb4 [ju g13 g g8 ] / +[l-14 f84 f ]j rb4 / +L3 +% Bar 13 Decrease mult, up jump +[ g83 g1 g1 ]j rb4 | [u g83 g1 g1 ]j rb4 | [u+14 g83 g1 g1 ]j rb4 / +rb4 [j f84 f ] | rb4 [j f84 f ] | rb4 [jl f84 f ] / +% down jump +rb4 [j g83 g ] | rb4 [j g83 g ] | rb4 [ju g83 g ] / +[ f84 f1 f ]j rb4 | [l f84 f1 f ]j rb4 | [l-14 f84 f1 f ]j rb4 / +\end{verbatim} + +\includegraphics[scale=1.0]{sjb291.eps} + +~ \subsubsection{Clefs} @@ -1294,13 +1371,13 @@ vertical position, refer to the note in {\tt pmx.tex}. \subsubsection{Arpeggios} -To set an arpeggio (a vertical wavy line), simply place the command {\tt ?} +To set an arpeggio (a vertical wavy line), simply place the \bs {\tt ?} after the commands for both the first and last note. To shift the symbol to the left by {\it x} notehead widths, use the option {\tt -}[{\it x}]\NEW{2.6} . \subsubsection{Lyrics}\NEW{2.73}\label{lyrics} -Lyrics depend on the underlying \TeX\ command {\tt\bs pmxlyr} developed by Dirk +Lyrics rely on the underlying \TeX\ command {\tt\bs pmxlyr} developed by Dirk Laurie, which is defined in {\tt pmx.tex}. It in turn makes use of the macro package {\tt musixlyr.tex} developed by Rainer Dunker. So to enable lyrics within \PMXX, you will need to @@ -1365,7 +1442,7 @@ It may also be necessary to allow extra vertical space where the lyrics are posi There is no \PMX command for this, but type 2 inline \TeX~can be used to insert extra vertical space above any instrument. For example, if the voice is in instrument \#2 and lyrics are below that staff, -\bs\bs{\tt interinstrument=0\bs internote\bs\bs setinterinstrument1\{8\bs internote\}}\bs~ will +\bs\bs{\tt interinstrument=0\bs internote\bs setinterinstrument1\{8\bs internote\}}\bs~ will add \newline 8 \bs{\tt internote}s in the space for the lyrics. Present limitations allow lyrics at upper and lower voices on the bottom two @@ -1381,11 +1458,13 @@ Type~1 \TeX\ strings apply. To ensure that the length of all the Type 1 \TeX\ strings belonging to a particular note combined does not exceed 128, remember to account for the nine characters in {\tt\bs pmxlyr\{\}}. -This way of entering lyrics is a convenient interface to a small subset of the +The sample files {\tt prad5.pmx} and {\tt netsoos.pmx} illustrate many aspects of +this direct method for entering lyrics in pure \PMX. + +This way of entering lyrics is a convenient interface to a subset of the facilities offered by {\tt musixlyr}. If more advanced features than those supported by -{\tt\bs pmxlyr} are needed, the necessary {\tt musixlyr} macros could be entered as -in-line \TeX\ directly into the .pmx file - see the example file {\tt netsoos.pmx} for -some of those. +{\tt\bs pmxlyr} are needed, the necessary {\tt musixlyr} macros could be manually +entered as in-line \TeX\ directly into the .pmx file. If really advanced features are needed (such as having several verses of lyrics at once), most users would prefer the convenient interface to {\tt musixlyr} via @@ -1401,7 +1480,7 @@ automatically be transferred from score to parts when separate parts are generated by {\bfx scor2prt} (see section~\ref{scor2prt}). -\subsubsection{Repeats, double bars, forced single bars} +\subsubsection{Repeats, double bars, forced single bars} \label{Repeats} Repeat signs, double bars, and other bar-ending options are signaled by {\tt R} followed by @@ -1466,6 +1545,25 @@ digit and the next as a 2-digit integer, between 10 and 19 inclusive. {\bfx Method 2.} \NEW{1.4} Enter the four numbers verbatim in the order just listed, but separate them with slashes ({\it /}). +\subsubsection{Bar numbers} + + By default \PMX will place a boxed bar number at the start of every system +except the first, above the clef at the beginning of the top staff. Numbers start at +1 unless the first bar is a pickup included in the first input block, in which case +the pickup bar is numbered 0. There is no way to change any of this except with +inline \TeX. + + There are several ways to modify specific aspects of bar numbering +when blank gaps have been inserted (see section~\ref{Gaps}), or to continue +numbering rather than resetting to zero at a movement break +(see section~\ref{movbrk}). + + If you wish to mover the bar number box at the start of any system, +enter the type 1 inline \TeX~ command {\tt\bs bnrs[i][j]} anywhere in the +system before the linebreak, where {\tt [i]} is the vertical shift in +{\tt \bs internotes} and {\tt [j]} is the horizontal shift in notehead +widths. + \subsubsection{Fundamentals of key changes and transposition}\label{transpose} As explained in section~\ref{setupdata}, the intial key signature, also called @@ -2065,8 +2163,8 @@ the {\tt M}. Options following {\tt M} are {\tt +}[{\it integer}] to insert vertical space in \bs{\tt internote}s before the break, {\tt i}[{\it decimal number}] to reset the first-line indentation as a fraction of the line width, and {\tt c}\NEW{1.41} to {\bf c}ontinue bar numbering rather -than resetting the bar number to 0. \NEW{1.4}Also, to change the {\bf n}umber -of instruments, +than resetting the bar number to 0 (which is the default). \NEW{1.4}Also, to +change the {\bf n}umber of instruments, enter {\tt n}[{\it integer}], then the number of each instrument in their new order, then a clef-designating character for each staff of each instrument. (An instrument's number is simply its position in the original sequence.) @@ -2085,6 +2183,95 @@ them if the number of instruments changes, but otherwise not. Immediately after a movement break, any desired meter changes, key changes, or text can be entered in the normal way. +\subsubsection{Blank gaps} \label{Gaps} + +A blank gaps can be insterted in the middle or at the end of almost any system. +The middle gap might be used to create a very short coda at the end of a +system. The end gap leaves the system shorter than the others. Both types +create a space that could be used for text comments. + +Both types of gapped systems are initiated by an option to an {\tt L} command at +the beginning of the system in question. The syntax is +{\tt L}[{\it n}]{\tt S}[{\it x}] where [{\it n}] is the system number, +[{\it x}] is the fraction of the width of the system up to the beginning of the +gap, and no brackets are to be entered. This must be soon followed by a normal +{\tt L}[{\it n+1}] command to start the next line. With no intervening {\tt LC} +command (see below), the system entered between the two {\tt L}'s will simply +start at the left margin and be shortened to a length of {\it x} times the +default. + +To create a middle gap, begin as above with {\tt L}[{\it n}]{\tt S}[{\it x}] +followed by the material to the left of the gap. Then enter {\tt LC}[{\it y}] +to insert a gap followed by another segment of music extending to the end of +the system. Here {\it y} is the fraction of the total system length occupied +by the second segment (so the fraction of the width occupied by the gap will +be 1-{\it x}-{\it y} ). The second segment must soon be followed by +{\tt L}[{\it n+1}] to start the next normal line. Obviously {\it x}+{\it y} +must be less than 1. + +Normally a bar number will appear at the beginning of the second segment after +a gap. To suppress this, use {\tt LC}[{\it y}]{\tt n} to start the second +segment. + +If you want to insert text into the gap, one way is to use the text-dynamics +command after the last note before the gap: +{\tt D"}{\it text}{\tt "}[{\tt +},{\tt -}][{\it n}][{\tt +},{\tt -}][{\it m}] , where +{\it n} and {\it m} are the vertical and horizontal offsets from default +position. Some trial and error will always be needed here. + +In a system with a gap, the default barline at the end of one or two segments +of music will be a single bar unless the following line starts a new movement +in which case it will be a double bar. If you want to change either of these +segment-ending barline symbols to something else, then after the last note in +the lowest voice before the gap, you may use the normal ``repeat'' command, +e.g. {\tt RD} for a thin-thick double bar, or with other options for different +symbols as explained in \ref{Repeats}. If you use this option, it must be +immediately followed by a space and {\tt /} to end the input block. So in +particular if you have entered some text with the {\tt D} command, that must +come before the {\tt R} command. + +Here is an example \PMX file incorporating the different types of gaps, +followed by the output it produces: + +%\pagebreak +\begin{verbatim} +1 1 2 4 2 4 0 -1 +1 9 20 .1 +Harp +t +.\ +h7.4i +Abe +h +Movement 1 +f44 g a g f g a g / +L2S.4 +f44 g a g a g D"\bigfont Hello"+8+8 / +LC.4 +f44 g a g a g / +L3 +f44 g a g f g a g / +L4Mi.1+11 +h +Movement 2 +f44 g a g f g a g / +f44 g a g oC+1+6 f g a g / +L6S.4 +f44 g a g a g + D"\bigfont D.C. al"+10+6 D"\bigfont Coda"+4+6 RD / +LC.4n +f44 oC+2 D"\bigfont Coda"+18-8 g a g a g / +L7Mi.1+11 +h +Movement 3 +f44 g a g f g a g / +f44 g a g f g a g / +L9S.8 +f44 g a g a g D"\BIgfont The end"+6+11 / +\end{verbatim} + +\includegraphics[scale=.7]{gapxmpl.eps} + \subsubsection{Fractional bars} Often if a piece starts with a pickup, the last bar may not be @@ -2706,11 +2893,13 @@ Matthias Weckmann (1616-1674). It uses many techniques peculiar to keyboard scores, most notably two voices per staff. -{\tt netsoos.pmx}\NEW{2.73} is an example with lyrics, including several inline \TeX\ -commands to enhance the layout. +{\tt prad5.pmx} {\tt netsoos.pmx} are examples of how to enter lyrics purely in \PMX. +They include several inline \TeX\ commands to enhance the layout. {\tt staffcrossall.pmx}\NEW{2.74} contains examples of staff-crossing chords. Some are -single-stemmed, some are beamed non-xtuplets, and finally beamed xtuplets. +single-stemmed, some are beamed non-xtuplets, and finally beamed xtuplets. + +{\tt dyntest.pmx} contains examples showing the default vertical positions of dynamic marks. \subsection{A Benign Bug} diff --git a/support/pmx/doc/ref284.pdf b/support/pmx/doc/ref284.pdf Binary files differdeleted file mode 100644 index 422a0b12f2..0000000000 --- a/support/pmx/doc/ref284.pdf +++ /dev/null diff --git a/support/pmx/doc/ref294.pdf b/support/pmx/doc/ref294.pdf Binary files differnew file mode 100644 index 0000000000..6161911998 --- /dev/null +++ b/support/pmx/doc/ref294.pdf diff --git a/support/pmx/doc/ref284.tex b/support/pmx/doc/ref294.tex index 0355f13e36..28c426f663 100644 --- a/support/pmx/doc/ref284.tex +++ b/support/pmx/doc/ref294.tex @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%% %% -%% ref284.tex (latex) +%% ref294.tex (latex) %% %%%%%%%%%%%%%%%%% \ifx\documentstyle\undefined @@ -43,8 +43,8 @@ %\let\blank\ \def\ {\blank\blank} \centerline{QUICK REFERENCE TABLE FOR {\bf PMX}, -Version 2.84, -February 2018~~~ +Version 2.94, +Jan 2020~~~ \hfill Don Simons (dsimons@roadrunner.com)} %\begin{multicols}{2} @@ -61,7 +61,7 @@ characters, chosen from different lines that are indented the same amount, may be used in sequence. {\it d1, d2} are single digits, so for example {\it d1}{\tt[}{\it d2}{\tt]} is a one- or two-digit integer. {\it i}, {\it i1}, or {\it i2} is any non-negative integer. -{\it x} is any non-negative decimal number. +{\it x} or {\it y} is any non-negative decimal number. %\end{multicols} @@ -119,7 +119,8 @@ a,b,c,d,e,f,g & Note name.\\ \ \ \ \ [+,- {\it x}] & Horiz. shift, notehead widths.\\ \ \ \ [s] & Fine tune slope of bracket for non-beamed xtuplet.\\ \ \ \ \ +,- {\it i} & Slope adjustment.\\ -\ [xT] & Start a 2-note tremolo.\\ +\ [xT] & Start a 2-note tremolo. Next note is 2nd note. If starting note + has {\tt d}, 2nd note must not, unless dot needs to be moved.\\ \ \ [0,1,2,3] & Number of main beams between 2 notes.\\ \ \ \ [0,1,2,3] & Number of indented beams.\\ \dhline @@ -142,6 +143,8 @@ r & Rest.\\ \ [d] & Dot.\\ \ [p] & Full-bar rest using 'Pause' symbol (no digit).\\ \ [m{\it i}] & Multi-bar rest of {\it i} bars.\\ +\ \ [n{\it j}] & Put number at level {\it j}. Default is 9, below staff + is -6. Change is ``sticky''.\\ \ [b] & Blank rest, not printed (this line of music drops from sight).\\ \ [o] & Suppress centering full-bar rest.\\ @@ -320,6 +323,10 @@ L{\it i} & Force a line break at line {\it i}. Voice \#1 only. Start of \ \ \ {\it d1d2...di} & Numbers of instruments. Precede 2-digit numbers with {\tt :}\\ \ \ \ \ {\it c1c2...ck} & Clef symbols. Enter one for every staff in new lineup.\\ +\ [S{\it x}] & Shorten this system to fraction {\it X} of orig.\\ +LC{\it y} & After L{\it i}S{\it x} and after gap, short segment of + length fraction {\it y} to end of system.\\ +\ [n] & Suppress bar number at start of 2nd segment\\ \dhline m & Meter change. Voice \#1 only. Start of input block only.\\ \ o,{\it d1}[{\it d2}] & True numerator of meter. @@ -337,7 +344,7 @@ M & Macro. If alone, ends recording or saving.\\ \ [R,S,P] & Record (store and execute), save (store but do not execute), or playback. \\ \ \ {\it i} & Macro ID number, from 1 to 20. \\ -\dhline +\newcol P & Start page numbering in this page. Voice \#1 only. Start of input block only.\\ \ [{\it i}] & Starting page number. Default is 1.\\ @@ -346,7 +353,7 @@ P & Start page numbering in this page. Voice \#1 only. Default text is instrument name \\ \ \ [{\it text}] & Text with no blanks \\ \ \ ["{\it text}"] & Text with blanks \\ -\newcol +\dhline R & Repeat or doublebar. Voice \#1 only. Doublebars at start of bar only.\\ \ l,r,lr,d,D,dl & Left repeat, right repeat, l-r rpt, doublebar, doubleBAR, @@ -375,7 +382,7 @@ V & Toggle for Volta. Voice \#1 only. Start of bar only. and it must come at start of block.\\ \ [{\it text}] & Text for start of volta. May not be ``b" or ``x".\\ \ b,x & At end of volta, boxed end or horizontal (no box).\\ -\dhline +\newcol W & Set new minimum horizontal space between noteheads.\\ \ . & Decimal point (required).\\ \ \ {\it d1} & Tenths of notehead width. Default is 3.\\ @@ -386,7 +393,7 @@ x & Floating figure (offset to right).\\ \ \ \ 2,3,\dots,9,\break\rightline{\#,-,n,0{\it d1}} & Characters for floating figure, arranged as in normal figure.\\ -\newcol +\dhline X & Shift or insert hardspace. \\ \ [-]{\it x} & Distance. Default units are notehead widths.\\ \ \ [{\tt p}] & Units are points.\\ @@ -421,7 +428,7 @@ X & Shift or insert hardspace. \\ \dhline ] & End forced beam.\\ \ [j] & Keep beam open, prepare to jump to other staff \\ -\dhline +\newcol ][ & Between two notes in a forced beam, decrease multiplicity to 1, then immediately increase. Treated as a single symbol, set off by spaces.\\ @@ -431,7 +438,7 @@ X & Shift or insert hardspace. \\ \dhline ( & Placed before a note, equivalent to {\tt s} after note. \\ ) & Equivalent to {\tt s} . \\ -\newcol +\dhline \{ & Placed before a note, equivalent to {\tt t} after note. \\ \} & Equivalent to {\tt t} . \\ \dhline @@ -467,8 +474,8 @@ X & Shift or insert hardspace. \\ \dhline ,\break\null\ {\it note command} & Detatched 2:1 shortcut. Note will have 1/2 duration of prior note. See note name command.\\ -\dhline -"\break\null\ {\it text}" & Lyrics. See pmx274.pdf section 2.2.14 for details.\\ +\newcol +"\break\null\ {\it text}" & Lyrics. See pmx294.pdf section 2.2.15 for details.\\ \ \ [@] & Set a vertical offset\\ \ \ \ a,b & Above or below the staff\\ \ \ \ \ +,- {\it i} & Amount of offset, \bsn{}internotes\\ diff --git a/support/pmx/doc/sjb291.eps b/support/pmx/doc/sjb291.eps new file mode 100644 index 0000000000..d00e4f363d --- /dev/null +++ b/support/pmx/doc/sjb291.eps @@ -0,0 +1,1208 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: dvips(k) 5.993 Copyright 2013 Radical Eye Software +%%Title: sjb291.dvi +%%CreationDate: Sat Jun 08 08:40:31 2019 +%%Pages: 1 +%%PageOrder: Ascend +%%BoundingBox: 38 451 442 745 +%%DocumentFonts: TeXMUSIXSPX-Regular TeXMUSIX20-Regular CMBX12 CMBX8 +%%DocumentPaperSizes: Letter +%%EndComments +%DVIPSWebPage: (www.radicaleye.com) +%DVIPSCommandLine: dvips -O0.25in,-0.22in -tletter sjb291 +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2019.06.08:0840 +%%BeginProcSet: tex.pro 0 0 +%! +/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S +N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 +mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 +0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ +landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize +mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ +matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round +exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ +statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] +N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin +/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array +/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 +array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N +df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A +definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get +}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} +B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put +}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ +bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A +mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ +SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ +userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X +1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 +index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N +/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3 +def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90 +rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 +N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop +false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A +length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} +forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{ +BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat +{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch +round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 +rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B +/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M} +B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p +-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{ +0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end + +%%EndProcSet +%%BeginProcSet: psslurs.pro 0 0 +% This file can be used instead of psslurs.pro, it is only commented +% and indented. +% +% VERSION: 1.01 +% +% WARNING! This is a heavy magic! If you want something more understandable, +% you will have to write it yourself (if it is possible in a stack-oriented +% language that PostScript is). There are some constants you can +% change and see what happens, but I think the slurs should be almost +% always satisfiable. When not, let me know at: +% stanislav@kneifl.net +% Also any bug reports and comments are welcomed. +% +% Stanislav Kneifl. + +/slur@Dict 200 dict def + +% this dictionary is for \setslurtext, overriding some dvips's definitions +/temp@xx@dict 4 dict def temp@xx@dict begin + /a { moveto ax1 ay1 rmoveto } def + /V {gsave newpath transform round exch round exch itransform + exch ax1 add exch ay1 add moveto rulex 0 rlineto 0 ruley neg + rlineto rulex neg 0 rlineto fill grestore} def +end + +TeXDict begin +% get dimen from TeX's string ("125pt" -> 125 PS points) +/psxGD { dup length 2 sub 0 exch getinterval cvr 1.045 mul} def +% get dimen adjusted to Resolution +/psxGDAR { dup length 2 sub 0 exch getinterval cvr 4 psxAR mul 1.045 mul} def +% Adjust to Resolution +/psxAR { Resolution mul 300 div } def +% the distances in dvips's PostScript are resolution dependant! +end + +slur@Dict begin +/CP /currentpoint load def +/ED { exch def } bind def +/psxAR { Resolution mul 300 div } def % stands for Adjust to Resolution, +/VS { dup /ay1 exch ay1 exch linew mul 4 mul add def /ay2 exch ay2 exch linew mul 4 mul add def } def +/y { 3 2 roll ax1 ay1 rmoveto show moveto } def +/M { mul } def +/A { add } def +/SB { sub } def +/P { pop } def +/DP { dup } def +/R { roll } def + +/drawseg { 0 0 moveto + ax1 ay1 + ax1 0.6 mul ax2 0.4 mul add ay1 0.6 mul ay2 0.4 mul add + ax1 ax2 add 2 div ay1 ay2 add 2 div curveto + ax1 0.4 mul ax2 0.6 mul add ay1 0.4 mul ay2 0.6 mul add + ax2 ay2 + x2 0 curveto } def + +/DS { + psxAR /maxe ED + /ifadjust ED + /ifdash ED + psxAR /m ED % max height of the slur + /e ED % "angularity" of the slur; 0.1 = very angular, + % 0.3 = very round + /aa exch neg def % what to multiply the height with + % AFTER the max height checking + /y2 ED % y coordinate of the end of the slur + /x2 ED % x coordinate of the end of the slur + /y1 ED % y coordinate of the beginning of the slur + /x1 ED % x coordinate of the beginning of the slur + /yr2 ED + /yr1 ED + /internote ED + /x2 x2 x1 sub def % x2=x2-x1 + /y2 y2 y1 sub def % y2=y2-y1 + /sx y2 x2 div def + /b x2 300 mul Resolution div abs sqrt psxAR 2 mul def % b=2*sqrt(x2) + b 3 psxAR lt {/b 3 psxAR def} if % b=max(b,3) + b m gt {/b m def} if % b=min(b,m) + /aa b aa mul def % aa=aa*b + /s 90 x2 y2 atan sub def % s=90-arctan(x2,y2) slope of the slur + /aa aa s cos div def % aa=aa/cos(s) height of the slur + /x2 s neg cos x2 mul s neg sin y2 mul sub def % x2 = x2*cos(-s) - y2*sin(-s) + % is the length of the slur + e x2 mul maxe gt { /e maxe x2 div def } if + /beta e x2 mul aa neg atan def + beta 90 gt {/beta 180 beta sub def} if + /ax1 e x2 mul def % control points + /ay1 aa def + /ax2 1 e sub x2 mul def + /ay2 aa def + +% check if the starting and endin vector stay in desired quadrants +% => beta < abs(s) + beta s abs lt { + /b aa abs s abs 2 add sin mul s abs 2 add cos div def + s aa mul 0 lt { + s cos 0.75 lt { /ax1 ax1 b 1 s cos sub mul 0.5 mul sub def /ay1 ay1 s cos mul 0.8 mul def } if +% ^^^^ ^^^ ^^^ +% (values to play with) + /ax2 x2 b sub def + } + { + /ax1 b def + s cos 0.75 lt { /ax2 b 1 s cos sub mul 0.5 mul ax2 add def /ay2 ay2 s cos mul 0.8 mul def } if +% ^^^^ ^^^ ^^^ + } ifelse + } if + +% align the slur to the staff lines + + gsave + x1 y1 translate + s rotate +% [1 0 sx 1 0 0] concat + drawseg + gsave + initmatrix + flattenpath + pathbbox + exch pop + sub + /slh ED % in slh we have the height of the whole slur + pop + grestore + + /yr s aa mul 0 ge { yr1 } { yr2 } ifelse internote div def + /slh yr slh internote div aa 0 gt { add } { sub } ifelse 2 div def +% check if the slur gets too close to staff line + /shift 0 def + slh 4.45 lt slh -0.5 gt and { + /slh slh dup truncate sub def + slh 0 lt { /slh 1 slh add def } if + aa 0 gt { /slh 1 slh sub def } if + + % slh now contains the position ot the slur top/bottom in the space + % between the nearest staff lines (from <0,1>), regardless direction + + % slur is too low: + slh 0.45 lt { /shift 0.45 slh sub def } if + % slur is too high, but we can be shift it down: + slh 0.7 gt slh 0.85 lt and { /shift 0.7 slh sub def } if + % slur is too high, must be shifted up: + slh 0.85 ge { /shift 1.45 slh sub def } if + } if + + aa 0 gt { /shift shift neg def } if + + ifadjust 0 eq { + /shift 0 def + } if + + +% and finally draw it... + + grestore + gsave + /linew internote 0.06 mul psxAR def + linew 4 mul setlinewidth + 1 setlinecap + 0 setlinejoin + ifdash 1 eq + { [internote 8 mul psxAR internote 5 mul psxAR] 0 setdash } if + x1 y1 shift neg 2 mul internote mul 4 psxAR mul add translate + s rotate +% [1 sx 0 1 0 0] concat + +% uncomment this to see the control points +% 5 psxAR setlinewidth ax1 ay1 moveto 0.1 0 rlineto stroke +% ax2 ay2 moveto 0.1 0 rlineto stroke linew setlinewidth + + drawseg + 1 VS + drawseg + -2 VS + drawseg + x2 20 psxAR gt { + 3 VS + drawseg + } if + x2 50 psxAR gt { + -4 VS + drawseg + } if + x2 80 psxAR gt { + 5 VS + drawseg + } if + stroke + + grestore + + % now some \slurtext code... + + /x1 ax1 ax2 add 2 div def % middle of the slur + /y1 ay1 ay2 add 2 div def + x1 s cos mul y1 s sin mul add neg + y1 s cos mul x1 s sin mul sub + aa 0 lt {1} {0} ifelse + end + + % this is a hack to place the slurtext in the middle of the slur. + % From unknown reasons simple 'ax1 ay1 translate' did not work, + % so we have to overlay some definitions with our own, namely + % 'a', which is originally 'moveto' and 'V' for drawing rules. + % maybe there are some other operations that should be redefined, + % but for almost all cases this will be sufficient. If you find + % anything that won't be typeset at the correct position, let me know... + + temp@xx@dict begin + /dir exch def + /ay1 exch def + /ax1 exch def +} def + +% crescendos +/DC { + /y2 ED + /x2 ED + /y1 ED + /x1 ED + gsave + 1 psxAR ceiling setlinewidth % line thickness: this results + 1 setlinecap % to exactly 2 pixels in 300 dpi + 1 setlinejoin + x2 y2 10 psxAR add moveto % the 10's specify wideness of the + x1 y1 lineto % open end of the crescendo, + x2 y2 10 psxAR sub lineto % similarly the 11's below + stroke + grestore +} def + +% half crescendos +/DHC { + /y2 ED + /x2 ED + /y1 ED + /x1 ED + gsave + 1 psxAR ceiling setlinewidth + 1 setlinecap + 1 setlinejoin + x2 y2 11 psxAR add moveto + x1 y1 4 psxAR add lineto stroke + x1 y1 4 psxAR sub moveto + x2 y2 11 psxAR sub lineto + stroke + grestore +} def + +% differenced line + +/DLN { + gsave + psxGDAR ceiling setlinewidth + psxGDAR exch psxGDAR neg rlineto + stroke + grestore +} def + +% sloped line + +/DSLN { + gsave + psxGDAR ceiling setlinewidth + psxGDAR exch 1.125 mul neg rotate 0 rlineto + stroke + grestore +} def + +% free line (init & terminate) + +/DFLN { + gsave + psxGDAR ceiling setlinewidth + CP moveto + lineto + stroke + grestore +} def + +end + + +%%EndProcSet +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def +end + +%%EndProcSet +%%BeginProcSet: special.pro 0 0 +%! +TeXDict begin/SDict 200 dict N SDict begin/@SpecialDefaults{/hs 612 N +/vs 792 N/ho 0 N/vo 0 N/hsc 1 N/vsc 1 N/ang 0 N/CLIP 0 N/rwiSeen false N +/rhiSeen false N/letter{}N/note{}N/a4{}N/legal{}N}B/@scaleunit 100 N +/@hscale{@scaleunit div/hsc X}B/@vscale{@scaleunit div/vsc X}B/@hsize{ +/hs X/CLIP 1 N}B/@vsize{/vs X/CLIP 1 N}B/@clip{/CLIP 2 N}B/@hoffset{/ho +X}B/@voffset{/vo X}B/@angle{/ang X}B/@rwi{10 div/rwi X/rwiSeen true N}B +/@rhi{10 div/rhi X/rhiSeen true N}B/@llx{/llx X}B/@lly{/lly X}B/@urx{ +/urx X}B/@ury{/ury X}B/magscale true def end/@MacSetUp{userdict/md known +{userdict/md get type/dicttype eq{userdict begin md length 10 add md +maxlength ge{/md md dup length 20 add dict copy def}if end md begin +/letter{}N/note{}N/legal{}N/od{txpose 1 0 mtx defaultmatrix dtransform S +atan/pa X newpath clippath mark{transform{itransform moveto}}{transform{ +itransform lineto}}{6 -2 roll transform 6 -2 roll transform 6 -2 roll +transform{itransform 6 2 roll itransform 6 2 roll itransform 6 2 roll +curveto}}{{closepath}}pathforall newpath counttomark array astore/gc xdf +pop ct 39 0 put 10 fz 0 fs 2 F/|______Courier fnt invertflag{PaintBlack} +if}N/txpose{pxs pys scale ppr aload pop por{noflips{pop S neg S TR pop 1 +-1 scale}if xflip yflip and{pop S neg S TR 180 rotate 1 -1 scale ppr 3 +get ppr 1 get neg sub neg ppr 2 get ppr 0 get neg sub neg TR}if xflip +yflip not and{pop S neg S TR pop 180 rotate ppr 3 get ppr 1 get neg sub +neg 0 TR}if yflip xflip not and{ppr 1 get neg ppr 0 get neg TR}if}{ +noflips{TR pop pop 270 rotate 1 -1 scale}if xflip yflip and{TR pop pop +90 rotate 1 -1 scale ppr 3 get ppr 1 get neg sub neg ppr 2 get ppr 0 get +neg sub neg TR}if xflip yflip not and{TR pop pop 90 rotate ppr 3 get ppr +1 get neg sub neg 0 TR}if yflip xflip not and{TR pop pop 270 rotate ppr +2 get ppr 0 get neg sub neg 0 S TR}if}ifelse scaleby96{ppr aload pop 4 +-1 roll add 2 div 3 1 roll add 2 div 2 copy TR .96 dup scale neg S neg S +TR}if}N/cp{pop pop showpage pm restore}N end}if}if}N/normalscale{ +Resolution 72 div VResolution 72 div neg scale magscale{DVImag dup scale +}if 0 setgray}N/psfts{S 65781.76 div N}N/startTexFig{/psf$SavedState +save N userdict maxlength dict begin/magscale true def normalscale +currentpoint TR/psf$ury psfts/psf$urx psfts/psf$lly psfts/psf$llx psfts +/psf$y psfts/psf$x psfts currentpoint/psf$cy X/psf$cx X/psf$sx psf$x +psf$urx psf$llx sub div N/psf$sy psf$y psf$ury psf$lly sub div N psf$sx +psf$sy scale psf$cx psf$sx div psf$llx sub psf$cy psf$sy div psf$ury sub +TR/showpage{}N/erasepage{}N/setpagedevice{pop}N/copypage{}N/p 3 def +@MacSetUp}N/doclip{psf$llx psf$lly psf$urx psf$ury currentpoint 6 2 roll +newpath 4 copy 4 2 roll moveto 6 -1 roll S lineto S lineto S lineto +closepath clip newpath moveto}N/endTexFig{end psf$SavedState restore}N +/@beginspecial{SDict begin/SpecialSave save N gsave normalscale +currentpoint TR @SpecialDefaults count/ocount X/dcount countdictstack N} +N/@setspecial{CLIP 1 eq{newpath 0 0 moveto hs 0 rlineto 0 vs rlineto hs +neg 0 rlineto closepath clip}if ho vo TR hsc vsc scale ang rotate +rwiSeen{rwi urx llx sub div rhiSeen{rhi ury lly sub div}{dup}ifelse +scale llx neg lly neg TR}{rhiSeen{rhi ury lly sub div dup scale llx neg +lly neg TR}if}ifelse CLIP 2 eq{newpath llx lly moveto urx lly lineto urx +ury lineto llx ury lineto closepath clip}if/showpage{}N/erasepage{}N +/setpagedevice{pop}N/copypage{}N newpath}N/@endspecial{count ocount sub{ +pop}repeat countdictstack dcount sub{end}repeat grestore SpecialSave +restore end}N/@defspecial{SDict begin}N/@fedspecial{end}B/li{lineto}B +/rl{rlineto}B/rc{rcurveto}B/np{/SaveX currentpoint/SaveY X N 1 +setlinecap newpath}N/st{stroke SaveX SaveY moveto}N/fil{fill SaveX SaveY +moveto}N/ellipse{/endangle X/startangle X/yrad X/xrad X/savematrix +matrix currentmatrix N TR xrad yrad scale 0 0 1 startangle endangle arc +savematrix setmatrix}N end + +%%EndProcSet +%%BeginFont: CMBX8 +%!PS-AdobeFont-1.0: CMBX8 003.002 +%%Title: CMBX8 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX8. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX8 known{/CMBX8 findfont dup/UniqueID known{dup +/UniqueID get 5000766 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX8 def +/FontBBox {-59 -250 1235 750 }readonly def +/UniqueID 5000766 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX8.) readonly def +/FullName (CMBX8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 49 /one put +dup 51 /three put +dup 55 /seven put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D4350D67F24B396427 +8808B79FF5CAF896E4A8A31E46499CEE35E6A5AF0CFD175C2DD628620C681947 +A02A01D3C2B715AB79D7FDAB638D887B77DFFEC5C3A9484104D84FCECC7296CE +2A3488AE246E233A8D5B40ED5DCC44558B77422BDE47E0435F960EEC3A26DA9C +E137555F0638511AAA14992C8DDA9A4A11B3F90BD4DAAD1883BBEC357DBD8389 +16EBE2AA8F93C2AD44F383ABE13B8C95B240563FAB987EA98794D301785E1E9F +03DD545E51A6D58B3618E0750208D3AB913F9CE8C3B865D4CB83B90FB24962D6 +142B0204A1E271854F903A2FF600E087EE2FC222326051F155BE709B3E7A808A +487B8AC3CD7D2EAB52C2ED68285F962D06677C2A5015A16B3D12D15D658D89E5 +18513C020222D1A995EA14D7D9CCAC4A552172146B53AA4DCF6DD217B61CFE98 +1E14709295D97DC8B168AFBBA9990F0BFB9F72A5305570A1848A9E2CCA702C77 +DF4F414CDDA4FD7DA25D9B09F05A77F37F1496F2601AA5FBE9B52C1C16FBE860 +A3FCA20DCAA3BBADDA16304242A306400D2BEC9BA12788A5AE0E0CABDCF565BF +474A615DB6A14695E6C7288DE0B852EB91153F8A337E66DB5CB43E8234589F00 +4868530A5216CFCFA0DCDB92D6BDB092855E9BA80682D5679EF88F3152E8C2B9 +E38D0D6F26276BC74B8664E13D4B388124C88D19FFD2448E2743BC02AEB14694 +1AC48CB776F8526FA416549A3C35616E8FA5632AA0D557B90C5CF40BE1B62325 +97E45F7EC4F04CBC178B72A195912CD18498098C901CD35834FD6EEF765CB292 +5A753BAACA557BEA0AF989BDEE0F0C5DF8177084AFC20E7A78BFA536DC28E9DA +FEBFF50E908CA6B5DA15D3CC28A00DBFF8A1D7FF0D82F2A397C0B8B23F959C99 +63BFBA5FC83D7F51CD0EA2E2C925F7F4AAEEC8A0483F50E02E4C0373FA4D7891 +3EDAB498C44A259B6A2E3E176143C12E25C7B880E2E6B96592BE77AEE1190C74 +35F4BA28952C002AB6B3A4B0BD9054855CBDC143CA9D20D20EB111A030D1C979 +86BDE77F3BB47918F4A456513EDCB90B7CF72E97296FE07F51D0DF8C9E666024 +69C209E6A4A5343F3DEDB6F09B06297505F8F8AC2AA857DC545E030DC9337FBC +E48DC186C5DB047D0FF564B444054F7664AC72B7C39F39959BD574C099562FAF +9832B2260D4F1E9FE64F6BE5243308B57499B6220EB4431A53E8D9A3C6BDF5F3 +8D7EA0754D363E897EC68D7E45DB4635D3E7D7176C8C364082D1D6B00D9A7AEE +5E978FC3AC4D9D73E8FAE3086930DA11497F8867E01CAE42CD9D7D1558DA4694 +48501C4729614948B9DD2065E5F13275325302C24E28A22AC2F33304EAE0A317 +FE51288D91EFB7AF68B8B9C3BE1294CBC390862BC28463FBBD62A32E0AE3344C +5F96E2343E5E1662E5626C6014E1F0E661126A00E1E24A4F7A2546C37B701BA8 +F18F93372B48893E3C0449CEA14D228BDB8FD17256DF2FE0767661F6A3972DA9 +33C746E2AFF1EFF2B44159CFF6A570C10260751299D8A30A3BC19239C9FE0DC6 +BAD2AD2558223FF4CA1B672426EBC422A12514F67D9152099848B13E131C0E90 +9037A6DBEC1CB183720F78C37D5EE5BFE81FCB2F615A9595791C6F56210C84FE +62FF6F5F15B866C686D8881212D7B3F4342FD09FC1E4874D35DCDFDB9D506D5A +06E5DB61F496E70C8E8B145B9BB951B2160B6FE86EA7AC1671BC40CDD866A9DB +3103E91EB483E5BE3C037F2D2388A44D8154B216C433FB85231DA4F55D3D4A8E +7FDA4387923679067F13454B02D9F2E2B030FD62C0750576F32F090E9A054DBF +4BBB729B94162C080ECD81F2DB2BD1D65C1D50CE414D0FFB4C7E994B65177F04 +E786CACF71A5690F62AE3AE57F43247B8392D2BBD4E61262EA0CAD3868F33296 +BC7002271448E865DED4324FCD923313969D1355A579F918E6225955A2BD5B7E +C2A0E02809102F295895722930FCCCE6E8DB301635221B57FA589533C2C3BEC4 +9B1958680BE6102180C667E4984C7B9250C5BB231F8E443B98EF07FAE3AC29F0 +B4CC4BE8A3DC0058FB2CCEB90262FC959D5ECC3A887E10E1E43FAE7DFBDE4882 +BA9035B38BB0F69F8659C0094EA643DEBCACFC8EB5C73AA25A1B83B2DA2D1D47 +29A27B554BB9A762D020EC05001DC8559E096F82581B248AF95D6F12FB73E4E9 +58BFF246EB803809F561F8E17E6B1B7B1472FC342761EF29FA2C3890FEEB96FF +6B1A173A74A2A61837BE90AD9574EFD8D65602C63C560DEFBE5F0C1F8250E66B +E7A8C1A68E8445CF67F672E2F11583F70E77F479916339FA7E5672DFD1907CAE +45A5DBD35C535D903442EECF453495A6B256DC635941A6781C426A2E12BAF3BB +73C147A74DDE4925D642BB73D9F2608554D967A0944D38CB29F984379073F6B2 +77301EA7AD503121EAA1AF349D72677869515D0E537AD762304A6A5CF31E8431 +D053D4A1B6C03A4DBE6BDAE2312FBC65F18FC8F4AA546FA69D09DCC722CEE1DA +E02B6F69B69F675AE544ACAEFCDE959350E1EB6C45C162E08E153D1F3151AFF7 +B539D0834CA4B87B06732D5EC077B37373348A5CD7B39811286092ADBDD86931 +3F6867AC5D53E565234847205FEDC23BC1E1166CA113787DEB72AC251FE7FD1E +250557284E533F3B2DA3BB22AFF13428D2537BBAFB70734A7FDDC68AF58A9D3F +DD456ED2E4A0A89C6E22080101412164A955748ED5E689308C96FA5D23D63513 +5B8890A57983C9DAE333B38ADFE356C6CD6BB865C493151B24B9A1FC4D66C491 +12E8637906EBCBD60E76227E8847112135CE4FFB00B396FE3DC237292B8D2EA3 +03B263C1B6CDA2719C0D99B6CEEE6C86CB397C4D0C058BC2EE9D6298612D01BD +31531819BFC228868453DB8EB836AF2394D45A222A21EBDE795E558E84A277F7 +D8591ADCD9E16C34201CB0D0FC1FE62FB107D53DA0D95F61A9A55585A3D106B5 +48B258A35D3AF66995A9DEE4312C0DA4C91CD3AA7FFBB7A5278FACBA05E5BBA0 +F936BC210EA4E107EB883DEBC83BBA0798B665F2DAF2BCFC00D524930B394187 +4712AC73DC2F901BDA21589E9132A50B6F16FE8C6153209BDEEC9025C3C24035 +F8623B3CDF420E064D2D3F1BEDA64E39C8482972C96B38BF7D25C1025A9DC57C +40BE36086161C419BE1B0CB4B653DB07FA28934C41AFE90152A14AF2688FB6A0 +71AEB8175EEA7775C13F2B7C598C30E91EA8DB07ECDDAD64E40A8C8FAA3ACCAE +ECD1296AB2075DE150F10502847E970256A70B7329834B1D80D40AC5C8DF55DD +E3922D85820114F898F87E644EB8F460BFCFF752B635B6D08F46AEF2123A2E86 +913CF1B45DD2D01B8E560EC04230CC8DE7C78EA2970C224B371777430ED41B02 +63C87C9B29161341DAC785F547C2E6256370BF3BD8D7AEC72F6F9A4BDDFB6EFD +45AF0A366B9387A4CD9164326B997BCDCFFE0D25D88E22888889D8E47C5709F7 +CAD17E0DD435B20E767B31521E9E14ADE57C7C9CDC2FD7D09DAF912F6C5CDC34 +6362133B50B8E5954814EFAE6AB8D004AF3CBE097BB0F61FDF1E10170F4EA28D +CD93B802BE124A435403D3BAEBE8C1131718579194420AD650A3986AF9220363 +75155975B60093A9A6CD171834B2E39629041BEDA7CFAC7BA6411A206B09DD78 +CFF14E36304B7FAC838FEC6E4AC6847C6CEC1559B41D81383017668DD230C98B +C317B08B199C270FEAF50868DFE6AD4243EAEB67590855074A248CEF8F64DB80 +D5CCAE6445AE92150058660E861467D0CECF61DCD5D4062CE9DF07CB098B90FB +6CB59553A0956BD6339CAC2FA9C519C46AE9775672DD69D33C0E6D7F626EC2D5 +85070A68A450227CD535911F9E0CCD1BA379C750CD10C4190EC8B979C1E4ECBD +DE2836E85616406FC2DFDA7E27A411276AD1B3900453DC3AD85C7A9BE51CCAEE +315E3E5C31F8E6962721DA166B9660C8087C1F1ABD77950E061A2D924FBF4A89 +3FF5C570ABAC5EED011D2BF94BC1268EE4F2A2CCBCBA29FBCC4B186A3FCDDDD3 +B462305EABECBFD279C9860D5E490EA63D9231638E06EE8D58EE6E926C4A3D3A +C5E957A20F1F99FA05C43BC4D1918DA051656EEF0C498748879BA4258DD73CAB +0F32F20B98014C2B14A77186E43470F0182828955730F440493D34B0877065A7 +6E7B704B27F93DAD747DA77109C541A15F08A694A703E6E7C62BD0A86331EE79 +6C18A6C38923B88BF83BF212C76BA6EAC620CC859F0365F5511821261CE29DC2 +BFEBDE0CD36F0052692C9945077CD606E4841CB991D3C3DE9BE28EC7CBEC2FA6 +75984071CFDFA8857CCDF9005AA8FC549EF295DC701260CB4A5CE8FA0F439B22 +BC2C19D3C14E7B2B6B41AAA158659C307D9C91C2B12331BE152D3EF8FD324B9F +8C3B74D553AADE2B0E89805F47FA2DF36766B8DF01CC2B6B44344BF4B11C7FD3 +186662A11137448ACE7D3F4CA515E0BEC21859D2BB5A25F67C48817404DFA0CA +7B3D11495250150C6A1E32B80334E8F5C52D4769C8BDF3E6E3DA4FF1BC97E009 +A1AFD195205FC741837F21CC2942CC8322F3D6AAB6D330E6CE120E1A15E91987 +AD98FC12019A945B215BC72768F32A7635AB0F0E6E185AC7099F1A0EAEEC5FA0 +341EBECA077B25102310331CA87B74345506156CA5E853728217608416EC8173 +2D24CEE766E2B3B0BE183CF2A8B794E0E0E91C11D59B98DF5F4E5EA119F197B5 +D8800744F9FD45015FCF5E740105ECE72AB5AB7E1CFEB15807A0D1CDE00A44AD +E94EF57AB546990A691FB2E24CB55477B7FAB6F12A28676DB7ECCC014AC70C80 +9199E921F449C232EEB88268A48DD86FCFA2E29FB450FEC618E9E317F4AACC68 +C51EBDB1B9E43F7574B40C0EB05E769D30F1C172645006D799E8C3D7C79DACD4 +FD269ABF9B24B215B534365D79535AE3578D714606D22AAA5A2039FE7A5DD52E +506D293824BEF78F5E1C7228FF9097FF5AE8CB7B46E69C72FB43EEA7110A9EAA +546E9975C54CFD56022EB1B21E00CEC393DFA488C49C90E73D57CAB0324E36CD +0D2F0F0641DC3785CA9BFD680D609392CC2F852056E90276DA93043B14F30BDB +C32808FCF16CD13E4A13B727BEB4FD42B29D6C215AF4811B965822960F6D7CDE +92BBB8FB84B59075FC14075C30CEFD9D095ADD8043FD12452D3C5E4EFABC9671 +6E929D5932C337969F3F5448A2BC8001ACDDA043EE975F35E64D7436FB73B197 +697E87860E071F326C7080E9C2930CBA600C6875ECFA85DD4C3741945004B3C3 +298F2B741302E0FD39D990F20D68542B2FD0D71F52DE1ADF30FFA332306360C7 +C6BE3E6D510A691029D503FBFE96831D332831C69B590025C831281881968B86 +42817BFDCE322355F994FA9C8BE68A9222CC09AF9AB2AAE8BCFDEB69B8481CB5 +75E66873B08A4E8265F369448F0E3BC0C82D82F65216D0C93DE88322EE7D0FD4 +1089A1D6CC3B52F681BAEADB1C82EC3B82949C27C6C340BE7E27020015CF142C +37DC3BA8E4EC2A4FA81E50EE6854C23B3EE301E43D83CF6B82E80ABAA01EC82A +36CFE930297EE3A45783871EC4E77DCCC0923A9FB1654406FC8070BDADBD27D6 +0BA8837A459481ECB63F03DC3007700D360643864AFB3728C5573A20870E5D55 +4F698DB4B5610C30876DE56786D84C71AA9FDD5198B4F3F8918AF319B7FCD04C +F06C90B2CD0CF2241C2055DB68F1CA5CD57990E68F6F832A5820A481B0823F98 +0F4BAE4D7E92F4F2BC118E01ADDB7D527E6BB49E85D37D7E0BE7BEFBD1BF9E1B +9ECE91D28E664284D190010D1578C1F61F02610A9AA6E9527872276E59A25362 +68F74B88959CE84F497D8D89735413981FE4EF573E4E0C02D3F0EED5FC100A4A +563949D21A3E29D86A84C9F945602D9EDA860C6C44492EF219DFEBCC016FA7A4 +AA12A727D4E218D22805E5EC878AEA7D8B5D79E84E74E78FD9E017FEC4220A7F +9ABCD125BA6E9D378BDC19D0B267A323FDD0831C5E7EB7D4A5CE7047F272D3AD +1E25F7C5327127A058C287FEC98BD81144447D5BF73C56472E552C7B1AAF6705 +05286122B612BF5A2AA8C4A6CD64088BAB59B008A43121FBF5692418FFCFAF05 +260D6EB20C680BB73F3988C3E4E3CEFC65BA637FDFBA60E6D9D63E6C7FE196F4 +412367C1F43343EC6FEE8F97FA0E95BF1BC2C15F14CB6C8E8B28248B5EBB6478 +FDDA9D183AFF6A63145824E518377F384740984DC6095FCF3F8B777DD23A221B +AB1ED5EE27C19941184967846B8800E489E1B86F23ABC34237502ABCAF092C77 +38A1720A851E8EED24BFEC9AB4C8D4D7FFC3ED0C1CF4FC73B962EB53725DB67D +983A8C2B9E30F4F85AFAA17D86EEFD57CB17BACFB8BB2204E7CDAC446C679226 +F21D1A5CF2EA719888BC727725346D58479B69213F9EC3520B9C3A1778061AB0 +3B330514114833525D40B3F7F45EE401534732803B807953EE20C9660FB790C2 +71513A220EBE1731295B205324F275FE110D60A77CBB43441472193570E67BD0 +E97D51AEDD94B4DA0D71DE66E18F22F1E6CCB81D1DAD113125743D82DD4BBC8C +190BF7073078FB1235E8A329EC3C69E3D25B37B1BCBDFA50D0C34BA486AB50CE +0F411AE5DDD05BF3ABA16151A06D566860A08B2C634786C823D615BE622BC8DC +36FADBEE389BA4F7A5A32BBAC6403282F02E92ADF11C14F45B51D579631F067E +09C17ACC247837A8B6F66C66574F91317CC12C73D09A75B80CFD11993FEFCED9 +859D36B55033A149ECF0A845F611FAC0A8DEE32B407091C0233808C79857C2C1 +540A530EBFAE98C5D51C955D02FE62C8F207C97D614636AF826A7F2247E56B54 +3B496509DEDA8A277F0100A94376F5FF85586C6721F65F3F6BCF8B19CAAF8E4A +EB16AC97AB71C32FD3DC9E7F1CF02D29ED516BE9F8F0BA027C68A5467A91338C +CB52C099EC4FB72775138197BFF472B4FB75B84D5D45824A705412F13EC5A2DF +363D37E7ED7DEBD14AB754B8F7C829998351F76E0660BBBFAE6DE96BEA394965 +F14D65CD28C593B5056D41FBE0780AE9AFE5F697D3F41FD750D327F5DC23FE02 +1DC31AC1DC74721C939D38710BB1BE55E895C2181365CD2BF61E8B59023253B9 +7694B2215942A702B855A0102029229F2CFB8EBDED2BA9B723CD915E0CF54FD2 +D8B4CA2A0BD43DEB478AC342F292FF590B2FDCFEB7195BA687A7C7D4E17D5E06 +EDA0D7F0195D255CEA7288396CB53A961DC4EC29F949EA8AA48DBFD6BD2BC7C5 +7019E26D342B8BBD0AD9D48E689550DC1FD581EB0D6E4156D107E116D9326BF7 +E29F3479790283C8FA5AD1BF8562D11A26F81783E7B9CB3C74EDB9A2BCEE56F0 +0A6FF68026B320FAA86EF294C07F310B832941D400337C0A1C8DD466F2AEA9C9 +7284F09CF01CB6D17E333AFEAB84DB7E5451829DEE0B97F8D4037877EB32BE6C +871C9B477865AFA9BECE34891B81B4416BF1C82CEBFBBB6757B7032E04E2ED10 +38DC59E06E65379DF10372264804733507A929783916D02CF3158E4AEC0531EB +95502E07ECAAAE6EF0E70EE934263D6C8404739F468228484BC5BF2EDF9BF06C +D5CABBE2E28975711AD2F485846A92D22DB307ED63FDF99120684837B21AE421 +751B4681AF90A153AE3B977850AF1B7FADFB4A0D074AEE539DD1B553D99CF869 +0D589B7C27086CD89458E78A94E33C2610617A56771E56B146D9143488B01742 +017A7EE0444948173C783DB8643039B61CAE1D863047ED474E47A1CB49DC43DA +0099D2BE926D5C8CE61D98B0DF3B532AAB90EE57BC17191EF4119FCDB991ACE4 +B124110BEAD7BC80EC8A205638E2727D8464AFE44C65F47D33F454316DD87FAF +A1C93E7C6C1E357F3E111E41706635476A360F789F0153DD8DBBFD19826BDB1C +AD807F7DC8E2E5E5B899A3736AD5B763730B56580EEFF4344C817F5F957D846F +DA451E88904ABC2AB6D91D65C09AD057E2E5C57B50489AA55AF46A636EEEE6A6 +2B82261A04F36F8C26048328571475A5ECCECB8C037E41A8BC22D608EDFB2675 +103CDFFB44F1BD1BF9637A67426BE60C51F6BC9D02B6197A1E65FB3707765DD6 +051AE76C812DDB88EA1E9AF29946B09CE34557DBDEEBF27F8972F32EB1E49D39 +8EAC824980A6AD3851F565B89F2BABAA5C69FBF7A7ED299E5DA6274584F3FEA4 +C818B0A3812B71F88C93CEA8C1D67B685B1803C2EE03B6F0CF79820167529946 +9CBCCA3814BB486957BF0E45B1A09A0807E4875A871100A4D713909D5474851D +06BB8370E5CFF0B6882CB65C9B0E399E01E19CC5555CDE7EFEED41A8AE2CCFC0 +8A3A43C83B60B75F64FB3A49E7E107E23C6FB6D2E8F9215AD057B865B6F1387B +CF5AB90034AD44AA5B4E6563C9A09B80ACD4D02979DB3D8F5E0D23B3E134C7F6 +49BC4680FBA5F712EB64AE9E2FA55E8C31366547A301014AC3A79F99A94D8441 +F3E70866721B078B8FB1ECA1A24E43B98BF26A44FA3467A34F3B0D824E7D5E0E +C15640A00C3DAAF5D159D85A4798EC66446F1369C9039FF1F99246C35D87034C +83F663664B5A0B9C50E3DEAA6E9CB3DA6152EAFE8C93ABCFAB27EEA07318E63A +222508B6999F6CC8AD0A04FB5C6175D5C071D9FF0C3B46AF9B345CF1F4D68875 +860DF221AA5CBFB0AC73453651796545F6DDCA5435EC7E38809EEE9F56928E9D +0C19D53FCE2DC5084999A0A912787486FFFDB857B3A855E81F9B4D551F4AF2D8 +27AA078CE1015FA1B5FCC44D9031A03B889AC9BAC1FC08F75D35289889BE0A07 +EC27C07E65D9C791001742DA +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: CMBX12 +%!PS-AdobeFont-1.0: CMBX12 003.002 +%%Title: CMBX12 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX12. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX12 known{/CMBX12 findfont dup/UniqueID known{dup +/UniqueID get 5000769 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX12 def +/FontBBox {-53 -251 1139 750 }readonly def +/UniqueID 5000769 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX12.) readonly def +/FullName (CMBX12) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 50 /two put +dup 52 /four put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D43A151FEE81296FBE +0CF37DF6A338C826464BA5198991445EC4BE80971DB687336AE8F74B516E333D +2D8AB74D362C559AAE6ACFAE49AEEF4F52E28C869222C1301D041E7A0BC1B608 +1BF728EF9E98F3A12EB2714E7F16B14E055FE1FA0EEFB058860ACADEDA9D0E4C +42E3C6F1E4869471BFAA3760175F3FBD842755A9D7847EBF605F18293B42F557 +FBE2715002669091BB033E1AAD657532F34F7C66E4F04D63ABB07E6CB9D9AEAE +78EDE8B79DD9BC87A1FF445EAA05B5572BB880E69F4DE1F82D7F0E9980AB0C18 +22C448B0B1722D3CC33C56FF287CECB80658B3AF5E7675BE82CEFF3DAD5942EE +A03C955FF979E41E54BCFB5316A9AB8945C403A73180D0961416EC9C92F49811 +4B91BC4C788392994587517718521E416D469F69952149FF7F9224377EBA1065 +4A727BF806A112A7B45B0A1BA1D5A23683960575368D9EAC8C04753BF7465AF7 +95F25C258C63E4FDFFD0B412FD381946AA38C0B961652BCEC30322C47BF4755D +9F91880688AF066E32FFB22E1A52DE741307AD3ED830D6BAA1D1F562919666DC +5E8FD9862AC8600B0AE0BC7FC779252AAC57248744ACC8A8AAFA836BCF09B0DF +9253DFBB1CB77EA8A59D42D1B18FF25E9AED72FA62FEC3F126F030F5D7DED9C3 +CF60FE890BA4A48E39E687BFFAEAB96AE542A6387F6624486037C8924002A511 +BEE5FBFD780AC1D4BEC3FBC47A930BAD0280D444259528B6C565DE11DE36BB65 +9BADC55C1EDA1A80458E98896D782DFB5C137897419602809F9BF8CA39F00C68 +EFB9E076FB324C2963F23CBFED28B9EF70EAA4E4B903225D1F199A7162AB239A +D92D71C18B1B682D04C6A48926275BCB16D413B2A0E953E1257E0B12D8B717CE +2EC84CFBC046A4338A69F454A469B12118E562B4F56C5FFB3CA5D357513E6FFE +947A564B229C7FD873057D5C7CDF03E958294A1003B37D8DF565A70A00A3734B +0138AE5277D383D10C2BD853EF806D3CCDC47739F0E374A3DF3B63638B949ED6 +4EC25869DC1C0B1F4DBDFFCC97382841D8F10F3635C792139A1EC462FDBA379C +BE0990CA2E70FE73137AFBBF30CA54954D7E7377CC50BDD780DDD4C7FDC77AD2 +F3EB1169F14A0041F18160F43C24FAF556DB5D621709FBC544CE55424F7446D4 +6AC07A51C8CD5161AB0AD5084A96FB35D77F1CA155147DEF8D7A590EA6939514 +D4A226588295CE0007BA8A550895511C8D80BBE5CDFB8A50D249C3BDCA974415 +F5557914A9B805782F399E4078DDB6264F1A49A9A5BA45E284A5196E9828EBA8 +481D357B8D9E6ECA631A6204439FDFACE7D7E6A2392726107CB7D2517CD19A24 +FBE592C119626DB221BBB635B6EB84845C16A9585282E34958B961F4A543AF9D +419B6A9105BF185FC767712D923437BE08A9C0EB92AB6792DBDC671029B6FCA6 +7F717FCE379C0F3B51C6CF042A762ED04898FBB4B0105C3C4ADDDC18C51BAA3B +70A93666669547081D9246732CFF74C83EE90DA17F5B4F8BAF47FE4D81590988 +2858C9B96071341FA0A0D23BDD4947FC9BC2297913CFBD4FD6CA4303AB3179AE +0203F1BD502065F90CE9BEA3B52DAFE4A29446082EA0E6B1D7AF1F31D0AD02CC +9A7FACE2CA86E5FE0F6A425B28A5940ECA306891CECDB3CFC7A5BBC76B5D9E8A +C754379ADE80B4D72CE493010317BF21A0CF4A0A55C1246218839DCA3F4D626D +1F4161D38F54AD5142C1CEE95C61D8BB10FAD4B772F4955777AFDE8AE5A837C2 +A2BBB11D0BF5DA2E63D0B75ED421DBA9C789B281B01846B65DC572BA69591969 +21265DB722AE86BD8CAA3D887C975A617ACEDDFB7AAB341F47532AC0F354A530 +7662C089DA3939588774FFA16FC4A52555DED6D6F51DE718BF5F345C23C90198 +17B77CB8B5D53A5CE7A79F3E286B6A59F3F6178AC8BF15C0A15C1A8A95D03B60 +30EBE53DE328CE085CD9A1D49C69AA299C5B58B24334A546F6E274C1B534DC8F +3289553F560C2F81E413ADB92FA0E7DD1C2F39D5FD268EBA97AB7335ECF28257 +96B4EADB7D0778706CB41C7E9C882760E7670936774A1088FFB2011115FDADB3 +B69EBD5108760762521C25C968C3E282DC3400001AC8FB1EA27FF643E3025950 +1D617BB8BB321281708E496277E11DD3AE0023DA9F25AD06B39C7CF527FED27B +57397E88D3DF70EE4FCCEFC8A0927D6B05517E571B3E70ECC99F3CBA32CCD4DE +B8BF22626B6C94FE65598A88AB90D238461EBD9A098DADEA4091AF1CDD7560EC +8E1B9BC2321686E1759E6B8A270C8CB4A254F7368039602EAEAB86ED21CDED91 +8F2DB9889F46981C494C7EAF5E819B91C129F0740B8002B510014985E5791F59 +B16879CC6521D8E9F1C4C1890AC85A78022BE614BEFF318AB2616F0C3F02405E +BB425D1555472A2642BA7686E431DC3FB8A1688B76660D9957C3FDE8D58109AC +21B1234C9DDF3F0FAF93BCF7B2F88A001F23162E1A13E5E9118D51B485B70A91 +D0CBC39CF44413FD8686D9030782DAB58064F5B987E0402AF5B264B17BD31BD4 +FDF63951BECD73ACA6138854EF35B062D01F33073850D9C09A818828C581241F +A625AB3638081DD0F00F946BE5450D38489CECEA4E66B4D85CC8AE0157E2AEE4 +A22A9313829F24D573101D84CC1784D1CED7DFAD5DD966601370C6CCBB723082 +A86BBAF0A5D867D0D2E3CA16E14E5109A29EF02649C47E12E88B3B397D65CACA +DEB9940B92100744D686066F8250FF30E5F13D81428EE238A2E4E07ACE0F5C38 +7D79D4A336D0D26AF9C2B84088ED8ECDF94A1E3FADB45AFDAB46CAD6FF950B0F +07AA2CDF82374DA76C56D29C80138841EB13F0D02ADD32F88B23E282ECC845F9 +BB9AAECE9CDC644AC2D49577A92307A83A99434F6493156DF25DBF0FCF2EC21E +8C50A312C3D19E0609C0038554CF4FEF3ACEB7A833FD54B06EF0D617C2971C89 +E4C06075B09B84A4F78A82152B9A9C540B1D881313C2C74F20ED064A9606EC2C +B56D7BB4797F1EEF4A9B13579CCF311FA4A4DFA62D80FDB7F535CC6526D1AAE5 +45C008EAF024B48C377522F74D939A475970533E645B1BFA81997549AFF26F67 +2AAE6C2EFA357DB3B525276EF330905688777057F4E4CBF584520A534A8587E5 +5A8360891E75A15205E8ADAC4A4E5A6E27D0C4A7D492216E4BC023AB027F37AF +A8DC7579BA50204D5F45A51460C5BD8A5A7F87668CA6451137F2F59E117BBE28 +5C40820882A5546FA76F0CF49F8A6EC445F0647CC3227C400F56E7E9B84A6975 +E85E243CC1666DBAFF4E07EEAF3AF71BDACB30DAEA792F2B8504CAB071544F01 +5D66243D529C479D276FE22F7E275D9E7FA9C6EECA18716B2F213916E32C1D94 +6E32397B41AC6779543218E506569E3544803BBF9B404A983EBA62A494187B30 +8D3DFA4E1237A2E5E08224A60492C09ADAD8775B7CDB830520829BA164209ACB +BCDEB2D574CEBFB7AE4BE72DF4EB1945FEF2458761AD8DCC0D378AEB7DA002C6 +9C14A665DAAA532B0ABA98D7BFB5A6151FF6703385AF7AE8FD315A492FCCDBCB +B825707F9566B3B4943A3C61C3DEFDC31A843A2D67AB06891F3E110DD8C73D3B +B5E4151B51D9F13905D7D94DB9ABBFCAF35F43B6EEE256B1A80ED6D1739D8D5E +8C767F6F0E8704C5345D028A2A6DAFD9BB7AA048B8B895FE9423A7ACE858BADD +595CB074A128DAFE08FDFFD6BDAC0114159A702FDCBF8013804B0CAEAD7AF38E +FAF086A3248AD4FCA1401A85AE2F72E3E6956DC0996FE8ADB18F89B14A208A15 +13F81AF73D0DB72F78C4DA634ADE3C73756CAE6AF2E149C26316DFD93370BE1A +FB4A79F77A67C07CB0A53C78367F21661D4AFE9E27328E077B522B50FD9AE2E3 +DA087BE481515B5DD7BF894A96A84A6C78874100505B7DDE1D22EFCE8D58B3AB +313AB5495F72E2CA4E6AE22C0CB854302B9990372F1661D9F0A517F90686F248 +C5643008B3D29F7296E5C8FD4049886662EFDD4106E17C879F5D41CE84F87E89 +F6A3117C968B95A35940CC29C43E1E0DEF51C1E46B676301F40D59615C3F73DD +DE37B72FF7105DB84227DA5241583272AB1C3CD97AE11C1EE98FFDB5E5F44844 +8FC41BEA5C54B26341AFF6830D9D0A5A2901B0653D8BD0746838194D240FF753 +E99750D3383373F453723D86BE97B571B8B84D8696089B5CFDD53E6C562A2197 +A8C4FB0CC690C27761A816B441029D3D306245052E0C41B53025D8CB7267CFE3 +C17FDFE348E765326F91AEB700CC49162DF748171214252CBC821493DD01AA20 +417D66DF47EBEFFF3E9BB2B0A2BE7D9B8C68BD570FC2EB0FA54CECC318F04C43 +19598BDE93F2F13DC7847354C99059AB20593EE51E94F9D4E9241869D605AAF4 +9D9B5FD88C3798A039A67993C5EC68B6326B132E647F67EACCA7F7AE7F718D85 +12666E90D7C73EF210E344964A38228B236679A2B18F5E081234CAA2458F8D83 +3F0CA308D19663CB12EB904076EF88E556407C33C9380A6A3D68A9EFE65387C1 +A1BCD2D26DFD2AC0881EC30E81C0A4E76C244A2BD822EE88C4A60B480D107E68 +90E419A1F512E865BA922A7830909BC2611A80931CB2E9344529586726614D94 +3AC5200FB9FF68AD9686506C5EFA8788C0AD0251AFE7F95E84683380CDB421C5 +B1A783B6D5F3A6BD1BC1C14B363DB01C87C0796DCDD5BECF41A1A9F43183CF6B +82C2AE49F0BFDC5DEF7729F2E638EE6EA9E4D059EB9BB1B992AD8C82D501A550 +1BF73CBBFE740179B54E193E84A55DCD61B343C1852780FFB44248FC9426AC94 +AA2B3FE20FBA30F6C4D1E0FF3EDCDD8C0F57CCB50CDB0EFE2E04A8927E239C1D +9B026C7929BB48461D4D695FFC766C8A0E545B1BCC2AA068D1865333108E7985 +2D93F9B00EA0A90939D0D3840D59B6CC0CE2C147B2E1A9A4F14270FE3ACF51D5 +99F7349106165AD627CBBB0ABA01ECC6D3A14C1DC1ED23A9DB9865BB4396C51A +31ECD001EAC94B33C34E29C5611148EF3E55DD61813470B8F3CE32564C749414 +3C93C77EA5A3538A0B5AE3FC4DA32813B06772E0E48E25BB39F3F6FDCC077E86 +F86FA50E18FD19EB2F37311CE87F18F3BC85CE7FD71CA92D5C3264E34E04A2E5 +70C79D99F54D6C6D9D527AE45EBB48411221134587D2253E7C8ED7658EDCA34E +5E768DD14E0200470F73C44D006CE8CB35DE1CA3EC10ADC668B0662A7774C891 +84EC95A31DD872F0728D9F65CA80940080E04630BE4DEC77A2C49E3913C39978 +BF145F8832AF2C4385EBCDB15F9D32C22CBA0CF950877717D6F1591D7C0B8047 +8C9BFCB16AF7124ED83137695F3D69228DB633053208C29E0ABA1B06A7FB3EE7 +5625CB44927E2DA6E038A6E62DEBDA2D96A03177982D8FA33BAAF4426E05F4B7 +9C1748B3FF7691F9888E7FF864A10B9DF761A41E6B5CFAD2BDD7E1C4924AC97B +F4B352705316DD1A58637CC12D71C18A5CA691AB2AA8F171590EC24582B1123E +94D4DC587D8F99E18A711776BF4013C96446BFECFEE4C809EA94B169088024DE +0CBD20199A915AA406F0BD5F3D63D1467C49B4691AEBBB35ED6624F2D7BB74BC +E80FD92B9FD04DD9C2BE9B6FD29EC7EC07FAB447511C61DD299C783BC09AE2A4 +7B3CBCA6A20C6631D06D0B2E2482A50612BB7C29B7E7D0A205EB0E8436702581 +596BC996ABD58CD8D5BAAE4B1478195CAFF98FE0141287296C4EFB8D2E7A8442 +F0A3AA9F9264329982532295A176BA1867EF732BBAC49AF485D9D0F7130F617E +7F7DEEF935874D55A22240F8EDE4F247D5F73481373A392D40A8076BD91079E1 +1CE5998BA13D48D56B49A92B4A18430E316405D2E2E391B496A1934671FF1785 +AF42BA3B2D14B8E04014437FD194455C50289DFBA61B5C377BCBDADA48E82DEE +4E70EF5E9DC03064907BCB8BE4D59DE069FB0C0CB140DA54708E630767313F9F +744594AD8A499CFEF733E640A11FD74E46A749F9C7D18D49251BF85C6EB4668D +67598C31A8F90922FEAEAD4B83B6E7184567DC798E4BA1C4C9B3461A478D63CA +054F13B502DACB674EB49D6BB935E5EC82BF99FDA7D47C581AD7F940DF4FC6FA +6C6D25D647033AC69505F0CAC58DE99087F365531A6283CB89CB644688963C3B +8B2203A94294E58739EF23C7803630A1F9121D62BE1977DE2F41687C8CAF87FE +CBD7AD3B98E0D95C8C6E1A7CCB0E09465AA874DC90A0F5DB2C5E7C130297FD39 +EFE63B0350B5139D09E6864D22C3F1150B29196E40EEF9723E71158B7ECFB8E4 +C426FEDCD439420B7F1C251FADA347C9A2C49738B5A17922E1EA93CA7B125B76 +57449EAA9C1D591CAD327D0E98EF2D44D614EE9ED49DD31ACAC0B956620B6BA5 +5BF6D08CA7541059D5ED2EF00AE2EE95488F5645BF6837D9241C0D3959B7580F +C9ECB2BCF3E65C07D52EC9CFB21C11CD4C883E44C173214C900C44D2E1E43DD1 +CE8DFE3DA93C38B548BC4EC46FF91F30CFB97525E1FD4E77686433B20BABF8D2 +848C1CDF1BCF185CFD7A81D2D4BB826E837E2AF35CFC4F419F698DB0C43E9F9C +B0FB628AC9A3CBE9B1FF4A067016E70333E78B32AB2D89C483834B31F5808FDB +77492E099F1504DABCA5722C7860CDCEDB2DDEB512FFCC7D287F4945FD711F28 +87BC3D36173566B81FC2C1290C717A09697DAC6072408E20926D39270121CE58 +3EF97CE12EDD7F87F2C8CFE36C3C0400869C0D813B71C425343EE0CDF717BDD8 +409D5297D0F8F7FDEB0257C0A391F5635E0DB1116058942FF3E7C94D5F2873A7 +A3B0ADAFC3835AF2BE474E6741319BC6695FB37F59AEE388F81F6E66F910000B +72E6BA7531B4378CEFEEDC79CCF4947BA1703823B5AB4F4AD73D9615C66C489D +99D68E49C9BF765B7FC547BAB9640D51D5A7A2396507AB5A4DFF3D14F52422CD +8FCFEAA06A56C6C7FFCD29C9A7A59DDD2A909A9363FE5F1E9629616D25ED38CB +E754C059E4379318CC491C3B1A90128693AC53F80F8210FAEA7EE638902A7D3C +82B95B3F5AE340EC1B648DBB9FB679D6E80B7F426D8671FE7136D97F51E2D2F3 +C9CE9183E4061CA40091A2A70DBB9ECBB19CE3F65ADD0FB346B54BAB182E2CD0 +EAF4C0F402C25573FB344EA771B297BEB615FCD0595172E84ED2A62FF8962634 +23C19076C2A9ECEED5135994EB397303A9619C76DC55E032DA83FBA441BD484A +59F70A5110A8927F6239A14D4E223E189A5462E4A92EAEFFA4B961A2A32B320F +C2B4E8C1821FA67A655B5042C15E4DE1FB3652B55078DB123573C4E986B19DB0 +1C5131F3DFAB271C30A5476B4A19D8FC922E31879C34BAED94C07A4841B8209C +403369FB8E842610D1EB4662B6171A4465FD0E819964F62EC5B0ADC92F08CF90 +1DE0B410FFBAD16F6D355E8AD72CCF67961EDB6CDA82398021007C2D0462E893 +75EB0710AE4A6CDD15077C9DEFC5774EF4A657734D703CE42174259B58E5277E +0DF26BF59AF8D1A3E7DC12E3C12AA4B67CF35B19962F6950C2020B698D971B35 +82FF84E72F72FBB0C54A112BADBAE6C4CAA358BDE6A705AB59332C3850CA3D25 +C7564499BC1319121CE0D93218210C68080AFF33420E3CB3A48BF9EB66BC07C8 +A79D8CD8E78C200FF7CFA3DAED0B9E87E6141C88B436D8FCBA50AC195FCBB9BC +9512B95FE3A37FFAAB39850FCEBD4D50A243EA416E73F53B4B00F3B6EAE0CA06 +0693AAE0FFD5C119D11E5D13743E28D843B0F2EE315A2ED05A510CE53A2D06A7 +0C076D4B6BC2B6A928553E7F0FD472760167DB486A777259FA74245EE37D0125 +47314DEE4B29E5D22180BDB1BDA7D33406FD340DC3991F50800BDC90F7678EF1 +1064986DDA53A77FBE2EDD38E20C41EF86CD50E8EC167344A3F3B3C3BD83CD80 +87BE64CAB70004E636FCC0B60C1E624A19A63D8B3B27EE2B6FD0FFDC310AC6FD +BC56E92FDE53A26F13B6BEF922905F5F23BB2554D356DBD37D5A8E1ECA63FC9A +5E1A9ED378B01663BC53EAE81244DFC8AE19B1372B866DC3A508F09A4F1FDB12 +88DF0D99F082CC8B6B1D600410710DDD937682D66A4A29D64B2CEE98BDECF885 +E5EAE2A50EDEE1CFAB48CE9A325183A85823C5D718D2E8245436AF96823DA2EA +7DDA7B105FED5B4D542CD5C7B5B761F677311C80989982505F93BCBFBFCBFB90 +7A32B43293A377F91E8E3E785599A60CE7D8D4C7057CA3ED41F50FF063E97D53 +EFCCD9C0453C526332842D456F5161F611FE49354644A1EA6FC444D4F30F24E7 +C9764282150BEB515D424F9755C7599FFE8DC8451475BFC76D13FAF787A63341 +00E35E210846F2140BBCF9773AF5B7D4353E71E5180A5CD24DC2173E300240CA +56A658494DA7DA66111C4FA27A0142CB046BE1327CEC1510E2BBAB735B8C348E +1C549923B2EE4BB4388DC6233196254EB7728585BCDF504F626A45953DE8E44D +A00211B58758A51E9BBB0E50329080ED8E82E4D35FE01F65A6E68F7187B5E188 +61F009FE689F7A5A69051858237E0BB82E6CABB8A86D15 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: TeXMUSIX20-Regular +%!PS-AdobeFont-1.0: TeXMUSIX20-Regular 001.000 +%%CreationDate: 01-07-25 at 04.07 +%%VMusage: 1024 35768 +% Generated by Fontographer 4.1.4 +% converted using TeXtrace 0.45 and modified by T. Uchiyama +% ADL: 701 299 0 +%%EndComments +FontDirectory/TeXMUSIX20-Regular known{/TeXMUSIX20-Regular findfont dup/UniqueID known{dup +/UniqueID get 0 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +20 dict begin +/FontInfo 16 dict dup begin +/version (001.000) readonly def +/FullName (TeXMUSIX20-Regular) readonly def +/FamilyName (TeXMUSIX20) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +/Notice (converted using TeXtrace 0.45 and modified by T. Uchiyama) readonly def +/em 1000 def +/ascent 701 def +/descent 299 def +end readonly def +/FontName /TeXMUSIX20-Regular def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 7 /caron put +dup 71 /G put +dup 73 /I put +readonly def +/PaintType 0 def +/FontType 1 def +/StrokeWidth 0 def +/FontMatrix[0.001 0 0 0.001 0 0]readonly def +%/UniqueID 0 def +/FontBBox{-619 -1659 3200 1660}readonly def +currentdict end +currentfile eexec +D9D66F633B846AB28EDC112EE8CE6C6736001234F4C7DFDC8C8014E32702D436 +0A505E30AFE960AA59313499738A089E6AEAEFDC84AEBA57A1F9AD647CCB7BE5 +B03F5F4993FB2566BC918B0AB23DB4629AC0D00174ECD9F3286839BBEA5DD0D6 +84E25152E241F0D923ADCB347B5635EE25CE26F509B8F400F2C9CFB67D676ACF +9D516193DA983A07AC65A99BDDE6D09C93F522AF18F5462F7C2C3A7CD58FB034 +810D4645AE7525C1BDF2E062C4D0BB1A115E406B09C9014323678B1FF15AC494 +A82AC85A09051539D2EBF8D4910447B1C8875854670342B6D13D727DDBA5C2FD +52AFE2107B72A73D3A8F8B0516B5D141AA315F37523CA19009A6CEAB11C23A80 +20B8C46718DBF2DBEAB3320A596C8992531F6E70A725359BD09EF9FF2C0E58DD +9EE54192A355EDB81FB6E2391CD91A9BBD4E6637ECE7F9DA1603F49FA9AEF3E7 +27075B080A569EF1014B7F2D4C3687FA1336676537B82BF4590F962C967795F7 +BF6CD740C57389AB77A273920959FE657B87F76B9403C9586FE85C957B0BFF7B +26F4AA603883E02139AC15D1360C26E332527461ABDBAA603802CAE75E08F559 +E16B2E623827BEBD40D4661A6B3D10D6C395EECC916F52F99D9D1F19DE5977BB +73C4EFAEB7FD0052E831BE175C945358083BA2C5690E0CF8B386900A4A51F60D +C8E98236B16D54A1D94E88A062E0E3D8397F5CB503F51A4F9918D3A902AC7DB3 +25B30A154EF106BF4CB8A369599B3496537F22C842825F69154DD87E05CF9ADA +B6C94188CB702F53D00BBEC8ACE69CBBFB8C11099395D7BF0D47EB3E41454D13 +AAAC4392E8C0ADCA1E87A6F844D3AD81EDD4CCDD0FBBFCEEE9C70BAC5B4D4861 +E7B9DB2F4DAD612986007DB8CDB3B5384C3C7D77A2609D2255D4098E7A314D80 +1A553DD03007696C9DA22D9E9AD132F09CDC0144E7C1BB169635A24341DE3589 +96D503CB7BC73A81FC12A743C711916CBEEEF61F7273B238B3C0DF1AF4B190B7 +C820DD8F5FDAF73872074E1C95F4A4B7E1B5DED436C03D1020B9FE9F780FF2C5 +920C97B1584B7E0051107EE7789BFAB0B13F32AD2DC01DB5120BFD6B5FA8E386 +EE743D10E6A9E858979543882C19ABB36FE278EAD1304E84DF80E8CF87A994DE +0DAFBB90FDEFE07349EA1C6929C969E589CBF28622D60F85C11F38915A362243 +1044875525E1F4EA3559A0764F61C126D6ECA21CADD273A1978083D5434CFCBD +33AB3DC917F0E67010C48829C2F5B2A0B328C4A93C19511CAE397EA2AD7D02E4 +7B5CF16128C924B567CA0BDF9BB92B6E5C5627D8EF1EB01A110EE6D133012C79 +8B32A46ECC8DD7BBB259EDFCAD4DB4F57A9B003E728A7F8A6523B9AA71E61D62 +6E6164F1A47D627E50216C79CD72914607E998C6979F12150EA659388A335C72 +317116BB737EF06429CFDD1FC82146D5EB330496AD418D1EA61F85048F8628B4 +9AAF2E6834B1807A0EBD629EE680B782012F2E6DF26B76613BE3978CA6005958 +C254B571B95075E030C912E6B5C8B82BC4FAF0B0A83DD58058A762DE0178440F +D8E1EE0AE57432D0EE5DFCF0E5BC5B2FAADA2AFC97C6F4EC57FD7784419DBC50 +F824BA99F093039669EEA1592E54F81EDBE5CAEF48DA0407CBA155463B7752EC +478B7698C0B3529F658AE73D382A70F7CC1678ADD4D05C25EE06D9160B36358F +7DAF4714CD6171A78FB4069EC676A781180EA9B8AD7372C259F83DE2419D606A +707C39344CA1A6BFEB3200CF352C34546766B5726326FF97427E8BACBBF32A58 +6F500934C1B7B8BDF8F98798DE2E7DBE52F1E14A483B69B5D56EDC0E8DBB1ECC +65B37E0C7274B33E8556CFC21FA07110D17170ABAD5F210D3D382F9D252381D9 +D1EBEFF2B63CF3A80291F4D879D20DC2DC4DC89FD6B073EBDD6373894467449F +5D3233283EBB3FCF772F8502DD958987751A74BC531768F894D16A330C4B4DE0 +FAAD81F767E3DC4297A664AB2D66A4480D9D92A78A1F7E908D26DB01BB620557 +8E0375863DB66E3D3CCCA7097938F420A3729EDA88662F90B19ADAB0585D15B5 +BDCFBAC7F164F759DEB4E82E5598A00CA55973756D569C56AEABA08E8CDE58B0 +6C1B7F4EE7491945F49968990F62AABFEE1AE447B6F8BE463E32DE13DC7D4B59 +4E5536B564B0EE3EF1DBE4F1E796A415BE7E9C9568D78353B0A2C2C1147B10E8 +F28584FC54E67F8AC0C131DFEFA3186FE7832C4C485AA946B525A463D37FCBE4 +8EC2B78EFA75B1467C6A2B8AC606E9D4A79FE151927E51ACA879AEEFBE63D9EF +D6A1E6EF83258CA02FEF2CF3A119F3DE26FFB9DD779AC5EA0F48D4946B0B81A1 +600A427825911AE0DB1DEC8E49C9EF73D73415F9C1B5342FFC97C0 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark{restore}if +%%EndFont +%%BeginFont: TeXMUSIXSPX-Regular +%!PS-AdobeFont-1.0: TeXMUSIXSPX-Regular 001.000 +%%CreationDate: 01-07-22 at 22.39 +%%VMusage: 1024 69400 +% Generated by Fontographer 4.1.4 +% converted using TeXtrace 0.45 and modified by T. Uchiyama +% ADL: 502 498 0 +%%EndComments +FontDirectory/TeXMUSIXSPX-Regular known{/TeXMUSIXSPX-Regular findfont dup/UniqueID known{dup +/UniqueID get 0 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +20 dict begin +/FontInfo 16 dict dup begin +/version (001.000) readonly def +/FullName (TeXMUSIXSPX-Regular) readonly def +/FamilyName (TeXMUSIXSPX) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -300.3 def +/UnderlineThickness 150.15 def +/Notice (converted using TeXtrace 0.45 and modified by T. Uchiyama) readonly def +/em 1000 def +/ascent 502 def +/descent 498 def +end readonly def +/FontName /TeXMUSIXSPX-Regular def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 163 /ccaron put +readonly def +/PaintType 0 def +/FontType 1 def +/StrokeWidth 0 def +/FontMatrix[0.001 0 0 0.001 0 0]readonly def +%/UniqueID 0 def +/FontBBox{-810 -5754 9613 5760}readonly def +currentdict end +currentfile eexec +D9D66F633B846AB28EDC112EE8CE6C6736001234F4C7DFDC8C8014E32702D436 +0A505E30AFE960AA59313499738A089E6AEAEFDC84AEBA57A1F9AD647CCB7BE5 +B03F5F4993FB2566BC918B0AB23DB4629AC0D00174ECD9F3286839BBEA5DD0D6 +84E25152E241F0D923ADCB347B5635EE25CE26F509B8F400F2C9CFB67D676ACF +9D516193DA983A07AC65A99BDDE6D09C93F522AF18F5462F7C2C3A7CD58FB034 +810D4645AE7525C1BDF2E062C4D0BB1A115E406B09C9014323678B1FF15AC494 +A82AC85A09051539D2EBF8D4910447B1C8875854670342B6D13D727DDBA5C2FD +52AFE2107B72A73D3A8F8B0516B5D141AA315F37523CA19009A6CEAB11C23A80 +20B8C46718DBF2DBEAB3320A596C8992531F6E70A725359BD09EF9FF2C0E58DD +9EE54192A355EDB81FB6E2391CD91A9BBD4E6637ECE455D5521EFD88CCE1386F +E8D48F5606EBD4D022398AA55DBFD3FAB451145AE45A9253E619BA949342B84F +84BD47EC98CDC296A7E2B4E87EAD0B1A6BD1ACAFA79EF1F4A452EE8A57B40167 +81461C6603C0824B10F8D2F842C6A41B3ECF50F5EE3D2D0291A7037CA41C519E +758E4CF0C26800B402E2390DB84BDE63ED4DCE76E536FD3498D26C0C294B633F +CBC6B23DCFE3398FF0AB8221466C645B943DF5EF81057D1F1EA8859EA97DB16C +F0FA4DEDD2485D24AF441D59298B52565C859B457D0748A5E86B8EDD3E890764 +13026367C68BDF2CBF79A49E48CFC4B516DB1DEAF67DC23E838C438EB6150937 +BFB2ECF6892415AE14817AF3592D8B0173C5CB41F224F9E3302E40E12F6FAF8F +1452239E36DAFE964572A4995036387E93AC6E41812A143B802D395133479ABB +DF095148465533FD237E818F856FFD85515C73C3B6353A0004D9CEC8C95DD5A6 +84547B6F5E170EBFA3FB64626BEBF9362E25526EB6440F799F3D710DBB5880CB +5D80B4B11525BD2B8C3F6F760C82458B5EFCA2692C44857A6A338F84F82E6236 +912F5AE9878F7E4B430627FC4D8D0B79BDFB5EE52618C9DEDC32BBC5D4AAA9E1 +F9F218F54C1F84D48DFFB451A709EEF61D29E39883433D4EAA86956A5DCE4E91 +91AD2AB3528E7F851C85343F64B6AC84761F5ECFBD85744D9FDD6E51C82C8E2F +BE59939CFDECC063CDD43A31E728776D1EB1F691DE9123778D1269290F914A51 +3C1FF6D7D97B664F0FA3F3F01125CCFFE0CE15B5A5C830C04967B33BBE972862 +D1451763CE3C7ED364A11FDACFD1B33CE8220724F563C06D33036DBE7B3453A6 +1F6E5BC371B461BFBBD0B72DC2BC810A98ADCFD9AE70C7A173A7C5AF68D37181 +B97E120BB846A9AF1A141BE13712E2C23CB9EB923F48DC26682D56B58DC8115F +78AAEE692D9BA1CA14EDA80D443A3246E01FC48C888829FB0305413A008D8690 +DC063D60E9ED61FEE0F1C81BB644367A52C126D8EF6F01DF05AB584287830509 +364641DDA5B6931D192A83F571C37590B59609E2438530C262D5E2A364AC32D4 +62D3908DF0E6D02266D5BD5840E7A947A973BBCA55A3A45C7620090FAD36D745 +A7C704D290A40ECE52BB064B213B2695DB705D3A323BACFBBCC08BCCF3E857 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark{restore}if +%%EndFont +TeXDict begin 40258431 52099146 1000 600 600 (sjb291.dvi) +@start /Fa 200[41 3[41 1[41 49[{}3 66.4176 /CMBX8 rf +/Fb 203[67 1[67 50[{}2 119.552 /CMBX12 rf /Fc 182[133 +1[133 63[0 7[{}3 166.044 /TeXMUSIX20-Regular rf /Fd 92[0 +163[{}1 166.044 /TeXMUSIXSPX-Regular rf end +%%EndProlog +%%BeginSetup +%%Feature: *Resolution 600dpi +TeXDict begin +%%BeginPaperSize: Letter +letter +%%EndPaperSize + end +%%EndSetup +%%Page: 1 1 +TeXDict begin 1 0 bop -214 151 a Fd(\243)p -214 277 3288 +4 v -214 318 V -214 360 V -214 401 V -214 443 V -214 +-138 V -214 -97 V -214 -55 V -214 -14 V -214 28 V -214 +443 4 583 v 166 x Fc(I)-214 -15 y(G)-50 355 y Fb(2)-50 +438 y(4)-50 -60 y(2)-50 23 y(4)p 111 439 4 144 v 112 +296 a Fc(\007)p 222 439 V 111 w(\007)p 333 439 4 435 +v 334 5 a(\007)p 111 440 337 20 v 444 439 4 435 v 111 +w(\007)p 555 443 4 583 v 662 296 4 144 v 615 296 a(\007)p +773 296 V 111 w(\007)p 836 170 4 165 v 837 5 a(\007)p +662 171 289 20 v 947 170 4 165 v 111 w(\007)p 1058 443 +4 583 v 1165 296 4 435 v 1118 296 a(\007)p 1276 296 V +111 w(\007)p 1387 5 4 144 v 1340 5 a(\007)p 1165 -120 +335 20 v 1498 5 4 144 v 111 w(\007)p 1561 443 4 583 v +1668 5 4 144 v 170 w(\007)p 1779 5 V 111 w(\007)p 1890 +296 4 435 v 1843 296 a(\007)p 1668 -120 335 20 v 2002 +296 4 435 v 112 w(\007)p 2064 443 4 583 v 2123 149 4 +144 v 2124 5 a(\007)p 2234 149 V 111 w(\007)p 2394 296 +4 165 v 2347 296 a(\007)p 2123 150 383 20 v 2505 296 +4 165 v 111 w(\007)p 2568 443 4 583 v 2626 439 4 435 +v 2627 5 a(\007)p 2737 439 V 111 w(\007)p 2848 439 4 +144 v 2849 296 a(\007)p 2626 440 337 20 v 2960 439 4 +144 v 112 w(\007)p 3071 443 4 583 v 3074 441 a + slur@Dict begin /pss@rega 0 N /psc@rega 0 N /pst@rega 0 N end + 3074 441 +a -214 1044 a Fd(\243)p -214 1171 3288 4 v -214 1212 +V -214 1254 V -214 1295 V -214 1337 V -214 755 V -214 +797 V -214 839 V -214 880 V -214 922 V -214 1337 4 583 +v -141 585 98 4 v -141 678 4 93 v -112 653 a Fa(7)p -47 +678 V -141 681 98 4 v -214 1210 a Fc(I)-214 878 y(G)p +-11 1333 4 144 v -10 1190 a(\007)p 94 1333 V 105 w(\007)p +200 1333 4 435 v 201 899 a(\007)p 201 1303 78 20 v 275 +1333 4 435 v 75 w(\007)p -11 1335 365 20 v 350 1333 4 +435 v 75 w(\007)p 455 1337 4 583 v 560 1190 4 165 v 513 +1190 a(\007)p 666 1190 V 106 w(\007)p 723 1043 4 144 +v 724 899 a(\007)p 724 1013 78 20 v 798 1043 4 144 v +75 w(\007)p 561 1044 315 20 v 873 1043 4 144 v 75 w(\007)p +978 1337 4 583 v 1083 1190 4 435 v 1036 1190 a(\007)p +1189 1190 V 106 w(\007)p 1295 899 4 144 v 1248 899 a(\007)p +1296 805 77 20 v 1369 899 4 144 v 74 w(\007)p 1083 774 +363 20 v 1444 899 4 144 v 75 w(\007)p 1501 1337 4 583 +v 1606 899 4 144 v 162 w(\007)p 1712 899 V 106 w(\007)p +1818 1190 4 435 v 1771 1190 a(\007)p 1819 805 77 20 v +1892 1190 4 435 v 74 w(\007)p 1606 774 363 20 v 1967 +1190 4 435 v 75 w(\007)p 2024 1337 4 583 v 2081 1064 +4 165 v 2082 899 a(\007)p 2187 1064 V 106 w(\007)p 2341 +1190 4 144 v 2294 1190 a(\007)p 2342 1096 77 20 v 2415 +1190 4 144 v 74 w(\007)p 2079 1065 413 20 v 2490 1190 +4 144 v 75 w(\007)p 2548 1337 4 583 v 2604 1333 4 435 +v 2605 899 a(\007)p 2710 1333 V 106 w(\007)p 2815 1333 +4 144 v 2816 1190 a(\007)p 2816 1303 78 20 v 2890 1333 +4 144 v 75 w(\007)p 2604 1335 365 20 v 2965 1333 4 144 +v 75 w(\007)p 3071 1337 4 583 v 3074 1335 a + slur@Dict begin /pss@rega 0 N /psc@rega 0 N /pst@rega 0 N end + 3074 1335 +a -214 1938 a Fd(\243)p -214 2064 3288 4 v -214 2106 +V -214 2147 V -214 2189 V -214 2230 V -214 1649 V -214 +1691 V -214 1732 V -214 1774 V -214 1815 V -214 2231 +4 583 v -141 1479 138 4 v -141 1572 4 93 v -112 1547 +a Fa(13)p -7 1572 V -141 1575 138 4 v -214 2104 a Fc(I)-214 +1772 y(G)p -12 2227 4 144 v -11 2083 a(\007)p 93 2227 +V 105 w(\007)p 94 2197 78 20 v 166 2227 4 144 v 73 w(\007)p +240 2227 4 435 v 241 1793 a(\007)p -12 2228 360 20 v +345 2227 4 435 v 105 w(\007)p 449 2231 4 583 v 553 2083 +4 144 v 506 2083 a(\007)p 657 2083 V 104 w(\007)p 658 +1990 76 20 v 731 2083 4 144 v 74 w(\007)p 757 1957 4 +165 v 758 1793 a(\007)p 553 1958 312 20 v 861 1957 4 +165 v 104 w(\007)p 966 2231 4 583 v 1070 2083 4 435 v +1023 2083 a(\007)p 1174 2083 V 104 w(\007)p 1175 1699 +76 20 v 1248 2083 4 435 v 74 w(\007)p 1322 1793 4 144 +v 1275 1793 a(\007)p 1070 1668 359 20 v 1426 1793 4 144 +v 104 w(\007)p 1483 2231 4 583 v 1587 1793 4 144 v 161 +w(\007)p 1691 1793 V 104 w(\007)p 1692 1699 76 20 v 1765 +1793 4 144 v 74 w(\007)p 1839 2083 4 435 v 1792 2083 +a(\007)p 1587 1668 359 20 v 1943 2083 4 435 v 104 w(\007)p +2000 2231 4 583 v 2055 1937 4 144 v 2056 1793 a(\007)p +2160 1937 V 105 w(\007)p 2161 1907 78 20 v 2234 1937 +4 144 v 74 w(\007)p 2355 2083 4 165 v 2308 2083 a(\007)p +2055 1938 407 20 v 2460 2083 4 165 v 105 w(\007)p 2516 +2231 4 583 v 2572 2227 4 435 v 2573 1793 a(\007)p 2677 +2227 V 105 w(\007)p 2678 2197 78 20 v 2750 2227 4 435 +v 73 w(\007)p 2824 2227 4 144 v 2825 2083 a(\007)p 2572 +2228 360 20 v 2929 2227 4 144 v 105 w(\007)p 3033 2231 +4 583 v 3049 2231 25 583 v 3074 2229 a + slur@Dict begin /pss@rega 0 N /psc@rega 0 N /pst@rega 0 N end + 3074 2229 a eop +end +%%Trailer + +userdict /end-hook known{end-hook}if +%%EOF diff --git a/support/pmx/doc/tremxmpl4.eps b/support/pmx/doc/tremxmpl4.eps new file mode 100644 index 0000000000..cd20d88c79 --- /dev/null +++ b/support/pmx/doc/tremxmpl4.eps @@ -0,0 +1,972 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: dvips(k) 5.993 Copyright 2013 Radical Eye Software +%%Title: tremxmpl4.dvi +%%CreationDate: Thu Jan 23 16:12:47 2020 +%%Pages: 1 +%%PageOrder: Ascend +%%BoundingBox: 45 578 406 747 +%%DocumentFonts: TeXMUSIX20-Regular CMBX12 CMR10 +%%DocumentPaperSizes: Letter +%%EndComments +%DVIPSWebPage: (www.radicaleye.com) +%DVIPSCommandLine: dvips -O0.25in,-0.22in -tletter tremxmpl4 +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2020.01.23:1612 +%%BeginProcSet: tex.pro 0 0 +%! +/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S +N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 +mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0 +0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{ +landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize +mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[ +matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round +exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{ +statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0] +N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin +/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array +/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2 +array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N +df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A +definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get +}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} +B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put +}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ +bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A +mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{ +SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{ +userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X +1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4 +index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N +/dir 0 def/dyy{/dir 0 def}B/dyt{/dir 1 def}B/dty{/dir 2 def}B/dtt{/dir 3 +def}B/p{dir 2 eq{-90 rotate show 90 rotate}{dir 3 eq{-90 rotate show 90 +rotate}{show}ifelse}ifelse}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 +N/Ry 0 N/V{}B/RV/v{/Ry X/Rx X V}B statusdict begin/product where{pop +false[(Display)(NeXT)(LaserWriter 16/600)]{A length product length le{A +length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} +forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{ +BDot}imagemask grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat +{BDot}imagemask grestore}}ifelse B/QV{gsave newpath transform round exch +round exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 +rlineto fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B +/M{S p delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M} +B/g{0 M}B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p +-3 w}B/n{p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{ +0 S rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end + +%%EndProcSet +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def +end + +%%EndProcSet +%%BeginFont: CMR10 +%!PS-AdobeFont-1.0: CMR10 003.002 +%%Title: CMR10 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMR10. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMR10 known{/CMR10 findfont dup/UniqueID known{dup +/UniqueID get 5000793 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMR10 def +/FontBBox {-40 -250 1009 750 }readonly def +/UniqueID 5000793 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMR10.) readonly def +/FullName (CMR10) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 47 /slash put +dup 97 /a put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 113 /q put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 119 /w put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2DB9B8591E5F01442D8 +569672CF86B91C3F79C5DDC97C190EE0082814A5B5A2A5E77C790F087E729079 +24A5AC880DDED58334DD5E8DC6A0B2BD4F04B17334A74BF8FF5D88B7B678A04A +2255C050CB39A389106B0C672A1912AFA86A49EFD02E61E6509E50EE35E67944 +8FC63D91C3D2794B49A0C2993832BC4CDC8F7BD7575AD61BCDF42E2E421AA93E +3FF9E4FAD980256D8B377043A07FC75D6169338028692CCA8CD1FE92FD60AD26 +D57B7519B80A8F8DCE9CEE5CDF720AF268D3C14099498A843D76E3B6C0328F24 +D36EFE7F5C4E5B5C612786200C8DE3A41EE5F1FFAF4097653CFCDC8F4FD32E0B +03EDB3E413283B9EFB0AC33B055617005BC9B0057FD68C52D1B0E67F0C571685 +767F2AA85ADE4E0104A1C777733D5E318A22A9944336E5B98D965E50D31F357A +8B6EA5A0EA98E1B027CE68C2EDB149EDDD04ED74A1B3D206D471A0C11C11449B +DE190BBFEBC08C9E1B7513B43DA3134D6B11A2516E6E86B67F68C970A320D05E +94FEC57FB347606DF89989C33482BD09D011C55AA920319E7B26A205D3D0F004 +22466F09C0482A164CFB27EF6ED2B040ECCC3DCAF345B5A73676F193D43123B7 +72FD6CFC5E37930E61EBD5A6307E4DE70194E6384EC0D79DB6AD86D3B319A31C +8B0589D0FE28241D8ACE280D0530EE99C80723E560BB72AE9D53F4713181F491 +344B06D3027BA4E9E94D4305BE1D817197C54C8FF56CD6964165F6448ECC8A8A +64B48B4F0FD69299A137589E2491A283509B21A3A5772F75B7602A9F60AE559B +07A58436D04222C73EAEA72DE9A5A441F88D27C11F4F91255EFE280E91A4ACAC +1E98A4E5E6C57B9AE86FD218C3CD8F24A4104156A80F13821384E529783C52C8 +78B94AB3A0096090867ED32E8A30980E737922037F75F062BD83BF4F5929BC51 +CC22AEE2DBBAAA001CFFBFF41D258424FAD888FFF1BEAB796A44E3126159E120 +7E4025C676CF94888A1971AEF8B6764B3AF4A92D36FAF6FC56FD049710EE3782 +BC2CD84FE2473F133BE03C1346B875463F126DCAB15C7A9BCC9A727D23611462 +4E8D2BFD2466600285D79518712B8681ABCD69608E6AA9578F7BD771EC36E01A +5A17BC17E375020ECA59B43790ABEB9DF5F4FBBEF807E5699EFEAC563E1ACC5D +EFA336E75DE6D8248E9381BB110884FDC89C2F9A41EBBC9A8A1F98E6A41F68BE +EE30E25CA148C1EFF42DFF8C214A6537AB11F260B8C329A4947B5FC8DC9C5622 +4DF7BF4FBFB00380D47BABB03BC30627AA74103E553F55278F538EDD8C1E64CE +0F1398CA0AB5A86630139B4A7E8FC02804CAFF3830114640AE50D2FDA3B561B5 +C63AD7EE3347804CBB40FB1E77A6C89735DD870351C3A1811591AB493251B904 +314F65791963C0412377C1D02362C5E9655F1C3D4803CD379A8EF24C48218C2E +DF1165840462BF37DDE1B8D5FF09FA2C3B261E2F1A65ECFBE5D4EAD43B52C029 +EEB3948CB8A252CBAF545C8FA1C31E920E23A12DD7222CEF2D2A513BD758EA13 +DA33BF5FBF1D734653EB83DA2D374A5B9A0CE316F24EE375D6DF6BDA49954C2E +DB25A88821193636119D469BA66E5DAA9C92520FD4F84426A4E54273FA469084 +7517817A6EE3E21176D333825E88046F50B3CF6938AF9BA79A2F51398239EB91 +1A2D07F7FCD948427FF62F40FF95E39FE1A1AA8451411563FD5388472251C155 +69BDE9283B41900B21EB1190D06E6B13B7794FED020D2C1BDD205AE77B084BCE +EF628249398B496DE85B406FC2E1939EF00DFC84C07E26CF72EC401BAAE756E5 +7F6673216E7560D1C2A723CB405EE5CA474A07F61B81F8836482F73DC9516D67 +CE0CB770EAD755B6B356198B4B97EBB29C63456953270CCC8D5650C1D006E69D +38DE2DFEAB27DAD50A817F0D645D30AF5B75A7B53CBD3D2B8D87BD0A7E525AF3 +22F7ADDFCE31716914C2318260C2E2B4664893921B68C5A93334A361D94A759C +0D7B146D6FD94F0442D672BDA0F6432E18F3C5DFA37ADA378D95B75F413C9ED1 +BB5C606A3EC7DFB3F796F59B0478C13FD1900381EFE0BB5242D5B5D34D03AF1D +4BDC93EAF8020E26CA23C8B0E7DDEBBC6762A557067A4CE05A524188A8F02E2F +3625DA38DFCF381727887F5646A3995A8A38A5FB1E5D5EBB395FDD0B7C8E71AD +B48EEDB62AB2CE99D121435EFBBFCEEA69AE9ED8238B60CC7288DE33C766CDFE +15B767B4AE2E6CE0965E77272AC9F86023DA620548CFAC85BC751C44218A29C9 +849F1C2DCBDFAD895B54E51A569952ED50F82DC8A19F367E7E44643854EFD6B3 +FCAEB04E55E4661C82D31E2932611748480EF61FB2FBFB0CFB940BEA81AFCD84 +4C6A6332D7A600170E38A8EAFCD4F93DC153C43175434C86BC747348FAC61B76 +1FEC9027C1A193E55C80F1F20B5317AA0A05AAA36AE235F6E49F06E570FEE798 +84857D7552EA92EF3EFAD52DE39C2F8F43C59E3A957B7B926FC95FC4B60186DF +7F3523EE2AB74E294C8C4BCD8B4975E84849E0FBDA6C0B0F24A636DFA578B122 +CF97BC5089E21E9F5298D1C9F30CB8BAFF6A3A11BB4D9A0A5CF2B18D055C44CA +4FD4D8FE1AF3630907DE7E585AA811F9CD11FB2C8FC791851D651009FA5DF20B +3C33FD2FF848A9E3F5652BD294965A332DD3F246C91B0ADA34017FF2451D1394 +F9C3C95AAC6EC8062BE98E8914D51DA6A164AD13938693D446044859D03A949D +F9AC5DF4A000CDA98BB516D762CB9F6D44B5268FD0C26E88BC4A760C0F75A140 +DEBDECA4F511128B7D2805872160C55236F0A0FA7637FF0D4E94AC079CD3C8A7 +D03A5A56F26B0438B577C46011A10532FEBCAD14FBD6032E224F45691A726886 +56F305231EB2FCDF59C8BBFCB5DBD2D093A0E84D62AC93A2312CA69295E937C4 +8DBA1802B85F54B5E7E6D6216A918F911FF705D3B5CF055F1D873B96283A0B53 +59344D910CD396D883F6F7836BA65FAB4393A773A8F6BC298069E5BA38210EED +49C9D920F718E3FCE692527DC7CCE6963BF744F2C91BC5952564196D60574E86 +87A0FAB21F2DB2BD5A51D7FBD8FC19946D24E5A228462C4772F978E650ADCE3B +8D66B9C21279C531CA1C3A8ECE3420BB65837287A7222CC3673A2A5F8BBFDB60 +C719CD073EF9A23675198462C7C87B24CC92D6AEE5C25AC63855CC3281494342 +D28F3D2FDE0C183486769A4FD5B0143193D31FCB2C2A14E487BBD96D0BADBB64 +D1B56021C363A795BF10E2DB448261C363A54A4AC1182B470C457AA82DF3F5D1 +F4B329806141EBD53CAE309319B94133D7EBDC2D0453A905ADD207364371E178 +0A95C2686E3B34C4A978BFC0EE968C39ABA00889BC5149162C2B54483D44FD3B +5CFF41F611C7E03B94945F414560E874D7CF27FFD0630890D7D7EA66CBD15448 +229059E1C436BB33D69552B5367AB5D53591C4678D0C704DD3EA23F5D9E8A7AC +17D003C19E333E726FFFA2961F33C70F429085F7BFE3E2510F59B78F58B19CB4 +01B48E184BAD9020FECCE3AF52048A056981DAEA02AE78197E65855DDB170616 +F54278395D9EA50DC83761AE759F9CDEF9E1948E7002414FC05286ED793E6662 +3347F2A9AF8917493D7305B92CF93E8E9185F70015F5594084298A6C2F9FD3C0 +689F262AC9FEDC9B89577ECDE92F08D3142209FBCE7B5C0A840CC767BCA56C20 +4E4E545E2BE4D21C53855CEE4CD0AB35D1A604C0FFFF77DBAE4289752276559F +A05FEE65F45ECAF44E95E23FAB6052195C7948AF0B1126482D4E02D72BF8AB03 +DE0F1A632F7672AD9DDE70EDC82AA993678A82BEAD0BC2649C4707FD8509810D +364B5C6FE0E10772E95288C622C2F06C634F4DF8C7FD1432BC9310D5F24FEE3F +7AB324863D6DABAA1576E70643CA79EF4D7DF4105093D66CEE0F3B87D2164A7F +26EA05F5C4645B22D3E1BFD2219657712C168FD90DE801FB0F32759E80DEC1E1 +43CEEB19FED12D757205043FC98FEC62D6A8D8B97BC083B4A0E985AF7850D6FD +8716B9957C1C35A0675BC53DF672C425C79F43FDABAEE7D63F092CF271C9A9D7 +C41F40C4189510987887942E60A412B3EEC84C9A6E1AC7D54D528F5604B72C08 +94B7882621A5BF1F325B92FF96B80878CC550D1AE4D8196E41CB1251856609A5 +C4D3BD05A922D0D45E039D9450DEF8490A3E924E41434194910BF60BA1B08BE1 +B41824345627745541A4F1703E956328F6227D11C74946B38CFB096139979E56 +4E723B889B44C6D78673868C89912F8B4F0B4B485F1587A637B630F92E6072D5 +7F3B44EA6FD96BBD4FC28A6C1D90805E3BE3E42A7BC9C880762966C55BC04E01 +204D083AE976FAE6F37C94F27E68F8C0F28D52B17F6C0FD7C9150701FD78F8CE +B8E8DC9260E3974005EB5CA728171F482D765016C94D4ADFE4A42EF42212BC56 +7E4EEEE8B0D2A7856CD4E44F55C0BAB762F92CB8D64C17022D4BF3A47C12F5E6 +279FC23101FEE93753653CE8CEDC3B75C9CCB29BF1D4554C6120DE8EE750FCBB +E38B5D915206974962E320362E59B3F21B3AB1875703191043D03284D4467346 +CFF2F98CEB4845B73ED8E003E0DC94251B73E13A9B51A3F1430BCF6A21EB9B7A +65E17FA411F53BE6432F1506232B8159E008FA257F884A4A01AC53BE91754D78 +BF14A5B0FBFB9C31BF4908355F8A762052968DF526D118708CCB0B7CB5BEE285 +6DAB6CD2E3934178E60BECB11AAB5478623CF6C50C92F8BB5D1A583609028FA7 +B8A53B791BDC9EF76A124F3F7641857E4BEA0837CB36176EC9A522EA7F41B8D3 +63C37D1145367BD300F17B54522A834BBB74DE12BF9EB26ACE6F24A046D58F89 +4D4B7DF74875F1A0C1C9D97BE0849593D7B398EB4B00BEBC8C8D1497B6EF831A +A35380FFB7F1AFA4D888AA52C9482E8B1755CC209905F98F40D95B44D4DCBCB6 +67423D1BC2F3560FF0A8B4F0CAC352A4EE2C1D946E45AAEC8A6AD40303F3382C +DF0756BFA3B1ED64C169E56ED1C760F2FF0E24DC5C9F41306EF8D2628153D30A +5DCB0791126BEFD4947D7EF08301FE015F2B0008DFFCBF9F2D4D859FD43EC7D9 +C5BE237E9BF6665B7B1BEBB362F0C0C3A8D86010B9C97FA741C97C2E0513386C +9C26C235B14DD2A58BFDAC7B5F63DB4DA6D5D37D0098175A9071590E1DF66A3D +B8173A047C29D7D35557F06132CC920B5460B8AFC11D23D09A4E45D089F5EB51 +963FA1A6256E359D485107FD143B2BF21FDE9DA5744BC2615E86C31C89470CF0 +D06C6397D9FCCB316EA9989430240759D2C4945D941F159FC02327F34B042BAB +B5C3A47C78E8C1A6FBCD396B1A51CC4B020B8AD401841EDABACECDB482D6EC5B +72D2BFEB4556720FADD49D07307C8B22ACB7E310CA4151A85C71EEF70E8D15DE +B3B00F26E0E166C14647A65ADA228A3D1C89025BE059306565DB1B1EFC37D358 +8C1EB024254AFD049BA977BD4C2C605050E17940A89D0D4C5D963E792320F5DB +3706682E03D25D9E02487247819551465092CC22B6B56E93F3AB528038FEC3F0 +668F866707A19B0463BE706EC729D2EE1653AAC7E29BD25BFB3241D4792F5152 +ED415B4E7FA92C2EE5A22E27E8B75542C492E56D811C192E95542A6FE0BFE5A5 +69273C2ABED4300D491B92D2AECDD278404CB84B1BB1BD7AFEC858215837D118 +C0E928BE7E07CFEEB51A6D21375B772B8248C994564014015232A0DA4BEA1754 +3274F407FED0837A236371F1A32056240F2015B1E7F4B2CA72C6B58610A66F13 +407CFFBA5E0A2893C1F572D50F51286E9133B5A84239C9493B0574E77D281D01 +11D00683354A000C9700EAFBC1FD104EA19DFCB87470190E7E2CE26E3A6FD0FF +2620B87B82AC8686B6206B530F17E9348BC7D04B948348802CE53A312443DB87 +4DBBA5313A6A2A8DAB8A1CC9A594FF8C299281C0A261C8CB2226B732FBEEDE40 +2C6ACC74A1A61379E2E1CD5548CD908268A32FA83D8504C442EA0E183ADBF7FF +9FD09C037AB03516ECCA93FF048235BD11A25DB07F164512A079C5392AC7F889 +CE96AE5C8D9580BCAFCC087C35E76EED1A671E87C12E3045E15A687134736DF8 +DA984772AFD189D68571A2ED7256F1E204230E41D3D9DD876F938951714A3973 +0CA9310489F8E807C1C7A4E51AEA5BC030610A5D7263FF7E0F9FDE3E5E37A362 +5B919000BD94D978583B942EB79CF2BEAC33FEBC9A67272EB10865BA8FB75FD7 +9D280AB59F91B96C16C982DE848D76D8FA8620DFD7C80B7DEAE7264350D6FB3A +EF04794DA3305844A7CF718F6D1A4A3AFF6826173A076A1372ABFC54ED3AC6C2 +09C9287FC830556CA694E21CA5342ECA7B10C90AFC4783D841D7B1E34FA3DB7A +2B706F3E21B0FBAB23E7257962FC3BC309CEA2C7239A9D6B44CC96825115ABD2 +AF9A2566D2F3382C01569FBDB94C8D664A5DA0F7DC3DD140CA77C743D7BC1420 +324ECF9E4780280EB119885E96A6C619CE3C0C8E1E264E2DEB137E5DC8149786 +486D65667ECF47B1A1E20E9E6E4FC8323E0BC8E61BDD3BCDFC6575C69C03E31A +EFFC290472CBBD049DE3F840AEE37A2486034240F80E75D8A79E0762377DF660 +52B12EAA16D678990B11A9BFBC03C1D4FCDA9FD4FFBB3E88352438102F10B7C5 +9F04C013B6575B5E948FAB58EA691984A0E54E6B9F3F505FFFEF74D06FA1CDF3 +4B8A95904C8A2763AA8AF5B71D00F5DE09DC1CDF87A08B6D181453063E14C12D +B7BB3775A6E2A901636273D9EEB833EA8CF20FD83AE899E28DADE10EEEC20BD7 +BD93085A4B1AC80AC1AE8280C14767F1A487BD066007A0D050317BD081131A14 +6EA0898ED59E46DA7B6254BDCCBC660686E2EDA0E77A705A653733BB5C5497D0 +B130359F866CF293FB6EF0C2AC5BAA2DB0DED045E2DED3A2612D078333260359 +16CF0CCB272D34767EA069E0F0B0D42327A18529D72E890EDA6195C2688438ED +E9ACDBEED41E81CA8EB5E43C2B09CE266EFCA03F2D7FF57F12B06F9E54FCC6A6 +546676F6FFC5B8B7D3F0982B6FF0D21D949309F0C0B175CC1D0976F8C55C6AED +6E821C39041E22D91AB30922F2B2EC2746BC7DAB484991542FBC82D87B487507 +559AB466F73EE23C2D3194DC5CE4C9AE66D3164613AC5CBB3DB501B64DA7C91B +C7ED2EE9027FC0906820B35D4F2CF66C4F9CE4A884B7C07155BCA884ECA5EB3A +ABB83F84DB1F5639599DC7D3F51241AB5D95C3BCB7AB1EC90B4BC989F74FB354 +04B2D7366A34D335A47B8C00C05CB423482BF6C7970A95545424A08AFF9A035B +7F83F52B65A9799CE76E303B85664B624C65E9CA58184C7BE2BB9D9C86A4DE5A +8165EE3DA2E652B5022EE7893896BABD88931DE1D538F615787645DF5ACBBA0B +A8E5B899A37321AA7D4B283AC9234978C2DD81813A1EE5DB6EC170DAC1B6EF02 +94892635B498765C07A38D2E9DB0B7581B11056C28278F89B0E60998379C07EB +C0EAEDC32AA69B8B836F92A61AFD35688315B2C3F860632FC13E4BDFB63214BC +41CC6859EAB3AC3034449213CAB99FA1D216563419CD6D6CE4E1B56F33E6C654 +7AA9DCB5B05FC068DF02AC32408C8010AD004F6CCA9887830927F8CBCD49CDB5 +18CAC1EAFF815FF2F6F527F936948201565003022C6C7390B4E3C2B219FB4F76 +9F12BD25CA7B3B61D1A2F8DFEE795D04D5428B42FB66E0C254AF7B7A10CEF7FD +E5ADA5E217BE24851180E9A1700FBA66C7D2B0D7BFDE4F4EED1D24B821A40947 +5620363657F6D048E651A689822CF815E72FC8AE9D835BE31D1DD8B54C9A717F +4DC319B4B59AE073936EA40B070524C7E71D5A7B64436DA107749746B516E29F +E3BBCB8F8C473E706670E11E5B221716F315FF097CD1841D0069FA69EA1898FF +9F9EC2518C77806A19730C97F54BEAD10B4729E5749A10EDBE644886443D1249 +2C8517DF8D8AE98E2882439FA81903941B363A7D885F93C6DF9E1FD89F2F8CEE +B870C409ED13E78B4C914813B0A01DF8F876EDCC4F384055FD37C575726AD69F +F23D50EC5BEE2FB95A44F2B2E2DD94C933D90BED2C97B53738B4B2ED56EBE617 +BEF17B9DF4F314A37F10FDE34C570D7BE76A496A58242F51E7321380CB042424 +855F4B53071DF5A0DA5A31B8AAF9FB4F4C491625FF8FD008BD4402918043BEDF +77B840B2BE0DAAB4EF904FFEF935954AFB9BD2041241B1BC8519EB642C89E288 +479664226DBB6F1171F9EEBC7E1273D0CABCF6B1BF7F26AF21C21D9B1B916F4F +603DDB68D3614B86566FC91D67AC3F4A4A96E256FA1A3BD35F4465AE4EC64D82 +34BEB4BBDDCEEBD9A89D932E55F14CA2776F927C4FD3E0920790A57DAEA08C5B +169A3E2309DA6BA8684A5D1DEE81415796E13DCF906FCDADB092047831B16841 +B250CD148557D72DD7E683BF122B38E2C4F614E59B395D1D9823D7D5F126D932 +14B50A37FCA7120F8F3A8E42134F1B6B0C248D56F247AA68FB941839F600F61C +14247EFF780BBA3E5198D37CED44DEEC3455048FC451BCDB48DC414AE5293A60 +5A59877D6DFD21EAD729CDB7B378CEDD34262B37A194EDD0BDB24AA42649375B +491DC08F6B03DFEB517B2FC125DA9373AFAA94F4E4BC09510A73E079F4ABDD8F +93529E898B13ABCDE7322323B3A2A02A0BF388E89B4F529A66FA22D38E3EE342 +54475A1989BFB7A119CF95750D5A18BB4FA9CDA30DB6F1AEF8AE8448BBC999C9 +FD0D74DE9A17A3153617F07CACE92977B68FB5A1CFB29FD42494D5D2B9C1ED81 +2F3CCEEC1BC079E837DDBB57C7E351F9925FB96349F8D9786D8E6FF03E9C4C1E +67DB235577B68003BA14073E2702296B284F803259283005D97035874D2B9AFD +4D3F29B4B1E6EDE30DDB9C68348CC174A091791FA74520C8614D4FB1125CBD6F +B9367559D715ED057FDF6DAAC180C7FA5CCEFD0C5878A91B20D4919792C03CA9 +3AFC986C34C08358A3E85F241E3F8F815FCE7C8E07C2A4258E17D65823264049 +3803D47C96A2745580EDC957AC4291730A840A2BADA50A28342A2B7093A3F731 +4F4F656E974389E133C53F89D5DD6407BB98B211697941A927BC72A0956FA78E +2DC624B2C253F76778698BD1510D509244AB0465D4261E3AC31D77C4F755096B +50C9CD8103CFF51490796CF35B02E38BFB36CBF2E6D0D7304344C4523C369946 +C3BAD318835D4707E90A0340BB7B6ABEBE9EF7E7FF54D1784AB514FAC0FDC8DE +B8DE95405811AB2F25F2391855929C2C452295D698C749DF868A962183036CEE +800D650FE2CD2E74C038665ECA680B173A27305874D4AEC967043DBCF9275F02 +7D92A0AC4C098A5DA5939BFA435FE56060110EA1E9FF2BCC9C5E93964FD43199 +8133454CF0A83B9946D6D2235AE3F345BEFA7D935A4FD76D7A9CF080E34D1983 +6FAB58E2C907D4EC63F6431805A40EF837884510B1A8C7CF8F290F034784C81D +9FA6ED8ACCFF15B6ADA1CD0460591326B7A7A5FE7216BCE081EF42F0846374B5 +0FF9F6FB8025D2DBEE17991FF93E7C09B55135397A77ECB051306B93C58A2598 +60E294DF402A6F07B1FD679025022AFFEC2938452C72400B45A1A49F1DA9113A +BA4C4528E9DAB7F86323AE99A1932A49161F10A37FF2A4D56FAF883DB84F209D +76982A6131DE0B316E898A4C039154A90CA72991180F9EEA6E0105B8A4443A37 +3C8DE253233006178B9A6BC69ECF2556E28A2DEFB6371422CDD07263005CD570 +9DC4C9DAC7FB491ACDD3A0CE095427DE50D773723E3DCE57EFB99B8101346CBF +8DB7048568AD276734D04A28CB871097AB4579D1893E600DE58BDEE4BC4575CC +FE9E9AF726419F8750DC71A816B0D51004C77A4369B6A7D01150E5B38FBF7B92 +17339137D3FD9CE162A2ABF274FAE6558CFB8408890ECB590BDF2F0F67ED73B8 +A5D56C84E137099152D6E7D0E9CC6D98AC4BA8FEB255F3E4E53F6CD25B5C822A +258436EB7CEC5BD2E149FD142EC895039F047FE4EAE9A104F63B84043D6D46C4 +BD7442D393B3431CDECCC3C5F700156741524F3B6849F155190D7B100F83DB88 +2945035D366B2ACBF52033A1EE281956136B44C763B2D94549A80ED356C8E735 +FC7E0B435EF4FD5640E6FAD3E2351FB9C4417142CAFA51D5688F745FFB4F9E56 +CDAF10B1ADB7983BF339540A8D723B76B5D29EEE58B4319663BE1BE0F3B85D19 +15F413B78C1C686CAD65DDE0CE08F57484329B50602BAE656C24F850F3CCDF25 +1BD43ED3D6520EC39CF40A1F5B90A8BD1C5076026D659E33793CACC755C9B6B8 +8480A6E644D334438BC9B5C8003F3356AB44A01EC91BEEEE1ABCE3E5328D3F81 +11610DB32C86FF6F9DBF0347BB833B0D91A874F95B68C0CAAAC8FAEBA26263A4 +85DE775F51E4142EB9C98F3EE74B8D1148027A54302E2F24F221982DD1D988D5 +66417E5C380B1B2C67654E0116CD08A59EF71EDCE99543E8C3D09D5ECA608B93 +03F49F586D8F839808711285ED8CEF18A7EF23430F28DB530FFE61BE5B988BDC +4D0A2756030F0BDDC05356642D5BEFFB6185CE33981A6294B15AC6950D17C56A +50C18E51E036260C2CD2EDF579BB1648BD39E1555BD2ADA08CAAC84AB583421E +5C08469D8D97C2901493D1604CB862B72FFA7E7B566BCAAAED470B4E2C609BCA +B47E2BE4D6AB773091F637C28635249EFE888D9D707640BC2319DDAB734A9932 +1F57F6794E4F8C7831D78B5707F95831BF9C8B7AC15AECBFCA3DC5195C2C4AD7 +1C5CA302C70B99717F9EF91A6AFFB1DD780D0F90C353F464EAFB98CEB5C4CF14 +B29BD79D2CA19396CEEB5ACEB048DD2379BAD1DD8C8C6EA162AE5CFF0CDDA4F6 +CB8FBB8BC49B88F02084B5D91D7A871767F244A807198A678EF58EFF3AD805AA +74F655EDBB4FB39703A50A2AE8EB4B0FB04D638A04C43BCA562C9F91ABC2584F +49D54A45AE6D378F5C2B4E313931D7B1A9ECD38E02928D94089E6544907FD666 +21C06EAFBA21CC46BB3207ECB77F12D5E1F1BDC673D822C8AF1B8426EFA3D588 +D0388F4C6201C1CF8827EC041777122CA6199A082E3EC02CD97A18D48F30E056 +CEE265838696F1C374EBAC4EAF1F31FD2889F302A9C5496EDAFD874A8038553D +70B02DA2F49827CCF0F39BE0C94CAF9E0E65A2AE944CDEDB8CB0483DBAE03637 +CC4C30DF26D497C3D66D5E119D5DEED4875C5A6AAE4A8578D52CE0F268EDF068 +6123521F8621E8F287A4A0CCB5A0BE5D0FA620CDBECB86DB797DED1294F82716 +9D7C886CB29E7AA68D3B64900093FAAFEC255B5B146B3CB1BE25453AFBD5B878 +504A44F084A4FF5005A959C34ADF2D9D5AEB2B1483938BB155475A45FC32755B +5CEED304E60FBE05B62DCB58755BE2F2B40817ECD640B52FF6C69244E1F7209F +C8F1F1C9DA0453B564B8FD5D5C6FC917E2A4CFA8FEEAD0D31837702BFD50EC8C +417FAC1D67BE98E348C2215C1207DA6FCBF266295BE92A624BCE6EE9EEF09589 +FEAD49CB6F6CDFBEA8F56A2BCA48DBD42C11E120CBD1E6BE4F06F96167078A9C +B36CDFE0F59EE4CD641767F939AB0F14F17E738DEAE1354F4243B0EC2E85A7FF +90A0EBF3A94791C2EF3F51F7F6555AF4AF8D18D977F95FA25306444914ADD15E +CD70D7D3AF32203F6E03A90ED01E5DCBA2B904BD2850D8670A62F27A4C5BA543 +20D9C40AC94F0B5E9FCA2B699D69BAE91BB28754674191C7F2F090780DAC6D42 +1357EC558DF727530EF6451BA65AAE08165CE5D729DB475A86893C605E4B3FFD +FAD74314725B903C4F818E862EC4465D40D092FC5DF0B7AB1BC8DCE69C7BF463 +857F78DB84B549BBA0939F6C86B508676CE8549886C1052E91E5AAE6C29A0E47 +471765E9307409D6951F4B00F4BB494AFF30B988E064EF6A1A882ABD14E876A3 +22E8186462DAD21CE270D79D8B34E663B6982E97902A0410A61294EA6E6B6969 +EDC4BF764C6EAC51B41CA5A14EEF3F3155B6458DB074BAA59ABC0F39A2B3DA1F +EF055A5E030B49B9BB5CE4759F4E02EBB7880DF534F81AA7C0CABD1FC0CCD848 +2EC70CA6A002213C05E9463E63B4B03FB0D56FFA8366785888F6B6CE55ABCE71 +FF872CD39E8E152828AB8833265C21A589C42AA588A5334F3DB30D92AC573AEA +940810252EF183A8251C58177DCEC752A48C26A4C56E07959804809059867FCB +6160F3BDE7B8E646EC549ABF64402B5F6243AA60B82E1B0B2F7D7107052E9BE8 +54F4CE1EC6071BC8972B6689C32B8CC191BFA74A9160687CCC26F8962AFC4600 +78E8636A5964C7A22899473DF1E8F0C9CD1921EC13E658C9876266903A85C059 +3E8619DF7ACB8FA3BC78009E457C580ACB6D1B68A73F53772C70CFB500DA2667 +BB318CF220975BFA54EFB0024D9F595B4887991B78140EEDD85CA3B23B90C403 +01326C9A12EBCBD3EBBC192B5F8752A2C5232BB664805A6ABBD0BC780A2A236A +4FE5D32D77D2C760F18204A348E20451E51BECD363B4D92DD4E2C0CBEEACD6DA +2B2ED0FD52657E7FD4773C68650E5AE4935AFF6A09AA4B34842A36F9A607A379 +AC1E7A7CD644009CFF69A4D2BC417D49EF6E234F8C6C141962435F47054880F3 +2A3DABACD5610F2ABC876714801160E4BFA86DBCF513B5FDB5A424933DA0073C +4979887868A3A1C65073D6756AA4004625B3B9F3483B9FAF142931D639FCF79E +9E0A0C2F32D70D2219C3E9E77C3F35CD8185DE97F9CE5577A0B912D6982E43F5 +97237FE4EF8577252DBC521A37F20D7AA466D4ADA3344DA152990AE9481760DF +937DDC622CFFA275AB68D60050B85B4925D67F9E955619C0EB8DE8090111461D +36456825760496DAB2BA7BF38A30EBD22BDA92860032C883E19392B15602C09D +140A648E14706904A7543AD23823205986A8CD7C47B5021CCCB514CE1A8F3155 +FEE37F95402BFC2F766E85E48CA855F9DACF0B9562D08F69D8AEB62D32265D57 +F4D29C5FA13275F02997408FC89D1721B1E948E823772F66F4BEBDAFAE843A6F +51371D9B0283161A9927ABCBE36B107166CCAD2F137B547E5AD55582754898EB +D7A82FD08CE8CA5D8E0C4A5E2E39C3B440C3D90A02C07795FF16B63D4FE696B2 +283C6546D38AC08229780424E23B00A858248AC3D1EBDD134720E31DCBE624EA +4A4EE99E7A6F3B57B4101196F16133D5C8540C7582ED8B6AC3624AFC7622660A +EDACBEB94BCA2CBF9EBE2AA1462A92B05E6A63FF24E0BC7585BD29858F65E937 +CDE3BDD17DA258934D6179445E9F7D356A156582E57CA8BC529BFAC7EE620699 +958AB21127EC4A285981D3270DBE59E9DD527B697F1AC809B7CCFEF4BC1C9742 +C3A4A11EB732CB51292AE1D398A439B9D8A5AB59266147B280311042AB99E359 +921A0F74FB5B715A45AE820FC4D4A224CCA7CDD903E14790AC78C0A39A8EE2B3 +EE436AFC2881BCD19E0E4FCBACECA691D7AEEA869AB67CEC7B06FDC19FFC0D89 +949B7382D1BC953A6193F8103086EE12FA45B2328CA75D93B7A27E71BA96D487 +E3BCAE4979888BB4309714303748659C20D646335287E949B2DAB7D052D7E124 +077469758ECC533B7DCECDFA9160BB6DABDC9A9A58D57CC1BF6BC0B1FA562CFF +4DDDF319B5F65B8D761EDF5C091D3770BC1D57AB4D4A213AA8C92AB452041DF4 +FC5A0951F89CC59B67FCA2F420F43CBD846115CF843F9F33FE743A45CC321102 +3A57F5C4F16E9CDE908E8E2CAC593EA28601E0637AA08D1ECEDA6B38DFA83C82 +4917A0FDD378828071EB0A9999BB0DEA95398827F9D6B8BE634950F4BDE68400 +C6706D29DFAB7588E65756AD81AC423F92022AAF3E4023CBD9671AAD2347AAC6 +72C3DB9E230387C5D6A49DFFA9D0F9ACBF231D93002C2D335753F18EA9C3FD04 +D285C4144FC3919C4F8935790AD00E74D802DAD6D829ED9CEA53072E19D1EE8B +C0546E181BD5D069FE2440A882CD78E32059C413067A1D5FA518597669C903B3 +74F55294934F99238A9958D57E36F379A1AF1827888CDB8B0C9615DB99E02694 +92A7016976BAC79761093758989D6345990002BBF6870AA147DB78005854C473 +96C9BE143879F74067B0D56FDF01A2CB4D288AA7DF071E167A1CD29AD9A80EE9 +612A96EE7CD08890DC9446BF6F4D29E4F41451FE548FC7075C626796C6CE881C +7CAE00BFC4C085392A8B231C6EF61C8FB77F160C52364F016D6FADBD03E09CDA +F15FA5117DB4AAF5E9564CE2D6759323D5016A79183BB93968E015930B9502FC +9F56307A23F535DA59D72FB809C7F317469C304080E6119B4BA016787AC98EDC +069A2362AF3B1BD60EDB39FA9866F895B095F45410B22973D8C8886D937511AA +443F8243353C2A00E0B017373C905D003DA455E45F33F7ACC43DEC0F900E751E +E5E739B3C5D9F60C5F37FF30531A7EE8EA22C730A9DD6F587BEB504F101A742A +EC16BE556BA57750B10881E3D1CEE353702536DB57D2069684912074EB84DB6D +FD6FDDE930556A3EE87A2997CB5C1A469A35FD6BE1B64768ADBC161363F664EE +3BA32C078A339340124C69F2CBA78588CE51FADF73F35C553E8744EE0513948E +FFEA5BB759CE3BE8B6FCA6704F6FD98AAD7F958A1F2C546F31A6EF6A95E30AC1 +B26C86D7CD24E2CE5A8528918CA5FEA106E54AF8D5BCA5460F7E952DB226A716 +9A7E1D610E771518873AE5D43118448363425F0F42453C2146E264C311125A3E +EDB45FFFBC8E3CD1001750E615359DCCB9A756D0DA96736AF5A73F4AD5534420 +373F3FAB6E736CA1756D1396EC59075068DE369CA8AA78647205DF05A52E6A88 +ADE7B75DFD13656C2A43DDA34CBEDF2CA6A01D8CFD51552749BD6774C8611A44 +91E1C0736C8B789AE2E290566194E2A44D55CB8A9D1F75C45995D066436341FE +94A15C62F6259EDFE9CD0663F1CB183CEC400717A97E04DA732725C02F6BB460 +825C1E7FE952C244D78B6766458DD4D765997D06AE61E1822D904D1698210AB6 +E3C64E95DCF735CC563F31C2B5C7D36E3E7AC523EF30A03C13602B2EA4F924F7 +F1463B2A3B23C6CAAA5074CFFEF2594FD1DD942109BC3CBD078E760E269B0F51 +02FB36E8A1B006723F21BF0DA3957371E9FAA4C10661730ECB2917BFC673A465 +970BEDF35A65D199FDA714CEDAA1FFFE3AC54333F2FFA773F5E174E7E23F86D8 +77CCF23085F7ED4D852E6C23FFA1A079A9F2DDE7F546BB53778CD9E442E7DF79 +AB022E801DCC718777AED552DA5A0DD78E0BC18F793C5B760EA086E970203990 +F183BDEF296B72B457D9767672CDCE15D0A388A903095B76E39E6C0284849F5C +B3A5FF846843C84731A2D40B072F71F32DEDD2FF723210B357B910FE99E64CBC +61DB759D5087A7CB3B764A75D7EF28A08A6361E4EB0675100EEA6B7C70663F60 +EB615427F82616268866DD513D981BA63F2B8872225803042AE1F59A3EBF1B05 +EB476377BDC907360D944875E8BCB5E7E3B5E7F0D1970B3C375CD133E90814FC +89D68CE3932AB8E16FDD714AC31AC92B87986FCF2AE72A04172B9939E969582E +01AAF7B26D983429D8D3AD019F62CBDAEB6E86A7DC62B8357AF3C66A5AA66DB3 +A4C899470227F2F99C31BAFB8C5748EF85AE8B996ED2E7C22B6C52BA25C75CA0 +8FCE6C32FE0A062207B828C876EF01D0319F1AC1DEEAC1EBC18C7795CB072C88 +7CE030657F81ADA516FCBC81C0D471A61D4931A4AA662FC67493609C0D593F66 +1442F1E5965030DD9644B027C5620A954615B3FB820CBDA2833C9E50D108A802 +E9891578E5988ED7FFBF47A00169AFD649E78DC3FB18C75EAF336E3598F9442A +554BBC5C7C76CC093A22EB7785EF340F60168D358737652EB26013694A9AA621 +9EB3EB10D27EAEF97E0586033A06AEE2AD85DB5E48BBD712F7CC2DD06469557A +316FFCD34106F59781CFA3412936A1932B232433F70B129CC1409EEE3FC52842 +3E1D1B8C9024760369A8A15408AC4B5487CF8D6562250DAB20ED95E5613571B6 +58224FDF02FD4A4B4DC9893D517A4C6E566EEA4891D3D42515FA5B2B5C35FC29 +B78C68BDC4A4FFE2D0208EDA33ACA8DA2E2EC02A7CC96CE9DE972914D98873A5 +F92CB2E48FBB47B6D86B6C6CD52250C316CEA37C6EC415028B5ED3D20057772C +B5F4914E9E296F37B44AA0686C1EDD62B285E0AEAA22CEAFC711DC184E1331FF +00C55C192D0993D3ACB6E5C339E5CC2BB4C1D3DEB1E0DA8C50860D9E8CB66B17 +0A8471BA34DA0D7674BC9E5741582FCACA01B08434C5CD11ED8F5D071D96F9CD +E753822C5A4DECDCB502BAC9CEBA2CF18F8012751E322C8452514977B6230274 +430CB1428A1ABD5B74A864B8B8BB13EAC59482C4C08672AC1C93CE1E4F3ED962 +DC0F89D085DF732E9617D0F7828EDCEB3BA4F6C9EC716B3A11C3C9BD474B87E7 +D2C82F72D5FA3C4EB8B56A9222F1853349E5B0FCD45429F0D29566BBBA5A1235 +AE5BDF5047D7D89A6D181EB9514DF17E02988F3FBB547F10C5A6E8EB78F7D2AE +3CBA45FDFA55570FFF8B4BEB874136AFC86C08C40CB0D19A7EAEDB818D0E9387 +3FB8A168E8385C6537B3616DA73D466B41771CFD6003DA76A6E70A3597DDD349 +8D2799BE3FDF8BD96BB802 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: CMBX12 +%!PS-AdobeFont-1.0: CMBX12 003.002 +%%Title: CMBX12 +%Version: 003.002 +%%CreationDate: Mon Jul 13 16:17:00 2009 +%%Creator: David M. Jones +%Copyright: Copyright (c) 1997, 2009 American Mathematical Society +%Copyright: (<http://www.ams.org>), with Reserved Font Name CMBX12. +% This Font Software is licensed under the SIL Open Font License, Version 1.1. +% This license is in the accompanying file OFL.txt, and is also +% available with a FAQ at: http://scripts.sil.org/OFL. +%%EndComments +FontDirectory/CMBX12 known{/CMBX12 findfont dup/UniqueID known{dup +/UniqueID get 5000769 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +11 dict begin +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0 ]readonly def +/FontName /CMBX12 def +/FontBBox {-53 -251 1139 750 }readonly def +/UniqueID 5000769 def +/PaintType 0 def +/FontInfo 9 dict dup begin +/version (003.002) readonly def +/Notice (Copyright \050c\051 1997, 2009 American Mathematical Society \050<http://www.ams.org>\051, with Reserved Font Name CMBX12.) readonly def +/FullName (CMBX12) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Bold) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +end readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 52 /four put +readonly def +currentdict end +currentfile eexec +D9D66F633B846AB284BCF8B0411B772DE5CE3DD325E55798292D7BD972BD75FA +0E079529AF9C82DF72F64195C9C210DCE34528F540DA1FFD7BEBB9B40787BA93 +51BBFB7CFC5F9152D1E5BB0AD8D016C6CFA4EB41B3C51D091C2D5440E67CFD71 +7C56816B03B901BF4A25A07175380E50A213F877C44778B3C5AADBCC86D6E551 +E6AF364B0BFCAAD22D8D558C5C81A7D425A1629DD5182206742D1D082A12F078 +0FD4F5F6D3129FCFFF1F4A912B0A7DEC8D33A57B5AE0328EF9D57ADDAC543273 +C01924195A181D03F5054A93B71E5065F8D92FE23794D2D43A151FEE81296FBE +0CF37DF6A338C826464BA5198991445EC4BE80971DB687336AE8F74B516E333D +2D8AB74D362C559AAE6ACFAE49AEEF4F52E28C869222C1301D041E7A0BC1B608 +1BF728EF9E98F3A12EB2714E7F16B14E055FE1FA0EEFB058860ACADEDA9D0E4C +42E3C6F1E4869471BFAA3760175F3FBD842755A9D7847EBF605F18293B42F557 +FBE2715002669091BB033E1AAD657532F34F7C66E4F04D63ABB07E6CB9D9AEAE +78EDE8B79DD9BC87A1FF445EAA05B5572BB880E69F4DE1F82D7F0E9980AB0C18 +22C448B0B1722D3CC33C56FF287CECB80658B3AF5E7675BE82CEFF3DAD5942EE +A03C955FF979E41E54BCFB5316A9AB8945C403A73180D0961416EC9C92F49811 +4B91BC4C788392994587517718521E416D469F69952149FF7F9224377EBA1065 +4A727BF806A112A7B45B0A1BA1D5A23683960575368D9EAC8C04753BF7465AF7 +95F25C258C63E4FDFFD0B412FD381946AA38C0B961652BCEC30322C47BF4755D +9F91880688AF066E32FFB22E1A52DE741307AD3ED830D6BAA1D1F562919666DC +5E8FD9862AC8600B0AE0BC7FC779252AAC57248744ACC8A8AAFA836BCF09B0DF +9253DFBB1CB77EA8A59D42D1B18FF25E9AED72FA62FEC3F126F030F5D7DED9C3 +CF60FE890BA4A48E39E687BFFAEAB96AE542A6387F6624486037C8924002A511 +BEE5FBFD780AC1D4BEC3FBC47A930BAD0280D444259528B6C565DE11DE36BB65 +9BADC55C1EDA1A80458E98896D782DFB5C137897419602809F9BF8CA39F00C68 +EFB9E076FB324C2963F23CBFED28B9EF70EAA4E4B903225D1F199A7162AB239A +D92D71C18B1B682D04C6A48926275BCB16D413B2A0E953E1257E0B12D8B717CE +2EC84CFBC046A4338A69F454A469B12118E562B4F56C5FFB3CA5D357513E6FFE +947A564B229C7FD873057D5C7CDF03E958294A1003B37D8DF565A70A00A3734B +0138AE5277D383D10C2BD853EF806D3CCDC47739F0E374A3DF3B63638B949ED6 +4EC25869DC1C0B1F4DBDFFCC97382841D8F10F3635C792139A1EC462FDBA379C +BE0990CA2E70FE73137AFBBF30CA54954D7E7377CC50BDD780DDD4C7FDC77AD2 +F3EB1169F14A0041F18160F43C24FAF556DB5D621709FBC544CE55424F7446D4 +6AC07A51C8CD5161AB0AD5084A96FB35D77F1CA155147DEF8D7A590EA6939514 +D4A226588295CE0007BA8A550895511C8D80BBE5CDFB8A50D249C3BDCA974415 +F5557914A9B805782F399E4078DDB6264F1A49A9A5BA45E284A5196E9828EBA8 +481D357B8D9E6ECA631A6204439FDFACE7D7E6A2392726107CB7D2517CD19A24 +FBE592C119626DB221BBB635B6EB84845C16A9585282E34958B961F4A543AF9D +419B6A9105BF185FC767712D923437BE08A9C0EB92AB6792DBDC671029B6FCA6 +7F717FCE379C0F3B51C6CF042A762ED04898FBB4B0105C3C4ADDDC18C51BAA3B +70A93666669547081D9246732CFF74C83EE90DA17F5B4F8BAF47FE4D81590988 +2858C9B96071341FA0A0D23BDD4947FC9BC2297913CFBD4FD6CA4303AB3179AE +0203F1BD502065F90CE9BEA3B52DAFE4A29446082EA0E6B1D7AF1F31D0AD02CC +9A7FACE2CA86E5FE0F6A425B28A5940ECA306891CECDB3CFC7A5BBC76B5D9E8A +C754379ADE80B4D72CE493010317BF21A0CF4A0A55C1246218839DCA3F4D626D +1F4161D38F54AD5142C1CEE95C61D8BB10FAD4B772F4955777AFDE8AE5A837C2 +A2BBB11D0BF5DA2E63D0B75ED421DBA9C789B281B01846B65DC572BA69591969 +21265DB722AE86BD8CAA3D887C975A617ACEDDFB7AAB341F47532AC0F354A530 +7662C089DA3939588774FFA16FC4A52555DED6D6F51DE718BF5F345C23C90198 +17B77CB8B5D53A5CE7A79F3E286B6A59F3F6178AC8BF15C0A15C1A8A95D03B60 +30EBE53DE328CE085CD9A1D49C69AA299C5B58B24334A546F6E274C1B534DC8F +3289553F560C2F81E413ADB92FA0E7DD1C2F39D5FD268EBA97AB7335ECF28257 +96B4EADB7D0778706CB41C7E9C882760E7670936774A1088FFB2011115FDADB3 +B69EBD5108760762521C25C968C3E282DC3400001AC8FB1EA27FF643E3025950 +1D617BB8BB321281708E496277E11DD3AE0023DA9F25AD06B39C7CF527FED27B +57397E88D3DF70EE4FCCEFC8A0927D6B05517E571B3E70ECC99F3CBA32CCD4DE +B8BF22626B6C94FE65598A88AB90D238461EBD9A098DADEA4091AF1CDD7560EC +8E1B9BC2321686E1759E6B8A270C8CB4A254F7368039602EAEAB86ED21CDED91 +8F2DB9889F46981C494C7EAF5E819B91C129F0740B8002B510014985E5791F59 +B16879CC6521D8E9F1C4C1890AC85A78022BE614BEFF318AB2616F0C3F02405E +BB425D1555472A2642BA7686E431DC3FB8A1688B76660D9957C3FDE8D58109AC +21B1234C9DDF3F0FAF93BCF7B2F88A001F23162E1A13E5E9118D51B485B70A91 +D0CBC39CF44413FD8686D9030782DAB58064F5B987E0402AF5B264B17BD31BD4 +FDF63951BECD73ACA6138854EF35B062D01F33073850D9C09A818828C581241F +A625AB3638081DD0F00F946BE5450D38489CECEA4E66B4D85CC8AE0157E2AEE4 +A22A9313829F24D573101D84CC1784D1CED7DFAD5DD966601370C6CCBB723082 +A86BBAF0A5D867D0D2E3CA16E14E5109A29EF02649C47E12E88B3B397D65CACA +DEB9940B92100744D686066F8250FF30E5F13D81428EE238A2E4E07ACE0F5C38 +7D79D4A336D0D26AF9C2B84088ED8ECDF94A1E3FADB45AFDAB46CAD6FF950B0F +07AA2CDF82374DA76C56D29C80138841EB13F0D02ADD32F88B23E282ECC845F9 +BB9AAECE9CDC644AC2D49577A92307A83A99434F6493156DF25DBF0FCF2EC21E +8C50A312C3D19E0609C0038554CF4FEF3ACEB7A833FD54B06EF0D617C2971C89 +E4C06075B09B84A4F78A82152B9A9C540B1D881313C2C74F20ED064A9606EC2C +B56D7BB4797F1EEF4A9B13579CCF311FA4A4DFA62D80FDB7F535CC6526D1AAE5 +45C008EAF024B48C377522F74D939A475970533E645B1BFA81997549AFF26F67 +2AAE6C2EFA357DB3B525276EF330905688777057F4E4CBF584520A534A8587E5 +5A8360891E75A15205E8ADAC4A4E5A6E27D0C4A7D492216E4BC023AB027F37AF +A8DC7579BA50204D5F45A51460C5BD8A5A7F87668CA6451137F2F59E117BBE28 +5C40820882A5546FA76F0CF49F8A6EC445F0647CC3227C400F56E7E9B84A6975 +E85E243CC1666DBAFF4E07EEAF3AF71BDACB30DAEA792F2B8504CAB071544F01 +5D66243D529C479D276FE22F7E275D9E7FA9C6EECA18716B2F213916E32C1D94 +6E32397B41AC6779543218E506569E3544803BBF9B404A983EBA62A494187B30 +8D3DFA4E1237A2E5E08224A60492C09ADAD8775B7CDB830520829BA164209ACB +BCDEB2D574CEBFB7AE4BE72DF4EB1945FEF2458761AD8DCC0D378AEB7DA002C6 +9C14A665DAAA532B0ABA98D7BFB5A6151FF6703385AF7AE8FD315A492FCCDBCB +B825707F9566B3B4943A3C61C3DEFDC31A843A2D67AB06891F3E110DD8C73D3B +B5E4151B51D9F13905D7D94DB9ABBFCAF35F43B6EEE256B1A80ED6D1739D8D5E +8C767F6F0E8704C5345D028A2A6DAFD9BB7AA048B8B895FE9423A7ACE858BADD +595CB074A128DAFE08FDFFD6BDAC0114159A702FDCBF8013804B0CAEAD7AF38E +FAF086A3248AD4FCA1401A85AE2F72E3E6956DC0996FE8ADB18F89B14A208A15 +13F81AF73D0DB72F78C4DA634ADE3C73756CAE6AF2E149C26316DFD93370BE1A +FB4A79F77A67C07CB0A53C78367F21661D4AFE9E27328E077B522B50FD9AE2E3 +DA087BE481515B5DD7BF894A96A84A6C78874100505B7DDE1D22EFCE8D58B3AB +313AB5495F72E2CA4E6AE22C0CB854302B9990372F1661D9F0A517F90686F248 +C5643008B3D29F7296E5C8FD4049886662EFDD4106E17C879F5D41CE84F87E89 +F6A3117C968B95A35940CC29C43E1E0DEF51C1E46B676301F40D59615C3F73DD +DE37B72FF7105DB84227DA5241583272AB1C3CD97AE11C1EE98FFDB5E5F44844 +8FC41BEA5C54B26341AFF6830D9D0A5A2901B0653D8BD0746838194D240FF753 +E99750D3383373F453723D86BE97B571B8B84D8696089B5CFDD53E6C562A2197 +A8C4FB0CC690C27761A816B441029D3D306245052E0C41B53025D8CB7267CFE3 +C17FDFE348E765326F91AEB700CC49162DF748171214252CBC821493DD01AA20 +417D66DF47EBEFFF3E9BB2B0A2BE7D9B8C68BD570FC2EB0FA54CECC318F04C43 +19598BDE93F2F13DC7847354C99059AB20593EE51E94F9D4E9241869D605AAF4 +9D9B5FD88C3798A039A67993C5EC68B6326B132E647F67EACCA7F7AE7F718D85 +12666E90D7C73EF210E344964A38228B236679A2B18F5E081234CAA2458F8D83 +3F0CA308D19663CB12EB904076EF88E556407C33C9380A6A3D68A9EFE65387C1 +A1BCD2D26DFD2AC0881EC30E81C0A4E76C244A2BD822EE88C4A60B480D107E68 +90E419A1F512E865BA922A7830909BC2611A80931CB2E9344529586726614D94 +3AC5200FB9FF68AD9686506C5EFA8788C0AD0251AFE7F95E84683380CDB421C5 +B1A783B6D5F3A6BD1BC1C14B363DB01C87C0796DCDD5BECF41A1A9F43183CF6B +82C2AE49F0BFDC5DEF7729F2E638EE6EA9E4D059EB9BB1B992AD8C82D501A550 +1BF73CBBFE740179B54E193E84A55DCD61B343C1852780FFB44248FC9426AC94 +AA2B3FE20FBA30F6C4D1E0FF3EDCDD8C0F57CCB50CDB0EFE2E04A8927E239C1D +9B026C7929BB48461D4D695FFC766C8A0E545B1BCC2AA068D1865333108E7985 +2D93F9B00EA0A90939D0D3840D59B6CC0CE2C147B2E1A9A4F14270FE3ACF51D5 +99F7349106165AD627CBBB0ABA01ECC6D3A14C1DC1ED23A9DB9865BB4396C51A +31ECD001EAC94B33C34E29C5611148EF3E55DD61813470B8F3CE32564C749414 +3C93C77EA5A3538A0B5AE3FC4DA32813B06772E0E48E25BB39F3F6FDCC077E86 +F86FA50E18FD19EB2F37311CE87F18F3BC85CE7FD71CA92D5C3264E34E04A2E5 +70C79D99F54D6C6D9D527AE45EBB48411221134587D2253E7C8ED7658EDCA34E +5E768DD14E0200470F73C44D006CE8CB35DE1CA3EC10ADC668B0662A7774C891 +84EC95A31DD872F0728D9F65CA80940080E04630BE4DEC77A2C49E3913C39978 +BF145F8832AF2C4385EBCDB15F9D32C22CBA0CF950877717D6F1591D7C0B8047 +8C9BFCB16AF7124ED83137695F3D69228DB633053208C29E0ABA1B06A7FB3EE7 +5625CB44927E2DA6E038A6E62DEBDA2D96A03177982D8FA33BAAF4426E05F4B7 +9C1748B3FF7691F9888E7FF864A10B9DF761A41E6B5CFAD2BDD7E1C4924AC97B +F4B352705316DD1A58637CC12D71C18A5CA691AB2AA8F171590EC24582B1123E +94D4DC587D8F99E18A711776BF4013C96446BFECFEE4C809EA94B169088024DE +0CBD20199A915AA406F0BD5F3D63D1467C49B4691AEBBB35ED6624F2D7BB74BC +E80FD92B9FD04DD9C2BE9B6FD29EC7EC07FAB447511C61DD299C783BC09AE2A4 +7B3CBCA6A20C6631D06D0B2E2482A50612BB7C29B7E7D0A205EB0E8436702581 +596BC996ABD58CD8D5BAAE4B1478195CAFF98FE0141287296C4EFB8D2E7A8442 +F0A3AA9F9264329982532295A176BA1867EF732BBAC49AF485D9D0F7130F617E +7F7DEEF935874D55A22240F8EDE4F247D5F73481373A392D40A8076BD91079E1 +1CE5998BA13D48D56B49A92B4A18430E316405D2E2E391B496A1934671FF1785 +AF42BA3B2D14B8E04014437FD194455C50289DFBA61B5C377BCBDADA48E82DEE +4E70EF5E9DC03064907BCB8BE4D59DE069FB0C0CB140DA54708E630767313F9F +744594AD8A499CFEF733E640A11FD74E46A749F9C7D18D49251BF85C6EB4668D +67598C31A8F90922FEAEAD4B83B6E7184567DC798E4BA1C4C9B3461A478D63CA +054F13B502DACB674EB49D6BB935E5EC82BF99FDA7D47C581AD7F940DF4FC6FA +6C6D25D647033AC69505F0CAC58DE99087F365531A6283CB89CB644688963C3B +8B2203A94294E58739EF23C7803630A1F9121D62BE1977DE2F41687C8CAF87FE +CBD7AD3B98E0D95C8C6E1A7CCB0E09465AA874DC90A0F5DB2C5E7C130297FD39 +EFE63B0350B5139D09E6864D22C3F1150B29196E40EEF9723E71158B7ECFB8E4 +C426FEDCD439420B7F1C251FADA347C9A2C49738B5A17922E1EA93CA7B125B76 +57449EAA9C1D591CAD327D0E98EF2D44D614EE9ED49DD31ACAC0B956620B6BA5 +5BF6D08CA7541059D5ED2EF00AE2EE95488F5645BF6837D9241C0D3959B7580F +C9ECB2BCF3E65C07D52EC9CFB21C11CD4C883E44C173214C900C44D2E1E43DD1 +CE8DFE3DA93C38B548BC4EC46FF91F30CFB97525E1FD4E77686433B20BABF8D2 +848C1CDF1BCF185CFD7A81D2D4BB826E837E2AF35CFC4F419F698DB0C43E9F9C +B0FB628AC9A3CBE9B1FF4A067016E70333E78B32AB2D89C483834B31F5808FDB +77492E099F1504DABCA5722C7860CDCEDB2DDEB512FFCC7D287F4945FD711F28 +87BC3D36173566B81FC2C1290C717A09697DAC6072408E20926D39270121CE58 +3EF97CE12EDD7F87F2C8CFE36C3C0400869C0D813B71C425343EE0CDF717BDD8 +409D5297D0F8F7FDEB0257C0A391F5635E0DB1116058942FF3E7C94D5F2873A7 +A3B0ADAFC3835AF2BE474E6741319BC6695FB37F59AEE388F81F6E66F910000B +72E6BA7531B4378CEFEEDC79CCF4947BA1703823B5AB4F4AD73D9615C66C489D +99D68E49C9BF765B7FC547BAB9640D51D5A7A2396507AB5A4DFF3D14F52422CD +8FCFEAA06A56C6C7FFCD29C9A7A59DDD2A909A9363FE5F1E9629616D25ED38CB +E754C059E4379318CC491C3B1A90128693AC53F80F8210FAEA7EE638902A7D3C +82B95B3F5AE340EC1B648DBB9FB679D6E80B7F426D8671FE7136D97F51E2D2F3 +C9CE9183E4061CA40091A2A70DBB9ECBB19CE3F65ADD0FB346B54BAB182E2CD0 +EAF4C0F402C25573FB344EA771B297BEB615FCD0595172E84ED2A62FF8962634 +23C19076C2A9ECEED5135994EB397303A9619C76DC55E032DA83FBA441BD484A +59F70A5110A8927F6239A14D4E223E189A5462E4A92EAEFFA4B961A2A32B320F +C2B4E8C1821FA67A655B5042C15E4DE1FB3652B55078DB123573C4E986B19DB0 +1C5131F3DFAB271C30A5476B4A19D8FC922E31879C34BAED94C07A4841B8209C +403369FB8E842610D1EB4662B6171A4465FD0E819964F62EC5B0ADC92F08CF90 +1DE0B410FFBAD16F6D355E8AD72CCF67961EDB6CDA82398021007C2D0462E893 +75EB0710AE4A6CDD15077C9DEFC5774EF4A657734D703CE42174259B58E5277E +0DF26BF59AF8D1A3E7DC12E3C12AA4B67CF35B19962F6950C2020B698D971B35 +82FF84E72F72FBB0C54A112BADBAE6C4CAA358BDE6A705AB59332C3850CA3D25 +C7564499BC1319121CE0D93218210C68080AFF33420E3CB3A48BF9EB66BC07C8 +A79D8CD8E78C200FF7CFA3DAED0B9E87E6141C88B436D8FCBA50AC195FCBB9BC +9512B95FE3A37FFAAB39850FCEBD4D50A243EA416E73F53B4B00F3B6EAE0CA06 +0693AAE0FFD5C119D11E5D13743E28D843B0F2EE315A2ED05A510CE53A2D06A7 +0C076D4B6BC2B6A928553E7F0FD472760167DB486A777259FA74245EE37D0125 +47314DEE4B29E5D22180BDB1BDA7D33406FD340DC3991F50800BDC90F7678EF1 +1064986DDA53A77FBE2EDD38E20C41EF86CD50E8EC167344A3F3B3C3BD83CD80 +87BE64CAB701D25CFC0796C099C07882A4332A5588B9900849925FE82DFEB1B3 +306700778714A8D72AD7F55F8836D0C1E2D6761CC3499C1771035D21CF191A2A +9F424F1AAA20430004FE7917E3A6199B483D1CBABA5ECAF65287B7C389E86AF0 +CD55328B3E14C9688832B25EEAA05B69CE25CA606368FC10F30F6D04E5099566 +0F0497F4676676DDEB198758CBC2742F5F5FA5B904616A4F6DDA098FCA6837C1 +D16539998B5F787C29720DDF8A817E5AE94832178857EF7FB6DA2FA0E8BAA5C4 +62DB63EA840133874605DF90C8D027CEFBC212B9E2480DC7D4337D24F5377529 +CF1F14F3FA398C621ECC8AAB77BD1278DB82447A4B3A0784F91EB8706AD2EDEA +8EAFF674B892ED3B33DDD9BF1A5A8E002DDD34D4172E9B51F4716DDDF3E2 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +{restore}if +%%EndFont +%%BeginFont: TeXMUSIX20-Regular +%!PS-AdobeFont-1.0: TeXMUSIX20-Regular 001.000 +%%CreationDate: 01-07-25 at 04.07 +%%VMusage: 1024 35768 +% Generated by Fontographer 4.1.4 +% converted using TeXtrace 0.45 and modified by T. Uchiyama +% ADL: 701 299 0 +%%EndComments +FontDirectory/TeXMUSIX20-Regular known{/TeXMUSIX20-Regular findfont dup/UniqueID known{dup +/UniqueID get 0 eq exch/FontType get 1 eq and}{pop false}ifelse +{save true}{false}ifelse}{false}ifelse +20 dict begin +/FontInfo 16 dict dup begin +/version (001.000) readonly def +/FullName (TeXMUSIX20-Regular) readonly def +/FamilyName (TeXMUSIX20) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -100 def +/UnderlineThickness 50 def +/Notice (converted using TeXtrace 0.45 and modified by T. Uchiyama) readonly def +/em 1000 def +/ascent 701 def +/descent 299 def +end readonly def +/FontName /TeXMUSIX20-Regular def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /grave put +dup 7 /caron put +dup 8 /breve put +dup 50 /two put +dup 62 /greater put +dup 63 /question put +dup 64 /at put +dup 71 /G put +dup 132 /Dcaron put +dup 137 /Lcaron put +dup 142 /Ohungarumlaut put +dup 143 /Racute put +dup 147 /Scedilla put +dup 148 /Tcaron put +dup 196 /Adieresis put +readonly def +/PaintType 0 def +/FontType 1 def +/StrokeWidth 0 def +/FontMatrix[0.001 0 0 0.001 0 0]readonly def +%/UniqueID 0 def +/FontBBox{-619 -1659 3200 1660}readonly def +currentdict end +currentfile eexec +D9D66F633B846AB28EDC112EE8CE6C6736001234F4C7DFDC8C8014E32702D436 +0A505E30AFE960AA59313499738A089E6AEAEFDC84AEBA57A1F9AD647CCB7BE5 +B03F5F4993FB2566BC918B0AB23DB4629AC0D00174ECD9F3286839BBEA5DD0D6 +84E25152E241F0D923ADCB347B5635EE25CE26F509B8F400F2C9CFB67D676ACF +9D516193DA983A07AC65A99BDDE6D09C93F522AF18F5462F7C2C3A7CD58FB034 +810D4645AE7525C1BDF2E062C4D0BB1A115E406B09C9014323678B1FF15AC494 +A82AC85A09051539D2EBF8D4910447B1C8875854670342B6D13D727DDBA5C2FD +52AFE2107B72A73D3A8F8B0516B5D141AA315F37523CA19009A6CEAB11C23A80 +20B8C46718DBF2DBEAB3320A596C8992531F6E70A725359BD09EF9FF2C0E58DD +9EE54192A355EDB81FB6E2391CD91A9BBD4E6637ECE7F9DA1603F49FA9AEF3E7 +27075B080A569EF1014B7F2D4C3687FA1336676537B82BF4590F962C967795F7 +BF6CD740C57389AB77A273920959FE657B87F76B9403C9586FE85C957B0BFF7B +26F4AA603883E02139AC15D1360C26E332527461ABDBAA603802CAE75E08F559 +E16B2E623827BEBD40D4661A6B3D10D6C395EECC916F52F99D9D1F19DE5977BB +73C4EFAEB7FD0052E831BE175C945358083BA2C5690E0CF8B386900A4A51F60D +C8E98236B16D54A1D94E88A062E0E3D8397F5CB503F51A4F9918D3A902AC7DB3 +25B30A154EF106BF4CB8A369599B3496537F22C842825F69154DD87E05CF9ADA +B6C94188CB702F53D00BBEC8ACE69CBBFB8C11099395D7BF0D47EB3E41454D13 +AAAC4392E8C0ADCA1E87A6F844D3AD81EDD4CCDD0FBBFCEEE9C70BAC5B4D4861 +E7B9DB2F4DAD612986007DB8CDB3B5384C3C7D77A2609D2255D4098E7A314D80 +1A553DD03007696C9DA22D9E9AD132F09CDC0144E7C1BB169635A24341DE3589 +96D503CB7BC73A81FC12A743C711916CBEEEF61F7273B238B3C0DF1AF4B190B7 +C820DD8F5FDAF73872074E1C95F4A4B7E1B5DED436C03D1020B9FE9F780FF2C5 +920C97B1584B7E0051107EE7789BFAB0B13F32AD2DC01DB5120BFD6B5FA8E386 +EE743D10E6A9E858979543882C19ABB36FE278EAD1304E84DF80E8CF87A994DE +0DAFBB95D391F35C8E312D1D85D21F65EC814C7A4E15D034D9F6EAFEA8697AC7 +18C065A32EF7393D5EA0A0A1910348C683507572C4EF09A3879385A9055D07BE +DF7DF76E709173D893BF15C3BEDE13E98CAC3B558464896E706D9DA2C2E427F8 +BB46F767E7C2DCC7AFA57B2261E3B4B77FF536077142568FCF854F6CD0AA2490 +6F60E10477ADF31469FCC61F2996FEA16931CC25BB0C4EE70CAB7CD0E1694597 +7CF7FFCA2E0F91E203D0F0E1063DC1E35790F64B33FCD10C4E1A8D7198EB1595 +8C98B634DC773FA0C6319B6C61747FE81F28BFA16DA0FA70684F64B94C7E5F96 +A49F076C0C62981CCF3C97EA36EB5128796E46CB0AF47EBABF3371814C699A52 +42A6269BC520E108F4CCCE71F6C94548B08649B5272791B118E05E6BF3241193 +F6FD1FE927709EE5DFCCA5CE89A74C4A4F6DC13CF002AA597C532DD7C0CC273D +4935FB1315D9EBBFC89DE29080C0AC38FC238208E2CB9B8C564D794FDAA23AC4 +FA5366E2B5E60844067070494551C880665E8C5975AA902C9C8F599493D79296 +72EAC804E83F04F9397811C3DCA6F6ED7B6C192C157CA7E3861EF7E3BBECAC86 +36869747A8973B9FF766C48EF90CB4718568140CBEB62BF9146BF03DB79F147B +A8DB97795AA6AC93836B51EC6305E153F94B7B126193917240ECA0FB6E2ED351 +855CA26732C374BFEF6F3E76F924931C0A541A75778D25A8AA8866193B8CC374 +7EA02973E078BD26167522FD825BE43D0571AB84233E89570472CA8F63717D9C +C9EF12E4FFDB96DC6030A9621D47CAD9FF7839F27536BDFB8C7B86F6F9C83FCC +9C7EBBCEBB88C29AED0C9F91E3F34D8BF8CB228392755572E4DDAE3F2878DB94 +9281A8093A41909E7289AE46B7E03439AF11892C85DDB0DFB1FFD40AA222D25A +DDF1928CBB888F0C20240E9E8358C3109D227EA1DC398C1015B135582508844D +7CE0FE9BF7C50360F65D51CF02ABB27BB712EBE9B62757302393F87677529A0D +EC03CB1A41BBCA9528513945C0CA86B2748153FF784ECD49E98303AEDE5A6C48 +06CDA5D387964465D355B8705F65BED45E43E07A78BEC52C0B5CA756E10ED962 +807280F2241A5B322511285341C5B4D0F5FEF23C3682F2179E80BBA95F60FC3A +54EA474CAE96C037AE11F2D0AB38EC2280F4650908F0DDD78DDA83C237AFAA86 +E505F5CF933CD72BF3E423E65E5A3C3506E063B178116DAFC867507BAF6D903D +C2E2EF39EB10A6E5B84D4C84E063137E0A15ABF83C2C2A27FD44668F67843CBC +80A482DEBA35B87D1F7E9E3BA44CC7E112ACFFA2833A2CF10EE6074747E3AFD6 +7D81B95EC4585F9BCEDFE9E2C6DA99C4FD7291B095B472421157C7F282D502D6 +86865E7A1F4DC90E64091EE2EE330525C2B4242175451BBDB7F2743D6CFC0C8F +EE305BAB301056BE04FE6E4413835211BEC90FB61580A5817DA13E7782F126FC +1D0920A671D93294B2759956CF0AE8FD3C81C7B736816B36910C5A0A3B4B17CA +7963D89CF311980A11AADE264D5A3D728A24E598B55319258E404CDA76F61F09 +C8A9EADB68EBDDE492E86062449C494FCC80E0DA6319A6BE57F1959106763A52 +9A33C2BDF0AF6C62C66747EF270EDCFF0E0C4CEE04E96A3D153C32CF19ACA947 +DF6CBA6440DE60562CE5E0D2C4AA9E3574BB5D3E04AFD823C8923E151515FB8E +D1A2F9CDC73B6F3FE5BC8998311194FFD1D432F9EC71EDD674E57C0AB26EF8AC +9F110243CC251AE3C0B29084654C73E10915970F60BA98F915B664C4738046CE +4CDF306D4DB9DE2E031239DBCAF12EB6C77DDEBDFB8D8C9CF4E895A56DDBB321 +4E61CD61F8ED63451E4164A9AA939ADE975C8044C4B8D0D88CC8C44E4B9CC218 +37342CA40584DD196ACEFAB11E4B831217BC528D15A7880976551127E0020F6B +1CC031CFB13EE91C91B3624FC794BA6FB2D914A2F54098770D99675E5EED68BD +394B29D02999AF28FB8BCBF358C149519824AAD9D3F71923C217F6B87D60D24F +435BC63C5A0646344D41B16FE9BDF9BCE630A9F7DE51C5DF31E16DEEAB58D7F8 +D0503C61F11B851B35E00DBD21C85CCC6C44F17C798E1CDCA3486502BD7EB3E0 +EE79734B6E041FFF7546386350F566AD2A72F367E6043789FD68271B170AB36D +88857AD9CF20980B148F6080DB98A12466D2130BA37C1588947145515BD2124B +C01CD2CD28281C172CC1E5F1A308934B95DE6C65C6E96F276FC34D2889EF4987 +7A27B527B1869FAED89A129F5643DAAF0B56EFEB55236F60B38BF8938BD35B88 +CCCE3541FE827DB6B215E47107A1745424928274583A516F5688C3295A611BEC +3ACB24638EF27CD1A2F5E6D87C9D2158A4EBFD9359D46E3C0A1931F77A9DE27E +7C3FD9D0C0217C05F9179560A1AC70F73E4D8F55FFF65E6EA9F6636935E9C24B +5B44E620E893C58DFD4A9C01458254B6FB5077D94F5269B7B7359E3C6EEE09BC +8745C74CC4DF38C1FE2A6F57C5F7B2150A8D4C24823A305E11457B94EF7E60A6 +22388A7FBE92AB2CE376 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark{restore}if +%%EndFont +TeXDict begin 40258431 52099146 1000 600 600 (tremxmpl4.dvi) +@start /Fa 136[60 44 46 32 33 33 44 1[42 46 69 23 2[23 +46 42 25 37 46 37 1[42 49[42 47[{}20 83.022 /CMR10 rf +/Fb 203[67 52[{}1 119.552 /CMBX12 rf /Fc 59[266 47[66 +33 3[133 66 4[133 4[266 60[133 6[0 0 0 11[50 41[0 0 6[0{}15 +166.044 /TeXMUSIX20-Regular rf end +%%EndProlog +%%BeginSetup +%%Feature: *Resolution 600dpi +TeXDict begin +%%BeginPaperSize: Letter +letter +%%EndPaperSize + end +%%EndSetup +%%Page: 1 1 +TeXDict begin 1 0 bop -214 -117 2989 4 v -214 -76 V -214 +-34 V -214 7 V -214 49 V -214 5 a Fc(G)-51 -39 y Fb(4)-51 +44 y(4)166 151 y Fa(whole)27 b(note)g(default)p 214 26 +4 227 v 167 26 a Fc(\010)215 -130 y(\204)261 -132 y(\204)215 +-161 y(\204)261 -163 y(\204)215 -192 y(\204)261 -194 +y(\204)p 525 -15 4 201 v 478 -15 a(\010)p 837 26 4 227 +v 790 26 a(\010)838 -130 y(\204)884 -132 y(\204)838 -161 +y(\204)884 -163 y(\204)838 -192 y(\204)884 -194 y(\204)p +1148 -15 4 201 v 1101 -15 a(\010)p 1412 49 4 168 v 1525 +151 a Fa(whole)h(note)f(fast)p 1574 26 4 196 v 1527 26 +a Fc(\010)1575 -130 y(\204)1621 -132 y(\204)1575 -161 +y(\204)1621 -163 y(\204)p 1885 -15 4 170 v 1838 -15 a(\010)p +2197 26 4 196 v 2150 26 a(\010)2198 -130 y(\204)2244 +-132 y(\204)2198 -161 y(\204)2244 -163 y(\204)p 2508 +-15 4 170 v 2461 -15 a(\010)p 2772 49 4 168 v -214 363 +2989 4 v -214 405 V -214 446 V -214 488 V -214 529 V +-214 486 a(G)58 694 y Fa(dotted)h(half)g(w/)f(mo)n(v)n(ed)g(c)n(hordal) +f(dots)9 528 y Fc(2)108 507 y(\010\000)p 46 571 75 4 +v 59 569 a(\010)108 590 y(\000)p 107 569 4 248 v 60 528 +a(\010)108 548 y(\000)108 393 y(\304)267 401 y(\304)108 +362 y(\304)267 370 y(\304)108 331 y(\304)267 339 y(\304)p +471 571 75 4 v 471 612 V 531 610 4 268 v 484 610 a(\010)484 +590 y(\000)908 528 y(>)p 1256 529 4 168 v 1382 631 a +Fa(half)h(note)h(default)p 1430 507 4 227 v 1383 507 +a Fc(\010)1431 351 y(\204)1513 347 y(\204)1431 320 y(\204)1513 +316 y(\204)1431 289 y(\204)1513 285 y(\204)p 1777 465 +4 203 v 1730 465 a(\010)2077 631 y Fa(half)f(note)h(fast)p +2125 507 4 196 v 2078 507 a Fc(\010)2126 351 y(\204)2208 +347 y(\204)2126 320 y(\204)2208 316 y(\204)p 2472 465 +4 172 v 2425 465 a(\010)p 2772 529 4 168 v -214 807 2989 +4 v -214 849 V -214 890 V -214 932 V -214 973 V -214 +930 a(G)20 1159 y Fa(quarter)20 1076 y(dotted)p 68 951 +4 175 v 21 951 a Fc(\007\000)103 847 y(\211)-127 b(\211)103 +816 y(\211)g(\211)103 785 y(\211)109 784 y(\211)p 275 +910 4 153 v 228 910 a(\007\000)434 972 y(?)603 1159 y +Fa(default)603 1076 y(quarter)p 652 951 4 150 v 605 951 +a Fc(\007)686 868 y(\216)721 863 y(\216)686 837 y(\216)721 +832 y(\216)686 806 y(\216)721 801 y(\216)p 821 910 4 +134 v 774 910 a(\007)942 972 y(>)p 1181 973 4 168 v 1269 +1159 a Fa(fast)1269 1076 y(quarter)p 1317 951 4 131 v +1270 951 a Fc(\007)1352 858 y(\216)1386 853 y(\216)1352 +827 y(\216)1386 821 y(\216)p 1486 910 4 116 v 1439 910 +a(\007)1607 1159 y Fa(eigh)n(th)1607 1076 y(dotted)p +1655 951 4 165 v 1608 951 a Fc(\007\000)1690 854 y(\216)1701 +852 y(\216)1690 822 y(\216)1701 821 y(\216)1656 795 y(\217)1671 +793 y(\217)p 1801 910 4 145 v 1754 910 a(\007\000)1899 +972 y(@)2018 1159 y Fa(default)2018 1076 y(eigh)n(th)p +2067 951 4 165 v 2020 951 a Fc(\007)2101 851 y(\223)2119 +848 y(\223)2101 820 y(\223)2119 817 y(\223)2068 795 y(\224)2121 +785 y(\224)p 2186 910 4 147 v 2139 910 a(\007)2257 972 +y(>)2496 1159 y Fa(fast)2496 1076 y(eigh)n(th)p 2544 +951 4 144 v 2497 951 a Fc(\007)2579 841 y(\223)2597 838 +y(\223)2545 816 y(\224)2599 805 y(\224)p 2663 910 4 127 +v 2616 910 a(\007)p 2734 973 4 168 v 2750 973 25 168 +v eop end +%%Trailer + +userdict /end-hook known{end-hook}if +%%EOF diff --git a/support/pmx/tex/pmx.tex b/support/pmx/tex/pmx.tex index 36fd8d2387..3576f581cf 100644 --- a/support/pmx/tex/pmx.tex +++ b/support/pmx/tex/pmx.tex @@ -4,7 +4,8 @@ %% %% %%%%%%%%%%%%%%%%%%%%%%% \ifx\pmxversion\undefined\else\endinput\fi -\def\pmxversion{2.80}\def\pmxdate{15 Mar 17} +\def\pmxversion{2.94}\def\pmxdate{23 Jan 20} +% 2.94 add def'ns of \hbp, \hbpp % 2.80 add def'n of \slx, real stemlength % 2.73 4 Feb 16 Fix \pmxclefsym to include \smalltreblelowoct % 2.73 Added \pmxlyr command. @@ -765,8 +766,10 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt % 160103 back to 3 args % \def\mbgap{\qsk\hqsk}% +\def\mbrhgt{9}% \def\mbrest#1#2#3{% -\CenterBar{\ccn{9}{\meterfont#1}}{#2}{#3}% +%\CenterBar{\ccn{9}{\meterfont#1}}{#2}{#3}% +\CenterBar{\ccn{\mbrhgt}{\meterfont#1}}{#2}{#3}% \CenterBar{% \ifcase #1% \relax% @@ -850,7 +853,17 @@ depth \h@lf\pcil width \razclef\kern-\h@lf\razclef\kern-\h@lf\pcil\kern-.1pt % \def\lk{\lyrlink}% \def\at#1{\lyrraisehere{#1\internote}}% - +% +% 190526 Items for short line enhancements +% +\let\wbnt\writebarno +\def\nobarno{\gdef\writebarno{\global\let\writebarno\wbnt}} +% +% 200123 Open headed dotted chord notes +% +\def\hbp{\h@symbol\@qbp}% +\def\hbpp{\h@symbol\@qbpp}% +% \catcode`\@=\catcodeat \endinput diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 56cfcdd0d3..36a066748d 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,7 +26,7 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2019 -depend revision/53677 +depend revision/53687 name 00texlive.image category TLCore @@ -27820,7 +27820,7 @@ catalogue-topics diagram-comm name barracuda category Package -revision 53034 +revision 53683 shortdesc Draw barcodes with Lua relocated 1 longdesc The barracuda library is a modular Lua package for drawing @@ -27828,15 +27828,15 @@ longdesc barcode symbols. It provides modules for writing barcodes from longdesc a LuaTeX document. It is also possible to use Barracuda with a longdesc standalone Lua interpreter to draw barcodes in different longdesc graphic formats like SVG. -containersize 25288 -containerchecksum 481c66eef850286f7ac2a6f1b3a114512a63f3729d64d46249858b4fb4c39fde98ee592742cac156e98bf7916eda6a0aac04d7f6cb9fae541638c0b0eb1400e2 -doccontainersize 285156 -doccontainerchecksum 9a7be53893ca7315347dc8a1edf89991f500d4ef9d31d85700c85a096aa2c2fe84b3519d43d07cd53d35336a096d05211045a69f2111e9708b4ddd84f9f57988 -docfiles size=129 +containersize 30052 +containerchecksum 8331d0a9fd3504eef4e759e144bf34682f55c0bbf435aad9f53671083af2a0c766180665348fd6de4668c67b7cbb3690919619b2a0b175b77f76caa95a951328 +doccontainersize 347964 +doccontainerchecksum 8c7be1abea65248e0f34bd9b538aba2018058688a19d31c696ee964049d44046f4f92117b9db8a1056a4b5e45dcc8aec843971886de69214f0dd3368e1f4c3c2 +docfiles size=152 RELOC/doc/luatex/barracuda/INSTALL.txt RELOC/doc/luatex/barracuda/LICENSE.txt + RELOC/doc/luatex/barracuda/PLANNER.txt RELOC/doc/luatex/barracuda/README.md details="Readme" - RELOC/doc/luatex/barracuda/TODO.txt RELOC/doc/luatex/barracuda/doc/barracuda-ga-asm.pdf RELOC/doc/luatex/barracuda/doc/barracuda-ga-asm.tex RELOC/doc/luatex/barracuda/doc/barracuda-manual-tool.tex @@ -27845,6 +27845,7 @@ docfiles size=129 RELOC/doc/luatex/barracuda/doc/image/8006194056290.pdf RELOC/doc/luatex/barracuda/test/test-barracuda-package/01-barracuda-latex-test.pdf RELOC/doc/luatex/barracuda/test/test-barracuda-package/01-barracuda-latex-test.tex + RELOC/doc/luatex/barracuda/test/test-barracuda-package/02-ord_iter-test.tex RELOC/doc/luatex/barracuda/test/test-code128/001-code128-test.lua RELOC/doc/luatex/barracuda/test/test-code128/002-code128-test.pdf RELOC/doc/luatex/barracuda/test/test-code128/002-code128-test.tex @@ -27868,7 +27869,12 @@ docfiles size=129 RELOC/doc/luatex/barracuda/test/test-ean/003-ean-test.pdf RELOC/doc/luatex/barracuda/test/test-ean/003-ean-test.tex RELOC/doc/luatex/barracuda/test/test-ean/004-ean-test.lua + RELOC/doc/luatex/barracuda/test/test-ean/005-isbn-test.pdf + RELOC/doc/luatex/barracuda/test/test-ean/005-isbn-test.tex + RELOC/doc/luatex/barracuda/test/test-ean/006-issn-test.pdf + RELOC/doc/luatex/barracuda/test/test-ean/006-issn-test.tex RELOC/doc/luatex/barracuda/test/test-ean/8006194056290.svg + RELOC/doc/luatex/barracuda/test/test-ean/ars.svg RELOC/doc/luatex/barracuda/test/test-ga-pdfliteral/001-ga-pdfliteral-test.pdf RELOC/doc/luatex/barracuda/test/test-ga-pdfliteral/001-ga-pdfliteral-test.tex RELOC/doc/luatex/barracuda/test/test-ga-svg/001-ga-svg-test.lua @@ -27878,7 +27884,9 @@ docfiles size=129 RELOC/doc/luatex/barracuda/test/test-ga-svg/test-code39.svg RELOC/doc/luatex/barracuda/test/test-i2of5/001-i2of5-test.pdf RELOC/doc/luatex/barracuda/test/test-i2of5/001-i2of5-test.tex -runfiles size=39 + RELOC/doc/luatex/barracuda/test/test-i2of5/002-ITF14-test.pdf + RELOC/doc/luatex/barracuda/test/test-i2of5/002-ITF14-test.tex +runfiles size=47 RELOC/scripts/barracuda/barracuda.lua RELOC/scripts/barracuda/lib-barcode/brcd-barcode.lua RELOC/scripts/barracuda/lib-barcode/brcd-code128.lua @@ -27897,7 +27905,7 @@ catalogue-contact-support https://github.com/robitex/barracuda/issues catalogue-ctan /macros/luatex/generic/barracuda catalogue-license gpl2 catalogue-topics barcode -catalogue-version 0.0.9.1 +catalogue-version 0.0.10 name bartel-chess-fonts category Package @@ -40930,7 +40938,7 @@ catalogue-version 0.2 name bxjscls category Package -revision 52927 +revision 53684 shortdesc Japanese document class collection for all major engines relocated 1 longdesc This package provides an extended version of the Japanese @@ -40939,10 +40947,10 @@ longdesc original version supports only pLaTeX and upLaTeX, the extended longdesc version also supports pdfLaTeX, XeLaTeX and LuaLaTeX, with the longdesc aid of suitable packages that provide capability of Japanese longdesc typesetting. -containersize 31260 -containerchecksum 12a8d551f861d1d5a53c26b98d5afb40e965eb5e26346ac581d9ebfa904e9b978932ba47857cff9c9599683f079c51fc4510816da36d880b0dceda3913ec15a1 -doccontainersize 1824300 -doccontainerchecksum cbbc4785d6e15bf7bbecf11df69e9fe504754a52511c0f6b43fead390937a8183ab9bea17357ed6cc37c2914bab3ae821fb4316b24f782c86f3a32b75f71acd5 +containersize 31388 +containerchecksum 0bbc4f6acd1e2848bc483bd8c2c18237754542a34e1b603133e4adf01d1ac3177c0afb30cf6a92dfb87d432df30780e532796b0c33a2c5a21783a57e72e8eef4 +doccontainersize 1790400 +doccontainerchecksum ecdf8554f1ccd44262017049ce7ebad530aad4174dd3ff918cd17ecc5b83892c923be46aaadafb209f3e5506101b722ce75ee45fd654515d99962500c8cd0cba docfiles size=486 RELOC/doc/latex/bxjscls/LICENSE RELOC/doc/latex/bxjscls/README-ja.md details="Readme (Japanese)" language="ja" @@ -40950,9 +40958,9 @@ docfiles size=486 RELOC/doc/latex/bxjscls/bxjscls-manual.pdf details="User guide (Japanese)" language="ja" RELOC/doc/latex/bxjscls/bxjscls-manual.tex RELOC/doc/latex/bxjscls/bxjscls.pdf details="Package documentation (Japanese)" language="ja" -srccontainersize 78592 -srccontainerchecksum d65fbd59d6dafd4a5da989784a5ca4552619c4591b68cda25a35a5ba24508a1545eea8e6d166c78d048a4f7cfaa2e93cff088d518ad871e1341321af1db0512b -srcfiles size=95 +srccontainersize 78872 +srccontainerchecksum bfaaf9b8e192ac93f1f116ea17003fe5a945a4a75c410750ca9a829ff0e05fe3c4914f0e77eddea381bd25cd189ba42a0b02ac2e015bfa9ff79e593726327bdb +srcfiles size=96 RELOC/source/latex/bxjscls/bxjscls.dtx RELOC/source/latex/bxjscls/bxjscls.ins runfiles size=97 @@ -40972,7 +40980,7 @@ catalogue-contact-repository https://github.com/zr-tex8r catalogue-ctan /language/japanese/BX/bxjscls catalogue-license bsd2 catalogue-topics japanese class -catalogue-version 1.9i +catalogue-version 1.9j name bxnewfont category Package @@ -174720,27 +174728,27 @@ catalogue-version 1.1 name lualibs category Package -revision 52658 +revision 53682 shortdesc Additional Lua functions for LuaTeX macro programmers relocated 1 longdesc Lualibs is a collection of Lua modules useful for general longdesc programming. The bundle is based on lua modules shipped with longdesc ConTeXt, and made available in this bundle for use independent longdesc of ConTeXt. -containersize 120408 -containerchecksum cae5bc0a5381c97aaef489cf4c9fd56a7a11fde78e0b6a3b88f6f6fbace7545420a09d32b96d912550950f1e08c469557d91bdd51d01e662b595bdaf7c02e722 -doccontainersize 87748 -doccontainerchecksum 1d8388cbc80315e570dd06a824c07140bbfda4a8e622a5b3f835260359a3527524ff557838aa8025660a62371e4b418bd5cc502789725c76e200195a00aa7743 +containersize 120980 +containerchecksum bf41a6bca45473d40f927ec019434612947fe79d70671837b2b1ac53cfc727f68e436cd52bf60d12bca5d5dd0bf89e49fbf610107458ab4078b8dfa3bae25940 +doccontainersize 87576 +doccontainerchecksum 3703aa61ceb2fb0cc79a33972e15f1e8d19a2f597eff19b871233422b78dde4cfcba2145cda33c0352cb54a014b7773c3fcee6819b547fb6d91f499f4b464f97 docfiles size=28 RELOC/doc/luatex/lualibs/LICENSE RELOC/doc/luatex/lualibs/NEWS RELOC/doc/luatex/lualibs/README.md details="Readme" RELOC/doc/luatex/lualibs/lualibs.pdf details="Package documentation" -srccontainersize 8580 -srccontainerchecksum 36981f23fdbd6b8e2ca0f8803fe674c2d592b1a5ca2439e28390ead669104c7f0d60a3ea8b74f6822c8f1821097793576c8ec592d66479c8ed5c2a58917c849c +srccontainersize 8572 +srccontainerchecksum 9975b9391ead3221261494bae828b0b2e618cc686da2bf27b6d7ef2d034868a6428fe9cf274a1ae87bcc42ea6c9d898254df93b1a9d0da21b8e6fefaa7b86468 srcfiles size=7 RELOC/source/luatex/lualibs/lualibs.dtx -runfiles size=186 +runfiles size=187 RELOC/tex/luatex/lualibs/lualibs-basic-merged.lua RELOC/tex/luatex/lualibs/lualibs-basic.lua RELOC/tex/luatex/lualibs/lualibs-boolean.lua @@ -174782,7 +174790,7 @@ catalogue-contact-support https://github.com/latex3/lualibs/issues catalogue-ctan /macros/luatex/generic/lualibs catalogue-license gpl2 catalogue-topics lua-supp luatex -catalogue-version 2.69 +catalogue-version 2.70 name luamesh category Package @@ -194147,7 +194155,7 @@ catalogue-version 1.5 name mptopdf category Package -revision 53110 +revision 53687 shortdesc mpost to PDF, native MetaPost graphics inclusion longdesc The mptopdf script does standalone conversion from mpost to longdesc PDF, using the supp-* and syst-* files. They also allow native @@ -194160,10 +194168,10 @@ longdesc found on CTAN in macros/pdftex/graphics. depend plain depend mptopdf.ARCH execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" fmttriggers=plain -containersize 38436 -containerchecksum 47a43cd96bcb5ed1d4cc04b2b16f741313dd803cf77634b3cc88a5ba54d030824e59319d39a5ec933aa39508b8c70914affae9ddea4422dc6b1102fc7892af88 -doccontainersize 13684 -doccontainerchecksum 924a281c0116c686fc45cb6aaaa558c55b4828271b1574195675cc3b3440b373a5befd70ad2d6d3dd0306c65667347e59134dd90f4500ea6b250d001cc851f5c +containersize 38596 +containerchecksum 1c005dda3caf90966782bce15e6f82063c8b87cff0b5458519f78a7e064fc0ec4eadc4aa3644d61770cba92a1157ade059f8baa347868c12741090ab370f70f3 +doccontainersize 13556 +doccontainerchecksum 2ecc946c3a7027e502a468c8fe8366c794b4c1c8c3bb5c1f58a2ef127317f89ba69804de10070844c7fd43ab49b8ee66b0326d882a5aba615a4fca6f7f4fd1f1 docfiles size=6 texmf-dist/doc/context/scripts/mkii/mptopdf.man texmf-dist/doc/man/man1/mptopdf.1 @@ -283657,15 +283665,15 @@ docfiles size=572 name texlive-docindex category TLCore -revision 53663 +revision 53679 shortdesc top-level TeX Live doc.html, etc. longdesc These files are regenerated as needed, which is often, so we longdesc make them a separate package. See the tl-update-auto script longdesc for the process. containersize 388 -containerchecksum 6514fd637b851f150807e85c297efa1fdeb67da2a8a0a87bbf93f82b813eaf3ca615fb8398ec304b50cfe2e7e1bc18e850100cd2b68e68e5dcca6916036156d8 -doccontainersize 158488 -doccontainerchecksum f45f9b659e3f29c0b486f2ef39fd156b979189551aceed805e4b58c25eb8d952b739488dce740be37e1d8f5b0095f4211182c3755f87ae8345b48177cab13ba9 +containerchecksum 4c07132f9c8f2f1e7aad9946c5a369d90c0cc266acc6de5f129773d4c448170c51646325ef644cbeb8a662ede0f33fd84efc087c7a95ec029723fb4bafc7934f +doccontainersize 158468 +doccontainerchecksum f0545dc5590d5c9b46874292c6af708a32f1e2e8e2269140f92ad29382a73b0aa8c3b81df7f9404bd8bf77b55e678754c4a48f1a9570d36b54f76dba6c7a107b docfiles size=311 doc.html @@ -287915,21 +287923,21 @@ catalogue-topics label-ref maths-theorem name thesis-ekf category Package -revision 53332 +revision 53685 shortdesc Thesis class for Eszterhazy Karoly University relocated 1 longdesc This is a class file for theses and dissertations at the longdesc Eszterhazy Karoly University (Eger, Hungary). It is based on longdesc the report class. The documentation is in Hungarian. -containersize 59236 -containerchecksum 3a98c2d2cfff6ddf16db158bdc794b598bf2fb469a7f85bb91027755b9328442bc40ef5fb2b71d0d3c1d7b58c37392b6d3a671533eab4667d98ba84e9f036c96 -doccontainersize 251688 -doccontainerchecksum 0458dabf55d10f00495077eee622a3f58a0b64335830ac7837f8405d662cd26d972cfa9f8e5d6382614035d2668a7acfa69b46a1c110e8c95b55e5ba0a3bf0b2 -docfiles size=63 +containersize 59216 +containerchecksum 2cf781811d1a58885b4f9703d0541da7d629c4f1fdc6fc0c519f266d95fdfdfd7c5dbf5bbb92aed80269292cf7bfed016433a9e75d13836b27a63616bf745ddc +doccontainersize 250060 +doccontainerchecksum 9215773df9ce87c5c397f87d1bb53f44177c301b00a220651c24a7e65c2b4a0ac82b8441d877b51cfa71d264a385a566714bdb8671dc1475411057e80ad0544d +docfiles size=62 RELOC/doc/latex/thesis-ekf/README details="Readme" RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf details="Package documentation" language="hu" -srccontainersize 7476 -srccontainerchecksum 730dcc2275b4eedb5879a68f55952da84c5c35926cd727ab7ef30ee539faf4019d749f38f2e427aab425fb6ee7261006ea451489613a143b33fe0dd580d85c13 +srccontainersize 7440 +srccontainerchecksum 026e80e3fe4ba2511fb9f25f95dddd66a4dd241ec8237badcf8564e4704f9abedbe01c3563c6d696ca5dcbcf9ce27087cc8fe99c063b998df2c694aaa5c164c0 srcfiles size=8 RELOC/source/latex/thesis-ekf/thesis-ekf.dtx RELOC/source/latex/thesis-ekf/thesis-ekf.ins @@ -287944,7 +287952,7 @@ runfiles size=42 catalogue-ctan /macros/latex/contrib/thesis-ekf catalogue-license lppl1.2 catalogue-topics dissertation class hungarian -catalogue-version 3.2 +catalogue-version 3.3 name thesis-gwu category Package diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 4ae9594936..e3a586e711 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -d928819d377f13dc3779f13798265e13 texlive.tlpdb +82f0197bbb5474c10596d884bd73827a texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index d19adedc0c..574b61c29b 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -6bb3baaab07561852fdc33f527b1b71e556f9b0cef5cc78c003c2e77095fe0dc906244f53e5c751b3eba8ec5a1cb94ec5afa386f781e38dbf4ac58ac19e76a10 texlive.tlpdb +8c5861f6ad57ff2f3293037b2a61187fd325e3128bb81698a2b108a01c9023809e956c59a64a5c638367ba69084981d1ef3e164ad082afff93b738388dcf94f1 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index ee14e143d8..ccce4c9e8b 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----- -iQEcBAEBCgAGBQJeOhJ1AAoJEEzhh34ZQ4xwbqcIAJ/xmO0Wt6GrcJy4i5zwI6vm -SlbjGDq1/WNJp+OEbmCqhW3PkQRIfrYDW0Gz9oh4zLI8oD/mtWMe7uQ5S7Wcx9id -GZ7QKMdxhFQjEt2HRZtYCS+dXypyT/QFrdut6rq00ccnSiCrWlfB+iQIaj0ZGl/Q -NabQdN0mgQKryoThIWc0ZfZ9XgywsKEYEBjxEhAwM0eI9FhvjCunaeENaeT5y82i -oDi/NzJkuARudWAqQkYAA6K8+D6rv00c0T0pQlEHmKWsnhlRxsDbBwi7UbVzntWq -ZgN2CECmXprO+VVI13l4pXeJGZ2O3trHJMOxJkXpF7GirqZGR2em1ur2O9GcHEw= -=R28A +iQEcBAEBCgAGBQJeO2PzAAoJEEzhh34ZQ4xwY9oIAK4vQ5IAneE/8ghEtVbp6/OU +a15pAK1U3CHA86To1I0+QdHssbdbKd/rxhnaZu7268cixgRSQBG22Q7JO2M1PBRG +Enqq0rXHjTo5WxON4CErLiOWFwz8Ct0NJo/INeXOx0GRlxk99oxyM3e33YiiCcif +I7mTmJNtMlOyNBQb3ZRFKX0ZkqeO91GQMEFx1f20zMJchwlATMmcj59OCsxlPIN3 +1YoA/LSRB24pEIZnBrneAM0OI3g1yHENKtvB7LWCLpHwfYQZnehHJwF+oWMBVXgf +eMuWc1AJwDugQS2PS6hRyduAez+fd248q+WN1ihSzveKQBEfOndjInnhneoOcSo= +=jqLn -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex c7e3483aa1..9fb62a90f2 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma Binary files differindex abf2d3429a..4c2996a87a 100644 --- a/systems/win32/miktex/tm/packages/files.csv.lzma +++ b/systems/win32/miktex/tm/packages/files.csv.lzma diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma Binary files differindex b9ec5e01c9..909ce02d5e 100644 --- a/systems/win32/miktex/tm/packages/next/files.csv.lzma +++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini index 8ed021dd75..67099cdbbb 100644 --- a/systems/win32/miktex/tm/packages/next/pr.ini +++ b/systems/win32/miktex/tm/packages/next/pr.ini @@ -2,9 +2,9 @@ [repository]
-date=1580937830
+date=1581023793
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=d72d305a42355327ad05c3dfadd6acef
+lstdigest=6c7d9f3730789277074b1de7a62e942d
numpkg=3852
relstate=next
-version=7340
+version=7341
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index a212b09e05..f0899214ab 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -2,9 +2,9 @@ [repository]
-date=1580937093
-lastupd=asymptote barracuda bxjscls circuitikz classics dvips erewhon-math jslectureplanner l3backend l3build l3kernel l3packages miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9
-lstdigest=eb09dcb59cec986a71ed668f8736c298
+date=1581023484
+lastupd=miktex-texify-bin-2.9 miktex-texify-bin-x64-2.9 mptopdf pmhanguljamo sansmathaccent thesis-ekf asymptote barracuda bxjscls circuitikz classics dvips erewhon-math jslectureplanner l3backend l3build l3kernel l3packages miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9
+lstdigest=b677fc544992128de2ea1a7d02c854fc
numpkg=3852
relstate=stable
-version=7340
+version=7341
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index 9b97c16172..ca48e5bc43 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,25 @@ W32TeX (x86 & x64) ChangeLog +[2020/02/05] +(01) cjkzr.tar.xz + Update bxjscls. +(02) latex-dev.tar.xz + Update format files. +(03) pgfcontrib.tar.xz + Update circuitikz. +(04) platex.tar.xz + Update platex. +(05) ptex-ng-w32.tar.xz + Update ptex-ng.exe. +(06) ptex-w32.tar.xz + Update format files. +(07) uptex-w32.tar.xz + Update format files. +(08) web2c-w32.tar.xz + Update texosquery. +(09) win64/ptex-ng-w64.tar.xz + Update ptex-ng.exe. + [2020/02/04] (01) aleph-w32.tar.xz Update format files. @@ -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: -2020-02-06-02-02 +2020-02-07-02-02 |