From f3157085de19cbc6cee3ade6d9e4e705675196a3 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 5 Oct 2019 16:12:50 +0200 Subject: 2019-10-05 14:54:00 --- doc/context/documents/general/qrcs/setup-cs.pdf | Bin 887638 -> 887446 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 889570 -> 889459 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 893187 -> 893252 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 885655 -> 885320 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 891118 -> 891290 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 383962 -> 383704 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 471698 -> 471534 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 380055 -> 380336 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 383753 -> 383846 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 383179 -> 383243 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 382085 -> 381980 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 620612 -> 620230 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 880835 -> 880904 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 885539 -> 885653 bytes doc/context/scripts/mkiv/mtx-update.html | 66 +++++++++++++++++ doc/context/scripts/mkiv/mtx-update.man | 81 +++++++++++++++++++++ doc/context/scripts/mkiv/mtx-update.xml | 33 +++++++++ metapost/context/base/mpiv/mp-lmtx.mpxl | 1 + scripts/context/lua/mtx-update.lua | 2 +- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-fr.mkii | 1 + tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/context.mkxl | 2 +- tex/context/base/mkiv/font-ogr.lua | 27 ++++--- tex/context/base/mkiv/status-files.pdf | Bin 26660 -> 26662 bytes tex/context/base/mkiv/status-lua.pdf | Bin 268380 -> 268380 bytes tex/context/interface/mkii/keys-fr.xml | 1 + tex/context/interface/mkiv/i-context.pdf | Bin 893187 -> 893252 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 61165 -> 61165 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 32 files changed, 206 insertions(+), 18 deletions(-) create mode 100644 doc/context/scripts/mkiv/mtx-update.html create mode 100644 doc/context/scripts/mkiv/mtx-update.man create mode 100644 doc/context/scripts/mkiv/mtx-update.xml diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index 506dfc96a..115032824 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index 3265015ea..a78461575 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index 51102b6e7..d28f6d585 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index 436f9f41d..c1169b609 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 09ba7f8cc..7ada4035b 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf index c4f84e8e4..09643f6ef 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf and b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf index 4a8cec63f..88132acb4 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-de.pdf and b/doc/context/documents/general/qrcs/setup-mapping-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf index 439349327..2ae010e22 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-en.pdf and b/doc/context/documents/general/qrcs/setup-mapping-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf index 2ba16062a..950afa1ce 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf and b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf index ecd479c4b..7686eb915 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-it.pdf and b/doc/context/documents/general/qrcs/setup-mapping-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf index 0ddd7011d..0fea84fbf 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf and b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf index 15edacd00..f0af2480c 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf and b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index d389a21cb..52f60e02f 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 3ec2dc1db..3f47c3e80 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ diff --git a/doc/context/scripts/mkiv/mtx-update.html b/doc/context/scripts/mkiv/mtx-update.html new file mode 100644 index 000000000..ed7363ca0 --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-update.html @@ -0,0 +1,66 @@ + + + + + + + + + + + ConTeXt Minimals Updater 1.03 + + + + + +
+
ConTeXt Minimals Updater 1.03
+
+
+
+
wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
--platformstringplatform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)
--serverstringrepository url (rsync://contextgarden.net)
--modulestringrepository url (minimals)
--repositorystringspecify version (current, experimental)
--contextstringspecify version (current, latest, beta, yyyy.mm.dd)
--rsyncstringrsync binary (rsync)
--texrootstringinstallation directory (not guessed for the moment)
--enginestringtex engine (luatex, pdftex, xetex)
--modulesstringextra modules (can be list or 'all')
--fontsstringadditional fonts (can be list or 'all')
--goodiesstringextra binaries (like scite and texworks)
--forceinstead of a dryrun, do the real thing
--updateupdate minimal tree
--makealso make formats and generate file databases
--keepdon't delete unused or obsolete files
--stateupdate tree using saved state
--cygwinadapt drive specs to cygwin
--mingwassume mingw binaries being used
--silentless (or no) logging
+
+
+
+ + diff --git a/doc/context/scripts/mkiv/mtx-update.man b/doc/context/scripts/mkiv/mtx-update.man new file mode 100644 index 000000000..a4ecef639 --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-update.man @@ -0,0 +1,81 @@ +.TH "mtx-update" "1" "01-01-2019" "version 1.03" "ConTeXt Minimals Updater" +.SH NAME + mtx-update - ConTeXt Minimals Updater +.SH SYNOPSIS +.B mtxrun --script update [ +.I OPTIONS ... +.B ] [ +.I FILENAMES +.B ] +.SH DESCRIPTION +.B ConTeXt Minimals Updater +.SH OPTIONS +.TP +.B --platform=string +platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc) +.TP +.B --server=string +repository url (rsync://contextgarden.net) +.TP +.B --module=string +repository url (minimals) +.TP +.B --repository=string +specify version (current, experimental) +.TP +.B --context=string +specify version (current, latest, beta, yyyy.mm.dd) +.TP +.B --rsync=string +rsync binary (rsync) +.TP +.B --texroot=string +installation directory (not guessed for the moment) +.TP +.B --engine=string +tex engine (luatex, pdftex, xetex) +.TP +.B --modules=string +extra modules (can be list or 'all') +.TP +.B --fonts=string +additional fonts (can be list or 'all') +.TP +.B --goodies=string +extra binaries (like scite and texworks) +.TP +.B --force +instead of a dryrun, do the real thing +.TP +.B --update +update minimal tree +.TP +.B --make +also make formats and generate file databases +.TP +.B --keep +don't delete unused or obsolete files +.TP +.B --state +update tree using saved state +.TP +.B --cygwin +adapt drive specs to cygwin +.TP +.B --mingw +assume mingw binaries being used +.TP +.B --silent +less (or no) logging +.SH AUTHOR +More information about ConTeXt and the tools that come with it can be found at: + + +.B "maillist:" +ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context + +.B "webpage:" +http://www.pragma-ade.nl / http://tex.aanhet.net + +.B "wiki:" +http://contextgarden.net diff --git a/doc/context/scripts/mkiv/mtx-update.xml b/doc/context/scripts/mkiv/mtx-update.xml new file mode 100644 index 000000000..818b994fd --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-update.xml @@ -0,0 +1,33 @@ + + + + mtx-update + ConTeXt Minimals Updater + 1.03 + + + + + platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc) + repository url (rsync://contextgarden.net) + repository url (minimals) + specify version (current, experimental) + specify version (current, latest, beta, yyyy.mm.dd) + rsync binary (rsync) + installation directory (not guessed for the moment) + tex engine (luatex, pdftex, xetex) + extra modules (can be list or 'all') + additional fonts (can be list or 'all') + extra binaries (like scite and texworks) + instead of a dryrun, do the real thing + update minimal tree + also make formats and generate file databases + don't delete unused or obsolete files + update tree using saved state + adapt drive specs to cygwin + assume mingw binaries being used + less (or no) logging + + + + diff --git a/metapost/context/base/mpiv/mp-lmtx.mpxl b/metapost/context/base/mpiv/mp-lmtx.mpxl index 3d24dfd75..bc658a7b2 100644 --- a/metapost/context/base/mpiv/mp-lmtx.mpxl +++ b/metapost/context/base/mpiv/mp-lmtx.mpxl @@ -2124,6 +2124,7 @@ presetparameters "mpsglyphs" [ presetparameters "mpsglyph" [ category = "dummy", unicode = 0, + % unichar = "" ] ; def lmt_registerglyphs = applyparameters "mpsglyphs" "lmt_do_registerglyphs" enddef ; diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua index a3297e804..0462313d6 100644 --- a/scripts/context/lua/mtx-update.lua +++ b/scripts/context/lua/mtx-update.lua @@ -224,7 +224,7 @@ update.goodies = { -- ["unknown"] = "unknown", -- } -local platforms = { +update.platforms = { ["mswin"] = "mswin", ["windows"] = "mswin", ["win32"] = "mswin", diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index bed8b96fc..08e2176a8 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{2019.10.04 17:44} +\newcontextversion{2019.10.05 14:45} %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 b042613af..e1b15ce6a 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{2019.10.04 17:44} +\edef\contextversion{2019.10.05 14:45} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index b85fcc245..02135bcbf 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -234,6 +234,7 @@ \setinterfacevariable{hanging}{suspend} \setinterfacevariable{head}{tete} \setinterfacevariable{header}{entete} +\setinterfacevariable{headintext}{headintext} \setinterfacevariable{height}{hauteur} \setinterfacevariable{helptext}{texteaide} \setinterfacevariable{hencefore}{precedent} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 1b4a8b805..07821ba93 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2019.10.04 17:44} +\newcontextversion{2019.10.05 14:45} %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 cc542ec68..ae52ed885 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.10.04 17:44} +\edef\contextversion{2019.10.05 14:45} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 6158184ee..538735850 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.10.04 17:44} +\edef\contextversion{2019.10.05 14:45} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/font-ogr.lua b/tex/context/base/mkiv/font-ogr.lua index ed5bc709b..5d45c3c5b 100644 --- a/tex/context/base/mkiv/font-ogr.lua +++ b/tex/context/base/mkiv/font-ogr.lua @@ -202,18 +202,23 @@ do end function dropins.registerglyph(parameters) - local category = parameters.category - local unicode = parameters.unicode - local unitype = type(unicode) - if unitype == "string" then - local uninumber = tonumber(unicode) - if uninumber then - unicode = round(uninumber) - else - unicode = utfbyte(unicode) + local category = parameters.category + local unicode = parameters.unicode + local unichar = parameters.unichar + if type(unichar) == "string" then + unicode = utfbyte(unichar) + else + local unitype = type(unicode) + if unitype == "string" then + local uninumber = tonumber(unicode) + if uninumber then + unicode = round(uninumber) + else + unicode = utfbyte(unicode) + end + elseif unitype == "number" then + unicode = round(unicode) end - elseif unitype == "number" then - unicode = round(unicode) end parameters.unicode = unicode -- print(category,unicode) diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 0d100562d..0ee0bd0ce 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 41c98c12c..215b37f01 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/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index 3e0e890d6..c1f7b970b 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -237,6 +237,7 @@ + diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 51102b6e7..d28f6d585 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-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 41e4b2392..cb957009b 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/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 9d036f3ec..e9b99be70 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 10/04/19 17:44:12 +-- merge date : 10/05/19 14:45:26 do -- begin closure to overcome local limits and interference -- cgit v1.2.3