diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-04 20:49:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-04 20:49:55 +0000 |
commit | be53f9d0af947622afca67b99c89a90d5c08dbd4 (patch) | |
tree | b979deab71bd8edfa4beeee0f0edc693d60b01b7 | |
parent | 5c5c9bce35bf7563e8f7dd7983d537f083b2b731 (diff) |
countriesofeurope, now all lc (3oct19)
git-svn-id: svn://tug.org/texlive/trunk@52285 c570f23f-e606-0410-a88d-b1316a301751
15 files changed, 200 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/Changes b/Master/texmf-dist/doc/fonts/countriesofeurope/Changes index 7660320dc19..45892627a94 100644 --- a/Master/texmf-dist/doc/fonts/countriesofeurope/Changes +++ b/Master/texmf-dist/doc/fonts/countriesofeurope/Changes @@ -1,2 +1,3 @@ +0.23 2019-10-03 - added color and Ligature option 0.22 2018-12-27 - added OpenType font and outline option 0.21 2012-04-18 - first CTAN version
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf Binary files differdeleted file mode 100644 index 205dfa914de..00000000000 --- a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/README b/Master/texmf-dist/doc/fonts/countriesofeurope/README index 07739755f20..a46e6021b1d 100644 --- a/Master/texmf-dist/doc/fonts/countriesofeurope/README +++ b/Master/texmf-dist/doc/fonts/countriesofeurope/README @@ -4,7 +4,6 @@ The fonts are copyrighted by Ingo Zimmermann (ingofonts.com) and can be used under the Open Font License. All other files are copyrighted by Rolf Niepraschk and -Herbert Voß and can be used under the LaTeX Public Project Licence. +Herbert Voß and can be used under the LaTeX Project Public Licence. -v0.22 2018-12-27 hvoss@tug.org
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.bib b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.bib new file mode 100644 index 00000000000..9465016c330 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.bib @@ -0,0 +1,18 @@ +@ctan{countriesofeurope, +title = {The Countriesofeurope package}, +subtitle = {A font with the images of the countries of Europe}, +author = {Zimmermann, Ingo and Voß, Herbert and Niepraschk, Rolf}, +url = {http://www.ctan.org/pkg/countriesofeurope}, +urldate = {2019-10-203}, +date = {2019-10-03}, +version = {0.23} +} + +@online{ingofonts, +title={Fonts and typography that leave a mark}, +author={Ingo Zimmermann}, +url={http://www.ingoFonts.de}, +urldate = {2019-10-03}, +note={for corporate design, promotion, web, publishing. Buy fonts directly from the maker. At ingoFonts you’ll find fonts of all styles, + including free test versions of all fonts to download and try out.}, +} diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.pdf b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.pdf Binary files differnew file mode 100644 index 00000000000..2b4be170a96 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.pdf diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.tex index 9bee1d3eca5..b812cd4ef63 100644 --- a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex +++ b/Master/texmf-dist/doc/fonts/countriesofeurope/countriesofeurope.tex @@ -1,14 +1,16 @@ +%\listfiles +%% $Id: countriesofeurope.tex 1095 2019-10-03 06:05:39Z herbert $ +\documentclass[11pt,english,BCOR=10mm,DIV=13,toc=bibliography,parskip=false, + headings=small,headinclude=false,footinclude=false,oneside]{pst-doc} +\usepackage[Scale=7.5]{countriesofeurope} +\let\pstFV\fileversion -%--------------------------- -\listfiles - -\documentclass{article} \usepackage{ifluatex} +\usepackage{dtk-logos} \ifluatex\else - \pdfmapfile{+CountriesofEurope.map} % only needed, if the map is not enabled with updmap + \pdfmapfile{+countriesofeurope.map} % only needed, if the map is not enabled with updmap \fi \usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus} -\usepackage[Scale=7.5]{CountriesofEurope} \makeatletter \newcommand\Country[2][]{{% @@ -21,14 +23,25 @@ \newcounter{N} +\renewcommand\bgImage{% + \EUCountry[Scale=3,outline,fillcolor=blue!20,linecolor=black]{Germany}} + +\usepackage{biblatex} +\addbibresource{\jobname.bib} \begin{document} -\author{Rolf Niepraschk \and Herbert Voß} -\title{Package \texttt{CountriesofEurope}} + +\title{Package \texttt{countriesofeurope}} +\subtitle{Printing all european countries as a character of a font (v.\,0.23)} +\author{Rolf Niepraschk\\Herbert Voß\\Ingo Zimmermann} +\docauthor{Herbert Voß} +\date{\today} \maketitle +\section{Introduction} \begin{sloppypar} -This package defines the two macros \verb|\CountriesofEuropeFamily| and \verb|\EUCountry[options]{name}|, +This package defines the two macros \Lcs{countriesofeuropefamily} (short version is \Lcs{CoEF}) +and \Lcs{EUCountry}\verb|[options]{name}|, which allow to print one of the european countries as a single character with the given scaling or with an individual scaling. @@ -43,11 +56,14 @@ The font can be loaded with an optional argument for the scaling factor, which is preset to 1: \begin{verbatim} -\usepackage[Scale=10]{CountriesofEurope}% scaled to 10 +\usepackage[Scale=10]{countriesofeurope}% scaled to 10 \end{verbatim} + +\section{Default use} + The countris itself are available by a macro from the following list. The characters are -at the position 128--166 in the Type~1 font \verb|CountriesofEurope.pfb| and also available +at the position 128--166 in the Type~1 font \LFile{countriesofeurope.pfb} and also available with the \verb|\char| primitive. The following table shows the countries in their original size with a scaling of 7.5: @@ -94,12 +110,12 @@ with a scaling of 7.5: \end{longtable} -\noindent\rule{\textwidth}{.5mm} +\noindent\rule{\textwidth}{.5mm} The countries in the original size with the given bounding box and the text command \verb|\huge|: -% \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} +% \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \medskip @@ -107,7 +123,7 @@ The countries in the original size with the given bounding box and the text comm \fboxsep=0pt \noindent% \ifluatex - \fontspec{CountriesofEurope.otf} + \fontspec[Scale=1]{countriesofeurope.otf} \huge \setcounter{N}{63724}% \whiledo{\value{N} > 63686}{% @@ -122,8 +138,9 @@ The countries in the original size with the given bounding box and the text comm \fi \endgroup +\rmfamily -\clearpage +\section{Outline font} All countries can be printed as outline, e.\,g.: @@ -134,10 +151,11 @@ All countries can be printed as outline, e.\,g.: +\begingroup \ifluatex - \fontspec{CountriesofEurope.otf} + \CoEF \else - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \fi \begin{longtable}{cccc} @@ -183,25 +201,112 @@ All countries can be printed as outline, e.\,g.: \end{longtable} +\endgroup + +\section{Ligatures} \rmfamily The countries are internally defined as a ligature so that abreviations of the countries can be -used for printing: +used for printing. +% +%\begin{verbatim} +%\CoEF ge au +%\end{verbatim} +% +These Ligatures are enabled by default! -\begin{verbatim} -\CountriesofEuropeFamily -ge au -\end{verbatim} +%\begin{verbatim} +%\defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common} +%\end{verbatim} + +%leads to +\begingroup \ifluatex - \fontspec{CountriesofEurope.otf} + \CoEF +% \defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common} \else - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} \fi -\CountriesofEuropeFamily -ge au +\verb|{\CoEF ge GE}| $\rightarrow$ {\CoEF ge GE} +\endgroup + + + + +\def\TAB#1{\tabular[b]{@{}l@{}}#1\endtabular} +\begin{longtable}{ll ll}\toprule +\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule +\endfirsthead +\midrule +\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule +\endhead +AL & \CoEF AL & AN & \CoEF AN \\\hline +AU & \CoEF AU & BELA & \CoEF BELA \\\hline +BELG & \CoEF BELG & BO & \CoEF BO\\\hline +BU & \CoEF BU & CR & \CoEF CR\\\hline +CZ & \CoEF CZ & \TAB{DAN\\DAE} & \CoEF DAN\\\hline +EST & \CoEF EST & FI & \CoEF FI \\\hline +FR & \CoEF FR & GE & \CoEF GE \\ +\TAB{EN\\GREA\\BR} & \CoEF BR & GRI & \CoEF GRI \\\hline +HU & \CoEF HU & IC & \CoEF IC \\\hline +IR & \CoEF IR & IT & \CoEF IT \\\hline +LA & \CoEF LA & LIE & \CoEF LIE\\\hline +LIT & \CoEF LIT & LU & \CoEF LU \\\hline +MAC & \CoEF MAC & MAL & \CoEF MAL\\\hline +MOL & \CoEF MOL & MON & \CoEF MON \\\hline +NE & \CoEF NE & NO & \CoEF NO\\\hline +POL & \CoEF POL & POR & \CoEF POR \\\hline +RO & \CoEF RO & SE & \CoEF SE \\\hline +SLOVA& \CoEF SLOVA& SLOVE& \CoEF SLOVE \\\hline +SP & \CoEF SP & \TAB{SWE\\SV} & \CoEF SWE\\\hline +SWI & \CoEF SWI & & \\\bottomrule +\end{longtable} + +%\defaultfontfeatures[\countriesofeuropefamily]{Ligatures=NoCommon} + + +%The Ligatures can also be enabled by + +%\begin{verbatim} +%\usepackage[Ligatures=Common]{countriesofeurope} +%\end{verbatim} + + +\rmfamily +\section{Color options} + + + +With the optional arguments \Lkeyword{fillcolor} and \Lkeyword{linecolor} the countries can printed with +different colors. The option \Lkeyword{fillcolor} is only valiD, if the option \Lkeyword{outline} is +set, too. + + + +\verb|\EUCountry[Scale=37.5,outline,fillcolor=blue!20,linecolor=blue]{Germany}| +\ifluatex + \fontspec{countriesofeurope.otf} +\else + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{} +\fi + + +\fbox{\EUCountry[Scale=5,outline,fillcolor=blue!20,linecolor=blue]{Germany}} + + + +\rmfamily +\bgroup +\raggedright +\nocite{*} +%\bibliographystyle{plain} +\printbibliography +\egroup + +\printindex diff --git a/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesofEurope.afm b/Master/texmf-dist/fonts/afm/public/countriesofeurope/countriesofeurope.afm index 6ffbab04eeb..6ffbab04eeb 100644 --- a/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesofEurope.afm +++ b/Master/texmf-dist/fonts/afm/public/countriesofeurope/countriesofeurope.afm diff --git a/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc b/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc index 799897b4aac..568dff0a401 100644 --- a/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc +++ b/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc @@ -1,5 +1,5 @@ -/CountriesofEurope [ +/countriesofeurope [ %00 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -49,4 +49,4 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -% Command line: 'otftotfm CountriesofEurope.otf foo' +% Command line: 'otftotfm countriesofeurope.otf foo' diff --git a/Master/texmf-dist/fonts/map/dvips/countriesofeurope/CountriesofEurope.map b/Master/texmf-dist/fonts/map/dvips/countriesofeurope/CountriesofEurope.map deleted file mode 100644 index e8b38479e29..00000000000 --- a/Master/texmf-dist/fonts/map/dvips/countriesofeurope/CountriesofEurope.map +++ /dev/null @@ -1 +0,0 @@ -CountriesofEurope CountriesofEurope "CountriesofEurope ReEncodeFont" <CountriesofEurope.enc <CountriesofEurope.pfb diff --git a/Master/texmf-dist/fonts/map/dvips/countriesofeurope/countriesofeurope.map b/Master/texmf-dist/fonts/map/dvips/countriesofeurope/countriesofeurope.map new file mode 100644 index 00000000000..37ed0bd2625 --- /dev/null +++ b/Master/texmf-dist/fonts/map/dvips/countriesofeurope/countriesofeurope.map @@ -0,0 +1 @@ +countriesofeurope countriesofeurope "countriesofeurope ReEncodeFont" <countriesofeurope.enc <countriesofeurope.pfb diff --git a/Master/texmf-dist/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf b/Master/texmf-dist/fonts/opentype/public/countriesofeurope/countriesofeurope.otf Binary files differindex 6e1013291e1..6e1013291e1 100644 --- a/Master/texmf-dist/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf +++ b/Master/texmf-dist/fonts/opentype/public/countriesofeurope/countriesofeurope.otf diff --git a/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm b/Master/texmf-dist/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm Binary files differindex 72226007b66..72226007b66 100644 --- a/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm +++ b/Master/texmf-dist/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm diff --git a/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb b/Master/texmf-dist/fonts/type1/public/countriesofeurope/countriesofeurope.pfb Binary files differindex b4d1942088c..b4d1942088c 100644 --- a/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb +++ b/Master/texmf-dist/fonts/type1/public/countriesofeurope/countriesofeurope.pfb diff --git a/Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty b/Master/texmf-dist/tex/latex/countriesofeurope/countriesofeurope.sty index 4fd2039f0ff..ca07f5b1efa 100644 --- a/Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty +++ b/Master/texmf-dist/tex/latex/countriesofeurope/countriesofeurope.sty @@ -12,14 +12,16 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{CountriesofEurope}% - [2018/12/27 v0.22 CountriesofEurope Font (hv,RN)] +\ProvidesPackage{countriesofeurope}% + [2018/12/29 v0.23 countriesofeurope Font (hv,RN)] +\PassOptionsToPackage{rgb}{xcolor} +\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx,xcolor} -\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx} - -\newcommand*\CountriesofEurope@scale{1} +\newcommand*\countriesofeurope@scale{1} +\newcommand*\countriesofeurope@ligatures{ResetAll} \RequirePackage{xkeyval} -\DeclareOptionX{Scale}{\renewcommand*\CountriesofEurope@scale{#1}} +\DeclareOptionX{Scale}{\renewcommand*\countriesofeurope@scale{#1}} +\DeclareOptionX{Ligatures}{\renewcommand*\countriesofeurope@ligatures{#1}} \ProcessOptionsX\relax \newif\ifCoE@outline @@ -28,10 +30,17 @@ \define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}} \define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}} +\define@key{CoE}{fillcolor}[]{\def\CoE@fillcolor{#1}} +\define@key{CoE}{linecolor}[black]{\def\CoE@linecolor{#1}} % \def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x} -\setCoEkeys{outline=false,Scale=1} +\setCoEkeys{outline=false,Scale=1,fillcolor=,linecolor=black} + +\def\getPDFsyntax#1,#2,#3\@nil#4{\gdef#4{#1 #2 #3}} +\def\getPDFcolor#1#2{\extractcolorspecs{#1}\Col@A\Col@B\relax + \expandafter\getPDFsyntax\Col@B\@nil#2\relax +} \newif\if@CoE@newengine \@CoE@newenginefalse \ifxetex\@CoE@newenginetrue @@ -40,25 +49,40 @@ \fi \if@CoE@newengine - \def\set@Outline{\pdfextension literal direct { 1 Tr 0 w }\relax} - \def\unset@Outline{\pdfextension literal direct { 0 Tr 0 w }\relax} + \def\set@Outline{% + \ifx\CoE@fillcolor\@empty + \pdfextension literal direct { 1 Tr 0 w }\relax + \else + \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor + \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor + \pdfextension literal direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax + \fi} + \def\unset@Outline{\pdfextension literal direct{ 0 Tr 0 w }\relax}% \else - \def\set@Outline{\pdfliteral direct { 1 Tr 0 w }\relax} - \def\unset@Outline{\pdfliteral direct { 0 Tr 0 w }\relax} + \def\set@Outline{% + \ifx\relax\CoE@fillcolor\relax + \pdfliteral direct { 1 Tr 0 w }\relax + \else + \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor + \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor + \pdfliteral direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax + \fi}% + \def\unset@Outline{\pdfliteral direct{ 0 Tr 0 w }\relax}% \fi \newcommand\EUCountry[2][]{{% \expandafter\setCoEkeys\expandafter{#1}% - \CountriesofEuropeFamily\scalebox{\CoE@Scale}{% - \ifCoE@outline\set@Outline\fi - \csname#2\endcsname - \ifCoE@outline\unset@Outline\fi + \countriesofeuropefamily\scalebox{\CoE@Scale}{% + \ifCoE@outline\set@Outline\fi% + \csname#2\endcsname% + \ifCoE@outline\unset@Outline\fi% }}} \if@CoE@newengine \RequirePackage{fontspec} - \newfontface\CountriesofEuropeFamily{CountriesofEurope.otf}[Scale=\CountriesofEurope@scale] - \let\CoEF\CountriesofEuropeFamily + \newfontface\countriesofeuropefamily{countriesofeurope.otf}% + [Scale=\countriesofeurope@scale,Ligatures=\countriesofeurope@ligatures] + \let\CoEF\countriesofeuropefamily \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724 \DeclareTextCommand{\Andorra}{TU}{\char"F8EB} \DeclareTextCommand{\Austria}{TU}{\char"F8EA} @@ -101,9 +125,9 @@ \else \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} - \DeclareFontFamily{U}{CountriesofEurope}{} - \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[\CountriesofEurope@scale]CountriesofEurope}{} - \providecommand\CountriesofEuropeFamily{\usefont{U}{CountriesofEurope}{m}{n}} + \DeclareFontFamily{U}{countriesofeurope}{} + \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[\countriesofeurope@scale]countriesofeurope}{} + \providecommand\countriesofeuropefamily{\usefont{U}{countriesofeurope}{m}{n}} \DeclareTextCommand{\Albania}{U}{\char128} \DeclareTextCommand{\Andorra}{U}{\char129} \DeclareTextCommand{\Austria}{U}{\char130} @@ -144,7 +168,7 @@ \DeclareTextCommand{\Sweden}{U}{\char165} \DeclareTextCommand{\Switzerland}{U}{\char166} \fi -% otftotfm --encoding=CountriesofEurope.enc --no-map CountriesofEurope.otf CountriesofEurope +% otftotfm --encoding=countriesofeurope.enc --no-map countriesofeurope.otf countriesofeurope \endinput diff --git a/Master/tlpkg/tlpsrc/countriesofeurope.tlpsrc b/Master/tlpkg/tlpsrc/countriesofeurope.tlpsrc index 478c965aa7f..493569ed3f6 100644 --- a/Master/tlpkg/tlpsrc/countriesofeurope.tlpsrc +++ b/Master/tlpkg/tlpsrc/countriesofeurope.tlpsrc @@ -1 +1 @@ -execute addMap CountriesofEurope.map +execute addMap ${PKGNAME}.map |