cinzel (24may14)

git-svn-id: svn://tug.org/texlive/trunk@34408 c570f23f-e606-0410-a88d-b1316a301751

96 files changed, 70 insertions, 55 deletions

diff --git a/Master/texmf-dist/doc/fonts/cinzel/README b/Master/texmf-dist/doc/fonts/cinzel/README
index 8a6f87ec8cc..cf1c52d0cad 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/README
+++ b/Master/texmf-dist/doc/fonts/cinzel/README
@@ -1,4 +1,4 @@
-This is the README for the cinzel package, version 2014-03-31.
+This is the README for the cinzel package, version 2014-05-24.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
 for the Cinzel and Cinzel Decorative families of fonts, designed
@@ -42,7 +42,7 @@ Command \cinzel allows for localized use of Cinzel (and Cinzel
 Decorative). Command \cinzelblack allows for localized use of the
 Black series.
 
-The opentype fonts were downloaded from
+The truetype fonts were downloaded from
 http://www.google.com/webfonts and are licensed under the SIL Open
 Font License, (version 1.1); the text may be found in the doc
 directory. The type1 versions were created using fontforge. The
diff --git a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
index a680f47179a..7d1eb61f01e 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
index fb130913edd..0e5b480720e 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
+++ b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
@@ -13,18 +13,25 @@ Cinzel and Cinzel Decorative
 \subsection*{Regular}
 \lipsum[1]
 
-\subsection*{Bold}
-\textbf{\lipsum[3]}
-
 \subsection*{Decorative}
 \textit{\lipsum[2]}
 
+\subsection*{Bold}
+\textbf{\lipsum[3]}
+
 \subsection*{Bold Decorative}
 
 \textbf{\textit{\lipsum[4]}}
 
+\subsection*{Black}
+{\cinzelblack\lipsum[4]}
+
+\subsection*{Black Decorative}
+{\cinzelblack\textit{\lipsum[5]}}
+
 \subsection*{Numbers}
 
 1234567890
 
+
 \end{document}
diff --git a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7luz43.enc b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7luz43.enc
index f6d118cb025..1588c80e91e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7luz43.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7luz43.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7luz434ypt3pnlnjm2v7veregd
-% Encoding created by otftotfm on Sun Mar 30 21:17:26 2014
+% Encoding created by otftotfm on Sat May 24 08:57:58 2014
 % Command line follows encoding
 /AutoEnc_7luz434ypt3pnlnjm2v7veregd [
 %00
@@ -59,7 +59,7 @@
 % --type1-directory=texmf/fonts/type1/ndiscovered/cinzel
 % --truetype-directory=texmf/fonts/truetype/ndiscovered/cinzel
 % --encoding-directory=texmf/fonts/enc/dvips/cinzel
-% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap
+% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap --no-type1
 % --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern --ligkern=f
 % i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
-% --ligkern=ff l =: ffl Cinzel-Black.otf Cinzel-Black-lf-ly1'
+% --ligkern=ff l =: ffl Cinzel-Black.ttf Cinzel-Black-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc
index 5a0a2add31b..c664a6bbe56 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug
-% Encoding created by otftotfm on Sun Mar 30 21:17:25 2014
+% Encoding created by otftotfm on Sat May 24 08:57:58 2014
 % Command line follows encoding
 /AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug [
 %00
@@ -59,7 +59,7 @@
 % --type1-directory=texmf/fonts/type1/ndiscovered/cinzel
 % --truetype-directory=texmf/fonts/truetype/ndiscovered/cinzel
 % --encoding-directory=texmf/fonts/enc/dvips/cinzel
-% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap
+% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap --no-type1
 % --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
 % --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
-% =: ffi --ligkern=ff l =: ffl Cinzel-Black.otf Cinzel-Black-lf-t1'
+% =: ffi --ligkern=ff l =: ffl Cinzel-Black.ttf Cinzel-Black-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_fzt4gv.enc b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc
index d88b906b55d..daa842cd99d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_fzt4gv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc
@@ -1,15 +1,15 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
-%%AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc
-% Encoding created by otftotfm on Sun Mar 30 21:17:26 2014
+%%AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga
+% Encoding created by otftotfm on Sat May 24 08:57:59 2014
 % Command line follows encoding
-/AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc [
+/AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga [
 %00
   /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /asterisk
+  /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk
 %10
-  /exclam /exclamdown /quotedblbase /question /questiondown /.notdef /.notdef /.notdef
-  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /bar /.notdef
+  /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef
+  /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef
 %20
   /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
   /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
@@ -59,7 +59,7 @@
 % --type1-directory=texmf/fonts/type1/ndiscovered/cinzel
 % --truetype-directory=texmf/fonts/truetype/ndiscovered/cinzel
 % --encoding-directory=texmf/fonts/enc/dvips/cinzel
-% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap
+% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap --no-type1
 % --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi
 % --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
-% l =: ffl Cinzel-Black.otf Cinzel-Black-lf-ts1'
+% l =: ffl Cinzel-Black.ttf Cinzel-Black-lf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc
index bb8739e1e76..300c904934d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc
-% Encoding created by otftotfm on Sun Mar 30 21:17:25 2014
+% Encoding created by otftotfm on Sat May 24 08:57:58 2014
 % Command line follows encoding
 /AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc [
 %00
@@ -59,7 +59,7 @@
 % --type1-directory=texmf/fonts/type1/ndiscovered/cinzel
 % --truetype-directory=texmf/fonts/truetype/ndiscovered/cinzel
 % --encoding-directory=texmf/fonts/enc/dvips/cinzel
-% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap
+% --map-file=texmf/fonts/map/dvips/cinzel/Cinzel.map --no-updmap --no-type1
 % --coding-scheme=TEX TEXT --feature=kern --ligkern=f i =: fi --ligkern=f l
 % =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
-% Cinzel-Black.otf Cinzel-Black-lf-ot1'
+% Cinzel-Black.ttf Cinzel-Black-lf-ot1'
diff --git a/Master/texmf-dist/fonts/map/dvips/cinzel/cinzel.map b/Master/texmf-dist/fonts/map/dvips/cinzel/cinzel.map
index 74f346a479b..8fe3359428b 100644
--- a/Master/texmf-dist/fonts/map/dvips/cinzel/cinzel.map
+++ b/Master/texmf-dist/fonts/map/dvips/cinzel/cinzel.map
@@ -1,24 +1,30 @@
+
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
 Cinzel-Black-lf-ot1 Cinzel-Black "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <Cinzel-Black.pfb
 Cinzel-Black-lf-t1--base Cinzel-Black "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <Cinzel-Black.pfb
 Cinzel-Black-lf-ly1--base Cinzel-Black "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <Cinzel-Black.pfb
-Cinzel-Black-lf-ts1--base Cinzel-Black "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <Cinzel-Black.pfb
+Cinzel-Black-lf-ts1--base Cinzel-Black "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <Cinzel-Black.pfb
 Cinzel-Bold-lf-ot1 Cinzel-Bold "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <Cinzel-Bold.pfb
 Cinzel-Bold-lf-t1--base Cinzel-Bold "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <Cinzel-Bold.pfb
 Cinzel-Bold-lf-ly1--base Cinzel-Bold "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <Cinzel-Bold.pfb
-Cinzel-Bold-lf-ts1--base Cinzel-Bold "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <Cinzel-Bold.pfb
+Cinzel-Bold-lf-ts1--base Cinzel-Bold "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <Cinzel-Bold.pfb
 Cinzel-Regular-lf-ot1 Cinzel-Regular "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <Cinzel-Regular.pfb
 Cinzel-Regular-lf-t1--base Cinzel-Regular "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <Cinzel-Regular.pfb
 Cinzel-Regular-lf-ly1--base Cinzel-Regular "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <Cinzel-Regular.pfb
-Cinzel-Regular-lf-ts1--base Cinzel-Regular "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <Cinzel-Regular.pfb
+Cinzel-Regular-lf-ts1--base Cinzel-Regular "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <Cinzel-Regular.pfb
+
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
 CinzelDecorative-Black-lf-ot1 CinzelDecorative-Black "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <CinzelDecorative-Black.pfb
 CinzelDecorative-Black-lf-t1--base CinzelDecorative-Black "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <CinzelDecorative-Black.pfb
 CinzelDecorative-Black-lf-ly1--base CinzelDecorative-Black "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <CinzelDecorative-Black.pfb
-CinzelDecorative-Black-lf-ts1--base CinzelDecorative-Black "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <CinzelDecorative-Black.pfb
+CinzelDecorative-Black-lf-ts1--base CinzelDecorative-Black "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <CinzelDecorative-Black.pfb
 CinzelDecorative-Bold-lf-ot1 CinzelDecorative-Bold "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <CinzelDecorative-Bold.pfb
 CinzelDecorative-Bold-lf-t1--base CinzelDecorative-Bold "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <CinzelDecorative-Bold.pfb
 CinzelDecorative-Bold-lf-ly1--base CinzelDecorative-Bold "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <CinzelDecorative-Bold.pfb
-CinzelDecorative-Bold-lf-ts1--base CinzelDecorative-Bold "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <CinzelDecorative-Bold.pfb
+CinzelDecorative-Bold-lf-ts1--base CinzelDecorative-Bold "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <CinzelDecorative-Bold.pfb
 CinzelDecorative-Regular-lf-ot1 CinzelDecorative-Regular "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <CinzelDecorative-Regular.pfb
 CinzelDecorative-Regular-lf-t1--base CinzelDecorative-Regular "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <CinzelDecorative-Regular.pfb
 CinzelDecorative-Regular-lf-ly1--base CinzelDecorative-Regular "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <CinzelDecorative-Regular.pfb
-CinzelDecorative-Regular-lf-ts1--base CinzelDecorative-Regular "AutoEnc_fzt4gvhcp5fmzkdmcgb3la3duc ReEncodeFont" <[cnzl_fzt4gv.enc <CinzelDecorative-Regular.pfb
+CinzelDecorative-Regular-lf-ts1--base CinzelDecorative-Regular "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <CinzelDecorative-Regular.pfb
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Black.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Black.otf
deleted file mode 100644
index e1d142f19b5..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Black.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Bold.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Bold.otf
deleted file mode 100644
index 736fb115aa6..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Bold.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Regular.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Regular.otf
deleted file mode 100644
index 2fa4b3ed30d..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/Cinzel-Regular.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Black.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Black.otf
deleted file mode 100644
index e4aeef4d98b..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Black.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Bold.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Bold.otf
deleted file mode 100644
index 918600ffa67..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Bold.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Regular.otf b/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Regular.otf
deleted file mode 100644
index 9f6ddafc245..00000000000
--- a/Master/texmf-dist/fonts/opentype/ndiscovered/cinzel/CinzelDecorative-Regular.otf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1--base.tfm
index b0780734278..dabc6651641 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1.tfm
index 0522eeb0718..f7201605a1d 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ot1.tfm
index 47a915ab19a..b7ee06c2a93 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1--base.tfm
index 0f92565d940..7d79c17c9b3 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm
index 78deba40ed4..3cfa840d155 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1--base.tfm
index ac6e8e1b613..aac2fc7e70b 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm
index 7fd0eefe627..c1b2eb8f8fd 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm
index e23b97fd3c5..827064ab112 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm
index c0389002459..15353fde2f4 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm
index c0abd25776d..c2281ac45b3 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm
index b80bb3fd485..3a3f7bddb3d 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm
index 09f99d8ef78..603312b54e3 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm
index bdc75abb28d..0a15d357513 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm
index 22f0c11b83a..5d2b42bd60d 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1--base.tfm
index f8b21d82266..acf4ef997ae 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.tfm
index f8ebdb9ad8e..584f5a81085 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ot1.tfm
index 8ddc6278eca..93ef642d655 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1--base.tfm
index de4d576a2f1..f7a1c79d708 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm
index 65c5c1de3be..909432e9afd 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1--base.tfm
index 3cd6d833f2a..cb5f751cb72 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm
index 31e591c7720..0bdec651acf 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm
index b5633439613..bf83281f4bb 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm
index a223d660d90..b3402c5a46a 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm
index 3d6a8a3850d..2b106582ce9 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm
index 8e468db3321..07dd6958301 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm
index 03a56ea82c3..767adbd6b2b 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm
index 6cbc2c55d46..dc6a06cae3a 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm
index 460713203e6..fcdd0a772bf 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm
index e28ada98b94..5843c1f0b33 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm
index f9ae05e8f36..0237b7c9fac 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm
index ab946c019d1..8225aea4359 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm
index cecd8deffd5..64736aca9fa 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm
index ba45cc1bd6e..cbc1469431f 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm
index eea83f3220d..995782488dd 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm
index f8c3aa164f3..34619d0da3f 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm
index ed2d0f155d5..8e0a0c03d91 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm
index ab13ad19e2f..8d77c8b0594 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm
index 75447cd3532..ef2c7817015 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm
index 8b0189f5d75..15f48ef62f6 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm
index 8bc9e0974ca..42e4afa4faa 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm
index 1acbf1ce664..c7b8c9cca18 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm
diff --git a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm
index f3ea0a58e7b..274e4b99862 100644
--- a/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm
+++ b/Master/texmf-dist/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Black.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Black.ttf
new file mode 100644
index 00000000000..06142132a03
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Black.ttf
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Bold.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Bold.ttf
new file mode 100644
index 00000000000..2550adde88a
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Bold.ttf
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Regular.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Regular.ttf
new file mode 100644
index 00000000000..65d7240ba37
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/Cinzel-Regular.ttf
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Black.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Black.ttf
new file mode 100644
index 00000000000..e24e8882680
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Black.ttf
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Bold.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Bold.ttf
new file mode 100644
index 00000000000..61612535304
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Bold.ttf
diff --git a/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Regular.ttf b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Regular.ttf
new file mode 100644
index 00000000000..15e94a03b20
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/ndiscovered/cinzel/CinzelDecorative-Regular.ttf
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Black.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Black.pfb
index 590904331dc..94b816e2084 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Black.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Black.pfb
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Bold.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Bold.pfb
index 2d87b9b2b27..6ca94fb4b91 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Regular.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Regular.pfb
index 0635568bac5..d119a545bba 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/Cinzel-Regular.pfb
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Black.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Black.pfb
index 56585d13c06..7525f6b4f4f 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Black.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Black.pfb
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Bold.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Bold.pfb
index 4fa76c1741f..f9afc52efe0 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Regular.pfb b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Regular.pfb
index 9ad6dac55fc..bdf361be2d0 100644
--- a/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/ndiscovered/cinzel/CinzelDecorative-Regular.pfb
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ly1.vf
index c3a4e85b9b2..7dcc5333edf 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf
index 3ff166480a0..d9cce0299dd 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf
index cd5962b9d46..15d8a397ee5 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf
index ed9cb92ecc8..a16b6096c36 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf
index 6e2e8f00008..527f1d65a69 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf
index 88049b5b854..63e3b2fb05d 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.vf
index 2bc7c9b3712..fc2789ced29 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf
index 679c00d274e..8c714a1a1e4 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf
index 9d732b9ff72..95dbbdb85ba 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf
index 10b7ed5149b..1dae517bdd3 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf
index 770a8ab92b9..8b6dc2c566a 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf
index 12518c4053d..3655017d9d6 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf
index 6c71ed5737d..933dedee4b3 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf
index 67f98f3c68d..34a6a647840 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf
index 67c4affc485..f8c26f777f0 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf
index 6aae8599310..68328062a29 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf
index 1d7449d9f51..f38d3fccb35 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf
diff --git a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf
index 0ac1026a4f2..4c0170d2d37 100644
--- a/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf
+++ b/Master/texmf-dist/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf
diff --git a/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd
index ac59ff2c316..a72627d6255 100644
--- a/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/LY1Cinzel-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{LY1Cinzel-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for LY1/Cinzel-LF.]
+    [2014/05/24 (autoinst)  Font definitions for LY1/Cinzel-LF.]
 
 \expandafter\ifx\csname Cinzel@scale\endcsname\relax
     \let\Cinzel@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd
index c4fbca26740..301223592f2 100644
--- a/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/LY1CinzelDecorative-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{LY1CinzelDecorative-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for LY1/CinzelDecorative-LF.]
+    [2014/05/24 (autoinst)  Font definitions for LY1/CinzelDecorative-LF.]
 
 \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
     \let\CinzelDecorative@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd
index 55c72d3e10f..34acba5f39c 100644
--- a/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/OT1Cinzel-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{OT1Cinzel-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for OT1/Cinzel-LF.]
+    [2014/05/24 (autoinst)  Font definitions for OT1/Cinzel-LF.]
 
 \expandafter\ifx\csname Cinzel@scale\endcsname\relax
     \let\Cinzel@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd
index e75973e119b..c6d0665a3c7 100644
--- a/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/OT1CinzelDecorative-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{OT1CinzelDecorative-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for OT1/CinzelDecorative-LF.]
+    [2014/05/24 (autoinst)  Font definitions for OT1/CinzelDecorative-LF.]
 
 \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
     \let\CinzelDecorative@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd
index 19e5286b217..5c972e585ee 100644
--- a/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/T1Cinzel-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{T1Cinzel-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for T1/Cinzel-LF.]
+    [2014/05/24 (autoinst)  Font definitions for T1/Cinzel-LF.]
 
 \expandafter\ifx\csname Cinzel@scale\endcsname\relax
     \let\Cinzel@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd
index 3fba38b8518..ce1e14cd828 100644
--- a/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/T1CinzelDecorative-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{T1CinzelDecorative-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for T1/CinzelDecorative-LF.]
+    [2014/05/24 (autoinst)  Font definitions for T1/CinzelDecorative-LF.]
 
 \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
     \let\CinzelDecorative@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd b/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd
index b88ca772562..2d769a54fad 100644
--- a/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/TS1Cinzel-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{TS1Cinzel-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for TS1/Cinzel-LF.]
+    [2014/05/24 (autoinst)  Font definitions for TS1/Cinzel-LF.]
 
 \expandafter\ifx\csname Cinzel@scale\endcsname\relax
     \let\Cinzel@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd b/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd
index 3ef77a9c53b..a8379c6b69f 100644
--- a/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd
+++ b/Master/texmf-dist/tex/latex/cinzel/TS1CinzelDecorative-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/03/30
+%% Generated by autoinst on 2014/05/24
 %%
 \ProvidesFile{TS1CinzelDecorative-LF.fd}
-    [2014/03/30 (autoinst)  Font definitions for TS1/CinzelDecorative-LF.]
+    [2014/05/24 (autoinst)  Font definitions for TS1/CinzelDecorative-LF.]
 
 \expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
     \let\CinzelDecorative@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
index 7bae8ecd449..7dbb3ef5a44 100644
--- a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
+++ b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
@@ -1,25 +1,25 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cinzel}
-    [2014/03/30  (Bob Tennent)  Supports Cinzel and CinzelDecorative for all LaTeX engines.]
+    [2014/05/24  (Bob Tennent)  Supports Cinzel and CinzelDecorative for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-\newif\ifcinzel@otf 
+\newif\ifcinzel@ttf 
 \ifxetex
-  \cinzel@otftrue
+  \cinzel@ttftrue
 \else\ifluatex
-  \cinzel@otftrue
+  \cinzel@ttftrue
 \else  % [pdf]LaTeX
-  \cinzel@otffalse
+  \cinzel@ttffalse
 \fi\fi
 
 \newif\ifcinzel@black \cinzel@blackfalse
 
-\DeclareOptionX{type1}{\cinzel@otffalse}
+\DeclareOptionX{type1}{\cinzel@ttffalse}
 \DeclareOptionX{black}{\cinzel@blacktrue}
 \ProcessOptionsX\relax
 
-\ifcinzel@otf
+\ifcinzel@ttf
   \def\cinzel@boldstyle{Bold}
   \ifcinzel@black\def\cinzel@boldstyle{Black}\fi
 
@@ -29,18 +29,18 @@
 
 \fi
 
-\ifcinzel@otf
+\ifcinzel@ttf
   \RequirePackage{fontspec}
 \else
   \RequirePackage{fontenc,fontaxes,mweights}
 \fi
 
 
-\ifcinzel@otf
+\ifcinzel@ttf
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
-        Extension = .otf }
+        Extension = .ttf }
   \setmainfont
       [ UprightFont    = *-Regular ,
         ItalicFont     = *Decorative-Regular ,
@@ -67,7 +67,7 @@
 
 \fi
 
-\ifcinzel@otf
+\ifcinzel@ttf
 % turn off defaults in case other fonts are selected:
   \defaultfontfeatures{}
 \fi
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 27b6ba67750..c5012acc381 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -528,6 +528,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'keys3',       "die 'skipping, merged into expl3'",
  'knitting',    "&MAKEflatten",
  'koi8',        "die 'skipping, ca.1996, noinfo license'",
+ 'koma-script-examples-3', "die 'skipping, just have koma-script-examples'",
+ 'koma-script-examples-4', "die 'skipping, just have koma-script-examples'",
  'koma-script-SFS',     "die 'skipping, use koma-script-sfs'",
  'ktv-texdata',         "&MAKEflatten",
  'kurier',              "&MAKEcopy",