CTAN sync 202104300302

2 files changed, 223 insertions, 162 deletions

diff --git a/graphics/pgf/contrib/worldflags/doc/worldflags.pdf b/graphics/pgf/contrib/worldflags/doc/worldflags.pdf
index 25fdd477fd..6491316c73 100644
--- a/graphics/pgf/contrib/worldflags/doc/worldflags.pdf
+++ b/graphics/pgf/contrib/worldflags/doc/worldflags.pdf
diff --git a/graphics/pgf/contrib/worldflags/doc/worldflags.tex b/graphics/pgf/contrib/worldflags/doc/worldflags.tex
index e4865716c5..e80d633df4 100644
--- a/graphics/pgf/contrib/worldflags/doc/worldflags.tex
+++ b/graphics/pgf/contrib/worldflags/doc/worldflags.tex
@@ -1,5 +1,5 @@
 % =============================================================================
-% Flags of the world with TikZ                       Wilhelm Haager, 2021-04-25
+% Flags of the world with TikZ                       Wilhelm Haager, 2021-04-30
 % =============================================================================
 \documentclass[11pt,a4paper,headsepline]{scrreprt}
 \usepackage[T1]{fontenc}
@@ -112,8 +112,7 @@
 \author{\slshape Wilhelm Haager\\\slshape wilhelm.haager@htlstp.ac.at}
 \vfill
 \vfill
-%\date{Version 1.0\\\today}
-\date{\today}
+\date{2021-04-30}
 \vfill
 \maketitle
 
@@ -135,8 +134,8 @@ A particular flag is selected via a parameter; for national flags that is the
 two-letter country code (i.\,e. the domain name).
 A flag can be drawn in two ways:
 \begin{itemize}
-\item As a single TikZ-picture within ordinary text.
-\item As a picture element \emph{within} a TikZ-picture.
+\item as a single TikZ-picture within ordinary text
+\item as a picture element \emph{within} a TikZ-picture
 \end{itemize}
 
 The appearance of a flag (size, frame etc.) can be adapted using
@@ -333,7 +332,7 @@ Those emblems are often very complex and require a lot of computing time and
 memory.
 The depiction of such an emblem can be supressed with the option
 \command{noemblem}, either for the sake of saving computing time
-(for dafts) or just because simplified version of the flag is required.
+(for drafts) or just because simplified version of the flag is required.
 Some countries distinguish between a \emph{civil} flag without an emblem
 and a \emph{state} flag containing an emblem.
 
@@ -376,7 +375,7 @@ the emblem in the Croatian flag is depicted default.
 
 Within a Tikz-picture the flags are available as \emph{pic}-Elements
 named \command{worldflag}.
-A particular flag is selectet with the option \command{country}.
+A particular flag is selected with the option \command{country}.
 Unlike \emph{nodes}, \emph{pic}-elements cannot be referenced by name,
 but named nodes and coordinates within the \emph{pic}-element can be referenced.
 Hence every flag has special coordinates for referencing:
@@ -454,6 +453,7 @@ The following example illustrates the usage of the special coordinates:
 %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 \codebox{0.63}{%
    \tb begin{tikzpicture}[draw=cyan,>=stealth,x=1mm,y=1mm]\\
+   \tb pic (de) [country=DE,emblem] \{worldflag\};\\
    \tb draw (de-e){-}-++(45:5) node [above right,cyan] \{fly\};\\
    \tb draw (de-w)--++(45:14)\\\mbox{}~~~~~~node [above right,cyan] \{hoist\};\\
    \tb draw (de-0)--++(45:14)\\\mbox{}~~~~~~node [above right,cyan] \{coat of arms\};\\
@@ -583,26 +583,28 @@ No configuraion files, no other actions; that's it.
 Every flag description file has the following structure:
 
 {\color{emphcolor}\small
-\tt{\tb BeginFlagDescription\{}\ti{y}\tt{\}\{}\ti{x}\tt{\}}~~~{\normalsize\color{black}\ding{192}}\\
+\tt{\tb begin\{flagdescription\}\{$\xi$\}}~~~{\normalsize\color{black}\ding{192}}\\
 \tt{\tb definecolor\{red\}\{RGB\}\{}\ti{r}\tt{,}\ti{g}\tt{,}\ti{b}\tt{\}}~~~{\normalsize\color{black}\ding{193}}\\
 \tt{\tb definecolor\{gold\}\{RGB\}\{}\ti{r}\tt{,}\ti{g}\tt{,}\ti{b}\tt{\}}\\
 \xx9\makebox[0pt]{$\vdots$}\\
 \xx9{\makebox[0pt]{\normalsize\color{black}\ding{194}}}\\
 \xx9\makebox[0pt]{$\vdots$}\\
-\tt{\tb FrameCode}~~~{\normalsize\color{black}\ding{195}}\\
-\tt{\tb EndFlagDescription}~~~{\normalsize\color{black}\ding{196}}\\
+\tt{\tb framecode}~~~{\normalsize\color{black}\ding{195}}\\
+\tt{\tb end\{flagdescription\}}~~~{\normalsize\color{black}\ding{196}}\\
 }
 
 \begin{itemize}
 \item[\ding{192}]
-This command calculates the flag length,
-which will be stored in the dimension register \command{\tb flaglength}, from
-the flag width, which is stored in the dimension register \command{\tb flagwidth}
-(or vice versa) using the proper aspect ratio of the flag.
-That aspect ratio has to be specified with the two parameters
-{\color{emphcolor}\ti{y}} (width) and {\color{emphcolor}\ti{x}} (length).
-Those parameters have to be interger numbers,
-their absolute values don't matter.
+All commands describing the geometry of a flag have to be within
+the environment \command{flagdescription}.
+This environmant requires a parameter
+\emph{\color{emphcolor}$\xi$}, which specifies the proper aspect ratio
+\emph{width/length} of a flag.
+Using that parameter, the flag length is calculatend from the flag width
+(or vice versa).
+As \command{$\xi$} is further processed using \tt{\tb pgfmathparse},
+is can be specified as a floating point number or as a ratio of two
+(preferably integer) numbers.
 
 Furthermore, two nested scopes are opened:
 The outer scope sets the drawing unit to \command{\tb flagwidth}
@@ -636,19 +638,19 @@ For non-rectangular flags (e.\,g. Nepal) the flag frame has to be programmed
 ``manually''.
 
 \item[\ding{196}]
-This command draws a millimeter-grid onto the flag, if invoked with the option
-\command{grid} and closes the two previously opened scopes.
+At the end of the environment a millimeter-grid is drawn onto the flag, if invoked with the option
+\command{grid} and the two previously opened scopes are closed again.
 \end{itemize}
 
 \section{Variables}
 % -----------------
 
-A couple of properties of a flag are kept in variables,
-which are either dimension registers or macros.
-Those variables are set by the user, specifying options or are calculated
+The properties of a flag are kept in variables,
+which are dimension registers or macros.
+Those variables are either set by the user via specifying options or are calculated
 internally.
-They are used in the code for the flag description,
-but need not be set directly.
+Most of those variables are used internally, only the following few variables
+are used in the code for the flag description:
 
  % +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 \wideframe{
@@ -660,92 +662,74 @@ width of the flag (vertical extent)\\[\medskipamount]
 {\m\color{emphcolor}\texttt{\tb flaglength}}
 &
 length of the flag (horizontal extent)\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb flagframe}}
-&
-line width of the flag frame\\[\medskipamount]
 \end{tabularx}
 
 \bigskip
 \begin{tabularx}{\textwidth}{@{}>{\RaggedRight}p{\colwidth}X@{}}
-\textsl{Macros:}\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb framecolor}}
-&
-color name of the flag frame\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb viewangle}}
-&
-angle of the rotation around the flagpole\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb hangangle}}
-&
-angle of the ``hanging down'' from the flagpole\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb flagstretch}}
+\textsl{Macro:}\\[\medskipamount]
+{\m\color{emphcolor}\texttt{\tb stretchfactor}}
 &
-conrols stretching of certain geometries, when stretching the entire flag\\[\medskipamount]
-{\m\color{emphcolor}\texttt{\tb StretchFactor}}
-&
-factor for stretching of certain geometries according to \tt{\tb flagstretch}\\[\medskipamount]
+factor for stretching of certain geometries\\[\medskipamount]
 \end{tabularx}}
 % +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 \command{\tb flagwidth} and \command{\tb flaglength} specify the width and
 length of a flag.
 They are set by the user with the options \command{width} and \command{length}
-or are calculaterd from each other by \command{\tb AspectRatio} internally.
+or are calculaterd from each other at the begin of the environment
+\command{flagdescription} internally.
 \command{\tb flagwidth} is the unit for coordinates and lengths
 in the flag description.
 
-The properties of the flag frame are kept in the variables
-\command{\tb flagframe} and \command{\tb framecolor};
-they can be set with the options
-\command{framewidth} and \command{framecolor}.
-
-\command{\tb StretchFactor} is a factor for stretching certain \ti{x}-coordinates,
+\command{\tb stretchfactor} is a factor for stretching certain \ti{x}-coordinates,
 when the whole flag is stretched (or compressed),
 i.\,e. when the aspect ratio differs from its proper value.
-It is calculated by \command{\tb AspectRatio}
-from the variable \command{\tb flagstretch},
-which itself is user-specified with the Option \command{stretch}.
+It is calculated from the user option \command{stretch} and can be used in
+the flag description.
 
 \section{Commands}\label{SEC_MACROS}
 % ----------------------------------
 
+A couple of commands for common geometric elements on flags facilitate
+the flag description.
+To avoid accidental name clashes with other packages,
+the visibility of those commands is confined to the environment
+\command{flagdescription}.
+
+
  % +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 \wideframe{
 \begin{tabularx}{\textwidth}{@{}>{\RaggedRight}p{\colwidth}>{\RaggedRight}X@{}}
-{\m\color{emphcolor}\tt{\tb BeginFlagDescription\{}\ti{y}\tt{\}\{}\ti{x}\tt{\}}}
-&
-\qquad\qquad see section \ref{SEC_FLAG_DESCRIPTION}\\[\medskipamount]
-{\m\color{emphcolor}\tt{\tb EndFlagDescription}}
-&
-see section \ref{SEC_FLAG_DESCRIPTION}\\[\medskipamount]
-{\m\color{emphcolor}\tt{\tb AspectRatio\{}\ti{y}\tt{\}\{}\ti{x}\tt{\}}}
-&
-calculates the dimensions of the flag and the\newline variable \tt{\tb StretchFactor}; called by \tt{\tb BeginFlagDescription}.\\[\medskipamount]
-{\m\color{emphcolor}\tt{\tb FrameCode}}
+{\m\color{emphcolor}\tt{\tb begin\{flagdescription\}\{}\ti{y}\tt{\}\{}\ti{x}\tt{\}}}
 &
-draws the rectangular frame around the flag.\\[\medskipamount]
-{\m\color{emphcolor}\tt{\tb GridCode}}
+\\
+\qquad $\vdots$ & \\
+{\m\color{emphcolor}\tt{\tb end\{flagdescription\}}}
 &
-draws a millimeter-grid onto the flag; called by \tt{\tb EndFlagDescription}.\\[\medskipamount]
+environment for the flag description\\[\medskipamount]
 \end{tabularx}
 
 \bigskip
 \begin{tabularx}{\textwidth}{@{}>{\RaggedRight}p{\colwidth}X@{}}
 \textsl{Geometric flag elements:}
 \\[\medskipamount] % --------------------------
+{\m\color{emphcolor}\tt{\tb framecode}}
+&draws the rectangular frame around the flag.
+\\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb hstripesII\{}{$c_1$}\tt{\}\{}{$c_2$}\tt{\}}}
 & partitions the flag into two horizontal stripes with the colors $c_1$ and $c_2$.
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb hstripesIII\{}{$c_1$}\tt{\}\{}{$c_2$}\tt{\}\{}{$c_3$}\tt{\}}}
-& three horizontal stripes with the colors $c_1$, \dots
+& three horizontal stripes with the colors $c_1$, \dots\ $c_3$
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb hstripesIV\{}{$c_1$}\tt{\}\{}{$c_2$}\tt{\}\{}{$c_3$}\tt{\}\{}{$c_4$}\tt{\}}}
-& \qquad four horizontal stripes with the colors $c_1$, \dots
+& \qquad four horizontal stripes with the colors $c_1$, \dots\ $c_4$
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb vstripesII\{}{$c_1$}\tt{\}\{}{$C_2$}\tt{\}}}
 & partitions the flag into two vertical stripes with the colors $c_1$ and $c_2$.
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb vstripesIII\{}{$c_1$}\tt{\}\{}{$c_2$}\tt{\}\{}{$c_3$}\tt{\}}}
-& three vertical stripes with the colors $c_1$, \dots
+& three vertical stripes with the colors $c_1$, \dots\ $c_3$
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb hbar\{}{$c$}\tt{\}\{}{$y$}\tt{\}\{}{$w$}\tt{\}}}
 & horizontal bar with the color $c$ and the line width $w$ at the \ti{y}-coordinate $y$
@@ -763,86 +747,95 @@ draws a millimeter-grid onto the flag; called by \tt{\tb EndFlagDescription}.\\[
 & 6-pointed star as a compex polygon with the fill color $c$, an outer raduis $r$, an angle $\alpha$ at the coordinate $p$
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb starn\{}{$c$}\tt{\}\{}{$n$}\tt{\}\{}{$p$}\tt{\}\{}{$r_1$}\tt{\}\{}{$r_2$}\tt{\}\{}{$\alpha$}\tt{\}}}
-& \qquad n-pointed star with the fill color $c$, an outer raduis $r_a$, an inner raduis $r_i$ and an angle $\alpha$ at the coordinate $p$
+& \qquad n-pointed star with the fill color $c$, an outer raduis $r_1$, an inner raduis $r_2$ and an angle $\alpha$ at the coordinate $p$
 \\[\medskipamount] % --------------------------
 {\m\color{emphcolor}\tt{\tb moon\{}{$c$}\tt{\}\{}{$p_1$}\tt{\}\{}{$r_1$}\tt{\}\{}{$p_2$}\tt{\}\{}{$r_2$}\tt{\}}}
 & crescent moon with the fill color $c$, as a difference set of two generating circles with the radii $r_1$, $r_2$, and center coordinates $p_1$ and $p_2$
 \\[\medskipamount] % --------------------------
-{\m\color{emphcolor}\tt{\tb UnionJack\{}{$x_1$}\tt{\}\{}{$y_1$}\tt{\}\{}{$x_2$}\tt{\}\{}{$y_2$}\tt{\}}}
+{\m\color{emphcolor}\tt{\tb unionjack\{}{$x_1$}\tt{\}\{}{$y_1$}\tt{\}\{}{$x_2$}\tt{\}\{}{$y_2$}\tt{\}}}
 & \qquad Union Jack between the coordinates $(x_1,y_1)$ and $(x_2,y_2)$
 \\[\medskipamount] % --------------------------
 \end{tabularx}}
 % +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+\medskip
 The macros
 \command{\tb hstripesII}, \command{\tb hstripesIII}, \command{\tb hstripesIV},
 \command{\tb vstripesII}, \command{\tb vstripesIII} partition the flag into an
 according number of horizontal or vertical colored stripes.
+
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ \codebox{0.65}{%
+ \tb begin\{tikzpicture\}
+  \tb begin\{flagdescription\}\{3/4\}        \\
+  \xx3\tb hstripesIII\{cyan\}\{white\}\{red\}\\
+  \tb end\{flagdescription\}
+  \tb end\{tikzpicture\}                     \\
+  \tb quad                                   \\
+  \tb begin\{tikzpicture\}
+  \tb begin\{flagdescription\}\{3/4\}        \\
+  \xx3\tb vstripesIII\{cyan\}\{white\}\{red\}\\
+   \tb end\{flagdescription\}
+      \tb end\{tikzpicture\}                 \\
+    }\hfill
+\resultbox{0.34}{%
+  \begin{tikzpicture}
+  \begin{flagdescription}{3/4}
+    \hstripesIII{cyan}{white}{red}
+  \end{flagdescription}
+  \end{tikzpicture}
+  \quad
+  \begin{tikzpicture}
+  \begin{flagdescription}{3/4}
+    \vstripesIII{cyan}{white}{red}
+   \end{flagdescription}
+   \end{tikzpicture}
+}
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\command{\tb background} fills the entire rectangular area of the flag with
+color; note: a flag needs neither a frame around it nor a background on principle.
 \command{\tb hbar} draws a horizontal bar of given width and color
 at a specified \ti{y}-coordinate across the flag;
 \command{\tb vbar} does the same vertically.
 \command{\tb chevron} draws an isosceles triangle with a given height over
 the hoist.
-Those macros need to know the variables \command{\tb flagwidth} and
-\command{\tb flaglength} which have to be defined, if called
-outside a flag description file:
 
-%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-\codebox{0.65}{%
-   \tb newdimen\tb flagwidth\tb flagwidth=15mm \\
-   \tb newdimen\tb flaglength\tb flaglength=20mm\\\\
-   \tb begin\{tikzpicture\}[x=\tb flagwidth,y=\tb flagwidth]\\
-   \tb begin\{scope\}\tb hstripesIII\{cyan\}\{white\}\{red\} \\
-   \xx3\tb FrameCode\tb end\{scope\}\\
-   \tb begin\{scope\}[shift={(1.5,0)}]\\
-   \xx3\tb vstripesIII\{cyan\}\{white\}\{red\} \\
-   \xx3\tb FrameCode\tb end\{scope\}\\
-   \tb begin\{scope\}[shift=\{(0,-1.2)\}]\\
-   \xx3\tb hbar\{cyan\}\{0.5\}\{1\}\\
-   \xx3\tb hbar\{white\}\{0.5\}\{0.3\}\\
-   \xx3\tb vbar\{white\}\{0.5\}\{0.3\}\\
-   \xx3\tb FrameCode\tb end\{scope\}\\
-   \tb begin\{scope\}[shift={(1.5,-1.2)}]\\
-   \xx3\tb chevron\{cyan\}\{1\}\tb FrameCode\tb end\{scope\}
+ %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ \codebox{0.65}{%
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{3/4\} \\
+   \xx3\tb background\{cyan\}              \\
+   \xx3\tb hbar\{white\}\{0.5\}\{0.3\}     \\
+   \xx3\tb vbar\{white\}\{0.5\}\{0.3\}     \\
+   \tb end\{flagdescription\}
+   \tb end\{tikzpicture\}              \\
+   \tb quad                            \\
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{3/4\}
+   \xx3\tb chevron\{cyan\}\{1\}            \\
+   \xx3\tb framecode                       \\
+   \tb end\{flagdescription\}
    \tb end\{tikzpicture\}
-   }\hfill
+    }\hfill
 \resultbox{0.34}{%
-   \newdimen\flagwidth\flagwidth=15mm
-   \newdimen\flaglength\flaglength=20mm
-   \begin{tikzpicture}[x=\flagwidth,y=\flagwidth]
-   \begin{scope}
-     \hstripesIII{cyan}{white}{red}
-     \FrameCode
-   \end{scope}
-   \begin{scope}[shift={(1.5,0)}]
-     \vstripesIII{cyan}{white}{red}
-    % \FrameCode
-   \end{scope}
-   \begin{scope}[shift={(0,-1.2)}]
-     \hbar{cyan}{0.5}{1}
-     \hbar{white}{0.5}{0.3}
-     \vbar{white}{0.5}{0.3}
-     \FrameCode
-   \end{scope}
-   \begin{scope}[shift={(1.5,-1.2)}]
-     \chevron{cyan}{1}
-     \FrameCode
-   \end{scope}
-%   \begin{scope}[shift={(0,-2.4)}]
-%     \colorlet{blue}{cyan}
-%     \UnionJack{0mm}{0.5\flagwidth}{0.8\flaglength}{\flagwidth}
-%     \FrameCode
-%   \end{scope}
+   \begin{tikzpicture}
+   \begin{flagdescription}{3/4}
+   \background{cyan}
+   \hbar{white}{0.5}{0.3}
+   \vbar{white}{0.5}{0.3}
+   \end{flagdescription}
+   \end{tikzpicture}
+   \quad
+   \begin{tikzpicture}
+   \begin{flagdescription}{3/4}
+   \chevron{cyan}{1}
+   \framecode
+   \end{flagdescription}
    \end{tikzpicture}
 }
 %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Note: A flag needs no background.
-
-The following commands don't require the variables
-\command{\tb flagwidth} and \command{\tb flaglength};
-they can be used arbitrarily outside a flag, anywhere in a TikZ-picture.
-
 \command{\tb Union Jack} draws the Union Jack
 (which is part of a couple of flags)
 between a lower left and an upper right point.
@@ -852,6 +845,41 @@ parameters, which \emph{must} be specified as dimensions
 The colors \command{blue}, \command{red} and \command{white}
 can be redefined arbitrarily.
 
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+\codebox{0.65}{%
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{3/4\}  \\
+   \tb unionjack\{0mm\}\{0mm\}\{\tb flaglength\}\{\tb flagwidth\} \\
+   \tb end\{flagdescription\}
+   \tb end\{tikzpicture\} \\
+   \tb quad                \\
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{3/4\} \\
+   \tb colorlet\{blue\}\{black\}  \\
+   \tb definecolor\{red\}\{rgb\}\{0.9,0.6,0\} \\
+   \tb unionjack\{0mm\}\{5mm\}\{10mm\}\{\tb flagwidth\}\\
+   \tb framecode\\
+   \tb end\{flagdescription\}
+   \tb end\{tikzpicture\}  \\
+   }
+\resultbox{0.34}{%
+   \begin{tikzpicture}
+   \begin{flagdescription}{3/4}
+   \unionjack{0mm}{0mm}{\flaglength}{\flagwidth}
+   \end{flagdescription}
+   \end{tikzpicture}
+   \quad
+   \begin{tikzpicture}
+   \begin{flagdescription}{3/4}
+   \colorlet{blue}{black}
+   \definecolor{red}{rgb}{0.9,0.6,0}
+   \unionjack{0mm}{5mm}{10mm}{\flagwidth}
+   \framecode
+   \end{flagdescription}
+   \end{tikzpicture}
+}
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 The various types of stars \command{\tb starV} \command{\tb starVI}
 \command{\tb starn} and \command{\tb moon} are self-explanatory.
 In the following example \tt{\tb starn} and \tt{\tb moon}
@@ -859,48 +887,57 @@ are overlayed with the generating circles.
 
 %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 \codebox{0.65}{%
-   \tb begin\{tikzpicture\}[x=1mm,y=1mm]\\
-   \tb UnionJack\{0mm\}\{0mm\}\{30mm\}\{15mm\}\\
-   \tb colorlet\{blue\}\{cyan\}           \\
-   \tb definecolor\{red\}\{rgb\}\{0.8,0,0\} \\
-   \tb UnionJack\{32mm\}\{0mm\}\{47mm\}\{15mm\}\\
-   \tb begin\{scope\}[shift=\{(12,-28)\}]\\
-   \xx3\tb starV\{cyan\}\{(0,17)\}\{6\}\{0\}\\
-   \xx3\tb starVI\{cyan\}\{(22,17)\}\{6\}\{0\}\\
-   \xx3\tb starn\{cyan\}\{9\}\{(22,0)\}\{8\}\{3\}\{0\}\\
-   \xx3\tb draw[gray] (22,0)circle(8) (22,0)circle(3);\\
-   \xx3\tb moon\{cyan\}\{(0,0)\}\{8\}\{(4,2)\}\{7\}\\
-   \xx3\tb draw[gray] (0,0)circle(8) (4,2)circle(7);\\
-   \tb end\{scope\}\\
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{1/3\}\\
+   \xx3\tb background\{cyan\}\\
+     \xx3\tb starV\{white\}\{(1,0.5)\}\{0.3\}\{0\}\\
+     \xx3\tb starVI\{white\}\{(2,0.5)\}\{0.3\}\{0\}\\
+%    \xx3\tb framecode\\
+   \tb end\{flagdescription\}
+   \tb end\{tikzpicture\}\\
+   \tb par\tb medskip\\
+   \tb begin\{tikzpicture\}
+   \tb begin\{flagdescription\}\{1/3\}\\
+     \xx3\tb background\{cyan\}\\
+     \xx3\tb starn\{white\}\{9\}\{(2,0.5)\}\{0.4\}\{0.15\}\{0\} \\
+     \xx3\tb draw (2,0.5)circle(0.4) (2,0.5)circle(0.15); \\
+     \xx3\tb moon\{white\}\{(1,0.45)\}\{0.4\}\{(1.1,0.6)\}\{0.36\}\\
+     \xx3\tb draw (1,0.45)circle(0.4) (1.1,0.6)circle(0.36);\\
+%    \xx3\tb framecode\\
+   \tb end\{flagdescription\}
    \tb end\{tikzpicture\}
-   }\hfill
+   }
 \resultbox{0.34}{%
-   \begin{tikzpicture}[x=1mm,y=1mm]
-   \UnionJack{0mm}{0mm}{30mm}{15mm}
-   \colorlet{blue}{cyan}
-   \definecolor{red}{rgb}{0.8,0,0}
-   \UnionJack{32mm}{0mm}{47mm}{15mm}
-   \begin{scope}[shift={(12,-28)}]
-   \starV{cyan}{(0,17)}{6}{0}
-   \starVI{cyan}{(22,17)}{6}{0}
-   \starn{cyan}{9}{(22,0)}{8}{3}{0}
-   \draw[gray] (22,0)circle(8) (22,0)circle(3);
-   \moon{cyan}{(0,0)}{8}{(4,2)}{7}
-   \draw[gray] (0,0)circle(8) (4,2)circle(7);
-   \end{scope}
+   \begin{tikzpicture}
+   \begin{flagdescription}{1/3}
+     \background{cyan}
+     \starV{white}{(1,0.5)}{0.3}{0}
+     \starVI{white}{(2,0.5)}{0.3}{0}
+%     \framecode
+   \end{flagdescription}
+   \end{tikzpicture}
+   \par\medskip
+   \begin{tikzpicture}
+   \begin{flagdescription}{1/3}
+     \background{cyan}
+     \starn{white}{9}{(2,0.5)}{0.4}{0.15}{0}
+     \draw (2,0.5)circle(0.4) (2,0.5) circle(0.15);
+     \moon{white}{(1,0.45)}{0.4}{(1.1,0.6)}{0.36}
+     \draw (1,0.45)circle(0.4) (1.1,0.6)circle(0.36);
+%     \framecode
+   \end{flagdescription}
    \end{tikzpicture}
 }
 %~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
 % --------------------------------------------------------------------------
 \chapter{Flags}\label{FLAGS}
 % --------------------------------------------------------------------------
 
-\section{Country Flags}
-% ------------------------
+\section{National Flags of sovereign states}
+% ------------------------------------------
 
-\flagsdefault[width=18mm,length=30mm,stretch=1]
+\flagsdefault[width=18mm,length=30mm,stretch=0.5]
 
 \show{Afghanistan}{AF}
 \show{Albania}{AL}
@@ -944,7 +981,6 @@ are overlayed with the generating circles.
 \show{Congo, Republic}{CG}
 \show{Cook Islands}{CK}
 \show{Costa Rica}{CR}
-\show{Cote d'Ivoire}{CI}
 \show{Croatia}{HR}
 \show{Cuba}{CU}
 \show{Cyprus}{CY}
@@ -953,6 +989,7 @@ are overlayed with the generating circles.
 \show{Djibouti}{DJ}
 \show{Dominica}{DM}
 \show{Dominican Republic}{DO}
+\show{East Timor}{TL}
 \show{Ecuador}{EC}
 \show{Egypt}{EG}
 \show{EL Salvador}{SV}
@@ -969,7 +1006,6 @@ are overlayed with the generating circles.
 \show{Georgia}{GE}
 \show{Germany}{DE}
 \show{Ghana}{GH}
-\show{Great Britain}{GB}
 \show{Greece}{GR}
 \show{Grenada}{GD}
 \show{Guatemala}{GT}
@@ -987,12 +1023,15 @@ are overlayed with the generating circles.
 \show{Ireland}{IE}
 \show{Israel}{IL}
 \show{Italy}{IT}
+\show{Ivory Coast}{CI}
 \show{Jamaica}{JM}
 \show{Japan}{JP}
 \show{Jordan}{JO}
 \show{Kazakhstan}{KZ}
 \show{Kenya}{KE}
 \show{Kiribati}{KI}
+\show{Korea, North}{KP}
+\show{Korea, South}{KR}
 \show{Kosovo}{KO}
 \show{Kuwait}{KW}
 \show{Kyrgystan}{KG}
@@ -1030,19 +1069,19 @@ are overlayed with the generating circles.
 \show{Nicaragua}{NI}
 \show{Niger}{NE}
 \show{Nigeria}{NG}
-\show{North Korea}{KP}
 \show{North Macedonia}{MK}
 \show{Norway}{NO}
 \show{Oman}{OM}
 \show{Pakistan}{PK}
 \show{Palau}{PW}
+\show{Palestine}{PS}
 \show{Panama}{PA}
 \show{Papua New Guinea}{PG}
 \show{Paraguay}{PY}
 \show{Peru}{PE}
 \show{Philippines}{PH}
 \show{Poland}{PL}
-\show{Portugal}{PT}
+\show{Portugal}{pt}
 \show{Quatar}{QA}
 \show{Romania}{RO}
 \show{Russia}{RU}
@@ -1064,7 +1103,6 @@ are overlayed with the generating circles.
 \show{Solomon Islands}{SB}
 \show{Somalia}{SO}
 \show{South Africa}{ZA}
-\show{South Korea}{KR}
 \show{South Sudan}{SS}
 \show{Spain}{ES}
 \show{Sri Lanka}{LK}
@@ -1077,7 +1115,6 @@ are overlayed with the generating circles.
 \show{Tajikistan}{TJ}
 \show{Tanzania}{TZ}
 \show{Thailand}{TH}
-\show{Timor-Leste}{TL}
 \show{Togo}{TG}
 \show{Tonga}{TO}
 \show{Trinidad \& Tobago}{TT}
@@ -1088,27 +1125,45 @@ are overlayed with the generating circles.
 \show{Uganda}{UG}
 \show{Ukraine}{UA}
 \show{United Arab Emirates}{AE}
+\show{United Kingdom}{GB}
 \show{United States}{US}
 \show{Uruguay}{UY}
 \show{Uzbekistan}{UZ}
 \show{Vanuatu}{VU}
 \show{Vatican}{VA}
 \show{Venezuela}{VE}
-\show{Viet Nam}{VN}
+\show{Vietnam}{VN}
 \show{Yemen}{YE}
 \show{Zambia}{ZM}
 \show{Zimbabwe}{ZW}
 
+\section{Flags of other countries and territories}
+% ------------------------------------------------
+
+\zaehler0
+\show{Abkhazia}{Abkhazia}
+\show{Antarctica}{AQ}
+\show{Artsakh}{Artsakh}
+\show{French Guiana}{GF}
+\show{Greenland}{GL}
+\show{Niue}{NU}
+\show{Somaliland}{Somaliland}
+\show{Transnistria}{Transnistria}
+\show{Western Sahara}{EH}
+
+
 \section{Other Flags}
 % ----------------------
 
 \zaehler0
 \show{European Union}{EU}
 \show{United Nations}{UNO}
+\show{NATO}{NATO}
 \show{Red Cross}{RedCross}
 \show{Olympics}{Olympics}
 \show{Jolly Roger}{JollyRoger}
 \show{Rainbow flag}{Rainbow}
+\show{Esperanto Movement}{Esperanto}
 
 % --------------------------------------------------------------------------
 % Links
@@ -1132,6 +1187,11 @@ are overlayed with the generating circles.
 \txt{Website of the FOTW (``Flags Of The World''), vexillological association
  and internet resource; many background informations about flags and vexillology.}
 % ---------------------------------------------------------------------------
+\bibitem{FLAGS}
+\web{https://www.flags.net}
+\txt{World Flags Database; another comprehensive collection of flags
+from all over the world.}
+% ---------------------------------------------------------------------------
 \bibitem{WELTFLAGGEN}
 \web{https://www.welt-flaggen.de}
 \txt{Flags of and information about all countries of the world;
@@ -1144,4 +1204,5 @@ contains flag quizzes.}
 \end{thebibliography}
 % ---------------------------------------------------------------------------
 }
+
 \end{document}