texlive[74173] branches/branch2024.final/Master/texmf-dist: mp-geom2d
commits+karl at tug.org
commits+karl at tug.org
Thu Feb 20 21:48:55 CET 2025
Revision: 74173
https://tug.org/svn/texlive?view=revision&revision=74173
Author: karl
Date: 2025-02-20 21:48:55 +0100 (Thu, 20 Feb 2025)
Log Message:
-----------
mp-geom2d (branch) (20feb25)
Modified Paths:
--------------
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.tex
branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-c2d.mp
branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-lbl.mp
branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-main.mp
branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d.mp
Added Paths:
-----------
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.1
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.1
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.1
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.2
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.1
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/mpxerr.tex
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.1
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure.mp
branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.1
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,685 @@
+%!PS
+%%BoundingBox: -29 -299 398 299
+%%HiResBoundingBox: -28.84645 -298.13774 397.35031 298.13774
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.11.25:1709
+%%Pages: 1
+%*Font: cmsy7 6.97385 6.97385 30:8
+%*Font: cmmi10 9.96265 9.96265 41:e0880c
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+gsave newpath -28.34645 -297.63774 moveto
+-28.34645 297.63774 lineto
+396.85031 297.63774 lineto
+396.85031 -297.63774 lineto
+ closepath clip
+gsave newpath 198.42516 0 moveto
+198.42516 26.31398 187.97041 51.54706 169.36502 70.15245 curveto
+150.75964 88.75783 125.52657 99.21259 99.21259 99.21259 curveto
+72.89859 99.21259 47.66551 88.75783 29.06013 70.15245 curveto
+10.45474 51.54706 0 26.31398 0 0 curveto
+0 -26.31398 10.45474 -51.54706 29.06013 -70.15245 curveto
+47.66551 -88.75783 72.89859 -99.21259 99.21259 -99.21259 curveto
+125.52657 -99.21259 150.75964 -88.75783 169.36502 -70.15245 curveto
+187.97041 -51.54706 198.42516 -26.31398 198.42516 0 curveto closepath clip
+ 0.8232 0.913 1 setrgbcolor
+newpath 198.42516 0 moveto
+198.42516 26.31398 187.97041 51.54706 169.36502 70.15245 curveto
+150.75964 88.75783 125.52657 99.21259 99.21259 99.21259 curveto
+72.89859 99.21259 47.66551 88.75783 29.06013 70.15245 curveto
+10.45474 51.54706 0 26.31398 0 0 curveto
+0 -26.31398 10.45474 -51.54706 29.06013 -70.15245 curveto
+47.66551 -88.75783 72.89859 -99.21259 99.21259 -99.21259 curveto
+125.52657 -99.21259 150.75964 -88.75783 169.36502 -70.15245 curveto
+187.97041 -51.54706 198.42516 -26.31398 198.42516 0 curveto closepath fill
+grestore
+ 0.116 0.565 1 setrgbcolor 0 1.3 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath 198.42516 0 moveto
+198.42516 26.31398 187.97041 51.54706 169.36502 70.15245 curveto
+150.75964 88.75783 125.52657 99.21259 99.21259 99.21259 curveto
+72.89859 99.21259 47.66551 88.75783 29.06013 70.15245 curveto
+10.45474 51.54706 0 26.31398 0 0 curveto
+0 -26.31398 10.45474 -51.54706 29.06013 -70.15245 curveto
+47.66551 -88.75783 72.89859 -99.21259 99.21259 -99.21259 curveto
+125.52657 -99.21259 150.75964 -88.75783 169.36502 -70.15245 curveto
+187.97041 -51.54706 198.42516 -26.31398 198.42516 0 curveto closepath stroke
+ 1 0.64682 0.64682 setrgbcolor
+newpath 113.3858 0 moveto
+113.3858 15.03656 107.41167 29.45546 96.78001 40.08711 curveto
+86.14836 50.71877 71.72946 56.6929 56.6929 56.6929 curveto
+41.65634 56.6929 27.23744 50.71877 16.60579 40.08711 curveto
+5.97414 29.45546 0 15.03656 0 0 curveto
+0 -15.03656 5.97414 -29.45546 16.60579 -40.08711 curveto
+27.23744 -50.71877 41.65634 -56.6929 56.6929 -56.6929 curveto
+71.72946 -56.6929 86.14836 -50.71877 96.78001 -40.08711 curveto
+107.41167 -29.45546 113.3858 -15.03656 113.3858 0 curveto closepath fill
+ 0.698 0.132 0.132 setrgbcolor
+newpath 113.3858 0 moveto
+113.3858 15.03656 107.41167 29.45546 96.78001 40.08711 curveto
+86.14836 50.71877 71.72946 56.6929 56.6929 56.6929 curveto
+41.65634 56.6929 27.23744 50.71877 16.60579 40.08711 curveto
+5.97414 29.45546 0 15.03656 0 0 curveto
+0 -15.03656 5.97414 -29.45546 16.60579 -40.08711 curveto
+27.23744 -50.71877 41.65634 -56.6929 56.6929 -56.6929 curveto
+71.72946 -56.6929 86.14836 -50.71877 96.78001 -40.08711 curveto
+107.41167 -29.45546 113.3858 -15.03656 113.3858 0 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 198.42516 0 moveto
+198.42516 11.27742 193.94455 22.0916 185.97081 30.06534 curveto
+177.99707 38.03908 167.1829 42.51968 155.90549 42.51968 curveto
+144.62805 42.51968 133.81389 38.03908 125.84015 30.06534 curveto
+117.86641 22.0916 113.3858 11.27742 113.3858 0 curveto
+113.3858 -11.27742 117.86641 -22.0916 125.84015 -30.06534 curveto
+133.81389 -38.03908 144.62805 -42.51968 155.90549 -42.51968 curveto
+167.1829 -42.51968 177.99707 -38.03908 185.97081 -30.06534 curveto
+193.94455 -22.0916 198.42516 -11.27742 198.42516 0 curveto closepath fill
+ 1 0 dtransform exch truncate exch idtransform pop setlinewidth 1 setlinecap
+newpath 198.42516 1984.25156 moveto
+198.42516 -1785.8264 lineto stroke
+ 0.698 0.132 0.132 setrgbcolor
+newpath 347.24402 3472.44023 moveto
+347.24402 -3125.1962 lineto stroke
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+newpath 347.24402 0 moveto
+347.24402 19.7356 339.40308 38.66019 325.44914 52.61455 curveto
+311.49478 66.56848 292.57018 74.40944 272.8346 74.40944 curveto
+253.099 74.40944 234.17441 66.56848 220.22003 52.61455 curveto
+206.2661 38.66019 198.42516 19.7356 198.42516 0 curveto
+198.42516 -19.7356 206.2661 -38.66019 220.22003 -52.61455 curveto
+234.17441 -66.56848 253.099 -74.40944 272.8346 -74.40944 curveto
+292.57018 -74.40944 311.49478 -66.56848 325.44914 -52.61455 curveto
+339.40308 -38.66019 347.24402 -19.7356 347.24402 0 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 7.33922 -28.30795 moveto
+7.33922 -27.89099 7.17355 -27.4909 6.87857 -27.1959 curveto
+6.58357 -26.90092 6.18349 -26.73526 5.76653 -26.73526 curveto
+5.34956 -26.73526 4.94946 -26.90092 4.65448 -27.1959 curveto
+4.3595 -27.4909 4.19383 -27.89099 4.19383 -28.30795 curveto
+4.19383 -28.72491 4.3595 -29.12502 4.65448 -29.42 curveto
+4.94946 -29.71498 5.34956 -29.88065 5.76653 -29.88065 curveto
+6.18349 -29.88065 6.58357 -29.71498 6.87857 -29.42 curveto
+7.17355 -29.12502 7.33922 -28.72491 7.33922 -28.30795 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -1339.3698 moveto
+347.24402 -1319.6342 339.40308 -1300.70961 325.44914 -1286.75525 curveto
+311.49478 -1272.80132 292.57018 -1264.96037 272.8346 -1264.96037 curveto
+253.099 -1264.96037 234.17441 -1272.80132 220.22003 -1286.75525 curveto
+206.2661 -1300.70961 198.42516 -1319.6342 198.42516 -1339.3698 curveto
+198.42516 -1359.1054 206.2661 -1378.02998 220.22003 -1391.98436 curveto
+234.17441 -1405.93828 253.099 -1413.77924 272.8346 -1413.77924 curveto
+292.57018 -1413.77924 311.49478 -1405.93828 325.44914 -1391.98436 curveto
+339.40308 -1378.02998 347.24402 -1359.1054 347.24402 -1339.3698 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 9.19867 -31.53854 moveto
+9.19867 -31.01561 8.99106 -30.5143 8.62123 -30.14493 curveto
+8.25186 -29.7751 7.75055 -29.56749 7.22762 -29.56749 curveto
+6.70468 -29.56749 6.20338 -29.7751 5.834 -30.14493 curveto
+5.46419 -30.5143 5.25656 -31.01561 5.25656 -31.53854 curveto
+5.25656 -32.06148 5.46419 -32.56277 5.834 -32.93216 curveto
+6.20338 -33.30197 6.70468 -33.5096 7.22762 -33.5096 curveto
+7.75055 -33.5096 8.25186 -33.30197 8.62123 -32.93216 curveto
+8.99106 -32.56277 9.19867 -32.06148 9.19867 -31.53854 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -1190.55093 moveto
+347.24402 -1170.81534 339.40308 -1151.89075 325.44914 -1137.93639 curveto
+311.49478 -1123.98245 292.57018 -1116.1415 272.8346 -1116.1415 curveto
+253.099 -1116.1415 234.17441 -1123.98245 220.22003 -1137.93639 curveto
+206.2661 -1151.89075 198.42516 -1170.81534 198.42516 -1190.55093 curveto
+198.42516 -1210.28653 206.2661 -1229.21112 220.22003 -1243.16548 curveto
+234.17441 -1257.11942 253.099 -1264.96037 272.8346 -1264.96037 curveto
+292.57018 -1264.96037 311.49478 -1257.11942 325.44914 -1243.16548 curveto
+339.40308 -1229.21112 347.24402 -1210.28653 347.24402 -1190.55093 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 11.8462 -35.53903 moveto
+11.8462 -34.86559 11.57889 -34.22025 11.10268 -33.74402 curveto
+10.62646 -33.2678 9.98112 -33.0005 9.30766 -33.0005 curveto
+8.63422 -33.0005 7.98888 -33.2678 7.51266 -33.74402 curveto
+7.03644 -34.22025 6.76913 -34.86559 6.76913 -35.53903 curveto
+6.76913 -36.2125 7.03644 -36.85782 7.51266 -37.33405 curveto
+7.98888 -37.81026 8.63422 -38.07756 9.30766 -38.07756 curveto
+9.98112 -38.07756 10.62646 -37.81026 11.10268 -37.33405 curveto
+11.57889 -36.85782 11.8462 -36.2125 11.8462 -35.53903 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -1041.73207 moveto
+347.24402 -1021.99648 339.40308 -1003.07188 325.44914 -989.11751 curveto
+311.49478 -975.16359 292.57018 -967.32263 272.8346 -967.32263 curveto
+253.099 -967.32263 234.17441 -975.16359 220.22003 -989.11751 curveto
+206.2661 -1003.07188 198.42516 -1021.99648 198.42516 -1041.73207 curveto
+198.42516 -1061.46767 206.2661 -1080.39226 220.22003 -1094.34662 curveto
+234.17441 -1108.30055 253.099 -1116.1415 272.8346 -1116.1415 curveto
+292.57018 -1116.1415 311.49478 -1108.30055 325.44914 -1094.34662 curveto
+339.40308 -1080.39226 347.24402 -1061.46767 347.24402 -1041.73207 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 15.78398 -40.58669 moveto
+15.78398 -39.68962 15.42757 -38.82932 14.79305 -38.19522 curveto
+14.15895 -37.56068 13.29865 -37.20428 12.40157 -37.20428 curveto
+11.5045 -37.20428 10.6442 -37.56068 10.0101 -38.19522 curveto
+9.37558 -38.82932 9.01917 -39.68962 9.01917 -40.58669 curveto
+9.01917 -41.48376 9.37558 -42.34407 10.0101 -42.97816 curveto
+10.6442 -43.61269 11.5045 -43.96909 12.40157 -43.96909 curveto
+13.29865 -43.96909 14.15895 -43.61269 14.79305 -42.97816 curveto
+15.42757 -42.34407 15.78398 -41.48376 15.78398 -40.58669 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -892.91321 moveto
+347.24402 -873.17761 339.40308 -854.253 325.44914 -840.29865 curveto
+311.49478 -826.34471 292.57018 -818.50377 272.8346 -818.50377 curveto
+253.099 -818.50377 234.17441 -826.34471 220.22003 -840.29865 curveto
+206.2661 -854.253 198.42516 -873.17761 198.42516 -892.91321 curveto
+198.42516 -912.64879 206.2661 -931.5734 220.22003 -945.52776 curveto
+234.17441 -959.48169 253.099 -967.32263 272.8346 -967.32263 curveto
+292.57018 -967.32263 311.49478 -959.48169 325.44914 -945.52776 curveto
+339.40308 -931.5734 347.24402 -912.64879 347.24402 -892.91321 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 21.96097 -47.05695 moveto
+21.96097 -45.80865 21.46486 -44.61183 20.58249 -43.72903 curveto
+19.69969 -42.84666 18.50287 -42.35056 17.2546 -42.35056 curveto
+16.0063 -42.35056 14.80948 -42.84666 13.92668 -43.72903 curveto
+13.04431 -44.61183 12.5482 -45.80865 12.5482 -47.05695 curveto
+12.5482 -48.30524 13.04431 -49.50204 13.92668 -50.38484 curveto
+14.80948 -51.26721 16.0063 -51.76334 17.2546 -51.76334 curveto
+18.50287 -51.76334 19.69969 -51.26721 20.58249 -50.38484 curveto
+21.46486 -49.50204 21.96097 -48.30524 21.96097 -47.05695 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -744.09433 moveto
+347.24402 -724.35873 339.40308 -705.43414 325.44914 -691.47978 curveto
+311.49478 -677.52585 292.57018 -669.6849 272.8346 -669.6849 curveto
+253.099 -669.6849 234.17441 -677.52585 220.22003 -691.47978 curveto
+206.2661 -705.43414 198.42516 -724.35873 198.42516 -744.09433 curveto
+198.42516 -763.82993 206.2661 -782.75452 220.22003 -796.7089 curveto
+234.17441 -810.66281 253.099 -818.50377 272.8346 -818.50377 curveto
+292.57018 -818.50377 311.49478 -810.66281 325.44914 -796.7089 curveto
+339.40308 -782.75452 347.24402 -763.82993 347.24402 -744.09433 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 32.3011 -55.37367 moveto
+32.3011 -53.53801 31.57184 -51.77718 30.27382 -50.47914 curveto
+28.97578 -49.1811 27.21495 -48.45186 25.37927 -48.45186 curveto
+23.54361 -48.45186 21.78278 -49.1811 20.48474 -50.47914 curveto
+19.1867 -51.77718 18.45746 -53.53801 18.45746 -55.37367 curveto
+18.45746 -57.20935 19.1867 -58.97018 20.48474 -60.26822 curveto
+21.78278 -61.56624 23.54361 -62.2955 25.37927 -62.2955 curveto
+27.21495 -62.2955 28.97578 -61.56624 30.27382 -60.26822 curveto
+31.57184 -58.97018 32.3011 -57.20935 32.3011 -55.37367 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -595.27547 moveto
+347.24402 -575.53987 339.40308 -556.61528 325.44914 -542.66092 curveto
+311.49478 -528.70699 292.57018 -520.86603 272.8346 -520.86603 curveto
+253.099 -520.86603 234.17441 -528.70699 220.22003 -542.66092 curveto
+206.2661 -556.61528 198.42516 -575.53987 198.42516 -595.27547 curveto
+198.42516 -615.01106 206.2661 -633.93565 220.22003 -647.89001 curveto
+234.17441 -661.84395 253.099 -669.6849 272.8346 -669.6849 curveto
+292.57018 -669.6849 311.49478 -661.84395 325.44914 -647.89001 curveto
+339.40308 -633.93565 347.24402 -615.01106 347.24402 -595.27547 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 50.97223 -65.53516 moveto
+50.97223 -62.63806 49.82126 -59.86034 47.77278 -57.81186 curveto
+45.7243 -55.76338 42.94658 -54.61243 40.04948 -54.61243 curveto
+37.15237 -54.61243 34.37465 -55.76338 32.32619 -57.81186 curveto
+30.27771 -59.86034 29.12674 -62.63806 29.12674 -65.53516 curveto
+29.12674 -68.43227 30.27771 -71.20999 32.32619 -73.25847 curveto
+34.37465 -75.30695 37.15237 -76.4579 40.04948 -76.4579 curveto
+42.94658 -76.4579 45.7243 -75.30695 47.77278 -73.25847 curveto
+49.82126 -71.20999 50.97223 -68.43227 50.97223 -65.53516 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -446.4566 moveto
+347.24402 -426.72101 339.40308 -407.79642 325.44914 -393.84204 curveto
+311.49478 -379.88812 292.57018 -372.04716 272.8346 -372.04716 curveto
+253.099 -372.04716 234.17441 -379.88812 220.22003 -393.84204 curveto
+206.2661 -407.79642 198.42516 -426.72101 198.42516 -446.4566 curveto
+198.42516 -466.1922 206.2661 -485.11679 220.22003 -499.07115 curveto
+234.17441 -513.02509 253.099 -520.86603 272.8346 -520.86603 curveto
+292.57018 -520.86603 311.49478 -513.02509 325.44914 -499.07115 curveto
+339.40308 -485.11679 347.24402 -466.1922 347.24402 -446.4566 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 86.81187 -74.40987 moveto
+86.81187 -69.47597 84.85164 -64.74493 81.36327 -61.25612 curveto
+77.87445 -57.76775 73.14342 -55.80751 68.20952 -55.80751 curveto
+63.27562 -55.80751 58.54457 -57.76775 55.05577 -61.25612 curveto
+51.5674 -64.74493 49.60715 -69.47597 49.60715 -74.40987 curveto
+49.60715 -79.34377 51.5674 -84.0748 55.05577 -87.56361 curveto
+58.54457 -91.05199 63.27562 -93.01222 68.20952 -93.01222 curveto
+73.14342 -93.01222 77.87445 -91.05199 81.36327 -87.56361 curveto
+84.85164 -84.0748 86.81187 -79.34377 86.81187 -74.40987 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -297.63774 moveto
+347.24402 -277.90215 339.40308 -258.97754 325.44914 -245.02318 curveto
+311.49478 -231.06924 292.57018 -223.2283 272.8346 -223.2283 curveto
+253.099 -223.2283 234.17441 -231.06924 220.22003 -245.02318 curveto
+206.2661 -258.97754 198.42516 -277.90215 198.42516 -297.63774 curveto
+198.42516 -317.37332 206.2661 -336.29793 220.22003 -350.25229 curveto
+234.17441 -364.20622 253.099 -372.04716 272.8346 -372.04716 curveto
+292.57018 -372.04716 311.49478 -364.20622 325.44914 -350.25229 curveto
+339.40308 -336.29793 347.24402 -317.37332 347.24402 -297.63774 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 150.15886 -64.35435 moveto
+150.15886 -55.82005 146.76823 -47.63654 140.73396 -41.6027 curveto
+134.70013 -35.56845 126.51663 -32.17783 117.98233 -32.17783 curveto
+109.44803 -32.17783 101.26451 -35.56845 95.23068 -41.6027 curveto
+89.19643 -47.63654 85.8058 -55.82005 85.8058 -64.35435 curveto
+85.8058 -72.88866 89.19643 -81.07216 95.23068 -87.10599 curveto
+101.26451 -93.14026 109.44803 -96.53088 117.98233 -96.53088 curveto
+126.51663 -96.53088 134.70013 -93.14026 140.73396 -87.10599 curveto
+146.76823 -81.07216 150.15886 -72.88866 150.15886 -64.35435 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 -148.81886 moveto
+347.24402 -129.08327 339.40308 -110.15868 325.44914 -96.20432 curveto
+311.49478 -82.25038 292.57018 -74.40944 272.8346 -74.40944 curveto
+253.099 -74.40944 234.17441 -82.25038 220.22003 -96.20432 curveto
+206.2661 -110.15868 198.42516 -129.08327 198.42516 -148.81886 curveto
+198.42516 -168.55446 206.2661 -187.47905 220.22003 -201.43343 curveto
+234.17441 -215.38734 253.099 -223.2283 272.8346 -223.2283 curveto
+292.57018 -223.2283 311.49478 -215.38734 325.44914 -201.43343 curveto
+339.40308 -187.47905 347.24402 -168.55446 347.24402 -148.81886 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 150.15886 64.35435 moveto
+150.15886 72.88866 146.76823 81.07216 140.73396 87.10599 curveto
+134.70013 93.14026 126.51663 96.53088 117.98233 96.53088 curveto
+109.44803 96.53088 101.26451 93.14026 95.23068 87.10599 curveto
+89.19643 81.07216 85.8058 72.88866 85.8058 64.35435 curveto
+85.8058 55.82005 89.19643 47.63654 95.23068 41.6027 curveto
+101.26451 35.56845 109.44803 32.17783 117.98233 32.17783 curveto
+126.51663 32.17783 134.70013 35.56845 140.73396 41.6027 curveto
+146.76823 47.63654 150.15886 55.82005 150.15886 64.35435 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 148.81886 moveto
+347.24402 168.55446 339.40308 187.47905 325.44914 201.43343 curveto
+311.49478 215.38734 292.57018 223.2283 272.8346 223.2283 curveto
+253.099 223.2283 234.17441 215.38734 220.22003 201.43343 curveto
+206.2661 187.47905 198.42516 168.55446 198.42516 148.81886 curveto
+198.42516 129.08327 206.2661 110.15868 220.22003 96.20432 curveto
+234.17441 82.25038 253.099 74.40944 272.8346 74.40944 curveto
+292.57018 74.40944 311.49478 82.25038 325.44914 96.20432 curveto
+339.40308 110.15868 347.24402 129.08327 347.24402 148.81886 curveto closepath stroke
+ [3 3 ] 0 setdash
+newpath 2728.34589 1488.18867 moveto
+-2455.5113 -1339.3698 lineto stroke
+newpath 377.00659 952.44092 moveto
+-150.80203 -857.19682 lineto stroke
+newpath 1984.25156 1488.18867 moveto
+-1785.8264 -1339.3698 lineto stroke
+ 1 1 1 setrgbcolor
+newpath 274.3346 148.81886 moveto
+274.3346 149.2167 274.17653 149.5982 273.89523 149.8795 curveto
+273.61394 150.1608 273.23244 150.31886 272.8346 150.31886 curveto
+272.43675 150.31886 272.05525 150.1608 271.77396 149.8795 curveto
+271.49266 149.5982 271.3346 149.2167 271.3346 148.81886 curveto
+271.3346 148.42102 271.49266 148.03952 271.77396 147.75822 curveto
+272.05525 147.47693 272.43675 147.31886 272.8346 147.31886 curveto
+273.23244 147.31886 273.61394 147.47693 273.89523 147.75822 curveto
+274.17653 148.03952 274.3346 148.42102 274.3346 148.81886 curveto closepath fill
+ 0 0 0 setrgbcolor [] 0 setdash
+newpath 274.3346 148.81886 moveto
+274.3346 149.2167 274.17653 149.5982 273.89523 149.8795 curveto
+273.61394 150.1608 273.23244 150.31886 272.8346 150.31886 curveto
+272.43675 150.31886 272.05525 150.1608 271.77396 149.8795 curveto
+271.49266 149.5982 271.3346 149.2167 271.3346 148.81886 curveto
+271.3346 148.42102 271.49266 148.03952 271.77396 147.75822 curveto
+272.05525 147.47693 272.43675 147.31886 272.8346 147.31886 curveto
+273.23244 147.31886 273.61394 147.47693 273.89523 147.75822 curveto
+274.17653 148.03952 274.3346 148.42102 274.3346 148.81886 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 199.92516 148.81886 moveto
+199.92516 149.2167 199.76709 149.5982 199.4858 149.8795 curveto
+199.2045 150.1608 198.823 150.31886 198.42516 150.31886 curveto
+198.02731 150.31886 197.64581 150.1608 197.36452 149.8795 curveto
+197.08322 149.5982 196.92516 149.2167 196.92516 148.81886 curveto
+196.92516 148.42102 197.08322 148.03952 197.36452 147.75822 curveto
+197.64581 147.47693 198.02731 147.31886 198.42516 147.31886 curveto
+198.823 147.31886 199.2045 147.47693 199.4858 147.75822 curveto
+199.76709 148.03952 199.92516 148.42102 199.92516 148.81886 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 199.92516 148.81886 moveto
+199.92516 149.2167 199.76709 149.5982 199.4858 149.8795 curveto
+199.2045 150.1608 198.823 150.31886 198.42516 150.31886 curveto
+198.02731 150.31886 197.64581 150.1608 197.36452 149.8795 curveto
+197.08322 149.5982 196.92516 149.2167 196.92516 148.81886 curveto
+196.92516 148.42102 197.08322 148.03952 197.36452 147.75822 curveto
+197.64581 147.47693 198.02731 147.31886 198.42516 147.31886 curveto
+198.823 147.31886 199.2045 147.47693 199.4858 147.75822 curveto
+199.76709 148.03952 199.92516 148.42102 199.92516 148.81886 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 128.49197 95.2441 moveto
+128.49197 95.64194 128.33391 96.02344 128.05261 96.30473 curveto
+127.77132 96.58603 127.38982 96.7441 126.99197 96.7441 curveto
+126.59413 96.7441 126.21263 96.58603 125.93134 96.30473 curveto
+125.65004 96.02344 125.49197 95.64194 125.49197 95.2441 curveto
+125.49197 94.84625 125.65004 94.46475 125.93134 94.18346 curveto
+126.21263 93.90216 126.59413 93.7441 126.99197 93.7441 curveto
+127.38982 93.7441 127.77132 93.90216 128.05261 94.18346 curveto
+128.33391 94.46475 128.49197 94.84625 128.49197 95.2441 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 128.49197 95.2441 moveto
+128.49197 95.64194 128.33391 96.02344 128.05261 96.30473 curveto
+127.77132 96.58603 127.38982 96.7441 126.99197 96.7441 curveto
+126.59413 96.7441 126.21263 96.58603 125.93134 96.30473 curveto
+125.65004 96.02344 125.49197 95.64194 125.49197 95.2441 curveto
+125.49197 94.84625 125.65004 94.46475 125.93134 94.18346 curveto
+126.21263 93.90216 126.59413 93.7441 126.99197 93.7441 curveto
+127.38982 93.7441 127.77132 93.90216 128.05261 94.18346 curveto
+128.33391 94.46475 128.49197 94.84625 128.49197 95.2441 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 119.48233 64.35435 moveto
+119.48233 64.7522 119.32426 65.1337 119.04297 65.415 curveto
+118.76167 65.69629 118.38017 65.85435 117.98233 65.85435 curveto
+117.58449 65.85435 117.20299 65.69629 116.92169 65.415 curveto
+116.6404 65.1337 116.48233 64.7522 116.48233 64.35435 curveto
+116.48233 63.95651 116.6404 63.57501 116.92169 63.29372 curveto
+117.20299 63.01242 117.58449 62.85435 117.98233 62.85435 curveto
+118.38017 62.85435 118.76167 63.01242 119.04297 63.29372 curveto
+119.32426 63.57501 119.48233 63.95651 119.48233 64.35435 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 119.48233 64.35435 moveto
+119.48233 64.7522 119.32426 65.1337 119.04297 65.415 curveto
+118.76167 65.69629 118.38017 65.85435 117.98233 65.85435 curveto
+117.58449 65.85435 117.20299 65.69629 116.92169 65.415 curveto
+116.6404 65.1337 116.48233 64.7522 116.48233 64.35435 curveto
+116.48233 63.95651 116.6404 63.57501 116.92169 63.29372 curveto
+117.20299 63.01242 117.58449 62.85435 117.98233 62.85435 curveto
+118.38017 62.85435 118.76167 63.01242 119.04297 63.29372 curveto
+119.32426 63.57501 119.48233 63.95651 119.48233 64.35435 curveto closepath stroke
+275.8346 145.074 moveto
+(I) cmmi10 9.96265 fshow
+280.99579 148.6894 moveto
+(0) cmsy7 6.97385 fshow
+120.08232 55.44656 moveto
+(I) cmmi10 9.96265 fshow
+201.42516 145.074 moveto
+(M) cmmi10 9.96265 fshow
+212.17645 148.6894 moveto
+(0) cmsy7 6.97385 fshow
+114.14069 97.34409 moveto
+(M) cmmi10 9.96265 fshow
+ 0.116 0.565 1 setrgbcolor
+newpath 86.81187 74.40987 moveto
+86.81187 79.34377 84.85164 84.0748 81.36327 87.56361 curveto
+77.87445 91.05199 73.14342 93.01222 68.20952 93.01222 curveto
+63.27562 93.01222 58.54457 91.05199 55.05577 87.56361 curveto
+51.5674 84.0748 49.60715 79.34377 49.60715 74.40987 curveto
+49.60715 69.47597 51.5674 64.74493 55.05577 61.25612 curveto
+58.54457 57.76775 63.27562 55.80751 68.20952 55.80751 curveto
+73.14342 55.80751 77.87445 57.76775 81.36327 61.25612 curveto
+84.85164 64.74493 86.81187 69.47597 86.81187 74.40987 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 297.63774 moveto
+347.24402 317.37332 339.40308 336.29793 325.44914 350.25229 curveto
+311.49478 364.20622 292.57018 372.04716 272.8346 372.04716 curveto
+253.099 372.04716 234.17441 364.20622 220.22003 350.25229 curveto
+206.2661 336.29793 198.42516 317.37332 198.42516 297.63774 curveto
+198.42516 277.90215 206.2661 258.97754 220.22003 245.02318 curveto
+234.17441 231.06924 253.099 223.2283 272.8346 223.2283 curveto
+292.57018 223.2283 311.49478 231.06924 325.44914 245.02318 curveto
+339.40308 258.97754 347.24402 277.90215 347.24402 297.63774 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 50.97223 65.53516 moveto
+50.97223 68.43227 49.82126 71.20999 47.77278 73.25847 curveto
+45.7243 75.30695 42.94658 76.4579 40.04948 76.4579 curveto
+37.15237 76.4579 34.37465 75.30695 32.32619 73.25847 curveto
+30.27771 71.20999 29.12674 68.43227 29.12674 65.53516 curveto
+29.12674 62.63806 30.27771 59.86034 32.32619 57.81186 curveto
+34.37465 55.76338 37.15237 54.61243 40.04948 54.61243 curveto
+42.94658 54.61243 45.7243 55.76338 47.77278 57.81186 curveto
+49.82126 59.86034 50.97223 62.63806 50.97223 65.53516 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 446.4566 moveto
+347.24402 466.1922 339.40308 485.11679 325.44914 499.07115 curveto
+311.49478 513.02509 292.57018 520.86603 272.8346 520.86603 curveto
+253.099 520.86603 234.17441 513.02509 220.22003 499.07115 curveto
+206.2661 485.11679 198.42516 466.1922 198.42516 446.4566 curveto
+198.42516 426.72101 206.2661 407.79642 220.22003 393.84204 curveto
+234.17441 379.88812 253.099 372.04716 272.8346 372.04716 curveto
+292.57018 372.04716 311.49478 379.88812 325.44914 393.84204 curveto
+339.40308 407.79642 347.24402 426.72101 347.24402 446.4566 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 32.3011 55.37367 moveto
+32.3011 57.20935 31.57184 58.97018 30.27382 60.26822 curveto
+28.97578 61.56624 27.21495 62.2955 25.37927 62.2955 curveto
+23.54361 62.2955 21.78278 61.56624 20.48474 60.26822 curveto
+19.1867 58.97018 18.45746 57.20935 18.45746 55.37367 curveto
+18.45746 53.53801 19.1867 51.77718 20.48474 50.47914 curveto
+21.78278 49.1811 23.54361 48.45186 25.37927 48.45186 curveto
+27.21495 48.45186 28.97578 49.1811 30.27382 50.47914 curveto
+31.57184 51.77718 32.3011 53.53801 32.3011 55.37367 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 595.27547 moveto
+347.24402 615.01106 339.40308 633.93565 325.44914 647.89001 curveto
+311.49478 661.84395 292.57018 669.6849 272.8346 669.6849 curveto
+253.099 669.6849 234.17441 661.84395 220.22003 647.89001 curveto
+206.2661 633.93565 198.42516 615.01106 198.42516 595.27547 curveto
+198.42516 575.53987 206.2661 556.61528 220.22003 542.66092 curveto
+234.17441 528.70699 253.099 520.86603 272.8346 520.86603 curveto
+292.57018 520.86603 311.49478 528.70699 325.44914 542.66092 curveto
+339.40308 556.61528 347.24402 575.53987 347.24402 595.27547 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 21.96097 47.05695 moveto
+21.96097 48.30524 21.46486 49.50204 20.58249 50.38484 curveto
+19.69969 51.26721 18.50287 51.76334 17.2546 51.76334 curveto
+16.0063 51.76334 14.80948 51.26721 13.92668 50.38484 curveto
+13.04431 49.50204 12.5482 48.30524 12.5482 47.05695 curveto
+12.5482 45.80865 13.04431 44.61183 13.92668 43.72903 curveto
+14.80948 42.84666 16.0063 42.35056 17.2546 42.35056 curveto
+18.50287 42.35056 19.69969 42.84666 20.58249 43.72903 curveto
+21.46486 44.61183 21.96097 45.80865 21.96097 47.05695 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 744.09433 moveto
+347.24402 763.82993 339.40308 782.75452 325.44914 796.7089 curveto
+311.49478 810.66281 292.57018 818.50377 272.8346 818.50377 curveto
+253.099 818.50377 234.17441 810.66281 220.22003 796.7089 curveto
+206.2661 782.75452 198.42516 763.82993 198.42516 744.09433 curveto
+198.42516 724.35873 206.2661 705.43414 220.22003 691.47978 curveto
+234.17441 677.52585 253.099 669.6849 272.8346 669.6849 curveto
+292.57018 669.6849 311.49478 677.52585 325.44914 691.47978 curveto
+339.40308 705.43414 347.24402 724.35873 347.24402 744.09433 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 15.78398 40.58669 moveto
+15.78398 41.48376 15.42757 42.34407 14.79305 42.97816 curveto
+14.15895 43.61269 13.29865 43.96909 12.40157 43.96909 curveto
+11.5045 43.96909 10.6442 43.61269 10.0101 42.97816 curveto
+9.37558 42.34407 9.01917 41.48376 9.01917 40.58669 curveto
+9.01917 39.68962 9.37558 38.82932 10.0101 38.19522 curveto
+10.6442 37.56068 11.5045 37.20428 12.40157 37.20428 curveto
+13.29865 37.20428 14.15895 37.56068 14.79305 38.19522 curveto
+15.42757 38.82932 15.78398 39.68962 15.78398 40.58669 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 892.91321 moveto
+347.24402 912.64879 339.40308 931.5734 325.44914 945.52776 curveto
+311.49478 959.48169 292.57018 967.32263 272.8346 967.32263 curveto
+253.099 967.32263 234.17441 959.48169 220.22003 945.52776 curveto
+206.2661 931.5734 198.42516 912.64879 198.42516 892.91321 curveto
+198.42516 873.17761 206.2661 854.253 220.22003 840.29865 curveto
+234.17441 826.34471 253.099 818.50377 272.8346 818.50377 curveto
+292.57018 818.50377 311.49478 826.34471 325.44914 840.29865 curveto
+339.40308 854.253 347.24402 873.17761 347.24402 892.91321 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 11.8462 35.53903 moveto
+11.8462 36.2125 11.57889 36.85782 11.10268 37.33405 curveto
+10.62646 37.81026 9.98112 38.07756 9.30766 38.07756 curveto
+8.63422 38.07756 7.98888 37.81026 7.51266 37.33405 curveto
+7.03644 36.85782 6.76913 36.2125 6.76913 35.53903 curveto
+6.76913 34.86559 7.03644 34.22025 7.51266 33.74402 curveto
+7.98888 33.2678 8.63422 33.0005 9.30766 33.0005 curveto
+9.98112 33.0005 10.62646 33.2678 11.10268 33.74402 curveto
+11.57889 34.22025 11.8462 34.86559 11.8462 35.53903 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 1041.73207 moveto
+347.24402 1061.46767 339.40308 1080.39226 325.44914 1094.34662 curveto
+311.49478 1108.30055 292.57018 1116.1415 272.8346 1116.1415 curveto
+253.099 1116.1415 234.17441 1108.30055 220.22003 1094.34662 curveto
+206.2661 1080.39226 198.42516 1061.46767 198.42516 1041.73207 curveto
+198.42516 1021.99648 206.2661 1003.07188 220.22003 989.11751 curveto
+234.17441 975.16359 253.099 967.32263 272.8346 967.32263 curveto
+292.57018 967.32263 311.49478 975.16359 325.44914 989.11751 curveto
+339.40308 1003.07188 347.24402 1021.99648 347.24402 1041.73207 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 9.19867 31.53854 moveto
+9.19867 32.06148 8.99106 32.56277 8.62123 32.93216 curveto
+8.25186 33.30197 7.75055 33.5096 7.22762 33.5096 curveto
+6.70468 33.5096 6.20338 33.30197 5.834 32.93216 curveto
+5.46419 32.56277 5.25656 32.06148 5.25656 31.53854 curveto
+5.25656 31.01561 5.46419 30.5143 5.834 30.14493 curveto
+6.20338 29.7751 6.70468 29.56749 7.22762 29.56749 curveto
+7.75055 29.56749 8.25186 29.7751 8.62123 30.14493 curveto
+8.99106 30.5143 9.19867 31.01561 9.19867 31.53854 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 1190.55093 moveto
+347.24402 1210.28653 339.40308 1229.21112 325.44914 1243.16548 curveto
+311.49478 1257.11942 292.57018 1264.96037 272.8346 1264.96037 curveto
+253.099 1264.96037 234.17441 1257.11942 220.22003 1243.16548 curveto
+206.2661 1229.21112 198.42516 1210.28653 198.42516 1190.55093 curveto
+198.42516 1170.81534 206.2661 1151.89075 220.22003 1137.93639 curveto
+234.17441 1123.98245 253.099 1116.1415 272.8346 1116.1415 curveto
+292.57018 1116.1415 311.49478 1123.98245 325.44914 1137.93639 curveto
+339.40308 1151.89075 347.24402 1170.81534 347.24402 1190.55093 curveto closepath stroke
+ 0.116 0.565 1 setrgbcolor
+newpath 7.33922 28.30795 moveto
+7.33922 28.72491 7.17355 29.12502 6.87857 29.42 curveto
+6.58357 29.71498 6.18349 29.88065 5.76653 29.88065 curveto
+5.34956 29.88065 4.94946 29.71498 4.65448 29.42 curveto
+4.3595 29.12502 4.19383 28.72491 4.19383 28.30795 curveto
+4.19383 27.89099 4.3595 27.4909 4.65448 27.1959 curveto
+4.94946 26.90092 5.34956 26.73526 5.76653 26.73526 curveto
+6.18349 26.73526 6.58357 26.90092 6.87857 27.1959 curveto
+7.17355 27.4909 7.33922 27.89099 7.33922 28.30795 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 347.24402 1339.3698 moveto
+347.24402 1359.1054 339.40308 1378.02998 325.44914 1391.98436 curveto
+311.49478 1405.93828 292.57018 1413.77924 272.8346 1413.77924 curveto
+253.099 1413.77924 234.17441 1405.93828 220.22003 1391.98436 curveto
+206.2661 1378.02998 198.42516 1359.1054 198.42516 1339.3698 curveto
+198.42516 1319.6342 206.2661 1300.70961 220.22003 1286.75525 curveto
+234.17441 1272.80132 253.099 1264.96037 272.8346 1264.96037 curveto
+292.57018 1264.96037 311.49478 1272.80132 325.44914 1286.75525 curveto
+339.40308 1300.70961 347.24402 1319.6342 347.24402 1339.3698 curveto closepath stroke
+ [3 3 ] 0 setdash
+newpath 1984.25156 0 moveto
+-1785.8264 0 lineto stroke
+ 1 1 1 setrgbcolor
+newpath 58.1929 0 moveto
+58.1929 0.39784 58.03484 0.77934 57.75354 1.06064 curveto
+57.47224 1.34193 57.09074 1.5 56.6929 1.5 curveto
+56.29506 1.5 55.91356 1.34193 55.63226 1.06064 curveto
+55.35097 0.77934 55.1929 0.39784 55.1929 0 curveto
+55.1929 -0.39784 55.35097 -0.77934 55.63226 -1.06064 curveto
+55.91356 -1.34193 56.29506 -1.5 56.6929 -1.5 curveto
+57.09074 -1.5 57.47224 -1.34193 57.75354 -1.06064 curveto
+58.03484 -0.77934 58.1929 -0.39784 58.1929 0 curveto closepath fill
+ 0 0 0 setrgbcolor [] 0 setdash
+newpath 58.1929 0 moveto
+58.1929 0.39784 58.03484 0.77934 57.75354 1.06064 curveto
+57.47224 1.34193 57.09074 1.5 56.6929 1.5 curveto
+56.29506 1.5 55.91356 1.34193 55.63226 1.06064 curveto
+55.35097 0.77934 55.1929 0.39784 55.1929 0 curveto
+55.1929 -0.39784 55.35097 -0.77934 55.63226 -1.06064 curveto
+55.91356 -1.34193 56.29506 -1.5 56.6929 -1.5 curveto
+57.09074 -1.5 57.47224 -1.34193 57.75354 -1.06064 curveto
+58.03484 -0.77934 58.1929 -0.39784 58.1929 0 curveto closepath stroke
+53.0427 -9.8078 moveto
+(U) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 100.71259 0 moveto
+100.71259 0.39784 100.55452 0.77934 100.27322 1.06064 curveto
+99.99193 1.34193 99.61043 1.5 99.21259 1.5 curveto
+98.81474 1.5 98.43324 1.34193 98.15195 1.06064 curveto
+97.87065 0.77934 97.71259 0.39784 97.71259 0 curveto
+97.71259 -0.39784 97.87065 -0.77934 98.15195 -1.06064 curveto
+98.43324 -1.34193 98.81474 -1.5 99.21259 -1.5 curveto
+99.61043 -1.5 99.99193 -1.34193 100.27322 -1.06064 curveto
+100.55452 -0.77934 100.71259 -0.39784 100.71259 0 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 100.71259 0 moveto
+100.71259 0.39784 100.55452 0.77934 100.27322 1.06064 curveto
+99.99193 1.34193 99.61043 1.5 99.21259 1.5 curveto
+98.81474 1.5 98.43324 1.34193 98.15195 1.06064 curveto
+97.87065 0.77934 97.71259 0.39784 97.71259 0 curveto
+97.71259 -0.39784 97.87065 -0.77934 98.15195 -1.06064 curveto
+98.43324 -1.34193 98.81474 -1.5 99.21259 -1.5 curveto
+99.61043 -1.5 99.99193 -1.34193 100.27322 -1.06064 curveto
+100.55452 -0.77934 100.71259 -0.39784 100.71259 0 curveto closepath stroke
+90.8029 -8.90779 moveto
+(V) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 1.5 0 moveto
+1.5 0.39784 1.34193 0.77934 1.06064 1.06064 curveto
+0.77934 1.34193 0.39784 1.5 0 1.5 curveto
+-0.39784 1.5 -0.77934 1.34193 -1.06064 1.06064 curveto
+-1.34193 0.77934 -1.5 0.39784 -1.5 0 curveto
+-1.5 -0.39784 -1.34193 -0.77934 -1.06064 -1.06064 curveto
+-0.77934 -1.34193 -0.39784 -1.5 0 -1.5 curveto
+0.39784 -1.5 0.77934 -1.34193 1.06064 -1.06064 curveto
+1.34193 -0.77934 1.5 -0.39784 1.5 0 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 1.5 0 moveto
+1.5 0.39784 1.34193 0.77934 1.06064 1.06064 curveto
+0.77934 1.34193 0.39784 1.5 0 1.5 curveto
+-0.39784 1.5 -0.77934 1.34193 -1.06064 1.06064 curveto
+-1.34193 0.77934 -1.5 0.39784 -1.5 0 curveto
+-1.5 -0.39784 -1.34193 -0.77934 -1.06064 -1.06064 curveto
+-0.77934 -1.34193 -0.39784 -1.5 0 -1.5 curveto
+0.39784 -1.5 0.77934 -1.34193 1.06064 -1.06064 curveto
+1.34193 -0.77934 1.5 -0.39784 1.5 0 curveto closepath stroke
+-10.07008 3.59439 moveto
+(A) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 199.92516 0 moveto
+199.92516 0.39784 199.76709 0.77934 199.4858 1.06064 curveto
+199.2045 1.34193 198.823 1.5 198.42516 1.5 curveto
+198.02731 1.5 197.64581 1.34193 197.36452 1.06064 curveto
+197.08322 0.77934 196.92516 0.39784 196.92516 0 curveto
+196.92516 -0.39784 197.08322 -0.77934 197.36452 -1.06064 curveto
+197.64581 -1.34193 198.02731 -1.5 198.42516 -1.5 curveto
+198.823 -1.5 199.2045 -1.34193 199.4858 -1.06064 curveto
+199.76709 -0.77934 199.92516 -0.39784 199.92516 0 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 199.92516 0 moveto
+199.92516 0.39784 199.76709 0.77934 199.4858 1.06064 curveto
+199.2045 1.34193 198.823 1.5 198.42516 1.5 curveto
+198.02731 1.5 197.64581 1.34193 197.36452 1.06064 curveto
+197.08322 0.77934 196.92516 0.39784 196.92516 0 curveto
+196.92516 -0.39784 197.08322 -0.77934 197.36452 -1.06064 curveto
+197.64581 -1.34193 198.02731 -1.5 198.42516 -1.5 curveto
+198.823 -1.5 199.2045 -1.34193 199.4858 -1.06064 curveto
+199.76709 -0.77934 199.92516 -0.39784 199.92516 0 curveto closepath stroke
+200.52515 -8.90779 moveto
+(B) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 114.8858 0 moveto
+114.8858 0.39784 114.72774 0.77934 114.44644 1.06064 curveto
+114.16515 1.34193 113.78365 1.5 113.3858 1.5 curveto
+112.98796 1.5 112.60646 1.34193 112.32516 1.06064 curveto
+112.04387 0.77934 111.8858 0.39784 111.8858 0 curveto
+111.8858 -0.39784 112.04387 -0.77934 112.32516 -1.06064 curveto
+112.60646 -1.34193 112.98796 -1.5 113.3858 -1.5 curveto
+113.78365 -1.5 114.16515 -1.34193 114.44644 -1.06064 curveto
+114.72774 -0.77934 114.8858 -0.39784 114.8858 0 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 114.8858 0 moveto
+114.8858 0.39784 114.72774 0.77934 114.44644 1.06064 curveto
+114.16515 1.34193 113.78365 1.5 113.3858 1.5 curveto
+112.98796 1.5 112.60646 1.34193 112.32516 1.06064 curveto
+112.04387 0.77934 111.8858 0.39784 111.8858 0 curveto
+111.8858 -0.39784 112.04387 -0.77934 112.32516 -1.06064 curveto
+112.60646 -1.34193 112.98796 -1.5 113.3858 -1.5 curveto
+113.78365 -1.5 114.16515 -1.34193 114.44644 -1.06064 curveto
+114.72774 -0.77934 114.8858 -0.39784 114.8858 0 curveto closepath stroke
+115.4858 -8.90779 moveto
+(C) cmmi10 9.96265 fshow
+ [3 3 ] 0 setdash
+newpath 198.42516 0 moveto
+198.42516 52.62796 177.51567 103.09413 140.3049 140.3049 curveto
+103.09413 177.51567 52.62796 198.42516 0 198.42516 curveto
+-52.62796 198.42516 -103.09413 177.51567 -140.3049 140.3049 curveto
+-177.51567 103.09413 -198.42516 52.62796 -198.42516 0 curveto
+-198.42516 -52.62796 -177.51567 -103.09413 -140.3049 -140.3049 curveto
+-103.09413 -177.51567 -52.62796 -198.42516 0 -198.42516 curveto
+52.62796 -198.42516 103.09413 -177.51567 140.3049 -140.3049 curveto
+177.51567 -103.09413 198.42516 -52.62796 198.42516 0 curveto closepath stroke
+grestore
+ 1 1 1 setrgbcolor 0 1 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath -28.34645 -297.63774 moveto
+-28.34645 297.63774 lineto
+396.85031 297.63774 lineto
+396.85031 -297.63774 lineto
+ closepath stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,74 @@
+input geom2d;
+
+gddU:=0.7cm;
+
+beginfig(1);
+ r = 2.5;
+ R = 3.5;
+ A = Point(0,0);
+ C_A = Cercle(A,2*R);
+ C = Point(2r,0);
+ B = Point(2R,0);
+ C_V = CercleD(A,B);
+ C_U = CercleD(A,C);
+ C_CB=CercleD(C,B);
+ V = Centre(C_V);
+ U = Centre(C_U);
+ AB = Droite(A,B);
+ I_CU = Inversion(C_U,C_A);
+ I_CV = Inversion(C_V,C_A);
+
+ L_AB = Droite(A,B);
+ Up = IntersectionDroites(L_AB,I_CU);
+ Vp = IntersectionDroites(L_AB,I_CV);
+ Cp0 = CercleD(Vp,Up);
+ Rp= Rayon(Cp0);
+
+
+ colorieAvecTransparence(C_V,DodgerBlue,0.2);
+ trace C_V avecCrayon(1.3,DodgerBlue);
+
+ colorie C_U withcolor 4.9*FireBrick;
+ trace C_U avecCrayon(1.3,FireBrick);
+ colorie C_CB withcolor DodgerBlue;
+ trace I_CV avecCrayon(1,DodgerBlue);
+ trace I_CU avecCrayon(1,FireBrick);
+
+ Ip[0] = Milieu(Vp,Up);
+ N=9;
+ trace Cp0;
+ for i:=-N upto N:
+ if(i<>0):
+ Ip[i] = Addition(Ip[0],Point(0,i*2*Rp));
+ Mp[i] = Addition(Ip[i],Point(-Rp,0));
+ DAMp[i] = Droite(A,Mp[i]);
+ DVIp[i] = Droite(V,Ip[i]);
+ DAIp[i] = Droite(A,Ip[i]);
+ M[i] = IntersectionDroiteCercle(DAMp[i],C_V,2);
+ DVM[i] = Droite(V,M[i]);
+ I[i] = IntersectionDroites(DAIp[i],DVM[i]);
+ colorie CercleCP(I[i],M[i]) withcolor DodgerBlue;
+ trace CercleCP(Ip[i],Mp[i]);
+ if(i=1):
+ drawoptions(dashed evenly);
+ trace DAIp[i];trace DVM[i];trace DAMp[i];
+ drawoptions();
+ pointe Ip[i]; pointe Mp[i];
+ pointe M[i]; pointe I[i];
+ gddLabel.rt(textext("$I'$"),Ip[i]);
+ gddLabel.lrt(textext("$I$"),I[i]);
+ gddLabel.rt(textext("$M'$"),Mp[i]);
+ gddLabel.ulft(textext("$M$"),M[i]);
+ fi
+ fi
+ endfor;
+ trace AB dashed evenly;
+ marque.bot "U";
+ marque.llft "V";
+ marque.ulft "A"; marque.lrt "B"; marque.lrt "C";
+ trace C_A dashed evenly;
+
+ Fenetre(-1,-2.5R,3*R,2.5R);
+endfig;
+
+end.
\ No newline at end of file
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/cercles/pappuschain.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,346 @@
+%!PS
+%%BoundingBox: -96 -185 171 142
+%%HiResBoundingBox: -95.71516 -184.31218 170.0787 141.73225
+%%Creator: MetaPost 2.10
+%%CreationDate: 2025.02.19:2210
+%%Pages: 1
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 0.88 1 1 setrgbcolor
+newpath 56.6929 0 moveto
+56.6929 15.03656 50.71877 29.45546 40.08711 40.08711 curveto
+29.45546 50.71877 15.03656 56.6929 0 56.6929 curveto
+-15.03656 56.6929 -29.45546 50.71877 -40.08711 40.08711 curveto
+-50.71877 29.45546 -56.6929 15.03656 -56.6929 0 curveto
+-56.6929 -15.03656 -50.71877 -29.45546 -40.08711 -40.08711 curveto
+-29.45546 -50.71877 -15.03656 -56.6929 0 -56.6929 curveto
+15.03656 -56.6929 29.45546 -50.71877 40.08711 -40.08711 curveto
+50.71877 -29.45546 56.6929 -15.03656 56.6929 0 curveto closepath fill
+gsave newpath 28.34645 28.34645 moveto
+28.34645 43.38301 22.37231 57.80191 11.74066 68.43356 curveto
+1.10901 79.06522 -13.30989 85.03935 -28.34645 85.03935 curveto
+-43.38301 85.03935 -57.80191 79.06522 -68.43356 68.43356 curveto
+-79.06522 57.80191 -85.03935 43.38301 -85.03935 28.34645 curveto
+-85.03935 13.30989 -79.06522 -1.10901 -68.43356 -11.74066 curveto
+-57.80191 -22.37231 -43.38301 -28.34645 -28.34645 -28.34645 curveto
+-13.30989 -28.34645 1.10901 -22.37231 11.74066 -11.74066 curveto
+22.37231 -1.10901 28.34645 13.30989 28.34645 28.34645 curveto closepath clip
+ 0.909 0.8 0.8 setrgbcolor
+newpath 28.34645 28.34645 moveto
+28.34645 43.38301 22.37231 57.80191 11.74066 68.43356 curveto
+1.10901 79.06522 -13.30989 85.03935 -28.34645 85.03935 curveto
+-43.38301 85.03935 -57.80191 79.06522 -68.43356 68.43356 curveto
+-79.06522 57.80191 -85.03935 43.38301 -85.03935 28.34645 curveto
+-85.03935 13.30989 -79.06522 -1.10901 -68.43356 -11.74066 curveto
+-57.80191 -22.37231 -43.38301 -28.34645 -28.34645 -28.34645 curveto
+-13.30989 -28.34645 1.10901 -22.37231 11.74066 -11.74066 curveto
+22.37231 -1.10901 28.34645 13.30989 28.34645 28.34645 curveto closepath fill
+ 0.813 0.8 0.8 setrgbcolor
+newpath 56.6929 0 moveto
+56.6929 15.03656 50.71877 29.45546 40.08711 40.08711 curveto
+29.45546 50.71877 15.03656 56.6929 0 56.6929 curveto
+-15.03656 56.6929 -29.45546 50.71877 -40.08711 40.08711 curveto
+-50.71877 29.45546 -56.6929 15.03656 -56.6929 0 curveto
+-56.6929 -15.03656 -50.71877 -29.45546 -40.08711 -40.08711 curveto
+-29.45546 -50.71877 -15.03656 -56.6929 0 -56.6929 curveto
+15.03656 -56.6929 29.45546 -50.71877 40.08711 -40.08711 curveto
+50.71877 -29.45546 56.6929 -15.03656 56.6929 0 curveto closepath fill
+grestore
+gsave newpath 170.0787 56.6929 moveto
+170.0787 79.24774 161.1175 100.8761 145.17003 116.82358 curveto
+129.22255 132.77104 107.5942 141.73225 85.03935 141.73225 curveto
+62.48451 141.73225 40.85616 132.77104 24.90868 116.82358 curveto
+8.96121 100.8761 0 79.24774 0 56.6929 curveto
+0 34.13806 8.96121 12.5097 24.90868 -3.43777 curveto
+40.85616 -19.38524 62.48451 -28.34645 85.03935 -28.34645 curveto
+107.5942 -28.34645 129.22255 -19.38524 145.17003 -3.43777 curveto
+161.1175 12.5097 170.0787 34.13806 170.0787 56.6929 curveto closepath clip
+ 0.8 0.8 0.909 setrgbcolor
+newpath 170.0787 56.6929 moveto
+170.0787 79.24774 161.1175 100.8761 145.17003 116.82358 curveto
+129.22255 132.77104 107.5942 141.73225 85.03935 141.73225 curveto
+62.48451 141.73225 40.85616 132.77104 24.90868 116.82358 curveto
+8.96121 100.8761 0 79.24774 0 56.6929 curveto
+0 34.13806 8.96121 12.5097 24.90868 -3.43777 curveto
+40.85616 -19.38524 62.48451 -28.34645 85.03935 -28.34645 curveto
+107.5942 -28.34645 129.22255 -19.38524 145.17003 -3.43777 curveto
+161.1175 12.5097 170.0787 34.13806 170.0787 56.6929 curveto closepath fill
+ 0.70401 0.8 0.909 setrgbcolor
+newpath 56.6929 0 moveto
+56.6929 15.03656 50.71877 29.45546 40.08711 40.08711 curveto
+29.45546 50.71877 15.03656 56.6929 0 56.6929 curveto
+-15.03656 56.6929 -29.45546 50.71877 -40.08711 40.08711 curveto
+-50.71877 29.45546 -56.6929 15.03656 -56.6929 0 curveto
+-56.6929 -15.03656 -50.71877 -29.45546 -40.08711 -40.08711 curveto
+-29.45546 -50.71877 -15.03656 -56.6929 0 -56.6929 curveto
+15.03656 -56.6929 29.45546 -50.71877 40.08711 -40.08711 curveto
+50.71877 -29.45546 56.6929 -15.03656 56.6929 0 curveto closepath fill
+gsave newpath 28.34645 28.34645 moveto
+28.34645 43.38301 22.37231 57.80191 11.74066 68.43356 curveto
+1.10901 79.06522 -13.30989 85.03935 -28.34645 85.03935 curveto
+-43.38301 85.03935 -57.80191 79.06522 -68.43356 68.43356 curveto
+-79.06522 57.80191 -85.03935 43.38301 -85.03935 28.34645 curveto
+-85.03935 13.30989 -79.06522 -1.10901 -68.43356 -11.74066 curveto
+-57.80191 -22.37231 -43.38301 -28.34645 -28.34645 -28.34645 curveto
+-13.30989 -28.34645 1.10901 -22.37231 11.74066 -11.74066 curveto
+22.37231 -1.10901 28.34645 13.30989 28.34645 28.34645 curveto closepath clip
+ 0.8 0.8 0.909 setrgbcolor
+newpath 28.34645 28.34645 moveto
+28.34645 43.38301 22.37231 57.80191 11.74066 68.43356 curveto
+1.10901 79.06522 -13.30989 85.03935 -28.34645 85.03935 curveto
+-43.38301 85.03935 -57.80191 79.06522 -68.43356 68.43356 curveto
+-79.06522 57.80191 -85.03935 43.38301 -85.03935 28.34645 curveto
+-85.03935 13.30989 -79.06522 -1.10901 -68.43356 -11.74066 curveto
+-57.80191 -22.37231 -43.38301 -28.34645 -28.34645 -28.34645 curveto
+-13.30989 -28.34645 1.10901 -22.37231 11.74066 -11.74066 curveto
+22.37231 -1.10901 28.34645 13.30989 28.34645 28.34645 curveto closepath fill
+ 0.7272 0.64 0.74901 setrgbcolor
+newpath 28.34645 28.34645 moveto
+28.34645 43.38301 22.37231 57.80191 11.74066 68.43356 curveto
+1.10901 79.06522 -13.30989 85.03935 -28.34645 85.03935 curveto
+-43.38301 85.03935 -57.80191 79.06522 -68.43356 68.43356 curveto
+-79.06522 57.80191 -85.03935 43.38301 -85.03935 28.34645 curveto
+-85.03935 13.30989 -79.06522 -1.10901 -68.43356 -11.74066 curveto
+-57.80191 -22.37231 -43.38301 -28.34645 -28.34645 -28.34645 curveto
+-13.30989 -28.34645 1.10901 -22.37231 11.74066 -11.74066 curveto
+22.37231 -1.10901 28.34645 13.30989 28.34645 28.34645 curveto closepath fill
+ 0.6504 0.64 0.74901 setrgbcolor
+newpath 56.6929 0 moveto
+56.6929 15.03656 50.71877 29.45546 40.08711 40.08711 curveto
+29.45546 50.71877 15.03656 56.6929 0 56.6929 curveto
+-15.03656 56.6929 -29.45546 50.71877 -40.08711 40.08711 curveto
+-50.71877 29.45546 -56.6929 15.03656 -56.6929 0 curveto
+-56.6929 -15.03656 -50.71877 -29.45546 -40.08711 -40.08711 curveto
+-29.45546 -50.71877 -15.03656 -56.6929 0 -56.6929 curveto
+15.03656 -56.6929 29.45546 -50.71877 40.08711 -40.08711 curveto
+50.71877 -29.45546 56.6929 -15.03656 56.6929 0 curveto closepath fill
+grestore
+grestore
+gsave newpath -28.34645 -56.6929 moveto
+56.6929 -56.6929 lineto
+5.6692 28.34645 lineto
+ closepath clip
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinecap 1 setlinejoin 10 setmiterlimit
+newpath -809.777 -793.74214 moveto
+793.74214 809.777 lineto stroke
+newpath -805.76828 -797.75085 moveto
+797.75085 805.76828 lineto stroke
+newpath -801.75957 -801.75957 moveto
+801.75957 801.75957 lineto stroke
+newpath -797.75085 -805.76828 moveto
+805.76828 797.75085 lineto stroke
+newpath -793.74214 -809.777 moveto
+809.777 793.74214 lineto stroke
+newpath -789.73343 -813.7857 moveto
+813.7857 789.73343 lineto stroke
+newpath -785.72472 -817.79442 moveto
+817.79442 785.72472 lineto stroke
+newpath -781.71602 -821.80313 moveto
+821.80313 781.71602 lineto stroke
+newpath -777.7073 -825.81184 moveto
+825.81184 777.7073 lineto stroke
+newpath -773.6986 -829.82054 moveto
+829.82054 773.6986 lineto stroke
+newpath -769.68988 -833.82925 moveto
+833.82925 769.68988 lineto stroke
+newpath -765.68074 -837.83841 moveto
+837.83841 765.68074 lineto stroke
+newpath -761.67203 -841.8471 moveto
+841.8471 761.67203 lineto stroke
+newpath -757.66331 -845.85582 moveto
+845.85582 757.66331 lineto stroke
+newpath -753.6546 -849.86453 moveto
+849.86453 753.6546 lineto stroke
+newpath -749.64589 -853.87325 moveto
+853.87325 749.64589 lineto stroke
+newpath -745.63718 -857.88196 moveto
+857.88196 745.63718 lineto stroke
+grestore
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath -28.34645 -56.6929 moveto
+56.6929 -56.6929 lineto
+5.6692 28.34645 lineto
+ closepath stroke
+ 1 1 1 setrgbcolor
+newpath -55.1929 -85.03935 moveto
+-55.1929 -84.64151 -55.35097 -84.26001 -55.63226 -83.97871 curveto
+-55.91356 -83.69742 -56.29506 -83.53935 -56.6929 -83.53935 curveto
+-57.09074 -83.53935 -57.47224 -83.69742 -57.75354 -83.97871 curveto
+-58.03484 -84.26001 -58.1929 -84.64151 -58.1929 -85.03935 curveto
+-58.1929 -85.4372 -58.03484 -85.8187 -57.75354 -86.09999 curveto
+-57.47224 -86.38129 -57.09074 -86.53935 -56.6929 -86.53935 curveto
+-56.29506 -86.53935 -55.91356 -86.38129 -55.63226 -86.09999 curveto
+-55.35097 -85.8187 -55.1929 -85.4372 -55.1929 -85.03935 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath -55.1929 -85.03935 moveto
+-55.1929 -84.64151 -55.35097 -84.26001 -55.63226 -83.97871 curveto
+-55.91356 -83.69742 -56.29506 -83.53935 -56.6929 -83.53935 curveto
+-57.09074 -83.53935 -57.47224 -83.69742 -57.75354 -83.97871 curveto
+-58.03484 -84.26001 -58.1929 -84.64151 -58.1929 -85.03935 curveto
+-58.1929 -85.4372 -58.03484 -85.8187 -57.75354 -86.09999 curveto
+-57.47224 -86.38129 -57.09074 -86.53935 -56.6929 -86.53935 curveto
+-56.29506 -86.53935 -55.91356 -86.38129 -55.63226 -86.09999 curveto
+-55.35097 -85.8187 -55.1929 -85.4372 -55.1929 -85.03935 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 86.53935 -113.3858 moveto
+86.53935 -112.98796 86.38129 -112.60646 86.09999 -112.32516 curveto
+85.8187 -112.04387 85.4372 -111.8858 85.03935 -111.8858 curveto
+84.64151 -111.8858 84.26001 -112.04387 83.97871 -112.32516 curveto
+83.69742 -112.60646 83.53935 -112.98796 83.53935 -113.3858 curveto
+83.53935 -113.78365 83.69742 -114.16515 83.97871 -114.44644 curveto
+84.26001 -114.72774 84.64151 -114.8858 85.03935 -114.8858 curveto
+85.4372 -114.8858 85.8187 -114.72774 86.09999 -114.44644 curveto
+86.38129 -114.16515 86.53935 -113.78365 86.53935 -113.3858 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 86.53935 -113.3858 moveto
+86.53935 -112.98796 86.38129 -112.60646 86.09999 -112.32516 curveto
+85.8187 -112.04387 85.4372 -111.8858 85.03935 -111.8858 curveto
+84.64151 -111.8858 84.26001 -112.04387 83.97871 -112.32516 curveto
+83.69742 -112.60646 83.53935 -112.98796 83.53935 -113.3858 curveto
+83.53935 -113.78365 83.69742 -114.16515 83.97871 -114.44644 curveto
+84.26001 -114.72774 84.64151 -114.8858 85.03935 -114.8858 curveto
+85.4372 -114.8858 85.8187 -114.72774 86.09999 -114.44644 curveto
+86.38129 -114.16515 86.53935 -113.78365 86.53935 -113.3858 curveto closepath stroke
+gsave newpath 122.57669 -120.89413 moveto
+126.92839 -99.13646 119.67786 -75.98775 102.42586 -56.53848 curveto
+85.17387 -37.08879 59.33221 -22.93028 30.58047 -17.17976 curveto
+1.82875 -11.42924 -27.47144 -14.55905 -50.87663 -25.87712 curveto
+-74.2827 -37.19476 -89.87852 -55.77333 -94.23024 -77.53102 curveto
+-98.58194 -99.2887 -91.3314 -122.43741 -74.0794 -141.88667 curveto
+-56.82742 -161.33636 -30.98576 -175.49487 -2.23402 -181.24539 curveto
+26.5177 -186.99591 55.81789 -183.8661 79.22308 -172.54803 curveto
+102.62915 -161.2304 118.22498 -142.65182 122.57669 -120.89413 curveto closepath clip
+ [0 5.00008 ] 2.50003 setdash 1 setlinecap
+newpath -1064.75836 381.51097 moveto
+1066.20822 -394.10632 lineto stroke
+newpath -1071.05605 380.78693 moveto
+1059.91054 -394.83038 lineto stroke
+newpath -1069.36182 377.15321 moveto
+1061.60477 -398.4641 lineto stroke
+newpath -1067.66714 373.5195 moveto
+1063.29944 -402.0978 lineto stroke
+newpath -1073.96483 372.79501 moveto
+1057.00177 -402.82228 lineto stroke
+newpath -1072.27016 369.16174 moveto
+1058.69643 -406.45557 lineto stroke
+newpath -1070.57593 365.52803 moveto
+1060.39066 -410.08926 lineto stroke
+newpath -1076.8736 364.80354 moveto
+1054.09299 -410.81375 lineto stroke
+newpath -1075.17894 361.16985 moveto
+1055.78764 -414.44746 lineto stroke
+newpath -1073.48471 357.53613 moveto
+1057.48187 -418.08118 lineto stroke
+newpath -1079.78238 356.81207 moveto
+1051.1842 -418.80522 lineto stroke
+newpath -1078.08772 353.17838 moveto
+1052.87886 -422.43893 lineto stroke
+newpath -1076.3935 349.54466 moveto
+1054.57309 -426.07265 lineto stroke
+newpath -1082.69116 348.82018 moveto
+1048.27542 -426.79713 lineto stroke
+newpath -1080.9965 345.1869 moveto
+1049.97008 -430.4304 lineto stroke
+newpath -1079.30228 341.55319 moveto
+1051.6643 -434.06412 lineto stroke
+newpath -1085.59952 340.8287 moveto
+1045.36707 -434.7886 lineto stroke
+newpath -1083.90529 337.19499 moveto
+1047.0613 -438.4223 lineto stroke
+newpath -1082.21106 333.5613 moveto
+1048.75552 -442.05602 lineto stroke
+newpath -1088.5083 332.83723 moveto
+1042.45828 -442.78008 lineto stroke
+newpath -1086.81407 329.20352 moveto
+1044.15251 -446.41377 lineto stroke
+newpath -1085.11984 325.56982 moveto
+1045.84676 -450.04749 lineto stroke
+newpath -1091.41708 324.84532 moveto
+1039.54951 -450.77197 lineto stroke
+newpath -1089.72285 321.21205 moveto
+1041.24374 -454.40524 lineto stroke
+newpath -1088.02861 317.57835 moveto
+1042.93797 -458.03896 lineto stroke
+newpath -1094.32585 316.85385 moveto
+1036.64073 -458.76344 lineto stroke
+newpath -1092.63162 313.22015 moveto
+1038.33496 -462.39716 lineto stroke
+newpath -1090.93697 309.58644 moveto
+1040.02962 -466.03085 lineto stroke
+newpath -1097.23463 308.86238 moveto
+1033.73195 -466.75491 lineto stroke
+newpath -1095.5404 305.22868 moveto
+1035.42618 -470.38863 lineto stroke
+newpath -1093.84575 301.59497 moveto
+1037.12083 -474.02232 lineto stroke
+newpath -1100.14342 300.87048 moveto
+1030.82317 -474.74683 lineto stroke
+newpath -1098.44919 297.23721 moveto
+1032.5174 -478.3801 lineto stroke
+newpath -1096.75453 293.6035 moveto
+1034.21205 -482.0138 lineto stroke
+newpath -1103.0522 292.87901 moveto
+1027.91438 -482.7383 lineto stroke
+newpath -1101.35797 289.2453 moveto
+1029.60861 -486.372 lineto stroke
+newpath -1099.66331 285.61203 moveto
+1031.30327 -490.00526 lineto stroke
+newpath -1105.96098 284.88754 moveto
+1025.0056 -490.72977 lineto stroke
+newpath -1104.26633 281.25383 moveto
+1026.70027 -494.36346 lineto stroke
+newpath -1102.5721 277.62013 moveto
+1028.3945 -497.99718 lineto stroke
+newpath -1108.86977 276.89563 moveto
+1022.09682 -498.72166 lineto stroke
+newpath -1107.1751 273.26236 moveto
+1023.79149 -502.35493 lineto stroke
+newpath -1105.48087 269.62866 moveto
+1025.48572 -505.98865 lineto stroke
+newpath -1111.77855 268.90416 moveto
+1019.18803 -506.71313 lineto stroke
+newpath -1110.08388 265.27046 moveto
+1020.8827 -510.34685 lineto stroke
+newpath -1108.38965 261.63719 moveto
+1022.57693 -513.98012 lineto stroke
+newpath -1114.68733 260.91269 moveto
+1016.27927 -514.7046 lineto stroke
+newpath -1112.99266 257.27899 moveto
+1017.97392 -518.33832 lineto stroke
+newpath -1111.29843 253.64528 moveto
+1019.66815 -521.97202 lineto stroke
+newpath -1117.59567 252.92079 moveto
+1013.37091 -522.69652 lineto stroke
+newpath -1115.90144 249.28752 moveto
+1015.06514 -526.32979 lineto stroke
+newpath -1114.20721 245.65381 moveto
+1016.75937 -529.96349 lineto stroke
+newpath -1120.50446 244.92932 moveto
+1010.46213 -530.68799 lineto stroke
+newpath -1118.81023 241.29561 moveto
+1012.15636 -534.32169 lineto stroke
+newpath -1117.116 237.66234 moveto
+1013.85059 -537.95496 lineto stroke
+newpath -1123.41324 236.93785 moveto
+1007.55334 -538.67946 lineto stroke
+newpath -1121.71901 233.30414 moveto
+1009.24757 -542.31316 lineto stroke
+newpath -1120.02478 229.67044 moveto
+1010.9418 -545.94687 lineto stroke
+newpath -1126.32202 228.94595 moveto
+1004.64456 -546.67136 lineto stroke
+grestore
+newpath 122.57669 -120.89413 moveto
+126.92839 -99.13646 119.67786 -75.98775 102.42586 -56.53848 curveto
+85.17387 -37.08879 59.33221 -22.93028 30.58047 -17.17976 curveto
+1.82875 -11.42924 -27.47144 -14.55905 -50.87663 -25.87712 curveto
+-74.2827 -37.19476 -89.87852 -55.77333 -94.23024 -77.53102 curveto
+-98.58194 -99.2887 -91.3314 -122.43741 -74.0794 -141.88667 curveto
+-56.82742 -161.33636 -30.98576 -175.49487 -2.23402 -181.24539 curveto
+26.5177 -186.99591 55.81789 -183.8661 79.22308 -172.54803 curveto
+102.62915 -161.2304 118.22498 -142.65182 122.57669 -120.89413 curveto closepath stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,27 @@
+input geom2d;
+
+beginfig(1);
+
+A = Point(-1,1);
+B = Point(3,2);
+C1= Cercle(origine,2);
+C2 = Cercle(A,2);
+C3 = Cercle(B,3);
+
+colorie C1 withcolor LightCyan;
+colorieAvecTransparence(C2,DarkRed,0.2);
+colorieAvecTransparence(C3,DarkBlue,0.2);
+
+T1 = Triangle((-1,-2),(2,-2),(0.2,1));
+trace hachure(T1,45,0.2,0);
+trace T1;
+pE1 = Point(-2,-3); pointe pE1;
+pE2 = Point(3,-4); pointe pE2;
+E = EllipseF(pE1,pE2,3.9);
+trace hachure(E,-20,0.1,3);
+trace E;
+
+
+endfig;
+
+end.
\ No newline at end of file
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coloriage/coloriage.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD-2.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,60 @@
+%!PS
+%%BoundingBox: -929 -511 851 599
+%%HiResBoundingBox: -928.2857 -510.48611 850.64352 598.60251
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.11.08:2152
+%%Pages: 1
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinecap 1 setlinejoin 10 setmiterlimit
+newpath 161.73428 560.85843 moveto
+158.53009 548.63463 155.32242 536.41168 152.11217 524.18962 curveto
+148.90321 511.97273 145.69122 499.75716 142.47578 487.54199 curveto
+139.26205 475.33377 136.04445 463.1264 132.82251 450.92033 curveto
+129.60274 438.72249 126.37778 426.52594 123.1472 414.33112 curveto
+119.9192 402.14667 116.68517 389.96396 113.4442 377.78297 curveto
+110.2067 365.61584 106.96184 353.45042 103.70659 341.28761 curveto
+100.45612 329.14297 97.19568 317.00092 93.92184 304.86276 curveto
+90.6545 292.74838 87.37373 280.63791 84.07394 268.53262 curveto
+80.78366 256.46107 77.47392 244.39514 74.13693 232.33656 curveto
+70.81335 220.3273 67.46252 208.3254 64.0693 196.33559 curveto
+60.69772 184.42148 57.28418 172.51862 53.801 160.63652 curveto
+50.3537 148.87639 46.83765 137.13617 43.20221 125.4327 curveto
+39.63252 113.9416 35.94734 102.48598 32.01303 91.11427 curveto
+28.2154 80.13832 24.18591 69.2411 19.6573 58.54544 curveto
+15.43709 48.57816 10.77525 38.77394 4.78207 29.75607 curveto
+-0.63063 21.61148 -7.12122 14.1503 -15.26321 8.72202 curveto
+-23.4052 3.29373 -32.78943 0.17215 -42.38905 -1.69164 curveto
+-53.01854 -3.75525 -63.86127 -4.28769 -74.68495 -4.34998 curveto
+-86.29932 -4.4166 -97.90807 -3.94513 -109.50037 -3.22885 curveto
+-121.5105 -2.48706 -133.50203 -1.48273 -145.48232 -0.35814 curveto
+-157.68362 0.78722 -169.87325 2.05713 -182.05467 3.39798 curveto
+-194.36281 4.75267 -206.66273 6.1796 -218.95747 7.64934 curveto
+-231.33006 9.1286 -243.69704 10.65155 -256.06097 12.2026 curveto
+-268.47552 13.76016 -280.88661 15.34583 -293.2951 16.95094 curveto
+-305.73863 18.56084 -318.17914 20.19019 -330.61833 21.83337 curveto
+-343.0822 23.48003 -355.54433 25.14009 -368.00471 26.81053 curveto
+-380.48372 28.48357 -392.96141 30.16698 -405.43825 31.85818 curveto
+-417.92848 33.55112 -430.41786 35.25183 -442.90637 36.9586 curveto
+-455.4057 38.66667 -467.90416 40.38124 -480.40219 42.10011 curveto
+-492.90886 43.8203 -505.41467 45.54524 -517.92006 47.27408 curveto
+-530.43236 49.00377 -542.94379 50.73692 -555.45479 52.47398 curveto stroke
+newpath -8.8933 -0.83305 moveto
+-0.39014 4.83571 4.60992 15.00195 5.0096 27.42862 curveto
+5.40968 39.85527 1.17606 53.52504 -6.76178 65.43135 curveto
+-14.69962 77.33768 -25.6894 86.50304 -37.31372 90.91315 curveto
+-48.93846 95.32411 -60.24573 94.61821 -68.74889 88.94945 curveto
+-77.25203 83.28067 -82.2521 73.11443 -82.65178 60.68777 curveto
+-83.05186 48.26111 -78.81824 34.59135 -70.8804 22.68503 curveto
+-62.94257 10.77872 -51.95277 1.61334 -40.32846 -2.79675 curveto
+-28.70372 -7.20772 -17.39645 -6.50183 -8.8933 -0.83305 curveto closepath stroke
+newpath -237.83493 342.577 moveto
+160.19318 -254.46104 lineto stroke
+newpath 850.39352 566.92902 moveto
+-765.35417 -510.23611 lineto stroke
+newpath -928.0357 -478.81262 moveto
+687.71199 598.35251 lineto stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.2
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.2 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.2 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,115 @@
+%!PS
+%%BoundingBox: -313 -539 539 624
+%%HiResBoundingBox: -312.05966 -538.833 538.83127 623.87234
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.11.08:2152
+%%Pages: 1
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 1 1 1 setrgbcolor
+newpath 114.8858 42.51968 moveto
+114.8858 42.91753 114.72774 43.29903 114.44644 43.58032 curveto
+114.16515 43.86162 113.78365 44.01968 113.3858 44.01968 curveto
+112.98796 44.01968 112.60646 43.86162 112.32516 43.58032 curveto
+112.04387 43.29903 111.8858 42.91753 111.8858 42.51968 curveto
+111.8858 42.12184 112.04387 41.74034 112.32516 41.45905 curveto
+112.60646 41.17775 112.98796 41.01968 113.3858 41.01968 curveto
+113.78365 41.01968 114.16515 41.17775 114.44644 41.45905 curveto
+114.72774 41.74034 114.8858 42.12184 114.8858 42.51968 curveto closepath fill
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath 114.8858 42.51968 moveto
+114.8858 42.91753 114.72774 43.29903 114.44644 43.58032 curveto
+114.16515 43.86162 113.78365 44.01968 113.3858 44.01968 curveto
+112.98796 44.01968 112.60646 43.86162 112.32516 43.58032 curveto
+112.04387 43.29903 111.8858 42.91753 111.8858 42.51968 curveto
+111.8858 42.12184 112.04387 41.74034 112.32516 41.45905 curveto
+112.60646 41.17775 112.98796 41.01968 113.3858 41.01968 curveto
+113.78365 41.01968 114.16515 41.17775 114.44644 41.45905 curveto
+114.72774 41.74034 114.8858 42.12184 114.8858 42.51968 curveto closepath stroke
+newpath 141.73225 28.34602 moveto
+145.4914 35.8643 143.12198 46.06082 135.14781 56.69247 curveto
+127.17451 67.32455 114.24915 77.52065 99.21259 85.03893 curveto
+84.17601 92.5572 68.26358 96.78001 54.97446 96.77959 curveto
+41.68446 96.78044 32.10559 92.55806 28.34645 85.03978 curveto
+24.58731 77.5215 26.95673 67.32498 34.9309 56.69333 curveto
+42.90419 46.06125 55.82956 35.86516 70.86613 28.34688 curveto
+85.9027 20.8286 101.81512 16.60579 115.10425 16.60622 curveto
+128.39424 16.60536 137.97311 20.82774 141.73225 28.34602 curveto closepath stroke
+newpath 176.77042 10.82672 moveto
+184.2887 25.86328 184.81854 43.62221 178.24794 60.19685 curveto
+171.67778 76.77193 158.54393 90.80675 141.73268 99.21259 curveto
+124.92145 107.61841 105.81346 109.70496 88.61078 105.01587 curveto
+71.40852 100.32808 57.51947 89.24919 50.00119 74.21263 curveto
+42.48291 59.17607 41.95306 41.41714 48.52367 24.8425 curveto
+55.09383 8.26743 68.22768 -5.7674 85.03893 -14.17323 curveto
+101.85016 -22.57906 120.95815 -24.6656 138.16083 -19.97652 curveto
+155.36308 -15.28873 169.25214 -4.20984 176.77042 10.82672 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 86.53935 56.6929 moveto
+86.53935 57.09074 86.38129 57.47224 86.09999 57.75354 curveto
+85.8187 58.03484 85.4372 58.1929 85.03935 58.1929 curveto
+84.64151 58.1929 84.26001 58.03484 83.97871 57.75354 curveto
+83.69742 57.47224 83.53935 57.09074 83.53935 56.6929 curveto
+83.53935 56.29506 83.69742 55.91356 83.97871 55.63226 curveto
+84.26001 55.35097 84.64151 55.1929 85.03935 55.1929 curveto
+85.4372 55.1929 85.8187 55.35097 86.09999 55.63226 curveto
+86.38129 55.91356 86.53935 56.29506 86.53935 56.6929 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 86.53935 56.6929 moveto
+86.53935 57.09074 86.38129 57.47224 86.09999 57.75354 curveto
+85.8187 58.03484 85.4372 58.1929 85.03935 58.1929 curveto
+84.64151 58.1929 84.26001 58.03484 83.97871 57.75354 curveto
+83.69742 57.47224 83.53935 57.09074 83.53935 56.6929 curveto
+83.53935 56.29506 83.69742 55.91356 83.97871 55.63226 curveto
+84.26001 55.35097 84.64151 55.1929 85.03935 55.1929 curveto
+85.4372 55.1929 85.8187 55.35097 86.09999 55.63226 curveto
+86.38129 55.91356 86.53935 56.29506 86.53935 56.6929 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 143.23225 28.34645 moveto
+143.23225 28.7443 143.07419 29.1258 142.7929 29.40709 curveto
+142.5116 29.68839 142.1301 29.84645 141.73225 29.84645 curveto
+141.33441 29.84645 140.95291 29.68839 140.67162 29.40709 curveto
+140.39032 29.1258 140.23225 28.7443 140.23225 28.34645 curveto
+140.23225 27.94861 140.39032 27.56711 140.67162 27.28581 curveto
+140.95291 27.00452 141.33441 26.84645 141.73225 26.84645 curveto
+142.1301 26.84645 142.5116 27.00452 142.7929 27.28581 curveto
+143.07419 27.56711 143.23225 27.94861 143.23225 28.34645 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 143.23225 28.34645 moveto
+143.23225 28.7443 143.07419 29.1258 142.7929 29.40709 curveto
+142.5116 29.68839 142.1301 29.84645 141.73225 29.84645 curveto
+141.33441 29.84645 140.95291 29.68839 140.67162 29.40709 curveto
+140.39032 29.1258 140.23225 28.7443 140.23225 28.34645 curveto
+140.23225 27.94861 140.39032 27.56711 140.67162 27.28581 curveto
+140.95291 27.00452 141.33441 26.84645 141.73225 26.84645 curveto
+142.1301 26.84645 142.5116 27.00452 142.7929 27.28581 curveto
+143.07419 27.56711 143.23225 27.94861 143.23225 28.34645 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 100.71259 85.03935 moveto
+100.71259 85.4372 100.55452 85.8187 100.27322 86.09999 curveto
+99.99193 86.38129 99.61043 86.53935 99.21259 86.53935 curveto
+98.81474 86.53935 98.43324 86.38129 98.15195 86.09999 curveto
+97.87065 85.8187 97.71259 85.4372 97.71259 85.03935 curveto
+97.71259 84.64151 97.87065 84.26001 98.15195 83.97871 curveto
+98.43324 83.69742 98.81474 83.53935 99.21259 83.53935 curveto
+99.61043 83.53935 99.99193 83.69742 100.27322 83.97871 curveto
+100.55452 84.26001 100.71259 84.64151 100.71259 85.03935 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 100.71259 85.03935 moveto
+100.71259 85.4372 100.55452 85.8187 100.27322 86.09999 curveto
+99.99193 86.38129 99.61043 86.53935 99.21259 86.53935 curveto
+98.81474 86.53935 98.43324 86.38129 98.15195 86.09999 curveto
+97.87065 85.8187 97.71259 85.4372 97.71259 85.03935 curveto
+97.71259 84.64151 97.87065 84.26001 98.15195 83.97871 curveto
+98.43324 83.69742 98.81474 83.53935 99.21259 83.53935 curveto
+99.61043 83.53935 99.99193 83.69742 100.27322 83.97871 curveto
+100.55452 84.26001 100.71259 84.64151 100.71259 85.03935 curveto closepath stroke
+ 1 setlinecap
+newpath -311.80966 -453.54279 moveto
+226.7729 623.62234 lineto stroke
+newpath 538.58127 538.58214 moveto
+-0.0013 -538.583 lineto stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.2
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,39 @@
+input geom2d;
+
+beginfig(1);
+ A = Point(0,0);
+ B = Point(3,2);
+ AB = Droite(A,B);
+ F_1 = Point(-1,1);
+ Hyper = HyperboleFD(F_1,AB,1.5);
+ %trace AB;
+ trace DemiHyperbole(Hyper,1);
+ E = EllipseFD(F_1,AB,0.7);
+ trace E;
+ D = Droite(Foyer(E,1),Foyer(E,2));
+ trace D;
+ trace Directrice(E,1);
+ trace Directrice(E,2);
+
+
+endfig;
+
+beginfig(2);
+ C := Point(3,2);
+ A := Point(5,1);
+ B := Point(3.5,3) ;
+ E := Ellipse(C,A,B);
+ F := EllipseF(C,A,2.5);
+ D := Centre(F);
+ pointe D;
+ trace E;
+ trace F;
+ pointe C;
+ pointe A;
+ pointe B;
+ %trace Directrice(E,1);
+ %trace Directrice(E,2);
+ trace Directrice(F,1);
+ trace Directrice(F,2);
+endfig;
+end.
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/FD.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,195 @@
+%!PS
+%%BoundingBox: -129 -44 86 114
+%%HiResBoundingBox: -128.05904 -43.01968 85.53935 113.8858
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.11.09:2339
+%%Pages: 1
+%*Font: cmr10 9.96265 9.96265 28:c04004
+%*Font: cmmi10 9.96265 9.96265 12:8000000000680010000010008
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+gsave newpath -127.55904 -42.51968 moveto
+-127.55904 113.3858 lineto
+85.03935 113.3858 lineto
+85.03935 -42.51968 lineto
+ closepath clip
+ 0.698 0.132 0.132 setrgbcolor 0 1.2
+ dtransform truncate idtransform setlinewidth pop [] 0 setdash 1 setlinejoin
+ 10 setmiterlimit
+newpath -8.8933 -0.83305 moveto
+-0.39014 4.83571 4.60992 15.00195 5.0096 27.42862 curveto
+5.40968 39.85527 1.17606 53.52504 -6.76178 65.43135 curveto
+-14.69962 77.33768 -25.6894 86.50304 -37.31372 90.91315 curveto
+-48.93846 95.32411 -60.24573 94.61821 -68.74889 88.94945 curveto
+-77.25203 83.28067 -82.2521 73.11443 -82.65178 60.68777 curveto
+-83.05186 48.26111 -78.81824 34.59135 -70.8804 22.68503 curveto
+-62.94257 10.77872 -51.95277 1.61334 -40.32846 -2.79675 curveto
+-28.70372 -7.20772 -17.39645 -6.50183 -8.8933 -0.83305 curveto closepath stroke
+ 0.284 0.24 0.545 setrgbcolor 1 setlinecap
+newpath 161.73428 560.85843 moveto
+158.53009 548.63463 155.32242 536.41168 152.11217 524.18962 curveto
+148.90321 511.97273 145.69122 499.75716 142.47578 487.54199 curveto
+139.26205 475.33377 136.04445 463.1264 132.82251 450.92033 curveto
+129.60274 438.72249 126.37778 426.52594 123.1472 414.33112 curveto
+119.9192 402.14667 116.68517 389.96396 113.4442 377.78297 curveto
+110.2067 365.61584 106.96184 353.45042 103.70659 341.28761 curveto
+100.45612 329.14297 97.19568 317.00092 93.92184 304.86276 curveto
+90.6545 292.74838 87.37373 280.63791 84.07394 268.53262 curveto
+80.78366 256.46107 77.47392 244.39514 74.13693 232.33656 curveto
+70.81335 220.3273 67.46252 208.3254 64.0693 196.33559 curveto
+60.69772 184.42148 57.28418 172.51862 53.801 160.63652 curveto
+50.3537 148.87639 46.83765 137.13617 43.20221 125.4327 curveto
+39.63252 113.9416 35.94734 102.48598 32.01303 91.11427 curveto
+28.2154 80.13832 24.18591 69.2411 19.6573 58.54544 curveto
+15.43709 48.57816 10.77525 38.77394 4.78207 29.75607 curveto
+-0.63063 21.61148 -7.12122 14.1503 -15.26321 8.72202 curveto
+-23.4052 3.29373 -32.78943 0.17215 -42.38905 -1.69164 curveto
+-53.01854 -3.75525 -63.86127 -4.28769 -74.68495 -4.34998 curveto
+-86.29932 -4.4166 -97.90807 -3.94513 -109.50037 -3.22885 curveto
+-121.5105 -2.48706 -133.50203 -1.48273 -145.48232 -0.35814 curveto
+-157.68362 0.78722 -169.87325 2.05713 -182.05467 3.39798 curveto
+-194.36281 4.75267 -206.66273 6.1796 -218.95747 7.64934 curveto
+-231.33006 9.1286 -243.69704 10.65155 -256.06097 12.2026 curveto
+-268.47552 13.76016 -280.88661 15.34583 -293.2951 16.95094 curveto
+-305.73863 18.56084 -318.17914 20.19019 -330.61833 21.83337 curveto
+-343.0822 23.48003 -355.54433 25.14009 -368.00471 26.81053 curveto
+-380.48372 28.48357 -392.96141 30.16698 -405.43825 31.85818 curveto
+-417.92848 33.55112 -430.41786 35.25183 -442.90637 36.9586 curveto
+-455.4057 38.66667 -467.90416 40.38124 -480.40219 42.10011 curveto
+-492.90886 43.8203 -505.41467 45.54524 -517.92006 47.27408 curveto
+-530.43236 49.00377 -542.94379 50.73692 -555.45479 52.47398 curveto stroke
+ 0.956 0.644 0.376 setrgbcolor
+newpath -1091.42097 2440.57379 moveto
+-1040.4189 2347.61217 -989.69754 2254.49657 -939.25777 2161.22873 curveto
+-892.04555 2073.92853 -845.07986 1986.49553 -798.43297 1898.89214 curveto
+-754.97252 1817.27368 -711.78891 1735.50774 -668.947 1653.56271 curveto
+-629.24397 1577.62212 -589.83464 1501.52797 -550.79945 1425.24135 curveto
+-514.84735 1354.98033 -479.21315 1284.55711 -443.99074 1213.92758 curveto
+-411.78523 1149.34746 -379.92358 1084.59604 -348.52043 1019.62187 curveto
+-320.05373 960.72392 -291.9642 901.6443 -264.38896 842.32376 curveto
+-239.65242 789.10928 -215.33069 735.70233 -191.5959 682.03326 curveto
+-170.57611 634.50357 -150.01785 586.77058 -130.14168 538.75125 curveto
+-112.82135 496.90633 -96.02005 454.84644 -80.0263 412.47641 curveto
+-66.376 376.31453 -53.31526 339.93076 -41.24933 303.20961 curveto
+-31.23145 272.7217 -21.90129 242.0067 -13.81076 210.95087 curveto
+-7.34007 186.11269 -1.66481 161.0617 2.28896 135.6993 curveto
+5.29463 116.42046 7.30072 96.97032 7.04985 77.45619 curveto
+6.86948 63.43219 5.49748 49.32774 0.47232 36.22028 curveto
+-3.21112 26.61285 -8.8812 17.70139 -17.44403 11.99283 curveto
+-26.00688 6.28427 -36.41362 4.47757 -46.6988 4.77257 curveto
+-60.73102 5.17525 -74.27751 9.33362 -87.29242 14.56078 curveto
+-105.40211 21.83467 -122.58447 31.16699 -139.22443 41.35617 curveto
+-161.11533 54.76035 -182.0564 69.63428 -202.49529 85.16003 curveto
+-228.05104 104.57253 -252.81482 124.998 -277.10498 145.97107 curveto
+-306.36105 171.23184 -334.9229 197.28154 -363.05309 223.79016 curveto
+-396.0125 254.84988 -428.37502 286.53505 -460.3396 318.6173 curveto
+-497.02052 355.43317 -533.17548 392.76851 -568.96495 430.4516 curveto
+-609.37732 473.00198 -649.3217 515.99399 -688.92914 559.29439 curveto
+-733.08119 607.56372 -776.81282 656.21541 -820.23174 705.14478 curveto
+-868.12996 759.12224 -915.64711 813.43622 -962.87317 868.00279 curveto
+-1014.52275 927.6806 -1065.8237 987.65945 -1116.85301 1047.86884 curveto
+-1172.2587 1113.24136 -1227.34387 1178.88467 -1282.1717 1244.7425 curveto
+-1341.33437 1315.80716 -1400.19685 1387.12096 -1458.8288 1458.6242 curveto
+-1521.76012 1535.37018 -1584.42586 1612.33371 -1646.82472 1689.51309 curveto stroke
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [3 3 ] 0 setdash
+newpath -237.83493 342.577 moveto
+160.19318 -254.46104 lineto stroke
+ [] 0 setdash
+newpath -22.05614 18.91249 moveto
+-21.43977 19.32382 -20.86061 19.79744 -20.32903 20.32903 curveto
+-18.2027 22.45535 -17.00804 25.33905 -17.00804 28.34645 curveto
+-17.00804 30.56621 -17.65901 32.71849 -18.85495 34.54897 curveto stroke
+newpath -16.00174 31.74559 moveto
+-16.77881 32.84113 -17.745 33.79063 -18.85495 34.54897 curveto
+-18.60632 33.22789 -18.59457 31.87329 -18.8198 30.54915 curveto
+ closepath
+gsave fill grestore stroke
+newpath -28.34645 28.34645 moveto
+20.33421 60.15446 lineto stroke
+ 1 1 1 setrgbcolor
+newpath -26.84645 28.34645 moveto
+-26.84645 28.7443 -27.00452 29.1258 -27.28581 29.40709 curveto
+-27.56711 29.68839 -27.94861 29.84645 -28.34645 29.84645 curveto
+-28.7443 29.84645 -29.1258 29.68839 -29.40709 29.40709 curveto
+-29.68839 29.1258 -29.84645 28.7443 -29.84645 28.34645 curveto
+-29.84645 27.94861 -29.68839 27.56711 -29.40709 27.28581 curveto
+-29.1258 27.00452 -28.7443 26.84645 -28.34645 26.84645 curveto
+-27.94861 26.84645 -27.56711 27.00452 -27.28581 27.28581 curveto
+-27.00452 27.56711 -26.84645 27.94861 -26.84645 28.34645 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath -26.84645 28.34645 moveto
+-26.84645 28.7443 -27.00452 29.1258 -27.28581 29.40709 curveto
+-27.56711 29.68839 -27.94861 29.84645 -28.34645 29.84645 curveto
+-28.7443 29.84645 -29.1258 29.68839 -29.40709 29.40709 curveto
+-29.68839 29.1258 -29.84645 28.7443 -29.84645 28.34645 curveto
+-29.84645 27.94861 -29.68839 27.56711 -29.40709 27.28581 curveto
+-29.1258 27.00452 -28.7443 26.84645 -28.34645 26.84645 curveto
+-27.94861 26.84645 -27.56711 27.00452 -27.28581 27.28581 curveto
+-27.00452 27.56711 -26.84645 27.94861 -26.84645 28.34645 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 21.83421 60.15446 moveto
+21.83421 60.5523 21.67615 60.9338 21.39485 61.2151 curveto
+21.11356 61.4964 20.73206 61.65446 20.33421 61.65446 curveto
+19.93637 61.65446 19.55487 61.4964 19.27357 61.2151 curveto
+18.99228 60.9338 18.83421 60.5523 18.83421 60.15446 curveto
+18.83421 59.75662 18.99228 59.37512 19.27357 59.09383 curveto
+19.55487 58.81253 19.93637 58.65446 20.33421 58.65446 curveto
+20.73206 58.65446 21.11356 58.81253 21.39485 59.09383 curveto
+21.67615 59.37512 21.83421 59.75662 21.83421 60.15446 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 21.83421 60.15446 moveto
+21.83421 60.5523 21.67615 60.9338 21.39485 61.2151 curveto
+21.11356 61.4964 20.73206 61.65446 20.33421 61.65446 curveto
+19.93637 61.65446 19.55487 61.4964 19.27357 61.2151 curveto
+18.99228 60.9338 18.83421 60.5523 18.83421 60.15446 curveto
+18.83421 59.75662 18.99228 59.37512 19.27357 59.09383 curveto
+19.55487 58.81253 19.93637 58.65446 20.33421 58.65446 curveto
+20.73206 58.65446 21.11356 58.81253 21.39485 59.09383 curveto
+21.67615 59.37512 21.83421 59.75662 21.83421 60.15446 curveto closepath stroke
+-14.90805 24.77724 moveto
+(\022) cmmi10 9.96265 fshow
+22.4342 50.58247 moveto
+(M) cmmi10 9.96265 fshow
+33.1855 50.58247 moveto
+(\() cmr10 9.96265 fshow
+37.0599 50.58247 moveto
+(r) cmmi10 9.96265 fshow
+41.27791 50.58247 moveto
+(;) cmmi10 9.96265 fshow
+45.7057 50.58247 moveto
+(\022) cmmi10 9.96265 fshow
+50.65941 50.58247 moveto
+(\)) cmr10 9.96265 fshow
+ 0.284 0.24 0.545 setrgbcolor
+38.3751 98.00813 moveto
+(e) cmmi10 9.96265 fshow
+45.78131 98.00813 moveto
+(>) cmmi10 9.96265 fshow
+56.29741 98.00813 moveto
+(1) cmr10 9.96265 fshow
+ 0.956 0.644 0.376 setrgbcolor
+-111.51657 5.72896 moveto
+(e) cmmi10 9.96265 fshow
+-104.11037 5.72896 moveto
+(=) cmr10 9.96265 fshow
+-93.59427 5.72896 moveto
+(1) cmr10 9.96265 fshow
+ 0.698 0.132 0.132 setrgbcolor
+-106.38622 70.10936 moveto
+(e) cmmi10 9.96265 fshow
+-98.98001 70.10936 moveto
+(<) cmmi10 9.96265 fshow
+-88.46391 70.10936 moveto
+(1) cmr10 9.96265 fshow
+grestore
+ 1 1 1 setrgbcolor 0 1 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath -127.55904 -42.51968 moveto
+-127.55904 113.3858 lineto
+85.03935 113.3858 lineto
+85.03935 -42.51968 lineto
+ closepath stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,32 @@
+input geom2d;
+
+beginfig(1);
+ A = Point(0,0);
+ B = Point(3,2);
+ AB = Droite(A,B);
+ F = Point(-1,1);
+ Hyper = HyperboleFD(F,AB,1.5);
+ Para = ParaboleFD(F,AB);
+ H1 = Chemin(DemiHyperbole(Hyper,1));
+ E = EllipseFD(F,AB,0.7);
+ trace E avecCrayon(1.2,FireBrick);
+ trace H1 avecCrayon(1.2,DarkSlateBlue);
+ trace Para avecCrayon(1.2,SandyBrown);
+ S = Sommet(Hyper,1);
+ D = Droite(Foyer(E,1),Foyer(E,2));
+ trace D dashed evenly;
+ M = PointDe(H1,0.45);
+ fleche reverse gddTraceObjet ArcEntrePoints(F,0.4,S,M,-1);
+ trace Segment(F,M);
+ pointe F;
+ pointe M;
+ gddLabel.urt(textext("$\theta$"),Addition(F,(0.4,-0.2)));
+ gddLabel.lrt(textext("$M(r,\theta)$"),M);
+ gddLabel.rt(textext("$e>1$"),PointDe(H1,0.41)) withcolor
+ DarkSlateBlue;
+ gddLabel.llft(textext("$e=1$"),PointDe(Para,0.58)) withcolor
+ SandyBrown;
+ gddLabel.lft(textext("$e<1$"),PointDe(E,0.58)) withcolor FireBrick;
+ Fenetre(-4.5,-1.5,3,4);
+endfig;
+end
\ No newline at end of file
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/deuxcorps.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/mpxerr.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/mpxerr.tex (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/mpxerr.tex 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,18 @@
+%&latex
+\documentclass{article}
+\begin{document}
+
+\gdef\mpxshipout{\shipout\hbox\bgroup%
+ \setbox0=\hbox\bgroup}%
+\gdef\stopmpxshipout{\egroup \dimen0=\ht0 \advance\dimen0\dp0
+ \dimen1=\ht0 \dimen2=\dp0
+ \setbox0=\hbox\bgroup
+ \box0
+ \ifnum\dimen0>0 \vrule width1sp height\dimen1 depth\dimen2
+ \else \vrule width1sp height1sp depth0sp\relax
+ \fi\egroup
+ \ht0=0pt \dp0=0pt \box0 \egroup}
+\mpxshipout% line 7 ./ltx-deuxcorps.tmp
+$\theat$%
+\stopmpxshipout
+\end{document}
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/coniques/mpxerr.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,254 @@
+%!PS
+%%BoundingBox: -22 -22 107 192
+%%HiResBoundingBox: -21.75984 -21.75984 106.79921 191.83858
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.12.16:1820
+%%Pages: 1
+%*Font: cmsy7 6.97385 6.97385 30:8
+%*Font: cmr7 6.97385 6.97385 31:8
+%*Font: cmmi10 9.96265 9.96265 50:c
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+gsave newpath -21.25984 -21.25984 moveto
+-21.25984 191.33858 lineto
+106.29921 191.33858 lineto
+106.29921 -21.25984 lineto
+ closepath clip
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath 0 0 moveto
+85.03937 0 lineto
+85.03937 170.07874 lineto
+0 170.07874 lineto
+ closepath stroke
+ 1 setlinecap
+newpath -765.35431 1700.78735 moveto
+850.39368 -1530.70862 lineto stroke
+newpath 0 85.03937 moveto
+85.03937 85.03937 lineto stroke
+ 0.956 0.644 0.376 setrgbcolor
+newpath -765.35431 552.75719 moveto
+850.39368 -497.48148 lineto stroke
+newpath -792.9925 608.03291 moveto
+822.7555 -442.20575 lineto stroke
+newpath -811.64806 645.34404 moveto
+804.09993 -404.89462 lineto stroke
+ 0.235 0.7 0.444 setrgbcolor
+newpath -765.35431 55.27573 moveto
+850.39368 55.27573 lineto stroke
+newpath 850.39368 92.58684 moveto
+-765.35431 92.58684 lineto stroke
+newpath 850.39368 117.77127 moveto
+-765.35431 117.77127 lineto stroke
+ 0.53 0.808 0.92 setrgbcolor
+newpath 850.39368 412.3584 moveto
+-765.35431 -209.54776 lineto stroke
+newpath 935.43304 382.59476 moveto
+-680.31494 -239.31142 lineto stroke
+newpath -765.35431 850.39368 moveto
+850.39368 -765.35431 lineto stroke
+newpath 444.2605 39.91345 moveto
+-314.09521 39.91345 lineto stroke
+ 1 1 1 setrgbcolor
+newpath 86.53937 55.27573 moveto
+86.53937 55.67357 86.3813 56.05507 86.1 56.33636 curveto
+85.81871 56.61766 85.43721 56.77573 85.03937 56.77573 curveto
+84.64153 56.77573 84.26003 56.61766 83.97873 56.33636 curveto
+83.69743 56.05507 83.53937 55.67357 83.53937 55.27573 curveto
+83.53937 54.87788 83.69743 54.49638 83.97873 54.21509 curveto
+84.26003 53.93379 84.64153 53.77573 85.03937 53.77573 curveto
+85.43721 53.77573 85.81871 53.93379 86.1 54.21509 curveto
+86.3813 54.49638 86.53937 54.87788 86.53937 55.27573 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 86.53937 55.27573 moveto
+86.53937 55.67357 86.3813 56.05507 86.1 56.33636 curveto
+85.81871 56.61766 85.43721 56.77573 85.03937 56.77573 curveto
+84.64153 56.77573 84.26003 56.61766 83.97873 56.33636 curveto
+83.69743 56.05507 83.53937 55.67357 83.53937 55.27573 curveto
+83.53937 54.87788 83.69743 54.49638 83.97873 54.21509 curveto
+84.26003 53.93379 84.64153 53.77573 85.03937 53.77573 curveto
+85.43721 53.77573 85.81871 53.93379 86.1 54.21509 curveto
+86.3813 54.49638 86.53937 54.87788 86.53937 55.27573 curveto closepath stroke
+87.13936 46.36794 moveto
+(P) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 58.90118 55.27573 moveto
+58.90118 55.67357 58.74312 56.05507 58.46182 56.33636 curveto
+58.18053 56.61766 57.79903 56.77573 57.40118 56.77573 curveto
+57.00334 56.77573 56.62184 56.61766 56.34055 56.33636 curveto
+56.05925 56.05507 55.90118 55.67357 55.90118 55.27573 curveto
+55.90118 54.87788 56.05925 54.49638 56.34055 54.21509 curveto
+56.62184 53.93379 57.00334 53.77573 57.40118 53.77573 curveto
+57.79903 53.77573 58.18053 53.93379 58.46182 54.21509 curveto
+58.74312 54.49638 58.90118 54.87788 58.90118 55.27573 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 58.90118 55.27573 moveto
+58.90118 55.67357 58.74312 56.05507 58.46182 56.33636 curveto
+58.18053 56.61766 57.79903 56.77573 57.40118 56.77573 curveto
+57.00334 56.77573 56.62184 56.61766 56.34055 56.33636 curveto
+56.05925 56.05507 55.90118 55.67357 55.90118 55.27573 curveto
+55.90118 54.87788 56.05925 54.49638 56.34055 54.21509 curveto
+56.62184 53.93379 57.00334 53.77573 57.40118 53.77573 curveto
+57.79903 53.77573 58.18053 53.93379 58.46182 54.21509 curveto
+58.74312 54.49638 58.90118 54.87788 58.90118 55.27573 curveto closepath stroke
+44.72629 45.68604 moveto
+(P) cmmi10 9.96265 fshow
+52.5062 49.30144 moveto
+(0) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 40.24562 92.58684 moveto
+40.24562 92.98468 40.08755 93.36618 39.80626 93.64748 curveto
+39.52496 93.92877 39.14346 94.08684 38.74562 94.08684 curveto
+38.34778 94.08684 37.96628 93.92877 37.68498 93.64748 curveto
+37.40369 93.36618 37.24562 92.98468 37.24562 92.58684 curveto
+37.24562 92.189 37.40369 91.8075 37.68498 91.5262 curveto
+37.96628 91.2449 38.34778 91.08684 38.74562 91.08684 curveto
+39.14346 91.08684 39.52496 91.2449 39.80626 91.5262 curveto
+40.08755 91.8075 40.24562 92.189 40.24562 92.58684 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 40.24562 92.58684 moveto
+40.24562 92.98468 40.08755 93.36618 39.80626 93.64748 curveto
+39.52496 93.92877 39.14346 94.08684 38.74562 94.08684 curveto
+38.34778 94.08684 37.96628 93.92877 37.68498 93.64748 curveto
+37.40369 93.36618 37.24562 92.98468 37.24562 92.58684 curveto
+37.24562 92.189 37.40369 91.8075 37.68498 91.5262 curveto
+37.96628 91.2449 38.34778 91.08684 38.74562 91.08684 curveto
+39.14346 91.08684 39.52496 91.2449 39.80626 91.5262 curveto
+40.08755 91.8075 40.24562 92.189 40.24562 92.58684 curveto closepath stroke
+23.77373 82.99715 moveto
+(P) cmmi10 9.96265 fshow
+31.55363 86.61255 moveto
+(00) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 27.65373 117.77127 moveto
+27.65373 118.16911 27.49567 118.55061 27.21437 118.83191 curveto
+26.93307 119.1132 26.55157 119.27127 26.15373 119.27127 curveto
+25.75589 119.27127 25.37439 119.1132 25.0931 118.83191 curveto
+24.8118 118.55061 24.65373 118.16911 24.65373 117.77127 curveto
+24.65373 117.37343 24.8118 116.99193 25.0931 116.71063 curveto
+25.37439 116.42934 25.75589 116.27127 26.15373 116.27127 curveto
+26.55157 116.27127 26.93307 116.42934 27.21437 116.71063 curveto
+27.49567 116.99193 27.65373 117.37343 27.65373 117.77127 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 27.65373 117.77127 moveto
+27.65373 118.16911 27.49567 118.55061 27.21437 118.83191 curveto
+26.93307 119.1132 26.55157 119.27127 26.15373 119.27127 curveto
+25.75589 119.27127 25.37439 119.1132 25.0931 118.83191 curveto
+24.8118 118.55061 24.65373 118.16911 24.65373 117.77127 curveto
+24.65373 117.37343 24.8118 116.99193 25.0931 116.71063 curveto
+25.37439 116.42934 25.75589 116.27127 26.15373 116.27127 curveto
+26.55157 116.27127 26.93307 116.42934 27.21437 116.71063 curveto
+27.49567 116.99193 27.65373 117.37343 27.65373 117.77127 curveto closepath stroke
+8.88495 108.18158 moveto
+(P) cmmi10 9.96265 fshow
+16.66486 111.79698 moveto
+(000) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 1.5 55.27573 moveto
+1.5 55.67357 1.34193 56.05507 1.06064 56.33636 curveto
+0.77934 56.61766 0.39784 56.77573 0 56.77573 curveto
+-0.39784 56.77573 -0.77934 56.61766 -1.06064 56.33636 curveto
+-1.34193 56.05507 -1.5 55.67357 -1.5 55.27573 curveto
+-1.5 54.87788 -1.34193 54.49638 -1.06064 54.21509 curveto
+-0.77934 53.93379 -0.39784 53.77573 0 53.77573 curveto
+0.39784 53.77573 0.77934 53.93379 1.06064 54.21509 curveto
+1.34193 54.49638 1.5 54.87788 1.5 55.27573 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 1.5 55.27573 moveto
+1.5 55.67357 1.34193 56.05507 1.06064 56.33636 curveto
+0.77934 56.61766 0.39784 56.77573 0 56.77573 curveto
+-0.39784 56.77573 -0.77934 56.61766 -1.06064 56.33636 curveto
+-1.34193 56.05507 -1.5 55.67357 -1.5 55.27573 curveto
+-1.5 54.87788 -1.34193 54.49638 -1.06064 54.21509 curveto
+-0.77934 53.93379 -0.39784 53.77573 0 53.77573 curveto
+0.39784 53.77573 0.77934 53.93379 1.06064 54.21509 curveto
+1.34193 54.49638 1.5 54.87788 1.5 55.27573 curveto closepath stroke
+-10.47409 46.36794 moveto
+(Q) cmmi10 9.96265 fshow
+ 1 1 1 setrgbcolor
+newpath 1.5 92.58684 moveto
+1.5 92.98468 1.34193 93.36618 1.06064 93.64748 curveto
+0.77934 93.92877 0.39784 94.08684 0 94.08684 curveto
+-0.39784 94.08684 -0.77934 93.92877 -1.06064 93.64748 curveto
+-1.34193 93.36618 -1.5 92.98468 -1.5 92.58684 curveto
+-1.5 92.189 -1.34193 91.8075 -1.06064 91.5262 curveto
+-0.77934 91.2449 -0.39784 91.08684 0 91.08684 curveto
+0.39784 91.08684 0.77934 91.2449 1.06064 91.5262 curveto
+1.34193 91.8075 1.5 92.189 1.5 92.58684 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 1.5 92.58684 moveto
+1.5 92.98468 1.34193 93.36618 1.06064 93.64748 curveto
+0.77934 93.92877 0.39784 94.08684 0 94.08684 curveto
+-0.39784 94.08684 -0.77934 93.92877 -1.06064 93.64748 curveto
+-1.34193 93.36618 -1.5 92.98468 -1.5 92.58684 curveto
+-1.5 92.189 -1.34193 91.8075 -1.06064 91.5262 curveto
+-0.77934 91.2449 -0.39784 91.08684 0 91.08684 curveto
+0.39784 91.08684 0.77934 91.2449 1.06064 91.5262 curveto
+1.34193 91.8075 1.5 92.189 1.5 92.58684 curveto closepath stroke
+-12.77109 82.99715 moveto
+(Q) cmmi10 9.96265 fshow
+-4.89508 86.61255 moveto
+(0) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 1.5 117.77127 moveto
+1.5 118.16911 1.34193 118.55061 1.06064 118.83191 curveto
+0.77934 119.1132 0.39784 119.27127 0 119.27127 curveto
+-0.39784 119.27127 -0.77934 119.1132 -1.06064 118.83191 curveto
+-1.34193 118.55061 -1.5 118.16911 -1.5 117.77127 curveto
+-1.5 117.37343 -1.34193 116.99193 -1.06064 116.71063 curveto
+-0.77934 116.42934 -0.39784 116.27127 0 116.27127 curveto
+0.39784 116.27127 0.77934 116.42934 1.06064 116.71063 curveto
+1.34193 116.99193 1.5 117.37343 1.5 117.77127 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 1.5 117.77127 moveto
+1.5 118.16911 1.34193 118.55061 1.06064 118.83191 curveto
+0.77934 119.1132 0.39784 119.27127 0 119.27127 curveto
+-0.39784 119.27127 -0.77934 119.1132 -1.06064 118.83191 curveto
+-1.34193 118.55061 -1.5 118.16911 -1.5 117.77127 curveto
+-1.5 117.37343 -1.34193 116.99193 -1.06064 116.71063 curveto
+-0.77934 116.42934 -0.39784 116.27127 0 116.27127 curveto
+0.39784 116.27127 0.77934 116.42934 1.06064 116.71063 curveto
+1.34193 116.99193 1.5 117.37343 1.5 117.77127 curveto closepath stroke
+-15.068 108.18158 moveto
+(Q) cmmi10 9.96265 fshow
+-7.19199 111.79698 moveto
+(00) cmsy7 6.97385 fshow
+ 0.864 0.08 0.235 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 45.12592 39.91345 moveto
+85.03937 39.91345 lineto stroke
+ 1 1 1 setrgbcolor
+newpath 86.53937 39.91345 moveto
+86.53937 40.3113 86.3813 40.6928 86.1 40.97409 curveto
+85.81871 41.25539 85.43721 41.41345 85.03937 41.41345 curveto
+84.64153 41.41345 84.26003 41.25539 83.97873 40.97409 curveto
+83.69743 40.6928 83.53937 40.3113 83.53937 39.91345 curveto
+83.53937 39.51561 83.69743 39.13411 83.97873 38.85281 curveto
+84.26003 38.57152 84.64153 38.41345 85.03937 38.41345 curveto
+85.43721 38.41345 85.81871 38.57152 86.1 38.85281 curveto
+86.3813 39.13411 86.53937 39.51561 86.53937 39.91345 curveto closepath fill
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+newpath 86.53937 39.91345 moveto
+86.53937 40.3113 86.3813 40.6928 86.1 40.97409 curveto
+85.81871 41.25539 85.43721 41.41345 85.03937 41.41345 curveto
+84.64153 41.41345 84.26003 41.25539 83.97873 40.97409 curveto
+83.69743 40.6928 83.53937 40.3113 83.53937 39.91345 curveto
+83.53937 39.51561 83.69743 39.13411 83.97873 38.85281 curveto
+84.26003 38.57152 84.64153 38.41345 85.03937 38.41345 curveto
+85.43721 38.41345 85.81871 38.57152 86.1 38.85281 curveto
+86.3813 39.13411 86.53937 39.51561 86.53937 39.91345 curveto closepath stroke
+87.13936 31.00566 moveto
+(P) cmmi10 9.96265 fshow
+93.53546 29.51126 moveto
+(1) cmr7 6.97385 fshow
+grestore
+ 1 1 1 setrgbcolor 0 1 dtransform truncate idtransform setlinewidth pop
+ [] 0 setdash 1 setlinejoin 10 setmiterlimit
+newpath -21.25984 -21.25984 moveto
+-21.25984 191.33858 lineto
+106.29921 191.33858 lineto
+106.29921 -21.25984 lineto
+ closepath stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,64 @@
+input geom2d;
+
+beginfig(1);
+ gddU := 1.5cm;
+ A = Point(0,0);
+ B = Point(2,0);
+ C = Point(2,4);
+ D = Point(0,4);
+ ABCD = Polygone(A,B,C,D);
+ Diag = Droite(B,D);
+ A' = Point(0,2);
+ B' = Point(2,2);
+ P = Point(2,1.3);
+ D_P = Droite(P,(0,Ordonnee(P)));
+ D_AD = Droite(A,D);
+ Q = IntersectionDroites(D_P,D_AD);
+ Diag_Q = Droite(B,Q);
+ P' = IntersectionDroites(D_P,Diag);
+ Diag_P' = DroiteParallele(Diag_Q,P');
+ Q' = IntersectionDroites(Diag_P',D_AD);
+ D_Q' = Droite(Q',(Abscisse(B),Ordonnee(Q')));
+ P'' = IntersectionDroites(D_Q',Diag);
+ Diag_P'' = DroiteParallele(Diag_Q,P'');
+ Q'' = IntersectionDroites(Diag_P'',D_AD);
+ D_Q'' = Droite(Q'',(Abscisse(B),Ordonnee(Q'')));
+ P''' = IntersectionDroites(D_Q'',Diag);
+ E = Point(Abscisse(B),Ordonnee(P'''));
+ D_A'E = Droite(A',E);
+ D_BA' = Droite(B,A');
+ D_Ppar = DroiteParallele(D_A'E,P);
+ F = IntersectionDroites(D_BA',D_Ppar);
+ P_1 = Point(Abscisse(B),Ordonnee(F));
+ D_F = Droite(F,P_1);
+
+ % representation
+ trace ABCD;
+ trace Diag;
+ trace Segment(A',B');
+ drawoptions(avecCrayon(0.5,SandyBrown));
+ trace Diag_Q;
+ trace Diag_P';
+ trace Diag_P'';
+ drawoptions(avecCrayon(0.5,MediumSeaGreen));
+ trace D_P;
+ trace D_Q';
+ trace D_Q'';
+ drawoptions(avecCrayon(0.5,SkyBlue));
+ trace D_A'E;
+ trace D_Ppar;
+ trace D_BA';
+ trace D_F;
+ drawoptions();
+ marque.lrt "P";
+ marque.llft "P'";
+ marque.llft "P''";
+ marque.llft "P'''";
+ marque.llft "Q";
+ marque.llft "Q'";
+ marque.llft "Q''";
+ trace Segment(F,P_1) avecCrayon(0.8,Crimson);
+ marque.lrt "P_1";
+ Fenetre(-0.5,-0.5,2.5,4.5);
+endfig;
+end.
\ No newline at end of file
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/construction/pandrosion.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf
===================================================================
(Binary files differ)
Index: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf 2025-02-20 20:48:55 UTC (rev 74173)
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure-1.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure.mp (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,11 @@
+input geom2d;
+
+beginfig(1);
+ A = Point(0,0);
+ B = Point(3,0);
+ C = CercleCP(A,B);
+ trace hachure(C,35,0.2,0) avecCrayon(4pt,DarkRed);
+ trace C ;%avecCrayon(1pt,DarkRed);
+endfig;
+
+end
\ No newline at end of file
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/divers/hachure.mp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale-1.pdf
===================================================================
(Binary files differ)
Added: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.1
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.1 (rev 0)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.1 2025-02-20 20:48:55 UTC (rev 74173)
@@ -0,0 +1,685 @@
+%!PS
+%%BoundingBox: -11 -6 408 146
+%%HiResBoundingBox: -10.472 -5.88646 407.56883 145.57288
+%%Creator: MetaPost 2.10
+%%CreationDate: 2024.11.09:2342
+%%Pages: 1
+%*Font: cmsy7 6.97385 6.97385 30:8
+%*Font: cmmi10 9.96265 9.96265 41:ee000e
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop [] 0 setdash 1 setlinejoin
+ 10 setmiterlimit
+newpath 57.18968 67.43616 moveto
+74.40945 5.95209 lineto
+8.5038 17.00761 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 66.91582 55.76297 moveto
+24.6615 49.32298 lineto
+49.00897 3.92134 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 57.18968 67.43616 moveto
+114.55972 39.41064 lineto
+115.56924 106.22914 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 66.91582 55.76297 moveto
+80.87149 96.16367 lineto
+121.13724 64.02802 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 178.26009 35.0812 moveto
+114.55972 39.41064 lineto
+147.01523 97.8259 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 164.00728 29.81621 moveto
+172.06601 71.79285 lineto
+121.13724 64.02802 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 208.51358 64.1954 moveto
+206.63206 128.01451 lineto
+147.01523 97.8259 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 214.32162 78.23477 moveto
+172.06601 71.79285 lineto
+181.78047 122.38683 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 208.51358 64.1954 moveto
+254.92346 108.04059 lineto
+275.79727 44.55885 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 214.32162 78.23477 moveto
+239.67604 43.82767 lineto
+268.53851 86.50175 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 314.44362 131.14755 moveto
+254.92346 108.04059 lineto
+303.30765 61.94667 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 299.26952 131.92546 moveto
+319.46857 94.2601 lineto
+268.53851 86.50175 lineto
+ closepath stroke
+ 0.828 0.828 0.828 setrgbcolor 0 0.5
+ dtransform truncate idtransform setlinewidth pop
+newpath 352.00519 112.36223 moveto
+369.22041 50.87946 lineto
+303.30765 61.94667 lineto
+ closepath
+gsave fill grestore stroke
+ 0.484 0.408 0.932 setrgbcolor 0 0.8
+ dtransform truncate idtransform setlinewidth pop
+newpath 361.73003 100.6884 moveto
+319.46857 94.2601 lineto
+343.81929 48.85196 lineto
+ closepath stroke
+ 0 0 0 setrgbcolor 0 1 dtransform truncate idtransform setlinewidth pop
+newpath 0 0 moveto
+42.51968 85.03937 lineto
+106.29921 8.5038 lineto
+ closepath stroke
+newpath 133.83034 111.52528 moveto
+42.51968 85.03937 lineto
+106.29921 8.5038 lineto
+ closepath stroke
+newpath 133.83034 111.52528 moveto
+199.75415 43.01991 lineto
+106.29921 8.5038 lineto
+ closepath stroke
+newpath 133.83034 111.52528 moveto
+199.75415 43.01991 lineto
+237.8341 135.08318 lineto
+ closepath stroke
+newpath 294.80708 44.94165 moveto
+199.75415 43.01991 lineto
+237.8341 135.08318 lineto
+ closepath stroke
+newpath 294.80708 44.94165 moveto
+337.3313 129.97064 lineto
+237.8341 135.08318 lineto
+ closepath stroke
+newpath 294.80708 44.94165 moveto
+337.3313 129.97064 lineto
+401.1063 53.42729 lineto
+ closepath stroke
+ 0.804 0.52 0.248 setrgbcolor 1 setlinecap
+newpath 57.18968 67.43616 moveto
+114.55972 39.41064 lineto
+147.01523 97.8259 lineto
+208.51358 64.1954 lineto
+254.92346 108.04059 lineto
+303.30765 61.94667 lineto
+352.00519 112.36223 lineto stroke
+ 0 0 0 setrgbcolor 0 0.5 dtransform truncate idtransform setlinewidth pop
+ [3 3 ] 0 setdash
+newpath 57.18968 67.43616 moveto
+352.00519 112.36223 lineto stroke
+newpath 66.91582 55.76297 moveto
+361.73003 100.6884 lineto stroke
+ 1 1 1 setrgbcolor
+newpath 1.5 0 moveto
+1.5 0.39784 1.34193 0.77934 1.06064 1.06064 curveto
+0.77934 1.34193 0.39784 1.5 0 1.5 curveto
+-0.39784 1.5 -0.77934 1.34193 -1.06064 1.06064 curveto
+-1.34193 0.77934 -1.5 0.39784 -1.5 0 curveto
+-1.5 -0.39784 -1.34193 -0.77934 -1.06064 -1.06064 curveto
+-0.77934 -1.34193 -0.39784 -1.5 0 -1.5 curveto
+0.39784 -1.5 0.77934 -1.34193 1.06064 -1.06064 curveto
+1.34193 -0.77934 1.5 -0.39784 1.5 0 curveto closepath fill
+ 0 0 0 setrgbcolor [] 0 setdash
+newpath 1.5 0 moveto
+1.5 0.39784 1.34193 0.77934 1.06064 1.06064 curveto
+0.77934 1.34193 0.39784 1.5 0 1.5 curveto
+-0.39784 1.5 -0.77934 1.34193 -1.06064 1.06064 curveto
+-1.34193 0.77934 -1.5 0.39784 -1.5 0 curveto
+-1.5 -0.39784 -1.34193 -0.77934 -1.06064 -1.06064 curveto
+-0.77934 -1.34193 -0.39784 -1.5 0 -1.5 curveto
+0.39784 -1.5 0.77934 -1.34193 1.06064 -1.06064 curveto
+1.34193 -0.77934 1.5 -0.39784 1.5 0 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 44.01968 85.03937 moveto
+44.01968 85.43721 43.86162 85.81871 43.58032 86.1 curveto
+43.29903 86.3813 42.91753 86.53937 42.51968 86.53937 curveto
+42.12184 86.53937 41.74034 86.3813 41.45905 86.1 curveto
+41.17775 85.81871 41.01968 85.43721 41.01968 85.03937 curveto
+41.01968 84.64153 41.17775 84.26003 41.45905 83.97873 curveto
+41.74034 83.69743 42.12184 83.53937 42.51968 83.53937 curveto
+42.91753 83.53937 43.29903 83.69743 43.58032 83.97873 curveto
+43.86162 84.26003 44.01968 84.64153 44.01968 85.03937 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 44.01968 85.03937 moveto
+44.01968 85.43721 43.86162 85.81871 43.58032 86.1 curveto
+43.29903 86.3813 42.91753 86.53937 42.51968 86.53937 curveto
+42.12184 86.53937 41.74034 86.3813 41.45905 86.1 curveto
+41.17775 85.81871 41.01968 85.43721 41.01968 85.03937 curveto
+41.01968 84.64153 41.17775 84.26003 41.45905 83.97873 curveto
+41.74034 83.69743 42.12184 83.53937 42.51968 83.53937 curveto
+42.91753 83.53937 43.29903 83.69743 43.58032 83.97873 curveto
+43.86162 84.26003 44.01968 84.64153 44.01968 85.03937 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 107.79921 8.5038 moveto
+107.79921 8.90164 107.64114 9.28314 107.35985 9.56444 curveto
+107.07855 9.84573 106.69705 10.0038 106.29921 10.0038 curveto
+105.90137 10.0038 105.51987 9.84573 105.23857 9.56444 curveto
+104.95728 9.28314 104.79921 8.90164 104.79921 8.5038 curveto
+104.79921 8.10596 104.95728 7.72446 105.23857 7.44316 curveto
+105.51987 7.16187 105.90137 7.0038 106.29921 7.0038 curveto
+106.69705 7.0038 107.07855 7.16187 107.35985 7.44316 curveto
+107.64114 7.72446 107.79921 8.10596 107.79921 8.5038 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 107.79921 8.5038 moveto
+107.79921 8.90164 107.64114 9.28314 107.35985 9.56444 curveto
+107.07855 9.84573 106.69705 10.0038 106.29921 10.0038 curveto
+105.90137 10.0038 105.51987 9.84573 105.23857 9.56444 curveto
+104.95728 9.28314 104.79921 8.90164 104.79921 8.5038 curveto
+104.79921 8.10596 104.95728 7.72446 105.23857 7.44316 curveto
+105.51987 7.16187 105.90137 7.0038 106.29921 7.0038 curveto
+106.69705 7.0038 107.07855 7.16187 107.35985 7.44316 curveto
+107.64114 7.72446 107.79921 8.10596 107.79921 8.5038 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 135.33034 111.52528 moveto
+135.33034 111.92313 135.17227 112.30463 134.89098 112.58592 curveto
+134.60968 112.86722 134.22818 113.02528 133.83034 113.02528 curveto
+133.4325 113.02528 133.051 112.86722 132.7697 112.58592 curveto
+132.4884 112.30463 132.33034 111.92313 132.33034 111.52528 curveto
+132.33034 111.12744 132.4884 110.74594 132.7697 110.46465 curveto
+133.051 110.18335 133.4325 110.02528 133.83034 110.02528 curveto
+134.22818 110.02528 134.60968 110.18335 134.89098 110.46465 curveto
+135.17227 110.74594 135.33034 111.12744 135.33034 111.52528 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 135.33034 111.52528 moveto
+135.33034 111.92313 135.17227 112.30463 134.89098 112.58592 curveto
+134.60968 112.86722 134.22818 113.02528 133.83034 113.02528 curveto
+133.4325 113.02528 133.051 112.86722 132.7697 112.58592 curveto
+132.4884 112.30463 132.33034 111.92313 132.33034 111.52528 curveto
+132.33034 111.12744 132.4884 110.74594 132.7697 110.46465 curveto
+133.051 110.18335 133.4325 110.02528 133.83034 110.02528 curveto
+134.22818 110.02528 134.60968 110.18335 134.89098 110.46465 curveto
+135.17227 110.74594 135.33034 111.12744 135.33034 111.52528 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 201.25415 43.01991 moveto
+201.25415 43.41776 201.09608 43.79926 200.81479 44.08055 curveto
+200.5335 44.36185 200.152 44.51991 199.75415 44.51991 curveto
+199.35631 44.51991 198.97481 44.36185 198.69351 44.08055 curveto
+198.41222 43.79926 198.25415 43.41776 198.25415 43.01991 curveto
+198.25415 42.62207 198.41222 42.24057 198.69351 41.95927 curveto
+198.97481 41.67798 199.35631 41.51991 199.75415 41.51991 curveto
+200.152 41.51991 200.5335 41.67798 200.81479 41.95927 curveto
+201.09608 42.24057 201.25415 42.62207 201.25415 43.01991 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 201.25415 43.01991 moveto
+201.25415 43.41776 201.09608 43.79926 200.81479 44.08055 curveto
+200.5335 44.36185 200.152 44.51991 199.75415 44.51991 curveto
+199.35631 44.51991 198.97481 44.36185 198.69351 44.08055 curveto
+198.41222 43.79926 198.25415 43.41776 198.25415 43.01991 curveto
+198.25415 42.62207 198.41222 42.24057 198.69351 41.95927 curveto
+198.97481 41.67798 199.35631 41.51991 199.75415 41.51991 curveto
+200.152 41.51991 200.5335 41.67798 200.81479 41.95927 curveto
+201.09608 42.24057 201.25415 42.62207 201.25415 43.01991 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 239.3341 135.08318 moveto
+239.3341 135.48102 239.17604 135.86252 238.89474 136.14381 curveto
+238.61345 136.42511 238.23195 136.58318 237.8341 136.58318 curveto
+237.43626 136.58318 237.05476 136.42511 236.77347 136.14381 curveto
+236.49217 135.86252 236.3341 135.48102 236.3341 135.08318 curveto
+236.3341 134.68533 236.49217 134.30383 236.77347 134.02254 curveto
+237.05476 133.74124 237.43626 133.58318 237.8341 133.58318 curveto
+238.23195 133.58318 238.61345 133.74124 238.89474 134.02254 curveto
+239.17604 134.30383 239.3341 134.68533 239.3341 135.08318 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 239.3341 135.08318 moveto
+239.3341 135.48102 239.17604 135.86252 238.89474 136.14381 curveto
+238.61345 136.42511 238.23195 136.58318 237.8341 136.58318 curveto
+237.43626 136.58318 237.05476 136.42511 236.77347 136.14381 curveto
+236.49217 135.86252 236.3341 135.48102 236.3341 135.08318 curveto
+236.3341 134.68533 236.49217 134.30383 236.77347 134.02254 curveto
+237.05476 133.74124 237.43626 133.58318 237.8341 133.58318 curveto
+238.23195 133.58318 238.61345 133.74124 238.89474 134.02254 curveto
+239.17604 134.30383 239.3341 134.68533 239.3341 135.08318 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 296.30708 44.94165 moveto
+296.30708 45.3395 296.14902 45.721 295.86772 46.00229 curveto
+295.58643 46.28358 295.20493 46.44165 294.80708 46.44165 curveto
+294.40924 46.44165 294.02774 46.28358 293.74644 46.00229 curveto
+293.46515 45.721 293.30708 45.3395 293.30708 44.94165 curveto
+293.30708 44.54381 293.46515 44.16231 293.74644 43.88101 curveto
+294.02774 43.59972 294.40924 43.44165 294.80708 43.44165 curveto
+295.20493 43.44165 295.58643 43.59972 295.86772 43.88101 curveto
+296.14902 44.16231 296.30708 44.54381 296.30708 44.94165 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 296.30708 44.94165 moveto
+296.30708 45.3395 296.14902 45.721 295.86772 46.00229 curveto
+295.58643 46.28358 295.20493 46.44165 294.80708 46.44165 curveto
+294.40924 46.44165 294.02774 46.28358 293.74644 46.00229 curveto
+293.46515 45.721 293.30708 45.3395 293.30708 44.94165 curveto
+293.30708 44.54381 293.46515 44.16231 293.74644 43.88101 curveto
+294.02774 43.59972 294.40924 43.44165 294.80708 43.44165 curveto
+295.20493 43.44165 295.58643 43.59972 295.86772 43.88101 curveto
+296.14902 44.16231 296.30708 44.54381 296.30708 44.94165 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 338.8313 129.97064 moveto
+338.8313 130.36848 338.67323 130.74998 338.39194 131.03128 curveto
+338.11064 131.31258 337.72914 131.47064 337.3313 131.47064 curveto
+336.93346 131.47064 336.55196 131.31258 336.27066 131.03128 curveto
+335.98936 130.74998 335.8313 130.36848 335.8313 129.97064 curveto
+335.8313 129.5728 335.98936 129.1913 336.27066 128.91 curveto
+336.55196 128.62871 336.93346 128.47064 337.3313 128.47064 curveto
+337.72914 128.47064 338.11064 128.62871 338.39194 128.91 curveto
+338.67323 129.1913 338.8313 129.5728 338.8313 129.97064 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 338.8313 129.97064 moveto
+338.8313 130.36848 338.67323 130.74998 338.39194 131.03128 curveto
+338.11064 131.31258 337.72914 131.47064 337.3313 131.47064 curveto
+336.93346 131.47064 336.55196 131.31258 336.27066 131.03128 curveto
+335.98936 130.74998 335.8313 130.36848 335.8313 129.97064 curveto
+335.8313 129.5728 335.98936 129.1913 336.27066 128.91 curveto
+336.55196 128.62871 336.93346 128.47064 337.3313 128.47064 curveto
+337.72914 128.47064 338.11064 128.62871 338.39194 128.91 curveto
+338.67323 129.1913 338.8313 129.5728 338.8313 129.97064 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 402.6063 53.42729 moveto
+402.6063 53.82513 402.44823 54.20663 402.16693 54.48793 curveto
+401.88564 54.76923 401.50414 54.92729 401.1063 54.92729 curveto
+400.70845 54.92729 400.32695 54.76923 400.04565 54.48793 curveto
+399.76436 54.20663 399.6063 53.82513 399.6063 53.42729 curveto
+399.6063 53.02945 399.76436 52.64795 400.04565 52.36665 curveto
+400.32695 52.08536 400.70845 51.92729 401.1063 51.92729 curveto
+401.50414 51.92729 401.88564 52.08536 402.16693 52.36665 curveto
+402.44823 52.64795 402.6063 53.02945 402.6063 53.42729 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 402.6063 53.42729 moveto
+402.6063 53.82513 402.44823 54.20663 402.16693 54.48793 curveto
+401.88564 54.76923 401.50414 54.92729 401.1063 54.92729 curveto
+400.70845 54.92729 400.32695 54.76923 400.04565 54.48793 curveto
+399.76436 54.20663 399.6063 53.82513 399.6063 53.42729 curveto
+399.6063 53.02945 399.76436 52.64795 400.04565 52.36665 curveto
+400.32695 52.08536 400.70845 51.92729 401.1063 51.92729 curveto
+401.50414 51.92729 401.88564 52.08536 402.16693 52.36665 curveto
+402.44823 52.64795 402.6063 53.02945 402.6063 53.42729 curveto closepath stroke
+-10.472 -3.4039 moveto
+(A) cmmi10 9.96265 fshow
+31.46309 81.63547 moveto
+(B) cmmi10 9.96265 fshow
+102.38266 -1.304 moveto
+(C) cmmi10 9.96265 fshow
+128.69678 114.52528 moveto
+(A) cmmi10 9.96265 fshow
+136.16878 118.14069 moveto
+(0) cmsy7 6.97385 fshow
+194.3283 32.53021 moveto
+(B) cmmi10 9.96265 fshow
+202.38489 36.14561 moveto
+(0) cmsy7 6.97385 fshow
+232.52 138.08318 moveto
+(C) cmmi10 9.96265 fshow
+240.3531 141.69858 moveto
+(0) cmsy7 6.97385 fshow
+288.52509 34.45195 moveto
+(A) cmmi10 9.96265 fshow
+295.99709 38.06735 moveto
+(00) cmsy7 6.97385 fshow
+330.75699 132.97064 moveto
+(B) cmmi10 9.96265 fshow
+338.81358 136.58604 moveto
+(00) cmsy7 6.97385 fshow
+394.64374 42.93759 moveto
+(C) cmmi10 9.96265 fshow
+402.47684 46.553 moveto
+(00) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 58.68968 67.43616 moveto
+58.68968 67.834 58.53162 68.2155 58.25032 68.4968 curveto
+57.96902 68.77809 57.58752 68.93616 57.18968 68.93616 curveto
+56.79184 68.93616 56.41034 68.77809 56.12904 68.4968 curveto
+55.84775 68.2155 55.68968 67.834 55.68968 67.43616 curveto
+55.68968 67.03831 55.84775 66.65681 56.12904 66.37552 curveto
+56.41034 66.09422 56.79184 65.93616 57.18968 65.93616 curveto
+57.58752 65.93616 57.96902 66.09422 58.25032 66.37552 curveto
+58.53162 66.65681 58.68968 67.03831 58.68968 67.43616 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 58.68968 67.43616 moveto
+58.68968 67.834 58.53162 68.2155 58.25032 68.4968 curveto
+57.96902 68.77809 57.58752 68.93616 57.18968 68.93616 curveto
+56.79184 68.93616 56.41034 68.77809 56.12904 68.4968 curveto
+55.84775 68.2155 55.68968 67.834 55.68968 67.43616 curveto
+55.68968 67.03831 55.84775 66.65681 56.12904 66.37552 curveto
+56.41034 66.09422 56.79184 65.93616 57.18968 65.93616 curveto
+57.58752 65.93616 57.96902 66.09422 58.25032 66.37552 curveto
+58.53162 66.65681 58.68968 67.03831 58.68968 67.43616 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 75.90945 5.95209 moveto
+75.90945 6.34993 75.75139 6.73143 75.4701 7.01273 curveto
+75.1888 7.29402 74.8073 7.45209 74.40945 7.45209 curveto
+74.01161 7.45209 73.63011 7.29402 73.34882 7.01273 curveto
+73.06752 6.73143 72.90945 6.34993 72.90945 5.95209 curveto
+72.90945 5.55424 73.06752 5.17274 73.34882 4.89145 curveto
+73.63011 4.61015 74.01161 4.45209 74.40945 4.45209 curveto
+74.8073 4.45209 75.1888 4.61015 75.4701 4.89145 curveto
+75.75139 5.17274 75.90945 5.55424 75.90945 5.95209 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 75.90945 5.95209 moveto
+75.90945 6.34993 75.75139 6.73143 75.4701 7.01273 curveto
+75.1888 7.29402 74.8073 7.45209 74.40945 7.45209 curveto
+74.01161 7.45209 73.63011 7.29402 73.34882 7.01273 curveto
+73.06752 6.73143 72.90945 6.34993 72.90945 5.95209 curveto
+72.90945 5.55424 73.06752 5.17274 73.34882 4.89145 curveto
+73.63011 4.61015 74.01161 4.45209 74.40945 4.45209 curveto
+74.8073 4.45209 75.1888 4.61015 75.4701 4.89145 curveto
+75.75139 5.17274 75.90945 5.55424 75.90945 5.95209 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 10.0038 17.00761 moveto
+10.0038 17.40546 9.84573 17.78696 9.56444 18.06825 curveto
+9.28314 18.34955 8.90164 18.50761 8.5038 18.50761 curveto
+8.10596 18.50761 7.72446 18.34955 7.44316 18.06825 curveto
+7.16187 17.78696 7.0038 17.40546 7.0038 17.00761 curveto
+7.0038 16.60977 7.16187 16.22827 7.44316 15.94698 curveto
+7.72446 15.66568 8.10596 15.50761 8.5038 15.50761 curveto
+8.90164 15.50761 9.28314 15.66568 9.56444 15.94698 curveto
+9.84573 16.22827 10.0038 16.60977 10.0038 17.00761 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 10.0038 17.00761 moveto
+10.0038 17.40546 9.84573 17.78696 9.56444 18.06825 curveto
+9.28314 18.34955 8.90164 18.50761 8.5038 18.50761 curveto
+8.10596 18.50761 7.72446 18.34955 7.44316 18.06825 curveto
+7.16187 17.78696 7.0038 17.40546 7.0038 17.00761 curveto
+7.0038 16.60977 7.16187 16.22827 7.44316 15.94698 curveto
+7.72446 15.66568 8.10596 15.50761 8.5038 15.50761 curveto
+8.90164 15.50761 9.28314 15.66568 9.56444 15.94698 curveto
+9.84573 16.22827 10.0038 16.60977 10.0038 17.00761 curveto closepath stroke
+ 0.5 0.5 0.5 setrgbcolor
+46.30128 64.03226 moveto
+(U) cmmi10 9.96265 fshow
+70.3967 -3.85571 moveto
+(V) cmmi10 9.96265 fshow
+-5.2891 13.60371 moveto
+(W) cmmi10 9.96265 fshow
+194.83008 60.45055 moveto
+(U) cmmi10 9.96265 fshow
+202.71848 64.06595 moveto
+(0) cmsy7 6.97385 fshow
+116.65971 29.82095 moveto
+(V) cmmi10 9.96265 fshow
+124.68521 33.43636 moveto
+(0) cmsy7 6.97385 fshow
+149.11522 99.92589 moveto
+(W) cmmi10 9.96265 fshow
+159.90811 103.54129 moveto
+(0) cmsy7 6.97385 fshow
+354.10518 114.46222 moveto
+(U) cmmi10 9.96265 fshow
+361.99358 118.07762 moveto
+(00) cmsy7 6.97385 fshow
+257.02345 110.14058 moveto
+(V) cmmi10 9.96265 fshow
+265.04895 113.75598 moveto
+(00) cmsy7 6.97385 fshow
+305.40764 52.35698 moveto
+(W) cmmi10 9.96265 fshow
+316.20053 55.97238 moveto
+(00) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 210.01358 64.1954 moveto
+210.01358 64.59325 209.85551 64.97475 209.57422 65.25604 curveto
+209.29292 65.53734 208.91142 65.6954 208.51358 65.6954 curveto
+208.11574 65.6954 207.73424 65.53734 207.45294 65.25604 curveto
+207.17165 64.97475 207.01358 64.59325 207.01358 64.1954 curveto
+207.01358 63.79756 207.17165 63.41606 207.45294 63.13477 curveto
+207.73424 62.85347 208.11574 62.6954 208.51358 62.6954 curveto
+208.91142 62.6954 209.29292 62.85347 209.57422 63.13477 curveto
+209.85551 63.41606 210.01358 63.79756 210.01358 64.1954 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 210.01358 64.1954 moveto
+210.01358 64.59325 209.85551 64.97475 209.57422 65.25604 curveto
+209.29292 65.53734 208.91142 65.6954 208.51358 65.6954 curveto
+208.11574 65.6954 207.73424 65.53734 207.45294 65.25604 curveto
+207.17165 64.97475 207.01358 64.59325 207.01358 64.1954 curveto
+207.01358 63.79756 207.17165 63.41606 207.45294 63.13477 curveto
+207.73424 62.85347 208.11574 62.6954 208.51358 62.6954 curveto
+208.91142 62.6954 209.29292 62.85347 209.57422 63.13477 curveto
+209.85551 63.41606 210.01358 63.79756 210.01358 64.1954 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 116.05972 39.41064 moveto
+116.05972 39.80849 115.90166 40.18999 115.62036 40.47128 curveto
+115.33907 40.75258 114.95757 40.91064 114.55972 40.91064 curveto
+114.16188 40.91064 113.78038 40.75258 113.49908 40.47128 curveto
+113.21779 40.18999 113.05972 39.80849 113.05972 39.41064 curveto
+113.05972 39.0128 113.21779 38.6313 113.49908 38.35 curveto
+113.78038 38.06871 114.16188 37.91064 114.55972 37.91064 curveto
+114.95757 37.91064 115.33907 38.06871 115.62036 38.35 curveto
+115.90166 38.6313 116.05972 39.0128 116.05972 39.41064 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 116.05972 39.41064 moveto
+116.05972 39.80849 115.90166 40.18999 115.62036 40.47128 curveto
+115.33907 40.75258 114.95757 40.91064 114.55972 40.91064 curveto
+114.16188 40.91064 113.78038 40.75258 113.49908 40.47128 curveto
+113.21779 40.18999 113.05972 39.80849 113.05972 39.41064 curveto
+113.05972 39.0128 113.21779 38.6313 113.49908 38.35 curveto
+113.78038 38.06871 114.16188 37.91064 114.55972 37.91064 curveto
+114.95757 37.91064 115.33907 38.06871 115.62036 38.35 curveto
+115.90166 38.6313 116.05972 39.0128 116.05972 39.41064 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 148.51523 97.8259 moveto
+148.51523 98.22374 148.35716 98.60524 148.07587 98.88654 curveto
+147.79457 99.16783 147.41307 99.3259 147.01523 99.3259 curveto
+146.61739 99.3259 146.23589 99.16783 145.95459 98.88654 curveto
+145.6733 98.60524 145.51523 98.22374 145.51523 97.8259 curveto
+145.51523 97.42805 145.6733 97.04655 145.95459 96.76526 curveto
+146.23589 96.48396 146.61739 96.3259 147.01523 96.3259 curveto
+147.41307 96.3259 147.79457 96.48396 148.07587 96.76526 curveto
+148.35716 97.04655 148.51523 97.42805 148.51523 97.8259 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 148.51523 97.8259 moveto
+148.51523 98.22374 148.35716 98.60524 148.07587 98.88654 curveto
+147.79457 99.16783 147.41307 99.3259 147.01523 99.3259 curveto
+146.61739 99.3259 146.23589 99.16783 145.95459 98.88654 curveto
+145.6733 98.60524 145.51523 98.22374 145.51523 97.8259 curveto
+145.51523 97.42805 145.6733 97.04655 145.95459 96.76526 curveto
+146.23589 96.48396 146.61739 96.3259 147.01523 96.3259 curveto
+147.41307 96.3259 147.79457 96.48396 148.07587 96.76526 curveto
+148.35716 97.04655 148.51523 97.42805 148.51523 97.8259 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 353.50519 112.36223 moveto
+353.50519 112.76007 353.34712 113.14157 353.06583 113.42287 curveto
+352.78453 113.70416 352.40303 113.86223 352.00519 113.86223 curveto
+351.60735 113.86223 351.22585 113.70416 350.94455 113.42287 curveto
+350.66325 113.14157 350.50519 112.76007 350.50519 112.36223 curveto
+350.50519 111.96439 350.66325 111.58289 350.94455 111.30159 curveto
+351.22585 111.0203 351.60735 110.86223 352.00519 110.86223 curveto
+352.40303 110.86223 352.78453 111.0203 353.06583 111.30159 curveto
+353.34712 111.58289 353.50519 111.96439 353.50519 112.36223 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 353.50519 112.36223 moveto
+353.50519 112.76007 353.34712 113.14157 353.06583 113.42287 curveto
+352.78453 113.70416 352.40303 113.86223 352.00519 113.86223 curveto
+351.60735 113.86223 351.22585 113.70416 350.94455 113.42287 curveto
+350.66325 113.14157 350.50519 112.76007 350.50519 112.36223 curveto
+350.50519 111.96439 350.66325 111.58289 350.94455 111.30159 curveto
+351.22585 111.0203 351.60735 110.86223 352.00519 110.86223 curveto
+352.40303 110.86223 352.78453 111.0203 353.06583 111.30159 curveto
+353.34712 111.58289 353.50519 111.96439 353.50519 112.36223 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 256.42346 108.04059 moveto
+256.42346 108.43843 256.2654 108.81993 255.9841 109.10123 curveto
+255.7028 109.38252 255.3213 109.54059 254.92346 109.54059 curveto
+254.52562 109.54059 254.14412 109.38252 253.86282 109.10123 curveto
+253.58153 108.81993 253.42346 108.43843 253.42346 108.04059 curveto
+253.42346 107.64275 253.58153 107.26125 253.86282 106.97995 curveto
+254.14412 106.69865 254.52562 106.54059 254.92346 106.54059 curveto
+255.3213 106.54059 255.7028 106.69865 255.9841 106.97995 curveto
+256.2654 107.26125 256.42346 107.64275 256.42346 108.04059 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 256.42346 108.04059 moveto
+256.42346 108.43843 256.2654 108.81993 255.9841 109.10123 curveto
+255.7028 109.38252 255.3213 109.54059 254.92346 109.54059 curveto
+254.52562 109.54059 254.14412 109.38252 253.86282 109.10123 curveto
+253.58153 108.81993 253.42346 108.43843 253.42346 108.04059 curveto
+253.42346 107.64275 253.58153 107.26125 253.86282 106.97995 curveto
+254.14412 106.69865 254.52562 106.54059 254.92346 106.54059 curveto
+255.3213 106.54059 255.7028 106.69865 255.9841 106.97995 curveto
+256.2654 107.26125 256.42346 107.64275 256.42346 108.04059 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 304.80765 61.94667 moveto
+304.80765 62.34451 304.64958 62.72601 304.36829 63.00731 curveto
+304.08699 63.2886 303.70549 63.44667 303.30765 63.44667 curveto
+302.9098 63.44667 302.5283 63.2886 302.24701 63.00731 curveto
+301.96571 62.72601 301.80765 62.34451 301.80765 61.94667 curveto
+301.80765 61.54883 301.96571 61.16733 302.24701 60.88603 curveto
+302.5283 60.60474 302.9098 60.44667 303.30765 60.44667 curveto
+303.70549 60.44667 304.08699 60.60474 304.36829 60.88603 curveto
+304.64958 61.16733 304.80765 61.54883 304.80765 61.94667 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 304.80765 61.94667 moveto
+304.80765 62.34451 304.64958 62.72601 304.36829 63.00731 curveto
+304.08699 63.2886 303.70549 63.44667 303.30765 63.44667 curveto
+302.9098 63.44667 302.5283 63.2886 302.24701 63.00731 curveto
+301.96571 62.72601 301.80765 62.34451 301.80765 61.94667 curveto
+301.80765 61.54883 301.96571 61.16733 302.24701 60.88603 curveto
+302.5283 60.60474 302.9098 60.44667 303.30765 60.44667 curveto
+303.70549 60.44667 304.08699 60.60474 304.36829 60.88603 curveto
+304.64958 61.16733 304.80765 61.54883 304.80765 61.94667 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 68.41582 55.76297 moveto
+68.41582 56.16081 68.25775 56.54231 67.97646 56.82361 curveto
+67.69516 57.1049 67.31366 57.26297 66.91582 57.26297 curveto
+66.51797 57.26297 66.13647 57.1049 65.85518 56.82361 curveto
+65.57388 56.54231 65.41582 56.16081 65.41582 55.76297 curveto
+65.41582 55.36513 65.57388 54.98363 65.85518 54.70233 curveto
+66.13647 54.42104 66.51797 54.26297 66.91582 54.26297 curveto
+67.31366 54.26297 67.69516 54.42104 67.97646 54.70233 curveto
+68.25775 54.98363 68.41582 55.36513 68.41582 55.76297 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 68.41582 55.76297 moveto
+68.41582 56.16081 68.25775 56.54231 67.97646 56.82361 curveto
+67.69516 57.1049 67.31366 57.26297 66.91582 57.26297 curveto
+66.51797 57.26297 66.13647 57.1049 65.85518 56.82361 curveto
+65.57388 56.54231 65.41582 56.16081 65.41582 55.76297 curveto
+65.41582 55.36513 65.57388 54.98363 65.85518 54.70233 curveto
+66.13647 54.42104 66.51797 54.26297 66.91582 54.26297 curveto
+67.31366 54.26297 67.69516 54.42104 67.97646 54.70233 curveto
+68.25775 54.98363 68.41582 55.36513 68.41582 55.76297 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 26.1615 49.32298 moveto
+26.1615 49.72083 26.00343 50.10233 25.72214 50.38362 curveto
+25.44084 50.66492 25.05934 50.82298 24.6615 50.82298 curveto
+24.26366 50.82298 23.88216 50.66492 23.60086 50.38362 curveto
+23.31956 50.10233 23.1615 49.72083 23.1615 49.32298 curveto
+23.1615 48.92514 23.31956 48.54364 23.60086 48.26234 curveto
+23.88216 47.98105 24.26366 47.82298 24.6615 47.82298 curveto
+25.05934 47.82298 25.44084 47.98105 25.72214 48.26234 curveto
+26.00343 48.54364 26.1615 48.92514 26.1615 49.32298 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 26.1615 49.32298 moveto
+26.1615 49.72083 26.00343 50.10233 25.72214 50.38362 curveto
+25.44084 50.66492 25.05934 50.82298 24.6615 50.82298 curveto
+24.26366 50.82298 23.88216 50.66492 23.60086 50.38362 curveto
+23.31956 50.10233 23.1615 49.72083 23.1615 49.32298 curveto
+23.1615 48.92514 23.31956 48.54364 23.60086 48.26234 curveto
+23.88216 47.98105 24.26366 47.82298 24.6615 47.82298 curveto
+25.05934 47.82298 25.44084 47.98105 25.72214 48.26234 curveto
+26.00343 48.54364 26.1615 48.92514 26.1615 49.32298 curveto closepath stroke
+ 1 1 1 setrgbcolor
+newpath 50.50897 3.92134 moveto
+50.50897 4.31918 50.3509 4.70068 50.06961 4.98198 curveto
+49.78831 5.26328 49.40681 5.42134 49.00897 5.42134 curveto
+48.61113 5.42134 48.22963 5.26328 47.94833 4.98198 curveto
+47.66704 4.70068 47.50897 4.31918 47.50897 3.92134 curveto
+47.50897 3.5235 47.66704 3.142 47.94833 2.8607 curveto
+48.22963 2.5794 48.61113 2.42134 49.00897 2.42134 curveto
+49.40681 2.42134 49.78831 2.5794 50.06961 2.8607 curveto
+50.3509 3.142 50.50897 3.5235 50.50897 3.92134 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 50.50897 3.92134 moveto
+50.50897 4.31918 50.3509 4.70068 50.06961 4.98198 curveto
+49.78831 5.26328 49.40681 5.42134 49.00897 5.42134 curveto
+48.61113 5.42134 48.22963 5.26328 47.94833 4.98198 curveto
+47.66704 4.70068 47.50897 4.31918 47.50897 3.92134 curveto
+47.50897 3.5235 47.66704 3.142 47.94833 2.8607 curveto
+48.22963 2.5794 48.61113 2.42134 49.00897 2.42134 curveto
+49.40681 2.42134 49.78831 2.5794 50.06961 2.8607 curveto
+50.3509 3.142 50.50897 3.5235 50.50897 3.92134 curveto closepath stroke
+ 0.484 0.408 0.932 setrgbcolor
+69.01581 46.85518 moveto
+(E) cmmi10 9.96265 fshow
+13.87129 45.91908 moveto
+(F) cmmi10 9.96265 fshow
+45.09242 -5.88646 moveto
+(G) cmmi10 9.96265 fshow
+304.48628 96.36009 moveto
+(F) cmmi10 9.96265 fshow
+312.27649 99.9755 moveto
+(00) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 320.96857 94.2601 moveto
+320.96857 94.65794 320.8105 95.03944 320.5292 95.32074 curveto
+320.24791 95.60204 319.86641 95.7601 319.46857 95.7601 curveto
+319.07072 95.7601 318.68922 95.60204 318.40793 95.32074 curveto
+318.12663 95.03944 317.96857 94.65794 317.96857 94.2601 curveto
+317.96857 93.86226 318.12663 93.48076 318.40793 93.19946 curveto
+318.68922 92.91817 319.07072 92.7601 319.46857 92.7601 curveto
+319.86641 92.7601 320.24791 92.91817 320.5292 93.19946 curveto
+320.8105 93.48076 320.96857 93.86226 320.96857 94.2601 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 320.96857 94.2601 moveto
+320.96857 94.65794 320.8105 95.03944 320.5292 95.32074 curveto
+320.24791 95.60204 319.86641 95.7601 319.46857 95.7601 curveto
+319.07072 95.7601 318.68922 95.60204 318.40793 95.32074 curveto
+318.12663 95.03944 317.96857 94.65794 317.96857 94.2601 curveto
+317.96857 93.86226 318.12663 93.48076 318.40793 93.19946 curveto
+318.68922 92.91817 319.07072 92.7601 319.46857 92.7601 curveto
+319.86641 92.7601 320.24791 92.91817 320.5292 93.19946 curveto
+320.8105 93.48076 320.96857 93.86226 320.96857 94.2601 curveto closepath stroke
+ 0.484 0.408 0.932 setrgbcolor
+364.73003 96.94354 moveto
+(E) cmmi10 9.96265 fshow
+372.65863 100.55894 moveto
+(00) cmsy7 6.97385 fshow
+ 1 1 1 setrgbcolor
+newpath 363.23003 100.6884 moveto
+363.23003 101.08624 363.07196 101.46774 362.79066 101.74904 curveto
+362.50937 102.03033 362.12787 102.1884 361.73003 102.1884 curveto
+361.33218 102.1884 360.95068 102.03033 360.66939 101.74904 curveto
+360.38809 101.46774 360.23003 101.08624 360.23003 100.6884 curveto
+360.23003 100.29056 360.38809 99.90906 360.66939 99.62776 curveto
+360.95068 99.34647 361.33218 99.1884 361.73003 99.1884 curveto
+362.12787 99.1884 362.50937 99.34647 362.79066 99.62776 curveto
+363.07196 99.90906 363.23003 100.29056 363.23003 100.6884 curveto closepath fill
+ 0 0 0 setrgbcolor
+newpath 363.23003 100.6884 moveto
+363.23003 101.08624 363.07196 101.46774 362.79066 101.74904 curveto
+362.50937 102.03033 362.12787 102.1884 361.73003 102.1884 curveto
+361.33218 102.1884 360.95068 102.03033 360.66939 101.74904 curveto
+360.38809 101.46774 360.23003 101.08624 360.23003 100.6884 curveto
+360.23003 100.29056 360.38809 99.90906 360.66939 99.62776 curveto
+360.95068 99.34647 361.33218 99.1884 361.73003 99.1884 curveto
+362.12787 99.1884 362.50937 99.34647 362.79066 99.62776 curveto
+363.07196 99.90906 363.23003 100.29056 363.23003 100.6884 curveto closepath stroke
+showpage
+%%EOF
Property changes on: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.mp 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/exemples/triangles/pedale.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -81,26 +81,26 @@
gddLabel.bot(textext("$C''$"),C7);
pointe U1; pointe V1; pointe W1;
-label.lft(textext("$U$"),PtR(U1)) withcolor Gray;
-label.bot(textext("$V$"),PtR(V1)) withcolor Gray;
-label.lft(textext("$W$"),PtR(W1)) withcolor Gray;
+gddLabel.lft(textext("$U$"),U1) withcolor Gray;
+gddLabel.bot(textext("$V$"),V1) withcolor Gray;
+gddLabel.lft(textext("$W$"),W1) withcolor Gray;
-label.lft(textext("$U'$"),PtR(U4)) withcolor Gray;
-label.lrt(textext("$V'$"),PtR(V2)) withcolor Gray;
-label.urt(textext("$W'$"),PtR(W3)) withcolor Gray;
-label.urt(textext("$U''$"),PtR(U7)) withcolor Gray;
-label.urt(textext("$V''$"),PtR(V5)) withcolor Gray;
-label.lrt(textext("$W''$"),PtR(W7)) withcolor Gray;
+gddLabel.lft(textext("$U'$"),U4) withcolor Gray;
+gddLabel.lrt(textext("$V'$"),V2) withcolor Gray;
+gddLabel.urt(textext("$W'$"),W3) withcolor Gray;
+gddLabel.urt(textext("$U''$"),U7) withcolor Gray;
+gddLabel.urt(textext("$V''$"),V5) withcolor Gray;
+gddLabel.lrt(textext("$W''$"),W7) withcolor Gray;
pointe U4; pointe V2; pointe W3;
pointe U7; pointe V5; pointe W7;
pointe E1; pointe F1; pointe G1;
-label.lrt(textext("$E$"),PtR(E1)) withcolor MediumSlateBlue;
-label.lft(textext("$F$"),PtR(F1)) withcolor MediumSlateBlue;
-label.bot(textext("$G$"),PtR(G1)) withcolor MediumSlateBlue;
+gddLabel.lrt(textext("$E$"),E1) withcolor MediumSlateBlue;
+gddLabel.lft(textext("$F$"),F1) withcolor MediumSlateBlue;
+gddLabel.bot(textext("$G$"),G1) withcolor MediumSlateBlue;
-label.ulft(textext("$F''$"),PtR(F7)) withcolor MediumSlateBlue;
+gddLabel.ulft(textext("$F''$"),F7) withcolor MediumSlateBlue;
pointe F7;
-label.rt(textext("$E''$"),PtR(E7)) withcolor MediumSlateBlue;
+gddLabel.rt(textext("$E''$"),E7) withcolor MediumSlateBlue;
pointe E7;
endfig;
end.
\ No newline at end of file
Modified: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.tex
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.tex 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/doc/metapost/mp-geom2d/mp-geom2d-doc.tex 2025-02-20 20:48:55 UTC (rev 74173)
@@ -67,14 +67,14 @@
captionpos=b,
xleftmargin=0em,
sensitive=true,
- morekeywords=[10]{colorie, trace,fermeture,fleche,pointe,marque,gddLabel,avecCrayon,ChampVecteurs,ChampVecteursDD,EtiquetteChemin},
+ morekeywords=[10]{colorie, colorieAvecTransparence,trace,fermeture,fleche,pointe,marque,gddLabel,avecCrayon,ChampVecteurs,ChampVecteursDD,EtiquetteChemin,hachure},
keywordstyle=[10]\color{Salmon},
- morekeywords=[7]{Abscisse,Addition,AdditionAbscisses,AdditionOrdonnee,AdditionVecteur,AireTriangle,Arc,arccos,arctan,arcsin,AsymptoteHyperbole,AxeDeSimilitude,AxeRadical,Axes,AxesBords,
+ morekeywords=[7]{Abscisse,Addition,AdditionAbscisses,AdditionOrdonnee,AdditionVecteur,AireTriangle,Arc,ArcEntrePoints,arccos,arctan,arcsin,AsymptoteHyperbole,AxeDeSimilitude,AxeRadical,Axes,AxesBords,
Barycentre,Bissectrice,
CadreRepere,Centre,CentreRadical,Cercle,CercleCirconscrit,CercleCP,CercleD,CercleEuler,CercleExinscrit,CercleInscrit,CerclePrincipale,CercleTroisPoints,ch,Chemin,cos,Courbe,CourbeDat,CourbeEnPolaires,
CoVertex,
- Debut,DemiHyperbole,DemiGrandAxe,DemiPetitAxe,Directrice,DistancePointDroite,Droite,DroitePerpendiculaire,
- Ellipse,EllipseF, EquationDroite,Excentricite,exp,
+ Debut,DemiHyperbole,DemiGrandAxe,DemiPetitAxe,Directrice,DistancePointDroite,Droite,DroiteParallele,DroitePerpendiculaire,
+ Ellipse,EllipseF, EllipseFD,EquationDroite,Excentricite,exp,
Fenetre, Fin,Foyer,
gddEnPlace,gddTraceArcDeCercle,gddTraceObjet,Graduations,GraduationsBords,GrilleRepere,
Homothetie,HyperboleFD,
@@ -87,7 +87,7 @@
PairImp,PairTOPoint,ParaboleFD,Point,PointDansRepere,PointDe,
PointImp,PointPolygone,PointTOPair,Polygone,PolygoneRegulier,ProduitScalaire,ProjectionPointSurDroite,ProjectionPointSurDroite,
Rayon,Repere,RepereMinMax,ReportSurDroite,Representation,Rotation,RotationCentre,
- ScalaireVecteur,Segment,SegmentTOVecteur,sh,SigneOrtho,sin,Sommet,SoustractionVecteur,SymetrieAxiale,SymetrieCentrale,
+ ScalaireVecteur,SchemaHachure,Segment,SegmentTOVecteur,sh,SigneOrtho,sin,Sommet,SoustractionVecteur,SymetrieAxiale,SymetrieCentrale,
tan,TangenteCommuneExterieure,TangenteCommuneInterieure,TangenteExterieureEllipse,TangenteEllipse,th,Triangle,
Unites,
Vecteur,VecteurP,Vertex},
@@ -375,7 +375,7 @@
}
\vfill
\begin{center}
-Version 1.1 du 22 octobre 2024\\
+Version 1.2 du 19 fevrier 2025\\
\url{https://gitlab.gutenberg-asso.fr/mchupin/mp-geom2d}\\
\url{https://ctan.org/pkg/mp-geom2d}
\end{center}
@@ -443,7 +443,7 @@
SVG.
\end{enumerate}
-Nous allons, dans la suite, décrire plus en détails chacune de ces
+Nous allons, dans la suite, décrire plus en détail chacune de ces
fonctions. Certaines fonctions s'appuient sur
l'extension \fichier{graph.mp} présente dans toutes les bonnes
distributions \TeX.
@@ -460,7 +460,7 @@
Par exemple, pour un \typeGDD{Point} (type \mpgeomdd), la première coordonnée
se trouve dans \variableGDD{gddA[]} et la seconde dans \variableGDD{gddB[]}
-(les autres table ne sont pas utilisées pour un tel objet).
+(les autres tables ne sont pas utilisées pour un tel objet).
Il y a trois tables particulières \variableGDD{gddP[]} qui est du type
\typeMP{path}, \variableGDD{gddPX[][]} qui est sa version étendue, et \variableGDD{gddS[]} qui est du type
@@ -479,7 +479,7 @@
section~\ref{sec:types}), ainsi que certains type \MP. Les exemples tout au long
de la documentation permettront d'illustrer les commandes de tracé.
-Pour comprendre comment fonctionne les représentations avec \mpgeomdd, il nous faut
+Pour comprendre comment fonctionnent les représentations avec \mpgeomdd, il nous faut
tout d'abord décrire le mécanisme de gestion des unités.
\subsection{Unité}
@@ -593,12 +593,87 @@
\item[\meta{couleur}:] est une \typeMP{color}.
\item[\meta{coefficient de transparence}:] est un \typeMP{numeric} compris
entre 0 et 1, 0 pour un coloriage opaque et 1 pour un coloriage invisible.
-\end{description}\index{colorie@\lstinline+colorie+}
+\end{description}\index{colorieAvecTransparence@\lstinline+colorieAvecTransparence+}
\end{colourband}
+On pourra aussi hachurer une forme fermée\footnote{Le code est repris et adapté
+de l’ensemble de macros \texttt{geometriesyr16} de Christophe Poulain \url{https://melusine.eu.org/syracuse/poulecl/geometriesyr16/}.} avec la
+commande suivante :
+\begin{colourband}
+\macro|hachure(«objet»,«angle»,«espace»,«type»)|\return{\typeMP{image}}
+\begin{description}
+ \item[\meta{objet}:] peut être:
+ \begin{itemize}
+ \item pour le côté \MP, uniquement un \typeMP{path} et dans ce cas \lstinline+trace+ sera équivalent à \lstinline+fill+;
+ \item du côté de \mpgeomdd,
+ n'importe quel objet \og{}coloriable\fg{} : \typeGDD{triangle},
+ \typeGDD{cercle}, \typeGDD{ellipse}, \typeGDD{polygone}, \typeGDD{chemin}, ou
+ \typeGDD{courbe}.
+ \end{itemize}
+ \item[\meta{angle}:] est l’angle (\typeMP{numeric} en degré) des lignes de
+ hachurage.
+ \item[\meta{espace}:] est l’espace (\typeMP{numeric}) entre chaque ligne de
+ hachurage (dans l’unité de \mpgeomdd, il ne faut donc pas mettre d’unité).
+ \item[\meta{type}:] est le type de tracé. Si \meta{type}$=0$, les lignes
+ seront en trait pleins, si \meta{type}$=1$, les lignes seront en traits
+ pointillés (\lstinline+dashed evenly+), si \meta{type}$=2$, les lignes
+ seront en traits d’axes, si \meta{type}$=3$, les lignes
+ seront en traits pointillés avec des points (\lstinline+withdots+). Enfin, si
+ \meta{type}$=4$, vous pouvez définir le \emph{schéma} de trait avec la command \lstinline+SchemaHachure+.
+\end{description}\index{hachure@\lstinline+hachure+}
+\end{colourband}
+
+Attention, la macro \lstinline+hachure+ retourne une \typeMP{image}, il faudra
+donc l’utiliser conjointement à la macro \lstinline+trace+.
+
+Pour utiliser le quatrième type de trait pour les hachures, il faudra définir
+son schéma (\emph{pattern}) à l’aide de la commande suivante.
+
+\begin{colourband}
+\macro|SchemaHachure(«schéma»)|
+\begin{description}
+ \item[\meta{schéma}:] est le \emph{pattern} que l’on fournit classiquement à
+ la commande \lstinline+dashpattern+. Nous renvoyons à la documentation de
+ \MP{}. Notez cependant que les dimensions à fournir aux commandes
+ \lstinline+on+ et \lstinline+off+ seront mis à l’échelle à l’unité
+ \lstinline+gddU+ de \mpgeomdd. Il faut donc les consevoir comme exprimées dans
+ l’unité de \mpgeomdd.
+\end{description}\index{SchemaHachure@\lstinline+SchemaHachure+}
+\end{colourband}
+
+Nous illustrons
+ci-dessous quelques commandes de tracé, de coloriage et de hachurage.
+
+\begin{ExempleMP}
+input geom2d;
+
+beginfig(1);
+gddU:=0.6cm;
+A = Point(-1,1); B = Point(3,2);
+C1= Cercle(origine,2);
+C2 = Cercle(A,2); C3 = Cercle(B,3);
+
+colorie C1 withcolor LightCyan;
+colorieAvecTransparence(C2,DarkRed,0.2);
+colorieAvecTransparence(C3,DarkBlue,0.2);
+
+T1 = Triangle((-1,-2),(2,-2),(0.2,1));
+trace hachure(T1,45,0.2,0) avecCrayon(0.6,DarkRed);
+trace T1;
+pE1 = Point(-2,-3);
+pE2 = Point(3,-4);
+E = EllipseF(pE1,pE2,3.9);
+SchemaHachure(on0.2 off0.3);
+trace hachure(E,-20,0.1,4);
+trace E;
+pointe pE1; pointe pE2;
+endfig;
+\end{ExempleMP}
+
+
Les macros ci-dessus, font appel à une macro plus bas niveau qui permet de
retourner le \typeMP{path} à tracer ou colorier pour tous les objets \mpgeomdd.
@@ -643,6 +718,9 @@
pencircle scaled ... withcolor ...}. On peut d'ailleurs évidemment toujours
utiliser les commandes \MP{} pour le dessin.
+
+
+
On peut représenter les objets de type \typeGDD{point}. Pour cela, on dispose
d'une commande qui trace un petit cercle coloré à l'endroit du point. La
commande est la suivante :
@@ -707,7 +785,7 @@
\subsubsection{Constructeur}
-Pour être plus clair voici la fonction principale
+Pour être plus clair, voici la fonction principale
pour créer un tel objet :
%
\begin{mpcode}
@@ -733,7 +811,7 @@
\variableGDD{gddA} et \variableGDD{gddB}.
Avec un tel type de fonctionnement, la plupart des manipulations se
-fait sur des \typeMP{numeric}s. En effet, pour déclarer un
+font sur des \typeMP{numeric}s. En effet, pour déclarer un
\typeGDD{point}, il suffit d'écrire
\begin{mpcode}
A = Point(2,3);
@@ -871,7 +949,7 @@
\end{description}\index{IsoBarycentre@\lstinline+IsoBarycentre+}
\end{colourband}
-On peut calculer le barycentre d'une liste de points associées à des poids (mais
+On peut calculer le barycentre d'une liste de points associés à des poids (mais
ici, il n'est pas possible d'utiliser des \typeMP{pair} de \MP).
\begin{colourband}
\macro|Barycentre((«A»,«a»),(«B»,«b»),(«C»,«c»), etc.)|\return{\typeGDD{point}}
@@ -932,7 +1010,7 @@
\end{description}\index{PairTOPoint@\lstinline+PairTOPoint+}
\end{colourband}
-Ces deux commandes sont complétées par deux autres qui assure qu'un élément est
+Ces deux commandes sont complétées par deux autres qui assurent qu'un élément est
d'un type donné:
\begin{colourband}
\macro|PairImp(«p»)|\return{\typeGDD{pair}}
@@ -1255,6 +1333,16 @@
\end{description}\index{DroitePerpendiculaire@\lstinline+DroitePerpendiculaire+}
\end{colourband}
+Sur le même modèle, la macro suivante permet d'obtenir la droite parallèle à une autre passant
+par un point.
+\begin{colourband}
+\macro|DroiteParallele(«a»,«p»)|\return{\typeGDD{droite}}
+\begin{description}
+ \item[\meta{a}:] \typeGDD{droite} ;
+ \item[\meta{p}:] \typeGDD{point}.
+\end{description}\index{DroiteParallele@\lstinline+DroiteParallele+}
+\end{colourband}
+
On pourra obtenir le \typeGDD{point} d'intersection de deux droites avec la
macro suivante.
\begin{colourband}
@@ -1513,7 +1601,7 @@
\end{colourband}
\bigskip
-L'exemple suivante illustre l'utilisation de ces deux macros.
+L'exemple suivant illustre l'utilisation de ces deux macros.
\begin{ExempleMP}[sidebyside=false]
input geom2d;
beginfig(1);
@@ -1573,13 +1661,13 @@
vertex), et un des points de l'ellipse sur le petit axe (appelé co-vertex).
Cependant, lors de la création d'une ellipse de nombreux attributs sont calculés.
-Le code du contructeur est le suivant:
+Le code du constructeur est le suivant:
\begin{mpcode}
-vardef Ellipse(expr C,A,B) =
+ vardef Ellipse(expr C,A,B) =
% C : centre
% A : vertex
- % B : co-vertex
- save n,a,b,c,e,_tmp,slope;
+ % B : co-vertex
+ save n,a,b,c,e,_tmp,slope,_D,_K,_h,_ff;
pair _tmp;
n = incr gddO;
gddT[n] = "ellipse"; gddA[n] = PointImp(C); gddB[n] = PointImp(A);
@@ -1596,9 +1684,17 @@
gddX[n][1] = a;
gddX[n][2] = b;
gddX[n][3] = e;
- % angle du demi-grand axe
+ % angle du demi grand axe
slope = angle(PairImp(A)-PairImp(C));
gddX[n][4] = slope;
+ % directrices
+ _h = (a*a-c*c)/c;
+ % prejection sur la directice
+ _ff = Droite(gddE[n],gddD[n]);
+ _K = ReportSurDroite(gddD[n],_ff,_h);
+ _D = DroitePerpendiculaire(_ff,_K);
+ gddX[n][5] := _D; % on stock la directrice
+ gddX[n][6] := SymetrieCentrale(_D,gddA[n]); % on stock la deuxième directrice
n
enddef;
\end{mpcode}
@@ -1651,6 +1747,18 @@
endfig;
\end{ExempleMP}
+On pourra aussi définir une ellipse à partir d’un foyer, de sa directrice et de
+l’excentricité avec la commande suivante:
+\begin{colourband}
+\macro|EllipseFD(«F»,«D»,«e»)|\return{\typeGDD{ellipse}}
+\begin{description}
+ \item[\meta{F}:] \typeGDD{point} ou \typeMP{pair}, un foyer ;
+ \item[\meta{D}:] \typeGDD{droite}, la directrice associée ;
+ \item[\meta{e}:] \typeGDD{numeric}, l’excentricité ($<1$).
+\end{description}\index{EllipseFD@\lstinline+EllipseFD+}
+\end{colourband}
+\bigskip
+
\subsubsection{Macros associées}
On pourra obtenir le centre (\typeGDD{point}) d'une ellipse avec la commande :
@@ -1730,6 +1838,19 @@
\end{colourband}
\bigskip
+On peut obtenir les directrices de l'ellipse avec la commande suivante:
+
+\begin{colourband}
+\macro|Directrice(«a»,«n»)|\return{\typeGDD{droite}}
+\begin{description}
+ \item[\meta{a}:] \typeGDD{ellipse}, \typeGDD{parabole} ou \typeGDD{hyperbole}
+ ;
+ \item[\meta{n}:] 1 ou 2 (\typeMP{numeric}), pour choisir l'une des deux
+ directrices.
+\end{description}\index{Directrice@\lstinline+Directrice+}
+\end{colourband}
+\bigskip
+
Pour obtenir la tangente (\typeGDD{droite}) à un point de l'ellipse, on
utilisera la commande suivante.
@@ -1896,7 +2017,8 @@
\begin{colourband}
\macro|Directrice(«a»,«n»)|\return{\typeGDD{droite}}
\begin{description}
- \item[\meta{a}:] \typeGDD{parabole} ou \typeGDD{hyperbole} ;
+ \item[\meta{a}:] \typeGDD{ellipse}, \typeGDD{parabole} ou \typeGDD{hyperbole}
+ ;
\item[\meta{n}:] 1 ou 2 (\typeMP{numeric}), argument utile pour l'hyperbole
qui possède deux directrices. Ici, peu importe la valeur de \meta{n},
l'unique directrice sera donnée.
@@ -2051,7 +2173,8 @@
\begin{colourband}
\macro|Directrice(«a»,«n»)|\return{\typeGDD{droite}}
\begin{description}
- \item[\meta{a}:] \typeGDD{parabole} ou \typeGDD{hyperbole} ;
+ \item[\meta{a}:] \typeGDD{ellipse}, \typeGDD{parabole} ou \typeGDD{hyperbole}
+ ;
\item[\meta{n}:] 1 ou 2 (\typeMP{numeric}), pour choisir l'une des deux
directrices.
\end{description}\index{Directrice@\lstinline+Directrice+}
@@ -2223,7 +2346,7 @@
\end{description}\index{CercleEuler@\lstinline+CercleEuler+}
\end{colourband}
-Voici un exemple d'illustration des quelques unes des macros relatives aux
+Voici un exemple d'illustration des quelques-unes des macros relatives aux
triangles.
\begin{ExempleMP}
input geom2d;
@@ -2316,7 +2439,7 @@
\subsubsection{Macros associées}
-On pourra obtenir le nombre de côté d'un polygone avec la commande suivante.
+On pourra obtenir le nombre de côtés d'un polygone avec la commande suivante.
\begin{colourband}
\macro|NombreCotesPolygone(«a»)|\return{\typeMP{numeric}}
@@ -2457,7 +2580,7 @@
\item[\meta{A}:] premier \typeGDD{point} ou \typeMP{pair} ;
\item[\meta{B}:] deuxième \typeGDD{point} ou \typeMP{pair} ;
\item[\meta{s}:] \typeMP{numeric}, $-1$ ou $1$ suivant le sens choisi.
-\end{description}\index{Arc@\lstinline+Arc+}
+\end{description}\index{ArcEntrePoints@\lstinline+ArcEntrePoints+}
\end{colourband}
\begin{ExempleMP}
@@ -2690,7 +2813,7 @@
\begin{colourband}
\macro|marque.«place» "«nom»"|
\begin{description}
- \item[\meta{place}:] peut être les classiques placement de \MP{} :
+ \item[\meta{place}:] peut être les classiques placements de \MP{} :
\lstinline+top+, \lstinline+bot+, \lstinline+rt+,
\lstinline+lft+,+\lstinline+urt+, \lstinline+ulft+, \lstinline+lrt+, \lstinline+llft+.
\item[\meta{nom}:] entre double quote, doit être un nom de variable de
@@ -2708,7 +2831,7 @@
\begin{colourband}
\macro|gddLabel.«place»(«materiel»,«point»)|
\begin{description}
- \item[\meta{place}:] peut être les classiques placement de \MP{} :
+ \item[\meta{place}:] peut être les classiques placements de \MP{} :
\lstinline+top+, \lstinline+bot+, \lstinline+rt+,
\lstinline+lft+,+\lstinline+urt+, \lstinline+ulft+, \lstinline+lrt+, \lstinline+llft+.
\item[\meta{materiel}:] classiquement ce qu'on donne à \lstinline+label+, une
@@ -2725,7 +2848,7 @@
\begin{colourband}
\macro|EtiquetteChemin.«place»(«materiel»,«chemin»,«position»)|
\begin{description}
- \item[\meta{place}:] peut être les classiques placement de \MP{} :
+ \item[\meta{place}:] peut être les classiques placements de \MP{} :
\lstinline+top+, \lstinline+bot+, \lstinline+rt+,
\lstinline+lft+,+\lstinline+urt+, \lstinline+ulft+, \lstinline+lrt+, \lstinline+llft+.
\item[\meta{materiel}:] classiquement ce qu'on donne à \lstinline+label+, une
@@ -2780,7 +2903,7 @@
\end{description}\index{Repere@\lstinline+Repere+}
\end{colourband}
-Ce commande ne retourne, ni ne trace rien. Elle sert à spécifier quelques
+Cette commande ne retourne, ni ne trace rien. Elle sert à spécifier quelques
variables internes de définition du dessin. Elle modifie d'ailleurs le
comportement de la macro \lstinline+gddEnPlace+ (voir
page~\pageref{gddEnPlace}). Noter que cette commande impose le fait que
@@ -3154,7 +3277,7 @@
\mpgeomdd fournit des macros pour la représentation des champs de vecteurs.
-Tout d'abord, on peut tracer des champs de vecteurs associée à une équation
+Tout d'abord, on peut tracer des champs de vecteurs associés à une équation
différentielle du premier ordre pour une fonction $y$ de la variable $x$:
\[y'=F(x,y).\]
La macro associée est la suivante:
@@ -3275,7 +3398,7 @@
\pagestyle{empty}
\begin{landscape}
\section{Galerie}
- \subsection{Repère et tangentes extérieure}
+ \subsection{Repère et tangentes extérieures}
\begin{minipage}{0.5\linewidth}
\begin{center}
\begin{mplibcode}
@@ -3471,8 +3594,29 @@
\end{multicols}
\end{landscape}
\newpage
+
+\begin{landscape}
+ \subsection{Chaîne de Pappus}
+
+ La chaîne de Pappus par inversion géométrique.
+ \begin{multicols}{2}
+ \begin{mplibcode}
+ input exemples/cercles/pappuschain.mp;
+ \end{mplibcode}
+
+ \lstinputlisting[basicstyle=\ttfamily\scriptsize]{exemples/cercles/pappuschain.mp}
+ \end{multicols}
+\end{landscape}
+\newpage
\section{Historique}
\begin{description}
+ \item[février 2025:] ajout de la macro \lstinline+hachure+ ainsi que la macro
+ \lstinline+SchemaHachure+. Correction d’un bug dans la macro
+ \lstinline+EllipseFD+. Version 1.2.
+ \item[décembre 2024:] ajout de la macro \lstinline+DroiteParallele+.
+ \item[novembre 2024:] ajout de la macro \lstinline+EllipseFD+ ainsi que le
+ stockage des directrices dans le type \typeGDD{ellipse}. Correction de la
+ commande \lstinline+gddLabel+. Ajout de l’exemple de la chaîne de Pappus.
\item[21 octobre 2024:] corrections de Quark67 (merci à lui) sur la
documentation et modifications suite à ses remarques.
\lstinline+DemieHyperbole+ devient
Modified: branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-c2d.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-c2d.mp 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-c2d.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -34,7 +34,7 @@
% C : centre
% A : vertex
% B : co-vertex
- save n,a,b,c,e,_tmp,slope;
+ save n,a,b,c,e,_tmp,slope,_D,_K,_h,_ff;
pair _tmp;
n = incr gddO;
gddT[n] = "ellipse"; gddA[n] = PointImp(C); gddB[n] = PointImp(A);
@@ -54,6 +54,14 @@
% angle du demi grand axe
slope = angle(PairImp(A)-PairImp(C));
gddX[n][4] = slope;
+ % directrices
+ _h = (a*a-c*c)/c;
+ % prejection sur la directice
+ _ff = Droite(gddE[n],gddD[n]);
+ _K = ReportSurDroite(gddD[n],_ff,_h);
+ _D = DroitePerpendiculaire(_ff,_K);
+ gddX[n][5] := _D; % on stock la directrice
+ gddX[n][6] := SymetrieCentrale(_D,gddA[n]); % on stock la deuxième directrice
n
enddef;
@@ -60,7 +68,7 @@
vardef EllipseF(expr A,B,a) =
% A : foyer 1
% B : foyer 2
- save n,b,c,e,_tmp,slope;
+ save n,b,c,e,_tmp,slope,_h,_ff,_K,_D;
pair _tmp;
n = incr gddO;
gddT[n] = "ellipse";
@@ -68,7 +76,7 @@
gddD[n] = PointImp(A);
gddE[n] = PointImp(B);
% centre
- gddA[n] = Milieu(A,B);
+ gddA[n] = Milieu(gddD[n],gddE[n]);
% La distance entre les deux foyers est égale à 2c
c = Longueur(A,B)/2;
if(c>a):
@@ -88,10 +96,54 @@
% angle du demi grand axe
slope = angle(PairImp(gddB[n])-PairImp(gddA[n]));
gddX[n][4] = slope;
+ % directrices
+ _h = (a*a-c*c)/c;
+ % prejection sur la directice
+ _ff = Droite(gddE[n],gddD[n]);
+ _K = ReportSurDroite(gddD[n],_ff,_h);
+ _D = DroitePerpendiculaire(_ff,_K);
+ gddX[n][5] := _D; % on stock la directrice
+ gddX[n][6] := SymetrieCentrale(_D,gddA[n]); % on stock la deuxième directrice
n
enddef;
+vardef EllipseFD(expr F,D,e) =
+ % F : foyer (point)
+ % D : directrice (droite)
+ % e : exentricité (numeric <1)
+ save u, v, w, d, i, n,_tmp,_tmpd,slope,K,a,b,c,h;
+ pair _tmp,_tmpd;
+ n = incr gddO;
+ gddT[n] := "ellipse";
+ % projeté du foyer sur la directrice
+ K = ProjectionPointSurDroite(F,D);
+ % vertex
+ h:= Longueur(F,K);
+ gddB[n] = PairTOPoint(Pt(F)+h*e*unitvector(Pt(K)-Pt(F)));
+ a := h*e/(1-e*e);
+ b := a*sqrt(1-e*e);
+ c := sqrt(a*a-b*b);
+ gddX[n][1] = a;
+ gddX[n][2] = b;
+ gddX[n][3] = e;
+ % Foyers
+ _tmp := Pt(F);
+ _tmpd := Pt(K);
+ gddD[n] = PointImp(F);
+ gddE[n] = PairTOPoint(_tmp+c*unitvector(_tmp-_tmpd));
+ % centre
+ gddA[n] = Milieu(gddD[n],gddE[n]);
+ % co-vertex
+ gddC[n] = PairTOPoint(Pt(gddA[n])+b*Pt(Rotation(unitvector(_tmp-_tmpd),Pi/2)));
+ % directrice
+ gddX[n][5] := D; % on stock la directrice
+ gddX[n][6] := SymetrieCentrale(D,gddA[n]); % on stock la deuxième directrice
+ % angle du demi grand axe
+ slope = angle(PairImp(gddB[n])-PairImp(gddA[n]));
+ gddX[n][4] = slope;
+ n
+enddef;
vardef Vertex(expr c) =
gddB[c]
@@ -294,7 +346,12 @@
enddef;
vardef Directrice(expr p,n) =
- % p : parabole ou hyperbole
- gddX[p][n]
+ % p : parabole, hyperbole ou ellipse
+ % n : 1 ou 2
+ if(gddT[p]="ellipse"):
+ gddX[p][4+n]
+ else:
+ gddX[p][n]
+ fi
enddef;
endinput
\ No newline at end of file
Modified: branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-lbl.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-lbl.mp 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-lbl.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -11,11 +11,13 @@
textext("$"&scanchaine_label(s)&"$")
enddef;
-vardef gddLabel.@#(expr s,p) =
+
+
+vardef gddLabel.@#(expr s,p) text t_=
% comme label mais qui s’applique à un point
% s : matériel de l’annotation
% p : point mpgdd
- label.@#(s,Pt(p) gddEnPlace)
+ label.@#(s,Pt(p) gddEnPlace) t_
enddef;
vardef Etiquette.@#(expr s,t,p) = label.@#(textext(s) scaled t,p gddEnPlace) enddef;
Modified: branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-main.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-main.mp 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d-main.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -34,6 +34,9 @@
gddW = "scaled gddU";
def gddEnPlace = scantokens gddW enddef;
+% anglais
+let gddInPlace = gddEnPlace;
+
%%% ----------------------------------------------------------------------------
%%% Définition des objets
%%% ----------------------------------------------------------------------------
@@ -51,6 +54,9 @@
gddA[gddO] = r*cos(a); gddB[gddO] = r*sin(a); gddO
enddef;
+% anglais
+let PolarPoint = PointPolaire;
+
vardef PointDansRepere(expr x,y,o,i,j) =
gddT[incr gddO] = "point";
gddA[gddO] = gddA[o] + x*(gddA[i]-gddA[o]) + y*(gddA[j]-gddA[o]);
@@ -58,6 +64,9 @@
gddO
enddef;
+% anglais
+let PointInBasis = PointDansRepere;
+
vardef CoordonneesRepere(expr m,o,i,j) =
save x,y; numeric x,y;
gddA[m] = (gddA[i]-gddA[o])*x + (gddA[j]-gddA[o])*y + gddA[o];
@@ -65,6 +74,9 @@
(x,y)
enddef;
+% anglais
+let CoordinatesInBasis = CoordonneesRepere;
+
vardef Milieu(expr a,b) =
gddT[incr gddO] = "point";
gddA[gddO] = 0.5*(gddA[a]+gddA[b]);
@@ -72,6 +84,9 @@
gddO
enddef;
+%anglais
+let MidPoint = Milieu;
+
vardef Rotation(expr A, a) =
% A : point
% a : angle
@@ -84,6 +99,8 @@
n
enddef;
+
+
vardef RotationCentre(expr A, C, a) =
% A : point
% C : point centre de la rotation
@@ -98,6 +115,9 @@
n
enddef;
+%anglais
+let CenterRotation = RotationCentre;
+
vardef IsoBarycentre(text t) =
save n, G;
pair G; numeric n;
@@ -109,6 +129,8 @@
PointImp(G/n)
enddef;
+let IsoBarycenter = IsoBarycentre;
+
vardef Barycentre(text t) =
% liste sous la forme (A,a),(B,b),(C,c), etc.
save n, Gs;
@@ -121,6 +143,7 @@
PointImp(G/n)
enddef;
+let Barycenter = Barycentre;
% Transformations pair <-> Point -----------------------------------------------
def PointTOPair(expr a) = (gddA[a],gddB[a]) enddef;
@@ -138,6 +161,8 @@
vardef Abscisse(expr a) = if pair a: xpart a else: gddA[a] fi enddef;
vardef Ordonnee(expr a) = if pair a: ypart a else: gddB[a] fi enddef;
+let Xaxis = Abscisse;
+let Yaxis = Ordonnee;
% Addition ---------------------------------------------------------------------
vardef AdditionAbscisses(expr a,b) = if pair a: xpart a else: gddA[a] fi + if pair b: xpart b else: gddA[b] fi enddef;
@@ -149,10 +174,17 @@
gddO
enddef;
+% anglais
+let XaxisSum = AdditionsAbsicces;
+let YaxisSum = AdditionOrdonnees;
+let PointSum = Addition;
+
vardef Longueur (expr a,b) =
abs(PairImp(a)-PairImp(b))
enddef;
+let Length = Longueur;
+
vardef Bissectrice(expr a,b,c) =
% bisectrice du secteur angulaire défini par les points (abc)
save dba,dbc,ap,cp;
@@ -167,6 +199,8 @@
Droite(b,Milieu(ap,cp))
enddef;
+let AngleBisector = Bissectrice;
+
% Vecteur ----------------------------------------------------------------------
vardef Vecteur (expr a,b) =
save n; n = incr gddO;
@@ -189,6 +223,8 @@
Vecteur(x,y)
enddef;
+let ScalarVecteur = ScalaireVecteur;
+
vardef AdditionVecteur (expr u,v) =
save n,x,y; n = incr gddO;
gddT[n] = "vecteur";
@@ -197,6 +233,8 @@
gddA[n] = x; gddB[n] = y; n
enddef;
+let VecteurSum = AdditionVecteur;
+
vardef SoustractionVecteur (expr u,v) =
save n,x,y; n = incr gddO;
gddT[n] = "vecteur";
@@ -205,19 +243,26 @@
gddA[n] = x; gddB[n] = y; n
enddef;
+let VecteurSubstract = SoustractionVecteur;
vardef ProduitScalaire (expr u,v)=
(gddA[u]*gddA[v]+gddB[u]*gddB[v])
enddef;
+let ScalarProduct = ProduitScalaire;
+
vardef Norme (expr s) =
sqrt(gddA[s]**2+gddB[s]**2)
enddef;
+let Norm = Norme;
+
vardef VecteursAngle (expr u,v)=
arccos((ProduitScalaire(u,v))/(Norme(u)*Norme(v)))
enddef;
+let AngleBetweenVecteurs = VecteursAngle;
+
% Segment ----------------------------------------------------------------------
vardef Segment (expr a,b) =
save n; n = incr gddO;
@@ -228,6 +273,8 @@
abs(Pt(gddA[s])-Pt(gddB[s]))
enddef;
+let SegmentLength = LongueurSegment;
+
vardef SegmentTOVecteur (expr s)=
VecteurP(Pt(gddB[s])-Pt(gddA[s]))
enddef;
@@ -252,8 +299,6 @@
PairTOPoint(D)
enddef;
-
-
vardef AireTriangle ( expr t) =
save droite,h,l;
droite = Droite(gddA[t],gddB[t]);
@@ -262,6 +307,8 @@
(Longueur(gddA[t],gddB[t])*l/2.0)
enddef;
+let TriangleArea = AireTriangle;
+
vardef CercleInscrit(expr t) =
save AB,BC,CA,a,b,c,I,Aire,rayon;
c = Longueur(gddA[t],gddB[t]);
@@ -273,6 +320,7 @@
Cercle(I,rayon)
enddef;
+let InscribedCircle = CercleInscrit;
vardef CercleExinscrit(expr t,n) =
% t : gdd triangle
@@ -404,6 +452,20 @@
Droite(p,q)
enddef;
+% Droite parallele -------------------------------------------------------
+
+vardef DroiteParallele (expr D,p) =
+ % D : droite par rapport à laquelle on doit être parallele
+ % p : point par lequel doit passer la droite
+ save n,_t,A,B,v,pP,pD; n = incr gddO;
+ pair _t,A,B,v,q;
+ A := Pt(gddA[D]);
+ B := Pt(gddB[D]);
+ v := B-A; %% Vecteur de la droite D
+ q := Pt(p) + v;
+ Droite(p,q)
+enddef;
+
vardef ReportSurDroite(expr P,D,d) =
% P : point de départ du segment
% D : droite sur laquelle construire le point
@@ -970,6 +1032,53 @@
if path p: fill p else: fill (gddTraceObjet p) fi gddEnPlace
enddef;
+% inspiration geometriesyr16
+
+% _hatching parameter
+numeric _ExtHatch,_ExtNombre;
+_ExtHatch := 40;
+def ExtensionHachure(expr t)=
+ _ExtHatch:=t;
+enddef;
+_ExtNombre := 200;
+
+def _hachure_pattern =
+ on0.2 off0.2
+enddef;
+
+def SchemaHachure(text t) = def _hachure_pattern = t enddef enddef;
+
+vardef hachure(expr p,a,e,t) =
+ save $,support;
+ picture $;
+ path support;
+ % le trait de base
+ support=((-_ExtHatch,0)--(_ExtHatch,0)) rotated a;
+ if t=1:
+ drawoptions(dashed evenly scaled (1.0/(gddU)));
+ elseif t=2:
+ drawoptions(dashed dashpattern(on12bp off6bp
+ on3bp off6bp) scaled (1.0/(gddU)));
+ elseif t=3:
+ drawoptions(dashed withdots scaled (1.0/(gddU)));
+ elseif t=4:
+ drawoptions(dashed dashpattern(_hachure_pattern));
+ fi;
+ $ = image(
+ for j=-_ExtNombre upto _ExtNombre:
+ % on test s’il y a intersection (pour ne pas dessiner des choses inutiles)
+ if ((support shifted (e*j*(sind(a),-cosd(a)) if(t>0): +e*(j mod
+ 3-1)*(cosd(a),sind(a)) fi) intersectiontimes (gddTraceObjet(p)))<>(-1,-1)):
+ draw support shifted (e*j*(sind(a),-cosd(a)) if(t>0): +e*(j mod
+ 3-1)*(cosd(a),sind(a)) fi) withpen (pencircle scaled (1.0/(2gddU)));
+ fi
+ endfor;
+ );
+ clip $ to gddTraceObjet(p);
+ drawoptions();
+ $
+enddef;
+
def fermeture expr p =
if path p: p else: (gddTraceObjet p) fi -- cycle
enddef;
Modified: branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d.mp
===================================================================
--- branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d.mp 2025-02-20 20:48:02 UTC (rev 74172)
+++ branches/branch2024.final/Master/texmf-dist/metapost/mp-geom2d/geom2d.mp 2025-02-20 20:48:55 UTC (rev 74173)
@@ -1,7 +1,16 @@
%
if not known mplib: input latexmp fi;
+% Don't load this package twice:
+if known mpgeomdd_version: expandafter endinput; fi;
+numeric mpgeomdd_version;string mpgeomdd_date;
+mpgeomdd_version=1.2;
+mpgeomdd_date="2025/02/19";
+% The banner:
+message "******* mp-geom2d " & decimal (mpgeomdd_version) &
+ " (c) Jean-Michel Sarlat, Maxime Chupin (" & mpgeomdd_date & ") *******";message "";
+
input geom2d-arc;
input geom2d-c2d;
input geom2d-fct;
More information about the tex-live-commits
mailing list.