From 0e99988c85616897aa99e28c4f00d596d677f5ab Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Mon, 8 Aug 2016 21:30:04 +0200 Subject: 2016-08-08 21:06:00 --- tex/context/base/context-version.pdf | Bin 4261 -> 0 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/font-sel.lua | 56 ++-- tex/context/base/mkiv/font-sel.mkvi | 38 ++- tex/context/base/mkiv/lang-def.mkiv | 23 ++ tex/context/base/mkiv/lang-txt.lua | 320 +++++++++++++-------- tex/context/base/mkiv/math-dir.lua | 14 +- tex/context/base/mkiv/math-fen.mkiv | 28 +- tex/context/base/mkiv/mult-sys.mkiv | 30 +- tex/context/base/mkiv/status-files.pdf | Bin 9127 -> 0 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368500 -> 0 bytes tex/context/base/mkiv/strc-lev.mkvi | 2 +- tex/context/base/mkiv/strc-mat.mkiv | 2 +- tex/context/interface/mkiv/i-readme.pdf | Bin 60792 -> 0 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 16 files changed, 333 insertions(+), 186 deletions(-) delete mode 100644 tex/context/base/context-version.pdf delete mode 100644 tex/context/base/mkiv/status-files.pdf delete mode 100644 tex/context/base/mkiv/status-lua.pdf delete mode 100644 tex/context/interface/mkiv/i-readme.pdf (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf deleted file mode 100644 index 1fe4cc655..000000000 Binary files a/tex/context/base/context-version.pdf and /dev/null differ diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 171ace032..5e19d1573 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.08.01 14:16} +\newcontextversion{2016.08.08 21:04} %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 d2e8742e8..e6e40fde5 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.08.01 14:16} +\edef\contextversion{2016.08.08 21:04} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-sel.lua b/tex/context/base/mkiv/font-sel.lua index d5bb754f7..003b708c6 100644 --- a/tex/context/base/mkiv/font-sel.lua +++ b/tex/context/base/mkiv/font-sel.lua @@ -17,39 +17,39 @@ local splitat, lpegmatch = lpeg.splitat, lpeg.match local formatters = string.formatters local settings_to_array = utilities.parsers.settings_to_array local settings_to_hash = utilities.parsers.settings_to_hash - + local v_default = interfaces.variables.default - + local implement = interfaces.implement - + local selectfont = fonts.select or { } fonts.select = selectfont - + local data = selectfont.data or { } selectfont.data = data - + local fallbacks = selectfont.fallbacks or { } selectfont.fallbacks = fallbacks - + local methods = selectfont.methods or { } selectfont.methods = methods - + local extras = selectfont.extras or { } selectfont.extras = extras - + local alternatives = selectfont.alternatives or { } selectfont.alternatives = alternatives - + local presets = selectfont.presets or { } selectfont.presets = presets - + local defaults = selectfont.defaults or { } selectfont.defaults = defaults local getlookups = fonts.names.getlookups local registerdesignsizes = fonts.goodies.designsizes.register local bodyfontsizes = storage.shared.bodyfontsizes - + local ctx_definefontsynonym = context.definefontsynonym local ctx_resetfontfallback = context.resetfontfallback local ctx_startfontclass = context.startfontclass @@ -82,6 +82,7 @@ defaults["dejavumath"] = { options = { extras = "dejavu", defaults["neoeuler"] = { options = { extras = "euler-math", features = "math\\mathsizesuffix" } } defaults["latinmodernmath"] = { options = { extras = "lm,lm-math", features = "math\\mathsizesuffix,lm-math", goodies = "lm" } } defaults["lucidabrightmathot"] = { options = { extras = "lucida-opentype-math", features = "math\\mathsizesuffix", goodies = "lucida-opentype-math" } } +defaults["minionmath"] = { options = { extras = "minion-math", features = "math\\mathsizesuffix", goodies = "minion-math" } } defaults["texgyredejavumath"] = { options = { extras = "dejavu", features = "math\\mathsizesuffix" } } defaults["texgyrepagellamath"] = { options = { extras = "texgyre", features = "math\\mathsizesuffix" } } defaults["texgyrebonummath"] = { options = { extras = "texgyre", features = "math\\mathsizesuffix" } } @@ -227,7 +228,7 @@ local m_alternative = { ["sl"] = "italic", ["bi"] = "bolditalic", ["bs"] = "bolditalic", - ["sc"] = "regular" + ["sc"] = "smallcaps" } --~ methods["style"] = function(data,alternative,style) @@ -294,6 +295,18 @@ local function m_style_family(family) end end +local function m_style_subfamily(entries,style,family) + local t = { } + for index, entry in next, entries do + if entry["familyname"] == family and entry["subfamilyname"] == style then -- familyname + subfamilyname + t[#t+1] = entry + elseif entry["family"] == family and entry["subfamily"] == style then -- family + subfamily + t[#t+1] = entry + end + end + return #t ~= 0 and t or nil +end + local function m_style_weight(entries,style) local t = { } local weight = m_name[style] and m_name[style]["weight"] or "regular" @@ -396,13 +409,18 @@ methods["style"] = function(data,alternative,style) local fontstyle = m_alternative[style] or style local entries = m_style_family(fontfamily) if entries then - entries = m_style_weight(entries,fontstyle) - if entries then - entries = m_style_style(entries,fontstyle) + local subfamily = m_style_subfamily(entries,fontstyle,fontfamily) + if subfamily then + entries = subfamily + else + entries = m_style_weight(entries,fontstyle) if entries then - entries = m_style_variant(entries,fontstyle) - if entries and #entries > 1 and designsize == "default" then - entries = m_style_width(entries,fontstyle) + entries = m_style_style(entries,fontstyle) + if entries then + entries = m_style_variant(entries,fontstyle) + if entries and #entries > 1 and designsize == "default" then + entries = m_style_width(entries,fontstyle) + end end end end @@ -923,4 +941,4 @@ implement { name = "definefontfamilypreset", actions = selectfont.definefontfamilypreset, arguments = { "string", "string" } -} +} \ No newline at end of file diff --git a/tex/context/base/mkiv/font-sel.mkvi b/tex/context/base/mkiv/font-sel.mkvi index 596a7c0dd..7561a2767 100644 --- a/tex/context/base/mkiv/font-sel.mkvi +++ b/tex/context/base/mkiv/font-sel.mkvi @@ -1,6 +1,6 @@ %D \module %D [ file=font-sel, -%D version=2016.05.16, +%D version=2016.06.19, %D title=\CONTEXT\ User Module, %D subtitle=Selectfont, %D author=Wolfgang Schuster, @@ -17,8 +17,10 @@ \installcorenamespace {selectfont} \installsimplecommandhandler \??selectfont {selectfont} -\unexpanded\def\selectfont_register[#settings]% +\unexpanded\def\selectfont_register[#style][#settings]% {\begingroup + \edef\currentselectfont{\expandnamespacevalue\??fontshortstyle{#style}\s!rm}% + \checkselectfontparent \setupcurrentselectfont[#settings]% \edef\p_selectfont_preset{\selectfontparameter\c!preset}% \ifx\p_selectfont_preset\empty \else @@ -37,17 +39,17 @@ designsize {\selectfontparameter\s!designsize}% rscale {\selectfontparameter\s!rscale}% goodies {\selectfontparameter\c!goodies}% - extras {\selectfontparameter\c!extras}% + extras {\selectfontparameter\c!extras}% features {\selectfontparameter\c!features}% - preset {\selectfontparameter\c!preset}% + preset {\selectfontparameter\c!preset}% range {\selectfontparameter\c!range}% fallback only offset {\selectfontparameter\c!offset}% fallback only check {\selectfontparameter\c!check}% fallback only force {\selectfontparameter\c!force}% fallback only } - userdata {% - \luaexpanded{#settings}% - }}% + userdata {% + \luaexpanded{#settings}% + }}% \endgroup} %D \macros @@ -233,7 +235,7 @@ %D \stoptext %D \stoptyping %D -%D Another feature of the module is the \type{opticalsize} key which allows one to enable +%D Another feature of the module is the \type{designsize} key which allows one to enable %D optical sizes when they are a feature of the requested font. %D %D \starttyping @@ -257,8 +259,8 @@ \def\selectfont_family_define[#typeface][#style][#family][#settings]% {\doifelseassignment{#settings} - {\selectfont_register[\c!label={#typeface},\c!style={#style},\c!name={#family},#settings]} - {\selectfont_register[\c!label={#typeface},\c!style={#style},\c!name={#family},\c!preset={#settings}]}% + {\selectfont_register[#style][\c!label={#typeface},\c!style={#style},\c!name={#family},#settings]} + {\selectfont_register[#style][\c!label={#typeface},\c!style={#style},\c!name={#family},\c!preset={#settings}]}% \clf_definefontfamily\selectfont_index\relax} \unexpanded\def\definefallbackfamily @@ -266,10 +268,22 @@ \def\selectfont_fallback_define[#typeface][#style][#family][#settings]% {\doifelseassignment{#settings} - {\selectfont_register[\c!label={#typeface},\c!style={#style},\c!name={#family},#settings]} - {\selectfont_register[\c!label={#typeface},\c!style={#style},\c!name={#family},\c!preset={#settings}]}% + {\selectfont_register[#style][\c!label={#typeface},\c!style={#style},\c!name={#family},#settings]} + {\selectfont_register[#style][\c!label={#typeface},\c!style={#style},\c!name={#family},\c!preset={#settings}]}% \clf_definefallbackfamily\selectfont_index\relax} +\unexpanded\def\setupfontfamily + {\dodoubleargument\selectfont_family_setup} + +\def\selectfont_family_setup[#style][#settings]% + {\ifsecondargument + \edef\currentselectfont{\expandnamespacevalue\??fontshortstyle{#style}\s!rm}% + \setupcurrentselectfont[#settings]% + \else + \let\currentselectfont\empty + \setupcurrentselectfont[#style]% + \fi} + \setupselectfont [ \c!features=\s!default, \s!designsize=\s!default, diff --git a/tex/context/base/mkiv/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv index 85f4e4e3f..0cda6547c 100644 --- a/tex/context/base/mkiv/lang-def.mkiv +++ b/tex/context/base/mkiv/lang-def.mkiv @@ -399,6 +399,23 @@ \installlanguage [\s!arabic] [\s!ar] +\installlanguage + [\s!pe] + [\c!spacing=\v!broad, + \c!leftsentence=\emdash, + \c!rightsentence=\emdash, + \c!leftsubsentence=\emdash, + \c!rightsubsentence=\emdash, + \c!leftquote=\leftguillemot, + \c!rightquote=\rightguillemot, + \c!leftquotation=\leftguillemot, + \c!rightquotation=\rightguillemot, + \c!date={\v!day,\space,\v!month,\space,\v!year}] + +\installlanguage [\s!persian] [\s!pe] +\installlanguage [\s!fa] [\s!pe] % these two are redundant but sometimes might +\installlanguage [\s!farsi] [\s!fa] % sound more natural .. best set labels to 'pe' + % Just aliases to "ar" for now \installlanguage[\s!ar-ae][\c!default=\s!ar] % U.A.E. @@ -414,6 +431,12 @@ \installlanguage[\s!ar-tn][\c!default=\s!ar] % Tunisia \installlanguage[\s!ar-ye][\c!default=\s!ar] % Yemen +% Farsi (Persian) + +\installlanguage[\s!ar-ir][\c!default=\s!pe] +%installlanguage[\s!pe-ir][\c!default=\s!pe] +%installlanguage[\s!fa-ir][\c!default=\s!fa] + % Syriac months \installlanguage[\s!ar-sy][\c!default=\s!ar] % Syria diff --git a/tex/context/base/mkiv/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua index c3474e011..720cf29c1 100644 --- a/tex/context/base/mkiv/lang-txt.lua +++ b/tex/context/base/mkiv/lang-txt.lua @@ -38,6 +38,7 @@ if not modules then modules = { } end modules ['lang-txt'] = { -- nb Norwegian Hans Fredrik Nordhaug, ... -- nn Norwegian Hans Fredrik Nordhaug, ... -- nl Dutch Hans Hagen +-- pe Persian Mohammad Hossein Bateni -- pl Polish Grzegorz Sapijaszko -- pt Portuguese Pedro F. M. Mendonça -- ro Romanian Dan Seracu, ... @@ -423,6 +424,7 @@ data.labels={ ["year"]={ labels={ en="year", + pe="سال", nl="jaar", kr="년", }, @@ -430,6 +432,7 @@ data.labels={ ["month"]={ labels={ en="month", + pe="ماه" nl="maand", kr="월", }, @@ -437,6 +440,7 @@ data.labels={ ["day"]={ labels={ en="day", + pe="روز", nl="dag", kr="일", }, @@ -450,6 +454,7 @@ data.labels={ de="und", en="and", es="y", + pe="و", fi="", fr="", gr="", @@ -486,6 +491,7 @@ data.labels={ de="Anhang ", en="Appendix ", es="Apéndice ", + pe="پیوست ", fi="", fr="Annexe ", gr="Παράρτημα", @@ -525,6 +531,7 @@ data.labels={ de="April", en="April", es="abril", + pe="آوریل", fi="huhtikuu", fr="avril", gr="Απρίλιος", @@ -552,7 +559,7 @@ data.labels={ }, }, ["april:mnem"]={ - labels={ + labels={ af="", ca="", cs="dub.", @@ -594,6 +601,7 @@ data.labels={ de="auf Seite ", en="at page ", es="en la página ", + pe="در صفحه ", fi="", fr="à la page ", gr="", @@ -632,6 +640,7 @@ data.labels={ de="August", en="August", es="agosto", + pe="اوت", fi="elokuu", fr="août", gr="Αύγουστος", @@ -703,6 +712,7 @@ data.labels={ de="Kapitel ", en="Chapter ", es="Capítulo ", + pe="فصل ", fi="", fr="Chapitre ", gr="Κεφάλαιο", @@ -738,6 +748,7 @@ data.labels={ de="", en=" (continued)", es=" (continúa)", + pe="(ادامه دارد)", fi="", fr="", gr="", @@ -775,6 +786,7 @@ data.labels={ de="Dezember", en="December", es="diciembre", + pe="دسامبر", fi="joulukuu", fr="décembre", gr="Δεκέμβριος", @@ -847,6 +859,7 @@ data.labels={ de="Februar", en="February", es="febrero", + pe="فوریه", fi="helmikuu", fr="février", gr="Φεβρουάριος", @@ -917,6 +930,7 @@ data.labels={ de="Abbildung ", en="Figure ", es="Figura ", + pe="شکل ", fi="Kuva ", fr="Figure ", gr="Σχήμα", @@ -954,6 +968,7 @@ data.labels={ de="Freitag", en="Friday", es="viernes", + pe="جمعه", fi="perjantai", fr="vendredi", gr="Παρασκευή", @@ -991,6 +1006,7 @@ data.labels={ de="Graphik ", en="Graphic ", es="Gráfico ", + pe="طرح ", fi="Grafiikka ", fr="Illustration ", gr="Γραφικό", @@ -1019,12 +1035,14 @@ data.labels={ precedingpage={ labels={ en="on a preceding page", + pe="در صفحات گذشته", nl="op een voorgaande bladzijde", }, }, followingpage={ labels={ en="on a following page", + pe="در صفحات آینده", nl="op een volgende bladzijde", }, }, @@ -1038,6 +1056,7 @@ data.labels={ de="siehe oben", en="as we show above", es="como se muestra arriba", + pe="چنان‌که شرح دادیم", fi="", fr="ci-dessus", gr="", @@ -1073,6 +1092,7 @@ data.labels={ de="siehe unten", en="as we show below", es="como se muestra abajo", + pe="چنان‌که شرح خواهیم داد", fi="", fr="ci-dessous", gr="", @@ -1148,6 +1168,7 @@ data.labels={ de="Januar", en="January", es="enero", + pe="ژانویه", fi="tammikuu", fr="janvier", gr="Ιανουάριος", @@ -1221,6 +1242,7 @@ data.labels={ de="Juli", en="July", es="julio", + pe="ژوئیه", fi="heinäkuu", fr="juillet", gr="Ιούλιος", @@ -1293,6 +1315,7 @@ data.labels={ de="Juni", en="June", es="junio", + pe="ژوئن", fi="kesäkuu", fr="juin", gr="Ιούνιος", @@ -1363,6 +1386,7 @@ data.labels={ de="Zeile ", en="line ", es="línea ", + pe="سطر ", fi="rivi ", fr="ligne ", gr="Γραμμή", @@ -1400,6 +1424,7 @@ data.labels={ de="Zeilen ", en="lines ", es="líneas ", + pe="سطرهای ", fi="rivie ", fr="lignes ", gr="Γραμμές", @@ -1438,6 +1463,7 @@ data.labels={ de="März", en="March", es="marzo", + pe="مارس", fi="maaliskuu", fr="mars", gr="Μάρτιος", @@ -1511,6 +1537,7 @@ data.labels={ de="Mai", en="May", es="mayo", + pe="مه", fi="toukokuu", fr="mai", gr="Μάιος", @@ -1581,6 +1608,7 @@ data.labels={ de="Montag", en="Monday", es="lunes", + pe="دوشنبه", fi="maanantai", fr="lundi", gr="Δευτέρα", @@ -1620,6 +1648,7 @@ data.labels={ de="November", en="November", es="noviembre", + pe="نوامبر", fi="marraskuu", fr="novembre", gr="Νοέμβριος", @@ -1691,6 +1720,7 @@ data.labels={ de="Oktober", en="October", es="octubre", + pe="اکتبر", fi="lokakuu", fr="octobre", gr="Οκτώβριος", @@ -1760,6 +1790,7 @@ data.labels={ de="Seite ", en="page ", es="página ", + pe="صفحه ", fi="", fr="page ", gr="", @@ -1796,6 +1827,7 @@ data.labels={ de="Teil ", en="Part ", es="Parte ", + pe="قسمت ", fi="Osa ", fr="Partie ", gr="Μέρος", @@ -1833,6 +1865,7 @@ data.labels={ de="Samstag", en="Saturday", es="sábado", + pe="شنبه", fi="lauantai", fr="samedi", gr="Σάββατο", @@ -1871,6 +1904,7 @@ data.labels={ de="", en="", es="Sección ", + pe="بخش ", fi="", fr="Section ", gr="Ενότητα", @@ -1907,6 +1941,7 @@ data.labels={ de="siehe ", en="see ", es="ver: ", + pe="نگاه کنید به ", fi="", fr="cf. ", gr="", @@ -1945,6 +1980,7 @@ data.labels={ de="September", en="September", es="septiembre", + pe="سپتامبر", fi="syyskuu", fr="septembre", gr="Σεπτέμβριος", @@ -2016,6 +2052,7 @@ data.labels={ de="", en="", es="Subsección ", + pe="زیربخش ", fi="", fr="Soussection ", gr="Υπόενότητα", @@ -2045,7 +2082,7 @@ data.labels={ hidden=true, labels={ af="", - ar="فصل أ دنى أدنى ", + ar="فصل أدنى أدنى ", ca="Subsubsecció ", cn="", cs="Podpodsekce ", @@ -2053,6 +2090,7 @@ data.labels={ de="", en="", es="Subsubsección ", + pe="زیرزیربخش ", fi="", fr="Soussoussection ", gr="", @@ -2090,6 +2128,7 @@ data.labels={ de="", en="", es="Subsubsubsección ", + pe="زیرزیرزیربخش ", fi="", fr="Soussoussoussection ", gr="", @@ -2126,6 +2165,7 @@ data.labels={ de="Sonntag", en="Sunday", es="domingo", + pe="یکشنبه", fi="sunnuntai", fr="dimanche", gr="Κυριακή", @@ -2163,6 +2203,7 @@ data.labels={ de="Tabelle ", en="Table ", es="Tabla ", + pe="جدول ", fi="Taulukko ", fr="Tableau ", gr="Πίνακας", @@ -2200,6 +2241,7 @@ data.labels={ de="Donnerstag", en="Thursday", es="jueves", + pe="پنج‌شنبه", fi="torstai", fr="jeudi", gr="Πέμπτη", @@ -2237,6 +2279,7 @@ data.labels={ de="Dienstag", en="Tuesday", es="martes", + pe="سه‌شنبه", fi="tiistai", fr="mardi", gr="Τρίτη", @@ -2274,6 +2317,7 @@ data.labels={ de="Mittwoch", en="Wednesday", es="miércoles", + pe="چهارشنبه", fi="keskiviikko", fr="mercredi", gr="Τετάρτη", @@ -2385,6 +2429,7 @@ data.labels={ de="Abkürzungen", en="Abbreviations", es="Abreviaturas", + pe="نشانه‌های اختصاری", fi="Lyhennyksi", fr="Abréviations", gr="Συντομογραφίες", @@ -2422,6 +2467,7 @@ data.labels={ de="Inhalt", en="Contents", es="Contenido", + pe="فهرست مطالب", fi="Sisällys", fr="Table des matières", gr="Περιεχόμενα", @@ -2459,6 +2505,7 @@ data.labels={ de="Abbildungen", en="Figures", es="Figuras", + pe="فهرست اشکال", fi="Kuvi", fr="Figures", gr="Σχήματα", @@ -2496,6 +2543,7 @@ data.labels={ de="Graphiken", en="Graphics", es="Gráficos", + pe="فهرست طرح‌ها", fi="Grafiikkaoi", fr="Graphiques", gr="Γραφικά", @@ -2533,6 +2581,7 @@ data.labels={ de="Index", en="Index", es="Índice", + pe="نمایه", fi="Indeksiluku", fr="Index", gr="Ευρετήριο", @@ -2607,6 +2656,7 @@ data.labels={ de="Logos", en="Logos", es="Logotipos", + pe="فهرست لوگوها", fi="Vertauskuva", fr="Logos", gr="Λογότυπα", @@ -2642,6 +2692,7 @@ data.labels={ de="Literatur", en="References", es="Bibliografía", + pe="کتاب‌نامه", fi="", fr="Bibliographie", gr="", @@ -2678,6 +2729,7 @@ data.labels={ de="Tabellen", en="Tables", es="Tablas", + pe="فهرست جداول", fi="Taulukkoj", fr="Tableaux", gr="Πίνακες", @@ -2715,6 +2767,7 @@ data.labels={ de="Einheiten", en="Units", es="Unidades", + pe="واحدها", fi="Yksiköt", fr="Unités", gr="Μονάδες", @@ -2742,173 +2795,188 @@ data.labels={ }, }, }, - btx = { - ["mastersthesis"] = { + btx={ + ["mastersthesis"]={ labels = { - en = "Master's thesis", - fr = "Thèse de master (DEA, DESS, master)", - nl = "Masterproef", - de = "Masterarbeit", - it = "Tesi di laurea", - es = "Tesis de maestría", + en="Master's thesis", + fr="Thèse de master (DEA, DESS, master)", + nl="Masterproef", + de="Masterarbeit", + it="Tesi di laurea", + es="Tesis de maestría", + pe="پایان‌نامه کارشناسی ارشد", }, }, - ["phdthesis"] = { - labels = { - en = "PhD thesis", - fr = "Thèse de doctorat", - de = "Dissertation", - nl = "Proefschrift", - it = "Tesi di dottorato", - es = "Tesis doctoral", + ["phdthesis"]={ + labels={ + en="PhD thesis", + fr="Thèse de doctorat", + de="Dissertation", + nl="Proefschrift", + it="Tesi di dottorato", + es="Tesis doctoral", + pe="رساله دکتری", }, }, - ["technicalreport"] = { - labels = { - en = "Technical report", - fr = "Rapport technique", - de = "Technischer Bericht", - nl = "Technisch rapport", - it = "Relazione tecnica", - es = "Informe técnico", + ["technicalreport"]={ + labels={ + en="Technical report", + fr="Rapport technique", + de="Technischer Bericht", + nl="Technisch rapport", + it="Relazione tecnica", + es="Informe técnico", + pe="گزارش فنی", }, }, - ["patent"] = { - labels = { - en = "Patent", - nl = "Octrooi", - fr = "Brevet", - de = "Patent", - it = "Brevetto", - es = "Patente", + ["patent"]={ + labels={ + en="Patent", + nl="Octrooi", + fr="Brevet", + de="Patent", + it="Brevetto", + es="Patente", }, }, -- - ["editor"] = { - labels = { - en = "editor", - fr = "éditeur", - de = "Herausgeber", - it = "a cura di", + ["editor"]={ + labels={ + en="editor", + fr="éditeur", + de="Herausgeber", + it="a cura di", + pe="ویراستار", }, }, - ["editors"] = { - labels = { - en = "editors", - fr = "éditeurs", - de = "Herausgeber", - it = "a cura di", - es = "editores", + ["editors"]={ + labels={ + en="editors", + fr="éditeurs", + de="Herausgeber", + it="a cura di", + es="editores", }, }, - ["edition"] = { - labels = { - en = "edition", - fr = "édition", - de = "Auflage", - nl = "editie", - it = "edizione", - es = "edición", - }, + ["edition"]={ + labels={ + en="edition", + fr="édition", + de="Auflage", + nl="editie", + it="edizione", + es="edición", + pe="ویرایش", + }, }, -- - ["volume"] = { - labels = { - en = "volume", - de = "Band", - nl = "deel", + ["volume"]={ + labels={ + en="volume", + de="Band", + nl="deel", + pe="جلد", }, }, - ["Volume"] = { - labels = { - en = "Volume", - de = "Band", - nl = "Deel", + ["Volume"]={ + labels={ + en="Volume", + de="Band", + nl="Deel", + pe="جلد", }, }, - ["number"] = { - labels = { - en = "number", - fr = "numéro", - de = "Numer", - nl = "nummer", + ["number"]={ + labels={ + en="number", + fr="numéro", + de="Numer", + nl="nummer", + pe="شماره", }, }, - ["Number"] = { - labels = { - en = "Number", - fr = "Numéro", - de = "Numer", - nl = "Nummer", + ["Number"]={ + labels={ + en="Number", + fr="Numéro", + de="Numer", + nl="Nummer", + pe="شماره", }, }, - ["in"] = { - labels = { - en = "in", - fr = "dans", - es = "en", + ["in"]={ + labels={ + en="in", + fr="dans", + es="en", + pe="در", }, }, - ["of"] = { - labels = { - en = "of", - fr = "de", - de = "von", - nl = "van", + ["of"]={ + labels={ + en="of", + fr="de", + de="von", + nl="van", }, }, -- - ["In"] = { - labels = { - en = "In", - fr = "Dans", - es = "En", + ["In"]={ + labels={ + en="In", + fr="Dans", + es="En", + pe="در", }, }, -- - ["p"] = { - labels = { - en = "p.", - de = "S.", + ["p"]={ + labels={ + en="p.", + de="S.", + pe="ص", }, }, - ["pp"] = { - labels = { - en = "pp.", - de = "S.", + ["pp"]={ + labels={ + en="pp.", + de="S.", + pe="صص", }, }, - ["pages"] = { - labels = { - en = "pages", - de = "Seiten", - nl = "paginas" + ["pages"]={ + labels={ + en="pages", + de="Seiten", + nl="paginas" + pe="صفحات", }, }, -- - ["and"] = { - labels = { - en = "and", - fr = "et", - de = "und", - nl = "en", - it = "e", - es = "y", + ["and"]={ + labels={ + en="and", + fr="et", + de="und", + nl="en", + it="e", + es="y", + pe="و", }, }, - ["with"] = { - labels = { - en = "with", - nl = "met", - fr = "avec", - de = "mit", - it = "con", - es = "con", + ["with"]={ + labels={ + en="with", + nl="met", + fr="avec", + de="mit", + it="con", + es="con", }, }, - ["others"] = { - labels = { - en = "et al.", + ["others"]={ + labels={ + en="et al.", }, }, } diff --git a/tex/context/base/mkiv/math-dir.lua b/tex/context/base/mkiv/math-dir.lua index c9c2a38dd..6978ba3b5 100644 --- a/tex/context/base/mkiv/math-dir.lua +++ b/tex/context/base/mkiv/math-dir.lua @@ -108,13 +108,13 @@ local function processmath(head) end elseif not start then -- nothing -if id == hlist_code or id == vlist_code then - local list, d = processmath(getlist(current)) - setlist(current,list) - if d then - done = true - end -end + if id == hlist_code or id == vlist_code then + local list, d = processmath(getlist(current)) + setlist(current,list) + if d then + done = true + end + end elseif start == stop then start = nil else diff --git a/tex/context/base/mkiv/math-fen.mkiv b/tex/context/base/mkiv/math-fen.mkiv index 81e39723d..8d004636f 100644 --- a/tex/context/base/mkiv/math-fen.mkiv +++ b/tex/context/base/mkiv/math-fen.mkiv @@ -54,17 +54,39 @@ % we need the direct use of \Udelimiter because of { etc -\def\math_fenced_left {\edef\p_left{\mathfenceparameter\c!left}% +\newconditional\c_math_fenced_mirror \settrue\c_math_fenced_mirror + +\def\math_fenced_left {\edef\p_left + {\ifconditional\c_math_fenced_mirror + \ifcase\c_math_bidi + \mathfenceparameter\c!left + \else + \mathfenceparameter\c!right + \fi + \else + \mathfenceparameter\c!left + \fi}% \math_fenced_color_push \normalleft\ifx\p_left\empty.\else\Udelimiter\plusfour\fam\p_left\relax\fi \math_fenced_color_pop} + \def\math_fenced_middle{\edef\p_middle{\mathfenceparameter\c!middle}% \mskip\thinmuskip \math_fenced_color_push \normalmiddle\ifx\p_middle\empty.\else\Udelimiter\plusfour\fam\p_middle\relax\fi \math_fenced_color_pop \mskip\thinmuskip} -\def\math_fenced_right {\edef\p_right{\mathfenceparameter\c!right}% + +\def\math_fenced_right {\edef\p_right + {\ifconditional\c_math_fenced_mirror + \ifcase\c_math_bidi + \mathfenceparameter\c!right + \else + \mathfenceparameter\c!left + \fi + \else + \mathfenceparameter\c!right + \fi}% \math_fenced_color_push \normalright\ifx\p_right\empty.\else\Udelimiter\plusfive\fam\p_right\relax\fi \math_fenced_color_pop} @@ -470,7 +492,7 @@ \installcorenamespace{mathbig} \unexpanded\def\choosemathbig#1#2% so we accept \big{||} as well - {{\hbox\bgroup + {{\naturalhbox\bgroup \startimath \ifcase\bigmathdelimitermethod \math_fenced_step#2\relax diff --git a/tex/context/base/mkiv/mult-sys.mkiv b/tex/context/base/mkiv/mult-sys.mkiv index 88e956d66..914929ab1 100644 --- a/tex/context/base/mkiv/mult-sys.mkiv +++ b/tex/context/base/mkiv/mult-sys.mkiv @@ -38,52 +38,54 @@ %D First we define some system constants used for both the multi||lingual %D interface and multi||linguag typesetting. +% definesystemconstant {slovene} +% definesystemconstant {cz} +% definesystemconstant {vn} + \definesystemconstant {afrikaans} \definesystemconstant {af} +\definesystemconstant {ancientgreek} \definesystemconstant {agr} +\definesystemconstant {ancientlatin} \definesystemconstant {ala} \definesystemconstant {arabic} \definesystemconstant {ar} +\definesystemconstant {bokmal} \definesystemconstant {nb} \definesystemconstant {catalan} \definesystemconstant {ca} \definesystemconstant {chinese} \definesystemconstant {cn} +\definesystemconstant {chinese} \definesystemconstant {cn} \definesystemconstant {croatian} \definesystemconstant {hr} \definesystemconstant {czech} \definesystemconstant {cs} - \definesystemconstant {cz} \definesystemconstant {danish} \definesystemconstant {da} \definesystemconstant {dutch} \definesystemconstant {nl} \definesystemconstant {english} \definesystemconstant {en} +\definesystemconstant {farsi} \definesystemconstant {fa} % just persian \definesystemconstant {finnish} \definesystemconstant {fi} \definesystemconstant {french} \definesystemconstant {fr} +\definesystemconstant {gbenglish} \definesystemconstant {gb} \definesystemconstant {german} \definesystemconstant {de} +\definesystemconstant {greek} \definesystemconstant {gr} \definesystemconstant {hungarian} \definesystemconstant {hu} \definesystemconstant {italian} \definesystemconstant {it} +\definesystemconstant {japanese} \definesystemconstant {ja} +\definesystemconstant {korean} \definesystemconstant {kr} \definesystemconstant {latin} \definesystemconstant {la} -\definesystemconstant {ancientlatin} \definesystemconstant {ala} \definesystemconstant {lithuanian} \definesystemconstant {lt} -\definesystemconstant {bokmal} \definesystemconstant {nb} \definesystemconstant {malayalam} \definesystemconstant {ml} \definesystemconstant {norwegian} \definesystemconstant {no} \definesystemconstant {nynorsk} \definesystemconstant {nn} -\definesystemconstant {polish} \definesystemconstant {pl} \definesystemconstant {persian} \definesystemconstant {pe} +\definesystemconstant {polish} \definesystemconstant {pl} \definesystemconstant {portuguese} \definesystemconstant {pt} \definesystemconstant {romanian} \definesystemconstant {ro} \definesystemconstant {russian} \definesystemconstant {ru} \definesystemconstant {slovak} \definesystemconstant {sk} \definesystemconstant {slovenian} \definesystemconstant {sl} -\definesystemconstant {slovene} % obsolete \definesystemconstant {spanish} \definesystemconstant {es} \definesystemconstant {swedish} \definesystemconstant {sv} +\definesystemconstant {thai} \definesystemconstant {th} % mojca mentioned it at BT2013 but we need more info \definesystemconstant {turkish} \definesystemconstant {tr} \definesystemconstant {turkmen} \definesystemconstant {tk} -\definesystemconstant {gbenglish} \definesystemconstant {gb} \definesystemconstant {ukenglish} \definesystemconstant {uk} -\definesystemconstant {usenglish} \definesystemconstant {us} \definesystemconstant {ukrainian} \definesystemconstant {ua} -\definesystemconstant {greek} \definesystemconstant {gr} -\definesystemconstant {ancientgreek} \definesystemconstant {agr} +\definesystemconstant {usenglish} \definesystemconstant {us} \definesystemconstant {vietnamese} \definesystemconstant {vi} - \definesystemconstant {vn} -\definesystemconstant {chinese} \definesystemconstant {cn} -\definesystemconstant {japanese} \definesystemconstant {ja} -\definesystemconstant {korean} \definesystemconstant {kr} -\definesystemconstant {thai} \definesystemconstant {th} % mojca mentioned it at BT2013 but we need more info %D For proper \UNICODE\ support we need a few font related constants. diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf deleted file mode 100644 index 5e052d035..000000000 Binary files a/tex/context/base/mkiv/status-files.pdf and /dev/null differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf deleted file mode 100644 index 2bb3aabca..000000000 Binary files a/tex/context/base/mkiv/status-lua.pdf and /dev/null differ diff --git a/tex/context/base/mkiv/strc-lev.mkvi b/tex/context/base/mkiv/strc-lev.mkvi index ac106f999..6e08e7c07 100644 --- a/tex/context/base/mkiv/strc-lev.mkvi +++ b/tex/context/base/mkiv/strc-lev.mkvi @@ -37,7 +37,7 @@ \unexpanded\def\strc_levels_start_section[#category]% {\doifelseassignment{#category}% {\clf_startsectionlevel\plusone{\v!default}{\currentnamedsection}[#category]}% - {\clf_startsectionlevel\plusone {}{\currentnamedsection}{#category}}} + {\clf_startsectionlevel\plusone {#category}{\currentnamedsection}}} \unexpanded\def\strc_levels_start_subject[#category]% {\doifelseassignment{#category}% diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv index d4f1c3d91..cac96d2c4 100644 --- a/tex/context/base/mkiv/strc-mat.mkiv +++ b/tex/context/base/mkiv/strc-mat.mkiv @@ -1157,7 +1157,7 @@ \def\strc_formulas_place_number_in_box {\dostarttagged\t!formulacaption\empty - \global\setbox\b_strc_formulas_number\hbox{\strc_formulas_number_indeed}% + \global\setbox\b_strc_formulas_number\naturalhbox{\strc_formulas_number_indeed}% \dostoptagged} \def\strc_formulas_flush_number diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf deleted file mode 100644 index 1a9ff2d3d..000000000 Binary files a/tex/context/interface/mkiv/i-readme.pdf and /dev/null differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3b8f5d984..90f5fd83c 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 : 08/01/16 14:16:32 +-- merge date : 08/08/16 21:04:13 do -- begin closure to overcome local limits and interference -- cgit v1.2.3