diff options
89 files changed, 740 insertions, 1058 deletions
diff --git a/context/data/cont-cz-scite.properties b/context/data/cont-cz-scite.properties index b0cb8d6ff..256a4ea3b 100644 --- a/context/data/cont-cz-scite.properties +++ b/context/data/cont-cz-scite.properties @@ -24,53 +24,53 @@ keywordclass.macros.context.cz=\ nastavdefinicipoznamekpodcarou nastavdeleniplvoucichobjektu nastavdelitko nastavdolnitexty nastavexterniobrazy nastavhorejsek \ nastavhornitexty nastavinterakci nastavinterakcnilistu nastavinterakcniobrazovku nastavjazyk nastavkapitalky \ nastavkombinovanyseznam nastavkomentar nastavlegendu nastavmarginalie nastavmarginalniblok nastavmarginalnilinky \ - nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazovani nastavodstavce \ - nastavopis nastavoramovanetexty nastavoramovani nastavorez nastavotoceni nastavpaletu \ - nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni nastavpole nastavpolozky \ - nastavpopisek nastavpopisky nastavpopisy nastavpozadi nastavpoznamkypodcarou nastavprechodstrany \ - nastavpreskok nastavprofily nastavprogramy nastavprostredizakladnihofontu nastavpublikace nastavradkovani \ - nastavradky nastavrastr nastavrejstrik nastavsadusymbolu nastavsekci nastavseznam \ - nastavseznamodkazu nastavsirkucary nastavsloupce nastavspodek nastavspojeni nastavsynchronizaci \ - nastavsynchronizacnilistu nastavsynonyma nastavsystem nastavtab nastavtabelaci nastavtabulky \ - nastavtenkelinky nastavtext nastavtexthlavicky nastavtextovelinky nastavtextpopisku nastavtexttexty \ - nastavtextyupati nastavtextyzahlavi nastavtlacitka nastavtoleranci nastavtrideni nastavtype \ - nastavumisteniprotejsku nastavumistovani nastavupati nastavupravu nastavurl nastavusporadani \ - nastavvelikostpapiru nastavverze nastavvsechnapole nastavvycty nastavvyplnovelinky nastavvyplnoveradky \ - nastavvystup nastavvzhled nastavzahlavi nastavzakladnifont nastavzarovnani nastavznaceni \ - nastavzuzeni nastrane nejakyradek nekde nivy nizky \ - nop obrazovka odkaz odkaznadatum odkaznastranu odkaznatext \ - odsazovani okr opis opissoubor oramovani oref \ - orez otocit oznacverzi parovastrana pis placefloat \ - placereferencelist placerule placetextvariable podtrzeni podtrzeno pol \ - pole polozka polozky popisky porovnejpaletu porovnejskupinubarev \ - positiontext pozadi pozice poznamka poznamkapodcarou pref \ - prelozit premistinamrizku prepninazakladnifont preskoc preskrtnuti preskrtnuto \ - prizpusobivepole prizpusobvzhled program propojeneznaceni propojenydokument propojenyrejstrik \ - publikace ran ref reset resetznaceni rimskecislice \ - rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky scitani sedabarva \ - settextcontent settextvariable setupforms setupitemgroup setuppaper setuprule \ - setupstrut setuptextposition setuptextvariable sloupec slovovpravo spodek \ - stanovcharakteristickuseznamu stanovcislonadpisu start startbarva startcitace startfakt \ - startinteraktivnimenu startkomentar startkomponenta startmarginalnilinka startpozadi startprodukt \ - startprojekt startprostredi starttextovalinka startverze startzhustene stop \ - stopbarva stopcitace stopfakt stopinteraktivnimenu stopkomentar stopkomponenta \ - stopmarginalnilinka stoppozadi stopprodukt stopprojekt stopprostredi stoptextovalinka \ - stopverze stopzhustene strana switchtorawfont sym symbol \ - synchronizacnilista synchronizovat tab tecky tenkalinka tenkelinky \ - tex texthlavicky textovalinka textpopisku textvariable tlacitko \ - tref tvrdemezery typebuffer typstrany ukazbarvu ukazexterniobrazy \ - ukazmrizku ukaznastaveni ukazpaletu ukazpodpery ukazpole ukazpostredizakladnihofontu \ - ukazramecek ukazsadusymbolu ukazskupinubarev ukazupravu ukazvytisk ukazvzhled \ - ukazzakladnifont umistikombinovanyseznam umistilegendu umistiloga umistilokalnipoznamkypodcarou umistinadsebe \ - umistinamrizku umistipodrovnici umistipoznamkypodcarou umistirejstrik umistirovnici umistiseznam \ - umistivedlesebe umistizalozky uzijURL uzijbloky uzijexternidokument uzijexterniobraz \ - uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani uzijmodul uzijodkazy \ - uzijprikazy uzijspeciality uzijsymbol verze vl vlasovalinka \ - vlevo vpravo vradku vsedniden vyberbloky vyberpapir \ - vyberverzi vyplnenytext vyplnovelinky vyplnovepole vyplnovyradek vysoky \ - zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto zadnedalsibloky zadnedalsisoubory \ - zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni zadnyseznam zadnytest \ - zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam zaramovani \ - zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole zhustene \ - ziskejbuffer ziskejznaceni zlomek znaceni znak znaky \ - zpracujbloky zpracujstranu zrcadlit zref + nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazeni nastavodsazovani \ + nastavodstavce nastavopis nastavoramovanetexty nastavoramovani nastavorez nastavotoceni \ + nastavpaletu nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni nastavpole \ + nastavpolozky nastavpopisek nastavpopisky nastavpopisy nastavpozadi nastavpoznamkypodcarou \ + nastavprechodstrany nastavpreskok nastavprofily nastavprogramy nastavprostredizakladnihofontu nastavpublikace \ + nastavradkovani nastavradky nastavrastr nastavrejstrik nastavsadusymbolu nastavsekci \ + nastavseznam nastavseznamodkazu nastavsirkucary nastavsloupce nastavspodek nastavspojeni \ + nastavsynchronizaci nastavsynchronizacnilistu nastavsynonyma nastavsystem nastavtab nastavtabelaci \ + nastavtabulky nastavtenkelinky nastavtext nastavtexthlavicky nastavtextovelinky nastavtextpopisku \ + nastavtexttexty nastavtextyupati nastavtextyzahlavi nastavtlacitka nastavtoleranci nastavtrideni \ + nastavtype nastavumisteniprotejsku nastavumistovani nastavupati nastavupravu nastavurl \ + nastavusporadani nastavvelikostpapiru nastavverze nastavvsechnapole nastavvycty nastavvyplnovelinky \ + nastavvyplnoveradky nastavvystup nastavvzhled nastavzahlavi nastavzakladnifont nastavzarovnani \ + nastavznaceni nastavzuzeni nastrane nejakyradek nekde nivy \ + nizky nop obrazovka odkaz odkaznadatum odkaznastranu \ + odkaznatext odsazovani okr opis opissoubor oramovani \ + oref orez otocit oznacverzi parovastrana pis \ + placefloat placereferencelist placerule placetextvariable podtrzeni podtrzeno \ + pol pole polozka polozky popisky porovnejpaletu \ + porovnejskupinubarev positiontext pozadi pozice poznamka poznamkapodcarou \ + pref prelozit premistinamrizku prepninazakladnifont preskoc preskrtnuti \ + preskrtnuto prizpusobivepole prizpusobvzhled program propojeneznaceni propojenydokument \ + propojenyrejstrik publikace ran ref reset resetznaceni \ + rimskecislice rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky scitani \ + sedabarva settextcontent settextvariable setupforms setupitemgroup setuppaper \ + setuprule setupstrut setuptextposition setuptextvariable sloupec slovovpravo \ + spodek stanovcharakteristickuseznamu stanovcislonadpisu start startbarva startcitace \ + startfakt startinteraktivnimenu startkomentar startkomponenta startmarginalnilinka startpozadi \ + startprodukt startprojekt startprostredi starttextovalinka startverze startzhustene \ + stop stopbarva stopcitace stopfakt stopinteraktivnimenu stopkomentar \ + stopkomponenta stopmarginalnilinka stoppozadi stopprodukt stopprojekt stopprostredi \ + stoptextovalinka stopverze stopzhustene strana switchtorawfont sym \ + symbol synchronizacnilista synchronizovat tab tecky tenkalinka \ + tenkelinky tex texthlavicky textovalinka textpopisku textvariable \ + tlacitko tref tvrdemezery typebuffer typstrany ukazbarvu \ + ukazexterniobrazy ukazmrizku ukaznastaveni ukazpaletu ukazpodpery ukazpole \ + ukazpostredizakladnihofontu ukazramecek ukazsadusymbolu ukazskupinubarev ukazupravu ukazvytisk \ + ukazvzhled ukazzakladnifont umistikombinovanyseznam umistilegendu umistiloga umistilokalnipoznamkypodcarou \ + umistinadsebe umistinamrizku umistipodrovnici umistipoznamkypodcarou umistirejstrik umistirovnici \ + umistiseznam umistivedlesebe umistizalozky uzijURL uzijbloky uzijexternidokument \ + uzijexterniobraz uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani uzijmodul \ + uzijodkazy uzijprikazy uzijspeciality uzijsymbol verze vl \ + vlasovalinka vlevo vpravo vradku vsedniden vyberbloky \ + vyberpapir vyberverzi vyplnenytext vyplnovelinky vyplnovepole vyplnovyradek \ + vysoky zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto zadnedalsibloky \ + zadnedalsisoubory zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni zadnyseznam \ + zadnytest zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam \ + zaramovani zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole \ + zhustene ziskejbuffer ziskejznaceni zlomek znaceni znak \ + znaky zpracujbloky zpracujstranu zrcadlit zref diff --git a/context/data/context-jedit-cz.xml b/context/data/context-jedit-cz.xml index 5b7b3e59d..42fcbbe08 100644 --- a/context/data/context-jedit-cz.xml +++ b/context/data/context-jedit-cz.xml @@ -159,6 +159,7 @@ <KEYWORD2>\nastavnadpis</KEYWORD2> <KEYWORD2>\nastavnadpisy</KEYWORD2> <KEYWORD2>\nastavodkazovani</KEYWORD2> + <KEYWORD2>\nastavodsazeni</KEYWORD2> <KEYWORD2>\nastavodsazovani</KEYWORD2> <KEYWORD2>\nastavodstavce</KEYWORD2> <KEYWORD2>\nastavopis</KEYWORD2> diff --git a/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf Binary files differindex 86d04bb3c..6221eb58c 100644 --- a/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf +++ b/fonts/truetype/hoekwater/lm/lmtypewriter10-regular.ttf diff --git a/scripts/context/lua/scite-ctx.lua b/scripts/context/lua/scite-ctx.lua index 5836bcbfb..82f8599b1 100644 --- a/scripts/context/lua/scite-ctx.lua +++ b/scripts/context/lua/scite-ctx.lua @@ -330,7 +330,6 @@ function wrap_text() local endcolumn = props['SelectionEndColumn'] - 1 local indentation = string.rep(' ', startcolumn) --- local selection = string.gsub(editor:GetSelText(),"[\n\r][\n\r]+", ' ' .. magicstring .. ' ') local selection = string.gsub(editor:GetSelText(),"[\n\r][\n\r]", "\n") local selection = string.gsub(selection,"\n\n+", ' ' .. magicstring .. ' ') local replacement = '' @@ -348,7 +347,7 @@ function wrap_text() elseif string.len(templine) == 0 then templine = indentation .. snippet else - templine = templine .. ' ' .. snippet + templine = string.len(templine) .. ' ' .. snippet end end diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb index 0969c3807..5898d7aa5 100644 --- a/scripts/context/ruby/base/tex.rb +++ b/scripts/context/ruby/base/tex.rb @@ -671,6 +671,7 @@ class TEX else report("unable to make format due to lack of permissions") texformatpath = '' + setvariable('error','no permissions to write') end else texformatpath = '' @@ -821,7 +822,7 @@ class TEX mainlanguage = getvariable('mainlanguage') bodyfont = getvariable('bodyfont') if f = openedfile("cont-fmt.tex") then - f << "\\unprotect" + f << "\\unprotect\n" case language when 'all' then f << "\\preloadallpatterns\n" @@ -1103,8 +1104,10 @@ class TEX end rescue TimeoutError report("job aborted due to timeout '#{delay}'") + setvariable('error','timeout') rescue report("job aborted due to error") + setvariable('error','fatal error') else report("job finished within timeout '#{delay}'") end diff --git a/scripts/context/ruby/base/tool.rb b/scripts/context/ruby/base/tool.rb index 77ad947fe..5ccedfec1 100644 --- a/scripts/context/ruby/base/tool.rb +++ b/scripts/context/ruby/base/tool.rb @@ -129,6 +129,8 @@ module Tool def Tool.simplefilename(old) + return old # too fragile + return old if not FileTest.file?(old) new = old.downcase @@ -258,7 +260,7 @@ module Tool new = checksuffix(simplefilename(old)) unless new == old - begin + begin # bugged, should only be name, not path File.rename(old,new) logging.report("renaming fuzzy name #{old} to #{new}") unless logging return old diff --git a/scripts/context/ruby/concheck.rb b/scripts/context/ruby/concheck.rb index 6c7512bff..3db3e5148 100644 --- a/scripts/context/ruby/concheck.rb +++ b/scripts/context/ruby/concheck.rb @@ -308,7 +308,7 @@ def some_wrd_error(data, filename, start, stop, ignore) end end -def some_sym_error (data, filename, symbol,template=false) +def some_sym_error (data, filename, symbol, template=false) saved = Array.new inside = false level = 0 diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb index 1e1158d44..d8d38e84b 100644 --- a/scripts/context/ruby/ctxtools.rb +++ b/scripts/context/ruby/ctxtools.rb @@ -1643,7 +1643,11 @@ class Commands texmfroot = @commandline.argument('first') texmfroot = '.' if texmfroot.empty? - maproot = "#{texmfroot.gsub(/\\/,'/')}/fonts/map/pdftex/context" + if @commandline.option('maproot') then + maproot = @commandline.option('maproot') + else + maproot = "#{texmfroot.gsub(/\\/,'/')}/fonts/map/pdftex/context" + end if File.directory?(maproot) then files = Dir.glob("#{maproot}/*.map") @@ -1737,7 +1741,7 @@ class Array def add_shebang(filename,program) unless self[0] =~ /^\#/ then - self.insert(0,"\#!/usr/env #{program}") + self.insert(0,"\#!/usr/bin/env #{program}") end unless self[2] =~ /^\#.*?copyright\=/ then self.insert(1,"\#") @@ -2698,6 +2702,7 @@ commandline.registeraction('disarmutfbom' , 'remove utf bom [--force]') commandline.registervalue('type','') commandline.registervalue('filter','') +commandline.registervalue('maproot','') commandline.registerflag('recurse') commandline.registerflag('force') diff --git a/scripts/context/ruby/graphics/gs.rb b/scripts/context/ruby/graphics/gs.rb index 070fd1be8..51175efa3 100644 --- a/scripts/context/ruby/graphics/gs.rb +++ b/scripts/context/ruby/graphics/gs.rb @@ -570,7 +570,12 @@ end if ! epsbbox && str =~ /^%%(Page:|EndProlog)/io then out.puts(str) if $1 == "EndProlog" debug('faking papersize') - out.puts("<< /PageSize [#{@width} #{@height}] >> setpagedevice\n") + # out.puts("<< /PageSize [#{@width} #{@height}] >> setpagedevice\n") + if ! dimensions? then + out.puts("<< /PageSize [1 1] >> setpagedevice\n") + else + out.puts("<< /PageSize [#{@width} #{@height}] >> setpagedevice\n") + end out.puts("gsave #{@xoffset} #{@yoffset} translate\n") epsbbox = true elsif str =~ /^%%BeginBinary\:\s*\d+\s*$/o then diff --git a/scripts/context/ruby/pstopdf.rb b/scripts/context/ruby/pstopdf.rb index 3625f4d83..73e628df2 100644 --- a/scripts/context/ruby/pstopdf.rb +++ b/scripts/context/ruby/pstopdf.rb @@ -76,7 +76,7 @@ class Commands @commandline.arguments.each do |filename| - filename = Tool.cleanfilename(filename,@commandline) + filename = Tool.cleanfilename(filename,@commandline) # brrrr inppath = @commandline.option('inputpath') if inppath.empty? then inppath = '.' diff --git a/scripts/context/ruby/wwwserver.rb b/scripts/context/ruby/wwwserver.rb index 53e1cdc51..13d5d1312 100644 --- a/scripts/context/ruby/wwwserver.rb +++ b/scripts/context/ruby/wwwserver.rb @@ -1,4 +1,4 @@ -#!/usr/env ruby +#!/usr/bin/env ruby banner = ['WWWServer', 'version 1.0.0', '2003-2006', 'PRAGMA ADE/POD'] diff --git a/scripts/context/ruby/xmltools.rb b/scripts/context/ruby/xmltools.rb index 5b4a112b8..0c828e9d3 100644 --- a/scripts/context/ruby/xmltools.rb +++ b/scripts/context/ruby/xmltools.rb @@ -476,23 +476,23 @@ class Commands "<#{elements.length}>" end # abc[-/]def - data.gsub!(/([a-z]{3,})([\/\-])([a-z]{3,})/mois) do + data.gsub!(/([a-z]{3,})([\/\-\(\)])([a-z]{3,})/mois) do done = true report("compound: #{$1}#{$2}#{$3}") if verbose "#{$1}<compound token='#{$2}'/>#{$3}" end # (abcd - data.gsub!(/(\()([a-z]{4,})/mois) do - done = true - report("compound: #{$1}#{$2}") if verbose - "<compound token='#{$1}'/>#{$2}" - end + # data.gsub!(/(\()([a-z]{4,})/mois) do + # done = true + # report("compound: #{$1}#{$2}") if verbose + # "<compound token='#{$1}'/>#{$2}" + # end # abcd) - data.gsub!(/(\()([a-z]{4,})/mois) do - done = true - report("compound: #{$1}#{$2}") if verbose - "#{$2}<compound token='#{$2}'/>" - end + # data.gsub!(/(\()([a-z]{4,})/mois) do + # done = true + # report("compound: #{$1}#{$2}") if verbose + # "#{$2}<compound token='#{$2}'/>" + # end # roll back elements data.gsub!(/<(\d+)>/mois) do "<#{elements.shift}>" diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 930a2e28d..fa0d41815 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -13,7 +13,7 @@ % it's about time to clean up this file ... -\newcontextversion{2007.01.23 13:32} +\newcontextversion{2007.02.20 12:00} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new @@ -23,6 +23,8 @@ \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex} +% \ifx\pdfmapfile \undefined \else \pdfmapfile{ } \fi + % \font\f=dummyfont \rpcode\f0=500 \hbox{..}\char0 % todo: mp-new % caption: grid=top|bottom in xml defs diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori index fff231619..b90662cc3 100644 --- a/tex/context/base/cont-sys.ori +++ b/tex/context/base/cont-sys.ori @@ -108,10 +108,11 @@ \loadmapfile[original-ams-euler.map] \loadmapfile[original-public-lm.map] - \loadmapfile[texnansi-public-lm.map] - \loadmapfile[ec-public-lm.map] - \loadmapfile[qx-public-lm.map] - \loadmapfile[t5-public-lm.map] + + %loadmapfile[texnansi-public-lm.map] + %loadmapfile[ec-public-lm.map] + %loadmapfile[qx-public-lm.map] + %loadmapfile[t5-public-lm.map] %loadmapfile[pl0-public-lm.map] %loadmapfile[il2-public-lm.map] diff --git a/tex/context/base/cont-usr.ori b/tex/context/base/cont-usr.ori index ee0627836..7489f8a10 100644 --- a/tex/context/base/cont-usr.ori +++ b/tex/context/base/cont-usr.ori @@ -22,6 +22,8 @@ %D want to play safe, use \typ {texexec --make --alone %D --all}. +% \preloadallpatterns % will load them all + % \installlanguage [\s!af] [\c!state=\v!start] % afrikaans % \installlanguage [\s!ca] [\c!state=\v!start] % catalan % \installlanguage [\s!cz] [\c!state=\v!start] % czech diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index e21d66d43..86277019f 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -42,7 +42,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2007.01.23 13:32} +\edef\contextversion{2007.02.20 12:00} %D For those who want to use this: diff --git a/tex/context/base/core-fld.tex b/tex/context/base/core-fld.tex index 595a9188f..3b1ce9b3f 100644 --- a/tex/context/base/core-fld.tex +++ b/tex/context/base/core-fld.tex @@ -2,7 +2,7 @@ %D [ file=core-fld, %D version=1997.05.18, %D title=\CONTEXT\ Core Macros, -%D subtitle=Fill||in fields, +%D subtitle=Fill in fields, %D author=Hans Hagen, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex index e9319068c..e9300f35b 100644 --- a/tex/context/base/core-mat.tex +++ b/tex/context/base/core-mat.tex @@ -3,7 +3,7 @@ %D version=2006.03.27, % 1998.12.07 %D title=\CONTEXT\ Core Macros, %D subtitle=Math Fundamentals, -%D author={Hans Hagen \& Taco Hoekwater}, +%D author={Hans Hagen, Taco Hoekwater \& Aditya Mahajan}, %D date=\currentdate, %D copyright=PRAGMA] %C @@ -50,6 +50,8 @@ \expandafter\secondoftwoarguments \fi} +% \defineactivecharacter _ {\mathortext{_}{\_}} text_text $a^2$ + % force text mode, will be overloaded later \ifx\text\undefined \let\text\hbox \fi @@ -2363,7 +2365,6 @@ %D %D \startbuffer %D \startformula -%D \startformula %D \text{Let }{\cal R} = \bigcup_{P_{X_1},P_{X_2}} %D \left\{ (R_1, R_2) : %D \startmatrix[distance=1em,align={left,left,right}] @@ -2683,6 +2684,58 @@ \def\mathopnolimits#1{\mathop{\rm#1}\nolimits} +%D \macros{overset, underset} +%D +%D The macros \type{\overset} and \type{\underset} are provided by +%D \AMS\ packages in \LATEX. These macro allows you to place a symbol +%D above or below another symbol, irrespective of whether the other +%D symbol is a relation or something else, and without influencing the +%D spacing. For most cases there is a better way to do such things +%D (declaring a math command with limop option, or using accents), but +%D occasionally these macros can be useful, for example: +%D +%D \startbuffer +%D \startformula +%D \overset{*}{X} \underset{*}{X} +%D \stopformula +%D \stopbuffer +%D \typebuffer \getbuffer +%D +%D Use these macros sparingly. Remember, \TEX\ was designed for +%D mathematics, so there is usually a proper method for typesetting +%D common math notation. + +%D These macros are a clearer version of \type{\binrel@} and +%D \type{\binrel@@} macros in \AMSTEX\ packages. + +\def\preparebinrel#1% + {\begingroup + \setbox\scratchbox\hbox + {\thinmuskip 0mu + \medmuskip -1mu + \thickmuskip -1mu + \setbox\scratchbox\hbox{$#1\mathsurround\zeropoint$}% + \kern-\wd\scratchbox + ${}#1{}\mathsurround\zeropoint$}% + \expanded + {\endgroup + \let\noexpand\currentbinrel + \ifdim\wd\scratchbox<\zeropoint + \mathbin + \else\ifdim\wd\scratchbox>\zeropoint + \mathrel + \else + \relax + \fi\fi}} + +\unexpanded\def\overset#1#2% + {\preparebinrel{#2}% + \currentbinrel{\mathop{\kern\zeropoint#2}\limits^{#1}}} + +\unexpanded\def\underset#1#2% + {\preparebinrel{#2}% + \currentbinrel{\mathop{\kern\zeropoint#2}\limits_{#1}}} + %D How negative such a symbol looks is demonstrated in: %D $\negative 10^{\negative 10^{\negative 10}}$. diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index 5cec47f64..895a1af83 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -2343,6 +2343,7 @@ %D \macros %D {startfloatcombination} %D +%D \setupexternalfigures[directory={../sample}] %D \startbuffer %D \placefigure %D [left,none] @@ -2826,7 +2827,7 @@ \setuplabeltext [\s!de] [and-1=\textcomma\ , and-2= und ] %D \macros -%D {\somekindoftab} +%D {somekindoftab} %D %D This macro can be used to create tabs: %D diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex index 781562644..e8534b714 100644 --- a/tex/context/base/core-ntb.tex +++ b/tex/context/base/core-ntb.tex @@ -277,6 +277,8 @@ % \setupTABLE [first] [two][corner=2] % special case % \setupTABLE [last] [two][corner=4] % special case % +% % % \setupTABLE [one] [first] ... special case of span +% % \startTEXpage % \bTABLE[frame=off,align=middle] % \bTR \bTD one \eTD \bTD two \eTD \bTD three \eTD \eTR @@ -345,6 +347,14 @@ \csname\@@tblprefix\c!x\v!last\c!y\v!two\endcsname \fi\fi \fi +\ifnum\gettblcol\positiverow\positivecol=\maximumcol\relax % top span over whole width + \ifnum\positiverow=\plusone + \csname\@@tblprefix\c!x\v!one\c!y\v!first\endcsname + \fi + \ifnum\positiverow=\maximumrow\relax + \csname\@@tblprefix\c!x\v!one\c!y\v!last\endcsname + \fi +\fi % header things \ifnum#1>\noftblhdnxlines\else \executeifdefined{\@@tblprefix\v!header\v!each }\donothing diff --git a/tex/context/base/enco-032.tex b/tex/context/base/enco-032.tex index 5c8f5fe68..d7e15126c 100644 --- a/tex/context/base/enco-032.tex +++ b/tex/context/base/enco-032.tex @@ -79,4 +79,4 @@ \stopencoding -\endinput +\protect \endinput diff --git a/tex/context/base/enco-agr.tex b/tex/context/base/enco-agr.tex index c50f97e51..7aa53a48d 100644 --- a/tex/context/base/enco-agr.tex +++ b/tex/context/base/enco-agr.tex @@ -31,8 +31,6 @@ \definecharacter textbraceright 9 \definecharacter textbreve 10 -\definecharacter textdoublebracketleft 11 -\definecharacter textdoublebracketright 12 \definecharacter greekSigmalunate 13 \definecharacter greekIotadialytika 14 \definecharacter greekUpsilondialytika 15 @@ -47,8 +45,6 @@ \definecharacter greekupsilondialytikaperispomeni 25 \definecharacter greekdialytikaperispomeni 26 -\definecharacter textbottomdotsmall 31 - \definecharacter textbottomdot 33 \definecharacter greeksampi 34 \definecharacter greekdigamma 35 @@ -59,12 +55,12 @@ \definecharacter textdag 43 -\definecharacter oxia 47 +\definecharacter greekoxia 47 -\definecharacter greekanoteleia 59 -\definecharacter dasia 60 +\definecharacter greekanoteleia 59 +\definecharacter greekdasia 60 -\definecharacter psili 62 +\definecharacter greekpsili 62 % Question, etc., look out of sync with Oxonia, however @@ -98,7 +94,7 @@ \definecharacter bracketleft 91 \definecharacter greekvaria 92 \definecharacter bracketright 93 -\definecharacter perispomeni 94 +\definecharacter greekperispomeni 94 \definecharacter guilsingleleft 96 @@ -132,7 +128,7 @@ \definecharacter floorleft 123 \definecharacter textbar 124 \definecharacter floorright 125 -\definecharacter perispomeni 126 +\definecharacter greekperispomeni 126 \definecharacter quotedblleft 128 \definecharacter quotedblright 129 @@ -265,96 +261,96 @@ \startencoding[default] -\definecharacter greekAlphapsili {\psili \greekAlpha} -\definecharacter greekAlphadasia {\dasia \greekAlpha} +\definecharacter greekAlphapsili {\greekpsili \greekAlpha} +\definecharacter greekAlphadasia {\greekdasia \greekAlpha} \definecharacter greekAlphapsilivaria {\greekpsilivaria \greekAlpha} \definecharacter greekAlphadasiavaria {\greekdasiavaria \greekAlpha} \definecharacter greekAlphapsilitonos {\greekpsilitonos \greekAlpha} \definecharacter greekAlphadasiatonos {\greekdasiatonos \greekAlpha} \definecharacter greekAlphapsiliperispomeni {\greekpsiliperispomeni \greekAlpha} \definecharacter greekAlphadasiaperispomeni {\greekdasiaperispomeni \greekAlpha} -\definecharacter greekEpsilonpsili {\psili \greekEpsilon} -\definecharacter greekEpsilondasia {\dasia \greekEpsilon} +\definecharacter greekEpsilonpsili {\greekpsili \greekEpsilon} +\definecharacter greekEpsilondasia {\greekdasia \greekEpsilon} \definecharacter greekEpsilonpsilivaria {\greekpsilivaria \greekEpsilon} \definecharacter greekEpsilondasiavaria {\greekdasiavaria \greekEpsilon} \definecharacter greekEpsilonpsilitonos {\greekpsilitonos \greekEpsilon} \definecharacter greekEpsilondasiatonos {\greekdasiatonos \greekEpsilon} -\definecharacter greekEtapsili {\psili \greekEta} -\definecharacter greekEtadasia {\dasia \greekEta} +\definecharacter greekEtapsili {\greekpsili \greekEta} +\definecharacter greekEtadasia {\greekdasia \greekEta} \definecharacter greekEtapsilivaria {\greekpsilivaria \greekEta} \definecharacter greekEtadasiavaria {\greekdasiavaria \greekEta} \definecharacter greekEtapsilitonos {\greekpsilitonos \greekEta} \definecharacter greekEtadasiatonos {\greekdasiatonos \greekEta} \definecharacter greekEtapsiliperispomeni {\greekpsiliperispomeni \greekEta} \definecharacter greekEtadasiaperispomeni {\greekdasiaperispomeni \greekEta} -\definecharacter greekIotapsili {\psili \greekIota} -\definecharacter greekIotadasia {\dasia \greekIota} +\definecharacter greekIotapsili {\greekpsili \greekIota} +\definecharacter greekIotadasia {\greekdasia \greekIota} \definecharacter greekIotapsilivaria {\greekpsilivaria \greekIota} \definecharacter greekIotadasiavaria {\greekdasiavaria \greekIota} \definecharacter greekIotapsilitonos {\greekpsilitonos \greekIota} \definecharacter greekIotadasiatonos {\greekdasiatonos \greekIota} \definecharacter greekIotapsiliperispomeni {\greekpsiliperispomeni \greekIota} \definecharacter greekIotadasiaperispomeni {\greekdasiaperispomeni \greekIota} -\definecharacter greekOmicronpsili {\psili \greekOmicron} -\definecharacter greekOmicrondasia {\dasia \greekOmicron} +\definecharacter greekOmicronpsili {\greekpsili \greekOmicron} +\definecharacter greekOmicrondasia {\greekdasia \greekOmicron} \definecharacter greekOmicronpsilivaria {\greekpsilivaria \greekOmicron} \definecharacter greekOmicrondasiavaria {\greekdasiavaria \greekOmicron} \definecharacter greekOmicronpsilitonos {\greekpsilitonos \greekOmicron} \definecharacter greekOmicrondasiatonos {\greekdasiatonos \greekOmicron} -\definecharacter greekUpsilondasia {\dasia \greekUpsilon} +\definecharacter greekUpsilondasia {\greekdasia \greekUpsilon} \definecharacter greekUpsilondasiavaria {\greekdasiavaria \greekUpsilon} \definecharacter greekUpsilondasiatonos {\greekdasiatonos \greekUpsilon} \definecharacter greekUpsilondasiaperispomeni {\greekdasiaperispomeni \greekUpsilon} -\definecharacter greekOmegapsili {\psili \greekOmega} -\definecharacter greekOmegadasia {\dasia \greekOmega} +\definecharacter greekOmegapsili {\greekpsili \greekOmega} +\definecharacter greekOmegadasia {\greekdasia \greekOmega} \definecharacter greekOmegapsilivaria {\greekpsilivaria \greekOmega} \definecharacter greekOmegadasiavaria {\greekdasiavaria \greekOmega} \definecharacter greekOmegapsilitonos {\greekpsilitonos \greekOmega} \definecharacter greekOmegadasiatonos {\greekdasiatonos \greekOmega} \definecharacter greekOmegapsiliperispomeni {\greekpsiliperispomeni \greekOmega} \definecharacter greekOmegadasiaperispomeni {\greekdasiaperispomeni \greekOmega} -\definecharacter greekAlphaiotasubpsili {\psili \greekAlpha \greekiota} -\definecharacter greekAlphaiotasubdasia {\dasia \greekAlpha \greekiota} +\definecharacter greekAlphaiotasubpsili {\greekpsili \greekAlpha \greekiota} +\definecharacter greekAlphaiotasubdasia {\greekdasia \greekAlpha \greekiota} \definecharacter greekAlphaiotasubpsilivaria {\greekpsilivaria \greekAlpha \greekiota} -\definecharacter greekAlphaiotasubdasiavaria {\greeldasiavaria \greekAlpha \greekiota} +\definecharacter greekAlphaiotasubdasiavaria {\greekdasiavaria \greekAlpha \greekiota} \definecharacter greekAlphaiotasubpsilitonos {\greekpsilitonos \greekAlpha \greekiota} \definecharacter greekAlphaiotasubdasiatonos {\greekdasiatonos \greekAlpha \greekiota} \definecharacter greekAlphaiotasubpsiliperispomeni {\greekpsiliperispomeni \greekAlpha \greekiota} \definecharacter greekAlphaiotasubdasiaperispomeni {\greekdasiaperispomeni \greekAlpha \greekiota} -\definecharacter greekEtaiotasubpsili {\psili \greekEta \greekiota} -\definecharacter greekEtaiotasubdasia {\dasia \greekEta \greekiota} +\definecharacter greekEtaiotasubpsili {\greekpsili \greekEta \greekiota} +\definecharacter greekEtaiotasubdasia {\greekdasia \greekEta \greekiota} \definecharacter greekEtaiotasubpsilivaria {\greekpsilivaria \greekEta \greekiota} \definecharacter greekEtaiotasubdasiavaria {\greekdasiavaria \greekEta \greekiota} \definecharacter greekEtaiotasubpsilitonos {\greekpsilitonos \greekEta \greekiota} \definecharacter greekEtaiotasubdasiatonos {\greekdasiatonos \greekEta \greekiota} \definecharacter greekEtaiotasubpsiliperispomeni {\greekpsiliperispomeni \greekEta \greekiota} \definecharacter greekEtaiotasubdasiaperispomeni {\greekdasiaperispomeni \greekEta \greekiota} -\definecharacter greekOmegaiotasubpsili {\psili \greekOmega \greekiota} -\definecharacter greekOmegaiotasubdasia {\dasia \greekOmega \greekiota} +\definecharacter greekOmegaiotasubpsili {\greekpsili \greekOmega \greekiota} +\definecharacter greekOmegaiotasubdasia {\greekdasia \greekOmega \greekiota} \definecharacter greekOmegaiotasubpsilivaria {\greekpsilivaria \greekOmega \greekiota} \definecharacter greekOmegaiotasubdasiavaria {\greekdasiavaria \greekOmega \greekiota} \definecharacter greekOmegaiotasubpsilitonos {\greekpsilitonos \greekOmega \greekiota} \definecharacter greekOmegaiotasubdasiatonos {\greekdasiatonos \greekOmega \greekiota} \definecharacter greekOmegaiotasubpsiliperispomeni {\greekpsiliperispomeni \greekOmega \greekiota} \definecharacter greekOmegaiotasubdasiaperispomeni {\greekdasiaperispomeni \greekOmega \greekiota} -\definecharacter greekAlphavaria {\varia \greekAlpha} -\definecharacter greekAlphaoxia {\oxia \greekAlpha} +\definecharacter greekAlphavaria {\greekvaria \greekAlpha} +\definecharacter greekAlphaoxia {\greekoxia \greekAlpha} \definecharacter greekAlphaiotasub {\greekAlpha \greekiota} -\definecharacter greekEpsilonvaria {\varia \greekEpsilon} -\definecharacter greekEpsilonoxia {\oxia \greekEpsilon} -\definecharacter greekEtavaria {\varia \greekEta} -\definecharacter greekEtaoxia {\oxia \greekEta} +\definecharacter greekEpsilonvaria {\greekvaria \greekEpsilon} +\definecharacter greekEpsilonoxia {\greekoxia \greekEpsilon} +\definecharacter greekEtavaria {\greekvaria \greekEta} +\definecharacter greekEtaoxia {\greekoxia \greekEta} \definecharacter greekEtaiotasub {\greekEta \greekiota} -\definecharacter greekIotavaria {\varia \greekIota} -\definecharacter greekIotaoxia {\oxia \greekIota} -\definecharacter greekUpsilonvaria {\varia \greekUpsilon} -\definecharacter greekUpsilonoxia {\oxia \greekUpsilon} -\definecharacter greekOmicronvaria {\varia \greekOmicron} -\definecharacter greekOmicronoxia {\oxia \greekOmicron} -\definecharacter greekOmegavaria {\varia \greekOmega} -\definecharacter greekOmegaoxia {\oxia \greekOmega} +\definecharacter greekIotavaria {\greekvaria \greekIota} +\definecharacter greekIotaoxia {\greekoxia \greekIota} +\definecharacter greekUpsilonvaria {\greekvaria \greekUpsilon} +\definecharacter greekUpsilonoxia {\greekoxia \greekUpsilon} +\definecharacter greekOmicronvaria {\greekvaria \greekOmicron} +\definecharacter greekOmicronoxia {\greekoxia \greekOmicron} +\definecharacter greekOmegavaria {\greekvaria \greekOmega} +\definecharacter greekOmegaoxia {\greekoxia \greekOmega} \definecharacter greekOmegaiotasub {\greekOmega \greekiota} -\definecharacter greekRhodasia {\dasia \greekRho} +\definecharacter greekRhodasia {\greekdasia \greekRho} \definecharacter digamma {\greekdigamma} \definecharacter sampi {\greeksampi} \definecharacter stigma {\greekstigma} diff --git a/tex/context/base/enco-ini.mkii b/tex/context/base/enco-ini.mkii new file mode 100644 index 000000000..1daeda5d2 --- /dev/null +++ b/tex/context/base/enco-ini.mkii @@ -0,0 +1,24 @@ +%D \module +%D [ file=enco-ini, +%D version=2007.02.19, +%D title=\CONTEXT\ Encoding Macros, +%D subtitle=Initialization, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright=\PRAGMA] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D In the end we will cleanup enco-ini.tex! + +\unprotect + +\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5,cyr,agr] % pol and il2 will go away, not needed in mkiv + +\useencoding[032,033,037] % fallbacks for some unicode chars + +\setupencoding[\s!default=ec] % was: [\s!default=\s!default] + +\protect \endinput diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex index da14b509b..e6a27998f 100644 --- a/tex/context/base/enco-ini.tex +++ b/tex/context/base/enco-ini.tex @@ -11,6 +11,9 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +%D Quite some code will be moved to the mk files once we're ready +%D for it. + %D This module is a reimplementation of the module that handled %D composed characters and non \ASCII\ characters. The changed %D are not that fundamental, and mainly concerns moving @@ -1194,12 +1197,17 @@ %D We preload several encodings: -\useencoding[def,acc,raw,com,cas,mis] % mis should come first - -\useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5,cyr,agr] % pol and il2 will go away +\useencoding[def] % defaults (partly simplified) +\useencoding[acc] % accent commands +\useencoding[raw] % simplified (incomplete) +\useencoding[com] % a few commands +\useencoding[cas] % case mapping, not needed in mkiv +\useencoding[mis] % a few commands -\useencoding[032,033,037] +\loadmarkfile{enco-ini} -\setupencoding[\s!default=ec] % was: [\s!default=\s!default] +% \useencoding[ans,il2,ec,tbo,pdf,uc,pol,qx,t5,cyr,agr] % pol and il2 will go away, not needed in mkiv +% \useencoding[032,033,037] % fallbacks for some unicode chars +% \setupencoding[\s!default=ec] % was: [\s!default=\s!default] \protect \endinput diff --git a/tex/context/base/enco-pfr.tex b/tex/context/base/enco-pfr.tex index 24044e4d0..00d0192d3 100644 --- a/tex/context/base/enco-pfr.tex +++ b/tex/context/base/enco-pfr.tex @@ -215,7 +215,17 @@ % \fi} \def\includepdffontresource - {\ifcase\pdfgentounicode + {\ifx\pdfgentounicode\undefined + \expandafter\ifx\the\font\nullfont \else + \ifx\pdffontattr\undefined + % we're not using (a recent version of) pdftex + \else\ifcase\pdfoutput + % we're not in pdf mode + \else + \doincludepdffontresource + \fi\fi + \fi + \else\ifcase\pdfgentounicode \ifincludepdffontresources \expandafter\ifx\the\font\nullfont \else \ifx\pdffontattr\undefined @@ -229,7 +239,7 @@ \fi \or \global\let\includepdffontresource\relax % automatic, built in - \fi} + \fi\fi} \def\dododoincludepdffontresource#1% encoding {\bgroup diff --git a/tex/context/base/enco-raw.tex b/tex/context/base/enco-raw.tex index 02278e708..e3a46e3d7 100644 --- a/tex/context/base/enco-raw.tex +++ b/tex/context/base/enco-raw.tex @@ -3,7 +3,7 @@ \startencoding[raw] \definecharacter Acircumflex {A} \definecharacter acircumflex {a} -\definecharacter Ccircumflex {C} \definecharacter ccircumflex {c} +\definecharacter Ccircumflex {C} \definecharacter ccircumflex {c} \definecharacter Ecircumflex {E} \definecharacter ecircumflex {e} \definecharacter Gcircumflex {G} \definecharacter gcircumflex {g} \definecharacter Hcircumflex {H} \definecharacter hcircumflex {h} @@ -14,7 +14,7 @@ \definecharacter Ucircumflex {U} \definecharacter ucircumflex {u} \definecharacter Wcircumflex {W} \definecharacter wcircumflex {w} \definecharacter Ycircumflex {Y} \definecharacter ycircumflex {y} - + \definecharacter Agrave {A} \definecharacter agrave {a} \definecharacter Egrave {E} \definecharacter egrave {e} \definecharacter Igrave {I} \definecharacter igrave {i} @@ -26,6 +26,7 @@ \definecharacter Itilde {I} \definecharacter itilde {i} \definecharacter Otilde {O} \definecharacter otilde {o} \definecharacter Utilde {U} \definecharacter utilde {u} +\definecharacter Utilde {N} \definecharacter utilde {n} \definecharacter Adiaeresis {A} \definecharacter adiaeresis {a} \definecharacter Ediaeresis {E} \definecharacter ediaeresis {e} diff --git a/tex/context/base/enco-run.tex b/tex/context/base/enco-run.tex index f27b65937..d78b6e4c8 100644 --- a/tex/context/base/enco-run.tex +++ b/tex/context/base/enco-run.tex @@ -104,7 +104,7 @@ {\bgroup \localcolortrue \dorecurse{255} - {\ifnum\fontcharwd\font\recurselevel>\zeropoint + {\ifdim\fontcharwd\font\recurselevel>\zeropoint \noindent\ruledhbox{\darkgray\char\recurselevel}\space \fi}\unskip \egroup} diff --git a/tex/context/base/font-ini.mkii b/tex/context/base/font-ini.mkii new file mode 100644 index 000000000..cbe71a187 --- /dev/null +++ b/tex/context/base/font-ini.mkii @@ -0,0 +1,77 @@ +%D \module +%D [ file=font-ini, +%D version=2007.01.10, +%D title=\CONTEXT\ Font Macros, +%D subtitle=Initialization, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% \starttext +% \definefont +% [blabla] +% [name:Latin Modern Something] +% \definefont +% [blabla] +% [file:texnansi-lmr10] +% \blabla test +% \definefont +% [blabla] +% [texnansi-lmtt10] +% \blabla test +% \stoptext + +\unprotect + +% \definefontsynonym +% [blabla] +% [name:Latin Modern Something] +% \definefontsynonym +% [blabla] +% [file:texnansi-lmr10] +% [encoding=texnansi] +% \definedfont[blabla] test \currentencoding/\fontfile \par +% \definefontsynonym +% [blabla] +% [texnansi-lmtt10] +% [encoding=texnansi] +% \definedfont[blabla] test \currentencoding/\fontfile \par +% \definefontsynonym +% [blabla] +% [ec-lmtt10] +% [encoding=ec] +% \definedfont[blabla] test \currentencoding/\fontfile \par + +\def\checkfontfilename + {\expandafter\docheckfontfilename\fontfile:\empty:\empty\relax} + +\def\docheckfontfilename#1:#2:#3#4\relax + {\edef\!!stringa{#1}% + \edef\!!stringb{#2}% + \ifx\!!stringb\empty + \edef\checkedfontfile{\fontfilesome\!!stringa}% + \else\ifx\!!stringa\v!file + \edef\checkedfontfile{\fontfilefile\!!stringb}% + \else\ifx\!!stringa\v!name + \edef\checkedfontfile{\fontfilename\!!stringb}% + \else + \edef\checkedfontfile{\fontfilesome\!!stringb}% + \fi\fi\fi} + +\def\fontfilename#1{"#1"} +\def\fontfilefile#1{"#1"} +\def\fontfilesome#1{"#1"} + +\beginXETEX + + \def\fontfilename#1{"#1"} + \def\fontfilefile#1{"[#1]"} + \def\fontfilesome#1{"[#1]"} + +\endXETEX + +\protect \endinput diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex index dda160845..3efc12386 100644 --- a/tex/context/base/font-ini.tex +++ b/tex/context/base/font-ini.tex @@ -14,6 +14,8 @@ \writestatus{loading}{Context Font Macros (ini)} +\loadmarkfile{font-ini} + \unprotect % \def\fontrange#1% @@ -899,7 +901,7 @@ \def\synchronizesymb % stylish math stuff in mmode {\ifsynchronizemathfonts\the\symbstrategies\fi} % \if...\fam\minusone\fi} -%D By not setting the family we can append a font switch to \tyep +%D By not setting the family we can append a font switch to \type %D {\everymath}. On the other hand, one never knows in what family %D state the strategies brought us. %D @@ -1336,66 +1338,66 @@ %D \definedfont["Gentium" at 40pt] test %D \stoptyping -\beginXETEX \font +% \beginXETEX \font - % actually, we can use "" in pdftex> 1.20 as well +% % actually, we can use "" in pdftex> 1.20 as well - \def\parsefontspec#1% - {\xdef\somefontspec{#1\space}% - \@EA\doparsefontspec\somefontspec\relax]% =>#1 \empty] - \donoparsefontspec} +% \def\parsefontspec#1% +% {\xdef\somefontspec{#1\space}% +% \@EA\doparsefontspec\somefontspec\relax]% =>#1 \empty] +% \donoparsefontspec} - \def\doparsefontspec#1% - {\ifx"#1% - \@EA\dodqparsefontspec - \else\ifx'#1% - \@EAEAEA\dosqparsefontspec - \else - \@EAEAEA\dodoparsefontspec - \fi\fi#1} - - \def\dqfontquote{"} - \def\sqfontquote{'} - - \def\dodqparsefontspec"#1"#2% - {\def\somefontname{#1}% - \let\somefontquote\dqfontquote - \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2} - - \def\dosqparsefontspec'#1'#2% - {\def\somefontname{#1}% - \let\somefontquote\sqfontquote - \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2} - - \def\dodoparsefontspec#1 #2% - {\def\somefontname{#1}% - \let\somefontquote\empty - \ifx\somefontname\empty % space before fontname - \@EA\doparsefontspec - \else\ifx#2\relax - \@EAEAEA\setnaturalfontspec - \else - \@EAEAEA\setforcedfontspec - \fi\fi - #2} - - \def\setnaturalfontspec#1]% - {\@fs@scaled\plusthousand\relax} - - \def\setforcedfontspec#1 #2\relax]% - {\csname\@fs@#1\endcsname#2\relax} - - \def\donoparsefontspec % #1 == \cs - {\edef\fontfile{\somefontquote\truefontname\somefontname\somefontquote}% - \ifx\fontfile\s!unknown \let\fontfile\defaultfontfile \fi - \edef\lastfontname{\fontfile\somefontspec}% - \ifx\fontclass\empty - \expandafter\definefontlocal - \else - \expandafter\definefontglobal - \fi} % #1 == \cs +% \def\doparsefontspec#1% +% {\ifx"#1% +% \@EA\dodqparsefontspec +% \else\ifx'#1% +% \@EAEAEA\dosqparsefontspec +% \else +% \@EAEAEA\dodoparsefontspec +% \fi\fi#1} + +% \def\dqfontquote{"} +% \def\sqfontquote{'} + +% \def\dodqparsefontspec"#1"#2% +% {\def\somefontname{#1}% +% \let\somefontquote\dqfontquote +% \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2} + +% \def\dosqparsefontspec'#1'#2% +% {\def\somefontname{#1}% +% \let\somefontquote\sqfontquote +% \ifx#2\relax\@EA\setnaturalfontspec\else\@EA\setforcedfontspec\fi#2} + +% \def\dodoparsefontspec#1 #2% +% {\def\somefontname{#1}% +% \let\somefontquote\empty +% \ifx\somefontname\empty % space before fontname +% \@EA\doparsefontspec +% \else\ifx#2\relax +% \@EAEAEA\setnaturalfontspec +% \else +% \@EAEAEA\setforcedfontspec +% \fi\fi +% #2} -\endXETEX +% \def\setnaturalfontspec#1]% +% {\@fs@scaled\plusthousand\relax} + +% \def\setforcedfontspec#1 #2\relax]% +% {\csname\@fs@#1\endcsname#2\relax} + +% \def\donoparsefontspec % #1 == \cs +% {\edef\fontfile{\somefontquote\truefontname\somefontname\somefontquote}% +% \ifx\fontfile\s!unknown \let\fontfile\defaultfontfile \fi +% \edef\lastfontname{\fontfile\somefontspec}% +% \ifx\fontclass\empty +% \expandafter\definefontlocal +% \else +% \expandafter\definefontglobal +% \fi} % #1 == \cs + +% \endXETEX \def\@fs@scaled {\afterassignment\do@fs@scaled\scratchcounter} @@ -1476,10 +1478,15 @@ \let\fontfile\s!unknown +\ifx\checkfontfilename\undefined \let\checkfontfilename\relax \fi + +\def\checkedfontfile{\fontfile} % default + \def\donoparsefontspec % #1 == \cs {\edef\fontfile{\truefontname\somefontname}% \ifx\fontfile\s!unknown \let\fontfile\defaultfontfile \fi - \edef\lastfontname{\fontfile\somefontspec}% + \checkfontfilename + \edef\lastfontname{\checkedfontfile\somefontspec}% \ifx\fontclass\empty \expandafter\definefontlocal \else @@ -1749,7 +1756,9 @@ \def\dostartfontclass[#1]% {\pushmacro\fontclass - \doifsomething{#1}{\def\fontclass{#1}}} + \doifelse{#1}{\v!each} + {\let\fontclass\empty} + {\doifsomething{#1}{\def\fontclass{#1}}}} \def\stopfontclass {\popmacro\fontclass} @@ -3557,7 +3566,7 @@ % \enableencodinginmath % too untested to enable by default -%D \startyping +%D \starttyping %D $\cases{& \ccaron}$ $x=\hbox{\ccaron $x=\hbox{\ccaron}$}$ %D \stoptyping @@ -3589,7 +3598,9 @@ \fi}% {\lastfontidentifier}% \the\everyfont - \synchronizepatterns} + \synchronizepatternswithfont} + +\ifx\synchronizepatternswithfont\undefined \def\synchronizepatternswithfont{\synchronizepatterns} \fi %D The next auxilliary macro is an alternative to \type %D {\fontname}. diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index 814e4c0e3..adb1c1dd5 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -680,6 +680,23 @@ % [\s!default] % [\c!links=1,\c!rechts=1,\c!min=20,\c!max=20,\c!stap=5] +% Beware of fonttoks: +% +% \startfonthandling[morespacing] +% \appendtoks +% \fontdimen2\handledfont=.50em +% \fontdimen3\handledfont=.25em +% \fontdimen4\handledfont=.25em +% \to \fonttoks +% \stopfonthandling +% +% \definefonthandling [morespacing] [morespacing] +% +% \definefontsynonym[xtexnansi-lmr7][texnansi-lmr7][handling=morespacing] +% \definefont[crap][texnansi-lmr7] +% +% \crap \the\fontdimen2\font, \the\fontdimen3\font, \the\fontdimen4\font + \usehandling [def] \protect \endinput diff --git a/tex/context/base/lang-ind.tex b/tex/context/base/lang-ind.tex index 9cc6623cf..f9bbad0d7 100644 --- a/tex/context/base/lang-ind.tex +++ b/tex/context/base/lang-ind.tex @@ -2,7 +2,7 @@ %D [ file=lang--ind, %D version=1997.09.03, %D title=\CONTEXT\ Language Macros, -%D subtitle=Indo||Iranian Languages, +%D subtitle=Indo Iranian Languages, %D author=Hans Hagen / Tobias Burnus, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex index 85243f3de..f82b800ba 100644 --- a/tex/context/base/lang-ini.tex +++ b/tex/context/base/lang-ini.tex @@ -347,11 +347,17 @@ \enableregime[utf]} \beginXETEX - \def\setuphyppatencoding{\pathypsettings} + \def\synchronizepatternswithfont{} + \def\doloadpatterns #1#2{\dodoloadpatterns{#1}{#2}\s!default\s!default} + \def\setnormallanguage #1{\dosetnormallanguage{:\s!default:\s!default:}#1\empty} + \def\setuphyppatencoding {\pathypsettings} \endXETEX \beginMETATEX - \def\setuphyppatencoding{\pathypsettings} + \def\synchronizepatternswithfont{} + \def\doloadpatterns #1#2{\dodoloadpatterns{#1}{#2}\s!default\s!default} + \def\setnormallanguage #1{\dosetnormallanguage{:\s!default:\s!default:}#1\empty} + \def\setuphyppatencoding {\pathypsettings} \endMETATEX \def\dodoloadpatterns#1#2#3#4% beware, loaded language also incr @@ -410,6 +416,8 @@ \globallet\dodoloadpatterns\gobblefourarguments \to \everydump +% \loadmarkfile{lang-ini} % not yet + %D \macros %D {setuplanguage} %D @@ -519,7 +527,8 @@ % new, encoding specific patterns -\ifx\synchronizepatterns\undefined \let\synchronizepatterns\relax \fi +\ifx\synchronizepatterns \undefined \let\synchronizepatterns\relax \fi +\ifx\synchronizepatternswithfont\undefined \def\synchronizepatternswithfont{\synchronizepatterns} \fi \beginTEX diff --git a/tex/context/base/m-cweb.tex b/tex/context/base/m-cweb.tex index 9aa630aa6..044648d0b 100644 --- a/tex/context/base/m-cweb.tex +++ b/tex/context/base/m-cweb.tex @@ -256,7 +256,7 @@ \defCWEBmacro\|#1% {\leavevmode\hbox{$#1$}} -%D \macros{\string&}{} +%D \macros{\string\&}{} %D %D \CWEBquote boldface type for reserved words. diff --git a/tex/context/base/m-edtsnc.tex b/tex/context/base/m-edtsnc.tex index d3a697b25..0926f4488 100644 --- a/tex/context/base/m-edtsnc.tex +++ b/tex/context/base/m-edtsnc.tex @@ -2,7 +2,7 @@ %D [ file=m-editsnc, %D version=2003.12.23, %D title=\CONTEXT\ Modules, -%D subtitle=Editor Synchronization +%D subtitle=Editor Synchronization, %D author={Hans Hagen \& Ton Otten}, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/m-narrowtt.tex b/tex/context/base/m-narrowtt.tex index b11aaefb5..6c14c97c5 100644 --- a/tex/context/base/m-narrowtt.tex +++ b/tex/context/base/m-narrowtt.tex @@ -14,17 +14,18 @@ %D Test file %D %D \starttyping +%D \startTEX %D \usemodule[narrowtt] %D \starttext %D \starttyping %D Test test test. %D \stoptyping -%D test \type {test} test \ntype{test} test -%D \startntyping +%D test \type {test} test \type{test} test +%D \starttyping %D Test test test. -%D \stopntyping -%D \stoptext %D \stoptyping +%D \stoptext +%D \stopTEX \unprotect diff --git a/tex/context/base/m-pdfsnc.tex b/tex/context/base/m-pdfsnc.tex index 812218427..da59ab5d8 100644 --- a/tex/context/base/m-pdfsnc.tex +++ b/tex/context/base/m-pdfsnc.tex @@ -2,7 +2,7 @@ %D [ file=m-pdfsnc, %D version=2003.12.23, %D title=\CONTEXT\ Modules, -%D subtitle=Editor Synchronization +%D subtitle=Editor Synchronization, %D author={Hans Hagen \& Ton Otten}, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/m-visual.tex b/tex/context/base/m-visual.tex index 1622e5e63..b9ff6cb4c 100644 --- a/tex/context/base/m-visual.tex +++ b/tex/context/base/m-visual.tex @@ -223,8 +223,9 @@ \def\fakespacingformula {\color[fakebaselinecolor]{\ruledbaseline}\fakeformula} -%D test \bodyfontgrid\space test -%D test \emexgrid \space test +%D test \type{\bodyfontgrid}\space test +%D test \type{\emexgrid} \space test + \def\smashedgrid {\dosingleempty\dosmashedgrid} diff --git a/tex/context/base/math-mis.tex b/tex/context/base/math-mis.tex index b5a605cea..1b1193fd4 100644 --- a/tex/context/base/math-mis.tex +++ b/tex/context/base/math-mis.tex @@ -41,7 +41,7 @@ \endgroup} %D \startbuffer -%D $a\geneq b^{a\geneq b^{a\geneq b}}$ +%D $a\string\geneq b^{a\string\geneq b^{a\string\geneq b}}$ %D \stopbuffer %D %D \typebuffer \getbuffer diff --git a/tex/context/base/math-pln.tex b/tex/context/base/math-pln.tex index f0b4f440e..4689f2e9f 100644 --- a/tex/context/base/math-pln.tex +++ b/tex/context/base/math-pln.tex @@ -203,11 +203,13 @@ \def\doteq {\buildrel\textstyle.\over=} +\ifx\mfunction\undefined \def\mfunction#1{\mathbin{\rm#1}} \fi + \def\bmod {\nonscript \mskip-\medmuskip \mkern5mu - \mathbin{\rm mod}% + \mfunction{mod}% \penalty900 \mkern5mu \nonscript @@ -216,7 +218,7 @@ \def\pmod#1% {\allowbreak \mkern18mu - ({\rm mod}\,\,#1)} + (\mfunction{mod}\,\,#1)} \def\cases#1% {\left\{% diff --git a/tex/context/base/meta-tex.tex b/tex/context/base/meta-tex.tex index f1faa300d..7ca57e0c4 100644 --- a/tex/context/base/meta-tex.tex +++ b/tex/context/base/meta-tex.tex @@ -128,8 +128,8 @@ \newbox\mptextbox -%definefontsynonym[MPtxtfont][texnansi-lmtt10] \loadmapfile[lm-texnansi.map] -\definefontsynonym[MPtxtfont][texnansi-lmtt10] \loadmapfile[texnansi-public-lm.map] +%definefontsynonym[MPtxtfont][texnansi-lmtt10] \loadmapfile[texnansi-public-lm.map] +\definefontsynonym[MPtxtfont][texnansi-lmtt10] \loadmapfile[lm-texnansi.map] \definefont[localMPtxtfont][MPtxtfont at 10bp] diff --git a/tex/context/base/mult-com.tex b/tex/context/base/mult-com.tex index 599fd61d2..96552e362 100644 --- a/tex/context/base/mult-com.tex +++ b/tex/context/base/mult-com.tex @@ -1764,7 +1764,7 @@ determineregistercharacteristics: bepaalregisterkenmerken determineregi impostaenumerazioni seteazaenumerare regleenumerations setupindentations: steldoorspringenin setupindentations - stelleeinzuegein nastavodsazovani + stelleeinzuegein nastavodsazeni impostarientri seteazaaliniate reglealineas setuptab: steltabin setuptab diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex index de24230ae..86147d85d 100644 --- a/tex/context/base/mult-con.tex +++ b/tex/context/base/mult-con.tex @@ -3358,7 +3358,7 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub descrizione descriere description indentation: doorsprong indentation - einzug odsazovani + einzug odsazeni rientro indentare indentation labeling: doorlabel labeling diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index 1e0cb5f3d..ce51665c2 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -29,6 +29,9 @@ %D %D This commands generate \type{\s!word} and \type{\m!word}. +\definesystemconstant {hans} +\definesystemconstant {taco} + %D First we define some system constants used for both the %D multi||lingual interface and multi||linguag typesetting. @@ -660,8 +663,8 @@ %D The next two files specify user settings as well as %D \TEXEXEC\ settings when generating a format. -\definefileconstant {usrfilename} {cont-usr} -\definefileconstant {fmtfilename} {cont-fmt} +\definefileconstant {usrfilename} {cont-usr} % .tex +\definefileconstant {fmtfilename} {cont-fmt} % .tex %D The setup files for the language, font, color and special %D subsystems have a common prefix. This means that we have at diff --git a/tex/context/base/page-imp.tex b/tex/context/base/page-imp.tex index bdb3a7b65..2b96e6f44 100644 --- a/tex/context/base/page-imp.tex +++ b/tex/context/base/page-imp.tex @@ -859,7 +859,7 @@ {\setuppageshift[\v!page][#1][#2]}% \else\iffirstargument \setuppageshift[\v!page][#1][#1]% - \fi\fi} + \fi\fi\fi} %D One can (mis)use this mechanism, in close cooperation %D with \PDFTEX\ to arrange pages of already produced files. diff --git a/tex/context/base/page-mar.tex b/tex/context/base/page-mar.tex index e11d0d15e..5a7ce9d24 100644 --- a/tex/context/base/page-mar.tex +++ b/tex/context/base/page-mar.tex @@ -2,7 +2,7 @@ %D [ file=page-mar, % moved here from main-001 %D version=1997.03.31, %D title=\CONTEXT\ Core Macros, -%D subtitle=Marginal Things +%D subtitle=Marginal Things, %D author=Hans Hagen, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/page-mul.tex b/tex/context/base/page-mul.tex index edbf6206e..bf4386b4e 100644 --- a/tex/context/base/page-mul.tex +++ b/tex/context/base/page-mul.tex @@ -657,6 +657,7 @@ {\hbox to \finalcolumntextwidth {\hskip\colleftskip\relax % new, \relax needed \ifreversecolumns + \popsplitproperties % else wrong color stack \@EA\dohandlerevcolumns \else \@EA\dohandleallcolumns @@ -1586,7 +1587,7 @@ \nofcolumns\@@kln\relax \processaction [\@@klrule] - [ \v!on=>\let\betweencolumns\linebetweencolumns, + [ \v!on=>\let\betweencolumns\linebetweencolumns, \v!off=>\let\betweencolumns\spacebetweencolumns, \s!default=>\let\betweencolumns\spacebetweencolumns, \s!unknown=>\let\betweencolumns\@@klrule]} diff --git a/tex/context/base/page-new.tex b/tex/context/base/page-new.tex index 8158f2e97..0b047ffbe 100644 --- a/tex/context/base/page-new.tex +++ b/tex/context/base/page-new.tex @@ -1,3 +1,15 @@ +%D \module +%D [ file=page-new, +%D version=2000.10.20, +%D title=\CONTEXT\ Page Macros, +%D subtitle=Page New, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. \unprotect % % % NOT ENGLISH % % % diff --git a/tex/context/base/page-one.tex b/tex/context/base/page-one.tex index b1931dd1e..bab18d7d8 100644 --- a/tex/context/base/page-one.tex +++ b/tex/context/base/page-one.tex @@ -341,12 +341,33 @@ \OTRONEdosetbotinserts \fi} +% \def\OTRONEdotopinsertions +% {\ifvoid\topins\else +% \ifgridsnapping +% \box\topins +% \vskip-\topskip \vskip\strutheight % [xx] new: see icare topbleed +% \else +% \unvbox\topins +% \fi +% \fi +% \global\topinserted\zeropoint} + +\chardef\topinserttopskipmode=0 % 1 no topskip + \def\OTRONEdotopinsertions {\ifvoid\topins\else \ifgridsnapping \box\topins - \vskip-\topskip \vskip\strutheight % [xx] new: see icare topbleed + \vskip-\topskip + \vskip\strutheight % [xx] new: see icare topbleed \else + \ifcase\topinserttopskipmode + % 0: default, do nothing + \or + % 1: no topskip (crossed fingers) + \vskip-\topskip + \vskip\strutheight + \fi \unvbox\topins \fi \fi diff --git a/tex/context/base/ppchtex.tex b/tex/context/base/ppchtex.tex index f2a022b20..a88c4dbd8 100644 --- a/tex/context/base/ppchtex.tex +++ b/tex/context/base/ppchtex.tex @@ -3367,7 +3367,8 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{}, %D \item styles hooked into \CONTEXT\ style mechanism %D \item support for color and rulethickness (mp mode only) %D \item position tracking -%D \stopopsoming +%D \stopitemize + \ifCONTEXT \else \protect \endinput \fi diff --git a/tex/context/base/regi-8859-1.tex b/tex/context/base/regi-8859-1.tex index 6f5152518..c291b029a 100644 --- a/tex/context/base/regi-8859-1.tex +++ b/tex/context/base/regi-8859-1.tex @@ -14,7 +14,7 @@ %D Support for iso-8859-1/Latin1 input encoding (regime) for West European languages, %D see also cp1252 and iso-8859-15 (includes Euro). %D -%D (Contributors to the original file: Daniel Flipo, Hans Hagen & Denis Roegel.) +%D (Contributors to the original file: Daniel Flipo, Hans Hagen \& Denis Roegel.) %D %D Usage: \type{\enableregime[8859-1]} (see \type {regi-syn} for %D alternatives calls). diff --git a/tex/context/base/regi-cp1252.tex b/tex/context/base/regi-cp1252.tex index 3911644ce..9a54f178f 100644 --- a/tex/context/base/regi-cp1252.tex +++ b/tex/context/base/regi-cp1252.tex @@ -14,7 +14,7 @@ %D Support for cp1252 input encoding (regime) for West European languages, %D see also iso-8859-1 and iso-8859-15. %D -%D (Contributors to the original file: Tobias Burnus, Hans Hagen & Victor Figurnov.) +%D (Contributors to the original file: Tobias Burnus, Hans Hagen \& Victor Figurnov.) %D %D Usage: %D \type{\enableregime[cp1252]} or \type{\enablereregime[windows-1252]} diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex index 3be277023..ce0fedeba 100644 --- a/tex/context/base/s-abr-01.tex +++ b/tex/context/base/s-abr-01.tex @@ -45,6 +45,7 @@ \logo [CWEB] {cweb} \logo [DANTE] {Dante} \logo [DISTILLER] {distiller} +\logo [DRATEX] {Dra\TeX} \logo [DSC] {dsc} \logo [DTD] {dtd} \logo [DTK] {dtk} @@ -86,6 +87,7 @@ \logo [GHOSTVIEW] {Ghost\-view} \logo [GIF] {gif} \logo [GNU] {gnu} +\logo [GNUPLOT] {gnuplot} \logo [GS] {Ghost\-Script} \logo [GUST] {Gust} \logo [GWTEX] {gw\TeX} @@ -137,7 +139,11 @@ \logo [OMEGA] {Omega} \logo [OPI] {opi} \logo [OPENMATH] {OpenMath} +\logo [OPENTYPE] {OpenType} \logo [OTP] {otp} +\logo [OTF] {otf} +\logo [OFM] {ofm} +\logo [OVF] {ovf} \logo [PASCAL] {Pascal} \logo [PCTEX] {pc\TeX} \logo [PDFETEX] {pdfe\TeX} @@ -187,6 +193,9 @@ \logo [TEXWORK] {\TeX work} \logo [TEXFONT] {\TeX font} \logo [TEXTOOLS] {textools} +\logo [TRUETYPE] {TrueType} +\logo [TTF] {ttf} +\logo [TYPEONE] {Type1} \logo [XMLTOOLS] {xmltools} \logo [PDFTOOLS] {pdftools} \logo [RLXTOOLS] {rlxtools} diff --git a/tex/context/base/s-mod-02.tex b/tex/context/base/s-mod-02.tex index b6260ab38..9dae3ecc0 100644 --- a/tex/context/base/s-mod-02.tex +++ b/tex/context/base/s-mod-02.tex @@ -21,12 +21,15 @@ % todo: internationalize + setups \setuphead[paragraaf][expansion=command] +\setuphead[section][expansion=command] \def\complexmodule[#1]% redefined {\startglobal % i.v.m. \bgroup in \startdocumentation \getparameters[Module][#1] \stopglobal % i.v.m. \bgroup in \startdocumentation - \section{\Modulesubtitle} + %%\section{\Modulesubtitle} + \xdef\Temp{\Modulesubtitle}%%Modulesubtitle:\framed{BEGIN \Modulesubtitle END} :#1 !} + \@EA\section\@EA{\Temp} \WriteLists} \def\stopmodule % redefined @@ -54,7 +57,7 @@ {\doglobal\increment\ModuleNumber % \immediate\write\BatchFile{call modu-run \FileName\space \ModuleNumber}} % \immediate\write\BatchFile{texmfstart texutil --modu \FileName}} - \immediate\write\BatchFile{texmfstart texexec --pdf --modu \FileName}} + \immediate\write\BatchFile{texmfstart texexec --pdf --modu --batch \FileName }} \newif\ifProcessingPublic diff --git a/tex/context/base/spec-def.tex b/tex/context/base/spec-def.tex index 933d42197..3f26c8924 100644 --- a/tex/context/base/spec-def.tex +++ b/tex/context/base/spec-def.tex @@ -16,6 +16,8 @@ \writestatus{loading}{Context Special Macros / Definitions} +\unprotect + %D The following libraries are defined. Two postscript %D drivers are supported, as well as two mechanisms for %D interactive texts. diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex index fbb886772..f9e697f20 100644 --- a/tex/context/base/spec-fdf.tex +++ b/tex/context/base/spec-fdf.tex @@ -3242,7 +3242,8 @@ %D Handy for the \METAPOST\ to \PDF\ converter: -\newevery \everyPDFxform \relax % we can also use this one in meta-pdf +\newevery \everyPDFximage \relax +\newevery \everyPDFxform \relax \appendtoksonce \collectPDFresources diff --git a/tex/context/base/spec-mis.tex b/tex/context/base/spec-mis.tex index fce364038..743091bbe 100644 --- a/tex/context/base/spec-mis.tex +++ b/tex/context/base/spec-mis.tex @@ -276,4 +276,9 @@ \fi +%D Handy to have this available asap: + +\newevery \everyPDFxform \relax +\newevery \everyPDFximage \relax + \protect \endinput diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex index 8d6d93d38..fdf41daec 100644 --- a/tex/context/base/spec-tpd.tex +++ b/tex/context/base/spec-tpd.tex @@ -226,7 +226,9 @@ \ifx\pdfmapfile\undefined \let\pdfmapfile\gobbletwoarguments \fi \ifx\pdfmapline\undefined \let\pdfmapline\gobbletwoarguments \fi -\definespecial\doresetmapfilelist{\pdfmapfile{original-empty.map}} +\definespecial\doresetmapfilelist + {\global\let\doresetmapfilelist\relax + \pdfmapfile{original-empty.map}} \ifnum\pdftexversion<120 diff --git a/tex/context/base/spec-tst.tex b/tex/context/base/spec-tst.tex index b8424e18e..e699475bc 100644 --- a/tex/context/base/spec-tst.tex +++ b/tex/context/base/spec-tst.tex @@ -2,7 +2,7 @@ %D [ file=spec-tst, %D version=2002.12.08, %D title=\CONTEXT\ \PDF\ Macros, -%D subtitle=Special Test Macro +%D subtitle=Special Test Macro, %D author=Hans Hagen, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex index e4f4922c7..53f096de5 100644 --- a/tex/context/base/supp-box.tex +++ b/tex/context/base/supp-box.tex @@ -2339,12 +2339,13 @@ %D The alternatives \type {\tbox} and \type {\bbox} can be used %D to properly align boxes, like in: %D +%D \setupexternalfigures[directory={../sample}] %D \startbuffer %D \starttable[|||] %D \HL -%D \VL \tbox{\externalfigure[koe][height=3cm,frame=on]} \VL top aligned \VL\SR +%D \VL \tbox{\externalfigure[cow][height=3cm,frame=on]} \VL top aligned \VL\SR %D \HL -%D \VL \bbox{\externalfigure[koe][height=3cm,frame=on]} \VL bottom aligned \VL\SR +%D \VL \bbox{\externalfigure[cow][height=3cm,frame=on]} \VL bottom aligned \VL\SR %D \HL %D \stoptable %D \stopbuffer diff --git a/tex/context/base/supp-mpe.tex b/tex/context/base/supp-mpe.tex index 60f517e8b..35a940edc 100644 --- a/tex/context/base/supp-mpe.tex +++ b/tex/context/base/supp-mpe.tex @@ -505,9 +505,9 @@ %D \startbuffer %D \setupframed[width=3cm,height=2cm,frame=off] %D \startcombination[3*1] -%D {\framed[backgroundachtergrond=demo 1]{\bfd \white Demo 1}} {} -%D {\framed[backgroundachtergrond=demo 2]{\bfd \white Demo 2}} {} -%D {\framed[backgroundachtergrond=demo 3]{\bfd \white Demo 3}} {} +%D {\framed[background=demo 1]{\bfd \white Demo 1}} {} +%D {\framed[background=demo 2]{\bfd \white Demo 2}} {} +%D {\framed[background=demo 3]{\bfd \white Demo 3}} {} %D \stopcombination %D \stopbuffer %D diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex index 22d59a064..fea1c7356 100644 --- a/tex/context/base/supp-mps.tex +++ b/tex/context/base/supp-mps.tex @@ -1498,6 +1498,7 @@ %D Now let's see if things work all right and show the example %D files that are part of the \METAPOST\ distribution: %D +%D \setupexternalfigures[directory={../sample}] %D \startlinecorrection %D \setupalign[middle] %D \leavevmode diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex index 754efa847..63dfb1f69 100644 --- a/tex/context/base/supp-pdf.tex +++ b/tex/context/base/supp-pdf.tex @@ -161,8 +161,8 @@ %D his initials. (We keep the old code around because it's a %D nice illustration on how a module like this evolves.) -%D Beware, we cannot use \zeropoint here since it may be -%D defined in the range \dimen 0 - 20 which we happen to use +%D Beware, we cannot use \type{\zeropoint} here since it may be +%D defined in the range \type{\dimen0} - 20 which we happen to use %D as scratch registers; inside context we may consider %D using dedicated registers. diff --git a/tex/context/base/symb-eur.tex b/tex/context/base/symb-eur.tex index 515db6ae5..400e88ac5 100644 --- a/tex/context/base/symb-eur.tex +++ b/tex/context/base/symb-eur.tex @@ -37,9 +37,7 @@ \definesymbol [euro] [\getglyph{Euro}{\char160}] \startencoding[default] - \definecharacter texteuro {\symbol[euro]} - \stopencoding \unexpanded\def\euro{\doiftextelse\texteuro\texteuro{\symbol[euro]}} diff --git a/tex/context/base/symb-glm.tex b/tex/context/base/symb-glm.tex index b07a3a426..0b01ca7df 100644 --- a/tex/context/base/symb-glm.tex +++ b/tex/context/base/symb-glm.tex @@ -13,8 +13,9 @@ %D Watch the \type {x} before the local symbols. -\loadmapfile [ec-public-lm.map] +% \loadmapfile [ec-public-lm.map] % \loadmapfile [ec-lm.map] +\loadmapfile [lm-ec.map] % this used to be: % diff --git a/tex/context/base/syst-pdt.tex b/tex/context/base/syst-pdt.tex index 079c664ef..c8f2555f3 100644 --- a/tex/context/base/syst-pdt.tex +++ b/tex/context/base/syst-pdt.tex @@ -27,8 +27,8 @@ \bindprimitive setrandomseed pdfsetrandomseed \bindprimitive uniformdeviate pdfuniformdeviate -\bindprimitive resettimer pdfresettimer -\bindprimitive elapsedtime pdfelapsedtime +\bindprimitive resettimer pdfresettimer +\bindprimitive elapsedtime pdfelapsedtime % new per 1.40 @@ -44,6 +44,7 @@ {\pdfcompresslevel \zerocount \pdfobjcompresslevel\zerocount} +\let\normalquitvmode \quitvmode \let\normalnoligatures\noligatures \protect diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex index 533f727d7..7ccbac9ca 100644 --- a/tex/context/base/type-buy.tex +++ b/tex/context/base/type-buy.tex @@ -309,6 +309,18 @@ \stoptypescript +\starttypescript [sans] [meta-medium] [name] + + \definefontsynonym [Sans] [MetaMedium-Roman] + \definefontsynonym [SansItalic] [MetaMedium-Italic] + \definefontsynonym [SansSlanted] [MetaMedium-Italic] + \definefontsynonym [SansBold] [MetaBold-Roman] + \definefontsynonym [SansBoldItalic] [MetaBold-Italic] + \definefontsynonym [SansBoldSlanted][MetaBold-Italic] + \definefontsynonym [SansCaps] [MetaMedium-Caps] + +\stoptypescript + \starttypescript [sans] [meta-lf] [name] \definefontsynonym [Sans] [MetaBookLF-Roman] diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index bf0145474..799eedbd5 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -231,6 +231,14 @@ \definefontsynonym [cmcsc10] [\typescriptthree-lmcsc10] [encoding=\typescriptthree] \definefontsynonym [cmcscsl10][\typescriptthree-lmcsco10] [encoding=\typescriptthree] + \definefontsynonym [cmr12 ][rm-lmr12] % hack needed to fool math roman + \definefontsynonym [cmr10 ][rm-lmr10] % into not messing around with + \definefontsynonym [cmr9 ] [rm-lmr9] % encodings, probably no longer + \definefontsynonym [cmr8 ] [rm-lmr8] % needed now + \definefontsynonym [cmr7 ] [rm-lmr7] % + \definefontsynonym [cmr6 ] [rm-lmr6] % no space appended here, needs + \definefontsynonym [cmr5 ] [rm-lmr5] % some testing + \stoptypescript \starttypescript [sans] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5] diff --git a/tex/context/base/type-exp.tex b/tex/context/base/type-exp.tex new file mode 100644 index 000000000..432685a03 --- /dev/null +++ b/tex/context/base/type-exp.tex @@ -0,0 +1,95 @@ +%D \module +%D [ file=type-exp, +%D version=2007.01.28, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Experimental Definitions, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% \usetypescript[palatino-light] [texnansi] \setupbodyfont[palatino-light] \input zapf \par +% \usetypescript[palatino-normal][texnansi] \setupbodyfont[palatino-normal] \input zapf \par +% \usetypescript[palatino-medium][texnansi] \setupbodyfont[palatino-medium] \input zapf \par + +%D This file is used for \LUATEX\ experiments. + +\starttypescriptcollection[experiment] + +\starttypescript [sans] [palatino-sans-light] [name] + + \definefontsynonym [Sans] [PalatinoSans-Light] + \definefontsynonym [SansItalic] [PalatinoSans-LightItalic] + \definefontsynonym [SansBold] [PalatinoSans-Regular] + \definefontsynonym [SansBoldItalic] [PalatinoSans-Italic] + \definefontsynonym [SansSlanted] [PalatinoSans-Regular] + \definefontsynonym [SansBoldSlanted] [PalatinoSans-Italic] + \definefontsynonym [SansCaps] [PalatinoSans-Light] + +\stoptypescript + +\starttypescript [sans] [palatino-sans-normal] [name] + + \definefontsynonym [Sans] [PalatinoSans-Regular] + \definefontsynonym [SansItalic] [PalatinoSans-Italic] + \definefontsynonym [SansBold] [PalatinoSans-Bold] + \definefontsynonym [SansBoldItalic] [PalatinoSans-BoldItalic] + \definefontsynonym [SansSlanted] [PalatinoSans-Italic] + \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic] + \definefontsynonym [SansCaps] [PalatinoSans-Regular] + +\stoptypescript + +\starttypescript [sans] [palatino-sans-medium] [name] + + \definefontsynonym [Sans] [PalatinoSans-Medium] + \definefontsynonym [SansItalic] [PalatinoSans-MediumItalic] + \definefontsynonym [SansBold] [PalatinoSans-Bold] + \definefontsynonym [SansBoldItalic] [PalatinoSans-BoldItalic] + \definefontsynonym [SansSlanted] [PalatinoSans-Bold] + \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic] + \definefontsynonym [SansCaps] [PalatinoSans-MediumSC] + +\stoptypescript + +\starttypescript [sans] [palatino-sans-light,palatino-sans-normal,palatino-sans-medium] [texnansi,ec,8r] + + \definefontsynonym[PalatinoSans-Light] [\typescriptthree-palatinosanscom-light] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-LightItalic] [\typescriptthree-palatinosanscom-lightitalic] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-Regular] [\typescriptthree-palatinosanscom-regular] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-Italic] [\typescriptthree-palatinosanscom-italic] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-Medium] [\typescriptthree-palatinosanscom-medium] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-MediumItalic][\typescriptthree-palatinosanscom-mediumitalic][encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-Bold] [\typescriptthree-palatinosanscom-bold] [encoding=\typescriptthree] + \definefontsynonym[PalatinoSans-BoldItalic] [\typescriptthree-palatinosanscom-bolditalic] [encoding=\typescriptthree] + +\stoptypescript + +\starttypescript[palatino-normal][texnansi,ec] + \definetypeface[palatino-normal][ss][sans] [palatino-sans-normal] [default][encoding=\typescripttwo] + \definetypeface[palatino-normal][rm][serif][palatino-nova] [default][encoding=\typescripttwo] + \definetypeface[palatino-normal][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \definetypeface[palatino-normal][mm][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \quittypescriptscanning +\stoptypescript + +\starttypescript[palatino-medium][texnansi,ec] + \definetypeface[palatino-medium][ss][sans] [palatino-sans-medium] [default][encoding=\typescripttwo] + \definetypeface[palatino-medium][rm][serif][palatino-nova] [default][encoding=\typescripttwo] + \definetypeface[palatino-medium][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \definetypeface[palatino-medium][mm][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \quittypescriptscanning +\stoptypescript + +\starttypescript[palatino-light][texnansi,ec] + \definetypeface[palatino-light][ss][sans] [palatino-sans-light] [default][encoding=\typescripttwo] + \definetypeface[palatino-light][rm][serif][palatino-nova] [default][encoding=\typescripttwo] + \definetypeface[palatino-light][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \definetypeface[palatino-light][mm][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] + \quittypescriptscanning +\stoptypescript + +\stoptypescriptcollection diff --git a/tex/context/base/type-fsf.tex b/tex/context/base/type-fsf.tex index 835fb4153..9467ae929 100644 --- a/tex/context/base/type-fsf.tex +++ b/tex/context/base/type-fsf.tex @@ -1,3 +1,16 @@ +%D \module +%D [ file=page-new, +%D version=2000.10.20, +%D title=\CONTEXT\ Page Macros, +%D subtitle=Fontsite 500, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + % run texfont from currentpath with the fonts on subpath fontsite/500 % texfont --en=texnansi --ve=fontsite --co=opus type-fsf.dat diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.tex index afb637818..2be9de7cb 100644 --- a/tex/context/base/type-ghz.tex +++ b/tex/context/base/type-ghz.tex @@ -90,8 +90,6 @@ \starttypescript[optima-nova][texnansi,ec] % will change to more narrow tt \definetypeface[optima][ss][sans][optima-nova] [default][encoding=\typescripttwo] \definetypeface[optima][rm][sans][optima-nova] [default][encoding=\typescripttwo] -% \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125] -% \definetypeface[optima][mm][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.125] \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1] \definetypeface[optima][mm][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1] \quittypescriptscanning @@ -100,8 +98,6 @@ \starttypescript[optima-nova-os][texnansi,ec] % will change to more narrow tt \definetypeface[optima-os][ss][sans][optima-nova-os] [default][encoding=\typescripttwo] \definetypeface[optima-os][rm][sans][optima-nova-os] [default][encoding=\typescripttwo] -% \definetypeface[optima-os][tt][mono][latin-modern] [default][encoding=\typescripttwo,rscale=1.125] -% \definetypeface[optima-os][mm][mono][latin-modern] [default][encoding=\typescripttwo,rscale=1.125] \definetypeface[optima-os][tt][mono][latin-modern] [default][encoding=\typescripttwo,rscale=1.1] \definetypeface[optima-os][mm][mono][latin-modern] [default][encoding=\typescripttwo,rscale=1.1] \quittypescriptscanning diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex index 3244cc430..25f12ff17 100644 --- a/tex/context/base/type-ini.tex +++ b/tex/context/base/type-ini.tex @@ -599,7 +599,7 @@ %D \inherittypeface[palatino][rm][\fontclass] %D \inherittypeface[palatino][rm] % == \fontclass %D \inherittypeface[palatino] % == [rm,ss,tt,mm] -%D \starttyping +%D \stoptyping \def\inherittypeface {\dotripleempty\doinherittypeface} diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex index 4dbd9c309..e333423b7 100644 --- a/tex/context/base/type-map.tex +++ b/tex/context/base/type-map.tex @@ -71,6 +71,7 @@ % this is what the latest distributions provide \loadmapfile[lm-\typescriptthree.map] % maybe some day \loadmapfile[lm-math.map] + \loadmapfile[lm-rm.map] \stoptypescript % \usetypescript [map] [latin-modern-os] [ec] % lm is loaded under ec regime diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex index 6c6af6f4c..e37de9136 100644 --- a/tex/context/base/unic-001.tex +++ b/tex/context/base/unic-001.tex @@ -23,6 +23,7 @@ %D Zcaron\or zcaron\else unknownchar\fi %D \stopunicodevector %D +%D \stoptyping %D But we can speed things up, watch how we avoid zero and \TEX's %D automatically added \type {\relax}. diff --git a/tex/context/base/verb-ini.tex b/tex/context/base/verb-ini.tex index c76e0847f..4432da3b7 100644 --- a/tex/context/base/verb-ini.tex +++ b/tex/context/base/verb-ini.tex @@ -59,11 +59,9 @@ %D use the following construction for display verbatim: %D %D \starttyping -%D \starttyping %D The Dutch word 'typen' stands for 'typing', therefore in the Dutch version %D one will not find the word 'verbatim'. %D \stoptyping -%D \stoptyping %D %D In \CONTEXT\ files can be typed with \type{\typefile} and %D inline verbatim can be accomplished with \type{\type}. This @@ -1393,7 +1391,7 @@ %D text and files verbatim. The inline alternative also accepts %D user supplied delimiters. %D -%D \starttyping +%D %D \type{text} %D %D \starttyping @@ -1401,7 +1399,6 @@ %D \stoptyping %D %D \typefile{filename} -%D \stoptyping %D %D We can turn on the options by: %D diff --git a/tex/context/base/x-contml.tex b/tex/context/base/x-contml.tex index e1dda06c1..10a21b996 100644 --- a/tex/context/base/x-contml.tex +++ b/tex/context/base/x-contml.tex @@ -225,7 +225,7 @@ %D The previous examples already demonstrated how we can include a graphic: %D %D <verbatim> -%D <line><externalfigure file="koe" width="5cm" /></line> +%D <line><externalfigure file="cow" width="5cm" /></line> %D </verbatim> %D \stopbuffer %D @@ -242,7 +242,7 @@ \egroup} %D \elements {fixed} -%D +%D \setupexternalfigures[directory={../sample}] %D \startbuffer %D Something fixed will end up at the place where it defined in the input %D stream. The main idea behind this element is that it gives you control @@ -252,7 +252,7 @@ %D <item> %D <fixed align="high"> %D <content> -%D <externalfigure file="koe" frame="on" height="1cm" /> +%D <externalfigure file="cow" frame="on" height="1cm" /> %D </content> %D </fixed> %D </item> @@ -275,15 +275,15 @@ \egroup} %D \elements {float} -%D +%D \setupexternalfigures[directory={../sample}] %D \startbuffer %D A floating body will be placed at the first location available, unless %D a location is specified. As with the <element>fixed</element> element, -%D you can prvide a caption. +%D you can provide a caption. %D %D <float type="figure"> %D <content> -%D <externalfigure file="koe" frame="on" height="3cm" /> +%D <externalfigure file="cow" frame="on" height="3cm" /> %D </content> %D <caption>This is a cow!</caption> %D </float> diff --git a/tex/context/base/x-newmml.tex b/tex/context/base/x-newmml.tex index 97562daec..923ec3c76 100644 --- a/tex/context/base/x-newmml.tex +++ b/tex/context/base/x-newmml.tex @@ -470,7 +470,7 @@ %D <dmath><apply><cn>1.23</cn></apply></dmath> %D \stopXMLdata %D -%D \setupMMLappearance[cn] [alternative=b] +%D \type{\setupMMLappearance[cn] [alternative=b]} %D %D \startXMLdata %D <imath><apply><cn>1.23</cn></apply></imath> diff --git a/tex/context/config/cont-usr.tex b/tex/context/config/cont-usr.tex index ee0627836..7489f8a10 100644 --- a/tex/context/config/cont-usr.tex +++ b/tex/context/config/cont-usr.tex @@ -22,6 +22,8 @@ %D want to play safe, use \typ {texexec --make --alone %D --all}. +% \preloadallpatterns % will load them all + % \installlanguage [\s!af] [\c!state=\v!start] % afrikaans % \installlanguage [\s!ca] [\c!state=\v!start] % catalan % \installlanguage [\s!cz] [\c!state=\v!start] % czech diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index 46ee5c3be..6e7b36073 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -3081,7 +3081,7 @@ <cd:command name="setupindentations" file="core-des.tex"> <cd:sequence> - <cd:string value="nastavodsazovani"/> + <cd:string value="nastavodsazeni"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes" list="yes"> @@ -3129,7 +3129,7 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="nastavodsazovani"/> + <cd:inherit name="nastavodsazeni"/> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 37a5d3aab..e364f5814 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="jedna"/> @@ -1388,7 +1388,7 @@ <cd:command name="defineindenting" value="definujodsazovani"/> <cd:command name="setupdescriptions" value="nastavpopisy"/> <cd:command name="setupenumerations" value="nastavvycty"/> - <cd:command name="setupindentations" value="nastavodsazovani"/> + <cd:command name="setupindentations" value="nastavodsazeni"/> <cd:command name="setuptab" value="nastavtab"/> <cd:command name="tab" value="tab"/> <cd:command name="setupexternalfigures" value="nastavexterniobrazy"/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 0a26cb80f..1ae750baf 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="eins"/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index b498e5ce1..828735868 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="one"/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index eb995896b..837cfe1ed 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="un"/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 8f1778a1c..bf7d53907 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="uno"/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 70ccfff67..4bbfe8cb2 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="een"/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 297fea5c0..731bc3da8 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.01.23 13:32"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.02.20 12:00"> <cd:variables> <cd:variable name="one" value="unu"/> diff --git a/tex/context/patterns/lang-et.log b/tex/context/patterns/lang-et.log deleted file mode 100644 index c0586c1e0..000000000 --- a/tex/context/patterns/lang-et.log +++ /dev/null @@ -1,745 +0,0 @@ -/\\\^ A/ => [Acircumflex] -/\\\^A/ => [Acircumflex] -/\\\^\{A\}/ => [Acircumflex] -/\\\^ a/ => [acircumflex] -/\\\^a/ => [acircumflex] -/\\\^\{a\}/ => [acircumflex] -/\\\^ C/ => [Ccircumflex] -/\\\^C/ => [Ccircumflex] -/\\\^\{C\}/ => [Ccircumflex] -/\\\^ c/ => [ccircumflex] -/\\\^c/ => [ccircumflex] -/\\\^\{c\}/ => [ccircumflex] -/\\\^ E/ => [Ecircumflex] -/\\\^E/ => [Ecircumflex] -/\\\^\{E\}/ => [Ecircumflex] -/\\\^ e/ => [ecircumflex] -/\\\^e/ => [ecircumflex] -/\\\^\{e\}/ => [ecircumflex] -/\\\^ G/ => [Gcircumflex] -/\\\^G/ => [Gcircumflex] -/\\\^\{G\}/ => [Gcircumflex] -/\\\^ g/ => [gcircumflex] -/\\\^g/ => [gcircumflex] -/\\\^\{g\}/ => [gcircumflex] -/\\\^ H/ => [Hcircumflex] -/\\\^H/ => [Hcircumflex] -/\\\^\{H\}/ => [Hcircumflex] -/\\\^ h/ => [hcircumflex] -/\\\^h/ => [hcircumflex] -/\\\^\{h\}/ => [hcircumflex] -/\\\^ I/ => [Icircumflex] -/\\\^I/ => [Icircumflex] -/\\\^\{I\}/ => [Icircumflex] -/\\\^ i/ => [icircumflex] -/\\\^i/ => [icircumflex] -/\\\^\{i\}/ => [icircumflex] -/\\\^ \i/ => [icircumflex] -/\\\^\i/ => [icircumflex] -/\\\^\{\i\}/ => [icircumflex] -/\\\^ J/ => [Jcircumflex] -/\\\^J/ => [Jcircumflex] -/\\\^\{J\}/ => [Jcircumflex] -/\\\^ j/ => [jcircumflex] -/\\\^j/ => [jcircumflex] -/\\\^\{j\}/ => [jcircumflex] -/\\\^ \j/ => [jcircumflex] -/\\\^\j/ => [jcircumflex] -/\\\^\{\j\}/ => [jcircumflex] -/\\\^ O/ => [Ocircumflex] -/\\\^O/ => [Ocircumflex] -/\\\^\{O\}/ => [Ocircumflex] -/\\\^ o/ => [ocircumflex] -/\\\^o/ => [ocircumflex] -/\\\^\{o\}/ => [ocircumflex] -/\\\^ S/ => [Scircumflex] -/\\\^S/ => [Scircumflex] -/\\\^\{S\}/ => [Scircumflex] -/\\\^ s/ => [scircumflex] -/\\\^s/ => [scircumflex] -/\\\^\{s\}/ => [scircumflex] -/\\\^ U/ => [Ucircumflex] -/\\\^U/ => [Ucircumflex] -/\\\^\{U\}/ => [Ucircumflex] -/\\\^ u/ => [ucircumflex] -/\\\^u/ => [ucircumflex] -/\\\^\{u\}/ => [ucircumflex] -/\\\^ W/ => [Wcircumflex] -/\\\^W/ => [Wcircumflex] -/\\\^\{W\}/ => [Wcircumflex] -/\\\^ w/ => [wcircumflex] -/\\\^w/ => [wcircumflex] -/\\\^\{w\}/ => [wcircumflex] -/\\\^ Y/ => [Ycircumflex] -/\\\^Y/ => [Ycircumflex] -/\\\^\{Y\}/ => [Ycircumflex] -/\\\^ y/ => [ycircumflex] -/\\\^y/ => [ycircumflex] -/\\\^\{y\}/ => [ycircumflex] -/\\\` A/ => [Agrave] -/\\\`A/ => [Agrave] -/\\\`\{A\}/ => [Agrave] -/\\\` a/ => [agrave] -/\\\`a/ => [agrave] -/\\\`\{a\}/ => [agrave] -/\\\` E/ => [Egrave] -/\\\`E/ => [Egrave] -/\\\`\{E\}/ => [Egrave] -/\\\` e/ => [egrave] -/\\\`e/ => [egrave] -/\\\`\{e\}/ => [egrave] -/\\\` I/ => [Igrave] -/\\\`I/ => [Igrave] -/\\\`\{I\}/ => [Igrave] -/\\\` i/ => [igrave] -/\\\`i/ => [igrave] -/\\\`\{i\}/ => [igrave] -/\\\` \i/ => [igrave] -/\\\`\i/ => [igrave] -/\\\`\{\i\}/ => [igrave] -/\\\` O/ => [Ograve] -/\\\`O/ => [Ograve] -/\\\`\{O\}/ => [Ograve] -/\\\` o/ => [ograve] -/\\\`o/ => [ograve] -/\\\`\{o\}/ => [ograve] -/\\\` U/ => [Ugrave] -/\\\`U/ => [Ugrave] -/\\\`\{U\}/ => [Ugrave] -/\\\` u/ => [ugrave] -/\\\`u/ => [ugrave] -/\\\`\{u\}/ => [ugrave] -/\\\` Y/ => [Ygrave] -/\\\`Y/ => [Ygrave] -/\\\`\{Y\}/ => [Ygrave] -/\\\` y/ => [ygrave] -/\\\`y/ => [ygrave] -/\\\`\{y\}/ => [ygrave] -/\\\~ A/ => [Atilde] -/\\\~A/ => [Atilde] -/\\\~\{A\}/ => [Atilde] -/\\\~ a/ => [atilde] -/\\\~a/ => [atilde] -/\\\~\{a\}/ => [atilde] -/\\\~ I/ => [Itilde] -/\\\~I/ => [Itilde] -/\\\~\{I\}/ => [Itilde] -/\\\~ i/ => [itilde] -/\\\~i/ => [itilde] -/\\\~\{i\}/ => [itilde] -/\\\~ \i/ => [itilde] -/\\\~\i/ => [itilde] -/\\\~\{\i\}/ => [itilde] -/\\\~ O/ => [Otilde] -/\\\~O/ => [Otilde] -/\\\~\{O\}/ => [Otilde] -/\\\~ o/ => [otilde] -/\\\~o/ => [otilde] -/\\\~\{o\}/ => [otilde] -/\\\~ U/ => [Utilde] -/\\\~U/ => [Utilde] -/\\\~\{U\}/ => [Utilde] -/\\\~ u/ => [utilde] -/\\\~u/ => [utilde] -/\\\~\{u\}/ => [utilde] -/\\\" A/ => [Adiaeresis] -/\\\"A/ => [Adiaeresis] -/\\\"\{A\}/ => [Adiaeresis] -/\\\" a/ => [adiaeresis] -/\\\"a/ => [adiaeresis] -/\\\"\{a\}/ => [adiaeresis] -/\\\" E/ => [Ediaeresis] -/\\\"E/ => [Ediaeresis] -/\\\"\{E\}/ => [Ediaeresis] -/\\\" e/ => [ediaeresis] -/\\\"e/ => [ediaeresis] -/\\\"\{e\}/ => [ediaeresis] -/\\\" I/ => [Idiaeresis] -/\\\"I/ => [Idiaeresis] -/\\\"\{I\}/ => [Idiaeresis] -/\\\" i/ => [idiaeresis] -/\\\"i/ => [idiaeresis] -/\\\"\{i\}/ => [idiaeresis] -/\\\" \i/ => [idiaeresis] -/\\\"\i/ => [idiaeresis] -/\\\"\{\i\}/ => [idiaeresis] -/\\\" O/ => [Odiaeresis] -/\\\"O/ => [Odiaeresis] -/\\\"\{O\}/ => [Odiaeresis] -/\\\" o/ => [odiaeresis] -/\\\"o/ => [odiaeresis] -/\\\"\{o\}/ => [odiaeresis] -/\\\" U/ => [Udiaeresis] -/\\\"U/ => [Udiaeresis] -/\\\"\{U\}/ => [Udiaeresis] -/\\\" u/ => [udiaeresis] -/\\\"u/ => [udiaeresis] -/\\\"\{u\}/ => [udiaeresis] -/\\\" Y/ => [Ydiaeresis] -/\\\"Y/ => [Ydiaeresis] -/\\\"\{Y\}/ => [Ydiaeresis] -/\\\" y/ => [ydiaeresis] -/\\\"y/ => [ydiaeresis] -/\\\"\{y\}/ => [ydiaeresis] -/\\\' A/ => [Aacute] -/\\\'A/ => [Aacute] -/\\\'\{A\}/ => [Aacute] -/\\\' a/ => [aacute] -/\\\'a/ => [aacute] -/\\\'\{a\}/ => [aacute] -/\\\' C/ => [Cacute] -/\\\'C/ => [Cacute] -/\\\'\{C\}/ => [Cacute] -/\\\' c/ => [cacute] -/\\\'c/ => [cacute] -/\\\'\{c\}/ => [cacute] -/\\\' E/ => [Eacute] -/\\\'E/ => [Eacute] -/\\\'\{E\}/ => [Eacute] -/\\\' e/ => [eacute] -/\\\'e/ => [eacute] -/\\\'\{e\}/ => [eacute] -/\\\' I/ => [Iacute] -/\\\'I/ => [Iacute] -/\\\'\{I\}/ => [Iacute] -/\\\' i/ => [iacute] -/\\\'i/ => [iacute] -/\\\'\{i\}/ => [iacute] -/\\\' \i/ => [iacute] -/\\\'\i/ => [iacute] -/\\\'\{\i\}/ => [iacute] -/\\\' L/ => [Lacute] -/\\\'L/ => [Lacute] -/\\\'\{L\}/ => [Lacute] -/\\\' l/ => [lacute] -/\\\'l/ => [lacute] -/\\\'\{l\}/ => [lacute] -/\\\' N/ => [Nacute] -/\\\'N/ => [Nacute] -/\\\'\{N\}/ => [Nacute] -/\\\' n/ => [nacute] -/\\\'n/ => [nacute] -/\\\'\{n\}/ => [nacute] -/\\\' O/ => [Oacute] -/\\\'O/ => [Oacute] -/\\\'\{O\}/ => [Oacute] -/\\\' o/ => [oacute] -/\\\'o/ => [oacute] -/\\\'\{o\}/ => [oacute] -/\\\' R/ => [Racute] -/\\\'R/ => [Racute] -/\\\'\{R\}/ => [Racute] -/\\\' r/ => [racute] -/\\\'r/ => [racute] -/\\\'\{r\}/ => [racute] -/\\\' S/ => [Sacute] -/\\\'S/ => [Sacute] -/\\\'\{S\}/ => [Sacute] -/\\\' s/ => [sacute] -/\\\'s/ => [sacute] -/\\\'\{s\}/ => [sacute] -/\\\' U/ => [Uacute] -/\\\'U/ => [Uacute] -/\\\'\{U\}/ => [Uacute] -/\\\' u/ => [uacute] -/\\\'u/ => [uacute] -/\\\'\{u\}/ => [uacute] -/\\\' Y/ => [Yacute] -/\\\'Y/ => [Yacute] -/\\\'\{Y\}/ => [Yacute] -/\\\' y/ => [yacute] -/\\\'y/ => [yacute] -/\\\'\{y\}/ => [yacute] -/\\\' Z/ => [Zacute] -/\\\'Z/ => [Zacute] -/\\\'\{Z\}/ => [Zacute] -/\\\' z/ => [zacute] -/\\\'z/ => [zacute] -/\\\'\{z\}/ => [zacute] -/\\\. C/ => [Cdotaccent] -/\\\.C/ => [Cdotaccent] -/\\\.\{C\}/ => [Cdotaccent] -/\\\. c/ => [cdotaccent] -/\\\.c/ => [cdotaccent] -/\\\.\{c\}/ => [cdotaccent] -/\\\. E/ => [Edotaccent] -/\\\.E/ => [Edotaccent] -/\\\.\{E\}/ => [Edotaccent] -/\\\. e/ => [edotaccent] -/\\\.e/ => [edotaccent] -/\\\.\{e\}/ => [edotaccent] -/\\\. G/ => [Gdotaccent] -/\\\.G/ => [Gdotaccent] -/\\\.\{G\}/ => [Gdotaccent] -/\\\. g/ => [gdotaccent] -/\\\.g/ => [gdotaccent] -/\\\.\{g\}/ => [gdotaccent] -/\\\. I/ => [Idotaccent] -/\\\.I/ => [Idotaccent] -/\\\.\{I\}/ => [Idotaccent] -/\\\. i/ => [idotaccent] -/\\\.i/ => [idotaccent] -/\\\.\{i\}/ => [idotaccent] -/\\\. \i/ => [idotaccent] -/\\\.\i/ => [idotaccent] -/\\\.\{\i\}/ => [idotaccent] -/\\\. Z/ => [Zdotaccent] -/\\\.Z/ => [Zdotaccent] -/\\\.\{Z\}/ => [Zdotaccent] -/\\\. z/ => [zdotaccent] -/\\\.z/ => [zdotaccent] -/\\\.\{z\}/ => [zdotaccent] -/\\\= A/ => [Amacron] -/\\\=A/ => [Amacron] -/\\\=\{A\}/ => [Amacron] -/\\\= a/ => [amacron] -/\\\=a/ => [amacron] -/\\\=\{a\}/ => [amacron] -/\\\= E/ => [Emacron] -/\\\=E/ => [Emacron] -/\\\=\{E\}/ => [Emacron] -/\\\= e/ => [emacron] -/\\\=e/ => [emacron] -/\\\=\{e\}/ => [emacron] -/\\\= I/ => [Imacron] -/\\\=I/ => [Imacron] -/\\\=\{I\}/ => [Imacron] -/\\\= i/ => [imacron] -/\\\=i/ => [imacron] -/\\\=\{i\}/ => [imacron] -/\\\= \i/ => [imacron] -/\\\=\i/ => [imacron] -/\\\=\{\i\}/ => [imacron] -/\\\= O/ => [Omacron] -/\\\=O/ => [Omacron] -/\\\=\{O\}/ => [Omacron] -/\\\= o/ => [omacron] -/\\\=o/ => [omacron] -/\\\=\{o\}/ => [omacron] -/\\\= U/ => [Umacron] -/\\\=U/ => [Umacron] -/\\\=\{U\}/ => [Umacron] -/\\\= u/ => [umacron] -/\\\=u/ => [umacron] -/\\\=\{u\}/ => [umacron] -/\\c C/ => [Ccedilla] -/\\c\{C\}/ => [Ccedilla] -/\\c c/ => [ccedilla] -/\\c\{c\}/ => [ccedilla] -/\\c K/ => [Kcedilla] -/\\c\{K\}/ => [Kcedilla] -/\\c k/ => [kcedilla] -/\\c\{k\}/ => [kcedilla] -/\\c L/ => [Lcedilla] -/\\c\{L\}/ => [Lcedilla] -/\\c l/ => [lcedilla] -/\\c\{l\}/ => [lcedilla] -/\\c N/ => [Ncedilla] -/\\c\{N\}/ => [Ncedilla] -/\\c n/ => [ncedilla] -/\\c\{n\}/ => [ncedilla] -/\\c R/ => [Rcedilla] -/\\c\{R\}/ => [Rcedilla] -/\\c r/ => [rcedilla] -/\\c\{r\}/ => [rcedilla] -/\\c S/ => [Scedilla] -/\\c\{S\}/ => [Scedilla] -/\\c s/ => [scedilla] -/\\c\{s\}/ => [scedilla] -/\\c T/ => [Tcedilla] -/\\c\{T\}/ => [Tcedilla] -/\\c t/ => [tcedilla] -/\\c\{t\}/ => [tcedilla] -/\\H O/ => [Ohungarumlaut] -/\\H\{O\}/ => [Ohungarumlaut] -/\\H o/ => [ohungarumlaut] -/\\H\{o\}/ => [ohungarumlaut] -/\\H u/ => [uhungarumlaut] -/\\H\{u\}/ => [uhungarumlaut] -/\\H U/ => [Uhungarumlaut] -/\\H\{U\}/ => [Uhungarumlaut] -/\\k A/ => [Aogonek] -/\\k\{A\}/ => [Aogonek] -/\\k a/ => [aogonek] -/\\k\{a\}/ => [aogonek] -/\\k E/ => [Eogonek] -/\\k\{E\}/ => [Eogonek] -/\\k e/ => [eogonek] -/\\k\{e\}/ => [eogonek] -/\\k I/ => [Iogonek] -/\\k\{I\}/ => [Iogonek] -/\\k i/ => [iogonek] -/\\k\{i\}/ => [iogonek] -/\\k U/ => [Uogonek] -/\\k\{U\}/ => [Uogonek] -/\\k u/ => [uogonek] -/\\k\{u\}/ => [uogonek] -/\\r A/ => [Aring] -/\\r\{A\}/ => [Aring] -/\\r a/ => [aring] -/\\r\{a\}/ => [aring] -/\\r U/ => [Uring] -/\\r\{U\}/ => [Uring] -/\\r u/ => [uring] -/\\r\{u\}/ => [uring] -/\\u A/ => [Abreve] -/\\u\{A\}/ => [Abreve] -/\\u a/ => [abreve] -/\\u\{a\}/ => [abreve] -/\\u E/ => [Ebreve] -/\\u\{E\}/ => [Ebreve] -/\\u e/ => [ebreve] -/\\u\{e\}/ => [ebreve] -/\\u G/ => [Gbreve] -/\\u\{G\}/ => [Gbreve] -/\\u g/ => [gbreve] -/\\u\{g\}/ => [gbreve] -/\\u I/ => [Ibreve] -/\\u\{I\}/ => [Ibreve] -/\\u i/ => [ibreve] -/\\u\{i\}/ => [ibreve] -/\\u \i/ => [ibreve] -/\\u\{\i\}/ => [ibreve] -/\\u O/ => [Obreve] -/\\u\{O\}/ => [Obreve] -/\\u o/ => [obreve] -/\\u\{o\}/ => [obreve] -/\\u U/ => [Ubreve] -/\\u\{U\}/ => [Ubreve] -/\\u u/ => [ubreve] -/\\u\{u\}/ => [ubreve] -/\\v C/ => [Ccaron] -/\\v\{C\}/ => [Ccaron] -/\\v c/ => [ccaron] -/\\v\{c\}/ => [ccaron] -/\\v D/ => [Dcaron] -/\\v\{D\}/ => [Dcaron] -/\\v d/ => [dcaron] -/\\v\{d\}/ => [dcaron] -/\\v E/ => [Ecaron] -/\\v\{E\}/ => [Ecaron] -/\\v e/ => [ecaron] -/\\v\{e\}/ => [ecaron] -/\\v L/ => [Lcaron] -/\\v\{L\}/ => [Lcaron] -/\\v l/ => [lcaron] -/\\v\{l\}/ => [lcaron] -/\\v N/ => [Ncaron] -/\\v\{N\}/ => [Ncaron] -/\\v n/ => [ncaron] -/\\v\{n\}/ => [ncaron] -/\\v R/ => [Rcaron] -/\\v\{R\}/ => [Rcaron] -/\\v r/ => [rcaron] -/\\v\{r\}/ => [rcaron] -/\\v S/ => [Scaron] -/\\v\{S\}/ => [Scaron] -/\\v s/ => [scaron] -/\\v\{s\}/ => [scaron] -/\\v T/ => [Tcaron] -/\\v\{T\}/ => [Tcaron] -/\\v t/ => [tcaron] -/\\v\{t\}/ => [tcaron] -/\\v Z/ => [Zcaron] -/\\v\{Z\}/ => [Zcaron] -/\\v z/ => [zcaron] -/\\v\{z\}/ => [zcaron] -/\\\" \i/ => [idiaeresis] -/\\\"\i/ => [idiaeresis] -/\\\"\{\i\}/ => [idiaeresis] -/\^\^00/ => [textgrave] -/\^\^01/ => [textacute] -/\^\^02/ => [textcircumflex] -/\^\^03/ => [texttilde] -/\^\^04/ => [textdiaeresis] -/\^\^05/ => [texthungarumlaut] -/\^\^06/ => [textring] -/\^\^07/ => [textcaron] -/\^\^08/ => [textbreve] -/\^\^09/ => [textmacron] -/\^\^0a/ => [textdotaccent] -/\^\^0b/ => [textcedilla] -/\^\^0c/ => [textogonek] -/\^\^0d/ => [quotesinglebase] -/\^\^0e/ => [guilsingleleft] -/\^\^0f/ => [guilsingleright] -/\^\^10/ => [quotedblleft] -/\^\^11/ => [quotedblright] -/\^\^12/ => [quotedblbase] -/\^\^13/ => [leftguillemot] -/\^\^14/ => [rightguillemot] -/\^\^15/ => [endash] -/\^\^16/ => [emdash] -/\^\^19/ => [dotlessi] -/\^\^1a/ => [dotlessj] -/\^\^22/ => [quotedbl] -/\^\^25/ => [percent] -/\^\^27/ => [quoteright] -/\^\^2d/ => [softhyphen] -/\^\^5c/ => [textbackslash] -/\^\^5e/ => [textasciicircum] -/\^\^5f/ => [textunderscore] -/\^\^60/ => [quoteleft] -/\^\^7b/ => [textbraceleft] -/\^\^7d/ => [textbraceright] -/\^\^7e/ => [textasciitilde] -/\^\^80/ => [Abreve] -/\200/ => [Abreve] -/\^\^81/ => [Aogonek] -/\201/ => [Aogonek] -/\^\^82/ => [Cacute] -/\202/ => [Cacute] -/\^\^83/ => [Ccaron] -/\203/ => [Ccaron] -/\^\^84/ => [Dcaron] -/\204/ => [Dcaron] -/\^\^85/ => [Ecaron] -/\205/ => [Ecaron] -/\^\^86/ => [Eogonek] -/\206/ => [Eogonek] -/\^\^87/ => [Gbreve] -/\207/ => [Gbreve] -/\^\^88/ => [Lacute] -/\210/ => [Lacute] -/\^\^89/ => [Lcaron] -/\211/ => [Lcaron] -/\^\^8a/ => [Lstroke] -/\212/ => [Lstroke] -/\^\^8b/ => [Nacute] -/\213/ => [Nacute] -/\^\^8c/ => [Ncaron] -/\214/ => [Ncaron] -/\^\^8d/ => [Eng] -/\215/ => [Eng] -/\^\^8d/ => [Neng] -/\215/ => [Neng] -/\^\^8e/ => [Ohungarumlaut] -/\216/ => [Ohungarumlaut] -/\^\^8f/ => [Racute] -/\217/ => [Racute] -/\^\^90/ => [Rcaron] -/\220/ => [Rcaron] -/\^\^91/ => [Sacute] -/\221/ => [Sacute] -/\^\^92/ => [Scaron] -/\222/ => [Scaron] -/\^\^93/ => [Scedilla] -/\223/ => [Scedilla] -/\^\^94/ => [Tcaron] -/\224/ => [Tcaron] -/\^\^95/ => [Tcedilla] -/\225/ => [Tcedilla] -/\^\^96/ => [Uhungarumlaut] -/\226/ => [Uhungarumlaut] -/\^\^97/ => [Uring] -/\227/ => [Uring] -/\^\^98/ => [Ydiaeresis] -/\230/ => [Ydiaeresis] -/\^\^99/ => [Zacute] -/\231/ => [Zacute] -/\^\^9a/ => [Zcaron] -/\232/ => [Zcaron] -/\^\^9b/ => [Zdotaccent] -/\233/ => [Zdotaccent] -/\^\^9c/ => [IJligature] -/\234/ => [IJligature] -/\^\^9d/ => [Idotaccent] -/\235/ => [Idotaccent] -/\^\^9e/ => [dstroke] -/\236/ => [dstroke] -/\^\^9f/ => [sectionmark] -/\237/ => [sectionmark] -/\^\^a0/ => [abreve] -/\240/ => [abreve] -/\^\^a1/ => [aogonek] -/\241/ => [aogonek] -/\^\^a2/ => [cacute] -/\242/ => [cacute] -/\^\^a3/ => [ccaron] -/\243/ => [ccaron] -/\^\^a4/ => [dcaron] -/\244/ => [dcaron] -/\^\^a5/ => [ecaron] -/\245/ => [ecaron] -/\^\^a6/ => [eogonek] -/\246/ => [eogonek] -/\^\^a7/ => [gbreve] -/\247/ => [gbreve] -/\^\^a8/ => [lacute] -/\250/ => [lacute] -/\^\^a9/ => [lcaron] -/\251/ => [lcaron] -/\^\^aa/ => [lstroke] -/\252/ => [lstroke] -/\^\^ab/ => [nacute] -/\253/ => [nacute] -/\^\^ac/ => [ncaron] -/\254/ => [ncaron] -/\^\^ad/ => [eng] -/\255/ => [eng] -/\^\^ae/ => [ohungarumlaut] -/\256/ => [ohungarumlaut] -/\^\^af/ => [racute] -/\257/ => [racute] -/\^\^b0/ => [rcaron] -/\260/ => [rcaron] -/\^\^b1/ => [sacute] -/\261/ => [sacute] -/\^\^b2/ => [scaron] -/\262/ => [scaron] -/\^\^b3/ => [scedilla] -/\263/ => [scedilla] -/\^\^b4/ => [tcaron] -/\264/ => [tcaron] -/\^\^b5/ => [tcedilla] -/\265/ => [tcedilla] -/\^\^b6/ => [uhungarumlaut] -/\266/ => [uhungarumlaut] -/\^\^b7/ => [uring] -/\267/ => [uring] -/\^\^b8/ => [ydiaeresis] -/\270/ => [ydiaeresis] -/\^\^b9/ => [zacute] -/\271/ => [zacute] -/\^\^ba/ => [zcaron] -/\272/ => [zcaron] -/\^\^bb/ => [zdotaccent] -/\273/ => [zdotaccent] -/\^\^bc/ => [ijligature] -/\274/ => [ijligature] -/\^\^bd/ => [exclamdown] -/\275/ => [exclamdown] -/\^\^be/ => [questiondown] -/\276/ => [questiondown] -/\^\^bf/ => [textsterling] -/\277/ => [textsterling] -/\^\^c0/ => [Agrave] -/\300/ => [Agrave] -/\^\^c1/ => [Aacute] -/\301/ => [Aacute] -/\^\^c2/ => [Acircumflex] -/\302/ => [Acircumflex] -/\^\^c3/ => [Atilde] -/\303/ => [Atilde] -/\^\^c4/ => [Adiaeresis] -/\304/ => [Adiaeresis] -/\^\^c5/ => [Aring] -/\305/ => [Aring] -/\^\^c6/ => [AEligature] -/\306/ => [AEligature] -/\^\^c7/ => [Ccedilla] -/\307/ => [Ccedilla] -/\^\^c8/ => [Egrave] -/\310/ => [Egrave] -/\^\^c9/ => [Eacute] -/\311/ => [Eacute] -/\^\^ca/ => [Ecircumflex] -/\312/ => [Ecircumflex] -/\^\^cb/ => [Ediaeresis] -/\313/ => [Ediaeresis] -/\^\^cc/ => [Igrave] -/\314/ => [Igrave] -/\^\^cd/ => [Iacute] -/\315/ => [Iacute] -/\^\^ce/ => [Icircumflex] -/\316/ => [Icircumflex] -/\^\^cf/ => [Idiaeresis] -/\317/ => [Idiaeresis] -/\^\^d0/ => [Eth] -/\320/ => [Eth] -/\^\^d0/ => [Dstroke] -/\320/ => [Dstroke] -/\^\^d1/ => [Ntilde] -/\321/ => [Ntilde] -/\^\^d2/ => [Ograve] -/\322/ => [Ograve] -/\^\^d3/ => [Oacute] -/\323/ => [Oacute] -/\^\^d4/ => [Ocircumflex] -/\324/ => [Ocircumflex] -/\^\^d5/ => [Otilde] -/\325/ => [Otilde] -/\^\^d6/ => [Odiaeresis] -/\326/ => [Odiaeresis] -/\^\^d7/ => [OEligature] -/\327/ => [OEligature] -/\^\^d8/ => [Ostroke] -/\330/ => [Ostroke] -/\^\^d9/ => [Ugrave] -/\331/ => [Ugrave] -/\^\^da/ => [Uacute] -/\332/ => [Uacute] -/\^\^db/ => [Ucircumflex] -/\333/ => [Ucircumflex] -/\^\^dc/ => [Udiaeresis] -/\334/ => [Udiaeresis] -/\^\^dd/ => [Yacute] -/\335/ => [Yacute] -/\^\^de/ => [Thorn] -/\336/ => [Thorn] -/\^\^df/ => [Ssharp] -/\337/ => [Ssharp] -/\^\^e0/ => [agrave] -/\340/ => [agrave] -/\^\^e1/ => [aacute] -/\341/ => [aacute] -/\^\^e2/ => [acircumflex] -/\342/ => [acircumflex] -/\^\^e3/ => [atilde] -/\343/ => [atilde] -/\^\^e4/ => [adiaeresis] -/\344/ => [adiaeresis] -/\^\^e5/ => [aring] -/\345/ => [aring] -/\^\^e6/ => [aeligature] -/\346/ => [aeligature] -/\^\^e7/ => [ccedilla] -/\347/ => [ccedilla] -/\^\^e8/ => [egrave] -/\350/ => [egrave] -/\^\^e9/ => [eacute] -/\351/ => [eacute] -/\^\^ea/ => [ecircumflex] -/\352/ => [ecircumflex] -/\^\^eb/ => [ediaeresis] -/\353/ => [ediaeresis] -/\^\^ec/ => [igrave] -/\354/ => [igrave] -/\^\^ed/ => [iacute] -/\355/ => [iacute] -/\^\^ee/ => [icircumflex] -/\356/ => [icircumflex] -/\^\^ef/ => [idiaeresis] -/\357/ => [idiaeresis] -/\^\^f0/ => [eth] -/\360/ => [eth] -/\^\^f1/ => [ntilde] -/\361/ => [ntilde] -/\^\^f2/ => [ograve] -/\362/ => [ograve] -/\^\^f3/ => [oacute] -/\363/ => [oacute] -/\^\^f4/ => [ocircumflex] -/\364/ => [ocircumflex] -/\^\^f5/ => [otilde] -/\365/ => [otilde] -/\^\^f6/ => [odiaeresis] -/\366/ => [odiaeresis] -/\^\^f7/ => [oeligature] -/\367/ => [oeligature] -/\^\^f8/ => [ostroke] -/\370/ => [ostroke] -/\^\^f9/ => [ugrave] -/\371/ => [ugrave] -/\^\^fa/ => [uacute] -/\372/ => [uacute] -/\^\^fb/ => [ucircumflex] -/\373/ => [ucircumflex] -/\^\^fc/ => [udiaeresis] -/\374/ => [udiaeresis] -/\^\^fd/ => [yacute] -/\375/ => [yacute] -/\^\^fe/ => [thorn] -/\376/ => [thorn] -/\^\^ff/ => [ssharp] -/\377/ => [ssharp] diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme index fff231619..b90662cc3 100644 --- a/tex/context/user/cont-sys.rme +++ b/tex/context/user/cont-sys.rme @@ -108,10 +108,11 @@ \loadmapfile[original-ams-euler.map] \loadmapfile[original-public-lm.map] - \loadmapfile[texnansi-public-lm.map] - \loadmapfile[ec-public-lm.map] - \loadmapfile[qx-public-lm.map] - \loadmapfile[t5-public-lm.map] + + %loadmapfile[texnansi-public-lm.map] + %loadmapfile[ec-public-lm.map] + %loadmapfile[qx-public-lm.map] + %loadmapfile[t5-public-lm.map] %loadmapfile[pl0-public-lm.map] %loadmapfile[il2-public-lm.map] diff --git a/tex/generic/context/ppchtex.noc b/tex/generic/context/ppchtex.noc index 34ececff9..7b1d5b3b0 100644 --- a/tex/generic/context/ppchtex.noc +++ b/tex/generic/context/ppchtex.noc @@ -32,6 +32,7 @@ \input supp-mis.tex \let\writestatus\undefined \input syst-gen.tex +\input syst-fnt.tex %D after which we can go on with: diff --git a/web2c/context.cnf b/web2c/context.cnf index 92ff8a7ae..9121493ca 100644 --- a/web2c/context.cnf +++ b/web2c/context.cnf @@ -45,46 +45,41 @@ WEB2C = $TEXMF/web2c OSFONTDIR = -TEXPSHEADERS = .;$TEXMF/{fonts/{enc,map,type1,truetype},dvips,pdftex,tex}//;$TEXMF/{etex,tex,pdftex,dvips,fonts/type1}//;./fonts// +TEXPSHEADERS = .;$TEXMF/{fonts/{enc,map,type1,truetype},dvips,pdftex,tex}//;$TEXMF/{etex,tex,pdftex,dvips,fonts/type1}// -TEXFONTMAPS.dvipdfm = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//;./fonts// -TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/map/{dvipdfm,dvips,}//;./fonts// -TEXFONTMAPS.pdftex = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts// -TEXFONTMAPS.pdfetex = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts// -TEXFONTMAPS.luatex = .;$TEXMF/fonts/map/{pdftex,dvips,}//;./fonts// -TEXFONTMAPS.xetex = .;$TEXMF/fonts/map/{xetex,pdftex,dvips,}//;./fonts// -TEXFONTMAPS.dvips = .;$TEXMF/fonts/map/{dvips,pdftex,}//;./fonts// +TEXFONTMAPS.dvipdfm = .;$TEXMF/fonts/map/{dvipdfm,dvips,}// +TEXFONTMAPS.dvipdfmx = .;$TEXMF/fonts/map/{dvipdfm,dvips,}// +TEXFONTMAPS.pdftex = .;$TEXMF/fonts/map/{pdftex,dvips,}// +TEXFONTMAPS.pdfetex = .;$TEXMF/fonts/map/{pdftex,dvips,}// +TEXFONTMAPS.luatex = .;$TEXMF/fonts/map/{pdftex,dvips,}// +TEXFONTMAPS.xetex = .;$TEXMF/fonts/map/{xetex,pdftex,dvips,}// +TEXFONTMAPS.dvips = .;$TEXMF/fonts/map/{dvips,pdftex,}// # TEXFONTMAPS = .;$TEXMF/fonts/map/{$backend,pdftex,dvips,}//;$TEXMF/{$progname,pdftex,dvips}/{config,}// -TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,$engine,pdftex,dvips,}//;$TEXMF/{$progname,$engine,pdftex,dvips}/{config,}//;./fonts// - -VFFONTS = .;$TEXMF/fonts/vf//;./fonts// -#~ TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//;./fonts// -TFMFONTS = .;$TEXMF/fonts/tfm//;./fonts// -T1FONTS = .;$TEXMF/fonts/{type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR;./fonts// -AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR;./fonts// -LIGFONTS = .;$TEXMF/fonts/lig//;./fonts// -TTFONTS = .;$TEXMF/fonts/{truetype,ttf}//;$OSFONTDIR;./fonts// -TTF2TFMINPUTS = .;$TEXMF/ttf2pk//;./fonts// -T42FONTS = .;$TEXMF/fonts/type42//;./fonts// -MISCFONTS = .;$TEXMF/fonts/misc//;./fonts// -% ENCFONTS = .;$TEXMF/fonts/enc//;./fonts// -ENCFONTS = .;$TEXMF/{fonts/enc,dvips,pdftex,dvipdfm}//;./fonts// -CMAPFONTS = .;$TEXMF/fonts/cmap//;./fonts// -SFDFONTS = .;$TEXMF/fonts/sfd//;./fonts// -OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR;./fonts// - -#~ OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//;$TFMFONTS;./fonts// -#~ OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//;./fonts// -#~ OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovf//;./fonts// -#~ OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//;./fonts// -OFMFONTS = .;$TEXMF/fonts/{ofm,tfm}//;$TFMFONTS;./fonts// -OPLFONTS = .;$TEXMF/fonts/opl//;./fonts// -OVFFONTS = .;$TEXMF/fonts/ovf//;./fonts// -OVPFONTS = .;$TEXMF/fonts/ovp//;./fonts// +TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,$engine,pdftex,dvips,}//;$TEXMF/{$progname,$engine,pdftex,dvips}/{config,}// + +VFFONTS = .;$TEXMF/fonts/vf// +TFMFONTS = .;$TEXMF/fonts/tfm// +T1FONTS = .;$TEXMF/fonts/{data,type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR; +AFMFONTS = .;$TEXMF/fonts/{data,afm}//;$OSFONTDIR; +LIGFONTS = .;$TEXMF/fonts/lig// +TTFONTS = .;$TEXMF/fonts/{data,truetype,ttf}//;$OSFONTDIR; +TTF2TFMINPUTS = .;$TEXMF/ttf2pk// +T42FONTS = .;$TEXMF/fonts/type42// +MISCFONTS = .;$TEXMF/fonts/misc// +% ENCFONTS = .;$TEXMF/fonts/enc// +ENCFONTS = .;$TEXMF/{fonts/{data,enc},dvips,pdftex,dvipdfm}// +CMAPFONTS = .;$TEXMF/fonts/cmap// +SFDFONTS = .;$TEXMF/fonts/sfd// +OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR + +OFMFONTS = .;$TEXMF/fonts/{ofm,tfm}// +OPLFONTS = .;$TEXMF/fonts/opl//; +OVFFONTS = .;$TEXMF/fonts/{ovf,vf}// +OVPFONTS = .;$TEXMF/fonts/ovp//; OTPINPUTS = .;$TEXMF/omega/otp// OCPINPUTS = .;$TEXMF/omega/ocp// -OTFFONTS = .;$TEXMF/fonts/otf/{xetex,}//;./fonts// +OTFFONTS = .;$TEXMF/fonts/otf/{xetex,}//; % configurations @@ -100,6 +95,8 @@ CTXDEVTXPATH=unset CTXDEVMPPATH=unset CTXDEVMFPATH=unset +TEXINPUTS = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{pdftex,pdfetex,etex,xetex,omega,tex}/{context,plain,generic,}// + % TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{pdftex,pdfetex,etex,xetex,omega,tex}/{context,plain,generic,}// % TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{tex,omega}/{context,plain,generic}// % TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic/context,generic/hyphen,generic/omega}// @@ -163,11 +160,11 @@ TEX = texexec --batch --once --nomp % These values are about the same as in the main % configuration file (dest_names_size added). -buf_size.context = 2000000 % needed for omega bug +buf_size.context = 4000000 % needed for omega bug extra_mem_bot.context = 2000000 extra_mem_top.context = 4000000 -font_max.context = 2000 -font_mem_size.context = 1000000 +font_max.context = 5000 +font_mem_size.context = 2000000 hash_extra.context = 100000 main_memory.context = 2000000 max_strings.context = 300000 @@ -205,7 +202,7 @@ save_size.metafun = 50000 stack_size.metafun = 5000 string_vacancies.metafun = 90000 -buf_size = 100000 +buf_size = 400000 mp_buf_size = 30000 mf_buf_size = 30000 |