From f74c4055713ab52a11d12435eb04040ec6553129 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 6 Dec 2019 22:57:40 +0100 Subject: 2019-12-06 19:54:00 --- doc/context/documents/general/qrcs/setup-cs.pdf | Bin 888089 -> 888024 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 889424 -> 889795 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 893995 -> 893980 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 885882 -> 886179 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 891894 -> 891983 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 383649 -> 383647 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 383776 -> 384184 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 380305 -> 380310 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 383852 -> 383890 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 383523 -> 383477 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 381891 -> 382068 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 620337 -> 620138 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 881163 -> 881404 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 886075 -> 886091 bytes doc/context/scripts/mkiv/mtx-fonts.html | 81 +++++++++++++++++++++ doc/context/scripts/mkiv/mtx-fonts.man | 69 ++++++++++++++++++ doc/context/scripts/mkiv/mtx-fonts.xml | 65 +++++++++++++++++ tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- 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-ini.lua | 2 +- tex/context/base/mkiv/lpdf-ini.lua | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 26578 -> 26605 bytes tex/context/base/mkiv/status-lua.pdf | Bin 269165 -> 269165 bytes tex/context/interface/mkiv/i-context.pdf | Bin 893995 -> 893980 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 61165 -> 61165 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 4 +- 29 files changed, 224 insertions(+), 9 deletions(-) create mode 100644 doc/context/scripts/mkiv/mtx-fonts.html create mode 100644 doc/context/scripts/mkiv/mtx-fonts.man create mode 100644 doc/context/scripts/mkiv/mtx-fonts.xml diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index 31bb06864..bb1be8747 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 e3ace250f..212dd9a25 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 12d7ad595..e38499187 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 b9d18b6e1..5b31e3a99 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 c78a1f578..ded5e8882 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 9708078cd..78500f041 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 546aa5f31..ff2393e97 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 bfc546f37..c79bbd3d0 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 506d92d93..2cab564a4 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 f9d44c4ae..c64b3f941 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 94cf16b02..75911f96a 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 6f19eb84c..e3c836392 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 b0b530e51..ca96ab077 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 b9a54628e..941ce9fab 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-fonts.html b/doc/context/scripts/mkiv/mtx-fonts.html new file mode 100644 index 000000000..b175139c8 --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-fonts.html @@ -0,0 +1,81 @@ + + + + + + + + + + + ConTeXt Font Database Management 0.21 + + + + + +
+
ConTeXt Font Database Management 0.21
+
+
+
+
wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
+
+
+
+ +
+
+

Command line options

+ + + + + + + + + + + + + + + + + + + + + +
flagvaluedescription
--convertsave open type font in raw table
--unpacksave a tma file in a more readable format
--reloadgenerate new font database (use --force when in doubt)
--reload--simple:generate luatex-fonts-names.lua (not for context!)
--list--name: list installed fonts, filter by name [--pattern]
--list--spec: list installed fonts, filter by spec [--filter]
--list--file: list installed fonts, filter by file [--pattern]
--patternstrfilter files using pattern
--filterlistkey-value pairs
--allshow all found instances (combined with other flags)
--infogive more details
--trackerslistenable trackers
--statisticssome info about the database
--namesuse name instead of unicodes
--cachestruse specific cache (otl or otf)
+
+

Examples

+mtxrun --script font --list somename (== --pattern=*somename*) +

mtxrun --script font --list --name somename +
mtxrun --script font --list --name --pattern=*somename* +

mtxrun --script font --list --spec somename +
mtxrun --script font --list --spec somename-bold-italic +
mtxrun --script font --list --spec --pattern=*somename* +
mtxrun --script font --list --spec --filter="fontname=somename" +
mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed" +
mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic" +

mtxrun --script font --list --all +
mtxrun --script font --list --file somename +
mtxrun --script font --list --file --all somename +
mtxrun --script font --list --file --pattern=*somename* +

mtxrun --script font --convert texgyrepagella-regular.otf +
mtxrun --script font --convert --names texgyrepagella-regular.otf +

+
+ + diff --git a/doc/context/scripts/mkiv/mtx-fonts.man b/doc/context/scripts/mkiv/mtx-fonts.man new file mode 100644 index 000000000..e781b087c --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-fonts.man @@ -0,0 +1,69 @@ +.TH "mtx-fonts" "1" "01-01-2019" "version 1.00" "ConTeXt Font Database Management" +.SH NAME + mtx-fonts - ConTeXt Font Database Management +.SH SYNOPSIS +.B mtxrun --script fonts [ +.I OPTIONS ... +.B ] [ +.I FILENAMES +.B ] +.SH DESCRIPTION +.B ConTeXt Font Database Management +.SH OPTIONS +.TP +.B --convert +save open type font in raw table +.TP +.B --unpack +save a tma file in a more readable format +.TP +.B --reload +generate new font database (use --force when in doubt) +.TP +.B --reload +--simple:generate luatex-fonts-names.lua (not for context!) +.TP +.B --list +--name: list installed fonts, filter by name [--pattern] +.TP +.B --list +--spec: list installed fonts, filter by spec [--filter] +.TP +.B --list +--file: list installed fonts, filter by file [--pattern] +.TP +.B --pattern=str +filter files using pattern +.TP +.B --filter=list +key-value pairs +.TP +.B --all +show all found instances (combined with other flags) +.TP +.B --info +give more details +.TP +.B --trackers=list +enable trackers +.TP +.B --statistics +some info about the database +.TP +.B --names +use name instead of unicodes +.TP +.B --cache=str +use specific cache (otl or otf) +.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-fonts.xml b/doc/context/scripts/mkiv/mtx-fonts.xml new file mode 100644 index 000000000..d001f4f9a --- /dev/null +++ b/doc/context/scripts/mkiv/mtx-fonts.xml @@ -0,0 +1,65 @@ + + + + mtx-fonts + ConTeXt Font Database Management + 1.00 + + + + + save open type font in raw table + save a tma file in a more readable format + + + generate new font database (use when in doubt) + :generate luatex-fonts-names.lua (not for context!) + + + : list installed fonts, filter by name [] + : list installed fonts, filter by spec [] + : list installed fonts, filter by file [] + + + filter files using pattern + key-value pairs + show all found instances (combined with other flags) + give more details + enable trackers + some info about the database + use name instead of unicodes + use specific cache (otl or otf) + + + + + + Examples + + mtxrun --script font --list somename (== --pattern=*somename*) + + + mtxrun --script font --list --name somename + mtxrun --script font --list --name --pattern=*somename* + + + mtxrun --script font --list --spec somename + mtxrun --script font --list --spec somename-bold-italic + mtxrun --script font --list --spec --pattern=*somename* + mtxrun --script font --list --spec --filter="fontname=somename" + mtxrun --script font --list --spec --filter="familyname=somename,weight=bold,style=italic,width=condensed" + mtxrun --script font --list --spec --filter="familyname=crap*,weight=bold,style=italic" + + + mtxrun --script font --list --all + mtxrun --script font --list --file somename + mtxrun --script font --list --file --all somename + mtxrun --script font --list --file --pattern=*somename* + + + mtxrun --script font --convert texgyrepagella-regular.otf + mtxrun --script font --convert --names texgyrepagella-regular.otf + + + + diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 3821ec4a7..c68d0bd30 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.12.05 18:44} +\newcontextversion{2019.12.06 19: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 21d3808ea..cf49f51f0 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.12.05 18:44} +\edef\contextversion{2019.12.06 19:45} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index cfec9c098..32d0ff457 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.12.05 18:44} +\newcontextversion{2019.12.06 19: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 54f6ecc35..fa33068b2 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.12.05 18:44} +\edef\contextversion{2019.12.06 19: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 e91fbc285..38e339ec8 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.12.05 18:44} +\edef\contextversion{2019.12.06 19:45} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/font-ini.lua b/tex/context/base/mkiv/font-ini.lua index 8fdac011d..8bab6d902 100644 --- a/tex/context/base/mkiv/font-ini.lua +++ b/tex/context/base/mkiv/font-ini.lua @@ -53,6 +53,6 @@ fonts.privateoffsets = { keepnames = false, -- when set to true names are always kept (not for context) } -if not tex.getfontoffamily then +if node and not tex.getfontoffamily then tex.getfontoffamily = node.family_font -- we moved this end diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index b039daa58..2163e8748 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1275,7 +1275,7 @@ do end end end - if ExtGState or ColorSpace or Pattern or Shading or Fonts then + if ExtGState or ColorSpace or Pattern or Shading or Font then local collected = pdfdictionary { ExtGState = ExtGState, ColorSpace = ColorSpace, diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 14160c825..251d59539 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 1fb3effab..24ef5be72 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/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 12d7ad595..e38499187 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 7695a653b..bdfaa028f 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 f81fee7a7..2b4755b3f 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 : 12/05/19 18:44:50 +-- merge date : 12/06/19 19:45:18 do -- begin closure to overcome local limits and interference @@ -8690,7 +8690,7 @@ fonts.privateoffsets={ mathbase=0xFF000, keepnames=false, } -if not tex.getfontoffamily then +if node and not tex.getfontoffamily then tex.getfontoffamily=node.family_font end -- cgit v1.2.3