summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-28 21:34:41 +0000
committerKarl Berry <karl@freefriends.org>2018-12-28 21:34:41 +0000
commit5f5e3b734fe79b18115c591ba0d2b1a789e7678a (patch)
tree157935a800558ddc87ad52c0401337e6ea70d447
parent2d89587eeee7209cafca4b1c12837c820050b957 (diff)
countriesofeurope (28dec18)
git-svn-id: svn://tug.org/texlive/trunk@49517 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/Changes2
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.pdfbin248155 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.tex114
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdfbin0 -> 76943 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex210
-rw-r--r--Master/texmf-dist/doc/fonts/countriesofeurope/README9
-rw-r--r--Master/texmf-dist/dvips/countriesofeurope/config.CountriesOfEurope1
-rw-r--r--Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesofEurope.afm (renamed from Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesOfEurope.afm)6
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc (renamed from Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesOfEurope.enc)4
-rw-r--r--Master/texmf-dist/fonts/map/dvips/countriesofeurope/CountriesOfEurope.map1
-rw-r--r--Master/texmf-dist/fonts/map/dvips/countriesofeurope/CountriesofEurope.map1
-rw-r--r--Master/texmf-dist/fonts/opentype/public/countriesofeurope/CountriesofEurope.otfbin0 -> 94696 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm (renamed from Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesOfEurope.tfm)bin1136 -> 1136 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesOfEurope.pfbbin98793 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfbbin0 -> 164613 bytes
-rw-r--r--Master/texmf-dist/tex/latex/countriesofeurope/CountriesOfEurope.sty105
-rw-r--r--Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty159
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
18 files changed, 383 insertions, 230 deletions
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/Changes b/Master/texmf-dist/doc/fonts/countriesofeurope/Changes
new file mode 100644
index 00000000000..7660320dc19
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/countriesofeurope/Changes
@@ -0,0 +1,2 @@
+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
deleted file mode 100644
index 405110fe2ce..00000000000
--- a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.tex b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.tex
deleted file mode 100644
index e8569d4dbb9..00000000000
--- a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesOfEurope.tex
+++ /dev/null
@@ -1,114 +0,0 @@
-
-%---------------------------
-\listfiles
-
-%\pdfmapfile{+CountriesOfEurope.map} % only needed, if the map is not enabled with updmap
-
-\documentclass{article}
-
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e}
-\usepackage[scaled=7.5]{CountriesOfEurope}
-
-\makeatletter
-\newcommand\Country[1]{%
- \tabular{|>{\Centering}p{2.5cm}|}\hline
- \strut\footnotesize\texttt{\textbackslash#1}\\\hline
- \parbox[c][3.2cm]{2cm}{\CountriesOfEuropeFamily\@nameuse{#1}}\\\hline
- \endtabular}
-
-\makeatother
-
-\newcounter{N}
-
-\begin{document}
-\author{Rolf Niepraschk \and Herbert Voß}
-\title{Package \texttt{CountriesOfEurope}}
-\maketitle
-
-
-\begin{sloppypar}
-This package defines the two macros \verb|\CountriesOfEuropeFamily| and \verb|\EUCountry{no}|,
-which allow to print one of the european countries as a single character with the given scaling.
-The first one switches
-to the font encoding \verb|U| and loads the font and the second one does the same but also with
-printing the character which the given number (128--166), eg for Finland: \verb|\EUCountry{139}|$\rightarrow$%
-\scalebox{0.1}{\EUCountry{139}}.
-\end{sloppypar}
-
-The font can be loaded
-with an optional argument for the scaling factor, which is preset to 1:
-
-\begin{verbatim}
-\usepackage[scaled]{CountriesOfEurope}% scaled to 10
-\usepackage[scaled=15]{CountriesOfEurope}
-\end{verbatim}
-
-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
-with the \verb|\char| primitive. The following table shows the countries in their original size
-with a scaling of 7.5:
-
-\begin{longtable}{cccc}
-\Country{Albania} &
-\Country{Andorra} &
-\Country{Austria} &
-\Country{Belarus} \\
-\Country{Belgium} &
-\Country{Bosnia} &
-\Country{Bulgaria} &
-\Country{Croatia} \\
-\Country{Czechia} &
-\Country{Denmark} &
-\Country{Estonia} &
-\Country{Finland} \\
-\Country{France} &
-\Country{Germany} &
-\Country{GreatBritain} &
-\Country{Greece} \\
-\Country{Hungary} &
-\Country{Iceland} &
-\Country{Ireland} &
-\Country{Italy} \\
-\Country{Latvia} &
-\Country{Liechtenstein} &
-\Country{Lithuania} &
-\Country{Luxembourg} \\
-\Country{Macedonia} &
-\Country{Malta} &
-\Country{Moldova} &
-\Country{Montenegro} \\
-\Country{Netherlands} &
-\Country{Norway} &
-\Country{Poland} &
-\Country{Portugal} \\
-\Country{Romania} &
-\Country{Serbia} &
-\Country{Slovakia} &
-\Country{Slovenia} \\
-\Country{Spain} &
-\Country{Sweden} &
-\Country{Switzerland}
-
-\end{longtable}
-
-
-\DeclareFontShape{U}{CountriesOfEurope}{m}{n}{ <-> s*[1] CountriesOfEurope}{}
-\noindent\rule{\textwidth}{.5mm}
-
-The countries in the original size with the given bounding box and the text command \verb|huge|:
-
-\medskip
-
-\begingroup
-\fboxsep=0pt
-\setcounter{N}{128}
-\huge\noindent%
-\CountriesOfEuropeFamily%
-\whiledo{\value{N} < 167}{%
- \fbox{\symbol{\value{N}}}%
- \stepcounter{N}}
-\endgroup
-
-\end{document}
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf
new file mode 100644
index 00000000000..205dfa914de
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex
new file mode 100644
index 00000000000..9bee1d3eca5
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/countriesofeurope/CountriesofEurope.tex
@@ -0,0 +1,210 @@
+
+%---------------------------
+\listfiles
+
+\documentclass{article}
+\usepackage{ifluatex}
+\ifluatex\else
+ \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][]{{%
+ \tabular{|>{\Centering}p{2.5cm}|}\hline
+ \strut\footnotesize\texttt{\textbackslash#2}\\\hline
+ \parbox[c][3.2cm]{2cm}{\EUCountry[#1]{#2}}\\\hline
+ \endtabular}}
+
+\makeatother
+
+\newcounter{N}
+
+\begin{document}
+\author{Rolf Niepraschk \and Herbert Voß}
+\title{Package \texttt{CountriesofEurope}}
+\maketitle
+
+
+\begin{sloppypar}
+This package defines the two macros \verb|\CountriesofEuropeFamily| and \verb|\EUCountry[options]{name}|,
+which allow to print one of the european countries as a single character with the given scaling or
+with an individual scaling.
+
+The first one switches
+to the font encoding \verb|U| (Type 1) or \verb|TU| (OpenType) and loads the font and the second
+one does the same but also with
+printing the character which the given name, e.\,g. for Finland: \verb|\EUCountry[Scale=0.2]{Germany}|$\rightarrow$%
+\EUCountry[Scale=0.2]{Germany}.
+\end{sloppypar}
+
+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
+\end{verbatim}
+
+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
+with the \verb|\char| primitive. The following table shows the countries in their original size
+with a scaling of 7.5:
+
+\begin{longtable}{cccc}
+\Country{Albania} &
+\Country{Andorra} &
+\Country{Austria} &
+\Country{Belarus} \\
+\Country{Belgium} &
+\Country{Bosnia} &
+\Country{Bulgaria} &
+\Country{Croatia} \\
+\Country{Czechia} &
+\Country{Denmark} &
+\Country{Estonia} &
+\Country{Finland} \\
+\Country{France} &
+\Country{Germany} &
+\Country{GreatBritain} &
+\Country{Greece} \\
+\Country{Hungary} &
+\Country{Iceland} &
+\Country{Ireland} &
+\Country{Italy} \\
+\Country{Latvia} &
+\Country{Liechtenstein} &
+\Country{Lithuania} &
+\Country{Luxembourg} \\
+\Country{Macedonia} &
+\Country{Malta} &
+\Country{Moldova} &
+\Country{Montenegro} \\
+\Country{Netherlands} &
+\Country{Norway} &
+\Country{Poland} &
+\Country{Portugal} \\
+\Country{Romania} &
+\Country{Serbia} &
+\Country{Slovakia} &
+\Country{Slovenia} \\
+\Country{Spain} &
+\Country{Sweden} &
+\Country{Switzerland}
+
+\end{longtable}
+
+\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}{}
+
+\medskip
+
+\begingroup
+\fboxsep=0pt
+\noindent%
+\ifluatex
+ \fontspec{CountriesofEurope.otf}
+ \huge
+ \setcounter{N}{63724}%
+ \whiledo{\value{N} > 63686}{%
+ \fbox{\symbol{\value{N}}}%
+ \addtocounter{N}{-1}}
+\else
+ \huge
+ \setcounter{N}{128}%
+ \whiledo{\value{N} < 167}{%
+ \fbox{\symbol{\value{N}}}%
+ \stepcounter{N}}
+\fi
+\endgroup
+
+
+\clearpage
+
+All countries can be printed as outline, e.\,g.:
+
+\verb|\EUCountry[Scale=37.5,outline]{Germany}|
+
+\EUCountry[Scale=5,outline]{Germany}
+
+
+
+
+\ifluatex
+ \fontspec{CountriesofEurope.otf}
+\else
+ \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
+\fi
+
+\begin{longtable}{cccc}
+\Country[outline]{Albania} &
+\Country[outline]{Andorra} &
+\Country[outline]{Austria} &
+\Country[outline]{Belarus} \\
+\Country[outline]{Belgium} &
+\Country[outline]{Bosnia} &
+\Country[outline]{Bulgaria} &
+\Country[outline]{Croatia} \\
+\Country[outline]{Czechia} &
+\Country[outline]{Denmark} &
+\Country[outline]{Estonia} &
+\Country[outline]{Finland} \\
+\Country[outline]{France} &
+\Country[outline]{Germany} &
+\Country[outline]{GreatBritain} &
+\Country[outline]{Greece} \\
+\Country[outline]{Hungary} &
+\Country[outline]{Iceland} &
+\Country[outline]{Ireland} &
+\Country[outline]{Italy} \\
+\Country[outline]{Latvia} &
+\Country[outline]{Liechtenstein} &
+\Country[outline]{Lithuania} &
+\Country[outline]{Luxembourg} \\
+\Country[outline]{Macedonia} &
+\Country[outline]{Malta} &
+\Country[outline]{Moldova} &
+\Country[outline]{Montenegro} \\
+\Country[outline]{Netherlands} &
+\Country[outline]{Norway} &
+\Country[outline]{Poland} &
+\Country[outline]{Portugal} \\
+\Country[outline]{Romania} &
+\Country[outline]{Serbia} &
+\Country[outline]{Slovakia} &
+\Country[outline]{Slovenia} \\
+\Country[outline]{Spain} &
+\Country[outline]{Sweden} &
+\Country[outline]{Switzerland}
+
+\end{longtable}
+
+
+\rmfamily
+
+The countries are internally defined as a ligature so that abreviations of the countries can be
+used for printing:
+
+\begin{verbatim}
+\CountriesofEuropeFamily
+ge au
+\end{verbatim}
+
+\ifluatex
+ \fontspec{CountriesofEurope.otf}
+\else
+ \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
+\fi
+\CountriesofEuropeFamily
+ge au
+
+
+
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/countriesofeurope/README b/Master/texmf-dist/doc/fonts/countriesofeurope/README
index eedca87f042..07739755f20 100644
--- a/Master/texmf-dist/doc/fonts/countriesofeurope/README
+++ b/Master/texmf-dist/doc/fonts/countriesofeurope/README
@@ -1,9 +1,10 @@
-Countries Of Europe as a Type 1 font
+Countries of Europe as a Type 1 or OpenType font
-The Type 1 version of this font is copyrighted by Ingo Zimemrmann
-and can be used under the Open Font License
+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.
-v0.21 2012-04-18 first CTAN version \ No newline at end of file
+v0.22 2018-12-27
+hvoss@tug.org \ No newline at end of file
diff --git a/Master/texmf-dist/dvips/countriesofeurope/config.CountriesOfEurope b/Master/texmf-dist/dvips/countriesofeurope/config.CountriesOfEurope
deleted file mode 100644
index 66d53d36644..00000000000
--- a/Master/texmf-dist/dvips/countriesofeurope/config.CountriesOfEurope
+++ /dev/null
@@ -1 +0,0 @@
-p +CountriesOfEurope.map
diff --git a/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesOfEurope.afm b/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
index 3abfac0b3be..6ffbab04eeb 100644
--- a/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesOfEurope.afm
+++ b/Master/texmf-dist/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
@@ -1,9 +1,9 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20090914
Comment Creation Date: Mon Apr 16 13:36:09 2012
-FontName CountriesOfEurope
-FullName Countries Of Europe
-FamilyName Countries Of Europe
+FontName CountriesofEurope
+FullName Countries of Europe
+FamilyName Countries of Europe
Weight Roman
Notice (Copyright (c) 2012 by Ingo Zimmermann. Font may be used under the OFL.)
ItalicAngle 0
diff --git a/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesOfEurope.enc b/Master/texmf-dist/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc
index 499c75f1e3d..799897b4aac 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 9ffba47a9c8..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..e8b38479e29
--- /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
new file mode 100644
index 00000000000..6e1013291e1
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesOfEurope.tfm b/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm
index 72226007b66..72226007b66 100644
--- a/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesOfEurope.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesOfEurope.pfb b/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesOfEurope.pfb
deleted file mode 100644
index 828e1f8f687..00000000000
--- a/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesOfEurope.pfb
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb b/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb
new file mode 100644
index 00000000000..b4d1942088c
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/countriesofeurope/CountriesOfEurope.sty b/Master/texmf-dist/tex/latex/countriesofeurope/CountriesOfEurope.sty
deleted file mode 100644
index cd332860433..00000000000
--- a/Master/texmf-dist/tex/latex/countriesofeurope/CountriesOfEurope.sty
+++ /dev/null
@@ -1,105 +0,0 @@
-%%
-%% CountriesOfEurope.sty
-%%
-%% COPYRIGHT 2012 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
-%% Herbert Voss, <hvoss@tug.org>.
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
-%%
-%% The Type 1 version of the font CountriesOfEurope is copyrighted by Ingo Zimmermann
-%% and can be used under the Open Font License
-%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{CountriesOfEurope}[2012/04/18 v0.21 CountriesOfEurope Font(RN,hv)]
-
-\RequirePackage{keyval}
-\def\CoE@scale{1}
-\define@key{CoE}{scaled}[10]{\def\CoE@scale{#1}}
-\def\ProcessOptionsWithKV#1{%
- \let\@tempc\relax
- \let\CoE@tempa\@empty
- \ifx\@classoptionslist\relax\else
- \@for\CurrentOption:=\@classoptionslist\do{%
- \@ifundefined{KV@#1@\CurrentOption}%
- {}%
- {%
- \edef\CoE@tempa{\CoE@tempa,\CurrentOption,}%
- \@expandtwoargs\@removeelement\CurrentOption
- \@unusedoptionlist\@unusedoptionlist
- }%
- }%
- \fi
- \edef\CoE@tempa{%
- \noexpand\setkeys{#1}{%
- \CoE@tempa\@ptionlist{\@currname.\@currext}%
- }%
- }%
- \CoE@tempa
- \let\CurrentOption\@empty
-}
-\ProcessOptionsWithKV{CoE}
-\AtEndOfPackage{\let\@unprocessedoptions\relax}
-
-\DeclareFontFamily{U}{CountriesOfEurope}{}
-\DeclareFontShape{U}{CountriesOfEurope}{m}{n}{ <-> s*[\CoE@scale] CountriesOfEurope}{}
-
-\providecommand\CountriesOfEuropeFamily{\usefont{U}{CountriesOfEurope}{m}{n}}
-\providecommand\EUCountry[1]{{\CountriesOfEuropeFamily\char#1}}
-
-\iffalse
-%80
- \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
- \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
-%90
- \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
- \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
-%A0
- \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
-\fi
-
-\DeclareTextCommand{\Albania}{U}{\char128}
-\DeclareTextCommand{\Andorra}{U}{\char129}
-\DeclareTextCommand{\Austria}{U}{\char130}
-\DeclareTextCommand{\Belarus}{U}{\char131}
-\DeclareTextCommand{\Belgium}{U}{\char132}
-\DeclareTextCommand{\Bosnia}{U}{\char133}
-\DeclareTextCommand{\Bulgaria}{U}{\char134}
-\DeclareTextCommand{\Croatia}{U}{\char135}
-\DeclareTextCommand{\Czechia}{U}{\char136}
-\DeclareTextCommand{\Denmark}{U}{\char137}
-\DeclareTextCommand{\Estonia}{U}{\char138}
-\DeclareTextCommand{\Finland}{U}{\char139}
-\DeclareTextCommand{\France}{U}{\char140}
-\DeclareTextCommand{\Germany}{U}{\char141}
-\DeclareTextCommand{\GreatBritain}{U}{\char142}
-\DeclareTextCommand{\Greece}{U}{\char143}
-\DeclareTextCommand{\Hungary}{U}{\char144}
-\DeclareTextCommand{\Iceland}{U}{\char145}
-\DeclareTextCommand{\Ireland}{U}{\char146}
-\DeclareTextCommand{\Italy}{U}{\char147}
-\DeclareTextCommand{\Latvia}{U}{\char148}
-\DeclareTextCommand{\Liechtenstein}{U}{\char149}
-\DeclareTextCommand{\Lithuania}{U}{\char150}
-\DeclareTextCommand{\Luxembourg}{U}{\char151}
-\DeclareTextCommand{\Macedonia}{U}{\char152}
-\DeclareTextCommand{\Malta}{U}{\char153}
-\DeclareTextCommand{\Moldova}{U}{\char154}
-\DeclareTextCommand{\Montenegro}{U}{\char155}
-\DeclareTextCommand{\Netherlands}{U}{\char156}
-\DeclareTextCommand{\Norway}{U}{\char157}
-\DeclareTextCommand{\Poland}{U}{\char158}
-\DeclareTextCommand{\Portugal}{U}{\char159}
-\DeclareTextCommand{\Romania}{U}{\char160}
-\DeclareTextCommand{\Serbia}{U}{\char161}
-\DeclareTextCommand{\Slovakia}{U}{\char162}
-\DeclareTextCommand{\Slovenia}{U}{\char163}
-\DeclareTextCommand{\Spain}{U}{\char164}
-\DeclareTextCommand{\Sweden}{U}{\char165}
-\DeclareTextCommand{\Switzerland}{U}{\char166}
-
-% otftotfm --encoding=CountriesOfEurope.enc --no-map CountriesOfEurope.otf CountriesOfEurope
-
-\endinput
-
diff --git a/Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty b/Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty
new file mode 100644
index 00000000000..4fd2039f0ff
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/countriesofeurope/CountriesofEurope.sty
@@ -0,0 +1,159 @@
+%% This is file `CountriesofEurope.sty',
+%%
+%% Copyright (C) 2016-
+%% Rolf Niepraschk, Herbert Voss
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{CountriesofEurope}%
+ [2018/12/27 v0.22 CountriesofEurope Font (hv,RN)]
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx}
+
+\newcommand*\CountriesofEurope@scale{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{Scale}{\renewcommand*\CountriesofEurope@scale{#1}}
+\ProcessOptionsX\relax
+
+\newif\ifCoE@outline
+
+\def\CoE@boolkey#1#2{\csname CoE@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
+
+\define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}}
+\define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}}
+%
+\def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x}
+
+\setCoEkeys{outline=false,Scale=1}
+
+\newif\if@CoE@newengine \@CoE@newenginefalse
+\ifxetex\@CoE@newenginetrue
+\else
+ \ifluatex\@CoE@newenginetrue\fi
+\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}
+\else
+ \def\set@Outline{\pdfliteral direct { 1 Tr 0 w }\relax}
+ \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
+ }}}
+
+\if@CoE@newengine
+ \RequirePackage{fontspec}
+ \newfontface\CountriesofEuropeFamily{CountriesofEurope.otf}[Scale=\CountriesofEurope@scale]
+ \let\CoEF\CountriesofEuropeFamily
+ \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724
+ \DeclareTextCommand{\Andorra}{TU}{\char"F8EB}
+ \DeclareTextCommand{\Austria}{TU}{\char"F8EA}
+ \DeclareTextCommand{\Belarus}{TU}{\char"F8E9}
+ \DeclareTextCommand{\Belgium}{TU}{\char"F8E8}
+ \DeclareTextCommand{\Bosnia}{TU}{\char"F8E7}
+ \DeclareTextCommand{\Bulgaria}{TU}{\char"F8E6}
+ \DeclareTextCommand{\Croatia}{TU}{\char"F8E5}
+ \DeclareTextCommand{\Czechia}{TU}{\char"F8E4}
+ \DeclareTextCommand{\Denmark}{TU}{\char"F8E3}
+ \DeclareTextCommand{\Estonia}{TU}{\char"F8E2}
+ \DeclareTextCommand{\Finland}{TU}{\char"F8E1}
+ \DeclareTextCommand{\France}{TU}{\char"F8E0}
+ \DeclareTextCommand{\Germany}{TU}{\char"F8DF}
+ \DeclareTextCommand{\GreatBritain}{TU}{\char"F8DE}
+ \DeclareTextCommand{\Greece}{TU}{\char"F8DD}
+ \DeclareTextCommand{\Hungary}{TU}{\char"F8DC}
+ \DeclareTextCommand{\Iceland}{TU}{\char"F8DB}
+ \DeclareTextCommand{\Ireland}{TU}{\char"F8DA}
+ \DeclareTextCommand{\Italy}{TU}{\char"F8D9}
+ \DeclareTextCommand{\Latvia}{TU}{\char"F8D8}
+ \DeclareTextCommand{\Liechtenstein}{TU}{\char"F8D7}
+ \DeclareTextCommand{\Lithuania}{TU}{\char"F8D6}
+ \DeclareTextCommand{\Luxembourg}{TU}{\char"F8D5}
+ \DeclareTextCommand{\Macedonia}{TU}{\char"F8D4}
+ \DeclareTextCommand{\Malta}{TU}{\char"F8D3}
+ \DeclareTextCommand{\Moldova}{TU}{\char"F8D2}
+ \DeclareTextCommand{\Montenegro}{TU}{\char"F8D1}
+ \DeclareTextCommand{\Netherlands}{TU}{\char"F8D0}
+ \DeclareTextCommand{\Norway}{TU}{\char"F8CF}
+ \DeclareTextCommand{\Poland}{TU}{\char"F8CE}
+ \DeclareTextCommand{\Portugal}{TU}{\char"F8CD}
+ \DeclareTextCommand{\Romania}{TU}{\char"F8CC}
+ \DeclareTextCommand{\Serbia}{TU}{\char"F8CB}
+ \DeclareTextCommand{\Slovakia}{TU}{\char"F8CA}
+ \DeclareTextCommand{\Slovenia}{TU}{\char"F8C9}
+ \DeclareTextCommand{\Spain}{TU}{\char"F8C8}
+ \DeclareTextCommand{\Sweden}{TU}{\char"F8C7}
+ \DeclareTextCommand{\Switzerland}{TU}{\char"F8C6}% 63686
+\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}}
+ \DeclareTextCommand{\Albania}{U}{\char128}
+ \DeclareTextCommand{\Andorra}{U}{\char129}
+ \DeclareTextCommand{\Austria}{U}{\char130}
+ \DeclareTextCommand{\Belarus}{U}{\char131}
+ \DeclareTextCommand{\Belgium}{U}{\char132}
+ \DeclareTextCommand{\Bosnia}{U}{\char133}
+ \DeclareTextCommand{\Bulgaria}{U}{\char134}
+ \DeclareTextCommand{\Croatia}{U}{\char135}
+ \DeclareTextCommand{\Czechia}{U}{\char136}
+ \DeclareTextCommand{\Denmark}{U}{\char137}
+ \DeclareTextCommand{\Estonia}{U}{\char138}
+ \DeclareTextCommand{\Finland}{U}{\char139}
+ \DeclareTextCommand{\France}{U}{\char140}
+ \DeclareTextCommand{\Germany}{U}{\char141}
+ \DeclareTextCommand{\GreatBritain}{U}{\char142}
+ \DeclareTextCommand{\Greece}{U}{\char143}
+ \DeclareTextCommand{\Hungary}{U}{\char144}
+ \DeclareTextCommand{\Iceland}{U}{\char145}
+ \DeclareTextCommand{\Ireland}{U}{\char146}
+ \DeclareTextCommand{\Italy}{U}{\char147}
+ \DeclareTextCommand{\Latvia}{U}{\char148}
+ \DeclareTextCommand{\Liechtenstein}{U}{\char149}
+ \DeclareTextCommand{\Lithuania}{U}{\char150}
+ \DeclareTextCommand{\Luxembourg}{U}{\char151}
+ \DeclareTextCommand{\Macedonia}{U}{\char152}
+ \DeclareTextCommand{\Malta}{U}{\char153}
+ \DeclareTextCommand{\Moldova}{U}{\char154}
+ \DeclareTextCommand{\Montenegro}{U}{\char155}
+ \DeclareTextCommand{\Netherlands}{U}{\char156}
+ \DeclareTextCommand{\Norway}{U}{\char157}
+ \DeclareTextCommand{\Poland}{U}{\char158}
+ \DeclareTextCommand{\Portugal}{U}{\char159}
+ \DeclareTextCommand{\Romania}{U}{\char160}
+ \DeclareTextCommand{\Serbia}{U}{\char161}
+ \DeclareTextCommand{\Slovakia}{U}{\char162}
+ \DeclareTextCommand{\Slovenia}{U}{\char163}
+ \DeclareTextCommand{\Spain}{U}{\char164}
+ \DeclareTextCommand{\Sweden}{U}{\char165}
+ \DeclareTextCommand{\Switzerland}{U}{\char166}
+\fi
+% otftotfm --encoding=CountriesofEurope.enc --no-map CountriesofEurope.otf CountriesofEurope
+
+\endinput
+
+
+%80
+ \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
+ \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
+%90
+ \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
+ \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
+%A0
+ \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a36aab3156f..8f767475d4f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -325,6 +325,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'correctmathalign', "&MAKEflatten",
'corridx', "die 'skipping, Pascal source'",
'count1to', "die 'skipping, use ms'",
+ 'countriesofeurope', "&MAKEflatten",
'courier', "die 'skipping, nonfree IBM Courier font'",
'cpssp', "die 'skipping, requires python'",
'create-struktex', "die 'sorry, investigate self-locating?'",