From b2a2304cbb0c65040d7b118ac9b857d304e333e6 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Sat, 25 Jun 2016 15:40:51 +0200 Subject: 2016-06-25 14:42:00 --- .../lexers/data/scite-context-data-metafun.lua | 2 +- .../context/scite-context-data-metafun.properties | 47 +- .../general/manuals/languages/languages-mkiv.tex | 15 + .../sources/general/manuals/math/math-mkiv.tex | 13 + metapost/context/base/mpiv/mp-mlib.mpiv | 39 + metapost/context/base/mpiv/mp-shap.mpiv | 12 +- metapost/context/base/mpiv/mp-step.mpiv | 364 +- scripts/context/lua/mtx-fonts.lua | 2 +- scripts/context/lua/mtxrun.lua | 40 +- scripts/context/stubs/mswin/mtxrun.lua | 40 +- scripts/context/stubs/unix/mtxrun | 40 +- scripts/context/stubs/win64/mtxrun.lua | 40 +- tex/context/base/context-version.pdf | Bin 4250 -> 4254 bytes tex/context/base/mkiv/char-enc.lua | 1 - tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/font-age.lua | 3 +- tex/context/base/mkiv/font-agl.lua | 2 + tex/context/base/mkiv/font-con.lua | 18 +- tex/context/base/mkiv/font-dsp.lua | 26 +- tex/context/base/mkiv/font-enc.lua | 8 +- tex/context/base/mkiv/font-mis.lua | 2 +- tex/context/base/mkiv/font-otl.lua | 2 +- tex/context/base/mkiv/luat-fio.lua | 14 +- tex/context/base/mkiv/lxml-aux.lua | 12 +- tex/context/base/mkiv/lxml-ini.mkiv | 10 + tex/context/base/mkiv/lxml-tab.lua | 36 +- tex/context/base/mkiv/lxml-tex.lua | 8 +- tex/context/base/mkiv/math-ali.mkiv | 12 +- tex/context/base/mkiv/math-vfu.lua | 4 + tex/context/base/mkiv/meta-ini.mkiv | 2 - tex/context/base/mkiv/mlib-lua.lua | 13 +- tex/context/base/mkiv/mlib-pps.lua | 34 + tex/context/base/mkiv/mlib-pps.mkiv | 27 + tex/context/base/mkiv/mtx-context-listing.tex | 2 + tex/context/base/mkiv/mtx-context-xml.tex | 4 +- tex/context/base/mkiv/mult-aux.mkiv | 5 + tex/context/base/mkiv/mult-fun.lua | 2 +- tex/context/base/mkiv/node-fnt.lua | 49 +- tex/context/base/mkiv/page-mix.mkiv | 2 +- tex/context/base/mkiv/spac-ver.lua | 38 +- tex/context/base/mkiv/status-files.pdf | Bin 9084 -> 9202 bytes tex/context/base/mkiv/status-lua.pdf | Bin 268913 -> 366280 bytes tex/context/base/mkiv/strc-num.lua | 19 +- tex/context/base/mkiv/supp-box.lua | 141 + tex/context/base/mkiv/supp-box.mkiv | 26 + tex/context/base/mkiv/util-sci.lua | 1 + tex/context/base/mkiv/util-str.lua | 6 +- tex/context/fonts/mkiv/minion-math.lfg | 2 + tex/context/interface/mkiv/i-accent.xml | 252 -- tex/context/interface/mkiv/i-align.xml | 276 -- tex/context/interface/mkiv/i-anchor.xml | 35 - tex/context/interface/mkiv/i-attachment.xml | 154 - tex/context/interface/mkiv/i-attribute.xml | 96 - tex/context/interface/mkiv/i-backend.xml | 49 - tex/context/interface/mkiv/i-background.xml | 161 - tex/context/interface/mkiv/i-bar.xml | 205 -- tex/context/interface/mkiv/i-blackrule.xml | 101 - tex/context/interface/mkiv/i-bleed.xml | 64 - tex/context/interface/mkiv/i-block.xml | 120 - tex/context/interface/mkiv/i-bookmark.xml | 79 - tex/context/interface/mkiv/i-boxes.xml | 982 ------ tex/context/interface/mkiv/i-buffer.xml | 196 -- tex/context/interface/mkiv/i-button.xml | 187 -- tex/context/interface/mkiv/i-capitals.xml | 208 -- tex/context/interface/mkiv/i-catcodes.xml | 123 - tex/context/interface/mkiv/i-character.xml | 136 - tex/context/interface/mkiv/i-characteralign.xml | 45 - tex/context/interface/mkiv/i-characterspacing.xml | 43 - .../interface/mkiv/i-characterstripping.xml | 20 - tex/context/interface/mkiv/i-charwidth.xml | 17 - tex/context/interface/mkiv/i-chemical.xml | 255 -- tex/context/interface/mkiv/i-cleaning.xml | 47 - tex/context/interface/mkiv/i-clipping.xml | 78 - tex/context/interface/mkiv/i-collector.xml | 114 - tex/context/interface/mkiv/i-color.xml | 597 ---- tex/context/interface/mkiv/i-columns.xml | 111 - tex/context/interface/mkiv/i-combination.xml | 131 - tex/context/interface/mkiv/i-commandhandler.xml | 314 -- tex/context/interface/mkiv/i-comment.xml | 140 - tex/context/interface/mkiv/i-common-argument.xml | 509 --- tex/context/interface/mkiv/i-common-assignment.xml | 338 -- .../interface/mkiv/i-common-definitions.xml | 13 - tex/context/interface/mkiv/i-common-keyword.xml | 704 ---- tex/context/interface/mkiv/i-common-string.xml | 157 - tex/context/interface/mkiv/i-common-value.xml | 546 --- tex/context/interface/mkiv/i-context.pdf | Bin 821218 -> 821323 bytes tex/context/interface/mkiv/i-context.xml | 234 -- tex/context/interface/mkiv/i-conversion.xml | 632 ---- tex/context/interface/mkiv/i-counter.xml | 517 --- tex/context/interface/mkiv/i-dataset.xml | 51 - tex/context/interface/mkiv/i-define.xml | 23 - tex/context/interface/mkiv/i-delimitedtext.xml | 217 -- tex/context/interface/mkiv/i-description.xml | 172 - tex/context/interface/mkiv/i-digits.xml | 26 - tex/context/interface/mkiv/i-dimension.xml | 67 - tex/context/interface/mkiv/i-direction.xml | 69 - tex/context/interface/mkiv/i-document.xml | 215 -- tex/context/interface/mkiv/i-dummy.xml | 58 - tex/context/interface/mkiv/i-effect.xml | 62 - tex/context/interface/mkiv/i-enumeration.xml | 219 -- tex/context/interface/mkiv/i-export.xml | 77 - tex/context/interface/mkiv/i-field.xml | 383 --- tex/context/interface/mkiv/i-figure.xml | 50 - tex/context/interface/mkiv/i-file.xml | 404 --- tex/context/interface/mkiv/i-filler.xml | 116 - tex/context/interface/mkiv/i-fillinline.xml | 43 - tex/context/interface/mkiv/i-fillinrule.xml | 66 - tex/context/interface/mkiv/i-firstline.xml | 52 - tex/context/interface/mkiv/i-fittingpage.xml | 96 - tex/context/interface/mkiv/i-floats.xml | 736 ---- tex/context/interface/mkiv/i-fontfamily.xml | 225 -- tex/context/interface/mkiv/i-fonts.xml | 1644 --------- tex/context/interface/mkiv/i-form.xml | 23 - tex/context/interface/mkiv/i-formula.xml | 295 -- tex/context/interface/mkiv/i-fraction.xml | 191 -- tex/context/interface/mkiv/i-framed.xml | 594 ---- tex/context/interface/mkiv/i-graphics.xml | 522 --- tex/context/interface/mkiv/i-grid.xml | 189 -- tex/context/interface/mkiv/i-help.xml | 83 - tex/context/interface/mkiv/i-highlight.xml | 64 - tex/context/interface/mkiv/i-hspace.xml | 159 - tex/context/interface/mkiv/i-hyphenation.xml | 260 -- tex/context/interface/mkiv/i-imposition.xml | 82 - tex/context/interface/mkiv/i-indent.xml | 91 - tex/context/interface/mkiv/i-indentedtext.xml | 72 - tex/context/interface/mkiv/i-initial.xml | 81 - tex/context/interface/mkiv/i-injector.xml | 73 - tex/context/interface/mkiv/i-insertion.xml | 48 - tex/context/interface/mkiv/i-interaction.xml | 160 - tex/context/interface/mkiv/i-interactionbar.xml | 100 - tex/context/interface/mkiv/i-interactionmenu.xml | 276 -- tex/context/interface/mkiv/i-interactionscreen.xml | 68 - tex/context/interface/mkiv/i-interface.xml | 202 -- tex/context/interface/mkiv/i-interlinespace.xml | 176 - tex/context/interface/mkiv/i-italiccorrection.xml | 32 - tex/context/interface/mkiv/i-itemgroup.xml | 534 --- tex/context/interface/mkiv/i-items.xml | 85 - tex/context/interface/mkiv/i-javascript.xml | 51 - tex/context/interface/mkiv/i-kerning.xml | 93 - tex/context/interface/mkiv/i-label.xml | 210 -- tex/context/interface/mkiv/i-labeltext.xml | 496 --- tex/context/interface/mkiv/i-language.xml | 200 -- tex/context/interface/mkiv/i-layer.xml | 327 -- tex/context/interface/mkiv/i-layout.xml | 367 -- tex/context/interface/mkiv/i-linenumber.xml | 158 - tex/context/interface/mkiv/i-lines.xml | 116 - tex/context/interface/mkiv/i-linetable.xml | 165 - tex/context/interface/mkiv/i-linewidth.xml | 20 - tex/context/interface/mkiv/i-list.xml | 620 ---- tex/context/interface/mkiv/i-logo.xml | 105 - tex/context/interface/mkiv/i-lohi.xml | 223 -- tex/context/interface/mkiv/i-lua.xml | 193 -- tex/context/interface/mkiv/i-makeup.xml | 180 - tex/context/interface/mkiv/i-marginblock.xml | 87 - tex/context/interface/mkiv/i-margindata.xml | 469 --- tex/context/interface/mkiv/i-marker.xml | 33 - tex/context/interface/mkiv/i-marking.xml | 174 - tex/context/interface/mkiv/i-math.xml | 462 --- tex/context/interface/mkiv/i-mathalignment.xml | 67 - tex/context/interface/mkiv/i-mathcases.xml | 71 - tex/context/interface/mkiv/i-mathfence.xml | 199 -- tex/context/interface/mkiv/i-mathmatrix.xml | 115 - tex/context/interface/mkiv/i-mathornament.xml | 46 - tex/context/interface/mkiv/i-mathradical.xml | 56 - tex/context/interface/mkiv/i-mathstackers.xml | 1789 ---------- tex/context/interface/mkiv/i-metapost.xml | 406 --- tex/context/interface/mkiv/i-mixedcolumns.xml | 127 - tex/context/interface/mkiv/i-modes.xml | 216 -- tex/context/interface/mkiv/i-modules.xml | 126 - tex/context/interface/mkiv/i-narrow.xml | 121 - tex/context/interface/mkiv/i-naturaltable.xml | 301 -- tex/context/interface/mkiv/i-note.xml | 663 ---- tex/context/interface/mkiv/i-object.xml | 132 - tex/context/interface/mkiv/i-offset.xml | 74 - tex/context/interface/mkiv/i-opposite.xml | 29 - tex/context/interface/mkiv/i-ornament.xml | 103 - tex/context/interface/mkiv/i-output.xml | 49 - tex/context/interface/mkiv/i-overlay.xml | 45 - tex/context/interface/mkiv/i-pagebreak.xml | 135 - tex/context/interface/mkiv/i-pagecomment.xml | 40 - tex/context/interface/mkiv/i-pagefigure.xml | 25 - tex/context/interface/mkiv/i-pagegrid.xml | 220 -- tex/context/interface/mkiv/i-pageinjection.xml | 89 - tex/context/interface/mkiv/i-pagelayout.xml | 41 - tex/context/interface/mkiv/i-pagenumber.xml | 184 - tex/context/interface/mkiv/i-pageselection.xml | 175 - tex/context/interface/mkiv/i-pageshift.xml | 29 - tex/context/interface/mkiv/i-pagestate.xml | 59 - tex/context/interface/mkiv/i-pairedbox.xml | 171 - tex/context/interface/mkiv/i-papersize.xml | 303 -- tex/context/interface/mkiv/i-paragraph.xml | 71 - tex/context/interface/mkiv/i-paragraphnumber.xml | 29 - tex/context/interface/mkiv/i-paragraphs.xml | 168 - tex/context/interface/mkiv/i-parallel.xml | 85 - tex/context/interface/mkiv/i-parbuilder.xml | 35 - tex/context/interface/mkiv/i-pdf.xml | 131 - tex/context/interface/mkiv/i-penalty.xml | 29 - tex/context/interface/mkiv/i-periods.xml | 43 - tex/context/interface/mkiv/i-phantom.xml | 41 - tex/context/interface/mkiv/i-placement.xml | 75 - tex/context/interface/mkiv/i-position.xml | 528 --- tex/context/interface/mkiv/i-positionbar.xml | 73 - tex/context/interface/mkiv/i-positioning.xml | 98 - tex/context/interface/mkiv/i-postponing.xml | 15 - tex/context/interface/mkiv/i-processor.xml | 51 - tex/context/interface/mkiv/i-profile.xml | 100 - tex/context/interface/mkiv/i-publication.xml | 1124 ------- tex/context/interface/mkiv/i-random.xml | 64 - tex/context/interface/mkiv/i-readme.pdf | Bin 60787 -> 60791 bytes tex/context/interface/mkiv/i-references.xml | 566 ---- tex/context/interface/mkiv/i-regime.xml | 88 - tex/context/interface/mkiv/i-register.xml | 646 ---- tex/context/interface/mkiv/i-renderingwindow.xml | 62 - tex/context/interface/mkiv/i-replacement.xml | 26 - tex/context/interface/mkiv/i-rotatation.xml | 54 - tex/context/interface/mkiv/i-scale.xml | 121 - tex/context/interface/mkiv/i-script.xml | 106 - tex/context/interface/mkiv/i-section.xml | 679 ---- tex/context/interface/mkiv/i-sectionblock.xml | 125 - tex/context/interface/mkiv/i-selector.xml | 52 - tex/context/interface/mkiv/i-setups.xml | 224 -- tex/context/interface/mkiv/i-shift.xml | 85 - tex/context/interface/mkiv/i-sidebar.xml | 103 - tex/context/interface/mkiv/i-smash.xml | 82 - tex/context/interface/mkiv/i-sort.xml | 188 -- tex/context/interface/mkiv/i-soundtrack.xml | 30 - tex/context/interface/mkiv/i-spellchecking.xml | 33 - tex/context/interface/mkiv/i-startstop.xml | 78 - tex/context/interface/mkiv/i-stream.xml | 74 - tex/context/interface/mkiv/i-string.xml | 69 - tex/context/interface/mkiv/i-strut.xml | 53 - tex/context/interface/mkiv/i-symbol.xml | 145 - tex/context/interface/mkiv/i-synonym.xml | 212 -- tex/context/interface/mkiv/i-system.xml | 3534 -------------------- tex/context/interface/mkiv/i-systemlog.xml | 31 - tex/context/interface/mkiv/i-table.xml | 407 --- tex/context/interface/mkiv/i-tabulation.xml | 270 -- tex/context/interface/mkiv/i-tagging.xml | 68 - tex/context/interface/mkiv/i-textbackground.xml | 147 - tex/context/interface/mkiv/i-textflow.xml | 84 - tex/context/interface/mkiv/i-textrule.xml | 72 - tex/context/interface/mkiv/i-texts.xml | 385 --- tex/context/interface/mkiv/i-thinrule.xml | 74 - tex/context/interface/mkiv/i-token.xml | 31 - tex/context/interface/mkiv/i-tolerance.xml | 22 - tex/context/interface/mkiv/i-tooltip.xml | 81 - tex/context/interface/mkiv/i-tracker.xml | 75 - tex/context/interface/mkiv/i-translation.xml | 29 - tex/context/interface/mkiv/i-twopassdata.xml | 124 - tex/context/interface/mkiv/i-typography.xml | 173 - tex/context/interface/mkiv/i-unit.xml | 121 - tex/context/interface/mkiv/i-variables.xml | 356 -- tex/context/interface/mkiv/i-verbatim.xml | 449 --- tex/context/interface/mkiv/i-version.xml | 78 - tex/context/interface/mkiv/i-viewerlayer.xml | 68 - tex/context/interface/mkiv/i-visualizer.xml | 156 - tex/context/interface/mkiv/i-vspace.xml | 151 - tex/context/interface/mkiv/i-whitespace.xml | 62 - tex/context/interface/mkiv/i-xml.xml | 827 ----- tex/context/interface/mkiv/i-xtable.xml | 247 -- tex/context/modules/mkiv/m-steps.lua | 463 ++- tex/context/modules/mkiv/m-steps.mkvi | 457 ++- tex/context/modules/mkiv/s-fonts-features.lua | 50 +- tex/context/modules/mkiv/s-fonts-features.mkiv | 6 +- tex/context/modules/mkiv/s-xml-analyzers.lua | 12 +- tex/context/modules/mkiv/x-mathml.mkiv | 24 +- tex/context/modules/mkiv/x-steps.mkiv | 22 +- tex/generic/context/luatex/luatex-basics-gen.lua | 1 + .../context/luatex/luatex-fonts-demo-vf-1.lua | 8 + .../context/luatex/luatex-fonts-demo-vf-4.lua | 7 + tex/generic/context/luatex/luatex-fonts-enc.lua | 59 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 99 +- tex/generic/context/luatex/luatex-plain-tfm.lua | 113 + tex/generic/context/luatex/luatex-test.tex | 6 + 275 files changed, 1996 insertions(+), 44775 deletions(-) delete mode 100644 tex/context/interface/mkiv/i-accent.xml delete mode 100644 tex/context/interface/mkiv/i-align.xml delete mode 100644 tex/context/interface/mkiv/i-anchor.xml delete mode 100644 tex/context/interface/mkiv/i-attachment.xml delete mode 100644 tex/context/interface/mkiv/i-attribute.xml delete mode 100644 tex/context/interface/mkiv/i-backend.xml delete mode 100644 tex/context/interface/mkiv/i-background.xml delete mode 100644 tex/context/interface/mkiv/i-bar.xml delete mode 100644 tex/context/interface/mkiv/i-blackrule.xml delete mode 100644 tex/context/interface/mkiv/i-bleed.xml delete mode 100644 tex/context/interface/mkiv/i-block.xml delete mode 100644 tex/context/interface/mkiv/i-bookmark.xml delete mode 100644 tex/context/interface/mkiv/i-boxes.xml delete mode 100644 tex/context/interface/mkiv/i-buffer.xml delete mode 100644 tex/context/interface/mkiv/i-button.xml delete mode 100644 tex/context/interface/mkiv/i-capitals.xml delete mode 100644 tex/context/interface/mkiv/i-catcodes.xml delete mode 100644 tex/context/interface/mkiv/i-character.xml delete mode 100644 tex/context/interface/mkiv/i-characteralign.xml delete mode 100644 tex/context/interface/mkiv/i-characterspacing.xml delete mode 100644 tex/context/interface/mkiv/i-characterstripping.xml delete mode 100644 tex/context/interface/mkiv/i-charwidth.xml delete mode 100644 tex/context/interface/mkiv/i-chemical.xml delete mode 100644 tex/context/interface/mkiv/i-cleaning.xml delete mode 100644 tex/context/interface/mkiv/i-clipping.xml delete mode 100644 tex/context/interface/mkiv/i-collector.xml delete mode 100644 tex/context/interface/mkiv/i-color.xml delete mode 100644 tex/context/interface/mkiv/i-columns.xml delete mode 100644 tex/context/interface/mkiv/i-combination.xml delete mode 100644 tex/context/interface/mkiv/i-commandhandler.xml delete mode 100644 tex/context/interface/mkiv/i-comment.xml delete mode 100644 tex/context/interface/mkiv/i-common-argument.xml delete mode 100644 tex/context/interface/mkiv/i-common-assignment.xml delete mode 100644 tex/context/interface/mkiv/i-common-definitions.xml delete mode 100644 tex/context/interface/mkiv/i-common-keyword.xml delete mode 100644 tex/context/interface/mkiv/i-common-string.xml delete mode 100644 tex/context/interface/mkiv/i-common-value.xml delete mode 100644 tex/context/interface/mkiv/i-context.xml delete mode 100644 tex/context/interface/mkiv/i-conversion.xml delete mode 100644 tex/context/interface/mkiv/i-counter.xml delete mode 100644 tex/context/interface/mkiv/i-dataset.xml delete mode 100644 tex/context/interface/mkiv/i-define.xml delete mode 100644 tex/context/interface/mkiv/i-delimitedtext.xml delete mode 100644 tex/context/interface/mkiv/i-description.xml delete mode 100644 tex/context/interface/mkiv/i-digits.xml delete mode 100644 tex/context/interface/mkiv/i-dimension.xml delete mode 100644 tex/context/interface/mkiv/i-direction.xml delete mode 100644 tex/context/interface/mkiv/i-document.xml delete mode 100644 tex/context/interface/mkiv/i-dummy.xml delete mode 100644 tex/context/interface/mkiv/i-effect.xml delete mode 100644 tex/context/interface/mkiv/i-enumeration.xml delete mode 100644 tex/context/interface/mkiv/i-export.xml delete mode 100644 tex/context/interface/mkiv/i-field.xml delete mode 100644 tex/context/interface/mkiv/i-figure.xml delete mode 100644 tex/context/interface/mkiv/i-file.xml delete mode 100644 tex/context/interface/mkiv/i-filler.xml delete mode 100644 tex/context/interface/mkiv/i-fillinline.xml delete mode 100644 tex/context/interface/mkiv/i-fillinrule.xml delete mode 100644 tex/context/interface/mkiv/i-firstline.xml delete mode 100644 tex/context/interface/mkiv/i-fittingpage.xml delete mode 100644 tex/context/interface/mkiv/i-floats.xml delete mode 100644 tex/context/interface/mkiv/i-fontfamily.xml delete mode 100644 tex/context/interface/mkiv/i-fonts.xml delete mode 100644 tex/context/interface/mkiv/i-form.xml delete mode 100644 tex/context/interface/mkiv/i-formula.xml delete mode 100644 tex/context/interface/mkiv/i-fraction.xml delete mode 100644 tex/context/interface/mkiv/i-framed.xml delete mode 100644 tex/context/interface/mkiv/i-graphics.xml delete mode 100644 tex/context/interface/mkiv/i-grid.xml delete mode 100644 tex/context/interface/mkiv/i-help.xml delete mode 100644 tex/context/interface/mkiv/i-highlight.xml delete mode 100644 tex/context/interface/mkiv/i-hspace.xml delete mode 100644 tex/context/interface/mkiv/i-hyphenation.xml delete mode 100644 tex/context/interface/mkiv/i-imposition.xml delete mode 100644 tex/context/interface/mkiv/i-indent.xml delete mode 100644 tex/context/interface/mkiv/i-indentedtext.xml delete mode 100644 tex/context/interface/mkiv/i-initial.xml delete mode 100644 tex/context/interface/mkiv/i-injector.xml delete mode 100644 tex/context/interface/mkiv/i-insertion.xml delete mode 100644 tex/context/interface/mkiv/i-interaction.xml delete mode 100644 tex/context/interface/mkiv/i-interactionbar.xml delete mode 100644 tex/context/interface/mkiv/i-interactionmenu.xml delete mode 100644 tex/context/interface/mkiv/i-interactionscreen.xml delete mode 100644 tex/context/interface/mkiv/i-interface.xml delete mode 100644 tex/context/interface/mkiv/i-interlinespace.xml delete mode 100644 tex/context/interface/mkiv/i-italiccorrection.xml delete mode 100644 tex/context/interface/mkiv/i-itemgroup.xml delete mode 100644 tex/context/interface/mkiv/i-items.xml delete mode 100644 tex/context/interface/mkiv/i-javascript.xml delete mode 100644 tex/context/interface/mkiv/i-kerning.xml delete mode 100644 tex/context/interface/mkiv/i-label.xml delete mode 100644 tex/context/interface/mkiv/i-labeltext.xml delete mode 100644 tex/context/interface/mkiv/i-language.xml delete mode 100644 tex/context/interface/mkiv/i-layer.xml delete mode 100644 tex/context/interface/mkiv/i-layout.xml delete mode 100644 tex/context/interface/mkiv/i-linenumber.xml delete mode 100644 tex/context/interface/mkiv/i-lines.xml delete mode 100644 tex/context/interface/mkiv/i-linetable.xml delete mode 100644 tex/context/interface/mkiv/i-linewidth.xml delete mode 100644 tex/context/interface/mkiv/i-list.xml delete mode 100644 tex/context/interface/mkiv/i-logo.xml delete mode 100644 tex/context/interface/mkiv/i-lohi.xml delete mode 100644 tex/context/interface/mkiv/i-lua.xml delete mode 100644 tex/context/interface/mkiv/i-makeup.xml delete mode 100644 tex/context/interface/mkiv/i-marginblock.xml delete mode 100644 tex/context/interface/mkiv/i-margindata.xml delete mode 100644 tex/context/interface/mkiv/i-marker.xml delete mode 100644 tex/context/interface/mkiv/i-marking.xml delete mode 100644 tex/context/interface/mkiv/i-math.xml delete mode 100644 tex/context/interface/mkiv/i-mathalignment.xml delete mode 100644 tex/context/interface/mkiv/i-mathcases.xml delete mode 100644 tex/context/interface/mkiv/i-mathfence.xml delete mode 100644 tex/context/interface/mkiv/i-mathmatrix.xml delete mode 100644 tex/context/interface/mkiv/i-mathornament.xml delete mode 100644 tex/context/interface/mkiv/i-mathradical.xml delete mode 100644 tex/context/interface/mkiv/i-mathstackers.xml delete mode 100644 tex/context/interface/mkiv/i-metapost.xml delete mode 100644 tex/context/interface/mkiv/i-mixedcolumns.xml delete mode 100644 tex/context/interface/mkiv/i-modes.xml delete mode 100644 tex/context/interface/mkiv/i-modules.xml delete mode 100644 tex/context/interface/mkiv/i-narrow.xml delete mode 100644 tex/context/interface/mkiv/i-naturaltable.xml delete mode 100644 tex/context/interface/mkiv/i-note.xml delete mode 100644 tex/context/interface/mkiv/i-object.xml delete mode 100644 tex/context/interface/mkiv/i-offset.xml delete mode 100644 tex/context/interface/mkiv/i-opposite.xml delete mode 100644 tex/context/interface/mkiv/i-ornament.xml delete mode 100644 tex/context/interface/mkiv/i-output.xml delete mode 100644 tex/context/interface/mkiv/i-overlay.xml delete mode 100644 tex/context/interface/mkiv/i-pagebreak.xml delete mode 100644 tex/context/interface/mkiv/i-pagecomment.xml delete mode 100644 tex/context/interface/mkiv/i-pagefigure.xml delete mode 100644 tex/context/interface/mkiv/i-pagegrid.xml delete mode 100644 tex/context/interface/mkiv/i-pageinjection.xml delete mode 100644 tex/context/interface/mkiv/i-pagelayout.xml delete mode 100644 tex/context/interface/mkiv/i-pagenumber.xml delete mode 100644 tex/context/interface/mkiv/i-pageselection.xml delete mode 100644 tex/context/interface/mkiv/i-pageshift.xml delete mode 100644 tex/context/interface/mkiv/i-pagestate.xml delete mode 100644 tex/context/interface/mkiv/i-pairedbox.xml delete mode 100644 tex/context/interface/mkiv/i-papersize.xml delete mode 100644 tex/context/interface/mkiv/i-paragraph.xml delete mode 100644 tex/context/interface/mkiv/i-paragraphnumber.xml delete mode 100644 tex/context/interface/mkiv/i-paragraphs.xml delete mode 100644 tex/context/interface/mkiv/i-parallel.xml delete mode 100644 tex/context/interface/mkiv/i-parbuilder.xml delete mode 100644 tex/context/interface/mkiv/i-pdf.xml delete mode 100644 tex/context/interface/mkiv/i-penalty.xml delete mode 100644 tex/context/interface/mkiv/i-periods.xml delete mode 100644 tex/context/interface/mkiv/i-phantom.xml delete mode 100644 tex/context/interface/mkiv/i-placement.xml delete mode 100644 tex/context/interface/mkiv/i-position.xml delete mode 100644 tex/context/interface/mkiv/i-positionbar.xml delete mode 100644 tex/context/interface/mkiv/i-positioning.xml delete mode 100644 tex/context/interface/mkiv/i-postponing.xml delete mode 100644 tex/context/interface/mkiv/i-processor.xml delete mode 100644 tex/context/interface/mkiv/i-profile.xml delete mode 100644 tex/context/interface/mkiv/i-publication.xml delete mode 100644 tex/context/interface/mkiv/i-random.xml delete mode 100644 tex/context/interface/mkiv/i-references.xml delete mode 100644 tex/context/interface/mkiv/i-regime.xml delete mode 100644 tex/context/interface/mkiv/i-register.xml delete mode 100644 tex/context/interface/mkiv/i-renderingwindow.xml delete mode 100644 tex/context/interface/mkiv/i-replacement.xml delete mode 100644 tex/context/interface/mkiv/i-rotatation.xml delete mode 100644 tex/context/interface/mkiv/i-scale.xml delete mode 100644 tex/context/interface/mkiv/i-script.xml delete mode 100644 tex/context/interface/mkiv/i-section.xml delete mode 100644 tex/context/interface/mkiv/i-sectionblock.xml delete mode 100644 tex/context/interface/mkiv/i-selector.xml delete mode 100644 tex/context/interface/mkiv/i-setups.xml delete mode 100644 tex/context/interface/mkiv/i-shift.xml delete mode 100644 tex/context/interface/mkiv/i-sidebar.xml delete mode 100644 tex/context/interface/mkiv/i-smash.xml delete mode 100644 tex/context/interface/mkiv/i-sort.xml delete mode 100644 tex/context/interface/mkiv/i-soundtrack.xml delete mode 100644 tex/context/interface/mkiv/i-spellchecking.xml delete mode 100644 tex/context/interface/mkiv/i-startstop.xml delete mode 100644 tex/context/interface/mkiv/i-stream.xml delete mode 100644 tex/context/interface/mkiv/i-string.xml delete mode 100644 tex/context/interface/mkiv/i-strut.xml delete mode 100644 tex/context/interface/mkiv/i-symbol.xml delete mode 100644 tex/context/interface/mkiv/i-synonym.xml delete mode 100644 tex/context/interface/mkiv/i-system.xml delete mode 100644 tex/context/interface/mkiv/i-systemlog.xml delete mode 100644 tex/context/interface/mkiv/i-table.xml delete mode 100644 tex/context/interface/mkiv/i-tabulation.xml delete mode 100644 tex/context/interface/mkiv/i-tagging.xml delete mode 100644 tex/context/interface/mkiv/i-textbackground.xml delete mode 100644 tex/context/interface/mkiv/i-textflow.xml delete mode 100644 tex/context/interface/mkiv/i-textrule.xml delete mode 100644 tex/context/interface/mkiv/i-texts.xml delete mode 100644 tex/context/interface/mkiv/i-thinrule.xml delete mode 100644 tex/context/interface/mkiv/i-token.xml delete mode 100644 tex/context/interface/mkiv/i-tolerance.xml delete mode 100644 tex/context/interface/mkiv/i-tooltip.xml delete mode 100644 tex/context/interface/mkiv/i-tracker.xml delete mode 100644 tex/context/interface/mkiv/i-translation.xml delete mode 100644 tex/context/interface/mkiv/i-twopassdata.xml delete mode 100644 tex/context/interface/mkiv/i-typography.xml delete mode 100644 tex/context/interface/mkiv/i-unit.xml delete mode 100644 tex/context/interface/mkiv/i-variables.xml delete mode 100644 tex/context/interface/mkiv/i-verbatim.xml delete mode 100644 tex/context/interface/mkiv/i-version.xml delete mode 100644 tex/context/interface/mkiv/i-viewerlayer.xml delete mode 100644 tex/context/interface/mkiv/i-visualizer.xml delete mode 100644 tex/context/interface/mkiv/i-vspace.xml delete mode 100644 tex/context/interface/mkiv/i-whitespace.xml delete mode 100644 tex/context/interface/mkiv/i-xml.xml delete mode 100644 tex/context/interface/mkiv/i-xtable.xml create mode 100644 tex/generic/context/luatex/luatex-plain-tfm.lua diff --git a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua index 3be739005..6f9723de1 100644 --- a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua +++ b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua @@ -1,4 +1,4 @@ return { - ["commands"]={ "transparency", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshadestep", "withshadefraction", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "textext", "thetextext", "rawtextext", "textextoffset", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "format", "formatted", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright" }, + ["commands"]={ "transparency", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshadestep", "withshadefraction", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "format", "formatted", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright" }, ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "metapostversion", "maxdimensions", "drawoptionsfactor" }, } \ No newline at end of file diff --git a/context/data/scite/context/scite-context-data-metafun.properties b/context/data/scite/context/scite-context-data-metafun.properties index 9110148d4..d28a45aa5 100644 --- a/context/data/scite/context/scite-context-data-metafun.properties +++ b/context/data/scite/context/scite-context-data-metafun.properties @@ -29,29 +29,30 @@ greyed onlayer along graphictext loadfigure \ externalfigure figure register outlinetext checkedbounds \ checkbounds strut rule withmask bitmapimage \ colordecimals ddecimal dddecimal ddddecimal textext \ -thetextext rawtextext textextoffset verbatim thelabel \ -label autoalign transparent withtransparency property \ -properties withproperties asgroup infont space \ -crlf dquote percent SPACE CRLF \ -DQUOTE PERCENT grayscale greyscale withgray \ -withgrey colorpart readfile clearxy unitvector \ -center epsed anchored originpath infinite \ -break xstretched ystretched snapped pathconnectors \ -function constructedfunction constructedpath constructedpairs straightfunction \ -straightpath straightpairs curvedfunction curvedpath curvedpairs \ -evenly oddly condition pushcurrentpicture popcurrentpicture \ -arrowpath tensecircle roundedsquare colortype whitecolor \ -blackcolor basiccolors complementary complemented normalfill \ -normaldraw visualizepaths detailpaths naturalizepaths drawboundary \ -drawwholepath drawpathonly visualizeddraw visualizedfill detaileddraw \ -draworigin drawboundingbox drawpath drawpoint drawpoints \ -drawcontrolpoints drawcontrollines drawpointlabels drawlineoptions drawpointoptions \ -drawcontroloptions drawlabeloptions draworiginoptions drawboundoptions drawpathoptions \ -resetdrawoptions undashed decorated redecorated undecorated \ -passvariable passarrayvariable tostring format formatted \ -startpassingvariable stoppassingvariable eofill eoclip nofill \ -fillup eofillup area addbackground shadedup \ -shadeddown shadedleft shadedright +thetextext rawtextext textextoffset texbox thetexbox \ +rawtexbox verbatim thelabel label autoalign \ +transparent withtransparency property properties withproperties \ +asgroup infont space crlf dquote \ +percent SPACE CRLF DQUOTE PERCENT \ +grayscale greyscale withgray withgrey colorpart \ +readfile clearxy unitvector center epsed \ +anchored originpath infinite break xstretched \ +ystretched snapped pathconnectors function constructedfunction \ +constructedpath constructedpairs straightfunction straightpath straightpairs \ +curvedfunction curvedpath curvedpairs evenly oddly \ +condition pushcurrentpicture popcurrentpicture arrowpath tensecircle \ +roundedsquare colortype whitecolor blackcolor basiccolors \ +complementary complemented normalfill normaldraw visualizepaths \ +detailpaths naturalizepaths drawboundary drawwholepath drawpathonly \ +visualizeddraw visualizedfill detaileddraw draworigin drawboundingbox \ +drawpath drawpoint drawpoints drawcontrolpoints drawcontrollines \ +drawpointlabels drawlineoptions drawpointoptions drawcontroloptions drawlabeloptions \ +draworiginoptions drawboundoptions drawpathoptions resetdrawoptions undashed \ +decorated redecorated undecorated passvariable passarrayvariable \ +tostring format formatted startpassingvariable stoppassingvariable \ +eofill eoclip nofill fillup eofillup \ +area addbackground shadedup shadeddown shadedleft \ +shadedright keywordclass.metafun.internals=\ nocolormodel greycolormodel graycolormodel rgbcolormodel \ diff --git a/doc/context/sources/general/manuals/languages/languages-mkiv.tex b/doc/context/sources/general/manuals/languages/languages-mkiv.tex index dbf9875e1..e054cd8de 100644 --- a/doc/context/sources/general/manuals/languages/languages-mkiv.tex +++ b/doc/context/sources/general/manuals/languages/languages-mkiv.tex @@ -1,3 +1,18 @@ +% language=uk + +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. + \enablemode[simple] % ,oversized \startproduct languages-mkiv diff --git a/doc/context/sources/general/manuals/math/math-mkiv.tex b/doc/context/sources/general/manuals/math/math-mkiv.tex index 8f3a62705..c20f12049 100644 --- a/doc/context/sources/general/manuals/math/math-mkiv.tex +++ b/doc/context/sources/general/manuals/math/math-mkiv.tex @@ -1,5 +1,18 @@ % language=uk +% author : Hans Hagen +% copyright : PRAGMA ADE & ConTeXt Development Team +% license : Creative Commons Attribution ShareAlike 4.0 International +% reference : pragma-ade.nl | contextgarden.net | texlive (related) distributions +% origin : the ConTeXt distribution +% +% comment : Because this manual is distributed with TeX distributions it comes with a rather +% liberal license. We try to adapt these documents to upgrades in the (sub)systems +% that they describe. Using parts of the content otherwise can therefore conflict +% with existing functionality and we cannot be held responsible for that. Many of +% the manuals contain characteristic graphics and personal notes or examples that +% make no sense when used out-of-context. + \environment math-layout \startproduct math-mkiv diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv index ad2338bd0..cac84a6fd 100644 --- a/metapost/context/base/mpiv/mp-mlib.mpiv +++ b/metapost/context/base/mpiv/mp-mlib.mpiv @@ -240,6 +240,32 @@ vardef rawtextext(expr s) = % todo: avoid currentpicture fi enddef ; +vardef validtexbox(expr category, name) = + if category == "" : + false + elseif string name : + name <> "" + elseif numeric name : + name > 0 + else : + true + fi +enddef ; + +vardef rawtexbox(expr category, name) = + mfun_tt_c := nullpicture ; + if validtexbox(category,name) : + mfun_tt_b := lua.mp.tb_dimensions(category, name) ; + addto mfun_tt_c doublepath unitsquare + xscaled redpart mfun_tt_b + yscaled (greenpart mfun_tt_b + bluepart mfun_tt_b) + shifted (0,- bluepart mfun_tt_b) + withprescript "bx_category=" & if numeric category : decimal fi category + withprescript "bx_name=" & if numeric name : decimal fi name ; + fi + mfun_tt_c +enddef ; + % More text defaultfont := "Mono" ; @@ -403,6 +429,19 @@ vardef onetimetextext@#(expr p) = % no draw here thetextext@#(p,origin) enddef ; +vardef thetexbox@#(expr category, name, z) = + save p ; picture p ; p := rawtexbox(category,name) ; + p + if (mfun_labtype@# >= 10) : + shifted (0,ypart center p) + fi + shifted (z + textextoffset*mfun_laboff@# - (mfun_labxf@#*lrcorner p + mfun_labyf@#*ulcorner p + (1-mfun_labxf@#-mfun_labyf@#)*llcorner p)) +enddef ; + +vardef texbox@#(expr category, name) = % no draw here + thetexbox@#(category,name,origin) +enddef ; + vardef thelabel@#(expr p,z) = if string p : thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z) diff --git a/metapost/context/base/mpiv/mp-shap.mpiv b/metapost/context/base/mpiv/mp-shap.mpiv index 713656510..3e885e585 100644 --- a/metapost/context/base/mpiv/mp-shap.mpiv +++ b/metapost/context/base/mpiv/mp-shap.mpiv @@ -74,6 +74,8 @@ def stop_predefined_shape_definition = enddef ; +% this can be delayed + start_predefined_shape_definition ; predefined_shapes[ 0] := (origin--cycle) ; @@ -143,7 +145,7 @@ start_predefined_shape_definition ; stop_predefined_shape_definition ; vardef some_shape_path (expr type) = - if known predefined_shapes[type] : predefined_shapes[type] else : predefined_shapes[0] fi + if known predefined_shapes[type] : predefined_shapes[type] else : predefined_shapes[24] fi enddef ; def some_shape (expr shape_type, shape_width, shape_height, shape_linewidth, shape_linecolor, shape_fillcolor) = @@ -156,6 +158,14 @@ def some_shape (expr shape_type, shape_width, shape_height, shape_linewidth, sha endgroup ; enddef ; +% maybe: +% +% if t>1 : % normal shape +% path pp ; pp := some_shape_path(t) xyscaled(bbwidth(p), bbheight(p)) ; +% pp := pp shifted - center pp shifted center p ; +% fill pp withcolor fc ; +% draw pp withpen pencircle scaled lw withcolor lc ; + vardef drawpredefinedshape (expr t, p, lw, lc, fc) = save pp ; if t>1 : % normal shape diff --git a/metapost/context/base/mpiv/mp-step.mpiv b/metapost/context/base/mpiv/mp-step.mpiv index f7a7ba5de..27bcffcdc 100644 --- a/metapost/context/base/mpiv/mp-step.mpiv +++ b/metapost/context/base/mpiv/mp-step.mpiv @@ -23,7 +23,9 @@ def initialize_step_variables = cell_fill_color, cell_line_color, cell_line_width, cell_offset, line_line_color, line_line_width, line_alternative, line_distance, cell_distance_y, cell_distance_x, - nofcells, chart_vertical ; + nofcells, chart_vertical, chart_align, chart_category ; + + string chart_category ; chart_category := "" ; color text_line_color ; text_line_color := red ; color cell_line_color ; cell_line_color := blue ; @@ -49,6 +51,7 @@ def initialize_step_variables = numeric text_distance_set ; text_distance_set := 4pt ; boolean chart_vertical ; chart_vertical := false ; + boolean chart_align ; chart_align := false ; numeric nofcells ; nofcells := 0 ; @@ -56,17 +59,17 @@ enddef ; def step_cells (expr t, b) = nofcells := nofcells + 1 ; - cells_t[nofcells] := textext.d(t) ; - cells_b[nofcells] := textext.d(b) ; + cells_t[nofcells] := texbox.d(chart_category,t) ; + cells_b[nofcells] := texbox.d(chart_category,b) ; texts_t[nofcells] := nullpicture ; texts_m[nofcells] := nullpicture ; texts_b[nofcells] := nullpicture ; enddef ; -def step_texts (expr t, b) = - texts_t[nofcells] := textext.d(t) ; - texts_m[nofcells] := textext.d(m) ; - texts_b[nofcells] := textext.d(b) ; +def step_texts (expr t, m, b) = + texts_t[nofcells] := texbox.d(chart_category,t) ; + texts_m[nofcells] := texbox.d(chart_category,m) ; + texts_b[nofcells] := texbox.d(chart_category,b) ; enddef ; def step_begin_cell = @@ -81,11 +84,66 @@ enddef ; def step_end_cell = enddef ; -def step_cell_top (expr t) = cells_t[nofcells] := textext.d(t) ; enddef ; -def step_cell_bot (expr b) = cells_b[nofcells] := textext.d(b) ; enddef ; -def step_text_top (expr t) = texts_t[nofcells] := textext.d(t) ; enddef ; -def step_text_mid (expr m) = texts_m[nofcells] := textext.d(m) ; enddef ; -def step_text_bot (expr b) = texts_b[nofcells] := textext.d(b) ; enddef ; +% maybe: texbox.d + +def step_cell_top (expr t, c, f, l, s) = + cells_t[nofcells] := texbox.d(chart_category,t) ; + cell_top_colors[nofcells] := c ; + cell_top_fills [nofcells] := f ; + cell_top_lines [nofcells] := l ; + cell_top_shapes[nofcells] := s ; +enddef ; + +def step_cell_bot (expr b, c, f, l, s) = + cells_b[nofcells] := texbox.d(chart_category,b) ; + cell_bot_colors[nofcells] := c ; + cell_bot_fills [nofcells] := f ; + cell_bot_lines [nofcells] := l ; + cell_bot_shapes[nofcells] := s ; +enddef ; + +def step_cell_ali (expr ca, cb, cc, c, f, l, s) = + cells_a[nofcells][1] := texbox.d(chart_category,ca) ; + cells_a[nofcells][2] := texbox.d(chart_category,cb) ; + cells_a[nofcells][3] := texbox.d(chart_category,cc) ; + cell_top_colors[nofcells] := c ; + cell_top_fills [nofcells] := f ; + cell_top_lines [nofcells] := l ; + cell_top_shapes[nofcells] := s ; +enddef ; + +def step_text_top (expr t, tc, tf, tl, ts, lc, ll, ls) = + texts_t[nofcells] := texbox.d(chart_category,t) ; + text_top_colors[nofcells] := tc ; + text_top_fills [nofcells] := tf ; + text_top_lines [nofcells] := tl ; + text_top_shapes[nofcells] := ts ; + line_top_colors[nofcells] := lc ; + line_top_lines [nofcells] := ll ; + line_top_shapes[nofcells] := ls ; +enddef ; + +def step_text_mid (expr m, tc, tf, tl, ts, lc, ll, ls) = + texts_m[nofcells] := texbox.d(chart_category,m) ; + text_mid_colors[nofcells] := tc ; + text_mid_fills [nofcells] := tf ; + text_mid_lines [nofcells] := tl ; + text_mid_shapes[nofcells] := ts ; + line_mid_colors[nofcells] := lc ; + line_mid_lines [nofcells] := ll ; + line_mid_shapes[nofcells] := ls ; +enddef ; + +def step_text_bot (expr b, tc, tf, tl, ts, lc, ll, ls) = + texts_b[nofcells] := texbox.d(chart_category,b) ; + text_bot_colors[nofcells] := tc ; + text_bot_fills [nofcells] := tf ; + text_bot_lines [nofcells] := tl ; + text_bot_shapes[nofcells] := ts ; + line_bot_colors[nofcells] := lc ; + line_bot_lines [nofcells] := ll ; + line_bot_shapes[nofcells] := ls ; +enddef ; def step_begin_chart = begingroup ; @@ -93,6 +151,44 @@ def step_begin_chart = save nofcells ; numeric nofcells ; nofcells := 0 ; save cells_t, cells_m, cells_b ; picture cells_t[], cells_m[], cells_b[] ; save texts_t, texts_m, texts_b ; picture texts_t[], texts_m[], texts_b[] ; + save start_t, start_m, start_b ; numeric start_t[], start_m[], start_b[] ; + save cells_a ; picture cells_a[][] ; + + save cell_top_colors ; color cell_top_colors[] ; + save cell_bot_colors ; color cell_bot_colors[] ; + save text_top_colors ; color text_top_colors[] ; + save text_mid_colors ; color text_mid_colors[] ; + save text_bot_colors ; color text_bot_colors[] ; + + save cell_top_fills ; color cell_top_fills[] ; + save cell_bot_fills ; color cell_bot_fills[] ; + save text_top_fills ; color text_top_fills[] ; + save text_mid_fills ; color text_mid_fills[] ; + save text_bot_fills ; color text_bot_fills[] ; + + save cell_top_lines ; numeric cell_top_lines[] ; + save cell_bot_lines ; numeric cell_bot_lines[] ; + save text_top_lines ; numeric text_top_lines[] ; + save text_mid_lines ; numeric text_mid_lines[] ; + save text_bot_lines ; numeric text_bot_lines[] ; + + save cell_top_shapes ; numeric cell_top_shapes[] ; + save cell_bot_shapes ; numeric cell_bot_shapes[] ; + save text_top_shapes ; numeric text_top_shapes[] ; + save text_mid_shapes ; numeric text_mid_shapes[] ; + save text_bot_shapes ; numeric text_bot_shapes[] ; + + save line_top_lines ; numeric line_top_lines[] ; + save line_mid_lines ; numeric line_mid_lines[] ; + save line_bot_lines ; numeric line_bot_lines[] ; + + save line_top_colors ; color line_top_colors[] ; + save line_mid_colors ; color line_mid_colors[] ; + save line_bot_colors ; color line_bot_colors[] ; + + save line_top_shapes ; numeric line_top_shapes[] ; + save line_mid_shapes ; numeric line_mid_shapes[] ; + save line_bot_shapes ; numeric line_bot_shapes[] ; enddef ; def step_end_chart = @@ -106,6 +202,7 @@ def step_end_chart = save height_t, width_t, max_height_t, max_width_t ; numeric height_t, width_t, max_height_t, max_width_t ; save height_m, width_m, max_height_m, max_width_m ; numeric height_m, width_m, max_height_m, max_width_m ; save height_b, width_b, max_height_b, max_width_b ; numeric height_b, width_b, max_height_b, max_width_b ; + save alternative ; numeric alternative ; % check rows one_row_only := true ; for i=1 upto nofcells : @@ -113,18 +210,43 @@ def step_end_chart = one_row_only := false ; fi ; endfor ; + % + if chart_align : + save size, delta, width ; numeric size[], delta[], width[] ; + for i=1 upto 3: + size[i] = 0 ; + for c=1 upto nofcells : + size[i] := max(size[i],bbwidth(cells_a[c][i])) ; + endfor ; + endfor ; + for c=1 upto nofcells : + cells_t[c] := image ( + for i=1 upto 3: + width[i] := bbwidth(cells_a[c][i]); + delta[i] := size[i] - width[i] ; + endfor; + setbounds cells_a[c][1] to boundingbox(cells_a[c][1]) leftenlarged (delta[1]) ; + setbounds cells_a[c][2] to boundingbox(cells_a[c][2]) leftenlarged (delta[2]/2) + rightenlarged(delta[2]/2) ; + setbounds cells_a[c][3] to boundingbox(cells_a[c][3]) rightenlarged(delta[3]) ; + cells_a[c][1] := cells_a[c][1] shifted (- width[1]/2 - size[2]/2 - text_distance_set,0) ; + cells_a[c][3] := cells_a[c][3] shifted ( width[3]/2 + size[2]/2 + text_distance_set,0) ; + for i=1 upto 3: + draw cells_a[c][i] ; + % draw boundingbox cells_a[c][i] ; + endfor ; + ) ; + endfor ; + fi ; % swap and rotate if chart_vertical : if one_row_only : % deal with mid_texts max_width_t := max_width_m := max_width_b := 0 ; for i=1 upto nofcells : - width_t := bbwidth(texts_t[i]) ; - width_m := bbwidth(texts_m[i]) ; - width_b := bbwidth(texts_b[i]) ; - if width_t > max_width_t : max_width_t := width_t fi ; - if width_m > max_width_m : max_width_m := width_m fi ; - if width_b > max_width_b : max_width_b := width_b fi ; + max_width_t := max(max_width_t,bbwidth(texts_t[i])); + max_width_m := max(max_width_m,bbwidth(texts_m[i])); + max_width_b := max(max_width_b,bbwidth(texts_b[i])); endfor ; if max_width_m > 0 : for i=1 upto nofcells : @@ -132,14 +254,17 @@ def step_end_chart = text_m := texts_m[i] ; width_m := bbwidth(text_m) ; text_b := texts_b[i] ; width_b := bbwidth(text_b) ; if width_t < max_width_t : - setbounds text_t to boundingbox text_t leftenlarged (max_width_t - width_t) ; + setbounds text_t to boundingbox text_t + leftenlarged (max_width_t - width_t) ; fi ; if width_m < max_width_m : - setbounds text_m to boundingbox text_m leftenlarged ((max_width_m - width_m)/2) ; - setbounds text_m to boundingbox text_m rightenlarged ((max_width_m - width_m)/2) ; + setbounds text_m to boundingbox text_m + leftenlarged ((max_width_m - width_m)/2) + rightenlarged ((max_width_m - width_m)/2) ; fi ; if width_b < max_width_b : - setbounds text_b to boundingbox text_b rightenlarged (max_width_b - width_b) ; + setbounds text_b to boundingbox text_b + rightenlarged (max_width_b - width_b) ; fi ; text_t := text_t shifted (- xpart llcorner text_t, 0) ; text_m := text_m shifted (- xpart llcorner text_m, 0) ; @@ -161,6 +286,7 @@ def step_end_chart = fi ; else : for i=1 upto nofcells : + % swaps so we need a scratch variable cell_t := cells_t[i] ; cell_b := cells_b[i] ; cells_t[i] := cell_b rotated 90 ; @@ -174,39 +300,31 @@ def step_end_chart = fi ; % align horizontal for i=1 upto nofcells : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - width_t := bbwidth(cell_t) ; - width_b := bbwidth(cell_b) ; + width_t := bbwidth(cells_t[i]) ; + width_b := bbwidth(cells_b[i]) ; if (width_t = 0) and (width_b = 0) : % skip elseif (width_t > 0) and (width_t < width_b) : delta := (width_b-width_t)/2 ; - setbounds cell_t to boundingbox cell_t leftenlarged delta rightenlarged delta ; - cells_t[i] := cell_t ; + setbounds cells_t[i] to boundingbox cells_t[i] leftenlarged delta rightenlarged delta ; elseif (width_b > 0) and (width_t > width_b) : delta := (width_t-width_b)/2 ; - setbounds cell_b to boundingbox cell_b leftenlarged delta rightenlarged delta ; - cells_b[i] := cell_b ; + setbounds cells_b[i] to boundingbox cells_b[i] leftenlarged delta rightenlarged delta ; fi ; endfor ; % analyze vertical max_height_t := 0 ; max_height_b := 0 ; for i=1 upto nofcells : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - height_t := bbheight(cell_t) ; - height_b := bbheight(cell_b) ; + height_t := bbheight(cells_t[i]) ; + height_b := bbheight(cells_b[i]) ; if height_t > 0 : - setbounds cell_t to boundingbox cell_t enlarged cell_offset ; + setbounds cells_t[i] to boundingbox cells_t[i] enlarged cell_offset ; height_t := height_t + 2 * cell_offset ; - cells_t[i] := cell_t ; fi ; if height_b > 0 : - setbounds cell_b to boundingbox cell_b enlarged cell_offset ; + setbounds cells_b[i] to boundingbox cells_b[i] enlarged cell_offset ; height_b := height_b + 2 * cell_offset ; - cells_b[i] := cell_b ; fi ; if height_t > max_height_t : max_height_t := height_t ; @@ -217,34 +335,24 @@ def step_end_chart = endfor ; % align vertical for i=1 upto nofcells : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - height_t := bbheight(cell_t) ; - height_b := bbheight(cell_b) ; + height_t := bbheight(cells_t[i]) ; + height_b := bbheight(cells_b[i]) ; if height_t > 0 : delta := (max_height_t-height_t)/2 ; - setbounds cell_t to boundingbox cell_t topenlarged delta bottomenlarged delta ; + setbounds cells_t[i] to boundingbox cells_t[i] topenlarged delta bottomenlarged delta ; fi ; if height_b > 0 : delta := (max_height_b-height_b)/2 ; - setbounds cell_b to boundingbox cell_b topenlarged delta bottomenlarged delta ; + setbounds cells_b[i] to boundingbox cells_b[i] topenlarged delta bottomenlarged delta ; fi ; - cells_t[i] := cell_t ; - cells_b[i] := cell_b ; endfor ; % position dx := 0 ; for i=1 upto nofcells : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - cell_t := cell_t shifted -llcorner cell_t ; - cell_b := cell_b shifted -llcorner cell_b ; - cell_t := cell_t shifted (dx, 0) ; - cell_b := cell_b shifted (dx,-cell_distance_y-max_height_b) ; - cells_t[i] := cell_t ; - cells_b[i] := cell_b ; - width_t := bbwidth(cell_t) ; - width_b := bbwidth(cell_b) ; + cells_t[i] := cells_t[i] shifted -llcorner cells_t[i] shifted (dx, 0) ; + cells_b[i] := cells_b[i] shifted -llcorner cells_b[i] shifted (dx,-cell_distance_y-max_height_b) ; + width_t := bbwidth(cells_t[i]) ; + width_b := bbwidth(cells_b[i]) ; if width_t > 0 : dx := dx + cell_distance_x + width_t ; elseif width_b > 0 : @@ -253,19 +361,27 @@ def step_end_chart = endfor ; % flush for i=1 upto nofcells : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - width_t := bbwidth(cell_t) ; - width_b := bbwidth(cell_b) ; + width_t := bbwidth(cells_t[i]) ; + width_b := bbwidth(cells_b[i]) ; if width_t > 0 : - fill boundingbox cell_t withcolor cell_fill_color ; - draw boundingbox cell_t withpen pencircle scaled cell_line_width withcolor cell_line_color ; - draw cell_t ; + drawpredefinedshape ( + if known cell_top_shapes[i] : cell_top_shapes[i] else : 24 fi, + cells_t[i], + if known cell_top_lines [i] : cell_top_lines [i] else : cell_line_width fi, + if known cell_top_colors[i] : cell_top_colors[i] else : cell_line_color fi, + if known cell_top_fills [i] : cell_top_fills [i] else : cell_fill_color fi + ) ; + draw cells_t[i] ; fi ; if width_b > 0 : - fill boundingbox cell_b withcolor cell_fill_color ; - draw boundingbox cell_b withpen pencircle scaled cell_line_width withcolor cell_line_color ; - draw cell_b ; + drawpredefinedshape ( + if known cell_bot_shapes[i] : cell_bot_shapes[i] else : 24 fi, + cells_b[i], + if known cell_bot_lines [i] : cell_bot_lines [i] else : cell_line_width fi, + if known cell_bot_colors[i] : cell_bot_colors[i] else : cell_line_color fi, + if known cell_bot_fills [i] : cell_bot_fills [i] else : cell_fill_color fi + ) ; + draw cells_b[i] ; fi ; endfor ; % @@ -273,54 +389,58 @@ def step_end_chart = def midbottomboundary expr p = 0.5[llcorner boundingbox p, lrcorner boundingbox p] enddef ; % draw top and bottom text boxes for i=1 upto nofcells-1 : - text_t := texts_t[i] ; - text_b := texts_b[i] ; - if bbwidth(text_t) > 0 : - setbounds text_t to boundingbox text_t enlarged text_offset ; - texts_t[i] := text_t ; + if bbwidth(texts_t[i]) > 0 : + setbounds texts_t[i] to boundingbox texts_t[i] enlarged text_offset ; fi ; - if bbwidth(text_b) > 0 : - setbounds text_b to boundingbox text_b enlarged text_offset ; - texts_b[i] := text_b ; + if bbwidth(texts_b[i]) > 0 : + setbounds texts_b[i] to boundingbox texts_b[i] enlarged text_offset ; fi ; endfor ; % arrows for i=1 upto nofcells-1 : - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - next_t := cells_t[i+1] ; - next_b := cells_b[i+1] ; pair t_a, t_b, t_c, b_a, b_b, b_c ; - t_a := midtopboundary cell_t ; - t_b := midtopboundary next_t ; - t_c := (xpart 0.5[t_a,t_b], ypart t_a+line_height+line_distance) ; + t_a := midtopboundary cells_t[i] ; + t_b := midtopboundary cells_t[i+1] ; if one_row_only : - b_a := midbottomboundary cell_t ; - b_b := midbottomboundary next_t ; + b_a := midbottomboundary cells_t[i] ; + b_b := midbottomboundary cells_t[i+1] ; else : - b_a := midbottomboundary cell_b ; - b_b := midbottomboundary next_b ; + b_a := midbottomboundary cells_b[i] ; + b_b := midbottomboundary cells_b[i+1] ; fi ; + t_c := (xpart 0.5[t_a,t_b], ypart t_a+line_height+line_distance) ; b_c := (xpart 0.5[b_a,b_b], ypart b_a-line_height-line_distance) ; texts_t[i] := thelabel.top(texts_t[i],t_c) ; texts_b[i] := thelabel.bot(texts_b[i],b_c) ; endfor ; % for i=1 upto nofcells-1 : % todo arrows when empty text - cell_t := cells_t[i] ; - cell_b := cells_b[i] ; - next_t := cells_t[i+1] ; - next_b := cells_b[i+1] ; text_t := texts_t[i] ; text_b := texts_b[i] ; + cell_t := cells_t[start_t[i]] ; + cell_b := cells_b[start_b[i]] ; + next_t := cells_t[i+1] ; + next_b := cells_b[i+1] ; if bbwidth(text_t) > 0 : if bbwidth(cell_t) > 0 : - drawarrow midtopboundary cell_t - shifted (if i > 1 : line_offset else : 0 fi, cell_line_width) {up} .. - midbottomboundary text_t shifted (0,-line_distance) .. - {down} midtopboundary next_t shifted(if i < nofcells - 1 : -line_offset else : 0 fi,cell_line_width) - withpen pencircle scaled line_line_width - withcolor line_line_color ; + alternative := if known line_top_shapes[i] : line_top_shapes[i] else : 1 fi ; + if (alternative = 1) or (alternative = 2) : drawarrow else : draw fi + midtopboundary cell_t + shifted (if i > 1 : line_offset else : 0 fi, cell_line_width) {up} .. + midbottomboundary text_t + shifted (0,-line_distance) .. + {down} midtopboundary next_t + shifted (if i < nofcells - 1 : -line_offset else : 0 fi,cell_line_width) + if (alternative = 2) or (alternative = 4) : + dashed evenly scaled ( + if known line_top_lines [i] : line_top_lines [i] else : line_line_width fi + ) + fi + withpen pencircle scaled + if known line_top_lines [i] : line_top_lines [i] else : line_line_width fi + withcolor + if known line_top_colors[i] : line_top_colors[i] else : line_line_color fi + ; else : fi ; fi ; @@ -330,29 +450,49 @@ def step_end_chart = next_b := next_t ; fi ; if bbwidth(cell_b) > 0 : - drawarrow midbottomboundary cell_b - shifted (if i > 1 : line_offset else : 0 fi, -cell_line_width) {down} .. - midtopboundary text_b shifted (0, line_distance) .. - {up} midbottomboundary next_b shifted (if i < nofcells - 1 : -line_offset else : 0 fi,-cell_line_width) - withpen pencircle scaled line_line_width - withcolor line_line_color ; + alternative := if known line_bot_shapes[i] : line_bot_shapes[i] else : 1 fi ; + if (alternative = 1) or (alternative = 2) : drawarrow else : draw fi + midbottomboundary cell_b + shifted (if i > 1 : line_offset else : 0 fi, -cell_line_width) {down} .. + midtopboundary text_b + shifted (0, line_distance) .. + {up} midbottomboundary next_b + shifted (if i < nofcells - 1 : -line_offset else : 0 fi,-cell_line_width) + if (alternative = 2) or (alternative = 4) : + dashed evenly scaled ( + if known line_top_lines [i] : line_top_lines [i] else : line_line_width fi + ) + fi + withpen pencircle scaled + if known line_bot_lines [i] : line_bot_lines [i] else : line_line_width fi + withcolor + if known line_bot_colors[i] : line_bot_colors[i] else : line_line_color fi + ; else : fi ; fi ; endfor ; % draw top and bottom text boxes for i=1 upto nofcells-1 : - text_t := texts_t[i] ; - text_b := texts_b[i] ; - if bbwidth(text_t) > 0 : - fill boundingbox text_t withcolor text_fill_color ; - draw boundingbox text_t withpen pencircle scaled text_line_width withcolor text_line_color ; - draw text_t ; + if bbwidth(texts_t[i]) > 0 : + drawpredefinedshape ( + if known text_top_shapes[i] : text_top_shapes[i] else : 24 fi, + texts_t[i], + if known text_top_lines [i] : text_top_lines [i] else : text_line_width fi, + if known text_top_colors[i] : text_top_colors[i] else : text_line_color fi, + if known text_top_fills [i] : text_top_fills [i] else : text_fill_color fi + ) ; + draw texts_t[i] ; fi ; - if bbwidth(text_b) > 0 : - fill boundingbox text_b withcolor text_fill_color ; - draw boundingbox text_b withpen pencircle scaled text_line_width withcolor text_line_color ; - draw text_b ; + if bbwidth(texts_b[i]) > 0 : + drawpredefinedshape ( + if known text_bot_shapes[i] : text_bot_shapes[i] else : 24 fi, + texts_b[i], + if known text_bot_lines [i] : text_bot_lines [i] else : text_line_width fi, + if known text_bot_colors[i] : text_bot_colors[i] else : text_line_color fi, + if known text_bot_fills [i] : text_bot_fills [i] else : text_fill_color fi + ) ; + draw texts_b[i] ; fi ; endfor ; if chart_vertical : @@ -362,6 +502,8 @@ def step_end_chart = endgroup ; enddef ; +% no longer working .. will do someday +% % start_begin_step ; % step_cells ("\strut test 0", "\strut test 0") ; % step_cells ("\strut test 1", "\vbox{\hsize3cm \strut oeps 1\crlf oeps 1}") ; diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index 40d367008..afc64eca9 100644 --- a/scripts/context/lua/mtx-fonts.lua +++ b/scripts/context/lua/mtx-fonts.lua @@ -15,7 +15,7 @@ local nameonly, basename, joinpath, collapsepath = file.nameonly, file.basename, local lower = string.lower local otfversion = 2.826 -local otlversion = 3.024 +local otlversion = 3.025 local helpinfo = [[ diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 91591b038..f6f778254 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/mkiv/char-enc.lua b/tex/context/base/mkiv/char-enc.lua index c2061891a..f4f9fb95a 100644 --- a/tex/context/base/mkiv/char-enc.lua +++ b/tex/context/base/mkiv/char-enc.lua @@ -162,7 +162,6 @@ characters.synonyms = allocate { -- afm mess -- if not enccodes[name] then enccodes[name] = unicode end -- end -- --- -- end -- -- storage.register("characters.enccodes", characters.enccodes, "characters.enccodes") diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 89a6d4c7f..3f90812a0 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{2016.06.20 22:14} +\newcontextversion{2016.06.25 14:38} %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/context.mkiv b/tex/context/base/mkiv/context.mkiv index dd869f035..a59a31463 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.06.20 22:14} +\edef\contextversion{2016.06.25 14:38} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-age.lua b/tex/context/base/mkiv/font-age.lua index bb6883a74..b20a57538 100644 --- a/tex/context/base/mkiv/font-age.lua +++ b/tex/context/base/mkiv/font-age.lua @@ -12,7 +12,7 @@ if context then os.exit() end -return { -- generated: inspect(fonts.encodings.agl.unicodes) +return { ["A"]=65, ["AE"]=198, ["AEacute"]=508, @@ -1527,6 +1527,7 @@ return { -- generated: inspect(fonts.encodings.agl.unicodes) ["dotbelowcomb"]=803, ["dotkatakana"]=12539, ["dotlessi"]=305, + ["dotlessj"]=567, ["dotlessjstrokehook"]=644, ["dotmath"]=8901, ["dottedcircle"]=9676, diff --git a/tex/context/base/mkiv/font-agl.lua b/tex/context/base/mkiv/font-agl.lua index dd3490523..ec6c519ee 100644 --- a/tex/context/base/mkiv/font-agl.lua +++ b/tex/context/base/mkiv/font-agl.lua @@ -631,6 +631,8 @@ local extras = allocate { -- private extensions spade = 0x2660, theta1 = 0x03D1, twodotenleader = 0x2025, + + dotlessj = 0x0237, } -- We load this table only when needed. We could use a loading mechanism diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index 6139b8911..9a6f3f84d 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -259,17 +259,19 @@ local psfake = 0 local function fixedpsname(psname,fallback) local usedname = psname - if not psname or psname == "" then + if psname and psname ~= "" then + if find(psname," ") then + usedname = gsub(psname,"[%s]+","-") + else + -- we assume that the name is sane enough (we might sanitize completely some day) + end + elseif not fallback or fallback == "" then + psfake = psfake + 1 + psname = "fakename-" .. psfake + else -- filenames can be a mess so we do a drastic cleanup psname = fallback usedname = gsub(psname,"[^a-zA-Z0-9]+","-") - elseif find(psname," ") then - -- we assume that the name is sane enough (we might sanitize completely some day) - usedname = gsub(psname,"[%s]+","-") - end - if not psname or psname == "" then - psfake = psfake + 1 - psname = "fakename-" .. psfake end return usedname, psname ~= usedname end diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua index 36511743a..49d5929f6 100644 --- a/tex/context/base/mkiv/font-dsp.lua +++ b/tex/context/base/mkiv/font-dsp.lua @@ -224,10 +224,15 @@ local function readcoverage(f,offset,simple) return coverage end -local function readclassdef(f,offset) +local function readclassdef(f,offset,preset) setposition(f,offset) local classdefformat = readushort(f) local classdef = { } + if type(preset) == "number" then + for k=0,preset-1 do + classdef[k] = 1 + end + end if classdefformat == 1 then local index = readushort(f) local nofclassdef = readushort(f) @@ -249,6 +254,13 @@ local function readclassdef(f,offset) else report("unknown classdef format %a ",classdefformat) end + if type(preset) == "table" then + for k in next, preset do + if not classdef[k] then + classdef[k] = 1 + end + end + end return classdef end @@ -459,7 +471,7 @@ local function unchainedcontext(f,fontdata,lookupid,lookupoffset,offset,glyphs,n local rules = { } if subclasssets then coverage = readcoverage(f,tableoffset + coverage) - currentclassdef = readclassdef(f,tableoffset + currentclassdef) + currentclassdef = readclassdef(f,tableoffset + currentclassdef,coverage) local currentclasses = classtocoverage(currentclassdef,fontdata.glyphs) for class=1,#subclasssets do local offset = subclasssets[class] @@ -588,9 +600,9 @@ local function chainedcontext(f,fontdata,lookupid,lookupoffset,offset,glyphs,nof local rules = { } if subclasssets then local coverage = readcoverage(f,tableoffset + coverage) - local beforeclassdef = readclassdef(f,tableoffset + beforeclassdef) - local currentclassdef = readclassdef(f,tableoffset + currentclassdef) - local afterclassdef = readclassdef(f,tableoffset + afterclassdef) + local beforeclassdef = readclassdef(f,tableoffset + beforeclassdef,nofglyphs) + local currentclassdef = readclassdef(f,tableoffset + currentclassdef,coverage) + local afterclassdef = readclassdef(f,tableoffset + afterclassdef,nofglyphs) local beforeclasses = classtocoverage(beforeclassdef,fontdata.glyphs) local currentclasses = classtocoverage(currentclassdef,fontdata.glyphs) local afterclasses = classtocoverage(afterclassdef,fontdata.glyphs) @@ -1014,8 +1026,8 @@ function gposhandlers.pair(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofgly local nofclasses2 = readushort(f) -- incl class 0 local classlist = readpairclasssets(f,nofclasses1,nofclasses2,format1,format2) coverage = readcoverage(f,tableoffset+coverage) - classdef1 = readclassdef(f,tableoffset+classdef1) - classdef2 = readclassdef(f,tableoffset+classdef2) + classdef1 = readclassdef(f,tableoffset+classdef1,coverage) + classdef2 = readclassdef(f,tableoffset+classdef2,nofglyphs) local usedcoverage = { } for g1, c1 in next, classdef1 do if coverage[g1] then diff --git a/tex/context/base/mkiv/font-enc.lua b/tex/context/base/mkiv/font-enc.lua index 2e8b722de..ba957bdf2 100644 --- a/tex/context/base/mkiv/font-enc.lua +++ b/tex/context/base/mkiv/font-enc.lua @@ -20,7 +20,7 @@ them in tables. But we may do so some day, for consistency.

local report_encoding = logs.reporter("fonts","encoding") -local encodings = { } +local encodings = fonts.encodings or { } fonts.encodings = encodings encodings.version = 1.03 @@ -79,6 +79,7 @@ function encodings.load(filename) local ok, encoding, size = resolvers.loadbinfile(foundname) if ok and encoding then encoding = gsub(encoding,"%%(.-)\n","") + local unicoding = fonts.encodings.agl.unicodes local tag, vec = match(encoding,"/(%w+)%s*%[(.*)%]%s*def") local i = 0 for ch in gmatch(vec,"/([%a%d%.]+)") do @@ -89,8 +90,9 @@ function encodings.load(filename) else -- duplicate, play safe for tex ligs and take first end - if enccodes[ch] then - unicodes[enccodes[ch]] = i + local u = unicoding[ch] or enccodes[ch] -- enccodes have also context names + if u then + unicodes[u] = i end end i = i + 1 diff --git a/tex/context/base/mkiv/font-mis.lua b/tex/context/base/mkiv/font-mis.lua index 7278f283f..f90247c89 100644 --- a/tex/context/base/mkiv/font-mis.lua +++ b/tex/context/base/mkiv/font-mis.lua @@ -21,7 +21,7 @@ local readers = otf.readers if readers then - otf.version = otf.version or 3.024 + otf.version = otf.version or 3.025 otf.cache = otf.cache or containers.define("fonts", "otl", otf.version, true) function fonts.helpers.getfeatures(name,save) diff --git a/tex/context/base/mkiv/font-otl.lua b/tex/context/base/mkiv/font-otl.lua index 6eb12cdcf..a35db5b0a 100644 --- a/tex/context/base/mkiv/font-otl.lua +++ b/tex/context/base/mkiv/font-otl.lua @@ -53,7 +53,7 @@ local report_otf = logs.reporter("fonts","otf loading") local fonts = fonts local otf = fonts.handlers.otf -otf.version = 3.024 -- beware: also sync font-mis.lua and in mtx-fonts +otf.version = 3.025 -- beware: also sync font-mis.lua and in mtx-fonts otf.cache = containers.define("fonts", "otl", otf.version, true) otf.svgcache = containers.define("fonts", "svg", otf.version, true) otf.pdfcache = containers.define("fonts", "pdf", otf.version, true) diff --git a/tex/context/base/mkiv/luat-fio.lua b/tex/context/base/mkiv/luat-fio.lua index 2b083b582..302d17a66 100644 --- a/tex/context/base/mkiv/luat-fio.lua +++ b/tex/context/base/mkiv/luat-fio.lua @@ -92,16 +92,16 @@ if not resolvers.instance then register('find_vf_file' , function(name) return findbinfile(name,"vf") end, true) register('find_cidmap_file' , function(name) return findbinfile(name,"cidmap") end, true) - register('read_data_file' , function(file) return loadbinfile(file,"tex") end, true) - register('read_enc_file' , function(file) return loadbinfile(file,"enc") end, true) - register('read_font_file' , function(file) return loadbinfile(file,"tfm") end, true) + register('read_data_file' , function(file) return loadbinfile(file,"tex") end, true) + register('read_enc_file' , function(file) return loadbinfile(file,"enc") end, true) + register('read_font_file' , function(file) return loadbinfile(file,"tfm") end, true) -- format -- image - register('read_map_file' , function(file) return loadbinfile(file,"map") end, true) + register('read_map_file' , function(file) return loadbinfile(file,"map") end, true) -- output - register('read_pk_file' , function(file) return loadbinfile(file,"pk") end, true) -- 600dpi/manfnt.720pk - register('read_sfd_file' , function(file) return loadbinfile(file,"sfd") end, true) - register('read_vf_file' , function(file) return loadbinfile(file,"vf" ) end, true) + register('read_pk_file' , function(file) return loadbinfile(file,"pk") end, true) -- 600dpi/manfnt.720pk + register('read_sfd_file' , function(file) return loadbinfile(file,"sfd") end, true) + register('read_vf_file' , function(file) return loadbinfile(file,"vf" ) end, true) -- register('find_font_file' , function(name) return findbinfile(name,"ofm") end, true) -- register('find_vf_file' , function(name) return findbinfile(name,"ovf") end, true) diff --git a/tex/context/base/mkiv/lxml-aux.lua b/tex/context/base/mkiv/lxml-aux.lua index abe36837e..9a829795d 100644 --- a/tex/context/base/mkiv/lxml-aux.lua +++ b/tex/context/base/mkiv/lxml-aux.lua @@ -257,7 +257,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d = p.dt - d[e.ni] = copiedelement(element,p) + local n = e.ni + local t = copiedelement(element,p) + if type(t) == "table" then + d[n] = t[1] + for i=2,#t do + n = n + 1 + insert(d,n,t[i]) + end + else + d[n] = t + end redo_ni(d) -- probably not needed end end diff --git a/tex/context/base/mkiv/lxml-ini.mkiv b/tex/context/base/mkiv/lxml-ini.mkiv index 6fa14ddfc..bf641f10b 100644 --- a/tex/context/base/mkiv/lxml-ini.mkiv +++ b/tex/context/base/mkiv/lxml-ini.mkiv @@ -310,6 +310,16 @@ \unexpanded\def\xmlinstalldirective#1#2% {\clf_xmlinstalldirective{#1}{\csstring#2}} +% an example: + +% + +\appendtoks + \xmlinstalldirective{tex}{xmltexcommand}% +\to \everyjob + +\def\xmltexcommand#1{\begincsname#1\endcsname} + % \def\xmlcontextdirective#1% kind class key value % {\executeifdefined{xml#1directive}\gobblethreearguments} diff --git a/tex/context/base/mkiv/lxml-tab.lua b/tex/context/base/mkiv/lxml-tab.lua index 3c386b7a3..209dec7f9 100644 --- a/tex/context/base/mkiv/lxml-tab.lua +++ b/tex/context/base/mkiv/lxml-tab.lua @@ -1243,17 +1243,15 @@ generic table copier. Since we know what we're dealing with we can speed up things a bit. The second argument is not to be used!

--ldx]]-- --- local function copy(old,tables) +-- local function copy(old) -- if old then --- if not tables then --- tables = { } --- end -- local new = { } --- if not tables[old] then --- tables[old] = new --- end -- for k,v in next, old do --- new[k] = (type(v) == "table" and (tables[v] or copy(v, tables))) or v +-- if type(v) == "table" then +-- new[k] = table.copy(v) +-- else +-- new[k] = v +-- end -- end -- local mt = getmetatable(old) -- if mt then @@ -1264,15 +1262,27 @@ can speed up things a bit. The second argument is not to be used!

-- return { } -- end -- end +-- +-- We need to prevent __p__ recursio, so: -local function copy(old) +local function copy(old,p) if old then local new = { } - for k,v in next, old do - if type(v) == "table" then - new[k] = table.copy(v) - else + for k, v in next, old do + local t = type(v) == "table" + if k == "at" then + local t = { } + for k, v in next, v do + t[k] = v + end + new[k] = t + elseif k == "dt" then + v.__p__ = nil + v = copy(v,new) new[k] = v + v.__p__ = p + else + new[k] = v -- so we also share entities, etc in root end end local mt = getmetatable(old) diff --git a/tex/context/base/mkiv/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua index 026cf520d..eb7d15de8 100644 --- a/tex/context/base/mkiv/lxml-tex.lua +++ b/tex/context/base/mkiv/lxml-tex.lua @@ -2206,7 +2206,11 @@ local pattern = P("context-") * C((1-patterns.whitespace)^1) * C(P(1)^1) function lxml.applyselectors(id) local root = getid(id) local function filter(e) - local dt = e.dt + local dt = e.dt + if not dt then + report_lxml("error in selector, no data in %a",e.tg or "?") + return + end local ndt = #dt local done = false local i = 1 @@ -2312,7 +2316,7 @@ function lxml.applyselectors(id) end end end - else + elseif dti then filter(dti) end end diff --git a/tex/context/base/mkiv/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv index f9ac1e877..209d7a0fd 100644 --- a/tex/context/base/mkiv/math-ali.mkiv +++ b/tex/context/base/mkiv/math-ali.mkiv @@ -114,6 +114,14 @@ \the\mathdisplayaligntweaks \tabskip\centering} +\def\math_halign_checked + {\halign + \ifnum\c_strc_formulas_mode=\plustwo + % currently there is no need for width juggling + \else + \ifcase\eqalignmode \or to \checkeddisplaywidth \fi + \fi} + \def\math_both_eqalign_no_normal#1#2% {\ifmmode \the\mathdisplayaligntweaks @@ -123,7 +131,7 @@ \let\math_finish_eqalign_no\relax \fi #1% - \halign \ifcase\eqalignmode \or to \checkeddisplaywidth \fi \expandafter {\the\scratchtoks\crcr#2\crcr}% + \math_halign_checked\expandafter\bgroup\the\scratchtoks\crcr#2\crcr\egroup \math_finish_eqalign_no} \def\math_both_eqalign_no_aligned#1% @@ -139,7 +147,7 @@ \fi \fi #1% - \halign \ifcase\eqalignmode \or to \checkeddisplaywidth \fi \expandafter \bgroup\the\scratchtoks\crcr} + \math_halign_checked\expandafter\bgroup\the\scratchtoks\crcr} \def\math_rlap#1% {\setbox\scratchbox\hbox{#1}% diff --git a/tex/context/base/mkiv/math-vfu.lua b/tex/context/base/mkiv/math-vfu.lua index bba4112f0..2cfe0de10 100644 --- a/tex/context/base/mkiv/math-vfu.lua +++ b/tex/context/base/mkiv/math-vfu.lua @@ -563,6 +563,10 @@ function vfmath.addmissing(main,id,size) raise(main,characters,id,size,0x2032,0xFE325,1,id_of_smaller) -- prime raise(main,characters,id,size,0x2033,0xFE325,2,id_of_smaller) -- double prime raise(main,characters,id,size,0x2034,0xFE325,3,id_of_smaller) -- triple prime + -- to satisfy the prime resolver + characters[0xFE932] = characters[0x2032] + characters[0xFE933] = characters[0x2033] + characters[0xFE934] = characters[0x2034] end -- there are more (needs discussion first): diff --git a/tex/context/base/mkiv/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv index d0fff83df..c9b15c822 100644 --- a/tex/context/base/mkiv/meta-ini.mkiv +++ b/tex/context/base/mkiv/meta-ini.mkiv @@ -545,11 +545,9 @@ \fi} \def\MPrawvar#1#2% no checking - %{\csname\??graphicvariable#1:#2\endcsname} {\begincsname\??graphicvariable#1:#2\endcsname} \def\MPvariable#1% todo: could be a framed chain - %{\csname\??graphicvariable\currentmpvariableclass:#1\endcsname} {\begincsname\??graphicvariable\currentmpvariableclass:#1\endcsname} \unexpanded\def\useMPvariables diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index 5d30d38eb..d348981e7 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -356,9 +356,10 @@ end -- texts: -local factor = 65536*(7227/7200) -local textexts = nil -local mptriplet = mp.triplet +local factor = 65536*(7227/7200) +local textexts = nil +local mptriplet = mp.triplet +local nbdimensions = nodes.boxes.dimensions function mp.tt_initialize(tt) textexts = tt @@ -387,6 +388,12 @@ function mp.tt_dimensions(n) end end +function mp.tb_dimensions(category,name) + local w, h, d = nbdimensions(category,name) + mptriplet(w/factor,h/factor,d/factor) +end + + function mp.report(a,b) if b then report_message("%s : %s",a,b) diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua index 358bd9f52..42a2cf12a 100644 --- a/tex/context/base/mkiv/mlib-pps.lua +++ b/tex/context/base/mkiv/mlib-pps.lua @@ -931,6 +931,8 @@ local function cl_reset(t) t[#t+1] = metapost.colorinitializer() -- only color end +-- text + local function tx_reset() if top then -- why ? @@ -1083,6 +1085,37 @@ local function tx_process(object,prescript,before,after) end end +-- we could probably redo normal textexts in the next way but as it's rather optimized +-- we keep away from that (at least for now) + +local function bx_process(object,prescript,before,after) + local bx_category = prescript.bx_category + local bx_name = prescript.bx_name + if bx_category and bx_name then + if trace_textexts then + report_textexts("category %a, name %a",bx_category,bx_name) + end + local sx, rx, ry, sy, tx, ty = cm(object) -- needs to be frozen outside the function + local wd, ht, dp = nodes.boxes.dimensions(bx_category,bx_name) + before[#before+1] = function() + context.MPLIBgetboxscaledcm(bx_category,bx_name, + f_f(sx), -- bah ... %s no longer checks + f_f(rx), -- bah ... %s no longer checks + f_f(ry), -- bah ... %s no longer checks + f_f(sy), -- bah ... %s no longer checks + f_f(tx), -- bah ... %s no longer checks + f_f(ty), -- bah ... %s no longer checks + sxsy(wd,ht,dp)) + end + if not trace_textexts then + object.path = false -- else: keep it + end + object.color = false + object.grouped = true + object.istext = true + end +end + -- graphics (we use the given index because pictures can be reused) local graphics = { } @@ -1508,6 +1541,7 @@ appendaction(processoractions,"system",sh_process) -- (processoractions,"system",gt_process) appendaction(processoractions,"system",bm_process) appendaction(processoractions,"system",tx_process) +appendaction(processoractions,"system",bx_process) appendaction(processoractions,"system",ps_process) appendaction(processoractions,"system",fg_process) appendaction(processoractions,"system",tr_process) -- last, as color can be reset diff --git a/tex/context/base/mkiv/mlib-pps.mkiv b/tex/context/base/mkiv/mlib-pps.mkiv index cdccfc379..3a3ab2623 100644 --- a/tex/context/base/mkiv/mlib-pps.mkiv +++ b/tex/context/base/mkiv/mlib-pps.mkiv @@ -91,6 +91,33 @@ \smashbox\MPbox \box\MPbox} +% \putnextboxincache{hans}{1}\hbox{foo} +% +% \startMPcode +% draw boundingbox rawtexbox("hans",1) ; +% draw rawtexbox("hans",1) ; +% \stopMPcode + +\unexpanded\def\MPLIBgetboxscaledcm#1#2% + {\begingroup + \copyboxfromcache{#1}{#2}\MPtextbox % can be \clf_ + \MPLIBgetboxscaledcm_next} + +\unexpanded\def\MPLIBgetboxscaledcm_next#1#2#3#4#5#6#7#8% 1-6: sx,rx,ry,sy,tx,ty + {\setbox\MPbox\hpack\bgroup + \dotransformnextbox{#1}{#2}{#3}{#4}{#5}{#6}% + \vpack to \zeropoint\bgroup + \vss + \hpack to \zeropoint \bgroup + \fastsxsy{#7}{#8}{\raise\dp\MPtextbox\box\MPtextbox}% + \hss + \egroup + \egroup + \egroup + \smashbox\MPbox + \box\MPbox + \endgroup} + \unexpanded\def\MPLIBgraphictext#1% use at mp end {\startTEXpage[\c!scale=10000]#1\stopTEXpage} diff --git a/tex/context/base/mkiv/mtx-context-listing.tex b/tex/context/base/mkiv/mtx-context-listing.tex index 2deffd795..41e468e1f 100644 --- a/tex/context/base/mkiv/mtx-context-listing.tex +++ b/tex/context/base/mkiv/mtx-context-listing.tex @@ -82,6 +82,8 @@ mkii = "tex", cld = "lua", lfg = "lua", + mpiv = "mp", + mpii = "mp", } local pattern = document.arguments.pattern diff --git a/tex/context/base/mkiv/mtx-context-xml.tex b/tex/context/base/mkiv/mtx-context-xml.tex index 9d0680e2a..8e4d229f5 100644 --- a/tex/context/base/mkiv/mtx-context-xml.tex +++ b/tex/context/base/mkiv/mtx-context-xml.tex @@ -23,6 +23,8 @@ % --bodyfont=list : additional bodyfont settings % --paperformat=spec : paper*print or paperxprint % +% context --extra=xml --analyze path::i-context.xml +% context --extra=xml --analyze selfautoparent:texmf-context/tex/context/interface/mkiv/i-*.xml % end help \input mtx-context-common.tex @@ -50,8 +52,8 @@ \starttext \startluacode - local pattern = document.arguments.pattern local files = document.files + local pattern = document.arguments.pattern or (#files == 1 and files[1]) if pattern then files = dir.glob(pattern) diff --git a/tex/context/base/mkiv/mult-aux.mkiv b/tex/context/base/mkiv/mult-aux.mkiv index d44c0242e..a64e09305 100644 --- a/tex/context/base/mkiv/mult-aux.mkiv +++ b/tex/context/base/mkiv/mult-aux.mkiv @@ -584,6 +584,11 @@ {\installbasicparameterhandler{#1}{#2}% \installautosetuphandler {#1}{#2}} +\unexpanded\def\installstylisticautosetuphandler#1#2#3% \??self name \??parent (can be \??self) + {\installbasicparameterhandler{#1}{#2}% + \installautosetuphandler {#1}{#2}% + \installstyleandcolorhandler {#1}{#2}} + \unexpanded\def\installcommandhandler#1#2#3% \??self name \??parent (can be \??self) {\installbasicparameterhandler{#1}{#2}% \installdefinehandler {#1}{#2}{#3}% diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index e7ab2c071..d32776b96 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -56,7 +56,7 @@ return { "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", - "textext", "thetextext", "rawtextext", "textextoffset", + "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "verbatim", "thelabel", "label", "autoalign", diff --git a/tex/context/base/mkiv/node-fnt.lua b/tex/context/base/mkiv/node-fnt.lua index c130f86ca..84c45d4b0 100644 --- a/tex/context/base/mkiv/node-fnt.lua +++ b/tex/context/base/mkiv/node-fnt.lua @@ -166,17 +166,17 @@ function handlers.characters(head) -- either next or not, but definitely no already processed list starttiming(nodes) - local usedfonts = { } - local attrfonts = { } - local basefonts = { } - local a, u, b = 0, 0, 0 - local basefont = nil - local prevfont = nil - local prevattr = 0 - local mode = nil - local done = false - local variants = nil - local redundant = nil + local usedfonts = { } + local attrfonts = { } + local basefonts = { } + local a, u, b, r = 0, 0, 0, 0 + local basefont = nil + local prevfont = nil + local prevattr = 0 + local mode = nil + local done = false + local variants = nil + local redundant = nil if trace_fontrun then run = run + 1 @@ -213,6 +213,7 @@ function handlers.characters(head) variants = fontvariants[font] if mode == "none" then -- skip + -- variants = false protect_glyph(n) else if basefont then @@ -231,7 +232,7 @@ function handlers.characters(head) a = a + 1 elseif force_basepass then b = b + 1 - basefont = { n, nil } + basefont = { n, false } basefonts[b] = basefont end end @@ -244,7 +245,7 @@ function handlers.characters(head) u = u + 1 elseif force_basepass then b = b + 1 - basefont = { n, nil } + basefont = { n, false } basefonts[b] = basefont end end @@ -265,19 +266,23 @@ function handlers.characters(head) report_fonts("replacing %C by %C",char,variant) end setchar(p,variant) - if not redundant then - redundant = { n } + if redundant then + r = r + 1 + redundant[r] = n else - redundant[#redundant+1] = n + r = 1 + redundant = { n } end end end elseif keep_redundant then -- go on, can be used for tracing - elseif not redundant then - redundant = { n } + elseif redundant then + r = r + 1 + redundant[r] = n else - redundant[#redundant+1] = n + r = 1 + redundant = { n } end end end @@ -292,8 +297,10 @@ function handlers.characters(head) for b in traverse_id(boundary_code,nuthead) do if getsubtype(b) == word_boundary then if redundant then - redundant[#redundant+1] = b + r = r + 1 + redundant[r] = b else + r = 1 redundant = { b } end end @@ -302,7 +309,7 @@ function handlers.characters(head) end if redundant then - for i=1,#redundant do + for i=1,r do local r = redundant[i] local p, n = getboth(r) if r == nuthead then diff --git a/tex/context/base/mkiv/page-mix.mkiv b/tex/context/base/mkiv/page-mix.mkiv index 7aaac5fd3..83ce22058 100644 --- a/tex/context/base/mkiv/page-mix.mkiv +++ b/tex/context/base/mkiv/page-mix.mkiv @@ -57,7 +57,7 @@ % old multicolumns mechanism % % \c!ntop=1, -% \c!rule=\v!off, +% \c!rule=\v!off, : now separator=rule % \c!height=, % \c!blank={\v!line,\v!fixed}, % \c!rulethickness=\linewidth, diff --git a/tex/context/base/mkiv/spac-ver.lua b/tex/context/base/mkiv/spac-ver.lua index 9a439e5c2..f1f5757b7 100644 --- a/tex/context/base/mkiv/spac-ver.lua +++ b/tex/context/base/mkiv/spac-ver.lua @@ -126,6 +126,7 @@ local skipcodes = nodes.skipcodes local penalty_code = nodecodes.penalty local kern_code = nodecodes.kern local glue_code = nodecodes.glue +local insert_code = nodecodes.ins local hlist_code = nodecodes.hlist local vlist_code = nodecodes.vlist local localpar_code = nodecodes.localpar @@ -1957,14 +1958,37 @@ function vspacing.collapsevbox(n,aslist) -- for boxes but using global a_snapmet end -- This one is needed to prevent bleeding of prevdepth to the next page --- which doesn't work well with forced skips. - -local outer = texnest[0] - -function vspacing.resetprevdepth() - if texlists.hold_head then - outer.prevdepth = 0 +-- which doesn't work well with forced skips. I'm not that sure if the +-- following is a good way out. + +do + + local outer = texnest[0] + local reset = true + local trace = false + local report = logs.reporter("vspacing") + + directives.register("vspacing.resetprevdepth",function(v) reset = v end) + trackers.register ("vspacing.resetprevdepth",function(v) trace = v end) + + function vspacing.resetprevdepth() + if reset then + local head = texlists.hold_head + local skip = 0 + while head and head.id == insert_code do + head = head.next + skip = skip + 1 + end + if head then + outer.prevdepth = 0 + end + if trace then + report("prevdepth %s at page %i, skipped %i, value %p", + head and "reset" or "kept",tex.getcount("realpageno"),skip,outer.prevdepth) + end + end end + end -- interface diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index c79387699..ef99b2374 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 e011f4e49..8f5ffceab 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/strc-num.lua b/tex/context/base/mkiv/strc-num.lua index 8b5230b65..ef18406b8 100644 --- a/tex/context/base/mkiv/strc-num.lua +++ b/tex/context/base/mkiv/strc-num.lua @@ -9,6 +9,7 @@ if not modules then modules = { } end modules ['strc-num'] = { local format = string.format local next, type = next, type local min, max = math.min, math.max +local insert, remove, copy = table.insert, table.remove, table.copy local texsetcount = tex.setcount -- Counters are managed here. They can have multiple levels which makes it easier to synchronize @@ -16,6 +17,7 @@ local texsetcount = tex.setcount local allocate = utilities.storage.allocate local setmetatableindex = table.setmetatableindex +local setmetatablecall = table.setmetatablecall local trace_counters = false trackers.register("structures.counters", function(v) trace_counters = v end) local report_counters = logs.reporter("structure","counters") @@ -429,14 +431,23 @@ end function counters.save(name) -- or just number local cd = counterdata[name] if cd then - table.insert(cd.saved,table.copy(cd.data)) + insert(cd.saved,copy(cd.data)) end end function counters.restore(name) local cd = counterdata[name] - if cd and cd.saved then - cd.data = table.remove(cd.saved) + if not cd then + report_counters("invalid restore, no counter %a",name) + return + end + local saved = cd.saved + if not saved then + -- is ok + elseif #saved > 1 then + cd.data = remove(saved) + else + report_counters("restore without save for counter %a",name) end end @@ -640,7 +651,7 @@ implement { name = "decrementedcounter", actions = { add, context }, argume implement { name = "showcounter", actions = showcounter, arguments = "string" } -- todo implement { name = "checkcountersetup", actions = checkcountersetup, arguments = { "string", "integer", "integer", "string" } } -table.setmetatablecall(counterdata,function(t,k) return t[k] end) +setmetatablecall(counterdata,function(t,k) return t[k] end) implement { name = "doifelsecounter", actions = { counterdata, commands.doifelse }, arguments = "string" } implement { name = "doifcounter", actions = { counterdata, commands.doif }, arguments = "string" } diff --git a/tex/context/base/mkiv/supp-box.lua b/tex/context/base/mkiv/supp-box.lua index bf41899bf..6c2846fd1 100644 --- a/tex/context/base/mkiv/supp-box.lua +++ b/tex/context/base/mkiv/supp-box.lua @@ -443,3 +443,144 @@ interfaces.implement { doifelse(firstdirinbox(n) == "TRT") end } + +-- new (handy for mp) .. might move to its own module + +do + + local flush_list = nodes.flush_list + local copy_list = nodes.copy_list + local takebox = nodes.takebox + local texsetbox = tex.setbox + + local new_hlist = nodes.pool.hlist + + local boxes = { } + nodes.boxes = boxes + local cache = table.setmetatableindex("table") + local report = logs.reporter("boxes","cache") + local trace = false + + trackers.register("nodes.boxes",function(v) trace = v end) + + function boxes.save(category,name,box) +name = tonumber(name) or name + local b = takebox(box) + if trace then + report("category %a, name %a, %s (%s)",category,name,"save",b and "content" or "empty") + end + cache[category][name] = b or false + end + + function boxes.direct(category,name,copy) +name = tonumber(name) or name + local c = cache[category] + local b = c[name] + if not b then + -- do nothing, maybe trace + elseif copy then + b = copy_list(b) + else + c[name] = false + end + if trace then + report("category %a, name %a, %s (%s)",category,name,"direct",b and "content" or "empty") + end + return b or nil + end + + function boxes.restore(category,name,box,copy) +name = tonumber(name) or name + local c = cache[category] + local b = takebox(box) + if b then + flush_list(b) + end + local b = c[name] + if not b then + -- do nothing, maybe trace + elseif copy then + b = copy_list(b) + else + c[name] = false + end + if trace then + report("category %a, name %a, %s (%s)",category,name,"restore",b and "content" or "empty") + end + texsetbox(box,b or nil) + end + + function boxes.dimensions(category,name) +name = tonumber(name) or name + local b = cache[category][name] + if b then + return b.width, b.height, b.depth + else + return 0, 0, 0 + end + end + + function boxes.reset(category,name) +name = tonumber(name) or name + local c = cache[category] + if name and name ~= "" then + local b = c[name] + if b then + flush_list(b) + c[name] = false + end + if trace then + report("category %a, name %a, reset",category,name) + end + else + for k, b in next, c do + if b then + flush_list(b) + end + end + cache[category] = { } + if trace then + report("category %a, reset",category) + end + end + end + + interfaces.implement { + name = "putboxincache", + arguments = { "string", "string", "integer" }, + actions = boxes.save, + } + + interfaces.implement { + name = "getboxfromcache", + arguments = { "string", "string", "integer" }, + actions = boxes.restore, + } + + interfaces.implement { + name = "directboxfromcache", + arguments = { "string", "string" }, + actions = { boxes.direct, context }, + -- actions = function(category,name) local b = boxes.direct(category,name) if b then context(b) end end, + } + + interfaces.implement { + name = "directcopyboxfromcache", + arguments = { "string", "string", true }, + actions = { boxes.direct, context }, + -- actions = function(category,name) local b = boxes.direct(category,name,true) if b then context(b) end end, + } + + interfaces.implement { + name = "copyboxfromcache", + arguments = { "string", "string", "integer", true }, + actions = boxes.restore, + } + + interfaces.implement { + name = "resetboxesincache", + arguments = { "string" }, + actions = boxes.reset, + } + +end diff --git a/tex/context/base/mkiv/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv index 499281ebe..d617c82db 100644 --- a/tex/context/base/mkiv/supp-box.mkiv +++ b/tex/context/base/mkiv/supp-box.mkiv @@ -2604,6 +2604,32 @@ \unexpanded\def\globalpushbox{\syst_boxes_push\global} \unexpanded\def\globalpopbox {\syst_boxes_pop \global} +%D And here is a more modern one (not yet in i-*): +%D +%D \starttyping +%D \dorecurse {100} { +%D \setbox\zerocount\hbox{test \recurselevel} +%D \putboxincache{foo}{\recurselevel}\zerocount +%D \copyboxfromcache{foo}{\recurselevel}\zerocount +%D \iftrue +%D \setbox\zerocount\hbox{\directboxfromcache{foo}{\recurselevel}}% +%D \else +%D \getboxfromcache{foo}{\recurselevel}\zerocount +%D \fi +%D } +%D \resetboxesincache{foo} +%D \stoptyping + +\unexpanded\def\putboxincache #1#2#3{\clf_putboxincache {#1}{#2}#3\relax} +\unexpanded\def\getboxfromcache #1#2#3{\clf_getboxfromcache {#1}{#2}#3\relax} +\unexpanded\def\copyboxfromcache #1#2#3{\clf_copyboxfromcache {#1}{#2}#3\relax} +\unexpanded\def\directboxfromcache #1#2{\clf_directboxfromcache {#1}{#2}} +\unexpanded\def\directcopyboxfromcache#1#2{\clf_directcopyboxfromcache{#1}{#2}} +\unexpanded\def\resetboxesincache #1{\clf_resetboxesincache {#1}} + +\unexpanded\def\putnextboxincache#1#2% + {\dowithnextbox{\putboxincache{#1}{#2}\nextbox}} + %D \macros %D {removedepth, obeydepth} %D diff --git a/tex/context/base/mkiv/util-sci.lua b/tex/context/base/mkiv/util-sci.lua index 43d873b63..33e520719 100644 --- a/tex/context/base/mkiv/util-sci.lua +++ b/tex/context/base/mkiv/util-sci.lua @@ -22,6 +22,7 @@ local lexerroot = file.dirname(resolvers.find_file("scite-context-lexer.lua")) local knownlexers = { tex = "tex", mkiv = "tex", mkvi = "tex", mkxi = "tex", mkix = "tex", mkii = "tex", cld = "tex", lua = "lua", lfg = "lua", lus = "lua", + mp = "mps", mpiv = "mps", mpii = "mps", w = "web", ww = "web", c = "cpp", h = "cpp", cpp = "cpp", hpp = "cpp", cxx = "cpp", hxx = "cpp", xml = "xml", lmx = "xml", ctx = "xml", xsl = "xml", xsd = "xml", rlx = "xml", css = "xml", dtd = "xml", diff --git a/tex/context/base/mkiv/util-str.lua b/tex/context/base/mkiv/util-str.lua index 28b75dbc5..a54a4aac9 100644 --- a/tex/context/base/mkiv/util-str.lua +++ b/tex/context/base/mkiv/util-str.lua @@ -824,6 +824,8 @@ end -- extensions : %!tag! +-- can be made faster but not called that often + local builder = Cs { "start", start = ( ( @@ -852,10 +854,10 @@ local builder = Cs { "start", + V("a") -- new + V("A") -- new + V("j") + V("J") -- stripped e E - + V("m") + V("M") -- new + + V("m") + V("M") -- new (formatted number) + V("z") -- new -- - -- + V("?") -- ignores probably messed up % + -- + V("?") -- ignored, probably messed up % ) + V("*") ) diff --git a/tex/context/fonts/mkiv/minion-math.lfg b/tex/context/fonts/mkiv/minion-math.lfg index 72bf7d436..a4f539ec7 100644 --- a/tex/context/fonts/mkiv/minion-math.lfg +++ b/tex/context/fonts/mkiv/minion-math.lfg @@ -16,8 +16,10 @@ return { }, ["Minion-BoldMath"] = { default = "file:MinionMath-Semibold.otf", + }, ["Minion-MediumMath"] = { default = "file:MinionMath-Semibold.otf", + }, }, mathematics = { kerns = { diff --git a/tex/context/interface/mkiv/i-accent.xml b/tex/context/interface/mkiv/i-accent.xml deleted file mode 100644 index b947dfc12..000000000 --- a/tex/context/interface/mkiv/i-accent.xml +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml deleted file mode 100644 index d8b75a463..000000000 --- a/tex/context/interface/mkiv/i-align.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-anchor.xml b/tex/context/interface/mkiv/i-anchor.xml deleted file mode 100644 index 342976a3d..000000000 --- a/tex/context/interface/mkiv/i-anchor.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml deleted file mode 100644 index 6aadc0304..000000000 --- a/tex/context/interface/mkiv/i-attachment.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml deleted file mode 100644 index eb699b99e..000000000 --- a/tex/context/interface/mkiv/i-attribute.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml deleted file mode 100644 index ff9a628cb..000000000 --- a/tex/context/interface/mkiv/i-backend.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml deleted file mode 100644 index 400e01454..000000000 --- a/tex/context/interface/mkiv/i-background.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml deleted file mode 100644 index 3f339b9a0..000000000 --- a/tex/context/interface/mkiv/i-bar.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml deleted file mode 100644 index edb6873f0..000000000 --- a/tex/context/interface/mkiv/i-blackrule.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-bleed.xml b/tex/context/interface/mkiv/i-bleed.xml deleted file mode 100644 index 15a2fe5f7..000000000 --- a/tex/context/interface/mkiv/i-bleed.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml deleted file mode 100644 index 980b5b435..000000000 --- a/tex/context/interface/mkiv/i-block.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bookmark.xml b/tex/context/interface/mkiv/i-bookmark.xml deleted file mode 100644 index 5b7aec9a8..000000000 --- a/tex/context/interface/mkiv/i-bookmark.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml deleted file mode 100644 index a9eeb96ae..000000000 --- a/tex/context/interface/mkiv/i-boxes.xml +++ /dev/null @@ -1,982 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml deleted file mode 100644 index ad1ffd519..000000000 --- a/tex/context/interface/mkiv/i-buffer.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml deleted file mode 100644 index 1f6dfd5bf..000000000 --- a/tex/context/interface/mkiv/i-button.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-capitals.xml b/tex/context/interface/mkiv/i-capitals.xml deleted file mode 100644 index bfbb6bb2b..000000000 --- a/tex/context/interface/mkiv/i-capitals.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml deleted file mode 100644 index 7c3f649d5..000000000 --- a/tex/context/interface/mkiv/i-catcodes.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-character.xml b/tex/context/interface/mkiv/i-character.xml deleted file mode 100644 index 47bc714fa..000000000 --- a/tex/context/interface/mkiv/i-character.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml deleted file mode 100644 index 2ee8d0cd9..000000000 --- a/tex/context/interface/mkiv/i-characteralign.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterspacing.xml b/tex/context/interface/mkiv/i-characterspacing.xml deleted file mode 100644 index cb54030c7..000000000 --- a/tex/context/interface/mkiv/i-characterspacing.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-characterstripping.xml b/tex/context/interface/mkiv/i-characterstripping.xml deleted file mode 100644 index cd89ac065..000000000 --- a/tex/context/interface/mkiv/i-characterstripping.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-charwidth.xml b/tex/context/interface/mkiv/i-charwidth.xml deleted file mode 100644 index 63240327a..000000000 --- a/tex/context/interface/mkiv/i-charwidth.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml deleted file mode 100644 index d300f9008..000000000 --- a/tex/context/interface/mkiv/i-chemical.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-cleaning.xml b/tex/context/interface/mkiv/i-cleaning.xml deleted file mode 100644 index d982a5dd5..000000000 --- a/tex/context/interface/mkiv/i-cleaning.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-clipping.xml b/tex/context/interface/mkiv/i-clipping.xml deleted file mode 100644 index aa152a85b..000000000 --- a/tex/context/interface/mkiv/i-clipping.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-collector.xml b/tex/context/interface/mkiv/i-collector.xml deleted file mode 100644 index dab49f14c..000000000 --- a/tex/context/interface/mkiv/i-collector.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml deleted file mode 100644 index 3f98914e4..000000000 --- a/tex/context/interface/mkiv/i-color.xml +++ /dev/null @@ -1,597 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml deleted file mode 100644 index 154d38072..000000000 --- a/tex/context/interface/mkiv/i-columns.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml deleted file mode 100644 index 4e7ea2d52..000000000 --- a/tex/context/interface/mkiv/i-combination.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-commandhandler.xml b/tex/context/interface/mkiv/i-commandhandler.xml deleted file mode 100644 index 210690d3e..000000000 --- a/tex/context/interface/mkiv/i-commandhandler.xml +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-comment.xml b/tex/context/interface/mkiv/i-comment.xml deleted file mode 100644 index 52d54398b..000000000 --- a/tex/context/interface/mkiv/i-comment.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml deleted file mode 100644 index 305b93e90..000000000 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-common-assignment.xml b/tex/context/interface/mkiv/i-common-assignment.xml deleted file mode 100644 index 0f11d0137..000000000 --- a/tex/context/interface/mkiv/i-common-assignment.xml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 1bb84efdc..000000000 --- a/tex/context/interface/mkiv/i-common-definitions.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml deleted file mode 100644 index 15eed8628..000000000 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ /dev/null @@ -1,704 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-string.xml b/tex/context/interface/mkiv/i-common-string.xml deleted file mode 100644 index 8e940e6f3..000000000 --- a/tex/context/interface/mkiv/i-common-string.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml deleted file mode 100644 index f111292b8..000000000 --- a/tex/context/interface/mkiv/i-common-value.xml +++ /dev/null @@ -1,546 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 0e4fab907..bffa5e999 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 deleted file mode 100644 index f1e85658f..000000000 --- a/tex/context/interface/mkiv/i-context.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml deleted file mode 100644 index b4755c27c..000000000 --- a/tex/context/interface/mkiv/i-conversion.xml +++ /dev/null @@ -1,632 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml deleted file mode 100644 index 7701d40cd..000000000 --- a/tex/context/interface/mkiv/i-counter.xml +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dataset.xml b/tex/context/interface/mkiv/i-dataset.xml deleted file mode 100644 index 914fe0af1..000000000 --- a/tex/context/interface/mkiv/i-dataset.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-define.xml b/tex/context/interface/mkiv/i-define.xml deleted file mode 100644 index 0d0398e5d..000000000 --- a/tex/context/interface/mkiv/i-define.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml deleted file mode 100644 index 24fa581fd..000000000 --- a/tex/context/interface/mkiv/i-delimitedtext.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml deleted file mode 100644 index 0204b3466..000000000 --- a/tex/context/interface/mkiv/i-description.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-digits.xml b/tex/context/interface/mkiv/i-digits.xml deleted file mode 100644 index 325febab3..000000000 --- a/tex/context/interface/mkiv/i-digits.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dimension.xml b/tex/context/interface/mkiv/i-dimension.xml deleted file mode 100644 index 2962a3aef..000000000 --- a/tex/context/interface/mkiv/i-dimension.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml deleted file mode 100644 index 725e215a3..000000000 --- a/tex/context/interface/mkiv/i-direction.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml deleted file mode 100644 index a2ed222d0..000000000 --- a/tex/context/interface/mkiv/i-document.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml deleted file mode 100644 index 452ac311e..000000000 --- a/tex/context/interface/mkiv/i-dummy.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml deleted file mode 100644 index c46c689e2..000000000 --- a/tex/context/interface/mkiv/i-effect.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml deleted file mode 100644 index abd1da232..000000000 --- a/tex/context/interface/mkiv/i-enumeration.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-export.xml b/tex/context/interface/mkiv/i-export.xml deleted file mode 100644 index 40c73ee51..000000000 --- a/tex/context/interface/mkiv/i-export.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml deleted file mode 100644 index 67ff40ccf..000000000 --- a/tex/context/interface/mkiv/i-field.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-figure.xml b/tex/context/interface/mkiv/i-figure.xml deleted file mode 100644 index a53678e89..000000000 --- a/tex/context/interface/mkiv/i-figure.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml deleted file mode 100644 index 4805c0faf..000000000 --- a/tex/context/interface/mkiv/i-file.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml deleted file mode 100644 index 919267b30..000000000 --- a/tex/context/interface/mkiv/i-filler.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fillinline.xml b/tex/context/interface/mkiv/i-fillinline.xml deleted file mode 100644 index dbf9f8627..000000000 --- a/tex/context/interface/mkiv/i-fillinline.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-fillinrule.xml b/tex/context/interface/mkiv/i-fillinrule.xml deleted file mode 100644 index 949b8f6ea..000000000 --- a/tex/context/interface/mkiv/i-fillinrule.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml deleted file mode 100644 index ffa706e3d..000000000 --- a/tex/context/interface/mkiv/i-firstline.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml deleted file mode 100644 index 3489c55e2..000000000 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml deleted file mode 100644 index d786769fc..000000000 --- a/tex/context/interface/mkiv/i-floats.xml +++ /dev/null @@ -1,736 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fontfamily.xml b/tex/context/interface/mkiv/i-fontfamily.xml deleted file mode 100644 index 648bef6a2..000000000 --- a/tex/context/interface/mkiv/i-fontfamily.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml deleted file mode 100644 index c10b56571..000000000 --- a/tex/context/interface/mkiv/i-fonts.xml +++ /dev/null @@ -1,1644 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-form.xml b/tex/context/interface/mkiv/i-form.xml deleted file mode 100644 index 0f02d0670..000000000 --- a/tex/context/interface/mkiv/i-form.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml deleted file mode 100644 index f288e4f8a..000000000 --- a/tex/context/interface/mkiv/i-formula.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml deleted file mode 100644 index 444784dfa..000000000 --- a/tex/context/interface/mkiv/i-fraction.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml deleted file mode 100644 index 07bdd5de4..000000000 --- a/tex/context/interface/mkiv/i-framed.xml +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml deleted file mode 100644 index 4e90a0c81..000000000 --- a/tex/context/interface/mkiv/i-graphics.xml +++ /dev/null @@ -1,522 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml deleted file mode 100644 index d98a1a544..000000000 --- a/tex/context/interface/mkiv/i-grid.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml deleted file mode 100644 index db2128d53..000000000 --- a/tex/context/interface/mkiv/i-help.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml deleted file mode 100644 index 1cc4ed4ca..000000000 --- a/tex/context/interface/mkiv/i-highlight.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml deleted file mode 100644 index 3c96fc247..000000000 --- a/tex/context/interface/mkiv/i-hspace.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml deleted file mode 100644 index 934751712..000000000 --- a/tex/context/interface/mkiv/i-hyphenation.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml deleted file mode 100644 index b4bd4dee5..000000000 --- a/tex/context/interface/mkiv/i-imposition.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml deleted file mode 100644 index 666388b6a..000000000 --- a/tex/context/interface/mkiv/i-indent.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-indentedtext.xml b/tex/context/interface/mkiv/i-indentedtext.xml deleted file mode 100644 index c70fb5ba0..000000000 --- a/tex/context/interface/mkiv/i-indentedtext.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-initial.xml b/tex/context/interface/mkiv/i-initial.xml deleted file mode 100644 index 170a5e1ba..000000000 --- a/tex/context/interface/mkiv/i-initial.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-injector.xml b/tex/context/interface/mkiv/i-injector.xml deleted file mode 100644 index c13e544db..000000000 --- a/tex/context/interface/mkiv/i-injector.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml deleted file mode 100644 index 9250c9ebf..000000000 --- a/tex/context/interface/mkiv/i-insertion.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml deleted file mode 100644 index 06b104f4c..000000000 --- a/tex/context/interface/mkiv/i-interaction.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionbar.xml b/tex/context/interface/mkiv/i-interactionbar.xml deleted file mode 100644 index 67c31216a..000000000 --- a/tex/context/interface/mkiv/i-interactionbar.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-interactionmenu.xml b/tex/context/interface/mkiv/i-interactionmenu.xml deleted file mode 100644 index 6bf2f9674..000000000 --- a/tex/context/interface/mkiv/i-interactionmenu.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml deleted file mode 100644 index 6e337f6d6..000000000 --- a/tex/context/interface/mkiv/i-interactionscreen.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml deleted file mode 100644 index c8c93b72b..000000000 --- a/tex/context/interface/mkiv/i-interface.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interlinespace.xml b/tex/context/interface/mkiv/i-interlinespace.xml deleted file mode 100644 index 99f5e11af..000000000 --- a/tex/context/interface/mkiv/i-interlinespace.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-italiccorrection.xml b/tex/context/interface/mkiv/i-italiccorrection.xml deleted file mode 100644 index f8d711ae8..000000000 --- a/tex/context/interface/mkiv/i-italiccorrection.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml deleted file mode 100644 index 69e817efd..000000000 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ /dev/null @@ -1,534 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-items.xml b/tex/context/interface/mkiv/i-items.xml deleted file mode 100644 index d3f68132a..000000000 --- a/tex/context/interface/mkiv/i-items.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-javascript.xml b/tex/context/interface/mkiv/i-javascript.xml deleted file mode 100644 index 790d13523..000000000 --- a/tex/context/interface/mkiv/i-javascript.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml deleted file mode 100644 index 167bfc4f8..000000000 --- a/tex/context/interface/mkiv/i-kerning.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml deleted file mode 100644 index 320c105f9..000000000 --- a/tex/context/interface/mkiv/i-label.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml deleted file mode 100644 index 247783762..000000000 --- a/tex/context/interface/mkiv/i-labeltext.xml +++ /dev/null @@ -1,496 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml deleted file mode 100644 index 26bdbf060..000000000 --- a/tex/context/interface/mkiv/i-language.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml deleted file mode 100644 index 6be7cccc9..000000000 --- a/tex/context/interface/mkiv/i-layer.xml +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml deleted file mode 100644 index 984995f10..000000000 --- a/tex/context/interface/mkiv/i-layout.xml +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml deleted file mode 100644 index 623595140..000000000 --- a/tex/context/interface/mkiv/i-linenumber.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml deleted file mode 100644 index fc8032448..000000000 --- a/tex/context/interface/mkiv/i-lines.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-linetable.xml b/tex/context/interface/mkiv/i-linetable.xml deleted file mode 100644 index a10479161..000000000 --- a/tex/context/interface/mkiv/i-linetable.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linewidth.xml b/tex/context/interface/mkiv/i-linewidth.xml deleted file mode 100644 index 65a967954..000000000 --- a/tex/context/interface/mkiv/i-linewidth.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml deleted file mode 100644 index 38e534252..000000000 --- a/tex/context/interface/mkiv/i-list.xml +++ /dev/null @@ -1,620 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-logo.xml b/tex/context/interface/mkiv/i-logo.xml deleted file mode 100644 index e3327400a..000000000 --- a/tex/context/interface/mkiv/i-logo.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml deleted file mode 100644 index 7cfd489eb..000000000 --- a/tex/context/interface/mkiv/i-lohi.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml deleted file mode 100644 index 525753723..000000000 --- a/tex/context/interface/mkiv/i-lua.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml deleted file mode 100644 index 2128464ef..000000000 --- a/tex/context/interface/mkiv/i-makeup.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml deleted file mode 100644 index f40bf112a..000000000 --- a/tex/context/interface/mkiv/i-marginblock.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml deleted file mode 100644 index 5a2b014ea..000000000 --- a/tex/context/interface/mkiv/i-margindata.xml +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marker.xml b/tex/context/interface/mkiv/i-marker.xml deleted file mode 100644 index 103fc5e55..000000000 --- a/tex/context/interface/mkiv/i-marker.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml deleted file mode 100644 index a556f1007..000000000 --- a/tex/context/interface/mkiv/i-marking.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml deleted file mode 100644 index 3381a4273..000000000 --- a/tex/context/interface/mkiv/i-math.xml +++ /dev/null @@ -1,462 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml deleted file mode 100644 index cc0ff6fa7..000000000 --- a/tex/context/interface/mkiv/i-mathalignment.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml deleted file mode 100644 index 9744fa9e5..000000000 --- a/tex/context/interface/mkiv/i-mathcases.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml deleted file mode 100644 index b23f8558e..000000000 --- a/tex/context/interface/mkiv/i-mathfence.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml deleted file mode 100644 index a934d2b31..000000000 --- a/tex/context/interface/mkiv/i-mathmatrix.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathornament.xml b/tex/context/interface/mkiv/i-mathornament.xml deleted file mode 100644 index 6009b7921..000000000 --- a/tex/context/interface/mkiv/i-mathornament.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathradical.xml b/tex/context/interface/mkiv/i-mathradical.xml deleted file mode 100644 index cedbb4200..000000000 --- a/tex/context/interface/mkiv/i-mathradical.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml deleted file mode 100644 index 37b5737ff..000000000 --- a/tex/context/interface/mkiv/i-mathstackers.xml +++ /dev/null @@ -1,1789 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml deleted file mode 100644 index ca15ebb9d..000000000 --- a/tex/context/interface/mkiv/i-metapost.xml +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml deleted file mode 100644 index 09e0f3b34..000000000 --- a/tex/context/interface/mkiv/i-mixedcolumns.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml deleted file mode 100644 index 8df4c27f6..000000000 --- a/tex/context/interface/mkiv/i-modes.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml deleted file mode 100644 index 9567cb9af..000000000 --- a/tex/context/interface/mkiv/i-modules.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml deleted file mode 100644 index 1fa8699e1..000000000 --- a/tex/context/interface/mkiv/i-narrow.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml deleted file mode 100644 index d7ba1aac8..000000000 --- a/tex/context/interface/mkiv/i-naturaltable.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml deleted file mode 100644 index dacdfeb0b..000000000 --- a/tex/context/interface/mkiv/i-note.xml +++ /dev/null @@ -1,663 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml deleted file mode 100644 index 804d17af8..000000000 --- a/tex/context/interface/mkiv/i-object.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml deleted file mode 100644 index 8e68a3bef..000000000 --- a/tex/context/interface/mkiv/i-offset.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-opposite.xml b/tex/context/interface/mkiv/i-opposite.xml deleted file mode 100644 index 497b6d502..000000000 --- a/tex/context/interface/mkiv/i-opposite.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml deleted file mode 100644 index 8ad0b7cfb..000000000 --- a/tex/context/interface/mkiv/i-ornament.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-output.xml b/tex/context/interface/mkiv/i-output.xml deleted file mode 100644 index 1f59284ff..000000000 --- a/tex/context/interface/mkiv/i-output.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml deleted file mode 100644 index dd2d43363..000000000 --- a/tex/context/interface/mkiv/i-overlay.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml deleted file mode 100644 index abc586ea6..000000000 --- a/tex/context/interface/mkiv/i-pagebreak.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagecomment.xml b/tex/context/interface/mkiv/i-pagecomment.xml deleted file mode 100644 index 26678a4a0..000000000 --- a/tex/context/interface/mkiv/i-pagecomment.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pagefigure.xml b/tex/context/interface/mkiv/i-pagefigure.xml deleted file mode 100644 index 5f776e835..000000000 --- a/tex/context/interface/mkiv/i-pagefigure.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml deleted file mode 100644 index 29810d7db..000000000 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageinjection.xml b/tex/context/interface/mkiv/i-pageinjection.xml deleted file mode 100644 index 64becc385..000000000 --- a/tex/context/interface/mkiv/i-pageinjection.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pagelayout.xml b/tex/context/interface/mkiv/i-pagelayout.xml deleted file mode 100644 index dd4bc27f5..000000000 --- a/tex/context/interface/mkiv/i-pagelayout.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml deleted file mode 100644 index d17df9425..000000000 --- a/tex/context/interface/mkiv/i-pagenumber.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml deleted file mode 100644 index 45c433269..000000000 --- a/tex/context/interface/mkiv/i-pageselection.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml deleted file mode 100644 index 630a5af6c..000000000 --- a/tex/context/interface/mkiv/i-pageshift.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml deleted file mode 100644 index 0d6a94811..000000000 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml deleted file mode 100644 index fbf190257..000000000 --- a/tex/context/interface/mkiv/i-pairedbox.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-papersize.xml b/tex/context/interface/mkiv/i-papersize.xml deleted file mode 100644 index 99d6b9d9d..000000000 --- a/tex/context/interface/mkiv/i-papersize.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-paragraph.xml b/tex/context/interface/mkiv/i-paragraph.xml deleted file mode 100644 index 63ddab64f..000000000 --- a/tex/context/interface/mkiv/i-paragraph.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml deleted file mode 100644 index f3588f87c..000000000 --- a/tex/context/interface/mkiv/i-paragraphnumber.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml deleted file mode 100644 index 6c1dae0db..000000000 --- a/tex/context/interface/mkiv/i-paragraphs.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml deleted file mode 100644 index ef2c55f3f..000000000 --- a/tex/context/interface/mkiv/i-parallel.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parbuilder.xml b/tex/context/interface/mkiv/i-parbuilder.xml deleted file mode 100644 index b7bf37417..000000000 --- a/tex/context/interface/mkiv/i-parbuilder.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-pdf.xml b/tex/context/interface/mkiv/i-pdf.xml deleted file mode 100644 index 9d75ddfd3..000000000 --- a/tex/context/interface/mkiv/i-pdf.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-penalty.xml b/tex/context/interface/mkiv/i-penalty.xml deleted file mode 100644 index 8cadf672b..000000000 --- a/tex/context/interface/mkiv/i-penalty.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-periods.xml b/tex/context/interface/mkiv/i-periods.xml deleted file mode 100644 index e72152c38..000000000 --- a/tex/context/interface/mkiv/i-periods.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-phantom.xml b/tex/context/interface/mkiv/i-phantom.xml deleted file mode 100644 index e3f92b810..000000000 --- a/tex/context/interface/mkiv/i-phantom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-placement.xml b/tex/context/interface/mkiv/i-placement.xml deleted file mode 100644 index 4db307957..000000000 --- a/tex/context/interface/mkiv/i-placement.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml deleted file mode 100644 index 54bc952dc..000000000 --- a/tex/context/interface/mkiv/i-position.xml +++ /dev/null @@ -1,528 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positionbar.xml b/tex/context/interface/mkiv/i-positionbar.xml deleted file mode 100644 index e6dadf8c5..000000000 --- a/tex/context/interface/mkiv/i-positionbar.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positioning.xml b/tex/context/interface/mkiv/i-positioning.xml deleted file mode 100644 index 98898c7cc..000000000 --- a/tex/context/interface/mkiv/i-positioning.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-postponing.xml b/tex/context/interface/mkiv/i-postponing.xml deleted file mode 100644 index 619a77552..000000000 --- a/tex/context/interface/mkiv/i-postponing.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml deleted file mode 100644 index a43037754..000000000 --- a/tex/context/interface/mkiv/i-processor.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-profile.xml b/tex/context/interface/mkiv/i-profile.xml deleted file mode 100644 index 2df175cdf..000000000 --- a/tex/context/interface/mkiv/i-profile.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml deleted file mode 100644 index 4d3583e7e..000000000 --- a/tex/context/interface/mkiv/i-publication.xml +++ /dev/null @@ -1,1124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml deleted file mode 100644 index 969cef05f..000000000 --- a/tex/context/interface/mkiv/i-random.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 3894aae56..42e9490d6 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 deleted file mode 100644 index 7b117e4f7..000000000 --- a/tex/context/interface/mkiv/i-references.xml +++ /dev/null @@ -1,566 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-regime.xml b/tex/context/interface/mkiv/i-regime.xml deleted file mode 100644 index 6c9e5b356..000000000 --- a/tex/context/interface/mkiv/i-regime.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml deleted file mode 100644 index 561912f6a..000000000 --- a/tex/context/interface/mkiv/i-register.xml +++ /dev/null @@ -1,646 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-renderingwindow.xml b/tex/context/interface/mkiv/i-renderingwindow.xml deleted file mode 100644 index 219fda285..000000000 --- a/tex/context/interface/mkiv/i-renderingwindow.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml deleted file mode 100644 index 95b6272e7..000000000 --- a/tex/context/interface/mkiv/i-replacement.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-rotatation.xml b/tex/context/interface/mkiv/i-rotatation.xml deleted file mode 100644 index 95a5815e9..000000000 --- a/tex/context/interface/mkiv/i-rotatation.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml deleted file mode 100644 index 135d6fba8..000000000 --- a/tex/context/interface/mkiv/i-scale.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml deleted file mode 100644 index f1aee232a..000000000 --- a/tex/context/interface/mkiv/i-script.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml deleted file mode 100644 index 32b79323d..000000000 --- a/tex/context/interface/mkiv/i-section.xml +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml deleted file mode 100644 index fc6d87cff..000000000 --- a/tex/context/interface/mkiv/i-sectionblock.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml deleted file mode 100644 index e593e9117..000000000 --- a/tex/context/interface/mkiv/i-selector.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml deleted file mode 100644 index fec773f2e..000000000 --- a/tex/context/interface/mkiv/i-setups.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml deleted file mode 100644 index d9b8bf7e4..000000000 --- a/tex/context/interface/mkiv/i-shift.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sidebar.xml b/tex/context/interface/mkiv/i-sidebar.xml deleted file mode 100644 index 8c00ce1ff..000000000 --- a/tex/context/interface/mkiv/i-sidebar.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml deleted file mode 100644 index 16c1046bd..000000000 --- a/tex/context/interface/mkiv/i-smash.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml deleted file mode 100644 index 5ecc83f18..000000000 --- a/tex/context/interface/mkiv/i-sort.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-soundtrack.xml b/tex/context/interface/mkiv/i-soundtrack.xml deleted file mode 100644 index b0f460352..000000000 --- a/tex/context/interface/mkiv/i-soundtrack.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml deleted file mode 100644 index 615ba390b..000000000 --- a/tex/context/interface/mkiv/i-spellchecking.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml deleted file mode 100644 index e23485fd6..000000000 --- a/tex/context/interface/mkiv/i-startstop.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml deleted file mode 100644 index 40ddc89de..000000000 --- a/tex/context/interface/mkiv/i-stream.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml deleted file mode 100644 index b3efe552b..000000000 --- a/tex/context/interface/mkiv/i-string.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml deleted file mode 100644 index 1fd12a3bb..000000000 --- a/tex/context/interface/mkiv/i-strut.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml deleted file mode 100644 index 33d5b4707..000000000 --- a/tex/context/interface/mkiv/i-symbol.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml deleted file mode 100644 index c64c1c759..000000000 --- a/tex/context/interface/mkiv/i-synonym.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml deleted file mode 100644 index e1404754e..000000000 --- a/tex/context/interface/mkiv/i-system.xml +++ /dev/null @@ -1,3534 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-systemlog.xml b/tex/context/interface/mkiv/i-systemlog.xml deleted file mode 100644 index 3f2967912..000000000 --- a/tex/context/interface/mkiv/i-systemlog.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml deleted file mode 100644 index 649b198ae..000000000 --- a/tex/context/interface/mkiv/i-table.xml +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml deleted file mode 100644 index 1e6dfc1fc..000000000 --- a/tex/context/interface/mkiv/i-tabulation.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml deleted file mode 100644 index 14f413ce3..000000000 --- a/tex/context/interface/mkiv/i-tagging.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-textbackground.xml b/tex/context/interface/mkiv/i-textbackground.xml deleted file mode 100644 index 3b17e0efd..000000000 --- a/tex/context/interface/mkiv/i-textbackground.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml deleted file mode 100644 index edcf03492..000000000 --- a/tex/context/interface/mkiv/i-textflow.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-textrule.xml b/tex/context/interface/mkiv/i-textrule.xml deleted file mode 100644 index a849f44e1..000000000 --- a/tex/context/interface/mkiv/i-textrule.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml deleted file mode 100644 index 009949d35..000000000 --- a/tex/context/interface/mkiv/i-texts.xml +++ /dev/null @@ -1,385 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-thinrule.xml b/tex/context/interface/mkiv/i-thinrule.xml deleted file mode 100644 index b74286e5e..000000000 --- a/tex/context/interface/mkiv/i-thinrule.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml deleted file mode 100644 index 2cc0f4674..000000000 --- a/tex/context/interface/mkiv/i-token.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-tolerance.xml b/tex/context/interface/mkiv/i-tolerance.xml deleted file mode 100644 index 26b554132..000000000 --- a/tex/context/interface/mkiv/i-tolerance.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml deleted file mode 100644 index 775d0abcf..000000000 --- a/tex/context/interface/mkiv/i-tooltip.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml deleted file mode 100644 index e2b48ade2..000000000 --- a/tex/context/interface/mkiv/i-tracker.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-translation.xml b/tex/context/interface/mkiv/i-translation.xml deleted file mode 100644 index f4f77c526..000000000 --- a/tex/context/interface/mkiv/i-translation.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml deleted file mode 100644 index f30b8bb23..000000000 --- a/tex/context/interface/mkiv/i-twopassdata.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-typography.xml b/tex/context/interface/mkiv/i-typography.xml deleted file mode 100644 index ffb80c211..000000000 --- a/tex/context/interface/mkiv/i-typography.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml deleted file mode 100644 index 3502b544a..000000000 --- a/tex/context/interface/mkiv/i-unit.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml deleted file mode 100644 index 28aaa6df4..000000000 --- a/tex/context/interface/mkiv/i-variables.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml deleted file mode 100644 index 7026d2b10..000000000 --- a/tex/context/interface/mkiv/i-verbatim.xml +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml deleted file mode 100644 index d01659815..000000000 --- a/tex/context/interface/mkiv/i-version.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-viewerlayer.xml b/tex/context/interface/mkiv/i-viewerlayer.xml deleted file mode 100644 index 3de29b1fd..000000000 --- a/tex/context/interface/mkiv/i-viewerlayer.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml deleted file mode 100644 index fd7198f9d..000000000 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml deleted file mode 100644 index 4618fc00a..000000000 --- a/tex/context/interface/mkiv/i-vspace.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml deleted file mode 100644 index 8f9fa0823..000000000 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml deleted file mode 100644 index c13196383..000000000 --- a/tex/context/interface/mkiv/i-xml.xml +++ /dev/null @@ -1,827 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml deleted file mode 100644 index 31b4a6842..000000000 --- a/tex/context/interface/mkiv/i-xtable.xml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/modules/mkiv/m-steps.lua b/tex/context/modules/mkiv/m-steps.lua index 8eb481550..f492c6c42 100644 --- a/tex/context/modules/mkiv/m-steps.lua +++ b/tex/context/modules/mkiv/m-steps.lua @@ -10,9 +10,13 @@ if not modules then modules = { } end modules ['x-flow'] = { moduledata.steps = moduledata.steps or { } +local context = context local variables = interfaces.variables -local trace_charts = false +local report = logs.reporter("stepcharts") +local trace = false + +trackers.register("stepcharts",function(v) trace = v end) local defaults = { chart = { @@ -48,92 +52,206 @@ local defaults = { -- maybe: includes -- maybe: flush ranges -local charts = { } +local charts = { } -- not used but we could support nesting +local chart = nil local steps = { } +local count = 0 -function commands.step_start_chart(name) +local function step_start_chart(name) name = name or "" - steps = { } - charts[name] = { + steps = table.setmetatableindex(function(t,k) + local v = { -- could be metatable + cell_top = false, + cell_bot = false, + text_top = false, + text_mid = false, + text_bot = false, + start_t = k, + start_m = k, + start_b = k, + cell_ali = false, + } + t[k] = v + return v + end) + count = 0 + chart = { steps = steps, + count = count, } + charts[name] = chart end -function commands.step_stop_chart() +local function step_stop_chart() + chart.count = count end -function commands.step_make_chart(settings) +local function step_make_chart(settings) local chartsettings = settings.chart if not chartsettings then - print("no chart") + if trace then + report("no chart") + end return end local chartname = chartsettings.name if not chartname then - print("no name given") + if trace then + report("no name given") + end return end local chart = charts[chartname] if not chart then - print("no such chart",chartname) + if trace then + report("no such chart: %s",chartname) + end return end local steps = chart.steps or { } -- table.setmetatableindex(settings,defaults) -- - if trace_charts then - inspect(steps) + if trace then + report(table.serialize(steps,"chartdata")) end -- local textsettings = settings.text local cellsettings = settings.cell local linesettings = settings.line -- + -- just process MP directly so that we can pass an array + -- context.startMPcode() context("if unknown context_cell : input mp-step.mpiv ; fi ;") context("step_begin_chart ;") -- - if chartsettings.alternative == variables.vertical then + local alternative = utilities.parsers.settings_to_hash(chartsettings.alternative) + local vertical = alternative[variables.vertical] + local align = alternative[variables.three] + local category = chartsettings.category + -- + context('chart_category := "%s" ;',category) + -- + if vertical then context("chart_vertical := true ;") end + if align then + context("chart_align := true ;") + end -- context("text_line_color := \\MPcolor{%s} ;", textsettings.framecolor) - context("text_line_width := %p ;", textsettings.rulethickness) + context("text_line_width := %p ;", textsettings.rulethickness) context("text_fill_color := \\MPcolor{%s} ;", textsettings.backgroundcolor) - context("text_offset := %p ;", textsettings.offset) - context("text_distance_set := %p ;", textsettings.distance) + context("text_offset := %p ;", textsettings.offset) + context("text_distance_set := %p ;", textsettings.distance) -- - context("cell_line_color := \\MPcolor{%s} ;", cellsettings.framecolor) - context("cell_line_width := %p ;", cellsettings.rulethickness) - context("cell_fill_color := \\MPcolor{%s} ;", cellsettings.backgroundcolor) - context("cell_offset := %p ;", cellsettings.offset) - context("cell_distance_x := %p ;", cellsettings.dx) - context("cell_distance_y := %p ;", cellsettings.dy) + context("cell_line_color := \\MPcolor{%s} ;", cellsettings.framecolor) + context("cell_line_width := %p ;", cellsettings.rulethickness) + context("cell_fill_color := \\MPcolor{%s} ;", cellsettings.backgroundcolor) + context("cell_offset := %p ;", cellsettings.offset) + context("cell_distance_x := %p ;", cellsettings.dx) + context("cell_distance_y := %p ;", cellsettings.dy) -- - context("line_line_color := \\MPcolor{%s} ;", linesettings.color) - context("line_line_width := %p ;", linesettings.rulethickness) - context("line_distance := %p ;", linesettings.distance) - context("line_offset := %p ;", linesettings.offset) + context("line_line_color := \\MPcolor{%s} ;", linesettings.color) + context("line_line_width := %p ;", linesettings.rulethickness) + context("line_distance := %p ;", linesettings.distance) + context("line_offset := %p ;", linesettings.offset) + context("line_height := %p ;", linesettings.height) -- - for i=1,#steps do + for i=1,chart.count do local step = steps[i] context("step_begin_cell ;") - if step.cell_top ~= "" then - context('step_cell_top("%s") ;',string.strip(step.cell_top)) + local ali = step.cell_ali + local top = step.cell_top + local bot = step.cell_bot + if ali then + local text = ali.text + local shape = ali.shape + context('step_cell_ali(%s,%s,%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i) ;', + tonumber(text.left) or 0, + tonumber(text.middle) or 0, + tonumber(text.right) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24 + ) end - if step.cell_bot ~= "" then - context('step_cell_bot("%s") ;',string.strip(step.cell_bot)) + if top then + local shape = top.shape + context('step_cell_top(%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i) ;', + tonumber(top.text.top) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24 + ) end - if step.text_top ~= "" then - context('step_text_top("%s") ;',string.strip(step.text_top)) + if bot then + local shape = bot.shape + context('step_cell_bot(%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i) ;', + tonumber(bot.text.bot) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24 + ) end - if step.text_mid ~= "" then - context('step_text_mid("%s") ;',string.strip(step.text_mid)) + local top = step.text_top + local mid = step.text_mid + local bot = step.text_bot + local s_t = step.start_t + local s_m = step.start_m + local s_b = step.start_b +-- if vertical then +-- top, bot, s_t, s_b = bot, top, s_b, s_t +-- end + if top then + local shape = top.shape + local line = top.line + context('step_text_top(%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i,\\MPcolor{%s},%p,%i) ;', + tonumber(top.text.top) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24, + line.color, + line.rulethickness, + tonumber(line.alternative) or 1 + ) end - if step.text_bot ~= "" then - context('step_text_bot("%s") ;',string.strip(step.text_bot)) + if mid then -- used ? + local shape = mid.shape + local line = mid.line + context('step_text_mid(%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i,\\MPcolor{%s},%p,%i) ;', + tonumber(mid.text.mid) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24, + line.color, + line.rulethickness, + tonumber(line.alternative) or 1 + ) end + if bot then + local shape = bot.shape + local line = bot.line + context('step_text_bot(%s,\\MPcolor{%s},\\MPcolor{%s},%p,%i,\\MPcolor{%s},%p,%i) ;', + tonumber(bot.text.bot) or 0, + shape.framecolor, + shape.backgroundcolor, + shape.rulethickness, + tonumber(shape.alternative) or 24, + line.color, + line.rulethickness, + tonumber(line.alternative) or 1 + ) + end + context('start_t[%i] := %i ;',i,s_t) + context('start_m[%i] := %i ;',i,s_m) + context('start_b[%i] := %i ;',i,s_b) context("step_end_cell ;") end -- @@ -141,86 +259,253 @@ function commands.step_make_chart(settings) context.stopMPcode() end -function commands.step_cells(top,bot) - steps[#steps+1] = { - cell_top = top or "", - cell_bot = bot or "", - text_top = "", - text_mid = "", - text_bot = "", - } +local function step_cells(spec) + count = count + 1 + local step = steps[count] + step.cell_top = spec + step.cell_bot = spec end -function commands.step_texts(top,bot) - if #steps > 0 then - steps[#steps].text_top = top or "" - steps[#steps].text_bot = bot or "" +local function step_cells_three(spec) + count = count + 1 + local step = steps[count] + step.cell_ali = spec +end + +local function step_texts(spec) + if count > 0 then + local step = steps[count] + step.text_top = spec + step.text_bot = spec end end -function commands.step_cell(top) - steps[#steps+1] = { - cell_top = top or "", - cell_bot = "", - text_top = "", - text_mid = "", - text_bot = "", - } +local function step_cell(spec) + count = count + 1 + steps[count].cell_top = spec end -function commands.step_text(top) - if #steps > 0 then - steps[#steps].text_top = top or "" +local function step_text(spec) + if count > 0 then + local c = count + while true do + local step = steps[c] + if step.text_top then + c = c + 1 + step = steps[c] + else + step.text_top = spec + step.start_b = count + break + end + end end end -function commands.step_textset(left,middle,right) - if #steps > 0 then - steps[#steps].text_top = left or "" - steps[#steps].text_mid = middle or "" - steps[#steps].text_bot = right or "" +local function step_textset(spec) + if count > 0 then + count = count + 1 + local step = steps[count] + step.text_top = spec + step.text_mid = spec + step.text_bot = spec end end -function commands.step_start_cell() - steps[#steps+1] = { - cell_top = "", - cell_bot = "", - text_top = "", - text_mid = "", - text_bot = "", - } +local function step_start_cell() + count = count + 1 + local step = steps[count] -- creates end -function commands.step_stop_cell() +local function step_stop_cell() end -function commands.step_text_top(str) - if #steps > 0 then - steps[#steps].text_top = str or "" +local function step_text_top(spec) + if count > 0 then + steps[count].text_top = spec end end -function commands.step_text_mid(str) - if #steps > 0 then - steps[#steps].text_mid = str or "" +local function step_text_mid(spec) + if count > 0 then + steps[count].text_mid = spec end end -function commands.step_text_bot(str) - if #steps > 0 then - steps[#steps].text_bot = str or "" +local function step_text_bot(spec) + if count > 0 then + steps[count].text_bot = spec end end -function commands.step_cell_top(str) - if #steps > 0 then - steps[#steps].cell_top = str or "" +local function step_cell_top(spec) + if count > 0 then + steps[count].cell_top = spec end end -function commands.step_cell_bot(str) - if #steps > 0 then - steps[#steps].cell_bot = str or "" +local function step_cell_bot(spec) + if count > 0 then + steps[count].cell_bot = spec end end + +-- + +interfaces.implement { + name = "step_start_chart", + arguments = "string", + actions = step_start_chart, +} + +interfaces.implement { + name = "step_stop_chart", + actions = step_stop_chart, +} + +interfaces.implement { + name = "step_make_chart", + actions = step_make_chart, + arguments = { + { + { "chart", { + { "category" }, + { "name" }, + { "alternative" }, + } + }, + { "cell", { + { "alternative" }, + { "offset", "dimension" }, + { "rulethickness", "dimension" }, + { "framecolor" }, + { "backgroundcolor" }, + { "dx", "dimension" }, + { "dy", "dimension" }, + } + }, + { "text", { + { "alternative" }, + { "offset", "dimension" }, + { "distance", "dimension" }, + { "rulethickness", "dimension" }, + { "framecolor" }, + { "backgroundcolor" }, + } + }, + { "line", { + { "alternative" }, + { "rulethickness", "dimension" }, + { "height", "dimension" }, + { "distance", "dimension" }, + { "offset", "dimension" }, + { "color" }, + } + } + } + } +} + +local step_spec = { + { + { "text", { + { "top" }, + { "middle" }, + { "mid" }, + { "bot" }, + { "left" }, + { "right" }, + } + }, + { "shape", { + { "rulethickness", "dimension" }, + { "alternative" }, + { "framecolor" }, + { "backgroundcolor" }, + } + }, + { "line", { + { "alternative" }, + { "rulethickness", "dimension" }, + { "color" }, + { "offset", "dimension" }, + } + } + } +} + +interfaces.implement { + name = "step_cell", + arguments = step_spec, + actions = step_cell, +} + +interfaces.implement { + name = "step_text", + arguments = step_spec, + actions = step_text, +} + +interfaces.implement { + name = "step_textset", + arguments = step_spec, + actions = step_textset, +} + +interfaces.implement { + name = "step_text_top", + arguments = step_spec, + actions = step_text_top, +} + +interfaces.implement { + name = "step_text_mid", + arguments = step_spec, + actions = step_text_mid, +} + +interfaces.implement { + name = "step_text_bot", + arguments = step_spec, + actions = step_text_bot, +} + +interfaces.implement { + name = "step_cell_top", + arguments = step_spec, + actions = step_cell_top, +} + +interfaces.implement { + name = "step_cell_bot", + arguments = step_spec, + actions = step_cell_bot, +} + +interfaces.implement { + name = "step_start_cell", + actions = step_start_cell, +} + +interfaces.implement { + name = "step_stop_cell", + actions = step_stop_cell, +} + +interfaces.implement { + name = "step_texts", + arguments = step_spec, + actions = step_texts, +} + +interfaces.implement { + name = "step_cells", + arguments = step_spec, + actions = step_cells, +} + +interfaces.implement { + name = "step_cells_three", + arguments = step_spec, + actions = step_cells_three, +} diff --git a/tex/context/modules/mkiv/m-steps.mkvi b/tex/context/modules/mkiv/m-steps.mkvi index c9c5a0636..76aeed41f 100644 --- a/tex/context/modules/mkiv/m-steps.mkvi +++ b/tex/context/modules/mkiv/m-steps.mkvi @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% multiple texts? +% This code is not optimized. \registerctxluafile{m-steps}{} @@ -23,11 +23,11 @@ \installcorenamespace {steptexts} \installcorenamespace {steplines} -\installsimplecommandhandler \??stepcharts {STEPchart} \??stepcharts -\installsimplecommandhandler \??steptables {STEPtable} \??steptables -\installsimplecommandhandler \??stepcells {STEPcell} \??stepcells -\installsimplecommandhandler \??steptexts {STEPtext} \??steptexts -\installsimplecommandhandler \??steplines {STEPline} \??steplines +\installstylisticautosetuphandler \??stepcharts {STEPchart} \??stepcharts +\installstylisticautosetuphandler \??steptables {STEPtable} \??steptables +\installstylisticautosetuphandler \??stepcells {STEPcell} \??stepcells +\installstylisticautosetuphandler \??steptexts {STEPtext} \??steptexts +\installstylisticautosetuphandler \??steplines {STEPline} \??steplines \let\setupSTEPcharts\setupSTEPchart \let\setupSTEPtables\setupSTEPtable @@ -35,15 +35,21 @@ \let\setupSTEPtexts \setupSTEPtext \let\setupSTEPlines \setupSTEPline +\let\setSTEPchartsparameter\setSTEPchartparameter +\let\setSTEPtablesparameter\setSTEPtableparameter +\let\setSTEPcellsparameter \setSTEPcellparameter +\let\setSTEPtextsparameter \setSTEPtextparameter +\let\setSTEPlinesparameter \setSTEPlineparameter + % numeric text_text_distance ; text_text_distance := 20pt ; % numeric step_distance ; step_distance := 20pt ; \setupSTEPcharts [\c!alternative=\v!horizontal, + %\c!offset=.15\bodyfontsize + %\c!height=2ex \c!before=\blank, \c!after=\blank] -% \c!offset=.15\bodyfontsize -% \c!height=2ex % \setupSTEPtables % [\c!before=\blank, @@ -55,22 +61,22 @@ % \c!offset=.15\bodyfontsize] \setupSTEPcells - [\c!alternative=1, % TODO -% \c!style=, -% \c!color=, + [\c!alternative=24, + \c!style=, + \c!color=, \c!dx=\bodyfontsize, \c!dy=\bodyfontsize, - \c!background=\v!color, + % \c!background=\v!color, \c!backgroundcolor=STEPbackgroundcolor, \c!rulethickness=.1\bodyfontsize, \c!framecolor=STEPframecolor, \c!offset=.25\bodyfontsize] \setupSTEPtexts - [\c!alternative=1, % TODO -% \c!style=\v!smallbodyfont, -% \c!color=, - \c!background=\v!color, + [\c!alternative=24, + \c!style=\v!smallbodyfont, + \c!color=, + % \c!background=\v!color, \c!backgroundcolor=STEPbackgroundcolor, \c!rulethickness=.1\bodyfontsize, \c!framecolor=STEPframecolor, @@ -78,7 +84,7 @@ \c!offset=.25\bodyfontsize] \setupSTEPlines - [\c!alternative=1, % TODO + [\c!alternative=1, \c!rulethickness=.15\bodyfontsize, \c!height=3\bodyfontsize, \c!distance=.5\bodyfontsize, @@ -89,31 +95,76 @@ \definecolor [STEPframecolor] [s=.7] \definecolor [STEPbackgroundcolor] [s=.9] +\newcount\c_module_steps_tag +\newmacro\m_module_steps_category + +\unexpanded\def\setSTEPbox#tag#str% + {\setbox\scratchbox\hbox\bgroup + \begstrut + \ignorespaces + #str% + \removeunwantedspaces + \endstrut + \egroup + \ifzeropt\wd\scratchbox + \let#1\empty + \else + \global\advance\c_module_steps_tag\plusone + \edef#tag{\the\c_module_steps_tag}% + \putboxincache{\??stepcharts\m_module_steps_category}{#tag}\scratchbox + \fi} + \newtoks\everySTEPchart +% we used to save charts but that is tricky with so much delegated to lua +% and mp so now we do support a buffered way only + +\def\module_steps_syncronize + {\let\currentSTEPtext\p_category + \let\currentSTEPcell\p_category + \let\currentSTEPline\p_category + \checkSTEPcellparent + \checkSTEPtextparent + \checkSTEPlineparent} + \unexpanded\def\startSTEPchart {\begingroup \dodoubleempty\module_steps_start_chart} \def\module_steps_start_chart[#name][#settings]% - {\startnointerference - \iffirstargument + {\iffirstargument \doifelseassignment{#name} {\let\currentSTEPchart\empty - \xdef\module_steps_flush_chart{\module_steps_chart[][#name]}} + \let\m_module_steps_category\empty + \setupcurrentSTEPchart[#name]% + \def\module_steps_flush_chart{\module_steps_chart[][#name]}} {\edef\currentSTEPchart{#name}% - \glet\module_steps_flush_chart\relax}% settings are not stored + \let\m_module_steps_category\currentSTEPchart + \resetboxesincache{\??stepcharts\m_module_steps_category}% + \setupcurrentSTEPchart[#settings]% + \let\module_steps_flush_chart\relax}% settings are not stored \else \let\currentSTEPchart\empty - \gdef\module_steps_flush_chart{\module_steps_chart[][]}% + \def\module_steps_flush_chart{\module_steps_chart[][]}% \fi + \edef\p_category{\STEPchartparameter\c!category}% + \let\currentSTEPtext\p_category + \let\currentSTEPcell\p_category + \let\currentSTEPline\p_category + \checkSTEPcellparent + \checkSTEPtextparent + \checkSTEPlineparent \the\everySTEPchart - \ctxcommand{step_start_chart("\currentSTEPchart")}} + \startnointerference + \clf_step_start_chart{\currentSTEPchart}} \unexpanded\def\stopSTEPchart - {\ctxcommand{step_stop_chart()}% + {\clf_step_stop_chart \stopnointerference \module_steps_flush_chart + \ifx\m_module_steps_category\empty + \resetboxesincache{\??stepcharts}% + \fi \endgroup} \unexpanded\def\startSTEPtable @@ -123,13 +174,24 @@ \let\stopSTEPtable\stopSTEPchart +\unexpanded\def\startSTEPaligntable + {\begingroup + \setupSTEPchart[\c!alternative={\v!vertical,\v!three}]% + \let\module_steps_cells\module_steps_cells_three % no nesting yet + \dodoubleempty\module_steps_start_chart} + +\let\stopSTEPaligntable\stopSTEPchart + \let\module_steps_flush_chart\relax +% \resetboxesincache\??stepcharts + \unexpanded\def\STEPchart {\dodoubleempty\module_steps_chart} \unexpanded\def\module_steps_chart[#name][#settings]% {\begingroup + \edef\m_module_steps_category{#name}% \setupSTEPchart[#settings]% \ifinsidefloat \makeSTEPchart[#name]% @@ -144,70 +206,221 @@ \endgroup} \unexpanded\def\makeSTEPchart[#name]% - {\ctxcommand{step_make_chart { - chart = { - name = "#name", - alternative = "\STEPchartparameter\c!alternative", - }, - cell = { - alternative = "\STEPcellparameter\c!alternative", % TODO: shapes - offset = \number\dimexpr\STEPcellparameter\c!offset, - rulethickness = \number\dimexpr\STEPcellparameter\c!rulethickness, - framecolor = "\STEPcellparameter\c!framecolor", - backgroundcolor = "\STEPcellparameter\c!backgroundcolor", - dx = \number\dimexpr\STEPcellparameter\c!dx, - dy = \number\dimexpr\STEPcellparameter\c!dy, - }, - text = { - alternative = "\STEPtextparameter\c!alternative", % TODO: shapes - offset = \number\dimexpr\STEPtextparameter\c!offset, - distance = \number\dimexpr\STEPtextparameter\c!distance, - rulethickness = \number\dimexpr\STEPtextparameter\c!rulethickness, - framecolor = "\STEPtextparameter\c!framecolor", - backgroundcolor = "\STEPtextparameter\c!backgroundcolor", - }, - line = { - alternative = "\STEPlineparameter\c!alternative", % TODO: dash, arrow - rulethickness = \number\dimexpr\STEPlineparameter\c!rulethickness, - height = \number\dimexpr\STEPlineparameter\c!height, - distance = \number\dimexpr\STEPlineparameter\c!distance, - offset = \number\dimexpr\STEPlineparameter\c!offset, - color = "\STEPlineparameter\c!color", - }, - }}} - -\unexpanded\def\startSTEPcell - {\ctxcommand{step_start_cell()}} - -\unexpanded\def\stopSTEPcell - {\ctxcommand{step_stop_cell()}} - -\unexpanded\def\module_steps_cells#top#bot% - {\ctxcommand{step_cells(\!!bs\detokenize{#top}\!!es,\!!bs\detokenize{#bot}\!!es)}} - -\unexpanded\def\module_steps_texts#top#bot% - {\ctxcommand{step_texts(\!!bs\detokenize{#top}\!!es,\!!bs\detokenize{#bot}\!!es)}} - -\unexpanded\def\module_steps_cell#str% - {\ctxcommand{step_cell(\!!bs\detokenize{#str}\!!es)}} - -\unexpanded\def\module_steps_text#str% - {\ctxcommand{step_text(\!!bs\detokenize{#str}\!!es)}} - -\unexpanded\def\module_steps_textset#left#middle#right% - {\ctxcommand{step_textset(\!!bs\detokenize{#left}\!!es,\!!bs\detokenize{#middle}\!!es,\!!bs\detokenize{#right}\!!es)}} - -\unexpanded\def\module_steps_toptext#top% - {\ctxcommand{step_text_top(\!!bs\detokenize{#top}\!!es)}} - -\unexpanded\def\module_steps_bottext#bot% - {\ctxcommand{step_text_bot(\!!bs\detokenize{#bot}\!!es)}} - -\unexpanded\def\module_steps_topcell#top% - {\ctxcommand{step_cell_top(\!!bs\detokenize{#top}\!!es)}} - -\unexpanded\def\module_steps_botcell#bot% - {\ctxcommand{step_cell_bot(\!!bs\detokenize{#bot}\!!es)}} + {\clf_step_make_chart + chart { + category {\??stepcharts\m_module_steps_category} + name {#name} + alternative {\STEPchartparameter\c!alternative} + } + cell { + alternative {\STEPcellparameter\c!alternative} + offset \dimexpr\STEPcellparameter\c!offset\relax + rulethickness \dimexpr\STEPcellparameter\c!rulethickness\relax + framecolor {\STEPcellparameter\c!framecolor} + backgroundcolor {\STEPcellparameter\c!backgroundcolor} + dx \dimexpr\STEPcellparameter\c!dx\relax + dy \dimexpr\STEPcellparameter\c!dy\relax + } + text { + alternative {\STEPtextparameter\c!alternative} + offset \dimexpr\STEPtextparameter\c!offset\relax + distance \dimexpr\STEPtextparameter\c!distance\relax + rulethickness \dimexpr\STEPtextparameter\c!rulethickness\relax + framecolor {\STEPtextparameter\c!framecolor} + backgroundcolor {\STEPtextparameter\c!backgroundcolor} + } + line { + alternative {\STEPlineparameter\c!alternative} + rulethickness \dimexpr\STEPlineparameter\c!rulethickness\relax + height \dimexpr\STEPlineparameter\c!height\relax + distance \dimexpr\STEPlineparameter\c!distance\relax + offset \dimexpr\STEPlineparameter\c!offset\relax + color {\STEPlineparameter\c!color} + } + \relax} + +\unexpanded\def\startSTEPcell{\clf_step_start_cell} +\unexpanded\def\stopSTEPcell {\clf_step_stop_cell} + +\unexpanded\def\module_steps_cells {\dosingleempty\module_steps_cells_indeed} +\unexpanded\def\module_steps_cells_three{\dosingleempty\module_steps_cells_three_indeed} +\unexpanded\def\module_steps_texts {\dosingleempty\module_steps_texts_indeed} +\unexpanded\def\module_steps_cell {\dosingleempty\module_steps_cell_indeed} +\unexpanded\def\module_steps_text {\dosingleempty\module_steps_text_indeed} +%unexpanded\def\module_steps_textset {\dosingleempty\module_steps_textset_indeed} +\unexpanded\def\module_steps_toptext {\dosingleempty\module_steps_toptext_indeed} +\unexpanded\def\module_steps_bottext {\dosingleempty\module_steps_bottext_indeed} +\unexpanded\def\module_steps_topcell {\dosingleempty\module_steps_topcell_indeed} +\unexpanded\def\module_steps_botcell {\dosingleempty\module_steps_botcell_indeed} + +\def\module_steps_check_cell#category% + {\edef\p_category{#category}% + \ifx\p_category\empty \else + \let\currentSTEPcell\p_category + \let\currentSTEPline\p_category + \checkSTEPcellparent + \checkSTEPlineparent + \fi} + +\def\module_steps_check_text#category% + {\edef\p_category{#category}% + \ifx\p_category\empty \else + \let\currentSTEPtext\p_category + \let\currentSTEPline\p_category + \checkSTEPtextparent + \checkSTEPlineparent + \fi} + +\def\module_steps_pass_data#1#2% + {{ + text { + #2 + } + shape { + rulethickness \dimexpr#1\c!rulethickness\relax + alternative {#1\c!alternative} + framecolor {#1\c!framecolor} + backgroundcolor {#1\c!backgroundcolor} + } + line { + rulethickness \dimexpr\STEPlineparameter\c!rulethickness\relax + alternative {\STEPlineparameter\c!alternative} + color {\STEPlineparameter\c!color} + offset \dimexpr\STEPlineparameter\c!offset\relax + } + }} + +\def\module_steps_cells_indeed[#category]#top#bot% + {\begingroup + \iffirstargument + \module_steps_check_cell{#category}% + \fi + \useSTEPcellstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#top}% + \setSTEPbox\module_steps_tag_b{#bot}% + \clf_step_cells \module_steps_pass_data \STEPcellparameter { + top {\module_steps_tag_a} + bot {\module_steps_tag_b} + } + \endgroup} + +\def\module_steps_cells_three_indeed[#category]#one#two#three% + {\begingroup + \iffirstargument + \module_steps_check_cell{#category}% + \fi + \useSTEPcellstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#one}% + \setSTEPbox\module_steps_tag_b{#two}% + \setSTEPbox\module_steps_tag_c{#three}% + \clf_step_cells_three \module_steps_pass_data \STEPcellparameter { + left {\module_steps_tag_a} + middle {\module_steps_tag_b} + right {\module_steps_tag_c} + }% + \endgroup} + +\def\module_steps_texts_indeed[#category]#top#bot% + {\begingroup + \iffirstargument + \module_steps_check_text{#category}% + \fi + \useSTEPtextstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#top}% + \setSTEPbox\module_steps_tag_b{#bot}% + \clf_step_texts \module_steps_pass_data \STEPtextparameter { + top {\module_steps_tag_a} + bot {\module_steps_tag_b} + }% + \endgroup} + +\def\module_steps_cell_indeed[#category]#str% + {\begingroup + \iffirstargument + \module_steps_check_cell{#category}% + \fi + \useSTEPcellstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#str}% + \clf_step_cell \module_steps_pass_data \STEPcellparameter { + top {\module_steps_tag_a} + }% + \endgroup} + +\def\module_steps_text_indeed[#category]#str% + {\begingroup + \iffirstargument + \module_steps_check_text{#category}% + \fi + \useSTEPtextstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#str}% + \clf_step_text \module_steps_pass_data \STEPtextparameter { + top {\module_steps_tag_a} + }% + \endgroup} + +% \def\module_steps_textset_indeed[#category]#left#middle#right% +% {\begingroup +% \iffirstargument +% \module_steps_check_text{#category}% +% \fi +% \useSTEPtextstyleandcolor\c!style\c!color +% \setSTEPbox\module_steps_tag_a{#left}% +% \setSTEPbox\module_steps_tag_b{#middle}% +% \setSTEPbox\module_steps_tag_c{#right}% +% \clf_step_textset \module_steps_pass_data \STEPtextparameter { +% left {\module_steps_tag_a} +% middle {\module_steps_tag_a} +% right {\module_steps_tag_a} +% }% +% \endgroup} + +\def\module_steps_toptext_indeed[#category]#top% + {\begingroup + \iffirstargument + \module_steps_check_text{#category}% + \fi + \useSTEPtextstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#top}% + \clf_step_text_top \module_steps_pass_data \STEPtextparameter { + top {\module_steps_tag_a} + }% + \endgroup} + +\def\module_steps_bottext_indeed[#category]#bot% + {\begingroup + \iffirstargument + \module_steps_check_text{#category}% + \fi + \useSTEPtextstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#bot}% + \clf_step_text_bot \module_steps_pass_data \STEPtextparameter { + bot {\module_steps_tag_a} + }% + \endgroup} + +\def\module_steps_topcell_indeed[#category]#top% + {\begingroup + \iffirstargument + \module_steps_check_cell{#category}% + \fi + \useSTEPcellstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#top}% + \clf_step_cell_top \module_steps_pass_data \STEPcellparameter { + top {\module_steps_tag_a} + }% + \endgroup} + +\def\module_steps_botcell_indeed[#category]#bot% + {\begingroup + \iffirstargument + \module_steps_check_cell{#category}% + \fi + \useSTEPcellstyleandcolor\c!style\c!color + \setSTEPbox\module_steps_tag_a{#bot}% + \clf_step_cell_bot \module_steps_pass_data \STEPcellparameter { + bot {\module_steps_tag_a} + }% + \endgroup} \appendtoks \let\cells \module_steps_cells @@ -223,43 +436,83 @@ % todo: mapping can be done in lua +% chart table cell text line + +\unexpanded\def\setSTEPxmldirective#1#2#3% + {\begincsname setSTEP#1parameter\endcsname{#2}{#3}} + +\xmlinstalldirective{stepchart}{setSTEPxmldirective} + \startxmlsetups xml:step:define - \xmlsetsetup{#1} {stepchart|steptable} {xml:step:*} + \xmlsetsetup + {#1} + {stepchart|steptable|stepaligntable|cells|texts|stepcell|cell|text} + {xml:step:*} \stopxmlsetups \xmlregistersetup{xml:step:define} \startxmlsetups xml:step:stepchart - \startSTEPchart - \xmlfilter{#1}{/(cells|texts|stepcell|cell|text)/command(xml:step:*)} + \startSTEPchart[\c!category=\xmlatt{#1}{class}] + \xmlflush{#1} \stopSTEPchart \stopxmlsetups \startxmlsetups xml:step:steptable - \startSTEPtable - \xmlfilter{#1}{/(cells|texts|stepcell|cell|text)/command(xml:step:*)} + \startSTEPtable[\c!category=\xmlatt{#1}{class}] + \xmlflush{#1} \stopSTEPtable \stopxmlsetups +\startxmlsetups xml:step:stepaligntable + \startSTEPaligntable[\c!category=\xmlatt{#1}{class}] + \xmlflush{#1} + \stopSTEPaligntable +\stopxmlsetups + \startxmlsetups xml:step:cells - \cells {\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} + \xmldoifelse {#1} {/c1} { + \cells + [\xmlatt{#1}{class}] + {\xmltext{#1}{/c1}} + {\xmltext{#1}{/c2}} + {\xmltext{#1}{/c3}} + } { + \cells + [\xmlatt{#1}{class}] + {\xmltext{#1}{/top}} + {\xmltext{#1}{/bot}} + } \stopxmlsetups \startxmlsetups xml:step:texts - \texts {\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} + \texts + [\xmlatt{#1}{class}] + {\xmltext{#1}{/top}} + {\xmltext{#1}{/bot}} \stopxmlsetups \startxmlsetups xml:step:stepcell - \cells {\xmltext{#1}{/topcell}} {\xmltext{#1}{/botcell}} - \texts {\xmltext{#1}{/toptext}} {\xmltext{#1}{/bottext}} + \cells + [\xmlatt{#1}{class}] + {\xmltext{#1}{/topcell}} + {\xmltext{#1}{/botcell}} + \texts + [\xmlatt{#1}{class}] + {\xmltext{#1}{/toptext}} + {\xmltext{#1}{/bottext}} \stopxmlsetups \startxmlsetups xml:step:cell - \cell {\xmlflush{#1}} + \cell + [\xmlatt{#1}{class}] + {\xmlflush{#1}} \stopxmlsetups \startxmlsetups xml:step:text - \text {\xmlflush{#1}} + \text + [\xmlatt{#1}{class}] + {\xmlflush{#1}} \stopxmlsetups \protect @@ -268,11 +521,13 @@ \starttext +\setupSTEPcells[demo-1][style=bold] + \startbuffer some cell some text - some cell + some cell some text some cell @@ -280,7 +535,6 @@ \typebuffer \processxmlbuffer - \startbuffer some cell @@ -310,7 +564,6 @@ \cell {three} \stopSTEPtable - \page \startbuffer diff --git a/tex/context/modules/mkiv/s-fonts-features.lua b/tex/context/modules/mkiv/s-fonts-features.lua index 7300cb768..f78300f32 100644 --- a/tex/context/modules/mkiv/s-fonts-features.lua +++ b/tex/context/modules/mkiv/s-fonts-features.lua @@ -83,6 +83,51 @@ local function collectkerns(tfmdata,feature) local lookuphash = resources.lookuphash local feature = feature or "kern" if sequences then + + if true then + + for i=1,#sequences do + local sequence = sequences[i] + if sequence.features and sequence.features[feature] then + local steps = sequence.steps + for i=1,#steps do + local step = steps[i] + local format = step.format + for unicode, hash in table.sortedhash(step.coverage) do + local kerns = combinations[unicode] + if not kerns then + kerns = { } + combinations[unicode] = kerns + end + for otherunicode, kern in table.sortedhash(hash) do + if format == "pair" then + local f = kern[1] + local s = kern[2] + if f then + if s then + -- todo + else + if not kerns[otherunicode] and f[3] ~= 0 then + kerns[otherunicode] = f[3] + end + end + elseif s then + -- todo + end + elseif format == "kern" then + if not kerns[otherunicode] and kern ~= 0 then + kerns[otherunicode] = kern + end + end + end + end + end + end + end + end + + else -- old loader + for i=1,#sequences do local sequence = sequences[i] if sequence.features and sequence.features[feature] then @@ -107,7 +152,9 @@ local function collectkerns(tfmdata,feature) end end end + end + return combinations end @@ -142,6 +189,7 @@ function moduledata.fonts.features.showallkerns(specification) local tfmdata = fonts.hashes.identifiers[id] local allkerns = collectkerns(tfmdata) local characters = tfmdata.characters + local hfactor = tfmdata.parameters.hfactor if next(allkerns) then for first, pairs in sortedhash(allkerns) do context.par() @@ -150,7 +198,7 @@ function moduledata.fonts.features.showallkerns(specification) -- if not kerns and pairs[second] then -- -- weird -- end - showkernpair(first,kern,second,0) + showkernpair(first,kern*hfactor,second) end context.par() end diff --git a/tex/context/modules/mkiv/s-fonts-features.mkiv b/tex/context/modules/mkiv/s-fonts-features.mkiv index b81b53a71..efd74adf4 100644 --- a/tex/context/modules/mkiv/s-fonts-features.mkiv +++ b/tex/context/modules/mkiv/s-fonts-features.mkiv @@ -19,11 +19,11 @@ \installmodulecommandluasingle \showallkerns {moduledata.fonts.features.showallkerns} \installmodulecommandluasingle \showbasekerns {moduledata.fonts.features.showbasekerns} -\def\kernpairheight{\strutheight} -\def\kernpairdepth {\strutdepth} +\def\kernpairheight{.8\strutht} +\def\kernpairdepth {.8\strutdp} \def\kernpairwidth {\onepoint} -\unexpanded\def\showkernpair#1#2#3% first second kern +\unexpanded\def\showkernpair#1#2#3% first kern second {\dontleavehmode \hbox \bgroup \scratchdimen#2\scaledpoint diff --git a/tex/context/modules/mkiv/s-xml-analyzers.lua b/tex/context/modules/mkiv/s-xml-analyzers.lua index c356d4c37..99f6a1cdf 100644 --- a/tex/context/modules/mkiv/s-xml-analyzers.lua +++ b/tex/context/modules/mkiv/s-xml-analyzers.lua @@ -119,7 +119,11 @@ local function analyze(filename) end for i=1,#filename do - local root = xml.load(filename[i]) + local name = filename[i] + local root = xml.load(name) + -- + logs.report("xml analyze","loaded: %s",name) + -- collect(root) -- local names = root.statistics.entities.names @@ -160,9 +164,9 @@ function moduledata.xml.analyzers.structure(filename) for attribute, values in sortedhash(attributes) do local n = table.count(values) if attribute == "id" or attribute == "xml:id" or n > maxnofattributes then - NC() context(attribute) NC() context("%s different values",n) NC() NR() + NC() context("@%s",attribute) NC() context("%s different values",n) NC() NR() else - NC() context(attribute) NC() context.puretext(sequenced(values)) NC() NR() + NC() context("@%s",attribute) NC() context.puretext(sequenced(values)) NC() NR() end end end @@ -194,5 +198,3 @@ function moduledata.xml.analyzers.entities(filename) end context.stoptabulate() end - - diff --git a/tex/context/modules/mkiv/x-mathml.mkiv b/tex/context/modules/mkiv/x-mathml.mkiv index a5be5ddb0..5a9c4fdd2 100644 --- a/tex/context/modules/mkiv/x-mathml.mkiv +++ b/tex/context/modules/mkiv/x-mathml.mkiv @@ -1,6 +1,6 @@ %D \module %D [ file=x-mathml, -%D version=2008.05.29, +%D version=2008.05.29, (evolved from pre 2000 code) %D title=\CONTEXT\ XML Modules, %D subtitle=\MATHML, %D author=Hans Hagen, @@ -13,20 +13,14 @@ % \xmlfilter{#1}{/*/name()} -> \xmltag -% This module is under construction and will be cleaned up. We use a funny mix of -% xml, tex and lua. I could rewrite the lot but it also shows how context evolves. +% This implementation looks like a hack ... this is because we deal with all weird +% cases we ran into, including abuse that was supposed to render ok (even if it +% didn't in other renderers) .. it was simply expected to work that way. % -% I might end up with a lua-only implementation some day. I must find a good reason -% to spend time on it. In fact, it might even be more messy. -% -% no m:text strip (needs checking, maybe nbsp is mandate -% -% todo: more will be moved to lua (less hassle) -% todo: move left/right to the lua end -% -% this implememation looks like a hack ... this is because we deal with all weird cases we -% ran into, including abuse that was supposed to render ok (even if it didn't in other -% renderers) .. it was simply expected to work that way. +% So, consider this module to be under constant construction and clean up. We still +% use a funny mix of xml, tex and lua. I could rewrite the lot but it also shows how +% context evolves. I might end up with a lua-only implementation some day, but I must +% find a real good reason to spend time on it as so far it never paid back. \writestatus{loading}{ConTeXt XML Macros / MathML Renderer} @@ -2430,7 +2424,7 @@ \stopxmlsetups \startxmlsetups mml:mcolumn - \ctxmodulemathml{mcolumn("#1")} + \vbox{\ctxmodulemathml{mcolumn("#1")}}% needs checking \stopxmlsetups \def\mmlsetfakewidth#1{\setbox\scratchbox\hbox{#1}\scratchdimen\wd\scratchbox} diff --git a/tex/context/modules/mkiv/x-steps.mkiv b/tex/context/modules/mkiv/x-steps.mkiv index 29b3f7eaa..02b4cda77 100644 --- a/tex/context/modules/mkiv/x-steps.mkiv +++ b/tex/context/modules/mkiv/x-steps.mkiv @@ -18,6 +18,8 @@ \usemodule[m][steps] +\endinput + \unprotect \installcorenamespace {xmlstepchart} @@ -46,40 +48,40 @@ \xmlregistersetup{xml:ct:define} -\startxmlsetups xml:ct:prep - \expanded{\prep[\xmltoparameters{#1}]}{\xmlflush{#1}} -\stopxmlsetups +% \startxmlsetups xml:ct:prep +% \normalexpanded{\prep[\xmltoparameters{#1}]}{\xmlflush{#1}} +% \stopxmlsetups \startxmlsetups xml:ct:text - \expanded{\text[\xmltoparameters{#1}]}{\xmlflush{#1}} + \normalexpanded{\text[\xmltoparameters{#1}]}{\xmlflush{#1}} \stopxmlsetups \startxmlsetups xml:ct:texts - \expanded{\texts[\xmltoparameters{#1}]}{\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} + \normalexpanded{\texts[\xmltoparameters{#1}]}{\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} \stopxmlsetups \startxmlsetups xml:ct:cell - \expanded{\cell[\xmltoparameters{#1}]}{\xmlflush{#1}} + \normalexpanded{\cell[\xmltoparameters{#1}]}{\xmlflush{#1}} \stopxmlsetups \startxmlsetups xml:ct:cells - \expanded{\cells[\xmltoparameters{#1}]}{\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} + \normalexpanded{\cells[\xmltoparameters{#1}]}{\xmltext{#1}{/top}} {\xmltext{#1}{/bot}} \stopxmlsetups \startxmlsetups xml:ct:lines - \expanded{\startlines[\xmltoparameters{#1}]} + \normalexpanded{\startlines[\xmltoparameters{#1}]} \xmlflush{#1} \stoplines \stopxmlsetups \startxmlsetups xml:ct:steptable - \expanded{\startSTEPtable[\xmltoparameters{#1}]} + \normalexpanded{\startSTEPtable[\xmltoparameters{#1}]} \xmlflush{#1} \stopSTEPtable \stopxmlsetups \startxmlsetups xml:ct:stepchart - \expanded{\startSTEPchart[\xmltoparameters{#1}]} + \normalexpanded{\startSTEPchart[\xmltoparameters{#1}]} \xmlflush{#1} \stopSTEPchart \stopxmlsetups diff --git a/tex/generic/context/luatex/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua index 2a68b1c18..871e54853 100644 --- a/tex/generic/context/luatex/luatex-basics-gen.lua +++ b/tex/generic/context/luatex/luatex-basics-gen.lua @@ -97,6 +97,7 @@ local remapper = { -- fea = "font feature files", -- no longer supported pfb = "type1 fonts", -- needed for vector loading afm = "afm", + enc = "enc files", } function resolvers.findfile(name,fileformat) diff --git a/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua b/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua index 13acd16ca..793526f7b 100644 --- a/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua +++ b/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua @@ -1,3 +1,11 @@ +if not modules then modules = { } end modules ['luatex-fonts-demo-vf-1'] = { + version = 1.001, + comment = "companion to luatex-*.tex", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + local identifiers = fonts.hashes.identifiers return function(specification) diff --git a/tex/generic/context/luatex/luatex-fonts-demo-vf-4.lua b/tex/generic/context/luatex/luatex-fonts-demo-vf-4.lua index 00fc636a1..92ce4ffcb 100644 --- a/tex/generic/context/luatex/luatex-fonts-demo-vf-4.lua +++ b/tex/generic/context/luatex/luatex-fonts-demo-vf-4.lua @@ -1,3 +1,10 @@ +if not modules then modules = { } end modules ['luatex-fonts-demo-vf-4'] = { + version = 1.001, + comment = "companion to luatex-*.tex", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} return function(specification) local t = { } diff --git a/tex/generic/context/luatex/luatex-fonts-enc.lua b/tex/generic/context/luatex/luatex-fonts-enc.lua index 2e1c6a466..c076d5947 100644 --- a/tex/generic/context/luatex/luatex-fonts-enc.lua +++ b/tex/generic/context/luatex/luatex-fonts-enc.lua @@ -11,19 +11,66 @@ if context then os.exit() end -local fonts = fonts -fonts.encodings = { } -fonts.encodings.agl = { } -fonts.encodings.known = { } +local fonts = fonts +local encodings = { } +fonts.encodings = encodings +encodings.agl = { } +encodings.known = { } -setmetatable(fonts.encodings.agl, { __index = function(t,k) +setmetatable(encodings.agl, { __index = function(t,k) if k == "unicodes" then texio.write(" ") local unicodes = dofile(resolvers.findfile("font-age.lua")) - fonts.encodings.agl = { unicodes = unicodes } + encodings.agl = { unicodes = unicodes } return unicodes else return nil end end }) +-- adapted for generic + +encodings.cache = containers.define("fonts", "enc", encodings.version, true) + +function encodings.load(filename) + local name = file.removesuffix(filename) + local data = containers.read(encodings.cache,name) + if data then + return data + end + local vector, tag, hash, unicodes = { }, "", { }, { } + local foundname = resolvers.findfile(filename,'enc') + if foundname and foundname ~= "" then + local ok, encoding, size = resolvers.loadbinfile(foundname) + if ok and encoding then + encoding = string.gsub(encoding,"%%(.-)\n","") + local unicoding = encodings.agl.unicodes + local tag, vec = string.match(encoding,"/(%w+)%s*%[(.*)%]%s*def") + local i = 0 + for ch in string.gmatch(vec,"/([%a%d%.]+)") do + if ch ~= ".notdef" then + vector[i] = ch + if not hash[ch] then + hash[ch] = i + else + -- duplicate, play safe for tex ligs and take first + end + local u = unicoding[ch] + if u then + unicodes[u] = i + end + end + i = i + 1 + end + end + end + local data = { + name = name, + tag = tag, + vector = vector, + hash = hash, + unicodes = unicodes + } + return containers.write(encodings.cache, name, data) +end + diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 9981b1aa6..3c21f19c8 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 : 06/20/16 22:14:55 +-- merge date : 06/25/16 14:38:07 do -- begin closure to overcome local limits and interference @@ -4327,6 +4327,7 @@ local remapper={ cidmap="cid maps", pfb="type1 fonts", afm="afm", + enc="enc files", } function resolvers.findfile(name,fileformat) name=string.gsub(name,"\\","/") @@ -5849,15 +5850,17 @@ end local psfake=0 local function fixedpsname(psname,fallback) local usedname=psname - if not psname or psname=="" then - psname=fallback - usedname=gsub(psname,"[^a-zA-Z0-9]+","-") - elseif find(psname," ") then - usedname=gsub(psname,"[%s]+","-") - end - if not psname or psname=="" then + if psname and psname~="" then + if find(psname," ") then + usedname=gsub(psname,"[%s]+","-") + else + end + elseif not fallback or fallback=="" then psfake=psfake+1 psname="fakename-"..psfake + else + psname=fallback + usedname=gsub(psname,"[^a-zA-Z0-9]+","-") end return usedname,psname~=usedname end @@ -6796,19 +6799,61 @@ if context then os.exit() end local fonts=fonts -fonts.encodings={} -fonts.encodings.agl={} -fonts.encodings.known={} -setmetatable(fonts.encodings.agl,{ __index=function(t,k) +local encodings={} +fonts.encodings=encodings +encodings.agl={} +encodings.known={} +setmetatable(encodings.agl,{ __index=function(t,k) if k=="unicodes" then texio.write(" ") local unicodes=dofile(resolvers.findfile("font-age.lua")) - fonts.encodings.agl={ unicodes=unicodes } + encodings.agl={ unicodes=unicodes } return unicodes else return nil end end }) +encodings.cache=containers.define("fonts","enc",encodings.version,true) +function encodings.load(filename) + local name=file.removesuffix(filename) + local data=containers.read(encodings.cache,name) + if data then + return data + end + local vector,tag,hash,unicodes={},"",{},{} + local foundname=resolvers.findfile(filename,'enc') + if foundname and foundname~="" then + local ok,encoding,size=resolvers.loadbinfile(foundname) + if ok and encoding then + encoding=string.gsub(encoding,"%%(.-)\n","") + local unicoding=encodings.agl.unicodes + local tag,vec=string.match(encoding,"/(%w+)%s*%[(.*)%]%s*def") + local i=0 + for ch in string.gmatch(vec,"/([%a%d%.]+)") do + if ch~=".notdef" then + vector[i]=ch + if not hash[ch] then + hash[ch]=i + else + end + local u=unicoding[ch] + if u then + unicodes[u]=i + end + end + i=i+1 + end + end + end + local data={ + name=name, + tag=tag, + vector=vector, + hash=hash, + unicodes=unicodes + } + return containers.write(encodings.cache,name,data) +end end -- closure @@ -11302,10 +11347,15 @@ local function readcoverage(f,offset,simple) end return coverage end -local function readclassdef(f,offset) +local function readclassdef(f,offset,preset) setposition(f,offset) local classdefformat=readushort(f) local classdef={} + if type(preset)=="number" then + for k=0,preset-1 do + classdef[k]=1 + end + end if classdefformat==1 then local index=readushort(f) local nofclassdef=readushort(f) @@ -11327,6 +11377,13 @@ local function readclassdef(f,offset) else report("unknown classdef format %a ",classdefformat) end + if type(preset)=="table" then + for k in next,preset do + if not classdef[k] then + classdef[k]=1 + end + end + end return classdef end local function classtocoverage(defs) @@ -11491,7 +11548,7 @@ local function unchainedcontext(f,fontdata,lookupid,lookupoffset,offset,glyphs,n local rules={} if subclasssets then coverage=readcoverage(f,tableoffset+coverage) - currentclassdef=readclassdef(f,tableoffset+currentclassdef) + currentclassdef=readclassdef(f,tableoffset+currentclassdef,coverage) local currentclasses=classtocoverage(currentclassdef,fontdata.glyphs) for class=1,#subclasssets do local offset=subclasssets[class] @@ -11615,9 +11672,9 @@ local function chainedcontext(f,fontdata,lookupid,lookupoffset,offset,glyphs,nof local rules={} if subclasssets then local coverage=readcoverage(f,tableoffset+coverage) - local beforeclassdef=readclassdef(f,tableoffset+beforeclassdef) - local currentclassdef=readclassdef(f,tableoffset+currentclassdef) - local afterclassdef=readclassdef(f,tableoffset+afterclassdef) + local beforeclassdef=readclassdef(f,tableoffset+beforeclassdef,nofglyphs) + local currentclassdef=readclassdef(f,tableoffset+currentclassdef,coverage) + local afterclassdef=readclassdef(f,tableoffset+afterclassdef,nofglyphs) local beforeclasses=classtocoverage(beforeclassdef,fontdata.glyphs) local currentclasses=classtocoverage(currentclassdef,fontdata.glyphs) local afterclasses=classtocoverage(afterclassdef,fontdata.glyphs) @@ -12008,8 +12065,8 @@ function gposhandlers.pair(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofgly local nofclasses2=readushort(f) local classlist=readpairclasssets(f,nofclasses1,nofclasses2,format1,format2) coverage=readcoverage(f,tableoffset+coverage) - classdef1=readclassdef(f,tableoffset+classdef1) - classdef2=readclassdef(f,tableoffset+classdef2) + classdef1=readclassdef(f,tableoffset+classdef1,coverage) + classdef2=readclassdef(f,tableoffset+classdef2,nofglyphs) local usedcoverage={} for g1,c1 in next,classdef1 do if coverage[g1] then @@ -15310,7 +15367,7 @@ local trace_defining=false registertracker("fonts.defining",function(v) trace_de local report_otf=logs.reporter("fonts","otf loading") local fonts=fonts local otf=fonts.handlers.otf -otf.version=3.024 +otf.version=3.025 otf.cache=containers.define("fonts","otl",otf.version,true) otf.svgcache=containers.define("fonts","svg",otf.version,true) otf.pdfcache=containers.define("fonts","pdf",otf.version,true) diff --git a/tex/generic/context/luatex/luatex-plain-tfm.lua b/tex/generic/context/luatex/luatex-plain-tfm.lua new file mode 100644 index 000000000..87b453689 --- /dev/null +++ b/tex/generic/context/luatex/luatex-plain-tfm.lua @@ -0,0 +1,113 @@ +if not modules then modules = { } end modules ['luatex-plain-tfm'] = { + version = 1.001, + comment = "companion to luatex-*.tex", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +-- \font\foo=file:luatex-plain-tfm.lua:tfm=csr10;enc=csr;pfb=csr10 at 12pt +-- +-- \foo áäčďěíĺľňóôŕřšťúýž ff ffi \input tufte + +return function(specification) + + local size = specification.size + local feat = specification.features and specification.features.normal + + if not feat then + return + end + + local tfm = feat.tfm + local enc = feat.enc or tfm + local pfb = feat.pfb or tfm + + if not tfm then + return + end + + local tfmfile = tfm .. ".tfm" + local encfile = enc .. ".enc" + local pfbfile = pfb .. ".pfb" + + local tfmdata, id = fonts.constructors.readanddefine("file:"..tfmfile,size) + + local encoding = fonts.encodings.load(encfile) + if encoding then + encoding = encoding.hash + else + encoding = false + end + + local unicoding = fonts.encodings.agl and fonts.encodings.agl.unicodes + + if tfmdata and encoding and unicoding then + + local characters = { } + local originals = tfmdata.characters + local indices = { } + local parentfont = { "font", 1 } + local mapline = tfm .. "<" .. pfbfile -- .."<"..encfile + + local dummy = unicoding.foo -- foo forces loading + + -- create characters table + + for name, index in next, encoding do + local unicode = unicoding[name] + if unicode then + local original = originals[index] + original.name = name -- so one can lookup weird names + original.commands = { parentfont, { "char", index } } + characters[unicode] = original + indices[index] = unicode + else + -- unknown name + end + end + + -- also include ligatures and whatever left + + local p = fonts.constructors.privateoffset + for k, v in next, originals do + if not indices[k] then + characters[p] = v + indices[k] = p + p = p + 1 + end + end + + -- redo kerns and ligatures + + for k, v in next, characters do + local kerns = v.kerns + if kerns then + local t = { } + for k, v in next, kerns do + local i = indices[k] + t[i] = v + end + v.kerns = t + end + local ligatures = v.ligatures + if ligatures then + local t = { } + for k, v in next, ligatures do + t[indices[k]] = v + v.char = indices[v.char] + end + v.ligatures = t + end + end + + -- wrap up + + tfmdata.fonts = { { id = id } } + tfmdata.characters = characters + + pdf.mapline(mapline) + + end + return tfmdata +end diff --git a/tex/generic/context/luatex/luatex-test.tex b/tex/generic/context/luatex/luatex-test.tex index 0bb752b3f..9dc7c3113 100644 --- a/tex/generic/context/luatex/luatex-test.tex +++ b/tex/generic/context/luatex/luatex-test.tex @@ -158,4 +158,10 @@ $\sin{x}$ % \textdir TRT\amiri بِسْمِ اللَّـهِ الرَّ‌حْمَـٰنِ الرَّ‌حِيمِ % \egroup +% assumes csr10.tfm csr10.pfb csr.enc to be present +% +% \font\foo=file:luatex-plain-tfm.lua:tfm=csr10;enc=csr;pfb=csr10 at 12pt +% +% \foo áäčďěíĺľňóôŕřšťúýž ff ffi + \end -- cgit v1.2.3