summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/anch-pos.lua54
-rw-r--r--tex/context/base/anch-pos.mkiv6
-rw-r--r--tex/context/base/back-exp.lua337
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdf42
-rw-r--r--tex/context/base/context-version.pngbin105314 -> 106055 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv4
-rw-r--r--tex/context/base/core-mis.mkiv46
-rw-r--r--tex/context/base/core-sys.mkiv4
-rw-r--r--tex/context/base/font-ext.lua2
-rw-r--r--tex/context/base/lang-ini.mkiv13
-rw-r--r--tex/context/base/m-chart.mkvi4
-rw-r--r--tex/context/base/mult-de.mkii2
-rw-r--r--tex/context/base/mult-def.lua20
-rw-r--r--tex/context/base/mult-en.mkii2
-rw-r--r--tex/context/base/mult-fr.mkii2
-rw-r--r--tex/context/base/mult-it.mkii2
-rw-r--r--tex/context/base/mult-low.lua4
-rw-r--r--tex/context/base/mult-nl.mkii2
-rw-r--r--tex/context/base/mult-pe.mkii2
-rw-r--r--tex/context/base/mult-ro.mkii2
-rw-r--r--tex/context/base/node-tra.lua10
-rw-r--r--tex/context/base/page-app.mkiv10
-rw-r--r--tex/context/base/scrn-ini.mkvi13
-rw-r--r--tex/context/base/spac-fnt.mkiv12
-rw-r--r--tex/context/base/spac-par.mkiv25
-rw-r--r--tex/context/base/status-files.pdf2560
-rw-r--r--tex/context/base/status-lua.pdf24
-rw-r--r--tex/context/base/strc-doc.mkiv2
-rw-r--r--tex/context/base/strc-flt.mkii4
-rw-r--r--tex/context/base/strc-flt.mkvi (renamed from tex/context/base/strc-flt.mkiv)1129
-rw-r--r--tex/context/base/strc-num.mkiv193
-rw-r--r--tex/context/base/syst-aux.mkiv5
-rw-r--r--tex/context/base/tabl-tab.mkiv2
-rw-r--r--tex/context/base/tabl-xnt.mkvi16
-rw-r--r--tex/context/base/tabl-xtb.lua21
-rw-r--r--tex/context/base/tabl-xtb.mkvi52
-rw-r--r--tex/context/base/task-ini.lua2
-rw-r--r--tex/context/base/trac-inf.lua2
-rw-r--r--tex/context/base/trac-set.lua2
-rw-r--r--tex/context/base/typo-itc.lua55
-rw-r--r--tex/context/base/typo-mar.lua23
-rw-r--r--tex/context/fonts/lucida-math.lfg7
-rw-r--r--tex/context/interface/keys-cs.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-fr.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-pe.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
54 files changed, 2528 insertions, 2215 deletions
diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/anch-pos.lua
index 3cebdd233..eda3ecb43 100644
--- a/tex/context/base/anch-pos.lua
+++ b/tex/context/base/anch-pos.lua
@@ -23,6 +23,7 @@ local allocate, mark = utilities.storage.allocate, utilities.storage.mark
local texsp, texcount = tex.sp, tex.count
----- texsp = string.todimen -- because we cache this is much faster but no rounding
+local pt = number.dimenfactors.pt
local pts = number.pts
local collected = allocate()
@@ -256,43 +257,62 @@ commands.copyposition = jobpositions.copy
function commands.MPp(id)
local jpi = collected[id] or tobesaved[id]
- context(jpi and jpi[1] or '0')
+ if jpi then
+ context(jpi[1])
+ else
+ context('0')
+ end
end
function commands.MPx(id)
local jpi = collected[id] or tobesaved[id]
- local x = jpi and jpi[2]
- context(x and pts(x) or '0pt')
+ if jpi then
+ context("%spt",jpi[2]*pt)
+ else
+ context('0pt')
+ end
end
function commands.MPy(id)
local jpi = collected[id] or tobesaved[id]
- local y = jpi and jpi[3]
- context(y and pts(y) or '0pt')
+ if jpi then
+ context("%spt",jpi[3]*pt)
+ else
+ context('0pt')
+ end
end
function commands.MPw(id)
local jpi = collected[id] or tobesaved[id]
- local w = jpi and jpi[4]
- context(w and pts(w) or '0pt')
+ if jpi then
+ context("%spt",jpi[4]*pt)
+ else
+ context('0pt')
+ end
end
function commands.MPh(id)
local jpi = collected[id] or tobesaved[id]
- local h = jpi and jpi[5]
- context(h and pts(h) or '0pt')
+ if jpi then
+ context("%spt",jpi[5]*pt)
+ else
+ context('0pt')
+ end
end
function commands.MPd(id)
local jpi = collected[id] or tobesaved[id]
- local d = jpi and jpi[6]
- context(d and pts(d) or '0pt')
+ if jpi then
+ context("%spt",jpi[6]*pt)
+ else
+ context('0pt')
+ end
end
function commands.MPxy(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context('(%s,%s)',pts(jpi[2]),pts(jpi[3]))
+ context('(%spt,%spt)',jpi[2]*pt,jpi[3]*pt)
else
context('(0,0)')
end
@@ -301,7 +321,7 @@ end
function commands.MPll(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context('(%s,%s)',pts(jpi[2]),pts(jpi[3]-jpi[6]))
+ context('(%spt,%spt)',jpi[2]*pt,(jpi[3]-jpi[6])*pt)
else
context('(0,0)')
end
@@ -310,7 +330,7 @@ end
function commands.MPlr(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context('(%s,%s)',pts(jpi[2]+jpi[4]),pts(jpi[3]-jpi[6]))
+ context('(%spt,%spt)',(jpi[2]+jpi[4])*pt,(jpi[3]-jpi[6])*pt)
else
context('(0,0)')
end
@@ -319,7 +339,7 @@ end
function commands.MPur(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context('(%s,%s)',pts(jpi[2]+jpi[4]),pts(jpi[3]+jpi[5]))
+ context('(%spt,%spt)',(jpi[2]+jpi[4])*pt,(jpi[3]+jpi[5])*pt)
else
context('(0,0)')
end
@@ -328,7 +348,7 @@ end
function commands.MPul(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context('(%s,%s)',pts(jpi[2]),pts(jpi[3]+jpi[5]))
+ context('(%spt,%spt)',jpi[2]*pt,(jpi[3]+jpi[5])*pt)
else
context('(0,0)')
end
@@ -337,7 +357,7 @@ end
function commands.MPpos(id)
local jpi = collected[id] or tobesaved[id]
if jpi then
- context(concat(jpi,',',1,6))
+ context("%spt,%spt,%spt,%spt,%spt,%spt",jpi[1]*pt,jpi[2]*pt,jpi[3]*pt,jpi[4]*pt,jpi[5]*pt,jpi[6]*pt)
else
context('0,0,0,0,0,0')
end
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/anch-pos.mkiv
index d7a4b4d07..62439e9cb 100644
--- a/tex/context/base/anch-pos.mkiv
+++ b/tex/context/base/anch-pos.mkiv
@@ -159,7 +159,11 @@
%D Sometimes we want to trick the position handler a bit:
-\def\replacepospxywhd#1#2#3#4#5#6#7{\ctxcommand{replacepospxywhd('#1',\number#2,"\the\dimexpr#3\relax","\the\dimexpr#4\relax","\the\dimexpr#5\relax","\the\dimexpr#6\relax","\the\dimexpr#7\relax")}}
+% \def\replacepospxywhd#1#2#3#4#5#6#7%
+% {\ctxcommand{replacepospxywhd('#1',\number#2,"\the\dimexpr#3\relax","\the\dimexpr#4\relax","\the\dimexpr#5\relax","\the\dimexpr#6\relax","\the\dimexpr#7\relax")}}
+
+\def\replacepospxywhd#1#2#3#4#5#6#7%
+ {\ctxcommand{replacepospxywhd('#1',\number#2,\number\dimexpr#3,\number\dimexpr#4,\number\dimexpr#5,\number\dimexpr#6,\number\dimexpr#7)}}
%D The next switch can be used to communicate a special
%D situation. Positioning and associated actions can be
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index 46e2c951c..d7a50da3a 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -27,9 +27,10 @@ local topoints = number.topoints
local utfvalues = string.utfvalues
local fromunicode16 = fonts.mappings.fromunicode16
-local trace_export = false trackers.register ("export.trace", function(v) trace_export = v end)
-local less_state = false directives.register("export.lessstate", function(v) less_state = v end)
-local show_comment = true directives.register("export.comment", function(v) show_comment = v end)
+local trace_export = false trackers.register ("export.trace", function(v) trace_export = v end)
+local trace_spacing = false trackers.register ("export.trace.spacing", function(v) trace_spacing = v end)
+local less_state = false directives.register("export.lessstate", function(v) less_state = v end)
+local show_comment = true directives.register("export.comment", function(v) show_comment = v end)
-- maybe we will also support these:
--
@@ -423,7 +424,7 @@ local breakattributes = {
type = "collapse"
}
-local function makebreaknode(node) -- maybe no fulltag
+local function makebreaknode(attributes) -- maybe no fulltag
nofbreaks = nofbreaks + 1
return {
tg = "break",
@@ -431,7 +432,7 @@ local function makebreaknode(node) -- maybe no fulltag
n = nofbreaks,
element = "break",
nature = "display",
- -- attributes = breakattributes,
+ attributes = attributes or nil,
-- data = { }, -- not needed
-- attribute = 0, -- not needed
-- parnumber = 0,
@@ -1208,29 +1209,26 @@ end
local linedone = false -- can go ... we strip newlines anyway
local inlinedepth = 0
-local function emptytag(result,element,nature,depth)
- if linedone then
- result[#result+1] = format("%s<%s/>\n",spaces[depth],namespaced[element])
- else
- result[#result+1] = format("\n%s<%s/>\n",spaces[depth],namespaced[element])
- end
- linedone = false
-end
+-- todo: #result -> nofresult
-local function btag(result,element,nature,depth)
- if linedone then
- result[#result+1] = format("%s<%s>\n",spaces[depth],namespaced[element])
- else
- result[#result+1] = format("\n%s<%s>\n",spaces[depth],namespaced[element])
- end
- linedone = false
-end
-
-local function etag(result,element,nature,depth)
- if linedone then
- result[#result+1] = format("%s</%s>\n",spaces[depth],namespaced[element])
+local function emptytag(result,element,nature,depth,di) -- currently only break but at some point
+ local a = di.attributes -- we might add detail etc
+ if a then -- happens seldom
+ if linedone then
+ result[#result+1] = format("%s<%s",spaces[depth],namespaced[element])
+ else
+ result[#result+1] = format("\n%s<%s",spaces[depth],namespaced[element])
+ end
+ for k, v in next, a do
+ result[#result+1] = format(" %s=%q",k,v)
+ end
+ result[#result+1] = "/>\n"
else
- result[#result+1] = format("\n%s</%s>\n",spaces[depth],namespaced[element])
+ if linedone then
+ result[#result+1] = format("%s<%s/>\n",spaces[depth],namespaced[element])
+ else
+ result[#result+1] = format("\n%s<%s/>\n",spaces[depth],namespaced[element])
+ end
end
linedone = false
end
@@ -1383,26 +1381,31 @@ local function flushtree(result,data,nature,depth)
local nofdata = #data
for i=1,nofdata do
local di = data[i]
- if not di then -- or di == ""
+ if not di then
-- whatever
- elseif type(di) == "string" then
+ elseif di.content then
-- already has breaks
- di = utfgsub(di,".",entities) -- new
- if i == nofdata and sub(di,-1) == "\n" then
- if nature == "inline" or nature == "mixed" then
- result[#result+1] = sub(di,1,-2)
+ local content = utfgsub(di.content,".",entities)
+ if i == nofdata and sub(content,-1) == "\n" then -- move check
+ -- can be an end of line in par but can also be the last line
+ if trace_spacing then
+ result[#result+1] = format("<c n='%s'>%s</c>",di.parnumber,sub(content,1,-2))
else
- result[#result+1] = sub(di,1,-2)
- result[#result+1] = " "
+ result[#result+1] = sub(content,1,-2)
end
+ result[#result+1] = " "
else
- result[#result+1] = di
+ if trace_spacing then
+ result[#result+1] = format("<c n='%s'>%s</c>",di.parnumber,content)
+ else
+ result[#result+1] = content
+ end
end
linedone = false
elseif not di.collapsed then -- ignore collapsed data (is appended, reconstructed par)
local element = di.element
if element == "break" then -- or element == "pagebreak"
- emptytag(result,element,nature,depth)
+ emptytag(result,element,nature,depth,di)
elseif element == "" or di.skip == "ignore" then
-- skip
else
@@ -1412,10 +1415,13 @@ local function flushtree(result,data,nature,depth)
local natu = di.nature
local skip = di.skip
if di.breaknode then
- emptytag(result,"break","display",depth)
+ emptytag(result,"break","display",depth,di)
end
begintag(result,element,natu,depth,di,skip)
flushtree(result,di.data,natu,depth)
+-- if sub(result[#result],-1) == " " and natu ~= "inline" then
+-- result[#result] = sub(result[#result],1,-2)
+-- end
endtag(result,element,natu,depth,skip)
if di.after then
flushtree(result,di.after,nature,depth)
@@ -1425,44 +1431,85 @@ local function flushtree(result,data,nature,depth)
end
end
--- way too fragile
-
local function breaktree(tree,parent,parentelement) -- also removes double breaks
- local data = tree.data
- if data then
- local nofdata = #data
- local prevelement
- for i=1,nofdata do
- local di = data[i]
- if not di then
- -- skip
- elseif type(di) == "string" then
- prevelement = nil
- elseif not di.collapsed then
- local element = di.element
- if element == "break" then -- or element == "pagebreak"
- if prevelement == "break" then
- di.element = ""
- end
- prevelement = element
- elseif element == "" or di.skip == "ignore" then
- -- skip
- else
---~ if element == "p" and di.nature ~= "display" then
---~ di = di.data
---~ data[i] = di
---~ breaktree(di,tree,element)
---~ else
+ local data = tree.data
+ if data then
+ local nofdata = #data
+ local prevelement
+ local prevnature
+ local prevparnumber
+ local newdata = { }
+ local nofnewdata = 0
+ for i=1,nofdata do
+ local di = data[i]
+ if not di then
+ -- skip
+ elseif di.content then
+ local parnumber = di.parnumber
+ if prevnature == "inline" and prevparnumber and prevparnumber ~= parnumber then
+ nofnewdata = nofnewdata + 1
+ if trace_spacing then
+ newdata[nofnewdata] = makebreaknode { type = "a", p = prevparnumber, n = parnumber }
+ else
+ newdata[nofnewdata] = makebreaknode()
+ end
+ end
+ prevelement = nil
+ prevnature = "inline"
+ prevparnumber = parnumber
+ nofnewdata = nofnewdata + 1
+ newdata[nofnewdata] = di
+ elseif not di.collapsed then
+ local element = di.element
+ if element == "break" then -- or element == "pagebreak"
+ if prevelement == "break" then
+ di.element = ""
+ end
+ prevelement = element
+ prevnature = "display"
+ elseif element == "" or di.skip == "ignore" then
+ -- skip
+ else
+ local nature = di.nature
+ local parnumber = di.parnumber
+ if prevnature == "inline" and nature == "inline" and prevparnumber and prevparnumber ~= parnumber then
+ nofnewdata = nofnewdata + 1
+ if trace_spacing then
+ newdata[nofnewdata] = makebreaknode { type = "b", p = prevparnumber, n = parnumber }
+ else
+ newdata[nofnewdata] = makebreaknode()
+ end
+ end
+ prevnature = nature
+ prevparnumber = parnumber
prevelement = element
breaktree(di,tree,element)
---~ end
- end
- end
- end
- end
+ end
+ nofnewdata = nofnewdata + 1
+ newdata[nofnewdata] = di
+ else
+ local nature = di.nature
+ local parnumber = di.parnumber
+ if prevnature == "inline" and nature == "inline" and prevparnumber and prevparnumber ~= parnumber then
+ nofnewdata = nofnewdata + 1
+ if trace_spacing then
+ newdata[nofnewdata] = makebreaknode { type = "c", p = prevparnumber, n = parnumber }
+ else
+ newdata[nofnewdata] = makebreaknode()
+ end
+ end
+ prevnature = nature
+ prevparnumber = parnumber
+ nofnewdata = nofnewdata + 1
+ newdata[nofnewdata] = di
+ end
+ end
+ tree.data = newdata
+ end
end
--- tabulaterow reconstruction .. can better be a checker (TO BE CHECKED)
+-- also tabulaterow reconstruction .. maybe better as a checker
+-- i.e cell attribute
local function collapsetree()
for tag, trees in next, treehash do
@@ -1477,21 +1524,25 @@ local function collapsetree()
local previouspar = trees[i-1].parnumber
currenttree.collapsed = true
-- is the next ok?
- if previouspar == 0 or type(currentdata[1]) ~= "string" then
+ if previouspar == 0 or not (di and di.content) then
previouspar = nil -- no need anyway so no further testing needed
end
for j=1,#currentdata do
local cd = currentdata[j]
if not cd or cd == "" then
-- skip
- elseif type(cd) == "string" then
+ elseif cd.content then
if not currentpar then
-- add space ?
elseif not previouspar then
-- add space ?
elseif currentpar ~= previouspar then
nd = nd + 1
- d[nd] = makebreaknode(currenttree)
+ if trace_spacing then
+ d[nd] = makebreaknode { type = "d", p = previouspar, n = currentpar }
+ else
+ d[nd] = makebreaknode()
+ end
end
previouspar = currentpar
nd = nd + 1
@@ -1522,7 +1573,7 @@ local function indextree(tree)
local d = data[i]
if not d then
-- skip
- elseif type(d) == "string" then
+ elseif d.content then
n = n + 1
new[n] = d
elseif not d.collapsed then
@@ -1696,7 +1747,6 @@ local function pushcontent(addbreak)
local content = concat(currentcontent,"",1,nofcurrentcontent)
if content == "" then
-- omit; when addbreak we could push, remove spaces, pop
---~ elseif content == " " and addbreak then
elseif somespace[content] and addbreak then
-- omit; when addbreak we could push, remove spaces, pop
else
@@ -1707,10 +1757,10 @@ local function pushcontent(addbreak)
end
local td = tree.data
local nd = #td
- td[nd+1] = content
+ td[nd+1] = { parnumber = currentparagraph, content = content }
if trace_export then
report_export("%s<!-- start content with length %s -->",spaces[currentdepth],#content)
- report_export("%s%s",spaces[currentdepth],content)
+ report_export("%s%s",spaces[currentdepth],(gsub(content,"\n","\\n")))
report_export("%s<!-- stop content -->",spaces[currentdepth])
end
if olddepth then
@@ -1723,9 +1773,9 @@ local function pushcontent(addbreak)
end
if addbreak then
pushentry(makebreaklist(currentnesting))
- -- if trace_export then
- -- report_export("%s<!-- add break -->",spaces[currentdepth])
- -- end
+ if trace_export then
+ report_export("%s<!-- break added due to %s -->",spaces[currentdepth],addbreak)
+ end
end
end
@@ -1776,8 +1826,8 @@ local function collectresults(head,list) -- is last used (we also have currentat
report_export("%s<!-- processing glyph %s (tag %s) -->",spaces[currentdepth],utfchar(c),at)
end
pushcontent()
- currentparagraph = has_attribute(n,a_taggedpar)
currentnesting = tl
+ currentparagraph = has_attribute(n,a_taggedpar)
currentattribute = at
last = at
pushentry(currentnesting)
@@ -1789,12 +1839,12 @@ local function collectresults(head,list) -- is last used (we also have currentat
end
--
elseif last then
- local at = has_attribute(n,a_taggedpar)
- if at ~= currentparagraph then
- pushcontent(true) -- add break
+ local ap = has_attribute(n,a_taggedpar)
+ if ap ~= currentparagraph then
+ pushcontent(format("new paragraph (%s -> %s)",tostring(currentparagraph),tostring(ap)))
pushentry(currentnesting)
currentattribute = last
- currentparagraph = at
+ currentparagraph = ap
end
if trace_export then
report_export("%s<!-- processing glyph %s (tag %s) -->",spaces[currentdepth],utfchar(c),last)
@@ -1830,11 +1880,6 @@ local function collectresults(head,list) -- is last used (we also have currentat
if fc then
local u = fc.tounicode
if u and u ~= "" then
- -- tracing
--- for s in gmatch(u,"....") do -- is this ok?
--- nofcurrentcontent = nofcurrentcontent + 1
--- currentcontent[nofcurrentcontent] = utfchar(tonumber(s,16))
--- end
nofcurrentcontent = nofcurrentcontent + 1
currentcontent[nofcurrentcontent] = utfchar(fromunicode16(u))
else
@@ -1937,60 +1982,85 @@ local function collectresults(head,list) -- is last used (we also have currentat
end
elseif subtype == spaceskip_code or subtype == xspaceskip_code then
if not somespace[currentcontent[nofcurrentcontent]] then
- if trace_export then
- report_export("%s<!-- injecting spacing 7 -->",spaces[currentdepth])
+ local a = has_attribute(n,a_tagged)
+ if a == last then
+ if trace_export then
+ report_export("%s<!-- injecting spacing 7 (stay in element) -->",spaces[currentdepth])
+ end
+ nofcurrentcontent = nofcurrentcontent + 1
+ currentcontent[nofcurrentcontent] = " "
+ else
+ if trace_export then
+ report_export("%s<!-- injecting spacing 7 (end of element) -->",spaces[currentdepth])
+ end
+ last = a
+ pushcontent()
+ nofcurrentcontent = nofcurrentcontent + 1
+ currentcontent[nofcurrentcontent] = " "
+ currentnesting = taglist[last]
+ pushentry(currentnesting)
+ currentattribute = last
end
- nofcurrentcontent = nofcurrentcontent + 1
- currentcontent[nofcurrentcontent] = " "
end
- elseif subtype == rightskip_code or subtype == parfillskip_code then
- if nofcurrentcontent > 0 then -- and n.subtype == line_code then
- local r = currentcontent[nofcurrentcontent]
- if type(r) == "string" and r ~= " " then
- local s = utfsub(r,-1)
- if s == hyphen then
- if not keephyphens then
- currentcontent[nofcurrentcontent] = utfsub(r,1,-2)
- end
- elseif s ~= "\n" then
--- test without this
- if trace_export then
- report_export("%s<!-- injecting newline 1 -->",spaces[currentdepth])
+ elseif id == kern_code then
+ local kern = n.kern
+ if kern > 0 then
+ local limit = threshold
+ if p and p.id == glyph_code then
+ limit = fontquads[p.font] / 4
+ end
+ if kern > limit then
+ if last and not somespace[currentcontent[nofcurrentcontent]] then
+ local a = has_attribute(n,a_tagged)
+ if a == last then
+ if not somespace[currentcontent[nofcurrentcontent]] then
+ if trace_export then
+ report_export("%s<!-- injecting spacing 8 (%s) -->",spaces[currentdepth],topoints(kern,true))
+ end
+ nofcurrentcontent = nofcurrentcontent + 1
+ currentcontent[nofcurrentcontent] = " "
+ end
+ elseif a then
+ -- e.g LOGO<space>LOGO
+ if trace_export then
+ report_export("%s<!-- processing kern, threshold %s, tag %s => %s -->",spaces[currentdepth],topoints(limit,true),last,a)
+ end
+ last = a
+ pushcontent()
+ if trace_export then
+ report_export("%s<!-- injecting spacing 9 (%s) -->",spaces[currentdepth],topoints(kern,true))
+ end
+ nofcurrentcontent = nofcurrentcontent + 1
+ currentcontent[nofcurrentcontent] = " "
+ currentnesting = taglist[last]
+ pushentry(currentnesting)
+ currentattribute = last
end
- nofcurrentcontent = nofcurrentcontent + 1
- currentcontent[nofcurrentcontent] = "\n"
end
end
end
- end
- elseif id == kern_code then
- local kern = n.kern
- if kern > 0 then
- local limit = threshold
- if p and p.id == glyph_code then
- limit = fontquads[p.font] / 4
- end
- if kern > limit then
- if last and not somespace[currentcontent[nofcurrentcontent]] then
+ elseif subtype == rightskip_code then
+ -- a line
+ if nofcurrentcontent > 0 then
+ local r = currentcontent[nofcurrentcontent]
+ if r == hyphen then
+ if not keephyphens then
+ nofcurrentcontent = nofcurrentcontent - 1
+ end
+ elseif not somespace[r] then
local a = has_attribute(n,a_tagged)
if a == last then
- if not somespace[currentcontent[nofcurrentcontent]] then
- if trace_export then
- report_export("%s<!-- injecting spacing 8 (%s) -->",spaces[currentdepth],topoints(kern,true))
- end
- nofcurrentcontent = nofcurrentcontent + 1
- currentcontent[nofcurrentcontent] = " "
+ if trace_export then
+ report_export("%s<!-- injecting spacing 1 (end of line, stay in element) -->",spaces[currentdepth])
end
- elseif a then
- -- e.g LOGO<space>LOGO
+ nofcurrentcontent = nofcurrentcontent + 1
+ currentcontent[nofcurrentcontent] = " "
+ else
if trace_export then
- report_export("%s<!-- processing kern, threshold %s, tag %s => %s -->",spaces[currentdepth],topoints(limit,true),last,a)
+ report_export("%s<!-- injecting spacing 1 (end of line, end of element) -->",spaces[currentdepth])
end
last = a
pushcontent()
- if trace_export then
- report_export("%s<!-- injecting spacing 9 (%s) -->",spaces[currentdepth],topoints(kern,true))
- end
nofcurrentcontent = nofcurrentcontent + 1
currentcontent[nofcurrentcontent] = " "
currentnesting = taglist[last]
@@ -1999,8 +2069,11 @@ local function collectresults(head,list) -- is last used (we also have currentat
end
end
end
+ elseif subtype == parfillskip_code then
+ -- deal with paragaph endings (crossings) elsewhere and we quit here
+ -- as we don't want the rightskip space addition
+ return
end
- -- elseif id == whatsit_code and n.subtype == localpar_code then
end
p = n
end
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 3880314c1..2ce1639ba 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.11.04 14:15}
+\newcontextversion{2011.11.08 15:20}
%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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5c1ceb5d7..92144049d 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.11.04 14:15}
+\newcontextversion{2011.11.08 15:20}
%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-version.pdf b/tex/context/base/context-version.pdf
index 339f58ff5..48c6f3de1 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
@@ -1,7 +1,7 @@
%PDF-1.6
%ÐÔÅØ
17 0 obj
-<</Length 3372 >>
+<</Length 3373 >>
stream
0 g 0 G
0 g 0 G
@@ -69,7 +69,7 @@ h f
0.000 0.000 0.700 rg 0.000 0.000 0.700 RG
6.996964 -6.113174 m
94.155334 -22.251892 l
-66.130615 -35.860489 43.740662 -60.132584 32.849838 -88.710907 c
+64.514175 -33.352692 41.005051 -58.838028 32.849838 -88.710907 c
6.996964 -6.113174 l
h f
0 g 0 G
@@ -83,7 +83,7 @@ h f
0.000 0.700 0.700 rg 0.000 0.700 0.700 RG
-1.345032 -9.998840 m
29.874359 -90.097046 l
-9.611038 -67.528961 -27.856400 -68.107391 -54.288406 -91.396378 c
+10.208313 -66.445236 -28.164001 -67.037628 -54.288406 -91.396378 c
-1.345032 -9.998840 l
h f
0 g 0 G
@@ -97,7 +97,7 @@ h f
0.700 0.000 0.700 rg 0.700 0.000 0.700 RG
-8.674164 -6.355164 m
-56.902374 -90.097046 l
--57.037994 -60.352188 -73.774231 -35.488251 -100.546051 -25.258499 c
+-55.011398 -59.536789 -72.351151 -33.776230 -100.546051 -25.258499 c
-8.674164 -6.355164 l
h f
0 g 0 G
@@ -163,17 +163,17 @@ stream
</rdf:Description>
<rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
<pdfx:ConTeXt.Jobname>s-version</pdfx:ConTeXt.Jobname>
- <pdfx:ConTeXt.Time>2011.11.04 14:16</pdfx:ConTeXt.Time>
+ <pdfx:ConTeXt.Time>2011.11.08 15:20</pdfx:ConTeXt.Time>
<pdfx:ConTeXt.Url>www.pragma-ade.com</pdfx:ConTeXt.Url>
- <pdfx:ConTeXt.Version>2011.11.04 14:15</pdfx:ConTeXt.Version>
- <pdfx:ID>s-version.2011-11-04T14:16:04+01:00</pdfx:ID>
+ <pdfx:ConTeXt.Version>2011.11.08 15:20</pdfx:ConTeXt.Version>
+ <pdfx:ID>s-version.2011-11-08T15:20:21+01:00</pdfx:ID>
<pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
- <xmp:CreateDate>2011-11-04T14:16:04+01:00</xmp:CreateDate>
- <xmp:CreatorTool>ConTeXt - 2011.11.04 14:15</xmp:CreatorTool>
- <xmp:ModifyDate>2011-11-04T14:16:04+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2011-11-04T14:16:04+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2011-11-08T15:20:21+01:00</xmp:CreateDate>
+ <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>
+ <xmp:ModifyDate>2011-11-08T15:20:21+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2011-11-08T15:20:21+01:00</xmp:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
<pdf:Keywords/>
@@ -201,7 +201,7 @@ endobj
endobj
22 0 obj
<<
-/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.04 14:15) /ConTeXt.Jobname (s-version) /CreationDate (D:20111104141604+01'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.11.04 14:16) /ID (s-version.2011-11-04T14:16:04+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111104141604+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300034002000310034003a00310035>
+/ConTeXt.Url (www.pragma-ade.com) /ConTeXt.Version (2011.11.08 15:20) /ConTeXt.Jobname (s-version) /CreationDate (D:20111108152021+01'00') /Trapped /False /Title <feff0073002d00760065007200730069006f006e> /ConTeXt.Time (2011.11.08 15:20) /ID (s-version.2011-11-08T15:20:21+01:00) /Producer (LuaTeX-0.71.0) /ModDate (D:20111108152021+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030>
/PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
endobj
xref
@@ -221,16 +221,16 @@ xref
0000000013 00000 f
0000000014 00000 f
0000000000 00000 f
-0000003642 00000 n
-0000003443 00000 n
+0000003643 00000 n
+0000003444 00000 n
0000000015 00000 n
-0000006041 00000 n
-0000003677 00000 n
-0000006094 00000 n
-0000006115 00000 n
-0000006267 00000 n
+0000006042 00000 n
+0000003678 00000 n
+0000006095 00000 n
+0000006116 00000 n
+0000006268 00000 n
trailer
-<</Size 23/Root 21 0 R/Info 22 0 R/ID[<D6CA308111BC9E00C408BE0F5F7B7528> <D6CA308111BC9E00C408BE0F5F7B7528>]>>
+<</Size 23/Root 21 0 R/Info 22 0 R/ID[<B2FF6E8A784C07DFA4B2F177313E459B> <B2FF6E8A784C07DFA4B2F177313E459B>]>>
startxref
-6865
+6866
%%EOF
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 46987c9fe..50032e008 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 86378e820..fd5571e32 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.11.04 14:15}
+\edef\contextversion{2011.11.08 15:20}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 4755d0547..016520977 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.11.04 14:15}
+\edef\contextversion{2011.11.08 15:20}
%D For those who want to use this:
@@ -252,7 +252,7 @@
\loadmarkfile{page-txt}
\loadmarkfile{page-sid}
-\loadmarkfile{strc-flt}
+\loadmkvifile{strc-flt}
\loadmarkfile{page-mis}
\loadmarkfile{page-mul}
diff --git a/tex/context/base/core-mis.mkiv b/tex/context/base/core-mis.mkiv
index 8a8203b9b..34222a39e 100644
--- a/tex/context/base/core-mis.mkiv
+++ b/tex/context/base/core-mis.mkiv
@@ -486,13 +486,22 @@
\unexpanded\def\periods
{\dosingleempty\doperiods}
+% \def\doperiods[#1]% todo: also n=,width= or maybe just #1,#2
+% {\dontleavehmode
+% \begingroup
+% \scratchdimen\periodswidth
+% \hbox to \iffirstargument#1\else\periodsdefault\fi \scratchdimen
+% {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}%
+% \endgroup}
+%
+% better for export:
+
\def\doperiods[#1]% todo: also n=,width= or maybe just #1,#2
{\dontleavehmode
- \begingroup
- \scratchdimen\periodswidth
- \hbox to \iffirstargument#1\else\periodsdefault\fi \scratchdimen
- {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}%
- \endgroup}
+ \hbox\bgroup
+ \setbox\scratchbox\hbox to \periodswidth{\hss.\hss}%
+ \dorecurse{\iffirstargument#1\else\periodsdefault\fi}{\copy\scratchbox}%
+ \egroup}
\unexpanded\def\unknown
{\periods\relax} % relax prevents lookahead for []
@@ -503,14 +512,6 @@
%
% Hello\fourdots\ World\fourdots \par Hello\fourdots\ World.
-% compatibility macros
-
-\def\doorsnede
- {\hbox{\rlap/$\circ$} }
-
-\unexpanded\def\ongeveer
- {\mathematics\pm}
-
\setnewconstant\boundarycharactermode\plusone
\def\midboundarycharacter#1#2%
@@ -921,8 +922,6 @@
{\begingroup
\setbox\scratchbox\hbox{\delimitedtextparameter#1}%
\ifdim\wd\scratchbox>\zeropoint
-% \ifdim\lastskip=\delimitedtextsignal
-% \unskip
\ifdim\lastkern=\delimitedtextsignal
\unkern
\hskip\hspaceamount\currentlanguage{interquotation}%
@@ -935,7 +934,7 @@
\fi
\strut % new, needed below
\delimitedtextparameter#1% unhbox\scratchbox
-% \penalty\plustenthousand % else overfull boxes, but that's better than dangling periods
+ % \penalty\plustenthousand % else overfull boxes, but that's better than dangling periods
\kern\delimitedtextsignal % +- \prewordbreak
\fi
\endgroup}
@@ -1002,13 +1001,6 @@
\def\handlerightdelimitedtext#1%
{\dohandlerightdelimitedtext{#1}\relax}
-% \unexpanded\def\dodelimitedtextpar
-% {\dohandleleftdelimitedtext\c!left\relax
-% \groupedcommand
-% \donothing
-% {\dohandlerightdelimitedtext\c!right\removelastskip
-% \popdelimitedtext}}
-
\unexpanded\def\dodelimitedtextpar
{\groupedcommand
{\dostarttagged\t!delimited\currentdelimitedtext % block?
@@ -1021,14 +1013,6 @@
{\doifelse{\delimitedtextparameter\c!style}\v!normal
\doquoteddelimited\doattributeddelimited}
-% \def\doquoteddelimited
-% {\dohandleleftdelimitedtext\c!left\relax
-% \groupedcommand
-% \donothing
-% {\dohandlerightdelimitedtext\c!right
-% \removelastskip
-% \popdelimitedtext}}
-
\def\doquoteddelimited
{\groupedcommand
{\dostarttagged\t!delimited\currentdelimitedtext
diff --git a/tex/context/base/core-sys.mkiv b/tex/context/base/core-sys.mkiv
index e6d27e42b..247aa3b52 100644
--- a/tex/context/base/core-sys.mkiv
+++ b/tex/context/base/core-sys.mkiv
@@ -222,13 +222,13 @@
\installcommandhandler{\??hl}{highlight}{\??hl} % we could do with less
\appendtoks
- \setuevalue{\currenthighlight}{\dohighlight_indeed{\currenthighlight}}%
+ \setuevalue\currenthighlight{\dohighlight_indeed{\currenthighlight}}%
\to \everydefinehighlight
\ifdefined\dotaghighlight \else \let\dotaghighlight\relax \fi
\unexpanded\def\dohighlight_indeed#1% inline style/color switch
- {\groupedcommand
+ {\dontleavehmode\groupedcommand % otherwise wrong par number in tags
{\def\currenthighlight{#1}%
\dostarttagged\t!highlight\currenthighlight
\dosethighlightattributes\c!style\c!color
diff --git a/tex/context/base/font-ext.lua b/tex/context/base/font-ext.lua
index 38b887963..bb03aee8d 100644
--- a/tex/context/base/font-ext.lua
+++ b/tex/context/base/font-ext.lua
@@ -18,6 +18,8 @@ local trace_expansion = false trackers.register("fonts.expansion", function(v
local report_expansions = logs.reporter("fonts","expansions")
local report_protrusions = logs.reporter("fonts","protrusions")
+-- todo: byte(..) => 0xHHHH
+
--[[ldx--
<p>When we implement functions that deal with features, most of them
will depend of the font format. Here we define the few that are kind
diff --git a/tex/context/base/lang-ini.mkiv b/tex/context/base/lang-ini.mkiv
index 5cd7eaba6..b8f0605bf 100644
--- a/tex/context/base/lang-ini.mkiv
+++ b/tex/context/base/lang-ini.mkiv
@@ -363,6 +363,19 @@
\posthyphenchar\languageparameter\s!lefthyphenchar \relax
\to \everylanguage
+% \appendtoks
+% \setups[\languageparameter\c!setups]%
+% \to \everylanguage
+
+%D You can setup the 'default' language to reset settings.
+
+\appendtoks
+ \edef\currentlanguagesetups{\languageparameter\c!setups}%
+ \ifx\currentlanguagesetups\empty \else
+ \setups[\currentlanguagesetups]%
+ \fi
+\to \everylanguage
+
% this will move to core-spa !
\appendtoks
diff --git a/tex/context/base/m-chart.mkvi b/tex/context/base/m-chart.mkvi
index 8e60e6934..866d3c45b 100644
--- a/tex/context/base/m-chart.mkvi
+++ b/tex/context/base/m-chart.mkvi
@@ -52,7 +52,7 @@
\setupFLOWcharts
[\c!width=12\bodyfontsize,
\c!height=7\bodyfontsize,
- \c!offset=0pt, % \v!standard, % == auto offset
+ \c!offset=\FLOWlineparameter\c!rulethickness,
\c!dx=2\bodyfontsize,
\c!dy=2\bodyfontsize,
\c!nx=0,
@@ -72,7 +72,7 @@
% \c!background=,
% \c!framecolor=
% \c!backgroundcolor=, % \s!white
- \c!rulethickness=\linewidth,
+ \c!rulethickness=.15\bodyfontsize, %\linewidth,
\c!frame=\v!off]
\setupFLOWlines
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii
index ed3602e1e..bfddfb0d9 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mult-de.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{vollende}
\setinterfaceelement{coupled}{verknuepft}
\setinterfaceelement{currentlocal}{aktuelllokal}
-\setinterfaceelement{emptyone}{vuoto}
-\setinterfaceelement{emptytwo}{leer}
\setinterfaceelement{end}{ende}
\setinterfaceelement{endsetup}{ein}
\setinterfaceelement{get}{get}
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua
index 84f823f53..7dab4eaa6 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mult-def.lua
@@ -10995,26 +10995,6 @@ return {
["pe"]="موضعی‌جاری",
["ro"]="localcurent",
},
- ["emptyone"]={
- ["cs"]="leer",
- ["de"]="vuoto",
- ["en"]="empty",
- ["fr"]="vide",
- ["it"]="prazdne",
- ["nl"]="leeg",
- ["pe"]="یک‌خالی",
- ["ro"]="gol",
- },
- ["emptytwo"]={
- ["cs"]="prazdne",
- ["de"]="leer",
- ["en"]="empty",
- ["fr"]="vide",
- ["it"]="vuoti",
- ["nl"]="lege",
- ["pe"]="دوخالی",
- ["ro"]="gol",
- },
["end"]={
["cs"]="konec",
["de"]="ende",
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii
index d3a796ad4..587b82b78 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mult-en.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{complete}
\setinterfaceelement{coupled}{coupled}
\setinterfaceelement{currentlocal}{currentlocal}
-\setinterfaceelement{emptyone}{empty}
-\setinterfaceelement{emptytwo}{empty}
\setinterfaceelement{end}{end}
\setinterfaceelement{endsetup}{}
\setinterfaceelement{get}{get}
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii
index 09c6308bb..6be307377 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mult-fr.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{complete}
\setinterfaceelement{coupled}{couple}
\setinterfaceelement{currentlocal}{localcourant}
-\setinterfaceelement{emptyone}{vide}
-\setinterfaceelement{emptytwo}{vide}
\setinterfaceelement{end}{fin}
\setinterfaceelement{endsetup}{}
\setinterfaceelement{get}{obtient}
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii
index 5089c6109..371a3bb00 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mult-it.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{completo}
\setinterfaceelement{coupled}{accoppiato}
\setinterfaceelement{currentlocal}{correntelocale}
-\setinterfaceelement{emptyone}{prazdne}
-\setinterfaceelement{emptytwo}{vuoti}
\setinterfaceelement{end}{fine}
\setinterfaceelement{endsetup}{}
\setinterfaceelement{get}{prendi}
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index 3b581061e..4c7421568 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -39,6 +39,10 @@ return {
--
"uprotationangle", "rightrotatioangle", "downrotatioangle", "leftrotatioangle",
--
+ "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes",
+ "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes",
+ "xmlcatcodes",
+ --
-- maybe a different class
--
"startmode", "stopmode", "startnotmode", "stopnotmode", "doifmode", "doifmodeelse", "doifnotmode",
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii
index 92da529b5..2484ea818 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mult-nl.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{volledige}
\setinterfaceelement{coupled}{gekoppelde}
\setinterfaceelement{currentlocal}{huidigelokale}
-\setinterfaceelement{emptyone}{leeg}
-\setinterfaceelement{emptytwo}{lege}
\setinterfaceelement{end}{eindvan}
\setinterfaceelement{endsetup}{in}
\setinterfaceelement{get}{haal}
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii
index c5b21bc87..1ea8fe86a 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mult-pe.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{کامل}
\setinterfaceelement{coupled}{مزدوج}
\setinterfaceelement{currentlocal}{موضعی‌جاری}
-\setinterfaceelement{emptyone}{یک‌خالی}
-\setinterfaceelement{emptytwo}{دوخالی}
\setinterfaceelement{end}{انتها}
\setinterfaceelement{endsetup}{انتهای‌بارگذاری}
\setinterfaceelement{get}{بگیر}
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii
index 59aef63c1..8cd97a261 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mult-ro.mkii
@@ -1054,8 +1054,6 @@
\setinterfaceelement{complete}{complet}
\setinterfaceelement{coupled}{cuplat}
\setinterfaceelement{currentlocal}{localcurent}
-\setinterfaceelement{emptyone}{gol}
-\setinterfaceelement{emptytwo}{gol}
\setinterfaceelement{end}{sfarsit}
\setinterfaceelement{endsetup}{}
\setinterfaceelement{get}{get}
diff --git a/tex/context/base/node-tra.lua b/tex/context/base/node-tra.lua
index 61bd82ddc..70e4639b8 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/node-tra.lua
@@ -63,8 +63,6 @@ local whatsit_code = nodecodes.whatsit
local localpar_code = whatcodes.localpar
local dir_code = whatcodes.dir
-local userskip_code = skipcodes.userskip
-
local nodepool = nodes.pool
local new_glyph = nodepool.glyph
@@ -626,7 +624,7 @@ local function toutf(list,result,nofresult,stopcriterium)
--~ result[nofresult] = " "
--~ end
result, nofresult = toutf(n.list,result,nofresult)
- elseif id == glue_code and n.subtype == userskip_code and n.spec.width > threshold then
+ elseif id == glue_code then
if nofresult > 0 and result[nofresult] ~= " " then
nofresult = nofresult + 1
result[nofresult] = " "
@@ -642,6 +640,10 @@ local function toutf(list,result,nofresult,stopcriterium)
end
end
end
+ if nofresult > 0 and result[nofresult] == " " then
+ result[nofresult] = nil
+ nofresult = nofresult - 1
+ end
return result, nofresult
end
@@ -650,7 +652,7 @@ function nodes.toutf(list,stopcriterium)
return concat(result)
end
--- might move elsewhere
+-- this will move elsewhere
local ptfactor = number.dimenfactors.pt
local bpfactor = number.dimenfactors.bp
diff --git a/tex/context/base/page-app.mkiv b/tex/context/base/page-app.mkiv
index 5a880923a..b85132870 100644
--- a/tex/context/base/page-app.mkiv
+++ b/tex/context/base/page-app.mkiv
@@ -59,7 +59,7 @@
\def\currentfittingpage{#1}%
\dontcomplain
% runs under current page regime, i.e. page variables passed to mp
- \getparameters[\currentfittingpage][\c!paper=,#2]% auto or size or nothing
+ \setupcurrentfittingpage[\c!paper=,#2]% auto or size or nothing
\doifelsenothing{\fittingpageparameter\c!command}
\start_fitting_page_normal
\start_fitting_page_command}
@@ -97,9 +97,11 @@
{\setbox\fitting_page_box\hbox\bgroup
\scale[\c!scale=\fittingpageparameter\c!scale]{\box\fitting_page_box}%
\egroup}%
- \ifdim\ht\fitting_page_box<\lineheight
- % write status : too small
- \setbox\scratchbox\vbox to \lineheight{\vss\box\scratchbox\vss}%
+ \ifdim\ht\fitting_page_box=\zeropoint
+ \ht\fitting_page_box\onepoint
+ \fi
+ \ifdim\wd\fitting_page_box=\zeropoint
+ \wd\fitting_page_box\onepoint
\fi
\fitting_page_width \wd\fitting_page_box
\fitting_page_height\ht\fitting_page_box
diff --git a/tex/context/base/scrn-ini.mkvi b/tex/context/base/scrn-ini.mkvi
index 42d04cb08..3c8ef1321 100644
--- a/tex/context/base/scrn-ini.mkvi
+++ b/tex/context/base/scrn-ini.mkvi
@@ -27,7 +27,7 @@
%D
%D \showsetup{setupinteraction}
-\installcommandhandler\??ia {interaction} \??ia
+\installswitchcommandhandler \??ia {interaction} \??ia
\let\currentinteraction\empty
@@ -85,6 +85,17 @@
\unexpanded\def\setinteraction[#1]%
{\def\currentinteraction{#1}}
+\defineinteraction % keep it simple
+ [\v!hidden]
+
+\setupinteraction
+ [\v!hidden]
+ [\c!state=\v!start,
+ \c!color=,
+ \c!contrastcolor=,
+ \c!style=,
+ \c!click=\v!off]
+
%D As long as there a natural feeling of what can be considered
%D hyper active or not, we have to tell users where they can
%D possibly click. We've already seen a few macros that deal
diff --git a/tex/context/base/spac-fnt.mkiv b/tex/context/base/spac-fnt.mkiv
index 35e9b6dd5..ada7c2efc 100644
--- a/tex/context/base/spac-fnt.mkiv
+++ b/tex/context/base/spac-fnt.mkiv
@@ -17,6 +17,18 @@
\unprotect
+\newconditional \parbasedattributes % this will change .. old mkii stuff
+
+\def\finishparbasedattributes
+ {\ifconditional\parbasedattributes
+ \setfalse\parbasedattributes
+ \par
+ \fi}
+
+\def\dostopparbasedattributes
+ {\settrue\parbasedattributes
+ \dostopattributes}
+
\let\dostopattributes\relax % in case these commands end up in an edef
\unexpanded\def\@@dostopattributes
diff --git a/tex/context/base/spac-par.mkiv b/tex/context/base/spac-par.mkiv
index 433ea85c8..711a2525d 100644
--- a/tex/context/base/spac-par.mkiv
+++ b/tex/context/base/spac-par.mkiv
@@ -23,28 +23,25 @@
%D inside the group are forgotten afterwards. (I must
%D not forget its existence).
-\global\let\carriedoverpar\relax
-
-\def\carryoverpar#1%
- {\normalexpanded % \scratchtoks{#1}%
- {\noexpand#1% \the\scratchtoks
+\def\carryoverpar#1% #1 can be \endgroup or \egroup or ...
+ {\normalexpanded
+ {\noexpand#1%
\hangindent\the\hangindent
\hangafter \the\hangafter
\parskip \the\parskip
\leftskip \the\leftskip
\rightskip \the\rightskip}}
-\newconditional \parbasedattributes
+\unexpanded\def\pushparagraphproperties
+ {\edef\currentparagraphproperties{\carryoverpar\relax}%
+ \pushmacro\currentparagraphproperties}
-\def\finishparbasedattributes
- {\ifconditional\parbasedattributes
- \setfalse\parbasedattributes
- \par
- \fi}
+\unexpanded\def\popparagraphproperties
+ {\popmacro\currentparagraphproperties
+ \currentparagraphproperties}
-\def\dostopparbasedattributes
- {\settrue\parbasedattributes
- \dostopattributes}
+\unexpanded\def\flushparagraphproperties
+ {\popmacro\currentparagraphproperties}
% beware, changing this will break some code (like pos/backgrounds)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e4440dfd3..38a8225f3 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
@@ -1,5583 +1,5583 @@
%PDF-1.6
%ÐÔÅØ
17 0 obj
-<</Length 26678 >>
+<</Length 26993 >>
stream
0 g 0 G
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 955.7478 Tm [<004C005100700032004B002300320060>-515<0039002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<004D006D004B002300320060>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550023001C00620032>-515<004B0051002F006D004800320062>-515<001C004D002F>-515<00620069007600480032006200560058>]TJ
-1 0 0 1 151.7827 929.3652 Tm [<00650079>-500<006900320074>-22910<003800790064>-500<004B004600420042>-21091<006A00650033>-500<004B004600420070>-17693<006B0038>-500<004B004600700042>-5873<006A0038006B>-500<0048006D001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 968.1015 Tm [<004C005100700032004B002300320060>-515<0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<004D006D004B002300320060>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550023001C00620032>-515<004B0051002F006D004800320062>-515<001C004D002F>-515<00620069007600480032006200560058>]TJ
+1 0 0 1 164.1364 941.7188 Tm [<00650079>-500<006900320074>-22910<003800790064>-500<004B004600420042>-21091<006A00650064>-500<004B004600420070>-17694<006B0065>-500<004B004600700042>-5873<006A0038006B>-500<0048006D001C>]TJ
ET
q
-1 0 0 1 0 923.1064 cm
+1 0 0 1 12.3537 935.4601 cm
[]0 d 0 J 0.3985 w 0 0 m 1343.7497 0 l S
Q
q
-1 0 0 1 0 923.1064 cm
+1 0 0 1 12.3537 935.4601 cm
[]0 d 0 J 0.3985 w 0 0 m 1343.7497 0 l S
Q
BT
-/F47 11.955168 Tf 1 0 0 1 0 910.4995 Tm [<00420042>-515<00420070>-3090<001C004D002B003F>-31985<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 922.8532 Tm [<00420042>-515<00420070>-3090<001C004D002B003F>-31985<0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 910.4995 cm
+1 0 0 1 499.2278 922.8532 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 910.4995 Tm [<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 922.8532 Tm [<0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 910.4995 cm
+1 0 0 1 800.4464 922.8532 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 910.4995 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 922.8532 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 910.4995 cm
+1 0 0 1 1174.1782 922.8532 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 896.072 Tm [<00420070>-3090<001C006900690060>-57180<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 908.4257 Tm [<00420070>-3090<001C006900690060>-57180<0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 896.072 cm
+1 0 0 1 800.4464 908.4257 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 896.072 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 908.4257 Tm [<0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 896.072 cm
+1 0 0 1 1174.1782 908.4257 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 881.6445 Tm [<00420070>-3090<0023001C002B0046>-57180<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 893.9982 Tm [<00420070>-3090<0023001C002B0046>-57180<0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 881.6445 cm
+1 0 0 1 800.4464 893.9982 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 881.6445 Tm [<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 893.9982 Tm [<006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 881.6445 cm
+1 0 0 1 1174.1782 893.9982 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 867.217 Tm [<00420042>-515<00420070>-3090<0023004200230048>-31985<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 879.5707 Tm [<00420042>-515<00420070>-3090<0023004200230048>-31985<0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 867.217 cm
+1 0 0 1 499.2278 879.5707 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 867.217 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 879.5707 Tm [<006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 867.217 cm
+1 0 0 1 800.4464 879.5707 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 867.217 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 879.5707 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 867.217 cm
+1 0 0 1 1174.1782 879.5707 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 852.7895 Tm [<00420070>-3090<0023004800510023>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 865.1432 Tm [<00420070>-3090<0023004800510023>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 852.7895 cm
+1 0 0 1 800.4464 865.1432 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 852.7895 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 865.1432 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 852.7895 cm
+1 0 0 1 1174.1782 865.1432 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 838.362 Tm [<00420042>-515<00420070>-3090<0023006D00370037>-31985<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 850.7157 Tm [<00420042>-515<00420070>-3090<0023006D00370037>-31985<006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 838.362 cm
+1 0 0 1 499.2278 850.7157 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 838.362 Tm [<00520052>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 850.7157 Tm [<00520052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 838.362 cm
+1 0 0 1 800.4464 850.7157 cm
0 0 57.1782 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 838.362 Tm [<00520052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 850.7157 Tm [<00520052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 838.362 cm
+1 0 0 1 1174.1782 850.7157 cm
0 0 57.1782 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 823.9346 Tm [<00230074004B0048>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 836.2882 Tm [<00230074004B0048>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 823.9346 cm
+1 0 0 1 800.4464 836.2882 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 809.5071 Tm [<00420042>-515<00420070>-3090<002B001C0069002B>-31986<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 821.8607 Tm [<00420042>-515<00420070>-3090<002B001C0069002B>-31986<0065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 809.5071 cm
+1 0 0 1 499.2278 821.8607 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9701 809.5071 Tm [<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3238 821.8607 Tm [<0065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 809.5071 cm
+1 0 0 1 800.4464 821.8607 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 809.5071 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 821.8607 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 809.5071 cm
+1 0 0 1 1174.1782 821.8607 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 795.0796 Tm [<00420070>-3090<002B003F001C0060>-57180<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 807.4332 Tm [<00420070>-3090<002B003F001C0060>-57180<0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 795.0796 cm
+1 0 0 1 800.4464 807.4332 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 795.0796 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 807.4332 Tm [<0033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 795.0796 cm
+1 0 0 1 1174.1782 807.4332 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 780.6521 Tm [<00420070>-3090<002B003F0032004B>-57180<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 793.0057 Tm [<00420070>-3090<002B003F0032004B>-57180<006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 780.6521 cm
+1 0 0 1 800.4464 793.0057 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 780.6521 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 793.0057 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 780.6521 cm
+1 0 0 1 1174.1782 793.0057 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 766.2246 Tm [<00420070>-3090<002B0048002F0037>-57180<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 778.5782 Tm [<00420070>-3090<002B0048002F0037>-57180<0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 766.2246 cm
+1 0 0 1 800.4464 778.5782 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 766.2246 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 778.5782 Tm [<0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 766.2246 cm
+1 0 0 1 1174.1782 778.5782 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 751.7971 Tm [<00420042>-515<00420070>-3090<002B005100480051>-31985<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 764.1507 Tm [<00420042>-515<00420070>-3090<002B005100480051>-31985<0033>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 751.7971 cm
+1 0 0 1 499.2278 764.1507 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 751.7971 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 764.1507 Tm [<0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 751.7971 cm
+1 0 0 1 800.4464 764.1507 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 751.7971 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 764.1507 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 751.7971 cm
+1 0 0 1 1174.1782 764.1507 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 737.3696 Tm [<00420042>-515<00420070>-3090<002B0051004D0069>-31470<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 749.7233 Tm [<00420042>-515<00420070>-3090<002B0051004D0069>-31470<0052006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 737.3696 cm
+1 0 0 1 499.2278 749.7233 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 737.3696 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 749.7233 Tm [<0052006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 737.3696 cm
+1 0 0 1 800.4464 749.7233 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 722.9421 Tm [<00420042>-515<00420070>-3090<002B005100600032>-31471<00520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 735.2958 Tm [<00420042>-515<00420070>-3090<002B005100600032>-31471<00520065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 722.9421 cm
+1 0 0 1 499.2278 735.2958 cm
0 0 83.1659 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 722.9421 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 735.2958 Tm [<0052006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 722.9421 cm
+1 0 0 1 800.4464 735.2958 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.702 722.9421 Tm [<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0556 735.2958 Tm [<0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 722.9421 cm
+1 0 0 1 1174.1782 735.2958 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 708.5146 Tm [<002F001C0069001C>-87926<006B0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 720.8683 Tm [<002F001C0069001C>-87926<006B0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 708.5146 cm
+1 0 0 1 1174.1782 720.8683 cm
0 0 129.9461 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 694.0871 Tm [<00420042>-515<00420070>-3090<0032004D002B0051>-31471<006A004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 706.4408 Tm [<00420042>-515<00420070>-3090<0032004D002B0051>-31471<006A004E>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 694.0871 cm
+1 0 0 1 499.2278 706.4408 cm
0 0 202.7176 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 694.0871 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 706.4408 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 694.0871 cm
+1 0 0 1 800.4464 706.4408 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 679.6596 Tm [<00420070>-3090<0037004200480032>-78464<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 692.0133 Tm [<00420070>-3090<0037004200480032>-78464<0065>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 679.6596 cm
+1 0 0 1 1054.8848 692.0133 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.702 679.6596 Tm [<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0556 692.0133 Tm [<0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 679.6596 cm
+1 0 0 1 1174.1782 692.0133 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 665.2321 Tm [<00420042>-4635<0037004200480069>-31985<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 677.5858 Tm [<00420042>-4635<0037004200480069>-31985<006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 665.2321 cm
+1 0 0 1 499.2278 677.5858 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 650.8046 Tm [<00420042>-515<00420070>-3090<00370051004D0069>-31470<00520079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 663.1583 Tm [<00420042>-515<00420070>-3090<00370051004D0069>-31470<00520079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 650.8046 cm
+1 0 0 1 499.2278 663.1583 cm
0 0 51.9792 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 650.8046 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 663.1583 Tm [<0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 650.8046 cm
+1 0 0 1 800.4464 663.1583 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 650.8046 Tm [<006A0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 663.1583 Tm [<006A0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 650.8046 cm
+1 0 0 1 1174.1782 663.1583 cm
0 0 181.9252 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 636.3771 Tm [<00420042>-515<00420070>-3090<003B00600054003F>-31985<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 648.7308 Tm [<00420042>-515<00420070>-3090<003B00600054003F>-31985<006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 636.3771 cm
+1 0 0 1 499.2278 648.7308 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 636.3771 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 648.7308 Tm [<0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 636.3771 cm
+1 0 0 1 800.4464 648.7308 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 636.3771 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 648.7308 Tm [<0064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 636.3771 cm
+1 0 0 1 1174.1782 648.7308 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 621.9496 Tm [<00420042>-515<00420070>-3090<003F001C004D002F>-31985<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 634.3033 Tm [<00420042>-515<00420070>-3090<003F001C004D002F>-31985<006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 621.9496 cm
+1 0 0 1 499.2278 634.3033 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 621.9496 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 634.3033 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 621.9496 cm
+1 0 0 1 800.4464 634.3033 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 607.5221 Tm [<00420042>-515<00420070>-3090<0044001C0070001C>-31986<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 619.8758 Tm [<00420042>-515<00420070>-3090<0044001C0070001C>-31986<0065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 607.5221 cm
+1 0 0 1 499.2278 619.8758 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 607.5221 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 619.8758 Tm [<0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 607.5221 cm
+1 0 0 1 800.4464 619.8758 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 607.5221 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 619.8758 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 607.5221 cm
+1 0 0 1 1174.1782 619.8758 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 593.0946 Tm [<00420042>-515<00420070>-3090<0048001C004D003B>-31471<006B0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 605.4483 Tm [<00420042>-515<00420070>-3090<0048001C004D003B>-31471<006B0065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 593.0946 cm
+1 0 0 1 499.2278 605.4483 cm
0 0 135.1451 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 593.0946 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 605.4483 Tm [<0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 593.0946 cm
+1 0 0 1 800.4464 605.4483 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.702 593.0946 Tm [<0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0556 605.4483 Tm [<0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 593.0946 cm
+1 0 0 1 1174.1782 605.4483 cm
0 0 31.1868 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 578.6671 Tm [<00420070>-3090<0048001C00760051>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 591.0208 Tm [<00420070>-3090<0048001C00760051>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 578.6671 cm
+1 0 0 1 800.4464 591.0208 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 578.6671 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 591.0208 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 578.6671 cm
+1 0 0 1 1174.1782 591.0208 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 564.2396 Tm [<00480054002F0037>-87926<00520033>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 576.5933 Tm [<00480054002F0037>-87926<00520033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 564.2396 cm
+1 0 0 1 1174.1782 576.5933 cm
0 0 93.5639 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 549.8122 Tm [<00420070>-3090<0048006D001C0069>-57180<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 562.1658 Tm [<00420070>-3090<0048006D001C0069>-57180<0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 549.8122 cm
+1 0 0 1 800.4464 562.1658 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.545 549.8122 Tm [<00520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8987 562.1658 Tm [<00520065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 549.8122 cm
+1 0 0 1 1174.1782 562.1658 cm
0 0 83.1659 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 535.3847 Tm [<00420070>-3090<00480074004B0048>-57180<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 547.7383 Tm [<00420070>-3090<00480074004B0048>-57180<0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 535.3847 cm
+1 0 0 1 800.4464 547.7383 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 535.3847 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 547.7383 Tm [<0052006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 535.3847 cm
+1 0 0 1 1174.1782 547.7383 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 520.9572 Tm [<004B>-6515<0052006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 533.3108 Tm [<004B>-6515<0052006A>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 520.9572 cm
+1 0 0 1 182.4158 533.3108 cm
0 0 67.5725 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 468.5827 520.9572 Tm [<0052006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 480.9364 533.3108 Tm [<0052006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 520.9572 cm
+1 0 0 1 499.2278 533.3108 cm
0 0 67.5725 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 520.9572 Tm [<006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 533.3108 Tm [<006B0079>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 520.9572 cm
+1 0 0 1 800.4464 533.3108 cm
0 0 103.9583 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 520.9572 Tm [<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 533.3108 Tm [<006A>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 520.9572 cm
+1 0 0 1 1054.8848 533.3108 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 520.9572 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 533.3108 Tm [<0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 520.9572 cm
+1 0 0 1 1174.1782 533.3108 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 506.5297 Tm [<00420042>-515<00420070>-3090<004B001C0069003F>-31470<0052006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 518.8833 Tm [<00420042>-515<00420070>-3090<004B001C0069003F>-31470<0052006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 506.5297 cm
+1 0 0 1 499.2278 518.8833 cm
0 0 67.5725 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 506.5297 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 518.8833 Tm [<0052006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 506.5297 cm
+1 0 0 1 800.4464 518.8833 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.702 506.5297 Tm [<004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0556 518.8833 Tm [<004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 506.5297 cm
+1 0 0 1 1174.1782 518.8833 cm
0 0 46.7801 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 492.1022 Tm [<00420042>-515<00420070>-3090<004B00320069001C>-31470<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 504.4558 Tm [<00420042>-515<00420070>-3090<004B00320069001C>-31470<0052006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 492.1022 cm
+1 0 0 1 499.2278 504.4558 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 492.1022 Tm [<00520038>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 504.4558 Tm [<00520038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 492.1022 cm
+1 0 0 1 800.4464 504.4558 cm
0 0 77.9669 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 492.1022 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 504.4558 Tm [<0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 492.1022 cm
+1 0 0 1 1174.1782 504.4558 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 477.6747 Tm [<00420070>-3090<004B004800420023>-57180<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 490.0283 Tm [<00420070>-3090<004B004800420023>-57180<006A>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 477.6747 cm
+1 0 0 1 800.4464 490.0283 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 477.6747 Tm [<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 490.0283 Tm [<0039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 477.6747 cm
+1 0 0 1 1174.1782 490.0283 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 463.2472 Tm [<00420042>-515<00420070>-3090<004B006D00480069>-31470<006B0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 475.6009 Tm [<00420042>-515<00420070>-3090<004B006D00480069>-31470<006B0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 463.2472 cm
+1 0 0 1 499.2278 475.6009 cm
0 0 124.7507 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 463.2472 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 475.6009 Tm [<0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 463.2472 cm
+1 0 0 1 800.4464 475.6009 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 463.2472 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 475.6009 Tm [<0033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 463.2472 cm
+1 0 0 1 1174.1782 475.6009 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 448.8197 Tm [<00420070>-3090<004D0051002F0032>-57180<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 461.1734 Tm [<00420070>-3090<004D0051002F0032>-57180<0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 448.8197 cm
+1 0 0 1 800.4464 461.1734 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 448.8197 Tm [<006B006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 461.1734 Tm [<006B006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 448.8197 cm
+1 0 0 1 1174.1782 461.1734 cm
0 0 119.5517 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 434.3922 Tm [<00420042>-515<00420070>-3090<004D00510060004B>-31985<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 446.7459 Tm [<00420042>-515<00420070>-3090<004D00510060004B>-31985<0064>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 434.3922 cm
+1 0 0 1 499.2278 446.7459 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 434.3922 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 446.7459 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 434.3922 cm
+1 0 0 1 800.4464 446.7459 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 419.9647 Tm [<00420042>-515<00420070>-3090<0054001C002B0046>-31985<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 432.3184 Tm [<00420042>-515<00420070>-3090<0054001C002B0046>-31985<0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 419.9647 cm
+1 0 0 1 499.2278 432.3184 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 419.9647 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 432.3184 Tm [<0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 419.9647 cm
+1 0 0 1 800.4464 432.3184 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 419.9647 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 432.3184 Tm [<0052>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 419.9647 cm
+1 0 0 1 1054.8848 432.3184 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 419.9647 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 432.3184 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 419.9647 cm
+1 0 0 1 1174.1782 432.3184 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 405.5372 Tm [<00420042>-515<00420070>-3090<0054001C003B0032>-31470<006B006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 417.8909 Tm [<00420042>-515<00420070>-3090<0054001C003B0032>-31470<006B006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 405.5372 cm
+1 0 0 1 499.2278 417.8909 cm
0 0 119.5517 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 405.5372 Tm [<006B0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 417.8909 Tm [<006B0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 405.5372 cm
+1 0 0 1 800.4464 417.8909 cm
0 0 129.9461 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 405.5372 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 417.8909 Tm [<0052>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 405.5372 cm
+1 0 0 1 1054.8848 417.8909 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 405.5372 Tm [<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 417.8909 Tm [<0039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 405.5372 cm
+1 0 0 1 1174.1782 417.8909 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 391.1097 Tm [<0054002F00370060>-31985<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 403.4634 Tm [<0054002F00370060>-31985<006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 391.1097 cm
+1 0 0 1 499.2278 403.4634 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 376.6822 Tm [<00420070>-3090<0054003F00760062>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 389.0359 Tm [<00420070>-3090<0054003F00760062>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 376.6822 cm
+1 0 0 1 800.4464 389.0359 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 376.6822 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 389.0359 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 376.6822 cm
+1 0 0 1 1174.1782 389.0359 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 362.2547 Tm [<00420042>-515<00420070>-3090<0054006000510054>-31985<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 374.6084 Tm [<00420042>-515<00420070>-3090<0054006000510054>-31985<006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 362.2547 cm
+1 0 0 1 499.2278 374.6084 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 362.2547 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 374.6084 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 362.2547 cm
+1 0 0 1 800.4464 374.6084 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 347.8272 Tm [<00420042>-515<00420070>-3090<00600032003B0042>-31470<006B0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 360.1809 Tm [<00420042>-515<00420070>-3090<00600032003B0042>-31470<006B0064>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 347.8272 cm
+1 0 0 1 499.2278 360.1809 cm
0 0 140.3441 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 347.8272 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 360.1809 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 347.8272 cm
+1 0 0 1 800.4464 360.1809 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.545 347.8272 Tm [<006B0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8987 360.1809 Tm [<006B0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 347.8272 cm
+1 0 0 1 1174.1782 360.1809 cm
0 0 135.1451 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 333.3997 Tm [<0062>-6516<00390065>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 345.7534 Tm [<0062>-6516<00390065>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 333.3997 cm
+1 0 0 1 182.4158 345.7534 cm
0 0 239.1034 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 468.5827 333.3997 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 480.9364 345.7534 Tm [<0052006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 333.3997 cm
+1 0 0 1 499.2278 345.7534 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 333.3997 Tm [<006A0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 345.7534 Tm [<006A0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 333.3997 cm
+1 0 0 1 800.4464 345.7534 cm
0 0 176.7298 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 333.3997 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 345.7534 Tm [<0052>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 333.3997 cm
+1 0 0 1 1054.8848 345.7534 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 333.3997 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 345.7534 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 333.3997 cm
+1 0 0 1 1174.1782 345.7534 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 318.9722 Tm [<00420042>-515<00420070>-3090<0062002B0060004D>-31985<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 331.3259 Tm [<00420042>-515<00420070>-3090<0062002B0060004D>-31985<0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 318.9722 cm
+1 0 0 1 499.2278 331.3259 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 318.9722 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 331.3259 Tm [<0033>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 318.9722 cm
+1 0 0 1 1054.8848 331.3259 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 318.9722 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 331.3259 Tm [<0064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 318.9722 cm
+1 0 0 1 1174.1782 331.3259 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 304.5447 Tm [<00420070>-3090<0062002B00600054>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 316.8984 Tm [<00420070>-3090<0062002B00600054>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 304.5447 cm
+1 0 0 1 800.4464 316.8984 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 304.5447 Tm [<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 316.8984 Tm [<006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 304.5447 cm
+1 0 0 1 1174.1782 316.8984 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 290.1172 Tm [<00420042>-515<00420070>-3090<0062005100600069>-31985<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 302.4709 Tm [<00420042>-515<00420070>-3090<0062005100600069>-31985<006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 290.1172 cm
+1 0 0 1 499.2278 302.4709 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 290.1172 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 302.4709 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 290.1172 cm
+1 0 0 1 800.4464 302.4709 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 290.1172 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 302.4709 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 290.1172 cm
+1 0 0 1 1174.1782 302.4709 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 275.6898 Tm [<00420042>-515<00420070>-3090<00620054001C002B>-31985<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 288.0434 Tm [<00420042>-515<00420070>-3090<00620054001C002B>-31985<006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 275.6898 cm
+1 0 0 1 499.2278 288.0434 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9701 275.6898 Tm [<004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3238 288.0434 Tm [<004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 275.6898 cm
+1 0 0 1 800.4464 288.0434 cm
0 0 46.7801 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 275.6898 Tm [<0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 288.0434 Tm [<0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 275.6898 cm
+1 0 0 1 1174.1782 288.0434 cm
0 0 25.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 261.2623 Tm [<00420042>-4635<006200540032002B>-31471<00520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 273.6159 Tm [<00420042>-4635<006200540032002B>-31471<00520065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 261.2623 cm
+1 0 0 1 499.2278 273.6159 cm
0 0 83.1659 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 246.8348 Tm [<00420042>-515<00420070>-3090<006200690060002B>-31471<00520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 259.1884 Tm [<00420042>-515<00420070>-3090<006200690060002B>-31471<00520065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 246.8348 cm
+1 0 0 1 499.2278 259.1884 cm
0 0 83.1659 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 246.8348 Tm [<006B0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 259.1884 Tm [<006B006A>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 246.8348 cm
-0 0 124.7507 8.3103 re f
+1 0 0 1 800.4464 259.1884 cm
+0 0 119.5517 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 246.8348 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 259.1884 Tm [<006B>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 246.8348 cm
-0 0 5.199 8.3103 re f
+1 0 0 1 1054.8848 259.1884 cm
+0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 246.8348 Tm [<006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 259.1884 Tm [<006B0079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 246.8348 cm
+1 0 0 1 1174.1782 259.1884 cm
0 0 103.9583 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 232.4073 Tm [<00420042>-515<00420070>-3090<0062006D00540054>-31470<006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 244.7609 Tm [<00420042>-515<00420070>-3090<0062006D00540054>-31470<006B0079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 232.4073 cm
+1 0 0 1 499.2278 244.7609 cm
0 0 103.9583 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 232.4073 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 244.7609 Tm [<0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 232.4073 cm
+1 0 0 1 800.4464 244.7609 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 232.4073 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 244.7609 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 232.4073 cm
+1 0 0 1 1174.1782 244.7609 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 217.9798 Tm [<00420042>-515<00420070>-3090<00620076004B0023>-31470<00520052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 230.3334 Tm [<00420042>-515<00420070>-3090<00620076004B0023>-31470<00520052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 217.9798 cm
+1 0 0 1 499.2278 230.3334 cm
0 0 57.1782 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 217.9798 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 230.3334 Tm [<0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 217.9798 cm
+1 0 0 1 800.4464 230.3334 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 217.9798 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 230.3334 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 217.9798 cm
+1 0 0 1 1174.1782 230.3334 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 203.5523 Tm [<00420042>-515<00420070>-3090<0062007600620069>-31470<00520079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 215.9059 Tm [<00420042>-515<00420070>-3090<0062007600620069>-31470<00520079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 203.5523 cm
+1 0 0 1 499.2278 215.9059 cm
0 0 51.9792 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 203.5523 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 215.9059 Tm [<0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 203.5523 cm
+1 0 0 1 800.4464 215.9059 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 203.5523 Tm [<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 215.9059 Tm [<006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 203.5523 cm
+1 0 0 1 1174.1782 215.9059 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 189.1248 Tm [<00420042>-515<00420070>-3090<0069001C00230048>-31985<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 201.4784 Tm [<00420042>-515<00420070>-3090<0069001C00230048>-31985<0033>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 189.1248 cm
+1 0 0 1 499.2278 201.4784 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 189.1248 Tm [<0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 201.4784 Tm [<0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 189.1248 cm
+1 0 0 1 800.4464 201.4784 cm
0 0 41.5848 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 189.1248 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 201.4784 Tm [<006B>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 189.1248 cm
+1 0 0 1 1054.8848 201.4784 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 189.1248 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 201.4784 Tm [<006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 189.1248 cm
+1 0 0 1 1174.1782 201.4784 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 174.6973 Tm [<00420070>-3090<0069001C00620046>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 187.051 Tm [<00420070>-3090<0069001C00620046>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 174.6973 cm
+1 0 0 1 800.4464 187.051 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 174.6973 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 187.051 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 174.6973 cm
+1 0 0 1 1174.1782 187.051 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 160.2698 Tm [<00420042>-4635<0069003F0060002F>-31985<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 172.6235 Tm [<00420042>-4635<0069003F0060002F>-31985<0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 160.2698 cm
+1 0 0 1 499.2278 172.6235 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 145.8423 Tm [<00420070>-3090<0069005100460062>-57180<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 158.196 Tm [<00420070>-3090<0069005100460062>-57180<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 145.8423 cm
+1 0 0 1 800.4464 158.196 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 145.8423 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 158.196 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 145.8423 cm
+1 0 0 1 1174.1782 158.196 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 131.4148 Tm [<00420042>-515<00420070>-3090<00690060001C002B>-31985<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 143.7685 Tm [<00420042>-515<00420070>-3090<00690060001C002B>-31985<0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 131.4148 cm
+1 0 0 1 499.2278 143.7685 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 131.4148 Tm [<006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 143.7685 Tm [<006A>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 131.4148 cm
+1 0 0 1 800.4464 143.7685 cm
0 0 15.5934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.702 131.4148 Tm [<004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0556 143.7685 Tm [<004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 131.4148 cm
+1 0 0 1 1174.1782 143.7685 cm
0 0 46.7801 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 116.9873 Tm [<00420042>-515<00420070>-3090<0069007600540032>-31470<006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 129.341 Tm [<00420042>-515<00420070>-3090<0069007600540032>-31470<006B0079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 116.9873 cm
+1 0 0 1 499.2278 129.341 cm
0 0 103.9583 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 116.9873 Tm [<00520033>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 129.341 Tm [<00520033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 116.9873 cm
+1 0 0 1 800.4464 129.341 cm
0 0 93.5639 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 116.9873 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 129.341 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 116.9873 cm
+1 0 0 1 1174.1782 129.341 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 102.5598 Tm [<00420042>-515<00420070>-3090<0069007600540051>-31985<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 114.9135 Tm [<00420042>-515<00420070>-3090<0069007600540051>-31985<0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 102.5598 cm
+1 0 0 1 499.2278 114.9135 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 102.5598 Tm [<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 114.9135 Tm [<0052006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 102.5598 cm
+1 0 0 1 800.4464 114.9135 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1030.3966 102.5598 Tm [<006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1042.7503 114.9135 Tm [<006B>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1042.5311 102.5598 cm
+1 0 0 1 1054.8848 114.9135 cm
0 0 10.3944 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1143.5331 102.5598 Tm [<0052006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 1155.8868 114.9135 Tm [<0052006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 102.5598 cm
+1 0 0 1 1174.1782 114.9135 cm
0 0 67.5725 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 88.1323 Tm [<00420042>-515<00420070>-3090<006D004D0042002B>-31471<0052004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 100.486 Tm [<00420042>-515<00420070>-3090<006D004D0042002B>-31471<0052004E>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 88.1323 cm
+1 0 0 1 499.2278 100.486 cm
0 0 98.7593 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 775.9582 88.1323 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 788.3119 100.486 Tm [<0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 88.1323 cm
+1 0 0 1 800.4464 100.486 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 88.1323 Tm [<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 100.486 Tm [<0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 88.1323 cm
+1 0 0 1 1174.1782 100.486 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 73.7048 Tm [<006D006900420048>-87926<00520052>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 86.0585 Tm [<006D006900420048>-87926<00520052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 73.7048 cm
+1 0 0 1 1174.1782 86.0585 cm
0 0 57.1782 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 59.2773 Tm [<00420042>-4635<0070003200600023>-31470<0052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 71.631 Tm [<00420042>-4635<0070003200600023>-31470<0052006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 59.2773 cm
+1 0 0 1 499.2278 71.631 cm
0 0 62.3735 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 44.8498 Tm [<00420070>-3090<0074>-7030<0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 57.2035 Tm [<00420070>-3090<0074>-7030<0052>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 44.8498 cm
+1 0 0 1 182.4158 57.2035 cm
0 0 5.199 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 468.5827 44.8498 Tm [<0039006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 480.9364 57.2035 Tm [<0039006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 44.8498 cm
+1 0 0 1 499.2278 57.2035 cm
0 0 223.51 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 769.8013 44.8498 Tm [<00520033>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.155 57.2035 Tm [<00520033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 788.0927 44.8498 cm
+1 0 0 1 800.4464 57.2035 cm
0 0 93.5639 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1149.69 44.8498 Tm [<0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 1162.0437 57.2035 Tm [<0064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1161.8245 44.8498 cm
+1 0 0 1 1174.1782 57.2035 cm
0 0 36.3858 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 30.4223 Tm [<00420042>-4635<0074003200690074>-31985<0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 42.776 Tm [<00420042>-4635<0074003200690074>-31985<0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 30.4223 cm
+1 0 0 1 499.2278 42.776 cm
0 0 20.7924 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 15.9948 Tm [<00420042>-4635<00740069001C003B>-31470<006A0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 28.3485 Tm [<00420042>-4635<00740069001C003B>-31470<006A0038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 486.8741 15.9948 cm
+1 0 0 1 499.2278 28.3485 cm
0 0 181.9252 8.3103 re f
Q
endstream
endobj
16 0 obj
-<</Type/Page/Contents 17 0 R/Resources 15 0 R/MediaBox[0 0 1343.7497 966.1357]/TrimBox [ 0.0000 0.0000 1343.7497 966.1357 ] /CropBox [ 0.0000 0.0000 1343.7497 966.1357 ]/Parent 19 0 R>>
+<</Type/Page/Contents 17 0 R/Resources 15 0 R/MediaBox[0 0 1368.457 990.843]/TrimBox [ 0.0000 0.0000 1368.4570 990.8430 ] /CropBox [ 0.0000 0.0000 1368.4570 990.8430 ]/Parent 19 0 R>>
endobj
15 0 obj
<</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
endobj
22 0 obj
-<</Length 29699 >>
+<</Length 29954 >>
stream
0 g 0 G
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 955.7478 Tm [<004C005100700032004B002300320060>-515<0039002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<0062004200780032>-515<00510037>-515<0055002B0051006000320056>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550040>-515<0042004D002F0042002B001C006900320062>-515<00320074002B0048006D006200420051004D>-514<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<0059>-515<0042004D002F0042002B001C006900320062>-515<0042004D002B0048006D006200420051004D>-515<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<002B0051004B004B0032004D0069>-515<001C004D002F>-515<00620054001C002B00320062>-515<00600032004B005100700032002F00580056>]TJ
-1 0 0 1 127.1431 929.3652 Tm [<006B00790038005200790079>-500<006900320074>-8129<0039006B006B00380039004E0079>-500<004B004600420042>-515<0039003300330065007900380038>-515<0059>-12028<006B006A0079006B006B00390064>-500<004B004600420070>-14698<0052006500640079006A0039>-500<004B004600700042>-4150<006B006B00790065006B0033006A>-500<0048006D001C>-515<003800650052006500650065006B>-515<0059>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 968.1015 Tm [<004C005100700032004B002300320060>-515<0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<0062004200780032>-515<00510037>-515<0055002B0051006000320056>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<00550040>-515<0042004D002F0042002B001C006900320062>-515<00320074002B0048006D006200420051004D>-514<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<0059>-515<0042004D002F0042002B001C006900320062>-515<0042004D002B0048006D006200420051004D>-515<00510037>-515<0048001C0060003B0032>-515<002F001C0069001C>-515<003700420048003200620063>-515<002B0051004B004B0032004D0069>-515<001C004D002F>-515<00620054001C002B00320062>-515<00600032004B005100700032002F00580056>]TJ
+1 0 0 1 139.4968 941.7188 Tm [<006B00790038005200790079>-500<006900320074>-8128<0039006B006B0038003900790039>-500<004B004600420042>-515<0039003300330038003900390052>-515<0059>-12028<006B006B00380033007900380065>-500<004B004600420070>-14065<006B00520038003300520033>-500<004B004600700042>-4156<006B006B00790033006400390039>-500<0048006D001C>-515<0038006500520033003300390079>-515<0059>]TJ
ET
q
-1 0 0 1 0 923.1064 cm
-[]0 d 0 J 0.3985 w 0 0 m 1219.5098 0 l S
+1 0 0 1 12.3537 935.4601 cm
+[]0 d 0 J 0.3985 w 0 0 m 1212.0305 0 l S
Q
q
-1 0 0 1 0 923.1064 cm
-[]0 d 0 J 0.3985 w 0 0 m 1219.5098 0 l S
+1 0 0 1 12.3537 935.4601 cm
+[]0 d 0 J 0.3985 w 0 0 m 1212.0305 0 l S
Q
BT
-/F47 11.955168 Tf 1 0 0 1 0 910.4995 Tm [<00420042>-515<00420070>-3090<001C004D002B003F>-17204<00380052005200380065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 922.8532 Tm [<00420042>-515<00420070>-3090<001C004D002B003F>-17204<00380052005200380065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 910.4995 cm
+1 0 0 1 347.1431 922.8532 cm
0 0 28.7606 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 910.4995 Tm [<0039006A006A00790064>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 922.8532 Tm [<0039006A006B0033006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 910.4995 cm
-0 0 24.346 8.3103 re f
+1 0 0 1 626.1974 922.8532 cm
+0 0 24.3314 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8251 910.4995 Tm [<00650038006A0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6876 922.8532 Tm [<0065006400520064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 910.4995 cm
-0 0 3.674 8.3103 re f
+1 0 0 1 985.2808 922.8532 cm
+0 0 3.7761 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 896.072 Tm [<00420070>-3090<001C006900690060>-41061<00640038004E0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 908.4257 Tm [<00420070>-3090<001C006900690060>-41061<00640038004E0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 896.072 cm
+1 0 0 1 626.1974 908.4257 cm
0 0 4.2723 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 896.072 Tm [<0052004E0033006A006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 908.4257 Tm [<0052004E0033006A006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 896.072 cm
+1 0 0 1 985.2808 908.4257 cm
0 0 11.1496 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 881.6445 Tm [<00420070>-3090<0023001C002B0046>-40545<005200330064006B0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 893.9982 Tm [<00420070>-3090<0023001C002B0046>-40545<005200330064006B0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 881.6445 cm
+1 0 0 1 626.1974 893.9982 cm
0 0 10.5257 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 881.6445 Tm [<0039006A006A006A0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 893.9982 Tm [<00390038006A00790064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 881.6445 cm
-0 0 24.3642 8.3103 re f
+1 0 0 1 985.2808 893.9982 cm
+0 0 25.4697 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 867.217 Tm [<00420042>-515<00420070>-3090<0023004200230048>-17205<006B004E0065006B0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 879.5707 Tm [<00420042>-515<00420070>-3090<0023004200230048>-17205<006B004E0065006B0033>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 867.217 cm
+1 0 0 1 347.1431 879.5707 cm
0 0 16.6551 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 867.217 Tm [<003900640064006A006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 879.5707 Tm [<003900640064006A006A>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 867.217 cm
+1 0 0 1 626.1974 879.5707 cm
0 0 26.8342 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 867.217 Tm [<0052003300390033006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 879.5707 Tm [<0052003300390033006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 867.217 cm
+1 0 0 1 985.2808 879.5707 cm
0 0 10.3907 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 852.7895 Tm [<00420070>-3090<0023004800510023>-41575<006A0039006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 865.1432 Tm [<00420070>-3090<0023004800510023>-41575<006A0039006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.9405 852.7895 cm
+1 0 0 1 626.2941 865.1432 cm
[]0 d 0 J 0.1934 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8132 852.7895 Tm [<006B00520038004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6876 865.1432 Tm [<006B00520038004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 852.7895 cm
+1 0 0 1 985.2808 865.1432 cm
0 0 1.2149 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 838.362 Tm [<00420042>-515<00420070>-3090<0023006D00370037>-17204<006B0064007900790065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 850.7157 Tm [<00420042>-515<00420070>-3090<0023006D00370037>-17204<006B0064007900790065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 838.362 cm
+1 0 0 1 347.1431 850.7157 cm
0 0 15.1811 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 838.362 Tm [<006B006A00520033004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 850.7157 Tm [<006B006A00520033004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 838.362 cm
+1 0 0 1 626.1974 850.7157 cm
0 0 13.0358 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 838.362 Tm [<003900390033004E0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 850.7157 Tm [<003900390033004E0052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 838.362 cm
+1 0 0 1 985.2808 850.7157 cm
0 0 25.2362 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 823.9346 Tm [<00230074004B0048>-40545<00520039006B006B0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 836.2882 Tm [<00230074004B0048>-40545<00520039006B006B0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 823.9346 cm
+1 0 0 1 626.1974 836.2882 cm
0 0 7.9974 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 809.5071 Tm [<00420042>-515<00420070>-3090<002B001C0069002B>-17203<006B0079006B00520039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 821.8607 Tm [<00420042>-515<00420070>-3090<002B001C0069002B>-17203<006B0079006B00520039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 809.5071 cm
+1 0 0 1 347.1431 821.8607 cm
0 0 11.3649 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 809.5071 Tm [<006B006B0065006A0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 821.8607 Tm [<006B006B0065006A0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 809.5071 cm
+1 0 0 1 626.1974 821.8607 cm
0 0 12.7257 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 955.9701 809.5071 Tm [<003300650039>]TJ
+/F47 11.955168 Tf 1 0 0 1 960.8445 821.8607 Tm [<003300650039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.649 809.5071 cm
+1 0 0 1 985.5234 821.8607 cm
[]0 d 0 J 0.4852 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 795.0796 Tm [<00420070>-3090<002B003F001C0060>-41061<006B0064006B0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 807.4332 Tm [<00420070>-3090<002B003F001C0060>-41061<006B0064006B0065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 795.0796 cm
+1 0 0 1 626.1974 807.4332 cm
0 0 1.5323 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 931.3544 795.0796 Tm [<0040>-515<004E0039003800380065>]TJ
+/F47 11.955168 Tf 1 0 0 1 936.2288 807.4332 Tm [<0040>-515<004E0039003800380065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 795.0796 cm
+1 0 0 1 985.2808 807.4332 cm
0 0 53.1576 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 780.6521 Tm [<00420070>-3090<002B003F0032004B>-40545<00520039003800390038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 793.0057 Tm [<00420070>-3090<002B003F0032004B>-40545<00520039003800390038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 780.6521 cm
+1 0 0 1 626.1974 793.0057 cm
0 0 8.1761 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 780.6521 Tm [<00520039003800790064>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 793.0057 Tm [<00520039003800790064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 780.6521 cm
+1 0 0 1 985.2808 793.0057 cm
0 0 8.1542 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 766.2246 Tm [<00420070>-3090<002B0048002F0037>-41575<003300520038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 778.5782 Tm [<00420070>-3090<002B0048002F0037>-41575<003300520038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 614.0736 766.2246 cm
+1 0 0 1 626.4273 778.5782 cm
[]0 d 0 J 0.4597 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 766.2246 Tm [<006B006A00380052004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 778.5782 Tm [<006B006A00380052004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 766.2246 cm
+1 0 0 1 985.2808 778.5782 cm
0 0 13.2219 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 751.7971 Tm [<00420042>-515<00420070>-3090<002B005100480051>-16689<0052007900640039004E0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 764.1507 Tm [<00420042>-515<00420070>-3090<002B005100480051>-16689<0052007900640039004E0079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 751.7971 cm
+1 0 0 1 347.1431 764.1507 cm
0 0 60.4289 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 751.7971 Tm [<003300380038004E0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 764.1507 Tm [<003300380038004E0038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 751.7971 cm
+1 0 0 1 626.1974 764.1507 cm
0 0 48.1191 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 751.7971 Tm [<005200330064006B0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 764.1507 Tm [<005200330064006B0039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 751.7971 cm
+1 0 0 1 985.2808 764.1507 cm
0 0 10.5257 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 737.3696 Tm [<00420042>-515<00420070>-3090<002B0051004D0069>-17204<0052004E005200790079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 749.7233 Tm [<00420042>-515<00420070>-3090<002B0051004D0069>-17204<0052004E005200790079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 737.3696 cm
+1 0 0 1 347.1431 749.7233 cm
0 0 10.7373 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 737.3696 Tm [<005200390033006A0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 749.7233 Tm [<005200390033006A0052>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 737.3696 cm
+1 0 0 1 626.1974 749.7233 cm
0 0 8.3367 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 722.9421 Tm [<00420042>-515<00420070>-3090<002B005100600032>-16688<0052006B00520038006A0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 735.2958 Tm [<00420042>-515<00420070>-3090<002B005100600032>-16688<0052006B00520038006A0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 722.9421 cm
+1 0 0 1 347.1431 735.2958 cm
0 0 68.3205 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 722.9421 Tm [<003300380039006A004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 735.2958 Tm [<00330038006A0065006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 722.9421 cm
-0 0 48.0316 8.3103 re f
+1 0 0 1 626.1974 735.2958 cm
+0 0 47.9878 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6682 722.9421 Tm [<006B0064004E00790065>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5426 735.2958 Tm [<006B0064004E00790065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 722.9421 cm
+1 0 0 1 985.2808 735.2958 cm
0 0 15.6882 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 708.5146 Tm [<002F001C0069001C>-71209<004E0033004E006A0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 720.8683 Tm [<002F001C0069001C>-70584<004E0033004E006A0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 708.5146 cm
+1 0 0 1 985.2808 720.8683 cm
0 0 55.6203 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 694.0871 Tm [<00420042>-515<00420070>-3090<0032004D002B0051>-16689<006B006A004E006A0038006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 706.4408 Tm [<00420042>-515<00420070>-3090<0032004D002B0051>-16689<006B006A004E006A0038006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 694.0871 cm
+1 0 0 1 347.1431 706.4408 cm
0 0 134.5577 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 583.2505 694.0871 Tm [<00650038006A0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 595.6042 706.4408 Tm [<00650038006A0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 694.0871 cm
+1 0 0 1 626.1974 706.4408 cm
0 0 3.674 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 679.6596 Tm [<00420070>-3090<0037004200480032>-60892<0052006A003300520039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 692.0133 Tm [<00420070>-3090<0037004200480032>-60260<0052006A003300520039>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 679.6596 cm
+1 0 0 1 861.8939 692.0133 cm
0 0 7.7675 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 679.6596 Tm [<006B006B00520079004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 692.0133 Tm [<006B006B00520079004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 679.6596 cm
+1 0 0 1 985.2808 692.0133 cm
0 0 12.4302 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 665.2321 Tm [<00420042>-4635<0037004200480069>-17719<006B00650052006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 677.5858 Tm [<00420042>-4635<0037004200480069>-17719<006B00650052006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 665.2321 cm
+1 0 0 1 347.1431 677.5858 cm
0 0 1.4667 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 650.8046 Tm [<00420042>-515<00420070>-3090<00370051004D0069>-16688<005200790079005200330052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 663.1583 Tm [<00420042>-515<00420070>-3090<00370051004D0069>-16688<005200790079005200330052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 650.8046 cm
+1 0 0 1 347.1431 663.1583 cm
0 0 56.3208 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 650.8046 Tm [<004E0052006B006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 663.1583 Tm [<004E0052006B006B0079>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 650.8046 cm
+1 0 0 1 626.1974 663.1583 cm
0 0 51.2823 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 937.4994 650.8046 Tm [<0039006B0038006A00520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 942.3738 663.1583 Tm [<0039006B0038006A00520065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 650.8046 cm
+1 0 0 1 985.2808 663.1583 cm
0 0 239.1034 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 636.3771 Tm [<00420042>-515<00420070>-3090<003B00600054003F>-17204<00380039003300640065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 648.7308 Tm [<00420042>-515<00420070>-3090<003B00600054003F>-17204<00380039003300640065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 636.3771 cm
+1 0 0 1 347.1431 648.7308 cm
0 0 30.8511 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.1056 636.3771 Tm [<006A0065006500640064>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4592 648.7308 Tm [<006A0065006500640064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 636.3771 cm
+1 0 0 1 626.1974 648.7308 cm
0 0 20.6173 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 636.3771 Tm [<006A0039005200650079>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 648.7308 Tm [<006A0039005200650079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 636.3771 cm
+1 0 0 1 985.2808 648.7308 cm
0 0 19.2053 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 621.9496 Tm [<00420042>-515<00420070>-3090<003F001C004D002F>-17204<006B0052004E00390039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 634.3033 Tm [<00420042>-515<00420070>-3090<003F001C004D002F>-17204<006B0052004E00390039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 621.9496 cm
+1 0 0 1 347.1431 634.3033 cm
0 0 12.3353 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 583.2505 621.9496 Tm [<00520052004E0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 595.6042 634.3033 Tm [<00520052004E0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 614.1794 621.9496 cm
+1 0 0 1 626.5331 634.3033 cm
[]0 d 0 J 0.6713 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 607.5221 Tm [<00420042>-515<00420070>-3090<0044001C0070001C>-17204<006B003900380079004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 619.8758 Tm [<00420042>-515<00420070>-3090<0044001C0070001C>-17204<006B003900380079004E>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 607.5221 cm
+1 0 0 1 347.1431 619.8758 cm
0 0 13.7801 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.1056 607.5221 Tm [<005200650038006B004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4592 619.8758 Tm [<005200650038006B004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 607.5221 cm
+1 0 0 1 626.1974 619.8758 cm
0 0 9.2925 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8012 607.5221 Tm [<00380079006B006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6756 619.8758 Tm [<00380079006B006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 607.5221 cm
+1 0 0 1 985.2808 619.8758 cm
0 0 2.8239 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 593.0946 Tm [<00420042>-515<00420070>-3090<0048001C004D003B>-16690<0052006A004E004E006A0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 605.4483 Tm [<00420042>-515<00420070>-3090<0048001C004D003B>-16690<0052006A004E004E006A0038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 593.0946 cm
+1 0 0 1 347.1431 605.4483 cm
0 0 78.6674 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 593.0946 Tm [<00390052003300330064>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 605.4483 Tm [<0039006B00790039006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 593.0946 cm
-0 0 23.547 8.3103 re f
+1 0 0 1 626.1974 605.4483 cm
+0 0 23.6345 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 593.0946 Tm [<003800790052006B004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 605.4483 Tm [<003800790052006B004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 593.0946 cm
+1 0 0 1 985.2808 605.4483 cm
0 0 28.1805 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 578.6671 Tm [<00420070>-3090<0048001C00760051>-41577<006A00650065>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 591.0208 Tm [<00420070>-3090<0048001C00760051>-41577<006A00650065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.9459 578.6671 cm
+1 0 0 1 626.2996 591.0208 cm
[]0 d 0 J 0.2043 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 955.9701 578.6671 Tm [<004E00380079>]TJ
+/F47 11.955168 Tf 1 0 0 1 960.8445 591.0208 Tm [<004E00380079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.6728 578.6671 cm
+1 0 0 1 985.5471 591.0208 cm
[]0 d 0 J 0.5327 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 564.2396 Tm [<00480054002F0037>-70693<00520065006B006500390064>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 576.5933 Tm [<00480054002F0037>-70068<00520065006B006500390064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 564.2396 cm
+1 0 0 1 985.2808 576.5933 cm
0 0 91.4369 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 549.8122 Tm [<00420070>-3090<0048006D001C0069>-41060<003300520039006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 562.1658 Tm [<00420070>-3090<0048006D001C0069>-41060<003300520039006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 549.8122 cm
+1 0 0 1 626.1974 562.1658 cm
0 0 4.5788 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 549.8122 Tm [<0039006A0033006A0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 562.1658 Tm [<0039006A0033006A0039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 549.8122 cm
+1 0 0 1 985.2808 562.1658 cm
0 0 24.6415 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 535.3847 Tm [<00420070>-3090<00480074004B0048>-40545<0052006B007900390033>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 547.7383 Tm [<00420070>-3090<00480074004B0048>-40545<0052006B007900390033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 535.3847 cm
+1 0 0 1 626.1974 547.7383 cm
0 0 6.7715 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 535.3847 Tm [<004E00330033006A0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 547.7383 Tm [<004E00330033006A0064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 535.3847 cm
+1 0 0 1 985.2808 547.7383 cm
0 0 55.5656 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 520.9572 Tm [<004B>-4970<003900330039006B0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 533.3108 Tm [<004B>-4970<003900330039006B0079>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 520.9572 cm
+1 0 0 1 182.4158 533.3108 cm
0 0 27.2209 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 298.0392 520.9572 Tm [<003300790064006B0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 310.3929 533.3108 Tm [<003300790064006B0065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 520.9572 cm
+1 0 0 1 347.1431 533.3108 cm
0 0 45.3828 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 520.9572 Tm [<0039006A0039006B004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 533.3108 Tm [<0039006A0039006B004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 520.9572 cm
+1 0 0 1 626.1974 533.3108 cm
0 0 24.4153 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 820.334 520.9572 Tm [<006B006B003800390038>]TJ
+/F47 11.955168 Tf 1 0 0 1 825.1318 533.3108 Tm [<006B006B00380033006B>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 520.9572 cm
-0 0 12.6746 8.3103 re f
+1 0 0 1 861.8939 533.3108 cm
+0 0 12.6965 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6682 520.9572 Tm [<006A00330064004E0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5426 533.3108 Tm [<006A00330064004E0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 520.9572 cm
+1 0 0 1 985.2808 533.3108 cm
0 0 21.8103 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 506.5297 Tm [<00420042>-515<00420070>-3090<004B001C0069003F>-16690<00520079006500650038006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 518.8833 Tm [<00420042>-515<00420070>-3090<004B001C0069003F>-16690<00520079006500650038006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 506.5297 cm
+1 0 0 1 347.1431 518.8833 cm
0 0 59.9583 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 506.5297 Tm [<00650039005200520039>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 518.8833 Tm [<00650039005200520039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 506.5297 cm
+1 0 0 1 626.1974 518.8833 cm
0 0 36.0428 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6921 506.5297 Tm [<004E0065004E00330065>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5665 518.8833 Tm [<004E0065004E00330065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 506.5297 cm
+1 0 0 1 985.2808 518.8833 cm
0 0 54.5221 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 492.1022 Tm [<00420042>-515<00420070>-3090<004B00320069001C>-17205<00640052006A0065004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 504.4558 Tm [<00420042>-515<00420070>-3090<004B00320069001C>-17205<00640052006A0065004E>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 492.1022 cm
+1 0 0 1 347.1431 504.4558 cm
0 0 40.1218 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.1056 492.1022 Tm [<0039004E006A00330065>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4592 504.4558 Tm [<0039004E006A00330065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 492.1022 cm
+1 0 0 1 626.1974 504.4558 cm
0 0 27.7645 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 492.1022 Tm [<006B0033004E00390038>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 504.4558 Tm [<006B0033004E00390038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 492.1022 cm
+1 0 0 1 985.2808 504.4558 cm
0 0 16.272 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 477.6747 Tm [<00420070>-3090<004B004800420023>-41060<006A006B00330039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 490.0283 Tm [<00420070>-3090<004B004800420023>-41060<006A006B00330039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 477.6747 cm
+1 0 0 1 626.1974 490.0283 cm
0 0 1.8461 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 477.6747 Tm [<00390039005200650033>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 490.0283 Tm [<00390039005200650033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 477.6747 cm
+1 0 0 1 985.2808 490.0283 cm
0 0 24.8312 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 463.2472 Tm [<00420042>-515<00420070>-3090<004B006D00480069>-16173<0040>-515<006A0039007900330038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 475.6009 Tm [<00420042>-515<00420070>-3090<004B006D00480069>-16173<0040>-515<006A0039007900330038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 463.2472 cm
+1 0 0 1 347.1431 475.6009 cm
0 0 19.1615 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 463.2472 Tm [<00390079006500640039>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 475.6009 Tm [<00390079006500640039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 463.2472 cm
+1 0 0 1 626.1974 475.6009 cm
0 0 22.8647 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 931.3305 463.2472 Tm [<0040>-515<00330079003900330052>]TJ
+/F47 11.955168 Tf 1 0 0 1 936.2168 475.6009 Tm [<0040>-515<003300790065006A0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 463.2472 cm
-0 0 45.2442 8.3103 re f
+1 0 0 1 985.2808 475.6009 cm
+0 0 45.3317 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 448.8197 Tm [<00420070>-3090<004D0051002F0032>-40545<0052006B006400790039>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 461.1734 Tm [<00420070>-3090<004D0051002F0032>-40545<0052006B006400790039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 448.8197 cm
+1 0 0 1 626.1974 461.1734 cm
0 0 7.1436 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 937.4874 448.8197 Tm [<00520052007900640039006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 942.3618 461.1734 Tm [<005200520079006400390079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 448.8197 cm
+1 0 0 1 985.2808 461.1734 cm
0 0 62.2568 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 434.3922 Tm [<00420042>-515<00420070>-3090<004D00510060004B>-17203<006B0039006B00380079>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 446.7459 Tm [<00420042>-515<00420070>-3090<004D00510060004B>-17203<006B0039006B00380079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 434.3922 cm
+1 0 0 1 347.1431 446.7459 cm
0 0 13.6342 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 595.5524 434.3922 Tm [<006B0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 607.9061 446.7459 Tm [<006B0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8511 434.3922 cm
+1 0 0 1 626.2047 446.7459 cm
[]0 d 0 J 0.0146 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 419.9647 Tm [<00420042>-515<00420070>-3090<0054001C002B0046>-17203<00330052007900640038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 432.3184 Tm [<00420042>-515<00420070>-3090<0054001C002B0046>-17203<00330052007900640038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 419.9647 cm
+1 0 0 1 347.1431 432.3184 cm
0 0 45.5798 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 419.9647 Tm [<004E0052003800520033>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 432.3184 Tm [<004E0052003800520033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 419.9647 cm
+1 0 0 1 626.1974 432.3184 cm
0 0 51.4501 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 826.5029 419.9647 Tm [<00520039004E0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 831.3007 432.3184 Tm [<00520039004E0039>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.5157 419.9647 cm
+1 0 0 1 862.3135 432.3184 cm
[]0 d 0 J 0.8391 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8132 419.9647 Tm [<006B00650064006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6876 432.3184 Tm [<006B00650064006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 419.9647 cm
+1 0 0 1 985.2808 432.3184 cm
0 0 1.5032 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 405.5372 Tm [<00420042>-515<00420070>-3090<0054001C003B0032>-16688<006B00640033007900790038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 417.8909 Tm [<00420042>-515<00420070>-3090<0054001C003B0032>-16688<006B00640033007900790038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 405.5372 cm
+1 0 0 1 347.1431 417.8909 cm
0 0 156.2877 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 570.9248 405.5372 Tm [<006B00330052007900790052>]TJ
+/F47 11.955168 Tf 1 0 0 1 583.2904 417.8909 Tm [<006B003300520079006B0065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 405.5372 cm
-0 0 157.9733 8.3103 re f
+1 0 0 1 626.1974 417.8909 cm
+0 0 157.9879 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 826.5029 405.5372 Tm [<006A006A00650038>]TJ
+/F47 11.955168 Tf 1 0 0 1 831.3007 417.8909 Tm [<006A006A00650038>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 405.5372 cm
+1 0 0 1 861.8939 417.8909 cm
0 0 1.8935 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 405.5372 Tm [<00520038003900330033>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 417.8909 Tm [<00520038003900330033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 405.5372 cm
+1 0 0 1 985.2808 417.8909 cm
0 0 8.7088 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 391.1097 Tm [<0054002F00370060>-17204<006A006B006500520079>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 403.4634 Tm [<0054002F00370060>-17204<006A006B006500520079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 391.1097 cm
+1 0 0 1 347.1431 403.4634 cm
0 0 18.3333 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 376.6822 Tm [<00420070>-3090<0054003F00760062>-41060<0064006400390038>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 389.0359 Tm [<00420070>-3090<0054003F00760062>-41060<0064006400390038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 376.6822 cm
+1 0 0 1 626.1974 389.0359 cm
0 0 4.3526 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8251 376.6822 Tm [<004E00390039004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6995 389.0359 Tm [<004E00390039004E>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 376.6822 cm
+1 0 0 1 985.2808 389.0359 cm
0 0 5.3121 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 362.2547 Tm [<00420042>-515<00420070>-3090<0054006000510054>-17719<004E00790039006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 374.6084 Tm [<00420042>-515<00420070>-3090<0054006000510054>-17719<004E00790039006B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 362.2547 cm
+1 0 0 1 347.1431 374.6084 cm
0 0 5.0823 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 583.2386 362.2547 Tm [<0052005200330038>]TJ
+/F47 11.955168 Tf 1 0 0 1 595.5922 374.6084 Tm [<0052005200330038>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 614.1776 362.2547 cm
+1 0 0 1 626.5313 374.6084 cm
[]0 d 0 J 0.6677 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 347.8272 Tm [<00420042>-515<00420070>-3090<00600032003B0042>-16691<00520039004E006500790065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 360.1809 Tm [<00420042>-515<00420070>-3090<00600032003B0042>-16691<00520039004E006500790065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 347.8272 cm
+1 0 0 1 347.1431 360.1809 cm
0 0 84.1036 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 589.3955 347.8272 Tm [<006A0033006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 601.7491 360.1809 Tm [<006A0033006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.9514 347.8272 cm
+1 0 0 1 626.3051 360.1809 cm
[]0 d 0 J 0.2153 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 347.8272 Tm [<0038006B006400330079>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 360.1809 Tm [<0038006B006400330079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 347.8272 cm
+1 0 0 1 985.2808 360.1809 cm
0 0 29.6727 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 333.3997 Tm [<0062>-4456<0052003800390064004E0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 345.7534 Tm [<0062>-4456<0052003800390064004E0079>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 333.3997 cm
+1 0 0 1 182.4158 345.7534 cm
0 0 87.0187 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 298.0392 333.3997 Tm [<006A004E007900640039>]TJ
+/F47 11.955168 Tf 1 0 0 1 310.3929 345.7534 Tm [<006A004E007900640039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 333.3997 cm
+1 0 0 1 347.1431 345.7534 cm
0 0 21.9672 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 333.3997 Tm [<0033006A006A00380079>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 345.7534 Tm [<0033006A006A00380079>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 333.3997 cm
+1 0 0 1 626.1974 345.7534 cm
0 0 46.8568 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 826.5029 333.3997 Tm [<0039006A0038004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 831.3007 345.7534 Tm [<0039006A0038004E>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 333.3997 cm
+1 0 0 1 861.8939 345.7534 cm
0 0 2.4517 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8132 333.3997 Tm [<0064006500330039>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6876 345.7534 Tm [<0064006500330039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 333.3997 cm
+1 0 0 1 985.2808 345.7534 cm
0 0 4.3197 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 318.9722 Tm [<00420042>-515<00420070>-3090<0062002B0060004D>-17204<0033003900390065006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 331.3259 Tm [<00420042>-515<00420070>-3090<0062002B0060004D>-17204<0033003900390065006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 318.9722 cm
+1 0 0 1 347.1431 331.3259 cm
0 0 47.4843 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 820.346 318.9722 Tm [<00330052005200520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 825.1318 331.3259 Tm [<00330052006B0038006B>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 318.9722 cm
-0 0 45.6017 8.3103 re f
+1 0 0 1 861.8939 331.3259 cm
+0 0 45.6783 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 318.9722 Tm [<005200520079006A0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 331.3259 Tm [<005200520079006A0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 318.9722 cm
+1 0 0 1 985.2808 331.3259 cm
0 0 6.206 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 304.5447 Tm [<00420070>-3090<0062002B00600054>-41575<003300390064>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 316.8984 Tm [<00420070>-3090<0062002B00600054>-41575<003300390064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 614.0827 304.5447 cm
+1 0 0 1 626.4364 316.8984 cm
[]0 d 0 J 0.4779 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6682 304.5447 Tm [<006B0065004E00640064>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5426 316.8984 Tm [<006B0065004E00640064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 304.5447 cm
+1 0 0 1 985.2808 316.8984 cm
0 0 15.1665 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 290.1172 Tm [<00420042>-515<00420070>-3090<0062005100600069>-17204<006B0079006B004E0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 302.4709 Tm [<00420042>-515<00420070>-3090<0062005100600069>-17204<006B0079006B004E0033>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 290.1172 cm
+1 0 0 1 347.1431 302.4709 cm
0 0 11.4123 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 589.4074 290.1172 Tm [<0052006A004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 601.7611 302.4709 Tm [<0052006A004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8821 290.1172 cm
+1 0 0 1 626.2358 302.4709 cm
[]0 d 0 J 0.0766 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 290.1172 Tm [<006A006A006B0052006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 302.4709 Tm [<006A006A006B0052006A>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 290.1172 cm
+1 0 0 1 985.2808 302.4709 cm
0 0 18.6727 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 275.6898 Tm [<00420042>-515<00420070>-3090<00620054001C002B>-17203<00330038006A006A0039>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 288.0434 Tm [<00420042>-515<00420070>-3090<00620054001C002B>-17203<00330038006A006A0039>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 275.6898 cm
+1 0 0 1 347.1431 288.0434 cm
0 0 47.9732 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0936 275.6898 Tm [<00330038006500520064>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4473 288.0434 Tm [<003300380033004E0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 275.6898 cm
-0 0 48.1337 8.3103 re f
+1 0 0 1 626.1974 288.0434 cm
+0 0 48.2906 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 275.6898 Tm [<006A00330079006B0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 288.0434 Tm [<006A00330079006B0038>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 275.6898 cm
+1 0 0 1 985.2808 288.0434 cm
0 0 21.3761 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 261.2623 Tm [<00420042>-4635<006200540032002B>-16689<0052006A006A006A004E0038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 273.6159 Tm [<00420042>-4635<006200540032002B>-16689<0052006A006A006A004E0038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 261.2623 cm
+1 0 0 1 347.1431 273.6159 cm
0 0 74.9934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 246.8348 Tm [<00420042>-515<00420070>-3090<006200690060002B>-16689<006A00390065007900640052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 259.1884 Tm [<00420042>-515<00420070>-3090<006200690060002B>-16689<006A00390038004E00330038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 246.8348 cm
-0 0 194.5524 8.3103 re f
+1 0 0 1 347.1431 259.1884 cm
+0 0 194.505 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 570.9606 246.8348 Tm [<006B004E003900390065004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 583.3143 259.1884 Tm [<006B0039004E004E006A004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 246.8348 cm
-0 0 165.5438 8.3103 re f
+1 0 0 1 626.1974 259.1884 cm
+0 0 140.5119 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 820.346 246.8348 Tm [<006B006400650064006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 825.1318 259.1884 Tm [<00640038003900390039>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 246.8348 cm
-0 0 15.5569 8.3103 re f
+1 0 0 1 861.8939 259.1884 cm
+0 0 42.413 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 937.5113 246.8348 Tm [<0052003900330065006B0065>]TJ
+/F47 11.955168 Tf 1 0 0 1 942.3857 259.1884 Tm [<0052003900330065006B0065>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 246.8348 cm
+1 0 0 1 985.2808 259.1884 cm
0 0 83.5526 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 232.4073 Tm [<00420042>-515<00420070>-3090<0062006D00540054>-16688<005200640052007900640038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 244.7609 Tm [<00420042>-515<00420070>-3090<0062006D00540054>-16688<005200640052007900640038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 232.4073 cm
+1 0 0 1 347.1431 244.7609 cm
0 0 96.1762 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.1056 232.4073 Tm [<00650039003300520065>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4592 244.7609 Tm [<00650039003300520065>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 232.4073 cm
+1 0 0 1 626.1974 244.7609 cm
0 0 36.4368 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8012 232.4073 Tm [<006A006A00640039>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6756 244.7609 Tm [<006A006A00640039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 232.4073 cm
+1 0 0 1 985.2808 244.7609 cm
0 0 1.8972 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 217.9798 Tm [<00420042>-515<00420070>-3090<00620076004B0023>-17203<0033006B0033006A0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 230.3334 Tm [<00420042>-515<00420070>-3090<00620076004B0023>-17203<0033006B0033006A0064>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 217.9798 cm
+1 0 0 1 347.1431 230.3334 cm
0 0 46.5685 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 217.9798 Tm [<006A0052006A00640079>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 230.3334 Tm [<006A0052006A00640079>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 217.9798 cm
+1 0 0 1 626.1974 230.3334 cm
0 0 17.6365 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 955.982 217.9798 Tm [<004E004E0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 960.8564 230.3334 Tm [<004E004E0079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.6855 217.9798 cm
+1 0 0 1 985.5599 230.3334 cm
[]0 d 0 J 0.5582 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 203.5523 Tm [<00420042>-515<00420070>-3090<0062007600620069>-16689<0052006B0038006500520064>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 215.9059 Tm [<00420042>-515<00420070>-3090<0062007600620069>-16689<0052006B0038006500520064>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 203.5523 cm
+1 0 0 1 347.1431 215.9059 cm
0 0 70.619 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 570.9248 203.5523 Tm [<00520052006400790079006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 583.3023 215.9059 Tm [<005200520065004E0033006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 203.5523 cm
-0 0 65.7775 8.3103 re f
+1 0 0 1 626.1974 215.9059 cm
+0 0 65.7629 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8012 203.5523 Tm [<006A003900390052>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6756 215.9059 Tm [<006A003900390052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 203.5523 cm
+1 0 0 1 985.2808 215.9059 cm
0 0 1.9337 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 189.1248 Tm [<00420042>-515<00420070>-3090<0069001C00230048>-16689<0052005200380065006B006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 201.4784 Tm [<00420042>-515<00420070>-3090<0069001C00230048>-16689<0052005200380065006B006A>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 189.1248 cm
+1 0 0 1 347.1431 201.4784 cm
0 0 65.0004 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 570.9367 189.1248 Tm [<0052006A006A0064004E006A>]TJ
+/F47 11.955168 Tf 1 0 0 1 583.2904 201.4784 Tm [<0052006A006A0064004E0039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 189.1248 cm
+1 0 0 1 626.1974 201.4784 cm
0 0 75.216 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 820.346 189.1248 Tm [<0052007900640052004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 825.1437 201.4784 Tm [<0052005200380038004E>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 189.1248 cm
-0 0 6.0272 8.3103 re f
+1 0 0 1 861.8939 201.4784 cm
+0 0 6.4978 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 189.1248 Tm [<00520039003900520052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 201.4784 Tm [<00520039003900520052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 189.1248 cm
+1 0 0 1 985.2808 201.4784 cm
0 0 8.1032 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 174.6973 Tm [<00420070>-3090<0069001C00620046>-41576<00520052004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 187.051 Tm [<00420070>-3090<0069001C00620046>-41576<00520052004E>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8766 174.6973 cm
+1 0 0 1 626.2303 187.051 cm
[]0 d 0 J 0.0657 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8251 174.6973 Tm [<006500330065006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6995 187.051 Tm [<006500330065006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 174.6973 cm
+1 0 0 1 985.2808 187.051 cm
0 0 3.8564 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 160.2698 Tm [<00420042>-4635<0069003F0060002F>-17203<00640039003800790052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 172.6235 Tm [<00420042>-4635<0069003F0060002F>-17203<00640039003800790052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 160.2698 cm
+1 0 0 1 347.1431 172.6235 cm
0 0 41.884 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 145.8423 Tm [<00420070>-3090<0069005100460062>-41060<0052006B006A0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 158.196 Tm [<00420070>-3090<0069005100460062>-41060<0052006B006A0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 614.1922 145.8423 cm
+1 0 0 1 626.5459 158.196 cm
[]0 d 0 J 0.6968 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 949.8012 145.8423 Tm [<003800390039006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 954.6756 158.196 Tm [<003800390039006B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 145.8423 cm
+1 0 0 1 985.2808 158.196 cm
0 0 3.061 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 131.4148 Tm [<00420042>-515<00420070>-3090<00690060001C002B>-17204<0052006A003900390065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 143.7685 Tm [<00420042>-515<00420070>-3090<00690060001C002B>-17204<0052006A003900390065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 131.4148 cm
+1 0 0 1 347.1431 143.7685 cm
0 0 7.5595 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 131.4148 Tm [<005200390038006A0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 143.7685 Tm [<005200390038006A0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 131.4148 cm
+1 0 0 1 626.1974 143.7685 cm
0 0 8.1725 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6563 131.4148 Tm [<006A0033006500390052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5307 143.7685 Tm [<006A0033006500390039>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 131.4148 cm
-0 0 21.7227 8.3103 re f
+1 0 0 1 985.2808 143.7685 cm
+0 0 21.7264 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 116.9873 Tm [<00420042>-515<00420070>-3090<0069007600540032>-16688<006A00380033005200380038>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 129.341 Tm [<00420042>-515<00420070>-3090<0069007600540032>-16688<006A00380033005200380038>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 116.9873 cm
+1 0 0 1 347.1431 129.341 cm
0 0 201.3458 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 570.9487 116.9873 Tm [<005200650039004E006A0064>]TJ
+/F47 11.955168 Tf 1 0 0 1 583.3023 129.341 Tm [<005200650039004E006A0064>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 116.9873 cm
+1 0 0 1 626.1974 129.341 cm
0 0 92.7248 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 955.9701 116.9873 Tm [<006500380079>]TJ
+/F47 11.955168 Tf 1 0 0 1 960.8445 129.341 Tm [<006500380079>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.5888 116.9873 cm
+1 0 0 1 985.4632 129.341 cm
[]0 d 0 J 0.3648 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 102.5598 Tm [<00420042>-515<00420070>-3090<0069007600540051>-18233<005200390064>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 114.9135 Tm [<00420042>-515<00420070>-3090<0069007600540051>-18233<005200390064>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.8314 102.5598 cm
+1 0 0 1 347.185 114.9135 cm
[]0 d 0 J 0.0839 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.0817 102.5598 Tm [<006B0052006B006B0033>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4353 114.9135 Tm [<006B0052006B006B0033>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 102.5598 cm
+1 0 0 1 626.1974 114.9135 cm
0 0 11.934 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 826.5148 102.5598 Tm [<0052004E0039004E>]TJ
+/F47 11.955168 Tf 1 0 0 1 831.3126 114.9135 Tm [<0052004E0039004E>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 857.0961 102.5598 cm
+1 0 0 1 861.8939 114.9135 cm
0 0 1.0945 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6682 102.5598 Tm [<00650079004E00390052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5426 114.9135 Tm [<006500520079004E0033>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 102.5598 cm
-0 0 34.2587 8.3103 re f
+1 0 0 1 985.2808 114.9135 cm
+0 0 34.3463 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 88.1323 Tm [<00420042>-515<00420070>-3090<006D004D0042002B>-17205<00380065006A00380065>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 100.486 Tm [<00420042>-515<00420070>-3090<006D004D0042002B>-17205<00380065006A00380065>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 88.1323 cm
+1 0 0 1 347.1431 100.486 cm
0 0 31.6829 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 589.4074 88.1323 Tm [<003900650039>]TJ
+/F47 11.955168 Tf 1 0 0 1 601.7611 100.486 Tm [<003900650039>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.9733 88.1323 cm
+1 0 0 1 626.327 100.486 cm
[]0 d 0 J 0.259 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 955.9581 88.1323 Tm [<006A00390064>]TJ
+/F47 11.955168 Tf 1 0 0 1 960.8325 100.486 Tm [<006A00390064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.5031 88.1323 cm
+1 0 0 1 985.3775 100.486 cm
[]0 d 0 J 0.1934 w 0 0 m 0 8.3103 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 67.7259 73.7048 Tm [<006D006900420048>-71206<006A0079006A00640064>]TJ
+/F47 11.955168 Tf 1 0 0 1 80.0796 86.0585 Tm [<006D006900420048>-70581<006A0079006A00640064>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 73.7048 cm
+1 0 0 1 985.2808 86.0585 cm
0 0 17.0783 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 59.2773 Tm [<00420042>-4635<0070003200600023>-17203<0064006B0038006B0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 71.631 Tm [<00420042>-4635<0070003200600023>-17203<0064006B0038006B0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 59.2773 cm
+1 0 0 1 347.1431 71.631 cm
0 0 40.7712 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 18.4707 44.8498 Tm [<00420070>-3090<0074>-5486<00520033004E0079>]TJ
+/F47 11.955168 Tf 1 0 0 1 30.8244 57.2035 Tm [<00420070>-3090<0074>-5486<00520033004E0079>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 170.0622 44.8498 cm
+1 0 0 1 182.4158 57.2035 cm
0 0 1.0617 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 291.8704 44.8498 Tm [<006B0064006A006A00520079>]TJ
+/F47 11.955168 Tf 1 0 0 1 304.2241 57.2035 Tm [<006B0064006A006A00520079>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 44.8498 cm
+1 0 0 1 347.1431 57.2035 cm
0 0 153.6499 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 577.1175 44.8498 Tm [<004E006500380065006B>]TJ
+/F47 11.955168 Tf 1 0 0 1 589.4712 57.2035 Tm [<004E006500380065006B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 613.8438 44.8498 cm
+1 0 0 1 626.1974 57.2035 cm
0 0 54.285 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 943.6443 44.8498 Tm [<006A0064003900330052>]TJ
+/F47 11.955168 Tf 1 0 0 1 948.5187 57.2035 Tm [<006A0064003900330052>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 980.4064 44.8498 cm
+1 0 0 1 985.2808 57.2035 cm
0 0 21.0697 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 30.4223 Tm [<00420042>-4635<0074003200690074>-16689<0052006B0065006A006B0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 42.776 Tm [<00420042>-4635<0074003200690074>-16689<0052006B0065006A006B0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 30.4223 cm
+1 0 0 1 347.1431 42.776 cm
0 0 71.0166 8.3103 re f
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 15.9948 Tm [<00420042>-4635<00740069001C003B>-16691<006B0052004E004E004E0052>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 28.3485 Tm [<00420042>-4635<00740069001C003B>-16691<006B0052004E004E004E0052>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 334.7894 15.9948 cm
+1 0 0 1 347.1431 28.3485 cm
0 0 123.6744 8.3103 re f
Q
endstream
endobj
21 0 obj
-<</Type/Page/Contents 22 0 R/Resources 20 0 R/MediaBox[0 0 1219.5098 966.1357]/TrimBox [ 0.0000 0.0000 1219.5098 966.1357 ] /CropBox [ 0.0000 0.0000 1219.5098 966.1357 ]/Parent 19 0 R>>
+<</Type/Page/Contents 22 0 R/Resources 20 0 R/MediaBox[0 0 1236.7378 990.843]/TrimBox [ 0.0000 0.0000 1236.7378 990.8430 ] /CropBox [ 0.0000 0.0000 1236.7378 990.8430 ]/Parent 19 0 R>>
endobj
20 0 obj
<</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
endobj
25 0 obj
-<</Length 23124 >>
+<</Length 23108 >>
stream
0 g 0 G
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 868.7968 Tm [<004C005100700032004B002300320060>-515<0039002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<006000320048001C0069004200700032>-515<004D006D004B002300320060>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<0055006900320074002D>-515<004B004600420042002D>-515<004B004600420070002D>-515<004B004600700042002D>-514<0048006D001C00560058>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 881.1505 Tm [<004C005100700032004B002300320060>-515<0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<006000320048001C0069004200700032>-515<004D006D004B002300320060>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<0055006900320074002D>-515<004B004600420042002D>-515<004B004600420070002D>-514<004B004600700042002D>-515<0048006D001C00560058>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 673.7576 cm
+1 0 0 1 25.9955 686.1113 cm
0 0 11.9552 16.6339 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 673.7576 cm
+1 0 0 1 37.9507 686.1113 cm
0 0 11.9552 16.6339 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 673.7576 cm
+1 0 0 1 61.861 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 669.2198 cm
+1 0 0 1 14.0403 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 654.2942 Tm [<001C004D002B003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 666.6479 Tm [<001C004D002B003F>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 673.7576 cm
+1 0 0 1 113.055 686.1113 cm
0 0 11.9552 20.7902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 673.7576 cm
+1 0 0 1 136.9654 686.1113 cm
0 0 11.9552 20.7902 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 669.2198 cm
+1 0 0 1 89.1447 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 654.2942 Tm [<001C006900690060>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 666.6479 Tm [<001C006900690060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 673.7576 cm
+1 0 0 1 188.1594 686.1113 cm
0 0 11.9552 20.7902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 199.716 673.7576 cm
+1 0 0 1 212.0697 686.1113 cm
0 0 11.9552 12.4747 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 669.2198 cm
+1 0 0 1 164.249 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 654.2942 Tm [<0023001C002B0046>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 666.6479 Tm [<0023001C002B0046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 673.7576 cm
+1 0 0 1 251.3085 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 673.7576 cm
+1 0 0 1 263.2637 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 673.7576 cm
+1 0 0 1 287.174 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 669.2198 cm
+1 0 0 1 239.3534 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 654.2942 Tm [<0023004200230048>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 666.6479 Tm [<0023004200230048>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 673.7576 cm
+1 0 0 1 338.3681 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 673.7576 cm
+1 0 0 1 362.2784 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 669.2198 cm
+1 0 0 1 314.4577 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 654.2942 Tm [<0023004800510023>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 666.6479 Tm [<0023004800510023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 673.7576 cm
+1 0 0 1 401.5172 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 401.1187 673.7576 cm
+1 0 0 1 413.4724 686.1113 cm
0 0 11.9552 45.7425 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 673.7576 cm
+1 0 0 1 437.3827 686.1113 cm
0 0 11.9552 45.7425 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 669.2198 cm
+1 0 0 1 389.5621 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 654.2942 Tm [<0023006D00370037>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 666.6479 Tm [<0023006D00370037>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 673.7576 cm
+1 0 0 1 488.5767 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 669.2198 cm
+1 0 0 1 464.6664 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 654.2942 Tm [<00230074004B0048>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 666.6479 Tm [<00230074004B0048>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 673.7576 cm
+1 0 0 1 551.7259 686.1113 cm
0 0 11.9552 24.9494 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 673.7576 cm
+1 0 0 1 563.6811 686.1113 cm
0 0 11.9552 24.9494 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 673.7576 cm
+1 0 0 1 587.5914 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 669.2198 cm
+1 0 0 1 539.7708 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 654.2942 Tm [<002B001C0069002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 666.6479 Tm [<002B001C0069002B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 673.7576 cm
+1 0 0 1 638.7854 686.1113 cm
0 0 11.9552 16.6339 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 673.7576 cm
+1 0 0 1 662.6958 686.1113 cm
0 0 11.9552 33.2678 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 669.2198 cm
+1 0 0 1 614.8751 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 654.2942 Tm [<002B003F001C0060>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 666.6479 Tm [<002B003F001C0060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 701.5361 673.7576 cm
+1 0 0 1 713.8898 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 725.4464 673.7576 cm
+1 0 0 1 737.8001 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 669.2198 cm
+1 0 0 1 689.9794 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 695.1999 654.2942 Tm [<002B003F0032004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 707.5536 666.6479 Tm [<002B003F0032004B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 673.7576 cm
+1 0 0 1 788.9941 686.1113 cm
0 0 11.9552 20.7902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 673.7576 cm
+1 0 0 1 812.9045 686.1113 cm
0 0 11.9552 20.7902 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 669.2198 cm
+1 0 0 1 765.0838 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 654.2942 Tm [<002B0048002F0037>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 666.6479 Tm [<002B0048002F0037>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 673.7576 cm
+1 0 0 1 852.1433 686.1113 cm
0 0 11.9552 33.2678 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 673.7576 cm
+1 0 0 1 864.0985 686.1113 cm
0 0 11.9552 29.1086 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 673.7576 cm
+1 0 0 1 888.0088 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 669.2198 cm
+1 0 0 1 840.1881 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 654.2942 Tm [<002B005100480051>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 666.6479 Tm [<002B005100480051>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 914.894 673.7576 cm
+1 0 0 1 927.2476 686.1113 cm
0 0 11.9552 49.8988 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 673.7576 cm
+1 0 0 1 939.2028 686.1113 cm
0 0 11.9552 49.8988 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 669.2198 cm
+1 0 0 1 915.2925 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 654.2942 Tm [<002B0051004D0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 666.6479 Tm [<002B0051004D0069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 673.7576 cm
+1 0 0 1 1002.352 686.1113 cm
0 0 11.9552 66.5327 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 673.7576 cm
+1 0 0 1 1014.3072 686.1113 cm
0 0 11.9552 49.8988 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 673.7576 cm
+1 0 0 1 1038.2175 686.1113 cm
0 0 11.9552 24.9494 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 669.2198 cm
+1 0 0 1 990.3968 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 654.2942 Tm [<002B005100600032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 666.6479 Tm [<002B005100600032>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 673.7576 cm
+1 0 0 1 1113.3218 686.1113 cm
0 0 11.9552 103.9568 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 669.2198 cm
+1 0 0 1 1065.5012 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 654.2942 Tm [<002F001C0069001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 666.6479 Tm [<002F001C0069001C>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1140.207 673.7576 cm
+1 0 0 1 1152.5607 686.1113 cm
0 0 11.9552 162.1741 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 673.7576 cm
+1 0 0 1 1164.5158 686.1113 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 669.2198 cm
+1 0 0 1 1140.6055 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 654.2942 Tm [<0032004D002B0051>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 666.6479 Tm [<0032004D002B0051>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1239.2217 673.7576 cm
+1 0 0 1 1251.5754 686.1113 cm
0 0 11.9552 24.9494 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1251.1769 673.7576 cm
+1 0 0 1 1263.5305 686.1113 cm
0 0 11.9552 24.9494 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 669.2198 cm
+1 0 0 1 1215.7099 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 654.2942 Tm [<0037004200480032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 666.6479 Tm [<0037004200480032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1290.4157 673.7576 cm
+1 0 0 1 1302.7694 686.1113 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 669.2198 cm
+1 0 0 1 1290.8142 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 654.2942 Tm [<0037004200480069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 666.6479 Tm [<0037004200480069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 457.5684 cm
+1 0 0 1 25.9955 469.922 cm
0 0 11.9552 41.5833 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 457.5684 cm
+1 0 0 1 37.9507 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 457.5684 cm
+1 0 0 1 61.861 469.922 cm
0 0 11.9552 145.5402 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 453.0306 cm
+1 0 0 1 14.0403 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 438.1049 Tm [<00370051004D0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 450.4586 Tm [<00370051004D0069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 88.7462 457.5684 cm
+1 0 0 1 101.0998 469.922 cm
0 0 11.9552 12.4747 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 457.5684 cm
+1 0 0 1 113.055 469.922 cm
0 0 11.9552 20.7902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 457.5684 cm
+1 0 0 1 136.9654 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 453.0306 cm
+1 0 0 1 89.1447 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 438.1049 Tm [<003B00600054003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 450.4586 Tm [<003B00600054003F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 457.5684 cm
+1 0 0 1 176.2042 469.922 cm
0 0 11.9552 8.3155 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 457.5684 cm
+1 0 0 1 188.1594 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 453.0306 cm
+1 0 0 1 164.249 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 438.1049 Tm [<003F001C004D002F>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 450.4586 Tm [<003F001C004D002F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 457.5684 cm
+1 0 0 1 251.3085 469.922 cm
0 0 11.9552 24.9494 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 457.5684 cm
+1 0 0 1 263.2637 469.922 cm
0 0 11.9552 20.7902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 457.5684 cm
+1 0 0 1 287.174 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 453.0306 cm
+1 0 0 1 239.3534 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 438.1049 Tm [<0044001C0070001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 450.4586 Tm [<0044001C0070001C>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 314.0592 457.5684 cm
+1 0 0 1 326.4129 469.922 cm
0 0 11.9552 108.116 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 457.5684 cm
+1 0 0 1 338.3681 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 457.5684 cm
+1 0 0 1 362.2784 469.922 cm
0 0 11.9552 24.9494 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 453.0306 cm
+1 0 0 1 314.4577 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 438.1049 Tm [<0048001C004D003B>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 450.4586 Tm [<0048001C004D003B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 401.1187 457.5684 cm
+1 0 0 1 413.4724 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 457.5684 cm
+1 0 0 1 437.3827 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 453.0306 cm
+1 0 0 1 389.5621 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 438.1049 Tm [<0048001C00760051>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 450.4586 Tm [<0048001C00760051>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 500.1334 457.5684 cm
+1 0 0 1 512.4871 469.922 cm
0 0 11.9552 74.8511 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 453.0306 cm
+1 0 0 1 464.6664 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 438.1049 Tm [<00480054002F0037>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 450.4586 Tm [<00480054002F0037>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 457.5684 cm
+1 0 0 1 563.6811 469.922 cm
0 0 11.9552 16.6339 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 457.5684 cm
+1 0 0 1 587.5914 469.922 cm
0 0 11.9552 66.5327 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 453.0306 cm
+1 0 0 1 539.7708 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 438.1049 Tm [<0048006D001C0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 450.4586 Tm [<0048006D001C0069>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 457.5684 cm
+1 0 0 1 638.7854 469.922 cm
0 0 11.9552 16.6339 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 457.5684 cm
+1 0 0 1 662.6958 469.922 cm
0 0 11.9552 49.8988 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 453.0306 cm
+1 0 0 1 614.8751 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 438.1049 Tm [<00480074004B0048>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 450.4586 Tm [<00480074004B0048>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 677.6258 457.5684 cm
+1 0 0 1 689.9794 469.922 cm
0 0 11.9552 54.058 re f
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 689.5809 457.5684 cm
+1 0 0 1 701.9346 469.922 cm
0 0 11.9552 54.058 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 701.5361 457.5684 cm
+1 0 0 1 713.8898 469.922 cm
0 0 11.9552 83.1666 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 713.4913 457.5684 cm
+1 0 0 1 725.8449 469.922 cm
0 0 11.9552 12.4747 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 725.4464 457.5684 cm
+1 0 0 1 737.8001 469.922 cm
0 0 11.9552 20.7902 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 453.0306 cm
+1 0 0 1 689.9794 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 704.4352 438.1049 Tm [<004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 716.7889 450.4586 Tm [<004B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 764.6853 457.5684 cm
+1 0 0 1 777.039 469.922 cm
0 0 11.9552 54.058 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 457.5684 cm
+1 0 0 1 788.9941 469.922 cm
0 0 11.9552 49.8988 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 457.5684 cm
+1 0 0 1 812.9045 469.922 cm
0 0 11.9552 37.4241 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 453.0306 cm
+1 0 0 1 765.0838 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 438.1049 Tm [<004B001C0069003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 450.4586 Tm [<004B001C0069003F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 457.5684 cm
+1 0 0 1 852.1433 469.922 cm
0 0 11.9552 49.8988 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 457.5684 cm
+1 0 0 1 864.0985 469.922 cm
0 0 11.9552 62.3735 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 457.5684 cm
+1 0 0 1 888.0088 469.922 cm
0 0 11.9552 20.7902 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 453.0306 cm
+1 0 0 1 840.1881 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 438.1049 Tm [<004B00320069001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 450.4586 Tm [<004B00320069001C>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 457.5684 cm
+1 0 0 1 939.2028 469.922 cm
0 0 11.9552 12.4747 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 950.7595 457.5684 cm
+1 0 0 1 963.1131 469.922 cm
0 0 11.9552 16.6339 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 453.0306 cm
+1 0 0 1 915.2925 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 438.1049 Tm [<004B004800420023>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 450.4586 Tm [<004B004800420023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 457.5684 cm
+1 0 0 1 1002.352 469.922 cm
0 0 11.9552 99.8006 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 457.5684 cm
+1 0 0 1 1014.3072 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 457.5684 cm
+1 0 0 1 1038.2175 469.922 cm
0 0 11.9552 33.2678 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 453.0306 cm
+1 0 0 1 990.3968 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 438.1049 Tm [<004B006D00480069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 450.4586 Tm [<004B006D00480069>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1077.0578 457.5684 cm
+1 0 0 1 1089.4115 469.922 cm
0 0 11.9552 33.2678 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 457.5684 cm
+1 0 0 1 1113.3218 469.922 cm
0 0 11.9552 95.6413 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 453.0306 cm
+1 0 0 1 1065.5012 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 438.1049 Tm [<004D0051002F0032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 450.4586 Tm [<004D0051002F0032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1140.207 457.5684 cm
+1 0 0 1 1152.5607 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 457.5684 cm
+1 0 0 1 1164.5158 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 453.0306 cm
+1 0 0 1 1140.6055 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 438.1049 Tm [<004D00510060004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 450.4586 Tm [<004D00510060004B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1215.3114 457.5684 cm
+1 0 0 1 1227.665 469.922 cm
0 0 11.9552 16.6339 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1227.2665 457.5684 cm
+1 0 0 1 1239.6202 469.922 cm
0 0 11.9552 29.1086 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1239.2217 457.5684 cm
+1 0 0 1 1251.5754 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1251.1769 457.5684 cm
+1 0 0 1 1263.5305 469.922 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 453.0306 cm
+1 0 0 1 1215.7099 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 438.1049 Tm [<0054001C002B0046>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 450.4586 Tm [<0054001C002B0046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1290.4157 457.5684 cm
+1 0 0 1 1302.7694 469.922 cm
0 0 11.9552 95.6413 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1302.3709 457.5684 cm
+1 0 0 1 1314.7245 469.922 cm
0 0 11.9552 103.9568 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1314.326 457.5684 cm
+1 0 0 1 1326.6797 469.922 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1326.2812 457.5684 cm
+1 0 0 1 1338.6349 469.922 cm
0 0 11.9552 16.6339 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 453.0306 cm
+1 0 0 1 1290.8142 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 438.1049 Tm [<0054001C003B0032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 450.4586 Tm [<0054001C003B0032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 241.3791 cm
+1 0 0 1 25.9955 253.7327 cm
0 0 11.9552 12.4747 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 236.8413 cm
+1 0 0 1 14.0403 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 221.9156 Tm [<0054002F00370060>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 234.2693 Tm [<0054002F00370060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 241.3791 cm
+1 0 0 1 113.055 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 241.3791 cm
+1 0 0 1 136.9654 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 236.8413 cm
+1 0 0 1 89.1447 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 221.9156 Tm [<0054003F00760062>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 234.2693 Tm [<0054003F00760062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 241.3791 cm
+1 0 0 1 176.2042 253.7327 cm
0 0 11.9552 12.4747 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 241.3791 cm
+1 0 0 1 188.1594 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 236.8413 cm
+1 0 0 1 164.249 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 221.9156 Tm [<0054006000510054>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 234.2693 Tm [<0054006000510054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 241.3791 cm
+1 0 0 1 251.3085 253.7327 cm
0 0 11.9552 112.2753 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 241.3791 cm
+1 0 0 1 263.2637 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 241.3791 cm
+1 0 0 1 287.174 253.7327 cm
0 0 11.9552 108.116 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 236.8413 cm
+1 0 0 1 239.3534 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 221.9156 Tm [<00600032003B0042>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 234.2693 Tm [<00600032003B0042>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 302.104 238.413 cm
+1 0 0 1 314.4577 250.7666 cm
0 0 11.9552 191.2827 re f
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 314.0592 238.413 cm
+1 0 0 1 326.4129 250.7666 cm
0 0 11.9552 49.8988 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 238.413 cm
+1 0 0 1 338.3681 250.7666 cm
0 0 11.9552 141.3839 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 337.9696 238.413 cm
+1 0 0 1 350.3232 250.7666 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 238.413 cm
+1 0 0 1 362.2784 250.7666 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 233.8752 cm
+1 0 0 1 314.4577 246.2288 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 328.9135 218.9495 Tm [<0062>]TJ
+/F47 11.955168 Tf 1 0 0 1 341.2672 231.3032 Tm [<0062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 241.3791 cm
+1 0 0 1 401.5172 253.7327 cm
0 0 11.9552 16.6339 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 413.0739 241.3791 cm
+1 0 0 1 425.4276 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 241.3791 cm
+1 0 0 1 437.3827 253.7327 cm
0 0 11.9552 29.1086 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 236.8413 cm
+1 0 0 1 389.5621 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 221.9156 Tm [<0062002B0060004D>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 234.2693 Tm [<0062002B0060004D>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 241.3791 cm
+1 0 0 1 488.5767 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 500.1334 241.3791 cm
+1 0 0 1 512.4871 253.7327 cm
0 0 11.9552 12.4747 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 236.8413 cm
+1 0 0 1 464.6664 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 221.9156 Tm [<0062002B00600054>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 234.2693 Tm [<0062002B00600054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 241.3791 cm
+1 0 0 1 551.7259 253.7327 cm
0 0 11.9552 12.4747 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 241.3791 cm
+1 0 0 1 563.6811 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 241.3791 cm
+1 0 0 1 587.5914 253.7327 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 236.8413 cm
+1 0 0 1 539.7708 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 221.9156 Tm [<0062005100600069>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 234.2693 Tm [<0062005100600069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 614.4766 241.3791 cm
+1 0 0 1 626.8303 253.7327 cm
0 0 11.9552 8.3155 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 241.3791 cm
+1 0 0 1 638.7854 253.7327 cm
0 0 11.9552 37.4241 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 241.3791 cm
+1 0 0 1 662.6958 253.7327 cm
0 0 11.9552 20.7902 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 236.8413 cm
+1 0 0 1 614.8751 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 221.9156 Tm [<00620054001C002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 234.2693 Tm [<00620054001C002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 689.5809 241.3791 cm
+1 0 0 1 701.9346 253.7327 cm
0 0 11.9552 66.5327 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 236.8413 cm
+1 0 0 1 689.9794 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 695.1999 221.9156 Tm [<006200540032002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 707.5536 234.2693 Tm [<006200540032002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 764.6853 241.3791 cm
+1 0 0 1 777.039 253.7327 cm
0 0 11.9552 66.5327 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 241.3791 cm
-0 0 11.9552 99.8006 re f
+1 0 0 1 788.9941 253.7327 cm
+0 0 11.9552 95.6413 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 788.5956 241.3791 cm
-0 0 11.9552 4.1592 re f
+1 0 0 1 800.9493 253.7327 cm
+0 0 11.9552 8.3155 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 241.3791 cm
+1 0 0 1 812.9045 253.7327 cm
0 0 11.9552 83.1666 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 236.8413 cm
+1 0 0 1 765.0838 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 221.9156 Tm [<006200690060002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 234.2693 Tm [<006200690060002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 241.3791 cm
+1 0 0 1 852.1433 253.7327 cm
0 0 11.9552 83.1666 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 241.3791 cm
+1 0 0 1 864.0985 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 241.3791 cm
+1 0 0 1 888.0088 253.7327 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 236.8413 cm
+1 0 0 1 840.1881 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 221.9156 Tm [<0062006D00540054>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 234.2693 Tm [<0062006D00540054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 914.894 241.3791 cm
+1 0 0 1 927.2476 253.7327 cm
0 0 11.9552 45.7425 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 241.3791 cm
+1 0 0 1 939.2028 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 950.7595 241.3791 cm
+1 0 0 1 963.1131 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 236.8413 cm
+1 0 0 1 915.2925 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 221.9156 Tm [<00620076004B0023>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 234.2693 Tm [<00620076004B0023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 241.3791 cm
+1 0 0 1 1002.352 253.7327 cm
0 0 11.9552 41.5833 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 241.3791 cm
+1 0 0 1 1014.3072 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 241.3791 cm
+1 0 0 1 1038.2175 253.7327 cm
0 0 11.9552 12.4747 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 236.8413 cm
+1 0 0 1 990.3968 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 221.9156 Tm [<0062007600620069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 234.2693 Tm [<0062007600620069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1065.1027 241.3791 cm
+1 0 0 1 1077.4563 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1077.0578 241.3791 cm
+1 0 0 1 1089.4115 253.7327 cm
0 0 11.9552 33.2678 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1089.013 241.3791 cm
+1 0 0 1 1101.3667 253.7327 cm
0 0 11.9552 8.3155 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 241.3791 cm
+1 0 0 1 1113.3218 253.7327 cm
0 0 11.9552 8.3155 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 236.8413 cm
+1 0 0 1 1065.5012 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 221.9156 Tm [<0069001C00230048>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 234.2693 Tm [<0069001C00230048>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 241.3791 cm
+1 0 0 1 1164.5158 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1176.0725 241.3791 cm
+1 0 0 1 1188.4262 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 236.8413 cm
+1 0 0 1 1140.6055 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 221.9156 Tm [<0069001C00620046>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 234.2693 Tm [<0069001C00620046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1215.3114 241.3791 cm
+1 0 0 1 1227.665 253.7327 cm
0 0 11.9552 16.6339 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 236.8413 cm
+1 0 0 1 1215.7099 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 221.9156 Tm [<0069003F0060002F>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 234.2693 Tm [<0069003F0060002F>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1302.3709 241.3791 cm
+1 0 0 1 1314.7245 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1326.2812 241.3791 cm
+1 0 0 1 1338.6349 253.7327 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 236.8413 cm
+1 0 0 1 1290.8142 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 221.9156 Tm [<0069005100460062>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 234.2693 Tm [<0069005100460062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 25.1898 cm
+1 0 0 1 25.9955 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 25.1898 cm
+1 0 0 1 37.9507 37.5434 cm
0 0 11.9552 12.4747 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 25.1898 cm
+1 0 0 1 61.861 37.5434 cm
0 0 11.9552 37.4241 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 20.652 cm
+1 0 0 1 14.0403 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 5.7263 Tm [<00690060001C002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 18.08 Tm [<00690060001C002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 88.7462 25.1898 cm
+1 0 0 1 101.0998 37.5434 cm
0 0 11.9552 83.1666 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 25.1898 cm
+1 0 0 1 113.055 37.5434 cm
0 0 11.9552 74.8511 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 25.1898 cm
+1 0 0 1 136.9654 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 20.652 cm
+1 0 0 1 89.1447 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 5.7263 Tm [<0069007600540032>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 18.08 Tm [<0069007600540032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 25.1898 cm
+1 0 0 1 176.2042 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 25.1898 cm
+1 0 0 1 188.1594 37.5434 cm
0 0 11.9552 49.8988 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 187.7609 25.1898 cm
+1 0 0 1 200.1145 37.5434 cm
0 0 11.9552 8.3155 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 199.716 25.1898 cm
+1 0 0 1 212.0697 37.5434 cm
0 0 11.9552 54.058 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 20.652 cm
+1 0 0 1 164.249 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 5.7263 Tm [<0069007600540051>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 18.08 Tm [<0069007600540051>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 25.1898 cm
+1 0 0 1 251.3085 37.5434 cm
0 0 11.9552 79.0074 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 25.1898 cm
+1 0 0 1 263.2637 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 25.1898 cm
+1 0 0 1 287.174 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 20.652 cm
+1 0 0 1 239.3534 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 5.7263 Tm [<006D004D0042002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 18.08 Tm [<006D004D0042002B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 349.9247 25.1898 cm
+1 0 0 1 362.2784 37.5434 cm
0 0 11.9552 45.7425 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 20.652 cm
+1 0 0 1 314.4577 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 5.7263 Tm [<006D006900420048>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 18.08 Tm [<006D006900420048>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 25.1898 cm
+1 0 0 1 401.5172 37.5434 cm
0 0 11.9552 49.8988 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 20.652 cm
+1 0 0 1 389.5621 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 5.7263 Tm [<0070003200600023>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 18.08 Tm [<0070003200600023>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 452.3127 25.1898 cm
+1 0 0 1 464.6664 37.5434 cm
0 0 11.9552 4.1592 re f
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 464.2679 25.1898 cm
+1 0 0 1 476.6216 37.5434 cm
0 0 11.9552 178.808 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 25.1898 cm
+1 0 0 1 488.5767 37.5434 cm
0 0 11.9552 74.8511 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 500.1334 25.1898 cm
+1 0 0 1 512.4871 37.5434 cm
0 0 11.9552 29.1086 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 20.652 cm
+1 0 0 1 464.6664 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 479.1222 5.7263 Tm [<0074>]TJ
+/F47 11.955168 Tf 1 0 0 1 491.4759 18.08 Tm [<0074>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 25.1898 cm
+1 0 0 1 551.7259 37.5434 cm
0 0 11.9552 16.6339 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 20.652 cm
+1 0 0 1 539.7708 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 5.7263 Tm [<0074003200690074>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 18.08 Tm [<0074003200690074>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 614.4766 25.1898 cm
+1 0 0 1 626.8303 37.5434 cm
0 0 11.9552 145.5402 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 20.652 cm
+1 0 0 1 614.8751 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 5.7263 Tm [<00740069001C003B>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 18.08 Tm [<00740069001C003B>]TJ
ET
endstream
endobj
24 0 obj
-<</Type/Page/Contents 25 0 R/Resources 23 0 R/MediaBox[0 0 1339.923 879.1847]/TrimBox [ 0.0000 0.0000 1339.9230 879.1847 ] /CropBox [ 0.0000 0.0000 1339.9230 879.1847 ]/Parent 19 0 R>>
+<</Type/Page/Contents 25 0 R/Resources 23 0 R/MediaBox[0 0 1364.6304 903.892]/TrimBox [ 0.0000 0.0000 1364.6304 903.8920 ] /CropBox [ 0.0000 0.0000 1364.6304 903.8920 ]/Parent 19 0 R>>
endobj
23 0 obj
<</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
endobj
28 0 obj
-<</Length 23427 >>
+<</Length 23416 >>
stream
0 g 0 G
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 0 868.7968 Tm [<004C005100700032004B002300320060>-515<0039002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<006000320048001C0069004200700032>-515<0062004200780032>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<0055006900320074002D>-515<004B004600420042002D>-515<004B004600420070002D>-515<004B004600700042002D>-514<0048006D001C00560058>]TJ
+/F47 11.955168 Tf 1 0 0 1 12.3537 881.1505 Tm [<004C005100700032004B002300320060>-515<0033002D>-515<006B007900520052>-515<0040>-515<0068003F0032>-515<006000320048001C0069004200700032>-515<0062004200780032>-515<00510037>-515<00370042004800320062>-515<006D00620032002F>-515<0042004D>-515<002A0051004D0068003200730069>-515<0055006900320074002D>-515<004B004600420042002D>-515<004B004600420070002D>-514<004B004600700042002D>-515<0048006D001C00560058>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 673.7576 cm
+1 0 0 1 25.9955 686.1113 cm
0 0 11.9552 23.0084 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 673.7576 cm
-0 0 11.9552 19.4768 re f
+1 0 0 1 37.9507 686.1113 cm
+0 0 11.9552 19.4651 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 673.7576 cm
-0 0 11.9552 2.9392 re f
+1 0 0 1 61.861 686.1113 cm
+0 0 11.9552 3.0209 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 669.2198 cm
+1 0 0 1 14.0403 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 654.2942 Tm [<001C004D002B003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 666.6479 Tm [<001C004D002B003F>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 673.7576 cm
+1 0 0 1 113.055 686.1113 cm
0 0 11.9552 3.4178 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 673.7576 cm
+1 0 0 1 136.9654 686.1113 cm
0 0 11.9552 8.9197 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 669.2198 cm
+1 0 0 1 89.1447 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 654.2942 Tm [<001C006900690060>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 666.6479 Tm [<001C006900690060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 673.7576 cm
+1 0 0 1 188.1594 686.1113 cm
0 0 11.9552 8.4206 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 199.716 673.7576 cm
-0 0 11.9552 19.4914 re f
+1 0 0 1 212.0697 686.1113 cm
+0 0 11.9552 20.3757 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 669.2198 cm
+1 0 0 1 164.249 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 654.2942 Tm [<0023001C002B0046>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 666.6479 Tm [<0023001C002B0046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 673.7576 cm
+1 0 0 1 251.3085 686.1113 cm
0 0 11.9552 13.3241 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 673.7576 cm
+1 0 0 1 263.2637 686.1113 cm
0 0 11.9552 21.4673 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 673.7576 cm
+1 0 0 1 287.174 686.1113 cm
0 0 11.9552 8.3126 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 669.2198 cm
+1 0 0 1 239.3534 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 654.2942 Tm [<0023004200230048>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 666.6479 Tm [<0023004200230048>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 674.2558 cm
+1 0 0 1 338.3681 686.6094 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 674.2558 cm
+1 0 0 1 362.2784 686.6094 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 669.2198 cm
+1 0 0 1 314.4577 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 654.2942 Tm [<0023004800510023>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 666.6479 Tm [<0023004800510023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 673.7576 cm
+1 0 0 1 401.5172 686.1113 cm
0 0 11.9552 12.1449 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 401.1187 673.7576 cm
+1 0 0 1 413.4724 686.1113 cm
0 0 11.9552 10.4287 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 673.7576 cm
+1 0 0 1 437.3827 686.1113 cm
0 0 11.9552 20.1889 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 669.2198 cm
+1 0 0 1 389.5621 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 654.2942 Tm [<0023006D00370037>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 666.6479 Tm [<0023006D00370037>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 673.7576 cm
+1 0 0 1 488.5767 686.1113 cm
0 0 11.9552 6.3979 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 669.2198 cm
+1 0 0 1 464.6664 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 654.2942 Tm [<00230074004B0048>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 666.6479 Tm [<00230074004B0048>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 673.7576 cm
+1 0 0 1 551.7259 686.1113 cm
0 0 11.9552 9.0919 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 673.7576 cm
+1 0 0 1 563.6811 686.1113 cm
0 0 11.9552 10.1806 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 674.2558 cm
+1 0 0 1 587.5914 686.6094 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 669.2198 cm
+1 0 0 1 539.7708 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 654.2942 Tm [<002B001C0069002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 666.6479 Tm [<002B001C0069002B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 673.7576 cm
+1 0 0 1 638.7854 686.1113 cm
0 0 11.9552 1.2259 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 673.7576 cm
+1 0 0 1 662.6958 686.1113 cm
0 0 11.9552 42.5261 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 669.2198 cm
+1 0 0 1 614.8751 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 654.2942 Tm [<002B003F001C0060>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 666.6479 Tm [<002B003F001C0060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 701.5361 673.7576 cm
+1 0 0 1 713.8898 686.1113 cm
0 0 11.9552 6.5409 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 725.4464 673.7576 cm
+1 0 0 1 737.8001 686.1113 cm
0 0 11.9552 6.5234 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 669.2198 cm
+1 0 0 1 689.9794 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 695.1999 654.2942 Tm [<002B003F0032004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 707.5536 666.6479 Tm [<002B003F0032004B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 674.2558 cm
+1 0 0 1 788.9941 686.6094 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 673.7576 cm
+1 0 0 1 812.9045 686.1113 cm
0 0 11.9552 10.5775 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 669.2198 cm
+1 0 0 1 765.0838 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 654.2942 Tm [<002B0048002F0037>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 666.6479 Tm [<002B0048002F0037>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 673.7576 cm
+1 0 0 1 852.1433 686.1113 cm
0 0 11.9552 48.3431 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 673.7576 cm
+1 0 0 1 864.0985 686.1113 cm
0 0 11.9552 38.4953 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 673.7576 cm
+1 0 0 1 888.0088 686.1113 cm
0 0 11.9552 8.4206 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 669.2198 cm
+1 0 0 1 840.1881 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 654.2942 Tm [<002B005100480051>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 666.6479 Tm [<002B005100480051>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 914.894 673.7576 cm
+1 0 0 1 927.2476 686.1113 cm
0 0 11.9552 8.5899 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 673.7576 cm
+1 0 0 1 939.2028 686.1113 cm
0 0 11.9552 6.6693 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 669.2198 cm
+1 0 0 1 915.2925 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 654.2942 Tm [<002B0051004D0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 666.6479 Tm [<002B0051004D0069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 673.7576 cm
+1 0 0 1 1002.352 686.1113 cm
0 0 11.9552 54.6564 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 673.7576 cm
-0 0 11.9552 38.4252 re f
+1 0 0 1 1014.3072 686.1113 cm
+0 0 11.9552 38.3902 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 673.7576 cm
+1 0 0 1 1038.2175 686.1113 cm
0 0 11.9552 12.5506 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 669.2198 cm
+1 0 0 1 990.3968 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 654.2942 Tm [<002B005100600032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 666.6479 Tm [<002B005100600032>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 673.7576 cm
+1 0 0 1 1113.3218 686.1113 cm
0 0 11.9552 44.4962 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 669.2198 cm
+1 0 0 1 1065.5012 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 654.2942 Tm [<002F001C0069001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 666.6479 Tm [<002F001C0069001C>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1140.207 673.7576 cm
+1 0 0 1 1152.5607 686.1113 cm
0 0 11.9552 107.6461 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 673.7576 cm
+1 0 0 1 1164.5158 686.1113 cm
0 0 11.9552 2.9392 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 669.2198 cm
+1 0 0 1 1140.6055 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 654.2942 Tm [<0032004D002B0051>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 666.6479 Tm [<0032004D002B0051>]TJ
ET
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1239.2217 673.7576 cm
+1 0 0 1 1251.5754 686.1113 cm
0 0 11.9552 6.214 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1251.1769 673.7576 cm
+1 0 0 1 1263.5305 686.1113 cm
0 0 11.9552 9.9442 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 669.2198 cm
+1 0 0 1 1215.7099 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 654.2942 Tm [<0037004200480032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 666.6479 Tm [<0037004200480032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1290.4157 673.7576 cm
+1 0 0 1 1302.7694 686.1113 cm
0 0 11.9552 1.1733 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 669.2198 cm
+1 0 0 1 1290.8142 681.5735 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 654.2942 Tm [<0037004200480069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 666.6479 Tm [<0037004200480069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 454.6022 cm
+1 0 0 1 25.9955 466.9559 cm
0 0 11.9552 45.0566 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 454.6022 cm
+1 0 0 1 37.9507 466.9559 cm
0 0 11.9552 41.0258 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 454.6022 cm
+1 0 0 1 61.861 466.9559 cm
0 0 11.9552 191.2827 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 450.0644 cm
+1 0 0 1 14.0403 462.4181 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 435.1388 Tm [<00370051004D0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 447.4925 Tm [<00370051004D0069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 88.7462 457.5684 cm
+1 0 0 1 101.0998 469.922 cm
0 0 11.9552 24.6809 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 457.5684 cm
+1 0 0 1 113.055 469.922 cm
0 0 11.9552 16.4938 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 457.5684 cm
+1 0 0 1 136.9654 469.922 cm
0 0 11.9552 15.3643 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 453.0306 cm
+1 0 0 1 89.1447 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 438.1049 Tm [<003B00600054003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 450.4586 Tm [<003B00600054003F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 457.5684 cm
+1 0 0 1 176.2042 469.922 cm
0 0 11.9552 9.8683 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 458.0665 cm
+1 0 0 1 188.1594 470.4202 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 453.0306 cm
+1 0 0 1 164.249 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 438.1049 Tm [<003F001C004D002F>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 450.4586 Tm [<003F001C004D002F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 457.5684 cm
+1 0 0 1 251.3085 469.922 cm
0 0 11.9552 11.0241 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 457.5684 cm
+1 0 0 1 263.2637 469.922 cm
0 0 11.9552 7.434 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 457.5684 cm
+1 0 0 1 287.174 469.922 cm
0 0 11.9552 2.2591 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 453.0306 cm
+1 0 0 1 239.3534 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 438.1049 Tm [<0044001C0070001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 450.4586 Tm [<0044001C0070001C>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 314.0592 457.5684 cm
+1 0 0 1 326.4129 469.922 cm
0 0 11.9552 62.9339 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 457.5684 cm
-0 0 11.9552 18.8376 re f
+1 0 0 1 338.3681 469.922 cm
+0 0 11.9552 18.9076 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 457.5684 cm
+1 0 0 1 362.2784 469.922 cm
0 0 11.9552 22.5444 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 453.0306 cm
+1 0 0 1 314.4577 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 438.1049 Tm [<0048001C004D003B>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 450.4586 Tm [<0048001C004D003B>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 401.1187 458.0665 cm
+1 0 0 1 413.4724 470.4202 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 458.0665 cm
+1 0 0 1 437.3827 470.4202 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 453.0306 cm
+1 0 0 1 389.5621 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 438.1049 Tm [<0048001C00760051>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 450.4586 Tm [<0048001C00760051>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 500.1334 457.5684 cm
+1 0 0 1 512.4871 469.922 cm
0 0 11.9552 73.1495 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 453.0306 cm
+1 0 0 1 464.6664 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 438.1049 Tm [<00480054002F0037>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 450.4586 Tm [<00480054002F0037>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 457.5684 cm
+1 0 0 1 563.6811 469.922 cm
0 0 11.9552 3.663 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 457.5684 cm
+1 0 0 1 587.5914 469.922 cm
0 0 11.9552 19.7132 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 453.0306 cm
+1 0 0 1 539.7708 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 438.1049 Tm [<0048006D001C0069>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 450.4586 Tm [<0048006D001C0069>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 457.5684 cm
+1 0 0 1 638.7854 469.922 cm
0 0 11.9552 5.4172 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 457.5684 cm
+1 0 0 1 662.6958 469.922 cm
0 0 11.9552 44.4524 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 453.0306 cm
+1 0 0 1 614.8751 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 438.1049 Tm [<00480074004B0048>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 450.4586 Tm [<00480074004B0048>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 677.6258 457.5684 cm
+1 0 0 1 689.9794 469.922 cm
0 0 11.9552 21.7767 re f
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 689.5809 457.5684 cm
+1 0 0 1 701.9346 469.922 cm
0 0 11.9552 36.3062 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 701.5361 457.5684 cm
+1 0 0 1 713.8898 469.922 cm
0 0 11.9552 19.5322 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 713.4913 457.5684 cm
-0 0 11.9552 10.1397 re f
+1 0 0 1 725.8449 469.922 cm
+0 0 11.9552 10.1572 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 725.4464 457.5684 cm
+1 0 0 1 737.8001 469.922 cm
0 0 11.9552 17.4482 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 453.0306 cm
+1 0 0 1 689.9794 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 704.4352 438.1049 Tm [<004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 716.7889 450.4586 Tm [<004B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 764.6853 457.5684 cm
+1 0 0 1 777.039 469.922 cm
0 0 11.9552 47.9666 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 457.5684 cm
+1 0 0 1 788.9941 469.922 cm
0 0 11.9552 28.8343 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 457.5684 cm
+1 0 0 1 812.9045 469.922 cm
0 0 11.9552 43.6177 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 453.0306 cm
+1 0 0 1 765.0838 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 438.1049 Tm [<004B001C0069003F>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 450.4586 Tm [<004B001C0069003F>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 457.5684 cm
+1 0 0 1 852.1433 469.922 cm
0 0 11.9552 32.0974 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 457.5684 cm
+1 0 0 1 864.0985 469.922 cm
0 0 11.9552 22.2116 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 457.5684 cm
+1 0 0 1 888.0088 469.922 cm
0 0 11.9552 13.0176 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 453.0306 cm
+1 0 0 1 840.1881 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 438.1049 Tm [<004B00320069001C>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 450.4586 Tm [<004B00320069001C>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 457.5684 cm
+1 0 0 1 939.2028 469.922 cm
0 0 11.9552 1.4769 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 950.7595 457.5684 cm
+1 0 0 1 963.1131 469.922 cm
0 0 11.9552 19.865 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 453.0306 cm
+1 0 0 1 915.2925 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 438.1049 Tm [<004B004800420023>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 450.4586 Tm [<004B004800420023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 457.5684 cm
+1 0 0 1 1002.352 469.922 cm
0 0 11.9552 15.3292 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 457.5684 cm
+1 0 0 1 1014.3072 469.922 cm
0 0 11.9552 18.2918 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 457.5684 cm
-0 0 11.9552 36.1953 re f
+1 0 0 1 1038.2175 469.922 cm
+0 0 11.9552 36.2654 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 453.0306 cm
+1 0 0 1 990.3968 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 438.1049 Tm [<004B006D00480069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 450.4586 Tm [<004B006D00480069>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1077.0578 457.5684 cm
+1 0 0 1 1089.4115 469.922 cm
0 0 11.9552 5.7149 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 457.5684 cm
+1 0 0 1 1113.3218 469.922 cm
0 0 11.9552 49.8054 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 453.0306 cm
+1 0 0 1 1065.5012 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 438.1049 Tm [<004D0051002F0032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 450.4586 Tm [<004D0051002F0032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1140.207 457.5684 cm
+1 0 0 1 1152.5607 469.922 cm
0 0 11.9552 10.9073 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 458.0665 cm
+1 0 0 1 1164.5158 470.4202 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 453.0306 cm
+1 0 0 1 1140.6055 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 438.1049 Tm [<004D00510060004B>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 450.4586 Tm [<004D00510060004B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1215.3114 457.5684 cm
+1 0 0 1 1227.665 469.922 cm
0 0 11.9552 36.4638 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1227.2665 457.5684 cm
+1 0 0 1 1239.6202 469.922 cm
0 0 11.9552 41.1601 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1239.2217 458.0665 cm
+1 0 0 1 1251.5754 470.4202 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 1251.1769 457.5684 cm
+1 0 0 1 1263.5305 469.922 cm
0 0 11.9552 1.2025 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 453.0306 cm
+1 0 0 1 1215.7099 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 438.1049 Tm [<0054001C002B0046>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 450.4586 Tm [<0054001C002B0046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1290.4157 457.5684 cm
+1 0 0 1 1302.7694 469.922 cm
0 0 11.9552 125.0302 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1302.3709 457.5684 cm
-0 0 11.9552 126.3786 re f
+1 0 0 1 1314.7245 469.922 cm
+0 0 11.9552 126.3903 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1314.326 457.5684 cm
+1 0 0 1 1326.6797 469.922 cm
0 0 11.9552 1.5148 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1326.2812 457.5684 cm
+1 0 0 1 1338.6349 469.922 cm
0 0 11.9552 6.967 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 453.0306 cm
+1 0 0 1 1290.8142 465.3842 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 438.1049 Tm [<0054001C003B0032>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 450.4586 Tm [<0054001C003B0032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 241.3791 cm
+1 0 0 1 25.9955 253.7327 cm
0 0 11.9552 14.6667 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 236.8413 cm
+1 0 0 1 14.0403 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 221.9156 Tm [<0054002F00370060>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 234.2693 Tm [<0054002F00370060>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 241.3791 cm
+1 0 0 1 113.055 253.7327 cm
0 0 11.9552 3.4821 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 241.3791 cm
+1 0 0 1 136.9654 253.7327 cm
0 0 11.9552 4.2497 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 236.8413 cm
+1 0 0 1 89.1447 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 221.9156 Tm [<0054003F00760062>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 234.2693 Tm [<0054003F00760062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 241.3791 cm
+1 0 0 1 176.2042 253.7327 cm
0 0 11.9552 4.0658 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 241.8772 cm
+1 0 0 1 188.1594 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 236.8413 cm
+1 0 0 1 164.249 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 221.9156 Tm [<0054006000510054>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 234.2693 Tm [<0054006000510054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 241.3791 cm
+1 0 0 1 251.3085 253.7327 cm
0 0 11.9552 67.2828 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 241.8772 cm
+1 0 0 1 263.2637 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 241.3791 cm
+1 0 0 1 287.174 253.7327 cm
0 0 11.9552 23.7381 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 236.8413 cm
+1 0 0 1 239.3534 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 221.9156 Tm [<00600032003B0042>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 234.2693 Tm [<00600032003B0042>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 302.104 241.3791 cm
+1 0 0 1 314.4577 253.7327 cm
0 0 11.9552 69.6149 re f
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 314.0592 241.3791 cm
+1 0 0 1 326.4129 253.7327 cm
0 0 11.9552 17.5737 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 326.0144 241.3791 cm
+1 0 0 1 338.3681 253.7327 cm
0 0 11.9552 37.4854 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 337.9696 241.3791 cm
+1 0 0 1 350.3232 253.7327 cm
0 0 11.9552 1.9614 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 349.9247 241.3791 cm
+1 0 0 1 362.2784 253.7327 cm
0 0 11.9552 3.4558 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 236.8413 cm
+1 0 0 1 314.4577 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 328.9135 221.9156 Tm [<0062>]TJ
+/F47 11.955168 Tf 1 0 0 1 341.2672 234.2693 Tm [<0062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 241.3791 cm
+1 0 0 1 401.5172 253.7327 cm
0 0 11.9552 37.9874 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 413.0739 241.3791 cm
-0 0 11.9552 36.4814 re f
+1 0 0 1 425.4276 253.7327 cm
+0 0 11.9552 36.5427 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 425.0291 241.3791 cm
+1 0 0 1 437.3827 253.7327 cm
0 0 11.9552 4.9648 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 236.8413 cm
+1 0 0 1 389.5621 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 221.9156 Tm [<0062002B0060004D>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 234.2693 Tm [<0062002B0060004D>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 241.8772 cm
+1 0 0 1 488.5767 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 500.1334 241.3791 cm
+1 0 0 1 512.4871 253.7327 cm
0 0 11.9552 12.1332 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 236.8413 cm
+1 0 0 1 464.6664 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 469.8869 221.9156 Tm [<0062002B00600054>]TJ
+/F47 11.955168 Tf 1 0 0 1 482.2405 234.2693 Tm [<0062002B00600054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 241.3791 cm
+1 0 0 1 551.7259 253.7327 cm
0 0 11.9552 9.1298 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 551.3274 241.8772 cm
+1 0 0 1 563.6811 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 575.2378 241.3791 cm
+1 0 0 1 587.5914 253.7327 cm
0 0 11.9552 14.9381 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 236.8413 cm
+1 0 0 1 539.7708 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 221.9156 Tm [<0062005100600069>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 234.2693 Tm [<0062005100600069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 614.4766 241.3791 cm
+1 0 0 1 626.8303 253.7327 cm
0 0 11.9552 38.3785 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 626.4318 241.3791 cm
-0 0 11.9552 38.507 re f
+1 0 0 1 638.7854 253.7327 cm
+0 0 11.9552 38.6325 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 650.3421 241.3791 cm
+1 0 0 1 662.6958 253.7327 cm
0 0 11.9552 17.1009 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 236.8413 cm
+1 0 0 1 614.8751 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 221.9156 Tm [<00620054001C002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 234.2693 Tm [<00620054001C002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 689.5809 241.3791 cm
+1 0 0 1 701.9346 253.7327 cm
0 0 11.9552 59.9947 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 677.6258 236.8413 cm
+1 0 0 1 689.9794 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 695.1999 221.9156 Tm [<006200540032002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 707.5536 234.2693 Tm [<006200540032002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 764.6853 241.3791 cm
-0 0 11.9552 155.6419 re f
+1 0 0 1 777.039 253.7327 cm
+0 0 11.9552 155.604 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 776.6405 241.3791 cm
-0 0 11.9552 132.435 re f
+1 0 0 1 788.9941 253.7327 cm
+0 0 11.9552 112.4095 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 788.5956 241.3791 cm
-0 0 11.9552 12.4455 re f
+1 0 0 1 800.9493 253.7327 cm
+0 0 11.9552 33.9304 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 800.5508 241.3791 cm
+1 0 0 1 812.9045 253.7327 cm
0 0 11.9552 66.8421 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 752.7301 236.8413 cm
+1 0 0 1 765.0838 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 770.3042 221.9156 Tm [<006200690060002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 782.6579 234.2693 Tm [<006200690060002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 839.7896 241.3791 cm
+1 0 0 1 852.1433 253.7327 cm
0 0 11.9552 76.941 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 851.7448 241.3791 cm
+1 0 0 1 864.0985 253.7327 cm
0 0 11.9552 29.1495 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 875.6551 241.3791 cm
+1 0 0 1 888.0088 253.7327 cm
0 0 11.9552 1.5177 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 827.8345 236.8413 cm
+1 0 0 1 840.1881 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 845.4086 221.9156 Tm [<0062006D00540054>]TJ
+/F47 11.955168 Tf 1 0 0 1 857.7622 234.2693 Tm [<0062006D00540054>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 914.894 241.3791 cm
+1 0 0 1 927.2476 253.7327 cm
0 0 11.9552 37.2548 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 926.8491 241.3791 cm
+1 0 0 1 939.2028 253.7327 cm
0 0 11.9552 14.1092 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 950.7595 241.8772 cm
+1 0 0 1 963.1131 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 902.9388 236.8413 cm
+1 0 0 1 915.2925 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 920.5129 221.9156 Tm [<00620076004B0023>]TJ
+/F47 11.955168 Tf 1 0 0 1 932.8666 234.2693 Tm [<00620076004B0023>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 989.9983 241.3791 cm
+1 0 0 1 1002.352 253.7327 cm
0 0 11.9552 56.4952 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1001.9535 241.3791 cm
-0 0 11.9552 52.622 re f
+1 0 0 1 1014.3072 253.7327 cm
+0 0 11.9552 52.6103 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1025.8638 241.3791 cm
+1 0 0 1 1038.2175 253.7327 cm
0 0 11.9552 1.5469 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 978.0432 236.8413 cm
+1 0 0 1 990.3968 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 995.6173 221.9156 Tm [<0062007600620069>]TJ
+/F47 11.955168 Tf 1 0 0 1 1007.9709 234.2693 Tm [<0062007600620069>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1065.1027 241.3791 cm
+1 0 0 1 1077.4563 253.7327 cm
0 0 11.9552 52.0003 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1077.0578 241.3791 cm
+1 0 0 1 1089.4115 253.7327 cm
0 0 11.9552 60.1728 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 1089.013 241.3791 cm
-0 0 11.9552 4.8218 re f
+1 0 0 1 1101.3667 253.7327 cm
+0 0 11.9552 5.1983 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 1100.9682 241.3791 cm
+1 0 0 1 1113.3218 253.7327 cm
0 0 11.9552 6.4825 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1053.1475 236.8413 cm
+1 0 0 1 1065.5012 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1070.7216 221.9156 Tm [<0069001C00230048>]TJ
+/F47 11.955168 Tf 1 0 0 1 1083.0753 234.2693 Tm [<0069001C00230048>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1152.1622 241.8772 cm
+1 0 0 1 1164.5158 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 1176.0725 241.3791 cm
+1 0 0 1 1188.4262 253.7327 cm
0 0 11.9552 3.0851 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1128.2518 236.8413 cm
+1 0 0 1 1140.6055 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1145.826 221.9156 Tm [<0069001C00620046>]TJ
+/F47 11.955168 Tf 1 0 0 1 1158.1796 234.2693 Tm [<0069001C00620046>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 1215.3114 241.3791 cm
+1 0 0 1 1227.665 253.7327 cm
0 0 11.9552 33.5072 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1203.3562 236.8413 cm
+1 0 0 1 1215.7099 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1220.9303 221.9156 Tm [<0069003F0060002F>]TJ
+/F47 11.955168 Tf 1 0 0 1 1233.284 234.2693 Tm [<0069003F0060002F>]TJ
ET
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 1302.3709 241.8772 cm
+1 0 0 1 1314.7245 254.2309 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 1326.2812 241.3791 cm
+1 0 0 1 1338.6349 253.7327 cm
0 0 11.9552 2.4488 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1278.4605 236.8413 cm
+1 0 0 1 1290.8142 249.1949 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 1296.0346 221.9156 Tm [<0069005100460062>]TJ
+/F47 11.955168 Tf 1 0 0 1 1308.3883 234.2693 Tm [<0069005100460062>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 13.6418 25.1898 cm
+1 0 0 1 25.9955 37.5434 cm
0 0 11.9552 6.0476 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 25.597 25.1898 cm
+1 0 0 1 37.9507 37.5434 cm
0 0 11.9552 6.538 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 49.5073 25.1898 cm
-0 0 11.9552 17.3782 re f
+1 0 0 1 61.861 37.5434 cm
+0 0 11.9552 17.3811 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 1.6867 20.652 cm
+1 0 0 1 14.0403 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 19.2608 5.7263 Tm [<00690060001C002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 31.6144 18.08 Tm [<00690060001C002B>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 88.7462 25.1898 cm
+1 0 0 1 101.0998 37.5434 cm
0 0 11.9552 161.0766 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 100.7013 25.1898 cm
+1 0 0 1 113.055 37.5434 cm
0 0 11.9552 74.1798 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 124.6117 25.6879 cm
+1 0 0 1 136.9654 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 76.791 20.652 cm
+1 0 0 1 89.1447 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 94.3651 5.7263 Tm [<0069007600540032>]TJ
+/F47 11.955168 Tf 1 0 0 1 106.7188 18.08 Tm [<0069007600540032>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 163.8505 25.6879 cm
+1 0 0 1 176.2042 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 175.8057 25.1898 cm
+1 0 0 1 188.1594 37.5434 cm
0 0 11.9552 9.5472 re f
Q
0.6 0.6 0 rg 0.6 0.6 0 RG
q
-1 0 0 1 187.7609 25.6879 cm
+1 0 0 1 200.1145 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 199.716 25.1898 cm
-0 0 11.9552 27.407 re f
+1 0 0 1 212.0697 37.5434 cm
+0 0 11.9552 27.477 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 151.8954 20.652 cm
+1 0 0 1 164.249 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 169.4695 5.7263 Tm [<0069007600540051>]TJ
+/F47 11.955168 Tf 1 0 0 1 181.8231 18.08 Tm [<0069007600540051>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 238.9549 25.1898 cm
+1 0 0 1 251.3085 37.5434 cm
0 0 11.9552 25.3464 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 250.91 25.6879 cm
+1 0 0 1 263.2637 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.725 g 0.725 G
q
-1 0 0 1 274.8204 25.6879 cm
+1 0 0 1 287.174 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0.6 g 0.6 G
q
-1 0 0 1 226.9997 20.652 cm
+1 0 0 1 239.3534 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 244.5738 5.7263 Tm [<006D004D0042002B>]TJ
+/F47 11.955168 Tf 1 0 0 1 256.9275 18.08 Tm [<006D004D0042002B>]TJ
ET
0.725 g 0.725 G
q
-1 0 0 1 349.9247 25.1898 cm
+1 0 0 1 362.2784 37.5434 cm
0 0 11.9552 13.6626 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 302.104 20.652 cm
+1 0 0 1 314.4577 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 319.6782 5.7263 Tm [<006D006900420048>]TJ
+/F47 11.955168 Tf 1 0 0 1 332.0318 18.08 Tm [<006D006900420048>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 389.1636 25.1898 cm
+1 0 0 1 401.5172 37.5434 cm
0 0 11.9552 32.6169 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 377.2084 20.652 cm
+1 0 0 1 389.5621 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 394.7825 5.7263 Tm [<0070003200600023>]TJ
+/F47 11.955168 Tf 1 0 0 1 407.1362 18.08 Tm [<0070003200600023>]TJ
ET
0 0.8 0 rg 0 0.8 0 RG
q
-1 0 0 1 452.3127 25.6879 cm
+1 0 0 1 464.6664 38.0416 cm
[]0 d 0 J 0.9963 w 0 0 m 11.9552 0 l S
Q
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 464.2679 25.1898 cm
+1 0 0 1 476.6216 37.5434 cm
0 0 11.9552 122.9199 re f
Q
0.8 0 0 rg 0.8 0 0 RG
q
-1 0 0 1 476.2231 25.1898 cm
+1 0 0 1 488.5767 37.5434 cm
0 0 11.9552 43.428 re f
Q
0.725 g 0.725 G
q
-1 0 0 1 500.1334 25.1898 cm
+1 0 0 1 512.4871 37.5434 cm
0 0 11.9552 16.8557 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 452.3127 20.652 cm
+1 0 0 1 464.6664 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 479.1222 5.7263 Tm [<0074>]TJ
+/F47 11.955168 Tf 1 0 0 1 491.4759 18.08 Tm [<0074>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 539.3723 25.1898 cm
+1 0 0 1 551.7259 37.5434 cm
0 0 11.9552 56.8133 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 527.4171 20.652 cm
+1 0 0 1 539.7708 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 544.9912 5.7263 Tm [<0074003200690074>]TJ
+/F47 11.955168 Tf 1 0 0 1 557.3449 18.08 Tm [<0074003200690074>]TJ
ET
0 0 0.8 rg 0 0 0.8 RG
q
-1 0 0 1 614.4766 25.1898 cm
+1 0 0 1 626.8303 37.5434 cm
0 0 11.9552 98.9395 re f
Q
0.6 g 0.6 G
q
-1 0 0 1 602.5214 20.652 cm
+1 0 0 1 614.8751 33.0056 cm
[]0 d 0 J 0.9963 w 0 0 m 59.7758 0 l S
Q
0 g 0 G
BT
-/F47 11.955168 Tf 1 0 0 1 620.0955 5.7263 Tm [<00740069001C003B>]TJ
+/F47 11.955168 Tf 1 0 0 1 632.4492 18.08 Tm [<00740069001C003B>]TJ
ET
endstream
endobj
27 0 obj
-<</Type/Page/Contents 28 0 R/Resources 26 0 R/MediaBox[0 0 1339.923 879.1847]/TrimBox [ 0.0000 0.0000 1339.9230 879.1847 ] /CropBox [ 0.0000 0.0000 1339.9230 879.1847 ]/Parent 19 0 R>>
+<</Type/Page/Contents 28 0 R/Resources 26 0 R/MediaBox[0 0 1364.6304 903.892]/TrimBox [ 0.0000 0.0000 1364.6304 903.8920 ] /CropBox [ 0.0000 0.0000 1364.6304 903.8920 ]/Parent 19 0 R>>
endobj
26 0 obj
<</Font<</F47 18 0 R>>/ProcSet[/PDF/Text]>>
@@ -5586,7 +5586,7 @@ endobj
<</Type /Metadata /Subtype /XML
/Length 2135 >>
stream
-<?xpacket begin="" id="aeexbukxjrdwdbtvcotbvqej"?>
+<?xpacket begin="" id="awayuiahjldwlbbsvhneltin"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -5609,14 +5609,14 @@ stream
<pdfx:ConTeXt.Time/>
<pdfx:ConTeXt.Url/>
<pdfx:ConTeXt.Version/>
- <pdfx:ID>s-inf-01.2011-11-04T14:20:37+01:00</pdfx:ID>
+ <pdfx:ID>s-inf-01.2011-11-08T15:24:52+01:00</pdfx:ID>
<pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
- <xmp:CreateDate>2011-11-04T14:20:37+01:00</xmp:CreateDate>
- <xmp:CreatorTool>ConTeXt - 2011.11.04 14:15</xmp:CreatorTool>
- <xmp:ModifyDate>2011-11-04T14:20:37+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2011-11-04T14:20:37+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2011-11-08T15:24:52+01:00</xmp:CreateDate>
+ <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>
+ <xmp:ModifyDate>2011-11-08T15:24:52+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2011-11-08T15:24:52+01:00</xmp:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
<pdf:Keywords/>
@@ -5624,8 +5624,8 @@ stream
<pdf:Trapped>False</pdf:Trapped>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
- <xmpMM:DocumentID>uuid:e93b1719-4af5-8f4d-7347-2c73c22f209b</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:fc610249-429c-9653-0e99-551198fb692f</xmpMM:InstanceID>
+ <xmpMM:DocumentID>uuid:20e3bd83-4157-8bc8-f63f-ceab2da96d43</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:d8a9d837-4532-8b9a-7f81-3af7b2e55809</xmpMM:InstanceID>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
@@ -5757,7 +5757,7 @@ endobj
endobj
38 0 obj
<<
-/CreationDate (D:20111104142037+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300034002000310034003a00310035> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-04T14:20:37+01:00) /Trapped /False /ModDate (D:20111104142037+01'00') /Title <feff0073002d0069006e0066002d00300031>
+/CreationDate (D:20111108152452+01'00') /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030> /Producer (LuaTeX-0.71.0) /ID (s-inf-01.2011-11-08T15:24:52+01:00) /Trapped /False /ModDate (D:20111108152452+01'00') /Title <feff0073002d0069006e0066002d00300031>
/PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
endobj
xref
@@ -5777,32 +5777,32 @@ xref
0000000013 00000 f
0000000014 00000 f
0000000000 00000 f
-0000026951 00000 n
-0000026749 00000 n
+0000027264 00000 n
+0000027064 00000 n
0000000015 00000 n
-0000113962 00000 n
-0000114285 00000 n
-0000056968 00000 n
-0000056766 00000 n
-0000027011 00000 n
-0000080409 00000 n
-0000080208 00000 n
-0000057028 00000 n
-0000104153 00000 n
-0000103952 00000 n
-0000080469 00000 n
-0000104213 00000 n
-0000106435 00000 n
-0000106715 00000 n
-0000106788 00000 n
-0000112392 00000 n
-0000112609 00000 n
-0000114101 00000 n
-0000114359 00000 n
-0000114380 00000 n
-0000114532 00000 n
+0000114502 00000 n
+0000114825 00000 n
+0000057535 00000 n
+0000057334 00000 n
+0000027324 00000 n
+0000080960 00000 n
+0000080759 00000 n
+0000057595 00000 n
+0000104693 00000 n
+0000104492 00000 n
+0000081020 00000 n
+0000104753 00000 n
+0000106975 00000 n
+0000107255 00000 n
+0000107328 00000 n
+0000112932 00000 n
+0000113149 00000 n
+0000114641 00000 n
+0000114899 00000 n
+0000114920 00000 n
+0000115072 00000 n
trailer
-<</Size 39/Root 37 0 R/Info 38 0 R/ID[<45D84B800CA3C0E18065578DD87586B9> <45D84B800CA3C0E18065578DD87586B9>]>>
+<</Size 39/Root 37 0 R/Info 38 0 R/ID[<B54EB4162A212DDA3EF53B9DFE1E9256> <B54EB4162A212DDA3EF53B9DFE1E9256>]>>
startxref
-114993
+115533
%%EOF
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index bdbaf303e..43c0a89c5 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
@@ -13908,7 +13908,7 @@ endobj
<</Type /Metadata /Subtype /XML
/Length 2363 >>
stream
-<?xpacket begin="" id="aevczerqwdcwepukogyfwbna"?>
+<?xpacket begin="" id="anckkofcjbdwubkullqqdsgy"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -13928,17 +13928,17 @@ stream
</rdf:Description>
<rdf:Description rdf:about="" xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
<pdfx:ConTeXt.Jobname>s-inf-03</pdfx:ConTeXt.Jobname>
- <pdfx:ConTeXt.Time>2011.11.04 14:21</pdfx:ConTeXt.Time>
+ <pdfx:ConTeXt.Time>2011.11.08 15:25</pdfx:ConTeXt.Time>
<pdfx:ConTeXt.Url>www.pragma-ade.com</pdfx:ConTeXt.Url>
- <pdfx:ConTeXt.Version>2011.11.04 14:15</pdfx:ConTeXt.Version>
- <pdfx:ID>s-inf-03.2011-11-04T14:21:28+01:00</pdfx:ID>
+ <pdfx:ConTeXt.Version>2011.11.08 15:20</pdfx:ConTeXt.Version>
+ <pdfx:ID>s-inf-03.2011-11-08T15:25:24+01:00</pdfx:ID>
<pdfx:PTEX.Fullbanner>This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1</pdfx:PTEX.Fullbanner>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
- <xmp:CreateDate>2011-11-04T14:21:28+01:00</xmp:CreateDate>
- <xmp:CreatorTool>ConTeXt - 2011.11.04 14:15</xmp:CreatorTool>
- <xmp:ModifyDate>2011-11-04T14:21:28+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2011-11-04T14:21:28+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2011-11-08T15:25:24+01:00</xmp:CreateDate>
+ <xmp:CreatorTool>ConTeXt - 2011.11.08 15:20</xmp:CreatorTool>
+ <xmp:ModifyDate>2011-11-08T15:25:24+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2011-11-08T15:25:24+01:00</xmp:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
<pdf:Keywords/>
@@ -13946,8 +13946,8 @@ stream
<pdf:Trapped>False</pdf:Trapped>
</rdf:Description>
<rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
- <xmpMM:DocumentID>uuid:3f7d1a4b-4a2c-adf0-510d-72c9b193671d</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:572ba1d5-40ac-aa5d-79eb-28a3858bf60b</xmpMM:InstanceID>
+ <xmpMM:DocumentID>uuid:050f6a4f-4626-858b-34c3-fd8f77eb46ef</xmpMM:DocumentID>
+ <xmpMM:InstanceID>uuid:6a85ed41-43e7-98f7-c70d-c803a5ef609b</xmpMM:InstanceID>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
@@ -14781,7 +14781,7 @@ endobj
endobj
1445 0 obj
<<
-/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300034002000310034003a00310035> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111104142128+01'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.11.04 14:21) /ID (s-inf-03.2011-11-04T14:21:28+01:00) /ConTeXt.Version (2011.11.04 14:15) /ModDate (D:20111104142128+01'00') /Subject <feff004c007500610020006d006f00640075006c0065007300200061006e0064002000660075006e006300740069006f006e0073>
+/ConTeXt.Url (www.pragma-ade.com) /Creator <feff0043006f006e00540065005800740020002d00200032003000310031002e00310031002e00300038002000310035003a00320030> /ConTeXt.Jobname (s-inf-03) /Author <feff00480061006e007300200048006100670065006e0020002d0020006100750074006f006d00610074006900630061006c006c0079002000670065006e006500720061007400650064> /Trapped /False /CreationDate (D:20111108152524+01'00') /Producer (LuaTeX-0.71.0) /Title <feff0043006f006e00540065005800740020004d006b00490056> /ConTeXt.Time (2011.11.08 15:25) /ID (s-inf-03.2011-11-08T15:25:24+01:00) /ConTeXt.Version (2011.11.08 15:20) /ModDate (D:20111108152524+01'00') /Subject <feff004c007500610020006d006f00640075006c0065007300200061006e0064002000660075006e006300740069006f006e0073>
/PTEX.Fullbanner (This is LuaTeX, Version beta-0.71.0-2011062811 (rev 4315) (TeX Live 2011) kpathsea version 6.0.1)>>
endobj
xref
@@ -16233,7 +16233,7 @@ xref
0000814756 00000 n
0000814939 00000 n
trailer
-<</Size 1446/Root 1444 0 R/Info 1445 0 R/ID[<447CF4D660694BFF5ABDE13835426CBA> <447CF4D660694BFF5ABDE13835426CBA>]>>
+<</Size 1446/Root 1444 0 R/Info 1445 0 R/ID[<6113321A8B8CB829A1BFEBE197B5A45C> <6113321A8B8CB829A1BFEBE197B5A45C>]>>
startxref
815824
%%EOF
diff --git a/tex/context/base/strc-doc.mkiv b/tex/context/base/strc-doc.mkiv
index ce85095d7..44a79b16c 100644
--- a/tex/context/base/strc-doc.mkiv
+++ b/tex/context/base/strc-doc.mkiv
@@ -76,6 +76,8 @@
\fi\fi\fi
\let\currentstructurereferenceprefix\referenceprefix}
+% why xdef ?
+
\def\dostructurecomponent[#1][#2]% #1=interfaced-settings, #2=optional user data (not yet supported)
{\begingroup
\getparameters[\??ns][#1]%
diff --git a/tex/context/base/strc-flt.mkii b/tex/context/base/strc-flt.mkii
index 6e8176fe0..26125c65f 100644
--- a/tex/context/base/strc-flt.mkii
+++ b/tex/context/base/strc-flt.mkii
@@ -519,9 +519,7 @@
\setvalue {\e!start#1\e!text}{\dotripleempty\docomplexstarttextblock[#1]}%
\setvalue {\e!stop#1\e!text}{\dostoptextfloat}%
\setvalue{\e!start\e!reserve#1\e!text}{\doquadrupleempty\docomplexstartreservetextblock[#1]}%
- \setvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}%
- \setvalue {\e!emptyone#1}{\doemptyblock{#1}}%
- \setvalue {\e!emptytwo#1}{\doemptyblock{#1}}}
+ \setvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}}
% \setupfloat[...][leftmargindistance=1cm,default={left,none}]
diff --git a/tex/context/base/strc-flt.mkiv b/tex/context/base/strc-flt.mkvi
index 4d94018ca..c247e4941 100644
--- a/tex/context/base/strc-flt.mkiv
+++ b/tex/context/base/strc-flt.mkvi
@@ -17,12 +17,12 @@
\unprotect
-%D This module needs a cleanup and will be split in
-%D strc-flt.tex and page-flt.mkiv cq. page-flt.mkii.
-
-\ifdefined\addlocalbackgroundtobox\else \def\addlocalbackgroundtobox{\resetglobal\gobbleoneargument} \fi
-
-\unexpanded\def\placefloats{\doflushfloats} % keep this one
+%D This module is being converted into a mkvi one.
+%D
+%D - rename macros
+%D - get rid of dead code
+%D - less gobal mess
+%D - more mkiv-ish
\installframedcommandhandler \??fl {float} \??fl
\installframedcommandhandler \??kj {floatcaption} \??kj
@@ -59,6 +59,7 @@
\c!textcolor=,
\c!align=,
\c!number=\v!yes,
+ % \c!expansion=\v!no
% \c!prefix=\v!no,
% \c!prefixconnector=.,
% \c!way=\v!by\v!chapter,
@@ -169,22 +170,21 @@
\dodefinefloatcommands[#1][#2]}
\def\dodefinefloatcommands[#1][#2]%
- {\setuvalue {\e!place\e!listof#2}{\dodoubleempty\doplacelist[#1]}%
- \setuvalue {\e!complete\e!listof#2}{\dotripleempty\dodocompletelist[#1][#2]}%
- \setuvalue {\e!place#1}{\dotripleempty\docomplexplacefloat[#1]}%
- \setuvalue {\e!start\e!place#1}{\dodoubleempty\dostartplacefloat[#1]}%
- \setuvalue {\e!stop\e!place#1}{\dostopplacefloat}%
- \setuvalue {\e!reserve#1}{\doquadrupleempty\docomplexreserveblock[#1]}%
- \setuvalue {\e!start#1\e!text}{\dotripleempty\docomplexstarttextblock[#1]}%
- \setuvalue {\e!stop#1\e!text}{\dostoptextfloat}%
- \setuvalue{\e!start\e!reserve#1\e!text}{\doquadrupleempty\docomplexstartreservetextblock[#1]}%
- \setuvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}%
- \setuvalue {\e!emptyone#1}{\doemptyfloatblock{#1}}%
- \setuvalue {\e!emptytwo#1}{\doemptyfloatblock{#1}}}
+ {\setuvalue {\e!place\e!listof#2}{\dodoubleempty\doplacelist[#1]}%
+ \setuvalue {\e!complete\e!listof#2}{\dotripleempty\dodocompletelist[#1][#2]}%
+ \setuevalue {\e!place#1}{\float_place{#1}}%
+ \setuevalue {\e!start\e!place#1}{\float_start_place{#1}}%
+ \setuevalue {\e!stop\e!place#1}{\float_stop_place}%
+ \setuevalue {\e!start#1\e!text}{\float_start_text{#1}}%
+ \setuevalue {\e!stop#1\e!text}{\float_stop_text}%
+ % these will become obsolete:
+ \setuevalue {\e!reserve#1}{\float_reserve{#1}}%
+ \setuevalue{\e!start\e!reserve#1\e!text}{\float_start_reserve_text{#1}}%
+ \setuevalue {\e!stop\e!reserve#1\e!text}{\float_stop_reserve_text}}
%D Fallback float body:
-\def\doemptyfloatblock#1%
+\unexpanded\def\float_place_empty_box % \inheritedfloatframed
{\framed
[\c!frame=\v!on,
\c!width=\rootfloatparameter\c!width,
@@ -206,7 +206,7 @@
{\floatcaptionparameter\c!suffixseparator
\floatcaptionparameter\c!suffix}}
-\def\thecurrentfloatnumber
+\unexpanded\def\thecurrentfloatnumber
{\ifnofloatcaption \else \ifnofloatnumber \else
\ifx\currentfloatnumber\relax\else
\namedtaggedlabeltexts
@@ -217,7 +217,7 @@
\fi
\fi \fi}
-\def\thecurrentfloatcaption
+\unexpanded\def\thecurrentfloatcaption
{\ifnofloatcaption \else
\ifx\currentfloatnumber\relax\else
\dostarttagged\t!floattext\empty
@@ -243,12 +243,12 @@
\unexpanded\def\placefloatcaption{\dodoubleempty\doplacefloatcaption}
\unexpanded\def\setfloatcaption {\dodoubleempty\dodosetfloatcaption}
-\def\doplacefloatcaption[#1][#2]#3{[not supported]}
-\def\dodosetfloatcaption[#1][#2]#3{[not supported]} % \dosetfloatcaption already in use
+\def\doplacefloatcaption[#tag][#reference]#caption{[not supported]}
+\def\dodosetfloatcaption[#tag][#reference]#caption{[not supported]} % \dosetfloatcaption already in use
-\unexpanded\def\placefloatcaptiontext [#1]{[not suported yet]}
-\unexpanded\def\placefloatcaptionnumber [#1]{[not suported yet]}
-\unexpanded\def\placefloatcaptionreference[#1]{[not suported yet]}
+\unexpanded\def\placefloatcaptiontext [#tag]{[not suported yet]}
+\unexpanded\def\placefloatcaptionnumber [#tag]{[not suported yet]}
+\unexpanded\def\placefloatcaptionreference[#tag]{[not suported yet]}
\let\placefloatlabel \placefloatcaption
\let\placefloatlabeltext \placefloatcaptiontext
@@ -256,19 +256,22 @@
% end of todo
-\newbox\captionbox
+\newbox \float_caption_box
+\newdimen\float_caption_height
+\newdimen\float_caption_depth
+
+\newbox \float_content_box
-\long\def\putcompletecaption#1#2%
+\def\float_make_complete_caption
{\doifsomething{\floatcaptionparameter\c!spacebefore}{\blank[\floatcaptionparameter\c!spacebefore]}%
- %\floatcaptionparameter\c!before % test for side effects first
\synchronizedisplaydirection % temp hack, till we have a proper model
\noindent
- \gdef\lastcaptiontag{\strut#1}% was xdef
+ \gdef\lastcaptiontag{\strut\thecurrentfloatnumber}% was xdef ... needs checking
\begingroup
\dosetfloatcaptionattributes\c!style\c!color
\ifnofloatnumber
\else
- \hbox{\dosetfloatcaptionattributes\c!headstyle\c!headcolor\strut#1}%
+ \hbox{\dosetfloatcaptionattributes\c!headstyle\c!headcolor\strut\thecurrentfloatnumber}%
\ifnofloatcaption \else \ifemptyfloatcaption \else
\doifelsenothing{\floatcaptionparameter\c!spaceinbetween}
{\scratchskip\floatcaptionparameter\c!distance\relax
@@ -277,27 +280,21 @@
\fi \fi
\fi
\ifnofloatcaption
- \globallet\lastcaptionht\!!zeropoint
- \globallet\lastcaptiondp\!!zeropoint
+ \global\float_caption_height\zeropoint
+ \global\float_caption_depth \zeropoint
\else
\dosetfloatcaptionattributes\c!textstyle\c!textcolor
- \xdef\lastcaptionht{\strutheight}%
- \xdef\lastcaptiondp{\strutdepth}%
- \begstrut#2\endstrut\endgraf
+ \global\float_caption_height\strutheight
+ \global\float_caption_depth \strutdepth
+ \begstrut\thecurrentfloatcaption\endstrut\endgraf
\fi
\endgroup
- %\floatcaptionparameter\c!after % test for side effects first
\doifsomething{\floatcaptionparameter\c!spaceafter}{\blank[\floatcaptionparameter\c!spaceafter]}}
-\let\lastcaptionht\!!zeropoint
-\let\lastcaptiondp\!!zeropoint
-
-\newbox\tempcaptionbox
-
-\newif\iftracecaptions
-
-\def\settracedcaptionbox
- {\iftracecaptions\setbox\tempcaptionbox\ruledhbox{\box\tempcaptionbox}\fi}
+% \newif\iftracecaptions
+%
+% \def\settracedcaptionbox
+% {\iftracecaptions\setbox\float_caption_box\ruledhbox{\box\float_caption_box}\fi}
% \definefloat [figure-1] [figure]
% \definefloat [figure-2] [figure]
@@ -319,31 +316,27 @@
% test \setupswithbox[somefigure]{\framed[width=3cm] {}} test
% test \setupswithbox[somefigure]{\framed[width=\dimexpr\textwidth+3cm\relax]{}} test
-\def\dosetcaptionthings
- {\doprocesslocalsetups{\floatcaptionparameter\c!setups}% expanded ?
- %\advance\leftskip \floatcaptionparameter\c!leftmargin
- %\advance\rightskip\floatcaptionparameter\c!rightmargin
- \relax}
-
-\def\dofakecaptionthings
- {\hbox{\dosetcaptionthings\hskip\leftskip\hskip\rightskip}}
+% temporary removed ... was not applied systematically
+%
+% \def\dosetcaptionthings
+% {\doprocesslocalsetups{\floatcaptionparameter\c!setups}\relax}
-\long\def\docheckcaptioncontent#1#2% side floats
+\def\check_float_caption_content
{\ifnofloatcaption \else
- \setbox\tempcaptionbox\hbox
+ \setbox\float_caption_box\hbox
{\settrialtypesetting
\notesenabledfalse
- \putcompletecaption{#1}{#2}}%
+ \float_make_complete_caption}%
% new, \placefigure{\xmlfirst{#1}{somecaption}}{} passes earlier empty check
% so here we misuse the scratch box; actually this means that the previous
% test can go away (some day, when i redo this module)
- \ifdim\wd\tempcaptionbox=\zeropoint
+ \ifdim\wd\float_caption_box=\zeropoint
\global\emptyfloatcaptiontrue
\ifnofloatnumber
\global\nofloatcaptiontrue
\fi
\else
- \setbox\tempcaptionbox\hbox{\dosetcaptionthings\hskip\leftskip\box\tempcaptionbox}% yet incomplete
+ \setbox\float_caption_box\hbox{\hskip\leftskip\box\float_caption_box}%
\fi
\fi}
@@ -369,9 +362,6 @@
\globallet\twopassfloatdata\realpageno % \realfolio
\fi}
-\def\tracefloatnumber#1%
- {\doifnot{\rootfloatparameter\c!numbering}\v!nocheck{\tagnodelocation{\v!float\@@thenumber{#1}}}}
-
%D test case:
%D
%D \starttyping
@@ -396,32 +386,112 @@
% we're really dealing with the float. Some day I'll root out
% the global settings.
-\unexpanded\def\docomplexplacefloat[#1][#2]% [#3]#4%
- {\edef\currentfloat{#1}%
- \doifnothing\currentfloat{\let\currentfloat\v!figure}% hack
- \let\currentfloatcaption\currentfloat
- \doifelsenothing{#2}
- {\edef\floatlocation{\floatparameter\c!default}}
- {\edef\floatlocation{#2}}%
- \doifinsetelse\v!split{#2}
- {\normalexpanded{\dodocomplexsplitfloat[\currentfloat][\floatlocation]}}
- {\normalexpanded{\dodocomplexplacefloat[\currentfloat][\floatlocation]}}}
-
-\unexpanded\def\dodocomplexsplitfloat[#1][#2][#3]#4%
- {\splitfloat{\dodocomplexplacefloat[#1][#2][#3]{#4}}}
-
-\unexpanded\def\dostartplacefloat[#1][#2]% will be done the other way around but okay for now
- {\begingroup
- \getparameters[\??fl\??fl][\c!location=,\c!reference=,\c!title=,#2]%
- \normalexpanded{\docomplexplacefloat[#1][\@@fl@@fllocation][\@@fl@@flreference]{\@@fl@@fltitle}}%
+\def\float_set_current_tag#tag%
+ {\edef\currentfloat{#tag}%
+ \ifx\currentfloat\empty
+ \let\currentfloat\v!figure % a bit of a hack
+ \fi
+ \let\currentfloatcaption\currentfloat}
+
+% place
+
+\unexpanded\def\float_place#tag%
+ {\flushnotes
+ \flushsidefloats % here !
+ \float_begin_group
+ \float_set_current_tag{#tag}%
+ \dodoubleempty\float_place_indeed}
+
+\def\float_place_indeed[#location][#reference]#caption%
+ {\edef\floatlocation{#location}%
+ \ifx\floatlocation\empty
+ \edef\floatlocation{\floatparameter\c!default}% beware of a clash between alignment locations
+ \fi
+ \setupcurrentfloatcaption[\c!reference={#reference},\c!title={#caption},\c!marking=,\c!list=,\c!bookmark=]%
+ \doifinsetelse\v!split\floatlocation\place_next_float_box_split\place_next_float_box_normal}
+
+% start-stop
+
+\unexpanded\def\float_start_place#tag%
+ {\flushnotes
+ \flushsidefloats % here !
+ \float_begin_group
+ \float_set_current_tag{#tag}%
+ \dosingleempty\float_start_place_indeed}
+
+\def\float_start_place_indeed[#settings]% tricky ... saved not ok yet
+ {\edef\savedfloatlocation{\floatcaptionparameter\c!location}%
+ \setupcurrentfloatcaption[\c!location=,\c!reference=,\c!title=,\c!marking=,\c!list=,\c!bookmark=,#settings]%
+ \edef\floatlocation{\floatcaptionparameter\c!location}%
+ \setupcurrentfloatcaption[\c!location=\savedfloatlocation]%
+ \ifx\floatlocation\empty
+ \edef\floatlocation{\floatparameter\c!default}%
+ \fi
+ \doifinsetelse\v!split\floatlocation\place_next_float_box_split\place_next_float_box_normal
\bgroup
\ignorespaces}
-\unexpanded\def\dostopplacefloat
+\unexpanded\def\float_stop_place
{\removeunwantedspaces
- \egroup
+ \egroup}
+
+% reserve
+
+\unexpanded\def\float_reserve#tag%
+ {\flushnotes
+ \flushsidefloats % here !
+ \float_begin_group
+ \float_set_current_tag{#tag}%
+ \dotripleempty\float_reserve_indeed}
+
+\def\float_reserve_indeed[#settings][#location][#reference]#caption% maybe check for #settings
+ {\float_place_indeed[#location][#reference]{#caption}{\float_reserve_box{#settings}}}
+
+\def\float_reserve_box#settings%
+ {\begingroup
+ \setupcurrentfloat[\c!frame=\v!on,#settings]%
+ \inheritedfloatframed{}%
\endgroup}
+% text
+
+\unexpanded\def\float_start_text#tag%
+ {\flushnotes % Here indeed?
+ \flushsidefloats % Here indeed?
+ \float_begin_text_group
+ \float_set_current_tag{#tag}%
+ \dodoubleempty\float_start_text_indeed}
+
+\def\float_start_text_indeed[#location][#reference]%
+ {\float_place_indeed[\v!text,#location,\v!left][#reference]}
+
+\unexpanded\def\float_stop_text
+ {\float_stop_text_indeed}
+
+% reserved text
+
+\unexpanded\def\float_start_reserve_text#tag%
+ {\flushnotes
+ \flushsidefloats
+ \float_begin_text_group
+ \float_set_current_tag{#tag}%
+ \dotripleempty\float_start_reserve_text_indeed}
+
+\def\float_start_reserve_text_indeed[#settings][#location][#reference]#caption%
+ {\float_place_indeed[\v!text,#location,\v!left][#reference]{#caption}{\float_reserve_box{#settings}}}
+
+\unexpanded\def\float_stop_reserve_text
+ {\float_stop_text_indeed}
+
+% special hack
+
+\def\float_begin_group {\begingroup}
+\def\float_end_group {\carryoverpar\endgroup}
+
+\def\float_begin_text_group {\begingroup\let\float_end_group\relax}
+\def\float_end_text_group {\endgroup}
+
+% implemenation
\def\flushfloatslist
{\v!left,\v!right,\v!inner,\v!outer,%
@@ -431,64 +501,62 @@
\v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,%
\v!text,\v!opposite}% \v!page
-\unexpanded\def\dodocomplexplacefloat[#1][#2][#3]#4%
- {\flushnotes
- \flushsidefloats % here !
- \ifsomefloatwaiting
+\unexpanded\def\place_next_float_box_split
+ {\splitfloat{\place_next_float_box_normal}}
+
+\unexpanded\def\place_next_float_box_normal
+ {\ifsomefloatwaiting
% this was \checkwaitingfloats spread all over
- \doifinsetelse\v!always{#2}
+ \doifinsetelse\v!always\floatlocation
{\showmessage\m!floatblocks5\empty}
- {\normalexpanded{\noexpand\doifcommonelse{#2}{\flushfloatslist}}\doflushfloats\donothing}%
+ {\doifcommonelse\floatlocation\flushfloatslist\doflushfloats\donothing}%
% but which should be done before using box \floatbox
\fi
\ifmarginblocks
- \doifinset\v!margin{#2}\endgraf
+ \doifinset\v!margin\floatlocation\endgraf
\fi
\global\insidefloattrue
- \begingroup % **
\dostarttagged\t!float\currentfloat
\ifmarginblocks
- \doifinset\v!margin{#2}{\hsize\@@mbwidth}%
+ \doifinset\v!margin\floatlocation{\hsize\@@mbwidth}%
\fi
\the\everyinsidefloat
- \let\@@extrafloat\empty
- \presetmorefloatvariables{#2}%
+ \float_analyze_variables_one
\dostarttagged\t!floatcontent\empty
- \dowithnextboxcontent % better a \the\everyfloattoks
- {\setlocalfloathsize
+ \dowithnextboxcontent
+ {\float_set_local_hsize
\floatparameter\c!inner
-% \dostarttagged\t!floatcontent\empty
-% \aftergroup\dostoptagged % tricky, never change \dowithnextboxcontent
\postponenotes} % new
{\dostoptagged
- \doifsomething{\floatparameter\c!criterium}
- {\ifdim\wd\nextbox>\floatparameter\c!criterium\relax
- \edef\forcedfloatmethod{\floatparameter\c!fallback}%
- \ifx\forcedfloatmethod\empty\let\forcedfloatmethod\v!here\fi
- \fi}%
- \xdocompletefloat{#1}{#3}{#2}{#4}% ** not yet done
- % we need to carry over the par because of side floats
- \doifnotinset\v!text{#2}{\dostoptagged\carryoverpar\endgroup}% **
- \global\sidefloatdownshift \zeropoint
- \global\sidefloatextrashift\zeropoint
- \ifparfloat
- \doifinset\v!reset{#2}\forgetsidefloats
- \doinhibitblank
- \fi}% better move this to side floats
+ \float_finish_placement}
\vbox}
-\def\xxdocompletefloat#1#2%
- {\rightorleftpageaction{\let\@@extrafloat#1}{\let\@@extrafloat#2}}
+\def\float_finish_placement
+ {\doifsomething{\floatparameter\c!criterium}
+ {\ifdim\wd\nextbox>\floatparameter\c!criterium\relax
+ \edef\forcedfloatmethod{\floatparameter\c!fallback}%
+ \ifx\forcedfloatmethod\empty\let\forcedfloatmethod\v!here\fi
+ \fi}%
+ \float_check_extra_actions
+ \float_analyze_variables_two
+ \float_place_packaged_boxes
+ % we need to carry over the par because of side floats
+ \global\sidefloatdownshift \zeropoint
+ \global\sidefloatextrashift\zeropoint
+ \ifparfloat
+ \doifinset\v!reset\floatlocation\forgetsidefloats
+ \doinhibitblank
+ \fi
+ \float_end_group}
\setnewconstant\sidefloatalign \zerocount
\setnewconstant\textfloatmethod\zerocount % 0=raw 1=safe (.99) 2=tight (-1pt)
\setnewconstant\sidefloatmethod\plusone % 0=raw 1=safe (.99) 2=tight (-1pt)
+\setnewconstant\floatrotation \zerocount % 0 90 180 270
-\let\floatrotation\!!zerocount
-
-\unexpanded\def\presetfloatvariables#1#2#3#4%
+\def\float_analyze_variables_two
{\doifcommonelse
- {#2}
+ {\floatlocation}
{\v!left,\v!right,\v!inner,\v!outer,%
\v!inleft,\v!inright,\v!inmargin,%
\v!backspace,\v!cutspace,%
@@ -504,8 +572,8 @@
\global\sidefloatmethod\floatparameter\c!sidemethod
\global\textfloatmethod\floatparameter\c!textmethod
\global\sidefloatalign\zerocount
- \globallet\floatrotation\!!zerocount
- \calculatefloatskips
+ \global\floatrotation\zerocount
+ \float_calculate_skips
\ifparfloat
\processaction
[\floatparameter\c!sidealign]
@@ -514,37 +582,32 @@
\v!depth=>\global\sidefloatalign\plusthree,%
\v!grid=>\global\sidefloatalign\plusfour,%
\v!halfline=>\global\sidefloatalign\plusfive]%
- % todo (test first): \doifinset\v!lokaal{#2}{\global\sidefloatalign\zerocount}%
\ifcase\sidefloatalign\relax % todo: optie v!lokaal => \else
- \doifinset\v!height {#2}{\global\sidefloatalign\plusone}%
- \doifinset\v!line {#2}{\global\sidefloatalign\plustwo}%
- \doifinset\v!depth {#2}{\global\sidefloatalign\plusthree}%
- \doifinset\v!grid {#2}{\global\sidefloatalign\plusfour}%
- \doifinset\v!halfline{#2}{\global\sidefloatalign\plusfive}% meant for 'none'
+ \doifinset\v!height \floatlocation{\global\sidefloatalign\plusone}%
+ \doifinset\v!line \floatlocation{\global\sidefloatalign\plustwo}%
+ \doifinset\v!depth \floatlocation{\global\sidefloatalign\plusthree}%
+ \doifinset\v!grid \floatlocation{\global\sidefloatalign\plusfour}%
+ \doifinset\v!halfline\floatlocation{\global\sidefloatalign\plusfive}% meant for 'none'
\fi
- \doifinset\v!high{#2}{\global\sidefloattopskip \zeropoint}%
- \doifinset\v!low {#2}{\global\sidefloatbottomskip\zeropoint}%
- \doifinset\v!fit {#2}
+ \doifinset\v!high\floatlocation{\global\sidefloattopskip \zeropoint}%
+ \doifinset\v!low \floatlocation{\global\sidefloatbottomskip\zeropoint}%
+ \doifinset\v!fit \floatlocation
{\global\sidefloattopskip \zeropoint
\global\sidefloatbottomskip\zeropoint
\global\floatsideskip \zeropoint}%
\else
\processallactionsinset
- [#2]
- [ 90=>\globallet\floatrotation\commalistelement,%
- 180=>\globallet\floatrotation\commalistelement,%
- 270=>\globallet\floatrotation\commalistelement]%
+ [\floatlocation]
+ [ 90=>\global\floatrotation\commalistelement\relax,%
+ 180=>\global\floatrotation\commalistelement\relax,%
+ 270=>\global\floatrotation\commalistelement\relax]%
\fi
- \doifinsetelse\v!nonumber{#2}
+ \doifinsetelse\v!nonumber\floatlocation
{\global\nofloatnumbertrue}
{\doifelse{\floatcaptionparameter\c!number}\v!yes
{\global\nofloatnumberfalse}
{\global\nofloatnumbertrue}}%
- % this has to change
- \ConvertToConstant\doifelse{#4}{}
- {\global\emptyfloatcaptiontrue}
- {\global\emptyfloatcaptionfalse}%
- \doifinsetelse\v!none{#2}
+ \doifinsetelse\v!none\floatlocation
{\global\nofloatcaptiontrue}
{\global\nofloatcaptionfalse}%
\doif{\floatcaptionparameter\c!number}\v!none % new
@@ -555,18 +618,18 @@
% documenteren in details
-\def\presetmorefloatvariables#1%
+\def\float_analyze_variables_one
{\doifelse{\floatparameter\c!local}\v!yes % fout keyword
\globalcenterfloatboxtrue
\globalcenterfloatboxfalse
\ifglobalcenterfloatbox
\localcenterfloatboxtrue
\else
- \doifinsetelse\v!local{#1}
+ \doifinsetelse\v!local\floatlocation
\localcenterfloatboxtrue
\localcenterfloatboxfalse
\fi
- \doifnotcommon{\v!always,\v!here,\v!force}{#1} % ! ! ! ! ! !
+ \doifnotcommon{\v!always,\v!here,\v!force}\floatlocation % ! ! ! ! ! !
{\globalcenterfloatboxfalse
\localcenterfloatboxfalse}}
@@ -574,13 +637,21 @@
\let\naturalfloatwidth \!!zeropoint
\let\naturalfloatdepth \!!zeropoint
-\def\setnaturalfloatdimensions#1%
- {\xdef\naturalfloatheight{\the\ht#1}%
- \xdef\naturalfloatwidth {\the\wd#1}%
- \xdef\naturalfloatdepth {\the\dp#1}}
+\def\float_set_natural_dimensions#box%
+ {\xdef\naturalfloatheight{\the\ht#box}%
+ \xdef\naturalfloatwidth {\the\wd#box}%
+ \xdef\naturalfloatdepth {\the\dp#box}}
-\def\doifelsemainfloatbody#1#2%
- {\ifinsidesplitfloat\ifconditional\splitfloatfirstdone#2\else#1\fi\else#1\fi}
+\def\doifelsemainfloatbody
+ {\ifinsidesplitfloat
+ \ifconditional\splitfloatfirstdone
+ \doubleexpandafter\secondoftwoarguments
+ \else
+ \doubleexpandafter\firstoftwoarguments
+ \fi
+ \else
+ \expandafter\firstoftwoarguments
+ \fi}
% todo: optional user pars
@@ -606,13 +677,8 @@
\newconditional\usesamefloatnumber
-\long\def\docompletefloat#1#2#3#4#5% #1:floatclass #2:reference #3:optionlist #4:caption #5:box number
- {\presetfloatvariables{#1}{#3}{#2}{#5}% check this one
- \bgroup
- % prepare structure data
- %
- % \dofloatcomponent[\c!name=#1,\c!reference=#2,\c!bookmark=,\c!title={#4}][]% ifnofloatnumber ifnofloatcaption \tracefloatnumber{#1}%
- %
+\def\float_place_packaged_boxes
+ {\bgroup
\ifconditional\usesamefloatnumber
\globallet\currentfloatnumber \previousfloatnumber
\globallet\currentfloatattribute \empty
@@ -626,11 +692,11 @@
\relax
\relax
\relax
- [\c!name=\currentfloat,\s!counter=\@@thestructurecounter\currentfloat,%
+ [\c!name=\currentfloat,%
+ \s!counter=\@@thestructurecounter\currentfloat,%
\s!hascaption=\ifnofloatcaption \v!no\else\v!yes\fi,%
\s!hasnumber=\ifnofloatnumber \v!no\else\v!yes\fi,%
- \s!hastitle=\ifemptyfloatcaption\v!no\else\v!yes\fi,%
- \c!reference=#2,\c!title={#4},\c!bookmark=]%
+ \s!hastitle=\ifemptyfloatcaption\v!no\else\v!yes\fi]%
[]%
\globallet\previousfloatnumber \laststructurecounternumber
\globallet\currentfloatnumber \laststructurecounternumber
@@ -640,12 +706,12 @@
%
\global\setfalse\usesamefloatnumber % one shot
% check float box
- \setnaturalfloatdimensions#5%
- \global\setbox\floatbox\vbox{\floatparameter\c!command{\box#5}}%
- \setnaturalfloatdimensions\floatbox
+ \float_set_natural_dimensions\nextbox
+ \global\setbox\floatbox\vbox{\floatparameter\c!command{\box\nextbox}}%
+ \float_set_natural_dimensions\floatbox
\ifdim\htdp\floatbox=\zeropoint
\showmessage\m!floatblocks{11}\empty
- \global\setbox\floatbox\vbox{\doemptyfloatblock{#1}}%
+ \global\setbox\floatbox\vbox{\float_place_empty_box}%
\fi
% deal with lack of caption
\global\setbox\floatbox\vbox \floatcaptionattribute
@@ -656,11 +722,11 @@
\fi}% gets rid of the depth (unless tabulate)
\egroup
% place the float
- \dofloat{#3}{\thecurrentfloatnumber}{\thecurrentfloatcaption}%
-% \dostoptagged % tricky here, we need an extra mechanism (add to previous or so)
+ \float_set_box
+ \float_get_box
\global\insidefloatfalse}
-\def\setlocalfloathsize
+\def\float_set_local_hsize
{\iflocalcenterfloatbox
\seteffectivehsize
\hsize\localhsize
@@ -669,45 +735,43 @@
\ifdefined\everyinsidefloat \else \newevery \everyinsidefloat \relax \fi
\appendtoks
- \everyinsidefloat\emptytoks % in case it's called earlier
- \dogetfloatdata
+ \everyinsidefloat\emptytoks % in case it's called earlier
+ \dogetfloatdata
\to \everyinsidefloat
\def\doifrightpagefloatelse
{\ifdoublesided
\ifsinglesided
- \@EAEAEA\firstoftwoarguments
+ \doubleexpandafter\firstoftwoarguments
\else
- \@EAEAEA\doifoddfloatpageelse
+ \doubleexpandafter\doifoddfloatpageelse
\fi
\else
- \@EA\firstoftwoarguments
+ \expandafter\firstoftwoarguments
\fi}
\def\doifoddfloatpageelse
{\ifodd\purenumber\twopassfloatdata\space
- \@EA\firstoftwoarguments
+ \expandafter\firstoftwoarguments
\else
- \@EA\secondoftwoarguments
+ \expandafter\secondoftwoarguments
\fi}
\appendtoks
\let\rightorleftpageaction\doifrightpagefloatelse
\to \everyinsidefloat
-\newif\ifextrafloatactions \extrafloatactionstrue
-
% \let\movesidefloat\gobbleoneargument
% new : \place...[leftmargin,-2*line]; we need to catch fxtb:2*3
% watch out: line alone aligns on the line ! ! !
-\def\movesidefloat[#1]% (-)n*line|x=,y=
+\unexpanded\def\movesidefloat[#settings]% (-)n*line|x=,y=
{\global\sidefloatdownshift \zeropoint
\global\sidefloatextrashift\zeropoint
- \doifassignmentelse{#1}%
+ \doifassignmentelse{#settings}%
{\bgroup
- \getparameters[\??fl\??fl][\c!x=\zeropoint,\c!y=\zeropoint,#1]%
+ \getparameters[\??fl\??fl][\c!x=\zeropoint,\c!y=\zeropoint,#settings]%
\ifgridsnapping
\getnoflines\@@fly
\global\sidefloatdownshift\noflines\lineheight
@@ -716,132 +780,108 @@
\fi
\global\sidefloatextrashift\@@fl@@flx
\egroup}
- {\movedownsidefloat[#1]}}
-
-\def\movedownsidefloat[#1]% already in core
- {\bgroup
- \cleanupfeatures
- \doifinstringelse{:}{#1}
- \donothing
- {\def\docommand##1%
- {\processaction
- [##1]%
- [ \v!line=>\dodocommand+,%
- +\v!line=>\dodocommand+,%
- -\v!line=>\dodocommand-]}%
- \def\dodocommand##1%
- {\ifdone\else\global\sidefloatdownshift\zeropoint\donetrue\fi
- \global\advance\sidefloatdownshift##1\lineheight}%
- \donefalse\normalexpanded{\noexpand\dorepeatwithcommand[#1]}\docommand
- \def\docommand##1%
- {\processaction
- [##1]%
- [ \v!hang=>\dodocommand\plusone,%
- +\v!hang=>\dodocommand\plusone,%
- -\v!hang=>\dodocommand\minusone]}%
- \def\dodocommand##1% inefficient but who cares
- {\ifdone\else\global\sidefloatsidelines\zerocount\donetrue\fi
- \global\advance\sidefloatsidelines##1\relax}%
- \donefalse\normalexpanded{\noexpand\dorepeatwithcommand[#1]}\docommand}%
- \egroup}
-
-\def\hangsidefloat[#1]%
- {\global\sidefloatsidelines#1\relax}
-
-\long\def\xdocompletefloat#1#2#3#4%
- {\ifextrafloatactions
- \doifinsetelse\v!text{#3}
- {% fuzzy, text overloads left, since then it's a directive
- \docompletefloat{#1}{#2}{#3}{#4}\nextbox}
- {\let\@@extrafloat\empty
- % \sidefloatdownshift will be reset afterwards, and can
- % already be set at this point
- \processallactionsinset
- [#3] % ininner/inouter : for old times sake
- [ \v!inner=>\xxdocompletefloat\v!left \v!right,
- \v!outer=>\xxdocompletefloat\v!right \v!left,
- \v!innermargin=>\xxdocompletefloat\v!leftmargin \v!rightmargin,
- \v!outermargin=>\xxdocompletefloat\v!rightmargin\v!leftmargin,
- \v!inneredge=>\xxdocompletefloat\v!leftedge \v!rightedge,
- \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge,
- \v!backspace=>\xxdocompletefloat\v!backspace \v!cutspace,
- \v!cutspace=>\xxdocompletefloat\v!cutspace \v!backspace,
-% \v!margin=>\xxdocompletefloat\v!cutspace \v!backspace,
- \v!left=>\xxdocompletefloat\v!left \v!left,
- \v!right=>\xxdocompletefloat\v!right \v!right,
- \v!line=>, % only -n*line is handled (see ***)
- \s!unknown=>{\movedownsidefloat[\commalistelement]}]%
- \ifx\@@extrafloat\empty
- \docompletefloat{#1}{#2}{#3}{#4}\nextbox
- \else
- \docompletefloat{#1}{#2}{\@@extrafloat,#3}{#4}\nextbox
- \fi}%
- \else % downward compatible
- \docompletefloat{#1}{#2}{#3}{#4}\nextbox
- \fi}
+ {\movedownsidefloat[#settings]}}
+
+\def\float_move_down#setting%
+ {\processaction
+ [#setting]%
+ [ \v!line=>\float_move_down_line+,%
+ +\v!line=>\float_move_down_line+,%
+ -\v!line=>\float_move_down_line-,%
+ \v!hang=>\float_move_down_hang\plusone,%
+ +\v!hang=>\float_move_down_hang\plusone,%
+ -\v!hang=>\float_move_down_hang\minusone]}
+
+\def\float_move_down_line#sign%
+ {\if!!donea\else\global\sidefloatdownshift\zeropoint\!!doneatrue\fi
+ \global\advance\sidefloatdownshift#sign\lineheight}
+
+\def\float_move_down_hang#lines%
+ {\if!!doneb\else\global\sidefloatsidelines\zerocount\!!donebtrue\fi
+ \global\advance\sidefloatsidelines#lines\relax}
+
+\unexpanded\def\movedownsidefloat[#settings]% already in core
+ {\doifnotinstring{:}{#settings}
+ {\begingroup
+ \!!doneafalse
+ \!!donebfalse
+ \normalexpanded{\dorepeatwithcommand[#settings]}\float_move_down
+ \endgroup}}
+
+\unexpanded\def\hangsidefloat[#number]%
+ {\global\sidefloatsidelines#number\relax}
+
+\def\set_extra_float_action#rightpagelocation#leftpagelocation%
+ {\rightorleftpageaction
+ {\let\extrafloatlocation#rightpagelocation}%
+ {\let\extrafloatlocation#leftpagelocation}}
+
+\def\float_check_extra_actions
+ {\doifnotinset\v!text\floatlocation % fuzzy, text overloads left, since then it's a directive
+ {\let\extrafloatlocation\empty
+ % \sidefloatdownshift will be reset afterwards, and can
+ % already be set at this point
+ \processallactionsinset
+ [\floatlocation] % ininner/inouter : for old times sake
+ [ \v!inner=>\set_extra_float_action\v!left \v!right,
+ \v!outer=>\set_extra_float_action\v!right \v!left,
+ \v!innermargin=>\set_extra_float_action\v!leftmargin \v!rightmargin,
+ \v!outermargin=>\set_extra_float_action\v!rightmargin\v!leftmargin,
+ \v!inneredge=>\set_extra_float_action\v!leftedge \v!rightedge,
+ \v!outeredge=>\set_extra_float_action\v!rightedge \v!leftedge,
+ \v!backspace=>\set_extra_float_action\v!backspace \v!cutspace,
+ \v!cutspace=>\set_extra_float_action\v!cutspace \v!backspace,
+ % \v!margin=>\set_extra_float_action\v!cutspace \v!backspace,
+ \v!left=>\set_extra_float_action\v!left \v!left,
+ \v!right=>\set_extra_float_action\v!right \v!right,
+ \v!line=>, % only -n*line is handled (see ***)
+ \s!unknown=>{\movedownsidefloat[\commalistelement]}]%
+ \ifx\extrafloatlocation\empty \else
+ \edef\floatlocation{\extrafloatlocation,\floatlocation}%
+ \fi}}
% pas op, maxbreedte niet instellen als plaats=links/rechts
-\def\setlocalfloatdimensions#1%
+\def\float_set_local_dimensions
{\global\sidefloatshift \zeropoint % duplicate
\global\sidefloatmaximum\zeropoint\relax % duplicate
- \ifextrafloatactions
- \ifdim\sidefloatdownshift=\zeropoint\else
- \global\setbox\floatbox\vbox
- {\vskip\sidefloatdownshift\nointerlineskip\box\floatbox}%
- \fi
- \doifsomething{\floatparameter\c!minwidth}
- {\scratchdimen\floatparameter\c!minwidth\relax
- \ifdim\wd\floatbox<\scratchdimen
- \global\setbox\floatbox\hbox to \scratchdimen
- {\doifnot{\floatparameter\c!location}\v!left \hss
- \box\floatbox
- \doifnot{\floatparameter\c!location}\v!right\hss}%
- \fi}%
- % todo: rand / rug
- \doifinset\v!hanging{#1}
- {\doifcommonelse{\v!inleft,\v!leftmargin}{#1}
- {\letfloatparameter\c!maxwidth\leftmarginwidth}%
- {\doifcommon{\v!inright,\v!rightmargin}{#1}
- {\letfloatparameter\c!maxwidth\rightmarginwidth}}}%
- \doifsomething{\floatparameter\c!maxwidth}
- {\scratchdimen\floatparameter\c!maxwidth\relax
- \ifdim\wd\floatbox>\scratchdimen
- \doifcommonelse{\v!inright,\v!rightmargin,\v!rightedge,\v!inleft,\v!leftmargin,\v!leftedge}{#1}
- {\global\sidefloatmaximum\scratchdimen}
- {\global\setbox\floatbox\hbox to \scratchdimen
- {\doifcommonelse{\v!right,\v!left}{#1}
- {\doifnotinset\v!right{#1}\hss
- \box\floatbox
- \doifnotinset\v!left{#1}\hss}%
- {\doifnot{\floatparameter\c!location}\v!left\hss
- \box\floatbox
- \doifnot{\floatparameter\c!location}\v!right\hss}}}%
- \fi}%
- \fi}
-
-\def\docomplexstarttextblock[#1][#2][#3]%
- {\flushnotes
- \flushsidefloats % hoort eigenlijk niet hier
- \docomplexplacefloat[#1][\v!text,#2,\v!left][#3]}
-
-\def\dodocomplexreserveblock#1#2%
- {\begingroup
- \edef\currentfloat{#1}%
- \let\currentfloatcaption\currentfloat
- \setupcurrentfloat[#2]%
- \inheritedfloatframed{#1}%
- \endgroup}
-
-\def\docomplexreserveblock[#1][#2][#3][#4]#5%
- {\getvalue{\e!place#1}[#3][#4]{#5}{\dodocomplexreserveblock{#1}{#2}}}
-
-\def\docomplexstartreservetextblock[#1][#2][#3][#4]%
- {\flushsidefloats % hoort eigenlijk niet hier
- \docomplexreserveblock[#1][#2][\v!text,#3,\v!left][#4]}
+ \ifdim\sidefloatdownshift=\zeropoint\else
+ \global\setbox\floatbox\vbox
+ {\vskip\sidefloatdownshift\nointerlineskip\box\floatbox}%
+ \fi
+ \doifsomething{\floatparameter\c!minwidth}
+ {\scratchdimen\floatparameter\c!minwidth\relax
+ \ifdim\wd\floatbox<\scratchdimen
+ \global\setbox\floatbox\hbox to \scratchdimen
+ {\doifnot{\floatparameter\c!location}\v!left \hss
+ \box\floatbox
+ \doifnot{\floatparameter\c!location}\v!right\hss}%
+ \fi}%
+ \doifinset\v!hanging\floatlocation
+ {\doifcommonelse{\v!inleft,\v!leftmargin}\floatlocation
+ {\letfloatparameter\c!maxwidth\leftmarginwidth}%
+ {\doifcommon{\v!inright,\v!rightmargin}\floatlocation
+ {\letfloatparameter\c!maxwidth\rightmarginwidth}}}%
+ \doifsomething{\floatparameter\c!maxwidth}
+ {\scratchdimen\floatparameter\c!maxwidth\relax
+ \ifdim\wd\floatbox>\scratchdimen
+ \doifcommonelse{\v!inright,\v!rightmargin,\v!rightedge,\v!inleft,\v!leftmargin,\v!leftedge}\floatlocation
+ {\global\sidefloatmaximum\scratchdimen}
+ {\global\setbox\floatbox\hbox to \scratchdimen
+ {\doifcommonelse{\v!right,\v!left}\floatlocation
+ {\doifnotinset\v!right\floatlocation\hss
+ \box\floatbox
+ \doifnotinset\v!left\floatlocation\hss}%
+ {\doifnot{\floatparameter\c!location}\v!left\hss
+ \box\floatbox
+ \doifnot{\floatparameter\c!location}\v!right\hss}}}%
+ \fi}}
\unexpanded\def\placefloat
{\dotripleempty\docomplexplacefloat}
+
+\unexpanded\def\placefloats
+ {\doflushfloats}
\installinsertion\topins
\installinsertion\botins
@@ -852,12 +892,12 @@
\newif\iftopofinsert
\newif\iftestfloatbox
-\newdimen\floatsideskip \floatsideskip =12pt
-\newdimen\floattopskip \floattopskip =\floattopskip
-\newdimen\floatbottomskip \floatbottomskip=\floattopskip
+\newdimen\floatsideskip \floatsideskip 12pt
+\newdimen\floattopskip \floattopskip \floattopskip
+\newdimen\floatbottomskip \floatbottomskip \floattopskip
-\newdimen\sidefloattopskip \sidefloattopskip =\floattopskip
-\newdimen\sidefloatbottomskip \sidefloatbottomskip=\floatbottomskip
+\newdimen\sidefloattopskip \sidefloattopskip \floattopskip
+\newdimen\sidefloatbottomskip \sidefloatbottomskip\floatbottomskip
\newskip\sidefloatdownshift
\newskip\sidefloatleftshift
@@ -868,26 +908,29 @@
\newcount\noftopfloats \noftopfloats=2
\newcount\nofbotfloats \nofbotfloats=0
-\def\docalculatefloatskip#1#2%
- {\doifelsenothing{#2}
- {\global#1\zeropoint}
- {\doifelse{#2}\v!none
- {\global#1\zeropoint}
- {\setbox\scratchbox\vbox{\whitespace\normalexpanded{\noexpand\blank[#2]}}%
- \global#1\ht\scratchbox}}}
+\def\float_calculate_skip#target#skip%
+ {\edef\askedfloatskip{#skip}%
+ \ifx\askedfloatskip\empty
+ \global#target\zeropoint
+ \else\ifx\askedfloatskip\v!none
+ \global#target\zeropoint
+ \else
+ \setbox\scratchbox\vbox{\whitespace\blank[\askedfloatskip]}% todo: move whitespace inside blank
+ \global#target\ht\scratchbox
+ \fi\fi}
-\def\calculatefloatskips
+\def\float_calculate_skips
{\begingroup
- \docalculatefloatskip\floattopskip{\rootfloatparameter\c!spacebefore}%
- \docalculatefloatskip\floatbottomskip{\rootfloatparameter\c!spaceafter}%
- \docalculatefloatskip\sidefloattopskip{\rootfloatparameter\c!sidespacebefore}%
- \docalculatefloatskip\sidefloatbottomskip{\rootfloatparameter\c!sidespaceafter}%
- \gdef\sidefloattopoffset{\openstrutdepth}% was \def
- \global\floatsideskip\rootfloatparameter\c!margin
- \global\sidefloatleftshift\floatparameter\c!leftmargindistance
+ \float_calculate_skip\floattopskip {\rootfloatparameter\c!spacebefore}%
+ \float_calculate_skip\floatbottomskip {\rootfloatparameter\c!spaceafter}%
+ \float_calculate_skip\sidefloattopskip {\rootfloatparameter\c!sidespacebefore}%
+ \float_calculate_skip\sidefloatbottomskip{\rootfloatparameter\c!sidespaceafter}%
+ \gdef \sidefloattopoffset {\openstrutdepth}% was \def
+ \global\floatsideskip \rootfloatparameter\c!margin
+ \global\sidefloatleftshift \floatparameter\c!leftmargindistance
\global\sidefloatrightshift\floatparameter\c!rightmargindistance
- \global\noftopfloats\rootfloatparameter\c!ntop\relax
- \global\nofbotfloats\rootfloatparameter\c!nbottom\relax
+ \global\noftopfloats \rootfloatparameter\c!ntop\relax
+ \global\nofbotfloats \rootfloatparameter\c!nbottom\relax
\endgroup}
% beter de laatste skip buiten de \insert uitvoeren,
@@ -902,37 +945,42 @@
% \fi
% \egroup}
-\def\betweenfloatblanko% assumes that spaceafter is present
+\unexpanded\def\betweenfloatblanko% assumes that spaceafter is present
{\blank[\rootfloatparameter\c!spacebefore]} % or v!back,....
-
-\def\doplacefloatbox
+
+\def\doplacefloatbox % used elsewhere
{%\forgetall % NO
\whitespace
\blank[\rootfloatparameter\c!spacebefore]
\flushfloatbox
\blank[\rootfloatparameter\c!spaceafter]}
+%
+
\ifdefined\someherefloat\else \let\someherefloat\doplacefloatbox \fi
\ifdefined\someslotfloat\else \let\someslotfloat\doplacefloatbox \fi
\ifdefined\somefixdfloat\else \let\somefixdfloat\doplacefloatbox \fi
\ifdefined\sometopsfloat\else \let\sometopsfloat\doplacefloatbox \fi
\ifdefined\somebotsfloat\else \let\somebotsfloat\doplacefloatbox \fi
\ifdefined\somesidefloat\else \let\somesidefloat\doplacefloatbox \fi
-
+
% test case:
%
% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=0.9\textheight,color=green]}
% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=1.0\textheight,color=green]}
% \placefigure[page,none]{}{\blackrule[width=\textwidth,height=1.1\textheight,color=green]}
-\def\sometextfloat[#1]% lang, links, rechts, hoog, midden, laag, offset
+% the [#1] will go away
+
+\def\sometextfloat[#1]%
{%\checkwaitingfloats{#1}%
- \gdef\dostoptextfloat{\dodostoptextfloat[#1]}% brr global
+ % todo: check if #1 is indeed \floatlocation or maybe more
\global\floattextwidth\hsize
\global\floatwidth\wd\floatbox
\global\floatheight\ht\floatbox % forget about the depth
\global\advance\floattextwidth -\floatwidth
\global\advance\floattextwidth -\rootfloatparameter\c!margin\relax % was \tfskipsize
+ \edef\floatlocation{#1}% to be sure
\doifinsetelse\v!tall{#1}
{\floattextheight\pagegoal
\advance\floattextheight -\pagetotal
@@ -947,14 +995,16 @@
\setbox\floattext\vbox to \floattextheight}
{\setbox\floattext\vbox}%
\bgroup
- \forgetall \setupblank \setupwhitespace % new, also needed for footnotes
+ \forgetall
+ \setupblank
+ \setupwhitespace % new, also needed for footnotes
\blank[\v!disable]
\hsize\floattextwidth
\ignorespaces}
-\def\dodostoptextfloat[#1]% % de tekst kan beter in een soort
- {\egroup % kadertekst zonder kader, is flexibeler
- \doifnotinset\v!tall{#1}% en beter
+\def\float_stop_text_indeed
+ {\egroup
+ \doifnotinset\v!tall\floatlocation
{\ifdim\ht\floattext<\floatheight
\floattextheight\floatheight
\else
@@ -962,27 +1012,27 @@
\fi}%
\setbox\floatbox\vbox to \floattextheight
{\hsize\floatwidth
- \doifinsetelse\v!both{#1}%
- {\doifinsetelse\v!low{#1}
+ \doifinsetelse\v!both\floatlocation
+ {\doifinsetelse\v!low\floatlocation
{\vfill\box\floatbox}
- {\doifinsetelse\v!middle{#1}
+ {\doifinsetelse\v!middle\floatlocation
{\vfill\box\floatbox\vfill}
{\box\floatbox\vfill}}}
{\box\floatbox\vfill}}%
\setbox\floattext\vbox to \floattextheight
{\hsize\floattextwidth
- \doifinsetelse\v!low{#1}
+ \doifinsetelse\v!low\floatlocation
{\vfill
\box\floattext
- \doifinset\c!offset{#1}{\whitespace\blank}}
- {\doifinsetelse\v!middle{#1}
+ \doifinset\c!offset\floatlocation{\whitespace\blank}}
+ {\doifinsetelse\v!middle\floatlocation
{\vfill
\box\floattext
\vfill}
- {\doifinset\v!offset{#1}{\whitespace\blank}%
+ {\doifinset\v!offset\floatlocation{\whitespace\blank}%
\box\floattext
\vfill}}}%
- \doifinsetelse\v!right{#1}% \floatmethod
+ \doifinsetelse\v!right\floatlocation
{\setbox\floatbox\hbox to \hsize
{\box\floattext
\hfill
@@ -994,13 +1044,12 @@
\baselinecorrection
\whitespace
\blank[\rootfloatparameter\c!spacebefore]%
- \doifnotinset\v!tall{#1}%
+ \doifnotinset\v!tall\floatlocation
{\dp\floatbox\openstrutdepth}% dp\strutbox}% % toegevoegd
\box\floatbox
\dostoptagged
\blank[\rootfloatparameter\c!spaceafter]%
- \endgroup % **
-% \dostoptagged
+ \float_end_text_group
\doinsertfloatinfo}
\def\somefacefloat[#1]% links, rechts, midden, hoog, midden, laag
@@ -1066,171 +1115,150 @@
\inheritedfloatframed{\box\floatbox}%
\endgroup}
-\newbox\tempfloatbox
-
% minwidth=fit,width=max : no overshoot, as wide as graphic
\ifdefined\moveboxontogrid\else \let\movecaptionontogrid\gobblethreearguments \fi
-% \def\locatefloatbox
-% {\alignstrutmode\zerocount
-% \shiftalignedline
-% {\floatparameter\c!leftmargin }{\floatparameter\c!rightmargin}%
-% {\floatparameter\c!innermargin}{\floatparameter\c!outermargin}%
-% \alignedline{\floatparameter\c!location}\v!middle}
-%
-% A quick hack by WS:
-
-\def\locatefloatbox
- {\alignstrutmode\zerocount
- \doifnotcommon{\floatcaptionparameter\c!location}{\v!outermargin,\v!innermargin,\v!leftmargin,\v!rightmargin}
- {\shiftalignedline
- {\floatparameter\c!leftmargin }{\floatparameter\c!rightmargin}%
- {\floatparameter\c!innermargin}{\floatparameter\c!outermargin}}%
- \alignedline{\floatparameter\c!location}\v!middle}
+\def\float_align_content_indeed
+ {\alignstrutmode\zerocount
+ \doifnotcommon{\floatcaptionparameter\c!location}{\v!outermargin,\v!innermargin,\v!leftmargin,\v!rightmargin}
+ {\shiftalignedline
+ {\floatparameter\c!leftmargin }{\floatparameter\c!rightmargin}%
+ {\floatparameter\c!innermargin}{\floatparameter\c!outermargin}}%
+ \alignedline{\floatparameter\c!location}\v!middle}
-\def\locatecaptionbox
+\def\float_align_caption_indeed
{\alignstrutmode\zerocount
\shiftalignedline
{\floatcaptionparameter\c!leftmargin }{\floatcaptionparameter\c!rightmargin}%
{\floatcaptionparameter\c!innermargin}{\floatcaptionparameter\c!outermargin}%
\alignedline{\floatparameter\c!location}\v!middle}
-\long\def\dosetpagfloat#1#2#3% \copy wegwerken
+\def\float_set_page_variant
{\bgroup
- \setlocalfloathsize
- \ifnum\floatrotation>0
+ \float_set_local_hsize
+ \ifcase\floatrotation\else
\swapdimens\hsize\vsize
\fi
\forgetall
\postponenotes
\dontcomplain
- \setbox\tempfloatbox\vbox{\borderedfloatbox}%
- \let\locatefloat \locatefloatbox
- \let\locatecaption\locatecaptionbox
- \docheckcaptioncontent{#2}{#3}%
+ \setbox\float_content_box\vbox{\borderedfloatbox}%
+ \let\float_align_content \float_align_content_indeed
+ \let\float_align_caption\float_align_caption_indeed
+ \check_float_caption_content
\ifcase\floatparameter\c!method
\or % automatic
\ifnofloatcaption
- \dopreparenocaption{#1}{#2}{#3}%
- \edef\width{\the\wd\floatbox}%
+ \prepare_no_float_caption
\doglobal\addlocalbackgroundtobox\floatbox
\else
% todo: installable maken, variant/method=auto vs macro
- \dopreparepagecaption{#1}{#2}{#3}%
- \settracedcaptionbox
- \edef\width{\the\wd\tempfloatbox}%
- \addlocalbackgroundtobox\tempfloatbox
- \setbox\tempcaptionbox\hbox
- {\dosetcaptionthings
- \floatcaptionparameter\c!command{\box\tempcaptionbox}}%
- \moveboxontogrid\tempcaptionbox{\floatcaptionparameter\c!grid}\lastcaptionht
- \addlocalbackgroundtobox\tempcaptionbox
- \buildfloatbox
+ \prepare_page_float_caption
+ \addlocalbackgroundtobox\float_content_box
+ \setbox\float_caption_box\hbox
+ {\floatcaptionparameter\c!command{\box\float_caption_box}}%
+ \moveboxontogrid\float_caption_box{\floatcaptionparameter\c!grid}\float_caption_height
+ \addlocalbackgroundtobox\float_caption_box
+ \build_float_box
\fi
\or % semi automatic
\or % manual
\fi
- \ifnum\floatrotation>0
- \global\setbox\floatbox\vbox
- {\rotate[\c!rotation=\floatrotation]{\box\floatbox}}%
- \edef\width{\the\wd\tempfloatbox}%
+ \ifcase\floatrotation
+ % weird, gone: \postcenterfloatbox\width
\else
- \postcenterfloatbox\width
+ \global\setbox\floatbox\vbox
+ {\rotate[\c!rotation=\number\floatrotation]{\box\floatbox}}%
\fi
\egroup}
\def\captionminwidth {15\bodyfontsize}
\def\captionovershoot {2em}
-\def\dopreparenocaption#1#2#3%
+\def\prepare_no_float_caption
{\global\setbox\floatbox\vbox % pas op als wd groter dan hsize
- {\ifinsidecolumns\ifdim\wd\tempfloatbox>\hsize
- \let\locatefloat\relax
+ {\ifinsidecolumns\ifdim\wd\float_content_box>\hsize
+ \let\float_align_content\relax
\fi\fi
- \locatefloat{\copy\tempfloatbox}}}
+ \float_align_content{\copy\float_content_box}}}
-\def\dopreparepagecaption#1#2#3%
+\def\prepare_page_float_caption
{\dostarttagged\t!floatcaption\empty
\doifinsetelse{\floatcaptionparameter\c!location}{\v!top,\v!bottom}
{\doifinsetelse{\floatcaptionparameter\c!width}{\v!fit,\v!max}
{\doifelse{\floatcaptionparameter\c!minwidth}\v!fit
{\doifelse{\floatcaptionparameter\c!width}\v!max
- {\dopreparestackcaptionmax{#1}{#2}{#3}}
- {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox % wider caption
+ {\dopreparestackcaptionmax}
+ {\ifdim\wd\float_caption_box>\wd\float_content_box % wider caption
\doifelse{\floatcaptionparameter\c!width}\v!fit
- {\dopreparestackcaptionaut{#1}{#2}{#3}}
- {\dopreparestackcaptionwid{#1}{#2}{#3}}%
+ {\dopreparestackcaptionaut}
+ {\dopreparestackcaptionwid}%
\else
- \dopreparestackcaptionmin{#1}{#2}{#3}%
+ \dopreparestackcaptionmin
\fi}}
- {\dopreparestackcaptionfix{#1}{#2}{#3}}}%
- {\dopreparesidewidthcaption{#1}{#2}{#3}}}% new, special effects (see icare)
+ {\dopreparestackcaptionfix}}%
+ {\dopreparesidewidthcaption}}% new, special effects (see icare)
{\doifinsetelse{\floatcaptionparameter\c!width}{\v!fit,\v!max}
- {\dopreparesideautocaption{#1}{#2}{#3}}
- {\dopreparesidewidthcaption{#1}{#2}{#3}}}%
+ {\dopreparesideautocaption}
+ {\dopreparesidewidthcaption}}%
\dostoptagged}
-% \def\dosettempcaptionbox
-% {\dosetraggedvbox{\floatcaptionparameter\c!align}%
-% \setbox\tempcaptionbox\raggedbox}
-
\def\dosettempcaptionbox
- {\setbox\tempcaptionbox\vbox\bgroup
+ {\setbox\float_caption_box\vbox\bgroup
%expanded{\setupalign[\v!new,\v!reset,\floatcaptionparameter\c!align,\v!old]}% wrong! see icare
\normalexpanded{\noexpand\setupalign[\v!reset,\floatcaptionparameter\c!align]}% i need to check what reset does
- \dosetcaptionthings
\let\next}
-\def\dopreparesideautocaption#1#2#3%
- {\scratchdimen\dimexpr\hsize-\wd\tempfloatbox-\floatparameter\c!margin\relax % was \tfskipsize\relax
- \ifdim\wd\tempcaptionbox>\scratchdimen
- \ifdim\wd\tempcaptionbox<1.3\scratchdimen
+\def\dopreparesideautocaption
+ {\scratchdimen\dimexpr\hsize-\wd\float_content_box-\floatparameter\c!margin\relax % was \tfskipsize\relax
+ \ifdim\wd\float_caption_box>\scratchdimen
+ \ifdim\wd\float_caption_box<1.3\scratchdimen
\scratchdimen0.8\scratchdimen
\fi
\fi
\dosettempcaptionbox
{\hsize\scratchdimen
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
-\def\dopreparesidewidthcaption#1#2#3%
+\def\dopreparesidewidthcaption
{\dosettempcaptionbox
{\hsize\floatcaptionparameter\c!width
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
-\def\dopreparestackcaptionfix#1#2#3%
+\def\dopreparestackcaptionfix
{\dosettempcaptionbox
{\hsize\floatcaptionparameter\c!minwidth % special effects
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
-\def\dopreparestackcaptionmax#1#2#3%
+\def\dopreparestackcaptionmax
{\dosettempcaptionbox
- {\hsize\wd\tempfloatbox
- \putcompletecaption{#2}{#3}}}
+ {\hsize\wd\float_content_box
+ \float_make_complete_caption}}
-\def\dopreparestackcaptionwid#1#2#3%
+\def\dopreparestackcaptionwid
{\dosettempcaptionbox
{\hsize\floatcaptionparameter\c!width
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
-\def\dopreparestackcaptionmin#1#2#3%
+\def\dopreparestackcaptionmin
{\dosettempcaptionbox
- {\hsize\wd\tempfloatbox
+ {\hsize\wd\float_content_box
\doifnothing{\floatcaptionparameter\c!align}\raggedcenter % on purpose overloads align !
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
-\def\dopreparestackcaptionaut#1#2#3%
+\def\dopreparestackcaptionaut
{\doifsomething{\floatcaptionparameter\c!align}
- {\doifnotinset{\v!middle}{\floatcaptionparameter\c!align}%
+ {\doifnotinset\v!middle{\floatcaptionparameter\c!align}%
{\let\captionovershoot\!!zeropoint}}%
- \edef\captionhsize{\the\wd\tempfloatbox}%
+ \edef\captionhsize{\the\wd\float_content_box}%
\ifdim\captionhsize>\hsize
% float is wider than \hsize
\dosettempcaptionbox
{\settrialtypesetting
\hsize\captionhsize
\notesenabledfalse
- \putcompletecaption{#2}{#3}}%
+ \float_make_complete_caption}%
\ifdim\ht\scratchbox>\lineheight % more lines
\dosettempcaptionbox
{\hsize\captionhsize
@@ -1238,11 +1266,11 @@
\ifdim\hsize<\captionminwidth\relax
\hsize\captionhsize
\fi
- \putcompletecaption{#2}{#3}}%
+ \float_make_complete_caption}%
\else
\dosettempcaptionbox
{\hsize\captionhsize
- \putcompletecaption{#2}{#3}}%
+ \float_make_complete_caption}%
\fi
\else
% float is smaller of equal to \hsize
@@ -1257,26 +1285,26 @@
\advance\scratchdimen 3em % an average word length
\ifdim\scratchdimen<\hsize \hsize\scratchdimen \fi
\notesenabledfalse
- \putcompletecaption{#2}{#3}}%
+ \float_make_complete_caption}%
\ifdim\ht\scratchbox>\lineheight
% at least an average word longer than a line
\dosettempcaptionbox
{\scratchdimen\captionhsize
\advance\scratchdimen \captionovershoot
\ifdim\scratchdimen<\hsize \hsize\scratchdimen \fi
- \putcompletecaption{#2}{#3}}%
+ \float_make_complete_caption}%
\else
% just over a line, don't use an overshoot % % % todo: outer/inner and such
\doifcommonelse{\floatcaptionparameter\c!align}{\v!left,\v!right,\v!flushleft,\v!flushright}
{\dosettempcaptionbox
{\hsize\captionhsize
% strange : \raggedcenter
- \putcompletecaption{#2}{#3}}}
+ \float_make_complete_caption}}
{% nicer
\dosettempcaptionbox
{\hsize\captionhsize
\doifnothing{\floatcaptionparameter\c!align}\raggedcenter% overloads
- \putcompletecaption{#2}{#3}}}%
+ \float_make_complete_caption}}%
\fi
\fi}
@@ -1287,66 +1315,67 @@
{\endgraf\nointerlineskip\floatcaptionparameter\c!inbetween\endgraf}
\def\dofloatboxdefaultbuilder % done
- {\locatefloat{\box\tempfloatbox}}
+ {\float_align_content{\box\float_content_box}}
\def\dofloatboxnextrightbuilder#1%
- {\ifparfloat \hbox \else \expandafter \locatefloat \fi
- {\tempfloatheight\ht\tempfloatbox
- \box\tempfloatbox
+ {\ifparfloat \hbox \else \expandafter \float_align_content \fi
+ {\tempfloatheight\ht\float_content_box
+ \box\float_content_box
\normalexpanded{\noexpand\doifnotinset{\v!hang}{\floatcaptionparameter\c!location}}{\dotfskip{\floatcaptionparameter\c!distance}}%
\vbox to\tempfloatheight{#1}}}
\def\dofloatboxnextleftbuilder#1%
- {\ifparfloat \hbox \else \expandafter \locatefloat \fi
- {\tempfloatheight\ht\tempfloatbox
+ {\ifparfloat \hbox \else \expandafter \float_align_content \fi
+ {\tempfloatheight\ht\float_content_box
\vbox to\tempfloatheight{#1}%
\normalexpanded{\noexpand\doifnotinset{\v!hang}{\floatcaptionparameter\c!location}}{\dotfskip{\floatcaptionparameter\c!distance}}%
- \box\tempfloatbox}}
+ \box\float_content_box}}
\def\dofloatboxnextouterbuilder
{\doifrightpagefloatelse\dofloatboxnextrightbuilder\dofloatboxnextleftbuilder}
+
\def\dofloatboxnextinnerbuilder
{\doifrightpagefloatelse\dofloatboxnextleftbuilder\dofloatboxnextrightbuilder}
\def\dofloatboxnextrighthangbuilder#1%
- {\ifparfloat \hbox \else \expandafter \locatefloat \fi
- {\tempfloatheight\ht\tempfloatbox
- \box\tempfloatbox
+ {\ifparfloat \hbox \else \expandafter \float_align_content \fi
+ {\tempfloatheight\ht\float_content_box
+ \box\float_content_box
\vbox to\tempfloatheight{#1}}}
\def\dofloatboxnextlefthangbuilder#1%
- {\ifparfloat \hbox \else \expandafter \locatefloat \fi
- {\tempfloatheight\ht\tempfloatbox
+ {\ifparfloat \hbox \else \expandafter \float_align_content \fi
+ {\tempfloatheight\ht\float_content_box
\vbox to\tempfloatheight{#1}%
- \box\tempfloatbox}}
+ \box\float_content_box}}
\def\dodofloatboxnextrightmarginbuilder#1#2%
{\ifparfloat
\hbox\bgroup
- \tempfloatheight\ht\tempfloatbox
- \box\tempfloatbox
+ \tempfloatheight\ht\float_content_box
+ \box\float_content_box
\hsmash{\hskip#1\vbox to\tempfloatheight{#2}}%
\egroup
\else
\begingroup
- \tempfloatheight\ht\tempfloatbox
+ \tempfloatheight\ht\float_content_box
\everyrightofalignedline{\hsmash{\hskip#1\vbox to\tempfloatheight{#2}}}%
- \locatefloat{\box\tempfloatbox}%
+ \float_align_content{\box\float_content_box}%
\endgroup
\fi}
\def\dodofloatboxnextleftmarginbuilder#1#2%
{\ifparfloat
\hbox\bgroup
- \tempfloatheight\ht\tempfloatbox
- \hsmash{\hskip-\dimexpr#1+\wd\tempcaptionbox\relax\vbox to\tempfloatheight{#2}}%
- \box\tempfloatbox
+ \tempfloatheight\ht\float_content_box
+ \hsmash{\hskip-\dimexpr#1+\wd\float_caption_box\relax\vbox to\tempfloatheight{#2}}%
+ \box\float_content_box
\egroup
\else
\begingroup
- \tempfloatheight\ht\tempfloatbox
- \everyleftofalignedline{\hsmash{\hskip-\dimexpr#1+\wd\tempcaptionbox\relax\vbox to\tempfloatheight{#2}}}%
- \locatefloat{\box\tempfloatbox}%
+ \tempfloatheight\ht\float_content_box
+ \everyleftofalignedline{\hsmash{\hskip-\dimexpr#1+\wd\float_caption_box\relax\vbox to\tempfloatheight{#2}}}%
+ \float_align_content{\box\float_content_box}%
\endgroup
\fi}
@@ -1391,11 +1420,11 @@
\next}
\def\doflushfloatleftcaptionhang
- {\hsmash{\llap{\box\tempcaptionbox\dotfskip{\floatcaptionparameter\c!distance}}}}
+ {\hsmash{\llap{\box\float_caption_box\dotfskip{\floatcaptionparameter\c!distance}}}}
\def\doflushfloatrightcaptionhang
- {\hsmash{\rlap{\dotfskip{\floatcaptionparameter\c!distance}\box\tempcaptionbox}}}
+ {\hsmash{\rlap{\dotfskip{\floatcaptionparameter\c!distance}\box\float_caption_box}}}
-\def\doflushfloatcaptionhang
+\def\doflushfloatcaptionhang % expanded can go
{\expanded{\doifinsetelse{\v!righthanging}{\floatcaptionparameter\c!location}}
{\doflushfloatrightcaptionhang}
{\expanded{\doifinsetelse{\v!lefthanging}{\floatcaptionparameter\c!location}}
@@ -1406,7 +1435,7 @@
{\expanded{\doifinsetelse{\v!right}{\floatcaptiondirectives}}
{\doflushfloatrightcaptionhang}
{\doflushfloatleftcaptionhang}}}
- {\box\tempcaptionbox}}}}
+ {\box\float_caption_box}}}}
\def\dofloatboxhighbuilder
{\dofloatboxnextbuilder{\dofloatboxbetweenstack\doflushfloatcaptionhang\vfill}}
@@ -1415,7 +1444,7 @@
{\dofloatboxnextbuilder{\vfill\doflushfloatcaptionhang\dofloatboxbetweenstack}}
\def\dofloatboxmiddlebuilder
- {\dofloatboxnextbuilder{\vfill\box\tempcaptionbox\vfill}}
+ {\dofloatboxnextbuilder{\vfill\box\float_caption_box\vfill}}
% \definefloat
% [lefty][lefties][figure]
@@ -1433,101 +1462,101 @@
% \placelefty{}{} \input tufte \input tufte
% \stoptext
-\def\bothangfloat#1{\ruledvbox to \ht\tempfloatbox{#1\vss}}
-\def\tophangfloat#1{\ruledvbox to \ht\tempfloatbox{\vss#1}}
+\def\bothangfloat#1{\ruledvbox to \ht\float_content_box{#1\vss}}
+\def\tophangfloat#1{\ruledvbox to \ht\float_content_box{\vss#1}}
\def\dofloatboxnormaltopstackbuilder
{\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\tophangfloat
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \hbox{\locatesidefloat{\box\tempcaptionbox}}%
+ \hbox{\locatesidefloat{\box\float_caption_box}}%
\dofloatboxbetweenstack
- \hbox{\hbox {\box\tempfloatbox }}%
+ \hbox{\hbox {\box\float_content_box }}%
\else
- \hbox{\locatetextfloat{\box\tempcaptionbox}}
+ \hbox{\locatetextfloat{\box\float_caption_box}}
\dofloatboxbetweenstack
- \hbox{\locatefloat {\box\tempfloatbox }}%
+ \hbox{\float_align_content {\box\float_content_box }}%
\fi}}
\def\dofloatboxnormalbotstackbuilder
{\expanded{\doifinset{\v!overlay}{\floatcaptionparameter\c!location}}\bothangfloat
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \hbox{\hbox {\box\tempfloatbox }}%
+ \hbox{\hbox {\box\float_content_box }}%
\dofloatboxbetweenstack
- \hbox{\locatesidefloat{\box\tempcaptionbox}}%
+ \hbox{\locatesidefloat{\box\float_caption_box}}%
\else
- \hbox{\locatefloat {\box\tempfloatbox }}%
+ \hbox{\float_align_content {\box\float_content_box }}%
\dofloatboxbetweenstack
- \hbox{\locatetextfloat{\box\tempcaptionbox}}%
+ \hbox{\locatetextfloat{\box\float_caption_box}}%
\fi}}
\def\dofloatboxgridtopstackbuilder
- {\dp\tempcaptionbox\strutdepth
+ {\dp\float_caption_box\strutdepth
\setbox\scratchbox\vbox
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \locatesidefloat{\box\tempcaptionbox}%
+ \locatesidefloat{\box\float_caption_box}%
\vss\dofloatboxbetweenstack
- \hbox {\box\tempfloatbox }%
+ \hbox {\box\float_content_box }%
\else
- \locatetextfloat{\box\tempcaptionbox}%
+ \locatetextfloat{\box\float_caption_box}%
\vss\dofloatboxbetweenstack
- \locatefloat {\box\tempfloatbox }%
+ \float_align_content {\box\float_content_box }%
\fi}%
\getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy
\vbox to \noflines\lineheight{\unvbox\scratchbox}}
\def\dofloatboxgridbotstackbuilder
- {\dp\tempcaptionbox\strutdepth
+ {\dp\float_caption_box\strutdepth
\setbox\scratchbox\vbox
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \hbox {\box\tempfloatbox }%
+ \hbox {\box\float_content_box }%
\vss\dofloatboxbetweenstack
- \locatesidefloat{\box\tempcaptionbox}%
+ \locatesidefloat{\box\float_caption_box}%
\else
- \locatefloat {\box\tempfloatbox }%
+ \float_align_content {\box\float_content_box }%
\vss\dofloatboxbetweenstack
- \locatetextfloat{\box\tempcaptionbox}%
+ \locatetextfloat{\box\float_caption_box}%
\fi}%
\getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy
\vbox to \noflines\lineheight{\unvbox\scratchbox}}
\def\dofloatboxstretchtopstackbuilder
- {\dp\tempcaptionbox\strutdepth
+ {\dp\float_caption_box\strutdepth
\setbox\scratchbox\vbox
- {\locatecaption{\copy\tempcaptionbox}%
- \locatefloat {\copy\tempfloatbox }}%
+ {\float_align_caption{\copy\float_caption_box}%
+ \float_align_content {\copy\float_content_box }}%
\getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy
\vbox to \noflines\lineheight
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \locatesidefloat{\box\tempcaptionbox}%
+ \locatesidefloat{\box\float_caption_box}%
\vss\dofloatboxbetweenstack\vss
- \hbox {\box\tempfloatbox }%
+ \hbox {\box\float_content_box }%
\else
- \locatetextfloat{\box\tempcaptionbox}%
+ \locatetextfloat{\box\float_caption_box}%
\vss\dofloatboxbetweenstack\vss
- \locatefloat {\box\tempfloatbox }%
+ \float_align_content {\box\float_content_box }%
\fi}}
\def\dofloatboxstretchbotstackbuilder
- {\dp\tempcaptionbox\strutdepth
+ {\dp\float_caption_box\strutdepth
\setbox\scratchbox\vbox
- {\locatefloat {\copy\tempfloatbox }%
- \locatecaption{\copy\tempcaptionbox}}%
+ {\float_align_content {\copy\float_content_box }%
+ \float_align_caption{\copy\float_caption_box}}%
\getnoflines{\dimexpr\htdp\scratchbox-10\scaledpoint\relax}% get rid of inaccuracy
\vbox to \noflines\lineheight
- {\tempfloatwidth\wd\tempfloatbox
+ {\tempfloatwidth\wd\float_content_box
\ifparfloat
- \hbox {\box\tempfloatbox }%
+ \hbox {\box\float_content_box }%
\vss\dofloatboxbetweenstack\vss
- \locatesidefloat{\box\tempcaptionbox}
+ \locatesidefloat{\box\float_caption_box}
\else
- \locatefloat {\box\tempfloatbox }%
+ \float_align_content {\box\float_content_box }%
\vss\dofloatboxbetweenstack\vss
- \locatetextfloat{\box\tempcaptionbox}%
+ \locatetextfloat{\box\float_caption_box}%
\fi}}
\def\dofloatboxtopbuilder
@@ -1544,14 +1573,14 @@
\v!stretch=>\let\next\dofloatboxstretchstackbuilder]%
\next}
-\def\relocatecaptionright#1{\locatecaption{\hbox to \tempfloatwidth{\hss#1}}}
-\def\relocatecaptionleft #1{\locatecaption{\hbox to \tempfloatwidth{#1\hss}}}
+\def\relocatecaptionright#1{\float_align_caption{\hbox to \tempfloatwidth{\hss#1}}}
+\def\relocatecaptionleft #1{\float_align_caption{\hbox to \tempfloatwidth{#1\hss}}}
\long\def\installfloatboxbuilder#1#2{\setvalue{\??kj:#1}{#2}}
-\def\buildfloatbox
+\def\build_float_box
{\global\setbox\floatbox\vbox
- {\setlocalfloathsize
+ {\float_set_local_hsize
\forgetall
\let\floatcaptionarrangement\s!default
\def\docommand##1%
@@ -1560,7 +1589,7 @@
\executeifdefined{\??kj:\floatcaptionarrangement}{\getvalue{\??kj:\s!default}}}}
\def\locatetextfloat
- {\let\next\locatecaption
+ {\let\next\float_align_caption
\expanded{\processallactionsinset[\floatcaptionparameter\c!location]}
[ \v!left=>\let\next\relocatecaptionleft,
\v!right=>\let\next\relocatecaptionright,
@@ -1621,71 +1650,73 @@
\box\floatbox
\ifdone\hskip\effectiverightskip\fi\hss}}
-\long\def\dosetparfloat#1#2#3%
+\def\float_set_paragraph_variant
{\bgroup
\forgetall
\postponenotes
\dontcomplain
%\showcomposition
- \setbox\tempfloatbox\vbox{\borderedfloatbox}%
- \addlocalbackgroundtobox\tempfloatbox % no \doglobal
+ \setbox\float_content_box\vbox{\borderedfloatbox}%
+ \addlocalbackgroundtobox\float_content_box % no \doglobal
\ifnofloatcaption
- \global\setbox\floatbox\vbox{\box\tempfloatbox}%
+ \global\setbox\floatbox\vbox{\box\float_content_box}%
\else
- \docheckcaptioncontent{#2}{#3}%
- \dopreparesidecaption{#1}{#2}{#3}%
- \settracedcaptionbox
- \setbox\tempcaptionbox\hbox{\floatcaptionparameter\c!command{\box\tempcaptionbox}}%
- \moveboxontogrid\tempcaptionbox{\floatcaptionparameter\c!grid}\lastcaptionht
- \addlocalbackgroundtobox\tempcaptionbox % no \doglobal
- \buildsidefloatbox
+ \check_float_caption_content
+ \prepare_side_float_caption
+ \setbox\float_caption_box\hbox{\floatcaptionparameter\c!command{\box\float_caption_box}}%
+ \moveboxontogrid\float_caption_box{\floatcaptionparameter\c!grid}\float_caption_height
+ \addlocalbackgroundtobox\float_caption_box % no \doglobal
+ \build_side_float_box
\fi
\egroup}
-\def\dopreparesidecaption#1#2#3% will be enhanced
+\def\prepare_side_float_caption
{\doifelse{\floatcaptionparameter\c!width}\v!max
{\dosettempcaptionbox
- {\hsize\wd\tempfloatbox
- \putcompletecaption{#2}{#3}}}%
+ {\hsize\wd\float_content_box
+ \float_make_complete_caption}}%
{\doifelse{\floatcaptionparameter\c!width}\v!fit
- {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox\relax
- \setbox\tempcaptionbox\vbox
+ {\ifdim\wd\float_caption_box>\wd\float_content_box\relax
+ \setbox\float_caption_box\vbox
{\forgetall % needed?
- \hsize\wd\tempfloatbox
- \dosetcaptionthings
- \putcompletecaption{#2}{#3}}%
+ \hsize\wd\float_content_box
+ \float_make_complete_caption}%
\else
- \setbox\tempcaptionbox\hbox to \wd\tempfloatbox
- {\hss\box\tempcaptionbox\hss}%
+ \setbox\float_caption_box\hbox to \wd\float_content_box
+ {\hss\box\float_caption_box\hss}%
\fi}
{\dosettempcaptionbox
- {\hsize\floatcaptionparameter\c!width % \wd\tempfloatbox
- \putcompletecaption{#2}{#3}}}}}
+ {\hsize\floatcaptionparameter\c!width % \wd\float_content_box
+ \float_make_complete_caption}}}}
-\def\buildsidefloatbox
- {\let\locatefloat \relax
- \let\locatecaption\relax
+\def\build_side_float_box
+ {\let\float_align_content\relax
+ \let\float_align_caption\relax
\def\locatesidefloat##1%
{\begingroup
\alignstrutmode\zerocount
\hsize\tempfloatwidth \forgetall
\alignedline{\floatparameter\c!location}\v!middle{##1}%
\endgroup}%
- \buildfloatbox}
+ \build_float_box}
\newif\ifparfloat
-\long\def\dosetfloatbox#1#2#3% todo : \global\setbox, currently messy
+\def\float_set_box % todo : \global\setbox, currently messy
{\ifvisible
\par
\edef\floatcaptiondirectives{\floatparameter\c!location,\floatcaptionparameter\c!location}%
- \ifparfloat\@EA\dosetparfloat\else\@EA\dosetpagfloat\fi{#1}{#2}{#3}%
- \setlocalfloatdimensions{#1}%
+ \ifparfloat
+ \float_set_paragraph_variant
+ \else
+ \float_set_page_variant
+ \fi
+ \float_set_local_dimensions
\global\advance\totalnoffloats\plusone
\setbox\floatbox\hbox{\dosavefloatdata\box\floatbox}% still needed? we will do renumbering differently
\global\floatheight\htdp\floatbox
\global\floatwidth\wd\floatbox
- \doifnotinset\v!margin{#1} % gaat namelijk nog fout
+ \doifnotinset\v!margin\floatlocation % gaat namelijk nog fout
{\setbox\floatbox\vbox
{\parindent\zeropoint
\doifconcepttracing{\inleftmargin{\framed{\infofont\the\totalnoffloats}}}%
@@ -1700,10 +1731,6 @@
\fi}
\newcounter\noxfloatlocations
-
-\long\def\dofloat#1#2#3% #1 is optionlist
- {\dosetfloatbox{#1}{#2}{#3}%
- \dogetfloatbox{#1}\empty}
\def\dooutput{\sidefloatoutput} % redefinition of \dooutput
@@ -1738,25 +1765,23 @@
\def\setfloatmethodvariables#1% \floatmethod \floatlabel \floatrow \floatcolumn
{\ctxcommand{analysefloatmethod("#1")}}
-\def\dogetfloatbox#1#2%
+\def\float_get_box
{\ifvisible
- \let \floatlabel \empty
- \let \floatcolumn\empty
- \let \floatrow \empty
- \edef\floatmethod{#2}%
- \ifx\floatmethod\empty
- \setfloatmethodvariables{#1}%
- % todo: nog algemeen otr
- \ifdefined\OTRSETsetpreferedcolumnslot
- \OTRSETsetpreferedcolumnslot\floatcolumn\floatrow
- \fi
+ \let\floatlabel \empty
+ \let\floatcolumn\empty
+ \let\floatrow \empty
+ \setfloatmethodvariables\floatlocation
+ % todo: nog algemeen otr
+ \ifdefined\OTRSETsetpreferedcolumnslot
+ \OTRSETsetpreferedcolumnslot\floatcolumn\floatrow
+ \fi
+ \ifcsname\string\floatmethod\floatmethod\endcsname \else
+ \let\floatmethod\v!here
+ \fi
+ \ifx\forcedfloatmethod\empty \else
+ \let\floatmethod\forcedfloatmethod
\fi
- \doifundefined{\string\floatmethod\floatmethod}
- {\let\floatmethod\v!here}%
- \doifsomething\forcedfloatmethod
- {\edef\floatmethod{\forcedfloatmethod}}%
- %\getvalue{\string\floatmethod\floatmethod}[#1]%
- \getvalue{\string\floatmethod\floatmethod}[\floatmethod,#1]%
+ \getvalue{\string\floatmethod\floatmethod}[\floatmethod,\floatlocation]%
\fi}
\def\installfloathandler#1#2% #1=keyword #2=handler
diff --git a/tex/context/base/strc-num.mkiv b/tex/context/base/strc-num.mkiv
index 7daffc399..6ff70ae36 100644
--- a/tex/context/base/strc-num.mkiv
+++ b/tex/context/base/strc-num.mkiv
@@ -346,14 +346,123 @@
\newconditional\hasstructurecountertitle
\newconditional\hasstructurecounternumber
-\def\dostructurecountercomponent#1#2#3#4#5#6#7[#8][#9]%
+% \def\dostructurecountercomponent#1#2#3#4#5#6#7[#8][#9]%
+% {\begingroup
+% %
+% #2[\s!haslevel=1,#8]%
+% \edef\hasstructurecountercaption{#3\s!hascaption}%
+% \edef\hasstructurecountertitle {#3\s!hastitle}%
+% \edef\hasstructurecounternumber {#3\s!hasnumber}%
+% \edef\hasstructurecounterlevel {#3\s!haslevel}%
+% %
+% \edef\askedprefixsegments{#3\c!prefixsegments}%
+% \ifx\askedprefixsegments\v!auto
+% \edef\askedprefixsegments{\autostructureprefixsegments#3}%
+% \fi
+% %
+% \edef\currentname{#3\c!name}%
+% \ifx\currentname\empty
+% \edef\currentname{#1}%
+% \fi
+% \edef\currentcounter{#3\s!counter}%
+% \ifx\currentcounter\empty
+% \let\currentcounter\currentname
+% \fi
+% %
+% \doif{#3\c!title}\v!none{\setfalse\hasstructurecountercaption\setfalse\hasstructurecounternumber}% will become obsolete
+% %
+% \ifx\hasstructurecounternumber\v!yes % here due to previous test but best in callers
+% \doincrementsubstructurecounter[\currentcounter][\hasstructurecounterlevel]%
+% \fi
+% %
+% \ifx\hasstructurecountercaption\v!yes
+% \edef\currentexpansion{#3\c!expansion}%
+% \ifx\currentexpansion\s!xml
+% \edef\currenttitle{#4\c!title}%
+% \edef\currentbookmark{#4\c!bookmark}%
+% \xmlstartraw
+% \edef\currentlisttitle{#3\c!title}%
+% \xmlstopraw
+% \let\currentcoding\s!xml
+% \else
+% \ifx\currentexpansion\v!yes
+% \edef\currenttitle{#3\c!title}%
+% \edef\currentbookmark{#3\c!bookmark}%
+% \else
+% \edef\currenttitle{#4\c!title}%
+% \edef\currentbookmark{#4\c!bookmark}%
+% \fi
+% \let\currentlisttitle\currenttitle
+% \let\currentcoding\s!tex
+% \fi
+% \edef\currentlabel{#3\c!label}%
+% \edef\currentreference{#3\c!reference}%
+% \setnextinternalreference
+% \xdef\laststructurecounternumber{\ctxlua{structures.lists.push{
+% metadata = {
+% kind = "#1",
+% name = "\currentname",
+% level = structures.sections.currentlevel(),
+% catcodes = \the\catcodetable,
+% },
+% references = {
+% internal = \nextinternalreference,
+% reference = "\currentreference",
+% referenceprefix = "\referenceprefix",
+% block = "\currentsectionblock",
+% section = structures.sections.currentid(),
+% },
+% titledata = {
+% label = \!!bs\detokenize\expandafter{\currentlabel }\!!es,
+% title = \!!bs\detokenize\expandafter{\currenttitle }\!!es,
+% \ifx\currentbookmark\currenttitle \else
+% bookmark = \!!bs\detokenize\expandafter{\currentbookmark }\!!es,
+% \fi
+% \ifx\currentlisttitle\currenttitle \else
+% list = \!!bs\detokenize\expandafter{\currentlisttitle}\!!es,
+% \fi
+% },
+% \ifx\hasstructurecounternumber\v!yes
+% prefixdata = {
+% prefix = "#3\c!prefix",
+% separatorset = "#3\c!prefixseparatorset",
+% conversion = \!!bs#3\c!prefixconversion\!!es,
+% conversionset = "#3\c!prefixconversionset",
+% set = "#3\c!prefixset",
+% % segments = "#3\c!prefixsegments",
+% segments = "\askedprefixsegments",
+% connector = \!!bs#3\c!prefixconnector\!!es,
+% },
+% numberdata = {
+% numbers = structures.counters.compact("\currentcounter",nil,true),
+% separatorset = "#3\c!numberseparatorset",
+% conversion = \!!bs#3\c!numberconversion\!!es,
+% conversionset = "#3\c!numberconversionset",
+% starter = \!!bs#3\c!numberstarter\!!es,
+% stopper = \!!bs#3\c!numberstopper\!!es,
+% segments = "#3\c!numbersegments",
+% },
+% \fi
+% userdata = structures.helpers.touserdata(\!!bs\detokenize{#9}\!!es)
+% }
+% }}%
+% \xdef\laststructurecounterattribute {\ctxlua {tex.write(structures.references.setinternalreference(nil,nil,\nextinternalreference))}}%
+% \xdef\laststructurecountersynchronize{\ctxlatelua{structures.lists.enhance(\laststructurecounternumber)}}%
+% \else
+% \glet\laststructurecounternumber \relax
+% \glet\laststructurecounterattribute \attributeunsetvalue
+% \glet\laststructurecountersynchronize\relax
+% \fi
+% \endgroup}
+
+\def\dostructurecountercomponent#1#2#3#4#5#6#7[#8][#9]% maybe also nolist
{\begingroup
%
#2[\s!haslevel=1,#8]%
+ \edef\hasstructurecounterlevel {#3\s!haslevel}%
\edef\hasstructurecountercaption{#3\s!hascaption}%
\edef\hasstructurecountertitle {#3\s!hastitle}%
\edef\hasstructurecounternumber {#3\s!hasnumber}%
- \edef\hasstructurecounterlevel {#3\s!haslevel}%
%
\edef\askedprefixsegments{#3\c!prefixsegments}%
\ifx\askedprefixsegments\v!auto
@@ -376,50 +485,82 @@
\fi
%
\ifx\hasstructurecountercaption\v!yes
- \edef\currentexpansion{#3\c!expansion}%
- \ifx\currentexpansion\s!xml
- \edef\currenttitle{#4\c!title}%
- \edef\currentbookmark{#4\c!bookmark}%
+ \xdef\currentstructurecomponentname {#3\c!name}%
+ \xdef\currentstructurecomponentlevel {#3\c!level}%
+ \edef\currentstructurecomponentexpansion {#3\c!expansion}%
+ \xdef\currentstructurecomponentxmlsetup {#3\c!xmlsetup}%
+ \xdef\currentstructurecomponentcatcodes {#3\s!catcodes}%
+ \xdef\currentstructurecomponentlabel {#3\c!label}%
+ \xdef\currentstructurecomponentreference {#3\c!reference}%
+ \xdef\currentstructurecomponentreferenceprefix{#3\c!referenceprefix}%
+ \ifx\currentstructurecomponentexpansion\s!xml
\xmlstartraw
- \edef\currentlisttitle{#3\c!title}%
+ \xdef\currentstructurecomponenttitle {#3\c!title}%
+ \xdef\currentstructurecomponentbookmark{#3\c!bookmark}%
+ \xdef\currentstructurecomponentmarking {#3\c!marking}%
+ \xdef\currentstructurecomponentlist {#3\c!list}%
\xmlstopraw
- \let\currentcoding\s!xml
+ \ifx\currentstructurecomponentlist\empty
+ \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
+ \fi
+ \globallet\currentstructurecomponentcoding\s!xml
\else
- \ifx\currentexpansion\v!yes
- \edef\currenttitle{#3\c!title}%
- \edef\currentbookmark{#3\c!bookmark}%
+ \ifx\currentstructurecomponentexpansion\v!yes
+ \xdef\currentstructurecomponenttitle {#3\c!title}%
+ \xdef\currentstructurecomponentbookmark{#3\c!bookmark}%
+ \xdef\currentstructurecomponentmarking {#3\c!marking}%
+ \xdef\currentstructurecomponentlist {#3\c!list}%
\else
- \edef\currenttitle{#4\c!title}%
- \edef\currentbookmark{#4\c!bookmark}%
+ \xdef\currentstructurecomponenttitle {#4\c!title}%
+ \xdef\currentstructurecomponentbookmark{#4\c!bookmark}%
+ \xdef\currentstructurecomponentmarking {#4\c!marking}%
+ \xdef\currentstructurecomponentlist {#4\c!list}%
+ \iflocation \ifx\currentstructurecomponentbookmark\empty
+ \begingroup
+ \simplifycommands
+ \xdef\currentstructurecomponentbookmark{\detokenize\expandafter{\normalexpanded{#3\c!title}}}%
+ \endgroup
+ \fi \fi
+ \fi
+ \ifx\currentstructurecomponentlist\empty
+ \globallet\currentstructurecomponentlist\currentstructurecomponenttitle
\fi
- \let\currentlisttitle\currenttitle
- \let\currentcoding\s!tex
+ \globallet\currentstructurecomponentcoding\s!tex
\fi
- \edef\currentlabel{#3\c!label}%
- \edef\currentreference{#3\c!reference}%
+ %
\setnextinternalreference
\xdef\laststructurecounternumber{\ctxlua{structures.lists.push{
metadata = {
kind = "#1",
name = "\currentname",
level = structures.sections.currentlevel(),
- catcodes = \the\catcodetable,
+ catcodes = \the\ifx\currentstructurecomponentcatcodes\empty\catcodetable\else\csname\currentstructurecomponentcatcodes\endcsname\fi,
+ coding = "\currentstructurecomponentcoding",
+ \ifx\currentstructurecomponentcoding\s!xml
+ xmlroot = "\xmldocument",
+ \fi
+ \ifx\currentstructurecomponentxmlsetup\empty \else
+ xmlsetup = "\currentstructurexmlsetup",
+ \fi
},
references = {
internal = \nextinternalreference,
- reference = "\currentreference",
- referenceprefix = "\referenceprefix",
block = "\currentsectionblock",
+ reference = "\currentstructurecomponentreference",
+ referenceprefix = "\currentstructurecomponentreferenceprefix",
section = structures.sections.currentid(),
},
titledata = {
- label = \!!bs\detokenize\expandafter{\currentlabel }\!!es,
- title = \!!bs\detokenize\expandafter{\currenttitle }\!!es,
- \ifx\currentbookmark\currenttitle \else
- bookmark = \!!bs\detokenize\expandafter{\currentbookmark }\!!es,
+ label = \!!bs\detokenize\expandafter{\currentstructurecomponentlabel }\!!es,
+ title = \!!bs\detokenize\expandafter{\currentstructurecomponenttitle }\!!es,
+ \ifx\currentstructurecomponentbookmark\currentstructurecomponenttitle \else
+ bookmark = \!!bs\detokenize\expandafter{\currentstructurecomponentbookmark }\!!es,
+ \fi
+ \ifx\currentstructurecomponentmarking\currentstructurecomponenttitle \else
+ marking = \!!bs\detokenize\expandafter{\currentstructurecomponentmarking }\!!es,
\fi
- \ifx\currentlisttitle\currenttitle \else
- list = \!!bs\detokenize\expandafter{\currentlisttitle}\!!es,
+ \ifx\currentstructurecomponentlist\currentstructurecomponenttitle \else
+ list = \!!bs\detokenize\expandafter{\currentstructurecomponentlist}\!!es,
\fi
},
\ifx\hasstructurecounternumber\v!yes
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 1a90c89b0..3a9424098 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -4530,7 +4530,7 @@
%D a row. In both commands, the \type{n*} is optional. When this
%D specification is missing, the command executes once.
-\def\dorepeatwithcommand[#1]%
+\unexpanded\def\dorepeatwithcommand[#1]%
{\dodorepeatwithcommand#1*\empty*\relax}
\def\dodorepeatwithcommand#1*#2#3*#4\relax#5%
@@ -4540,7 +4540,8 @@
{\ifx#2\empty % redundant but gives cleaner extensions
#4{#1}%
\else\ifnum#1<\zerocount
- \normalexpanded{\dorecurse{\number-\number#1}}{#4{-#2#3}}%
+ %\normalexpanded{\dorecurse{\number-\number#1}}{#4{-#2#3}}%
+ \dorecurse{-#1}{#4{-#2#3}}%
\else\ifx#2+%
\dorecurse{#1}{#4{#3}}%
\else
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index 870bb2d8e..6590c6625 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -1491,7 +1491,7 @@
{\xdef\restarttable{\noexpand\dorestarttable{\noexpand\thirdstagestarttable{#1}}}}
{\doifdefinedelse{\s!TaBlE#1}
{\gdef\restarttable{\getvalue{\s!TaBlE#1}}}
- {\gdef\restarttable{\dorestartable{\getvalue{#1}}}}}%
+ {\gdef\restarttable{\dorestarttable{\getvalue{#1}}}}}%
\egroup
\restarttable}
diff --git a/tex/context/base/tabl-xnt.mkvi b/tex/context/base/tabl-xnt.mkvi
index 238bb6a28..1794100af 100644
--- a/tex/context/base/tabl-xnt.mkvi
+++ b/tex/context/base/tabl-xnt.mkvi
@@ -103,8 +103,8 @@
\let\eTR \stopxrow
\let\bTD \startxcell
\let\eTD \stopxcell
- \let\bTH \startxcell
- \let\eTH \stopxcell
+ \let\bTH \start_x_cell_th
+ \let\eTH \stop_x_cell_th
\let\setupTABLE\setup_x_table_TABLE
\let\bTABLE \start_x_table_TABLE
\let\eTABLE \stop_x_table_TABLE}
@@ -113,12 +113,20 @@
\unexpanded\def\start_x_table_TABLE{\dosingleempty\do_start_x_table_TABLE}
\unexpanded\def\stop_x_table_TABLE {\stopxtable}
-\def\do_setup_x_table_TABLE[#settings]%
+\unexpanded\def\start_x_cell_th
+ {\startxcellgroup[\c!foregroundstyle=\v!bold]%
+ \startxcell}
+
+\unexpanded\def\stop_x_cell_th
+ {\stopxcell
+ \stopxcellgroup}
+
+\unexpanded\def\do_setup_x_table_TABLE[#settings]%
{\iffirstargument
\setupxtable[#settings]%
\fi}
-\def\do_start_x_table_TABLE[#settings]%
+\unexpanded\def\do_start_x_table_TABLE[#settings]%
{\bgroup
\x_table_prepare{#settings}%
\edef\x_table_current_buffer{\x_table_default_buffer}%
diff --git a/tex/context/base/tabl-xtb.lua b/tex/context/base/tabl-xtb.lua
index 0621c0769..715acab73 100644
--- a/tex/context/base/tabl-xtb.lua
+++ b/tex/context/base/tabl-xtb.lua
@@ -6,6 +6,23 @@ if not modules then modules = { } end modules ['tabl-xtb'] = {
license = "see context related readme files"
}
+--[[
+
+This table mechanism is a combination between TeX and Lua. We do process
+cells at the TeX end and inspect them at the Lua end. After some analysis
+we have a second pass using the calculated widths, and if needed cells
+will go through a third pass to get the heights right. This last pass is
+avoided when possible which is why some code below looks a bit more
+complex than needed. The reason for such optimizations is that each cells
+is actually a framed instance and because tables like this can be hundreds
+of pages we want to keep processing time reasonable.
+
+To a large extend the behaviour is comparable with the way bTABLE/eTABLE
+works and there is a module that maps that one onto this one. Eventually
+this mechamism will be improved so that it can replace its older cousin.
+
+]]--
+
local texdimen = tex.dimen
local texcount = tex.count
local texbox = tex.box
@@ -271,8 +288,8 @@ function xtables.initialize_construct()
w = w + widths[c+x]
end
for y=1,drc.ny-1 do
- h = h + heights[c+y]
- d = d + depths[c+y]
+ h = h + heights[r+y]
+ d = d + depths[r+y]
end
texdimen.x_table_width = w
texdimen.x_table_height = h + d
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi
index 827811b46..57d88a13e 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/tabl-xtb.mkvi
@@ -17,6 +17,18 @@
\registerctxluafile{tabl-xtb}{1.001}
+% todo:
+%
+% - yes or no: foregroundstyle/color <- style/color
+% - template alignment
+% - maybe split horizontal (a la linetables)
+% - before/after and wrapping (linecorrection)
+% - maybe also some before/after commands
+% - maybe correction when non float usage
+% - tagging needs to be checked
+% - maybe only tag the box
+% - scale to fit
+%
%D This module started as an afternoon experiment and surprisingly could be
%D mostly finished the same evening. Of course it builds upon existing
%D functionality. The main reason for writing it is that we occasionally
@@ -49,17 +61,6 @@
% \def\v!xtable{xtable}
-% todo:
-%
-% - template alignment
-% - maybe split horizontal (a la linetables)
-% - before/after and wrapping (linecorrection)
-% - maybe also some before/after commands
-% - maybe correction when non float usage
-% - tagging needs to be checked
-% - maybe only tag the box
-% - scale to fit
-%
% option=stretch : equal distribution
% option={stretch,width} : proportional distribution
% option={max} : prefer max over forced width/height
@@ -107,6 +108,8 @@
\c!frameoffset=.5\linewidth,
\c!backgroundoffset=\v!frame,
% \c!framecolor=\s!black,
+ % \c!foregroundstyle=\xtableparameter\c!style, % not clean, better capture elsewhere
+ % \c!foregroundcolor=\xtableparameter\c!color, % not clean, better capture elsewhere
\c!width=\v!fit,
\c!height=\v!fit,
\c!maxwidth=8em,
@@ -157,6 +160,33 @@
{\x_table_prepare{#settings}%
\let\start_x_table\normal_start_x_table}
+%D We can also define xtables:
+
+\appendtoks
+ \setuevalue{\e!start\currentxtable}{\start_named_x_table{\currentxtable}}%
+ \setuevalue{\e!stop \currentxtable}{\stop_named_x_table}%
+\to \everydefinextable
+
+\unexpanded\def\start_named_x_table#tag%
+ {\bgroup
+ \edef\currentxtable{#tag}%
+ \dosingleempty\start_named_x_table_indeed}
+
+\unexpanded\def\start_named_x_table_indeed[#settings]%
+ {\advance\x_table_nesting\plusone
+ \dostarttagged\t!table\empty
+ \forgetall
+ \iffirstargument
+ \setupcurrentxtable[#settings]%
+ \fi
+ \edef\x_table_current_buffer{\x_table_default_buffer}%
+ \normalexpanded{\dodowithbuffer{\x_table_current_buffer}{\e!start\currentxtable}{\e!stop\currentxtable}\relax\x_table_process}}
+
+\unexpanded\def\stop_named_x_table
+ {}
+
+%D Now we come to processing:
+
\def\x_table_prepare#settings% assumes \iffirstargument to be set
{\advance\x_table_nesting\plusone
\dostarttagged\t!table\empty
diff --git a/tex/context/base/task-ini.lua b/tex/context/base/task-ini.lua
index 9fca612a0..4021bd6f1 100644
--- a/tex/context/base/task-ini.lua
+++ b/tex/context/base/task-ini.lua
@@ -43,6 +43,8 @@ appendaction("processors", "lists", "typesetters.kerns.handler")
appendaction("processors", "lists", "typesetters.digits.handler") -- disabled (after otf handling)
appendaction("processors", "lists", "typesetters.italics.handler") -- disabled (after otf/kern handling)
+-- appendaction("processors", "fonts", "typesetters.italics.handler") -- disabled (after otf/kern handling)
+
appendaction("processors", "lists", "typesetters.paragraphs.handler") -- disabled
appendaction("shipouts", "normalizers", "nodes.handlers.cleanuppage") -- disabled
diff --git a/tex/context/base/trac-inf.lua b/tex/context/base/trac-inf.lua
index a5a87c78d..cbc9d13f8 100644
--- a/tex/context/base/trac-inf.lua
+++ b/tex/context/base/trac-inf.lua
@@ -116,7 +116,7 @@ function statistics.show(reporter)
return lower(status.banner)
end)
register("control sequences", function()
- return format("%s of %s", status.cs_count, status.hash_size+status.hash_extra)
+ return format("%s of %s + %s", status.cs_count, status.hash_size,status.hash_extra)
end)
register("callbacks", function()
local total, indirect = status.callbacks or 0, status.indirect_callbacks or 0
diff --git a/tex/context/base/trac-set.lua b/tex/context/base/trac-set.lua
index f7708b5d5..bc0070eb4 100644
--- a/tex/context/base/trac-set.lua
+++ b/tex/context/base/trac-set.lua
@@ -314,6 +314,8 @@ end
if texconfig then
+ -- this happens too late in ini mode but that is no problem
+
local function set(k,v)
v = tonumber(v)
if v then
diff --git a/tex/context/base/typo-itc.lua b/tex/context/base/typo-itc.lua
index 7e9d6d923..d294dd60a 100644
--- a/tex/context/base/typo-itc.lua
+++ b/tex/context/base/typo-itc.lua
@@ -8,39 +8,39 @@ if not modules then modules = { } end modules ['typo-itc'] = {
local utfchar = utf.char
-local trace_italics = false trackers.register("typesetters.italics", function(v) trace_italics = v end)
+local trace_italics = false trackers.register("typesetters.italics", function(v) trace_italics = v end)
-local report_italics = logs.reporter("nodes","italics")
+local report_italics = logs.reporter("nodes","italics")
-typesetters.italics = typesetters.italics or { }
-local italics = typesetters.italics
+typesetters.italics = typesetters.italics or { }
+local italics = typesetters.italics
-local nodecodes = nodes.nodecodes
-local glyph_code = nodecodes.glyph
-local kern_code = nodecodes.kern
-local glue_code = nodecodes.glue
-local disc_code = nodecodes.disc
+local nodecodes = nodes.nodecodes
+local glyph_code = nodecodes.glyph
+local kern_code = nodecodes.kern
+local glue_code = nodecodes.glue
+local disc_code = nodecodes.disc
-local tasks = nodes.tasks
+local tasks = nodes.tasks
-local insert_node_after = node.insert_after
-local delete_node = nodes.delete
-local has_attribute = node.has_attribute
+local insert_node_after = node.insert_after
+local delete_node = nodes.delete
+local has_attribute = node.has_attribute
-local texattribute = tex.attribute
-local a_italics = attributes.private("italics")
-local unsetvalue = attributes.unsetvalue
+local texattribute = tex.attribute
+local a_italics = attributes.private("italics")
+local unsetvalue = attributes.unsetvalue
------ new_correction = nodes.pool.fontkern
-local new_correction = nodes.pool.glue
+local new_correction_kern = nodes.pool.fontkern
+local new_correction_glue = nodes.pool.glue
-local points = number.points
+local points = number.points
-local fonthashes = fonts.hashes
-local fontdata = fonthashes.identifiers
-local italicsdata = fonthashes.italics
+local fonthashes = fonts.hashes
+local fontdata = fonthashes.identifiers
+local italicsdata = fonthashes.italics
-local forcedvariant = false
+local forcedvariant = false
function typesetters.italics.forcevariant(variant)
forcedvariant = variant
@@ -80,6 +80,7 @@ local function setitalicinfont(font,char)
end
end
+-- todo: clear attribute
local function process(namespace,attribute,head)
local done = false
@@ -106,7 +107,7 @@ local function process(namespace,attribute,head)
if trace_italics then
report_italics("inserting %s between italic %s and regular %s",points(italic),utfchar(prevchar),utfchar(char))
end
- insert_node_after(head,previous,new_correction(italic))
+ insert_node_after(head,previous,new_correction_kern(italic))
done = true
end
elseif inserted and data then
@@ -156,7 +157,7 @@ local function process(namespace,attribute,head)
if trace_italics then
report_italics("inserting %s between italic %s and glue",points(italic),utfchar(prevchar))
end
- inserted = new_correction(italic)
+ inserted = new_correction_glue(italic) -- maybe just add ? else problem with penalties
insert_node_after(head,previous,inserted)
italic = 0
done = true
@@ -166,7 +167,7 @@ local function process(namespace,attribute,head)
report_italics("inserting %s between italic %s and whatever",points(italic),utfchar(prevchar))
end
inserted = nil
- insert_node_after(head,previous,new_correction(italic),new_correction(italic))
+ insert_node_after(head,previous,new_correction_kern(italic))
italic = 0
done = true
end
@@ -176,7 +177,7 @@ local function process(namespace,attribute,head)
if trace_italics then
report_italics("inserting %s between italic %s and end of list",points(italic),utfchar(prevchar))
end
- insert_node_after(head,previous,new_correction(italic),new_correction(italic))
+ insert_node_after(head,previous,new_correction_kern(italic))
done = true
end
return head, done
diff --git a/tex/context/base/typo-mar.lua b/tex/context/base/typo-mar.lua
index a2936592c..6e941bac0 100644
--- a/tex/context/base/typo-mar.lua
+++ b/tex/context/base/typo-mar.lua
@@ -462,10 +462,13 @@ local function inject(parent,head,candidate)
end
candidate.width = width
candidate.hsize = parent.width -- we can also pass textwidth
+ if trace_margindata then
+ report_margindata("processing, index %s, height: %s, depth: %s",candidate.n,height,depth)
+ end
if firstonstack then
offset = 0
else
- offset = offset + height
+-- offset = offset + height
end
if stack == v_yes then
offset = offset + candidate.dy
@@ -480,7 +483,7 @@ local function inject(parent,head,candidate)
if method == v_top then
local delta = height - parent.height
if trace_margindata then
- report_margindata("top aligned: %s, amount: %s",candidate.n,delta)
+ report_margindata("top aligned, amount: %s",delta)
end
if delta < candidate.threshold then
shift = shift + voffset + delta
@@ -494,13 +497,13 @@ local function inject(parent,head,candidate)
elseif method == v_depth then
local delta = candidate.strutdepth
if trace_margindata then
- report_margindata("depth aligned, amount: %s",candidate.n,delta)
+ report_margindata("depth aligned, amount: %s",delta)
end
shift = shift + voffset + delta
elseif method == v_height then
local delta = - candidate.strutheight
if trace_margindata then
- report_margindata("height aligned, amount: %s",candidate.n,delta)
+ report_margindata("height aligned, amount: %s",delta)
end
shift = shift + voffset + delta
elseif voffset ~= 0 then
@@ -529,17 +532,21 @@ local function inject(parent,head,candidate)
end
set_attribute(box,a_margindata,nofstatus)
if trace_margindata then
- report_margindata("injected: %s, location: %s",candidate.n,location)
+ report_margindata("injected, location: %s, shift: %s",location,shift)
end
-- we need to add line etc to offset as well
offset = offset + depth
- stacked[location] = offset
- -- todo: if no real depth then zero
local room = {
- height = box.height,
+ height = height,
depth = offset,
slack = candidate.bottomspace, -- todo: 'depth' => strutdepth
}
+offset = offset + height
+ stacked[location] = offset
+ -- todo: if no real depth then zero
+ if trace_margindata then
+ report_margindata("status, offset: %s",offset)
+ end
return head, room
end
diff --git a/tex/context/fonts/lucida-math.lfg b/tex/context/fonts/lucida-math.lfg
index 443f52ace..74e4ebefd 100644
--- a/tex/context/fonts/lucida-math.lfg
+++ b/tex/context/fonts/lucida-math.lfg
@@ -225,6 +225,8 @@ mathencodings["lbr-mb"] = {
[0x022CC] = 0xD1, -- rightthreetimes
[0x022D6] = 0xDC, -- lessdot
[0x022D7] = 0xDD, -- gtrdot
+ [0x022D8] = 0xDE, -- lll
+ [0x022D9] = 0xDF, -- ggg
[0x022DA] = 0xE8, -- lesseqgtr
[0x022DB] = 0xE9, -- gtreqless
[0x022DE] = 0xE6, -- curlyeqprec
@@ -268,6 +270,7 @@ mathencodings["lbr-sy"] = {
[0x02235] = 0x91, -- because
[0x0223D] = 0x24, -- backsim
[0x02242] = 0x99, -- eqsim
+ [0x02245] = 0x9B, -- cong
[0x0224A] = 0x9D, -- approxeq
[0x0224E] = 0xC7, -- Bumpeq
[0x02252] = 0xCB, -- fallingdotseq
@@ -328,12 +331,14 @@ return {
{ name = "hlcrv.tfm", vector = "tex-ex", extension = true },
{ name = "hlcra.tfm", vector = "lbr-ma" },
{ name = "hlcrm.tfm", vector = "lbr-mb" },
+ -- { name = "hlcrim.tfm", vector = "lbr-mb" }, -- LucidaNewMath-Italic <-> AltItalic
+ -- { name = "hlcdim.tfm", vector = "lbr-mb" }, -- LucidaNewMath-DemiItalic <-> AltDemiItalic
+ -- { name = "hlcrima.tfm", vector = "lbr-mb" }, -- LucidaNewMath-AltItalic <-> Italic
{ name = "file:lbd.afm", vector = "tex-bf" },
{ name = "file:lbdi.afm", vector = "tex-bi" } ,
{ name = "file:lsr.afm", vector = "tex-ss" },
{ name = "file:lstr.afm", vector = "tex-tt" },
{ name = "file:lbl.afm", vector = "lbr-fraktur" }, -- more complete
- },
},
variables = {
joinrelfactor = 4, -- default is 3
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml
index d80fbedcb..8d16ac92c 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/keys-cs.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='uplny'/>
<cd:element name='coupled' value='propojene'/>
<cd:element name='currentlocal' value='aktualnelokalni'/>
- <cd:element name='emptyone' value='leer'/>
- <cd:element name='emptytwo' value='prazdne'/>
<cd:element name='end' value='konec'/>
<cd:element name='endsetup' value=''/>
<cd:element name='get' value='ziskat'/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 24582c78a..d07188d44 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='vollende'/>
<cd:element name='coupled' value='verknuepft'/>
<cd:element name='currentlocal' value='aktuelllokal'/>
- <cd:element name='emptyone' value='vuoto'/>
- <cd:element name='emptytwo' value='leer'/>
<cd:element name='end' value='ende'/>
<cd:element name='endsetup' value='ein'/>
<cd:element name='get' value='get'/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 6a01a537e..ea942caf1 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='complete'/>
<cd:element name='coupled' value='coupled'/>
<cd:element name='currentlocal' value='currentlocal'/>
- <cd:element name='emptyone' value='empty'/>
- <cd:element name='emptytwo' value='empty'/>
<cd:element name='end' value='end'/>
<cd:element name='endsetup' value=''/>
<cd:element name='get' value='get'/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 45c19c558..b2f025ea8 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='complete'/>
<cd:element name='coupled' value='couple'/>
<cd:element name='currentlocal' value='localcourant'/>
- <cd:element name='emptyone' value='vide'/>
- <cd:element name='emptytwo' value='vide'/>
<cd:element name='end' value='fin'/>
<cd:element name='endsetup' value=''/>
<cd:element name='get' value='obtient'/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 99a4936df..20b8670d0 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='completo'/>
<cd:element name='coupled' value='accoppiato'/>
<cd:element name='currentlocal' value='correntelocale'/>
- <cd:element name='emptyone' value='prazdne'/>
- <cd:element name='emptytwo' value='vuoti'/>
<cd:element name='end' value='fine'/>
<cd:element name='endsetup' value=''/>
<cd:element name='get' value='prendi'/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index f5217a6fd..c78377078 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='volledige'/>
<cd:element name='coupled' value='gekoppelde'/>
<cd:element name='currentlocal' value='huidigelokale'/>
- <cd:element name='emptyone' value='leeg'/>
- <cd:element name='emptytwo' value='lege'/>
<cd:element name='end' value='eindvan'/>
<cd:element name='endsetup' value='in'/>
<cd:element name='get' value='haal'/>
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml
index 7dc60fb1c..88b4f56ae 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/keys-pe.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='کامل'/>
<cd:element name='coupled' value='مزدوج'/>
<cd:element name='currentlocal' value='موضعی‌جاری'/>
- <cd:element name='emptyone' value='یک‌خالی'/>
- <cd:element name='emptytwo' value='دوخالی'/>
<cd:element name='end' value='انتها'/>
<cd:element name='endsetup' value='انتهای‌بارگذاری'/>
<cd:element name='get' value='بگیر'/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index c2afb74d3..c4061a5c4 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1063,8 +1063,6 @@
<cd:element name='complete' value='complet'/>
<cd:element name='coupled' value='cuplat'/>
<cd:element name='currentlocal' value='localcurent'/>
- <cd:element name='emptyone' value='gol'/>
- <cd:element name='emptytwo' value='gol'/>
<cd:element name='end' value='sfarsit'/>
<cd:element name='endsetup' value=''/>
<cd:element name='get' value='get'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e0c234ecf..b008d4daa 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 11/04/11 14:15:51
+-- merge date : 11/08/11 15:20:09
do -- begin closure to overcome local limits and interference