diff options
| author | Karl Berry <karl@freefriends.org> | 2012-05-29 22:53:15 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-05-29 22:53:15 +0000 |
| commit | bd90e427596eee2b2a2dd4a15b04f6e60239357b (patch) | |
| tree | f83312e895b098fbbd173f5c4624b8fe42ce7b5c /Master/texmf-dist/fonts/source | |
| parent | 6ba407cece356e54f1144fc1d9c3fd38a65a2c2e (diff) | |
fdsymbol (29may12)
git-svn-id: svn://tug.org/texlive/trunk@26722 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/source')
38 files changed, 233 insertions, 159 deletions
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 021f586a6ab..d1b292227e8 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 408513f3f02..3d4ba4e5fd9 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 41a5f139052..a255885a72c 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 09468b5962c..d17223fea39 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf index a0cee843333..0e0f7413585 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolA.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 e954996c238..dfed9f6e51a 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 be9f288a055..a49fb64032f 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 5ae35a94b4f..5a96e1ef52f 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 5646f632a2f..eb9cef8244d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf index 6e9cf1b8524..3307772796d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolB.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 71353475320..9850fb6ece4 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 4d93e9987ca..156cccd0956 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 6dd13f70f43..486b771dad9 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 42ab8aa6461..e468cbd50cf 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf index 2bdfcbda231..bac71ba820f 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolC.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 9728b848598..a9750a7a406 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 f8455a2dbf1..f2d6bba7e66 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 2c11a354011..d8c7b6ef6ce 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 ad8c00ee53e..8544b9f01a8 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf index 29123a33f0c..026d6459e2d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolD.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 302d3c5cd47..4f35fb7fe00 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 670a0db21c0..5b0c726a679 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 42b090a20da..b5cf4f26815 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 a71a1dcb171..bc50ab65c6d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf index 871a53bf1f6..4d450ae861a 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolE.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 e67d73a3e85..27d9381857d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Bold.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 a6706bbe83a..5ecb076c202 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Book.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 354b450507a..b8034350330 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Medium.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and 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 818245c8c74..ebe97122753 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF-Regular.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf index bf654a0d358..9d83d367f0d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/FdSymbolF.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdaccents.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdaccents.mf index 4d9e81b764c..037ffb6a03b 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdaccents.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdaccents.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -43,10 +43,10 @@ endfor; charlist current_char - 5: current_char - 4: current_char - 3: current_char - 2: current_char - 1: current_char; -beginsymbol(6u#, x_height# + 2rule_thickness# + 5/2line_thickness#, 0); "vec"; +beginsymbol(6u# + side_bearing#, x_height# + 2rule_thickness# + 5/2line_thickness#, 0); "vec"; thick := 3/4line_thickness; - x0 = 0; + x0 = side_bearing; x1 = w - 1/2thick; y0 = y1 = h - 5/4line_thickness; diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf index 720c9c8a16e..eb8f57b9c19 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdarrows.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf index 31cc8f69870..af4a9b28e4d 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdbase.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -10,8 +10,8 @@ design_size := 10; font_size design_size * pt#; if known ps_output: - font_version := "1.004"; - font_comment := "Copyright (c) 2011, Michael Ummels. This Font Software is licensed under the SIL Open Font License, Version 1.1."; + font_version := "1.008"; + font_comment := "Copyright (c) 2012, Michael Ummels. This Font Software is licensed under the SIL Open Font License, Version 1.1."; fi u# := 0.6pt#; @@ -23,19 +23,19 @@ math_axis# := 2.75pt#; if weight_index = 0: % Book line_thickness# := 0.64pt#; rule_thickness# := 0.56pt#; - dot_size# := 0.84pt#; + dot_size# := 0.75pt#; elseif weight_index = 1: % Regular line_thickness# := 0.74pt#; rule_thickness# := 0.58pt#; - dot_size# := 0.9pt#; + dot_size# := 0.84pt#; elseif weight_index = 2: % Medium line_thickness# := 0.86pt#; rule_thickness# := 0.6pt#; - dot_size# := 0.97pt#; + dot_size# := 0.94pt#; else: % Bold line_thickness# := 1.0pt#; rule_thickness# := 0.64pt#; - dot_size# := 1.05pt#; + dot_size# := 1.06pt#; fi; side_bearing# := 1.5u#; @@ -109,6 +109,7 @@ def beginsymbol(expr width, height, depth) = current_char := current_char + 1; beginchar(current_char, width, height, depth); if not known ps_output: + proofrule((side_bearing, math_axis),(w - side_bearing, math_axis)); proofrule((side_bearing, h),(side_bearing, -d)); proofrule((w - side_bearing, h),(w - side_bearing, -d)); fi @@ -228,7 +229,7 @@ enddef; def dot(expr centre, radius) = superellipse(centre + radius * right, centre + radius * up, - centre - radius * right, centre - radius * up, 0.57) + centre - radius * right, centre - radius * up, 0.6) enddef; % Draw macros @@ -467,82 +468,118 @@ def stroke_through_arrow(expr pos, alpha, spread)(text angles) = endgroup; enddef; -def draw_product(expr centre, width, height, sign, thick) = - thin := 1/2thick; +def draw_product(expr centre, width, height, sign, thick, serifs) = + if serifs: + thicker := 11/8thick; + thinner := 5/8thick; + else: + thicker := 4/3thick; + thinner := thick; + fi z1r - z0r = z3r - z2r = width * right; - z2r - z0r = sign * (height - thin) * up; + y2r - y0l = sign * height; + x2r = x0r; 1/2[1/2[z0l,z1l], 1/2[z2r,z3r]] = centre; - 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); - penpos2(thin, sign * 93); - penpos3(thin, sign * 87); - penpos4(thin, sign * 80); - penpos5(thin, sign * 100); - penpos6(thick, 0); - penpos7(thick, 0); - penpos8(thick, 0); - penpos9(thick, 0); + z4 - z0 = z1 - z5 = min(3thicker, 2/5width) * right; + x6 = x8 = 1/2[x0,x4]; + x7 = x9 = 1/2[x1,x5]; + if serifs: + y6 - y0 = y7 - y1 = sign * 1/4(x4 - x0); + y2 - y8 = y3 - y9 = sign * 1/4(x4 - x0); + else: + y6 = y7 = y0l; + y8 = y9 = y2l; + fi - y10 = y11 = y2r - sign * 1/2[thin,thick]; + penpos0(thinner, sign * 100); + penpos1(thinner, sign * 80); + if serifs: + penpos2(thinner, sign * 93); + penpos3(thinner, sign * 87); + else: + penpos2(thicker, sign * 90); + penpos3(thicker, sign * 90); + fi + penpos4(thinner, sign * 80); + penpos5(thinner, sign * 100); + penpos6(thicker, 0); + penpos7(thicker, 0); + penpos8(thicker, 0); + penpos9(thicker, 0); + + y10 = y11 = y2r - sign * 1/2[thinner,thicker]; x10 = x6r; x11 = x7l; - fill z0l -- z4l -- z4r{dir (sign * 160)} .. {sign * up}z6r -- z10 -- z11 -- z7l{sign * down} .. {dir (-sign * 160)}z5r -- z5l -- z1l -- z1r{dir (sign * 160)} .. {sign * up}z7r -- z9r{sign * up} .. {dir (sign * 15)}z3l -- z3r -- z2r -- z2l{dir (-sign * 15)} .. {sign * down}z8l -- z6l{sign * down} .. {dir (-sign * 160)}z0r -- cycle; - - penlabels(0,1,2,3,4,5,6,7,8,9,10,11); + if serifs: + fill z0l -- z4l -- z4r{dir (sign * 165)} ... {sign * up}z6r -- z10 -- z11 -- z7l{sign * down} ... {dir (-sign * 165)}z5r -- z5l -- z1l -- z1r{dir (sign * 165)} ... {sign * up}z7r -- z9r{sign * up} ... {dir (sign * 15)}z3l -- z3r -- z2r -- z2l{dir (-sign * 15)} ... {sign * down}z8l -- z6l{sign * down} ... {dir (-sign * 165)}z0r -- cycle; + penlabels(0,1,2,3,4,5,6,7,8,9,10,11); + else: + fill z6l -- z8l -- z2l -- z2r -- z3r -- z3l -- z9r -- z7r -- z7l -- z9l -- z8r -- z6r -- cycle; + penlabels(2,3,6,7,8,9); + fi enddef; -def draw_sum(suffix $)(expr centre, width, height, thick) = - thin := 1/2thick; +def draw_sum(suffix $)(expr centre, width, height, thick, serifs) = + thicker := 11/8thick; + thinner := 1/2thick; + alpha := angle(width, height - thicker); 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 = 3thin * up; - z6$ = whatever[z0$,z1$] + thin * up = z4$ - whatever * dir 77; + z4$ - z1$ = z3$ - z5$.l = 3/2thicker * up; + if serifs: + z6$ = whatever[z0$,z1$] + thicker/2 * up = z4$ - whatever * dir 77; + z3$ - z7$ = 2/3thicker * up; + else: + z6$l = z1$; + z3$ - z7$ = thicker * up; + fi z8$r = z2$ + whatever * right; z8$l = z2$ + whatever * down; - - penpos6$(thick, 90); - penpos4$(thin, 167); - penpos5$(thin, 180); - penpos8$(5/6thick, 77); - - z13$ = centre; - - 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; + z9$' = 1/4[z7$,z8$l]; + z11$' = 1/4[z6$r,z10$r]; + z12$ = centre; + + if serifs: + penpos4$(thinner, 167); + penpos5$(thinner, 180); + penpos6$(thicker, 90); + penpos8$(5/6thicker, 77); + penpos10$(3/4thicker, 103); + penpos12$(thicker / sind alpha, 10); + else: + penpos6$(thicker, 90); + penpos8$(thicker, 90); + penpos10$(thicker, 90); + penpos12$(thicker / sind alpha, 0); + fi - penpos10$(3/4thick, 103); - - z11$ = z13$r + whatever * (z10$r - z13$l); + z9$ = z12$r + whatever * (z8$l - z12$l) = z7$ + whatever * right; + z11$ = z12$r + whatever * (z10$r - z12$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(3$,4$,5$,6$,7$,8$,9$,10$,11$,12$,13$); + if serifs: + fill z10$l -- z6$l -- z4$l -- z4$r{-dir 77} ... {z11$ - z11$'}z11$' -- z11$ -- z12$r -- z9$ -- z9$'{z9$' - z9$} ... {-dir 113}z5$r -- z5$l -- z3$ -- z8$r -- z8$l -- z12$l -- z10$r -- cycle; + penlabels(3$,4$,5$,6$,7$,8$,9$,10$,11$,12$); + else: + fill z10$l -- z6$l -- z6$r -- z11$ -- z12$r -- z9$ -- z7$ -- z3$ -- z8$r -- z8$l -- z12$l -- z10$r -- cycle; + penlabels(3$,6$,7$,8$,9$,10$,11$,12$); + fi enddef; def draw_integral(suffix $)(expr scale, centre, thick) = - penpos0$(thick, 0); - penpos1$(thick, 0); - penpos2$(2/3thick, -90); - penpos3$(thick, 0); - penpos4$(2/3thick, -90); + thicker := 4/3thick; + + penpos0$(thicker, 0); + penpos1$(thicker, 0); + penpos2$(9/8thick, -105); + penpos3$(thicker, 0); + penpos4$(thick, -90); z0$ = 1/2[z1$,z3$] = 1/2[z2$,z4$]; z1$ - z3$ = whatever * up; @@ -553,15 +590,15 @@ def draw_integral(suffix $)(expr scale, centre, thick) = y6$r = -d; y1$ = 2/3[y0$,y2$]; - penpos5$(3/4thick,-105); - penpos6$(3/4thick,-82); + penpos5$(9/8thick,-105); + penpos6$(9/8thick,-82); - y5$l = y2$l; + y5$l = y2$l - 1/12thick; x5$r = 5/4[x1$, x2$]; - y6$l = y4$.l; + y6$l = y4$l; x6$r = 5/4[x3$, x4$]; - ucorr := max (x2$r, x1$r + 1/4thick) - x2$r; + ucorr := max (x2$r, x1$r + 3/8thick) - x2$r; x2$ := x2$ + ucorr; x2$l := x2$l + ucorr; x2$r := x2$r + ucorr; @@ -569,7 +606,7 @@ def draw_integral(suffix $)(expr scale, centre, thick) = x5$r := x5$r + ucorr; x5$l := x5$l + ucorr; - lcorr := min (x4$l, x1$l - 1/4thick) - x4$l; + lcorr := min (x4$l, x1$l - 3/8thick) - x4$l; x4$ := x4$ + lcorr; x4$l := x4$l + lcorr; x4$r := x4$r + lcorr; @@ -577,7 +614,7 @@ def draw_integral(suffix $)(expr scale, centre, thick) = x6$r := x6$r + lcorr; x6$l := x6$l + lcorr; - fill z5$l .. z2$l{left} .. {down}z1$l -- z3$l{down} .. z4$l{left} .. z6$l -- z6$r + fill z5$l .. z2$l ... {down}z1$l -- z3$l{down} ... z4$l{left} .. z6$l -- z6$r .. {up}z3$r -- z1$r{up} .. z2$r{right} .. z5$r -- cycle; penlabels(0$,1$,2$,3$,4$,5$,6$); diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fddelims.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fddelims.mf index 8c33b047404..a0d652e8e12 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fddelims.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fddelims.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -426,7 +426,7 @@ extensible current_char: 0, 0, 0, current_char; % double vertical line charlist current_char - 5: current_char -4: current_char; for scale = 1, 1.2: - beginsymbol(8u# + 3line_thickness# + 2side_bearing#, vcentre(2scale * delim_height#)); "tripe vertical bar"; + beginsymbol(8u# + 3line_thickness# + 2side_bearing#, vcentre(2scale * delim_height#)); "triple vertical bar"; x0 = x1; x2 = x3; x4 = x5; @@ -583,3 +583,19 @@ endchar; extensible current_char - 2: current_char - 2, 0, current_char - 1, current_char; charlist root_char: root_char + 1: root_char + 2: root_char + 3: root_char + 4: root_char + 5: current_char - 2; + +% more roots + +for scale = 1, 1.2, 1.5, 1.8, 2.4, 3: + beginsymbol((4scale + 2) * u# + 5/2line_thickness# + 2side_bearing#, vcentre(2scale * delim_height#)); "root"; + draw_root(line_thickness); + endchar; +endfor; + +beginsymbol(14u# + 5/2line_thickness# + 2side_bearing#, 1.2delim_height#, 0); "root -- top"; + draw_root_top(line_thickness); +endchar; + +beginsymbol(14u# + 5/2line_thickness# + 2side_bearing#, 2.4delim_height#, 0); "root -- bottom"; + draw_root_bot(line_thickness); +endchar; diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf index 32ac2f122db..6ac7e20eae3 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdgeometric.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -1232,16 +1232,18 @@ beginsymbol(3u# + line_thickness#, 4/5asc_height#, 0); "backprime"; endchar; for sign = 1, -1: - beginoperator(plus_size#, 1); "product"; - draw_product(centre, plus_size, plus_size, sign, 4/3line_thickness); - endchar; + for serifs = true, false: + beginoperator(plus_size#, 1); "product"; + draw_product(centre, plus_size, plus_size, sign, line_thickness, serifs); + endchar; + endfor; endfor; beginsymbol(2/5asc_height# + 2side_bearing#, asc_height#, 0); "small integral"; pair centre; centre := (w/2, (h - d)/2); - draw_integral(a, 1/2, centre, 4/3line_thickness); + draw_integral(a, 1/2, centre, line_thickness); endchar; beginsymbol(11u# + line_thickness# + 2side_bearing#, asc_height#, 0); "check mark"; @@ -1475,13 +1477,19 @@ beginoperator(plus_size#, 1); "sector"; theta := angle(z0a - z2a) - alpha; - z0a - z4 = 1/2thick * dir (alpha + theta); - z1a - z5 = 1/2thick * dir (alpha - theta); + z0a = z4r; + z0a.r = z4'.r; + z1a = z5r; + z1a.r = z5'.r; penpos4(thick, alpha + theta); + penpos4'(thick, alpha + theta); penpos5(thick, alpha - theta); + penpos5'(thick, alpha - theta); + + fill stroke z4e -- z4'.e{dir (alpha + theta - 90)} .. {dir(alpha - theta - 90)}z5'.e -- z5e; - fill stroke z4.e{dir (alpha + theta - 90)} .. {dir(alpha - theta - 90)}z5.e; + penlabels(4,5); endchar; beginsymbol(5/4order_width# + 2side_bearing#, cap_height#, 0); "forall"; diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdoperators.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdoperators.mf index 9e7b8da4b07..ef0a22a7cc7 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdoperators.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdoperators.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -208,28 +208,34 @@ endfor; charlist current_char - 1: current_char; for sign = 1, -1: + for serifs = true, false: + for scale = 1, 1.4: + beginbigop(5/4scale, scale); "product"; + draw_product(centre, op_width, op_height, sign, line_thickness * sqrt sqrt scale, serifs); + endchar; + endfor; + charlist current_char - 1: current_char; + endfor; +endfor; + +for serifs = true, false: for scale = 1, 1.4: - beginbigop(1.3scale, scale); "product"; - draw_product(centre, op_width, op_height, sign, 5/3line_thickness * sqrt sqrt scale); + beginbigop(scale, scale); "sum"; + draw_sum(a)(centre, op_width, op_height, line_thickness * sqrt sqrt scale, serifs); endchar; endfor; charlist current_char - 1: current_char; endfor; -for scale = 1, 1.4: - beginbigop(scale, scale); "sum"; - draw_sum(a)(centre, op_width, op_height, 5/3line_thickness * sqrt sqrt scale); - endchar; -endfor; -charlist current_char - 1: current_char; - -for scale = 1, 1.4: - beginbigop(scale, scale); "sum modulo two"; - draw_sum(a)(centre, op_width, op_height, 5/3line_thickness * sqrt sqrt scale); - draw_circle(z13a, sqrt scale * 1/4op_width, line_thickness * sqrt sqrt scale); - endchar; +for serifs = true, false: + for scale = 1, 1.4: + beginbigop(scale, scale); "sum modulo two"; + draw_sum(a)(centre, op_width, op_height, line_thickness * sqrt sqrt scale, serifs); + draw_circle(z12a, sqrt scale * 1/4op_width, line_thickness * sqrt sqrt scale); + endchar; + endfor; + charlist current_char - 1: current_char; endfor; -charlist current_char - 1: current_char; for number = 0, 1, 2, 3: for scale = 1, 1.8: @@ -240,7 +246,7 @@ for number = 0, 1, 2, 3: for i = 0 upto number: centre := (side_bearing + scale * (5i + 7/2) * u, (h - d)/2); - draw_integral([i])(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral([i])(scale, centre, line_thickness * sqrt sqrt scale); endfor; endchar; endfor; @@ -254,11 +260,11 @@ for scale = 1, 1.8: pair centre; centre := (side_bearing + scale * 7/2u, (h - d)/2); - draw_integral([0])(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral([0])(scale, centre, line_thickness * sqrt sqrt scale); centre := (side_bearing + scale * 6u + 4(equal_spread + dot_size), (h - d)/2); - draw_integral([1])(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral([1])(scale, centre, line_thickness * sqrt sqrt scale); z0 = 1/4[z0[0],z0[1]]; z1 = 2/4[z0[0],z0[1]]; @@ -281,7 +287,7 @@ for sign = 1, -1: pair centre; centre := (side_bearing + scale * 9/2u, (h - d)/2); - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); thick := line_thickness * sqrt sqrt scale; r := 4u; @@ -317,7 +323,7 @@ for scale = 1, 1.8: pair centre; centre := (side_bearing + scale * 7/2u, (h - d)/2); - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); r := scale * 5/2u; thick := line_thickness * sqrt sqrt scale; @@ -336,7 +342,7 @@ for scale = 1, 1.8: pair centre; centre := (side_bearing + scale * 7/2u, (h - d)/2); - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); z1 - z0 = equal_spread * up; 1/2[z0, z1] = z0a; @@ -357,7 +363,7 @@ for scale = 1, 1.8: pair centre; centre := (side_bearing + scale * 7/2u, (h - d)/2); - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); r := scale * 7/2u; thick := line_thickness * sqrt sqrt scale; @@ -392,7 +398,7 @@ for number = 0, 1, 2: % Integral must come after unfill when processed with MetaPost! for i = 0 upto number: centre := (side_bearing + scale * (5i + 4) * u, (h - d)/2); - draw_integral([i])(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral([i])(scale, centre, line_thickness * sqrt sqrt scale); endfor; endchar; endfor; @@ -410,7 +416,7 @@ for alpha = 0, 180: pair centre; centre := (side_bearing + scale * (4u + if alpha > 90: u else: 0 fi), (h - d)/2); - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); thick := line_thickness * sqrt sqrt scale; r := scale * 4u; @@ -433,18 +439,19 @@ for alpha = 0, 180: endfor; endfor; -for scale = 1, 1.8: - beginsymbol(scale * 13/2u# + if scale > 1: 0 else: scale * u# fi + 2side_bearing#, vcentre(scale * 1.6asc_height#)); "sum integral"; - if scale > 1: - italcorr scale * u#; % kerning between upper limit and lower limit - fi - - pair centre; - centre := (side_bearing + scale * 4u, (h - d)/2); +for serifs = true, false: + for scale = 1, 1.8: + beginsymbol(scale * 13/2u# + if scale > 1: 0 else: scale * u# fi + 2side_bearing#, vcentre(scale * 1.6asc_height#)); "sum integral"; + if scale > 1: + italcorr scale * u#; % kerning between upper limit and lower limit + fi - draw_integral(a)(scale, centre, 3/2line_thickness * sqrt sqrt scale); - draw_sum(b, 1/4[z0a.l,z0a.r], scale * 7u, scale * 3/4asc_height, line_thickness * sqrt sqrt scale); + pair centre; + centre := (side_bearing + scale * 4u, (h - d)/2); - endchar; + draw_integral(a)(scale, centre, line_thickness * sqrt sqrt scale); + draw_sum(b, 1/4[z0a.l,z0a.r], scale * 7u, scale * 3/4asc_height, 5/6line_thickness * sqrt sqrt scale, serifs); + endchar; + endfor; + charlist current_char - 1: current_char; endfor; -charlist current_char - 1: current_char; diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdrelations.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdrelations.mf index 01940430e0f..1e339936de0 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdrelations.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdrelations.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and @@ -586,9 +586,9 @@ if negated < 2: draw_less(b, right_ex - t * up, left_ex - t * up, s, line_thickness, false); if sign = 1: - draw_line(z1a - equal_spread * up, z4a - equal_spread * up, false); + draw_line(1/2[z1a,z4b], 1/2[z4a,z1b], false); else: - draw_line(z0a - equal_spread * up, z3a - equal_spread * up, false); + draw_line(1/2[z0a,z3b], 1/2[z3a,z0b], false); fi; if negated = 1: @@ -670,19 +670,25 @@ if negated < 2: draw_less(a, z0, z1, greater_spread, thick, false); - theta := angle(z0a - z2a); + theta := angle(z0a - z2a); - z0a - z4 = 1/2thick * dir theta; - z1a - z5 = 1/2thick * dir theta; + z0a = z4r; + z0a.r = z4'.r; + z1a = z5r; + z1a.r = z5'.r; penpos4(thick, theta); + penpos4'(thick, theta); penpos5(thick, -theta); + penpos5'(thick, -theta); - fill stroke z4.e{dir (theta - 90)} .. {dir(-theta - 90)}z5.e; + fill stroke z4.e -- z4'.e{dir (theta - 90)} .. {dir (-theta - 90)}z5'.e -- z5.e; if negated = 1: stroke_through(centre, equal_spread + greater_spread); fi; + + penlabels(4,5); endchar; endfor; fi; @@ -702,12 +708,12 @@ if negated < 2: theta := angle(z0a - z2a); z0a - z4 = 1/2thick * dir theta; - z1a - z5 = 1/2thick * dir theta; + z1a - z5 = 1/2thick * dir -theta; penpos4(thick, theta); penpos5(thick, -theta); - fill stroke z4.e{dir (theta - 90)} .. {dir(-theta - 90)}z5.e; + fill stroke z4.e{dir (theta - 90)} .. {dir (-theta - 90)}z5.e; if sign = 1: draw_line(z1a - 2t * up, z4a - 2t * up, false); diff --git a/Master/texmf-dist/fonts/source/public/fdsymbol/fdturnstile.mf b/Master/texmf-dist/fonts/source/public/fdsymbol/fdturnstile.mf index 5e0031ffa7d..2ed313bdd65 100644 --- a/Master/texmf-dist/fonts/source/public/fdsymbol/fdturnstile.mf +++ b/Master/texmf-dist/fonts/source/public/fdsymbol/fdturnstile.mf @@ -1,5 +1,5 @@ % -% Copyright (c) 2011, Michael Ummels <michael.ummels@rwth-aachen.de> +% Copyright (c) 2012, Michael Ummels <michael.ummels@rwth-aachen.de> % % This Font Software is licensed under the SIL Open Font License, % Version 1.1. This license is in the accompanying file OFL.txt, and |