fdsymbol (22may11)

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

44 files changed, 194 insertions, 165 deletions

diff --git a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-a.enc b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-a.enc
index 7838e6ce3ba..6a5941dac9e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-a.enc
@@ -22,7 +22,7 @@
   /uni25BC /uni25B3.big /uni25BD.big /openbullet /bullet /uni25CB /uni25CF /minuscircle
 %60
   /uni29B6 /uni2298 /uni29B8 /circleplus /circlemultiply /circleot /uni229A /uni229B
-  /uni229C /uni229D /emptyset /uni29B0 /uni25EF /uni2B24 /uni25AB /uni25AA
+  /uni229D /uni229C /emptyset /uni29B0 /uni25EF /uni2B24 /uni25AB /uni25AA
 %70
   /uni25A1 /uni25A0 /uni229F /uni25EB /uni29C4 /uni29C5 /uni229E /uni22A0
   /uni22A1 /uni29C8 /uni2B1C /uni2B1B /uni22C4 /uni2B29 /uni25C7 /uni25C6
diff --git a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-c.enc b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-c.enc
index 660256e41b2..af4836eebc0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-c.enc
@@ -18,7 +18,7 @@
   /harpoonrightbarbup /uni21BF /uni21BD /uni21C2 /neharpoonup /nwharpoonup /swharpoonup /seharpoonup
   /uni21C1 /uni21BE /harpoonleftbarbup /uni21C3 /neharpoondown /nwharpoondown /swharpoondown /seharpoondown
 %50
-  /uni294B /uni294D /neswharpoonnwse /senwharpoonnesw /uni294A /uni294B /neswharpoonsenw /nwseharpoonswne
+  /uni294B /uni294D /neswharpoonnwse /senwharpoonnesw /uni294A /uni294C /neswharpoonsenw /nwseharpoonswne
   /uni21CC /uni296E /neswharpoons /senwharpoons /uni21CB /uni296F /swneharpoons /nwseharpoons
 %60
   /arrowdashright /arrowdashup /arrowdashleft /arrowdashdown /dashednearrow /dashednwarrow /dashedswarrow /dashedsearrow
diff --git a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-d.enc b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-d.enc
index dbca79ff1a5..bddef6e933e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fdsymbol/fdsymbol-d.enc
@@ -18,7 +18,7 @@
   /uni21C00338 /uni21BF0338 /uni21BD0338 /uni21C20338 /neharpoonup_uni0338 /nwharpoonup_uni0338 /swharpoonup_uni0338 /seharpoonup_uni0338
   /uni21C10338 /uni21BE0338 /uni21BC0338 /uni21C30338 /neharpoondown_uni0338 /nwharpoondown_uni0338 /swharpoondown_uni0338 /seharpoondown_uni0338
 %50
-  /uni294B0338 /uni294D0338 /neswharpoonnwse_uni0338 /senwharpoonnesw_uni0338 /uni294A0338 /uni294B0338 /neswharpoonsenw_uni0338 /nwseharpoonswne_uni0338
+  /uni294B0338 /uni294D0338 /neswharpoonnwse_uni0338 /senwharpoonnesw_uni0338 /uni294A0338 /uni294C0338 /neswharpoonsenw_uni0338 /nwseharpoonswne_uni0338
   /uni21CC0338 /uni296E0338 /neswharpoons_uni0338 /senwharpoons_uni0338 /uni21CB0338 /uni296F0338 /swneharpoons_uni0338 /nwseharpoons_uni0338
 %60
   /uni21E20338 /uni21E10338 /uni21E00338 /uni21E30338 /dashednearrow_uni0338 /dashednwarrow_uni0338 /dashedswarrow_uni0338 /dashedsearrow_uni0338
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf
index 835b43ecc75..021f586a6ab 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolA";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolA;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf
index 2337d69fa49..408513f3f02 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolA";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolA;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf
index 72090e329ac..41a5f139052 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolA";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolA;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf
index ff042c04483..09468b5962c 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolA";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolA;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf
index 0dcbb870fe3..a0cee843333 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolA";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 input fdgeometric;
 
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf
index f9c03337604..e954996c238 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolB";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolB;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf
index 7fc816b8029..be9f288a055 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolB";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolB;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf
index d387172b34c..5ae35a94b4f 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolB";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolB;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf
index c918496f36d..5646f632a2f 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolB";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolB;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf
index a0af7cf6df2..6e9cf1b8524 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolB";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 
 negated := 0;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf
index 99f9080a727..71353475320 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolC";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolC;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf
index f676dc42690..4d93e9987ca 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolC";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolC;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf
index 45a69ffef07..6dd13f70f43 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolC";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolC;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf
index ef9172ebd76..42ab8aa6461 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolC";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolC;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf
index 2d5843e6a6a..3170fe0aeca 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolC";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 
 boolean negated;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf
index e757d2a06a4..9728b848598 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolD";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolD;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf
index b80a22b8cea..f8455a2dbf1 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolD";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolD;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf
index 4fa4f06fb1c..2c11a354011 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolD";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolD;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf
index d30d81af14a..ad8c00ee53e 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolD";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolD;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf
index 5a4fc5812c2..55d1c26cf64 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolD";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 
 boolean negated;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf
index abf8bc20a8b..302d3c5cd47 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolE";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolE;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf
index b0bf8816642..670a0db21c0 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolE";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolE;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf
index da68386282a..42b090a20da 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolE";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolE;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf
index 9166eae44b8..a71a1dcb171 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolE";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolE;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf
index 026cf3f04e7..871a53bf1f6 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolE";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 input fdoperators;
 
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf
index a8a9a7fe849..e67d73a3e85 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Bold";
+if known ps_output:
+  font_family := "FdSymbolF";
+  font_weight := "Bold";
+fi
 weight_index := 3;
 
 input FdSymbolF;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf
index 60968400a12..a6706bbe83a 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Book";
+if known ps_output:
+  font_family := "FdSymbolF";
+  font_weight := "Book";
+fi
 weight_index := 0;
 
 input FdSymbolF;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf
index 60c4162bf3f..354b450507a 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Medium";
+if known ps_output:
+  font_family := "FdSymbolF";
+  font_weight := "Medium";
+fi
 weight_index := 2;
 
 input FdSymbolF;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf
index dc840d5fbdd..818245c8c74 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf
@@ -6,8 +6,10 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-string font_weight;
-font_weight := "Regular";
+if known ps_output:
+  font_family := "FdSymbolF";
+  font_weight := "Regular";
+fi
 weight_index := 1;
 
 input FdSymbolF;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf
index d54763c65a2..bf654a0d358 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf
@@ -6,10 +6,6 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
-font_identifier := "FdSymbolF";
-design_size := 10;
-font_size design_size * pt#;
-
 input fdbase;
 input fddelims;
 
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf
index b7fc83c3edc..01b36a12f9b 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf
@@ -280,10 +280,10 @@ endfor;
 for alpha = 0, 90, 180, 270:
   beginarrow(alpha, 1, 3/4plus_size# + ifneg(1,0) * arrow_spread#); "pitchfork (" & decimal alpha & ")";
     draw_line(foot_ex, head_ex, false);
-    draw_subset(a, foot + 3/4plus_size * dir arrow_dir, foot_ex, 3/4plus_size, line_thickness);
+    draw_subset(a, foot + 1/2arrow_len * dir arrow_dir, foot_ex, 3/4plus_size, line_thickness);
 
     if negated:
-      stroke_through_arrow(1/2[foot, head - 3/8plus_size * dir arrow_dir], alpha, 3/4plus_size + arrow_spread)(80, 80, 100, 100, 80, 80, 100, 100);
+      stroke_through_arrow(1/4[foot, head], alpha, 3/4plus_size + arrow_spread)(80, 80, 100, 100, 80, 80, 100, 100);
     fi
   endchar;
 endfor;
@@ -481,7 +481,7 @@ for alpha = 0, 90, 180, 270, 45, 135, 225, 315:
     draw_arrowhead(z2, arrow_dir - 50, arrow_spread, thick);
 
     if negated:
-      stroke_through_arrow(1/10[z1,z2], alpha, 3/2arrow_spread)(80, 80, 80, 80, 80, 80, 80, 80);
+      stroke_through_arrow(1/10[z1,z2] + 1/8arrow_spread * dir (arrow_dir - 90), alpha, 3/2arrow_spread)(80, 80, 80, 80, 80, 80, 80, 80);
     fi
   endchar;
 endfor;
@@ -502,7 +502,7 @@ for alpha = 0, 90, 180, 270, 45, 135, 225, 315:
     draw_arrowhead(z2, arrow_dir + 50, arrow_spread, thick);
 
     if negated:
-      stroke_through_arrow(1/10[z1,z2], alpha, 3/2arrow_spread)(110, 110, 110, 110, 110, 110, 110, 110);
+      stroke_through_arrow(1/10[z1,z2] + 1/8arrow_spread * dir (arrow_dir + 90), alpha, 3/2arrow_spread)(110, 110, 110, 110, 110, 110, 110, 110);
     fi
   endchar;
 endfor;
@@ -524,7 +524,7 @@ for alpha = 0, 90, 180, 270, 45, 135, 225, 315:
     draw_arrowhead(z2, arrow_dir - 50, arrow_spread, thick);
 
     if negated:
-      stroke_through_arrow(z1, alpha, 3/2arrow_spread)(80, 80, 100, 100, 80, 80, 100, 100);
+      stroke_through_arrow(z1 + 1/8arrow_spread * dir (arrow_dir - 90), alpha, 3/2arrow_spread)(80, 80, 100, 100, 80, 80, 100, 100);
     fi
   endchar;
 endfor;
@@ -570,8 +570,13 @@ for sign = 1, -1:
 
       if negated:
          1/2[z8,z9] = centre;
-         y8 - y9 = large_op_size;
-         z8 - z9 = whatever * dir 80;
+         if (alpha = 90) or (alpha = 270):
+           y8 - y9 = large_op_size * sind 45;
+           z8 - z9 = whatever * dir 40;
+         else:
+           y8 - y9 = large_op_size;
+           z8 - z9 = whatever * dir 80;
+         fi
 
          draw_straight(z8, z9, stroke_through_thickness, false);
       fi
@@ -586,10 +591,10 @@ for alpha = 0, 90, 180, 270:
     z4 - z3 = z5 - z4 = 2/3equal_spread * dir (arrow_dir + 90);
     z4 = head_ex;
 
-    draw_straight(z0, arrowhead_intersection(head, arrow_dir, 14/10arrow_spread, z0 -- z3), 4/5line_thickness, false);
-    draw_straight(z1, arrowhead_intersection(head, arrow_dir, 14/10arrow_spread, z1 -- z4), 4/5line_thickness, false);
-    draw_straight(z2, arrowhead_intersection(head, arrow_dir, 14/10arrow_spread, z2 -- z5), 4/5line_thickness, false);
-    draw_arrowhead(head, arrow_dir, 14/10arrow_spread, line_thickness);
+    draw_straight(z0, arrowhead_intersection(head, arrow_dir, 3/2arrow_spread, z0 -- z3), 4/5line_thickness, false);
+    draw_straight(z1, arrowhead_intersection(head, arrow_dir, 3/2arrow_spread, z1 -- z4), 4/5line_thickness, false);
+    draw_straight(z2, arrowhead_intersection(head, arrow_dir, 3/2arrow_spread, z2 -- z5), 4/5line_thickness, false);
+    draw_arrowhead(head, arrow_dir, 3/2arrow_spread, line_thickness);
 
     if negated:
       stroke_through_arrow(1/2[foot, head - arrow_spread * dir arrow_dir], alpha, 21/10arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
@@ -661,7 +666,7 @@ for alpha = 0, 90, 180, 270:
     draw_line(foot - 3/4arrow_spread * dir (arrow_dir + 90), foot + 3/4arrow_spread * dir (arrow_dir + 90), true);
 
     if negated:
-      stroke_through_arrow(1/2[foot, head], alpha, 2arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
+      stroke_through_arrow(2/3[foot, head], alpha, 2arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
     fi
   endchar;
 endfor;
@@ -677,7 +682,7 @@ for alpha = 0, 90, 180, 270:
     draw_line(foot - 7/8arrow_spread * dir (arrow_dir + 90), foot + 7/8arrow_spread * dir (arrow_dir + 90), true);
 
     if negated:
-      stroke_through_arrow(1/2[foot, head], alpha, 9/4arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
+      stroke_through_arrow(2/3[foot, head], alpha, 9/4arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
     fi
   endchar;
 endfor;
@@ -691,7 +696,7 @@ for alpha = 0, 90, 180, 270:
     draw_line(z0 - 7/8arrow_spread * dir (arrow_dir + 90), z0 + 7/8arrow_spread * dir (arrow_dir + 90), true);
 
     if negated:
-      stroke_through_arrow(1/2[z0, head], alpha, 9/4arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
+      stroke_through_arrow(5/8[z0, head], alpha, 9/4arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
     fi
   endchar;
 endfor;
@@ -709,7 +714,7 @@ for alpha = 0, 90, 180, 270:
     draw_line(z4 - arrow_spread * dir (arrow_dir + 90), z4 + arrow_spread * dir (arrow_dir + 90), true);
 
     if negated:
-      stroke_through_arrow(1/2[z4, head], alpha, 5/2arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
+      stroke_through_arrow(5/8[z4, head], alpha, 5/2arrow_spread)(70, 70, 110, 110, 70, 70, 110, 110);
     fi
   endchar;
 endfor;
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf
index e80c16f192a..51dd7970f31 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf
@@ -6,6 +6,14 @@
 % is also available with a FAQ at: http://scripts.sil.org/OFL
 %
 
+design_size := 10;
+font_size design_size * pt#;
+
+if known ps_output:
+  font_version := "1.002";
+  font_comment := "Copyright (c) 2011, Michael Ummels. This Font Software is licensed under the SIL Open Font License, Version 1.1.";
+fi
+
 u# := 0.6pt#;
 asc_height# := 7.54pt#; % 8.56pt#;
 cap_height# := 7.07pt#; %7.37pt#;
@@ -47,18 +55,6 @@ bigop_height# := 10.7pt#; % height of big operators
 
 mode_setup;
 
-% mf2pt1 support
-
-if known ps_output:
-%  pencircle := mfplain_pencircle;
-%  pensquare := mfplain_pencircle;
-%  penrazor := mfplain_pencircle;
-  pensquare := pencircle;
-  penrazor := pencircle;
-  let filldraw := mfplain_filldraw;
-  let unfilldraw := mfplain_unfilldraw;
-fi
-
 define_pixels(u, asc_height, cap_height, desc_depth, delim_height, bigop_height, x_height);
 define_whole_pixels(dot_size, small_op_size, med_op_size, large_op_size, plus_size,
   order_width, equal_spread, greater_spread,
@@ -293,23 +289,24 @@ def draw_bump(suffix $)(expr sign, lc, rc, rad, thick) =
   penpos0$(thick, angle (rc - lc) + sign * 90);
   penpos1$(thick, angle (rc - lc) + sign * 90);
   penpos2$(thick, angle (rc - lc) + sign * 90);
-  penpos3$(thick, angle (rc - lc) + sign * 90);
-  penpos4$(thick, angle (rc - lc) + sign * 90);
+  penpos3$(thick, angle (rc - lc));
+  penpos4$(thick, angle (rc - lc));
 
-  z3$' = z3$;
-  z5$ = z3$.l;
-  z4$' = z4$;
+  z5$ = z3$.r;
   z6$ = z4$.l;
 
-  penpos3$'(thick, angle (rc - lc) + 180);
-  penpos5$(thick, angle (rc - lc) + 180);
-  penpos4$'(thick, angle (rc - lc));
-  penpos6$(thick, angle (rc - lc));
+  penpos5$(thick, angle (rc - lc) + sign * 90);
+  penpos6$(thick, angle (rc - lc) + sign * 90);
+
+  path p$, q$;
+  numeric s$, t$;
 
-  fill stroke z0$.e -- z3$.e;
-  fill stroke z5$.e -- z3$'.e{dir (angle (rc - lc) + sign * 90)} ..
-    z2$.e{rc - lc} .. z4$'.e{dir (angle (rc - lc) - sign * 90)} -- z6$.e;
-  fill stroke z1$.e -- z4$.e;
+  p$ = z3$.l{dir (angle(rc - lc) + sign * 90)} .. {rc - lc}z2$.r;
+  q$ = z2$.r{rc - lc} .. {dir (angle(rc - lc) - sign * 90)}z4$.r;
+  s$ = xpart (p$ intersectiontimes (z0$.r -- z1$.r));
+  t$ = xpart (q$ intersectiontimes (z0$.r -- z1$.r));
+
+  fill z0$.r -- point s$ of p$ & subpath (s$,1) of p$ & subpath (0,t$) of q$ & point t$ of q$ -- z1$.r -- z1$.l -- z6$l. -- z6${dir (angle (rc - lc) + sign * 90)} .. z2$.l{lc - rc} .. {dir (angle (rc - lc) - sign * 90)}z5$ -- z5$.l -- z0$.l -- cycle;
 
   penlabels(0$,1$,2$,3$,4$,5$,6$);
 enddef;
@@ -447,12 +444,13 @@ def draw_product(expr centre, width, height, sign, thick) =
   z1r - z0r = z3r - z2r = width * right;
   z2r - z0r = sign * (height - thin) * up;
   1/2[1/2[z0l,z1l], 1/2[z2r,z3r]] = centre;
-  z4 = 1/3[z0,z1];
-  z5 = 2/3[z0,z1];
-  z6 = 1/2[z0,z4] + sign * max(1/9width, thin) * up;
-  z7 = 1/2[z1,z5] + sign * max(1/9width, thin) * up;
-  z8 = 1/2[z0,z4] + sign * min(height - thin - 1/9width, height - 2thin) * up;
-  z9 = 1/2[z1,z5] + sign * min(height - thin - 1/9width, height - 2thin) * up;
+  z4 = z0 + min(5thin, 2/5width) * right;
+  z5 = z1 + min(5thin, 2/5width) * left;
+  z6 = 1/2[z0,z4] + sign * 4/3thin * up;
+  z7 = 1/2[z1,z5] + sign * 4/3thin * up;
+  x8 = 1/2[x0,x4];
+  x9 = 1/2[x1,x5];
+  y8 = y9 = y2 - sign * 4/3thin;
 
   penpos0(thin, sign * 100);
   penpos1(thin, sign * 80);
@@ -480,32 +478,34 @@ def draw_sum(suffix $)(expr centre, width, height, thick) =
   z1$ - z0$ = z3$ - z2$ = width * right;
   z2$ - z0$ = height * up;
   1/2[1/2[z0$,z1$], 1/2[z2$,z3$]] = centre;
-  z4$ - z1$ = z3$ - z5$.l = 1/5height * up;
-  z6$ = whatever[z0$,z1$] + thick/2 * up = z4$ - whatever * dir 77;
+  z4$ - z1$ = z3$ - z5$.l = 3thin * up;
+  z6$ = whatever[z0$,z1$] + thin * up = z4$ - whatever * dir 77;
   z8$r = z2$ + whatever * right;
   z8$l = z2$ + whatever * down;
 
-  penpos 6$(thick,  90);
-  penpos 4$(thin,  167);
-  penpos 5$(thin,  180);
-  penpos 8$(5/6thick, 77);
+  penpos6$(thick, 90);
+  penpos4$(thin, 167);
+  penpos5$(thin, 180);
+  penpos8$(5/6thick, 77);
 
   z13$ = centre;
-  penpos 13$(6/5thick, 10);
+
+  penpos13$(6/5thick, 10);
 
   z3$ - z7$ = 2/3thick * up;
   z9$ = z13$r + whatever * (z8$l - z13$l) = z7$ + whatever * right;
 
   z10$r = z0$ + whatever * up;
   z10$l = z0$ + whatever * right;
-  penpos 10$(3/4thick, 103);
+
+  penpos10$(3/4thick, 103);
 
   z11$ = z13$r + whatever * (z10$r - z13$l);
   y11$ = y10$r;
 
   fill z10$l -- z6$l -- z4$l -- z4$r{-dir 77} .. {left}1/4[z6$r,z10$r] -- z11$ -- z13$r -- z9$ -- 1/4[z7$,z8$l]{right} .. {-dir 113}z5$r -- z5$l -- z3$ -- z8$r -- z8$l -- z13$l -- z10$r -- cycle;
 
-  penlabels(0$,1$,2$,3$,4$,5$,6$,7$,8$,9$,10$,11$,12$,13$);
+  penlabels(3$,4$,5$,6$,7$,8$,9$,10$,11$,12$,13$);
 enddef;
 
 def draw_integral(suffix $)(expr scale, centre, thick) =
diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf
index 520b34e5ec7..fbc9f649751 100644
--- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf
+++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf
@@ -308,8 +308,7 @@ for sign = 1, -1:
   beginoperator(plus_size#, 1); "union plus";
     draw_subset(a, centre - sign * plus_size/2 * up, centre + sign * plus_size/2 * up, 2radius, line_thickness);
 
-    t := 22/10line_thickness;
-    r := radius - t;
+    r := 1/6plus_size;
 
     draw_line(centre + sign * 1/6plus_size * up + r * right, centre + sign * 1/6plus_size * up + r * left, true);
     draw_line(centre + (r + sign * 1/6plus_size) * up, centre + (r - sign * 1/6plus_size) * down, true);
@@ -370,8 +369,7 @@ for sign = 1, -1:
     draw_line(z1, z2, false);
     draw_line(z2, z3, true);
 
-    t := 22/10line_thickness;
-    r := radius - t;
+    r := 1/6plus_size;
 
     draw_line(centre + sign * 1/6plus_size * up + r * right, centre + sign * 1/6plus_size * up + r * left, true);
     draw_line(centre + (r + sign * 1/6plus_size) * up, centre + (r - sign * 1/6plus_size) * down, true);
@@ -624,7 +622,7 @@ endchar;
 
 beginoperator(med_op_size#/sqrt(2), 1); "medium square square";
   draw_square(centre, radius, 0, line_thickness);
-  draw_square(centre, 2/5radius, 0, line_thickness);
+  draw_square(centre, 2/5radius, 0, 4/5line_thickness);
 endchar;
 
 beginoperator(large_op_size#/sqrt(2), 1); "large square";
@@ -696,7 +694,7 @@ endchar;
 
 beginoperator(med_op_size#, 1); "medium diamond diamond";
   draw_square(centre, radius / sqrt(2), 45, line_thickness);
-  draw_square(centre, 2/5radius / sqrt(2), 45, line_thickness);
+  draw_square(centre, 2/5radius / sqrt(2), 45, 4/5line_thickness);
 endchar;
 
 beginoperator(5/6small_op_size#, 8/5); "small lozenge";
@@ -1186,20 +1184,20 @@ beginoperator(plus_size#, 1); "right angle with dot";
   penlabels(0,1,2,3,4,5);
 endchar;
 
-beginsymbol(4u#, 4/5asc_height#, 0); "prime";
+beginsymbol(3u# + line_thickness#, 4/5asc_height#, 0); "prime";
   z0 = (w, h);
-  z1 = z0 + 2u * left;
+  z1 = z0 + (u + line_thickness) * left;
   z2 = (1u, 1/9h);
-  z3 = z2 + 4/3u * right;
+  z3 = z2 + 4/3line_thickness * right;
 
   fill z0 -- z1 -- z2 -- z3 -- cycle;
 endchar;
 
-beginsymbol(4u#, 4/5asc_height#, 0); "backprime";
+beginsymbol(3u# + line_thickness#, 4/5asc_height#, 0); "backprime";
   z0 = (0, h);
-  z1 = z0 + 2u * right;
+  z1 = z0 + (u + line_thickness) * right;
   z2 = (w - 1u, 1/9h);
-  z3 = z2 + 4/3u * left;
+  z3 = z2 + 4/3line_thickness * left;
 
   fill z0 -- z1 -- z2 -- z3 -- cycle;
 endchar;
@@ -1217,7 +1215,9 @@ beginsymbol(2/5asc_height# + 2side_bearing#, asc_height#, 0); "small integral";
   draw_integral(a, 1/2, centre, 4/3line_thickness);
 endchar;
 
-beginsymbol(13u# + 2side_bearing#, asc_height#, 0); "check mark";
+beginsymbol(11u# + line_thickness# + 2side_bearing#, asc_height#, 0); "check mark";
+  thick := line_thickness;
+
   x1l = side_bearing;
   y1 = math_axis;
   x2 = side_bearing + 3u;
@@ -1244,7 +1244,7 @@ beginsymbol(13u# + 2side_bearing#, asc_height#, 0); "check mark";
   penlabels(1,2,3,4,5,6);
 endchar; 
 
-beginsymbol(7u# + 2side_bearing#, 5/4asc_height#, 1/8asc_height#); "lightning";
+beginsymbol(6u# + line_thickness# + 2side_bearing#, 5/4asc_height#, 1/8asc_height#); "lightning";
   thick := line_thickness;
 
   x3r = w - side_bearing;
@@ -1570,7 +1570,7 @@ beginsymbol(7/8order_width# + 2side_bearing#, cap_height#, 0); "complement";
   penlabels(0,1,2,3,4,5,6,7);
 endchar;
 
-beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat";
+beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat";
   thick := line_thickness;
 
   x0l = x1l = side_bearing;
@@ -1586,7 +1586,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat";
 
   penpos0(thick, 0);
   penpos1(thick, 0);
-  penpos2(3/2thick, 0);
+  penpos2(4/3thick, 0);
   penpos3(thick, 90);
   penpos4(thick, 130);
 
@@ -1595,7 +1595,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, 1/2line_thickness#); "flat";
   penlabels (0,1,2,3,4,5);
 endchar;
 
-beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "natural";
+beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, desc_depth#); "natural";
   thick := line_thickness;
 
   x0l = x1l = w - x2r = w - x3r = side_bearing;
@@ -1630,10 +1630,10 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "natural";
   penlabels(1,2,4,5,6,7);
 endchar;
 
-beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "sharp";
+beginsymbol(5u# + line_thickness# + 2side_bearing#, asc_height#, desc_depth#); "sharp";
   thick := line_thickness;
 
-  x0l = x1l = w - x2r = w - x3r = side_bearing + u;
+  x0l - x4 = x1l - x5 = x2l - x0r = x3l - x1r = x6 - x2r = x7 - x3r;
   x4 = x5 = w - x6 = w - x7 = side_bearing;
   y3 = h;
   y7r = x_height;
@@ -1661,7 +1661,7 @@ beginsymbol(6u# + 2side_bearing#, asc_height#, desc_depth#); "sharp";
   penlabels (0,1,2,3,4,5,6,7);
 endchar;
 
-beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "aleph";
+beginsymbol(9u# + line_thickness# + 2side_bearing#, cap_height#, 0); "aleph";
   thick := line_thickness;
 
   x0l = x2l = side_bearing;
@@ -1692,7 +1692,7 @@ beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "aleph";
   penlabels(0,1,2,3,4,5);
 endchar;
 
-beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "beth";
+beginsymbol(9u# + line_thickness# + 2side_bearing#, cap_height#, 0); "beth";
   thick := line_thickness;
 
   x0 = u + side_bearing;
@@ -1720,7 +1720,7 @@ beginsymbol(10u# + 2side_bearing#, cap_height#, 0); "beth";
   penlabels(0,1,2,3,4,5);
 endchar;
 
-beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel";
+beginsymbol(6u# + line_thickness# + 2side_bearing#, cap_height#, 0); "gimel";
   thick := line_thickness;
 
   x0 = x2 = side_bearing;
@@ -1736,8 +1736,8 @@ beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel";
   z5 = z4 + whatever * dir -30;
   y6 = 2/3h;
 
-  penpos2(3/2thick, 80);
-  penpos2'(3/2thick * sind 80, 90);
+  penpos2(4/3thick, 80);
+  penpos2'(4/3thick * sind 80, 90);
   penpos3(4/3thick, 0);
   penpos4(3/2thick, 60);
   penpos5(3/2thick, 60);
@@ -1755,10 +1755,10 @@ beginsymbol(7u# + 2side_bearing#, cap_height#, 0); "gimel";
   fill stroke z4.e -- z5.e{dir -30} .. {dir -82}z6.e .. {dir -67}z3.e;
   fill stroke z2.e -- z2'.e{right} ..tension 3/4 and 1.. {dir 60}z8.e -- z7.e;
 
-  penlabels(2,3,4,5,6,7,8);
+  penlabels(2,2',3,4,5,6,7,8);
 endchar;
 
-beginsymbol(9u# + 2side_bearing#, cap_height#, 0); "daleth";
+beginsymbol(8u# + line_thickness# + 2side_bearing#, cap_height#, 0); "daleth";
   thick := line_thickness;
 
   x0 = side_bearing;
@@ -1786,7 +1786,7 @@ slant := 0.212557;
 transform currenttransform;
 currenttransform := identity slanted slant yscaled aspect_ratio scaled granularity shifted (-u,0);
 
-beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p";
+beginsymbol(9u# + 2line_thickness#, x_height#, desc_depth#); "Weierstrass p";
   numeric theta;
   theta = 90 - angle(8u,h);
   slope := -h/8u;  % angle at middle
@@ -1801,8 +1801,8 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p";
   y2l = h;
   y7r = -d;
   y1 = 2/5[-d, h];
-  x3l = .5u;
-  x6r = max(rt x7 + .5, .5w - .25u);
+  x3l = 1/2u;
+  x6r = max(x7 + line_thickness, 1/2w - 1/4u);
   x3r - x3l = x6r - x6l = 5/4line_thickness;
 
   ellipse_set(2l,3l,4l,1l);
@@ -1813,7 +1813,7 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p";
   y3 = y3r;
   y6 = y6r;
 
-  fill stroke super_arc.e(2,3) & z3e{down} .. z4e --- z5e .. z6e{down} & super_arc.e(6,7);  % flourish
+  fill stroke super_arc.e(2,3) & z3e{down} .. z4e .. z5e .. z6e{down} & super_arc.e(6,7);  % flourish
 
   penpos8(line_thickness, 180);
   penpos9(line_thickness, 90);
@@ -1821,13 +1821,13 @@ beginsymbol(11u#, x_height#, desc_depth#); "Weierstrass p";
   penpos11(line_thickness, -90);
   penpos12(line_thickness, -100);
 
-  x10r = w - 1.5u + 1/2line_thickness;
-  x8l  = 2.25u;
-  x9 = x11 = .5w + 1.5u;
+  x10r = w - 3/2u + 1/2line_thickness;
+  x8r = u;
+  x9 = x11 = 1/2w + 3/2u;
   x12l = max(x6r, .5w + .5u);
   y8 = y11r = 0;
-  top y9r = .95h;
-  y10 = .5[y9,y11];
+  y9r = 19/20h;
+  y10 = 1/2[y9,y11];
   y12r = 1/4[y11r,y1l];
 
   fill stroke z7e{left} ... z8e{up} ... pulled_arc.e(9,10) & pulled_arc.e(10,11) .. z12.e;  % stem and bowl
diff --git a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Bold.tfm
index 15de428dbdd..eb8a41c805e 100644
--- a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Bold.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Bold.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Book.tfm b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Book.tfm
index a5c4601eeb9..80644d45b26 100644
--- a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Book.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Book.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Medium.tfm b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Medium.tfm
index 2323cf36536..d192277218e 100644
--- a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Medium.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Medium.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Regular.tfm
index b743f24ee6f..62642966d12 100644
--- a/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Regular.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fdsymbol/FdSymbolA-Regular.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Bold.pfb b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Bold.pfb
index 3ced48ca560..a37075e02ef 100644
--- a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Book.pfb b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Book.pfb
index 612e9da249d..b209a47aea7 100644
--- a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Book.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Book.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Medium.pfb b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Medium.pfb
index 82324ef6e68..fc1c0413c4f 100644
--- a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Medium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Medium.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Regular.pfb b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Regular.pfb
index c00942aad35..1c2ecf21909 100644
--- a/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fdsymbol/FdSymbol-Regular.pfb