xypic 3.8.3

git-svn-id: svn://tug.org/texlive/trunk@19311 c570f23f-e606-0410-a88d-b1316a301751

134 files changed, 215 insertions, 205 deletions

diff --git a/Master/texmf-dist/fonts/afm/xypic/xyatip10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyatip10.afm
index 55fcc44d090..cf710aca1f6 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyatip10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyatip10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:10 2010
+Comment Creation Date: Wed Jul  7 00:51:09 2010
 FontName XYATIP-Medium
 FullName XYATIP
 FamilyName XYATIP
diff --git a/Master/texmf-dist/fonts/afm/xypic/xybsql10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xybsql10.afm
index e7c328e9eb3..dac8cbe4d69 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xybsql10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xybsql10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:13 2010
+Comment Creation Date: Wed Jul  7 00:51:11 2010
 FontName XYBSQL-Medium
 FullName XYBSQL
 FamilyName XYBSQL
diff --git a/Master/texmf-dist/fonts/afm/xypic/xybtip10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xybtip10.afm
index 657023bb862..0fbbd2d6e1c 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xybtip10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xybtip10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:16 2010
+Comment Creation Date: Wed Jul  7 00:51:14 2010
 FontName XYBTIP-Medium
 FullName XYBTIP
 FamilyName XYBTIP
diff --git a/Master/texmf-dist/fonts/afm/public/xypic/xycirc10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycirc10.afm
new file mode 100644
index 00000000000..a9e5ca47b9d
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycirc10.afm
@@ -0,0 +1,147 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20090914
+Comment Creation Date: Wed Jul  7 00:51:18 2010
+FontName XYCIRC-Medium
+FullName XYCIRC
+FamilyName XYCIRC
+Weight Medium
+Notice (Generated from MetaFont bitmap by mftrace 1.2.16, http://www.xs4all.nl/~hanwen/mftrace/ )
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.001
+EncodingScheme FontSpecific
+FontBBox -22 -3221 2284 3221
+Descender -2147483648
+StartCharMetrics 128
+C 0 ; WX 29 ; N c0 ; B -21 -91 51 20 ;
+C 1 ; WX 71 ; N c1 ; B -22 -120 90 -50 ;
+C 2 ; WX 71 ; N c2 ; B -20 -121 91 -50 ;
+C 3 ; WX 29 ; N c3 ; B -21 -92 50 21 ;
+C 4 ; WX 29 ; N c4 ; B -21 -19 50 91 ;
+C 5 ; WX 71 ; N c5 ; B -21 50 92 122 ;
+C 6 ; WX 71 ; N c6 ; B -21 50 92 120 ;
+C 7 ; WX 29 ; N c7 ; B -21 -20 51 91 ;
+C 8 ; WX 59 ; N c8 ; B -21 -162 79 20 ;
+C 9 ; WX 141 ; N c9 ; B -21 -222 162 -121 ;
+C 10 ; WX 141 ; N c10 ; B -20 -221 162 -121 ;
+C 11 ; WX 59 ; N c11 ; B -21 -163 79 20 ;
+C 12 ; WX 59 ; N c12 ; B -21 -19 78 163 ;
+C 13 ; WX 141 ; N c13 ; B -20 121 163 221 ;
+C 14 ; WX 141 ; N c14 ; B -21 121 162 220 ;
+C 15 ; WX 59 ; N c15 ; B -21 -20 79 162 ;
+C 16 ; WX 88 ; N c16 ; B -21 -233 108 20 ;
+C 17 ; WX 212 ; N c17 ; B -21 -320 234 -192 ;
+C 18 ; WX 212 ; N c18 ; B -20 -322 234 -192 ;
+C 19 ; WX 88 ; N c19 ; B -21 -234 109 20 ;
+C 20 ; WX 88 ; N c20 ; B -21 -20 109 234 ;
+C 21 ; WX 212 ; N c21 ; B -20 192 234 322 ;
+C 22 ; WX 212 ; N c22 ; B -22 191 234 321 ;
+C 23 ; WX 88 ; N c23 ; B -22 -20 108 233 ;
+C 24 ; WX 117 ; N c24 ; B -21 -303 138 20 ;
+C 25 ; WX 283 ; N c25 ; B -21 -420 303 -261 ;
+C 26 ; WX 283 ; N c26 ; B -19 -422 304 -262 ;
+C 27 ; WX 117 ; N c27 ; B -22 -304 138 20 ;
+C 28 ; WX 117 ; N c28 ; B -21 -19 138 304 ;
+C 29 ; WX 283 ; N c29 ; B -20 261 304 421 ;
+C 30 ; WX 283 ; N c30 ; B -22 261 302 421 ;
+C 31 ; WX 117 ; N c31 ; B -22 -20 138 303 ;
+C 32 ; WX 146 ; N c32 ; B -20 -374 167 20 ;
+C 33 ; WX 354 ; N c33 ; B -21 -522 374 -332 ;
+C 34 ; WX 354 ; N c34 ; B -19 -520 375 -333 ;
+C 35 ; WX 146 ; N c35 ; B -22 -375 167 20 ;
+C 36 ; WX 146 ; N c36 ; B -21 -19 167 375 ;
+C 37 ; WX 354 ; N c37 ; B -20 332 375 521 ;
+C 38 ; WX 354 ; N c38 ; B -22 332 373 521 ;
+C 39 ; WX 146 ; N c39 ; B -21 -20 167 374 ;
+C 40 ; WX 176 ; N c40 ; B -20 -445 196 20 ;
+C 41 ; WX 424 ; N c41 ; B -21 -620 445 -403 ;
+C 42 ; WX 424 ; N c42 ; B -21 -621 446 -404 ;
+C 43 ; WX 176 ; N c43 ; B -20 -445 196 20 ;
+C 44 ; WX 176 ; N c44 ; B -20 -20 196 445 ;
+C 45 ; WX 424 ; N c45 ; B -20 403 446 622 ;
+C 46 ; WX 424 ; N c46 ; B -22 403 445 621 ;
+C 47 ; WX 176 ; N c47 ; B -21 -21 196 445 ;
+C 48 ; WX 205 ; N c48 ; B -20 -515 226 20 ;
+C 49 ; WX 495 ; N c49 ; B -21 -721 515 -473 ;
+C 50 ; WX 495 ; N c50 ; B -19 -720 515 -473 ;
+C 51 ; WX 205 ; N c51 ; B -20 -515 226 20 ;
+C 52 ; WX 205 ; N c52 ; B -20 -20 226 515 ;
+C 53 ; WX 495 ; N c53 ; B -20 474 515 721 ;
+C 54 ; WX 495 ; N c54 ; B -22 473 514 721 ;
+C 55 ; WX 205 ; N c55 ; B -21 -20 226 515 ;
+C 56 ; WX 234 ; N c56 ; B -20 -586 255 20 ;
+C 57 ; WX 566 ; N c57 ; B -21 -822 585 -544 ;
+C 58 ; WX 566 ; N c58 ; B -19 -820 587 -545 ;
+C 59 ; WX 234 ; N c59 ; B -20 -586 255 20 ;
+C 60 ; WX 234 ; N c60 ; B -20 -20 255 586 ;
+C 61 ; WX 566 ; N c61 ; B -21 544 587 821 ;
+C 62 ; WX 566 ; N c62 ; B -22 544 585 821 ;
+C 63 ; WX 234 ; N c63 ; B -20 -19 255 586 ;
+C 64 ; WX 293 ; N c64 ; B -20 -728 313 20 ;
+C 65 ; WX 707 ; N c65 ; B -21 -1020 728 -686 ;
+C 66 ; WX 707 ; N c66 ; B -20 -1022 728 -686 ;
+C 67 ; WX 293 ; N c67 ; B -20 -728 313 20 ;
+C 68 ; WX 293 ; N c68 ; B -20 -20 313 728 ;
+C 69 ; WX 707 ; N c69 ; B -21 687 729 1021 ;
+C 70 ; WX 707 ; N c70 ; B -22 686 728 1021 ;
+C 71 ; WX 293 ; N c71 ; B -21 -20 313 728 ;
+C 72 ; WX 351 ; N c72 ; B -20 -869 372 20 ;
+C 73 ; WX 849 ; N c73 ; B -21 -1220 869 -828 ;
+C 74 ; WX 849 ; N c74 ; B -19 -1220 870 -828 ;
+C 75 ; WX 351 ; N c75 ; B -20 -869 372 20 ;
+C 76 ; WX 351 ; N c76 ; B -20 -20 372 869 ;
+C 77 ; WX 849 ; N c77 ; B -20 827 869 1221 ;
+C 78 ; WX 849 ; N c78 ; B -22 827 869 1221 ;
+C 79 ; WX 351 ; N c79 ; B -20 -19 373 869 ;
+C 80 ; WX 410 ; N c80 ; B -21 -1010 431 20 ;
+C 81 ; WX 990 ; N c81 ; B -21 -1422 1010 -968 ;
+C 82 ; WX 990 ; N c82 ; B -19 -1420 1011 -969 ;
+C 83 ; WX 410 ; N c83 ; B -20 -1010 432 20 ;
+C 84 ; WX 410 ; N c84 ; B -20 -20 432 1011 ;
+C 85 ; WX 990 ; N c85 ; B -20 969 1010 1421 ;
+C 86 ; WX 990 ; N c86 ; B -21 969 1009 1421 ;
+C 87 ; WX 410 ; N c87 ; B -20 -19 431 1010 ;
+C 88 ; WX 469 ; N c88 ; B -21 -1152 489 20 ;
+C 89 ; WX 1131 ; N c89 ; B -21 -1620 1152 -1111 ;
+C 90 ; WX 1131 ; N c90 ; B -20 -1620 1152 -1110 ;
+C 91 ; WX 469 ; N c91 ; B -20 -1152 489 20 ;
+C 92 ; WX 469 ; N c92 ; B -20 -20 489 1152 ;
+C 93 ; WX 1131 ; N c93 ; B -20 1111 1152 1621 ;
+C 94 ; WX 1131 ; N c94 ; B -21 1110 1152 1621 ;
+C 95 ; WX 469 ; N c95 ; B -20 -19 489 1152 ;
+C 96 ; WX 586 ; N c96 ; B -20 -1435 606 20 ;
+C 97 ; WX 1414 ; N c97 ; B -21 -2021 1435 -1393 ;
+C 98 ; WX 1414 ; N c98 ; B -20 -2021 1435 -1393 ;
+C 99 ; WX 586 ; N c99 ; B -20 -1435 606 20 ;
+C 100 ; WX 586 ; N c100 ; B -20 -20 606 1436 ;
+C 101 ; WX 1414 ; N c101 ; B -20 1394 1436 2021 ;
+C 102 ; WX 1414 ; N c102 ; B -22 1394 1435 2021 ;
+C 103 ; WX 586 ; N c103 ; B -21 -19 606 1435 ;
+C 104 ; WX 703 ; N c104 ; B -20 -1719 723 20 ;
+C 105 ; WX 1697 ; N c105 ; B -20 -2420 1718 -1677 ;
+C 106 ; WX 1697 ; N c106 ; B -20 -2421 1718 -1677 ;
+C 107 ; WX 703 ; N c107 ; B -20 -1719 723 20 ;
+C 108 ; WX 703 ; N c108 ; B -20 -20 723 1719 ;
+C 109 ; WX 1697 ; N c109 ; B -20 1677 1718 2420 ;
+C 110 ; WX 1697 ; N c110 ; B -20 1677 1718 2421 ;
+C 111 ; WX 703 ; N c111 ; B -20 -19 723 1718 ;
+C 112 ; WX 820 ; N c112 ; B -21 -2000 841 21 ;
+C 113 ; WX 1980 ; N c113 ; B -20 -2820 2000 -1959 ;
+C 114 ; WX 1980 ; N c114 ; B -20 -2820 2000 -1959 ;
+C 115 ; WX 820 ; N c115 ; B -20 -2000 841 20 ;
+C 116 ; WX 820 ; N c116 ; B -20 -20 841 2001 ;
+C 117 ; WX 1980 ; N c117 ; B -20 1959 2000 2821 ;
+C 118 ; WX 1980 ; N c118 ; B -21 1960 2000 2821 ;
+C 119 ; WX 820 ; N c119 ; B -20 -19 841 2000 ;
+C 120 ; WX 937 ; N c120 ; B -21 -2283 958 20 ;
+C 121 ; WX 2263 ; N c121 ; B -20 -3220 2283 -2242 ;
+C 122 ; WX 2263 ; N c122 ; B -20 -3221 2284 -2242 ;
+C 123 ; WX 937 ; N c123 ; B -20 -2283 958 20 ;
+C 124 ; WX 937 ; N c124 ; B -20 -20 958 2284 ;
+C 125 ; WX 2263 ; N c125 ; B -21 2242 2283 3221 ;
+C 126 ; WX 2263 ; N c126 ; B -21 2242 2284 3221 ;
+C 127 ; WX 937 ; N c127 ; B -20 -20 958 2284 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmat10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmat10.afm
index 28172d24739..fbd81e2a72f 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmat10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmat10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:41 2010
+Comment Creation Date: Wed Jul  7 00:51:37 2010
 FontName XYCMAT-Medium
 FullName XYCMAT
 FamilyName XYCMAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmat11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmat11.afm
index 0f619beba63..09216f8d918 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmat11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmat11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:07 2010
+Comment Creation Date: Wed Jul  7 00:51:07 2010
 FontName xycmat11
 FullName xycmat11
 FamilyName xycmat11
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmat12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmat12.afm
index 77281fdd019..870bf9584f5 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmat12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmat12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:50 2010
+Comment Creation Date: Wed Jul  7 00:51:44 2010
 FontName XYCMAT-Medium
 FullName XYCMAT
 FamilyName XYCMAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmbt10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt10.afm
index 2f3c1491788..37c27cf30b0 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmbt10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:44 2010
+Comment Creation Date: Wed Jul  7 00:51:40 2010
 FontName XYCMBT-Medium
 FullName XYCMBT
 FamilyName XYCMBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmbt11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt11.afm
index f9bd8b1b978..789dd144aa0 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmbt11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:47 2010
+Comment Creation Date: Wed Jul  7 00:51:42 2010
 FontName XYCMBT-Medium
 FullName XYCMBT
 FamilyName XYCMBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycmbt12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt12.afm
index 871e6deb660..99a4ad2b3c1 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xycmbt12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xycmbt12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:53 2010
+Comment Creation Date: Wed Jul  7 00:51:47 2010
 FontName XYCMBT-Medium
 FullName XYCMBT
 FamilyName XYCMBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xydash10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xydash10.afm
index 00d17c1d720..5abf3c7fedd 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xydash10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xydash10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:22 2010
+Comment Creation Date: Wed Jul  7 00:51:21 2010
 FontName XYDASH-Medium
 FullName XYDASH
 FamilyName XYDASH
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeuat10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat10.afm
index d8a27649a80..d2f8c06fb07 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeuat10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:55 2010
+Comment Creation Date: Wed Jul  7 00:51:49 2010
 FontName XYEUAT-Medium
 FullName XYEUAT
 FamilyName XYEUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeuat11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat11.afm
index 3a7e8dc3add..0f28c3b4207 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeuat11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:59 2010
+Comment Creation Date: Wed Jul  7 00:51:54 2010
 FontName XYEUAT-Medium
 FullName XYEUAT
 FamilyName XYEUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeuat12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat12.afm
index 2a728edb93f..8c9ea5456ef 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeuat12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeuat12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:47:04 2010
+Comment Creation Date: Wed Jul  7 00:51:58 2010
 FontName XYEUAT-Medium
 FullName XYEUAT
 FamilyName XYEUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeubt10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt10.afm
index 4512f9636ec..5df3d11e65a 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeubt10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:57 2010
+Comment Creation Date: Wed Jul  7 00:51:52 2010
 FontName XYEUBT-Medium
 FullName XYEUBT
 FamilyName XYEUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeubt11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt11.afm
index b38ebd11c1d..b10e673375b 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeubt11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:47:02 2010
+Comment Creation Date: Wed Jul  7 00:51:56 2010
 FontName XYEUBT-Medium
 FullName XYEUBT
 FamilyName XYEUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyeubt12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt12.afm
index 9dee5c52aae..96ebfc926a4 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyeubt12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyeubt12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:47:07 2010
+Comment Creation Date: Wed Jul  7 00:52:01 2010
 FontName XYEUBT-Medium
 FullName XYEUBT
 FamilyName XYEUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyluat10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyluat10.afm
index e210133b4e3..9b9ff07074f 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyluat10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyluat10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:25 2010
+Comment Creation Date: Wed Jul  7 00:51:23 2010
 FontName XYLUAT-Medium
 FullName XYLUAT
 FamilyName XYLUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyluat11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyluat11.afm
index 37a4fac56d4..94a64b533d9 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyluat11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyluat11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:30 2010
+Comment Creation Date: Wed Jul  7 00:51:28 2010
 FontName XYLUAT-Medium
 FullName XYLUAT
 FamilyName XYLUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xyluat12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xyluat12.afm
index f182f6b6734..eccb891439e 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xyluat12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xyluat12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:36 2010
+Comment Creation Date: Wed Jul  7 00:51:33 2010
 FontName XYLUAT-Medium
 FullName XYLUAT
 FamilyName XYLUAT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xylubt10.afm b/Master/texmf-dist/fonts/afm/public/xypic/xylubt10.afm
index 20875c0dc36..0a00a209792 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xylubt10.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xylubt10.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:27 2010
+Comment Creation Date: Wed Jul  7 00:51:26 2010
 FontName XYLUBT-Medium
 FullName XYLUBT
 FamilyName XYLUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xylubt11.afm b/Master/texmf-dist/fonts/afm/public/xypic/xylubt11.afm
index 41c564dbcda..897c0e6fcf6 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xylubt11.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xylubt11.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:33 2010
+Comment Creation Date: Wed Jul  7 00:51:30 2010
 FontName XYLUBT-Medium
 FullName XYLUBT
 FamilyName XYLUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xylubt12.afm b/Master/texmf-dist/fonts/afm/public/xypic/xylubt12.afm
index 98929a59b6c..566181c9cc4 100644
--- a/Master/texmf-dist/fonts/afm/xypic/xylubt12.afm
+++ b/Master/texmf-dist/fonts/afm/public/xypic/xylubt12.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:39 2010
+Comment Creation Date: Wed Jul  7 00:51:35 2010
 FontName XYLUBT-Medium
 FullName XYLUBT
 FamilyName XYLUBT
diff --git a/Master/texmf-dist/fonts/afm/xypic/xycirc10.afm b/Master/texmf-dist/fonts/afm/xypic/xycirc10.afm
deleted file mode 100644
index fecfcff8f5c..00000000000
--- a/Master/texmf-dist/fonts/afm/xypic/xycirc10.afm
+++ /dev/null
@@ -1,147 +0,0 @@
-StartFontMetrics 2.0
-Comment Generated by FontForge 20090914
-Comment Creation Date: Wed Jun 23 15:46:20 2010
-FontName XYCIRC-Medium
-FullName XYCIRC
-FamilyName XYCIRC
-Weight Medium
-Notice (Generated from MetaFont bitmap by mftrace 1.2.16, http://www.xs4all.nl/~hanwen/mftrace/ )
-ItalicAngle 0
-IsFixedPitch false
-UnderlinePosition -100
-UnderlineThickness 50
-Version 001.001
-EncodingScheme FontSpecific
-FontBBox -21 -3220 2284 3221
-Descender -2147483648
-StartCharMetrics 128
-C 0 ; WX 29 ; N c0 ; B -21 -91 50 21 ;
-C 1 ; WX 71 ; N c1 ; B -20 -122 91 -50 ;
-C 2 ; WX 71 ; N c2 ; B -20 -120 92 -50 ;
-C 3 ; WX 29 ; N c3 ; B -20 -91 50 21 ;
-C 4 ; WX 29 ; N c4 ; B -20 -20 51 91 ;
-C 5 ; WX 71 ; N c5 ; B -20 50 91 121 ;
-C 6 ; WX 71 ; N c6 ; B -20 51 91 121 ;
-C 7 ; WX 29 ; N c7 ; B -21 -20 50 92 ;
-C 8 ; WX 59 ; N c8 ; B -19 -162 79 21 ;
-C 9 ; WX 141 ; N c9 ; B -20 -221 162 -121 ;
-C 10 ; WX 141 ; N c10 ; B -20 -222 162 -121 ;
-C 11 ; WX 59 ; N c11 ; B -20 -162 79 21 ;
-C 12 ; WX 59 ; N c12 ; B -20 -20 79 162 ;
-C 13 ; WX 141 ; N c13 ; B -20 120 162 221 ;
-C 14 ; WX 141 ; N c14 ; B -20 121 162 221 ;
-C 15 ; WX 59 ; N c15 ; B -19 -20 79 163 ;
-C 16 ; WX 88 ; N c16 ; B -19 -233 109 21 ;
-C 17 ; WX 212 ; N c17 ; B -20 -321 233 -191 ;
-C 18 ; WX 212 ; N c18 ; B -20 -322 233 -191 ;
-C 19 ; WX 88 ; N c19 ; B -20 -232 108 21 ;
-C 20 ; WX 88 ; N c20 ; B -20 -20 108 233 ;
-C 21 ; WX 212 ; N c21 ; B -20 191 233 321 ;
-C 22 ; WX 212 ; N c22 ; B -21 191 233 321 ;
-C 23 ; WX 88 ; N c23 ; B -19 -20 109 233 ;
-C 24 ; WX 117 ; N c24 ; B -19 -303 137 21 ;
-C 25 ; WX 283 ; N c25 ; B -21 -421 303 -262 ;
-C 26 ; WX 283 ; N c26 ; B -20 -420 303 -262 ;
-C 27 ; WX 117 ; N c27 ; B -20 -303 139 21 ;
-C 28 ; WX 117 ; N c28 ; B -20 -20 138 303 ;
-C 29 ; WX 283 ; N c29 ; B -20 263 303 421 ;
-C 30 ; WX 283 ; N c30 ; B -20 263 303 421 ;
-C 31 ; WX 117 ; N c31 ; B -19 -20 137 303 ;
-C 32 ; WX 146 ; N c32 ; B -20 -373 167 21 ;
-C 33 ; WX 354 ; N c33 ; B -20 -521 374 -332 ;
-C 34 ; WX 354 ; N c34 ; B -20 -521 374 -333 ;
-C 35 ; WX 146 ; N c35 ; B -20 -374 167 21 ;
-C 36 ; WX 146 ; N c36 ; B -20 -20 167 374 ;
-C 37 ; WX 354 ; N c37 ; B -20 333 374 521 ;
-C 38 ; WX 354 ; N c38 ; B -20 333 374 521 ;
-C 39 ; WX 146 ; N c39 ; B -20 -20 167 374 ;
-C 40 ; WX 176 ; N c40 ; B -19 -445 196 21 ;
-C 41 ; WX 424 ; N c41 ; B -20 -621 445 -403 ;
-C 42 ; WX 424 ; N c42 ; B -20 -620 445 -403 ;
-C 43 ; WX 176 ; N c43 ; B -20 -444 196 21 ;
-C 44 ; WX 176 ; N c44 ; B -20 -20 196 445 ;
-C 45 ; WX 424 ; N c45 ; B -20 403 445 621 ;
-C 46 ; WX 424 ; N c46 ; B -20 403 446 621 ;
-C 47 ; WX 176 ; N c47 ; B -19 -20 196 445 ;
-C 48 ; WX 205 ; N c48 ; B -20 -515 226 21 ;
-C 49 ; WX 495 ; N c49 ; B -21 -721 515 -474 ;
-C 50 ; WX 495 ; N c50 ; B -20 -721 516 -474 ;
-C 51 ; WX 205 ; N c51 ; B -20 -515 226 21 ;
-C 52 ; WX 205 ; N c52 ; B -20 -20 226 515 ;
-C 53 ; WX 495 ; N c53 ; B -20 474 515 721 ;
-C 54 ; WX 495 ; N c54 ; B -21 475 515 721 ;
-C 55 ; WX 205 ; N c55 ; B -20 -20 226 515 ;
-C 56 ; WX 234 ; N c56 ; B -19 -587 256 21 ;
-C 57 ; WX 566 ; N c57 ; B -20 -820 586 -545 ;
-C 58 ; WX 566 ; N c58 ; B -20 -821 586 -545 ;
-C 59 ; WX 234 ; N c59 ; B -20 -586 255 21 ;
-C 60 ; WX 234 ; N c60 ; B -20 -20 255 587 ;
-C 61 ; WX 566 ; N c61 ; B -20 545 587 821 ;
-C 62 ; WX 566 ; N c62 ; B -20 545 586 821 ;
-C 63 ; WX 234 ; N c63 ; B -19 -20 256 586 ;
-C 64 ; WX 293 ; N c64 ; B -19 -728 314 21 ;
-C 65 ; WX 707 ; N c65 ; B -21 -1021 728 -687 ;
-C 66 ; WX 707 ; N c66 ; B -20 -1020 728 -687 ;
-C 67 ; WX 293 ; N c67 ; B -21 -728 313 21 ;
-C 68 ; WX 293 ; N c68 ; B -21 -20 313 728 ;
-C 69 ; WX 707 ; N c69 ; B -20 686 728 1021 ;
-C 70 ; WX 707 ; N c70 ; B -20 687 728 1021 ;
-C 71 ; WX 293 ; N c71 ; B -19 -20 314 728 ;
-C 72 ; WX 351 ; N c72 ; B -21 -869 372 21 ;
-C 73 ; WX 849 ; N c73 ; B -20 -1220 869 -828 ;
-C 74 ; WX 849 ; N c74 ; B -20 -1221 869 -828 ;
-C 75 ; WX 351 ; N c75 ; B -20 -869 373 21 ;
-C 76 ; WX 351 ; N c76 ; B -20 -20 372 870 ;
-C 77 ; WX 849 ; N c77 ; B -20 828 869 1221 ;
-C 78 ; WX 849 ; N c78 ; B -20 828 869 1221 ;
-C 79 ; WX 351 ; N c79 ; B -20 -20 372 869 ;
-C 80 ; WX 410 ; N c80 ; B -19 -1011 431 21 ;
-C 81 ; WX 990 ; N c81 ; B -21 -1421 1010 -969 ;
-C 82 ; WX 990 ; N c82 ; B -20 -1421 1011 -969 ;
-C 83 ; WX 410 ; N c83 ; B -20 -1010 431 21 ;
-C 84 ; WX 410 ; N c84 ; B -20 -20 431 1010 ;
-C 85 ; WX 990 ; N c85 ; B -20 969 1010 1421 ;
-C 86 ; WX 990 ; N c86 ; B -21 970 1010 1421 ;
-C 87 ; WX 410 ; N c87 ; B -19 -20 431 1010 ;
-C 88 ; WX 469 ; N c88 ; B -20 -1152 490 21 ;
-C 89 ; WX 1131 ; N c89 ; B -20 -1621 1152 -1110 ;
-C 90 ; WX 1131 ; N c90 ; B -20 -1620 1152 -1110 ;
-C 91 ; WX 469 ; N c91 ; B -20 -1152 489 21 ;
-C 92 ; WX 469 ; N c92 ; B -20 -20 489 1153 ;
-C 93 ; WX 1131 ; N c93 ; B -20 1110 1152 1621 ;
-C 94 ; WX 1131 ; N c94 ; B -20 1110 1152 1621 ;
-C 95 ; WX 469 ; N c95 ; B -21 -20 490 1153 ;
-C 96 ; WX 586 ; N c96 ; B -20 -1435 606 21 ;
-C 97 ; WX 1414 ; N c97 ; B -21 -2021 1435 -1394 ;
-C 98 ; WX 1414 ; N c98 ; B -20 -2020 1435 -1393 ;
-C 99 ; WX 586 ; N c99 ; B -21 -1435 606 21 ;
-C 100 ; WX 586 ; N c100 ; B -20 -20 606 1435 ;
-C 101 ; WX 1414 ; N c101 ; B -20 1393 1435 2021 ;
-C 102 ; WX 1414 ; N c102 ; B -20 1393 1435 2021 ;
-C 103 ; WX 586 ; N c103 ; B -20 -20 606 1435 ;
-C 104 ; WX 703 ; N c104 ; B -20 -1718 724 21 ;
-C 105 ; WX 1697 ; N c105 ; B -21 -2421 1718 -1677 ;
-C 106 ; WX 1697 ; N c106 ; B -21 -2420 1718 -1677 ;
-C 107 ; WX 703 ; N c107 ; B -21 -1718 723 21 ;
-C 108 ; WX 703 ; N c108 ; B -21 -20 723 1718 ;
-C 109 ; WX 1697 ; N c109 ; B -21 1676 1718 2421 ;
-C 110 ; WX 1697 ; N c110 ; B -21 1677 1718 2421 ;
-C 111 ; WX 703 ; N c111 ; B -20 -20 724 1718 ;
-C 112 ; WX 820 ; N c112 ; B -19 -2001 840 21 ;
-C 113 ; WX 1980 ; N c113 ; B -21 -2820 2000 -1959 ;
-C 114 ; WX 1980 ; N c114 ; B -21 -2820 2001 -1959 ;
-C 115 ; WX 820 ; N c115 ; B -20 -2000 841 21 ;
-C 116 ; WX 820 ; N c116 ; B -20 -20 841 2000 ;
-C 117 ; WX 1980 ; N c117 ; B -21 1959 2001 2821 ;
-C 118 ; WX 1980 ; N c118 ; B -21 1959 2000 2821 ;
-C 119 ; WX 820 ; N c119 ; B -19 -20 841 2000 ;
-C 120 ; WX 937 ; N c120 ; B -21 -2284 958 21 ;
-C 121 ; WX 2263 ; N c121 ; B -20 -3220 2283 -2242 ;
-C 122 ; WX 2263 ; N c122 ; B -21 -3220 2284 -2242 ;
-C 123 ; WX 937 ; N c123 ; B -20 -2283 958 21 ;
-C 124 ; WX 937 ; N c124 ; B -20 -20 959 2284 ;
-C 125 ; WX 2263 ; N c125 ; B -21 2242 2283 3221 ;
-C 126 ; WX 2263 ; N c126 ; B -20 2242 2283 3221 ;
-C 127 ; WX 937 ; N c127 ; B -20 -21 958 2283 ;
-EndCharMetrics
-EndFontMetrics
diff --git a/Master/texmf-dist/fonts/source/xypic/xyatip.mf b/Master/texmf-dist/fonts/source/public/xypic/xyatip.mf
index d3c5d117bd5..d3c5d117bd5 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyatip.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyatip.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyatip10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyatip10.mf
index 22b5ca9ca2b..22b5ca9ca2b 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyatip10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyatip10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyatri.mf b/Master/texmf-dist/fonts/source/public/xypic/xyatri.mf
index 6be21cf2ea6..6be21cf2ea6 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyatri.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyatri.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xybsql10.mf b/Master/texmf-dist/fonts/source/public/xypic/xybsql10.mf
index 1d2291d6b79..1d2291d6b79 100644
--- a/Master/texmf-dist/fonts/source/xypic/xybsql10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xybsql10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xybtip.mf b/Master/texmf-dist/fonts/source/public/xypic/xybtip.mf
index e6e95e7159f..e6e95e7159f 100644
--- a/Master/texmf-dist/fonts/source/xypic/xybtip.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xybtip.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xybtip10.mf b/Master/texmf-dist/fonts/source/public/xypic/xybtip10.mf
index c944c2b8a89..c944c2b8a89 100644
--- a/Master/texmf-dist/fonts/source/xypic/xybtip10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xybtip10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xybtri.mf b/Master/texmf-dist/fonts/source/public/xypic/xybtri.mf
index 69e8d007b21..69e8d007b21 100644
--- a/Master/texmf-dist/fonts/source/xypic/xybtri.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xybtri.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycirc10.mf b/Master/texmf-dist/fonts/source/public/xypic/xycirc10.mf
index 9ff773dc8ce..eb9f06feeb7 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycirc10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycirc10.mf
@@ -1,7 +1,8 @@
-% $Id: xycirc10.mf,v 3.10 2010/06/10 18:45:50 krisrose Exp $
+% $Id: xycirc10.mf,v 3.11 2010/07/06 21:49:55 krisrose Exp $
 %
 % XYCIRC10: 1/8 circles with varying radii for Xy-pic at 10 point.
-% Copyright (c) 1992,1993  Kristoffer H. Rose  <krisrose@tug.org>
+% Copyright (c) 1992,2010  Kristoffer H. Rose  <krisrose@tug.org>
+%                    2010  Daniel Müllner <http://www.math.uni-bonn.de/people/muellner>
 %
 % This file is part of the Xy-pic macro package.
 %
@@ -48,11 +49,6 @@
 %  radius [pt] = g+1,		if  0 <= g < 8
 %	       	 2(g-8) + 10,	if  8 <= g < 12		[= 2g-6]
 %	    	 4(g-12) + 20,	if 12 <= g < 16		[= 4g-28]
-%
-% The bounding box of each segment is the smallest box enclosing it (not
-% including the rule width) with reference point on the horizontal line
-% through the center of the circle---so segment 1256 have either height or
-% depth negative.
 % _________________________________________________________________________
 %
 font_identifier "XYCIRC"; font_size 10pt#;
@@ -60,9 +56,7 @@ mode_setup;
 
 % METANESS...
 %
-rulew# = .4pt#; define_whole_blacker_pixels(rulew); % line thickness
-%
-pickup pencircle scaled rulew; char_pen := savepen;
+rulew# = .4pt#; define_blacker_pixels(rulew); % line thickness
 
 % TESTING...we redefine openit because the characters extend far to the
 % left of the bounding box!
@@ -78,47 +72,60 @@ enddef;
 font_coding_scheme:="xycirc.enc";
 fontdimen 8:	rulew#;			% default_rule_thickness
 
+% (It's unnecessary to give the exact control points. MetaFont
+% automatically chooses a good approximation to a circular arc.)
+path eighthcircle;
+eighthcircle = right{up} .. {left+up}(right+up)/sqrt2;
+
 % Use the following macro that generates an entire group from character cc
 % to cc+7 with radius:
 %
+
 def makeg(expr g,radius) =
 
- minor# := (1 - sqrt 1/2) * radius;
- major# := radius - minor#;
+ major# := radius/sqrt2;
+ minor# := radius - major#;
  full#  := radius;
  define_pixels(minor,major,full);
 
- beginchar(8g  ,minor#,full#,full#); pickup char_pen;
-  z0=(0,0); z1=(minor,-major); draw z0{0,-1}..{1,-1}z1;
-  penlabels(0,1); endchar;
+ path arc;
+ arc = eighthcircle scaled (full + rulew/2) 
+    & halfcircle scaled rulew shifted (full*right) rotated 45 
+    & reverse eighthcircle scaled (full - rulew/2)
+    & halfcircle scaled rulew rotated 180 shifted (full*right)
+    & cycle;
+
+ beginchar(8g  ,minor#,full#,full#);
+  fill arc rotated 180 shifted (full*right);
+  endchar;
 
- beginchar(8g+1,major#,full#,full#); pickup char_pen;
-  z0=(0,-major); z1=(major,-full ); draw z0{1,-1}..{1,0}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+1,major#,full#,full#);
+  fill arc rotated 225 shifted (major*right);
+  endchar;
 
- beginchar(8g+2,major#,full#,full#); pickup char_pen;
-  z0=(0,-full); z1=(major,-major); draw z0{1,0}..{1, 1}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+2,major#,full#,full#);
+  fill arc rotated 270;
+  endchar;
 
- beginchar(8g+3,minor#,full#,full#); pickup char_pen;
-  z0=(0,-major); z1=(minor,0); draw z0{1, 1}..{0, 1}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+3,minor#,full#,full#);
+  fill arc rotated 315 shifted (major*left);
+  endchar;
 
- beginchar(8g+4,minor#,full#,full#); pickup char_pen;
-  z0=(0, major); z1=(minor,0); draw z0{1,-1}..{0,-1}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+4,minor#,full#,full#);
+  fill arc shifted (major*left);
+  endchar;
 
- beginchar(8g+5,major#,full#,full#); pickup char_pen;
-  z0=(0, full); z1=(major, major); draw z0{1,0}..{1,-1}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+5,major#,full#,full#);
+  fill arc rotated 45;
+  endchar;
 
- beginchar(8g+6,major#,full#,full#); pickup char_pen;
-  z0=(0, major); z1=(major, full); draw z0{1, 1}..{1,0}z1;
-  penlabels(0,1); endchar;
+ beginchar(8g+6,major#,full#,full#);
+  fill arc rotated 90 shifted (major*right);
+  endchar;
 
- beginchar(8g+7,minor#,full#,full#); pickup char_pen;
-  z0=(0,0); z1=(minor, major); draw z0{0, 1}..{1, 1}z1;
-  penlabels(0,1); endchar
+ beginchar(8g+7,minor#,full#,full#);
+  fill arc rotated 135 shifted (full*right);
+  endchar;
 
 enddef;
 
@@ -131,6 +138,9 @@ for g = 12 step 1 until 15: makeg(g,(4g-28)*pt#); endfor;
 bye.
 
 % $Log: xycirc10.mf,v $
+% Revision 3.11  2010/07/06 21:49:55  krisrose
+% Daniel's fix that works around bug in mf2pt1/fontforge script.
+%
 % Revision 3.10  2010/06/10 18:45:50  krisrose
 % Reference to GPL by URL.
 %
diff --git a/Master/texmf-dist/fonts/source/xypic/xycm.mf b/Master/texmf-dist/fonts/source/public/xypic/xycm.mf
index fb0a4240236..fb0a4240236 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycm.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycm.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmat10.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmat10.mf
index ecd65e1cfc1..ecd65e1cfc1 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmat10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmat10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmat11.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmat11.mf
index 9e9f8f086d8..9e9f8f086d8 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmat11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmat11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmat12.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmat12.mf
index 0c021251816..0c021251816 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmat12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmat12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmbt10.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmbt10.mf
index fd3fd9c8d0e..fd3fd9c8d0e 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmbt10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmbt10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmbt11.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmbt11.mf
index a286a4883cc..a286a4883cc 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmbt11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmbt11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xycmbt12.mf b/Master/texmf-dist/fonts/source/public/xypic/xycmbt12.mf
index f9ebff3be8c..f9ebff3be8c 100644
--- a/Master/texmf-dist/fonts/source/xypic/xycmbt12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xycmbt12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyd.mf b/Master/texmf-dist/fonts/source/public/xypic/xyd.mf
index fad1c242b0c..fad1c242b0c 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyd.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyd.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyd2.mf b/Master/texmf-dist/fonts/source/public/xypic/xyd2.mf
index d4ab6f9c373..d4ab6f9c373 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyd2.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyd2.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xydash10.mf b/Master/texmf-dist/fonts/source/public/xypic/xydash10.mf
index b97d2026f23..b97d2026f23 100644
--- a/Master/texmf-dist/fonts/source/xypic/xydash10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xydash10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeuat10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeuat10.mf
index 170ea3b5a7b..170ea3b5a7b 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeuat10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeuat10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeuat11.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeuat11.mf
index 6dcc7da88a7..6dcc7da88a7 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeuat11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeuat11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeuat12.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeuat12.mf
index 20f6fd1dd0b..20f6fd1dd0b 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeuat12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeuat12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeubt10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeubt10.mf
index 507825ffbd9..507825ffbd9 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeubt10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeubt10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeubt11.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeubt11.mf
index 24af94c70bd..24af94c70bd 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeubt11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeubt11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeubt12.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeubt12.mf
index dfe39356122..dfe39356122 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeubt12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeubt12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyeuler.mf b/Master/texmf-dist/fonts/source/public/xypic/xyeuler.mf
index efad5dfd6da..efad5dfd6da 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyeuler.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyeuler.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyline10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyline10.mf
index 41aad6e0434..41aad6e0434 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyline10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyline10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xylu.mf b/Master/texmf-dist/fonts/source/public/xypic/xylu.mf
index df8dc456603..df8dc456603 100644
--- a/Master/texmf-dist/fonts/source/xypic/xylu.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xylu.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyluat10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyluat10.mf
index f97f5c89a75..f97f5c89a75 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyluat10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyluat10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyluat11.mf b/Master/texmf-dist/fonts/source/public/xypic/xyluat11.mf
index ac898166705..ac898166705 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyluat11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyluat11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyluat12.mf b/Master/texmf-dist/fonts/source/public/xypic/xyluat12.mf
index 4008632faae..4008632faae 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyluat12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyluat12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xylubt10.mf b/Master/texmf-dist/fonts/source/public/xypic/xylubt10.mf
index 08d9ca4e526..08d9ca4e526 100644
--- a/Master/texmf-dist/fonts/source/xypic/xylubt10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xylubt10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xylubt11.mf b/Master/texmf-dist/fonts/source/public/xypic/xylubt11.mf
index bd6bd9abec0..bd6bd9abec0 100644
--- a/Master/texmf-dist/fonts/source/xypic/xylubt11.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xylubt11.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xylubt12.mf b/Master/texmf-dist/fonts/source/public/xypic/xylubt12.mf
index 87f70b082dd..87f70b082dd 100644
--- a/Master/texmf-dist/fonts/source/xypic/xylubt12.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xylubt12.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xymisc10.mf b/Master/texmf-dist/fonts/source/public/xypic/xymisc10.mf
index 268e3c42a62..268e3c42a62 100644
--- a/Master/texmf-dist/fonts/source/xypic/xymisc10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xymisc10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xyqc10.mf b/Master/texmf-dist/fonts/source/public/xypic/xyqc10.mf
index ef30cdb8f98..ef30cdb8f98 100644
--- a/Master/texmf-dist/fonts/source/xypic/xyqc10.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xyqc10.mf
diff --git a/Master/texmf-dist/fonts/source/xypic/xytech.mf b/Master/texmf-dist/fonts/source/public/xypic/xytech.mf
index 60e36c86a30..60e36c86a30 100644
--- a/Master/texmf-dist/fonts/source/xypic/xytech.mf
+++ b/Master/texmf-dist/fonts/source/public/xypic/xytech.mf
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyatip10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyatip10.tfm
index 83fca40ff01..83fca40ff01 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyatip10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyatip10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xybsql10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xybsql10.tfm
index b2c2ae59273..b2c2ae59273 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xybsql10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xybsql10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xybtip10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xybtip10.tfm
index 83fca40ff01..83fca40ff01 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xybtip10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xybtip10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycirc10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycirc10.tfm
index 7a726663c08..134c80fbf2f 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycirc10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycirc10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmat10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat10.tfm
index 9966a03f092..9966a03f092 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmat10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmat11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat11.tfm
index b90166be193..b90166be193 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmat11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmat12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat12.tfm
index 0a8c1e4662e..0a8c1e4662e 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmat12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmat12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmbt10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt10.tfm
index 9966a03f092..9966a03f092 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmbt10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmbt11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt11.tfm
index b90166be193..b90166be193 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmbt11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xycmbt12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt12.tfm
index 0a8c1e4662e..0a8c1e4662e 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xycmbt12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xycmbt12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xydash10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xydash10.tfm
index 00dc96d5862..00dc96d5862 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xydash10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xydash10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeuat10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat10.tfm
index 1f32b9a4289..1f32b9a4289 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeuat10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeuat11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat11.tfm
index 1c27c3fd7ac..1c27c3fd7ac 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeuat11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeuat12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat12.tfm
index 5e3cbe062c0..5e3cbe062c0 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeuat12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeuat12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeubt10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt10.tfm
index 1f32b9a4289..1f32b9a4289 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeubt10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeubt11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt11.tfm
index 1c27c3fd7ac..1c27c3fd7ac 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeubt11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyeubt12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt12.tfm
index 5e3cbe062c0..5e3cbe062c0 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyeubt12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyeubt12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyline10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyline10.tfm
index b6965721ee2..b6965721ee2 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyline10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyline10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyluat10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat10.tfm
index 93fedf9f8ed..93fedf9f8ed 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyluat10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyluat11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat11.tfm
index bd999ef959b..bd999ef959b 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyluat11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyluat12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat12.tfm
index 102c1001f29..102c1001f29 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyluat12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyluat12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xylubt10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt10.tfm
index 93fedf9f8ed..93fedf9f8ed 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xylubt10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xylubt11.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt11.tfm
index bd999ef959b..bd999ef959b 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xylubt11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xylubt12.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt12.tfm
index 102c1001f29..102c1001f29 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xylubt12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xylubt12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xymisc10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xymisc10.tfm
index 9de7ce48e3d..9de7ce48e3d 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xymisc10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xymisc10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/xypic/xyqc10.tfm b/Master/texmf-dist/fonts/tfm/public/xypic/xyqc10.tfm
index 1ac87cf999f..1ac87cf999f 100644
--- a/Master/texmf-dist/fonts/tfm/xypic/xyqc10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/xypic/xyqc10.tfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyatip10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyatip10.pfb
index f6fe4b8edf2..3fef0355877 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyatip10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyatip10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyatip10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyatip10.pfm
index 12674a00168..9133edad5ba 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyatip10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyatip10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xybsql10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xybsql10.pfb
index 6be4e079a15..1e368987579 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xybsql10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xybsql10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xybsql10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xybsql10.pfm
index 482fbe23563..53a29e72c76 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xybsql10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xybsql10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xybtip10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xybtip10.pfb
index 008d5cdbf7b..b815029d57d 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xybtip10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xybtip10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xybtip10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xybtip10.pfm
index 158560855e6..8451f893850 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xybtip10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xybtip10.pfm
diff --git a/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfb
new file mode 100644
index 00000000000..e66f309d77b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfm
new file mode 100644
index 00000000000..caaade3d05b
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycirc10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmat10.pfb
index f296c43fb80..956af2e75de 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmat10.pfm
index 8abd962ce28..869c8293a05 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmat11.pfb
index 015abab187a..fc588db88a3 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmat11.pfm
index 8ca36383e51..5cfc2af71d8 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmat12.pfb
index 3123dd36e99..368d7df5901 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmat12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmat12.pfm
index ffcd481ef01..939460fdcef 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmat12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmat12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt10.pfb
index be22ab163c9..8e00fac2509 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt10.pfm
index bf26bad278a..2aa8aee9803 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt11.pfb
index 9b111a46225..533c73d0031 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt11.pfm
index a80a8f4e96a..eba5f4e0aaa 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt12.pfb
index 2e32fc9c8c5..7def86199c6 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycmbt12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt12.pfm
index 37deaffc1cc..ae6b29bf1c3 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xycmbt12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xycmbt12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xydash10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xydash10.pfb
index a83b59e1fd2..f6ee0767ea1 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xydash10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xydash10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xydash10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xydash10.pfm
index b016a826dbe..306349373d9 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xydash10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xydash10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat10.pfb
index 80c448e5f25..b089179d123 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat10.pfm
index 1b0c16c343c..1a82b0aeaa9 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat11.pfb
index aa88102cfd1..7af2491bb62 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat11.pfm
index a29f0c13298..c07cd13a1b6 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat12.pfb
index 8c78dc66cd3..8ccbb38eae0 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeuat12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat12.pfm
index 2a3e88fd30d..9f8b12091d8 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeuat12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeuat12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt10.pfb
index 7d8646d4f04..9bbc2b56a63 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt10.pfm
index eab9b019628..140603b2b7a 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt11.pfb
index a627ac2987b..dc266244179 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt11.pfm
index 644337659b7..6e1baccff86 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt12.pfb
index 9382c4604ce..e17fe699966 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyeubt12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt12.pfm
index a45b079cf17..899da05da9d 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyeubt12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyeubt12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyluat10.pfb
index 7d1e48206de..e583372992e 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyluat10.pfm
index ac3346fb476..98de6f7b00e 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyluat11.pfb
index e98dea5ae4c..51145118849 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyluat11.pfm
index 001ce16e9ef..d1a9a9adaea 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xyluat12.pfb
index fa8d0eef16a..82cc53b6f92 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xyluat12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xyluat12.pfm
index 97c653e5a9d..69db615350b 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xyluat12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xyluat12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt10.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xylubt10.pfb
index 147d8c1aaae..d5dadd96fc5 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt10.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt10.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt10.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xylubt10.pfm
index f204bd18a89..b4ee8605831 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt10.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt10.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt11.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xylubt11.pfb
index 8ecee63cd38..1ec5aa78f72 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt11.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt11.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt11.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xylubt11.pfm
index 976153fac2a..5550087cc88 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt11.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt11.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt12.pfb b/Master/texmf-dist/fonts/type1/public/xypic/xylubt12.pfb
index c6343866734..1dad9429168 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt12.pfb
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt12.pfb
diff --git a/Master/texmf-dist/fonts/type1/xypic/xylubt12.pfm b/Master/texmf-dist/fonts/type1/public/xypic/xylubt12.pfm
index c8103b8b764..f0a95e24a32 100644
--- a/Master/texmf-dist/fonts/type1/xypic/xylubt12.pfm
+++ b/Master/texmf-dist/fonts/type1/public/xypic/xylubt12.pfm
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfb b/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfb
deleted file mode 100644
index 21ecb9bbef1..00000000000
--- a/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfb
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfm b/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfm
deleted file mode 100644
index dd367d6de52..00000000000
--- a/Master/texmf-dist/fonts/type1/xypic/xycirc10.pfm
+++ /dev/null