From f22ba9c58716477bc6e86f6508eb5e20a5422328 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Apr 2009 18:48:48 +0000 Subject: eurosym subr fix + v1.4 update (31mar09) git-svn-id: svn://tug.org/texlive/trunk@12607 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/eurosym/Makefile | 7 ++ Master/texmf-dist/doc/fonts/eurosym/README | 77 +++++++++++++++++---- Master/texmf-dist/doc/fonts/eurosym/README.type1 | 16 +++++ Master/texmf-dist/doc/fonts/eurosym/eurosym.cpp | 60 ++++++++++++++++ .../fonts/type1/public/eurosym/geybl10.pfb | Bin 17154 -> 17155 bytes .../fonts/type1/public/eurosym/geybo10.pfb | Bin 15703 -> 15704 bytes .../fonts/type1/public/eurosym/geybr10.pfb | Bin 15328 -> 15329 bytes .../fonts/type1/public/eurosym/geyml10.pfb | Bin 17167 -> 17168 bytes .../fonts/type1/public/eurosym/geymo10.pfb | Bin 15622 -> 15623 bytes .../fonts/type1/public/eurosym/geymr10.pfb | Bin 15390 -> 15391 bytes Master/texmf-dist/source/fonts/eurosym/Makefile | 7 -- Master/texmf-dist/source/fonts/eurosym/eurosym.cpp | 60 ---------------- Master/tlpkg/bin/tlpkg-ctan-check | 4 +- Master/tlpkg/libexec/ctan2tds | 1 + 14 files changed, 151 insertions(+), 81 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/eurosym/Makefile create mode 100644 Master/texmf-dist/doc/fonts/eurosym/README.type1 create mode 100644 Master/texmf-dist/doc/fonts/eurosym/eurosym.cpp delete mode 100644 Master/texmf-dist/source/fonts/eurosym/Makefile delete mode 100644 Master/texmf-dist/source/fonts/eurosym/eurosym.cpp diff --git a/Master/texmf-dist/doc/fonts/eurosym/Makefile b/Master/texmf-dist/doc/fonts/eurosym/Makefile new file mode 100644 index 00000000000..6c6bdbff251 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/eurosym/Makefile @@ -0,0 +1,7 @@ +CC=gcc +CXX=g++ +CXXFLAGS=-g -W -Wall +LOADLIBES=-lfig -lm + +all: eurosym +.PHONY: all diff --git a/Master/texmf-dist/doc/fonts/eurosym/README b/Master/texmf-dist/doc/fonts/eurosym/README index d83b274715a..a78c856e134 100644 --- a/Master/texmf-dist/doc/fonts/eurosym/README +++ b/Master/texmf-dist/doc/fonts/eurosym/README @@ -1,16 +1,69 @@ -Thomas Schröder sent me a mail about having composed -Type1 fonts from the Metafont source. I pass the files -through to you without checking them, but I suspect -they are useful. ++------------------------------------------------------+ +| The Euro Symbol Package for LaTeX by Henrik Theiling | +| Version 1.4 | +| , http://www.theiling.de/ | ++------------------------------------------------------+ -These fonts are made from an older version of the Eurosym -package (< 1.4) and so the measures may be slightly different -from the official construction. +Hi! -Thomas used textrace to create the g* files and then -edited them to contain hints using pfaedit. This makes -the f* series. A map file for dvips is also provided. +This is the Euro symbol package I created. It provides a new symbol +to be used for the new European currency symbol, the Euro. The +specifications were taken from the c't magazine 11/98 p.211 from from +Encyclopaedia Britannica, Book of the Year 2002. -Contact Thomas here: schlumpf@mac.com +There is a style file (sty/eurosym.sty), some Metafont source files +(src/*.mf) and a LaTeX file (doc/testeuro.tex). For installation, put +this somewere where LaTeX can find it. -Have fun! +Further documentation can be found in doc/testeuro.dvi. You can only +see the Euro symbols in the text if you have installed the package +successfully, though. + +System Wide Installation Done by the Superuser +---------------------------------------------- +An example follows. Substitute $TEXMF with something that +matches your installation (search for texmf on your system +if you don't know where it is). + +If you are the superuser, move the eurosym/src directory to +$TEXMF/fonts/source/eurosym, the eurosym/tfm directory to +$TEXMF/fonts/tfm/eurosym and the eurosym/sty directory to +$TEXMF/tex/latex/eurosym. + +Use Installation +---------------- +Choose a directory for this installation, say $HOME/lib/tex/eurosym +and make sure that the programmes `latex', `dvips', `xdvi', and +possible other TeX related programmes find the files by ensuring +that the environment variables TEXINPUTS, MFINPUT and TFMFONTS +point to $HOME/lib/tex// (double slash at the end to ensure +sub-directory recursion) as well. See the file doc/runlatex for +an example. + +Testing +------- +Go to the doc subdirectory, compile testeuro.tex with latex and read +it with xdvi. Ignore some warnings about underfull hboxes which +occur because there is a three column part of text which TeX can't +typeset perfectly. Also ignore the warnings about unavailable shapes +of cmr. + +TODO +---- + Implement the OCR Euro symbols. (long term project...) + + +BUGS +---- +- testeuro.tex creates warnings about unavailable shapes of cmr + although I tried my best to make the scope of the \olshape + command include the \officialeuro{} command only. + +- FIXED: + at least on my machine, dvips and xdvi produce checksum mismatches + for some unknown reason. + +- FIXED: + problems with names: `eurosymbol' and `eurosym' were both used. + +**Henrik diff --git a/Master/texmf-dist/doc/fonts/eurosym/README.type1 b/Master/texmf-dist/doc/fonts/eurosym/README.type1 new file mode 100644 index 00000000000..d83b274715a --- /dev/null +++ b/Master/texmf-dist/doc/fonts/eurosym/README.type1 @@ -0,0 +1,16 @@ +Thomas Schröder sent me a mail about having composed +Type1 fonts from the Metafont source. I pass the files +through to you without checking them, but I suspect +they are useful. + +These fonts are made from an older version of the Eurosym +package (< 1.4) and so the measures may be slightly different +from the official construction. + +Thomas used textrace to create the g* files and then +edited them to contain hints using pfaedit. This makes +the f* series. A map file for dvips is also provided. + +Contact Thomas here: schlumpf@mac.com + +Have fun! diff --git a/Master/texmf-dist/doc/fonts/eurosym/eurosym.cpp b/Master/texmf-dist/doc/fonts/eurosym/eurosym.cpp new file mode 100644 index 00000000000..5284d2145a3 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/eurosym/eurosym.cpp @@ -0,0 +1,60 @@ +// -*- Mode: C++ -*- + +#include + +int main (int, char **) +{ + // These measures are taken from an ``official'' Euro symbol + // that is programmed in PostScript (which turns out not to + // use the correct measures. + + // However, let's view the values in mm. + Fig::unit= Fig::mm; + + // Default angle unit is degrees: + Fig::angle_unit= Fig::deg; + + // The origin is at the center of the arcs. + // Inner Arc: + FigDimension const inner_arc_radius= 67.5; + FigAngle const inner_arc_angle1= 40.0; + FigAngle const inner_arc_angle2= 320.0; + + // Outer Arc: + FigDimension const outer_arc_radius= 77.5; // Hmmm... It can be seen that the line width + // is 10 units. So the inner radius contradicts + // the official construction; if must be 5 units + // and the outer one 6 units. + FigDimension const outer_arc_angle1= 311.8513; + FigDimension const outer_arc_angle2= 43.68390; + + // However, just for the fun of it, continue to write the rest as a fig-file, too: + + FILE *f=fopen ("eurosym.fig", "wt"); + (new FigFile ( + FigVectorWidget () + << (new FigCEllipse (0, 0, inner_arc_radius)) // instead of arc, use a circle for now + << (new FigCEllipse (0, 0, outer_arc_radius)) + << (new FigClosedPoly ( + FigVectorPoint() + << FigPoint (26.73339, -15) + << FigPoint (-97.5, -15) + << FigPoint (-93.22267, -5) + << FigPoint (31.010728, -5) + << FigPoint (26.73339, -15) + )) + << (new FigClosedPoly ( + FigVectorPoint() + << FigPoint (35.28807, 5) + << FigPoint (-97.5, 5) + << FigPoint (-93.22267, 15) + << FigPoint (39.56541, 15) + << FigPoint (35.28807, 5) + )) + ))->scale (1, -1) + ->translate (120, 100) + ->save (f); + fclose (f); + + return 0; +} \ No newline at end of file diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geybl10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geybl10.pfb index 4852e6975ce..68a5fe2a027 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geybl10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geybl10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geybo10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geybo10.pfb index 3fadb35bc14..15a435ec57e 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geybo10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geybo10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geybr10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geybr10.pfb index 1ad599edd28..6ee07b501ff 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geybr10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geybr10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geyml10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geyml10.pfb index 718c2e3e9a5..27c6c88881a 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geyml10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geyml10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geymo10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geymo10.pfb index 3b4d0df9d93..120c78f1cd1 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geymo10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geymo10.pfb differ diff --git a/Master/texmf-dist/fonts/type1/public/eurosym/geymr10.pfb b/Master/texmf-dist/fonts/type1/public/eurosym/geymr10.pfb index 8190fea41e4..cc3d55bc097 100644 Binary files a/Master/texmf-dist/fonts/type1/public/eurosym/geymr10.pfb and b/Master/texmf-dist/fonts/type1/public/eurosym/geymr10.pfb differ diff --git a/Master/texmf-dist/source/fonts/eurosym/Makefile b/Master/texmf-dist/source/fonts/eurosym/Makefile deleted file mode 100644 index 6c6bdbff251..00000000000 --- a/Master/texmf-dist/source/fonts/eurosym/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CC=gcc -CXX=g++ -CXXFLAGS=-g -W -Wall -LOADLIBES=-lfig -lm - -all: eurosym -.PHONY: all diff --git a/Master/texmf-dist/source/fonts/eurosym/eurosym.cpp b/Master/texmf-dist/source/fonts/eurosym/eurosym.cpp deleted file mode 100644 index 5284d2145a3..00000000000 --- a/Master/texmf-dist/source/fonts/eurosym/eurosym.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// -*- Mode: C++ -*- - -#include - -int main (int, char **) -{ - // These measures are taken from an ``official'' Euro symbol - // that is programmed in PostScript (which turns out not to - // use the correct measures. - - // However, let's view the values in mm. - Fig::unit= Fig::mm; - - // Default angle unit is degrees: - Fig::angle_unit= Fig::deg; - - // The origin is at the center of the arcs. - // Inner Arc: - FigDimension const inner_arc_radius= 67.5; - FigAngle const inner_arc_angle1= 40.0; - FigAngle const inner_arc_angle2= 320.0; - - // Outer Arc: - FigDimension const outer_arc_radius= 77.5; // Hmmm... It can be seen that the line width - // is 10 units. So the inner radius contradicts - // the official construction; if must be 5 units - // and the outer one 6 units. - FigDimension const outer_arc_angle1= 311.8513; - FigDimension const outer_arc_angle2= 43.68390; - - // However, just for the fun of it, continue to write the rest as a fig-file, too: - - FILE *f=fopen ("eurosym.fig", "wt"); - (new FigFile ( - FigVectorWidget () - << (new FigCEllipse (0, 0, inner_arc_radius)) // instead of arc, use a circle for now - << (new FigCEllipse (0, 0, outer_arc_radius)) - << (new FigClosedPoly ( - FigVectorPoint() - << FigPoint (26.73339, -15) - << FigPoint (-97.5, -15) - << FigPoint (-93.22267, -5) - << FigPoint (31.010728, -5) - << FigPoint (26.73339, -15) - )) - << (new FigClosedPoly ( - FigVectorPoint() - << FigPoint (35.28807, 5) - << FigPoint (-97.5, 5) - << FigPoint (-93.22267, 15) - << FigPoint (39.56541, 15) - << FigPoint (35.28807, 5) - )) - ))->scale (1, -1) - ->translate (120, 100) - ->save (f); - fclose (f); - - return 0; -} \ No newline at end of file diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index f119b1eee11..7faab84729e 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -88,8 +88,8 @@ my @WorkingTLP = qw( eqlist eqparbox errata es-tex-faq ESIEEcv esdiff esint esint-type1 eskd eskdx eso-pic esvect etaremune etex-pkg ethiop ethiop-t1 etoolbox euenc eukdate - eulervm euproposal euro europecv eurosans everypage exam - examdesign examplep exercise exp-testopt + eulervm euproposal euro europecv eurosans eurosym + everypage exam examdesign examplep exercise exp-testopt expdlist expl3 expressg extarrows exteps extpfeil extract extsizes faktor fancybox fancyhdr fancynum fancyref fancytooltips fancyvrb diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 73c57ef918e..f33747ea23b 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -573,6 +573,7 @@ $standardsource='\.fdd|\.dtx|\.ins|\.c$|Makefile|configure.*|install-sh|\.drv'; 'epslatex-fr', 'NULL', 'epspdf', 'NULL', # leave .install 'eskdx', 'NULL', # leave makefiles + 'eurosym', 'NULL', # leave makefiles, etc. 'feynmf', 'feynmf\.pl' . $standardsource, 'mff', '\.mfj|\.bat|\.diz', 'fpl', 'Add|\.sfd|\.pe|\.ps' . $standardsource, -- cgit v1.2.3