diff options
39 files changed, 230 insertions, 55 deletions
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex 3f549ad7a..415d1499a 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex d0de1aa8b..025c45f65 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex 33a647f28..1ac6e7764 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex d57e70522..affc42206 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex 12b37f24d..af1556843 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf Binary files differindex 62d9428bb..3012ce5aa 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf Binary files differindex fbdb2050e..85b6639c9 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf Binary files differindex f07f87bec..f877428b9 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf Binary files differindex 2f10576a2..8708d7a7a 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf Binary files differindex f5e09955d..f52cdaa38 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf Binary files differindex d92b7fc96..2f33274ca 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf Binary files differindex 162809e63..5ab86805e 100644 --- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex 0822a6fba..fcb0cbb71 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex f053b5347..c16d44b87 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf diff --git a/doc/context/sources/general/manuals/languages/languages-numbering.tex b/doc/context/sources/general/manuals/languages/languages-numbering.tex index 3464826df..9752b6271 100644 --- a/doc/context/sources/general/manuals/languages/languages-numbering.tex +++ b/doc/context/sources/general/manuals/languages/languages-numbering.tex @@ -296,6 +296,10 @@ can also as a specific one, so {\em jalali} \date [y=1395, m=4, d=18] \typebuffer \startnarrower \getbuffer \stopnarrower +For time we have \type {\currenttime} and here the specification is just an \type +{h}, \type {m} and whatever connects them. Both date and time are +pre|-|configured in the language definition file \type {lang-def}. + \stopsection % \startsection[title=Counters] diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 638a86e4d..17a5a0f62 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2018.09.24 14:11} +\newcontextversion{2018.09.25 14:14} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 5a159dea6..3cfcb8828 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2018.09.24 14:11} +\edef\contextversion{2018.09.25 14:14} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii index 822848c6c..7b32b022c 100644 --- a/tex/context/base/mkii/mult-it.mkii +++ b/tex/context/base/mkii/mult-it.mkii @@ -1241,6 +1241,7 @@ \setinterfaceconstant{textstyle}{stiletesto} \setinterfaceconstant{textwidth}{ampiezzatesto} \setinterfaceconstant{threshold}{threshold} +\setinterfaceconstant{time}{time} \setinterfaceconstant{title}{titolo} \setinterfaceconstant{titlecolor}{coloretitolo} \setinterfaceconstant{titlecommand}{titlecommand} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index f5e111f99..8bb291480 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{2018.09.24 14:11} +\newcontextversion{2018.09.25 14:14} %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 17a8896c3..2ea76e361 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -42,7 +42,7 @@ %D has to match \type {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2018.09.24 14:11} +\edef\contextversion{2018.09.25 14:14} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/core-con.mkiv b/tex/context/base/mkiv/core-con.mkiv index 3ac33f46f..cc42e9b46 100644 --- a/tex/context/base/mkiv/core-con.mkiv +++ b/tex/context/base/mkiv/core-con.mkiv @@ -454,7 +454,7 @@ \let\currentminute\!!plusone \let\currentsecond\!!plusone -\def\currenttimespecification{h,:,m} +% \def\currenttimespecification{h,:,m} \unexpanded\def\currenttime {\doifelsenextoptional\syst_converters_current_time_yes\syst_converters_current_time_nop} diff --git a/tex/context/base/mkiv/lang-def.lua b/tex/context/base/mkiv/lang-def.lua index c0c3981f7..3f04bed0d 100644 --- a/tex/context/base/mkiv/lang-def.lua +++ b/tex/context/base/mkiv/lang-def.lua @@ -225,6 +225,15 @@ local specifications = allocate { ["variant"] = "fi", }, { + ["description"] = "Estonian", + ["script"] = "latn", + ["bibliographical"] = "est", + ["terminological"] = "est", + ["context"] = "et", + ["opentype"] = "est", + ["variant"] = "et", + }, + { ["description"] = "French", ["script"] = "latn", ["bibliographical"] = "fre", diff --git a/tex/context/base/mkiv/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv index b2bd09aa4..7f3e85f08 100644 --- a/tex/context/base/mkiv/lang-def.mkiv +++ b/tex/context/base/mkiv/lang-def.mkiv @@ -22,19 +22,6 @@ % Frisian, Plattdeutsch \installlanguage - [\s!nl] - [\c!spacing=\v!packed, - \c!leftsentence=\emdash, - \c!rightsentence=\emdash, - \c!leftsubsentence=\emdash, - \c!rightsubsentence=\emdash, - \c!leftquote=\lowerleftsingleninequote, - \c!rightquote=\upperrightsingleninequote, - \c!leftquotation=\lowerleftdoubleninequote, - \c!rightquotation=\upperrightdoubleninequote, - \c!date={\v!day,\space,\v!month,\space,\v!year}] - -\installlanguage [\s!en] [\c!spacing=\v!broad, \c!leftsentence=\emdash, @@ -51,6 +38,19 @@ \s!righthyphenmin=3] \installlanguage + [\s!nl] + [\c!spacing=\v!packed, + \c!leftsentence=\emdash, + \c!rightsentence=\emdash, + \c!leftsubsentence=\emdash, + \c!rightsubsentence=\emdash, + \c!leftquote=\lowerleftsingleninequote, + \c!rightquote=\upperrightsingleninequote, + \c!leftquotation=\lowerleftdoubleninequote, + \c!rightquotation=\upperrightdoubleninequote, + \c!date={\v!day,\space,\v!month,\space,\v!year}] + +\installlanguage [\s!de] [\c!spacing=\v!packed, \s!lefthyphenmin=3, @@ -329,8 +329,19 @@ \installlanguage [\s!et] - [\s!patterns=\s!et, - \c!default=\s!fi] + [\c!default=\s!en, + \c!spacing=\v!packed, + \c!leftsentence=\emdash, + \c!rightsentence=\emdash, + \c!leftsubsentence=\emdash, + \c!rightsubsentence=\emdash, + \c!leftquote=\leftguillemot, + \c!rightquote=\rightguillemot, + \c!leftquotation=\lowerrightdoubleninequote, + \c!rightquotation=\upperrightdoublesixquote, + \c!time={h,{.},m}, + \c!date={\v!day,.,\space,\v!month,\space,\v!year}, + \s!patterns=\s!et] \installlanguage [\s!hu] @@ -586,6 +597,7 @@ \c!rightquote=\rightguillemot, \c!leftquotation=\leftguillemot, \c!rightquotation=\rightguillemot, + \c!time={h,{\Uchar104 },m},% we need to cheat in order to get the h \c!date={\v!day:mnem,\v!space,\v!month,\v!space,\v!year}] \installlanguage diff --git a/tex/context/base/mkiv/lang-ini.mkiv b/tex/context/base/mkiv/lang-ini.mkiv index 13606c676..296cf7f1c 100644 --- a/tex/context/base/mkiv/lang-ini.mkiv +++ b/tex/context/base/mkiv/lang-ini.mkiv @@ -292,6 +292,7 @@ \c!middlespeech=, \c!rightspeech=\languageparameter\c!rightquotation, \c!limittext=\unknown, + \c!time={h,:,m}, \c!date={\v!year,\ ,\v!month,\ ,\v!day}, \c!text=Ag, \s!font=] % \v!auto : experimental ! @@ -309,11 +310,12 @@ %D view \quotation {when we quote} or \quote {quote} something. %D \macros -%D {currentdatespecification} +%D {currentdatespecification, currenttimespecification} %D %D Just to make things easy we can ask for the current date specification by saying: \def\currentdatespecification{\languageparameter\c!date} +\def\currenttimespecification{\languageparameter\c!time} %D Carefull reading of these macros shows that it's legal to say %D diff --git a/tex/context/base/mkiv/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua index 1ee1aa9ba..d287f7e6d 100644 --- a/tex/context/base/mkiv/lang-txt.lua +++ b/tex/context/base/mkiv/lang-txt.lua @@ -87,6 +87,7 @@ data.labels={ ["labels"]={ ["de"]="Band", ["en"]="Volume", + ["et"]="Köide", ["nl"]="Deel", ["pe"]="جلد", }, @@ -96,6 +97,7 @@ data.labels={ ["de"]="und", ["en"]="and", ["es"]="y", + ["et"]="ja", ["fr"]="et", ["it"]="e", ["nl"]="en", @@ -107,6 +109,7 @@ data.labels={ ["de"]="Auflage", ["en"]="edition", ["es"]="edición", + ["et"]="väljaanne", ["fr"]="édition", ["it"]="edizione", ["nl"]="editie", @@ -117,6 +120,7 @@ data.labels={ ["labels"]={ ["de"]="Herausgeber", ["en"]="editor", + ["et"]="toimetaja", ["fr"]="éditeur", ["it"]="a cura di", ["pe"]="ویراستار", @@ -127,6 +131,7 @@ data.labels={ ["de"]="Herausgeber", ["en"]="editors", ["es"]="editores", + ["et"]="toimetajad", ["fr"]="éditeurs", ["it"]="a cura di", }, @@ -144,6 +149,7 @@ data.labels={ ["de"]="Masterarbeit", ["en"]="Master's thesis", ["es"]="Tesis de maestría", + ["et"]="magistritöö", ["fr"]="Thèse de master (DEA, DESS, master)", ["it"]="Tesi di laurea", ["nl"]="Masterproef", @@ -170,12 +176,14 @@ data.labels={ ["others"]={ ["labels"]={ ["en"]="et al.", + ["et"]="jt", }, }, ["p"]={ ["labels"]={ ["de"]="S.", ["en"]="p.", + ["et"]="lk", ["pe"]="ص", }, }, @@ -183,6 +191,7 @@ data.labels={ ["labels"]={ ["de"]="Seiten", ["en"]="pages", + ["et"]="leheküljed", ["nl"]="paginas", ["pe"]="صفحات", }, @@ -192,6 +201,7 @@ data.labels={ ["de"]="Patent", ["en"]="Patent", ["es"]="Patente", + ["et"]="Patent", ["fr"]="Brevet", ["it"]="Brevetto", ["nl"]="Octrooi", @@ -202,6 +212,7 @@ data.labels={ ["de"]="Dissertation", ["en"]="PhD thesis", ["es"]="Tesis doctoral", + ["et"]="doktoritöö", ["fr"]="Thèse de doctorat", ["it"]="Tesi di dottorato", ["nl"]="Proefschrift", @@ -212,6 +223,7 @@ data.labels={ ["labels"]={ ["de"]="S.", ["en"]="pp.", + ["et"]="lk-d", ["pe"]="صص", }, }, @@ -220,6 +232,7 @@ data.labels={ ["de"]="Technischer Bericht", ["en"]="Technical report", ["es"]="Informe técnico", + ["et"]="tehniline raport", ["fr"]="Rapport technique", ["it"]="Relazione tecnica", ["nl"]="Technisch rapport", @@ -230,6 +243,7 @@ data.labels={ ["labels"]={ ["de"]="Band", ["en"]="volume", + ["et"]="köide", ["nl"]="deel", ["pe"]="جلد", }, @@ -239,6 +253,7 @@ data.labels={ ["de"]="mit", ["en"]="with", ["es"]="con", + ["et"]="koos", ["fr"]="avec", ["it"]="con", ["nl"]="met", @@ -621,6 +636,7 @@ data.labels={ ["de"]=" und ", ["en"]=" and ", ["es"]=" y ", + ["et"]=" ja ", ["fi"]="", ["fr"]="", ["gr"]="", @@ -658,6 +674,7 @@ data.labels={ ["de"]="Anhang ", ["en"]="Appendix ", ["es"]="Apéndice ", + ["et"]="Lisa ", ["fi"]="", ["fr"]="Annexe ", ["gr"]="Παράρτημα", @@ -698,6 +715,7 @@ data.labels={ ["de"]="April", ["en"]="April", ["es"]="abril", + ["et"]="aprill", ["fi"]="huhtikuu", ["fr"]="avril", ["gr"]="Απρίλιος", @@ -740,6 +758,7 @@ data.labels={ ["de"]="", ["en"]="apr", ["es"]="abr.", + ["et"]="apr", ["fi"]="", ["fr"]="", ["gr"]="", @@ -774,6 +793,7 @@ data.labels={ ["de"]="auf Seite ", ["en"]="at page ", ["es"]="en la página ", + ["et"]="leheküljel ", ["fi"]="", ["fr"]="à la page ", ["gr"]="", @@ -813,6 +833,7 @@ data.labels={ ["de"]="August", ["en"]="August", ["es"]="agosto", + ["et"]="august", ["fi"]="elokuu", ["fr"]="août", ["gr"]="Αύγουστος", @@ -855,6 +876,7 @@ data.labels={ ["de"]="", ["en"]="aug", ["es"]="ago.", + ["et"]="aug", ["fi"]="", ["fr"]="", ["gr"]="", @@ -891,6 +913,7 @@ data.labels={ ["de"]="Kapitel ", ["en"]="Chapter ", ["es"]="Capítulo ", + ["et"]="Peatükk ", ["fi"]="", ["fr"]="Chapitre ", ["gr"]="Κεφάλαιο", @@ -927,6 +950,7 @@ data.labels={ ["de"]="", ["en"]=" (continued)", ["es"]=" (continúa)", + ["et"]=" (jätkub)", ["fi"]="", ["fr"]="", ["gr"]="", @@ -955,6 +979,7 @@ data.labels={ ["day"]={ ["labels"]={ ["en"]="day", + ["et"]="päev", ["kr"]="일", ["nl"]="dag", ["pe"]="روز", @@ -973,6 +998,7 @@ data.labels={ ["de"]="Dezember", ["en"]="December", ["es"]="diciembre", + ["et"]="detsember", ["fi"]="joulukuu", ["fr"]="décembre", ["gr"]="Δεκέμβριος", @@ -1015,6 +1041,7 @@ data.labels={ ["de"]="", ["en"]="dec", ["es"]="dic.", + ["et"]="dets", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1052,6 +1079,7 @@ data.labels={ ["de"]="Februar", ["en"]="February", ["es"]="febrero", + ["et"]="veebruar", ["fi"]="helmikuu", ["fr"]="février", ["gr"]="Φεβρουάριος", @@ -1094,6 +1122,7 @@ data.labels={ ["de"]="", ["en"]="feb", ["es"]="feb.", + ["et"]="veebr", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1129,6 +1158,7 @@ data.labels={ ["de"]="Abbildung ", ["en"]="Figure ", ["es"]="Figura ", + ["et"]="Joonis ", ["fi"]="Kuva ", ["fr"]="Figure ", ["gr"]="Σχήμα", @@ -1159,6 +1189,7 @@ data.labels={ ["followingpage"]={ ["labels"]={ ["en"]="on a following page", + ["et"]="järgmisel leheküljel", ["nl"]="op een volgende bladzijde", ["pe"]="در صفحات آینده", }, @@ -1174,6 +1205,7 @@ data.labels={ ["de"]="Freitag", ["en"]="Friday", ["es"]="viernes", + ["et"]="reede", ["fi"]="perjantai", ["fr"]="vendredi", ["gr"]="Παρασκευή", @@ -1212,6 +1244,7 @@ data.labels={ ["de"]="Graphik ", ["en"]="Graphic ", ["es"]="Gráfico ", + ["et"]="Pilt ", ["fi"]="Grafiikka ", ["fr"]="Illustration ", ["gr"]="Γραφικό", @@ -1248,6 +1281,7 @@ data.labels={ ["de"]="siehe oben", ["en"]="as we show above", ["es"]="como se muestra arriba", + ["et"]="nii nagu üleval näidatud", ["fi"]="", ["fr"]="ci-dessus", ["gr"]="", @@ -1284,6 +1318,7 @@ data.labels={ ["de"]="siehe unten", ["en"]="as we show below", ["es"]="como se muestra abajo", + ["et"]="nii nagu all näidatud", ["fi"]="", ["fr"]="ci-dessous", ["gr"]="", @@ -1321,6 +1356,7 @@ data.labels={ ["de"]="Intermezzo ", ["en"]="Intermezzo ", ["es"]="Intermedio ", + ["et"]="Vahemäng ", ["fi"]="Intermezzo ", ["fr"]="Intermède ", ["gr"]="Παύση", @@ -1360,6 +1396,7 @@ data.labels={ ["de"]="Januar", ["en"]="January", ["es"]="enero", + ["et"]="jaanuar", ["fi"]="tammikuu", ["fr"]="janvier", ["gr"]="Ιανουάριος", @@ -1402,6 +1439,7 @@ data.labels={ ["de"]="", ["en"]="jan", ["es"]="ene.", + ["et"]="jaan", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1440,6 +1478,7 @@ data.labels={ ["de"]="Juli", ["en"]="July", ["es"]="julio", + ["et"]="juuli", ["fi"]="heinäkuu", ["fr"]="juillet", ["gr"]="Ιούλιος", @@ -1482,6 +1521,7 @@ data.labels={ ["de"]="", ["en"]="jul", ["es"]="jul.", + ["et"]="juuli", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1519,6 +1559,7 @@ data.labels={ ["de"]="Juni", ["en"]="June", ["es"]="junio", + ["et"]="juuni", ["fi"]="kesäkuu", ["fr"]="juin", ["gr"]="Ιούνιος", @@ -1561,6 +1602,7 @@ data.labels={ ["de"]="", ["en"]="jun", ["es"]="jun.", + ["et"]="juuni", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1596,6 +1638,7 @@ data.labels={ ["de"]="Zeile ", ["en"]="line ", ["es"]="línea ", + ["et"]="joon ", ["fi"]="rivi ", ["fr"]="ligne ", ["gr"]="Γραμμή", @@ -1634,6 +1677,7 @@ data.labels={ ["de"]="Zeilen ", ["en"]="lines ", ["es"]="líneas ", + ["et"]="jooned ", ["fi"]="rivie ", ["fr"]="lignes ", ["gr"]="Γραμμές", @@ -1673,6 +1717,7 @@ data.labels={ ["de"]="März", ["en"]="March", ["es"]="marzo", + ["et"]="märts", ["fi"]="maaliskuu", ["fr"]="mars", ["gr"]="Μάρτιος", @@ -1715,6 +1760,7 @@ data.labels={ ["de"]="", ["en"]="mar", ["es"]="mar.", + ["et"]="märts", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1753,6 +1799,7 @@ data.labels={ ["de"]="Mai", ["en"]="May", ["es"]="mayo", + ["et"]="mai", ["fi"]="toukokuu", ["fr"]="mai", ["gr"]="Μάιος", @@ -1795,6 +1842,7 @@ data.labels={ ["de"]="", ["en"]="may", ["es"]="may.", + ["et"]="mai", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1830,6 +1878,7 @@ data.labels={ ["de"]="Montag", ["en"]="Monday", ["es"]="lunes", + ["et"]="esmaspäev", ["fi"]="maanantai", ["fr"]="lundi", ["gr"]="Δευτέρα", @@ -1860,6 +1909,7 @@ data.labels={ ["month"]={ ["labels"]={ ["en"]="month", + ["et"]="kuu", ["kr"]="월", ["nl"]="maand", ["pe"]="ماه", @@ -1878,6 +1928,7 @@ data.labels={ ["de"]="November", ["en"]="November", ["es"]="noviembre", + ["et"]="november", ["fi"]="marraskuu", ["fr"]="novembre", ["gr"]="Νοέμβριος", @@ -1920,6 +1971,7 @@ data.labels={ ["de"]="", ["en"]="nov", ["es"]="nov.", + ["et"]="nov", ["fi"]="", ["fr"]="", ["gr"]="", @@ -1956,6 +2008,7 @@ data.labels={ ["de"]="Oktober", ["en"]="October", ["es"]="octubre", + ["et"]="oktoober", ["fi"]="lokakuu", ["fr"]="octobre", ["gr"]="Οκτώβριος", @@ -1998,6 +2051,7 @@ data.labels={ ["de"]="", ["en"]="oct", ["es"]="oct.", + ["et"]="okt", ["fi"]="", ["fr"]="", ["gr"]="", @@ -2032,6 +2086,7 @@ data.labels={ ["de"]="Seite ", ["en"]="page ", ["es"]="página ", + ["et"]="lehekülg ", ["fi"]="", ["fr"]="page ", ["gr"]="", @@ -2069,6 +2124,7 @@ data.labels={ ["de"]="Teil ", ["en"]="Part ", ["es"]="Parte ", + ["et"]="Osa ", ["fi"]="Osa ", ["fr"]="Partie ", ["gr"]="Μέρος", @@ -2099,6 +2155,7 @@ data.labels={ ["precedingpage"]={ ["labels"]={ ["en"]="on a preceding page", + ["et"]="eelmisel lehel", ["nl"]="op een voorgaande bladzijde", ["pe"]="در صفحات گذشته", }, @@ -2114,6 +2171,7 @@ data.labels={ ["de"]="Samstag", ["en"]="Saturday", ["es"]="sábado", + ["et"]="laupäev", ["fi"]="lauantai", ["fr"]="samedi", ["gr"]="Σάββατο", @@ -2153,6 +2211,7 @@ data.labels={ ["de"]="", ["en"]="", ["es"]="Sección ", + ["et"]="jaos ", ["fi"]="", ["fr"]="Section ", ["gr"]="Ενότητα", @@ -2190,6 +2249,7 @@ data.labels={ ["de"]="siehe ", ["en"]="see ", ["es"]="ver: ", + ["et"]="vaadake ", ["fi"]="", ["fr"]="cf. ", ["gr"]="", @@ -2229,6 +2289,7 @@ data.labels={ ["de"]="September", ["en"]="September", ["es"]="septiembre", + ["et"]="september", ["fi"]="syyskuu", ["fr"]="septembre", ["gr"]="Σεπτέμβριος", @@ -2271,6 +2332,7 @@ data.labels={ ["de"]="", ["en"]="sep", ["es"]="sep.", + ["et"]="sept", ["fi"]="", ["fr"]="", ["gr"]="", @@ -2307,6 +2369,7 @@ data.labels={ ["de"]="", ["en"]="", ["es"]="Subsección ", + ["et"]="alajaotis ", ["fi"]="", ["fr"]="Soussection ", ["gr"]="Υπόενότητα", @@ -2345,6 +2408,7 @@ data.labels={ ["de"]="", ["en"]="", ["es"]="Subsubsección ", + ["et"]="alamjaotis ", ["fi"]="", ["fr"]="Soussoussection ", ["gr"]="", @@ -2383,6 +2447,7 @@ data.labels={ ["de"]="", ["en"]="", ["es"]="Subsubsubsección ", + ["et"]="", ["fi"]="", ["fr"]="Soussoussoussection ", ["gr"]="", @@ -2420,6 +2485,7 @@ data.labels={ ["de"]="Sonntag", ["en"]="Sunday", ["es"]="domingo", + ["et"]="pühapäev", ["fi"]="sunnuntai", ["fr"]="dimanche", ["gr"]="Κυριακή", @@ -2458,6 +2524,7 @@ data.labels={ ["de"]="Tabelle ", ["en"]="Table ", ["es"]="Tabla ", + ["et"]="Tabel ", ["fi"]="Taulukko ", ["fr"]="Tableau ", ["gr"]="Πίνακας", @@ -2496,6 +2563,7 @@ data.labels={ ["de"]="Donnerstag", ["en"]="Thursday", ["es"]="jueves", + ["et"]="neljapäev", ["fi"]="torstai", ["fr"]="jeudi", ["gr"]="Πέμπτη", @@ -2534,6 +2602,7 @@ data.labels={ ["de"]="Dienstag", ["en"]="Tuesday", ["es"]="martes", + ["et"]="teisipäev", ["fi"]="tiistai", ["fr"]="mardi", ["gr"]="Τρίτη", @@ -2572,6 +2641,7 @@ data.labels={ ["de"]="Mittwoch", ["en"]="Wednesday", ["es"]="miércoles", + ["et"]="kolmapäev", ["fi"]="keskiviikko", ["fr"]="mercredi", ["gr"]="Τετάρτη", @@ -2602,6 +2672,7 @@ data.labels={ ["year"]={ ["labels"]={ ["en"]="year", + ["et"]="aasta", ["kr"]="년", ["nl"]="jaar", ["pe"]="سال", @@ -2620,6 +2691,7 @@ data.labels={ ["de"]="Abkürzungen", ["en"]="Abbreviations", ["es"]="Abreviaturas", + ["et"]="Lühend", ["fi"]="Lyhennyksi", ["fr"]="Abréviations", ["gr"]="Συντομογραφίες", @@ -2658,6 +2730,7 @@ data.labels={ ["de"]="Inhalt", ["en"]="Contents", ["es"]="Contenido", + ["et"]="Sisu", ["fi"]="Sisällys", ["fr"]="Table des matières", ["gr"]="Περιεχόμενα", @@ -2696,6 +2769,7 @@ data.labels={ ["de"]="Abbildungen", ["en"]="Figures", ["es"]="Figuras", + ["et"]="Arvandmed", ["fi"]="Kuvi", ["fr"]="Figures", ["gr"]="Σχήματα", @@ -2734,6 +2808,7 @@ data.labels={ ["de"]="Graphiken", ["en"]="Graphics", ["es"]="Gráficos", + ["et"]="Graafika", ["fi"]="Grafiikkaoi", ["fr"]="Graphiques", ["gr"]="Γραφικά", @@ -2772,6 +2847,7 @@ data.labels={ ["de"]="Index", ["en"]="Index", ["es"]="Índice", + ["et"]="Indeks", ["fi"]="Indeksiluku", ["fr"]="Index", ["gr"]="Ευρετήριο", @@ -2810,6 +2886,7 @@ data.labels={ ["de"]="Intermezzi", ["en"]="Intermezzos", ["es"]="Intermedios", + ["et"]="Vahemängud", ["fi"]="Intermezzos", ["fr"]="Intermèdes", ["gr"]="Παύσεις", @@ -2847,6 +2924,7 @@ data.labels={ ["de"]="Logos", ["en"]="Logos", ["es"]="Logotipos", + ["et"]="Logos", ["fi"]="Vertauskuva", ["fr"]="Logos", ["gr"]="Λογότυπα", @@ -2883,6 +2961,7 @@ data.labels={ ["de"]="Literatur", ["en"]="References", ["es"]="Bibliografía", + ["et"]="Viited", ["fi"]="", ["fr"]="Bibliographie", ["gr"]="", @@ -2920,6 +2999,7 @@ data.labels={ ["de"]="Tabellen", ["en"]="Tables", ["es"]="Tablas", + ["et"]="Tabelid", ["fi"]="Taulukkoj", ["fr"]="Tableaux", ["gr"]="Πίνακες", @@ -2958,6 +3038,7 @@ data.labels={ ["de"]="Einheiten", ["en"]="Units", ["es"]="Unidades", + ["et"]="Ühikud", ["fi"]="Yksiköt", ["fr"]="Unités", ["gr"]="Μονάδες", diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index f0da0e38f..d4ef3f6df 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -7503,6 +7503,10 @@ return { ["pe"]="تاریخ", ["ro"]="data", }, + ["time"]={ + ["en"]="time", + ["nl"]="tijd", + }, ["deepnumbercommand"]={ ["cs"]="deepnumbercommand", ["de"]="deepnumbercommand", diff --git a/tex/context/base/mkiv/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv index bea7f188d..51040a28e 100644 --- a/tex/context/base/mkiv/page-mul.mkiv +++ b/tex/context/base/mkiv/page-mul.mkiv @@ -761,7 +761,7 @@ \page_mul_set_n_of_lines \advance\c_page_mul_n_of_lines \minustwo \scratchdimen\dimexpr\c_page_mul_n_of_lines\lineheight+\topskip\relax - \setbox\b_page_mul_notes\hbox{\lower\scratchdimen\box\b_page_mul_notes}% + \setbox\b_page_mul_notes\hpack{\lower\scratchdimen\box\b_page_mul_notes}% \ht\b_page_mul_notes\openstrutheight \dp\b_page_mul_notes\openstrutdepth \wd\b_page_mul_notes\zeropoint @@ -784,7 +784,7 @@ \getnoflines\scratchdimen \advance\noflines \minustwo \scratchdimen\dimexpr\noflines\lineheight+\topskip\relax - \setbox\b_page_mul_notes\hbox{\lower\scratchdimen\box\b_page_mul_notes}% + \setbox\b_page_mul_notes\hpack{\lower\scratchdimen\box\b_page_mul_notes}% \ht\b_page_mul_notes\openstrutheight \dp\b_page_mul_notes\openstrutdepth \wd\b_page_mul_notes\zeropoint diff --git a/tex/context/base/mkiv/page-pcl.mkiv b/tex/context/base/mkiv/page-pcl.mkiv index 5b7d0ae8a..140444fc2 100644 --- a/tex/context/base/mkiv/page-pcl.mkiv +++ b/tex/context/base/mkiv/page-pcl.mkiv @@ -30,19 +30,18 @@ \definemeasure[threecolumns][\dimexpr\plusthree\columnwidth+\plustwo \columndistance\relax] \definemeasure[fourcolumns] [\dimexpr\plusfour \columnwidth+\plusthree\columndistance\relax] -\newcount\c_page_col_n_of_columns \c_page_col_n_of_columns\plusone -\newcount\c_page_col_current \c_page_col_current \plusone -\newdimen\d_page_col_distance -\newdimen\d_page_col_max_height -\newdimen\d_page_col_max_width -%newdimen\d_page_col_balance_step -\newdimen\d_page_col_column_width - -\newdimen\d_page_col_top_height -\newdimen\d_page_col_top_width - -\newdimen\d_page_col_available -\newdimen\d_page_col_sofar +\newcount \c_page_col_n_of_columns \c_page_col_n_of_columns\plusone +\newcount \c_page_col_current \c_page_col_current \plusone +\newdimen \d_page_col_distance +\newdimen \d_page_col_max_height +\newdimen \d_page_col_max_width +%newdimen \d_page_col_balance_step +\newdimen \d_page_col_column_width +\newdimen \d_page_col_top_height +\newdimen \d_page_col_top_width +\newdimen \d_page_col_available +\newdimen \d_page_col_sofar +\newconditional\c_page_col_page %D We need to step over empty columns. @@ -700,6 +699,7 @@ \setuppagecolumns [\c!distance=1.5\bodyfontsize, \c!n=\plustwo, + \c!page=\v!yes, %\c!align=, % inherit (also replaces tolerance) %\c!before=, %\c!after=, @@ -727,9 +727,39 @@ \ifdefined \columnwidth \else \newdimen\columnwidth \fi \ifdefined \columndistance \else \newdimen\columndistance \fi +\def\page_col_pickup_preceding + {\begingroup + \setupoutputroutine[\s!mixedcolumn]% + \c_page_mix_routine\c_page_mix_routine_intercept + \page_otr_trigger_output_routine + \ifvoid\b_page_mix_preceding \else + % moved here, before the packaging + \page_postprocessors_linenumbers_deepbox\b_page_mix_preceding + % we need to avoid unvboxing with successive balanced on one page + \global\setbox\b_page_mix_preceding\vbox\bgroup + % yes or no: \forcestrutdepth + \unvbox\b_page_mix_preceding + \forcestrutdepth + \egroup + \wd\b_page_mix_preceding\makeupwidth + \global\d_page_mix_preceding_height\ht\b_page_mix_preceding + \fi + \endgroup} + +\def\page_col_flush_preceding + {\ifvoid\b_page_mix_preceding \else + % this is just one method but ok for now + \begingroup + % we might need more but for now this is ok + \setupfloat[\c!spacebefore=,\c!spaceafter=]% + \startplacefigure[\c!location={\v!top,\v!none}]% + \box\b_page_mix_preceding + \stopplacefigure + \endgroup + \fi} + \unexpanded\def\startpagecolumns - {\page - \begingroup + {\begingroup \begingroup \dosingleempty\page_col_start} @@ -738,6 +768,15 @@ {\let\currentpagecolumns\empty \setuppagecolumns[#1]}% {\edef\currentpagecolumns{#1}}% + \edef\p_page{\pagecolumnsparameter\c!page}% + \ifx\p_page\empty + \setfalse\c_page_col_page + \else\ifx\p_page\v!no + \setfalse\c_page_col_page + \else + \settrue\c_page_col_page + \page[\p_page]% + \fi\fi \c_page_col_n_of_columns\pagecolumnsparameter\c!n\relax \ifnum\c_page_col_n_of_columns>\plusone \expandafter\page_col_start_yes @@ -775,7 +814,15 @@ % \usesetupsparameter\pagecolumnsparameter % + % This will become a method but for now it's good enough + % + \ifconditional\c_page_col_page\else + \page_col_pickup_preceding + \fi \setupoutputroutine[\s!pagecolumn]% + \ifconditional\c_page_col_page\else + \page_col_flush_preceding + \fi % \setupfloats[\c!ntop=\plusthousand]% % \setupfloats[\c!nbottom=\plusthousand]% diff --git a/tex/context/base/mkiv/page-spr.mkiv b/tex/context/base/mkiv/page-spr.mkiv index f57b804b3..6c8f4d187 100644 --- a/tex/context/base/mkiv/page-spr.mkiv +++ b/tex/context/base/mkiv/page-spr.mkiv @@ -46,12 +46,12 @@ \def\normalsettextpagecontent_normal#1% {\ifdim\wd#1=\makeupwidth\else - \setbox#1\hbox to \makeupwidth + \setbox#1\hpack to \makeupwidth {\hss\box#1\hss}% never change the \hss's \fi} \def\normalsettextpagecontent_spread#1% - {\setbox#1\hbox to \makeupwidth + {\setbox#1\hpack to \makeupwidth {\ifvoid\b_page_spread_content \ifconditional\c_page_spread_once \box#1% diff --git a/tex/context/base/mkiv/sort-lan.lua b/tex/context/base/mkiv/sort-lan.lua index 3d5c89bb8..b27798966 100644 --- a/tex/context/base/mkiv/sort-lan.lua +++ b/tex/context/base/mkiv/sort-lan.lua @@ -134,7 +134,7 @@ definitions['de-AT'] = { }, } --- finish (by Wolfgang Schuster) +-- finnish (by Wolfgang Schuster) definitions['fi'] = { entries = { @@ -905,22 +905,24 @@ definitions["hu"] = { }, } ---- Estonian +-- Estonian definitions["et"] = { - entries = { -- w x y are used for foreign words only - ["a"] = "a", ["b"] = "b", ["d"] = "d", ["e"] = "e", ["f"] = "f", - ["g"] = "g", ["h"] = "h", ["i"] = "i", ["j"] = "j", ["k"] = "k", - ["l"] = "l", ["m"] = "m", ["n"] = "n", ["o"] = "o", ["p"] = "p", - ["r"] = "r", ["s"] = "s", ["š"] = "š", ["z"] = "z", ["ž"] = "ž", - ["t"] = "t", ["u"] = "u", ["v"] = "v", ["w"] = "v", ["õ"] = "õ", - ["ä"] = "ä", ["ö"] = "ö", ["ü"] = "ü", ["x"] = "x", ["y"] = "y", + entries = { -- f š z ž are used in estonian words of foreign origin, c č q w x y are used for foreign words only + ["a"] = "a", ["b"] = "b", ["c"] = "c", ["č"] = "č", ["d"] = "d", + ["e"] = "e", ["f"] = "f", ["g"] = "g", ["h"] = "h", ["i"] = "i", + ["j"] = "j", ["k"] = "k", ["l"] = "l", ["m"] = "m", ["n"] = "n", + ["o"] = "o", ["p"] = "p", ["q"] = "q", ["r"] = "r", ["s"] = "s", + ["š"] = "š", ["z"] = "z", ["ž"] = "ž", ["t"] = "t", ["u"] = "u", + ["v"] = "v", ["w"] = "w", ["õ"] = "õ", ["ä"] = "ä", ["ö"] = "ö", + ["ü"] = "ü", ["x"] = "x", ["y"] = "y", }, orders = { - "a", "b", "d", "e", "f", "g", "h", "i", "j", "k", - "l", "m", "n", "o", "p", "r", "s", "š", "z", "ž", - "t", "u", "v", "w", "õ", "ä", "ö", "ü", "x", "y", - } + "a", "b", "c", "č", "d", "e", "f", "g", "h", "i", + "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", + "š", "z", "ž", "t", "u", "v", "w", "õ", "ä", "ö", + "ü", "x", "y", + }, } --- Korean diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 02dca1b86..395dfd172 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex a557efdd7..270d4ef92 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml index 913b54e94..6edecb621 100644 --- a/tex/context/interface/mkii/keys-it.xml +++ b/tex/context/interface/mkii/keys-it.xml @@ -1247,6 +1247,7 @@ <cd:constant name='textstyle' value='stiletesto'/> <cd:constant name='textwidth' value='ampiezzatesto'/> <cd:constant name='threshold' value='threshold'/> + <cd:constant name='time' value='time'/> <cd:constant name='title' value='titolo'/> <cd:constant name='titlecolor' value='coloretitolo'/> <cd:constant name='titlecommand' value='titlecommand'/> diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index a0c7c4138..bf442c134 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -18646,6 +18646,9 @@ <cd:parameter name="date"> <cd:inherit name="currentdate"/> </cd:parameter> + <cd:parameter name="time"> + <cd:inherit name="currenttime"/> + </cd:parameter> <cd:parameter name="patterns"> <cd:constant type="cd:file"/> </cd:parameter> @@ -26562,6 +26565,9 @@ <cd:parameter name="setups"> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 33a647f28..1ac6e7764 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index 357061321..e682aec3d 100644 --- a/tex/context/interface/mkiv/i-language.xml +++ b/tex/context/interface/mkiv/i-language.xml @@ -37,6 +37,9 @@ <cd:parameter name="date"> <cd:inherit name="currentdate"/> </cd:parameter> + <cd:parameter name="time"> + <cd:inherit name="currenttime"/> + </cd:parameter> <cd:parameter name="patterns"> <cd:constant type="cd:file"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-pagecolumns.xml b/tex/context/interface/mkiv/i-pagecolumns.xml index 493f9c1dc..07ab20abb 100644 --- a/tex/context/interface/mkiv/i-pagecolumns.xml +++ b/tex/context/interface/mkiv/i-pagecolumns.xml @@ -59,6 +59,9 @@ <cd:parameter name="setups"> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> @@ -84,4 +87,4 @@ </cd:sequence> </cd:command> -</cd:interface>
\ No newline at end of file +</cd:interface> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex d72ad1ee2..75e3265b4 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 8ee2fcb32..b76e2042b 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 : 09/24/18 14:11:29 +-- merge date : 09/25/18 14:14:33 do -- begin closure to overcome local limits and interference |