summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-04-30 03:02:32 +0000
committerNorbert Preining <norbert@preining.info>2021-04-30 03:02:32 +0000
commitb2a74f7600f0c4e33c859c718976b1215c4c747d (patch)
treea2ca3f08c20604b3302aab6fe61350862246890d /graphics
parenteb12ba26e2796aad14025f9c36434d5b84097eab (diff)
CTAN sync 202104300302
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/worldflags/README2
-rw-r--r--graphics/pgf/contrib/worldflags/doc/worldflags.pdfbin2146628 -> 2161981 bytes
-rw-r--r--graphics/pgf/contrib/worldflags/doc/worldflags.tex385
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AF.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AQ.tex14
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AU.tex14
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_AZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Abkhazia.tex54
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Artsakh.tex15
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BB.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BF.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BI.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BJ.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BR.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BS.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BW.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_BZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CA.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CD.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CF.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CI.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CK.tex12
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CR.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CV.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_CZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DJ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DK.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_DZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_EC.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_EE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_EG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_EH.tex14
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ER.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ES.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ET.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_EU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Esperanto.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_FI.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_FJ.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_FM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_FR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GB.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GF.tex12
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GL.tex12
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GQ.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GT.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GW.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_GY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_HN.tex14
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_HR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_HT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_HU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ID.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IQ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IS.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_IT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_JM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_JO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_JP.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_JollyRoger.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KI.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KM.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KO.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KP.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KW.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_KZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LB.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LC.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LI.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LK.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LS.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LV.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_LY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ME.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MG.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MK.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ML.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MV.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MW.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MX.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_MZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NA.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NATO.tex59
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NI.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NO.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NP.tex4
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NU.tex19
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_NZ.tex16
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_OM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Olympics.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PK.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PS.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PW.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_PY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_QA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_RO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_RS.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_RU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_RW.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Rainbow.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_RedCross.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SB.tex18
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SC.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SE.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SI.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SK.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SL.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SS.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ST.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SV.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_SZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Somaliland.tex496
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TD.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TH.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TJ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TL.tex12
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TM.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TO.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TR.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TT.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TV.tex26
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TW.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_TZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_Transnistria.tex54
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_UA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_UG.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_UNO.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_US.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_UY.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_UZ.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_VA.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_VC.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_VE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_VN.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_VU.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_WB.tex8
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_WS.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_YE.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ZA.tex10
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ZM.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflag_ZW.tex6
-rw-r--r--graphics/pgf/contrib/worldflags/tex/worldflags.sty133
219 files changed, 1756 insertions, 905 deletions
diff --git a/graphics/pgf/contrib/worldflags/README b/graphics/pgf/contrib/worldflags/README
index 3538e6ae2e..a8a0dd1355 100644
--- a/graphics/pgf/contrib/worldflags/README
+++ b/graphics/pgf/contrib/worldflags/README
@@ -15,4 +15,4 @@ The description of every flag resides in a particular "flag description file".
License: LaTeX Project Public License version 1.3 or above
Wilhelm Haager
-2021-04-25
+2021-04-30
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
Binary files differ
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}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AD.tex
index 60c91df4b9..2b7df8954f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AD.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Andorra:
% --------------------------------------------------------------------------
-\BeginFlagDescription{7}{10}
+\begin{flagdescription}{7/10}
\definecolor{red}{RGB}{237,25,45}
\definecolor{blue}{RGB}{15,34,140}
\definecolor{gold}{RGB}{244,228,0}
@@ -2131,5 +2131,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AE.tex
index 57d2d840e5..d4544cc255 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AE.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% United Arab Emirates:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{166,25,46}
\definecolor{turquoise}{RGB}{1,87,80}
\hstripesIII{turquoise}{white}{black}
\fill [red] (0,0) rectangle (\flagwidth/2,1);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AF.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AF.tex
index 17b6dacf4d..060dc39d37 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AF.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AF.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Afghanistan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,99,65}
\fill [red] (0,0) rectangle (\flaglength,1);
\vstripesIII{black}{red}{green}
\ifemblem
-\begin{scope}[xshift=0.5\flaglength,yshift=0.5\flagwidth,scale=\StretchFactor]
+\begin{scope}[xshift=0.5\flaglength,yshift=0.5\flagwidth,scale=\stretchfactor]
\begin{scope}[scale=0.001645\flagwidth,yshift=65mm,xshift=-63mm]
\begin{scope}[y=0.80pt, x=0.80pt, yscale=-1,]
\begin{scope}[cm={{1.33333,0.0,0.0,1.33333,(0.0,1e-05)}}]
@@ -6210,5 +6210,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AG.tex
index 96c083c87f..ac587e13f6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AG.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Antigua and Barbuda:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,94,184}
\definecolor{gold}{RGB}{255,205,0}
@@ -10,5 +10,5 @@
\fill [white] (0,0) rectangle (\flaglength,36/92);
\fill [blue] (0,56/92) rectangle (\flaglength,36/92);
\fill [red] (0,0)--(0,1)--(0.5\flaglength,0)--(\flaglength,1)--(\flaglength,0)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AL.tex
index f1ffe33278..b91f93b446 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AL.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Albania:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{7}
+\begin{flagdescription}{5/7}
\definecolor{red}{RGB}{218,41,28}
\fill [red] (0,0) rectangle (\flaglength,1);
\ifemblem
@@ -248,5 +248,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AM.tex
index c127b87114..4335597e36 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AM.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Armenia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{218,41,28}
\definecolor{blue}{RGB}{0,51,160}
\definecolor{orange}{RGB}{255,184,28}
\hstripesIII{red}{blue}{orange}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AO.tex
index 691157efda..2077aa5484 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AO.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Angola:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{220,16,46}
\definecolor{gold}{RGB}{253,218,37}
\hstripesII{red}{black}
@@ -63,5 +63,5 @@ xshift=-67mm,yshift=-44mm]
(609.0360,472.1150) and (607.7170,464.0040) .. (600.4500,458.4970);
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AQ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AQ.tex
new file mode 100644
index 0000000000..b7d9979e8b
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AQ.tex
@@ -0,0 +1,14 @@
+% --------------------------------------------------------------------------
+% Antarctica:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{3/5}
+\definecolor{blue}{RGB}{27,47,76}
+\hstripesII{blue}{white}
+\begin{scope}[shift={(0.5\flaglength,0.5)}]
+\fill [white](-0.28058,0.0)--(0.0,-0.11167)--(0.28058,0.0)--(0.0,0.45342)--cycle;
+\fill [blue] (0.0,-0.45342)--(0.28058,0.0)--(0.0,-0.11223)--(-0.28058,0.0)--cycle;
+\end{scope}
+
+
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AR.tex
index 4e97e09de4..8b0e6deee4 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Argentina:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{blue}{RGB}{108,172,228}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{brown}{RGB}{131,57,33}
@@ -149,5 +149,5 @@
(389.5654,249.1503) .. (385.2924,247.4403) -- cycle;
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AT.tex
index c666a1a21c..64ea52ea49 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Austria:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{metal}{RGB}{160,185,221}
\definecolor{gold}{RGB}{250,225,9}
@@ -8136,5 +8136,5 @@
\end{scope}
\fi
% Frame around flag:
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AU.tex
index edd8c70e1c..7e61a6f2b6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AU.tex
@@ -1,18 +1,18 @@
% --------------------------------------------------------------------------
% Australia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,32,91}
\fill [blue] (0,0) rectangle (\flaglength,1);
-\UnionJack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
\starn{white}{7}{(0.25\flaglength,0.25)}{0.15}{0.06667}{0}
\begin{scope}[xshift=0.75\flaglength,yshift=0.5\flagwidth]
\starn{white}{7}{(0,1/3) }{0.0715}{0.031778}{0}
\starn{white}{7}{(0,-1/3) }{0.0715}{0.031778}{0}
- \starn{white}{7}{(-0.25*\StretchFactor,0.062)}{0.0715}{0.031778}{0}
- \starn{white}{7}{(0.2222*\StretchFactor,0.13)}{0.0715}{0.031778}{0}
- \starn{white}{7}{(0.1*\StretchFactor,-0.042) }{0.0416667}{0.01852}{0}
+ \starn{white}{7}{(-0.25*\stretchfactor,0.062)}{0.0715}{0.031778}{0}
+ \starn{white}{7}{(0.2222*\stretchfactor,0.13)}{0.0715}{0.031778}{0}
+ \starn{white}{7}{(0.1*\stretchfactor,-0.042) }{0.0416667}{0.01852}{0}
\end{scope}
-% \FrameCode
-\EndFlagDescription
+% \framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_AZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_AZ.tex
index 3e2ba23084..75e22dbad9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_AZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_AZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Azerbaijan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{0,188,226}
\definecolor{red}{RGB}{239,51,64}
\definecolor{green}{RGB}{80,158,47}
@@ -10,5 +10,5 @@
\moon{white}{(-0.05,0)}{0.15}{(-0.016667,0)}{0.125}
\starn{white}{8}{(7/60,0)}{1/12}{1/24}{0}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Abkhazia.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Abkhazia.tex
new file mode 100644
index 0000000000..619f2ce09b
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Abkhazia.tex
@@ -0,0 +1,54 @@
+% --------------------------------------------------------------------------
+% Abkhazia:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{green}{RGB}{0,153,62}
+\definecolor{red}{RGB}{200,49,42}
+\background{green}
+\hbar{white}{3/14}{1/7}
+\hbar{white}{1/2}{1/7}
+\hbar{white}{11/14}{1/7}
+\begin{scope}[scale=\flagwidth/85.3577,y=-0.1mm, x=0.1mm,shift={(0,-300)}]
+\fill[red] (0,0) rectangle (228,128.5710);
+\fill[white] (96.3520,71.8210) .. controls (96.3520,71.8210) and
+ (94.3870,72.6440) .. (95.7330,88.3300) .. controls (96.8320,101.2410) and
+ (101.4320,105.4470) .. (101.4320,105.4470) -- (103.4410,113.4390) --
+ (122.4970,113.5170) .. controls (122.4970,113.5170) and (122.8420,108.5680) ..
+ (123.5800,107.0030) .. controls (125.3930,103.1580) and (132.5790,98.7630) ..
+ (135.6590,92.1270) .. controls (138.9710,88.0820) and (137.3120,79.8270) ..
+ (143.9600,71.8590) .. controls (147.2610,67.9020) and (140.0930,69.5770) ..
+ (140.0930,69.5770) .. controls (136.1620,72.1840) and (134.2410,75.2440) ..
+ (133.2500,77.3820) .. controls (132.5830,81.5010) and (129.5000,84.9450) ..
+ (129.2090,81.9540) .. controls (129.2090,81.9540) and (128.0890,76.7820) ..
+ (124.7280,66.7280) .. controls (124.3950,63.7480) and (122.9540,53.4420) ..
+ (122.6460,45.5760) .. controls (122.4270,40.4580) and (117.9470,40.1500) ..
+ (117.5730,45.3450) -- (117.0320,65.9400) -- (115.9610,42.1540) .. controls
+ (115.5060,35.4220) and (110.4130,36.4200) .. (110.1920,41.9990) --
+ (109.9730,66.7660) -- (109.0450,42.7580) .. controls (107.6650,38.1720) and
+ (104.0390,40.8900) .. (103.9720,45.8580) -- (103.3540,69.2180) .. controls
+ (103.3540,69.2180) and (102.5730,56.4250) .. (102.3970,51.0230) .. controls
+ (102.2310,47.7740) and (98.4260,48.0140) .. (98.0670,52.6590) .. controls
+ (97.5490,59.3770) and (96.7340,64.8600) .. (96.3520,71.8210) --
+ (96.3520,71.8210) -- cycle;
+\fill[white] (108.2060,27.9700) -- (114.0000,10.1380) -- (119.7940,27.9700) --
+ (104.6250,16.9500) -- (123.3740,16.9500) -- (108.2060,27.9700) -- cycle;
+\fill[white] (153.2630,35.0840) -- (138.0940,24.0630) -- (156.8430,24.0630) --
+ (141.6740,35.0840) -- (147.4680,17.2520) -- (153.2630,35.0840) -- cycle;
+\fill[white] (181.8960,56.2720) -- (166.7270,45.2510) -- (185.4760,45.2510) --
+ (170.3070,56.2720) -- (176.1010,38.4400) -- (181.8960,56.2720) -- cycle;
+\fill[white] (198.4840,86.1980) -- (183.3150,75.1770) -- (202.0640,75.1770) --
+ (186.8960,86.1980) -- (192.6900,68.3660) -- (198.4840,86.1980) -- cycle;
+\fill[white] (74.7380,35.0840) -- (89.9070,24.0630) -- (71.1570,24.0630) --
+ (86.3260,35.0840) -- (80.5320,17.2520) -- (74.7380,35.0840) -- cycle;
+\fill[white] (46.1040,56.2720) -- (61.2730,45.2510) -- (42.5240,45.2510) --
+ (57.6930,56.2720) -- (51.8980,38.4400) -- (46.1040,56.2720) -- cycle;
+\fill[white] (29.5160,86.1980) -- (44.6850,75.1770) -- (25.9350,75.1770) --
+ (41.1040,86.1980) -- (35.3100,68.3660) -- (29.5160,86.1980) -- cycle;
+\end{scope}
+
+
+
+
+
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Artsakh.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Artsakh.tex
new file mode 100644
index 0000000000..6f3be62548
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Artsakh.tex
@@ -0,0 +1,15 @@
+% --------------------------------------------------------------------------
+% Artaskh:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{red}{RGB}{218,41,28}
+\definecolor{blue}{RGB}{0,51,160}
+\definecolor{orange}{RGB}{255,184,28}
+\hstripesIII{red}{blue}{orange}
+\begin{scope}[xshift=\flaglength,x=-\flaglength/12,y=\flagwidth/9]
+\fill [white] (0,0)-|++(2,1)-|++(1,1)-|++(1,1)-|++(1,1)-|++(1,1)-|++(-1,1)
+ -|++(-1,1)-|++(-1,1)-|++(-1,1)-|++(-2,-1)-|++(1,-1)-|++(1,-1)-|++(1,-1)-|++(1,-1)
+ -|++(-1,-1)-|++(-1,-1)-|++(-1,-1)-|cycle;
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BA.tex
index 4a93020071..3ae56b533f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BA.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Bosnia and Herzogovina:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{0,47,108}
\definecolor{gold}{RGB}{255,205,0}
\begin{scope}
@@ -16,5 +16,5 @@
\foreach \n in {0,1,...,8} {\starV{white}%
{($(h3)+(-\n*\flaglength/16,\n\flagwidth/8)+(-\xx,0.03\flagwidth)$)}{0.095}{0}}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BB.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BB.tex
index 6f0d2dcdef..c0d7366842 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BB.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BB.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Barbados:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{gold}{RGB}{255,199,44}
\vstripesIII{blue}{gold}{blue}
@@ -39,5 +39,5 @@ and (9.269,5.335) .. (8.633,5.236) .. controls (8.577,5.222) and (8.544,5.250)
\end{scope}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BD.tex
index 170c17d007..0ca050ce8a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BD.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Bangladesh:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{228,0,70}
\definecolor{green}{RGB}{0,97,74}
\fill [green] (0,0) rectangle (\flaglength,1);
\fill [red] (0.45\flaglength,0.5) circle (1/3);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BE.tex
index 47538ca8de..4d3fd0be8f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BE.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Belgium:
% --------------------------------------------------------------------------
-\BeginFlagDescription{13}{15}
+\begin{flagdescription}{13/15}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{255,205,0}
\vstripesIII{black}{gold}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BF.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BF.tex
index a4c40ad332..9dd783b028 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BF.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BF.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Burkina Faso:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{239,51,64}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{green}{RGB}{0,150,57}
\hstripesII{red}{green}
\starV{gold}{(\flaglength/2,0.5)}{\flagwidth/6}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BG.tex
index 4ec39b3c44..d163280136 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BG.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Bulgaria:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{218,41,28}
\definecolor{green}{RGB}{0,175,102}
\hstripesIII{white}{green}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BH.tex
index c9cc55c424..11fe1e3fe3 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BH.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Bahrein:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{218,41,28}
\fill [white] (0,0) rectangle (\flaglength,1);
\fill [red] (\flaglength,0)--(0.325\flaglength,0)--++(-0.125\flagwidth,0)
\foreach \n in{1,...,5}
{--++(\flagwidth/4,\flagwidth/10)--++(-\flagwidth/4,\flagwidth/10)}
--(\flaglength,1)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BI.tex
index 1d46683a3f..6e7efcb573 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BI.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Burundi:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{67,176,42}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -16,5 +16,5 @@
{ \starVI{green}{(\x:0.14667)}{\flagwidth/15}{0}
\starVI{red}{(\x:0.14667)}{0.054667\flagwidth}{0}}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BJ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BJ.tex
index 89376cc1c9..4d8224fba3 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BJ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BJ.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Benin:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{253,218,37}
\definecolor{green}{RGB}{0,177,64}
\hstripesII{gold}{red}
-\fill [green] (0,0) rectangle (0.6*\StretchFactor,1);
-\FrameCode
-\EndFlagDescription
+\fill [green] (0,0) rectangle (0.6*\stretchfactor,1);
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BN.tex
index 08dd016bf6..cd5d1a4b6a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BN.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Brunei:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{218,41,28}
\definecolor{gold}{RGB}{254,221,0}
\fill [gold] (0,0) rectangle (\flaglength,1);
@@ -809,5 +809,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BO.tex
index 339d9f3e2f..8322939791 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BO.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Bolivia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{15}{22}
+\begin{flagdescription}{15/22}
\definecolor{red}{RGB}{228,0,43}
\definecolor{green}{RGB}{0,122,51}
\definecolor{gold}{RGB}{255,242,0}
\hstripesIII{red}{gold}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BR.tex
index 705a98db57..3a04d5e37b 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BR.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Brazil:
% --------------------------------------------------------------------------
-\BeginFlagDescription{7}{10}
+\begin{flagdescription}{7/10}
\definecolor{green}{RGB}{0,150,57}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{gold}{RGB}{254,221,0}
\fill [green] (0,0) rectangle (\flaglength,1);
-\fill [gold] (0.5\flaglength,0.1214)--(\flaglength-0.1214*\flagwidth*\StretchFactor,0.5)--
- (0.5\flaglength,0.8786)--(0.1214*\StretchFactor,0.5)--cycle;
+\fill [gold] (0.5\flaglength,0.1214)--(\flaglength-0.1214*\flagwidth*\stretchfactor,0.5)--
+ (0.5\flaglength,0.8786)--(0.1214*\stretchfactor,0.5)--cycle;
\def\stern#1{%
\fill [white] (-90:#1)--(-126:#1/2.618)--(-162:#1)--(-198:#1/2.618)--(-234:#1)--
(-270:#1/2.618)--(-306:#1)--(-342:#1/2.618)--(-18:#1)--(-54:#1/2.618)--cycle;}
@@ -169,5 +169,5 @@
\begin{scope}[shift={(0,575.0)}]\stern{10.500}\end{scope}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BS.tex
index 3e67acfeb9..3547ac9f7e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BS.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Bahamas:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{gold}{RGB}{255,199,44}
\definecolor{blue}{RGB}{0,119,139}
\hstripesIII{blue}{gold}{blue}
\fill [black] (0,0)--(0.86603,0.5)--(0,1)--cycle;
%
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BT.tex
index 54ff5f25e5..9fe95b9a89 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Bhutan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{224,60,49}
\definecolor{gold}{RGB}{241,180,52}
\fill[gold] (0,0) rectangle (\flaglength,1);
@@ -1130,5 +1130,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BW.tex
index 9edc0d2961..037582ce42 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BW.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Botswana:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{108,172,228}
\fill [blue](0,0) rectangle (\flaglength,1);
\hbar{white}{0.5}{1/4}
\hbar{black}{0.5}{1/6}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BY.tex
index fa316a63a9..b0edc5f243 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Belarus:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{218, 41, 28}
\definecolor{green}{RGB}{0,175,102}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -29,5 +29,5 @@
\p{31}{5}{2}\p{31}{8}{1}\p{31}{12}{1}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_BZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_BZ.tex
index 8fe08ebbbe..83a622c4ad 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_BZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_BZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Belize
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{228,0,43}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{green}{RGB}{74,119,41}
@@ -2855,5 +2855,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CA.tex
index 1203debd22..ffd625d553 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CA.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Canada:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{213,0,50}
\fill [white] (0,0) rectangle (\flaglength,1);
\fill [red] (0,0) rectangle (0.25\flaglength,1);
\fill [red] (0.75\flaglength,0) rectangle (\flaglength,1);
\begin{scope}
-[xshift=\flaglength/2,yshift=\flagwidth/2,x=0.1pt,y=-0.1pt,scale=\StretchFactor*0.002184\flagwidth]
+[xshift=\flaglength/2,yshift=\flagwidth/2,x=0.1pt,y=-0.1pt,scale=\stretchfactor*0.002184\flagwidth]
\fill [red] (90,2030)--(45,1167)arc(177.361:279.758:95)--(1015,1220)--
(899,900)arc(159.714:230.929:65)--(1860,65)--(1648,-34)arc(115.293:198.135:65)--(1800,-685)--
(1258,-570)arc(78.223:156.776:65)--(1080,-855)--(657,-401)arc(43.473:190.889:65)--(750,-1510)--
@@ -16,5 +16,5 @@
(-1614,-113)arc(-18.135:64.707:65)--(-1860,65)--(-919,827)arc(-50.929:20.286:65)--(-1015,1220)--
(-156,1069)arc(-99.758:2.639:95)--(-90,2030)--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CD.tex
index 0122fc3c49..0bdcf94288 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CD.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Congo (Democratic Republic):
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{4}
+\begin{flagdescription}{3/4}
\definecolor{red}{RGB}{249,66,58}
\definecolor{blue}{RGB}{0,163,224}
\definecolor{gold}{RGB}{255,215,0}
\fill [blue] (0,0) rectangle (\flaglength,1);
-\starV{gold}{(0.24*\StretchFactor,0.742)}{0.1893*\flagwidth}{0}
+\starV{gold}{(0.24*\stretchfactor,0.742)}{0.1893*\flagwidth}{0}
\begin{scope}
\clip (0,0) rectangle (\flaglength,1);
\newdimen\dd\dd=0.00148\flagwidth
@@ -19,5 +19,5 @@
\draw [gold,line width=133.33\dd,line cap=rect] (c1)--(c2);
\draw [red,line width=100\dd,line cap=rect] (c1)--(c2);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CF.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CF.tex
index 084c90af66..98c817ea1b 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CF.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CF.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Central African Republic:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{green}{RGB}{0,97,74}
\definecolor{gold}{RGB}{255,209,0}
\hstripesIV{blue}{white}{green}{gold}
\vbar{red}{0.5\flaglength}{0.25\flagwidth}
-\starV{gold}{(0.25*\StretchFactor,0.875)}{\flagwidth/9}{0}
-\FrameCode
-\EndFlagDescription
+\starV{gold}{(0.25*\stretchfactor,0.875)}{\flagwidth/9}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CG.tex
index e14776d375..1086adc9a0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CG.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Congo (Republic):
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\definecolor{green}{RGB}{0,177,64}
\definecolor{gold}{RGB}{255,209,0}
\fill [gold] (0,0) rectangle (\flaglength,1);
\fill [green] (0,0)--(0,1)--(2/3*\flaglength,1)--cycle;
\fill [red] (\flaglength,0)--(\flaglength,1)--(1/3*\flaglength,0)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CH.tex
index 1536c91c07..0e9dc8983b 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CH.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Switzerland:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{1}
+\begin{flagdescription}{1/1}
\definecolor{red}{RGB}{218,41,28}
\fill [red] (0,0) rectangle (\flaglength,1);
\begin{scope}[shift={(0.5\flaglength,0.5)},x=\flagwidth/32,y=\flagwidth/32]
\fill [white] (3,10)|-(10,3)|-(3,-3)|-(-3,-10)|-(-10,-3)|-(-3,3)|-cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CI.tex
index de204a7214..372f75c8cd 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CI.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Cote d'Ivoire:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{orange}{RGB}{255,130,0}
\definecolor{green}{RGB}{0,122,51}
\vstripesIII{orange}{white}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CK.tex
index 19d7cee2f4..0e2286e2fa 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CK.tex
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% Cook Islands:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,32,91}
-\fill [blue] (0,0) rectangle (\flaglength,1);
-\UnionJack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\background{blue};
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
\begin{scope}[xshift=0.75\flaglength,yshift=0.5\flagwidth]
\foreach \n in {0,...,14}
- {\starV{white}{(90+24*\n:11/30*\StretchFactor)}{0.075*\StretchFactor}{24*\n}}
+ {\starV{white}{(90+24*\n:11/30*\stretchfactor)}{0.075*\stretchfactor}{24*\n}}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CL.tex
index 85be6463aa..fb9ce8b33d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CL.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Chile:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,48,135}
\hstripesII{white}{red}
\fill [blue] (0,0.5) rectangle (0.5,1);
\starV{white}{(0.25,0.75)}{\flagwidth/8}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CM.tex
index 4e1da563d8..2df9568c1f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CM.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Cameroon:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{253,218,37}
\definecolor{green}{RGB}{0,177,64}
\vstripesIII{green}{red}{gold}
\starV{gold}{(0.5\flaglength,0.4824)}{0.18426\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CN.tex
index fba1b342f7..8450d83853 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CN.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% China:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{253,218,37}
\hbar{red}{0.5}{1}
@@ -10,5 +10,5 @@
\starV{gold}{(0.6,0.8)}{0.05*\flagwidth}{0}
\starV{gold}{(0.6,0.65)}{0.05*\flagwidth}{0}
\starV{gold}{(0.5,0.55)}{0.05*\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CO.tex
index 6de2ab9cfc..8b8f61f857 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CO.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Colombia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,43}
\definecolor{blue}{RGB}{16,6,159}
\definecolor{gold}{RGB}{255,209,0}
\fill [gold] (0,0) rectangle (\flaglength,1);
\fill [blue] (0,0) rectangle (\flaglength,0.5);
\fill [red] (0,0) rectangle (\flaglength,0.25);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CR.tex
index 482392325a..e48b6b7b92 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Costa Rica:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\fill [blue] (0,0) rectangle (\flaglength,1);
@@ -25,7 +25,7 @@
\definecolor{cff0016}{RGB}{255,0,22}
\definecolor{cce1126}{RGB}{206,17,38}
\newdimen\lw\lw=0.0002\flagwidth
-\begin{scope} [xshift=0.5\flagwidth*\StretchFactor,yshift=0.5\flagwidth,scale=\flagwidth/391]
+\begin{scope} [xshift=0.5\flagwidth*\stretchfactor,yshift=0.5\flagwidth,scale=\flagwidth/391]
\fill [white] (0,0) ellipse (19mm and 21mm);
\begin{scope}[y=0.8pt, x=0.8pt, yscale=-1, xscale=1,line width=0.01\lw,shift={(-98.875,-338.125)}]
\begin{scope}[cm={{0.15382,0.0,0.0,0.15382,(34.72393,273.11413)}}]
@@ -1533,5 +1533,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CU.tex
index 1dc2af8baf..c08cd7fc95 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CU.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Cuba:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,32,91}
\hstripesV{blue}{white}{blue}{white}{blue}
\fill [red] (0,0)--(0.86603,0.5)--(0,1)--cycle;
\starV{white}{(0.2887,0.5)}{\flagwidth/6}{0}
%
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CV.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CV.tex
index 45a431be16..8efe937098 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CV.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CV.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Cape Verde:
% --------------------------------------------------------------------------
-\BeginFlagDescription{10}{17}
+\begin{flagdescription}{10/17}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,48,135}
\definecolor{gold}{RGB}{255,205,0}
@@ -9,8 +9,8 @@
\hbar{white}{0.375}{0.25}
\hbar{white}{0.375}{1/4}
\hbar{red}{0.375}{1/12}
-\coordinate (c) at (0.63889*\StretchFactor,0.375);
+\coordinate (c) at (0.63889*\stretchfactor,0.375);
\foreach \n in {18,54,...,342}
{\starV{gold}{($(c)+(\n:0.26389)$)}{0.04722\flagwidth}{0}}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CY.tex
index fed4826fad..cae4701e38 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Cyprus:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{orange}{RGB}{213,120,0}
\definecolor{olive}{RGB}{78,91,49}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -507,5 +507,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_CZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_CZ.tex
index 32c7b97157..f222c9192a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_CZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_CZ.tex
@@ -1,10 +1,10 @@
% -------------------------------------------------------------
% Czech Republic:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,70}
\definecolor{blue}{RGB}{0,48,135}
\hstripesII{white}{red}
\fill [blue] (0,0)--(0,1)--(0.5\flaglength,0.5)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DE.tex
index f07ee49618..c5d9eb7089 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DE.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Germany:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{218,41,28}
\definecolor{gold}{RGB}{255,205,0}
\hstripesIII{black}{red}{gold}
@@ -182,5 +182,5 @@ line cap=round,line width=1.627\lw] (-80.4860,246.0430) .. controls
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DJ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DJ.tex
index fd124806e2..843e5dca89 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DJ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DJ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Djibouti:
% --------------------------------------------------------------------------
-\BeginFlagDescription{250}{433}
+\begin{flagdescription}{250/433}
\definecolor{red}{RGB}{213,0,50}
\definecolor{cyan}{RGB}{5,195,221}
\definecolor{green}{RGB}{197,232,108}
@@ -9,5 +9,5 @@
\fill [white] (0,0)--(\flaglength/2,0.5)--(0,1)--cycle;
% ? \starV{red}{(\flaglength/6,0.5)}{0.1382\flagwidth}{0}
\starV{red}{(\flaglength/6,0.5)}{0.16667\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DK.tex
index 3a6b9fd1e1..b3a0d36112 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DK.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Denmark:
% --------------------------------------------------------------------------
-\BeginFlagDescription{28}{37}
+\begin{flagdescription}{28/37}
\definecolor{red}{RGB}{218,41,28}
\fill [red] (0,0) rectangle (\flaglength,1);
\hbar{white}{0.5}{0.14286}
-\vbar{white}{0.5\flagwidth*\StretchFactor}{0.14286}
-\FrameCode
-\EndFlagDescription
+\vbar{white}{0.5\flagwidth*\stretchfactor}{0.14286}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DM.tex
index d7a7b908e5..d217d1487a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DM.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Dominica:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{213, 0, 50}
\definecolor{green}{RGB}{4, 106, 56}
\definecolor{gold}{RGB}{255,205,0}
@@ -180,5 +180,5 @@
\end{scope}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DO.tex
index 92fa78b51c..4b5b85e1d7 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DO.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Dominican Republic:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,47,108}
\fill [red] (0,0) rectangle (0.5\flaglength,0.5);
@@ -5277,5 +5277,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_DZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_DZ.tex
index 39883953e7..b66308bbad 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_DZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_DZ.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Algeria:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{7}
+\begin{flagdescription}{5/7}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,122,51}
\vstripesII{green}{white}
\moon{red}{(0.5\flaglength,0.5)}{0.25}{($(0.5\flaglength,0.5)+(0.0583333,0)$)}{0.2}
\starV{red}{($(0.5\flaglength,0.5)+(0.1011,0)$)}{0.125\flagwidth}{-18}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_EC.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_EC.tex
index 37618bdde4..6acef3a441 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_EC.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_EC.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Ecuador:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{0,94,184}
\definecolor{gold}{RGB}{251,222,64}
@@ -8061,5 +8061,5 @@ shade, bottom color=blue,top color=blue!20] (665.3900,508.8300) ..
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_EE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_EE.tex
index 422c66025f..7cba562a58 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_EE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_EE.tex
@@ -1,8 +1,8 @@
% --------------------------------------------------------------------------
% Estonia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{7}{11}
+\begin{flagdescription}{7/11}
\definecolor{blue}{RGB}{0,114,206}
\hstripesIII{blue}{black}{white}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_EG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_EG.tex
index cf453abf87..5ef643edb3 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_EG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_EG.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Egypt:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{197,169,0}
\hstripesIII{red}{white}{black}
@@ -598,5 +598,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_EH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_EH.tex
new file mode 100644
index 0000000000..cdb0be8268
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_EH.tex
@@ -0,0 +1,14 @@
+% --------------------------------------------------------------------------
+% Western Sahara:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{red}{RGB}{228,0,43}
+\definecolor{green}{RGB}{0,122,51}
+\hstripesIII{black}{white}{green}
+\chevron{red}{2/3*\stretchfactor}
+\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)}]
+\starV{red}{(0,0)}{0.09524}{0}
+\moon{red}{(-0.01984,0)}{0.11905}{(0.01984,0)}{0.11905}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ER.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ER.tex
index 2f2f7cf83e..f4048bab3d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ER.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ER.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Eritrea:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{228,0,34}
\definecolor{blue}{RGB}{65,143,222}
\definecolor{green}{RGB}{67,176,42}
@@ -135,5 +135,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ES.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ES.tex
index 538a39f620..7cf8f5bfc8 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ES.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ES.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Spain:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\definecolor{gold}{RGB}{255,209,0}
\fill [red] (0,0) rectangle (\flaglength,1);
\hbar{gold}{0.5}{0.5}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ET.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ET.tex
index 626a93bfc3..0392544161 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ET.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ET.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Ethiopia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{239,51,64}
\definecolor{gold}{RGB}{255,215,0}
\definecolor{blue}{RGB}{0,61,165}
@@ -18,5 +18,5 @@
\end{scope}}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_EU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_EU.tex
index 9e1c36d7e7..6cbb0e51ef 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_EU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_EU.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% European Union:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{gold}{RGB}{255,215,0}
\fill [blue] (0,0) rectangle (\flaglength,1);
\foreach \w in{0,30,...,330}
{\starV{gold}{($(0.5\flaglength,0.5)+(\w:1/3)$)}{\flagwidth/18}{0}}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Esperanto.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Esperanto.tex
new file mode 100644
index 0000000000..f056530e7e
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Esperanto.tex
@@ -0,0 +1,10 @@
+% --------------------------------------------------------------------------
+% Esperanto Movement:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{2/3}
+\definecolor{green}{RGB}{0,153,0}
+\background{green}
+\fill [white] (0,0.5) rectangle (0.5,1);
+\starV{green}{(0.25,0.75)}{0.175}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_FI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_FI.tex
index b3d6b0f3a4..a56ab8ec4d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_FI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_FI.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Finnland:
% --------------------------------------------------------------------------
-\BeginFlagDescription{11}{18}
+\begin{flagdescription}{11/18}
\definecolor{blue}{RGB}{0,47,108}
\fill [white] (0,0) rectangle (\flaglength,1);
\hbar{blue}{0.5}{0.272727}
-\vbar{blue}{0.591*\StretchFactor}{0.272727}
-\FrameCode
-\EndFlagDescription
+\vbar{blue}{0.591*\stretchfactor}{0.272727}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_FJ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_FJ.tex
index 6b3f72b09d..d85e7df21f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_FJ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_FJ.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Fiji:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,32,91}
\definecolor{cyan}{RGB}{65,182,230}
\fill [cyan] (0,0) rectangle (\flaglength,1);
-\UnionJack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
\ifemblem
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{254,221,0}
@@ -1489,5 +1489,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_FM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_FM.tex
index 71af23a645..4f32db6222 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_FM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_FM.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Micronesia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{10}{19}
+\begin{flagdescription}{10/19}
\definecolor{blue}{RGB}{98,168,229}
\fill [blue] (0,0) rectangle (\flaglength,1);
\starV{white}{($(0.5\flaglength,0.5)+(0:0.3)$)}{0.1\flagwidth}{-18}
\starV{white}{($(0.5\flaglength,0.5)+(90:0.3)$)}{0.1\flagwidth}{0}
\starV{white}{($(0.5\flaglength,0.5)+(180:0.3)$)}{0.1\flagwidth}{18}
\starV{white}{($(0.5\flaglength,0.5)+(270:0.3)$)}{0.1\flagwidth}{36}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_FR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_FR.tex
index 3894ab52c9..2ce02cb5b6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_FR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_FR.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% France:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,65,53}
\definecolor{blue}{RGB}{0,85,164}
\vstripesIII{blue}{white}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GA.tex
index fd82be5442..250bd27f28 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GA.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Gabon:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{4}
+\begin{flagdescription}{3/4}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{green}{RGB}{0,154,68}
\definecolor{blue}{RGB}{0,114,206}
\hstripesIII{green}{gold}{blue}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GB.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GB.tex
index bdf7e7d34c..6daa8414a1 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GB.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GB.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Great Britain:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
-\UnionJack{0pt}{0pt}{\flaglength}{\flagwidth}
-\FrameCode
-\EndFlagDescription
+\unionjack{0pt}{0pt}{\flaglength}{\flagwidth}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GD.tex
index e2fb054468..13252e437e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GD.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Grenada:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{249,66,58}
\definecolor{green}{RGB}{44,127,108}
\definecolor{gold}{RGB}{253,218,37}
@@ -27,5 +27,5 @@
(69.590,133.50) .. (60.112,121.63) -- cycle;
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GE.tex
index 70d29e551d..414ec42fad 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GE.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Georgia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,43}
\fill [white] (0,0) rectangle (\flaglength,\flagwidth);
\hbar{red}{0.5}{0.2}
@@ -26,5 +26,5 @@
\coordinate (p) at ($(0.75\flaglength,0.25)+(0.05,-0.05)$);\cross{(p)}
\coordinate (p) at ($(0.25\flaglength,0.75)+(-0.05,0.05)$);\cross{(p)}
\coordinate (p) at ($(0.75\flaglength,0.75)+(0.05,0.05)$);\cross{(p)}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GF.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GF.tex
new file mode 100644
index 0000000000..e6f2313da9
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GF.tex
@@ -0,0 +1,12 @@
+% --------------------------------------------------------------------------
+% French Guiana:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{2/3}
+\definecolor{red}{RGB}{200,16,46}
+\definecolor{green}{RGB}{0,132,61}
+\definecolor{gold}{RGB}{254,221,0}
+\background{green}
+\fill [gold] (0,0)--(0,1)--(\flaglength,0)--cycle;
+\starV{red}{(0.5\flaglength,0.5)}{1/6}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GH.tex
index 392ad6ecc4..35a014ef42 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GH.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Ghana:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{green}{RGB}{4,106,56}
\hstripesIII{red}{gold}{green}
\starV{black}{(\flaglength/2,0.4824)}{0.18426\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GL.tex
new file mode 100644
index 0000000000..8d8508d138
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GL.tex
@@ -0,0 +1,12 @@
+% --------------------------------------------------------------------------
+% Greenland:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{2/3}
+\definecolor{red}{RGB}{228,0,43}
+\hstripesII{white}{red}
+\begin{scope}
+\clip (7/12*\stretchfactor,0.5) circle(1/3);
+\hstripesII{red}{white}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GM.tex
index 75590ca86f..603a879bda 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GM.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Gambia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{74,119,41}
\definecolor{blue}{RGB}{0,20,137}
\hstripesIII{red}{white}{green}
\hbar{blue}{0.5}{2/9}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GN.tex
index 5ce7fee3ef..8a8ac86c16 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GN.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Guinea:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,177,64}
\definecolor{gold}{RGB}{253,218,37}
\vstripesIII{red}{gold}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GQ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GQ.tex
index b5738039d8..fa692cff3d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GQ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GQ.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Equatorial Guinea:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,43}
\definecolor{green}{RGB}{0,132,61}
\definecolor{blue}{RGB}{0,48,135}
\hstripesIII{green}{white}{red}
-\fill [blue] (0,0)--(0.375*\StretchFactor,0.5)--(0,1)--cycle;
+\fill [blue] (0,0)--(0.375*\stretchfactor,0.5)--(0,1)--cycle;
\ifemblem
\definecolor{white}{RGB}{255,255,255}
\definecolor{dbrown}{RGB}{115,69,43}
@@ -317,5 +317,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GR.tex
index 67f9161cb3..5f7663b566 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GR.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Greece:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,64,160}
\fill [white] (0,0) rectangle (\flaglength,1);
\foreach \x in {1,5,9,13,17} {\hbar{blue}{\x*\flagwidth/18}{\flagwidth/9}}
\fill [blue] (0,4*\flagwidth/9) rectangle ++(5*\flagwidth/9,5*\flagwidth/9);
\fill [white] (0,6*\flagwidth/9) rectangle ++(5*\flagwidth/9,\flagwidth/9);
\fill [white] (2*\flagwidth/9,4*\flagwidth/9) rectangle ++(\flagwidth/9,5*\flagwidth/9);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GT.tex
index ab4ce15926..1cf9d873ed 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Guatemala:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{blue}{RGB}{105,179,231}
\vstripesIII{blue}{white}{blue}
\ifemblem
@@ -25,7 +25,7 @@
\definecolor{c448127}{RGB}{68,129,39}
\definecolor{ca08307}{RGB}{160,131,7}
\definecolor{ceac102}{RGB}{234,193,2}
-\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth*\StretchFactor/820]
+\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth*\stretchfactor/820]
\begin{scope}[scale=1.84,xshift=-135mm,yshift=84mm]
\begin{scope}[y=0.80pt, x=0.80pt, yscale=-1, xscale=1]
\begin{scope}[cm={{1.01416,0.0,0.0,1.033,(-6.79641,-9.89449)}}]
@@ -2342,5 +2342,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GW.tex
index 70f9e16e8c..2a5a5a9faa 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GW.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Guinea Bissau:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,150,57}
\definecolor{gold}{RGB}{255,205,0}
\hstripesII{gold}{green}
-\fill [red] (0,0) rectangle (2/3*\StretchFactor,1);
-\starV{black}{(1/3*\StretchFactor,0.5)}{\flagwidth/6}{0}
-\FrameCode
-\EndFlagDescription
+\fill [red] (0,0) rectangle (2/3*\stretchfactor,1);
+\starV{black}{(1/3*\stretchfactor,0.5)}{\flagwidth/6}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_GY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_GY.tex
index 943a2c5bda..6336cb7ac2 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_GY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_GY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Guyana:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,177,64}
\definecolor{gold}{RGB}{254,219,0}
@@ -19,5 +19,5 @@
\pgfmathparse{\d/sin(atan2(\flagwidth,\flaglength))}
\edef\x{\pgfmathresult}
\fill [red] (0,\y*1pt)--(0.5\flaglength-\x*1pt,0.5)--(0,\flagwidth-\y*1pt)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_HN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_HN.tex
index 86c40de356..6bbbc7a35f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_HN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_HN.tex
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% Honduras:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{0,61,165}
\hstripesIII{blue}{white}{blue}
\coordinate (c) at (0.5\flaglength,0.5);
\starV{blue}{(c)}{\flagwidth/18}{0}
-\starV{blue}{($(c)+(0.3333*\StretchFactor,1/12)$)}{\flagwidth/18}{0}
-\starV{blue}{($(c)+(0.3333*\StretchFactor,-1/12)$)}{\flagwidth/18}{0}
-\starV{blue}{($(c)-(0.3333*\StretchFactor,1/12)$)}{\flagwidth/18}{0}
-\starV{blue}{($(c)-(0.3333*\StretchFactor,-1/12)$)}{\flagwidth/18}{0}
-\FrameCode
-\EndFlagDescription
+\starV{blue}{($(c)+(0.3333*\stretchfactor,1/12)$)}{\flagwidth/18}{0}
+\starV{blue}{($(c)+(0.3333*\stretchfactor,-1/12)$)}{\flagwidth/18}{0}
+\starV{blue}{($(c)-(0.3333*\stretchfactor,1/12)$)}{\flagwidth/18}{0}
+\starV{blue}{($(c)-(0.3333*\stretchfactor,-1/12)$)}{\flagwidth/18}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_HR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_HR.tex
index 842649f92b..300c9cf7c0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_HR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_HR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Croatia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{lightblue}{RGB}{113,197,232}
@@ -5031,5 +5031,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_HT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_HT.tex
index 0e7c36a542..90e668c9fa 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_HT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_HT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Haiti:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,20,137}
\hstripesII{blue}{red}
@@ -2996,5 +2996,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_HU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_HU.tex
index d561c5e5dd..9fdbd88774 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_HU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_HU.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Hungary:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,132,61}
\hstripesIII{red}{white}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ID.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ID.tex
index 585e3c1d3d..e30253a869 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ID.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ID.tex
@@ -1,8 +1,8 @@
% --------------------------------------------------------------------------
% Indonesia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\hstripesII{red}{white}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IE.tex
index 78b2779be1..a03d274fff 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IE.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Ireland:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{orange}{RGB}{255,130,0}
\definecolor{green}{RGB}{0,154,68}
\vstripesIII{green}{white}{orange}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IL.tex
index fa8a55c6d2..0d9c3a0f95 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IL.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Israel:
% --------------------------------------------------------------------------
-\BeginFlagDescription{8}{11}
+\begin{flagdescription}{8/11}
\definecolor{blue}{RGB}{0,32,91}
\definecolor{blue}{RGB}{0,56,184}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -13,5 +13,5 @@
\fill [even odd rule] (30:0.2156\flagwidth)--(150:0.2156\flagwidth)--(270:0.2156\flagwidth)
(30:0.1469\flagwidth)--(150:0.1469\flagwidth)--(270:0.1469\flagwidth);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IN.tex
index f6b07d691c..a9d5c54fa8 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IN.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% India:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{orange}{RGB}{255,103,32}
\definecolor{green}{RGB}{0,132,61}
\definecolor{blue}{RGB}{0,38,58}
@@ -13,5 +13,5 @@
\foreach \w in{0,15,...,345}
\fill (\w:6)--(\w-5:20)--(\w:54)--(\w+5:20)--cycle (\w+7.5:52) circle (2.5);
\end{scope}\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IQ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IQ.tex
index df8cc87150..d0347f5641 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IQ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IQ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Iraq:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,154,68}
\hstripesIII{red}{white}{black}
@@ -81,5 +81,5 @@
(207.5490,141.8960) and (207.5490,127.3380) .. (207.5490,112.7790) -- cycle;
\end{scope}
\end{scope}\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IR.tex
index bcc4e69e8b..b680752391 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Iran:
% --------------------------------------------------------------------------
-\BeginFlagDescription{4}{7}
+\begin{flagdescription}{4/7}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,150,57}
\hstripesIII{green}{white}{red}
@@ -34,5 +34,5 @@
\end{scope}
\end{scope}
\end{scope}\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IS.tex
index 900d49fd89..dec8cd4451 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IS.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Iceland:
% --------------------------------------------------------------------------
-\BeginFlagDescription{18}{25}
+\begin{flagdescription}{18/25}
\definecolor{blue}{RGB}{0,48,135}
\definecolor{red}{RGB}{210,38,48}
\fill [blue] (0,0) rectangle (\flaglength,1);
\hbar{white}{0.5}{0.22222}
-\vbar{white}{0.5*\StretchFactor}{0.22222}
+\vbar{white}{0.5*\stretchfactor}{0.22222}
\hbar{red}{0.5}{0.11111}
-\vbar{red}{0.5*\StretchFactor}{0.111111}
-\FrameCode
-\EndFlagDescription
+\vbar{red}{0.5*\stretchfactor}{0.111111}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_IT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_IT.tex
index 7535e7aada..33e4a253ca 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_IT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_IT.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Italy:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,43}
\definecolor{green}{RGB}{0,122,51}
\definecolor{gold}{RGB}{255,209,0}
\vstripesIII{green}{white}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_JM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_JM.tex
index c54cd62c91..265ec2daaf 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_JM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_JM.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Jamaica:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{green}{RGB}{0,177,64}
\definecolor{gold}{RGB}{254,219,0}
\fill [black] (0,0) rectangle (\flaglength,1);
@@ -12,5 +12,5 @@
\draw [gold,line width=\flagwidth/6] (0,0)--(\flaglength,1);
\draw [gold,line width=\flagwidth/6] (0,1)--(\flaglength,0);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_JO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_JO.tex
index 9b6390baa2..0589f34657 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_JO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_JO.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Jordan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,122,51}
\hstripesIII{black}{white}{green}
\fill [red] (0,0)--(0.5\flaglength,0.5)--(0,1)--cycle;
\starn{white}{7}{(\flaglength/6,0.5)}{1/14}{0.0376}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_JP.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_JP.tex
index 7eb0c073ae..3f41bbecb2 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_JP.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_JP.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Japan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\fill [white] (0,0) rectangle (\flaglength,1);
\fill [red] (0.5\flaglength,0.5) circle (0.3);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_JollyRoger.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_JollyRoger.tex
index 54a399f70b..a263601c66 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_JollyRoger.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_JollyRoger.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Pirate Flag:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\fill [black] (0,0) rectangle (\flaglength,1);
\begin{scope}[xshift=0.5\flaglength,yshift=0.5\flagwidth,scale=\flagwidth/444.17]
\begin{scope}[y=-0.8pt, x=0.8pt,shift={(-400,-250)}]
@@ -61,5 +61,5 @@
cycle;
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KE.tex
index 43df4c0bc7..0ad15f5336 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KE.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Kenya:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{190,58,52}
\definecolor{green}{RGB}{0,103,71}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -39,5 +39,5 @@
\fill [white](1,-5.85)..controls(1,-5.85) and(5,-13.85)..(5,-26.85)..
controls(5,-39.85)and(1,-47.85)..(1,-47.85)--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KG.tex
index 86c06064c0..7cbbd2bccb 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KG.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Kyrgystan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{228,0,43}
\definecolor{gold}{RGB}{255,209,0}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -419,5 +419,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KH.tex
index d01a0aef7e..ef74742c03 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KH.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Cambodia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{0,47,108}
\hbar{blue}{0.5}{1}
@@ -462,5 +462,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KI.tex
index 2ccfae05a2..7cd644811f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KI.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Kiribati:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,47,108}
\definecolor{gold}{RGB}{255,205,0}
@@ -112,5 +112,5 @@
\draw [white, line width=0.08\flagwidth] plot ({\x*\flagwidth},{-0.22*\flagwidth-0.02*\flagwidth*cos(900*\x)});
\draw [white, line width=0.08\flagwidth] plot ({\x*\flagwidth},{-0.38*\flagwidth-0.02*\flagwidth*cos(900*\x)});
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KM.tex
index 68687277fa..1fe5c6912e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KM.tex
@@ -1,16 +1,16 @@
% --------------------------------------------------------------------------
% Comoros:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,114,206}
\definecolor{green}{RGB}{76,141,43}
\definecolor{gold}{RGB}{255,199,44}
-\coordinate (c) at (5/6*\StretchFactor,0.5);
-\coordinate (m) at (0.28333*\StretchFactor,0.5);
+\coordinate (c) at (5/6*\stretchfactor,0.5);
+\coordinate (m) at (0.28333*\stretchfactor,0.5);
\hstripesIV{gold}{white}{red}{blue}
\fill [green] (0,0)--(c)--(0,1)--cycle;
\moon{white}{(m)}{0.225}{($(m)+(0.1,0)$)}{0.225}
\foreach \n in {-18,-6,6,18} {\starV{white}{($(m)+(0.1,\n/120)$)}{\flagwidth/30}{-18}}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KN.tex
index 00927cdbfe..be48a724dd 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KN.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Saint Kitts and Nevis:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,122,51}
\definecolor{gold}{RGB}{255,205,0}
@@ -16,5 +16,5 @@
\edef\w{\pgfmathresult}
\starV{white}{(0.32\flaglength,0.32)}{0.14\flagwidth}{\w}
\starV{white}{(0.7\flaglength,0.7)}{0.14\flagwidth}{\w}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KO.tex
index 7b524e87c7..48d41f9c9e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KO.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Kosovo:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{gold}{RGB}{255,205,0}
-\fill [blue] (0,0) rectangle (\flaglength,1);
+\background{blue}
\begin{scope}[shift={(0.5\flaglength,0)}]
\foreach \w in {112.5,103.5,94.5,85.5,76.5,67.5}
{\starV{white}{(\w:225/280)}{17/280}{0}}
@@ -122,5 +122,5 @@
(418.9722,190.0877) and (424.5411,188.6128) .. (424.5411,192.1348);
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KP.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KP.tex
index 534e31f676..739636a02a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KP.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KP.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% North Korea:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{0,61,165}
\definecolor{red}{RGB}{213,0,50}
\hbar{blue}{0.5}{1}
@@ -9,5 +9,5 @@
\hbar{red}{0.5}{0.61111}
\fill[white] (0.3333\flaglength,0.5) circle (0.22222);
\starV{red}{(0.3333\flaglength,0.5)}{0.2153\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KR.tex
index 262f9837f0..cdf121f643 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% South Korea:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,47,108}
\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},rotate=-33.69,
@@ -20,5 +20,5 @@
(-44,1)--(-44,12) (-44,-1)--(-44,-12) (44,-12)--(44,12)
(50,1)--(50,12) (50,-1)--(50,-12) (-50,-12)--(-50,12);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KW.tex
index 6dcd2ef69f..b1d4304e63 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KW.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Kuwait:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16 46} % Pantone 186 C
\definecolor{green}{RGB}{67,176,42} % Pantone 361 C
\hstripesIII{green}{white}{red}
-\fill [black] (0,0)--(\StretchFactor/2,1/3)--++(0,1/3)--(0,1)--cycle;
-\FrameCode
-\EndFlagDescription
+\fill [black] (0,0)--(\stretchfactor/2,1/3)--++(0,1/3)--(0,1)--cycle;
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_KZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_KZ.tex
index 496b6ac4f6..392388e0dc 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_KZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_KZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Kazakhstan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{cyan}{RGB}{0,174,199}
\definecolor{gold}{RGB}{255, 209, 0}
\fill [cyan] (0,0) rectangle (\flaglength,1);
@@ -311,5 +311,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LA.tex
index dd7de5a9f5..dfb2f4fc47 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LA.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Laos:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,20,137}
\fill [red] (0,0) rectangle (\flaglength,1);
\fill [blue] (0,0.25) rectangle (\flaglength,0.75);
\fill [white] (0.5\flaglength,0.5) circle (0.2);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LB.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LB.tex
index 57146661aa..5f97d1b889 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LB.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LB.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Lebanon:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{249,66,58}
\definecolor{green}{RGB}{0,150,57}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -183,5 +183,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LC.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LC.tex
index 31a9ff25b0..ee5c1e0e82 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LC.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LC.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% ST. Lucia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{155,203,235}
\definecolor{gold}{RGB}{255,205,0}
\fill [blue] (0,0) rectangle (\flaglength,1);
@@ -11,5 +11,5 @@
\fill [black] (-63,-80)--(63,-80)--(0,60)--cycle;
\fill [gold] (-72,-80)--(72,-80)--(0,0)--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LI.tex
index 6734fb3b36..025f92c1a6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LI.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Liechtenstein:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{239,51,64}
\definecolor{blue}{RGB}{0,61,165}
\definecolor{gold}{RGB}{255,209,0}
@@ -436,5 +436,5 @@ cycle(302.7813,179.8309) .. controls (302.4883,179.8575) and
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LK.tex
index 37ef753cd0..dd68c37ee9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LK.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Sri Lanka:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{maroon}{RGB}{155,39,67}
\definecolor{orange}{RGB}{255,130,0}
\definecolor{green}{RGB}{0,122,51}
@@ -14,7 +14,7 @@
\fill [gold,even odd rule] (0,0) rectangle (\flaglength,1)
(\rb,\rb) rectangle ($(\flaglength,1)-(\rb,\rb)$);
\ifemblem
-\def\blatt{\begin{scope}[scale=0.001777\flagwidth*\StretchFactor]
+\def\blatt{\begin{scope}[scale=0.001777\flagwidth*\stretchfactor]
\begin{scope}[xshift=-441pt,yshift=-73pt,x=1pt,y=1pt]
\path[draw=black,fill=gold,line width=0.004\flagwidth] (502.2551,150.7838) ..
controls (502.2551,150.7838) and (495.6352,136.9669) .. (488.3211,131.3378) ..
@@ -32,7 +32,7 @@
\begin{scope}[shift={(\flaglength-\rb-0.0267\flagwidth,\rb+0.0267\flagwidth)},xscale=-1]\blatt\end{scope}
\begin{scope}[shift={(\rb/2+\flaglength/3+0.0267\flagwidth,\flagwidth-\rb-0.0267\flagwidth)},yscale=-1]\blatt\end{scope}
\begin{scope}[shift={(\flaglength-\rb-0.0267\flagwidth,\flagwidth-\rb-0.0267\flagwidth)},xscale=-1,yscale=-1]\blatt\end{scope}
-\begin{scope}[shift={(2*\flaglength/3-0.25*\rb,0.51333\flagwidth)},scale=0.001715\flagwidth*\StretchFactor]
+\begin{scope}[shift={(2*\flaglength/3-0.25*\rb,0.51333\flagwidth)},scale=0.001715\flagwidth*\stretchfactor]
\begin{scope}[y=-1pt, x=1pt,cm={{1.04354,0.0,0.0,1.01818,(-827,-297)}}]
\begin{scope}[draw=black,line width=0.015\flagwidth]
\begin{scope}[fill=gold]
@@ -1089,5 +1089,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LR.tex
index 4fbe015880..aaece46c5f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LR.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Liberia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{10}{19}
+\begin{flagdescription}{10/19}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{12,35,64}
\fill [red] (0,0) rectangle (\flaglength,1);
\foreach \n in {3,7,11,15,19} {\hbar{white}{\n/22}{1/11}}
\fill [blue] (0,6/11) rectangle (5/11,1);
\starV{white}{(5/22,17/22)}{0.13636\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LS.tex
index 90f312344d..25a9d24976 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LS.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Lesotho:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0 20 137}
\definecolor{green}{RGB}{0,154,68}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -62,5 +62,5 @@
(415.9199,389.5801) -- cycle;
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LT.tex
index 9b9e4f57ef..e4c12b2704 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LT.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Lithuania:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{190,58,52}
\definecolor{green}{RGB}{4,106,56}
\definecolor{gold}{RGB}{255,184,28}
\hstripesIII{gold}{green}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LU.tex
index bbcc9feef6..39a5e343b6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LU.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Luxembourg:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{239,51,64}
\definecolor{blue}{RGB}{0,163,224}
\hstripesIII{red}{white}{blue}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LV.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LV.tex
index f47c3abdc9..0f39fea053 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LV.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LV.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Latvia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{157,34,53}
\fill [white] (0,0) rectangle (\flaglength,1);
\fill [red] (0,0) rectangle (\flaglength,0.4\flagwidth);
\fill [red] (0,0.6\flagwidth) rectangle (\flaglength,1);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_LY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_LY.tex
index 29d9ceeb7f..208b776174 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_LY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_LY.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Libya:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{239,51,64}
\definecolor{green}{RGB}{0,151,57}
\hstripesII{red}{green}
\hbar{black}{0.5}{0.5}
\moon{white}{(0.5\flaglength,0.5)}{0.125}{($(0.5\flaglength,0.5)+(0.02528,0)$)}{0.10861}
\starV{white}{($(0.5\flaglength,0.5)+(0.15375,0)$)}{0.09304\flagwidth}{18}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MA.tex
index bd159f6b04..922bbc279f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MA.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Morocco:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{213,0,50}
\definecolor{green}{RGB}{0,132,61}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -10,5 +10,5 @@
\draw [green, line width=\flagwidth/42]
(90:\x)--(234:\x)--(18:\x)--(162:\x)--(306:\x)--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MD.tex
index 0748cd4513..82427111b1 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MD.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Moldova:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{0,61,165}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{red}{RGB}{200,16,46}
@@ -1120,5 +1120,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ME.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ME.tex
index 9fdcb1d6b2..5e743e31bc 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ME.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ME.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Montenegro:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{239,51,64}
\definecolor{blue}{RGB}{0,75,135}
\definecolor{gold}{RGB}{255, 199, 44}
@@ -3617,5 +3617,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MG.tex
index a052f7c1e8..7d26556b6c 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MG.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Madagaskar:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200 16,46}
\definecolor{green}{RGB}{0,177,64}
\hstripesII{red}{green}
-\fill [white] (0,0) rectangle (0.5*\StretchFactor,1);
-\FrameCode
-\EndFlagDescription
+\fill [white] (0,0) rectangle (0.5*\stretchfactor,1);
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MH.tex
index 1f6656a5e2..89c31e4c9e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MH.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Marshall Islands
% --------------------------------------------------------------------------
-\BeginFlagDescription{10}{19}
+\begin{flagdescription}{10/19}
\definecolor{blue}{RGB}{0,48,135}
\definecolor{orange}{RGB}{229,114 0}
\fill [blue] (0,0) rectangle (\flaglength,1);
@@ -12,5 +12,5 @@
\fill [white](0:0.31)
\foreach \n in {1,...,24} {--(15*\n-7.5:0.098)--(15*\n:{test(\n)})}--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MK.tex
index 1f27ca50a0..81ed51c416 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MK.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% North Macedonia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{gold}{RGB}{255,209,0}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -18,5 +18,5 @@
\fill [gold] (\flaglength,0)--++(-0.15\flaglength,0)--($(\flaglength/2,\flagwidth/2)-(\x*\flagwidth,-\y*\flagwidth)$);
\fill [red] (\flaglength/2,\flagwidth/2) circle (1.25\flagwidth/7);
\fill [gold] (\flaglength/2,\flagwidth/2) circle (\flagwidth/7);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ML.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ML.tex
index 60d3e60fc8..d111faac96 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ML.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ML.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Mali:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{253,218,37}
\definecolor{green}{RGB}{0,177,64}
\vstripesIII{green}{gold}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MM.tex
index 56fdd67fb2..3e7aa1a519 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MM.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Myanmar:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{238,39,55}
\definecolor{green}{RGB}{67,176,42}
\definecolor{gold}{RGB}{255,205,0}
\hstripesIII{gold}{green}{red}
\starV{white}{(0.5\flaglength,0.4648)}{0.3685\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MN.tex
index 34f8be13ac..33e7a68ff9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MN.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Mongolia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{64,126,201}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{red}{RGB}{239,51,64}
@@ -61,5 +61,5 @@
and (-797.4700,253.6500) .. (-783.1900,240.0500) -- cycle;
\end{scope}
\end{scope}\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MR.tex
index f7907922db..1e50cf8d60 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Mauritania:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,177,64}
\definecolor{gold}{RGB}{253,218,37}
@@ -9,5 +9,5 @@
\hbar{green}{0.5}{0.7}
\moon{gold}{(0.5\flaglength,0.59306)}{0.3236}{(0.5\flaglength,0.6875)}{0.3125}
\starV{gold}{(0.5\flaglength,0.6875)}{0.125\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MT.tex
index 9310e6e3a1..95a023999a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Malta:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\definecolor{red}{RGB}{200,16,46}
\definecolor{dark}{RGB}{150,135,125}
@@ -595,5 +595,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MU.tex
index ca180f93e3..9bd78c10f0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MU.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Mauritius:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{238,39,55}
\definecolor{blue}{RGB}{21,31,109}
\definecolor{green}{RGB}{0,159,77}
\definecolor{gold}{RGB}{255,215,0}
\hstripesIV{red}{blue}{gold}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MV.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MV.tex
index 0a39c2d262..b17288bd68 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MV.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MV.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Maledives:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{191,13,62}
\definecolor{green}{RGB}{0,115 103}
\fill [red] (0,0) rectangle (\flaglength,1);
\fill [green] (0.25,0.25) rectangle (\flaglength-0.25\flagwidth,0.75);
\coordinate(p) at (0.5\flaglength,0.5);
\moon{white}{($(p)+(3/48,0)$)}{1/6}{($(p)+(6/48,0)$)}{1/6}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MW.tex
index 06c42e66d9..90639e5ab9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MW.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Malawi:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,150,57}
\hstripesIII{black}{red}{green}
@@ -17,5 +17,5 @@
(3,-3.25) and (2.1667,0) .. (0,0) -- cycle;}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MX.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MX.tex
index 4d9895f970..336c1daacf 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MX.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MX.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Mexico:
% --------------------------------------------------------------------------
-\BeginFlagDescription{4}{7}
+\begin{flagdescription}{4/7}
\definecolor{red}{RGB}{200,16,53}
\definecolor{green}{RGB}{0,99,65}
\vstripesIII{green}{white}{red}
@@ -66,7 +66,7 @@
\definecolor{c513625}{RGB}{81,54,37}
\definecolor{c8b5122}{RGB}{139,81,34}
\definecolor{cf9c83a}{RGB}{249,200,58}
-\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth*\StretchFactor/820]
+\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth*\stretchfactor/820]
\begin{scope}[scale=1.87,xshift=-138mm,yshift=75mm]
\begin{scope}[y=0.8pt, x=0.8pt, yscale=-1, xscale=1]
\begin{scope}[cm={{1.16833,0.0,0.0,1.16833,(-0.699,1.184)}},draw=caa8c30,fill=cfcca3e]
@@ -5398,5 +5398,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MY.tex
index fdfd335863..2562117dcc 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Malaysia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{224,60,49}
\definecolor{blue}{RGB}{4,30,66}
\definecolor{gold}{RGB}{255,209,0}
@@ -11,5 +11,5 @@
\coordinate(p) at (0.25\flaglength,10/14);
\moon{gold}{($(p)-(0.0893,0)$)}{48/224}{($(p)-(0.04464,0)$)}{42/224}
\starn{gold}{14}{($(p)+(0.125,0)$)}{0.17857}{0.0714}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_MZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_MZ.tex
index 93f1ec503b..c15189093d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_MZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_MZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Mozambique:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,115,103}
\definecolor{gold}{RGB}{255,215,0}
@@ -93,5 +93,5 @@
(67.5243,157.5570) .. (65.6121,158.8710) -- cycle;
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NA.tex
index 39989f5618..ef609239e0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NA.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Namibia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{186,12,47}
\definecolor{blue}{RGB}{0,61,165}
\definecolor{green}{RGB}{0,154,68}
@@ -13,9 +13,9 @@
\draw [white, line width=\flagwidth/3] (0,0)--(\flaglength,1);
\draw [red, line width=\flagwidth/4] (0,0)--(\flaglength,1);
\end{scope}
-\begin{scope}[shift={(0.3*\StretchFactor,0.725)}]
+\begin{scope}[shift={(0.3*\stretchfactor,0.725)}]
\starn{gold}{12}{(0,0)}{1/6}{0.1}{0}
\fill [blue, even odd rule] (0,0) circle (0.1) (0,0) circle (1/12);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NATO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NATO.tex
new file mode 100644
index 0000000000..2b145f6b5f
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NATO.tex
@@ -0,0 +1,59 @@
+% --------------------------------------------------------------------------
+% NATO:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{3/4}
+\definecolor{blue}{RGB}{1,33,105}
+\background{blue}
+\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth/577.42]
+\begin{scope}[y=1mm, x=1mm, yscale=-1,shift={(-135.6,-101.47)}]
+\begin{scope}[rotate around={180.0:(135.6,101.47)}]
+\begin{scope}[shift={(427.64,-170.45)}]
+\begin{scope}[rotate around={90.0:(-291.86,271.68)}]
+\fill [white] (-342.7400,271.8400) -- (-292.0990,271.8400) -- (-301.2536,280.9946)
+ -- (-293.2632,316.8456) .. controls (-293.2632,317.2425) and
+ (-293.6336,317.2425) .. (-293.6336,316.8456) -- (-304.2966,283.2966) --
+ cycle(-330.5400,278.3200) .. controls (-327.8942,294.3540) and
+ (-315.3260,307.3180) .. (-298.9490,310.3610) -- (-300.1132,307.3183) ..
+ controls (-313.7922,304.2491) and (-324.8522,293.1893) .. (-327.8942,279.0873)
+ -- cycle;
+\end{scope}
+\fill [white] (-407.1900,273.0600) -- (-407.1900,270.7846) -- (-349.6170,270.7846)
+ -- (-349.6170,273.0600) -- cycle(-293.1800,329.4900) -- (-290.9046,329.4900)
+ -- (-290.9046,353.1970) -- (-293.1800,353.1970) -- cycle;
+\fill [white] (-342.7400,271.8400) -- (-292.0990,271.8400) -- (-301.2536,280.9946)
+ -- (-293.2632,316.8456) .. controls (-293.2632,317.2425) and
+ (-293.6336,317.2425) .. (-293.6336,316.8456) -- (-304.2966,283.2966) --
+ cycle(-330.5400,278.3200) .. controls (-327.8942,294.3540) and
+ (-315.3260,307.3180) .. (-298.9490,310.3610) -- (-300.1132,307.3183) ..
+ controls (-313.7922,304.2491) and (-324.8522,293.1893) .. (-327.8942,279.0873)
+ -- cycle;
+\end{scope}
+\end{scope}
+\begin{scope}[shift={(427.64,-170.45)}]
+\begin{scope}[rotate around={90.0:(-291.86,271.68)}]
+\fill [white] (-342.7400,271.8400) -- (-292.0990,271.8400) -- (-301.2536,280.9946)
+ -- (-293.2632,316.8456) .. controls (-293.2632,317.2425) and
+ (-293.6336,317.2425) .. (-293.6336,316.8456) -- (-304.2966,283.2966) --
+ cycle(-330.5400,278.3200) .. controls (-327.8942,294.3540) and
+ (-315.3260,307.3180) .. (-298.9490,310.3610) -- (-300.1132,307.3183) ..
+ controls (-313.7922,304.2491) and (-324.8522,293.1893) .. (-327.8942,279.0873)
+ -- cycle;
+\end{scope}
+\fill [white] (-407.1900,273.0600) -- (-407.1900,270.7846) -- (-349.6170,270.7846)
+ -- (-349.6170,273.0600) -- cycle(-293.1800,329.4900) -- (-290.9046,329.4900)
+ -- (-290.9046,353.1970) -- (-293.1800,353.1970) -- cycle;
+\fill [white] (-342.7400,271.8400) -- (-292.0990,271.8400) -- (-301.2536,280.9946)
+ -- (-293.2632,316.8456) .. controls (-293.2632,317.2425) and
+ (-293.6336,317.2425) .. (-293.6336,316.8456) -- (-304.2966,283.2966) --
+ cycle(-330.5400,278.3200) .. controls (-327.8942,294.3540) and
+ (-315.3260,307.3180) .. (-298.9490,310.3610) -- (-300.1132,307.3183) ..
+ controls (-313.7922,304.2491) and (-324.8522,293.1893) .. (-327.8942,279.0873)
+ -- cycle;
+\end{scope}
+\fill [white] (129.0600,62.5000) .. controls (112.6820,65.1723) and
+ (99.7440,78.1370) .. (97.0980,94.1440) -- (100.1407,93.0063) .. controls
+ (103.1834,79.2743) and (114.2167,68.2153) .. (127.9217,65.5423) -- cycle;
+\end{scope}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NE.tex
index eedab09dfc..b667181221 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NE.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Niger:
% --------------------------------------------------------------------------
-\BeginFlagDescription{6}{7}
+\begin{flagdescription}{6/7}
\definecolor{orange}{RGB}{255,130,0}
\definecolor{green}{RGB}{0,122,51}
\hstripesIII{orange}{white}{green}
\fill [orange] (0.5\flaglength,0.5) circle (1/12);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NG.tex
index d15b623ba0..c00181550e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NG.tex
@@ -1,8 +1,8 @@
% --------------------------------------------------------------------------
% Nigeria:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{green}{RGB}{0,132,61}
\vstripesIII{green}{white}{green}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NI.tex
index f9aa661a53..b4ea3ca7b9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NI.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Nicaragua:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{blue}{RGB}{0,94,184}
\hstripesIII{blue}{white}{blue}
\ifemblem
@@ -1176,5 +1176,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NL.tex
index c4f327b5e6..ca0dee1b5d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NL.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Netherlands:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,61,165}
\hstripesIII{red}{white}{blue}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NO.tex
index c414610ab0..646a56f259 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NO.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Norway:
% --------------------------------------------------------------------------
-\BeginFlagDescription{8}{11}
+\begin{flagdescription}{8/11}
\definecolor{blue}{RGB}{0,32,91}
\definecolor{red}{RGB}{186,12,47}
\fill [red] (0,0) rectangle (\flaglength,1);
\hbar{white}{0.5}{0.25}
-\vbar{white}{0.5*\StretchFactor}{0.25}
+\vbar{white}{0.5*\stretchfactor}{0.25}
\hbar{blue}{0.5}{0.125}
-\vbar{blue}{0.5*\StretchFactor}{0.125}
-\FrameCode
-\EndFlagDescription
+\vbar{blue}{0.5*\stretchfactor}{0.125}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NP.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NP.tex
index ffcaee2e5b..a72dd54c04 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NP.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NP.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Nepal:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2046}{2500}
+\begin{flagdescription}{2046/2500}
\path (0,0) rectangle (\flaglength,\flagwidth);
\begin{scope}[scale=\flagwidth/247.58]
\definecolor{red}{RGB}{200,16,46}
@@ -22,4 +22,4 @@
\end{scope}
\ifdim\flagframe>0pt\draw [framecolor,line width=\flagframe]
(A)--(B)--(E)--(G)--(C)--cycle;\fi
-\EndFlagDescription
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NR.tex
index 11884f0f13..b42938cdff 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NR.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Nauru:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{gold}{RGB}{255,199,44}
\fill [blue] (0,0) rectangle (\flaglength,\flagwidth);
\hbar{gold}{0.5}{1/12}
\starn{white}{12}{(0.25\flaglength,0.291667)}{1/6}{1/12}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NU.tex
new file mode 100644
index 0000000000..a8acefd70a
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NU.tex
@@ -0,0 +1,19 @@
+% --------------------------------------------------------------------------
+% Niue:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{red}{RGB}{200,16,46}
+\definecolor{blue}{RGB}{0,32,91}
+\definecolor{gold}{RGB}{255,205,0}
+\background{gold};
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\begin{scope}[xshift=0.25\flaglength,yshift=0.75\flagwidth]
+\fill [blue] (0,0) circle (1/12);
+\starV{gold}{(0,0)}{0.075}{0}
+\starV{gold}{(0.125*\flaglength,-0.00476)}{0.05}{0}
+\starV{gold}{(-0.125*\flaglength,-0.00476)}{0.05}{0}
+\starV{gold}{(0,0.16667)}{0.05}{0}
+\starV{gold}{(0,-0.16667)}{0.05}{0}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_NZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_NZ.tex
index 125f42b13d..0790f3e417 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_NZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_NZ.tex
@@ -1,20 +1,20 @@
% --------------------------------------------------------------------------
% New Zealand:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\fill [blue] (0,0) rectangle (\flaglength,1);
-\UnionJack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
\begin{scope}[xshift=0.75\flaglength,yshift=0.5\flagwidth]
\starV{white}{(0,0.3)}{0.07957\flagwidth}{0}
\starV{white}{(0,-0.3)}{0.08834\flagwidth}{0}
-\starV{white}{(-0.231*\StretchFactor,0.0675)}{0.0796\flagwidth}{0}
-\starV{white}{(0.1981*\StretchFactor,0.1278)}{0.071\flagwidth}{0}
+\starV{white}{(-0.231*\stretchfactor,0.0675)}{0.0796\flagwidth}{0}
+\starV{white}{(0.1981*\stretchfactor,0.1278)}{0.071\flagwidth}{0}
\starV{red}{(0,0.3)}{0.05257\flagwidth}{0}
\starV{red}{(0,-0.3)}{0.06134\flagwidth}{0}
-\starV{red}{(-0.231*\StretchFactor,0.0675)}{0.05257\flagwidth}{0}
-\starV{red}{(0.1981*\StretchFactor,0.1278)}{0.04381\flagwidth}{0}
+\starV{red}{(-0.231*\stretchfactor,0.0675)}{0.05257\flagwidth}{0}
+\starV{red}{(0.1981*\stretchfactor,0.1278)}{0.04381\flagwidth}{0}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_OM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_OM.tex
index 374a263170..b6dce06984 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_OM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_OM.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Oman:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{249,66,58}
\definecolor{green}{RGB}{0,154,68}
\hstripesIII{white}{red}{green}
@@ -693,5 +693,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Olympics.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Olympics.tex
index d20aa5cc89..b4e43b1692 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_Olympics.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Olympics.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Olympics:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{8,133,194}
\definecolor{red}{RGB}{237,51,78}
\definecolor{gold}{RGB}{251,177,50}
@@ -22,5 +22,5 @@
\end{scope}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PA.tex
index 43da46d8ca..80b670b8d4 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PA.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Panama:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,40,85}
\fill [red] (0.5\flaglength,0.5) rectangle (\flaglength,1);
\fill [blue] (0,0) rectangle (0.5\flaglength,0.5);
\starV{blue}{(0.25\flaglength,0.737)}{0.138\flagwidth}{0};
\starV{red}{(0.75\flaglength,0.237)}{0.138\flagwidth}{0};
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PE.tex
index e80d27dfbf..51c36d81b5 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PE.tex
@@ -1,8 +1,8 @@
% --------------------------------------------------------------------------
% Peru:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\vstripesIII{red}{white}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PG.tex
index bcdfa13616..ac643fd307 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PG.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Papua New Guinea:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{3}{4}
+\begin{flagdescription}{3/4}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{255,205,0}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -91,5 +91,5 @@
\starV{white}{(21,0)}{\flagwidth/16}{0}
\starV{white}{(9,-20)}{\flagwidth/28.8}{0}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PH.tex
index 5c0c050e82..459684b855 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PH.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Philippines:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{191,13,55}
\definecolor{blue}{RGB}{0,51,160}
\definecolor{gold}{RGB}{254,209,65}
@@ -26,5 +26,5 @@
\fill (h)--(\w+7.5:0.5)--(\w+11.25:0.5)--cycle;
\fill (h)--(\w-7.5:0.5)--(\w-11.25:0.5)--cycle;}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PK.tex
index 6ad60d4bb0..71f99e4896 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PK.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Pakistan:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{green}{RGB}{1,65,28}
\fill [green] (0,0) rectangle (\flaglength,1);
\fill [white] (0,0) rectangle (\flaglength/4,1);
@@ -10,5 +10,5 @@
\coordinate (p3) at ($(p1)+(41.63:0.2)$);
\moon{white}{(p1)}{0.3}{(p2)}{0.275}
\starV{white}{(p3)}{0.1\flagwidth}{23.63}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PL.tex
index ba5133acdc..34d0a30230 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PL.tex
@@ -1,8 +1,8 @@
% -------------------------------------------------------------
% Poland:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{red}{RGB}{210,38,48}
\hstripesII{white}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PS.tex
new file mode 100644
index 0000000000..fb084c671d
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PS.tex
@@ -0,0 +1,10 @@
+% -------------------------------------------------------------
+% Palestine:
+% ---------------------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{red}{RGB}{200,16,46}
+\definecolor{green}{RGB}{0,122,51}
+\hstripesIII{black}{white}{green}
+\chevron{red}{2/3}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PT.tex
index 65fc9f5736..f38b01eb43 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Portugal:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{218,41,28}
\definecolor{gold}{RGB}{255,233,0}
\definecolor{green}{RGB}{4,106,56}
@@ -373,5 +373,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PW.tex
index 0e8fe38ac2..761a0eb99a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PW.tex
@@ -1,10 +1,10 @@
% -------------------------------------------------------------
% Palau:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{blue}{RGB}{65,143,222}
\definecolor{gold}{RGB}{247,234,72}
\fill[blue] (0,0) rectangle (\flaglength,1);
\fill[gold] (0.4375\flaglength,0.5) circle (0.3);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_PY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_PY.tex
index edf50130df..9e4e20c8fd 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_PY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_PY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Paraguay:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{191,13,62}
\definecolor{blue}{RGB}{0,51,160}
\definecolor{green}{RGB}{0,150,57}
@@ -741,5 +741,5 @@
(641.4230,317.0740);
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_QA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_QA.tex
index db5cc78936..504d043d95 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_QA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_QA.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Quatar:
% --------------------------------------------------------------------------
-\BeginFlagDescription{11}{28}
+\begin{flagdescription}{11/28}
\definecolor{maroon}{RGB}{138,21,56}
\fill [white] (0,0) rectangle (\flaglength,1);
\fill [maroon] (\flaglength,0)--(0.32143\flaglength,0)--++(-\flagwidth/22,0)
\foreach \n in{1,...,9}
{--++(\flagwidth/5.5,\flagwidth/18)--++(-\flagwidth/5.5,\flagwidth/18)}
--(\flaglength,1)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_RO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_RO.tex
index 73501cfe95..bc3b961ebe 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_RO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_RO.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Romania:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{gold}{RGB}{255,205,0}
\vstripesIII{blue}{gold}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_RS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_RS.tex
index be4f96e743..7a58487ddc 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_RS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_RS.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Serbia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{228,0,70}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{gold}{RGB}{255,199,44}
@@ -12,7 +12,7 @@
\hstripesIII{red}{blue}{white}
\ifemblem
\newdimen\lw\lw=0.0015\flagwidth
-\begin{scope}[xshift=0.3483\flagwidth*\StretchFactor]
+\begin{scope}[xshift=0.3483\flagwidth*\stretchfactor]
\begin{scope}[scale=0.00336\flagwidth,xshift=-37mm,yshift=105.5mm]
\begin{scope}[y=0.80pt, x=0.80pt, yscale=-1, xscale=1, inner sep=0pt, outer sep=0pt]
\begin{scope}[even odd rule]
@@ -2797,5 +2797,5 @@ line width=\lw] (-33.7050,261.9075) -- (-35.7557,258.4057) ..
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_RU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_RU.tex
index 9247756e33..e372e3d8ea 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_RU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_RU.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Russia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{218,41,28}
\definecolor{blue}{RGB}{0,61,165}
\hstripesIII{white}{blue}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_RW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_RW.tex
index a51e6074ca..48e9ede0cb 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_RW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_RW.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Rwanda:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{green}{RGB}{0,119,73}
\definecolor{blue}{RGB}{0,119,200}
\definecolor{orange}{RGB}{239,163,0}
@@ -13,5 +13,5 @@
\starn{orange}{24}{(c)}{0.16154}{0.046154}{0}
\fill [blue] (c) circle (3/65);
\fill [orange] (c) circle (11/260);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Rainbow.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Rainbow.tex
index a979ad7224..5ab27c58c9 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_Rainbow.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Rainbow.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Rainbow Flag:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
%\definecolor{blue}{RGB}{8,133,194}
%\definecolor{red}{RGB}{237,51,78}
%\definecolor{gold}{RGB}{251,177,50}
@@ -12,5 +12,5 @@
\fill [green] (0,2/6) rectangle (\flaglength,3/6);
\fill [blue] (0,1/6) rectangle (\flaglength,2/6);
\fill [violet] (0,0) rectangle (\flaglength,1/6);
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_RedCross.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_RedCross.tex
index 1f27d25019..5b585b2e21 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_RedCross.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_RedCross.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Red Cross:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{218,41,28}
\fill [white] (0,0) rectangle (\flaglength,1);
\begin{scope}[shift={(0.5\flaglength,0.5)},x=\flagwidth/32,y=\flagwidth/32]
\fill [red] (3,10)|-(10,3)|-(3,-3)|-(-3,-10)|-(-10,-3)|-(-3,3)|-cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SA.tex
index fbb15126a0..178af92f64 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SA.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Saudi Arabia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{green}{RGB}{4,106,56} % Pantone 349 C
\fill [green] (0,0) rectangle (\flaglength,1);
\ifemblem
@@ -661,5 +661,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SB.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SB.tex
index c0a12d2a97..bf59d15b1f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SB.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SB.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Solomon Islands:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{green}{RGB}{0,103,71}
\definecolor{blue}{RGB}{0,94,184}
\definecolor{gold}{RGB}{253,218,37}
@@ -11,11 +11,11 @@
\clip (0,0) rectangle (\flaglength,1);
\draw [gold,line width=0.1\flagwidth] (0,0)--(\flaglength,1);
\end{scope}
-\coordinate (c) at (0.35*\StretchFactor,0.7);
-\starV{white}{(c)}{0.1\flagwidth*\StretchFactor}{0}
-\starV{white}{($(c)+(45:0.26*\StretchFactor)$)}{0.1\flagwidth*\StretchFactor}{0}
-\starV{white}{($(c)+(135:0.26*\StretchFactor)$)}{0.1\flagwidth*\StretchFactor}{0}
-\starV{white}{($(c)+(225:0.26*\StretchFactor)$)}{0.1\flagwidth*\StretchFactor}{0}
-\starV{white}{($(c)+(315:0.26*\StretchFactor)$)}{0.1\flagwidth*\StretchFactor}{0}
-\FrameCode
-\EndFlagDescription
+\coordinate (c) at (0.35*\stretchfactor,0.7);
+\starV{white}{(c)}{0.1\flagwidth*\stretchfactor}{0}
+\starV{white}{($(c)+(45:0.26*\stretchfactor)$)}{0.1\flagwidth*\stretchfactor}{0}
+\starV{white}{($(c)+(135:0.26*\stretchfactor)$)}{0.1\flagwidth*\stretchfactor}{0}
+\starV{white}{($(c)+(225:0.26*\stretchfactor)$)}{0.1\flagwidth*\stretchfactor}{0}
+\starV{white}{($(c)+(315:0.26*\stretchfactor)$)}{0.1\flagwidth*\stretchfactor}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SC.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SC.tex
index 6911365eee..2641f5d291 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SC.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SC.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Seychelles:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{210,38,48}
\definecolor{blue}{RGB}{0,47,108}
\definecolor{gold}{RGB}{254,209,65}
@@ -11,5 +11,5 @@
\fill [red] (0,0)--(2/3*\flaglength,1)--(\flaglength,1)--(\flaglength,0)--cycle;
\fill [white] (0,0)--(\flaglength,2/3)--(\flaglength,0)--cycle;
\fill [green] (0,0)--(\flaglength,1/3)--(\flaglength,0)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SD.tex
index a52a3ca28f..bf7e19703a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SD.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Sudan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,122,51}
\hstripesIII{red}{white}{black}
\fill [green] (0,0)--(0.6667,0.5)--(0,1)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SE.tex
index 5396a144bb..cc6c3c0856 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SE.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Sweden:
% --------------------------------------------------------------------------
-\BeginFlagDescription{5}{8}
+\begin{flagdescription}{5/8}
\definecolor{blue}{RGB}{0,75,135}
\definecolor{gold}{RGB}{255,209,0}
\fill [blue] (0,0) rectangle (\flaglength,1);
\hbar{gold}{0.5}{0.2}{}
-\vbar{gold}{0.6*\StretchFactor}{0.2}
-\FrameCode
-\EndFlagDescription
+\vbar{gold}{0.6*\stretchfactor}{0.2}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SG.tex
index 0a5abea12a..d3835d8108 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SG.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Singapore:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{239,51,64}
\hstripesII{red}{white}
\moon{white}{(0.316,0.75)}{0.184}{(0.41667,0.75)}{0.2014}
\foreach \w in {90,162,234,306,378}
{\starV{white}{($(0.41667,0.75)+(\w:0.105556)$)}{\flagwidth/22.5}{0}}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SI.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SI.tex
index 20a1bb586e..cbc2714a4f 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SI.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SI.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Slovenia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{0,61,165}
\definecolor{gold}{RGB}{255,205,0}
\hstripesIII{white}{blue}{red}
\ifemblem
-\begin{scope}[xshift=0.373\flagwidth*\StretchFactor]
+\begin{scope}[xshift=0.373\flagwidth*\stretchfactor]
\begin{scope}[scale=0.207\flagwidth,xshift=-0.625mm,yshift=1.71mm]
\begin{scope}[y=0.80pt, x=0.80pt, yscale=-1, xscale=1, inner sep=0pt, outer sep=0pt]
\begin{scope}[cm={{0.021,0.0,0.0,0.021,(-0.10648,3.47799)}}]
@@ -85,5 +85,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SK.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SK.tex
index 1793c32210..59496677fc 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SK.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SK.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Slovakia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\definecolor{blue}{RGB}{0,61,165}
\hstripesIII{white}{blue}{red}
\ifemblem
-\begin{scope}[xshift=\flagwidth/4*\StretchFactor]
+\begin{scope}[xshift=\flagwidth/4*\stretchfactor]
\begin{scope}[scale=0.00208\flagwidth,yshift=169mm,xshift=-41.7mm]
\begin{scope}[y=0.8pt, x=0.8pt, yscale=-1, xscale=1, inner sep=0pt, outer sep=0pt]
\fill [white] (393.4790,141.0000) -- (385.3760,141.0000) -- (269.9170,141.0000) --
@@ -61,5 +61,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SL.tex
index 6ea103a5bb..b38b916454 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SL.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Sierra Leone:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{65,143,222}
\definecolor{green}{RGB}{122,154,1}
\hstripesIII{green}{white}{blue}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SM.tex
index a89c6a433f..831fd87a5b 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SM.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% San Marino:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{4}
+\begin{flagdescription}{3/4}
\definecolor{blue}{RGB}{98,181,229}
\definecolor{dblue}{RGB}{78,135,160}
\definecolor{gold}{RGB}{255,205,0}
@@ -3094,5 +3094,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SN.tex
index 69f95b5100..aa9c1f3e5e 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SN.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Senegal:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{green}{RGB}{0,177,64}
\vstripesIII{green}{gold}{red}
\starV{green}{(0.5\flaglength,0.5)}{\flagwidth/6}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SO.tex
index c2a262334b..a9275890bf 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SO.tex
@@ -1,9 +1,9 @@
% --------------------------------------------------------------------------
% Somalia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,163,224}
\fill [blue] (0,0) rectangle (\flaglength,1);
\starV{white}{(0.5\flaglength,0.4824)}{0.1843\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SR.tex
index c1cab1b4d7..15b571a11b 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SR.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Suriname:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,122,51}
\definecolor{gold}{RGB}{255,205,0}
@@ -9,5 +9,5 @@
\hbar{white}{0.5}{0.6}
\hbar{red}{0.5}{0.4}
\starV{gold}{(0.5\flaglength,0.4809)}{0.2\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SS.tex
index 2dbcdd2bce..4137c57d5c 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SS.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% South Sudan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{190,58,52}
\definecolor{green}{RGB}{0,103,71}
\definecolor{blue}{RGB}{0,51,160}
@@ -12,5 +12,5 @@
\fill [black] (0,0.7) rectangle (\flaglength,1);
\fill [blue] (0,0)--(30:1)--(0,1)--cycle;
\starV{gold}{(0.2887,0.5)}{\flagwidth/6}{18}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ST.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ST.tex
index 01065318e1..105253b760 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ST.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ST.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Sao Tome and Principe:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{67,176,42}
\definecolor{gold}{RGB}{255,205,0}
@@ -10,5 +10,5 @@
\fill [red] (0,0)--(0.25\flaglength,0.5)--(0,1)--cycle;
\starV{black}{(0.5\flaglength,0.5)}{\flagwidth/7}{0}
\starV{black}{(0.75\flaglength,0.5)}{\flagwidth/7}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SV.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SV.tex
index 0338f0d9ab..7dae8e7be5 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SV.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SV.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% EL Salvador:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{blue}{RGB}{0,20,137}
\hstripesIII{blue}{white}{blue}
\ifemblem
@@ -7792,5 +7792,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SY.tex
index 1d00a71a0f..ea3429be32 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SY.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Syria:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,177,64}
\hstripesIII{red}{white}{black}
\starV{green}{(\flaglength/3,0.5)}{1/12}{0}
\starV{green}{(2*\flaglength/3,0.5)}{1/12}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_SZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_SZ.tex
index 113dd60616..86e67a42b7 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_SZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_SZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Swaziland:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{213,0,50}
\definecolor{blue}{RGB}{0,175,215}
\definecolor{gold}{RGB}{252,227,0}
@@ -235,5 +235,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Somaliland.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Somaliland.tex
new file mode 100644
index 0000000000..d64e69e576
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Somaliland.tex
@@ -0,0 +1,496 @@
+% --------------------------------------------------------------------------
+% Somaliland:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{green}{RGB}{0,109,33}
+\definecolor{red}{RGB}{223,0,0}
+\hstripesIII{green}{white}{red}
+\starV{black}{(0.5\flaglength,0.5)}{0.1}{0}
+\begin{scope}[shift={(0.5\flaglength,0.5\flagwidth)},scale=\flagwidth/170.72]
+\begin{scope}[y=0.1mm, x=0.1mm, yscale=-1,shift={(-600,-300)}]
+\begin{scope}[cm={{1.2,0.0,0.0,1.2,(155.92403,-121.0068)}},fill=white,even odd rule]
+\path[fill] (187.5160,140.6160) .. controls (186.6570,152.2050) and
+ (185.6260,172.5990) .. (195.4730,174.6910) .. controls (207.3830,175.8360) and
+ (200.8160,154.5330) .. (205.1270,150.6700) .. controls (205.9420,148.7610) and
+ (207.4450,148.7510) .. (207.5690,151.1590) -- (207.5690,169.2290) .. controls
+ (207.4600,175.1050) and (211.3230,176.8360) .. (214.3240,178.0500) .. controls
+ (217.4470,177.8090) and (219.5320,177.9130) .. (220.7560,180.9520) .. controls
+ (221.2440,191.3710) and (221.7330,201.7900) .. (222.2210,212.2090) .. controls
+ (222.2210,212.2090) and (229.4640,214.2820) .. (229.8090,194.6280) .. controls
+ (230.1550,183.0880) and (227.5040,173.4280) .. (229.0580,171.1830) .. controls
+ (229.1130,168.9770) and (231.9300,168.8450) .. (233.8840,169.9200) .. controls
+ (236.9970,172.1160) and (238.3840,174.8280) .. (243.2220,173.7430) .. controls
+ (250.5840,171.7150) and (255.0090,168.1340) .. (255.1180,162.4810) .. controls
+ (254.6880,157.1090) and (254.0860,151.7360) .. (251.7580,146.3640) .. controls
+ (252.0830,145.3870) and (250.3370,142.8560) .. (250.6610,141.8790) .. controls
+ (251.9840,143.9510) and (253.9970,143.7790) .. (254.4550,141.8790) .. controls
+ (253.2020,137.7500) and (251.2580,133.7940) .. (248.1060,132.0820) .. controls
+ (245.5010,129.7870) and (241.6890,130.2560) .. (240.2930,135.0420) .. controls
+ (239.6460,140.5570) and (242.2810,147.1090) .. (246.2970,152.4510) .. controls
+ (247.1500,154.5380) and (248.3480,158.0060) .. (247.8210,161.1290) .. controls
+ (245.6840,162.3480) and (243.5470,161.8400) .. (241.7570,159.9500) .. controls
+ (241.7570,159.9500) and (235.8970,155.5550) .. (235.8970,154.5780) .. controls
+ (237.4520,144.6220) and (236.2420,143.4930) .. (235.3800,140.7300) .. controls
+ (234.7780,136.9160) and (232.9680,135.6930) .. (231.5020,133.0880) .. controls
+ (230.0360,131.5340) and (228.0530,131.5340) .. (227.1050,133.0880) .. controls
+ (224.5150,137.5780) and (225.7230,147.2170) .. (227.5940,151.5340) .. controls
+ (228.9460,155.5050) and (231.0120,157.9970) .. (230.0360,157.9970) .. controls
+ (229.2320,160.2410) and (227.5700,159.7230) .. (226.3610,157.1330) .. controls
+ (224.6350,151.7800) and (224.2890,143.7930) .. (224.2890,140.1960) .. controls
+ (223.7710,135.7370) and (223.2020,126.2260) .. (220.2670,123.8090) .. controls
+ (218.4770,121.3710) and (215.8230,122.5600) .. (214.8960,124.7850) .. controls
+ (214.7030,129.2110) and (214.6830,133.6360) .. (215.1810,137.7150) .. controls
+ (217.1940,144.8690) and (217.8260,151.1590) .. (218.8030,158.4850) .. controls
+ (219.0740,168.2980) and (213.1290,162.7430) .. (213.4010,157.8780) .. controls
+ (214.7720,151.5590) and (214.4160,141.6130) .. (213.1980,139.0920) .. controls
+ (212.2320,136.5710) and (211.0920,135.9490) .. (208.7430,136.3640) .. controls
+ (206.8780,136.2500) and (202.0790,141.4900) .. (200.7320,150.1820) .. controls
+ (200.7320,150.1820) and (199.5830,154.6560) .. (199.0930,158.6280) .. controls
+ (198.4340,163.1170) and (195.4790,166.2850) .. (193.4070,157.9970) .. controls
+ (191.6160,151.9730) and (190.5150,137.1430) .. (187.5160,140.6160) -- cycle;
+
+\path[fill] (219.8800,188.1610) .. controls (209.3700,193.2990) and
+ (199.2050,198.0920) .. (188.8660,203.0570) .. controls (189.2440,196.0270) and
+ (203.6110,183.3370) .. (213.4090,183.1580) .. controls (219.7860,183.3360) and
+ (218.1840,185.6290) .. (219.8800,188.1610) -- cycle;
+
+\path[fill] (214.4620,197.8790) .. controls (198.1170,240.0120) and
+ (252.7370,245.8830) .. (258.8410,199.6050) .. controls (259.4160,197.7060) and
+ (261.7190,195.8060) .. (262.1220,198.9140) .. controls (260.8550,240.8160) and
+ (219.8730,243.6950) .. (212.9090,230.5130) .. controls (211.1830,227.4060) and
+ (210.6640,220.4990) .. (210.4910,216.3540) .. controls (209.4550,208.1240) and
+ (205.1390,211.2890) .. (204.4480,219.4620) .. controls (203.7570,224.0090) and
+ (203.9300,225.2770) .. (203.9300,229.6510) .. controls (206.1170,262.7470) and
+ (258.9000,248.5300) .. (267.4750,221.1900) .. controls (272.0220,206.0510) and
+ (266.7260,194.8860) .. (269.2010,194.9420) .. controls (274.4390,200.5840) and
+ (281.7480,195.6910) .. (283.3600,193.7340) .. controls (284.0510,192.7550) and
+ (285.7790,192.1230) .. (286.9870,193.3890) .. controls (291.0730,196.3260) and
+ (298.2700,194.9420) .. (299.7650,189.7620) .. controls (300.6290,184.6970) and
+ (301.3200,179.4590) .. (301.4930,174.0500) .. controls (298.1530,175.0870) and
+ (295.6790,175.7760) .. (295.4490,177.1580) .. controls (295.2180,178.6550) and
+ (294.9890,180.1500) .. (294.7580,181.6470) .. controls (294.4710,183.0870) and
+ (291.5910,183.1430) .. (291.4770,181.3010) .. controls (290.2110,175.5450) and
+ (284.9730,174.7970) .. (281.8070,183.7200) .. controls (279.6770,185.4460) and
+ (275.8210,185.7920) .. (275.4170,183.2020) .. controls (275.9350,177.2160) and
+ (273.5170,176.4090) .. (268.6830,179.2300) .. controls (267.1290,167.3730) and
+ (265.5760,156.0340) .. (264.0210,144.1770) .. controls (266.0360,144.1190) and
+ (267.8790,145.6150) .. (269.7210,143.3130) .. controls (267.7040,137.0400) and
+ (263.4460,124.2040) .. (261.0850,123.2830) .. controls (259.9340,121.9020) and
+ (258.9540,122.7650) .. (257.4590,123.1100) .. controls (254.9270,123.9160) and
+ (252.5660,126.1030) .. (253.3140,130.3630) .. controls (256.3070,148.5510) and
+ (258.2650,162.4230) .. (261.2580,180.6120) .. controls (261.7180,182.7420) and
+ (259.9340,185.5600) .. (257.6320,185.2730) .. controls (253.7180,182.6250) and
+ (252.7420,177.2730) .. (246.0630,177.5020) .. controls (241.2280,177.5600) and
+ (235.7010,182.7980) .. (235.0120,187.8650) .. controls (234.2060,191.8920) and
+ (233.9170,196.2660) .. (235.0100,199.7780) .. controls (238.4080,203.8640) and
+ (242.4940,203.4630) .. (246.0630,202.5410) .. controls (248.9980,201.3330) and
+ (251.4150,198.3970) .. (252.4520,199.0870) .. controls (253.1430,199.9510) and
+ (252.6230,209.6190) .. (238.6370,217.0450) .. controls (230.1760,220.8440) and
+ (223.4410,221.7080) .. (219.8170,214.8000) .. controls (217.5720,210.4830) and
+ (219.9890,194.0790) .. (214.4620,197.8790) -- cycle;
+
+\path[fill] (283.7920,155.0520) .. controls (287.0730,153.8430) and
+ (302.6160,136.0580) .. (302.6160,136.0580) .. controls (301.8090,135.3670) and
+ (301.0890,134.8490) .. (300.2830,134.1580) .. controls (299.4190,133.4100) and
+ (299.5060,132.6620) .. (300.2830,131.9130) .. controls (304.1390,129.6690) and
+ (302.9020,124.7470) .. (300.8880,122.5030) .. controls (297.5490,121.0060) and
+ (294.6420,121.4950) .. (292.5120,122.5890) .. controls (289.8070,125.1790) and
+ (289.1750,129.3230) .. (291.3050,131.9130) .. controls (293.3780,132.8920) and
+ (295.4490,134.9930) .. (294.0670,136.1440) .. controls (287.7080,142.9360) and
+ (270.2960,154.6490) .. (272.3110,155.0520) .. controls (272.7410,155.6280) and
+ (283.4480,155.5990) .. (283.7920,155.0520) -- cycle;
+
+\path[fill] (189.9340,217.9920) .. controls (184.1050,227.2780) and
+ (183.5980,241.1510) .. (186.8140,245.2870) .. controls (188.5230,247.2410) and
+ (191.3310,248.0970) .. (193.4080,247.4850) .. controls (197.0700,245.8970) and
+ (198.6730,238.4770) .. (197.8040,235.7630) .. controls (196.5820,233.8500) and
+ (195.6190,233.5470) .. (194.3990,235.1740) .. controls (191.8220,240.4060) and
+ (190.7520,236.8170) .. (190.5260,233.8930) .. controls (190.1310,228.3480) and
+ (190.6530,223.2410) .. (191.2550,219.1970) .. controls (191.8960,215.0520) and
+ (191.2440,216.3190) .. (189.9340,217.9920) -- cycle;
+
+\path[fill] (439.0170,203.1220) .. controls (433.3810,190.9910) and
+ (425.5790,179.0030) .. (423.0960,174.3980) .. controls (420.6140,169.7910) and
+ (401.8730,142.5930) .. (399.1140,139.5340) .. controls (393.0260,132.2990) and
+ (409.0000,142.5470) .. (397.0930,128.1830) .. controls (392.5530,124.2880) and
+ (392.2890,124.0510) .. (388.5210,120.8730) .. controls (386.6200,119.5240) and
+ (381.9790,117.0600) .. (381.1570,121.1440) .. controls (380.7440,124.7450) and
+ (380.9670,126.6980) .. (381.5720,129.6960) .. controls (382.0360,131.6950) and
+ (384.9480,135.0430) .. (386.3800,136.9830) .. controls (405.3940,162.5410) and
+ (422.2540,188.3520) .. (438.5130,220.8040) .. controls (441.0800,219.5840) and
+ (440.5190,205.1520) .. (439.0170,203.1220) -- cycle;
+
+\path[fill] (414.2790,243.7100) .. controls (413.1710,244.9540) and
+ (417.0150,250.2750) .. (422.0110,250.2700) .. controls (430.3660,249.3000) and
+ (437.7210,244.6070) .. (444.5310,232.2530) .. controls (446.3520,229.3720) and
+ (449.5530,223.2100) .. (449.6470,218.4300) .. controls (450.2840,190.4050) and
+ (448.2440,168.5980) .. (444.0450,148.3430) .. controls (443.7760,146.3700) and
+ (443.9400,144.0510) .. (444.2740,143.4590) .. controls (444.8150,142.8130) and
+ (446.6500,143.4620) .. (447.6230,141.8660) .. controls (449.0510,140.4080) and
+ (443.8310,128.3310) .. (440.8550,123.6790) .. controls (439.7980,121.6020) and
+ (439.4300,120.2150) .. (437.6810,123.9230) .. controls (435.8410,126.9370) and
+ (434.6050,132.1960) .. (434.7500,137.1100) .. controls (438.7360,164.7050) and
+ (439.9600,188.8460) .. (442.5650,216.4420) .. controls (442.7770,219.1110) and
+ (442.3850,222.9890) .. (440.6110,224.5350) .. controls (434.0490,231.3870) and
+ (424.5780,239.8210) .. (414.2790,243.7100) -- cycle;
+
+\path[fill] (527.1450,243.5620) .. controls (521.1490,247.0280) and
+ (521.1420,251.0150) .. (525.9900,251.1590) .. controls (534.3450,250.1890) and
+ (544.2170,249.4950) .. (551.0270,239.2140) .. controls (552.8490,236.3330) and
+ (555.0130,228.5420) .. (555.1070,223.7620) .. controls (555.7440,195.7370) and
+ (554.7410,174.8190) .. (550.5420,154.5640) .. controls (550.2730,152.5910) and
+ (549.4000,148.0500) .. (549.7340,147.4580) .. controls (550.2750,146.0710) and
+ (552.9990,147.6090) .. (553.9720,146.0130) .. controls (555.4000,144.5550) and
+ (546.9210,133.6630) .. (543.9450,129.0110) .. controls (542.8880,126.9340) and
+ (542.5200,125.5470) .. (540.7710,129.2550) .. controls (538.9310,132.2690) and
+ (538.2880,137.6760) .. (539.0250,142.4420) .. controls (543.4550,172.4070) and
+ (546.7530,194.9190) .. (547.4330,221.4780) .. controls (547.0520,223.9990) and
+ (546.9570,225.3580) .. (545.7750,228.5340) .. controls (543.1600,231.8860) and
+ (540.2630,236.0770) .. (537.5460,238.1030) .. controls (534.8300,240.1280) and
+ (529.0350,242.0610) .. (527.1450,243.5620) -- cycle;
+
+\path[fill] (531.6390,216.7000) .. controls (531.5700,209.6920) and
+ (531.7380,203.6410) .. (531.5070,198.4140) .. controls (531.2770,193.1870) and
+ (530.3530,188.9310) .. (528.5440,185.2210) .. controls (526.8320,181.2430) and
+ (527.8950,178.0460) .. (527.0910,173.8090) .. controls (526.2880,169.5730) and
+ (526.4860,163.2290) .. (525.2720,158.2020) .. controls (524.9390,156.2390) and
+ (523.9190,149.9520) .. (524.2340,149.3490) .. controls (524.7290,147.9460) and
+ (526.6140,149.3930) .. (527.5350,147.7670) .. controls (528.9140,146.2640) and
+ (522.7520,130.3200) .. (519.6260,125.7670) .. controls (518.5020,123.7260) and
+ (516.4610,124.4250) .. (513.9440,127.7440) .. controls (511.6100,129.9280) and
+ (512.4760,134.9090) .. (513.3670,139.6480) .. controls (519.3620,170.9340) and
+ (523.8340,199.2510) .. (522.8580,229.0330) .. controls (522.5590,231.5650) and
+ (531.7010,221.4800) .. (531.6390,216.7000) -- cycle;
+
+\path[fill] (487.3400,177.8920) .. controls (483.5690,177.8230) and
+ (475.6710,170.5540) .. (473.3660,166.2950) .. controls (472.4950,163.8520) and
+ (473.0540,161.4690) .. (473.8220,160.0730) .. controls (475.2180,159.1650) and
+ (477.3660,158.1450) .. (478.9720,159.1230) .. controls (478.9720,159.1230) and
+ (480.6370,161.4530) .. (480.3150,161.7490) .. controls (482.3740,162.7350) and
+ (483.2480,162.1680) .. (483.4570,161.3300) .. controls (483.5970,159.8640) and
+ (482.8480,158.9900) .. (482.8400,157.3750) .. controls (483.7130,152.9950) and
+ (488.7190,152.3140) .. (490.6040,155.1070) .. controls (491.9840,156.8100) and
+ (492.4900,160.4280) .. (492.6990,162.8710) .. controls (492.6770,164.1190) and
+ (490.6560,162.6550) .. (489.5080,162.9550) .. controls (488.3590,163.2560) and
+ (488.0830,164.5810) .. (487.9940,165.7800) .. controls (487.7860,168.9560) and
+ (487.4100,174.0520) .. (487.3400,177.8920) -- cycle;
+
+\path[fill] (417.7530,224.4690) .. controls (418.7920,214.9470) and
+ (417.3690,197.9890) .. (417.2740,192.3700) .. controls (416.8930,179.0960) and
+ (414.7250,153.4580) .. (413.6930,149.1750) .. controls (412.5300,141.1010) and
+ (417.0140,150.0610) .. (416.3930,145.3680) .. controls (414.9390,137.3050) and
+ (410.4670,131.8400) .. (405.2100,124.4550) .. controls (403.5150,122.0530) and
+ (403.5720,121.5630) .. (400.9550,125.0440) .. controls (398.0590,131.6140) and
+ (400.5590,136.1330) .. (401.3070,141.2490) .. controls (405.0980,157.9190) and
+ (407.3100,173.2580) .. (408.3400,188.4210) .. controls (409.3700,203.5850) and
+ (409.6860,219.9790) .. (408.7460,235.9490) .. controls (411.5870,236.0610) and
+ (416.1550,231.3530) .. (417.7530,224.4690) -- cycle;
+
+\path[fill] (544.4730,209.2170) .. controls (537.8240,198.0600) and
+ (527.7900,185.9770) .. (525.1090,181.4840) .. controls (522.4290,176.9900) and
+ (499.7570,147.7380) .. (496.8680,144.8020) .. controls (488.5740,136.0890) and
+ (500.6720,143.3840) .. (495.2800,136.6540) .. controls (490.7200,131.6470) and
+ (489.3900,130.0750) .. (485.4870,127.0640) .. controls (483.5300,125.7990) and
+ (482.3440,123.3840) .. (481.7010,127.5000) .. controls (481.4450,131.1160) and
+ (481.1780,135.2990) .. (481.4210,138.3470) .. controls (481.4070,140.0410) and
+ (483.1710,143.2240) .. (484.6860,145.1000) .. controls (504.7950,169.8060) and
+ (526.7280,195.0330) .. (544.3850,226.7460) .. controls (546.8970,225.4150) and
+ (546.0620,211.1800) .. (544.4730,209.2170) -- cycle;
+
+\path[fill=green] (242.7920,188.6320) .. controls (242.3130,189.4710) and
+ (241.2480,190.5580) .. (241.6050,191.6830) .. controls (242.3520,192.6950) and
+ (242.9480,192.9000) .. (244.1920,192.9550) .. controls (245.2710,192.9550) and
+ (246.7790,193.2100) .. (247.1030,192.5730) .. controls (247.6840,191.9330) and
+ (248.1260,190.6270) .. (247.6420,189.3940) .. controls (246.5180,186.5850) and
+ (243.3790,187.6320) .. (242.7920,188.6320) -- cycle;
+
+\path[fill] (306.7840,131.0670) .. controls (300.7300,148.3700) and
+ (310.2520,167.2970) .. (316.8540,165.4540) .. controls (321.6170,167.4260) and
+ (324.6500,158.3650) .. (326.6000,148.4380) .. controls (327.9340,145.6520) and
+ (328.9420,145.3550) .. (329.6270,146.7870) .. controls (329.4510,159.9880) and
+ (330.5750,162.9120) .. (333.9690,166.9190) .. controls (341.5400,172.7600) and
+ (347.8030,167.6650) .. (348.2940,167.1730) .. controls (348.7850,166.6820) and
+ (354.1890,161.2780) .. (354.1890,161.2780) .. controls (355.5010,159.8980) and
+ (357.2480,159.8170) .. (359.1010,161.0330) .. controls (360.9020,162.6700) and
+ (360.6490,165.4980) .. (364.5050,167.4590) .. controls (367.7500,168.7570) and
+ (374.6880,167.7590) .. (376.2950,164.9630) .. controls (378.4580,161.2560) and
+ (378.9770,159.9830) .. (379.9790,158.5770) .. controls (381.5230,156.5220) and
+ (384.1550,157.4360) .. (384.1550,158.0850) .. controls (383.9090,159.2310) and
+ (382.3640,160.3780) .. (383.4180,162.4420) .. controls (385.2540,163.8190) and
+ (385.6780,162.9330) .. (386.7640,162.6270) .. controls (390.6050,160.7910) and
+ (393.4890,152.4360) .. (393.4890,152.4360) .. controls (393.6590,149.3280) and
+ (391.9170,149.5850) .. (390.7870,150.2250) .. controls (389.3130,151.1260) and
+ (389.2170,151.4140) .. (387.7430,152.3150) .. controls (385.8650,152.5940) and
+ (382.2220,153.8390) .. (380.4210,151.0500) .. controls (378.5820,147.6970) and
+ (378.5570,143.0190) .. (377.1510,139.6370) .. controls (377.1510,139.3910) and
+ (374.7110,134.3100) .. (376.9820,133.9850) .. controls (378.1280,134.1980) and
+ (380.5730,134.8450) .. (380.9620,132.7860) .. controls (382.1640,130.7790) and
+ (378.3880,125.0960) .. (375.8040,122.2240) .. controls (373.5610,119.7620) and
+ (370.4530,119.4650) .. (367.4530,121.9790) .. controls (365.3520,123.9120) and
+ (365.6540,126.0720) .. (365.2420,128.1190) .. controls (364.7070,130.4700) and
+ (364.8210,133.3620) .. (367.2070,136.4700) .. controls (369.3040,140.6050) and
+ (373.1300,145.9300) .. (371.8740,153.4180) .. controls (371.8740,153.4180) and
+ (369.6390,156.9570) .. (365.7450,156.4940) .. controls (364.1220,156.1400) and
+ (361.4900,155.4510) .. (360.0840,145.0670) .. controls (359.0200,137.2070) and
+ (360.3350,126.2100) .. (356.9990,121.0540) .. controls (355.7940,117.9410) and
+ (354.9140,114.9350) .. (351.9780,120.2590) .. controls (351.1890,122.3500) and
+ (347.8030,125.5230) .. (350.2590,132.0490) .. controls (352.2680,136.1870) and
+ (353.0860,142.9210) .. (352.1740,150.4130) .. controls (350.7820,152.5420) and
+ (350.4730,153.2630) .. (348.6480,155.3920) .. controls (346.0840,158.1490) and
+ (343.3020,157.4450) .. (341.1710,156.4160) .. controls (339.1800,155.0740) and
+ (337.6210,154.3800) .. (336.7120,150.1170) .. controls (336.8760,143.3220) and
+ (337.2550,132.1990) .. (336.0130,129.8390) .. controls (334.1820,126.1840) and
+ (331.1620,127.5060) .. (329.8720,128.6100) .. controls (323.6740,134.2770) and
+ (320.6120,143.8390) .. (318.7410,151.4530) .. controls (317.0220,157.0020) and
+ (315.1930,155.4120) .. (313.9070,153.1730) .. controls (310.7760,150.2390) and
+ (310.5640,127.2950) .. (306.7840,131.0670) -- cycle;
+
+\path[fill] (325.0110,168.6820) .. controls (327.7600,166.7350) and
+ (326.4750,165.3740) .. (330.5860,169.4840) .. controls (335.7330,178.2840) and
+ (339.0410,189.6800) .. (339.5370,199.7770) .. controls (339.3200,202.2650) and
+ (341.0740,203.8400) .. (341.8760,203.2990) .. controls (342.3530,197.4580) and
+ (356.5570,189.3190) .. (369.5820,188.1290) .. controls (371.5740,187.6960) and
+ (370.6050,183.8790) .. (370.9300,181.9320) .. controls (370.1490,174.7010) and
+ (374.9930,168.1180) .. (381.7830,167.5930) .. controls (391.0240,168.9590) and
+ (394.1000,173.8930) .. (394.2560,181.4240) .. controls (393.2580,195.8820) and
+ (378.1970,198.3330) .. (369.7350,199.4860) .. controls (368.4370,199.9770) and
+ (367.8960,200.5760) .. (369.7350,201.2840) -- (405.1910,201.4450) --
+ (407.0000,202.4900) .. controls (407.2170,203.3350) and (406.4830,202.6300) ..
+ (405.0830,204.9350) .. controls (403.6840,207.2400) and (401.6200,212.5550) ..
+ (401.5130,216.1040) .. controls (390.9490,219.5010) and (380.0230,220.9890) ..
+ (368.9180,222.3320) .. controls (365.0600,224.2830) and (363.1480,226.8830) ..
+ (363.9400,229.8090) .. controls (365.2380,233.0540) and (373.7840,236.2960) ..
+ (373.7840,236.4500) .. controls (375.4070,237.4680) and (377.3270,239.8430) ..
+ (373.3250,244.7100) .. controls (356.0300,243.9490) and (342.6280,236.5890) ..
+ (337.9880,226.2010) .. controls (336.5900,225.1170) and (335.0840,226.1950) ..
+ (334.1190,227.5990) .. controls (327.3670,236.3030) and (320.7230,244.1420) ..
+ (309.2110,248.3030) .. controls (302.3460,250.0180) and (295.3180,247.2500) ..
+ (291.9990,242.7540) .. controls (289.7770,240.1950) and (289.8620,237.3700) ..
+ (289.0460,236.7580) .. controls (285.3360,238.3990) and (253.4060,251.9660) ..
+ (257.4530,245.6460) .. controls (265.2240,237.3290) and (278.6770,231.2190) ..
+ (290.5580,223.0100) .. controls (291.4150,220.2600) and (292.9740,210.9550) ..
+ (297.6670,207.9250) .. controls (297.9380,207.9480) and (296.9230,213.3890) ..
+ (297.0250,215.6840) .. controls (297.0780,217.5680) and (296.8870,218.3060) ..
+ (297.2990,217.8210) .. controls (298.1010,217.3100) and (312.5170,205.9820) ..
+ (313.6310,202.5080) .. controls (315.0370,200.5160) and (314.0530,195.4710) ..
+ (314.0530,195.3180) .. controls (311.3490,188.3500) and (307.5570,187.7580) ..
+ (306.1510,184.2960) .. controls (304.8850,179.6970) and (305.4580,174.4470) ..
+ (308.0870,172.9840) .. controls (310.4210,170.8650) and (313.1860,171.1270) ..
+ (315.7360,173.4430) .. controls (318.6480,176.0510) and (321.2340,181.1480) ..
+ (321.9820,184.9450) .. controls (321.4820,186.4470) and (318.1720,183.9470) ..
+ (317.0230,184.6920) .. controls (319.0560,186.7970) and (320.0050,189.2250) ..
+ (320.7390,192.1960) .. controls (322.6170,200.1490) and (322.0440,203.2410) ..
+ (320.1540,208.3840) .. controls (313.7530,221.8420) and (305.5730,225.8580) ..
+ (298.4160,230.8430) .. controls (298.2250,230.9110) and (298.0980,234.2580) ..
+ (300.7900,236.0680) .. controls (301.7180,237.0420) and (305.4510,237.5420) ..
+ (309.8410,236.1360) .. controls (318.3230,231.5100) and (327.1290,222.9890) ..
+ (331.5000,213.4960) .. controls (332.7690,206.3150) and (331.0090,198.7010) ..
+ (329.1420,192.0610) .. controls (326.3290,185.5710) and (323.0160,176.3050) ..
+ (323.0160,176.1520) .. controls (322.9070,172.1050) and (323.2360,170.7010) ..
+ (325.0110,168.6820) -- cycle;
+
+\path[fill] (232.1840,131.2540) .. controls (236.2650,133.2000) and
+ (243.9370,132.3720) .. (243.6130,125.7920) .. controls (243.6130,125.2100) and
+ (243.4650,123.2410) .. (243.4070,122.7080) .. controls (242.5740,120.7680) and
+ (240.3010,121.2470) .. (239.7860,123.2500) .. controls (239.6240,123.9060) and
+ (240.0750,124.9740) .. (239.4810,125.3040) .. controls (239.1400,125.6480) and
+ (237.8360,125.4460) .. (237.8900,123.6280) .. controls (237.8900,123.0490) and
+ (237.4630,122.4260) .. (237.2060,122.0590) .. controls (236.9480,121.8900) and
+ (236.7840,121.8430) .. (236.3170,121.8430) .. controls (235.7480,121.8660) and
+ (235.7570,122.0140) .. (235.4450,122.4920) .. controls (235.3130,122.9790) and
+ (235.1300,123.4550) .. (235.1300,124.0070) .. controls (235.0590,124.6540) and
+ (234.8150,124.8850) .. (234.3390,124.9800) .. controls (233.8070,124.9800) and
+ (233.9270,125.0390) .. (233.4960,124.7640) .. controls (233.2400,124.4840) and
+ (232.9200,124.3770) .. (232.9200,123.8990) .. controls (232.9200,123.4040) and
+ (232.8080,122.6030) .. (232.6590,122.2760) .. controls (232.4330,121.9780) and
+ (232.0700,121.8400) .. (231.6610,121.7350) .. controls (229.4320,121.7430) and
+ (229.2780,124.2850) .. (229.4060,125.2500) .. controls (229.2390,125.4320) and
+ (229.1440,129.9920) .. (232.1840,131.2540) -- cycle;
+
+\path[fill] (351.8090,181.8880) .. controls (355.8900,183.8340) and
+ (365.6040,182.7140) .. (363.2380,176.4260) .. controls (363.2380,175.8440) and
+ (363.0900,173.8750) .. (363.0320,173.3420) .. controls (362.1990,171.4020) and
+ (359.9260,171.8810) .. (359.4110,173.8840) .. controls (359.2490,174.5400) and
+ (359.7000,175.6080) .. (359.1060,175.9380) .. controls (358.7650,176.2820) and
+ (357.4610,176.0800) .. (357.5150,174.2620) .. controls (357.5150,173.6830) and
+ (357.0880,173.0600) .. (356.8310,172.6930) .. controls (356.5730,172.5240) and
+ (356.4090,172.4770) .. (355.9420,172.4770) .. controls (355.3730,172.5000) and
+ (355.3820,172.6480) .. (355.0700,173.1260) .. controls (354.9380,173.6130) and
+ (354.7550,174.0890) .. (354.7550,174.6410) .. controls (354.6840,175.2880) and
+ (354.4400,175.5190) .. (353.9640,175.6140) .. controls (353.4320,175.6140) and
+ (353.5520,175.6730) .. (353.1210,175.3980) .. controls (352.8650,175.1180) and
+ (352.5450,175.0110) .. (352.5450,174.5330) .. controls (352.5450,174.0380) and
+ (352.4330,173.2370) .. (352.2840,172.9100) .. controls (352.0580,172.6120) and
+ (351.6950,172.4740) .. (351.2860,172.3690) .. controls (349.0570,172.3770) and
+ (348.9030,174.9190) .. (349.0310,175.8840) .. controls (348.8640,176.0660) and
+ (348.7690,180.6260) .. (351.8090,181.8880) -- cycle;
+
+\path[fill] (421.5650,160.9310) .. controls (425.6460,162.8770) and
+ (433.3180,162.0490) .. (432.9940,155.4690) .. controls (432.9940,154.8870) and
+ (432.8460,152.9180) .. (432.7880,152.3850) .. controls (431.9550,150.4450) and
+ (429.6820,150.9240) .. (429.1670,152.9270) .. controls (429.0050,153.5830) and
+ (429.4560,154.6510) .. (428.8620,154.9810) .. controls (428.5210,155.3250) and
+ (427.2170,155.1230) .. (427.2710,153.3050) .. controls (427.2710,152.7260) and
+ (426.8440,152.1030) .. (426.5870,151.7360) .. controls (426.3290,151.5670) and
+ (426.1650,151.5200) .. (425.6980,151.5200) .. controls (425.1290,151.5430) and
+ (425.1380,151.6910) .. (424.8260,152.1690) .. controls (424.6940,152.6560) and
+ (424.5110,153.1320) .. (424.5110,153.6840) .. controls (424.4400,154.3310) and
+ (424.1960,154.5620) .. (423.7200,154.6570) .. controls (423.1880,154.6570) and
+ (423.3080,154.7160) .. (422.8770,154.4410) .. controls (422.6210,154.1610) and
+ (422.3010,154.0540) .. (422.3010,153.5760) .. controls (422.3010,153.0810) and
+ (422.1890,152.2800) .. (422.0400,151.9530) .. controls (421.8140,151.6550) and
+ (421.4510,151.5170) .. (421.0420,151.4120) .. controls (418.8130,151.4200) and
+ (418.6590,153.9620) .. (418.7870,154.9270) .. controls (418.6200,155.1090) and
+ (418.5250,159.6690) .. (421.5650,160.9310) -- cycle;
+
+\path[fill] (457.6940,213.5640) .. controls (450.5820,221.5790) and
+ (453.7180,234.8360) .. (455.3240,237.6920) .. controls (457.6690,242.3830) and
+ (459.5570,245.3920) .. (464.1200,247.7120) .. controls (468.2760,250.7710) and
+ (471.5140,248.8590) .. (473.2990,246.7170) .. controls (477.4810,242.3830) and
+ (477.5310,231.3180) .. (479.4940,229.1250) .. controls (480.8710,225.0970) and
+ (484.3380,225.7850) .. (486.0210,227.5700) .. controls (487.6520,229.9150) and
+ (489.5730,231.4270) .. (491.9690,232.7030) .. controls (495.8700,236.1440) and
+ (500.5280,236.7730) .. (505.1170,233.6370) .. controls (508.2530,231.8780) and
+ (510.2920,229.6050) .. (512.1280,225.0930) .. controls (514.1680,219.6370) and
+ (513.0310,194.4300) .. (512.6230,179.4900) .. controls (512.4660,178.3180) and
+ (508.5690,158.9450) .. (508.5690,158.7290) .. controls (508.5690,158.5120) and
+ (508.0540,148.8420) .. (507.6250,146.5380) .. controls (507.5500,145.6030) and
+ (507.3180,145.3340) .. (508.2980,145.4530) .. controls (509.3370,146.3270) and
+ (509.4790,146.3820) .. (510.1280,146.6700) .. controls (511.1770,146.8620) and
+ (512.1160,145.0770) .. (511.4830,143.4340) .. controls (508.2380,137.4490) and
+ (504.9930,131.4630) .. (501.7480,125.4780) .. controls (500.9670,124.7090) and
+ (499.9580,123.8640) .. (498.7190,125.6950) .. controls (497.5350,126.7330) and
+ (496.2740,128.6120) .. (496.3130,131.0270) .. controls (496.6010,135.2820) and
+ (497.3490,139.6120) .. (497.6370,143.8670) .. controls (498.9350,151.1500) and
+ (500.2340,158.4340) .. (501.5320,165.7170) .. controls (502.7580,181.2930) and
+ (503.0650,194.0400) .. (504.2910,209.6160) .. controls (504.1190,216.2110) and
+ (502.0690,221.9610) .. (500.1460,222.7910) .. controls (500.1460,222.7910) and
+ (497.2200,224.4870) .. (495.2580,222.6140) .. controls (493.8310,222.0410) and
+ (488.1190,213.0950) .. (488.1190,213.0950) .. controls (485.1990,210.4180) and
+ (483.2740,211.1830) .. (481.1960,213.0950) .. controls (475.4660,218.6280) and
+ (472.8730,228.9790) .. (468.9790,236.1180) .. controls (467.9750,237.7110) and
+ (465.1370,239.0750) .. (461.9930,236.0020) .. controls (454.0080,225.0930) and
+ (458.6880,209.5730) .. (457.6940,213.5640) -- cycle;
+
+\path[fill] (423.3960,122.7240) .. controls (427.0520,124.2540) and
+ (429.6310,131.6600) .. (428.7900,135.2760) .. controls (428.0620,139.7490) and
+ (426.1230,144.5800) .. (424.7290,143.9510) .. controls (423.2140,143.3890) and
+ (425.7620,139.5050) .. (424.3060,135.4290) .. controls (423.4970,132.7760) and
+ (418.5080,127.9290) .. (419.0330,126.5000) .. controls (418.0030,123.5060) and
+ (421.1540,122.1960) .. (423.3960,122.7240) -- cycle;
+
+\path[fill] (469.4650,217.9570) .. controls (470.2340,209.0640) and
+ (468.9360,203.6410) .. (468.7050,198.4140) .. controls (468.4750,193.1870) and
+ (462.7930,153.3040) .. (461.6410,149.3490) .. controls (460.2510,141.8710) and
+ (467.1640,148.3460) .. (466.4090,143.9970) .. controls (464.0170,138.5140) and
+ (458.0650,130.5300) .. (456.1960,125.7670) .. controls (455.0720,123.7260) and
+ (455.5440,121.9110) .. (453.0270,125.2300) .. controls (450.6930,132.8610) and
+ (449.8830,139.0980) .. (450.7740,143.8370) .. controls (456.7690,175.1230) and
+ (462.9170,201.1360) .. (461.9410,230.9180) .. controls (464.7840,230.9370) and
+ (468.0610,224.4130) .. (469.4650,217.9570) -- cycle;
+
+\path[fill] (531.9320,135.3280) .. controls (535.2650,136.9850) and
+ (537.2170,146.2660) .. (536.8490,148.9170) .. controls (536.1860,153.7600) and
+ (534.4180,158.9900) .. (533.1470,158.3090) .. controls (531.7660,157.7010) and
+ (533.4240,151.1270) .. (532.7610,149.0830) .. controls (532.0240,146.2110) and
+ (527.4760,140.9630) .. (527.9540,139.4160) .. controls (527.0150,136.1750) and
+ (529.8880,134.7570) .. (531.9320,135.3280) -- cycle;
+
+\path[fill] (284.2210,201.1390) .. controls (287.4090,202.3560) and
+ (289.2780,209.1760) .. (288.9260,211.1250) .. controls (288.2900,214.6830) and
+ (286.5980,218.5260) .. (285.3840,218.0260) .. controls (284.0620,217.5790) and
+ (285.6490,212.7480) .. (285.0140,211.2460) .. controls (284.7450,207.6030) and
+ (280.3200,205.7170) .. (280.4130,204.1430) .. controls (279.5870,201.2500) and
+ (282.2640,200.7180) .. (284.2210,201.1390) -- cycle;
+
+\path[fill=green] (361.2500,211.3750) .. controls (365.3650,211.6360) and
+ (367.4210,214.8650) .. (363.5670,216.2190) .. controls (359.7650,217.5210) and
+ (356.1110,218.5380) .. (356.0940,224.0320) .. controls (357.5000,231.6880) and
+ (354.1650,229.0610) .. (352.1760,228.0210) .. controls (349.8320,226.3380) and
+ (343.2540,222.2860) .. (342.3170,213.5360) .. controls (342.1760,211.4480) and
+ (343.8040,209.6910) .. (346.4250,209.7030) .. controls (350.3730,210.7760) and
+ (356.1980,210.8540) .. (361.2500,211.3750) -- cycle;
+
+\path[fill] (199.0060,120.5170) .. controls (203.7100,121.9350) and
+ (203.9880,128.8490) .. (203.6410,130.8700) .. controls (203.0140,134.5590) and
+ (201.3480,138.5430) .. (200.1510,138.0240) .. controls (198.8490,137.5610) and
+ (200.1000,132.5530) .. (199.4750,130.9950) .. controls (198.7780,128.8070) and
+ (194.8030,124.8100) .. (195.2540,123.6320) .. controls (194.3690,121.1620) and
+ (197.0780,120.0810) .. (199.0060,120.5170) -- cycle;
+
+\path[fill] (291.9030,153.1150) .. controls (288.2940,155.0670) and
+ (286.8940,160.8860) .. (289.1410,164.2740) .. controls (291.2400,167.2580) and
+ (294.5550,166.1520) .. (294.9970,166.1520) .. controls (298.5330,166.5940) and
+ (300.6310,159.5230) .. (300.6310,159.5230) .. controls (300.6310,159.5230) and
+ (300.7420,157.5350) .. (296.5430,161.2920) .. controls (294.7760,161.6230) and
+ (294.5550,160.9600) .. (294.1130,159.9650) .. controls (293.7450,158.1240) and
+ (293.8180,156.2830) .. (294.6650,154.4410) .. controls (295.2910,152.6740) and
+ (293.9280,151.9000) .. (291.9030,153.1150) -- cycle;
+
+\path[fill] (318.9720,117.8450) .. controls (317.1580,119.0610) and
+ (313.5480,122.8010) .. (313.4380,127.1100) .. controls (313.3280,129.5410) and
+ (312.8750,129.5340) .. (314.4670,131.0810) .. controls (315.6170,132.7390) and
+ (316.7770,132.5900) .. (319.0980,131.3740) .. controls (320.4310,130.3920) and
+ (320.8820,129.7400) .. (321.3310,128.0930) .. controls (321.8840,125.3310) and
+ (318.4110,129.4030) .. (317.9690,126.3290) .. controls (317.1960,123.4750) and
+ (319.4260,122.3070) .. (321.5250,119.5450) .. controls (321.5950,117.6530) and
+ (321.5540,116.3130) .. (318.9720,117.8450) -- cycle;
+
+\path[fill] (340.7820,121.7190) .. controls (340.0000,123.4460) and
+ (339.0630,132.4670) .. (339.2190,132.4670) .. controls (338.5950,135.1550) and
+ (342.0320,136.3050) .. (343.5950,132.8500) .. controls (345.9380,126.5160) and
+ (345.9380,123.8290) .. (346.0950,121.1420) .. controls (345.3650,117.0490) and
+ (342.6050,117.1770) .. (340.7820,121.7190) -- cycle;
+
+\path[fill] (478.2820,191.6870) .. controls (478.7510,191.2180) and
+ (497.6580,177.7810) .. (497.6580,177.7810) .. controls (499.5850,177.1040) and
+ (499.1680,184.7080) .. (498.2830,184.6560) .. controls (498.6470,186.1660) and
+ (479.6370,199.0830) .. (478.2820,198.5620) .. controls (477.3450,199.2390) and
+ (476.4070,193.3540) .. (478.2820,191.6870) -- cycle;
+
+\path[fill] (495.5250,191.5780) .. controls (498.8580,193.2350) and
+ (500.1850,202.9850) .. (499.8170,205.6360) .. controls (499.9350,210.7920) and
+ (496.6050,214.9280) .. (495.3340,214.2470) .. controls (493.9530,213.6390) and
+ (495.4550,207.8460) .. (494.7920,205.8020) .. controls (494.0550,202.9300) and
+ (491.2250,197.5260) .. (491.7030,195.9790) .. controls (490.7640,192.7380) and
+ (493.4810,191.0070) .. (495.5250,191.5780) -- cycle;
+
+\path[fill] (383.0610,233.5630) .. controls (384.3760,231.6410) and
+ (388.4380,228.8750) .. (388.5300,228.8750) .. controls (390.4040,227.9370) and
+ (392.2350,229.6100) .. (392.1240,229.5000) .. controls (392.4360,231.3750) and
+ (390.9380,233.1200) .. (391.4070,235.6210) .. controls (391.8170,236.6290) and
+ (392.1170,237.7480) .. (393.9640,237.3210) .. controls (396.9660,234.9590) and
+ (399.7470,234.8070) .. (402.7490,234.6560) .. controls (405.0500,234.7950) and
+ (405.1410,238.6900) .. (403.6860,238.7190) .. controls (398.1430,239.9240) and
+ (395.6590,241.4080) .. (391.7010,242.9190) .. controls (389.8260,244.0120) and
+ (388.2170,242.6250) .. (388.2170,242.4690) .. controls (388.2170,242.3130) and
+ (387.1200,241.4050) .. (387.8860,238.9210) .. controls (388.0220,236.9290) and
+ (387.2200,235.8370) .. (385.5610,236.0630) .. controls (384.3110,236.7390) and
+ (383.2100,237.1870) .. (382.5850,235.7500) .. controls (382.3390,234.6890) and
+ (382.2590,234.1730) .. (383.0610,233.5630) -- cycle;
+
+\path[fill] (515.4160,238.8140) .. controls (516.2260,239.8450) and
+ (516.7500,240.7990) .. (515.3510,242.4930) .. controls (514.0250,243.7080) and
+ (513.0910,244.3770) .. (511.7650,245.5920) .. controls (511.1390,246.6600) and
+ (510.7390,248.2800) .. (512.6540,248.7960) .. controls (516.1900,249.7900) and
+ (524.3660,244.4870) .. (524.3660,244.3760) .. controls (525.6920,243.3820) and
+ (525.2500,241.5040) .. (525.1390,241.5040) .. controls (524.3660,240.6200) and
+ (522.6240,241.1450) .. (521.4520,241.0020) .. controls (520.8940,241.0020) and
+ (519.0640,240.7250) .. (519.9350,239.1050) .. controls (520.6620,238.0970) and
+ (520.9220,237.4800) .. (521.4150,236.2380) .. controls (521.9670,235.0230) and
+ (521.4930,234.2120) .. (519.5040,233.5490) .. controls (517.4780,233.1810) and
+ (516.6690,233.3650) .. (514.4220,233.5490) .. controls (513.2070,233.8070) and
+ (512.7920,234.3500) .. (512.5710,235.8230) .. controls (512.6580,238.0570) and
+ (514.0170,237.9300) .. (515.4160,238.8140) -- cycle;
+
+\begin{scope}[fill=green]
+\fill[cm={{0.86563,0.50068,-0.30041,0.51938,(105.273,-102.9752)}},green]
+ (381.2516,181.3742) ellipse (3.45 and 3.137);
+\fill[cm={{0.31678,0.69557,-0.5691,0.13939,(278.8449,-160.9473)}},green]
+ (381.2516,181.3742) ellipse (3.45 and 3.137);
+\end{scope}
+\end{scope}
+\end{scope}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TD.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TD.tex
index d7b368bd49..b4c5dbb201 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TD.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TD.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Chad:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{gold}{RGB}{255,205,0}
\vstripesIII{blue}{gold}{red}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TG.tex
index e6ddd04722..a4b0ce1efa 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TG.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Togo:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{253,218,37}
\definecolor{green}{RGB}{0,177,64}
\hstripesV{green}{gold}{green}{gold}{green}
\fill [red] (0,0.4) rectangle (0.6,1);
\starV{white}{(0.3,0.7)}{0.19\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TH.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TH.tex
index 0b350c1a0d..b6df9a84b8 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TH.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TH.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Thailand:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\fill [red] (0,0) rectangle (\flaglength,1);
\hbar{white}{0.5}{2/3}
\hbar{blue}{0.5}{1/3}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TJ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TJ.tex
index bf41a2af69..6157eae60d 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TJ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TJ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Tajikistan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{204,0,0}
\definecolor{green}{RGB}{0,102,0}
\definecolor{gold}{RGB}{248,195,0}
@@ -51,5 +51,5 @@
\draw[line width=0.02\flagwidth] (603,478)arc(253.424:286.576:340);
\end{scope}
\end{scope}\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TL.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TL.tex
index 3c4f2b6df9..f36b711dd6 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TL.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TL.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Timor Leste:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{218,41,28}
\definecolor{gold}{RGB}{255,199,44}
\fill [red] (0,0) rectangle (\flaglength,1);
-\chevron{gold}{\StretchFactor}
-\chevron{black}{2/3*\StretchFactor}
-\starV{white}{(2/9*\StretchFactor,0.5)}{1/6}{24}
-\FrameCode
-\EndFlagDescription
+\chevron{gold}{\stretchfactor}
+\chevron{black}{2/3*\stretchfactor}
+\starV{white}{(2/9*\stretchfactor,0.5)}{1/6}{24}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TM.tex
index 78047825c5..fd48eb5707 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TM.tex
@@ -1,13 +1,13 @@
% --------------------------------------------------------------------------
% Turkmenistan
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{166,25,46}
\definecolor{gold}{RGB}{255,158,27}
\definecolor{dark}{RGB}{56,55,57}
\definecolor{green}{RGB}{0,103,71}
\fill [green] (0,0) rectangle (\flaglength,1);
-\def\xref{0.45*\StretchFactor}
+\def\xref{0.45*\stretchfactor}
\moon{white}{(\xref+0.245,0.775)}{0.124}{(\xref+0.214,0.794)}{0.124}
\starV{white}{(\xref+0.112,0.797)}{0.024}{36}
\starV{white}{(\xref+0.176,0.893)}{0.024}{36}
@@ -18,7 +18,7 @@
\begin{scope}
\clip (\xref,0) rectangle ++(-0.27,1);
\ifemblem
-\begin{scope}[xshift=0.45\flagwidth*\StretchFactor]
+\begin{scope}[xshift=0.45\flagwidth*\stretchfactor]
\begin{scope}[xshift=-0.45\flagwidth,yshift=\flagwidth,scale=0.0016667\flagwidth]
\begin{scope}[y=1pt, x=1pt, yscale=-1]
\def\code{%
@@ -1895,5 +1895,5 @@
\end{scope}
\fi
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TN.tex
index 4fcf3abeee..bbe5885c27 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TN.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Tunisia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
\fill [white] (0.5\flaglength,0.5) circle (0.25);
\moon{red}{(0.5\flaglength,0.5)}{0.1875}{($(0.5\flaglength,0.5)+(0.05,0)$)}{0.15}
\starV{red}{($(0.5\flaglength,0.5)+(0.05,0)$)}{0.1\flagwidth}{18}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TO.tex
index 107701fe8e..2ee38d4e17 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TO.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Tonga:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
-\fill [white] (0,0.5) rectangle (70/84*\StretchFactor,1);
-\begin{scope}[xshift=35/84*\flagwidth*\StretchFactor,yshift=0.75\flagwidth,scale=1/84]
+\fill [white] (0,0.5) rectangle (70/84*\stretchfactor,1);
+\begin{scope}[xshift=35/84*\flagwidth*\stretchfactor,yshift=0.75\flagwidth,scale=1/84]
\fill [red] (17,6)-|(6,17)-|(-6,6)-|(-17,-6)-|(-6,-17)-|(6,-6)-|cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TR.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TR.tex
index 5eb96692c9..739016f5e0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TR.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TR.tex
@@ -1,11 +1,11 @@
% --------------------------------------------------------------------------
% Turkey:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
\moon{white}{($(0.4639\flaglength,0.5)-(0.19583,0)$)}{0.25}
{($(0.4639\flaglength,0.5)-(0.13333,0)$)}{0.2}
\starV{white}{($(0.4639\flaglength,0.5)+(0.1125,0)$)}{1/12}{18}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TT.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TT.tex
index bc5ddc8baa..b04f8bde13 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TT.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TT.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Trinidad and Tobago:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
\newdimen\bb\bb=0.01\flaglength
@@ -12,5 +12,5 @@
\fill [white] (0,1)--(\x*1pt,1)--(\flaglength,0)--($(\flaglength,0)-(\x*1pt,0)$)--cycle;
\fill [black] (\x*1pt/6,1)--(5*\x*1pt/6,1)
--($(\flaglength,0)-(\x*1pt/6,0)$)--($(\flaglength,0)-(5*\x*1pt/6,0)$)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TV.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TV.tex
index 0efc21a206..10bcd82c73 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TV.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TV.tex
@@ -1,21 +1,21 @@
% --------------------------------------------------------------------------
% Tuvalu:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\definecolor{cyan}{RGB}{108,172,228}
\definecolor{gold}{RGB}{255,205,0}
\fill [cyan] (0,0) rectangle (\flaglength,1);
-\UnionJack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
-\starV{gold}{(\flaglength-\StretchFactor*0.92443\flagwidth,1-0.90166)}{\flagwidth/12}{0}
-\starV{gold}{(\flaglength-\StretchFactor*0.68662\flagwidth,1-0.84086)}{\flagwidth/12}{36}
-\starV{gold}{(\flaglength-\StretchFactor*0.68662\flagwidth,1-0.63755)}{\flagwidth/12}{36}
-\starV{gold}{(\flaglength-\StretchFactor*0.47662\flagwidth,1-0.78947)}{\flagwidth/12}{36}
-\starV{gold}{(\flaglength-\StretchFactor*0.47662\flagwidth,1-0.34712)}{\flagwidth/12}{36}
-\starV{gold}{(\flaglength-\StretchFactor*0.33926\flagwidth,1-0.65008)}{\flagwidth/12}{-2.4}
-\starV{gold}{(\flaglength-\StretchFactor*0.30012\flagwidth,1-0.2868 )}{\flagwidth/12}{33.6}
-\starV{gold}{(\flaglength-\StretchFactor*0.16194\flagwidth,1-0.53592)}{\flagwidth/12}{0}
-\starV{gold}{(\flaglength-\StretchFactor*0.16194\flagwidth,1-0.14581)}{\flagwidth/12}{0}
-\FrameCode
-\EndFlagDescription
+\unionjack{0pt}{0.5\flagwidth}{0.5\flaglength}{\flagwidth}
+\starV{gold}{(\flaglength-\stretchfactor*0.92443\flagwidth,1-0.90166)}{\flagwidth/12}{0}
+\starV{gold}{(\flaglength-\stretchfactor*0.68662\flagwidth,1-0.84086)}{\flagwidth/12}{36}
+\starV{gold}{(\flaglength-\stretchfactor*0.68662\flagwidth,1-0.63755)}{\flagwidth/12}{36}
+\starV{gold}{(\flaglength-\stretchfactor*0.47662\flagwidth,1-0.78947)}{\flagwidth/12}{36}
+\starV{gold}{(\flaglength-\stretchfactor*0.47662\flagwidth,1-0.34712)}{\flagwidth/12}{36}
+\starV{gold}{(\flaglength-\stretchfactor*0.33926\flagwidth,1-0.65008)}{\flagwidth/12}{-2.4}
+\starV{gold}{(\flaglength-\stretchfactor*0.30012\flagwidth,1-0.2868 )}{\flagwidth/12}{33.6}
+\starV{gold}{(\flaglength-\stretchfactor*0.16194\flagwidth,1-0.53592)}{\flagwidth/12}{0}
+\starV{gold}{(\flaglength-\stretchfactor*0.16194\flagwidth,1-0.14581)}{\flagwidth/12}{0}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TW.tex
index b97e6f10ab..20a7fe2c74 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TW.tex
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% Taiwan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{249,66,58}
\definecolor{blue}{RGB}{0,20,137}
\fill [red] (0,0) rectangle (\flaglength,1);
-\fill [blue] (0,0.5) rectangle (0.75*\StretchFactor,1);
-\begin{scope}[shift={(0.375\flagwidth*\StretchFactor,0.75\flagwidth)},even odd rule]
+\fill [blue] (0,0.5) rectangle (0.75*\stretchfactor,1);
+\begin{scope}[shift={(0.375\flagwidth*\stretchfactor,0.75\flagwidth)},even odd rule]
\starn{white}{12}{(0,0)}{0.1875}{0.09705}{0}
\fill [blue] (0,0) circle (0.10625) (0,0) circle (0.09375);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_TZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_TZ.tex
index d2485fd6d6..8599306dba 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_TZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_TZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Tanzania:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{gold}{RGB}{252,227, 0}
\definecolor{blue}{RGB}{0,94,184}
\definecolor{green}{RGB}{0,150,57}
@@ -12,5 +12,5 @@
\draw [gold,line width=0.39583\flagwidth] (0,0)--(\flaglength,1);
\draw [black,line width=0.27083\flagwidth] (0,0)--(\flaglength,1);
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_Transnistria.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_Transnistria.tex
new file mode 100644
index 0000000000..196351ae6d
--- /dev/null
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_Transnistria.tex
@@ -0,0 +1,54 @@
+% --------------------------------------------------------------------------
+% Transnistria:
+% --------------------------------------------------------------------------
+\begin{flagdescription}{1/2}
+\definecolor{red}{RGB}{222,0,0}
+\definecolor{green}{RGB}{0,153,51}
+\definecolor{gold}{RGB}{255,215,0}
+\background{red}
+\hbar{green}{0.5}{0.25}
+\begin{scope}[y=-\flagwidth/600, x=\flagwidth/600,shift={(0,-600)}]
+\fill[gold] (150.0000,29.9995) -- (143.2645,50.7293) -- (121.4685,50.7293) --
+ (139.1018,63.5408) -- (132.3664,84.2705) -- (150.0000,71.4588) --
+ (167.6336,84.2705) -- (160.8981,63.5408) -- (178.5315,50.7293) --
+ (156.7354,50.7293) -- cycle(150.0000,40.7996) -- (154.3106,54.0666) --
+ (168.2603,54.0666) -- (156.9747,62.2663) -- (161.2853,75.5332) --
+ (150.0000,67.3337) -- (138.7146,75.5332) -- (143.0252,62.2663) --
+ (131.7397,54.0666) -- (145.6894,54.0666) -- cycle;
+\begin{scope}[cm={{0.79146,0.0,0.0,0.78939,(-6.93659,3.01275)}}]
+\fill[gold] (137.4374,171.6942) --
+ (156.3004,190.6879) -- (174.0887,173.0220) .. controls (201.1472,202.0430) and
+ (229.5268,230.0170) .. (256.3758,259.1498) .. controls (260.4102,263.2122) and
+ (266.9739,263.2348) .. (271.0363,259.2004) .. controls (275.0987,255.1660) and
+ (275.1213,248.6023) .. (271.0869,244.5399) .. controls (242.2682,217.3498) and
+ (213.3615,189.9384) .. (184.5337,162.6489) -- (208.4986,138.8489) --
+ (175.1584,134.2329) -- cycle;
+\fill[gold] (198.2887,110.1955) .. controls
+ (213.8061,118.9349) and (225.5874,131.4767) .. (232.5371,144.5879) .. controls
+ (239.5810,157.8769) and (242.6767,171.7501) .. (242.7404,182.8422) .. controls
+ (242.8709,205.5860) and (224.3026,224.0241) .. (201.5585,224.0241) .. controls
+ (189.4226,224.0241) and (178.5125,218.7754) .. (170.9755,210.4232) --
+ (166.8069,213.9335) .. controls (166.0969,213.6612) and (165.3430,213.5213) ..
+ (164.5826,213.5208) .. controls (162.7531,213.5210) and (161.0164,214.3261) ..
+ (159.8340,215.7221) .. controls (156.8603,216.1111) and (154.3715,218.1674) ..
+ (153.4287,221.0144) .. controls (150.2938,227.3028) and (144.7934,232.2344) ..
+ (138.1376,234.4920) .. controls (138.0739,234.5136) and (138.0177,234.5420) ..
+ (137.9618,234.5703) .. controls (134.8843,235.6979) and (131.7992,237.7346) ..
+ (129.1726,240.3727) .. controls (123.9811,245.6093) and (121.4440,252.3093) ..
+ (122.8724,257.0110) .. controls (122.7314,257.4195) and (122.6588,257.8485) ..
+ (122.6574,258.2808) .. controls (122.6576,260.4516) and (124.4173,262.2113) ..
+ (126.5881,262.2115) .. controls (127.1315,262.2095) and (127.6687,262.0951) ..
+ (128.1656,261.8752) .. controls (132.8593,262.9340) and (139.2344,260.3293) ..
+ (144.2200,255.3160) .. controls (147.0463,252.4653) and (149.1636,249.0925) ..
+ (150.2030,245.7854) .. controls (152.5200,239.1626) and (157.5000,233.7668) ..
+ (163.8259,230.7322) .. controls (163.9769,230.6598) and (164.0989,230.5851) ..
+ (164.2080,230.5087) .. controls (166.3289,229.4946) and (167.8805,227.5797) ..
+ (168.4330,225.2948) .. controls (178.1353,236.7396) and (192.6856,244.0478) ..
+ (208.9518,244.4305) .. controls (238.7853,245.1326) and (261.0848,223.1725) ..
+ (262.1159,191.5941) .. controls (262.6349,175.7015) and (256.4860,155.2094) ..
+ (242.4747,138.4032) .. controls (231.7664,125.5588) and (216.0649,114.8953) ..
+ (198.2877,110.1955) -- cycle;
+\end{scope}
+\end{scope}
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_UA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_UA.tex
index b0a701568d..3a3f47aff0 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_UA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_UA.tex
@@ -1,9 +1,9 @@
% -------------------------------------------------------------
% Ukraine:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,87,184}
\definecolor{gold}{RGB}{255,215,0}
\hstripesII{blue}{gold}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_UG.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_UG.tex
index 204ce63448..a4527c1082 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_UG.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_UG.tex
@@ -1,7 +1,7 @@
% -------------------------------------------------------------
% Uganda:
% ---------------------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{gold}{RGB}{255,205,0}
\hstripesVI{black}{gold}{red}{black}{gold}{red}
@@ -122,5 +122,5 @@
\end{scope}
\fi
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_UNO.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_UNO.tex
index b9636d0bb3..935454272c 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_UNO.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_UNO.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% United Nations:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{65,143,222}
\definecolor{white}{RGB}{255,255,255}
\fill [blue] (0,0) rectangle (\flaglength,1);
@@ -1153,5 +1153,5 @@
\end{scope}
\end{scope}
% Frame around flag:
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_US.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_US.tex
index 71f178eda6..6bd792bbbb 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_US.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_US.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% United States:
% --------------------------------------------------------------------------
-\BeginFlagDescription{10}{19}
+\begin{flagdescription}{10/19}
\definecolor{red}{RGB}{191,13,62}
\definecolor{blue}{RGB}{10,49,97}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -13,5 +13,5 @@
\foreach \x in {1,2,3,4,5} \foreach \y in {1,2,3,4}
{\starV{white}{($(0.126*\x,0.108*\y)$)}{0.0308}{0}}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_UY.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_UY.tex
index c57d094843..0c0e64121a 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_UY.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_UY.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Uruguay:
% --------------------------------------------------------------------------
-\BeginFlagDescription{3}{5}
+\begin{flagdescription}{3/5}
\definecolor{blue}{RGB}{0,133,202}
\definecolor{gold}{RGB}{255,205,0}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -67,5 +67,5 @@
\end{scope}
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_UZ.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_UZ.tex
index 0ab78470c6..9c4dfe85f8 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_UZ.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_UZ.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Uzbekistan:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{224,60,49}
\definecolor{green}{RGB}{67,176,42}
\definecolor{blue}{RGB}{0,146,188}
@@ -21,5 +21,5 @@
\starV{white}{(0.544,0.936)}{0.029\flagwidth}{0}
\starV{white}{(0.640,0.936)}{0.029\flagwidth}{0}
\starV{white}{(0.736,0.936)}{0.029\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_VA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_VA.tex
index aa7534c262..685bd0e4fd 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_VA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_VA.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Vatican:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{1}
+\begin{flagdescription}{1/1}
\definecolor{gold}{RGB}{255,224,0}
\definecolor{red}{RGB}{255,0,0}
\definecolor{gray}{RGB}{204,204,204}
@@ -2027,5 +2027,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_VC.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_VC.tex
index 23005f2af7..95a06c5d29 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_VC.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_VC.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% ST. Vincent:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{blue}{RGB}{0,94,184}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{green}{RGB}{0,154,68}
@@ -14,5 +14,5 @@
\fill [green] (5,10)--++(4,-8)--++(-4,-8)--++(-4,8)--cycle;
\fill [green] (-5,10)--++(4,-8)--++(-4,-8)--++(-4,8)--cycle;
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_VE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_VE.tex
index a6a9fb092b..36d7c67046 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_VE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_VE.tex
@@ -1,12 +1,12 @@
% --------------------------------------------------------------------------
% Venezuela:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{16,6,159}
\definecolor{gold}{RGB}{255,205,0}
\hstripesIII{gold}{blue}{red}
\coordinate (c) at (0.5\flaglength,0.3);
\foreach \w in {20,40,...,160} {\starV{white}{($(c)+(\w:0.3)$)}{\flagwidth/24}{0}}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_VN.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_VN.tex
index 5fd877064a..2b2fa23b29 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_VN.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_VN.tex
@@ -1,10 +1,10 @@
% --------------------------------------------------------------------------
% Viet Nam:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{red}{RGB}{200,16,46}
\fill [red] (0,0) rectangle (\flaglength,1);
\starV{gold}{(0.5\flaglength,0.5)}{0.3\flagwidth}{0}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_VU.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_VU.tex
index 9a64bdcfa2..fba813d140 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_VU.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_VU.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Vanuatu:
% --------------------------------------------------------------------------
-\BeginFlagDescription{19}{36}
+\begin{flagdescription}{19/36}
\definecolor{gold}{RGB}{255,205,0}
\definecolor{red}{RGB}{200,16,46}
\definecolor{green}{RGB}{0,154,68}
@@ -90,5 +90,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_WB.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_WB.tex
index 58802d9e26..87a9a4bb66 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_WB.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_WB.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Wieselburger Bier:
% --------------------------------------------------------------------------
-\BeginFlagDescription{7}{10}
+\begin{flagdescription}{7/10}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{gold}{RGB}{255,215,0}
\fill [white] (0,0) rectangle (\flaglength,1);
@@ -21,7 +21,7 @@
(-2027.0215,1602.4174) .. controls (-2335.2920,1602.4174) and (-2477.7305,1870.2846) ..
(-2477.7305,2316.7426) .. controls (-2477.7305,2763.2006) and (-2335.2920,3031.0736) ..
(-2027.0215,3031.0736);
-\path[draw=white,line width=0.0143\flagwidth]
+\path[draw=white,line width=0.015\flagwidth]
(-2033.4023,2954.5385) .. controls (-1903.7168,2954.5385) and
(-1659.2285,2882.2572) .. (-1416.8672,2882.2572) .. controls
(-1174.5029,2882.2572) and (-930.0176,2954.5385) .. (-800.3291,2954.5385) ..
@@ -186,5 +186,5 @@
(-1357.3388,1906.4282);
\end{scope}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_WS.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_WS.tex
index 36d394c202..3d1554eb55 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_WS.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_WS.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Samoa:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{200,16,46}
\definecolor{blue}{RGB}{1,33,105}
\fill [red] (0,0) rectangle (\flaglength,1);
@@ -13,5 +13,5 @@
\starV{white}{(0.15625,0.07024)}{0.05476\flagwidth}{0}
\starV{white}{(0.0833,-0.03991)}{0.03651\flagwidth}{0}
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_YE.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_YE.tex
index 32e5ecd819..6a18983234 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_YE.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_YE.tex
@@ -1,8 +1,8 @@
% --------------------------------------------------------------------------
% Yemen:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\hstripesIII{red}{white}{black}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ZA.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ZA.tex
index e8227f348a..57cad661bb 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ZA.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ZA.tex
@@ -1,15 +1,15 @@
% --------------------------------------------------------------------------
% South Africa:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{224,60,49}
\definecolor{blue}{RGB}{0,20,137}
\definecolor{green}{RGB}{0,119,73}
\definecolor{gold}{RGB}{255,184,28}
-\coordinate (c) at (2/3*\StretchFactor,0.5);
+\coordinate (c) at (2/3*\stretchfactor,0.5);
\hstripesIII{red}{white}{blue}
\begin{scope}
-\clip (0,0) rectangle (\flagwidth*\StretchFactor,1);
+\clip (0,0) rectangle (\flagwidth*\stretchfactor,1);
\fill [black] (0,0)--(c)--(0,1)--cycle;
\draw [white,line width=\flagwidth/3] (0,0)--(c);
\draw [white,line width=\flagwidth/3] (0,1)--(c);
@@ -22,5 +22,5 @@
\draw [green,line width=\flagwidth/5] (0,1)--(c);
\end{scope}
\fill [green] (\flaglength,0.6)-|(c)|-(\flaglength,0.4)--cycle;
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ZM.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ZM.tex
index 6cb1fe9598..19171d2657 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ZM.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ZM.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Zambia:
% --------------------------------------------------------------------------
-\BeginFlagDescription{2}{3}
+\begin{flagdescription}{2/3}
\definecolor{red}{RGB}{239,51,64}
\definecolor{green}{RGB}{0,177,64}
\definecolor{orange}{RGB}{255,130,0}
@@ -259,5 +259,5 @@
\end{scope}
\end{scope}
\fi
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflag_ZW.tex b/graphics/pgf/contrib/worldflags/tex/worldflag_ZW.tex
index fff99e423c..9595ae9250 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflag_ZW.tex
+++ b/graphics/pgf/contrib/worldflags/tex/worldflag_ZW.tex
@@ -1,7 +1,7 @@
% --------------------------------------------------------------------------
% Zimbabwe:
% --------------------------------------------------------------------------
-\BeginFlagDescription{1}{2}
+\begin{flagdescription}{1/2}
\definecolor{red}{RGB}{228,0,43}
\definecolor{green}{RGB}{0,132,61}
\definecolor{gold}{RGB}{255,199,44}
@@ -571,5 +571,5 @@
\end{scope}
\fi
\end{scope}
-\FrameCode
-\EndFlagDescription
+\framecode
+\end{flagdescription}
diff --git a/graphics/pgf/contrib/worldflags/tex/worldflags.sty b/graphics/pgf/contrib/worldflags/tex/worldflags.sty
index fa3df66e95..2a6df52114 100644
--- a/graphics/pgf/contrib/worldflags/tex/worldflags.sty
+++ b/graphics/pgf/contrib/worldflags/tex/worldflags.sty
@@ -1,6 +1,6 @@
% =============================================================================
% worldflags.sty - Flags of the World with TikZ
-% (c) Wilhelm Haager 2021-04-25
+% (c) Wilhelm Haager 2021-04-30
% =============================================================================
\RequirePackage{ifthen}
\RequirePackage{tikz}
@@ -27,14 +27,14 @@
% ----------------------------------------------------------------------------
% 2 horizontal stripes
% ----------------------------------------------------------------------------
-\def\hstripesII#1#2{% 3 horizontal stripes
+\def\wf@hstripesII#1#2{% 3 horizontal stripes
\fill [#1] (0,1/2) rectangle (\flaglength,1);
\fill [#2] (0,0) rectangle (\flaglength,1/2);}
% ----------------------------------------------------------------------------
% 3 horizontal stripes
% ----------------------------------------------------------------------------
-\def\hstripesIII#1#2#3{% 3 horizontal stripes
+\def\wf@hstripesIII#1#2#3{% 3 horizontal stripes
\fill [#1] (0,2/3) rectangle (\flaglength,1);
\fill [#2] (0,1/3) rectangle (\flaglength,2/3);
\fill [#3] (0,0) rectangle (\flaglength,1/3);}
@@ -42,7 +42,7 @@
% ----------------------------------------------------------------------------
% 4 horizontal stripes
% ----------------------------------------------------------------------------
-\def\hstripesIV#1#2#3#4{%
+\def\wf@hstripesIV#1#2#3#4{%
\fill [#1] (0,3/4) rectangle (\flaglength,1);
\fill [#2] (0,1/2) rectangle (\flaglength,3/4);
\fill [#3] (0,1/4) rectangle (\flaglength,1/2);
@@ -51,7 +51,7 @@
% ----------------------------------------------------------------------------
% 5 horizontal stripes
% ----------------------------------------------------------------------------
-\def\hstripesV#1#2#3#4#5{%
+\def\wf@hstripesV#1#2#3#4#5{%
\fill [#1] (0,4/5) rectangle (\flaglength,1);
\fill [#2] (0,3/5) rectangle (\flaglength,4/5);
\fill [#3] (0,2/5) rectangle (\flaglength,3/5);
@@ -61,7 +61,7 @@
% ----------------------------------------------------------------------------
% 6 horizontal stripes
% ----------------------------------------------------------------------------
-\def\hstripesVI#1#2#3#4#5#6{%
+\def\wf@hstripesVI#1#2#3#4#5#6{%
\fill [#1] (0,5/6) rectangle (\flaglength,1);
\fill [#2] (0,4/6) rectangle (\flaglength,5/6);
\fill [#3] (0,3/6) rectangle (\flaglength,4/6);
@@ -72,14 +72,14 @@
% ----------------------------------------------------------------------------
% 2 vertical stripes
% ----------------------------------------------------------------------------
-\def\vstripesII#1#2{% 2 vertical stripes
+\def\wf@vstripesII#1#2{% 2 vertical stripes
\fill [#1] (0,0) rectangle (0.5\flaglength,1);
\fill [#2] (0.5\flaglength,0) rectangle (\flaglength,1);}
% ----------------------------------------------------------------------------
% 3 vertical stripes
% ----------------------------------------------------------------------------
-\def\vstripesIII#1#2#3{% 3 vertical stripes
+\def\wf@vstripesIII#1#2#3{% 3 vertical stripes
\fill [#1] (0,0) rectangle (\flaglength/3,1);
\fill [#2] (\flaglength/3,0) rectangle (2\flaglength/3,1);
\fill [#3] (2\flaglength/3,0) rectangle (\flaglength,1);}
@@ -88,7 +88,7 @@
% Vertical bar (width relative to flagWIDTH)
% ----------------------------------------------------------------------------
% #1...color, #2...position, #3...width
-\def\vbar#1#2#3{%
+\def\wf@vbar#1#2#3{%
\fill [#1] (#2,0) ++(-#3/2,0)
rectangle ++(#3,1);}
@@ -96,14 +96,14 @@
% Horizontal bar (width relative to flagwidth)
% ----------------------------------------------------------------------------
% #1...color, #2...position, #3...width
-\def\hbar#1#2#3{%
+\def\wf@hbar#1#2#3{%
\fill [#1] (0,#2) ++(0,-#3/2)
rectangle ++(\flaglength,#3);}
% ----------------------------------------------------------------------------
% Cevron; #1...color, #2...width
% ----------------------------------------------------------------------------
-\def\chevron#1#2{%
+\def\wf@chevron#1#2{%
\fill [#1] (0,0)--(0,1)--(#2,0.5)--cycle;}
% ----------------------------------------------------------------------------
@@ -111,7 +111,7 @@
% ----------------------------------------------------------------------------
% #1...color, #2...points, #3...coordinate, #4...outer radius,
% #5...inner radius, #6...angle
-\def\starn#1#2#3#4#5#6{%
+\def\wf@starn#1#2#3#4#5#6{%
\begin{scope}[shift={#3},rotate=#6]
\fill [#1] (90:#4) foreach \n in {1,...,#2}
{--(90-180/#2+\n*360/#2:#5)--(90+\n*360/#2:#4)}--cycle;
@@ -121,20 +121,26 @@
% 5-pointed-star
% ----------------------------------------------------------------------------
% #1...color, #2...coordinate, #3...outer radius, #4...angle
-\def\starV#1#2#3#4{\starn{#1}{5}{#2}{#3}{0.381966*#3}{#4}}
+\def\wf@starV#1#2#3#4{\starn{#1}{5}{#2}{#3}{0.381966*#3}{#4}}
% ----------------------------------------------------------------------------
% 6-pointed-star
% ----------------------------------------------------------------------------
% #1...color, #2...coordinate, #3...outer radius, #4...angle
-\def\starVI#1#2#3#4{\starn{#1}{6}{#2}{#3}{0.57735*#3}{#4}}
+\def\wf@starVI#1#2#3#4{\starn{#1}{6}{#2}{#3}{0.57735*#3}{#4}}
+
+% ----------------------------------------------------------------------------
+% Background; #1...color
+% ----------------------------------------------------------------------------
+\def\wf@background#1{%
+ \fill [#1] (0,0) rectangle (\flaglength,\flagwidth);}
% ----------------------------------------------------------------------------
% Moon
% ----------------------------------------------------------------------------
% #1...color, #2...outer coordinates, #3...outer radius,
% #4 inner coordinates #5...inner radius
-\def\moon#1#2#3#4#5{%
+\def\wf@moon#1#2#3#4#5{%
\begin{scope}
\clip #2 circle (#3);
\fill [even odd rule,#1] #2 circle (1.01*#3) #4 circle (#5);
@@ -143,31 +149,31 @@
% ----------------------------------------------------------------------------
% Natural aspect-ratio of a flag (for internal use)
% ----------------------------------------------------------------------------
-\def\AspectRatio#1#2{%
- \ifdim\flaglength=0pt\flaglength\flagwidth\divide\flaglength by #1\multiply\flaglength by #2\fi
- \ifdim\flagwidth=0pt\flagwidth\flaglength\divide\flagwidth by #2\multiply\flagwidth by #1\fi
- \newdimen\sh\sh=-\flagwidth\divide\sh by #1\multiply\sh by #2\advance\sh by\flaglength\sh=\flagstretch\sh
- \pgfmathparse{(\flaglength/\flagwidth*#1/#2-1)*\flagstretch+1}
- \edef\StretchFactor{\pgfmathresult}
- }
+\def\wf@aspectratio#1{%
+ \ifx\flagstretch\undefined\def\flagstretch{0}\fi
+ \ifx\flaglength\undefined\newdimen\flaglength\flaglength0pt\fi
+ \ifdim\flaglength=0pt\pgfmathparse{\flagwidth/(#1)}\pgfmathsetlength{\flaglength}{\pgfmathresult}\fi
+ \ifdim\flagwidth=0pt\pgfmathparse{\flaglength*(#1)}\pgfmathsetlength{\flagwidth}{\pgfmathresult}\fi
+ \pgfmathparse{(\flaglength/\flagwidth*(#1)-1)*\flagstretch+1}
+ \edef\stretchfactor{\pgfmathresult}}
% ----------------------------------------------------------------------------
-% FrameCode and GridCode
+% wf@framecode and wf@gridcode
% ----------------------------------------------------------------------------
-\def\FrameCode{
+\def\wf@framecode{\end{scope}
\ifx\framecolor\undefined\global\def\framecolor{\fr@mecolor}\fi
\ifx\flagframe\undefined\newdimen\flagframe\global\flagframe\fl@gframe\fi
\ifdim\flagframe>0pt\draw
- [\framecolor,line width=\flagframe] (0,0) rectangle (\flaglength,\flagwidth);\fi}
-
-\def\GridCode{\ifgrid
+ [\framecolor,line width=\flagframe] (0,0) rectangle (\flaglength,\flagwidth);\fi
+ \begin{scope}}
+\def\wf@gridcode{\ifgrid
\begin{scope}[x=1mm,y=1mm]
- \pgfmathparse{\flaglength*0.351}
+ \pgfmathparse{\flaglength*0.351462}
\def\n{\pgfmathresult}
\foreach \x in {0,1,...,\n} \draw [line width=0.1pt,gridcolor!20] (\x,0)--++(0,\flagwidth);
\foreach \x in {0,5,...,\n} \draw [line width=0.25pt,gridcolor!60] (\x,0)--++(0,\flagwidth);
\foreach \x in {0,10,...,\n} \draw [line width=0.5pt,gridcolor] (\x,0)--++(0,\flagwidth);
- \pgfmathparse{\flagwidth*0.351}
+ \pgfmathparse{\flagwidth*0.351462}
\def\n{\pgfmathresult}
\foreach \x in {0,1,...,\n} \draw [line width=0.1pt,gridcolor!20] (0,\x)--++(\flaglength,0);
\foreach \x in {0,5,...,\n} \draw [line width=0.25pt,gridcolor!60] (0,\x)--++(\flaglength,0);
@@ -176,13 +182,39 @@
\fi}
% ----------------------------------------------------------------------------
-% Begin and end of flag description (just initiates and ends zwo scopes)
+% Environment flagdescription
% ----------------------------------------------------------------------------
-\def\BeginFlagDescription#1#2{%
- \AspectRatio{#1}{#2}
+\newenvironment{flagdescription}[1]{%
+% \begingroup
+ \def\makeifgrid{\newif\ifgrid\if@rid\gridtrue\else\gridfalse\fi}
+ \ifx\flagwidth\undefined\newdimen\flagwidth\flagwidth\fl@gwidth\fi
+ \ifx\ifgrid\undefined\makeifgrid\fi
+ \let\hstripesII=\wf@hstripesII
+ \let\hstripesIII=\wf@hstripesIII
+ \let\hstripesIV=\wf@hstripesIV
+ \let\hstripesV=\wf@hstripesV
+ \let\hstripesVI=\wf@hstripesVI
+ \let\vstripesII=\wf@vstripesII
+ \let\vstripesIII=\wf@vstripesIII
+ \let\starn=\wf@starn
+ \let\starV=\wf@starV
+ \let\starVI=\wf@starVI
+ \let\moon=\wf@moon
+ \let\unionjack=\wf@unionjack
+ \let\hbar=\wf@hbar
+ \let\vbar=\wf@vbar
+ \let\chevron=\wf@chevron
+ \let\framecode=\wf@framecode
+ \let\gridcode=\wf@gridcode
+ \let\background=\wf@background
+ \wf@aspectratio{#1}
+ \ifx\viewangle\undefined\def\viewangle{0}\fi
+ \ifx\hangangle\undefined\def\hangangle{0}\fi
\begin{scope}[x=\flagwidth,y=\flagwidth,cm={cos(\viewangle)*cos(\hangangle),
-sin(\hangangle),0,1,(0,0)}]
\begin{scope}[shift={(-0.5\flaglength,-0.5\flagwidth)}]
+ \begin{scope} % inner scope for clipping
+ \clip (0,0) rectangle (\flaglength,\flagwidth);
\coordinate (-0) at (0.5\flaglength,0.5\flagwidth);
\coordinate (-nw) at (0,\flagwidth);
\coordinate (-w) at (0,0.5\flagwidth);
@@ -192,12 +224,23 @@
\coordinate (-ne) at (\flaglength,\flagwidth);
\coordinate (-e) at (\flaglength,0.5\flagwidth);
\coordinate (-se) at (\flaglength,0);}
-\def\EndFlagDescription{\GridCode\end{scope}\end{scope}}
+{\end{scope}\wf@gridcode\end{scope}\end{scope}%\endgroup
+ \global\let\flagwidth\undefined
+ \global\let\flaglength\undefined
+ \global\let\flagframe\undefined
+ \global\let\flagstretch\undefined
+ \global\let\framecolor\undefined
+ \global\let\ifemblem\undefined
+ \global\let\ifnoemblem\undefined
+ \global\let\ifgrid\undefined
+ \global\let\viewangle\undefined
+ \global\let\hangangle\undefined
+}
% ----------------------------------------------------------------------------
% Union Jack (neuer Versuch, 12.4.2021)
% ----------------------------------------------------------------------------
-\def\UnionJack#1#2#3#4{%
+\def\wf@unionjack#1#2#3#4{%
\begin{scope}[cm={1,0,0,1,(#1,#2)}]
\newdimen\b\b=#3\advance\b by -#1
\newdimen\h\h=#4\advance\h by -#2
@@ -273,16 +316,6 @@
\begin{tikzpicture}
\input{worldflag_#2.tex}
\end{tikzpicture}}{\relax}
- \global\let\flagwidth\undefined
- \global\let\flaglength\undefined
- \global\let\flagframe\undefined
- \global\let\flagstretch\undefined
- \global\let\framecolor\undefined
- \global\let\ifemblem\undefined
- \global\let\ifnoemblem\undefined
- \global\let\ifgrid\undefined
- \global\let\viewangle\undefined
- \global\let\hangangle\undefined
}
% ----------------------------------------------------------------------------
@@ -302,7 +335,6 @@
\tikzset{hang/.style={execute at begin scope={\def\hangangle{#1}}}}
\tikzset{
worldflag/.pic={
- %\begin{scope}
\ifx\flagwidth\undefined\newdimen\flagwidth\global\flagwidth=\fl@gwidth\fi
\ifx\flaglength\undefined\newdimen\flaglength\global\flaglength=\fl@glength\fi
\ifx\flagframe\undefined\newdimen\flagframe\global\flagframe=\fl@gframe\fi
@@ -317,16 +349,5 @@
\ifx\viewangle\undefined\def\viewangle{\view@ngle}\fi
\ifx\hangangle\undefined\def\hangangle{\hang@ngle}\fi
\IfFileExists{worldflag_\country.tex}{\input{worldflag_\country.tex}}{\relax}
- %\end{scope}
- \global\let\flagwidth\undefined
- \global\let\flaglength\undefined
- \global\let\flagframe\undefined
- \global\let\flagstretch\undefined
- \global\let\framecolor\undefined
- \global\let\ifemblem\undefined
- \global\let\ifnoemblem\undefined
- \global\let\ifgrid\undefined
- \global\let\viewangle\undefined
- \global\let\hangangle\undefined
}
}