beta 2010.09.22 12:33

15 files changed, 278 insertions, 232 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index a22612eeb..cee926a6e 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -637,14 +637,16 @@ end
 
 local pdfview -- delayed loading
 
-function scripts.context.openpdf(name)
+function scripts.context.openpdf(name,method)
     pdfview = pdfview or dofile(resolvers.findfile("l-pdfview.lua","tex"))
+    pdfview.setmethod(method)
     logs.simple("pdfview methods: %s, current method: %s, MTX_PDFVIEW_METHOD=%s",pdfview.methods(),pdfview.method,os.getenv(pdfview.METHOD) or "<unset>")
     pdfview.open(file.replacesuffix(name,"pdf"))
 end
 
-function scripts.context.closepdf(name)
+function scripts.context.closepdf(name,method)
     pdfview = pdfview or dofile(resolvers.findfile("l-pdfview.lua","tex"))
+    pdfview.setmethod(method)
     pdfview.close(file.replacesuffix(name,"pdf"))
 end
 
@@ -764,10 +766,11 @@ function scripts.context.run(ctxdata,filename)
                             resultname = nil
                         end
                         --
-                        if environment.argument("autopdf") or environment.argument("closepdf") then
-                            scripts.context.closepdf(filename)
+                        local pdfview = environment.argument("autopdf") or environment.argument("closepdf")
+                        if pdfview then
+                            scripts.context.closepdf(filename,pdfview)
                             if resultname then
-                                scripts.context.closepdf(resultname)
+                                scripts.context.closepdf(resultname,pdfview)
                             end
                         end
                         --
@@ -880,8 +883,9 @@ function scripts.context.run(ctxdata,filename)
                             scripts.context.purge_job(resultname,true)
                         end
                         --
-                        if environment.argument("autopdf") then
-                            scripts.context.openpdf(resultname or filename)
+                        local pdfview = environment.argument("autopdf")
+                        if pdfview then
+                            scripts.context.openpdf(resultname or filename,pdfview)
                         end
                         --
                         if environment.argument("timing") then
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 0bfc77fc2..83c7b6198 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -12,6 +12,9 @@ if not modules then modules = { } end modules ['back-exp'] = {
 -- Because we need to look ahead we now always build a tree (this was optional in
 -- the beginning). The extra overhead in the frontend is neglectable.
 
+-- We can consider replacing attributes by the hash entry ... slower in resolving but it's still
+-- quite okay.
+
 local nodecodes       = nodes.nodecodes
 local traverse_nodes  = node.traverse
 local hlist_code      = nodecodes.hlist
@@ -383,6 +386,8 @@ function extras.itemgroup(element,detail,n,fulltag,di)
                     local tg = ddi.tg
                     if tg == "itemtag" or tg == "itemcontent" then
                         local hash = attributehash[ddi.fulltag]
+--~ table.print(attributehash)
+--~ print(ddi.fulltag,hash)
                         if hash then
                             local v = hash.packed
                             if v and v == 1 then
@@ -392,8 +397,8 @@ function extras.itemgroup(element,detail,n,fulltag,di)
                             if v then
                                 handle:write(" symbol='",snames[v],"'")
                             end
+                            return
                         end
-                        return
                     end
                 end
             end
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index c9a207c34..7dd1c51a6 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2010.09.22 09:35}
+\newcontextversion{2010.09.22 12:33}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 681fd7312..9c4988471 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2010.09.22 09:35}
+\edef\contextversion{2010.09.22 12:33}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-syn.lua b/tex/context/base/font-syn.lua
index b246a1d82..ba3e90231 100644
--- a/tex/context/base/font-syn.lua
+++ b/tex/context/base/font-syn.lua
@@ -1429,6 +1429,12 @@ end
 --~
 --~ names.old_to_new = allocate(table.swapped(names.new_to_old))
 
+--~ todo:
+--~
+--~ blacklisted = {
+--~     ["cmr10.ttf"] = "completely messed up",
+--~ }
+
 function names.exists(name)
     local found = false
     local list = filters.list
diff --git a/tex/context/base/l-pdfview.lua b/tex/context/base/l-pdfview.lua
index 76923e1fc..c16df036c 100644
--- a/tex/context/base/l-pdfview.lua
+++ b/tex/context/base/l-pdfview.lua
@@ -35,6 +35,12 @@ pdfview.METHOD = "MTX_PDFVIEW_METHOD"
 pdfview.method = resolvers.getenv(pdfview.METHOD) or 'default'
 pdfview.method = (opencalls[pdfview.method] and pdfview.method) or 'default'
 
+function pdfview.setmethod(method)
+    if method and opencalls[method] then
+        pdfview.method = method
+    end
+end
+
 function pdfview.methods()
     return concat(table.sortedkeys(opencalls), " ")
 end
diff --git a/tex/context/base/lpdf-swf.lua b/tex/context/base/lpdf-swf.lua
index fc06c9699..c3e340db0 100644
--- a/tex/context/base/lpdf-swf.lua
+++ b/tex/context/base/lpdf-swf.lua
@@ -115,7 +115,7 @@ local function insertswf(spec)
 end
 
 function backends.pdf.nodeinjections.insertswf(spec)
-    local annot, preview, ref = insertswf {
+    local annotation, preview, ref = insertswf {
         foundname = spec.foundname,
         width     = spec.width,
         height    = spec.height,
@@ -124,6 +124,6 @@ function backends.pdf.nodeinjections.insertswf(spec)
     --  controls  = spec.controls,
     --  label     = spec.label,
     }
- -- texsprint(ctxcatcodes,format("\\pdfannot width %ssp height %ssp {%s}",spec.width,spec.height,annot())) -- brrrr
+ -- texsprint(ctxcatcodes,format("\\pdfannot width %ssp height %ssp {%s}",spec.width,spec.height,annotation())) -- brrrr
     node.write(pdfannotation(spec.width,spec.height,0,annotation()))
 end
diff --git a/tex/context/base/node-ini.lua b/tex/context/base/node-ini.lua
index 2fb3fe9c6..8dd55b468 100644
--- a/tex/context/base/node-ini.lua
+++ b/tex/context/base/node-ini.lua
@@ -209,14 +209,24 @@ end
 
 trackers.register("system.showcodes", nodes.showcodes)
 
-local hlist_code   = nodecodes.hlist
-local vlist_code   = nodecodes.vlist
+local hlist_code = nodecodes.hlist
+local vlist_code = nodecodes.vlist
+local glue_code  = nodecodes.glue
 
 function nodes.remove(head, current, free_too)
    local t = current
    head, current = remove_node(head,current)
    if t then
         if free_too then
+--~ if t.id == glue_code then
+--~     local s = t.spec
+--~ print(t)
+--~ print(s,s and s.writable)
+--~     if s and s.writable then
+--~         free_node(s)
+--~     end
+--~     t.spec = nil
+--~ end
             free_node(t)
             t = nil
         else
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua
index 8bd6daa60..59f66803e 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/spac-ver.lua
@@ -732,7 +732,8 @@ local free_glue_node = free_node
 local discard, largest, force, penalty, add, disable, nowhite, goback, together = 0, 1, 2, 3, 4, 5, 6, 7, 8
 
 --~ local function free_glue_node(n)
---~     free_node(n.spec)
+--~  -- free_node(n.spec)
+--~     print(n)
 --~     free_node(n)
 --~ end
 
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index bced781fd..c1152250f 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -763,6 +763,9 @@ end
 
 local prefixsplitter = lpegCs(lpegP((1-lpegP(":"))^1 * lpegP(":"))) * lpegCs(lpegP(1)^1)
 
+
+-- todo: add lots of tracing here
+
 local function identify(prefix,reference)
     local set = resolve(prefix,reference)
     local bug = false
@@ -936,13 +939,22 @@ local function identify(prefix,reference)
                             p = splitprefix
                         end
                     end
-                else
+                end
+                -- todo: strict here
+                if not i then
                     i = collected[prefix]
                     i = i and i[inner]
                     if i then
                         p = prefix
                     end
                 end
+                if not i and prefix ~= "" then
+                    i = collected[""]
+                    i = i and i[inner]
+                    if i then
+                        p = ""
+                    end
+                end
                 if i then
                     var.i = { "reference", i }
                     references.resolvers.reference(var)
@@ -966,7 +978,8 @@ local function identify(prefix,reference)
                                 p = splitprefix
                             end
                         end
-                    else
+                    end
+                    if not i then
                         i = derived[prefix]
                         i = i and i[inner]
                         if i then
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index 82ac1c166..f815e26c5 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -478,7 +478,7 @@
       \begstrut % use one \strut here!
       \dontleavehmode % in case there is no strut, else side effects with llap
       \ifconditional\structureheadshownumber % \ifheadnumbercontent
-        \llap{\hbox to 5em{\hfill{#1}\hskip\localheadskip\hskip\leftmargindistance}}% introduces whitespace
+        \llap{\hbox{\hfill{#1}\hskip\localheadskip\hskip\leftmargindistance}}% introduces whitespace
         % maybe better:
         % \inleftmargin{\hbox{\hss{#1}\hskip\localheadskip}}%
       \fi
diff --git a/tex/context/base/type-one.mkii b/tex/context/base/type-one.mkii
index 14e97a9bb..140f91e61 100644
--- a/tex/context/base/type-one.mkii
+++ b/tex/context/base/type-one.mkii
@@ -1447,41 +1447,41 @@
         \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\typescriptthree-antpb10-sc]  [encoding=\typescriptthree]
         \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\typescriptthree-antpbi10-sc] [encoding=\typescriptthree]
 
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Light]             [\typescriptthree-antpl8]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-LightItalic]       [\typescriptthree-antpli8]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Regular]           [\typescriptthree-antpr8]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Italic]            [\typescriptthree-antpri8]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Medium]            [\typescriptthree-antpm8]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-MediumItalic]      [\typescriptthree-antpmi8]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Bold]              [\typescriptthree-antpb8]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-BoldItalic]        [\typescriptthree-antpbi8]     [encoding=\typescriptthree]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLight]         [\typescriptthree-antpl8-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLightItalic]   [\typescriptthree-antpli8-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsRegular]       [\typescriptthree-antpr8-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsItalic]        [\typescriptthree-antpri8-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMedium]        [\typescriptthree-antpm8-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMediumItalic]  [\typescriptthree-antpmi8-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBold]          [\typescriptthree-antpb8-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBoldItalic]    [\typescriptthree-antpbi8-sc]  [encoding=\typescriptthree]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Light]                 [\typescriptthree-antpl6]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-LightItalic]           [\typescriptthree-antpli6]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Regular]               [\typescriptthree-antpr6]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Italic]                [\typescriptthree-antpri6]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Medium]                [\typescriptthree-antpm6]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-MediumItalic]          [\typescriptthree-antpmi6]     [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Bold]                  [\typescriptthree-antpb6]      [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-BoldItalic]            [\typescriptthree-antpbi6]     [encoding=\typescriptthree]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLight]             [\typescriptthree-antpl6-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLightItalic]       [\typescriptthree-antpli6-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsRegular]           [\typescriptthree-antpr6-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsItalic]            [\typescriptthree-antpri6-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMedium]            [\typescriptthree-antpm6-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMediumItalic]      [\typescriptthree-antpmi6-sc]  [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBold]              [\typescriptthree-antpb6-sc]   [encoding=\typescriptthree]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBoldItalic]        [\typescriptthree-antpbi6-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Light]             [\typescriptthree-antpl8]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-LightItalic]       [\typescriptthree-antpli8]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Regular]           [\typescriptthree-antpr8]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Italic]            [\typescriptthree-antpri8]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Medium]            [\typescriptthree-antpm8]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-MediumItalic]      [\typescriptthree-antpmi8]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Bold]              [\typescriptthree-antpb8]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-BoldItalic]        [\typescriptthree-antpbi8]     [encoding=\typescriptthree]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLight]         [\typescriptthree-antpl8-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLightItalic]   [\typescriptthree-antpli8-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsRegular]       [\typescriptthree-antpr8-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsItalic]        [\typescriptthree-antpri8-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMedium]        [\typescriptthree-antpm8-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMediumItalic]  [\typescriptthree-antpmi8-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBold]          [\typescriptthree-antpb8-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBoldItalic]    [\typescriptthree-antpbi8-sc]  [encoding=\typescriptthree]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Light]                 [\typescriptthree-antpl6]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-LightItalic]           [\typescriptthree-antpli6]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Regular]               [\typescriptthree-antpr6]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Italic]                [\typescriptthree-antpri6]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Medium]                [\typescriptthree-antpm6]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-MediumItalic]          [\typescriptthree-antpmi6]     [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Bold]                  [\typescriptthree-antpb6]      [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-BoldItalic]            [\typescriptthree-antpbi6]     [encoding=\typescriptthree]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLight]             [\typescriptthree-antpl6-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLightItalic]       [\typescriptthree-antpli6-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsRegular]           [\typescriptthree-antpr6-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsItalic]            [\typescriptthree-antpri6-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMedium]            [\typescriptthree-antpm6-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMediumItalic]      [\typescriptthree-antpmi6-sc]  [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBold]              [\typescriptthree-antpb6-sc]   [encoding=\typescriptthree]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBoldItalic]        [\typescriptthree-antpbi6-sc]  [encoding=\typescriptthree]
 
         \loadmapfile[poltawski-\typescriptthree.map]
     \stoptypescript
diff --git a/tex/context/base/type-otf.mkii b/tex/context/base/type-otf.mkii
index 05a6d3987..67a19eb7b 100644
--- a/tex/context/base/type-otf.mkii
+++ b/tex/context/base/type-otf.mkii
@@ -1209,96 +1209,97 @@
     %     \definefontsynonym [SerifCaps]        [AntykwaPoltawskiego-Regular]
     % \stoptypescript
 
+    % names of "Caps" may still change
     \starttypescript [serif] [antykwa-poltawskiego,antykwa-poltawskiego-light]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Light]                [\s!file:AntPoltLtCond-Regular]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-LightItalic]          [\s!file:AntPoltLtCond-Italic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Regular]              [\s!file:AntPoltCond-Regular]        [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Italic]               [\s!file:AntPoltCond-Italic]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Medium]               [\s!file:AntPoltMdCond-Bold]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-MediumItalic]         [\s!file:AntPoltMdCond-BoldItalic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Bold]                 [\s!file:AntPoltCond-Bold]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-BoldItalic]           [\s!file:AntPoltCond-BoldItalic]     [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLight]            [\s!file:AntPoltLtCond-Regular]      [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLightItalic]      [\s!file:AntPoltLtCond-Italic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsRegular]          [\s!file:AntPoltCond-Regular]        [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsItalic]           [\s!file:AntPoltCond-Italic]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMedium]           [\s!file:AntPoltMdCond-Bold]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMediumItalic]     [\s!file:AntPoltMdCond-BoldItalic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBold]             [\s!file:AntPoltCond-Bold]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBoldItalic]       [\s!file:AntPoltCond-BoldItalic]     [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:AntPoltLtSemiCond-Regular]  [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:AntPoltLtSemiCond-Italic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:AntPoltSemiCond-Regular]    [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:AntPoltSemiCond-Italic]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Medium]           [\s!file:AntPoltMdSemiCond-Bold]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-MediumItalic]     [\s!file:AntPoltMdSemiCond-BdItalic] [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Bold]             [\s!file:AntPoltSemiCond-Bold]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-BoldItalic]       [\s!file:AntPoltSemiCond-BoldItalic] [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:AntPoltLtSemiCond-Regular]  [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:AntPoltLtSemiCond-Italic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:AntPoltSemiCond-Regular]    [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:AntPoltSemiCond-Italic]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMedium]       [\s!file:AntPoltMdSemiCond-Bold]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMediumItalic] [\s!file:AntPoltMdSemiCond-BdItalic] [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBold]         [\s!file:AntPoltSemiCond-Bold]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBoldItalic]   [\s!file:AntPoltSemiCond-BoldItalic] [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-Light]                          [\s!file:AntPoltLt-Regular]          [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-LightItalic]                    [\s!file:AntPoltLt-Italic]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Regular]                        [\s!file:AntPolt-Regular]            [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Italic]                         [\s!file:AntPolt-Italic]             [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Medium]                         [\s!file:AntPoltMd-Bold]             [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-MediumItalic]                   [\s!file:AntPoltMd-BoldItalic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Bold]                           [\s!file:AntPolt-Bold]               [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-BoldItalic]                     [\s!file:AntPolt-BoldItalic]         [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-CapsLight]                      [\s!file:AntPoltLt-Regular]          [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsLightItalic]                [\s!file:AntPoltLt-Italic]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsRegular]                    [\s!file:AntPolt-Regular]            [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsItalic]                     [\s!file:AntPolt-Italic]             [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsMedium]                     [\s!file:AntPoltMd-Bold]             [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsMediumItalic]               [\s!file:AntPoltMd-BoldItalic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\s!file:AntPolt-Bold]               [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\s!file:AntPolt-BoldItalic]         [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Light]             [\s!file:AntPoltLtSemiExtd-Regular]  [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-LightItalic]       [\s!file:AntPoltLtSemiExtd-Italic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Regular]           [\s!file:AntPoltSemiExtd-Regular]    [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Italic]            [\s!file:AntPoltSemiExtd-Italic]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Medium]            [\s!file:AntPoltMdSemiExtd-Bold]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-MediumItalic]      [\s!file:AntPoltMdSemiExtd-BdItalic] [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Bold]              [\s!file:AntPoltSemiExtd-Bold]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-BoldItalic]        [\s!file:AntPoltSemiExtd-BoldItalic] [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLight]         [\s!file:AntPoltLtSemiExtd-Regular]  [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLightItalic]   [\s!file:AntPoltLtSemiExtd-Italic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsRegular]       [\s!file:AntPoltSemiExtd-Regular]    [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsItalic]        [\s!file:AntPoltSemiExtd-Italic]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMedium]        [\s!file:AntPoltMdSemiExtd-Bold]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMediumItalic]  [\s!file:AntPoltMdSemiExtd-BdItalic] [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBold]          [\s!file:AntPoltSemiExtd-Bold]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBoldItalic]    [\s!file:AntPoltSemiExtd-BoldItalic] [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Light]                 [\s!file:AntPoltLtExtd-Regular]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-LightItalic]           [\s!file:AntPoltLtExtd-Italic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Regular]               [\s!file:AntPoltExtd-Regular]        [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Italic]                [\s!file:AntPoltExtd-Italic]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Medium]                [\s!file:AntPoltMdExtd-Bold]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-MediumItalic]          [\s!file:AntPoltMdExtd-BoldItalic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Bold]                  [\s!file:AntPoltExtd-Bold]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-BoldItalic]            [\s!file:AntPoltExtd-BoldItalic]     [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLight]             [\s!file:AntPoltLtExtd-Regular]      [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLightItalic]       [\s!file:AntPoltLtExtd-Italic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsRegular]           [\s!file:AntPoltExtd-Regular]        [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsItalic]            [\s!file:AntPoltExtd-Italic]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMedium]            [\s!file:AntPoltMdExtd-Bold]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMediumItalic]      [\s!file:AntPoltMdExtd-BoldItalic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBold]              [\s!file:AntPoltExtd-Bold]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBoldItalic]        [\s!file:AntPoltExtd-BoldItalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Light]                [\s!file:antpoltltcond-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-LightItalic]          [\s!file:antpoltltcond-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Regular]              [\s!file:antpoltcond-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Italic]               [\s!file:antpoltcond-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Medium]               [\s!file:antpoltltcond-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-MediumItalic]         [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Bold]                 [\s!file:antpoltcond-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-BoldItalic]           [\s!file:antpoltcond-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLight]            [\s!file:antpoltltcond-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLightItalic]      [\s!file:antpoltltcond-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsRegular]          [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsItalic]           [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMedium]           [\s!file:antpoltltcond-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMediumItalic]     [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBold]             [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBoldItalic]       [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Light]            [\s!file:antpoltltsemicond-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-LightItalic]      [\s!file:antpoltltsemicond-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:antpoltsemicond-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:antpoltsemicond-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Medium]           [\s!file:antpoltltsemicond-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-MediumItalic]     [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Bold]             [\s!file:antpoltsemicond-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-BoldItalic]       [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLight]        [\s!file:antpoltltsemicond-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLightItalic]  [\s!file:antpoltltsemicond-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:antpoltsemicond-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:antpoltsemicond-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMedium]       [\s!file:antpoltltsemicond-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMediumItalic] [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBold]         [\s!file:antpoltsemicond-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBoldItalic]   [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Light]                          [\s!file:antpoltlt-regular]            [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-LightItalic]                    [\s!file:antpoltlt-italic]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Regular]                        [\s!file:antpolt-regular]              [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Italic]                         [\s!file:antpolt-italic]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Medium]                         [\s!file:antpoltlt-bold]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-MediumItalic]                   [\s!file:antpoltlt-bolditalic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Bold]                           [\s!file:antpolt-bold]                 [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-BoldItalic]                     [\s!file:antpolt-bolditalic]           [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-CapsLight]                      [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsLightItalic]                [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsRegular]                    [\s!file:antpolt-regular]              [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsItalic]                     [\s!file:antpolt-italic]               [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMedium]                     [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMediumItalic]               [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\s!file:antpolt-bold]                 [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\s!file:antpolt-bolditalic]           [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Light]             [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-LightItalic]       [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Regular]           [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Italic]            [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Medium]            [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-MediumItalic]      [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Bold]              [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-BoldItalic]        [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLight]         [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLightItalic]   [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsRegular]       [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsItalic]        [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMedium]        [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMediumItalic]  [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBold]          [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBoldItalic]    [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Light]                 [\s!file:antpoltltexpd-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-LightItalic]           [\s!file:antpoltltexpd-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Regular]               [\s!file:antpoltexpd-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Italic]                [\s!file:antpoltexpd-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Medium]                [\s!file:antpoltltexpd-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-MediumItalic]          [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Bold]                  [\s!file:antpoltexpd-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-BoldItalic]            [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLight]             [\s!file:antpoltltexpd-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLightItalic]       [\s!file:antpoltltexpd-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsRegular]           [\s!file:antpoltexpd-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsItalic]            [\s!file:antpoltexpd-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMedium]            [\s!file:antpoltltexpd-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMediumItalic]      [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBold]              [\s!file:antpoltexpd-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBoldItalic]        [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!smallcaps]
     \stoptypescript
 
     \starttypescript [serif] [antykwa-poltawskiego] [name]
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index 8e914f721..07ed5d008 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -873,95 +873,95 @@
 
     % names of "Caps" may still change
     \starttypescript [serif] [antykwa-poltawskiego,antykwa-poltawskiego-light]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Light]                [\s!file:AntPoltLtCond-Regular]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-LightItalic]          [\s!file:AntPoltLtCond-Italic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Regular]              [\s!file:AntPoltCond-Regular]        [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Italic]               [\s!file:AntPoltCond-Italic]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Medium]               [\s!file:AntPoltMdCond-Bold]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-MediumItalic]         [\s!file:AntPoltMdCond-BoldItalic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-Bold]                 [\s!file:AntPoltCond-Bold]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-BoldItalic]           [\s!file:AntPoltCond-BoldItalic]     [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLight]            [\s!file:AntPoltLtCond-Regular]      [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLightItalic]      [\s!file:AntPoltLtCond-Italic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsRegular]          [\s!file:AntPoltCond-Regular]        [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsItalic]           [\s!file:AntPoltCond-Italic]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMedium]           [\s!file:AntPoltMdCond-Bold]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMediumItalic]     [\s!file:AntPoltMdCond-BoldItalic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBold]             [\s!file:AntPoltCond-Bold]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBoldItalic]       [\s!file:AntPoltCond-BoldItalic]     [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:AntPoltLtSemiCond-Regular]  [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:AntPoltLtSemiCond-Italic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:AntPoltSemiCond-Regular]    [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:AntPoltSemiCond-Italic]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Medium]           [\s!file:AntPoltMdSemiCond-Bold]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-MediumItalic]     [\s!file:AntPoltMdSemiCond-BdItalic] [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Bold]             [\s!file:AntPoltSemiCond-Bold]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-BoldItalic]       [\s!file:AntPoltSemiCond-BoldItalic] [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:AntPoltLtSemiCond-Regular]  [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:AntPoltLtSemiCond-Italic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:AntPoltSemiCond-Regular]    [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:AntPoltSemiCond-Italic]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMedium]       [\s!file:AntPoltMdSemiCond-Bold]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMediumItalic] [\s!file:AntPoltMdSemiCond-BdItalic] [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBold]         [\s!file:AntPoltSemiCond-Bold]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBoldItalic]   [\s!file:AntPoltSemiCond-BoldItalic] [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-Light]                          [\s!file:AntPoltLt-Regular]          [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-LightItalic]                    [\s!file:AntPoltLt-Italic]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Regular]                        [\s!file:AntPolt-Regular]            [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Italic]                         [\s!file:AntPolt-Italic]             [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Medium]                         [\s!file:AntPoltMd-Bold]             [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-MediumItalic]                   [\s!file:AntPoltMd-BoldItalic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Bold]                           [\s!file:AntPolt-Bold]               [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-BoldItalic]                     [\s!file:AntPolt-BoldItalic]         [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-CapsLight]                      [\s!file:AntPoltLt-Regular]          [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsLightItalic]                [\s!file:AntPoltLt-Italic]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsRegular]                    [\s!file:AntPolt-Regular]            [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsItalic]                     [\s!file:AntPolt-Italic]             [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsMedium]                     [\s!file:AntPoltMd-Bold]             [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsMediumItalic]               [\s!file:AntPoltMd-BoldItalic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\s!file:AntPolt-Bold]               [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\s!file:AntPolt-BoldItalic]         [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Light]             [\s!file:AntPoltLtSemiExtd-Regular]  [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-LightItalic]       [\s!file:AntPoltLtSemiExtd-Italic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Regular]           [\s!file:AntPoltSemiExtd-Regular]    [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Italic]            [\s!file:AntPoltSemiExtd-Italic]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Medium]            [\s!file:AntPoltMdSemiExtd-Bold]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-MediumItalic]      [\s!file:AntPoltMdSemiExtd-BdItalic] [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-Bold]              [\s!file:AntPoltSemiExtd-Bold]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-BoldItalic]        [\s!file:AntPoltSemiExtd-BoldItalic] [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLight]         [\s!file:AntPoltLtSemiExtd-Regular]  [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsLightItalic]   [\s!file:AntPoltLtSemiExtd-Italic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsRegular]       [\s!file:AntPoltSemiExtd-Regular]    [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsItalic]        [\s!file:AntPoltSemiExtd-Italic]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMedium]        [\s!file:AntPoltMdSemiExtd-Bold]     [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsMediumItalic]  [\s!file:AntPoltMdSemiExtd-BdItalic] [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBold]          [\s!file:AntPoltSemiExtd-Bold]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-SemiExtended-CapsBoldItalic]    [\s!file:AntPoltSemiExtd-BoldItalic] [\s!features=\s!smallcaps]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Light]                 [\s!file:AntPoltLtExtd-Regular]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-LightItalic]           [\s!file:AntPoltLtExtd-Italic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Regular]               [\s!file:AntPoltExtd-Regular]        [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Italic]                [\s!file:AntPoltExtd-Italic]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Medium]                [\s!file:AntPoltMdExtd-Bold]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-MediumItalic]          [\s!file:AntPoltMdExtd-BoldItalic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-Bold]                  [\s!file:AntPoltExtd-Bold]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-BoldItalic]            [\s!file:AntPoltExtd-BoldItalic]     [\s!features=\s!default]
-
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLight]             [\s!file:AntPoltLtExtd-Regular]      [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsLightItalic]       [\s!file:AntPoltLtExtd-Italic]       [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsRegular]           [\s!file:AntPoltExtd-Regular]        [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsItalic]            [\s!file:AntPoltExtd-Italic]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMedium]            [\s!file:AntPoltMdExtd-Bold]         [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsMediumItalic]      [\s!file:AntPoltMdExtd-BoldItalic]   [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBold]              [\s!file:AntPoltExtd-Bold]           [\s!features=\s!smallcaps]
-        \definefontsynonym [AntykwaPoltawskiego-Extended-CapsBoldItalic]        [\s!file:AntPoltExtd-BoldItalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Light]                [\s!file:antpoltltcond-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-LightItalic]          [\s!file:antpoltltcond-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Regular]              [\s!file:antpoltcond-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Italic]               [\s!file:antpoltcond-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Medium]               [\s!file:antpoltltcond-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-MediumItalic]         [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-Bold]                 [\s!file:antpoltcond-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-BoldItalic]           [\s!file:antpoltcond-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLight]            [\s!file:antpoltltcond-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsLightItalic]      [\s!file:antpoltltcond-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsRegular]          [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsItalic]           [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMedium]           [\s!file:antpoltltcond-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsMediumItalic]     [\s!file:antpoltltcond-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBold]             [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Condensed-CapsBoldItalic]       [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Light]            [\s!file:antpoltltsemicond-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-LightItalic]      [\s!file:antpoltltsemicond-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Regular]          [\s!file:antpoltsemicond-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Italic]           [\s!file:antpoltsemicond-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Medium]           [\s!file:antpoltltsemicond-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-MediumItalic]     [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-Bold]             [\s!file:antpoltsemicond-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-BoldItalic]       [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLight]        [\s!file:antpoltltsemicond-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsLightItalic]  [\s!file:antpoltltsemicond-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsRegular]      [\s!file:antpoltsemicond-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsItalic]       [\s!file:antpoltsemicond-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMedium]       [\s!file:antpoltltsemicond-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsMediumItalic] [\s!file:antpoltltsemicond-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBold]         [\s!file:antpoltsemicond-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiCondensed-CapsBoldItalic]   [\s!file:antpoltsemicond-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Light]                          [\s!file:antpoltlt-regular]            [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-LightItalic]                    [\s!file:antpoltlt-italic]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Regular]                        [\s!file:antpolt-regular]              [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Italic]                         [\s!file:antpolt-italic]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Medium]                         [\s!file:antpoltlt-bold]               [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-MediumItalic]                   [\s!file:antpoltlt-bolditalic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Bold]                           [\s!file:antpolt-bold]                 [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-BoldItalic]                     [\s!file:antpolt-bolditalic]           [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-CapsLight]                      [\s!file:antpoltcond-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsLightItalic]                [\s!file:antpoltcond-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsRegular]                    [\s!file:antpolt-regular]              [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsItalic]                     [\s!file:antpolt-italic]               [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMedium]                     [\s!file:antpoltcond-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsMediumItalic]               [\s!file:antpoltcond-bolditalic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBold]                       [\s!file:antpolt-bold]                 [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-CapsBoldItalic]                 [\s!file:antpolt-bolditalic]           [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Light]             [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-LightItalic]       [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Regular]           [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Italic]            [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Medium]            [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-MediumItalic]      [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-Bold]              [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-BoldItalic]        [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLight]         [\s!file:antpoltltsemiexpd-regular]    [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsLightItalic]   [\s!file:antpoltltsemiexpd-italic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsRegular]       [\s!file:antpoltsemiexpd-regular]      [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsItalic]        [\s!file:antpoltsemiexpd-italic]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMedium]        [\s!file:antpoltltsemiexpd-bold]       [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsMediumItalic]  [\s!file:antpoltltsemiexpd-bolditalic] [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBold]          [\s!file:antpoltsemiexpd-bold]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-SemiExpanded-CapsBoldItalic]    [\s!file:antpoltsemiexpd-bolditalic]   [\s!features=\s!smallcaps]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Light]                 [\s!file:antpoltltexpd-regular]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-LightItalic]           [\s!file:antpoltltexpd-italic]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Regular]               [\s!file:antpoltexpd-regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Italic]                [\s!file:antpoltexpd-italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Medium]                [\s!file:antpoltltexpd-bold]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-MediumItalic]          [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-Bold]                  [\s!file:antpoltexpd-bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-BoldItalic]            [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!default]
+
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLight]             [\s!file:antpoltltexpd-regular]        [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsLightItalic]       [\s!file:antpoltltexpd-italic]         [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsRegular]           [\s!file:antpoltexpd-regular]          [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsItalic]            [\s!file:antpoltexpd-italic]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMedium]            [\s!file:antpoltltexpd-bold]           [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsMediumItalic]      [\s!file:antpoltltexpd-bolditalic]     [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBold]              [\s!file:antpoltexpd-bold]             [\s!features=\s!smallcaps]
+        \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBoldItalic]        [\s!file:antpoltexpd-bolditalic]       [\s!features=\s!smallcaps]
     \stoptypescript
 
     \starttypescript [serif] [antykwa-poltawskiego] [name]
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 4c221ae12..92ff5ac7e 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 09/22/10 09:35:53
+-- merge date  : 09/22/10 12:33:39
 
 do -- begin closure to overcome local limits and interference