From 7fc4b935d045c84e89459e726ff54ae331e4c574 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 29 Oct 2017 16:50:11 +0100 Subject: 2017-10-29 15:50:00 --- .../context/lexers/data/scite-context-data-tex.lua | 2 +- .../context/scite-context-data-tex.properties | 26 +- .../context/data/scite-context-data-tex.lua | 2 +- doc/context/documents/general/manuals/luatex.pdf | Bin 1133886 -> 1168001 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 798383 -> 834159 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 798862 -> 836044 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 803328 -> 839263 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 797084 -> 831463 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 798990 -> 836552 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 793616 -> 829557 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 793892 -> 830810 bytes .../sources/general/manuals/luatex/luatex-lua.tex | 32 +- .../sources/general/manuals/luatex/luatex-math.tex | 53 +- .../general/manuals/luatex/luatex-style.tex | 6 +- metapost/context/base/mpiv/mp-luas.mpiv | 7 +- scripts/context/lua/mtxrun.lua | 180 +- scripts/context/stubs/mswin/mtxrun.lua | 180 +- scripts/context/stubs/unix/mtxrun | 180 +- scripts/context/stubs/win64/mtxrun.lua | 180 +- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-cs.mkii | 1 + tex/context/base/mkii/mult-de.mkii | 1 + tex/context/base/mkiv/anch-pgr.lua | 1 - tex/context/base/mkiv/char-def.lua | 1 - tex/context/base/mkiv/colo-icc.lua | 1 - tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/cont-run.lua | 4 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/core-con.lua | 182 +- tex/context/base/mkiv/core-env.lua | 4 +- tex/context/base/mkiv/font-chk.lua | 5 +- tex/context/base/mkiv/font-con.lua | 11 +- tex/context/base/mkiv/font-ctx.lua | 39 +- tex/context/base/mkiv/font-def.lua | 2 +- tex/context/base/mkiv/font-ext.lua | 10 +- tex/context/base/mkiv/font-ini.mkvi | 2 +- tex/context/base/mkiv/font-map.lua | 2 +- tex/context/base/mkiv/font-mps.lua | 16 +- tex/context/base/mkiv/font-ocl.lua | 4 +- tex/context/base/mkiv/grph-inc.lua | 2 +- tex/context/base/mkiv/l-io.lua | 10 +- tex/context/base/mkiv/l-lua.lua | 52 +- tex/context/base/mkiv/l-table.lua | 23 + tex/context/base/mkiv/l-unicode.lua | 245 +- tex/context/base/mkiv/lpdf-col.lua | 5 +- tex/context/base/mkiv/lpdf-epa.lua | 4 +- tex/context/base/mkiv/lpdf-fld.lua | 60 +- tex/context/base/mkiv/lpdf-grp.lua | 4 +- tex/context/base/mkiv/lpdf-ini.lua | 2 +- tex/context/base/mkiv/lpdf-mis.lua | 2 +- tex/context/base/mkiv/lpdf-u3d.lua | 2 +- tex/context/base/mkiv/luat-ini.mkiv | 4 +- tex/context/base/mkiv/math-ini.lua | 11 +- tex/context/base/mkiv/math-ini.mkiv | 7 + tex/context/base/mkiv/math-map.lua | 1 - tex/context/base/mkiv/meta-fnt.lua | 4 +- tex/context/base/mkiv/meta-tex.lua | 2 +- tex/context/base/mkiv/mlib-lua.lua | 4 +- tex/context/base/mkiv/mult-prm.lua | 1 + tex/context/base/mkiv/node-ltp.lua | 1 - tex/context/base/mkiv/page-cst.lua | 2 +- tex/context/base/mkiv/page-mix.lua | 2 +- tex/context/base/mkiv/publ-dat.lua | 19 +- tex/context/base/mkiv/publ-ini.lua | 33 +- tex/context/base/mkiv/status-files.pdf | Bin 25756 -> 25838 bytes tex/context/base/mkiv/status-lua.pdf | Bin 246783 -> 249883 bytes tex/context/base/mkiv/supp-ran.lua | 2 +- tex/context/base/mkiv/syst-ini.mkiv | 1 + tex/context/base/mkiv/toks-ini.lua | 40 +- tex/context/base/mkiv/trac-inf.lua | 3 +- tex/context/base/mkiv/typo-cap.lua | 2 +- tex/context/base/mkiv/typo-del.mkiv | 4 +- tex/context/base/mkiv/typo-dha.lua | 1 - tex/context/base/mkiv/typo-dir.lua | 7 +- tex/context/base/mkiv/util-dim.lua | 2 +- tex/context/base/mkiv/util-lua.lua | 1 - tex/context/base/mkiv/util-sto.lua | 23 + tex/context/base/mkiv/util-str.lua | 16 +- tex/context/interface/mkii/keys-cs.xml | 1 + tex/context/interface/mkii/keys-de.xml | 1 + tex/context/interface/mkiv/context-en.xml | 15994 ++++++++++--------- tex/context/interface/mkiv/i-accent.xml | 60 +- tex/context/interface/mkiv/i-align.xml | 98 +- tex/context/interface/mkiv/i-attachment.xml | 4 +- tex/context/interface/mkiv/i-attribute.xml | 30 +- tex/context/interface/mkiv/i-backend.xml | 48 +- tex/context/interface/mkiv/i-background.xml | 26 +- tex/context/interface/mkiv/i-bar.xml | 50 +- tex/context/interface/mkiv/i-blackrule.xml | 29 +- tex/context/interface/mkiv/i-bleed.xml | 10 +- tex/context/interface/mkiv/i-block.xml | 18 +- tex/context/interface/mkiv/i-bookmark.xml | 10 +- tex/context/interface/mkiv/i-boxes.xml | 49 +- tex/context/interface/mkiv/i-buffer.xml | 86 +- tex/context/interface/mkiv/i-button.xml | 36 +- tex/context/interface/mkiv/i-capitals.xml | 60 +- tex/context/interface/mkiv/i-catcodes.xml | 48 +- tex/context/interface/mkiv/i-character.xml | 118 +- tex/context/interface/mkiv/i-characteralign.xml | 14 +- tex/context/interface/mkiv/i-characterspacing.xml | 10 +- .../interface/mkiv/i-characterstripping.xml | 8 +- tex/context/interface/mkiv/i-chart.xml | 58 +- tex/context/interface/mkiv/i-charwidth.xml | 8 +- tex/context/interface/mkiv/i-chemical.xml | 42 +- tex/context/interface/mkiv/i-clipping.xml | 6 +- tex/context/interface/mkiv/i-collector.xml | 18 +- tex/context/interface/mkiv/i-color.xml | 140 +- tex/context/interface/mkiv/i-columns.xml | 14 +- tex/context/interface/mkiv/i-combination.xml | 20 +- tex/context/interface/mkiv/i-comment.xml | 16 +- tex/context/interface/mkiv/i-common-argument.xml | 2 +- .../interface/mkiv/i-common-definitions.xml | 2 +- tex/context/interface/mkiv/i-common-instance.xml | 150 +- tex/context/interface/mkiv/i-common-keyword.xml | 1 + tex/context/interface/mkiv/i-common-value.xml | 25 +- tex/context/interface/mkiv/i-context-modules.xml | 2 +- tex/context/interface/mkiv/i-context.pdf | Bin 803328 -> 839263 bytes tex/context/interface/mkiv/i-context.xml | 4 +- tex/context/interface/mkiv/i-conversion.xml | 158 +- tex/context/interface/mkiv/i-counter.xml | 96 +- tex/context/interface/mkiv/i-database.xml | 10 +- tex/context/interface/mkiv/i-dataset.xml | 2 +- tex/context/interface/mkiv/i-define.xml | 2 +- tex/context/interface/mkiv/i-delimitedtext.xml | 46 +- tex/context/interface/mkiv/i-description.xml | 14 +- tex/context/interface/mkiv/i-digits.xml | 10 +- tex/context/interface/mkiv/i-dimension.xml | 2 +- tex/context/interface/mkiv/i-direction.xml | 22 +- tex/context/interface/mkiv/i-document.xml | 70 +- tex/context/interface/mkiv/i-dummy.xml | 8 +- tex/context/interface/mkiv/i-effect.xml | 10 +- tex/context/interface/mkiv/i-enumeration.xml | 14 +- tex/context/interface/mkiv/i-export.xml | 6 +- tex/context/interface/mkiv/i-field.xml | 52 +- tex/context/interface/mkiv/i-figure.xml | 10 +- tex/context/interface/mkiv/i-file.xml | 150 +- tex/context/interface/mkiv/i-filler.xml | 20 +- tex/context/interface/mkiv/i-fillinline.xml | 6 +- tex/context/interface/mkiv/i-fillinrule.xml | 8 +- tex/context/interface/mkiv/i-firstline.xml | 10 +- tex/context/interface/mkiv/i-fittingpage.xml | 18 +- tex/context/interface/mkiv/i-floats.xml | 121 +- tex/context/interface/mkiv/i-fontfamily.xml | 14 +- tex/context/interface/mkiv/i-fonts.xml | 451 +- tex/context/interface/mkiv/i-form.xml | 4 +- tex/context/interface/mkiv/i-formula.xml | 104 +- tex/context/interface/mkiv/i-fraction.xml | 54 +- tex/context/interface/mkiv/i-framed.xml | 76 +- tex/context/interface/mkiv/i-framedtable.xml | 86 + tex/context/interface/mkiv/i-graphics.xml | 90 +- tex/context/interface/mkiv/i-grid.xml | 26 +- tex/context/interface/mkiv/i-help.xml | 22 +- tex/context/interface/mkiv/i-hemistich.xml | 12 +- tex/context/interface/mkiv/i-highlight.xml | 14 +- tex/context/interface/mkiv/i-hspace.xml | 72 +- tex/context/interface/mkiv/i-hyphenation.xml | 52 +- tex/context/interface/mkiv/i-imposition.xml | 12 +- tex/context/interface/mkiv/i-indent.xml | 22 +- tex/context/interface/mkiv/i-indentedtext.xml | 10 +- tex/context/interface/mkiv/i-initial.xml | 10 +- tex/context/interface/mkiv/i-injector.xml | 22 +- tex/context/interface/mkiv/i-insertion.xml | 10 +- tex/context/interface/mkiv/i-interaction.xml | 16 +- tex/context/interface/mkiv/i-interactionbar.xml | 10 +- tex/context/interface/mkiv/i-interactionmenu.xml | 48 +- tex/context/interface/mkiv/i-interactionscreen.xml | 6 +- tex/context/interface/mkiv/i-interface.xml | 2 +- tex/context/interface/mkiv/i-interlinespace.xml | 30 +- tex/context/interface/mkiv/i-italiccorrection.xml | 10 +- tex/context/interface/mkiv/i-itemgroup.xml | 58 +- tex/context/interface/mkiv/i-items.xml | 8 +- tex/context/interface/mkiv/i-javascript.xml | 12 +- tex/context/interface/mkiv/i-kerning.xml | 20 +- tex/context/interface/mkiv/i-label.xml | 18 +- tex/context/interface/mkiv/i-labeltext.xml | 148 +- tex/context/interface/mkiv/i-language.xml | 32 +- tex/context/interface/mkiv/i-layer.xml | 46 +- tex/context/interface/mkiv/i-layout.xml | 52 +- tex/context/interface/mkiv/i-linenumber.xml | 24 +- tex/context/interface/mkiv/i-lines.xml | 4 +- tex/context/interface/mkiv/i-linetable.xml | 26 +- tex/context/interface/mkiv/i-linewidth.xml | 6 +- tex/context/interface/mkiv/i-list.xml | 82 +- tex/context/interface/mkiv/i-logo.xml | 100 +- tex/context/interface/mkiv/i-lohi.xml | 38 +- tex/context/interface/mkiv/i-lua.xml | 70 +- tex/context/interface/mkiv/i-makeup.xml | 20 +- tex/context/interface/mkiv/i-marginblock.xml | 10 +- tex/context/interface/mkiv/i-margindata.xml | 54 +- tex/context/interface/mkiv/i-marker.xml | 10 +- tex/context/interface/mkiv/i-marking.xml | 10 +- tex/context/interface/mkiv/i-math.xml | 150 +- tex/context/interface/mkiv/i-mathalignment.xml | 12 +- tex/context/interface/mkiv/i-mathcases.xml | 12 +- tex/context/interface/mkiv/i-mathfence.xml | 58 +- tex/context/interface/mkiv/i-mathmatrix.xml | 40 +- tex/context/interface/mkiv/i-mathornament.xml | 8 +- tex/context/interface/mkiv/i-mathradical.xml | 10 +- tex/context/interface/mkiv/i-mathstackers.xml | 2484 ++- tex/context/interface/mkiv/i-metapost.xml | 108 +- tex/context/interface/mkiv/i-mixedcolumns.xml | 12 +- tex/context/interface/mkiv/i-modes.xml | 64 +- tex/context/interface/mkiv/i-modules.xml | 6 +- tex/context/interface/mkiv/i-narrow.xml | 16 +- tex/context/interface/mkiv/i-naturaltable.xml | 44 +- tex/context/interface/mkiv/i-note.xml | 96 +- tex/context/interface/mkiv/i-object.xml | 40 +- tex/context/interface/mkiv/i-offset.xml | 10 +- tex/context/interface/mkiv/i-opposite.xml | 6 +- tex/context/interface/mkiv/i-ornament.xml | 14 +- tex/context/interface/mkiv/i-output.xml | 14 +- tex/context/interface/mkiv/i-overlay.xml | 22 +- tex/context/interface/mkiv/i-pagebreak.xml | 6 +- tex/context/interface/mkiv/i-pagecomment.xml | 6 +- tex/context/interface/mkiv/i-pagefigure.xml | 20 +- tex/context/interface/mkiv/i-pagegrid.xml | 30 +- tex/context/interface/mkiv/i-pageinjection.xml | 14 +- tex/context/interface/mkiv/i-pagelayout.xml | 6 +- tex/context/interface/mkiv/i-pagemarks.xml | 20 +- tex/context/interface/mkiv/i-pagenumber.xml | 90 +- tex/context/interface/mkiv/i-pageselection.xml | 2 +- tex/context/interface/mkiv/i-pageshift.xml | 2 +- tex/context/interface/mkiv/i-pagestate.xml | 2 +- tex/context/interface/mkiv/i-pairedbox.xml | 12 +- tex/context/interface/mkiv/i-papersize.xml | 22 +- tex/context/interface/mkiv/i-paragraph.xml | 14 +- tex/context/interface/mkiv/i-paragraphnumber.xml | 4 +- tex/context/interface/mkiv/i-paragraphs.xml | 20 +- tex/context/interface/mkiv/i-parallel.xml | 12 +- tex/context/interface/mkiv/i-parbuilder.xml | 8 +- tex/context/interface/mkiv/i-pdf.xml | 44 +- tex/context/interface/mkiv/i-penalty.xml | 10 +- tex/context/interface/mkiv/i-periods.xml | 10 +- tex/context/interface/mkiv/i-phantom.xml | 10 +- tex/context/interface/mkiv/i-placement.xml | 10 +- tex/context/interface/mkiv/i-position.xml | 122 +- tex/context/interface/mkiv/i-positionbar.xml | 12 +- tex/context/interface/mkiv/i-positioning.xml | 10 +- tex/context/interface/mkiv/i-postponing.xml | 4 +- tex/context/interface/mkiv/i-processor.xml | 8 +- tex/context/interface/mkiv/i-profile.xml | 16 +- tex/context/interface/mkiv/i-publication.xml | 242 +- tex/context/interface/mkiv/i-random.xml | 8 +- tex/context/interface/mkiv/i-readme.pdf | Bin 60767 -> 60775 bytes tex/context/interface/mkiv/i-references.xml | 114 +- tex/context/interface/mkiv/i-regime.xml | 10 +- tex/context/interface/mkiv/i-register.xml | 60 +- tex/context/interface/mkiv/i-renderingwindow.xml | 12 +- tex/context/interface/mkiv/i-replacement.xml | 8 +- tex/context/interface/mkiv/i-rotatation.xml | 10 +- tex/context/interface/mkiv/i-ruby.xml | 10 +- tex/context/interface/mkiv/i-scale.xml | 12 +- tex/context/interface/mkiv/i-scite.xml | 13 +- tex/context/interface/mkiv/i-script.xml | 28 +- tex/context/interface/mkiv/i-section.xml | 145 +- tex/context/interface/mkiv/i-sectionblock.xml | 22 +- tex/context/interface/mkiv/i-selector.xml | 4 +- tex/context/interface/mkiv/i-setup.xml | 67 +- tex/context/interface/mkiv/i-setups.xml | 50 +- tex/context/interface/mkiv/i-shift.xml | 14 +- tex/context/interface/mkiv/i-sidebar.xml | 18 +- tex/context/interface/mkiv/i-smash.xml | 2 +- tex/context/interface/mkiv/i-sort.xml | 30 +- tex/context/interface/mkiv/i-soundtrack.xml | 8 +- tex/context/interface/mkiv/i-spellchecking.xml | 6 +- tex/context/interface/mkiv/i-spreadsheet.xml | 34 +- tex/context/interface/mkiv/i-startstop.xml | 12 +- tex/context/interface/mkiv/i-steps.xml | 54 +- tex/context/interface/mkiv/i-stream.xml | 2 +- tex/context/interface/mkiv/i-string.xml | 2 +- tex/context/interface/mkiv/i-strut.xml | 33 +- tex/context/interface/mkiv/i-symbol.xml | 38 +- tex/context/interface/mkiv/i-synctex.xml | 42 + tex/context/interface/mkiv/i-synonym.xml | 36 +- tex/context/interface/mkiv/i-systemlog.xml | 2 +- tex/context/interface/mkiv/i-table.xml | 122 +- tex/context/interface/mkiv/i-tabulation.xml | 90 +- tex/context/interface/mkiv/i-tagging.xml | 18 +- tex/context/interface/mkiv/i-textbackground.xml | 14 +- tex/context/interface/mkiv/i-textflow.xml | 20 +- tex/context/interface/mkiv/i-textrule.xml | 8 +- tex/context/interface/mkiv/i-texts.xml | 46 +- tex/context/interface/mkiv/i-thinrule.xml | 10 +- tex/context/interface/mkiv/i-token.xml | 2 +- tex/context/interface/mkiv/i-tolerance.xml | 4 +- tex/context/interface/mkiv/i-tooltip.xml | 14 +- tex/context/interface/mkiv/i-tracker.xml | 18 +- tex/context/interface/mkiv/i-translate.xml | 10 +- tex/context/interface/mkiv/i-translation.xml | 6 +- tex/context/interface/mkiv/i-twopassdata.xml | 2 +- tex/context/interface/mkiv/i-typography.xml | 42 +- tex/context/interface/mkiv/i-unit.xml | 20 +- tex/context/interface/mkiv/i-variables.xml | 76 +- tex/context/interface/mkiv/i-verbatim.xml | 92 +- tex/context/interface/mkiv/i-version.xml | 14 +- tex/context/interface/mkiv/i-viewerlayer.xml | 14 +- tex/context/interface/mkiv/i-visual.xml | 40 +- tex/context/interface/mkiv/i-visualizer.xml | 19 +- tex/context/interface/mkiv/i-vspace.xml | 104 +- tex/context/interface/mkiv/i-whitespace.xml | 16 +- tex/context/interface/mkiv/i-xml.xml | 263 +- tex/context/interface/mkiv/i-xtable.xml | 48 +- tex/context/modules/mkiv/m-barcodes.mkiv | 11 + tex/context/modules/mkiv/m-chart.lua | 2 +- tex/context/modules/mkiv/m-chart.mkvi | 4 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 158 +- 307 files changed, 14719 insertions(+), 13568 deletions(-) create mode 100644 tex/context/interface/mkiv/i-framedtable.xml create mode 100644 tex/context/interface/mkiv/i-synctex.xml diff --git a/context/data/scite/context/lexers/data/scite-context-data-tex.lua b/context/data/scite/context/lexers/data/scite-context-data-tex.lua index da3190c35..c9c8734c9 100644 --- a/context/data/scite/context/lexers/data/scite-context-data-tex.lua +++ b/context/data/scite/context/lexers/data/scite-context-data-tex.lua @@ -1,7 +1,7 @@ return { ["aleph"]={ "Alephminorversion", "Alephrevision", "Alephversion" }, ["etex"]={ "botmarks", "clubpenalties", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "detokenize", "dimexpr", "displaywidowpenalties", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "everyeof", "firstmarks", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "ifcsname", "ifdefined", "iffontchar", "interactionmode", "interlinepenalties", "lastlinefit", "lastnodetype", "marks", "muexpr", "mutoglue", "numexpr", "pagediscards", "parshapedimen", "parshapeindent", "parshapelength", "predisplaydirection", "protected", "readline", "savinghyphcodes", "savingvdiscards", "scantokens", "showgroups", "showifs", "showtokens", "splitbotmarks", "splitdiscards", "splitfirstmarks", "topmarks", "tracingassigns", "tracinggroups", "tracingifs", "tracingnesting", "tracingscantokens", "unexpanded", "unless", "widowpenalties" }, - ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, + ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, ["omega"]={ "Omegaminorversion", "Omegarevision", "Omegaversion" }, ["pdftex"]={ "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlinedepth", "pdfeachlineheight", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfignoreunknownimages", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinfoomitdate", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfmajorversion", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkfixeddpi", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdfsuppressoptionalinfo", "pdfsuppressptexinfo", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdftrailerid", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformmargin", "pdfxformname", "pdfxformresources", "pdfximage" }, ["tex"]={ " ", "-", "/", "Uleft", "Umiddle", "Uright", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "atop", "atopwithdelims", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "botmark", "boundary", "box", "boxmaxdepth", "brokenpenalty", "catcode", "char", "chardef", "cleaders", "closein", "closeout", "clubpenalty", "copy", "count", "countdef", "cr", "crcr", "csname", "csstring", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "dimen", "dimendef", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "edef", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "fam", "fi", "finalhyphendemerits", "firstmark", "firstvalidlanguage", "floatingpenalty", "font", "fontdimen", "fontname", "futurelet", "gdef", "global", "globaldefs", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hpack", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifcase", "ifcat", "ifdim", "ifeof", "iffalse", "ifhbox", "ifhmode", "ifinner", "ifmmode", "ifnum", "ifodd", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignorespaces", "immediate", "indent", "input", "inputlineno", "insert", "insertpenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastpenalty", "lastskip", "lccode", "leaders", "left", "lefthyphenmin", "leftskip", "leqno", "let", "limits", "linepenalty", "lineskip", "lineskiplimit", "long", "looseness", "lower", "lowercase", "mag", "mark", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathinner", "mathop", "mathopen", "mathord", "mathpunct", "mathrel", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "multiply", "muskip", "muskipdef", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nolimits", "nonscript", "nonstopmode", "nulldelimiterspace", "nullfont", "number", "omit", "openin", "openout", "or", "outer", "output", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagedepth", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageshrink", "pagestretch", "pagetotal", "par", "parfillskip", "parindent", "parshape", "parskip", "patterns", "pausing", "penalty", "postdisplaypenalty", "predisplaypenalty", "predisplaysize", "pretolerance", "prevdepth", "prevgraf", "protrusionboundary", "radical", "raise", "read", "relax", "relpenalty", "right", "righthyphenmin", "rightskip", "romannumeral", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setlanguage", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showlists", "showthe", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitfirstmark", "splitmaxdepth", "splittopskip", "string", "tabskip", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topskip", "tpack", "tracingcommands", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingstats", "uccode", "uchyph", "underline", "unhbox", "unhcopy", "unkern", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vpack", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalty", "wordboundary", "write", "xdef", "xleaders", "xspaceskip", "year" }, diff --git a/context/data/scite/context/scite-context-data-tex.properties b/context/data/scite/context/scite-context-data-tex.properties index 840d5c259..167a21304 100644 --- a/context/data/scite/context/scite-context-data-tex.properties +++ b/context/data/scite/context/scite-context-data-tex.properties @@ -61,19 +61,19 @@ letcharcode letterspacefont linedir localbrokenpenalty localinterlinepenalty \ localleftbox localrightbox lpcode luaescapestring luafunction \ luatexbanner luatexrevision luatexversion mathdelimitersmode mathdir \ mathdisplayskipmode matheqnogapstep mathitalicsmode mathnolimitsmode mathoption \ -mathpenaltiesmode mathrulesfam mathrulesmode mathscriptsmode mathstyle \ -mathsurroundmode mathsurroundskip nohrule nokerns noligs \ -normaldeviate nospaces novrule outputbox outputmode \ -pagebottomoffset pagedir pageheight pageleftoffset pagerightoffset \ -pagetopoffset pagewidth pardir pdfextension pdffeedback \ -pdfvariable postexhyphenchar posthyphenchar prebinoppenalty predisplaygapfactor \ -preexhyphenchar prehyphenchar prerelpenalty primitive protrudechars \ -pxdimen quitvmode randomseed rightghost rightmarginkern \ -rpcode saveboxresource savecatcodetable saveimageresource savepos \ -scantextokens setfontid setrandomseed shapemode suppressfontnotfounderror \ -suppressifcsnameerror suppresslongerror suppressmathparerror suppressoutererror synctex \ -tagcode textdir toksapp tokspre tracingfonts \ -uniformdeviate useboxresource useimageresource +mathpenaltiesmode mathrulesfam mathrulesmode mathscriptsmode mathscriptboxmode \ +mathstyle mathsurroundmode mathsurroundskip nohrule nokerns \ +noligs normaldeviate nospaces novrule outputbox \ +outputmode pagebottomoffset pagedir pageheight pageleftoffset \ +pagerightoffset pagetopoffset pagewidth pardir pdfextension \ +pdffeedback pdfvariable postexhyphenchar posthyphenchar prebinoppenalty \ +predisplaygapfactor preexhyphenchar prehyphenchar prerelpenalty primitive \ +protrudechars pxdimen quitvmode randomseed rightghost \ +rightmarginkern rpcode saveboxresource savecatcodetable saveimageresource \ +savepos scantextokens setfontid setrandomseed shapemode \ +suppressfontnotfounderror suppressifcsnameerror suppresslongerror suppressmathparerror suppressoutererror \ +synctex tagcode textdir toksapp tokspre \ +tracingfonts uniformdeviate useboxresource useimageresource keywordclass.tex.omega=\ Omegaminorversion Omegarevision Omegaversion diff --git a/context/data/textadept/context/data/scite-context-data-tex.lua b/context/data/textadept/context/data/scite-context-data-tex.lua index da3190c35..c9c8734c9 100644 --- a/context/data/textadept/context/data/scite-context-data-tex.lua +++ b/context/data/textadept/context/data/scite-context-data-tex.lua @@ -1,7 +1,7 @@ return { ["aleph"]={ "Alephminorversion", "Alephrevision", "Alephversion" }, ["etex"]={ "botmarks", "clubpenalties", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "detokenize", "dimexpr", "displaywidowpenalties", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "everyeof", "firstmarks", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "ifcsname", "ifdefined", "iffontchar", "interactionmode", "interlinepenalties", "lastlinefit", "lastnodetype", "marks", "muexpr", "mutoglue", "numexpr", "pagediscards", "parshapedimen", "parshapeindent", "parshapelength", "predisplaydirection", "protected", "readline", "savinghyphcodes", "savingvdiscards", "scantokens", "showgroups", "showifs", "showtokens", "splitbotmarks", "splitdiscards", "splitfirstmarks", "topmarks", "tracingassigns", "tracinggroups", "tracingifs", "tracingnesting", "tracingscantokens", "unexpanded", "unless", "widowpenalties" }, - ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, + ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, ["omega"]={ "Omegaminorversion", "Omegarevision", "Omegaversion" }, ["pdftex"]={ "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlinedepth", "pdfeachlineheight", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfignoreunknownimages", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinfoomitdate", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfmajorversion", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkfixeddpi", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdfsuppressoptionalinfo", "pdfsuppressptexinfo", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdftrailerid", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformmargin", "pdfxformname", "pdfxformresources", "pdfximage" }, ["tex"]={ " ", "-", "/", "Uleft", "Umiddle", "Uright", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "atop", "atopwithdelims", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "botmark", "boundary", "box", "boxmaxdepth", "brokenpenalty", "catcode", "char", "chardef", "cleaders", "closein", "closeout", "clubpenalty", "copy", "count", "countdef", "cr", "crcr", "csname", "csstring", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "dimen", "dimendef", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "edef", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "fam", "fi", "finalhyphendemerits", "firstmark", "firstvalidlanguage", "floatingpenalty", "font", "fontdimen", "fontname", "futurelet", "gdef", "global", "globaldefs", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hpack", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifcase", "ifcat", "ifdim", "ifeof", "iffalse", "ifhbox", "ifhmode", "ifinner", "ifmmode", "ifnum", "ifodd", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignorespaces", "immediate", "indent", "input", "inputlineno", "insert", "insertpenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastpenalty", "lastskip", "lccode", "leaders", "left", "lefthyphenmin", "leftskip", "leqno", "let", "limits", "linepenalty", "lineskip", "lineskiplimit", "long", "looseness", "lower", "lowercase", "mag", "mark", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathinner", "mathop", "mathopen", "mathord", "mathpunct", "mathrel", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "multiply", "muskip", "muskipdef", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nolimits", "nonscript", "nonstopmode", "nulldelimiterspace", "nullfont", "number", "omit", "openin", "openout", "or", "outer", "output", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagedepth", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageshrink", "pagestretch", "pagetotal", "par", "parfillskip", "parindent", "parshape", "parskip", "patterns", "pausing", "penalty", "postdisplaypenalty", "predisplaypenalty", "predisplaysize", "pretolerance", "prevdepth", "prevgraf", "protrusionboundary", "radical", "raise", "read", "relax", "relpenalty", "right", "righthyphenmin", "rightskip", "romannumeral", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setlanguage", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showlists", "showthe", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitfirstmark", "splitmaxdepth", "splittopskip", "string", "tabskip", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topskip", "tpack", "tracingcommands", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingstats", "uccode", "uchyph", "underline", "unhbox", "unhcopy", "unkern", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vpack", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalty", "wordboundary", "write", "xdef", "xleaders", "xspaceskip", "year" }, diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf index 3e1da4004..40c2d4254 100644 Binary files a/doc/context/documents/general/manuals/luatex.pdf and b/doc/context/documents/general/manuals/luatex.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index a42008e9a..4b4aee23c 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index 6d3db3829..9c14fc46e 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index 10eb9ef10..7ff109649 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index 65133e823..d4c002678 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 1dbc54a8a..25136fcfe 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index 6f5d34071..a5cc17168 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 36b2f50d2..f34712008 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ diff --git a/doc/context/sources/general/manuals/luatex/luatex-lua.tex b/doc/context/sources/general/manuals/luatex/luatex-lua.tex index 3d7e14700..d95415b05 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-lua.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-lua.tex @@ -303,17 +303,17 @@ piecemeal: \type {string.utfcharacters(s)}: a string with a single \UTF-8 token in it \stopitem \startitem - \type {string.characters(s)} \NC a string containing one byte + \type {string.characters(s)}: a string containing one byte \stopitem \startitem - \type {string.characterpairs(s)} two strings each containing one byte or an + \type {string.characterpairs(s)}: two strings each containing one byte or an empty second string if the string length was odd \stopitem \startitem - \type {string.bytes(s)} a single byte value + \type {string.bytes(s)}: a single byte value \stopitem \startitem - \type {string.bytepairs(s)} two byte values or nil instead of a number as + \type {string.bytepairs(s)}: two byte values or nil instead of a number as its second return value if the string length was odd \stopitem \stopitemize @@ -335,8 +335,28 @@ always returns byte positions in a string, and \type {unicode.utf8.match} and are} \UNICODE|-|aware, they fall|-|back to non|-|\UNICODE|-|aware behavior when using the empty capture \type {()} but other captures work as expected. For the interpretation of character classes in \type {unicode.utf8} functions refer to -the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. Version -5.3 of \LUA\ will provide some native \UTF8 support. +the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. + +Version 5.3 of \LUA\ provides some native \UTF8 support but we have added a few +similar helpers too: + +\startitemize +\startitem + \type {string.utfvalue(s)}: returns the codepoints of the characters in the + given string +\stopitem +\startitem + \type {string.utfcharacter(c,...)}: returns a string with the characters of + the given code points +\stopitem +\startitem + \type {string.utflength(s)}: returns the length oif the given string +\stopitem +\stopitemize + +These three functions are relative fast and don't do much checking. They can be used +as building blocks for other helpers. + \blank diff --git a/doc/context/sources/general/manuals/luatex/luatex-math.tex b/doc/context/sources/general/manuals/luatex/luatex-math.tex index 9fb0c02ab..cf5489641 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-math.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-math.tex @@ -631,7 +631,7 @@ example. \stoptexdefinition \start - \setupbodyfont[cambria] + \switchtobodyfont[cambria] \starttabulate[|c|c|c|c|c|c|] \Whatever{0}% \Whatever{1}% @@ -641,6 +641,55 @@ example. This kind of parameters relate to the fact that italic correction in \OPENTYPE\ math is bound to fuzzy rules. So, control is the solution. +\section{Script boxes} + +If you want typeset text in math macro packages often provide something \type +{\text} which obeys the script sizes. As the definition can be anything there is +a good change that the kerning doesn't come out well when used in a script. Given +that the first glyph ends up in an \type {\hbox} we have some control over this. +And, as a bonus we also added control over the normal sublist kerning. The \type +{\mathscriptboxmode} parameter defaults to~1. + +\starttabulate[|l|l|] +\NC \type {0} \NC forget about kerning \NC \NR +\NC \type {1} \NC kern math sub lists with a valid glyph \NC \NR +\NC \type {2} \NC also kern math sub boxes that have a valid glyph \NC \NR +\NC \type {2} \NC only kern math sub boxes with a boundary node present\NC \NR +\stoptabulate + +Here we show some examples. Of course this doesn't solve all our problems, if +only because some fonts have characters with bounding boxes that compensate for +italics, while other fonts can lack kerns. + +\startbuffer[1] + $T_{\tf fluff}$ +\stopbuffer + +\startbuffer[2] + $T_{\text{fluff}}$ +\stopbuffer + +\startbuffer[3] + $T_{\text{\boundary1 fluff}}$ +\stopbuffer + +\unexpanded\def\Show#1#2#3% + {\doifelsenothing{#3} + {\small\typeinlinebuffer[#1]} + {\doifelse{#3}{-} + {\small\type{mode #2}} + {\switchtobodyfont[#3]\showfontkerns\showglyphs\mathscriptboxmode#2\relax\inlinebuffer[#1]}}} + +\starttabulate[|lT|c|c|c|c|c|] + \NC \NC \Show{1}{0}{} \NC\Show{1}{1}{} \NC \Show{2}{1}{} \NC \Show{2}{2}{} \NC \Show{3}{3}{} \NC \NR + \NC \NC \Show{1}{0}{-} \NC\Show{1}{1}{-} \NC \Show{2}{1}{-} \NC \Show{2}{2}{-} \NC \Show{3}{3}{-} \NC \NR + \NC modern \NC \Show{1}{0}{modern} \NC\Show{1}{1}{modern} \NC \Show{2}{1}{modern} \NC \Show{2}{2}{modern} \NC \Show{3}{3}{modern} \NC \NR + \NC lucidaot \NC \Show{1}{0}{lucidaot} \NC\Show{1}{1}{lucidaot} \NC \Show{2}{1}{lucidaot} \NC \Show{2}{2}{lucidaot} \NC \Show{3}{3}{lucidaot} \NC \NR + \NC pagella \NC \Show{1}{0}{pagella} \NC\Show{1}{1}{pagella} \NC \Show{2}{1}{pagella} \NC \Show{2}{2}{pagella} \NC \Show{3}{3}{pagella} \NC \NR + \NC cambria \NC \Show{1}{0}{cambria} \NC\Show{1}{1}{cambria} \NC \Show{2}{1}{cambria} \NC \Show{2}{2}{cambria} \NC \Show{3}{3}{cambria} \NC \NR + \NC dejavu \NC \Show{1}{0}{dejavu} \NC\Show{1}{1}{dejavu} \NC \Show{2}{1}{dejavu} \NC \Show{2}{2}{dejavu} \NC \Show{3}{3}{dejavu} \NC \NR +\stoptabulate + \section{Unscaled fences} The \type {\mathdelimitersmode} primitive is experimental and deals with the @@ -659,7 +708,7 @@ so that the same spacing applies as with unfenced variants. Here we show Cambria \stoptexdefinition \start - \setupbodyfont[cambria] + \switchtobodyfont[cambria] \starttabulate[|l|l|l|] \Whatever{0}\Whatever{1}\Whatever{2}\Whatever{3}% \Whatever{4}\Whatever{5}\Whatever{6}\Whatever{7}% diff --git a/doc/context/sources/general/manuals/luatex/luatex-style.tex b/doc/context/sources/general/manuals/luatex/luatex-style.tex index 547fd204a..a277a1178 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-style.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-style.tex @@ -89,7 +89,11 @@ \definecolor[keptcolor] [b=.5] \definecolor[othercolor][r=.5,g=.5] -\setupbodyfont[modern] % we need this in examples so we predefine +\usebodyfont[lucidaot] +\usebodyfont[pagella] +\usebodyfont[cambria] +%usebodyfont[dejavu] +\usebodyfont[modern] % we need this in examples so we predefine % \doifmodeelse {atpragma} { % diff --git a/metapost/context/base/mpiv/mp-luas.mpiv b/metapost/context/base/mpiv/mp-luas.mpiv index 99df0b861..d35701ec6 100644 --- a/metapost/context/base/mpiv/mp-luas.mpiv +++ b/metapost/context/base/mpiv/mp-luas.mpiv @@ -49,13 +49,13 @@ boolean context_luas ; context_luas := true ; % % Fourth variant: -string mfun_lua_bs ; mfun_lua_bs = "[[" ; -string mfun_lua_es ; mfun_lua_es = "]]" ; +string mfun_lua_bs ; mfun_lua_bs := "[[" ; +string mfun_lua_es ; mfun_lua_es := "]]" ; vardef mlib_luas_luacall(text t) = runscript("" for s = t : if string s : - & mfun_lua_bs & s & mfun_lua_es + & s elseif numeric s : & decimal s elseif boolean s : @@ -75,6 +75,7 @@ vardef mlib_luas_lualist(expr c)(text t) = hide(b := true) fi if string s : + % & ditto & s & ditto & mfun_lua_bs & s & mfun_lua_es elseif numeric s : & decimal s diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 54acbd16e..fb24a8705 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.10.24 10:30} +\newcontextversion{2017.10.29 15:44} %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 99243fd9d..9bdd54063 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2017.10.24 10:30} +\edef\contextversion{2017.10.29 15:44} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii index 85297dd12..61ddaa391 100644 --- a/tex/context/base/mkii/mult-cs.mkii +++ b/tex/context/base/mkii/mult-cs.mkii @@ -796,6 +796,7 @@ \setinterfaceconstant{fieldoffset}{offsetpole} \setinterfaceconstant{file}{soubor} \setinterfaceconstant{filler}{filler} +\setinterfaceconstant{filter}{filter} \setinterfaceconstant{filtercommand}{filtercommand} \setinterfaceconstant{finalnamesep}{finalnamesep} \setinterfaceconstant{finalpagesep}{finalpagesep} diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii index 3fd291e1e..5f8545a90 100644 --- a/tex/context/base/mkii/mult-de.mkii +++ b/tex/context/base/mkii/mult-de.mkii @@ -796,6 +796,7 @@ \setinterfaceconstant{fieldoffset}{feldoffset} \setinterfaceconstant{file}{datei} \setinterfaceconstant{filler}{filler} +\setinterfaceconstant{filter}{filter} \setinterfaceconstant{filtercommand}{filtercommand} \setinterfaceconstant{finalnamesep}{finalnamesep} \setinterfaceconstant{finalpagesep}{finalpagesep} diff --git a/tex/context/base/mkiv/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua index ba767ccab..18a915692 100644 --- a/tex/context/base/mkiv/anch-pgr.lua +++ b/tex/context/base/mkiv/anch-pgr.lua @@ -17,7 +17,6 @@ if not modules then modules = { } end modules ['anch-pgr'] = { -- will discuss this issue. local tonumber = tonumber -local abs, div, floor, round, min, max = math.abs, math.div, math.floor, math.round, math.min, math.max local sort, concat = table.sort, table.concat local splitter = lpeg.splitat(":") local lpegmatch = lpeg.match diff --git a/tex/context/base/mkiv/char-def.lua b/tex/context/base/mkiv/char-def.lua index c35832cc3..58e1f2c44 100644 --- a/tex/context/base/mkiv/char-def.lua +++ b/tex/context/base/mkiv/char-def.lua @@ -64078,7 +64078,6 @@ characters.data={ direction="on", linebreak="al", mathclass="binary", - mathname="bullet", unicodeslot=0x2219, }, [0x221A]={ diff --git a/tex/context/base/mkiv/colo-icc.lua b/tex/context/base/mkiv/colo-icc.lua index f7ed561c1..638c6c4c4 100644 --- a/tex/context/base/mkiv/colo-icc.lua +++ b/tex/context/base/mkiv/colo-icc.lua @@ -8,7 +8,6 @@ if not modules then modules = { } end modules ['colo-icc'] = { local char, byte, gsub, match, format, strip = string.char, string.byte, string.gsub, string.match, string.format, string.strip local readstring, readnumber = io.readstring, io.readnumber -local formatters = string.formatters local colors = attributes and attributes.colors or { } -- when used in mtxrun diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 7127cfc4c..596562074 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.10.24 10:30} +\newcontextversion{2017.10.29 15:44} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/cont-run.lua b/tex/context/base/mkiv/cont-run.lua index 657973f59..73620adb6 100644 --- a/tex/context/base/mkiv/cont-run.lua +++ b/tex/context/base/mkiv/cont-run.lua @@ -34,9 +34,9 @@ local logfilename = "sandbox.log" local function registerstats() statistics.register("sandboxing", function() if trace_files then - return string.format("%s calls, %s rejected, logdata in '%s'",nofcalls,nofrejected,logfilename) + return string.format("%i calls, %i rejected, logdata in '%s'",nofcalls,nofrejected,logfilename) else - return string.format("%s calls, %s rejected",nofcalls,nofrejected) + return string.format("%i calls, %i rejected",nofcalls,nofrejected) end end) registerstats = false diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index a2cf1f308..34a8d186c 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -41,7 +41,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.10.24 10:30} +\edef\contextversion{2017.10.29 15:44} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua index 41d0956cd..edba24f10 100644 --- a/tex/context/base/mkiv/core-con.lua +++ b/tex/context/base/mkiv/core-con.lua @@ -901,39 +901,39 @@ converters.verbose = verbose -- verbose english local words = { - [0] = "zero", - [1] = "one", - [2] = "two", - [3] = "three", - [4] = "four", - [5] = "five", - [6] = "six", - [7] = "seven", - [8] = "eight", - [9] = "nine", - [10] = "ten", - [11] = "eleven", - [12] = "twelve", - [13] = "thirteen", - [14] = "fourteen", - [15] = "fifteen", - [16] = "sixteen", - [17] = "seventeen", - [18] = "eighteen", - [19] = "nineteen", - [20] = "twenty", - [30] = "thirty", - [40] = "forty", - [50] = "fifty", - [60] = "sixty", - [70] = "seventy", - [80] = "eighty", - [90] = "ninety", - [100] = "hundred", - [1000] = "thousand", - [1000^2] = "million", - [1000^3] = "billion", - [1000^4] = "trillion", + [0] = "zero", + [1] = "one", + [2] = "two", + [3] = "three", + [4] = "four", + [5] = "five", + [6] = "six", + [7] = "seven", + [8] = "eight", + [9] = "nine", + [10] = "ten", + [11] = "eleven", + [12] = "twelve", + [13] = "thirteen", + [14] = "fourteen", + [15] = "fifteen", + [16] = "sixteen", + [17] = "seventeen", + [18] = "eighteen", + [19] = "nineteen", + [20] = "twenty", + [30] = "thirty", + [40] = "forty", + [50] = "fifty", + [60] = "sixty", + [70] = "seventy", + [80] = "eighty", + [90] = "ninety", + [100] = "hundred", + [1000] = "thousand", + [1000000] = "million", + [1000000000] = "billion", + [1000000000000] = "trillion", } local function translate(n) @@ -979,10 +979,10 @@ local function translate(n) end return n end - n = compose_two(n,1000^4) - n = compose_two(n,1000^3) - n = compose_two(n,1000^2) - n = compose_two(n,1000^1) + n = compose_two(n,1000000000000) + n = compose_two(n,1000000000) + n = compose_two(n,1000000) + n = compose_two(n,1000) if n > 0 then compose_one(n) end @@ -1007,55 +1007,55 @@ data.en = data.english -- verbose spanish (unchecked) local words = { - [1] = "uno", - [2] = "dos", - [3] = "tres", - [4] = "cuatro", - [5] = "cinco", - [6] = "seis", - [7] = "siete", - [8] = "ocho", - [9] = "nueve", - [10] = "diez", - [11] = "once", - [12] = "doce", - [13] = "trece", - [14] = "catorce", - [15] = "quince", - [16] = "dieciséis", - [17] = "diecisiete", - [18] = "dieciocho", - [19] = "diecinueve", - [20] = "veinte", - [21] = "veintiuno", - [22] = "veintidós", - [23] = "veintitrés", - [24] = "veinticuatro", - [25] = "veinticinco", - [26] = "veintiséis", - [27] = "veintisiete", - [28] = "veintiocho", - [29] = "veintinueve", - [30] = "treinta", - [40] = "cuarenta", - [50] = "cincuenta", - [60] = "sesenta", - [70] = "setenta", - [80] = "ochenta", - [90] = "noventa", - [100] = "ciento", - [200] = "doscientos", - [300] = "trescientos", - [400] = "cuatrocientos", - [500] = "quinientos", - [600] = "seiscientos", - [700] = "setecientos", - [800] = "ochocientos", - [900] = "novecientos", - [1000] = "mil", - [1000^2] = "millón", - [1000^3] = "mil millones", - [1000^4] = "billón", + [1] = "uno", + [2] = "dos", + [3] = "tres", + [4] = "cuatro", + [5] = "cinco", + [6] = "seis", + [7] = "siete", + [8] = "ocho", + [9] = "nueve", + [10] = "diez", + [11] = "once", + [12] = "doce", + [13] = "trece", + [14] = "catorce", + [15] = "quince", + [16] = "dieciséis", + [17] = "diecisiete", + [18] = "dieciocho", + [19] = "diecinueve", + [20] = "veinte", + [21] = "veintiuno", + [22] = "veintidós", + [23] = "veintitrés", + [24] = "veinticuatro", + [25] = "veinticinco", + [26] = "veintiséis", + [27] = "veintisiete", + [28] = "veintiocho", + [29] = "veintinueve", + [30] = "treinta", + [40] = "cuarenta", + [50] = "cincuenta", + [60] = "sesenta", + [70] = "setenta", + [80] = "ochenta", + [90] = "noventa", + [100] = "ciento", + [200] = "doscientos", + [300] = "trescientos", + [400] = "cuatrocientos", + [500] = "quinientos", + [600] = "seiscientos", + [700] = "setecientos", + [800] = "ochocientos", + [900] = "novecientos", + [1000] = "mil", + [1000000] = "millón", + [1000000000] = "mil millones", + [1000000000000] = "billón", } local function translate(n) @@ -1078,7 +1078,7 @@ local function translate(n) t[#t+1] = words[1000] -- x hundred (n.b. this will not give thirteen hundred because -- compose_one(n) is only called after - -- `n = compose(two(n, 1000^1))`. + -- n = compose(two(n, 1000)) elseif a > 0 then t[#t+1] = words[a*100] end @@ -1106,10 +1106,10 @@ local function translate(n) end return n end - n = compose_two(n,1000^4) - n = compose_two(n,1000^3) - n = compose_two(n,1000^2) - n = compose_two(n,1000^1) + n = compose_two(n,1000000000000) + n = compose_two(n,1000000000) + n = compose_two(n,1000000) + n = compose_two(n,1000) if n > 0 then compose_one(n) end diff --git a/tex/context/base/mkiv/core-env.lua b/tex/context/base/mkiv/core-env.lua index 583a6ed1e..0ef37a6d6 100644 --- a/tex/context/base/mkiv/core-env.lua +++ b/tex/context/base/mkiv/core-env.lua @@ -57,7 +57,7 @@ setmetatableindex(texmodes, function(t,k) local m = modes[k] if m then return m() - else + elseif k then local n = "mode>" .. k if cache[n].mode == 0 then return false @@ -65,6 +65,8 @@ setmetatableindex(texmodes, function(t,k) rawset(modes,k, function() return texgetcount(n) == 1 end) return texgetcount(n) == 1 -- 2 is prevented end + else + return false end end) setmetatablenewindex(texmodes, function(t,k) diff --git a/tex/context/base/mkiv/font-chk.lua b/tex/context/base/mkiv/font-chk.lua index d9bb497ad..106749078 100644 --- a/tex/context/base/mkiv/font-chk.lua +++ b/tex/context/base/mkiv/font-chk.lua @@ -10,6 +10,7 @@ if not modules then modules = { } end modules ['font-chk'] = { -- move to the nodes namespace local next = next +local floor = math.floor local context = context @@ -190,7 +191,7 @@ local variants = allocate { { tag = "yellow", r = .6, g = .6, b = 0 }, } -local pdf_blob = "pdf: q %0.6F 0 0 %0.6F 0 0 cm %s %s %s rg %s %s %s RG 10 M 1 j 1 J 0.05 w %s Q" +local pdf_blob = "pdf: q %.6F 0 0 %.6F 0 0 cm %s %s %s rg %s %s %s RG 10 M 1 j 1 J 0.05 w %s Q" local cache = { } -- saves some tables but not that impressive @@ -217,7 +218,7 @@ local function addmissingsymbols(tfmdata) -- we can have an alternative with rul local name = fake.name local privatename = formatters["placeholder %s %s"](name,tag) if not hasprivate(tfmdata,privatename) then - local hash = formatters["%s_%s_%s_%s_%s_%s"](name,tag,r,g,b,size) + local hash = formatters["%s_%s_%1.3f_%1.3f_%1.3f_%i"](name,tag,r,g,b,floor(size)) local char = cache[hash] if not char then char = { diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index 75d6b08a8..2dce9b6e4 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -14,6 +14,7 @@ local sort, insert, concat = table.sort, table.insert, table.concat local sortedkeys, sortedhash, serialize, fastcopy = table.sortedkeys, table.sortedhash, table.serialize, table.fastcopy local derivetable = table.derive local ioflush = io.flush +local round = math.round local trace_defining = false trackers.register("fonts.defining", function(v) trace_defining = v end) local trace_scaling = false trackers.register("fonts.scaling", function(v) trace_scaling = v end) @@ -1037,13 +1038,15 @@ function constructors.hashinstance(specification,force) specification.hash = hash end if size < 1000 and designsizes[hash] then - size = math.round(constructors.scaled(size,designsizes[hash])) - specification.size = size + size = round(constructors.scaled(size,designsizes[hash])) + else + size = round(size) end + specification.size = size if fallbacks then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. fallbacks + return hash .. ' @ ' .. size .. ' @ ' .. fallbacks else - return hash .. ' @ ' .. tostring(size) + return hash .. ' @ ' .. size end end diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua index 89466eca8..ec7eabb53 100644 --- a/tex/context/base/mkiv/font-ctx.lua +++ b/tex/context/base/mkiv/font-ctx.lua @@ -158,7 +158,7 @@ helpers.name = getfontname local addformatter = utilities.strings.formatters.add -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then addformatter(formatters,"font:name", [["'"..fontname(%s).."'"]], "local fontname = fonts.helpers.name") addformatter(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced") @@ -1056,7 +1056,6 @@ do -- else too many locals local scanboolean = scanners.boolean local setmacro = tokens.setters.macro - local scanners = interfaces.scanners -- function commands.definefont_one(str) @@ -1456,7 +1455,7 @@ do -- else too many locals name,id,nice_cs(cs),classfeatures,fontfeatures,classfallbacks,fontfallbacks,2) end -- resolved (when designsize is used): - local size = tfmdata.parameters.size or 655360 + local size = round(tfmdata.parameters.size or 655360) setmacro("somefontsize",size.."sp") -- ctx_setsomefontsize(size .. "sp") texsetcount("scaledfontsize",size) @@ -1493,7 +1492,7 @@ do -- else too many locals name,id,nice_cs(cs),classfeatures,fontfeatures,classfallbacks,fontfallbacks,"-") end -- resolved (when designsize is used): - local size = tfmdata.parameters.size or 655360 + local size = round(tfmdata.parameters.size or 655360) setmacro("somefontsize",size.."sp") -- ctx_setsomefontsize(size .. "sp") texsetcount("scaledfontsize",size) @@ -1507,7 +1506,7 @@ do -- else too many locals csnames[tfmdata] = specification.cs texdefinefont(global,cs,tfmdata) -- resolved (when designsize is used): - local size = fontdata[tfmdata].parameters.size or 0 + local size = round(fontdata[tfmdata].parameters.size or 0) -- ctx_setsomefontsize(size .. "sp") setmacro("somefontsize",size.."sp") texsetcount("scaledfontsize",size) @@ -1668,7 +1667,7 @@ do -- else too many locals function fonts.infofont() if infofont == 0 then - infofont = definers.define { name = "dejavusansmono", size = tex.sp("6pt") } + infofont = definers.define { name = "dejavusansmono", size = texsp("6pt") } end return infofont end @@ -1726,7 +1725,7 @@ function constructors.calculatescale(tfmdata,scaledpoints,relativeid,specificati -- scaledpoints = rscale * scaledpoints -- end -- end - return scaledpoints, delta + return round(scaledpoints), round(delta) end local designsizes = constructors.designsizes @@ -1744,17 +1743,19 @@ function constructors.hashinstance(specification,force) end if size < 1000 and designsizes[hash] then size = round(constructors.scaled(size,designsizes[hash])) - specification.size = size + else + size = round(size) end + specification.size = size if fallbacks then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. fallbacks + return hash .. ' @ ' .. size .. ' @ ' .. fallbacks else local scalemode = specification.scalemode local special = scalemode and specialscale[scalemode] if special then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. special + return hash .. ' @ ' .. size .. ' @ ' .. special else - return hash .. ' @ ' .. tostring(size) + return hash .. ' @ ' .. size end end end @@ -2116,14 +2117,14 @@ function loggers.reportdefinedfonts() local parameters = data.parameters or { } tn = tn + 1 t[tn] = { - format("%03i",id or 0), - format("%09i",parameters.size or 0), - properties.type or "real", - properties.format or "unknown", - properties.name or "", - properties.psname or "", - properties.fullname or "", - properties.sharedwith or "", + formatters["%03i"](id or 0), + formatters["%p" ](parameters.size or 0), + properties.type or "real", + properties.format or "unknown", + properties.name or "", + properties.psname or "", + properties.fullname or "", + properties.sharedwith or "", } end formatcolumns(t," ") diff --git a/tex/context/base/mkiv/font-def.lua b/tex/context/base/mkiv/font-def.lua index 19d980e48..97d25f180 100644 --- a/tex/context/base/mkiv/font-def.lua +++ b/tex/context/base/mkiv/font-def.lua @@ -512,7 +512,7 @@ function definers.read(specification,size,id) -- id can be optional, name can al local properties = tfmdata.properties or { } local parameters = tfmdata.parameters or { } report_defining("using %a font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a", - properties.format or "unknown", id, properties.name, parameters.size, properties.encodingbytes, + properties.format or "unknown", id or "-", properties.name, parameters.size, properties.encodingbytes, properties.encodingname, properties.fullname, basename(properties.filename)) end statistics.stoptiming(fonts) diff --git a/tex/context/base/mkiv/font-ext.lua b/tex/context/base/mkiv/font-ext.lua index 6020d6374..a393b18fe 100644 --- a/tex/context/base/mkiv/font-ext.lua +++ b/tex/context/base/mkiv/font-ext.lua @@ -772,7 +772,7 @@ local pop = { "pop" } -- local h = h * bp -- local v = setmetatableindex(function(t,w) -- -- local v = { "rule", h, w } --- local v = { "pdf", "origin", formatters["0 0 %0.6F %0.6F re F"](w*bp,h) } +-- local v = { "pdf", "origin", formatters["0 0 %.6F %.6F re F"](w*bp,h) } -- t[w] = v -- return v -- end) @@ -783,7 +783,7 @@ local pop = { "pop" } -- local forecache = setmetatableindex(function(t,h) -- local h = h * bp -- local v = setmetatableindex(function(t,w) --- local v = { "pdf", "origin", formatters["%0.6F w 0 0 %0.6F %0.6F re S"](0.25*65536*bp,w*bp,h) } +-- local v = { "pdf", "origin", formatters["%.6F w 0 0 %.6F %.6F re S"](0.25*65536*bp,w*bp,h) } -- t[w] = v -- return v -- end) @@ -799,7 +799,7 @@ local backcache = setmetatableindex(function(t,h) local v = setmetatableindex(function(t,d) local d = d * bp local v = setmetatableindex(function(t,w) - local v = { "pdf", "origin", formatters["%0.6F w 0 %0.6F %0.6F %0.6F re f"](r,-d,w*bp,h+d) } + local v = { "pdf", "origin", formatters["%.6F w 0 %.6F %.6F %.6F re f"](r,-d,w*bp,h+d) } t[w] = v return v end) @@ -816,8 +816,8 @@ local forecache = setmetatableindex(function(t,h) local d = d * bp local v = setmetatableindex(function(t,w) -- the frame goes through the boundingbox - -- local v = { "pdf", "origin", formatters["[] 0 d 0 J %0.6F w 0 %0.6F %0.6F %0.6F re S"](r,-d,w*bp,h+d) } - local v = { "pdf", "origin", formatters["[] 0 d 0 J %0.6F w %0.6F %0.6F %0.6F %0.6F re S"](r,r/2,-d+r/2,w*bp-r,h+d-r) } + -- local v = { "pdf", "origin", formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F re S"](r,-d,w*bp,h+d) } + local v = { "pdf", "origin", formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F %.6F re S"](r,r/2,-d+r/2,w*bp-r,h+d-r) } t[w] = v return v end) diff --git a/tex/context/base/mkiv/font-ini.mkvi b/tex/context/base/mkiv/font-ini.mkvi index c0121c18b..c4445b7b9 100644 --- a/tex/context/base/mkiv/font-ini.mkvi +++ b/tex/context/base/mkiv/font-ini.mkvi @@ -835,7 +835,7 @@ \fi \font_helpers_update_font_parameters \font_helpers_update_font_class_parameters - % \writestatus{fonts}{low level define: #csname/\somefontfile/\number\d_font_scaled_font_size/\fontface/\number\d_font_scaled_text_face}% + %\writestatus{fonts}{low level define: #csname/\somefontfile/\number\d_font_scaled_font_size/\fontface/\number\d_font_scaled_text_face}% \clf_definefont_two \ifx\fontclass\empty\s!false\else\s!true\fi {#csname}% diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index 0fc525805..ebc74b1d0 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -165,7 +165,7 @@ local function tounicode16sequence(unicodes) return concat(t) end -local function tounicode(unicode,name) +local function tounicode(unicode) if type(unicode) == "table" then local t = { } for l=1,#unicode do diff --git a/tex/context/base/mkiv/font-mps.lua b/tex/context/base/mkiv/font-mps.lua index 69b2af68c..cde34f2ae 100644 --- a/tex/context/base/mkiv/font-mps.lua +++ b/tex/context/base/mkiv/font-mps.lua @@ -21,9 +21,9 @@ fonts = fonts or { } local metapost = fonts.metapost or { } fonts.metapost = metapost -local f_moveto = formatters["(%F,%F)"] -local f_lineto = formatters["--(%F,%F)"] -local f_curveto = formatters["..controls(%F,%F)and(%F,%F)..(%F,%F)"] +local f_moveto = formatters["(%.6F,%.6F)"] +local f_lineto = formatters["--(%.6F,%.6F)"] +local f_curveto = formatters["..controls(%.6F,%.6F)and(%.6F,%.6F)..(%.6F,%.6F)"] local s_cycle = "--cycle" local f_nofill = formatters["nofill %s;"] @@ -32,8 +32,8 @@ local f_dofill = formatters["fill %s;"] local f_draw_trace = formatters["drawpathonly %s;"] local f_draw = formatters["draw %s;"] -local f_boundingbox = formatters["((%F,%F)--(%F,%F)--(%F,%F)--(%F,%F)--cycle)"] -local f_vertical = formatters["((%F,%F)--(%F,%F))"] +local f_boundingbox = formatters["((%.6F,%.6F)--(%.6F,%.6F)--(%.6F,%.6F)--(%.6F,%.6F)--cycle)"] +local f_vertical = formatters["((%.6F,%.6F)--(%.6F,%.6F))"] function metapost.boundingbox(d,factor) local bounds = d.boundingbox @@ -275,9 +275,9 @@ local parameters = fonts.hashes.parameters local shapes = fonts.hashes.shapes local topaths = metapost.paths -local f_code = formatters["mfun_do_outline_text_flush(%q,%i,%F,%F)(%,t);"] -local f_rule = formatters["mfun_do_outline_rule_flush(%q,%F,%F,%F,%F);"] -local f_bounds = formatters["checkbounds(%F,%F,%F,%F);"] +local f_code = formatters["mfun_do_outline_text_flush(%q,%i,%.6F,%.6F)(%,t);"] +local f_rule = formatters["mfun_do_outline_rule_flush(%q,%.6F,%.6F,%.6F,%.6F);"] +local f_bounds = formatters["checkbounds(%.6F,%.6F,%.6F,%.6F);"] local s_nothing = "(origin scaled 10)" local sc = 10 diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua index b9671ab18..872247d43 100644 --- a/tex/context/base/mkiv/font-ocl.lua +++ b/tex/context/base/mkiv/font-ocl.lua @@ -18,8 +18,8 @@ local tounicode = fonts.mappings.tounicode local otf = fonts.handlers.otf -local f_color = formatters["%f %f %f rg"] -local f_gray = formatters["%f g"] +local f_color = formatters["%.3f %.3f %.3f rg"] +local f_gray = formatters["%.3f g"] if context then diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua index 70f5e528f..be6d365f1 100644 --- a/tex/context/base/mkiv/grph-inc.lua +++ b/tex/context/base/mkiv/grph-inc.lua @@ -103,7 +103,7 @@ local v_local = variables["local"] local v_default = variables.default local v_auto = variables.auto -local maxdimen = 2^30-1 +local maxdimen = 0x3FFFFFFF -- 2^30-1 local ctx_doscalefigure = context.doscalefigure local ctx_relocateexternalfigure = context.relocateexternalfigure diff --git a/tex/context/base/mkiv/l-io.lua b/tex/context/base/mkiv/l-io.lua index 75e704a34..fa3ad3c4c 100644 --- a/tex/context/base/mkiv/l-io.lua +++ b/tex/context/base/mkiv/l-io.lua @@ -10,7 +10,7 @@ local io = io local open, flush, write, read = io.open, io.flush, io.write, io.read local byte, find, gsub, format = string.byte, string.find, string.gsub, string.format local concat = table.concat -local floor = math.floor +----- floor = math.floor local type = type if string.find(os.getenv("PATH"),";",1,true) then @@ -27,9 +27,9 @@ end -- to less intermediate large allocations. This phenomena was discussed on the -- luatex dev list. -local large = 2^24 -- 16 MB -local medium = large / 16 -- 1 MB -local small = medium / 8 +local large = 0x01000000 -- 2^24 16.777.216 +local medium = 0x00100000 -- 2^20 1.048.576 +local small = 0x00020000 -- 2^17 131.072 -- local function readall(f) -- local size = f:seek("end") @@ -54,7 +54,7 @@ local small = medium / 8 -- end local function readall(f) --- return f:read("*all") + -- return f:read("*all") local size = f:seek("end") if size > 0 then f:seek("set",0) diff --git a/tex/context/base/mkiv/l-lua.lua b/tex/context/base/mkiv/l-lua.lua index 88cde6d1e..aa2644b9f 100644 --- a/tex/context/base/mkiv/l-lua.lua +++ b/tex/context/base/mkiv/l-lua.lua @@ -17,28 +17,35 @@ if not modules then modules = { } end modules ['l-lua'] = { -- utf.* -- bit32 --- compatibility hacksand helpers +-- compatibility hacks and helpers -_MAJORVERSION, _MINORVERSION = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION, LUAMINORVERSION = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION = tonumber(_MAJORVERSION) or 5 -_MINORVERSION = tonumber(_MINORVERSION) or 1 -_LUAVERSION = _MAJORVERSION + _MINORVERSION/10 +LUAMAJORVERSION = tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION = tonumber(LUAMINORVERSION) or 1 +LUAVERSION = LUAMAJORVERSION + LUAMINORVERSION/10 -if _LUAVERSION < 5.2 and jit then +if LUAVERSION < 5.2 and jit then -- -- we want loadstring cum suis to behave like 5.2 -- - _MINORVERSION = 2 - _LUAVERSION = 5.2 + MINORVERSION = 2 + LUAVERSION = 5.2 end +_LUAVERSION = LUAVERSION -- for old times sake, will go away + -- lpeg if not lpeg then lpeg = require("lpeg") end +-- if utf8 then +-- utf8lua = utf8 +-- utf8 = nil +-- end + -- basics: if loadstring then @@ -220,3 +227,32 @@ if not FFISUPPORTED then elseif not ffi.number then ffi.number = tonumber end + +-- if not bit32 then +-- bit32 = load ( [[ return { +-- band = function(a,b) +-- return (a & b) +-- end, +-- bnot = function(a) +-- return ~a & 0xFFFFFFFF +-- end, +-- bor = function(a,b) +-- return (a | b) & 0xFFFFFFFF +-- end, +-- btest = function(a,b) +-- return (a & b) ~= 0 +-- end, +-- bxor = function(a,b) +-- return (a ~ b) & 0xFFFFFFFF +-- end, +-- extract = function(a,b,c) +-- return (a >> b) & ~(-1 << (c or 1)) +-- end, +-- lshift = function(a,b) +-- return (a << b) & 0xFFFFFFFF +-- end, +-- rshift = function(a,b) +-- return (a >> b) +-- end, +-- } ]] ) () +-- end diff --git a/tex/context/base/mkiv/l-table.lua b/tex/context/base/mkiv/l-table.lua index e37c74f8b..ba8712ddb 100644 --- a/tex/context/base/mkiv/l-table.lua +++ b/tex/context/base/mkiv/l-table.lua @@ -1392,3 +1392,26 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end + +-- lua 5.3: + +if not table.move then + + function table.move(a1,f,e,t,a2) + if a2 and a1 ~= a2 then + for i=f,e do + a2[t] = a1[i] + t = t + 1 + end + return a2 + else + t = t + e - f + for i=e,f,-1 do + a1[t] = a1[i] + t = t - 1 + end + return a1 + end + end + +end diff --git a/tex/context/base/mkiv/l-unicode.lua b/tex/context/base/mkiv/l-unicode.lua index b913d0cfc..e4a182980 100644 --- a/tex/context/base/mkiv/l-unicode.lua +++ b/tex/context/base/mkiv/l-unicode.lua @@ -29,6 +29,9 @@ utf.values = utf.values or string.utfvalues -- string.characterpairs -- string.bytes -- string.bytepairs +-- string.utflength +-- string.utfvalues +-- string.utfcharacters local type = type local char, byte, format, sub, gmatch = string.char, string.byte, string.format, string.sub, string.gmatch @@ -64,53 +67,67 @@ end if not utf.char then - local floor, char = math.floor, string.char - - function utf.char(n) - if n < 0x80 then - -- 0aaaaaaa : 0x80 - return char(n) - elseif n < 0x800 then - -- 110bbbaa : 0xC0 : n >> 6 - -- 10aaaaaa : 0x80 : n & 0x3F - return char( - 0xC0 + floor(n/0x40), - 0x80 + (n % 0x40) - ) - elseif n < 0x10000 then - -- 1110bbbb : 0xE0 : n >> 12 - -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F - -- 10aaaaaa : 0x80 : n & 0x3F - return char( - 0xE0 + floor(n/0x1000), - 0x80 + (floor(n/0x40) % 0x40), - 0x80 + (n % 0x40) - ) - elseif n < 0x200000 then - -- 11110ccc : 0xF0 : n >> 18 - -- 10ccbbbb : 0x80 : (n >> 12) & 0x3F - -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F - -- 10aaaaaa : 0x80 : n & 0x3F - -- dddd : ccccc - 1 - return char( - 0xF0 + floor(n/0x40000), - 0x80 + (floor(n/0x1000) % 0x40), - 0x80 + (floor(n/0x40) % 0x40), - 0x80 + (n % 0x40) - ) - else - return "" + utf.char = string.utfcharacter or (utf8 and utf8.char) + + if not utf.char then + + -- no multiples + + local floor, char = math.floor, string.char + + function utf.char(n) + if n < 0x80 then + -- 0aaaaaaa : 0x80 + return char(n) + elseif n < 0x800 then + -- 110bbbaa : 0xC0 : n >> 6 + -- 10aaaaaa : 0x80 : n & 0x3F + return char( + 0xC0 + floor(n/0x40), + 0x80 + (n % 0x40) + ) + elseif n < 0x10000 then + -- 1110bbbb : 0xE0 : n >> 12 + -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F + -- 10aaaaaa : 0x80 : n & 0x3F + return char( + 0xE0 + floor(n/0x1000), + 0x80 + (floor(n/0x40) % 0x40), + 0x80 + (n % 0x40) + ) + elseif n < 0x200000 then + -- 11110ccc : 0xF0 : n >> 18 + -- 10ccbbbb : 0x80 : (n >> 12) & 0x3F + -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F + -- 10aaaaaa : 0x80 : n & 0x3F + -- dddd : ccccc - 1 + return char( + 0xF0 + floor(n/0x40000), + 0x80 + (floor(n/0x1000) % 0x40), + 0x80 + (floor(n/0x40) % 0x40), + 0x80 + (n % 0x40) + ) + else + return "" + end end + end end if not utf.byte then - local utf8byte = patterns.utf8byte + utf.byte = string.utfvalue or (utf8 and utf8.codepoint) + + if not utf.byte then + + local utf8byte = patterns.utf8byte + + function utf.byte(c) + return lpegmatch(utf8byte,c) + end - function utf.byte(c) - return lpegmatch(utf8byte,c) end end @@ -253,83 +270,89 @@ end if not utf.len then - -- -- alternative 1: 0.77 - -- - -- local utfcharcounter = utfbom^-1 * Cs((p_utf8char/'!')^0) - -- - -- function utf.len(str) - -- return #lpegmatch(utfcharcounter,str or "") - -- end - -- - -- -- alternative 2: 1.70 - -- - -- local n = 0 - -- - -- local utfcharcounter = utfbom^-1 * (p_utf8char/function() n = n + 1 end)^0 -- slow - -- - -- function utf.length(str) - -- n = 0 - -- lpegmatch(utfcharcounter,str or "") - -- return n - -- end - -- - -- -- alternative 3: 0.24 (native unicode.utf8.len: 0.047) - - -- local n = 0 - -- - -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( Cp() * ( - -- -- patterns.utf8one ^1 * Cc(1) - -- -- + patterns.utf8two ^1 * Cc(2) - -- -- + patterns.utf8three^1 * Cc(3) - -- -- + patterns.utf8four ^1 * Cc(4) ) * Cp() / function(f,d,t) n = n + (t - f)/d end - -- -- )^0 ) -- just as many captures as below - -- - -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( - -- -- (Cmt(patterns.utf8one ^1,function(_,_,s) n = n + #s return true end)) - -- -- + (Cmt(patterns.utf8two ^1,function(_,_,s) n = n + #s/2 return true end)) - -- -- + (Cmt(patterns.utf8three^1,function(_,_,s) n = n + #s/3 return true end)) - -- -- + (Cmt(patterns.utf8four ^1,function(_,_,s) n = n + #s/4 return true end)) - -- -- )^0 ) -- not interesting as it creates strings but sometimes faster - -- - -- -- The best so far: - -- - -- local utfcharcounter = utfbom^-1 * P ( ( - -- Cp() * (patterns.utf8one )^1 * Cp() / function(f,t) n = n + t - f end - -- + Cp() * (patterns.utf8two )^1 * Cp() / function(f,t) n = n + (t - f)/2 end - -- + Cp() * (patterns.utf8three)^1 * Cp() / function(f,t) n = n + (t - f)/3 end - -- + Cp() * (patterns.utf8four )^1 * Cp() / function(f,t) n = n + (t - f)/4 end - -- )^0 ) - - -- function utf.len(str) - -- n = 0 - -- lpegmatch(utfcharcounter,str or "") - -- return n - -- end - - local n, f = 0, 1 + utf.len = string.utflength or (utf8 and utf8.len) + + if not utf.len then + + -- -- alternative 1: 0.77 + -- + -- local utfcharcounter = utfbom^-1 * Cs((p_utf8char/'!')^0) + -- + -- function utf.len(str) + -- return #lpegmatch(utfcharcounter,str or "") + -- end + -- + -- -- alternative 2: 1.70 + -- + -- local n = 0 + -- + -- local utfcharcounter = utfbom^-1 * (p_utf8char/function() n = n + 1 end)^0 -- slow + -- + -- function utf.length(str) + -- n = 0 + -- lpegmatch(utfcharcounter,str or "") + -- return n + -- end + -- + -- -- alternative 3: 0.24 (native unicode.utf8.len: 0.047) + + -- local n = 0 + -- + -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( Cp() * ( + -- -- patterns.utf8one ^1 * Cc(1) + -- -- + patterns.utf8two ^1 * Cc(2) + -- -- + patterns.utf8three^1 * Cc(3) + -- -- + patterns.utf8four ^1 * Cc(4) ) * Cp() / function(f,d,t) n = n + (t - f)/d end + -- -- )^0 ) -- just as many captures as below + -- + -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( + -- -- (Cmt(patterns.utf8one ^1,function(_,_,s) n = n + #s return true end)) + -- -- + (Cmt(patterns.utf8two ^1,function(_,_,s) n = n + #s/2 return true end)) + -- -- + (Cmt(patterns.utf8three^1,function(_,_,s) n = n + #s/3 return true end)) + -- -- + (Cmt(patterns.utf8four ^1,function(_,_,s) n = n + #s/4 return true end)) + -- -- )^0 ) -- not interesting as it creates strings but sometimes faster + -- + -- -- The best so far: + -- + -- local utfcharcounter = utfbom^-1 * P ( ( + -- Cp() * (patterns.utf8one )^1 * Cp() / function(f,t) n = n + t - f end + -- + Cp() * (patterns.utf8two )^1 * Cp() / function(f,t) n = n + (t - f)/2 end + -- + Cp() * (patterns.utf8three)^1 * Cp() / function(f,t) n = n + (t - f)/3 end + -- + Cp() * (patterns.utf8four )^1 * Cp() / function(f,t) n = n + (t - f)/4 end + -- )^0 ) + + -- function utf.len(str) + -- n = 0 + -- lpegmatch(utfcharcounter,str or "") + -- return n + -- end + + local n, f = 0, 1 + + local utfcharcounter = patterns.utfbom^-1 * Cmt ( + Cc(1) * patterns.utf8one ^1 + + Cc(2) * patterns.utf8two ^1 + + Cc(3) * patterns.utf8three^1 + + Cc(4) * patterns.utf8four ^1, + function(_,t,d) -- due to Cc no string captures, so faster + n = n + (t - f)/d + f = t + return true + end + )^0 - local utfcharcounter = patterns.utfbom^-1 * Cmt ( - Cc(1) * patterns.utf8one ^1 - + Cc(2) * patterns.utf8two ^1 - + Cc(3) * patterns.utf8three^1 - + Cc(4) * patterns.utf8four ^1, - function(_,t,d) -- due to Cc no string captures, so faster - n = n + (t - f)/d - f = t - return true + function utf.len(str) + n, f = 0, 1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n, f = 0, 1 - lpegmatch(utfcharcounter,str or "") - return n - end + -- -- these are quite a bit slower: - -- -- these are quite a bit slower: + -- utfcharcounter = utfbom^-1 * (Cmt(P(1) * R("\128\191")^0, function() n = n + 1 return true end))^0 -- 50+ times slower + -- utfcharcounter = utfbom^-1 * (Cmt(P(1), function() n = n + 1 return true end) * R("\128\191")^0)^0 -- 50- times slower - -- utfcharcounter = utfbom^-1 * (Cmt(P(1) * R("\128\191")^0, function() n = n + 1 return true end))^0 -- 50+ times slower - -- utfcharcounter = utfbom^-1 * (Cmt(P(1), function() n = n + 1 return true end) * R("\128\191")^0)^0 -- 50- times slower + end end diff --git a/tex/context/base/mkiv/lpdf-col.lua b/tex/context/base/mkiv/lpdf-col.lua index fc251fddc..d1a1af97d 100644 --- a/tex/context/base/mkiv/lpdf-col.lua +++ b/tex/context/base/mkiv/lpdf-col.lua @@ -16,7 +16,6 @@ local formatters = string.formatters local backends, lpdf, nodes = backends, lpdf, nodes local allocate = utilities.storage.allocate -local formatters = string.formatters local nodeinjections = backends.pdf.nodeinjections local codeinjections = backends.pdf.codeinjections @@ -64,7 +63,7 @@ local f_rgb = formatters["%.3F %.3F %.3F rg %.3F %.3F %.3F RG"] local f_cmyk = formatters["%.3F %.3F %.3F %.3F k %.3F %.3F %.3F %.3F K"] local f_spot = formatters["/%s cs /%s CS %s SCN %s scn"] local f_tr = formatters["Tr%s"] -local f_cm = formatters["q %F %F %F %F %F %F cm"] +local f_cm = formatters["q %.6F %.6F %.6F %.6F %.6F %.6F cm"] local f_effect = formatters["%s Tc %s w %s Tr"] local f_tr_gs = formatters["/Tr%s gs"] local f_num_1 = tostring @@ -716,7 +715,7 @@ do local pdfcolor = lpdf.color local pdftransparency = lpdf.transparency - local f_slant = formatters["q 1 0 %F 1 0 0 cm"] + local f_slant = formatters["q 1 0 %.6F 1 0 0 cm"] -- local fillcolors = { -- red = { "pdf", "origin", "1 0 0 rg" }, diff --git a/tex/context/base/mkiv/lpdf-epa.lua b/tex/context/base/mkiv/lpdf-epa.lua index d615f2bef..ac0ca3c92 100644 --- a/tex/context/base/mkiv/lpdf-epa.lua +++ b/tex/context/base/mkiv/lpdf-epa.lua @@ -40,7 +40,7 @@ local escapetex = characters.filters.utf.private.escape local bookmarks = structures.bookmarks -local maxdimen = 2^30-1 +local maxdimen = 0x3FFFFFFF -- 2^30-1 local layerspec = { -- predefining saves time "epdflinks" @@ -231,7 +231,7 @@ function codeinjections.mergereferences(specification) if not a then report_link("missing link annotation") elseif w > width or h > height or w < 0 or h < 0 or abs(x) > (maxdimen/2) or abs(y) > (maxdimen/2) then - report_link("broken link rectangle [%f %f %f %f] (max: %f)",a_llx,a_lly,a_urx,a_ury,maxdimen/2) + report_link("broken link rectangle [%.6F %.6F %.6F %.6F] (max: %.6F)",a_llx,a_lly,a_urx,a_ury,maxdimen/2) else local linktype = a.S if linktype == "GoTo" then diff --git a/tex/context/base/mkiv/lpdf-fld.lua b/tex/context/base/mkiv/lpdf-fld.lua index e8a968713..29a520790 100644 --- a/tex/context/base/mkiv/lpdf-fld.lua +++ b/tex/context/base/mkiv/lpdf-fld.lua @@ -121,39 +121,39 @@ function codeinjections.setformsmethod(name) end local flag = { -- /Ff - ReadOnly = 2^ 0, -- 1 - Required = 2^ 1, -- 2 - NoExport = 2^ 2, -- 3 - MultiLine = 2^12, -- 13 - Password = 2^13, -- 14 - NoToggleToOff = 2^14, -- 15 - Radio = 2^15, -- 16 - PushButton = 2^16, -- 17 - PopUp = 2^17, -- 18 - Edit = 2^18, -- 19 - Sort = 2^19, -- 20 - FileSelect = 2^20, -- 21 - DoNotSpellCheck = 2^22, -- 23 - DoNotScroll = 2^23, -- 24 - Comb = 2^24, -- 25 - RichText = 2^25, -- 26 - RadiosInUnison = 2^25, -- 26 - CommitOnSelChange = 2^26, -- 27 + ReadOnly = 0x00000001, -- 2^ 0 + Required = 0x00000002, -- 2^ 1 + NoExport = 0x00000004, -- 2^ 2 + MultiLine = 0x00001000, -- 2^12 + Password = 0x00002000, -- 2^13 + NoToggleToOff = 0x00004000, -- 2^14 + Radio = 0x00008000, -- 2^15 + PushButton = 0x00010000, -- 2^16 + PopUp = 0x00020000, -- 2^17 + Edit = 0x00040000, -- 2^18 + Sort = 0x00080000, -- 2^19 + FileSelect = 0x00100000, -- 2^20 + DoNotSpellCheck = 0x00400000, -- 2^22 + DoNotScroll = 0x00800000, -- 2^23 + Comb = 0x01000000, -- 2^24 + RichText = 0x02000000, -- 2^25 + RadiosInUnison = 0x02000000, -- 2^25 + CommitOnSelChange = 0x04000000, -- 2^26 } local plus = { -- /F - Invisible = 2^0, -- 1 - Hidden = 2^1, -- 2 - Printable = 2^2, -- 3 - Print = 2^2, -- 3 - NoZoom = 2^3, -- 4 - NoRotate = 2^4, -- 5 - NoView = 2^5, -- 6 - ReadOnly = 2^6, -- 7 - Locked = 2^7, -- 8 - ToggleNoView = 2^8, -- 9 - LockedContents = 2^9, -- 10, - AutoView = 2^8, -- 6 + 9 ? + Invisible = 0x00000001, -- 2^0 + Hidden = 0x00000002, -- 2^1 + Printable = 0x00000004, -- 2^2 + Print = 0x00000004, -- 2^2 + NoZoom = 0x00000008, -- 2^3 + NoRotate = 0x00000010, -- 2^4 + NoView = 0x00000020, -- 2^5 + ReadOnly = 0x00000040, -- 2^6 + Locked = 0x00000080, -- 2^7 + ToggleNoView = 0x00000100, -- 2^8 + LockedContents = 0x00000200, -- 2^9 + AutoView = 0x00000100, -- 2^8 } -- todo: check what is interfaced diff --git a/tex/context/base/mkiv/lpdf-grp.lua b/tex/context/base/mkiv/lpdf-grp.lua index 9122bd027..34925fddd 100644 --- a/tex/context/base/mkiv/lpdf-grp.lua +++ b/tex/context/base/mkiv/lpdf-grp.lua @@ -270,7 +270,7 @@ function img.package(image) -- see lpdf-u3d ** local height = boundingbox[4] local xform = img.scan { attr = resources(), - stream = formatters["%F 0 0 %F 0 0 cm /%s Do"](width,height,imagetag), + stream = formatters["%.6F 0 0 %.6F 0 0 cm /%s Do"](width,height,imagetag), bbox = { 0, 0, width/basepoints, height/basepoints }, } img.immediatewrite(xform) @@ -280,7 +280,7 @@ end -- experimental local nofpatterns = 0 -local f_pattern = formatters["q /Pattern cs /%s scn 0 0 %F %F re f Q"] -- q Q is not really needed +local f_pattern = formatters["q /Pattern cs /%s scn 0 0 %.6F %.6F re f Q"] -- q Q is not really needed local texsavebox = tex.saveboxresource diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 1d59175ca..3e05bff77 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1074,7 +1074,7 @@ end function lpdf.rotationcm(a) local s, c = sind(a), cosd(a) - return format("%0.6F %0.6F %0.6F %0.6F 0 0 cm",c,s,-s,c) + return format("%.6F %.6F %.6F %.6F 0 0 cm",c,s,-s,c) end -- ! -> universaltime diff --git a/tex/context/base/mkiv/lpdf-mis.lua b/tex/context/base/mkiv/lpdf-mis.lua index 2b2fd81e3..5fe064030 100644 --- a/tex/context/base/mkiv/lpdf-mis.lua +++ b/tex/context/base/mkiv/lpdf-mis.lua @@ -455,7 +455,7 @@ end -- temp hack: the mediabox is not under our control and has a precision of 5 digits local factor = number.dimenfactors.bp -local f_value = formatters["%0.5F"] +local f_value = formatters["%0.6F"] local function boxvalue(n) -- we could share them return pdfverbose(f_value(factor * n)) diff --git a/tex/context/base/mkiv/lpdf-u3d.lua b/tex/context/base/mkiv/lpdf-u3d.lua index c9f4a0369..dfd4c1b06 100644 --- a/tex/context/base/mkiv/lpdf-u3d.lua +++ b/tex/context/base/mkiv/lpdf-u3d.lua @@ -461,7 +461,7 @@ local function insert3d(spec) -- width, height, factor, display, controls, label }, ProcSet = pdfarray { pdfconstant("PDF"), pdfconstant("ImageC") }, } - local pwd = pdfflushstreamobject(formatters["q /GS gs %F 0 0 %F 0 0 cm /IM Do Q"](factor*width,factor*height),pw) + local pwd = pdfflushstreamobject(formatters["q /GS gs %.6F 0 0 %.6F 0 0 cm /IM Do Q"](factor*width,factor*height),pw) annot.AP = pdfdictionary { N = pdfreference(pwd) } diff --git a/tex/context/base/mkiv/luat-ini.mkiv b/tex/context/base/mkiv/luat-ini.mkiv index e19b72d14..25ad7e139 100644 --- a/tex/context/base/mkiv/luat-ini.mkiv +++ b/tex/context/base/mkiv/luat-ini.mkiv @@ -98,8 +98,8 @@ {\setcatcodetable\luacatcodes \the\everyluacode} -\edef\luamajorversion{\ctxwrite{_MINORVERSION}} -\edef\luaminorversion{\ctxwrite{_MAJORVERSION}} +\edef\luamajorversion{\ctxwrite{LUAMINORVERSION}} +\edef\luaminorversion{\ctxwrite{LUAMAJORVERSION}} %D We need a way to pass strings safely to \LUA\ without the %D need for tricky escaping. Compare: diff --git a/tex/context/base/mkiv/math-ini.lua b/tex/context/base/mkiv/math-ini.lua index c4bb822d6..5c495dbd7 100644 --- a/tex/context/base/mkiv/math-ini.lua +++ b/tex/context/base/mkiv/math-ini.lua @@ -17,7 +17,8 @@ if not modules then modules = { } end modules ['math-ini'] = { local formatters, find = string.formatters, string.find local utfchar, utfbyte, utflength = utf.char, utf.byte, utf.length -local floor = math.floor +----- floor = math.floor +local sortedhash = table.sortedhash local toboolean = toboolean local context = context @@ -285,7 +286,7 @@ function mathematics.define(family) family = family or 0 family = families[family] or family local data = characters.data - for unicode, character in next, data do + for unicode, character in sortedhash(data) do local symbol = character.mathsymbol local mset, dset = true, true if symbol then @@ -300,7 +301,8 @@ function mathematics.define(family) end local spec = other.mathspec if spec then - for i, m in next, spec do + for i=1,#spec do + local m = spec[i] local class = m.class if class then class = classes[class] or class -- no real checks needed @@ -312,7 +314,8 @@ function mathematics.define(family) local mathclass = character.mathclass local mathspec = character.mathspec if mathspec then - for i, m in next, mathspec do + for i=1,#mathspec do + local m = mathspec[i] local name = m.name local class = m.class if not class then diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv index 03197162d..0dbee83bf 100644 --- a/tex/context/base/mkiv/math-ini.mkiv +++ b/tex/context/base/mkiv/math-ini.mkiv @@ -2343,6 +2343,13 @@ % \ruledhbox{$\mathtext{abc ffi}$} % \ruledhbox{$\mathword{abc ffi}$} +% I need to decide: +% +%mathscriptboxmode\zerocount % no kerning +%mathscriptboxmode\plusone % lists +\mathscriptboxmode\plustwo % lists and boxes +%mathscriptboxmode\plusthree % lists and boxes with \boundary=1 (also for testing and demo) + \unexpanded\def\mathtext {\mathortext{\math_text_choice_font\relax}\hbox} \unexpanded\def\mathword {\mathortext{\math_text_choice_word\relax}\hbox} diff --git a/tex/context/base/mkiv/math-map.lua b/tex/context/base/mkiv/math-map.lua index cf9353e95..f1b0c14e3 100644 --- a/tex/context/base/mkiv/math-map.lua +++ b/tex/context/base/mkiv/math-map.lua @@ -33,7 +33,6 @@ if not modules then modules = { } end modules ['math-map'] = { -- plus add them to the regular vectors below so that they honor \it etc local type, next = type, next -local floor, div = math.floor, math.div local merged, sortedhash = table.merged, table.sortedhash local extract = bit32.extract diff --git a/tex/context/base/mkiv/meta-fnt.lua b/tex/context/base/mkiv/meta-fnt.lua index e7e83c694..1f5670c66 100644 --- a/tex/context/base/mkiv/meta-fnt.lua +++ b/tex/context/base/mkiv/meta-fnt.lua @@ -190,7 +190,7 @@ statistics.register("metapost font generation", function() if total > 0 then local time = statistics.elapsedtime(flusher) if total > 0 then - return format("%i glyphs, %.3f seconds runtime, %i glyphs/second", total, time, total/time) + return format("%i glyphs, %.3f seconds runtime, %.1f glyphs/second", total, time, total/time) else return format("%i glyphs, %.3f seconds runtime", total, time) end @@ -201,7 +201,7 @@ statistics.register("metapost font loading",function() if variants > 0 then local time = statistics.elapsedtime(metapost.fonts) if variants > 0 then - return format("%.3f seconds, %i instances, %0.3f instances/second", time, variants, variants/time) + return format("%.3f seconds, %i instances, %.3f instances/second", time, variants, variants/time) else return format("%.3f seconds, %i instances", time, variants) end diff --git a/tex/context/base/mkiv/meta-tex.lua b/tex/context/base/mkiv/meta-tex.lua index 3c31e3e1e..d66eab069 100644 --- a/tex/context/base/mkiv/meta-tex.lua +++ b/tex/context/base/mkiv/meta-tex.lua @@ -126,7 +126,7 @@ do arguments = { "string", "string" } } - if _LUAVERSION < 5.2 then + if LUAVERSION < 5.2 then utilities.strings.formatters.add(formatters,"texexp", [[texexp(...)]], "local texexp = metapost.texexp") else utilities.strings.formatters.add(formatters,"texexp", [[texexp(...)]], { texexp = metapost.texexp }) diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index 83c1e49ee..b2d97226a 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -68,7 +68,7 @@ local f_pair = formatters["(%.16f,%.16f)"] local f_triplet = formatters["(%.16f,%.16f,%.16f)"] local f_quadruple = formatters["(%.16f,%.16f,%.16f,%.16f)"] -local function mpprint(...) +local function mpprint(...) -- we can optimize for n=1 for i=1,select("#",...) do local value = select(i,...) if value ~= nil then @@ -258,7 +258,7 @@ local function mpquoted(fmt,s,...) buffer[n] = lpegmatch(p,formatters[fmt](s,...)) elseif fmt then -- buffer[n] = '"' .. fmt .. '"' - buffer[n] = '"' .. lpegmatch(p,fmt) .. '"' + buffer[n] = lpegmatch(p,fmt) else -- something is wrong end diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index b0826425f..4542c1e85 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -292,6 +292,7 @@ return { "mathrulesfam", "mathrulesmode", "mathscriptsmode", + "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", diff --git a/tex/context/base/mkiv/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua index 2cd1d1a0a..865f69c2c 100644 --- a/tex/context/base/mkiv/node-ltp.lua +++ b/tex/context/base/mkiv/node-ltp.lua @@ -138,7 +138,6 @@ local tonumber = tonumber local utfchar = utf.char local write, write_nl = texio.write, texio.write_nl local sub, formatters = string.sub, string.formatters -local round, floor = math.round, math.floor local insert, remove = table.insert, table.remove -- local fonts, nodes, node = fonts, nodes, node -- too many locals diff --git a/tex/context/base/mkiv/page-cst.lua b/tex/context/base/mkiv/page-cst.lua index cc35de877..1b537b288 100644 --- a/tex/context/base/mkiv/page-cst.lua +++ b/tex/context/base/mkiv/page-cst.lua @@ -9,7 +9,7 @@ if not modules then modules = { } end modules ["page-cst"] = { -- todo: check what is used local next, type, tonumber = next, type, tonumber -local ceil, floor, odd, round = math.ceil, math.floor, math.odd, math.round +local ceil, odd, round = math.ceil, math.odd, math.round local lower = string.lower local copy = table.copy diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua index 42435ed5b..0d8e64cea 100644 --- a/tex/context/base/mkiv/page-mix.lua +++ b/tex/context/base/mkiv/page-mix.lua @@ -17,7 +17,7 @@ if not modules then modules = { } end modules ["page-mix"] = { local next, type = next, type local concat = table.concat -local ceil, floor = math.ceil, math.floor +local ceil = math.ceil local trace_state = false trackers.register("mixedcolumns.trace", function(v) trace_state = v end) local trace_detail = false trackers.register("mixedcolumns.detail", function(v) trace_detail = v end) diff --git a/tex/context/base/mkiv/publ-dat.lua b/tex/context/base/mkiv/publ-dat.lua index 2cebb4379..fce69b158 100644 --- a/tex/context/base/mkiv/publ-dat.lua +++ b/tex/context/base/mkiv/publ-dat.lua @@ -138,14 +138,15 @@ local virtuals = allocate { } local defaulttypes = allocate { - author = "author", - editor = "author", - -- publisher = "author", - page = "pagenumber", - pages = "pagenumber", - keywords = "keyword", - doi = "url", - url = "url", + author = "author", + editor = "author", + translator = "author", + -- publisher = "author", + page = "pagenumber", + pages = "pagenumber", + keywords = "keyword", + doi = "url", + url = "url", } local defaultsets = allocate { @@ -265,11 +266,13 @@ local specifications = setmetatableindex(function(t,name) local fullname = resolvers.findfile(filename) or "" if fullname == "" then report("no data definition file %a for %a",filename,name) + t[name] = default return default end local specification = table.load(fullname) if not specification then report("invalid data definition file %a for %a",fullname,name) + t[name] = default return default end -- diff --git a/tex/context/base/mkiv/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua index 07160ec57..ed3050f35 100644 --- a/tex/context/base/mkiv/publ-ini.lua +++ b/tex/context/base/mkiv/publ-ini.lua @@ -2361,10 +2361,26 @@ do local citevariants = { } publications.citevariants = citevariants + local function btxvalidcitevariant(dataset,variant) + local citevariant = rawget(citevariants,variant) + if citevariant then + return variant, citevariant + end + local variant = specifications[dataset].types[variant] + if variant then + citevariant = rawget(citevariants,variant) + end + if citevariant then + return variant, citevariant + end + return "default", citevariants.default + end + local function btxhandlecite(specification) local dataset = specification.dataset or v_default local reference = specification.reference local variant = specification.variant + -- if not variant or variant == "" then variant = "default" end @@ -2403,7 +2419,10 @@ do -- ctx_btxsetdataset(dataset) -- - citevariants[variant](specification) -- we always fall back on default + local variant, citevariant = btxvalidcitevariant(dataset,variant) + specification.variant = variant -- the used one + -- + citevariant(specification) -- we always fall back on default end local function btxhandlenocite(specification) @@ -2745,11 +2764,15 @@ do local function simplegetter(first,last,field,specification) local value = first[field] if value then - ctx_btxsetfirst(value) - if last then - ctx_btxsetsecond(last[field]) + if type(value) == "string" then + ctx_btxsetfirst(value) + if last then + ctx_btxsetsecond(last[field]) + end + return true + else + report("missing data type definition for %a",field) end - return true end end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 92cff15e3..9cd88d681 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 9d368f7b8..4f6c0e8cb 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/supp-ran.lua b/tex/context/base/mkiv/supp-ran.lua index 8bfc09e58..1ad9293ee 100644 --- a/tex/context/base/mkiv/supp-ran.lua +++ b/tex/context/base/mkiv/supp-ran.lua @@ -24,7 +24,7 @@ local randomseed = math.randomseed local round = math.round local stack = { } local last = 1 -local maxcount = 2^30-1 -- 1073741823 +local maxcount = 0x3FFFFFFF -- 2^30-1 math.random = function(...) local n = random(...) diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index 03b6d0759..2c8263962 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -1188,6 +1188,7 @@ \ifdefined\mathsurroundmode \else \newcount\mathsurroundmode \fi \ifdefined\mathitalicsmode \else \newcount\mathitalicsmode \fi \ifdefined\mathdelimitersmode \else \newcount\mathdelimitersmode \fi +\ifdefined\mathscriptboxmode \else \newcount\mathscriptboxmode \fi \ifdefined\hyphenpenaltymode \else \newcount\hyphenpenaltymode \fi \ifdefined\automatichyphenpenalty \else \newcount\automatichyphenpenalty \fi diff --git a/tex/context/base/mkiv/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua index 0ce7b4836..312a8b318 100644 --- a/tex/context/base/mkiv/toks-ini.lua +++ b/tex/context/base/mkiv/toks-ini.lua @@ -101,28 +101,28 @@ end -- end local bits = { - escape = 2^ 0, - begingroup = 2^ 1, - endgroup = 2^ 2, - mathshift = 2^ 3, - alignment = 2^ 4, - endofline = 2^ 5, - parameter = 2^ 6, - superscript = 2^ 7, - subscript = 2^ 8, - ignore = 2^ 9, - space = 2^10, -- 1024 - letter = 2^11, - other = 2^12, - active = 2^13, - comment = 2^14, - invalid = 2^15, + escape = 0x00000001, -- 2^00 + begingroup = 0x00000002, -- 2^01 + endgroup = 0x00000004, -- 2^02 + mathshift = 0x00000008, -- 2^03 + alignment = 0x00000010, -- 2^04 + endofline = 0x00000020, -- 2^05 + parameter = 0x00000040, -- 2^06 + superscript = 0x00000080, -- 2^07 + subscript = 0x00000100, -- 2^08 + ignore = 0x00000200, -- 2^09 + space = 0x00000400, -- 2^10 -- 1024 + letter = 0x00000800, -- 2^11 + other = 0x00001000, -- 2^12 + active = 0x00002000, -- 2^13 + comment = 0x00004000, -- 2^14 + invalid = 0x00008000, -- 2^15 -- - character = 2^11 + 2^12, - whitespace = 2^13 + 2^10, -- / needs more checking + character = 0x00001800, -- 2^11 + 2^12 + whitespace = 0x00002400, -- 2^13 + 2^10 -- / needs more checking -- - open = 2^10 + 2^1, -- space + begingroup - close = 2^10 + 2^2, -- space + endgroup + open = 0x00000402, -- 2^10 + 2^01 -- space + begingroup + close = 0x00000404, -- 2^10 + 2^02 -- space + endgroup } -- for k, v in next, bits do bits[v] = k end diff --git a/tex/context/base/mkiv/trac-inf.lua b/tex/context/base/mkiv/trac-inf.lua index 99fe30a6e..5810e2059 100644 --- a/tex/context/base/mkiv/trac-inf.lua +++ b/tex/context/base/mkiv/trac-inf.lua @@ -196,8 +196,9 @@ function statistics.show() local hashchar = tonumber(status.luatex_hashchars) local hashtype = status.luatex_hashtype local mask = lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", diff --git a/tex/context/base/mkiv/typo-cap.lua b/tex/context/base/mkiv/typo-cap.lua index 9e4e9686a..ea0aad422 100644 --- a/tex/context/base/mkiv/typo-cap.lua +++ b/tex/context/base/mkiv/typo-cap.lua @@ -82,7 +82,7 @@ local run = 0 -- a trick to make neighbouring ranges work local blocked = { } local function set(tag,font) - if run == 2^6 then + if run == 0x40 then -- 2^6 run = 1 else run = run + 1 diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv index afd446258..1ef7f74c6 100644 --- a/tex/context/base/mkiv/typo-del.mkiv +++ b/tex/context/base/mkiv/typo-del.mkiv @@ -790,7 +790,8 @@ \dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext \usedelimitedtextstyleandcolor\c!style\c!color \typo_delimited_start_content - \typo_delimited_attributed_e + \bgroup + \aftergroup\typo_delimited_attributed_e \let\next=} \def\typo_delimited_attributed_e @@ -806,6 +807,7 @@ \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext \usedelimitedtextstyleandcolor\c!style\c!color \typo_delimited_start_content + \bgroup \aftergroup\typo_delimited_fontdriven_e \let\next=} diff --git a/tex/context/base/mkiv/typo-dha.lua b/tex/context/base/mkiv/typo-dha.lua index c75fdbc3f..f7f3dee2e 100644 --- a/tex/context/base/mkiv/typo-dha.lua +++ b/tex/context/base/mkiv/typo-dha.lua @@ -85,7 +85,6 @@ local parfillskip_code = skipcodes.parfillskip local new_textdir = nodepool.textdir local hasbit = number.hasbit -local formatters = string.formatters local insert = table.insert local fonthashes = fonts.hashes diff --git a/tex/context/base/mkiv/typo-dir.lua b/tex/context/base/mkiv/typo-dir.lua index 8a9ec978e..5645cd433 100644 --- a/tex/context/base/mkiv/typo-dir.lua +++ b/tex/context/base/mkiv/typo-dir.lua @@ -28,7 +28,6 @@ if not modules then modules = { } end modules ['typo-dir'] = { local next, type = next, type local format, insert, sub, find, match = string.format, table.insert, string.sub, string.find, string.match -local formatters = string.formatters local nodes, node = nodes, node @@ -67,9 +66,9 @@ local v_local = variables["local"] local v_on = variables.on local v_yes = variables.yes -local m_enabled = 2^6 -- 64 -local m_global = 2^7 -local m_fences = 2^8 +local m_enabled = 0x00000040 -- 2^6 64 +local m_global = 0x00000080 -- 2^7 +local m_fences = 0x00000100 -- 2^8 local handlers = { } local methods = { } diff --git a/tex/context/base/mkiv/util-dim.lua b/tex/context/base/mkiv/util-dim.lua index 2bdb870e7..fd9351a28 100644 --- a/tex/context/base/mkiv/util-dim.lua +++ b/tex/context/base/mkiv/util-dim.lua @@ -429,7 +429,7 @@ end stringtodimen = string.todimen -- local variable defined earlier function number.toscaled(d) - return format("%0.5f",d/2^16) + return format("%0.5f",d/0x10000) -- 2^16 end --[[ldx-- diff --git a/tex/context/base/mkiv/util-lua.lua b/tex/context/base/mkiv/util-lua.lua index 6481435bd..27daa516f 100644 --- a/tex/context/base/mkiv/util-lua.lua +++ b/tex/context/base/mkiv/util-lua.lua @@ -21,7 +21,6 @@ local report_mem = logs.reporter("system","lua memory") local tracestripping = false local tracememory = false -local forcestupidcompile = true -- use internal bytecode compiler luautilities.stripcode = true -- support stripping when asked for luautilities.alwaysstripcode = false -- saves 1 meg on 7 meg compressed format file (2012.08.12) luautilities.nofstrippedchunks = 0 diff --git a/tex/context/base/mkiv/util-sto.lua b/tex/context/base/mkiv/util-sto.lua index bcd8c85a3..5b6915eaf 100644 --- a/tex/context/base/mkiv/util-sto.lua +++ b/tex/context/base/mkiv/util-sto.lua @@ -158,6 +158,29 @@ function table.setmetatablecall(t,f) return t end +-- the manual is somewhat fuzzy about this but suggests that one can best +-- set all fields before assigning a metatable + +function table.setmetatableindices(t,f,n,c) + if type(t) ~= "table" then + f, t = t, { } + end + local m = getmetatable(t) + local i = f_index[f] or f + if m then + m.__index = i + m.__newindex = n + m.__call = c + else + setmetatable(t,{ + __index = i, + __newindex = n, + __call = c, + }) + end + return t +end + function table.setmetatablekey(t,key,value) local m = getmetatable(t) if not m then diff --git a/tex/context/base/mkiv/util-str.lua b/tex/context/base/mkiv/util-str.lua index 6d8f198ab..d938ee449 100644 --- a/tex/context/base/mkiv/util-str.lua +++ b/tex/context/base/mkiv/util-str.lua @@ -22,7 +22,7 @@ local utfchar, utfbyte = utf.char, utf.byte local loadstripped = nil -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then loadstripped = function(str,shortcuts) return load(str) @@ -504,7 +504,7 @@ return function(%s) return %s end local preamble, environment = "", { } -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then preamble = [[ local lpeg=lpeg @@ -1007,6 +1007,14 @@ local direct = Cs ( * P(-1) / [[local format = string.format return function(str) return format("%0",str) end]] ) +-- local direct = Cs ( +-- P("%") +-- * (S("+- .") + R("09"))^0 +-- * S("sqidfgGeExXo") +-- * (1-P("%"))^0 +-- * P(-1) / [[local format = string.format return function(str) return format([==[%0]==],str) end]] +-- ) + local function make(t,str) local f local p @@ -1079,7 +1087,7 @@ strings.formatters = { } -- _connector_ is an experiment -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then function strings.formatters.new(noconcat) local t = { _type_ = "formatter", _connector_ = noconcat and "," or "..", _extensions_ = { }, _preamble_ = preamble, _environment_ = { } } @@ -1139,7 +1147,7 @@ patterns.luaquoted = Cs(Cc('"') * ((1-S('"\n'))^1 + P('"')/'\\"' + P('\n')/'\\n" -- escaping by lpeg is faster for strings without quotes, slower on a string with quotes, but -- faster again when other q-escapables are found (the ones we don't need to escape) -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 6dc681b55..93e6bb477 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.xml @@ -802,6 +802,7 @@ + diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml index 271fea6d0..99b58bc74 100644 --- a/tex/context/interface/mkii/keys-de.xml +++ b/tex/context/interface/mkii/keys-de.xml @@ -802,6 +802,7 @@ + diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index 56cdbf3e9..7c6d3ba86 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,119 +65,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + @@ -186,7 +200,7 @@ - + @@ -241,19 +255,19 @@ - + - + - + @@ -263,43 +277,43 @@ - - - - - - - + + + + + + + - + - + - + - + - + - + @@ -346,7 +360,7 @@ - + @@ -355,7 +369,7 @@ - + @@ -372,7 +386,7 @@ - + @@ -389,7 +403,7 @@ - + @@ -409,7 +423,7 @@ - + @@ -426,7 +440,7 @@ - + @@ -446,7 +460,7 @@ - + @@ -467,7 +481,7 @@ - + @@ -487,44 +501,44 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -541,7 +555,7 @@ - + @@ -550,7 +564,7 @@ - + @@ -692,7 +706,7 @@ - + @@ -737,22 +751,22 @@ - + - + - + - + @@ -765,7 +779,7 @@ - + @@ -778,12 +792,12 @@ - + - + @@ -793,46 +807,46 @@ - + - + - + - - + + - + - + - + @@ -846,7 +860,28 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -858,7 +893,20 @@ - + + + + + + + + + + + + + + @@ -875,7 +923,7 @@ - + @@ -888,7 +936,7 @@ - + @@ -920,7 +968,7 @@ - + @@ -933,14 +981,14 @@ - + - + @@ -951,12 +999,12 @@ - + - + @@ -964,7 +1012,7 @@ - + @@ -985,7 +1033,7 @@ - + @@ -1004,14 +1052,14 @@ - + - + @@ -1024,7 +1072,7 @@ - + @@ -1037,7 +1085,7 @@ - + @@ -1052,7 +1100,7 @@ - + @@ -1065,7 +1113,7 @@ - + @@ -1135,7 +1183,7 @@ - + @@ -1145,7 +1193,7 @@ - + @@ -1171,38 +1219,38 @@ - + - + - + - + - + - + @@ -1245,21 +1293,21 @@ - + - + - + @@ -1273,7 +1321,7 @@ - + @@ -1295,9 +1343,24 @@ + + + + + + + + + + + + + + + - + @@ -1340,7 +1403,7 @@ - + @@ -1348,11 +1411,11 @@ - - + + - + @@ -1365,7 +1428,7 @@ - + @@ -1390,7 +1453,7 @@ - + @@ -1402,7 +1465,7 @@ - + @@ -1412,7 +1475,7 @@ - + @@ -1422,7 +1485,7 @@ - + @@ -1438,7 +1501,7 @@ - + @@ -1454,7 +1517,7 @@ - + @@ -1472,7 +1535,7 @@ - + @@ -1512,7 +1575,7 @@ - + @@ -1523,7 +1586,7 @@ - + @@ -1540,7 +1603,7 @@ - + @@ -1553,7 +1616,7 @@ - + @@ -1566,7 +1629,7 @@ - + @@ -2178,6 +2241,16 @@ + + + + + + + + + + @@ -2198,7 +2271,7 @@ - + @@ -2214,7 +2287,7 @@ - + @@ -2483,7 +2556,7 @@ - + @@ -2497,7 +2570,7 @@ - + @@ -2578,7 +2651,7 @@ - + @@ -2586,7 +2659,7 @@ - + @@ -2594,7 +2667,7 @@ - + @@ -2602,7 +2675,7 @@ - + @@ -2610,7 +2683,7 @@ - + @@ -2618,7 +2691,7 @@ - + @@ -2626,7 +2699,7 @@ - + @@ -2634,7 +2707,7 @@ - + @@ -2642,7 +2715,7 @@ - + @@ -2650,7 +2723,7 @@ - + @@ -2658,7 +2731,7 @@ - + @@ -2666,7 +2739,7 @@ - + @@ -2734,7 +2807,7 @@ - + @@ -2810,7 +2883,7 @@ - + @@ -2823,7 +2896,7 @@ - + @@ -2836,21 +2909,21 @@ - + - + - + @@ -2866,7 +2939,7 @@ - + @@ -2879,14 +2952,14 @@ - + - + @@ -2901,7 +2974,7 @@ - + @@ -2914,28 +2987,28 @@ - + - + - + - + @@ -2943,13 +3016,13 @@ - + - + @@ -2959,7 +3032,7 @@ - + @@ -2969,7 +3042,7 @@ - + @@ -2985,28 +3058,28 @@ - + - + - + - + @@ -3016,17 +3089,7 @@ - - - - - - - - - - - + @@ -3037,7 +3100,7 @@ - + @@ -3047,9 +3110,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3062,7 +3171,7 @@ - + @@ -3097,7 +3206,7 @@ - + @@ -3116,7 +3225,7 @@ - + @@ -3129,28 +3238,28 @@ - + - + - + - + @@ -3160,7 +3269,7 @@ - + @@ -3170,7 +3279,7 @@ - + @@ -3180,7 +3289,7 @@ - + @@ -3192,7 +3301,7 @@ - + @@ -3208,7 +3317,7 @@ - + @@ -3223,7 +3332,7 @@ - + @@ -3236,7 +3345,7 @@ - + @@ -3257,7 +3366,7 @@ - + @@ -3276,211 +3385,211 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + @@ -3490,7 +3599,7 @@ - + @@ -3500,16 +3609,16 @@ - + - - - + + + @@ -3519,7 +3628,7 @@ - + @@ -3531,7 +3640,7 @@ - + @@ -3543,21 +3652,21 @@ - - - + + + - - - + + + - + @@ -3567,46 +3676,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -3616,47 +3729,47 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -3666,7 +3779,7 @@ - + @@ -3678,9 +3791,9 @@ - - - + + + @@ -3689,21 +3802,21 @@ - + - + - + @@ -3725,7 +3838,7 @@ - + @@ -3733,10 +3846,10 @@ - + - + @@ -3744,13 +3857,13 @@ - - + + - - - + + + @@ -3759,12 +3872,12 @@ - + - + @@ -3777,7 +3890,7 @@ - + @@ -3880,7 +3993,7 @@ - + @@ -3890,7 +4003,7 @@ - + @@ -3898,7 +4011,7 @@ - + @@ -3908,21 +4021,21 @@ - + - + - + @@ -3932,7 +4045,7 @@ - + @@ -3945,28 +4058,28 @@ - + - + - + - + @@ -4019,7 +4132,7 @@ - + @@ -4080,7 +4193,7 @@ - + @@ -4090,7 +4203,7 @@ - + @@ -4103,7 +4216,7 @@ - + @@ -4157,7 +4270,7 @@ - + @@ -4168,28 +4281,28 @@ - + - + - + - + @@ -4199,7 +4312,7 @@ - + @@ -4222,7 +4335,7 @@ - + @@ -4230,7 +4343,7 @@ - + @@ -4239,10 +4352,10 @@ - - - - + + + + @@ -4256,7 +4369,7 @@ - + @@ -4321,7 +4434,7 @@ - + @@ -4331,7 +4444,7 @@ - + @@ -4341,7 +4454,7 @@ - + @@ -4351,7 +4464,7 @@ - + @@ -4361,7 +4474,7 @@ - + @@ -4371,7 +4484,7 @@ - + @@ -4384,7 +4497,7 @@ - + @@ -4425,7 +4538,7 @@ - + @@ -4443,7 +4556,7 @@ - + @@ -4453,7 +4566,7 @@ - + @@ -4485,7 +4598,7 @@ - + @@ -4495,14 +4608,14 @@ - + - + @@ -4510,7 +4623,7 @@ - + @@ -4518,7 +4631,7 @@ - + @@ -4526,7 +4639,7 @@ - + @@ -4557,7 +4670,7 @@ - + @@ -4592,29 +4705,29 @@ - - + + - + - + - + @@ -4682,7 +4795,7 @@ - + @@ -4692,22 +4805,22 @@ - + - - + + - + @@ -4720,8 +4833,8 @@ - - + + @@ -4740,7 +4853,7 @@ - + @@ -4753,7 +4866,7 @@ - + @@ -4766,7 +4879,7 @@ - + @@ -4776,77 +4889,77 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -4859,7 +4972,7 @@ - + @@ -4872,7 +4985,7 @@ - + @@ -4882,7 +4995,7 @@ - + @@ -4892,35 +5005,35 @@ - + - + - + - + - + @@ -4934,14 +5047,14 @@ - + - + @@ -4955,7 +5068,7 @@ - + @@ -4964,7 +5077,7 @@ - + @@ -5013,14 +5126,14 @@ - + - + @@ -5030,14 +5143,14 @@ - + - + @@ -5055,7 +5168,7 @@ - + @@ -5064,7 +5177,7 @@ - + @@ -5077,7 +5190,7 @@ - + @@ -5137,7 +5250,7 @@ - + @@ -5147,7 +5260,7 @@ - + @@ -5157,7 +5270,7 @@ - + @@ -5165,7 +5278,7 @@ - + @@ -5539,7 +5652,7 @@ - + @@ -5552,7 +5665,7 @@ - + @@ -5636,7 +5749,7 @@ - + @@ -5655,7 +5768,7 @@ - + @@ -5671,318 +5784,318 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5995,7 +6108,7 @@ - + @@ -6008,7 +6121,7 @@ - + @@ -6021,7 +6134,7 @@ - + @@ -6034,7 +6147,7 @@ - + @@ -6044,7 +6157,7 @@ - + @@ -6054,7 +6167,7 @@ - + @@ -6097,7 +6210,7 @@ - + @@ -6115,14 +6228,14 @@ - + - + @@ -6131,7 +6244,7 @@ - + @@ -6144,7 +6257,7 @@ - + @@ -6160,7 +6273,7 @@ - + @@ -6173,7 +6286,7 @@ - + @@ -6263,7 +6376,7 @@ - + @@ -6273,7 +6386,7 @@ - + @@ -6286,7 +6399,7 @@ - + @@ -6299,7 +6412,7 @@ - + @@ -6315,7 +6428,7 @@ - + @@ -6331,7 +6444,7 @@ - + @@ -6345,91 +6458,91 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6556,7 +6669,7 @@ - + @@ -6569,7 +6682,7 @@ - + @@ -6582,7 +6695,7 @@ - + @@ -6592,7 +6705,7 @@ - + @@ -6891,7 +7004,7 @@ - + @@ -6904,7 +7017,7 @@ - + @@ -6917,7 +7030,7 @@ - + @@ -6927,7 +7040,7 @@ - + @@ -6937,7 +7050,7 @@ - + @@ -6967,7 +7080,7 @@ - + @@ -6983,7 +7096,7 @@ - + @@ -7285,7 +7398,7 @@ - + @@ -7298,7 +7411,7 @@ - + @@ -7426,7 +7539,7 @@ - + @@ -7447,7 +7560,7 @@ - + @@ -7460,7 +7573,7 @@ - + @@ -7479,7 +7592,7 @@ - + @@ -7487,15 +7600,15 @@ - - + + - + @@ -7578,7 +7691,7 @@ - + @@ -7603,16 +7716,16 @@ - + - - - + + + @@ -7620,7 +7733,7 @@ - + @@ -7630,10 +7743,10 @@ - - - - + + + + @@ -7641,7 +7754,7 @@ - + @@ -7649,29 +7762,29 @@ - + - + - + - - + + @@ -7679,7 +7792,7 @@ - + @@ -7687,29 +7800,29 @@ - + - + - + - - + + @@ -7717,7 +7830,7 @@ - + @@ -7725,29 +7838,29 @@ - + - + - + - - + + @@ -7755,7 +7868,7 @@ - + @@ -7763,36 +7876,36 @@ - + - + - + - - + + - + @@ -7819,14 +7932,21 @@ - + - + + + + + + + + @@ -7876,7 +7996,7 @@ - + @@ -7886,14 +8006,14 @@ - + - + @@ -7902,7 +8022,7 @@ - + @@ -7915,7 +8035,7 @@ - + @@ -7942,19 +8062,19 @@ - + - + - + @@ -7964,7 +8084,7 @@ - + @@ -7977,7 +8097,7 @@ - + @@ -8153,7 +8273,7 @@ - + @@ -8163,7 +8283,7 @@ - + @@ -8184,7 +8304,7 @@ - + @@ -8197,7 +8317,7 @@ - + @@ -8216,7 +8336,7 @@ - + @@ -8233,7 +8353,7 @@ - + @@ -8283,14 +8403,14 @@ - + - + @@ -8303,7 +8423,7 @@ - + @@ -8418,7 +8538,7 @@ - + @@ -8431,7 +8551,7 @@ - + @@ -8444,7 +8564,7 @@ - + @@ -8457,7 +8577,7 @@ - + @@ -8470,7 +8590,7 @@ - + @@ -8480,7 +8600,7 @@ - + @@ -8490,7 +8610,7 @@ - + @@ -8503,7 +8623,7 @@ - + @@ -8516,7 +8636,7 @@ - + @@ -8541,7 +8661,7 @@ - + @@ -8554,7 +8674,7 @@ - + @@ -8570,7 +8690,7 @@ - + @@ -8580,7 +8700,7 @@ - + @@ -8588,7 +8708,7 @@ - + @@ -8598,7 +8718,7 @@ - + @@ -8608,7 +8728,7 @@ - + @@ -8619,7 +8739,7 @@ - + @@ -8648,7 +8768,7 @@ - + @@ -8671,7 +8791,7 @@ - + @@ -8691,7 +8811,7 @@ - + @@ -8701,7 +8821,7 @@ - + @@ -8714,7 +8834,7 @@ - + @@ -8729,7 +8849,7 @@ - + @@ -8742,7 +8862,7 @@ - + @@ -8751,7 +8871,7 @@ - + @@ -8760,7 +8880,7 @@ - + @@ -8772,7 +8892,7 @@ - + @@ -8781,21 +8901,21 @@ - + - + - + @@ -8805,7 +8925,7 @@ - + @@ -8815,7 +8935,7 @@ - + @@ -8828,7 +8948,7 @@ - + @@ -8841,24 +8961,24 @@ - - - - - - - - - - - + + + + + + + + + + + - + @@ -8871,7 +8991,7 @@ - + @@ -8884,7 +9004,7 @@ - + @@ -8897,7 +9017,7 @@ - + @@ -8910,7 +9030,7 @@ - + @@ -8923,7 +9043,7 @@ - + @@ -8936,7 +9056,7 @@ - + @@ -8949,7 +9069,7 @@ - + @@ -8962,21 +9082,21 @@ - + - - - - - - - - + + + + + + + + @@ -8989,7 +9109,7 @@ - + @@ -9002,45 +9122,45 @@ - + - + - + - + - - - + + + - - + + @@ -9050,91 +9170,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + - + @@ -9147,7 +9274,7 @@ - + @@ -9160,7 +9287,7 @@ - + @@ -9173,7 +9300,7 @@ - + @@ -9189,7 +9316,7 @@ - + @@ -9205,7 +9332,7 @@ - + @@ -9218,14 +9345,14 @@ - + - + @@ -9238,7 +9365,7 @@ - + @@ -9251,7 +9378,7 @@ - + @@ -9264,7 +9391,7 @@ - + @@ -9277,14 +9404,14 @@ - + - + @@ -9294,7 +9421,7 @@ - + @@ -9304,7 +9431,7 @@ - + @@ -9313,7 +9440,7 @@ - + @@ -9326,7 +9453,7 @@ - + @@ -9393,7 +9520,7 @@ - + @@ -9405,7 +9532,7 @@ - + @@ -9418,7 +9545,7 @@ - + @@ -9431,7 +9558,7 @@ - + @@ -9487,7 +9614,7 @@ - + @@ -9497,7 +9624,7 @@ - + @@ -9508,7 +9635,7 @@ - + @@ -9518,7 +9645,7 @@ - + @@ -9545,7 +9672,7 @@ - + @@ -9554,7 +9681,7 @@ - + @@ -9593,7 +9720,7 @@ - + @@ -9606,7 +9733,7 @@ - + @@ -9621,7 +9748,7 @@ - + @@ -9634,7 +9761,7 @@ - + @@ -9658,14 +9785,14 @@ - + - + @@ -9675,7 +9802,7 @@ - + @@ -9688,7 +9815,7 @@ - + @@ -9716,7 +9843,7 @@ - + @@ -9726,7 +9853,7 @@ - + @@ -9740,14 +9867,14 @@ - + - + @@ -9755,622 +9882,869 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + - - + + - - - + + - + + + + + + + - - - - + + - - - + + - - + + + + + + + - - + + - - + + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + - - - + + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + - - - - - + + - - - + + - + - + + - - - + + + + - - - + + - - - + + - - + + - - - + + + - - - + + + - - - + + - - + + - - + + + + - - - + + + - - - + + + - - - + + + - - - + + - - - + + - - + + - - + + + + + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + - - - + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + - - + + - - + + - - + + - - - - + + - - - + + - - - + + - - - + + + - - - + + - - - + + - - - + + - - + + + - - - + + - - - + + - - - + + - - + + - - - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + + + + - + - + + + + - - - + - + + + + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + - + - + - - - @@ -10379,11 +10753,8 @@ - + - - - @@ -10392,1043 +10763,1328 @@ - + - - - + + + + + + + + + + + - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - + - + - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + - + + + + - - - - - - - - - - - - - - + + - - + + - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - + - - - - - - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - - + + - - - - - + + + + + + + + + + + + + + + + + + + - + + + + - + - - - + + + - + - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + - + - - - - + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + + + + + + + - - - - - + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + + - - + + - - + + - - + + - - + + - - + + + + - - + + + - - + + + - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + - + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + - + - - - - - - + - + - - + + - - - - - - + - + - - + + - + - - - - - - - - - + - + - - - - - - - - - - - - - - - - + - - - - - - + - + - - - - - - - - + + + - + - - - - + - + + + + + + + + + + + + + - - - - - + - + - - + + + + + + + + + + + + + + + + + - + - - + + - - + + + + + - + - - + + - - - - - - - + + - - - - - - - + + - - - + + + + + + - + - - + + - + - - + + - + - - + + - - + - - + + + - + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + + + + + + + + + + + + + - + - + - - - - - + + + + + - + - + - - - - - - - - - + + + - + - - + + - - + - + + - + - + - - + + - - + + - + - - - - - - - - + + - - + + - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + - + - - + + - - - + + + - + - - + + + + + + + - + - + - - - - + - + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + - - + + + + + + - + + + + + + + - + - - + + - - + + + + + - + - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - + - + + + - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + - + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + - - + + + + + + - + - - + + + + + + + + + + + - - - - - - - - - + - + - + + + + + @@ -11442,126 +12098,642 @@ - + - - + + + + + + + + + + + + + + + + + - + - - + + + + + + + - - + + - - + + + + + + + + + + - - + + - + - + - - - - - - - - + + + + + + - + - - + + - - + - + - - - - - + + - + - - + + - - + + + + + + + - - + + + + + + + + + + + - + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11588,8 +12760,8 @@ - - + + @@ -11618,7 +12790,7 @@ - + @@ -11628,7 +12800,7 @@ - + @@ -11741,7 +12913,7 @@ - + @@ -11758,7 +12930,7 @@ - + @@ -11790,6 +12962,11 @@ + + + + + @@ -11827,6 +13004,10 @@ + + + + @@ -11855,6 +13036,10 @@ + + + + @@ -11871,10 +13056,6 @@ - - - - @@ -11889,7 +13070,7 @@ - + @@ -11937,6 +13118,10 @@ + + + + @@ -11954,10 +13139,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11978,6 +13193,10 @@ + + + + @@ -11993,7 +13212,7 @@ - + @@ -12002,7 +13221,7 @@ - + @@ -12070,14 +13289,16 @@ - + - + + + @@ -12133,15 +13354,6 @@ - - - - - - - - - @@ -12154,6 +13366,17 @@ + + + + + + + + + + + @@ -12220,7 +13443,7 @@ - + @@ -12233,7 +13456,7 @@ - + @@ -12429,21 +13652,21 @@ - + - + - + @@ -12451,7 +13674,7 @@ - + @@ -12466,7 +13689,7 @@ - + @@ -12474,7 +13697,7 @@ - + @@ -12484,7 +13707,7 @@ - + @@ -12495,7 +13718,7 @@ - + @@ -12506,7 +13729,7 @@ - + @@ -12514,7 +13737,7 @@ - + @@ -12525,7 +13748,7 @@ - + @@ -12536,7 +13759,7 @@ - + @@ -12544,7 +13767,7 @@ - + @@ -12557,7 +13780,7 @@ - + @@ -12567,7 +13790,7 @@ - + @@ -12583,7 +13806,7 @@ - + @@ -12596,7 +13819,7 @@ - + @@ -12606,7 +13829,7 @@ - + @@ -12619,7 +13842,7 @@ - + @@ -12662,7 +13885,7 @@ - + @@ -12672,7 +13895,7 @@ - + @@ -12686,7 +13909,7 @@ - + @@ -12705,7 +13928,7 @@ - + @@ -12718,7 +13941,7 @@ - + @@ -12750,7 +13973,7 @@ - + @@ -12758,7 +13981,7 @@ - + @@ -12768,7 +13991,7 @@ - + @@ -12778,7 +14001,7 @@ - + @@ -12788,7 +14011,7 @@ - + @@ -12799,6 +14022,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12965,9 +14274,6 @@ - - - @@ -13081,7 +14387,7 @@ - + @@ -13094,7 +14400,7 @@ - + @@ -13128,42 +14434,42 @@ - + - + - + - + - + - + @@ -13173,35 +14479,35 @@ - + - + - + - + - + @@ -13211,7 +14517,7 @@ - + @@ -13267,7 +14573,7 @@ - + @@ -13278,7 +14584,7 @@ - + @@ -13291,7 +14597,7 @@ - + @@ -13306,7 +14612,7 @@ - + @@ -13322,7 +14628,7 @@ - + @@ -13340,7 +14646,7 @@ - + @@ -13358,7 +14664,7 @@ - + @@ -13420,6 +14726,11 @@ + + + + + @@ -13460,6 +14771,11 @@ + + + + + @@ -13498,6 +14814,11 @@ + + + + + @@ -13514,8 +14835,8 @@ - - + + @@ -13572,7 +14893,7 @@ - + @@ -13581,7 +14902,7 @@ - + @@ -13594,7 +14915,7 @@ - + @@ -13604,7 +14925,7 @@ - + @@ -13623,7 +14944,7 @@ - + @@ -13636,7 +14957,7 @@ - + @@ -13646,7 +14967,7 @@ - + @@ -13656,8 +14977,8 @@ - - + + @@ -13667,7 +14988,7 @@ - + @@ -13680,7 +15001,7 @@ - + @@ -13689,7 +15010,7 @@ - + @@ -13702,7 +15023,7 @@ - + @@ -13722,7 +15043,7 @@ - + @@ -13732,7 +15053,7 @@ - + @@ -13742,14 +15063,14 @@ - + - + @@ -13761,7 +15082,7 @@ - + @@ -13774,7 +15095,7 @@ - + @@ -13800,22 +15121,22 @@ - - - - - - + + + + + + - - - - + + + + @@ -13824,30 +15145,30 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + @@ -13857,7 +15178,7 @@ - + @@ -13867,7 +15188,7 @@ - + @@ -13877,7 +15198,7 @@ - + @@ -13887,7 +15208,7 @@ - + @@ -13897,7 +15218,7 @@ - + @@ -13906,7 +15227,7 @@ - + @@ -13921,7 +15242,7 @@ - + @@ -13934,7 +15255,7 @@ - + @@ -13989,7 +15310,7 @@ - + @@ -13997,8 +15318,8 @@ - - + + @@ -14008,7 +15329,7 @@ - + @@ -14018,7 +15339,7 @@ - + @@ -14028,7 +15349,7 @@ - + @@ -14038,7 +15359,7 @@ - + @@ -14048,14 +15369,14 @@ - + - + @@ -14096,7 +15417,7 @@ - + @@ -14104,76 +15425,76 @@ - - + + - + - + - + - + - + - + - + - + - + - + @@ -14182,7 +15503,7 @@ - + @@ -14192,7 +15513,7 @@ - + @@ -14202,7 +15523,7 @@ - + @@ -14260,7 +15581,7 @@ - + @@ -14286,7 +15607,7 @@ - + @@ -14310,16 +15631,16 @@ - - + + - - - - + + + + @@ -14328,16 +15649,16 @@ - + - - + + - + @@ -14350,7 +15671,7 @@ - + @@ -14396,12 +15717,12 @@ - + - + @@ -14423,7 +15744,7 @@ - + @@ -14474,14 +15795,14 @@ - + - + @@ -14493,42 +15814,42 @@ - + - + - + - + - + - + @@ -14541,7 +15862,7 @@ - + @@ -14550,7 +15871,7 @@ - + @@ -14563,7 +15884,7 @@ - + @@ -14579,7 +15900,7 @@ - + @@ -14592,7 +15913,7 @@ - + @@ -14607,7 +15928,7 @@ - + @@ -14620,7 +15941,7 @@ - + @@ -14718,14 +16039,14 @@ - + - + @@ -14733,7 +16054,7 @@ - + @@ -14741,7 +16062,7 @@ - + @@ -14751,7 +16072,7 @@ - + @@ -14763,7 +16084,7 @@ - + @@ -14776,7 +16097,7 @@ - + @@ -14839,7 +16160,7 @@ - + @@ -14849,7 +16170,7 @@ - + @@ -14863,7 +16184,7 @@ - + @@ -14876,7 +16197,7 @@ - + @@ -14987,28 +16308,28 @@ - + - + - + - + @@ -15018,7 +16339,7 @@ - + @@ -15034,7 +16355,7 @@ - + @@ -15047,7 +16368,7 @@ - + @@ -15059,7 +16380,7 @@ - + @@ -15100,6 +16421,8 @@ + + @@ -15111,7 +16434,7 @@ - + @@ -15365,7 +16688,7 @@ - + @@ -15378,7 +16701,7 @@ - + @@ -15418,7 +16741,7 @@ - + @@ -15433,14 +16756,14 @@ - + - + @@ -15450,7 +16773,7 @@ - + @@ -15465,14 +16788,14 @@ - + - + @@ -15482,7 +16805,7 @@ - + @@ -15497,21 +16820,21 @@ - + - + - + @@ -15526,21 +16849,21 @@ - + - + - + @@ -15553,7 +16876,7 @@ - + @@ -15593,7 +16916,7 @@ - + @@ -15608,14 +16931,14 @@ - + - + @@ -15625,7 +16948,7 @@ - + @@ -15640,14 +16963,14 @@ - + - + @@ -15657,7 +16980,7 @@ - + @@ -15672,21 +16995,21 @@ - + - + - + @@ -15701,21 +17024,21 @@ - + - + - + @@ -15724,9 +17047,9 @@ - - - + + + @@ -15738,7 +17061,7 @@ - + @@ -15751,7 +17074,7 @@ - + @@ -15960,7 +17283,7 @@ - + @@ -16054,1232 +17377,244 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + - - + + - - + + - + - - + + + + + + + - + - - - + + - + + + - - - - - - - - + + - - + + - - + + - - + + - - + + + + + + + + - - + + + - - + + + + + + + - - + + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + - + + + + + - - - - - + + + - - + + + + + + + + - + - + - - - - + + + + + + + + - + - + - - - - - - - - - - - + + + + + - - - + - - - - + - - - + + - + - - - - - - - - - - - + - - - - - - - - + + - - + - - + + - - - - - - - - + - - + + + + + - - - - - - - - + - + + + + + + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + - + + + @@ -17288,268 +17623,238 @@ - + - + - - - - - - - - - + + + + + + - - + + - + - + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - + + + + - + - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - + + - + - - + + + + + - + + + - + + + + + + + - + - + + + + + + + + - + - + + - + + + + + + + + + + + + - + + + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + + - - + + - - + + - + - - - - - + + - + - + - - - - - + + - + - - - + - - - - - - - + - + + + - + - - - - - + + - - - + + @@ -17558,540 +17863,582 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + - - + + - + - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - + + - + - - - - - - - + + - - + + - - + + - - + + - - - - + + - + - + + + + + + + + + + - - - + + + - - + + - - + + - - + + - - + + + - + + + + + + + + + - + + - + - + - + + + + + - - - - - - - - - + + - + + + + - + - - + + + + - - - - - + + - + + + + - - + + + - - + + - - + + + - - + + + - + + + + - - - + + + + + - + + + + + - - - - - + + - - + + - + + + - + - - - - - + + - + + + + + + - - + + - - - - - - + + + + + + + + + + + + + - + + + + + + - - + + + + + + + + + + + + + + + + + + - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + - + + + + + - - + + - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - - - - - - - + + + + + + + + + + + + - + + + + + - + - - - - - - - - - - - + - - - + + + + + - + + + + + + - - - - - - - - - - - - - + + + + + + + - + + + + + + - - - - - - - - - - - - + + + + + + + - + + + - - - - - - - - - - - - + + + + + - - - - - + - - + + - - - - + - - + + + - + + + + + + + + + + + + + + - + - - - - + + - + + + + - - - + + + - - - - - - - - - - - - - + + - - + + - - - - - - - - - + + - - + + - + + + + + + + + + + - + - - + + - - - + + - - + - - + + - - - - - - - - - - - - + + - - + + - - + + - - - - + + + + + + + + + + + + - + - - + + - - - + + - - - - - - + + - + - - + + - - - - - - + + + + + - + - + @@ -18101,10 +18448,10 @@ - + - + @@ -18114,98 +18461,139 @@ - + + + + + + - - + + + + + + - + - + + + + + + - + - - - - + + + - - + + + + + - + + + - - + + + + + + + + + + + + - + + + + + + + - + + - + + + + + + + + + + + + + - + - + + + + + + + + + + + + - + + + - + - + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - + + @@ -18214,446 +18602,505 @@ - - - - - - - - - - - - - - - - + + + - - - - + + + + - + + + + - - - + - - - - - - - - - + + - - + + + + + + + + + + + - - + + - - + + - - + + - + + + + + + + + + + + + - - + + - - + + - - + + - - - + + - + - - + + - - - + - + - - + + + + + + - - + + + + + + + + + + + + + + + - - + + - - + + - - + + + - - - + + + - - - + + + - - - + + - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - + - - + + + + + - + + + + + + + + + + + - + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + - - - + + - + - + - + - - + + + + - - - + + - - - - + + - - - - - - - - - - - - - - - - - + + - - + + - - - - + - - - + - - - + - - - - - - + + - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - - - + + - - + + - - + + - - + + - - + - - + - - - + + - - - - - - - - + + - - + + - - - + + + + - - + + - - + + - - - - - - - - - - + + + + - - - - + + - - - + + - - + + - - - + + - - + + + + - - - + + + + + + + + - - + + - - - + + - - + + - + - - + + - - - - + + - - - - - - - - - - - - - - - - - - - + + - - + + - - - + + - - + + + + + + + + + - - + + + + - + + + + + + + - - - - - - - - - + + - - - + + - - + + - - - + + - - - + + - - - + + + + + + + + + - + @@ -18663,10 +19110,10 @@ - + - + @@ -18676,372 +19123,175 @@ - - - - - - - - - - - - - - + - - + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - + - + - + - + - + - + - + + + + - + - + - + + + + - + - + - + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - + + + + + - - + + + + + + - - - - + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + - - - - - - - - - - - + + + - - - - + + + + - - + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -19050,545 +19300,385 @@ - + - + - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - - + + + - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - + + + - + - - + + - + - - + + - + - - + + - + - + - - - - - + - - - - - + - + - + - - - - - + - - - - - + - + - - + + - - - - - - + + - + - - + + - + + + + - + - - + - - - - + - + - + - - - - - + - - - + - + - - - - - + - - - - - - - - - - - - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + + - + - - + + - - - - - - - + + - - - - + + - - - - - - - - - + + + + + - - + + + - + - - + + - + + + + + + - - + + + - - + + - - + + - - + + + - - + + - - + + - - + + + + - - + + - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - + + + - - - - + + + - + + @@ -19596,61 +19686,155 @@ - + - - - - + - - - - - + + + + - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19660,8 +19844,55 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19670,523 +19901,362 @@ - - - - + + - - - - - + + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - - + + + + - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - + - - + + + - - + + - - + + - - + + - + + + + + + + + - - - + + + - - + + + + + - - + + + + + - + - - + + + + + + + + - - - - - - - + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + - - - - - - - - - + + - + - - - - + + + + + + + + + - + - + - - - - + + + - + - + - - - + - - - - - + + - + - + - - + + - - - - - - - - - - - - - - - + + - + - - - - + + + + - + - + - - + + + + + - + - + + + + - + - - - - - - - + + + + - + + + + + - - - - - - - - - + + + + + + - + + + + + - - - - - - - - - + + + + + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - - - - - + + - - - - - - - - - - - - - - - - - + + - + - + - - + + + + - + - - - - - + + + + + + + + + - - - + @@ -20195,540 +20265,574 @@ - + - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - - - - - + + - - + + - - - + + - - - + + - + - - + + + + + + - + + + + + + + + - - + + + + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - - - - - - + + + + + + + + + - + - + + + + + + + - + - + + + + + + + + + + + + + + + + + + - + + + + + + + - + - + - + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + - + + + + - - + + + + + - + + + + + - + + + + + - + - - - - - - - - - - - + + + + + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - + + + - - + - + + + - + + + - + + + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - - - - - - - - - - - - - - - - + - + + + - + - + + + - + + - + + + + + + - - - - + - + + + - + + + + + - + + + - + - + + + - + + + + - + - + - + - + + + - + - + + + - + + + + + + - + + + - + - - - - - - - + + + + + + - - + + @@ -20737,67 +20841,141 @@ - + - + - - + + - - + + - + - - - - - + + - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - + + - + - - + + + + - - + + @@ -20806,56 +20984,73 @@ - + - + - + + + + + + + + - + - - - + + + + + - - + + - - + + + + + + + + + + + + + + + + + - - - - + - - - + + + - - - - - - + + @@ -20864,440 +21059,484 @@ - + - + - + - + + + + + + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + - - + + + + + - - + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + - + + + - - + + - + - - + + + + + - + - - + + - + - + - - - - - + - - - + + - + - + - + - + - - - - - + + + - + - - - - - - - - + - - + - - - - - - - - - - + + - - - - + - - - + + + + + + - - - - - + - - - + + + + + + - - + - - + + - - + + + + + + + + + + + + + + - + - + + + + - + - + - + + + + - - - + - + + - - - + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - + + + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - + - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + - - + + + + + + - - + - - + + + + + + - - - + + @@ -21306,290 +21545,171 @@ - + - + - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - + + + - - + + + - - + + + - - + + + - - + + + + - - - + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + - - + + + + - - + + - - + + + - - - + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - + + - + - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + - + - + - - - - - - @@ -21598,1081 +21718,1358 @@ - + - - - - - - - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - + + - + - - - - - - + + - + - - - - - - + + - + - - + + - - + + + + + + + + + + + - + - - - - - + + + + + + + + + + + + - + - - - - - + + + + + + + + + + + + - + - - - - - + + + + + + + + + + + + - + + - - - - - - + - + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + - - - - - - + - + - - - - - - + - + - - - - - - + - + + + + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - - - + - + - - - - + - - - - - + - + - + + + - - + + - - + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - + + - - + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - + + + + + + + - + + + - - + + - - + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - + - + - - - - - + + + - + + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + - - - - - + + - + + + + - - + + - - + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - + + + + + + + - + - - - - - - + + + - + + - - - - + - + + - + - + - + - + - + - + - - - - - - + - + - - - - - - + - + + + + + - - + + - - + + + + + - + - - - - - + + + + + + + + + + + + + + + + - + + + + - - - + - + + + - - + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + - + + + + - + + - + - + + - + + + - - + + - - - - - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + - - - - - - + + - - - - - - + + - + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + - - - - - - + + - - - - - - + + - + + + + - + - - + + + + - - - - - - + + + + + - + + + + + - + - - - - - + - - + + + + + + + + + - + + + + - + - - + + + + + + + + + + - + + + + + - + - - - - - + - - + + + + + + + + + + + + - + + + + - - - - + + + + + + + + + + - + - - + + + + + + + + + + + + + - + + + + + - + - - - - - - - - - + - - + + + + + + + + - + + + + @@ -22681,18 +23078,27 @@ + + + - + - - + + - - + + + + + - + + + + @@ -22701,61 +23107,62 @@ + + + - + - - + + - + + + + - + + + + - - + + - + - - - - - + - + - + - - + + - + - - - - - + - + - - - - + + + + @@ -22768,33 +23175,33 @@ - + - - - - + + + + - + - + - - + + @@ -22804,7 +23211,7 @@ - + @@ -22815,7 +23222,7 @@ - + @@ -22828,7 +23235,7 @@ - + @@ -22866,50 +23273,50 @@ - + - + - + - - - - + + + + - + - + - + @@ -22921,7 +23328,7 @@ - + @@ -22933,7 +23340,7 @@ - + @@ -22945,7 +23352,7 @@ - + @@ -22955,21 +23362,21 @@ - + - + - + @@ -22979,7 +23386,7 @@ - + @@ -22989,7 +23396,7 @@ - + @@ -23001,7 +23408,7 @@ - + @@ -23011,7 +23418,7 @@ - + @@ -23023,7 +23430,7 @@ - + @@ -23033,7 +23440,7 @@ - + @@ -23045,7 +23452,7 @@ - + @@ -23055,7 +23462,7 @@ - + @@ -23067,7 +23474,7 @@ - + @@ -23077,7 +23484,7 @@ - + @@ -23089,21 +23496,21 @@ - + - + - + @@ -23112,22 +23519,22 @@ - - + + - + - + @@ -23135,14 +23542,14 @@ - + - + @@ -23152,14 +23559,14 @@ - + - + @@ -23169,28 +23576,28 @@ - + - + - + - + @@ -23203,7 +23610,7 @@ - + @@ -23216,14 +23623,14 @@ - + - + @@ -23233,7 +23640,7 @@ - + @@ -23243,7 +23650,7 @@ - + @@ -23258,7 +23665,7 @@ - + @@ -23271,7 +23678,7 @@ - + @@ -23354,7 +23761,7 @@ - + @@ -23364,7 +23771,7 @@ - + @@ -23380,91 +23787,91 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -23476,14 +23883,14 @@ - + - + @@ -23496,7 +23903,7 @@ - + @@ -23509,7 +23916,7 @@ - + @@ -23519,7 +23926,7 @@ - + @@ -23529,21 +23936,21 @@ - + - + - + @@ -23556,7 +23963,7 @@ - + @@ -23569,7 +23976,7 @@ - + @@ -23582,7 +23989,7 @@ - + @@ -23595,21 +24002,21 @@ - + - + - + @@ -23618,28 +24025,28 @@ - + - + - + - + @@ -23667,7 +24074,7 @@ - + @@ -23758,7 +24165,7 @@ - + @@ -23771,7 +24178,7 @@ - + @@ -23804,7 +24211,7 @@ - + @@ -23817,7 +24224,7 @@ - + @@ -23833,7 +24240,7 @@ - + @@ -23843,7 +24250,7 @@ - + @@ -23859,7 +24266,7 @@ - + @@ -24112,14 +24519,14 @@ - + - + @@ -24163,7 +24570,7 @@ - + @@ -24343,7 +24750,7 @@ - + @@ -24353,7 +24760,7 @@ - + @@ -24378,7 +24785,7 @@ - + @@ -24392,7 +24799,7 @@ - + @@ -24409,7 +24816,7 @@ - + @@ -24434,7 +24841,7 @@ - + @@ -24447,7 +24854,7 @@ - + @@ -24590,7 +24997,7 @@ - + @@ -24600,7 +25007,7 @@ - + @@ -24613,7 +25020,7 @@ - + @@ -24634,7 +25041,7 @@ - + @@ -24647,7 +25054,7 @@ - + @@ -24668,7 +25075,7 @@ - + @@ -24678,14 +25085,14 @@ - + - + @@ -24695,9 +25102,9 @@ - - - + + + @@ -24710,7 +25117,7 @@ - + @@ -24723,7 +25130,7 @@ - + @@ -24733,7 +25140,7 @@ - + @@ -24743,7 +25150,7 @@ - + @@ -24753,7 +25160,7 @@ - + @@ -24763,7 +25170,7 @@ - + @@ -24781,22 +25188,22 @@ - + - - + + - + @@ -24809,7 +25216,7 @@ - + @@ -24834,7 +25241,7 @@ - + @@ -24847,7 +25254,7 @@ - + @@ -24864,7 +25271,7 @@ - + @@ -24878,7 +25285,7 @@ - + @@ -24888,7 +25295,7 @@ - + @@ -24897,7 +25304,7 @@ - + @@ -24909,11 +25316,11 @@ - - - - - + + + + + @@ -24925,7 +25332,7 @@ - + @@ -24937,7 +25344,7 @@ - + @@ -24949,7 +25356,7 @@ - + @@ -24961,7 +25368,7 @@ - + @@ -24973,7 +25380,7 @@ - + @@ -24985,7 +25392,7 @@ - + @@ -24995,7 +25402,7 @@ - + @@ -25005,9 +25412,9 @@ - - - + + + @@ -25023,7 +25430,7 @@ - + @@ -25039,7 +25446,7 @@ - + @@ -25055,7 +25462,7 @@ - + @@ -25073,7 +25480,7 @@ - + @@ -25124,14 +25531,14 @@ - + - + @@ -25140,7 +25547,7 @@ - + @@ -25150,7 +25557,7 @@ - + @@ -25169,10 +25576,10 @@ - + - + @@ -25197,7 +25604,7 @@ - + @@ -25215,7 +25622,7 @@ - + @@ -25226,7 +25633,7 @@ - + @@ -25250,7 +25657,7 @@ - + @@ -25267,7 +25674,7 @@ - + @@ -25280,7 +25687,7 @@ - + @@ -25293,7 +25700,7 @@ - + @@ -25305,22 +25712,22 @@ - + - + - - + + @@ -25330,7 +25737,7 @@ - + @@ -25343,14 +25750,14 @@ - - - - - - - - + + + + + + + + @@ -25363,7 +25770,7 @@ - + @@ -25553,7 +25960,7 @@ - + @@ -25563,7 +25970,7 @@ - + @@ -25585,7 +25992,7 @@ - + @@ -25615,7 +26022,7 @@ - + @@ -25624,7 +26031,12 @@ - + + + + + + @@ -25634,13 +26046,18 @@ - + + + + + + - + @@ -25653,7 +26070,7 @@ - + @@ -25695,7 +26112,7 @@ - + @@ -25705,7 +26122,7 @@ - + @@ -25715,7 +26132,7 @@ - + @@ -25731,7 +26148,7 @@ - + @@ -25744,7 +26161,7 @@ - + @@ -25770,7 +26187,7 @@ - + @@ -25780,14 +26197,14 @@ - + - + @@ -25800,7 +26217,7 @@ - + @@ -25840,7 +26257,7 @@ - + @@ -25850,7 +26267,7 @@ - + @@ -25866,7 +26283,7 @@ - + @@ -25884,7 +26301,7 @@ - + @@ -25897,7 +26314,7 @@ - + @@ -25933,7 +26350,7 @@ - + @@ -25945,7 +26362,7 @@ - + @@ -25957,7 +26374,7 @@ - + @@ -25970,7 +26387,7 @@ - + @@ -25984,7 +26401,7 @@ - + @@ -26007,7 +26424,7 @@ - + @@ -26018,7 +26435,7 @@ - + @@ -26056,9 +26473,9 @@ - - - + + + @@ -26112,39 +26529,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26422,7 +26839,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26565,13 +27006,13 @@ - + - + @@ -26579,7 +27020,7 @@ - + @@ -26615,7 +27056,7 @@ - + @@ -26628,7 +27069,7 @@ - + @@ -26654,7 +27095,7 @@ - + @@ -26739,14 +27180,14 @@ - + - + @@ -26758,7 +27199,7 @@ - + @@ -26771,7 +27212,7 @@ - + @@ -26793,7 +27234,7 @@ - + @@ -26803,7 +27244,7 @@ - + @@ -26813,8 +27254,8 @@ - - + + @@ -26829,7 +27270,7 @@ - + @@ -26853,7 +27294,7 @@ - + @@ -26866,7 +27307,7 @@ - + @@ -26930,7 +27371,7 @@ - + @@ -26990,31 +27431,31 @@ - + - - + + - + - + - + @@ -27051,7 +27492,7 @@ - + @@ -27064,7 +27505,7 @@ - + @@ -27081,7 +27522,7 @@ - + @@ -27098,7 +27539,7 @@ - + @@ -27109,21 +27550,21 @@ - + - + - + @@ -27133,7 +27574,7 @@ - + @@ -27145,7 +27586,7 @@ - + @@ -27155,7 +27596,7 @@ - + @@ -27165,7 +27606,7 @@ - + @@ -27175,7 +27616,7 @@ - + @@ -27185,7 +27626,7 @@ - + @@ -27195,7 +27636,7 @@ - + @@ -27205,7 +27646,7 @@ - + @@ -27215,7 +27656,7 @@ - + @@ -27225,7 +27666,7 @@ - + @@ -27235,7 +27676,7 @@ - + @@ -27245,31 +27686,31 @@ - - + + - + - - - + + + - + @@ -27277,7 +27718,7 @@ - + @@ -27285,9 +27726,9 @@ - - - + + + @@ -27300,12 +27741,12 @@ - + - + @@ -27316,17 +27757,17 @@ - + - + - + @@ -27345,39 +27786,39 @@ - + - + - + - + - + - + - + @@ -27394,7 +27835,7 @@ - + @@ -27407,7 +27848,7 @@ - + @@ -27444,7 +27885,7 @@ - + @@ -27455,7 +27896,7 @@ - + @@ -27468,7 +27909,7 @@ - + @@ -27481,7 +27922,7 @@ - + @@ -27494,7 +27935,7 @@ - + @@ -27514,21 +27955,21 @@ - + - + - + @@ -27538,14 +27979,14 @@ - + - + @@ -27555,7 +27996,7 @@ - + @@ -27567,14 +28008,14 @@ - + - + @@ -27589,7 +28030,7 @@ - + @@ -27607,7 +28048,7 @@ - + @@ -27617,7 +28058,7 @@ - + @@ -27627,7 +28068,7 @@ - + @@ -27637,196 +28078,196 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -27837,7 +28278,7 @@ - + @@ -27848,7 +28289,7 @@ - + @@ -27856,7 +28297,7 @@ - + @@ -27951,7 +28392,7 @@ - + @@ -27964,7 +28405,7 @@ - + @@ -27977,7 +28418,7 @@ - + @@ -27990,7 +28431,7 @@ - + @@ -28006,7 +28447,7 @@ - + @@ -28059,10 +28500,10 @@ - + - + @@ -28078,7 +28519,7 @@ - + @@ -28094,7 +28535,7 @@ - + @@ -28107,7 +28548,7 @@ - + @@ -28120,7 +28561,7 @@ - + @@ -28133,7 +28574,7 @@ - + @@ -28146,7 +28587,7 @@ - + @@ -28156,7 +28597,7 @@ - + @@ -28168,7 +28609,7 @@ - + @@ -28202,28 +28643,28 @@ - + - + - + - + @@ -28232,7 +28673,7 @@ - + @@ -28245,7 +28686,7 @@ - + @@ -28308,7 +28749,7 @@ - + @@ -28318,7 +28759,7 @@ - + @@ -28329,7 +28770,7 @@ - + @@ -28338,7 +28779,7 @@ - + @@ -28351,7 +28792,7 @@ - + @@ -28380,7 +28821,7 @@ - + @@ -28390,7 +28831,7 @@ - + @@ -28403,7 +28844,7 @@ - + @@ -28432,7 +28873,7 @@ - + @@ -28445,13 +28886,13 @@ - - + + - + @@ -28468,7 +28909,7 @@ - + @@ -28487,28 +28928,28 @@ - + - + - + - + @@ -28521,7 +28962,7 @@ - + @@ -28612,14 +29053,14 @@ - + - + @@ -28651,7 +29092,7 @@ - + @@ -28664,7 +29105,7 @@ - + @@ -28809,7 +29250,7 @@ - + @@ -28880,7 +29321,7 @@ - + @@ -28922,7 +29363,7 @@ - + @@ -28966,7 +29407,7 @@ - + @@ -28990,14 +29431,14 @@ - + - + @@ -29039,7 +29480,7 @@ - + @@ -29083,7 +29524,7 @@ - + @@ -29107,7 +29548,7 @@ - + @@ -29149,7 +29590,7 @@ - + @@ -29193,7 +29634,7 @@ - + @@ -29217,7 +29658,7 @@ - + @@ -29259,7 +29700,7 @@ - + @@ -29303,7 +29744,7 @@ - + @@ -29327,14 +29768,14 @@ - + - + @@ -29376,7 +29817,7 @@ - + @@ -29420,7 +29861,7 @@ - + @@ -29444,7 +29885,7 @@ - + @@ -29486,7 +29927,7 @@ - + @@ -29530,7 +29971,7 @@ - + @@ -29554,7 +29995,7 @@ - + @@ -29596,7 +30037,7 @@ - + @@ -29640,7 +30081,7 @@ - + @@ -29664,7 +30105,7 @@ - + @@ -29706,7 +30147,7 @@ - + @@ -29750,7 +30191,7 @@ - + @@ -29774,7 +30215,7 @@ - + @@ -29816,7 +30257,7 @@ - + @@ -29860,7 +30301,7 @@ - + @@ -29884,7 +30325,7 @@ - + @@ -29926,7 +30367,7 @@ - + @@ -29970,7 +30411,7 @@ - + @@ -29994,14 +30435,14 @@ - + - + @@ -30284,7 +30725,7 @@ - + @@ -30322,21 +30763,21 @@ - + - + - + @@ -30373,7 +30814,7 @@ - + @@ -30410,7 +30851,7 @@ - + @@ -30447,7 +30888,7 @@ - + @@ -30484,7 +30925,7 @@ - + @@ -30521,7 +30962,7 @@ - + @@ -30558,7 +30999,7 @@ - + @@ -30595,7 +31036,7 @@ - + @@ -30632,7 +31073,7 @@ - + @@ -30643,7 +31084,7 @@ - + @@ -30686,7 +31127,7 @@ - + @@ -30726,7 +31167,7 @@ - + @@ -30766,14 +31207,14 @@ - + - + @@ -30820,7 +31261,7 @@ - + @@ -30863,7 +31304,7 @@ - + @@ -30879,7 +31320,7 @@ - + @@ -30926,7 +31367,7 @@ - + @@ -30969,7 +31410,7 @@ - + @@ -30985,14 +31426,14 @@ - + - + @@ -31005,7 +31446,7 @@ - + @@ -31018,7 +31459,7 @@ - + @@ -31028,7 +31469,7 @@ - + @@ -31043,8 +31484,8 @@ - - + + @@ -31052,7 +31493,7 @@ - + @@ -31060,7 +31501,7 @@ - + @@ -31068,7 +31509,7 @@ - + @@ -31076,7 +31517,7 @@ - + @@ -31084,7 +31525,7 @@ - + @@ -31099,7 +31540,7 @@ - + @@ -31114,7 +31555,7 @@ - + @@ -31128,7 +31569,7 @@ - + @@ -31136,21 +31577,21 @@ - + - + - + @@ -31160,21 +31601,21 @@ - + - + - + @@ -31219,14 +31660,14 @@ - + - + @@ -31271,14 +31712,14 @@ - + - + @@ -31323,21 +31764,21 @@ - + - + - + @@ -31349,14 +31790,14 @@ - + - + @@ -31409,7 +31850,7 @@ - + @@ -31423,7 +31864,7 @@ - + @@ -31433,7 +31874,7 @@ - + @@ -31513,7 +31954,7 @@ - + @@ -31555,7 +31996,7 @@ - + @@ -31576,14 +32017,14 @@ - + - + @@ -31593,7 +32034,7 @@ - + @@ -31606,7 +32047,7 @@ - + @@ -31628,7 +32069,7 @@ - + @@ -31655,7 +32096,7 @@ - + @@ -31742,7 +32183,7 @@ - + @@ -31795,7 +32236,7 @@ - + @@ -31824,7 +32265,7 @@ - + @@ -31912,14 +32353,14 @@ - + - + @@ -31985,7 +32426,7 @@ - + @@ -31998,7 +32439,7 @@ - + @@ -32011,7 +32452,7 @@ - + @@ -32024,7 +32465,7 @@ - + @@ -32057,7 +32498,7 @@ - + @@ -32070,7 +32511,7 @@ - + @@ -32083,14 +32524,14 @@ - + - + @@ -32100,7 +32541,7 @@ - + @@ -32186,9 +32627,9 @@ - - - + + + @@ -32256,7 +32697,7 @@ - + @@ -32265,7 +32706,7 @@ - + @@ -32278,7 +32719,7 @@ - + @@ -32484,7 +32925,7 @@ - + @@ -32687,7 +33128,7 @@ - + @@ -32700,7 +33141,7 @@ - + @@ -32711,7 +33152,7 @@ - + @@ -32726,7 +33167,7 @@ - + @@ -32744,7 +33185,7 @@ - + @@ -32764,7 +33205,7 @@ - + @@ -32778,7 +33219,7 @@ - + @@ -32792,7 +33233,7 @@ - + @@ -32809,7 +33250,7 @@ - + @@ -32827,7 +33268,7 @@ - + @@ -32837,7 +33278,7 @@ - + @@ -32883,7 +33324,7 @@ - + @@ -32911,7 +33352,7 @@ - + @@ -32957,7 +33398,7 @@ - + @@ -33006,7 +33447,7 @@ - + @@ -33016,7 +33457,7 @@ - + @@ -33068,8 +33509,8 @@ - - + + @@ -33079,7 +33520,7 @@ - + @@ -33089,7 +33530,7 @@ - + @@ -33098,7 +33539,7 @@ - + @@ -33115,7 +33556,7 @@ - + @@ -33127,7 +33568,7 @@ - + @@ -33140,7 +33581,7 @@ - + @@ -33156,7 +33597,7 @@ - + @@ -33168,7 +33609,7 @@ - + @@ -33181,7 +33622,7 @@ - + @@ -33189,15 +33630,15 @@ - + - + - + @@ -33220,7 +33661,7 @@ - + @@ -33228,7 +33669,7 @@ - + @@ -33239,7 +33680,7 @@ - + @@ -33252,7 +33693,7 @@ - + @@ -33332,7 +33773,7 @@ - + @@ -33343,7 +33784,7 @@ - + @@ -33351,7 +33792,7 @@ - + @@ -33423,7 +33864,7 @@ - + @@ -33437,7 +33878,7 @@ - + @@ -33453,7 +33894,7 @@ - + @@ -33466,7 +33907,7 @@ - + @@ -33671,6 +34112,11 @@ + + + + + @@ -33750,10 +34196,15 @@ + + + + + - + @@ -33763,7 +34214,7 @@ - + @@ -33791,7 +34242,7 @@ - + @@ -33822,7 +34273,7 @@ - + @@ -33864,7 +34315,7 @@ - + @@ -33911,7 +34362,7 @@ - + @@ -33943,28 +34394,28 @@ - + - + - + - + @@ -33974,22 +34425,22 @@ - + - - + + - + @@ -34003,7 +34454,7 @@ - + @@ -34017,7 +34468,7 @@ - + @@ -34031,30 +34482,30 @@ - + - - - + + + - + - + @@ -34064,7 +34515,7 @@ - + @@ -34074,7 +34525,7 @@ - + @@ -34084,7 +34535,7 @@ - + @@ -34116,7 +34567,7 @@ - + @@ -34148,7 +34599,7 @@ - + @@ -34161,7 +34612,7 @@ - + @@ -34178,8 +34629,8 @@ - - + + @@ -34187,7 +34638,7 @@ - + @@ -34195,18 +34646,18 @@ - - - - - - - - - + + + + + + + + + - + @@ -34219,7 +34670,7 @@ - + @@ -34241,7 +34692,7 @@ - + @@ -34253,7 +34704,7 @@ - + @@ -34266,7 +34717,7 @@ - + @@ -34285,7 +34736,7 @@ - + @@ -34331,7 +34782,7 @@ - + @@ -34345,77 +34796,77 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -34459,7 +34910,7 @@ - + @@ -34473,7 +34924,7 @@ - + @@ -34486,7 +34937,7 @@ - + @@ -34499,7 +34950,7 @@ - + @@ -34509,7 +34960,7 @@ - + @@ -34519,7 +34970,7 @@ - + @@ -34529,14 +34980,14 @@ - + - + @@ -34546,7 +34997,7 @@ - + @@ -34570,7 +35021,7 @@ - + @@ -34580,14 +35031,14 @@ - + - + @@ -34597,7 +35048,7 @@ - + @@ -34606,7 +35057,7 @@ - + @@ -34619,7 +35070,7 @@ - + @@ -34662,7 +35113,7 @@ - + @@ -34674,7 +35125,7 @@ - + @@ -34683,7 +35134,7 @@ - + @@ -34696,7 +35147,7 @@ - + @@ -34729,7 +35180,7 @@ - + @@ -34739,7 +35190,7 @@ - + @@ -34749,7 +35200,7 @@ - + @@ -34759,14 +35210,14 @@ - + - + @@ -34973,7 +35424,7 @@ - + @@ -35016,7 +35467,7 @@ - + @@ -35026,14 +35477,14 @@ - + - + @@ -35065,7 +35516,7 @@ - + @@ -35074,7 +35525,7 @@ - + @@ -35084,7 +35535,7 @@ - + @@ -35123,7 +35574,7 @@ - + @@ -35136,7 +35587,7 @@ - + @@ -35170,12 +35621,12 @@ - + - + @@ -35185,7 +35636,7 @@ - + @@ -35346,11 +35797,11 @@ - - - - - + + + + + @@ -35378,12 +35829,12 @@ - - - - - - + + + + + + @@ -35395,8 +35846,8 @@ - - + + @@ -35413,7 +35864,7 @@ - + @@ -35429,7 +35880,7 @@ - + @@ -35445,7 +35896,7 @@ - + @@ -35461,7 +35912,7 @@ - + @@ -35474,7 +35925,7 @@ - + @@ -35504,7 +35955,7 @@ - + @@ -35514,7 +35965,7 @@ - + @@ -35528,7 +35979,7 @@ - + @@ -35539,7 +35990,7 @@ - + @@ -35552,7 +36003,7 @@ - + @@ -35579,7 +36030,7 @@ - + @@ -35595,8 +36046,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -35612,7 +36101,7 @@ - + @@ -35700,7 +36189,7 @@ - + @@ -35717,7 +36206,7 @@ - + @@ -35735,7 +36224,7 @@ - + @@ -35749,7 +36238,7 @@ - + @@ -35763,7 +36252,7 @@ - + @@ -35773,7 +36262,7 @@ - + @@ -35783,7 +36272,7 @@ - + @@ -35793,21 +36282,21 @@ - + - + - + @@ -35817,7 +36306,7 @@ - + @@ -35827,7 +36316,7 @@ - + @@ -40730,7 +41219,7 @@ - + @@ -40977,11 +41466,11 @@ - - + + - + @@ -40994,7 +41483,7 @@ - + @@ -41004,7 +41493,7 @@ - + @@ -41016,7 +41505,7 @@ - + @@ -41029,7 +41518,7 @@ - + @@ -41042,7 +41531,7 @@ - + @@ -41053,7 +41542,7 @@ - + @@ -41070,7 +41559,7 @@ - + @@ -41081,7 +41570,7 @@ - + @@ -41094,7 +41583,7 @@ - + @@ -41205,7 +41694,7 @@ - + @@ -41215,7 +41704,7 @@ - + @@ -41225,7 +41714,7 @@ - + @@ -41233,10 +41722,10 @@ - + - + @@ -41249,7 +41738,7 @@ - + @@ -41268,14 +41757,14 @@ - + - + @@ -41288,7 +41777,7 @@ - + @@ -41301,7 +41790,7 @@ - + @@ -41314,7 +41803,7 @@ - + @@ -41327,14 +41816,14 @@ - + - + @@ -41343,7 +41832,7 @@ - + @@ -41391,7 +41880,7 @@ - + @@ -41403,7 +41892,7 @@ - + @@ -41543,7 +42032,7 @@ - + @@ -41556,7 +42045,7 @@ - + @@ -41569,7 +42058,7 @@ - + @@ -41582,7 +42071,7 @@ - + @@ -41595,8 +42084,8 @@ - - + + @@ -41866,7 +42355,7 @@ - + @@ -41920,9 +42409,9 @@ - - - + + + @@ -41961,7 +42450,7 @@ - + @@ -41977,7 +42466,7 @@ - + @@ -41990,7 +42479,7 @@ - + @@ -42005,7 +42494,7 @@ - + @@ -42024,7 +42513,7 @@ - + @@ -42087,8 +42576,8 @@ - - + + @@ -42103,7 +42592,7 @@ - + @@ -42118,14 +42607,14 @@ - - - - - + + + + + - + @@ -42134,7 +42623,7 @@ - + @@ -42312,7 +42801,7 @@ - + @@ -42325,7 +42814,7 @@ - + @@ -42338,7 +42827,7 @@ - + @@ -42351,7 +42840,7 @@ - + @@ -42364,7 +42853,7 @@ - + @@ -42378,7 +42867,7 @@ - + @@ -42392,7 +42881,7 @@ - + @@ -42406,7 +42895,7 @@ - + @@ -42420,7 +42909,7 @@ - + @@ -42433,7 +42922,7 @@ - + @@ -42446,7 +42935,7 @@ - + @@ -42459,7 +42948,7 @@ - + @@ -42472,8 +42961,8 @@ - - + + @@ -42486,7 +42975,7 @@ - + @@ -42499,7 +42988,7 @@ - + @@ -42513,7 +43002,7 @@ - + @@ -42527,7 +43016,7 @@ - + @@ -42540,8 +43029,8 @@ - - + + @@ -42562,21 +43051,21 @@ - + - + - + @@ -42589,7 +43078,7 @@ - + @@ -42640,7 +43129,7 @@ - + @@ -42651,7 +43140,7 @@ - + @@ -42661,7 +43150,7 @@ - + @@ -42671,7 +43160,7 @@ - + @@ -42690,7 +43179,7 @@ - + @@ -42708,7 +43197,7 @@ - + @@ -42726,7 +43215,7 @@ - + @@ -42744,7 +43233,7 @@ - + @@ -42762,7 +43251,7 @@ - + @@ -42780,7 +43269,7 @@ - + @@ -42793,7 +43282,7 @@ - + @@ -42806,7 +43295,7 @@ - + @@ -42819,7 +43308,7 @@ - + @@ -42832,7 +43321,7 @@ - + @@ -42842,7 +43331,7 @@ - + @@ -42852,7 +43341,7 @@ - + @@ -42868,7 +43357,7 @@ - + @@ -42884,7 +43373,7 @@ - + @@ -42897,7 +43386,7 @@ - + @@ -42910,7 +43399,7 @@ - + @@ -42926,7 +43415,7 @@ - + @@ -42942,7 +43431,7 @@ - + @@ -42955,7 +43444,7 @@ - + @@ -42981,7 +43470,7 @@ - + @@ -42996,7 +43485,7 @@ - + @@ -43009,7 +43498,7 @@ - + @@ -43022,7 +43511,7 @@ - + @@ -43032,7 +43521,7 @@ - + @@ -43042,14 +43531,14 @@ - + - + @@ -43089,21 +43578,21 @@ - + - + - + @@ -43113,7 +43602,7 @@ - + @@ -43126,7 +43615,7 @@ - + @@ -43139,7 +43628,7 @@ - + @@ -43149,7 +43638,7 @@ - + @@ -43159,7 +43648,7 @@ - + @@ -43172,7 +43661,7 @@ - + @@ -43185,7 +43674,7 @@ - + @@ -43195,7 +43684,7 @@ - + @@ -43378,7 +43867,7 @@ - + @@ -43519,17 +44008,17 @@ - + - + - + @@ -43554,7 +44043,7 @@ - + @@ -43567,7 +44056,7 @@ - + @@ -43604,7 +44093,7 @@ - + @@ -43614,14 +44103,14 @@ - + - + @@ -43637,7 +44126,7 @@ - + @@ -43653,7 +44142,7 @@ - + @@ -43666,7 +44155,7 @@ - + @@ -43681,7 +44170,7 @@ - + @@ -43694,7 +44183,7 @@ - + @@ -43723,19 +44212,19 @@ - + - + - + @@ -43743,7 +44232,7 @@ - + @@ -43863,12 +44352,13 @@ - + + @@ -43891,22 +44381,22 @@ - - - - - - + + + + + + - + - + @@ -43919,7 +44409,7 @@ - + @@ -43929,7 +44419,7 @@ - + @@ -43980,42 +44470,86 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + @@ -44028,7 +44562,7 @@ - + @@ -44038,26 +44572,26 @@ - + - + - - - + + + - + @@ -44075,21 +44609,21 @@ - - + + - + - - + + @@ -44097,7 +44631,7 @@ - + @@ -44107,21 +44641,21 @@ - + - + - + @@ -44131,7 +44665,7 @@ - + @@ -44141,21 +44675,21 @@ - + - + - + @@ -44165,21 +44699,21 @@ - + - + - + @@ -44189,8 +44723,8 @@ - - + + @@ -44200,7 +44734,7 @@ - + @@ -44210,7 +44744,7 @@ - + @@ -44220,28 +44754,28 @@ - + - + - + - + @@ -44251,7 +44785,7 @@ - + @@ -44261,7 +44795,7 @@ - + @@ -44271,7 +44805,7 @@ - + @@ -44281,7 +44815,7 @@ - + @@ -44291,7 +44825,7 @@ - + @@ -44304,7 +44838,7 @@ - + @@ -44314,14 +44848,14 @@ - + - + @@ -44331,7 +44865,7 @@ - + @@ -44344,7 +44878,7 @@ - + @@ -44363,7 +44897,7 @@ - + @@ -44376,52 +44910,114 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + @@ -44434,7 +45030,7 @@ - + @@ -44447,7 +45043,7 @@ - + @@ -44460,7 +45056,7 @@ - + @@ -44473,7 +45069,7 @@ - + @@ -44486,7 +45082,7 @@ - + @@ -44499,7 +45095,7 @@ - + @@ -44512,7 +45108,7 @@ - + @@ -44525,42 +45121,42 @@ - + - + - + - + - + - + @@ -44570,7 +45166,7 @@ - + @@ -44583,7 +45179,7 @@ - + @@ -44593,8 +45189,8 @@ - - + + @@ -44607,7 +45203,7 @@ - + @@ -44623,7 +45219,7 @@ - + @@ -44633,7 +45229,7 @@ - + @@ -44646,28 +45242,28 @@ - + - + - + - + @@ -44677,7 +45273,7 @@ - + @@ -44687,7 +45283,7 @@ - + @@ -44700,14 +45296,14 @@ - + - + @@ -44717,7 +45313,7 @@ - + @@ -44727,35 +45323,35 @@ - + - + - + - + - + @@ -44765,7 +45361,7 @@ - + @@ -44775,7 +45371,7 @@ - + @@ -44785,7 +45381,7 @@ - + @@ -44795,7 +45391,7 @@ - + @@ -44808,7 +45404,7 @@ - + @@ -44821,8 +45417,8 @@ - - + + @@ -44832,7 +45428,7 @@ - + @@ -44845,7 +45441,7 @@ - + @@ -44858,7 +45454,7 @@ - + @@ -44871,7 +45467,7 @@ - + @@ -44887,7 +45483,7 @@ - + @@ -44900,7 +45496,7 @@ - + @@ -44913,7 +45509,7 @@ - + @@ -44929,7 +45525,7 @@ - + @@ -44939,7 +45535,7 @@ - + @@ -44949,7 +45545,7 @@ - + @@ -44962,7 +45558,7 @@ - + @@ -44978,7 +45574,7 @@ - + @@ -44988,7 +45584,7 @@ - + @@ -44998,7 +45594,7 @@ - + @@ -45014,7 +45610,7 @@ - + @@ -45027,7 +45623,7 @@ - + @@ -45037,7 +45633,7 @@ - + @@ -45050,7 +45646,7 @@ - + @@ -45063,7 +45659,7 @@ - + @@ -45079,14 +45675,14 @@ - + - + @@ -45096,7 +45692,7 @@ - + @@ -45109,7 +45705,7 @@ - + @@ -45122,7 +45718,7 @@ - + @@ -45135,65 +45731,65 @@ - + - + - + - + - + - - - + + + - + - + - + @@ -45203,7 +45799,7 @@ - + @@ -45228,7 +45824,7 @@ - + @@ -45333,14 +45929,14 @@ - + - + @@ -45482,7 +46078,7 @@ - - + + diff --git a/tex/context/interface/mkiv/i-accent.xml b/tex/context/interface/mkiv/i-accent.xml index b947dfc12..190e1faa9 100644 --- a/tex/context/interface/mkiv/i-accent.xml +++ b/tex/context/interface/mkiv/i-accent.xml @@ -4,7 +4,7 @@ - + @@ -12,138 +12,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -249,4 +261,4 @@ --> - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml index 326024c39..55659a12a 100644 --- a/tex/context/interface/mkiv/i-align.xml +++ b/tex/context/interface/mkiv/i-align.xml @@ -4,7 +4,7 @@ - + @@ -63,13 +63,13 @@ - + - + @@ -77,7 +77,7 @@ - + @@ -88,55 +88,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -144,7 +144,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -215,65 +215,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -291,7 +291,7 @@ - + @@ -301,7 +301,7 @@ - + diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml index 9320275a1..85cf8843b 100644 --- a/tex/context/interface/mkiv/i-attachment.xml +++ b/tex/context/interface/mkiv/i-attachment.xml @@ -94,7 +94,7 @@ - + @@ -157,4 +157,4 @@ --> - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml index 0db3eaa88..96a680e19 100644 --- a/tex/context/interface/mkiv/i-attribute.xml +++ b/tex/context/interface/mkiv/i-attribute.xml @@ -4,25 +4,25 @@ - + - + - + - + @@ -34,7 +34,7 @@ - + @@ -46,51 +46,51 @@ - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index ef9c2890e..ff52eed7d 100644 --- a/tex/context/interface/mkiv/i-backend.xml +++ b/tex/context/interface/mkiv/i-backend.xml @@ -4,7 +4,7 @@ - + @@ -18,7 +18,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -30,7 +54,23 @@ - + + + + + + + + + + + + + + + @@ -46,4 +86,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml index 7ae1e254a..6bdddbb1b 100644 --- a/tex/context/interface/mkiv/i-background.xml +++ b/tex/context/interface/mkiv/i-background.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -79,20 +79,20 @@ - + - + - + @@ -114,7 +114,7 @@ - + @@ -134,13 +134,13 @@ - + - + @@ -148,7 +148,7 @@ - + @@ -156,7 +156,7 @@ - + diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml index 2b9fdcecb..fb120d05b 100644 --- a/tex/context/interface/mkiv/i-bar.xml +++ b/tex/context/interface/mkiv/i-bar.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -103,25 +103,25 @@ - + - + - + - + @@ -129,97 +129,97 @@ - + diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml index 32ff5d854..0463f21ed 100644 --- a/tex/context/interface/mkiv/i-blackrule.xml +++ b/tex/context/interface/mkiv/i-blackrule.xml @@ -4,7 +4,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -98,4 +98,21 @@ - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bleed.xml b/tex/context/interface/mkiv/i-bleed.xml index a0622f919..ee860b85f 100644 --- a/tex/context/interface/mkiv/i-bleed.xml +++ b/tex/context/interface/mkiv/i-bleed.xml @@ -4,7 +4,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,8 +57,8 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index f6be451ec..fa5262506 100644 --- a/tex/context/interface/mkiv/i-block.xml +++ b/tex/context/interface/mkiv/i-block.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -50,21 +50,21 @@ - + - + - + @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,4 +103,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bookmark.xml b/tex/context/interface/mkiv/i-bookmark.xml index 0a8359fa8..3dbfa3406 100644 --- a/tex/context/interface/mkiv/i-bookmark.xml +++ b/tex/context/interface/mkiv/i-bookmark.xml @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -76,4 +76,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index f78cba953..366004840 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -601,6 +601,13 @@ + + + + + + + @@ -615,7 +622,7 @@ - + @@ -624,7 +631,7 @@ - + @@ -850,7 +857,7 @@ - + @@ -858,7 +865,7 @@ - + @@ -923,84 +930,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1060,7 +1067,7 @@ - + @@ -1121,4 +1128,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index cc8686494..2ec89f571 100644 --- a/tex/context/interface/mkiv/i-buffer.xml +++ b/tex/context/interface/mkiv/i-buffer.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,19 +20,19 @@ - + - + - + @@ -41,7 +41,7 @@ - + @@ -49,13 +49,13 @@ - + - + @@ -69,7 +69,7 @@ - + @@ -79,25 +79,25 @@ - + - + - + - + @@ -106,7 +106,7 @@ - + @@ -115,11 +115,11 @@ - + @@ -128,14 +128,14 @@ - + - + @@ -152,25 +152,25 @@ - + - + - + - + @@ -179,16 +179,7 @@ - - - - - - - - - - + @@ -200,7 +191,7 @@ - + @@ -209,4 +200,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml index 4166f21aa..d7228c949 100644 --- a/tex/context/interface/mkiv/i-button.xml +++ b/tex/context/interface/mkiv/i-button.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -86,32 +86,32 @@ - + - + - + - + - + @@ -120,14 +120,14 @@ - + - + @@ -140,7 +140,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -179,7 +179,7 @@ + - + - + - + - + - + - + - + - + - + - + @@ -71,7 +71,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -93,31 +93,31 @@ - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-character.xml b/tex/context/interface/mkiv/i-character.xml index f7f0e08db..c391836d5 100644 --- a/tex/context/interface/mkiv/i-character.xml +++ b/tex/context/interface/mkiv/i-character.xml @@ -4,133 +4,141 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml index 16b73287a..3e9f81722 100644 --- a/tex/context/interface/mkiv/i-characteralign.xml +++ b/tex/context/interface/mkiv/i-characteralign.xml @@ -4,14 +4,14 @@ - + - + @@ -22,11 +22,11 @@ - + - + - + @@ -36,10 +36,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterspacing.xml b/tex/context/interface/mkiv/i-characterspacing.xml index 950866c40..0247115a3 100644 --- a/tex/context/interface/mkiv/i-characterspacing.xml +++ b/tex/context/interface/mkiv/i-characterspacing.xml @@ -4,13 +4,13 @@ - + - + @@ -29,7 +29,7 @@ - + @@ -38,6 +38,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterstripping.xml b/tex/context/interface/mkiv/i-characterstripping.xml index cd89ac065..5c776e3ab 100644 --- a/tex/context/interface/mkiv/i-characterstripping.xml +++ b/tex/context/interface/mkiv/i-characterstripping.xml @@ -4,7 +4,7 @@ - + @@ -13,8 +13,8 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml index 84899c44e..2b73f1322 100644 --- a/tex/context/interface/mkiv/i-chart.xml +++ b/tex/context/interface/mkiv/i-chart.xml @@ -6,7 +6,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -371,20 +371,20 @@ - + - + - + @@ -395,7 +395,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -413,13 +413,13 @@ - + - + @@ -427,25 +427,25 @@ - + - + - + - + @@ -455,7 +455,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -482,7 +482,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -500,7 +500,7 @@ - + @@ -524,7 +524,7 @@ - + diff --git a/tex/context/interface/mkiv/i-charwidth.xml b/tex/context/interface/mkiv/i-charwidth.xml index 63240327a..dc19713f3 100644 --- a/tex/context/interface/mkiv/i-charwidth.xml +++ b/tex/context/interface/mkiv/i-charwidth.xml @@ -4,14 +4,14 @@ - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml index ef6848d80..a2df03ede 100644 --- a/tex/context/interface/mkiv/i-chemical.xml +++ b/tex/context/interface/mkiv/i-chemical.xml @@ -4,13 +4,13 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -134,33 +134,33 @@ - + - + - + - + - + @@ -171,7 +171,7 @@ - + @@ -192,7 +192,7 @@ - + - + - + @@ -222,19 +222,19 @@ - + @@ -252,4 +252,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-clipping.xml b/tex/context/interface/mkiv/i-clipping.xml index c7f7a1777..c823b102d 100644 --- a/tex/context/interface/mkiv/i-clipping.xml +++ b/tex/context/interface/mkiv/i-clipping.xml @@ -4,7 +4,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -75,4 +75,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-collector.xml b/tex/context/interface/mkiv/i-collector.xml index 7bdf6270f..6642e6980 100644 --- a/tex/context/interface/mkiv/i-collector.xml +++ b/tex/context/interface/mkiv/i-collector.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,25 +65,25 @@ - + - + - + - + @@ -92,7 +92,7 @@ - + @@ -111,4 +111,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 9856c02b6..af3a575cd 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -4,13 +4,13 @@ - + - + @@ -20,13 +20,13 @@ - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -86,14 +86,14 @@ - + - + @@ -102,14 +102,14 @@ - + - + @@ -118,14 +118,14 @@ - + - + @@ -135,7 +135,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -173,14 +173,14 @@ - + - + @@ -194,55 +194,55 @@ - + - + - + - + - + - + - + - + @@ -251,13 +251,13 @@ - + - + @@ -269,19 +269,19 @@ - + - + - + @@ -289,27 +289,27 @@ - + - + - + - + - + @@ -358,13 +358,13 @@ - + - + @@ -377,28 +377,28 @@ - + - + - + - + - + @@ -412,9 +412,9 @@ - + - + @@ -432,7 +432,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -448,74 +448,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -523,7 +523,7 @@ - + @@ -531,45 +531,45 @@ - + - + - + - + - + - + - + @@ -582,13 +582,13 @@ - + - + @@ -601,10 +601,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index ce98104d2..5c8be8685 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -4,7 +4,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -108,4 +108,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml index 489d2494c..bd732c264 100644 --- a/tex/context/interface/mkiv/i-combination.xml +++ b/tex/context/interface/mkiv/i-combination.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -105,13 +105,13 @@ - + @@ -120,7 +120,7 @@ - + @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-comment.xml b/tex/context/interface/mkiv/i-comment.xml index 918d8a5f4..a1eb14d23 100644 --- a/tex/context/interface/mkiv/i-comment.xml +++ b/tex/context/interface/mkiv/i-comment.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -128,11 +128,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index 787475e8b..de000148b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -532,4 +532,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-definitions.xml b/tex/context/interface/mkiv/i-common-definitions.xml index 9f6d461f9..54e729aa4 100644 --- a/tex/context/interface/mkiv/i-common-definitions.xml +++ b/tex/context/interface/mkiv/i-common-definitions.xml @@ -9,4 +9,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml index b00ee9a92..dc8cead79 100644 --- a/tex/context/interface/mkiv/i-common-instance.xml +++ b/tex/context/interface/mkiv/i-common-instance.xml @@ -282,4 +282,152 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml index 9671a4528..97ac50caa 100644 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ b/tex/context/interface/mkiv/i-common-keyword.xml @@ -757,6 +757,7 @@ + diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index 265308162..81b672e7b 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -413,6 +413,11 @@ + + + + + @@ -582,6 +587,10 @@ + + + + @@ -659,4 +668,18 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context-modules.xml b/tex/context/interface/mkiv/i-context-modules.xml index 319ba53df..85194c6ec 100644 --- a/tex/context/interface/mkiv/i-context-modules.xml +++ b/tex/context/interface/mkiv/i-context-modules.xml @@ -37,4 +37,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 10eb9ef10..7ff109649 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index 82d3cc541..ba09abcba 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -86,6 +86,7 @@ + @@ -203,6 +204,7 @@ + @@ -232,4 +234,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index af679b8e0..a2e975368 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -4,271 +4,271 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -276,7 +276,7 @@ - + @@ -284,7 +284,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -300,21 +300,21 @@ - + - + - + @@ -358,7 +358,7 @@ - + @@ -377,7 +377,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -395,7 +395,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -412,7 +412,7 @@ - + @@ -420,7 +420,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -525,7 +525,7 @@ - + @@ -533,7 +533,7 @@ - + @@ -542,7 +542,7 @@ - + @@ -551,7 +551,7 @@ - + @@ -564,82 +564,82 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml index 124638026..70527123f 100644 --- a/tex/context/interface/mkiv/i-counter.xml +++ b/tex/context/interface/mkiv/i-counter.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -127,21 +127,21 @@ - + - + - + @@ -149,7 +149,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -165,165 +165,165 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -332,7 +332,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -368,7 +368,7 @@ - + @@ -376,21 +376,21 @@ - + - + - + @@ -403,7 +403,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -501,7 +501,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-database.xml b/tex/context/interface/mkiv/i-database.xml index 0eb961a87..a81cd75f8 100644 --- a/tex/context/interface/mkiv/i-database.xml +++ b/tex/context/interface/mkiv/i-database.xml @@ -64,14 +64,14 @@ - + - + @@ -87,20 +87,20 @@ - + - + - + diff --git a/tex/context/interface/mkiv/i-dataset.xml b/tex/context/interface/mkiv/i-dataset.xml index afb8f8fa3..c006454d3 100644 --- a/tex/context/interface/mkiv/i-dataset.xml +++ b/tex/context/interface/mkiv/i-dataset.xml @@ -48,4 +48,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-define.xml b/tex/context/interface/mkiv/i-define.xml index f37645cf1..91975e752 100644 --- a/tex/context/interface/mkiv/i-define.xml +++ b/tex/context/interface/mkiv/i-define.xml @@ -20,4 +20,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml index e64693210..5017aa02b 100644 --- a/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/tex/context/interface/mkiv/i-delimitedtext.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -156,14 +156,14 @@ - + @@ -242,7 +242,7 @@ - + @@ -250,12 +250,12 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index 66da76acc..f2cf33e82 100644 --- a/tex/context/interface/mkiv/i-description.xml +++ b/tex/context/interface/mkiv/i-description.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -178,4 +178,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-digits.xml b/tex/context/interface/mkiv/i-digits.xml index d9a4b9d2d..c917bf0d4 100644 --- a/tex/context/interface/mkiv/i-digits.xml +++ b/tex/context/interface/mkiv/i-digits.xml @@ -4,7 +4,7 @@ - + @@ -13,14 +13,14 @@ - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dimension.xml b/tex/context/interface/mkiv/i-dimension.xml index bb7c3bfa7..1980687ab 100644 --- a/tex/context/interface/mkiv/i-dimension.xml +++ b/tex/context/interface/mkiv/i-dimension.xml @@ -64,4 +64,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml index c8017d25f..3b2d937a4 100644 --- a/tex/context/interface/mkiv/i-direction.xml +++ b/tex/context/interface/mkiv/i-direction.xml @@ -4,7 +4,7 @@ - + @@ -30,29 +30,29 @@ - + - + - + - + @@ -61,7 +61,7 @@ - + @@ -70,4 +70,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml index d80683244..fcd9e040b 100644 --- a/tex/context/interface/mkiv/i-document.xml +++ b/tex/context/interface/mkiv/i-document.xml @@ -4,13 +4,13 @@ - + - + - + - + @@ -19,7 +19,7 @@ - + @@ -28,27 +28,27 @@ - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,27 +66,27 @@ - + - + - + - + - + @@ -95,7 +95,7 @@ - + @@ -104,27 +104,27 @@ - + - + - + - + - + @@ -133,7 +133,7 @@ - + @@ -142,27 +142,27 @@ - + - + - + - + - + @@ -170,7 +170,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -206,10 +206,16 @@ - + - + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml index 10c0dbb90..47d005e20 100644 --- a/tex/context/interface/mkiv/i-dummy.xml +++ b/tex/context/interface/mkiv/i-dummy.xml @@ -36,23 +36,23 @@ - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml index 6720083b2..d20a62cd4 100644 --- a/tex/context/interface/mkiv/i-effect.xml +++ b/tex/context/interface/mkiv/i-effect.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -40,19 +40,19 @@ - + - + - + diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml index 575d192a5..149f4f613 100644 --- a/tex/context/interface/mkiv/i-enumeration.xml +++ b/tex/context/interface/mkiv/i-enumeration.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -221,4 +221,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-export.xml b/tex/context/interface/mkiv/i-export.xml index e3be678c0..3c3afff2b 100644 --- a/tex/context/interface/mkiv/i-export.xml +++ b/tex/context/interface/mkiv/i-export.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml index a3435e8da..7a67786f9 100644 --- a/tex/context/interface/mkiv/i-field.xml +++ b/tex/context/interface/mkiv/i-field.xml @@ -4,13 +4,13 @@ - + - + @@ -20,7 +20,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -180,14 +180,14 @@ - + - + @@ -195,7 +195,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -238,14 +238,14 @@ - + - + @@ -254,7 +254,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -310,7 +310,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -353,14 +353,14 @@ - + - + @@ -370,7 +370,7 @@ - + @@ -380,4 +380,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-figure.xml b/tex/context/interface/mkiv/i-figure.xml index 92d3a9887..6adf84d2e 100644 --- a/tex/context/interface/mkiv/i-figure.xml +++ b/tex/context/interface/mkiv/i-figure.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml index 3db82077c..bf12e5825 100644 --- a/tex/context/interface/mkiv/i-file.xml +++ b/tex/context/interface/mkiv/i-file.xml @@ -4,33 +4,33 @@ - + - + - + - + - + @@ -38,7 +38,7 @@ - + @@ -46,33 +46,33 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -136,27 +136,27 @@ - + - + - + - + - + - + - + - + - + @@ -164,7 +164,7 @@ - + @@ -172,122 +172,128 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + @@ -295,7 +301,7 @@ - + @@ -303,7 +309,7 @@ - + @@ -311,7 +317,7 @@ - + @@ -320,7 +326,7 @@ - + @@ -329,7 +335,7 @@ - + @@ -337,13 +343,13 @@ - + - + @@ -351,7 +357,7 @@ - + @@ -359,7 +365,7 @@ - + @@ -367,7 +373,7 @@ - + @@ -375,30 +381,30 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml index 9be6ce275..69cc37fca 100644 --- a/tex/context/interface/mkiv/i-filler.xml +++ b/tex/context/interface/mkiv/i-filler.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -198,7 +198,7 @@ - + diff --git a/tex/context/interface/mkiv/i-fillinline.xml b/tex/context/interface/mkiv/i-fillinline.xml index 7f75d6ee1..eb2f9d6ae 100644 --- a/tex/context/interface/mkiv/i-fillinline.xml +++ b/tex/context/interface/mkiv/i-fillinline.xml @@ -4,7 +4,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -40,4 +40,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fillinrule.xml b/tex/context/interface/mkiv/i-fillinrule.xml index 84d8f8f3d..d73b70ff9 100644 --- a/tex/context/interface/mkiv/i-fillinrule.xml +++ b/tex/context/interface/mkiv/i-fillinrule.xml @@ -4,7 +4,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,4 +63,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml index 1a530d152..b22035651 100644 --- a/tex/context/interface/mkiv/i-firstline.xml +++ b/tex/context/interface/mkiv/i-firstline.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -36,17 +36,17 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 05e24af7a..4398625c3 100644 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ b/tex/context/interface/mkiv/i-fittingpage.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -100,4 +100,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index 856b41a18..b01c72a87 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -170,7 +170,6 @@ - @@ -203,7 +202,7 @@ - + @@ -214,7 +213,7 @@ - + @@ -338,7 +337,7 @@ - + @@ -347,7 +346,7 @@ - + @@ -356,7 +355,7 @@ - + @@ -372,7 +371,7 @@ - + @@ -382,7 +381,7 @@ - + @@ -396,7 +395,7 @@ - + @@ -404,7 +403,7 @@ - + @@ -419,7 +418,7 @@ - + @@ -434,7 +433,7 @@ - + @@ -449,48 +448,48 @@ - + - + - + - + - + - + - + @@ -499,7 +498,7 @@ - + @@ -709,25 +708,25 @@ - + - + - + - + - + - + - + - + @@ -750,7 +749,7 @@ - + @@ -760,20 +759,20 @@ - + - + - + @@ -783,4 +782,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fontfamily.xml b/tex/context/interface/mkiv/i-fontfamily.xml index 59aafb519..e20346319 100644 --- a/tex/context/interface/mkiv/i-fontfamily.xml +++ b/tex/context/interface/mkiv/i-fontfamily.xml @@ -4,7 +4,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -215,11 +215,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index 02da28a93..ea9711787 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -4,7 +4,7 @@ - + @@ -38,70 +38,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + + + - + @@ -201,6 +203,10 @@ + + + + @@ -289,7 +295,7 @@ - + @@ -298,72 +304,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -380,11 +386,11 @@ - + - + @@ -401,11 +407,11 @@ - + - + @@ -413,7 +419,7 @@ - + @@ -421,31 +427,31 @@ - + - + - + - + - + - + - + - + - + @@ -454,14 +460,14 @@ - + - + @@ -483,7 +489,7 @@ - + @@ -505,20 +511,20 @@ - + - + - + @@ -526,7 +532,7 @@ - + @@ -534,87 +540,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -624,7 +630,7 @@ - + @@ -632,14 +638,14 @@ - + - + @@ -708,7 +714,7 @@ - + - + - + - + - + - + - + @@ -808,7 +814,7 @@ - + @@ -829,7 +835,7 @@ - + @@ -840,7 +846,7 @@ - + @@ -873,7 +879,7 @@ - + @@ -881,7 +887,7 @@ - + @@ -894,7 +900,7 @@ - + @@ -902,31 +908,31 @@ - + - + - + - + - + @@ -949,13 +955,13 @@ - + - + @@ -964,28 +970,28 @@ - + - + - + - + - + - + - + @@ -993,7 +999,7 @@ - + @@ -1001,14 +1007,14 @@ - + - + @@ -1036,19 +1042,19 @@ - + - + - + @@ -1056,109 +1062,109 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1168,7 +1174,7 @@ - + @@ -1200,7 +1206,7 @@ - + - + - + - + @@ -1233,17 +1239,28 @@ - + - + + + + + + + + + + + + - + - + @@ -1253,7 +1270,7 @@ - + @@ -1270,13 +1287,13 @@ - + - + @@ -1285,7 +1302,7 @@ - + @@ -1294,7 +1311,7 @@ - + @@ -1302,7 +1319,7 @@ - + @@ -1312,7 +1329,7 @@ - + @@ -1321,7 +1338,7 @@ - + @@ -1347,59 +1364,59 @@ - + - + - + - + - + - + - + - + - + @@ -1409,7 +1426,7 @@ - + @@ -1419,27 +1436,27 @@ - + - + - + - + @@ -1448,7 +1465,7 @@ - + @@ -1457,15 +1474,15 @@ - + - + - + @@ -1473,7 +1490,7 @@ - + @@ -1481,7 +1498,7 @@ - + @@ -1495,31 +1512,31 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -1528,7 +1545,7 @@ - + @@ -1554,22 +1571,22 @@ - + - + - + - + @@ -1587,20 +1604,20 @@ - + - + - + @@ -1649,7 +1666,7 @@ - + @@ -1672,7 +1689,7 @@ - + @@ -1692,10 +1709,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-form.xml b/tex/context/interface/mkiv/i-form.xml index 52246c457..fcb4979d0 100644 --- a/tex/context/interface/mkiv/i-form.xml +++ b/tex/context/interface/mkiv/i-form.xml @@ -4,7 +4,7 @@ - + @@ -20,4 +20,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml index f1b94a0d7..a6208fe4a 100644 --- a/tex/context/interface/mkiv/i-formula.xml +++ b/tex/context/interface/mkiv/i-formula.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -31,6 +31,11 @@ + + + + + @@ -86,6 +91,10 @@ + + + + @@ -100,16 +109,12 @@ - - - - - + @@ -118,7 +123,7 @@ - + @@ -128,7 +133,7 @@ - + @@ -139,7 +144,7 @@ - + @@ -148,7 +153,7 @@ - + @@ -161,33 +166,68 @@ - + + + + + + + + + + + + + + + + + + + - + @@ -203,41 +243,41 @@ - + - + - + - + - + - + - + @@ -253,31 +293,35 @@ - + - + - + - + - + + + + + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml index 18d253784..33252dde2 100644 --- a/tex/context/interface/mkiv/i-fraction.xml +++ b/tex/context/interface/mkiv/i-fraction.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -52,15 +52,6 @@ - - - - - - - - - @@ -72,11 +63,22 @@ + + + + + + + + + + + - + @@ -85,7 +87,7 @@ - + @@ -100,63 +102,63 @@ - + - + - + @@ -200,4 +202,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index db01f60cd..a4667dd2e 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/tex/context/interface/mkiv/i-framed.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -220,19 +220,19 @@ - + - + - + @@ -241,7 +241,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -284,7 +284,7 @@ - + @@ -294,14 +294,14 @@ - + - + @@ -311,7 +311,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -437,7 +437,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -502,7 +502,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -599,32 +599,32 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framedtable.xml b/tex/context/interface/mkiv/i-framedtable.xml new file mode 100644 index 000000000..51699b5bc --- /dev/null +++ b/tex/context/interface/mkiv/i-framedtable.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index 9d27f154d..d90be9e7b 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -178,9 +178,11 @@ - - - + @@ -240,7 +242,7 @@ - + @@ -262,7 +264,7 @@ - + @@ -272,7 +274,7 @@ - + @@ -281,32 +283,32 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -314,7 +316,7 @@ - + @@ -322,7 +324,7 @@ - + @@ -332,7 +334,7 @@ - + @@ -341,81 +343,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -442,7 +444,7 @@ - + @@ -466,7 +468,7 @@ - + @@ -478,7 +480,7 @@ - + @@ -488,7 +490,7 @@ - + @@ -504,7 +506,7 @@ - + @@ -513,7 +515,7 @@ - + @@ -522,4 +524,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml index 155930ef8..bd96388f3 100644 --- a/tex/context/interface/mkiv/i-grid.xml +++ b/tex/context/interface/mkiv/i-grid.xml @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -113,15 +113,15 @@ - + - + - + @@ -178,7 +178,7 @@ - + @@ -186,4 +186,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml index 673c34895..6e8612c5a 100644 --- a/tex/context/interface/mkiv/i-help.xml +++ b/tex/context/interface/mkiv/i-help.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -49,30 +49,30 @@ - + - + - + - + - + @@ -80,10 +80,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hemistich.xml b/tex/context/interface/mkiv/i-hemistich.xml index 673f861ee..a508c51f8 100644 --- a/tex/context/interface/mkiv/i-hemistich.xml +++ b/tex/context/interface/mkiv/i-hemistich.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml index db66912c5..9da39818e 100644 --- a/tex/context/interface/mkiv/i-highlight.xml +++ b/tex/context/interface/mkiv/i-highlight.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -41,24 +41,24 @@ - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index f07f67232..75932d2fc 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -40,29 +40,29 @@ - + - + - + - + - + - + - + - + - + - + @@ -72,45 +72,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -118,7 +118,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -156,10 +156,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml index 4c2d93895..75cdbae75 100644 --- a/tex/context/interface/mkiv/i-hyphenation.xml +++ b/tex/context/interface/mkiv/i-hyphenation.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,37 +97,37 @@ - + - + - + - + - + - + @@ -138,13 +138,13 @@ - + - + @@ -184,7 +184,7 @@ - + @@ -193,72 +193,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml index 2b315ad78..98fdcf253 100644 --- a/tex/context/interface/mkiv/i-imposition.xml +++ b/tex/context/interface/mkiv/i-imposition.xml @@ -4,14 +4,14 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,6 +77,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml index 9f44e22dd..ed91b9193 100644 --- a/tex/context/interface/mkiv/i-indent.xml +++ b/tex/context/interface/mkiv/i-indent.xml @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -54,21 +54,21 @@ - + - + - + - + - + - + @@ -78,14 +78,14 @@ - + - + - + diff --git a/tex/context/interface/mkiv/i-indentedtext.xml b/tex/context/interface/mkiv/i-indentedtext.xml index 3d1b470ac..8d19c321f 100644 --- a/tex/context/interface/mkiv/i-indentedtext.xml +++ b/tex/context/interface/mkiv/i-indentedtext.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -57,16 +57,16 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-initial.xml b/tex/context/interface/mkiv/i-initial.xml index 4b7c2a607..7f0993acc 100644 --- a/tex/context/interface/mkiv/i-initial.xml +++ b/tex/context/interface/mkiv/i-initial.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -63,13 +63,13 @@ - + - + @@ -78,4 +78,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-injector.xml b/tex/context/interface/mkiv/i-injector.xml index 321aa75c8..3728d7bb8 100644 --- a/tex/context/interface/mkiv/i-injector.xml +++ b/tex/context/interface/mkiv/i-injector.xml @@ -4,37 +4,37 @@ - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -50,19 +50,19 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml index 943e10069..c8c4ed721 100644 --- a/tex/context/interface/mkiv/i-insertion.xml +++ b/tex/context/interface/mkiv/i-insertion.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,4 +45,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml index dd8fce866..2496e5d94 100644 --- a/tex/context/interface/mkiv/i-interaction.xml +++ b/tex/context/interface/mkiv/i-interaction.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -119,13 +119,13 @@ - + - + @@ -134,7 +134,7 @@ - + @@ -143,18 +143,18 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionbar.xml b/tex/context/interface/mkiv/i-interactionbar.xml index ecc707df9..e03d2a071 100644 --- a/tex/context/interface/mkiv/i-interactionbar.xml +++ b/tex/context/interface/mkiv/i-interactionbar.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -97,4 +97,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionmenu.xml b/tex/context/interface/mkiv/i-interactionmenu.xml index 78068d1f5..32fac36f9 100644 --- a/tex/context/interface/mkiv/i-interactionmenu.xml +++ b/tex/context/interface/mkiv/i-interactionmenu.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -125,7 +125,7 @@ - + - + @@ -150,7 +150,7 @@ - + - + @@ -245,7 +245,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -270,11 +270,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml index dafdb310f..79c15428b 100644 --- a/tex/context/interface/mkiv/i-interactionscreen.xml +++ b/tex/context/interface/mkiv/i-interactionscreen.xml @@ -4,7 +4,7 @@ - + @@ -45,6 +45,8 @@ + + @@ -57,7 +59,7 @@ - + diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml index 08c273812..66b48535e 100644 --- a/tex/context/interface/mkiv/i-interface.xml +++ b/tex/context/interface/mkiv/i-interface.xml @@ -199,4 +199,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interlinespace.xml b/tex/context/interface/mkiv/i-interlinespace.xml index 6573a8e05..94911afb9 100644 --- a/tex/context/interface/mkiv/i-interlinespace.xml +++ b/tex/context/interface/mkiv/i-interlinespace.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -69,13 +69,13 @@ - + - + @@ -84,7 +84,7 @@ - + @@ -100,13 +100,13 @@ - + - + @@ -115,7 +115,7 @@ - + @@ -131,13 +131,13 @@ - + - + @@ -145,7 +145,7 @@ - + @@ -161,16 +161,16 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-italiccorrection.xml b/tex/context/interface/mkiv/i-italiccorrection.xml index def238233..2d406bdf5 100644 --- a/tex/context/interface/mkiv/i-italiccorrection.xml +++ b/tex/context/interface/mkiv/i-italiccorrection.xml @@ -4,7 +4,7 @@ - + @@ -14,11 +14,11 @@ - + - + - + @@ -29,4 +29,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index 7145ebfb3..b811592be 100644 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ b/tex/context/interface/mkiv/i-itemgroup.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -387,7 +387,7 @@ - + @@ -399,7 +399,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -450,15 +450,15 @@ - + - + - + @@ -466,36 +466,36 @@ - + - + - + @@ -549,7 +549,7 @@ - + @@ -560,7 +560,7 @@ - + @@ -571,7 +571,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-items.xml b/tex/context/interface/mkiv/i-items.xml index b73524229..ab50b669d 100644 --- a/tex/context/interface/mkiv/i-items.xml +++ b/tex/context/interface/mkiv/i-items.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,4 +82,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-javascript.xml b/tex/context/interface/mkiv/i-javascript.xml index 4cf9dbf85..e97c5109c 100644 --- a/tex/context/interface/mkiv/i-javascript.xml +++ b/tex/context/interface/mkiv/i-javascript.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -27,25 +27,25 @@ - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml index d2a332ab3..b45e916f2 100644 --- a/tex/context/interface/mkiv/i-kerning.xml +++ b/tex/context/interface/mkiv/i-kerning.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,9 +47,9 @@ - + - + @@ -59,21 +59,21 @@ - + - + - + @@ -82,7 +82,7 @@ - + @@ -90,4 +90,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml index ff2ebc005..a09360aa7 100644 --- a/tex/context/interface/mkiv/i-label.xml +++ b/tex/context/interface/mkiv/i-label.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -131,6 +131,12 @@ + + + + + + @@ -178,7 +184,7 @@ - + @@ -199,7 +205,7 @@ - + @@ -210,4 +216,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml index 4a58a069c..7ad6b6ba8 100644 --- a/tex/context/interface/mkiv/i-labeltext.xml +++ b/tex/context/interface/mkiv/i-labeltext.xml @@ -4,14 +4,14 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -137,382 +137,382 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index c60965a59..652f6ffc6 100644 --- a/tex/context/interface/mkiv/i-language.xml +++ b/tex/context/interface/mkiv/i-language.xml @@ -4,7 +4,7 @@ - + @@ -13,14 +13,14 @@ - + - + @@ -124,7 +124,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -156,41 +156,41 @@ - + - + - + - + - + - + - + - + @@ -201,4 +201,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml index 04704f75c..77aaf7d52 100644 --- a/tex/context/interface/mkiv/i-layer.xml +++ b/tex/context/interface/mkiv/i-layer.xml @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -221,37 +221,37 @@ - + - + - + - + - + - + @@ -267,7 +267,7 @@ - + @@ -276,14 +276,14 @@ - + - + @@ -291,7 +291,7 @@ - + @@ -299,11 +299,11 @@ - + - + - + @@ -314,7 +314,7 @@ - + @@ -324,4 +324,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index 15e60115e..19b233988 100644 --- a/tex/context/interface/mkiv/i-layout.xml +++ b/tex/context/interface/mkiv/i-layout.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -251,27 +251,27 @@ - + - + - + - + @@ -279,7 +279,7 @@ - + @@ -287,14 +287,14 @@ - + - + @@ -308,7 +308,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -363,8 +363,22 @@ - + - + - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml index 7459d7142..3dc562e68 100644 --- a/tex/context/interface/mkiv/i-linenumber.xml +++ b/tex/context/interface/mkiv/i-linenumber.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -122,25 +122,25 @@ - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -156,17 +156,17 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml index 0c46fbd10..500786276 100644 --- a/tex/context/interface/mkiv/i-lines.xml +++ b/tex/context/interface/mkiv/i-lines.xml @@ -104,7 +104,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linewidth.xml b/tex/context/interface/mkiv/i-linewidth.xml index 6b2e5274c..6d9043a1f 100644 --- a/tex/context/interface/mkiv/i-linewidth.xml +++ b/tex/context/interface/mkiv/i-linewidth.xml @@ -4,7 +4,7 @@ - + @@ -15,6 +15,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml index bde2a69e6..8d4863dd2 100644 --- a/tex/context/interface/mkiv/i-list.xml +++ b/tex/context/interface/mkiv/i-list.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -372,7 +372,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -456,7 +456,7 @@ - + - + - + - + - + - + - + @@ -532,7 +532,7 @@ - + @@ -546,7 +546,7 @@ - + @@ -556,7 +556,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -597,21 +597,21 @@ - + - + - + - + - + - + - + - + @@ -622,9 +622,9 @@ - + - + diff --git a/tex/context/interface/mkiv/i-logo.xml b/tex/context/interface/mkiv/i-logo.xml index e3327400a..8f8186a83 100644 --- a/tex/context/interface/mkiv/i-logo.xml +++ b/tex/context/interface/mkiv/i-logo.xml @@ -4,102 +4,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml index 9b31c5b96..c174a9f54 100644 --- a/tex/context/interface/mkiv/i-lohi.xml +++ b/tex/context/interface/mkiv/i-lohi.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -46,13 +46,13 @@ - + - + @@ -62,7 +62,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -94,13 +94,13 @@ - + - + @@ -110,7 +110,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -226,4 +226,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml index b4aa8ab5c..c7f114251 100644 --- a/tex/context/interface/mkiv/i-lua.xml +++ b/tex/context/interface/mkiv/i-lua.xml @@ -4,190 +4,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml index 39fe9d112..dc2bd9ad4 100644 --- a/tex/context/interface/mkiv/i-makeup.xml +++ b/tex/context/interface/mkiv/i-makeup.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -139,7 +139,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml index 89aca949a..0d0e3c2b4 100644 --- a/tex/context/interface/mkiv/i-marginblock.xml +++ b/tex/context/interface/mkiv/i-marginblock.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -67,7 +67,7 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml index 2f77e71a0..0ebf17825 100644 --- a/tex/context/interface/mkiv/i-margindata.xml +++ b/tex/context/interface/mkiv/i-margindata.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -167,7 +167,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marker.xml b/tex/context/interface/mkiv/i-marker.xml index d01aee822..2db8a9de1 100644 --- a/tex/context/interface/mkiv/i-marker.xml +++ b/tex/context/interface/mkiv/i-marker.xml @@ -4,30 +4,30 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml index cb1bf11af..914922cf2 100644 --- a/tex/context/interface/mkiv/i-marking.xml +++ b/tex/context/interface/mkiv/i-marking.xml @@ -43,14 +43,14 @@ - + - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -171,4 +171,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index d83acda68..6563590ef 100644 --- a/tex/context/interface/mkiv/i-math.xml +++ b/tex/context/interface/mkiv/i-math.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -106,35 +106,35 @@ - + - + - + - + - + @@ -164,7 +164,7 @@ - + @@ -174,63 +174,67 @@ - - - - - + - + - + - + - + - + - + - + - + - + @@ -239,7 +243,7 @@ - + @@ -248,7 +252,7 @@ - + @@ -257,7 +261,7 @@ - + @@ -266,221 +270,221 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -488,4 +492,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml index c4154e084..325b288c7 100644 --- a/tex/context/interface/mkiv/i-mathalignment.xml +++ b/tex/context/interface/mkiv/i-mathalignment.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -69,7 +69,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml index 75f4040d1..837f2b782 100644 --- a/tex/context/interface/mkiv/i-mathcases.xml +++ b/tex/context/interface/mkiv/i-mathcases.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -57,7 +57,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml index 5b0bf2d56..097863889 100644 --- a/tex/context/interface/mkiv/i-mathfence.xml +++ b/tex/context/interface/mkiv/i-mathfence.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -61,147 +61,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml index 50a0f0e1e..64056dee6 100644 --- a/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/tex/context/interface/mkiv/i-mathmatrix.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -95,28 +95,44 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathornament.xml b/tex/context/interface/mkiv/i-mathornament.xml index 9aad469ed..70100b8e4 100644 --- a/tex/context/interface/mkiv/i-mathornament.xml +++ b/tex/context/interface/mkiv/i-mathornament.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -43,4 +43,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathradical.xml b/tex/context/interface/mkiv/i-mathradical.xml index 5fa4876f4..a7ba93b75 100644 --- a/tex/context/interface/mkiv/i-mathradical.xml +++ b/tex/context/interface/mkiv/i-mathradical.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -46,11 +46,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml index 7a130f74c..3e6613022 100644 --- a/tex/context/interface/mkiv/i-mathstackers.xml +++ b/tex/context/interface/mkiv/i-mathstackers.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -120,23 +120,28 @@ - + - + - - - - - - + + + + - + @@ -147,7 +152,7 @@ - + @@ -156,1613 +161,1042 @@ - + - - + + + - - - - + + + + + + - + - + - - + - + - + - - + + + + - - - - + - + + + + + - + - + + + - + - + + + + - + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - + + + + + + + - + - - - + + + + + - + + + + - - - + + + + + - + - - - + + + + + - + + + + - - - + + + + + - + - - - + + + - + + + + - - + - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -1772,18 +1206,18 @@ - + - + - + - + - + diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml index b12479a22..0e703d66f 100644 --- a/tex/context/interface/mkiv/i-metapost.xml +++ b/tex/context/interface/mkiv/i-metapost.xml @@ -4,21 +4,21 @@ - + - + - + - + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -83,19 +83,19 @@ - + - + - + @@ -103,85 +103,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -192,14 +192,14 @@ - + - + @@ -210,14 +210,14 @@ - + - + @@ -228,14 +228,14 @@ - + - + @@ -246,14 +246,14 @@ - + - + @@ -264,19 +264,19 @@ - + - + - + @@ -286,72 +286,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -359,7 +359,7 @@ - + @@ -367,20 +367,20 @@ - + - + - + @@ -389,7 +389,7 @@ - + @@ -403,4 +403,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml index 447e0e761..4e1ab9625 100644 --- a/tex/context/interface/mkiv/i-mixedcolumns.xml +++ b/tex/context/interface/mkiv/i-mixedcolumns.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -121,7 +121,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml index b1e80c7dd..8b35da6f8 100644 --- a/tex/context/interface/mkiv/i-modes.xml +++ b/tex/context/interface/mkiv/i-modes.xml @@ -4,79 +4,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -87,13 +87,13 @@ - + - + @@ -101,7 +101,7 @@ - + @@ -109,33 +109,33 @@ - + - + - + - + - + @@ -143,7 +143,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -167,19 +167,19 @@ - + - + - + @@ -189,28 +189,28 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml index 2916090f8..03ed005e2 100644 --- a/tex/context/interface/mkiv/i-modules.xml +++ b/tex/context/interface/mkiv/i-modules.xml @@ -24,7 +24,7 @@ - + @@ -123,4 +123,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml index 0486dd4b6..f38f515a7 100644 --- a/tex/context/interface/mkiv/i-narrow.xml +++ b/tex/context/interface/mkiv/i-narrow.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -118,4 +118,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml index 535b2be55..ac9ea9383 100644 --- a/tex/context/interface/mkiv/i-naturaltable.xml +++ b/tex/context/interface/mkiv/i-naturaltable.xml @@ -4,7 +4,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -240,7 +240,7 @@ - + @@ -249,19 +249,19 @@ - + - + - + @@ -269,7 +269,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -293,7 +293,7 @@ - + @@ -301,4 +301,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index 734702264..9bcf43d5b 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -6,7 +6,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -417,14 +417,14 @@ - + - + @@ -432,14 +432,14 @@ - + - + @@ -448,13 +448,13 @@ - + - + @@ -463,11 +463,11 @@ - + - + - + @@ -475,7 +475,7 @@ - + @@ -483,21 +483,21 @@ - + - + - + @@ -506,26 +506,26 @@ - + - + - + @@ -554,9 +554,9 @@ - + - + @@ -566,26 +566,26 @@ - + @@ -603,7 +603,7 @@ - + @@ -627,7 +627,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -653,7 +653,7 @@ - + @@ -666,14 +666,14 @@ - + - + @@ -681,20 +681,20 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml index 9520ee567..2083c3572 100644 --- a/tex/context/interface/mkiv/i-object.xml +++ b/tex/context/interface/mkiv/i-object.xml @@ -4,7 +4,7 @@ - + @@ -13,15 +13,15 @@ - + - + - + - + - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -75,25 +75,25 @@ - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -129,4 +129,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml index a645d746c..15a162b1a 100644 --- a/tex/context/interface/mkiv/i-offset.xml +++ b/tex/context/interface/mkiv/i-offset.xml @@ -4,7 +4,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,4 +71,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-opposite.xml b/tex/context/interface/mkiv/i-opposite.xml index 5ee68f94d..3ed22559f 100644 --- a/tex/context/interface/mkiv/i-opposite.xml +++ b/tex/context/interface/mkiv/i-opposite.xml @@ -4,7 +4,7 @@ - + @@ -24,6 +24,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml index d2e8d3f1c..847fda4e6 100644 --- a/tex/context/interface/mkiv/i-ornament.xml +++ b/tex/context/interface/mkiv/i-ornament.xml @@ -4,7 +4,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -100,4 +100,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-output.xml b/tex/context/interface/mkiv/i-output.xml index f336c07a4..28b5b3799 100644 --- a/tex/context/interface/mkiv/i-output.xml +++ b/tex/context/interface/mkiv/i-output.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -25,25 +25,25 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml index d2ce6d524..40d0bda93 100644 --- a/tex/context/interface/mkiv/i-overlay.xml +++ b/tex/context/interface/mkiv/i-overlay.xml @@ -4,7 +4,7 @@ - + @@ -12,21 +12,21 @@ - + - + - + - + - + - + - + - + @@ -34,7 +34,7 @@ - + @@ -42,4 +42,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml index f9e38d9fc..9972800ec 100644 --- a/tex/context/interface/mkiv/i-pagebreak.xml +++ b/tex/context/interface/mkiv/i-pagebreak.xml @@ -111,14 +111,14 @@ - + - + @@ -132,4 +132,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagecomment.xml b/tex/context/interface/mkiv/i-pagecomment.xml index 211f08d3d..75b9056a8 100644 --- a/tex/context/interface/mkiv/i-pagecomment.xml +++ b/tex/context/interface/mkiv/i-pagecomment.xml @@ -4,7 +4,7 @@ - + @@ -35,6 +35,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagefigure.xml b/tex/context/interface/mkiv/i-pagefigure.xml index 8f76ace34..0e8af435f 100644 --- a/tex/context/interface/mkiv/i-pagefigure.xml +++ b/tex/context/interface/mkiv/i-pagefigure.xml @@ -4,22 +4,32 @@ - + - + + + + + + - + - + + + + + + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index d7aee5291..8e53ef8fc 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -138,13 +138,13 @@ - + - + @@ -154,7 +154,7 @@ - + @@ -192,14 +192,14 @@ - + - + @@ -208,7 +208,7 @@ - + @@ -217,4 +217,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageinjection.xml b/tex/context/interface/mkiv/i-pageinjection.xml index 735d44e28..f2ded298e 100644 --- a/tex/context/interface/mkiv/i-pageinjection.xml +++ b/tex/context/interface/mkiv/i-pageinjection.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -49,14 +49,14 @@ - + - + @@ -65,7 +65,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,4 +86,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagelayout.xml b/tex/context/interface/mkiv/i-pagelayout.xml index 2e5ca2085..3aadda0ff 100644 --- a/tex/context/interface/mkiv/i-pagelayout.xml +++ b/tex/context/interface/mkiv/i-pagelayout.xml @@ -4,7 +4,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -38,4 +38,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagemarks.xml b/tex/context/interface/mkiv/i-pagemarks.xml index f0eaae47f..036f518b9 100644 --- a/tex/context/interface/mkiv/i-pagemarks.xml +++ b/tex/context/interface/mkiv/i-pagemarks.xml @@ -4,7 +4,21 @@ - - + + + + + + + + - + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml index 830bdb351..4c262db4b 100644 --- a/tex/context/interface/mkiv/i-pagenumber.xml +++ b/tex/context/interface/mkiv/i-pagenumber.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -48,17 +48,17 @@ - + - + - + - + @@ -111,74 +111,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml index 90d419bbc..082f53b6d 100644 --- a/tex/context/interface/mkiv/i-pageselection.xml +++ b/tex/context/interface/mkiv/i-pageselection.xml @@ -178,4 +178,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml index 779304d6c..01e014a28 100644 --- a/tex/context/interface/mkiv/i-pageshift.xml +++ b/tex/context/interface/mkiv/i-pageshift.xml @@ -26,4 +26,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml index e9b18bfed..941068399 100644 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ b/tex/context/interface/mkiv/i-pagestate.xml @@ -56,4 +56,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml index 8001742e0..a5a0b9b5f 100644 --- a/tex/context/interface/mkiv/i-pairedbox.xml +++ b/tex/context/interface/mkiv/i-pairedbox.xml @@ -139,7 +139,7 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-papersize.xml b/tex/context/interface/mkiv/i-papersize.xml index 05bfb8a33..8156235bd 100644 --- a/tex/context/interface/mkiv/i-papersize.xml +++ b/tex/context/interface/mkiv/i-papersize.xml @@ -6,7 +6,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -300,4 +300,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraph.xml b/tex/context/interface/mkiv/i-paragraph.xml index 1729e26d2..b253f404b 100644 --- a/tex/context/interface/mkiv/i-paragraph.xml +++ b/tex/context/interface/mkiv/i-paragraph.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,9 +52,9 @@ - + - + @@ -68,4 +68,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml index 615e95597..6d35f11a0 100644 --- a/tex/context/interface/mkiv/i-paragraphnumber.xml +++ b/tex/context/interface/mkiv/i-paragraphnumber.xml @@ -4,7 +4,7 @@ - + @@ -26,4 +26,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml index 6cbbcd5b7..0d8ae3d2e 100644 --- a/tex/context/interface/mkiv/i-paragraphs.xml +++ b/tex/context/interface/mkiv/i-paragraphs.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -136,33 +136,33 @@ - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml index c8d177fcd..3f7154c9f 100644 --- a/tex/context/interface/mkiv/i-parallel.xml +++ b/tex/context/interface/mkiv/i-parallel.xml @@ -32,7 +32,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -76,10 +76,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parbuilder.xml b/tex/context/interface/mkiv/i-parbuilder.xml index 70879546d..95621fce0 100644 --- a/tex/context/interface/mkiv/i-parbuilder.xml +++ b/tex/context/interface/mkiv/i-parbuilder.xml @@ -4,13 +4,13 @@ - + - + @@ -21,7 +21,7 @@ - + @@ -32,4 +32,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pdf.xml b/tex/context/interface/mkiv/i-pdf.xml index e84f0a3aa..fc83777a1 100644 --- a/tex/context/interface/mkiv/i-pdf.xml +++ b/tex/context/interface/mkiv/i-pdf.xml @@ -4,119 +4,119 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-penalty.xml b/tex/context/interface/mkiv/i-penalty.xml index ee241b9ff..d69c196f9 100644 --- a/tex/context/interface/mkiv/i-penalty.xml +++ b/tex/context/interface/mkiv/i-penalty.xml @@ -4,13 +4,13 @@ - + - + @@ -18,12 +18,12 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-periods.xml b/tex/context/interface/mkiv/i-periods.xml index ec471faf6..5cded3b1c 100644 --- a/tex/context/interface/mkiv/i-periods.xml +++ b/tex/context/interface/mkiv/i-periods.xml @@ -4,7 +4,7 @@ - + @@ -24,13 +24,13 @@ - + - + @@ -38,6 +38,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-phantom.xml b/tex/context/interface/mkiv/i-phantom.xml index e3f92b810..8458be67b 100644 --- a/tex/context/interface/mkiv/i-phantom.xml +++ b/tex/context/interface/mkiv/i-phantom.xml @@ -4,25 +4,25 @@ - + - + - + - + @@ -38,4 +38,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-placement.xml b/tex/context/interface/mkiv/i-placement.xml index 958ffaa6f..665d9aeb8 100644 --- a/tex/context/interface/mkiv/i-placement.xml +++ b/tex/context/interface/mkiv/i-placement.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -72,4 +72,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml index 145a4eb8c..b9f4b3780 100644 --- a/tex/context/interface/mkiv/i-position.xml +++ b/tex/context/interface/mkiv/i-position.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -34,39 +34,39 @@ - + - + - + - + - + - + @@ -77,13 +77,13 @@ - + - + @@ -95,7 +95,7 @@ - + @@ -108,190 +108,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -299,7 +299,7 @@ - + @@ -307,14 +307,14 @@ - + - + @@ -386,7 +386,7 @@ - + @@ -394,7 +394,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -461,13 +461,13 @@ - + - + @@ -476,7 +476,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -509,7 +509,7 @@ - + @@ -517,18 +517,18 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positionbar.xml b/tex/context/interface/mkiv/i-positionbar.xml index 6777227b0..286466bef 100644 --- a/tex/context/interface/mkiv/i-positionbar.xml +++ b/tex/context/interface/mkiv/i-positionbar.xml @@ -4,7 +4,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -70,4 +70,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positioning.xml b/tex/context/interface/mkiv/i-positioning.xml index 9a91eecd5..9d873fd46 100644 --- a/tex/context/interface/mkiv/i-positioning.xml +++ b/tex/context/interface/mkiv/i-positioning.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -95,4 +95,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-postponing.xml b/tex/context/interface/mkiv/i-postponing.xml index 477359626..0d4c98d7a 100644 --- a/tex/context/interface/mkiv/i-postponing.xml +++ b/tex/context/interface/mkiv/i-postponing.xml @@ -4,7 +4,7 @@ - + @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml index 8dc9a28c4..7e23c6631 100644 --- a/tex/context/interface/mkiv/i-processor.xml +++ b/tex/context/interface/mkiv/i-processor.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -41,11 +41,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-profile.xml b/tex/context/interface/mkiv/i-profile.xml index 90027ffd3..acc486cb7 100644 --- a/tex/context/interface/mkiv/i-profile.xml +++ b/tex/context/interface/mkiv/i-profile.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -56,15 +56,15 @@ - + - + - + @@ -82,7 +82,7 @@ - + @@ -97,4 +97,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml index b8f322625..b6280047a 100644 --- a/tex/context/interface/mkiv/i-publication.xml +++ b/tex/context/interface/mkiv/i-publication.xml @@ -4,25 +4,25 @@ - + - + - + - + @@ -32,7 +32,7 @@ - + @@ -117,19 +117,19 @@ - + - + - + @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -340,7 +340,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -376,331 +376,331 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -735,67 +735,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -807,7 +807,7 @@ - + @@ -815,27 +815,27 @@ - + - + - + - + @@ -847,7 +847,7 @@ - + @@ -855,7 +855,7 @@ - + @@ -864,7 +864,7 @@ - + @@ -876,7 +876,7 @@ - + @@ -884,7 +884,7 @@ - + @@ -893,13 +893,13 @@ - + - + @@ -907,7 +907,7 @@ - + @@ -915,14 +915,14 @@ - + - + @@ -935,39 +935,39 @@ - + - + - + - + - + - + - + @@ -979,7 +979,7 @@ - + @@ -991,7 +991,7 @@ - + @@ -1002,7 +1002,7 @@ - + @@ -1011,38 +1011,38 @@ - + - + - + - + - + - + @@ -1058,13 +1058,13 @@ - + - + @@ -1080,13 +1080,13 @@ - + - + @@ -1102,19 +1102,19 @@ - + - + - + @@ -1127,16 +1127,16 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml index ad842c138..a1a17f669 100644 --- a/tex/context/interface/mkiv/i-random.xml +++ b/tex/context/interface/mkiv/i-random.xml @@ -36,7 +36,7 @@ - + @@ -52,13 +52,13 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 8550ad0ae..a98b91a6b 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/context/interface/mkiv/i-references.xml b/tex/context/interface/mkiv/i-references.xml index 423106115..1e3e3466d 100644 --- a/tex/context/interface/mkiv/i-references.xml +++ b/tex/context/interface/mkiv/i-references.xml @@ -4,7 +4,7 @@ - + @@ -53,40 +53,40 @@ - + - + - + - + - + - + @@ -94,21 +94,21 @@ - + - + - + @@ -118,27 +118,27 @@ - + - + - + - + @@ -146,7 +146,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -186,9 +186,9 @@ - + - + @@ -196,7 +196,7 @@ - + @@ -204,25 +204,25 @@ - + - + - + - + @@ -230,7 +230,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -287,19 +287,19 @@ - + - + - + @@ -309,7 +309,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -357,27 +357,27 @@ - + - + - + - + @@ -386,7 +386,7 @@ - + @@ -395,7 +395,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -443,7 +443,7 @@ - + @@ -456,13 +456,13 @@ - + - + @@ -470,7 +470,7 @@ - + @@ -483,27 +483,27 @@ - + - + - + - + @@ -563,4 +563,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-regime.xml b/tex/context/interface/mkiv/i-regime.xml index 7a05afd32..e126abb65 100644 --- a/tex/context/interface/mkiv/i-regime.xml +++ b/tex/context/interface/mkiv/i-regime.xml @@ -4,11 +4,11 @@ - + - + - + @@ -77,7 +77,7 @@ - + @@ -85,4 +85,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index d41fe8ef7..4d8010559 100644 --- a/tex/context/interface/mkiv/i-register.xml +++ b/tex/context/interface/mkiv/i-register.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -436,7 +436,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -546,14 +546,14 @@ - + - + @@ -561,7 +561,7 @@ - + @@ -584,7 +584,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -601,14 +601,14 @@ - + - + @@ -638,9 +638,9 @@ - + - + @@ -649,7 +649,7 @@ - + @@ -658,10 +658,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-renderingwindow.xml b/tex/context/interface/mkiv/i-renderingwindow.xml index c07bf4430..525415c70 100644 --- a/tex/context/interface/mkiv/i-renderingwindow.xml +++ b/tex/context/interface/mkiv/i-renderingwindow.xml @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -52,11 +52,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml index 82e2532f6..1cee232db 100644 --- a/tex/context/interface/mkiv/i-replacement.xml +++ b/tex/context/interface/mkiv/i-replacement.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,6 +21,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-rotatation.xml b/tex/context/interface/mkiv/i-rotatation.xml index ee151b0be..7bfb9b2de 100644 --- a/tex/context/interface/mkiv/i-rotatation.xml +++ b/tex/context/interface/mkiv/i-rotatation.xml @@ -4,13 +4,13 @@ - + - + @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,4 +51,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml index 4684f780f..10bcff22e 100644 --- a/tex/context/interface/mkiv/i-ruby.xml +++ b/tex/context/interface/mkiv/i-ruby.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,10 +67,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml index df1cf37a6..3d26ed76f 100644 --- a/tex/context/interface/mkiv/i-scale.xml +++ b/tex/context/interface/mkiv/i-scale.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -103,14 +103,14 @@ - + - + @@ -118,4 +118,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scite.xml b/tex/context/interface/mkiv/i-scite.xml index e62bc9067..f04e575e0 100644 --- a/tex/context/interface/mkiv/i-scite.xml +++ b/tex/context/interface/mkiv/i-scite.xml @@ -4,19 +4,26 @@ - + - + - + + + + + + + + diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml index c60afad09..9af017492 100644 --- a/tex/context/interface/mkiv/i-script.xml +++ b/tex/context/interface/mkiv/i-script.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,20 +86,20 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index 3130085a6..3f462db02 100644 --- a/tex/context/interface/mkiv/i-section.xml +++ b/tex/context/interface/mkiv/i-section.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -236,15 +236,20 @@ - + + + + + + - + @@ -253,7 +258,7 @@ - + @@ -266,7 +271,7 @@ - + @@ -280,7 +285,7 @@ - + @@ -292,7 +297,7 @@ - + @@ -307,182 +312,182 @@ - + @@ -499,25 +504,25 @@ - + - + - + - + @@ -526,21 +531,21 @@ - + - + - + - + @@ -553,7 +558,7 @@ - + @@ -566,7 +571,7 @@ - + @@ -579,50 +584,50 @@ - + - + - + - + - + - + - + - + - + @@ -630,7 +635,7 @@ - + @@ -638,7 +643,7 @@ - + @@ -648,7 +653,7 @@ - + @@ -664,38 +669,38 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml index fb59e16af..1cb2debde 100644 --- a/tex/context/interface/mkiv/i-sectionblock.xml +++ b/tex/context/interface/mkiv/i-sectionblock.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,7 +83,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml index 6a68fb328..44970669b 100644 --- a/tex/context/interface/mkiv/i-selector.xml +++ b/tex/context/interface/mkiv/i-selector.xml @@ -38,7 +38,7 @@ - + @@ -49,4 +49,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml index 4771230eb..a4420bfcf 100644 --- a/tex/context/interface/mkiv/i-setup.xml +++ b/tex/context/interface/mkiv/i-setup.xml @@ -4,7 +4,7 @@ - + @@ -19,124 +19,149 @@ - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + + + + + + + diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml index 5d3a7c9b1..df7281e74 100644 --- a/tex/context/interface/mkiv/i-setups.xml +++ b/tex/context/interface/mkiv/i-setups.xml @@ -4,67 +4,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -104,7 +104,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -132,21 +132,21 @@ - + - + - + @@ -155,13 +155,13 @@ - + - + @@ -170,7 +170,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -200,13 +200,13 @@ - + - + @@ -215,10 +215,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml index c9611e3bf..521317d1d 100644 --- a/tex/context/interface/mkiv/i-shift.xml +++ b/tex/context/interface/mkiv/i-shift.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,13 +75,13 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sidebar.xml b/tex/context/interface/mkiv/i-sidebar.xml index 8926954e3..7518b5c61 100644 --- a/tex/context/interface/mkiv/i-sidebar.xml +++ b/tex/context/interface/mkiv/i-sidebar.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -86,13 +86,13 @@ - + - + @@ -100,4 +100,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml index 74df570e2..9183c8a6b 100644 --- a/tex/context/interface/mkiv/i-smash.xml +++ b/tex/context/interface/mkiv/i-smash.xml @@ -79,4 +79,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml index b5e4e40f1..5a263ab97 100644 --- a/tex/context/interface/mkiv/i-sort.xml +++ b/tex/context/interface/mkiv/i-sort.xml @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -133,27 +133,27 @@ - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -173,14 +173,14 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-soundtrack.xml b/tex/context/interface/mkiv/i-soundtrack.xml index 2351476b3..c374268bb 100644 --- a/tex/context/interface/mkiv/i-soundtrack.xml +++ b/tex/context/interface/mkiv/i-soundtrack.xml @@ -4,7 +4,7 @@ - + @@ -14,17 +14,17 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml index 7b328eea6..90a219fc8 100644 --- a/tex/context/interface/mkiv/i-spellchecking.xml +++ b/tex/context/interface/mkiv/i-spellchecking.xml @@ -4,7 +4,7 @@ - + @@ -23,11 +23,11 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml index 51aad21f2..8181cfe2d 100644 --- a/tex/context/interface/mkiv/i-spreadsheet.xml +++ b/tex/context/interface/mkiv/i-spreadsheet.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -32,31 +32,31 @@ - + - + - + - + - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -94,31 +94,31 @@ - + - + - + - + - + @@ -127,9 +127,9 @@ - + - + diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml index 08c5d2ba0..c7780488c 100644 --- a/tex/context/interface/mkiv/i-startstop.xml +++ b/tex/context/interface/mkiv/i-startstop.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -51,13 +51,13 @@ - + - + @@ -66,7 +66,7 @@ - + @@ -75,4 +75,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-steps.xml b/tex/context/interface/mkiv/i-steps.xml index e27fe5f16..c71bc2e2f 100644 --- a/tex/context/interface/mkiv/i-steps.xml +++ b/tex/context/interface/mkiv/i-steps.xml @@ -6,7 +6,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,15 +334,15 @@ - + - + - + @@ -350,7 +350,7 @@ - + @@ -359,7 +359,7 @@ - + @@ -367,42 +367,42 @@ - + - + - + - + - + - + diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml index b392fd001..7e769fdb6 100644 --- a/tex/context/interface/mkiv/i-stream.xml +++ b/tex/context/interface/mkiv/i-stream.xml @@ -71,4 +71,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml index 567881602..aba5429c5 100644 --- a/tex/context/interface/mkiv/i-string.xml +++ b/tex/context/interface/mkiv/i-string.xml @@ -66,4 +66,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml index 88047dd3d..ff200e4db 100644 --- a/tex/context/interface/mkiv/i-strut.xml +++ b/tex/context/interface/mkiv/i-strut.xml @@ -4,15 +4,15 @@ - + - + - + - + - + @@ -28,12 +28,17 @@ - - - - - - + + + + + + + + + + + @@ -49,10 +54,10 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index d7e1e5926..123e98cbf 100644 --- a/tex/context/interface/mkiv/i-symbol.xml +++ b/tex/context/interface/mkiv/i-symbol.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -55,27 +55,27 @@ - + - + - + - + @@ -88,7 +88,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -116,30 +116,30 @@ - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synctex.xml b/tex/context/interface/mkiv/i-synctex.xml new file mode 100644 index 000000000..21f49e3f6 --- /dev/null +++ b/tex/context/interface/mkiv/i-synctex.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml index 75c623210..3e3e1c027 100644 --- a/tex/context/interface/mkiv/i-synonym.xml +++ b/tex/context/interface/mkiv/i-synonym.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -137,40 +137,40 @@ - + - + - + - + - + - + @@ -179,7 +179,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -196,7 +196,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-systemlog.xml b/tex/context/interface/mkiv/i-systemlog.xml index 93717af21..fc3243cfb 100644 --- a/tex/context/interface/mkiv/i-systemlog.xml +++ b/tex/context/interface/mkiv/i-systemlog.xml @@ -28,4 +28,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml index 177bc2eef..e59a9ca97 100644 --- a/tex/context/interface/mkiv/i-table.xml +++ b/tex/context/interface/mkiv/i-table.xml @@ -4,7 +4,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -31,31 +31,31 @@ - + - + - + - + - + @@ -126,34 +126,34 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml index 8a8eb8741..3efc34f42 100644 --- a/tex/context/interface/mkiv/i-tabulation.xml +++ b/tex/context/interface/mkiv/i-tabulation.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -153,29 +153,29 @@ - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index 1c666cf25..3e0d49d80 100644 --- a/tex/context/interface/mkiv/i-tagging.xml +++ b/tex/context/interface/mkiv/i-tagging.xml @@ -4,7 +4,7 @@ - + @@ -18,21 +18,21 @@ - + - + - + @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -66,10 +66,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textbackground.xml b/tex/context/interface/mkiv/i-textbackground.xml index 6cd045a91..6104b1d9a 100644 --- a/tex/context/interface/mkiv/i-textbackground.xml +++ b/tex/context/interface/mkiv/i-textbackground.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -146,6 +146,6 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml index 8fbc377fd..9c9ea2190 100644 --- a/tex/context/interface/mkiv/i-textflow.xml +++ b/tex/context/interface/mkiv/i-textflow.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -31,13 +31,13 @@ - + - + @@ -45,7 +45,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -69,16 +69,16 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textrule.xml b/tex/context/interface/mkiv/i-textrule.xml index 11b4a27c3..b71df66a6 100644 --- a/tex/context/interface/mkiv/i-textrule.xml +++ b/tex/context/interface/mkiv/i-textrule.xml @@ -4,7 +4,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -63,10 +63,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index b36980fe4..bd1b128b3 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -6,7 +6,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -262,11 +262,11 @@ - + - + - + @@ -280,7 +280,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -382,4 +382,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-thinrule.xml b/tex/context/interface/mkiv/i-thinrule.xml index 758b6fea2..372f9a238 100644 --- a/tex/context/interface/mkiv/i-thinrule.xml +++ b/tex/context/interface/mkiv/i-thinrule.xml @@ -4,7 +4,7 @@ - + @@ -59,11 +59,11 @@ - + - + - + @@ -71,4 +71,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml index a0b3eb916..129f472ba 100644 --- a/tex/context/interface/mkiv/i-token.xml +++ b/tex/context/interface/mkiv/i-token.xml @@ -28,4 +28,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tolerance.xml b/tex/context/interface/mkiv/i-tolerance.xml index 4a369541b..3d0010edf 100644 --- a/tex/context/interface/mkiv/i-tolerance.xml +++ b/tex/context/interface/mkiv/i-tolerance.xml @@ -4,7 +4,7 @@ - + @@ -19,4 +19,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml index 8010900e4..df43ff9ce 100644 --- a/tex/context/interface/mkiv/i-tooltip.xml +++ b/tex/context/interface/mkiv/i-tooltip.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -64,7 +64,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml index 26384f11c..3db36addc 100644 --- a/tex/context/interface/mkiv/i-tracker.xml +++ b/tex/context/interface/mkiv/i-tracker.xml @@ -32,9 +32,9 @@ - + - + @@ -48,7 +48,7 @@ - + @@ -62,14 +62,14 @@ - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-translate.xml b/tex/context/interface/mkiv/i-translate.xml index 6a033e0dc..4dc5d93e9 100644 --- a/tex/context/interface/mkiv/i-translate.xml +++ b/tex/context/interface/mkiv/i-translate.xml @@ -4,20 +4,20 @@ - + - + - + - + - + diff --git a/tex/context/interface/mkiv/i-translation.xml b/tex/context/interface/mkiv/i-translation.xml index b0b052a0f..f4f03037e 100644 --- a/tex/context/interface/mkiv/i-translation.xml +++ b/tex/context/interface/mkiv/i-translation.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -26,4 +26,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml index 63783d040..992735693 100644 --- a/tex/context/interface/mkiv/i-twopassdata.xml +++ b/tex/context/interface/mkiv/i-twopassdata.xml @@ -121,4 +121,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-typography.xml b/tex/context/interface/mkiv/i-typography.xml index 6c2aa7389..c5f06fa13 100644 --- a/tex/context/interface/mkiv/i-typography.xml +++ b/tex/context/interface/mkiv/i-typography.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -104,9 +104,9 @@ - + - + @@ -114,7 +114,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -148,9 +148,9 @@ - + - + @@ -170,4 +170,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml index 031e3c575..9efa452eb 100644 --- a/tex/context/interface/mkiv/i-unit.xml +++ b/tex/context/interface/mkiv/i-unit.xml @@ -4,19 +4,19 @@ - + - + - + @@ -26,7 +26,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -89,7 +89,7 @@ - + - + - + @@ -125,4 +125,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml index 388fd3eed..7c295f9ad 100644 --- a/tex/context/interface/mkiv/i-variables.xml +++ b/tex/context/interface/mkiv/i-variables.xml @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -121,21 +121,21 @@ - + - + - + @@ -144,7 +144,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -243,27 +243,27 @@ - + - + - + - + @@ -291,26 +291,26 @@ - + - + - + - + @@ -318,7 +318,7 @@ - + @@ -326,21 +326,21 @@ - + - + - + @@ -348,7 +348,7 @@ - + @@ -356,18 +356,18 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml index de3295669..e8abc1f66 100644 --- a/tex/context/interface/mkiv/i-verbatim.xml +++ b/tex/context/interface/mkiv/i-verbatim.xml @@ -4,7 +4,7 @@ - + @@ -14,20 +14,12 @@ - + - - - - - - - - - + @@ -77,7 +69,7 @@ - + @@ -86,7 +78,7 @@ - + @@ -95,7 +87,7 @@ - + @@ -104,7 +96,7 @@ - + @@ -113,7 +105,7 @@ - + @@ -125,7 +117,7 @@ - + @@ -137,7 +129,7 @@ - + @@ -147,7 +139,7 @@ - + @@ -161,15 +153,7 @@ - - - - - - - - - + @@ -251,7 +235,7 @@ - + @@ -265,7 +249,7 @@ - + @@ -279,55 +263,55 @@ - + - + - + - + - + - + - + - + - + @@ -337,7 +321,7 @@ - + @@ -345,7 +329,7 @@ - + @@ -355,7 +339,7 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml index ff33ee341..22a3846d9 100644 --- a/tex/context/interface/mkiv/i-version.xml +++ b/tex/context/interface/mkiv/i-version.xml @@ -28,20 +28,20 @@ - + - + - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,4 +75,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-viewerlayer.xml b/tex/context/interface/mkiv/i-viewerlayer.xml index 4fd25e0ef..fde846e4d 100644 --- a/tex/context/interface/mkiv/i-viewerlayer.xml +++ b/tex/context/interface/mkiv/i-viewerlayer.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -44,25 +44,25 @@ - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml index 3e44b2740..7849ab90b 100644 --- a/tex/context/interface/mkiv/i-visual.xml +++ b/tex/context/interface/mkiv/i-visual.xml @@ -4,20 +4,20 @@ - + - + - + @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,19 +53,19 @@ - + - + - + - + - + @@ -78,7 +78,7 @@ - + @@ -87,11 +87,11 @@ - + - + - + @@ -99,17 +99,17 @@ - + - + - + - + - + - + diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml index 0e037c9e5..daaad28cd 100644 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ b/tex/context/interface/mkiv/i-visualizer.xml @@ -108,12 +108,13 @@ - + + @@ -137,22 +138,22 @@ - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index a8777d02a..9e1836dbc 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -89,33 +89,97 @@ - + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -123,29 +187,29 @@ - + - + - + - + - + - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index 68040a8dd..f1a8ce84e 100644 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ b/tex/context/interface/mkiv/i-whitespace.xml @@ -4,7 +4,7 @@ - + @@ -23,15 +23,15 @@ - + - + - + @@ -39,9 +39,9 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -59,4 +59,4 @@ - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml index d287c0b74..9acd4038c 100644 --- a/tex/context/interface/mkiv/i-xml.xml +++ b/tex/context/interface/mkiv/i-xml.xml @@ -6,147 +6,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -154,27 +154,27 @@ - + - + - + - + @@ -182,7 +182,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -200,44 +200,73 @@ - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -245,7 +274,7 @@ - + @@ -253,7 +282,7 @@ - + @@ -261,7 +290,7 @@ - + @@ -269,7 +298,7 @@ - + @@ -277,7 +306,7 @@ - + @@ -285,7 +314,7 @@ - + @@ -293,7 +322,7 @@ - + @@ -301,44 +330,44 @@ - + - + - + - + - + - + - + @@ -346,16 +375,16 @@ - + - + - + @@ -363,7 +392,7 @@ - + @@ -372,14 +401,14 @@ - + - + @@ -387,39 +416,39 @@ - + - + - + - + - + - + @@ -427,79 +456,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -507,7 +536,7 @@ - + @@ -515,16 +544,16 @@ - + - + - + @@ -534,7 +563,7 @@ - + @@ -542,7 +571,7 @@ - + @@ -550,7 +579,7 @@ - + @@ -559,7 +588,7 @@ - + @@ -567,7 +596,7 @@ - + @@ -575,7 +604,7 @@ - + @@ -584,21 +613,21 @@ - + - + - + @@ -606,7 +635,7 @@ - + @@ -615,7 +644,7 @@ - + @@ -624,14 +653,14 @@ - + - + @@ -640,7 +669,7 @@ - + @@ -648,14 +677,14 @@ - + - + @@ -663,7 +692,7 @@ - + @@ -671,7 +700,7 @@ - + @@ -680,20 +709,20 @@ - + - + - + @@ -701,7 +730,7 @@ - + @@ -709,7 +738,7 @@ - + @@ -729,55 +758,55 @@ --> - + - + - + - + - + - + - + - + - + - + @@ -785,14 +814,14 @@ - + - + @@ -801,7 +830,7 @@ - + @@ -817,10 +846,10 @@ - + - + \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index 4db0882f1..c921e1a8d 100644 --- a/tex/context/interface/mkiv/i-xtable.xml +++ b/tex/context/interface/mkiv/i-xtable.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -90,13 +90,13 @@ - + - + @@ -104,13 +104,13 @@ - + - + @@ -121,13 +121,13 @@ - + - + @@ -136,7 +136,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -165,13 +165,13 @@ - + - + @@ -179,13 +179,13 @@ - + - + @@ -193,13 +193,13 @@ - + - + @@ -207,13 +207,13 @@ - + - + @@ -222,7 +222,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -240,8 +240,8 @@ - + - + - + \ No newline at end of file diff --git a/tex/context/modules/mkiv/m-barcodes.mkiv b/tex/context/modules/mkiv/m-barcodes.mkiv index e4c43b376..84f093c56 100644 --- a/tex/context/modules/mkiv/m-barcodes.mkiv +++ b/tex/context/modules/mkiv/m-barcodes.mkiv @@ -13,6 +13,15 @@ \writestatus{barcodes}{the 'zint' module is a better choice} +\usemodule[zint] + +\let\normalbarcode\barcode + +\unexpanded\def\barcode[#1]% + {\normalbarcode[\c!text=\dummyparameter\c!code,\c!alternative=\dummyparameter\c!type,#1]} + +\iffalse + % \startTEXpage % \startPSTRICKS % \pspicture(-4mm,-1mm)(38mm,26mm) @@ -112,6 +121,8 @@ end \directsetup{barcode:\getvariable{barcode}{type}}% \egroup} +\fi + \continueifinputfile{m-barcodes.mkiv} \starttext diff --git a/tex/context/modules/mkiv/m-chart.lua b/tex/context/modules/mkiv/m-chart.lua index 92ee0d969..bcf80bdfc 100644 --- a/tex/context/modules/mkiv/m-chart.lua +++ b/tex/context/modules/mkiv/m-chart.lua @@ -400,7 +400,7 @@ implement { implement { name = "flow_set_include", - arguments = { "string", "dimension", "dimension", "string" }, + arguments = { "string", "integer", "integer", "string" }, actions = function(name,x,y,settings) data[#data+1] = { include = name, diff --git a/tex/context/modules/mkiv/m-chart.mkvi b/tex/context/modules/mkiv/m-chart.mkvi index 37b48f6eb..0463e4acd 100644 --- a/tex/context/modules/mkiv/m-chart.mkvi +++ b/tex/context/modules/mkiv/m-chart.mkvi @@ -304,8 +304,8 @@ \unexpanded\def\module_charts_FLOW_include [#name][#settings]{% \begingroup - \getparameters[FLOWi][\c!x=1,\c!y=1,#settings]% - \clf_flow_set_include{#name}\numexpr\FLOWix\relax\numexpr\FLOWiy\relax{\detokenize{#settings}}% + \getdummyparameters[\c!x=1,\c!y=1,#settings]% + \clf_flow_set_include{#name}\numexpr\dummyparameter\c!x\relax\numexpr\dummyparameter\c!y\relax{\detokenize{#settings}}% \endgroup \ignorespaces } diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 8137842b5..014b110ab 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 10/24/17 10:30:41 +-- merge date : 10/29/17 15:44:10 do -- begin closure to overcome local limits and interference @@ -11,14 +11,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -2097,6 +2098,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- closure @@ -2113,16 +2132,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -2963,37 +2981,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -3044,19 +3068,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -3578,7 +3605,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -3839,7 +3866,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -4240,7 +4267,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -4277,7 +4304,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7621,6 +7648,7 @@ local sort,insert,concat=table.sort,table.insert,table.concat local sortedkeys,sortedhash,serialize,fastcopy=table.sortedkeys,table.sortedhash,table.serialize,table.fastcopy local derivetable=table.derive local ioflush=io.flush +local round=math.round local trace_defining=false trackers.register("fonts.defining",function(v) trace_defining=v end) local trace_scaling=false trackers.register("fonts.scaling",function(v) trace_scaling=v end) local report_defining=logs.reporter("fonts","defining") @@ -8419,13 +8447,15 @@ function constructors.hashinstance(specification,force) specification.hash=hash end if size<1000 and designsizes[hash] then - size=math.round(constructors.scaled(size,designsizes[hash])) - specification.size=size + size=round(constructors.scaled(size,designsizes[hash])) + else + size=round(size) end + specification.size=size if fallbacks then - return hash..' @ '..tostring(size)..' @ '..fallbacks + return hash..' @ '..size..' @ '..fallbacks else - return hash..' @ '..tostring(size) + return hash..' @ '..size end end function constructors.setname(tfmdata,specification) @@ -9139,7 +9169,7 @@ local function tounicode16sequence(unicodes) end return concat(t) end -local function tounicode(unicode,name) +local function tounicode(unicode) if type(unicode)=="table" then local t={} for l=1,#unicode do @@ -28363,8 +28393,8 @@ local setmetatableindex=table.setmetatableindex local formatters=string.formatters local tounicode=fonts.mappings.tounicode local otf=fonts.handlers.otf -local f_color=formatters["%f %f %f rg"] -local f_gray=formatters["%f g"] +local f_color=formatters["%.3f %.3f %.3f rg"] +local f_gray=formatters["%.3f g"] if context then local startactualtext=nil local stopactualtext=nil @@ -31898,7 +31928,7 @@ function definers.read(specification,size,id) local properties=tfmdata.properties or {} local parameters=tfmdata.parameters or {} report_defining("using %a font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a", - properties.format or "unknown",id,properties.name,parameters.size,properties.encodingbytes, + properties.format or "unknown",id or "-",properties.name,parameters.size,properties.encodingbytes, properties.encodingname,properties.fullname,basename(properties.filename)) end statistics.stoptiming(fonts) -- cgit v1.2.3