From e5b96502040aa3c41bbd6a175ce4316bf21d8570 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 9 Jan 2006 00:00:00 +0100 Subject: stable 2006.01.09 --- context/data/context.properties | 16 + context/data/scite-ctx.properties | 37 +- scripts/context/lua/scite-ctx.lua | 291 +- scripts/context/perl/mptopdf.pl | 2 +- scripts/context/perl/texexec.pl | 11 +- scripts/context/ruby/base/tex.rb | 10 +- scripts/context/ruby/ctxtools.rb | 4 + scripts/context/ruby/newtexexec.rb | 44 +- tex/context/base/colo-ini.tex | 30 +- tex/context/base/cont-fil.tex | 3 + tex/context/base/cont-fr.tex | 38 + tex/context/base/cont-new.tex | 16 +- tex/context/base/context.tex | 2 +- tex/context/base/core-box.tex | 4 +- tex/context/base/core-buf.tex | 35 +- tex/context/base/core-con.tex | 7 +- tex/context/base/core-dat.tex | 138 +- tex/context/base/core-des.tex | 11 +- tex/context/base/core-fil.tex | 7 +- tex/context/base/core-int.tex | 17 + tex/context/base/core-itm.tex | 252 +- tex/context/base/core-job.tex | 18 +- tex/context/base/core-mis.tex | 16 +- tex/context/base/core-new.tex | 32 +- tex/context/base/core-not.tex | 73 +- tex/context/base/core-obj.tex | 5 + tex/context/base/core-ref.tex | 11 + tex/context/base/core-rul.tex | 37 +- tex/context/base/core-sec.tex | 6 + tex/context/base/core-spa.tex | 13 +- tex/context/base/core-sys.tex | 23 +- tex/context/base/core-tab.tex | 6 +- tex/context/base/core-ver.tex | 69 +- tex/context/base/enco-agr.tex | 2 + tex/context/base/enco-def.tex | 9 + tex/context/base/enco-ffr.tex | 7 + tex/context/base/enco-ini.tex | 15 +- tex/context/base/enco-mis.tex | 4 +- tex/context/base/filt-ini.tex | 15 +- tex/context/base/font-ini.tex | 51 +- tex/context/base/font-uni.tex | 4 + tex/context/base/hand-ini.tex | 15 +- tex/context/base/java-ini.tex | 10 +- tex/context/base/lang-chi.tex | 88 +- tex/context/base/lang-ger.tex | 18 +- tex/context/base/lang-ini.tex | 14 + tex/context/base/lang-spe.tex | 2 + tex/context/base/m-gnuplot.tex | 156 + tex/context/base/m-pstric.tex | 78 +- tex/context/base/m-units.tex | 5 + tex/context/base/math-eul.tex | 2 +- tex/context/base/meta-ini.tex | 12 +- tex/context/base/mult-com.tex | 1125 +++- tex/context/base/mult-con.tex | 1265 ++++- tex/context/base/mult-sys.tex | 7 + tex/context/base/page-app.tex | 2 + tex/context/base/page-bck.tex | 4 + tex/context/base/page-flt.tex | 59 +- tex/context/base/page-imp.tex | 3 +- tex/context/base/page-ini.tex | 62 + tex/context/base/page-log.tex | 4 + tex/context/base/page-lyr.tex | 4 +- tex/context/base/page-mar.tex | 8 +- tex/context/base/regi-ini.tex | 8 +- tex/context/base/spec-ini.tex | 20 +- tex/context/base/spec-mis.tex | 2 +- tex/context/base/spec-xtx.tex | 9 +- tex/context/base/supp-box.tex | 4 +- tex/context/base/supp-lan.tex | 10 + tex/context/base/supp-mps.tex | 18 +- tex/context/base/symb-ini.tex | 12 +- tex/context/base/syst-etx.tex | 2 +- tex/context/base/syst-gen.tex | 3 +- tex/context/base/type-akb.tex | 44 +- tex/context/base/type-dis.tex | 55 +- tex/context/base/type-enc.tex | 58 +- tex/context/base/type-ini.tex | 27 +- tex/context/base/x-set-11.tex | 38 + tex/context/base/x-set-12.tex | 57 +- tex/context/base/xtag-ext.tex | 5 + tex/context/base/xtag-ini.tex | 21 +- tex/context/base/xtag-mmp.tex | 6 +- tex/context/config/cont-fr.ini | 5 + tex/context/interface/cont-cz.xml | 85 +- tex/context/interface/cont-de.xml | 85 +- tex/context/interface/cont-en.xml | 83 +- tex/context/interface/cont-fr.xml | 10256 +++++++++++++++++++++++++++++++++++ tex/context/interface/cont-it.xml | 85 +- tex/context/interface/cont-nl.xml | 85 +- tex/context/interface/cont-ro.xml | 85 +- tex/context/interface/keys-cz.xml | 3 +- tex/context/interface/keys-de.xml | 3 +- tex/context/interface/keys-en.xml | 3 +- tex/context/interface/keys-fr.xml | 1604 ++++++ tex/context/interface/keys-it.xml | 3 +- tex/context/interface/keys-nl.xml | 3 +- tex/context/interface/keys-ro.xml | 3 +- 97 files changed, 15883 insertions(+), 1241 deletions(-) create mode 100644 tex/context/base/cont-fr.tex create mode 100644 tex/context/base/m-gnuplot.tex create mode 100644 tex/context/config/cont-fr.ini create mode 100644 tex/context/interface/cont-fr.xml create mode 100644 tex/context/interface/keys-fr.xml diff --git a/context/data/context.properties b/context/data/context.properties index 6edccaab5..c7447526f 100644 --- a/context/data/context.properties +++ b/context/data/context.properties @@ -104,6 +104,10 @@ context.distribution.writable=1 command.save.before=1 +# xml completion + +xml.auto.close.tags=1 + # extensions import scite-ctx @@ -285,6 +289,18 @@ if $(context.distribution.writable) command.9.subsystem.$(file.patterns.metafun)=1 command.9.subsystem.$(file.patterns.example)=1 +# 10: arranging + +command.name.10.$(file.patterns.context)=Process and Arrange +command.name.10.$(file.patterns.metafun)=Process and Arrange +command.name.10.$(file.patterns.example)=Process and Arrange +command.10.$(file.patterns.context)=$(name.context.texexec) --arrange --pdf $(FileNameExt) +command.10.$(file.patterns.metafun)=$(name.context.texexec) --arrange --pdf --mptex $(FileNameExt) +command.10.$(file.patterns.example)=$(name.context.texexec) --arrange --pdf --xml $(FileNameExt) +command.10.subsystem.$(file.patterns.context)=1 +command.10.subsystem.$(file.patterns.metafun)=1 +command.10.subsystem.$(file.patterns.example)=1 + # Editor: syntax highlighting view.indentation.guides=1 diff --git a/context/data/scite-ctx.properties b/context/data/scite-ctx.properties index 5eb9ae73d..a9750cb3a 100644 --- a/context/data/scite-ctx.properties +++ b/context/data/scite-ctx.properties @@ -51,22 +51,24 @@ ctx.menulist.example=\ ctx.wraptext.length=65 ctx.spellcheck.language=auto -ctx.spellcheck.wordsize=3 +ctx.spellcheck.wordsize=4 ctx.spellcheck.wordpath=ENV(CTXSPELLPATH) ctx.spellcheck.wordfile.all=spell-uk.txt,spell-nl.txt ctx.spellcheck.wordfile.uk=spell-uk.txt ctx.spellcheck.wordfile.nl=spell-nl.txt -ctx.spellcheck.wordsize.uk=3 -ctx.spellcheck.wordsize.nl=3 +ctx.spellcheck.wordsize.uk=4 +ctx.spellcheck.wordsize.nl=4 ctx.helpinfo=\ Shift + F11 pop up menu with ctx options|\ |\ Ctrl + B check spelling|\ Ctrl + M wrap text (auto indent)|\ - Ctrl + R reset spelling results + Ctrl + R reset spelling results|\ + Ctrl + I insert template\| + \| command.name.21.$(file.patterns.context)=CTX Action List command.subsystem.21.$(file.patterns.context)=3 @@ -109,3 +111,30 @@ command.24.*=reset_text command.groupundo.24.*=yes command.save.before.24.*=2 command.shortcut.24.*=Ctrl+R + +command.name.25.*=CTX Template +command.subsystem.25.*=3 +command.save.before.25.*=2 +command.groupundo.25.*=yes +command.shortcut.25.*=Ctrl+I + +# command.25.$(file.patterns.context)=insert_template $(ctx.template.list.context) +# command.25.$(file.patterns.example)=insert_template $(ctx.template.list.example) +# +# ctx.template.list.example=\ +# foo=mathadore.foo|\ +# bar=mathadore.bar +# +# ctx.template.mathadore.foo.file=./ctx-templates/foo.xml +# ctx.template.mathadore.bar.data=bar bar bar +# +# paths: ./ctx-templates, ../ctx-templates, ../../ctx-templates + +import scite-ctx-context +import scite-ctx-example + +ctx.template.scan=yes +ctx.template.rescan=no + +ctx.template.suffix.tex=tex +ctx.template.suffix.xml=xml diff --git a/scripts/context/lua/scite-ctx.lua b/scripts/context/lua/scite-ctx.lua index 1f58b123d..fae9e0fb9 100644 --- a/scripts/context/lua/scite-ctx.lua +++ b/scripts/context/lua/scite-ctx.lua @@ -169,7 +169,8 @@ end function string.replace(original,pattern,replacement) local str = string.gsub(original,pattern,replacement) - print(str) -- indirect, since else str + nofsubs +--~ print(str) -- indirect, since else str + nofsubs + return str -- indirect, since else str + nofsubs end -- support functions, maybe editor namespace @@ -238,6 +239,30 @@ function getfiletype() end end +-- inspired by LuaExt's scite_Files + +function get_dir_list(mask) + local f + if props['PLAT_GTK'] and props['PLAT_GTK'] ~= "" then + f = io.popen('ls -1 ' .. mask) + else + mask = string.gsub(mask, '/','\\') + local tmpfile = 'scite-ctx.tmp' + local cmd = 'dir /b "' .. mask .. '" > ' .. tmpfile + os.execute(cmd) + f = io.open(tmpfile) + end + local files = {} + if not f then -- path check added + return files + end + for line in f:lines() do + table.insert(files, line) + end + f:close() + return files +end + -- banner print("loading scite-ctx.lua definition file") @@ -639,58 +664,252 @@ function reset_text() editor:SetStyling(editor.TextLength,INDIC_PLAIN) end --- templates - ---~ function insert_text() - ---~ local templatelist = props["ctx.template.list"] - ---~ editor:insert(editor.CurrentPos,templatelist) ---~ show_menu(templatelist) ---~ end - - -- menu -local menuactions = {} -local menutrigger = 12 +local menuactions = {} +local menufunctions = {} -function UserListShow(menuspec) +function UserListShow(menutrigger, menulist) local menuentries = {} - local list = string.grab(menuspec,'[^%|]+') - props["ctx.menulist.saved"] = menuspec + local list = string.grab(menulist,"[^%|]+") + menuactions = {} for i=1, table.len(list) do if list[i] ~= '' then for key, val in string.gfind(list[i],"%s*(.+)=(.+)%s*") do - if not string.find(val,"%(%)$") then - val = val .. "()" - end table.insert(menuentries,key) rawset(menuactions,key,val) end end end - editor.AutoCSeparator = string.byte('|') - editor:UserListShow(menutrigger,table.join(menuentries,'|')) - editor.AutoCSeparator = string.byte(' ') -end - -function DoOnUserListSelection(trigger,choice,redoonerror) - if trigger == menutrigger then - if menuactions[choice] then - assert(loadstring(menuactions[choice]))() - elseif redoonerror then -- handy when reloaded lua script - -- traceln("unknown action '" .. choice .. "', retrying") - UserListShow(props["ctx.menulist.saved"]) - DoOnUserListSelection (trigger,choice,false) - end + local menustring = table.join(menuentries,'|') + if menustring == "" then + traceln("There are no templates defined for this file type.") + else + editor.AutoCSeparator = string.byte('|') + editor:UserListShow(menutrigger,menustring) + editor.AutoCSeparator = string.byte(' ') end end function OnUserListSelection(trigger,choice) - DoOnUserListSelection(trigger,choice,true) + if menufunctions[trigger] and menuactions[choice] then + return menufunctions[trigger](menuactions[choice]) + else + return false + end end +-- main menu + +local menutrigger = 12 + function show_menu(menulist) - UserListShow(menulist) + UserListShow(menutrigger, menulist) end + +function process_menu(action) + if not string.find(action,"%(%)$") then + assert(loadstring(action .. "()"))() + else + assert(loadstring(action))() + end +end + +menufunctions[12] = process_menu + +-- templates + +local templatetrigger = 13 + +--~ local ctx_template_paths = { "./ctx-templates", "../ctx-templates", "../../ctx-templates" } +--~ local ctx_auto_templates = false +--~ local ctx_template_list = "" +--~ local ctx_dir_list = { } +--~ local ctx_dir_name = "./ctx-templates" + +--~ local ctx_path_list = {} +--~ local ctx_path_done = {} + +--~ function ctx_list_loaded() +--~ return ctx_dir_list and table.getn(ctx_dir_list) > 0 +--~ end + +--~ function insert_template(templatelist) +--~ if props["ctx.template.scan"] == "yes" then +--~ local current = props["FileDir"] .. "+" .. props["FileExt"] -- no name +--~ local rescan = props["ctx.template.rescan"] == "yes" +--~ local suffix = props["ctx.template.suffix."..props["FileExt"]] -- alas, no suffix expansion here +--~ if rescan then +--~ print("re-scanning enabled") +--~ end +--~ if current ~= ctx_file_path then +--~ rescan = true +--~ ctx_file_path = current +--~ ctx_file_done = false +--~ ctx_template_list = "" +--~ end +--~ if not ctx_file_done or rescan then +--~ local pattern = "*.*" +--~ for i, pathname in ipairs(ctx_template_paths) do +--~ print("scanning " .. pathname .. " for " .. pattern) +--~ ctx_dir_name = pathname +--~ ctx_dir_list = get_dir_list(pathname .. "/" .. pattern) +--~ if ctx_list_loaded() then +--~ break +--~ end +--~ end +--~ ctx_file_done = true +--~ end +--~ if ctx_list_loaded() then +--~ ctx_template_list = "" +--~ local pattern = "%." .. suffix .. "$" +--~ for j, filename in ipairs(ctx_dir_list) do +--~ if string.find(filename,pattern) then +--~ local menuname = string.gsub(filename,"%..-$","") +--~ if ctx_template_list ~= "" then +--~ ctx_template_list = ctx_template_list .. "|" +--~ end +--~ ctx_template_list = ctx_template_list .. menuname .. "=" .. ctx_dir_name .. "/" .. filename +--~ end +--~ end +--~ else +--~ print("no template files found") +--~ end +--~ if ctx_template_list == "" then +--~ ctx_auto_templates = false +--~ print("no file related templates found") +--~ else +--~ ctx_auto_templates = true +--~ templatelist = ctx_template_list +--~ end +--~ end +--~ if templatelist ~= "" then +--~ UserListShow(templatetrigger, templatelist) +--~ end +--~ end + +local ctx_template_paths = { "./ctx-templates", "../ctx-templates", "../../ctx-templates" } +local ctx_auto_templates = false +local ctx_template_list = "" + +local ctx_path_list = {} +local ctx_path_done = {} +local ctx_path_name = {} + +function ctx_list_loaded(path) + return ctx_path_list[path] and table.getn(ctx_path_list[path]) > 0 +end + +function insert_template(templatelist) + if props["ctx.template.scan"] == "yes" then + local path = props["FileDir"] + local rescan = props["ctx.template.rescan"] == "yes" + local suffix = props["ctx.template.suffix." .. props["FileExt"]] -- alas, no suffix expansion here + local current = path .. "+" .. props["FileExt"] + if rescan then + print("re-scanning enabled") + end + ctx_template_list = "" + if not ctx_path_done[path] or rescan then + local pattern = "*.*" + for i, pathname in ipairs(ctx_template_paths) do + print("scanning " .. string.gsub(path,"\\","/") .. "/" .. pathname) + ctx_path_name[path] = pathname + ctx_path_list[path] = get_dir_list(pathname .. "/" .. pattern) + if ctx_list_loaded(path) then + print("finished locating template files") + break + end + end + if ctx_list_loaded(path) then + print(table.getn(ctx_path_list[path]) .. " template files found") + else + print("no template files found") + end + end + if ctx_list_loaded(path) then + ctx_template_list = "" + local pattern = "%." .. suffix .. "$" + local n = 0 + for j, filename in ipairs(ctx_path_list[path]) do + if string.find(filename,pattern) then + n = n + 1 + local menuname = string.gsub(filename,"%..-$","") + if ctx_template_list ~= "" then + ctx_template_list = ctx_template_list .. "|" + end + ctx_template_list = ctx_template_list .. menuname .. "=" .. ctx_path_name[path] .. "/" .. filename + end + end + if not ctx_path_done[path] then + print(n .. " suitable template files found") + end + end + ctx_path_done[path] = true + if ctx_template_list == "" then + ctx_auto_templates = false + else + ctx_auto_templates = true + templatelist = ctx_template_list + end + else + ctx_auto_templates = false + end + if templatelist ~= "" then + UserListShow(templatetrigger, templatelist) + end +end + + +-- ctx.template.[whatever].[filetype] +-- ctx.template.[whatever].data.[filetype] +-- ctx.template.[whatever].file.[filetype] +-- ctx.template.[whatever].list.[filetype] + +function process_template_one(action) + local text = nil + if ctx_auto_templates then + local f = io.open(action,"r") + if f then + text = string.gsub(f:read("*all"),"\n$","") + f:close() + else + print("unable to auto load template file " .. text) + text = nil + end + end + if not text or text == "" then + text = props["ctx.template." .. action .. ".file"] + if not text or text == "" then + text = props["ctx.template." .. action .. ".data"] + if not text or text == "" then + text = props["ctx.template." .. action] + end + else + local f = io.open(text,"r") + if f then + text = string.gsub(f:read("*all"),"\n$","") + f:close() + else + print("unable to load template file " .. text) + text = nil + end + end + end + if text then + text = string.replace(text,"\\n","\n") + local pos = string.find(text,"%?") + text = string.replace(text,"%?","") + editor:insert(editor.CurrentPos,text) + if pos then + editor.CurrentPos = editor.CurrentPos + pos - 1 + editor.SelectionStart = editor.CurrentPos + editor.SelectionEnd = editor.CurrentPos + editor:GotoPos(editor.CurrentPos) + end + end +end + +menufunctions[13] = process_template_one +menufunctions[14] = process_template_two + diff --git a/scripts/context/perl/mptopdf.pl b/scripts/context/perl/mptopdf.pl index fc1be6a84..5f19ecaf4 100644 --- a/scripts/context/perl/mptopdf.pl +++ b/scripts/context/perl/mptopdf.pl @@ -37,7 +37,7 @@ my $PassOn = '' ; "latex" => \$Latex ) ; my $program = "MPtoPDF 1.3" ; -my $pattern = $ARGV[0] ; +my $pattern = "@ARGV" ; # was $ARGV[0] my $done = 0 ; my $report = '' ; my $texlatexswitch = " --tex=latex --format=latex " ; diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl index e60a7745f..aab5888f9 100644 --- a/scripts/context/perl/texexec.pl +++ b/scripts/context/perl/texexec.pl @@ -902,7 +902,7 @@ $OutputFormats{dviwindo} = "dviwindo"; $OutputFormats{dviview} = "dviview"; -my @ConTeXtFormats = ( "nl", "en", "de", "cz", "uk", "it", "ro", "xx"); +my @ConTeXtFormats = ( "nl", "en", "de", "fr", "cz", "uk", "it", "ro", "xx"); sub SetInterfaces { my ( $short, $long, $full ) = @_; @@ -917,6 +917,7 @@ sub SetInterfaces { SetInterfaces( "nl", "dutch", "dutch" ); SetInterfaces( "en", "english", "english" ); SetInterfaces( "de", "german", "german" ); +SetInterfaces( "fr", "french", "french" ); SetInterfaces( "cz", "czech", "czech" ); SetInterfaces( "uk", "brittish", "english" ); SetInterfaces( "it", "italian", "italian" ); @@ -1205,6 +1206,11 @@ sub MakeOptionFile { print OPT "\\setupcolors[\\c!split=$Separation]\n"; } if ($SetupPath) { print OPT "\\setupsystem[\\c!directory=\{$SetupPath\}]\n" } + if ($dosish) { + print OPT "\\setupsystem[\\c!type=mswin]\n" + } else { # no darwin handling in old texexec + print OPT "\\setupsystem[\\c!type=unix]\n" + } print OPT "\\setupsystem[\\c!n=$KindOfRun]\n"; $_ = $PaperFormat; #unless (($PdfArrange)||($PdfSelect)||($PdfCombine)||($PdfCopy)) @@ -3021,7 +3027,7 @@ sub show_version_info { print " tex : $texengine\n" ; print " context : ver: $contextversion\n" ; print " cont-en : $type\n" ; - foreach my $a (qw(cz de it nl ro uk xx)) { + foreach my $a (qw(cz de fr it nl ro uk xx)) { my $test = Pipe("$kpsewhich -format='fmt' cont-$a") ; if (defined $test && $test) { $Format = 'cont-' . $a; @@ -3122,6 +3128,7 @@ interface user interface =en English =nl Dutch =de German +=fr French =cz Czech =uk Brittish =it Italian diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb index 316cc6941..968d66ed7 100644 --- a/scripts/context/ruby/base/tex.rb +++ b/scripts/context/ruby/base/tex.rb @@ -88,6 +88,7 @@ class TEX ['cont-nl','nl','dutch'] .each do |f| @@texformats[f] = 'cont-nl' end ['cont-de','de','german'] .each do |f| @@texformats[f] = 'cont-de' end ['cont-it','it','italian'] .each do |f| @@texformats[f] = 'cont-it' end + ['cont-fr','fr','french'] .each do |f| @@texformats[f] = 'cont-fr' end ['cont-cz','cz','czech'] .each do |f| @@texformats[f] = 'cont-cz' end ['cont-ro','ro','romanian'] .each do |f| @@texformats[f] = 'cont-ro' end ['cont-uk','uk','brittish'] .each do |f| @@texformats[f] = 'cont-uk' end @@ -103,7 +104,7 @@ class TEX ['plain','default','standard','mptopdf'] .each do |f| @@texmethods[f] = 'plain' end ['cont-en','cont-nl','cont-de','cont-it', - 'cont-cz','cont-ro','cont-uk'] .each do |f| @@texmethods[f] = 'context' end + 'cont-fr','cont-cz','cont-ro','cont-uk'] .each do |f| @@texmethods[f] = 'context' end ['latex'] .each do |f| @@texmethods[f] = 'latex' end ['plain','default','standard'] .each do |f| @@mpsmethods[f] = 'plain' end @@ -113,7 +114,7 @@ class TEX @@mpsmakestr['plain'] = "\\dump" ['cont-en','cont-nl','cont-de','cont-it', - 'cont-cz','cont-ro','cont-uk'] .each do |f| @@texprocstr[f] = "\\emergencyend" end + 'cont-fr','cont-cz','cont-ro','cont-uk'] .each do |f| @@texprocstr[f] = "\\emergencyend" end @@runoptions['xetex'] = ['--no-pdf'] @@ -134,7 +135,7 @@ class TEX 'modefile', 'result', 'suffix', 'response', 'path', 'filters', 'usemodules', 'environments', 'separation', 'setuppath', 'arguments', 'input', 'output', 'randomseed', 'modes', 'mode', 'filename', - 'ctxfile' + 'ctxfile', 'printformat', 'paperformat' ] @@standardvars = [ 'mainlanguage', 'bodyfont', 'language' @@ -876,6 +877,7 @@ class TEX elsif (str = getvariable('suffix')) && ! str.empty? then opt << "\\setupsystem[file=#{jobname}.#{str}]\n" end + opt << "\\setupsystem[\\c!type=#{Tool.ruby_platform()}]\n" if (str = File.unixfied(getvariable('path'))) && ! str.empty? then opt << "\\usepath[#{str}]\n" unless str.empty? end @@ -928,7 +930,7 @@ class TEX arrangement = Array.new if finalrun then arrangement << "\\v!doublesided" unless getvariable('noduplex') - case printformat + case getvariable('printformat') when '' then arrangement << "\\v!normal" when /.*up/oi then arrangement << "\\v!rotated" when /.*down/oi then arrangement << ["2DOWN","\\v!rotated"] diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb index 1ba4dce12..948c19d58 100644 --- a/scripts/context/ruby/ctxtools.rb +++ b/scripts/context/ruby/ctxtools.rb @@ -353,6 +353,10 @@ class Commands data.i_translate('cd:inherit' , 'name' , strings) # data.i_translate('cd:command' , 'name' , strings) + data.gsub!(/(\]*?language=")en(")/) do + $1 + interface + $2 + end + report("saving #{outfile}") begin diff --git a/scripts/context/ruby/newtexexec.rb b/scripts/context/ruby/newtexexec.rb index 8caf9de0f..dc06a3831 100644 --- a/scripts/context/ruby/newtexexec.rb +++ b/scripts/context/ruby/newtexexec.rb @@ -234,7 +234,7 @@ class Commands end end - def arrange + def arrangeoutput if job = TEX.new(logger) then prepare(job) job.cleanuptemprunfiles @@ -266,7 +266,7 @@ class Commands report("arranging file #{filename}") f << "\\insertpages\n" f << " [#{filename}]\n" - f << " [#{addempty}]\n" unless addempty.empty? + f << " [#{emptypages}]\n" unless emptypages.empty? f << " [width=#{textwidth}]\n" end f << "\\stoptext\n" @@ -286,7 +286,7 @@ class Commands end end - def select + def selectoutput if job = TEX.new(logger) then prepare(job) job.cleanuptemprunfiles @@ -348,11 +348,11 @@ class Commands end end - def copy + def copyoutput copyortrim(false,'copy') end - def trim + def trimoutput copyortrim(true,'trim') end @@ -411,7 +411,7 @@ class Commands end end - def combine + def combineoutput if job = TEX.new(logger) then prepare(job) job.cleanuptemprunfiles @@ -541,14 +541,14 @@ commandline.registeraction('process', 'process file') commandline.registeraction('mptex', 'process mp file') commandline.registeraction('mpxtex', 'process mpx file') -commandline.registeraction('listing', 'list of file content') -commandline.registeraction('figures', 'generate overview of figures') -commandline.registeraction('modules', 'generate module documentation') -commandline.registeraction('arrange', 'impose pages (booklets)') -commandline.registeraction('select', 'select pages from file(s)') -commandline.registeraction('copy', 'copy pages from file(s)') -commandline.registeraction('trim', 'trim pages from file(s)') -commandline.registeraction('combine', 'combine multiple pages') +commandline.registeraction('listing', 'list of file content') +commandline.registeraction('figures', 'generate overview of figures') +commandline.registeraction('modules', 'generate module documentation') +commandline.registeraction('pdfarrange', 'impose pages (booklets)') +commandline.registeraction('pdfselect', 'select pages from file(s)') +commandline.registeraction('pdfcopy', 'copy pages from file(s)') +commandline.registeraction('pdftrim', 'trim pages from file(s)') +commandline.registeraction('pdfcombine', 'combine multiple pages') # compatibility switch @@ -556,20 +556,14 @@ class Commands include CommandBase - alias pdfarrange :arrange - alias pdfselect :select - alias pdfcopy :copy - alias pdftrim :trim - alias pdfcombine :combine + alias pdfarrange :arrangeoutput + alias pdfselect :selectoutput + alias pdfcopy :copyoutput + alias pdftrim :trimoutput + alias pdfcombine :combineoutput end -commandline.registeraction('pdfarrange') -commandline.registeraction('pdfselect') -commandline.registeraction('pdfcopy') -commandline.registeraction('pdftrim') -commandline.registeraction('pdfcombine') - # so far for compatibility @@extrastringvars = [ diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex index 0b3e15181..c5f220dd5 100644 --- a/tex/context/base/colo-ini.tex +++ b/tex/context/base/colo-ini.tex @@ -180,6 +180,22 @@ 12: -- is registered \stopmessages +\startmessages french library: colors + title: color + 1: le système -- est globalement activé + 2: le système -- est localement activé + 3: -- n'est pas défini -- + 4: le système -- est chargé + 5: système -- inconnu + 6: la palette -- est disponible + 7: le palette -- n'est pas disponible + 8: la spécification -- de la couleur -- devient noire + 9: l'espace de couleur -- n'est pas supporté + 10: -- l'espace de couleur est supporté + 11: la couleur est convertie en niveau de gris + 12: -- est enregistré +\stopmessages + %D We use a couple of local registers. That way we don't have %D to group when converting colors. By the way, this is not %D really faster. We can sqeeze half a second runtime for 50K @@ -587,10 +603,12 @@ \processcommalist[#1]\dodosetupcolor}} \def\dodosetupcolor#1% - {\makeshortfilename[\f!colorprefix\truefilename{#1}]% - \readsysfile\shortfilename - {\showmessage\m!colors4\colorstyle} - {\showmessage\m!colors5\colorstyle}} + {\makeshortfilename[\truefilename{\f!colorprefix#1}]% + \startreadingfile + \readsysfile\shortfilename + {\showmessage\m!colors4\colorstyle} + {\showmessage\m!colors5\colorstyle}% + \stopreadingfile} \let\usecolors\setupcolor @@ -1708,14 +1726,14 @@ %D %D \showsetup{startcolor} -\def\startcolor +\unexpanded\def\startcolor {\ifincolor \expandafter\doglobalstartcolor \else \expandafter\noglobalstartcolor \fi} -\def\stopcolor +\unexpanded\def\stopcolor {\ifincolor \doglobalstopcolor \else diff --git a/tex/context/base/cont-fil.tex b/tex/context/base/cont-fil.tex index b6d3fba65..a28647b07 100644 --- a/tex/context/base/cont-fil.tex +++ b/tex/context/base/cont-fil.tex @@ -14,11 +14,14 @@ \writestatus{loading}{Context File Synonyms} \definefilesynonym [chemie] [chemic] +\definefilesynonym [chemics] [chemic] \definefilesynonym [unit] [units] \definefilesynonym [eenheid] [units] \definefilesynonym [einheit] [units] +\definefilesynonym [pstricks] [pstric] + \definefilesynonym [finance] [financ] \definefilesynonym [con-01] [contml] % will go away diff --git a/tex/context/base/cont-fr.tex b/tex/context/base/cont-fr.tex new file mode 100644 index 000000000..338d6c6d4 --- /dev/null +++ b/tex/context/base/cont-fr.tex @@ -0,0 +1,38 @@ +%D \module +%D [ file=cont-de, +%D version=1997.08.19, +%D title=\CONTEXT, +%D subtitle=\CONTEXT\ German Format Generation, +%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. + +\catcode`\{=1 \catcode`\}=2 \def\defaultinterface{french} + +\input context.tex + +\unprotect + +\setupcurrentlanguage[\s!fr] + +\loaduserspecifications + +\installlanguage [\s!en] [\c!state=\v!start] +\installlanguage [\s!uk] [\c!state=\v!start] +\installlanguage [\s!de] [\c!state=\v!start] +\installlanguage [\s!fr] [\c!state=\v!start] +\installlanguage [\s!es] [\c!state=\v!start] +\installlanguage [\s!nl] [\c!state=\v!start] +\installlanguage [\s!it] [\c!state=\v!start] + +% \setupbodyfont [cmr,ams,rm,12pt] +% +% \setupencoding[default=ec] \usetypescript[modern][\defaultencoding] \setupbodyfont[modern,rm,12pt] + +\setupencoding[default=ec] \usetypescript[fallback][\defaultencoding] \setupbodyfont[rm,12pt] + +\protect \errorstopmode \dump \endinput diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index f973cd364..0799d76c2 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -28,6 +28,20 @@ \prependtoks \restoreendofline \to \everybeforeshipout +\newtoks\XMLdatatoks + +\bgroup \catcode`\<=\active + +\gdef\saveXMLdatainelement#1#2#3% name element data + {\XMLdatatoks\@EAEAEA{\csname\@@XMLdata:#3\endcsname}% no check + \dodoglobal\setevalue{\@@XMLsave:#1}{<#2 \currentXMLarguments>\the\XMLdatatoks}} + +\gdef\saveXMLdatastructure#1#2#3#4#5#6% name element args before data after + {\XMLdatatoks\@EAEAEA{\csname\@@XMLdata:#5\endcsname}% no check + \dodoglobal\setevalue{\@@XMLsave:#1}{<#2 #3 \currentXMLarguments>#4\the\XMLdatatoks#6}} + +\egroup + % \tracefilestrue % % \unexpanded\def\readfile#1#2#3% @@ -592,7 +606,7 @@ %D \getbuffer[c] \long\def\rescan#1{\scantokens{#1\ignorespaces}} -\long\def\rescanwithsetup#1#2{\bgroup\directsetup{#1}\scantokens{#2\ignorespaces}\egroup} +\long\def\rescanwithsetup#1#2{\begingroup\directsetup{#1}\scantokens{#2\ignorespaces}\endgroup} % In 2005 we will abandon support for font encodings that don't have % the ascii characters { } $ etc in their normal slot, i.e. latin modern diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 504345cdb..e110a5eff 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2005.12.19} +\def\contextversion{2006.01.09} %D For those who want to use this: diff --git a/tex/context/base/core-box.tex b/tex/context/base/core-box.tex index 8875cfe5f..184f0647c 100644 --- a/tex/context/base/core-box.tex +++ b/tex/context/base/core-box.tex @@ -164,7 +164,7 @@ \def\dodosetcollector[#1][#2]% todo: keep reference point {\def\currentcollector{#1}% - \chardef\collectorbox\csname\@@collectorbox#1\endcsname + \mathchardef\collectorbox\csname\@@collectorbox#1\endcsname \getparameters[\??cb#1][#2]% \@@layerxsiz\wd\collectorbox \@@layerysiz\ht\collectorbox @@ -261,7 +261,7 @@ \def\doadaptcollector[#1][#2]% {\bgroup \def\currentcollector{#1}% - \chardef\collectorbox\csname\@@collectorbox#1\endcsname + \mathchardef\collectorbox\csname\@@collectorbox#1\endcsname \getparameters [\??cb#1][\c!voffset=\zeropoint,\c!hoffset=\zeropoint,#2]% \scratchdimen\wd\collectorbox diff --git a/tex/context/base/core-buf.tex b/tex/context/base/core-buf.tex index 0aab656f9..56897c824 100644 --- a/tex/context/base/core-buf.tex +++ b/tex/context/base/core-buf.tex @@ -127,6 +127,22 @@ 12: -- sarit peste \stopmessages +\startmessages french library: textblocks + title: textblocks + 1: nouvelle version, une seconde passe est nécessaire + 2: ecriture des blocs vers -- + 3: lecture des blocs en provenance de -- + 4: seconde passe nécessaire + 5: -- non caché + 6: -- caché et traité + 7: -- caché + 8: -- composé + 9: -- non composé + 10: -- chargé et traité + 11: -- chargé et composé + 12: -- sauté +\stopmessages + \unprotect % more accurate @@ -468,8 +484,8 @@ \@EA\dosetblockcounters\@EA[\blockstatus]% \fi} -\def\getblockstatus#1% is this still ok - {\dosetfilterlevel{\getvalue{\??by\@@bscriterium}}\empty +\def\getblockstatus#1% + {\dosetfilterlevel{\@@bscriterium}\empty \expanded{\doifblklevelelse[#1\sectionseparator\sectionseparator0]} {\global\blockpermittedtrue} {\global\blockpermittedfalse}% @@ -965,16 +981,15 @@ {\settrue \processblockstatus\douseblocks} \def\doselectblocks[#1][#2][#3]% - {\doifelsenothing{#3} - {\getparameters[\??bs][#2]% - \douseblocks[#1][]} - {\getparameters[\??bs][#3]% - \douseblocks[#1][#2]}}% + {\begingroup + \doifelsenothing{#3} + {\getparameters[\??bs][\c!criterium=\v!all,#2]% + \dodouseblocks[#1][]} + {\getparameters[\??bs][\c!criterium=\v!all,#3]% + \dodouseblocks[#1][#2]}}% \def\selectblocks - {\begingroup - \doassign[\??bs][\c!criterium=\v!all]% - \dotripleempty\doselectblocks} + {\dotripleempty\doselectblocks} \def\beginblock[#1]% % we also check \endblock[..] {\getvalue{\e!begin#1}} diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index fad5c8974..2d5f57f9c 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -596,7 +596,9 @@ {\bgroup \let\labellanguage\currentlanguage \def\betweendates{\let\betweendates\dobetweendates}% - \processcommacommand[#1]\docomplexcurrentdate + % was \processcommacommandp[#1]\docomplexcurrentdate + \safeedef\ascii{\empty#1}% keep encoded chars + \@EA\processcommalist\@EA[\ascii]\docomplexcurrentdate \ifdim\lastskip=\datesignal\relax \unskip \fi @@ -604,8 +606,7 @@ \def\docomplexcurrentdate#1% {\lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped - \processaction - [#1] + \expanded{\processaction[\!!stringa]}% [#1] [ \v!day=>\betweendates\the\normalday, %\v!day+=>\betweendates\ordinaldaynumber\normalday, \v!day+=>\betweendates\convertnumber{\v!day+}\normalday, diff --git a/tex/context/base/core-dat.tex b/tex/context/base/core-dat.tex index 239b27d70..d859023c0 100644 --- a/tex/context/base/core-dat.tex +++ b/tex/context/base/core-dat.tex @@ -2,7 +2,7 @@ %D [ file=core-dat, % was core-02a, %D version=1999.08.10, % 1997.03.31, %D title=\CONTEXT\ Core Macros, -%D subtitle=Database Support, % 2A +%D subtitle=Database Support, % 2A %D author=Hans Hagen, %D date=\currentdate, %D copyright={PRAGMA / Hans Hagen \& Ton Otten}] @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% THIS WILL DISAPPEAR, I.E. BE MOVED TO A MODULE +% THIS WILL DISAPPEAR, I.E. BE MOVED TO A MODULE \writestatus{loading}{Context Database Support} @@ -39,7 +39,7 @@ 4: unbekannte Datei -- \stopmessages -% TOM : +% TOM : \startmessages czech library: databases title: databases @@ -73,105 +73,113 @@ 4: fisier necunoscut -- \stopmessages +\startmessages french library: databases + title: databases + 1: -- + 2: fichier local -- + 3: fichier global -- + 4: fichier inconnu -- +\stopmessages + \unprotect %D This module is a (limited) rewrite of the original \type %D {core-02a} module, the module that dealt with managing a -%D database of addresses. The principles and methods have not -%D changed; they are only generalized. -%D -%D A database file |<|in most cases such a base is generated -%D from another one|>| is structured as follows: -%D -%D \starttyping +%D database of addresses. The principles and methods have not +%D changed; they are only generalized. +%D +%D A database file |<|in most cases such a base is generated +%D from another one|>| is structured as follows: +%D +%D \starttyping %D \startrecord{tag} %D \memberofgroup{grouplist} %D \setrecordentry{name}{...} %D .... %D \stoprecord -%D \stoptyping -%D -%D The interface to such a database is defined as follows: -%D -%D \starttyping +%D \stoptyping +%D +%D The interface to such a database is defined as follows: +%D +%D \starttyping %D \definerecord[class][settings] %D \setuprecord[class][settings] %D \definerecordentry[class][name] -%D \stoptyping -%D -%D and processed by -%D -%D \starttyping +%D \stoptyping +%D +%D and processed by +%D +%D \starttyping %D \processrecords[file list][tag and/or group list] -%D \stoptyping -%D -%D The actual processing is done by a macro assigned to \type -%D {command}: -%D -%D \starttyping +%D \stoptyping +%D +%D The actual processing is done by a macro assigned to \type +%D {command}: +%D +%D \starttyping %D \setuprecord[class][command=\DoWithRecord] -%D \stoptyping -%D -%D Given that one can ask for a field with -%D -%D \starttyping +%D \stoptyping +%D +%D Given that one can ask for a field with +%D +%D \starttyping %D \getrecordentry{name} -%D \stoptyping -%D -%D such a command can look like: -%D -%D \starttyping +%D \stoptyping +%D +%D such a command can look like: +%D +%D \starttyping %D \def\DoWithRecord#1% %D {\startpacked %D \let\\=\quad %D name: \getrecordentry{name}~\getrecordentry{family name}\par %D address: \getrecordentry{postal address}\par %D \stoppacked} -%D \stoptyping -%D +%D \stoptyping +%D %D The argument passed is the tag. The database can look like: -%D -%D \starttyping +%D +%D \starttyping %D \startrecord{hagenj} %D \memberofgroup{a,b} %D \setrecordentry{naam}{Hans} %D \setrecordentry{family name}{Hagen} %D \setrecordentry{postal address}{J. Hagen\\Ridderstraat 29\\Hasselt NL} %D \stoprecord -%D +%D %D \startrecord{ottenaf} %D \memberofgroup{a} %D \setrecordentry{name}{Ton} %D \setrecordentry{family name}{Otten} %D \setrecordentry{postal address}{A.F. Otten\\Prinsengracht 17\\Hasselt NL} %D \stoprecord -%D \stoptyping -%D -%D The definition of this database looks like: -%D -%D \starttyping +%D \stoptyping +%D +%D The definition of this database looks like: +%D +%D \starttyping %D \definerecord[address][command=\DoWithRecord] -%D +%D %D \definerecordentry[address][name] %D \definerecordentry[address][family name] %D \definerecordentry[address][postal address] -%D \stoptyping -%D -%D The actual processing is now done by (for instance): -%D -%D \starttyping +%D \stoptyping +%D +%D The actual processing is now done by (for instance): +%D +%D \starttyping %D \processrecords[datafile][hagenj] %D \processrecords[datafile][hagenj,offenaf] %D \processrecords[datafile][all] %D \processrecords[datafile][a] %D \processrecords[datafile][b] -%D \stoptyping -%D +%D \stoptyping +%D %D Of course one can reassign the command used to handle the -%D records in between. +%D records in between. -% \??kt -> -% \??kw -> +% \??kt -> +% \??kw -> \def\??db {@@db} \def\c!velden{velden} @@ -200,7 +208,7 @@ \letvalue{\??db#1\c!velden}\recordentries} %D Watch out: the entries are defined global! While -%D processing a record, no grouping is applied. +%D processing a record, no grouping is applied. \def\getrecordentry #1{\getvalue {\??db:#1}} \def\resetrecordentry #1{\letgvalueempty{\??db:#1}} @@ -211,7 +219,7 @@ \newif\ifrecordok -\newtoks\resetrecordlist +\newtoks\resetrecordlist \def\processrecords {\dotripleargument\doprocessrecords} @@ -225,11 +233,11 @@ \processcommacommand[\getvalue{\??db#1\c!velden}]\docommando \let\setrecordentry\skiprecord \the\resetrecordlist - \doifelse{#2}\v!all % 't Is nu eenmaal alles + \doifelse{#2}\v!all % 't Is nu eenmaal alles \recordoktrue - {\doifelsenothing{#2} % of niets + {\doifelsenothing{#2} % of niets \recordoktrue - \recordokfalse}% % zullen we maar zeggen. + \recordokfalse}% % zullen we maar zeggen. \ifrecordok \let\askedrecords\v!all \else @@ -279,10 +287,10 @@ %D experiments with \type {%} before each entry and changing %D the category code of the comment char. Because \TEX\ scans %D the line anyway |<|this is needed because the end of line -%D character can be non standard|>| this is not faster. -%D +%D character can be non standard|>| this is not faster. +%D %D Although this mechanism could have been combined with the %D block moving mechaism, the current implementation is -%D prefered out of speed reasons. +%D prefered out of speed reasons. \protect \endinput diff --git a/tex/context/base/core-des.tex b/tex/context/base/core-des.tex index 9d610ef5f..0b8a0d1cd 100644 --- a/tex/context/base/core-des.tex +++ b/tex/context/base/core-des.tex @@ -752,9 +752,14 @@ [\c!conversion=\descriptionparameter\c!conversion]}}}% % sake \doifvaluesomething{\??dd#3#1\c!list} {\definelist[\getvalue{\??dd#3#1\c!type}:\getvalue{\??dd#3#1\c!list}]}% new - \setvalue{\s!set #3#1}{\dosetenumerationnumber[#1][#3]}% - \setvalue{\s!reset#3#1}{\doresetenumerationnumber[#1][#3]}% - \setvalue{\e!next #3#1}{\dotripleempty\donextenumerationnumber[#1][#3]}} + % should work ... + %setvalue{\s!set #3#1}{\dosetenumerationnumber[#1][#3]}% + %setvalue{\s!reset#3#1}{\doresetenumerationnumber[#1][#3]}% + %setvalue{\e!next #3#1}{\dotripleempty\donextenumerationnumber[#1][#3]}} + % but since we use \currentdescription, we need ... + \setevalue{\s!set #3#1}{\noexpand \dosetenumerationnumber [#1][#3]}% + \setevalue{\s!reset#3#1}{\noexpand \doresetenumerationnumber[#1][#3]}% + \setevalue{\e!next #3#1}{\noexpand\dotripleempty\noexpand\donextenumerationnumber [#1][#3]}} \def\descriptionparentparameter#1{\csname\??dd\currentdescriptionnumber#1\endcsname} diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex index 5820798cd..09c91be56 100644 --- a/tex/context/base/core-fil.tex +++ b/tex/context/base/core-fil.tex @@ -54,6 +54,11 @@ 1: sinonimul fisierelor -- este folosit deja pentru -- \stopmessages +\startmessages french library: files + title: files + 1: le synonyme de fichier -- est déjà utilisé pour -- +\stopmessages + %D \macros %D {definefilesynonym} %D @@ -158,7 +163,7 @@ \ifconditional\moduleisloaded % sometimes (see xtag-map) \let\next\relax % or: \expandafter\gobbleoneargument \else - \makeshortfilename[#1\truefilename{#2}]% + \makeshortfilename[#1\truefilename{#2}]% beware: *- is not part of syn \doifelseflagged\shortfilename {\showmessage\m!systems7{#2}% \settrue\moduleisloaded diff --git a/tex/context/base/core-int.tex b/tex/context/base/core-int.tex index 44d4fa778..c1eb33f3f 100644 --- a/tex/context/base/core-int.tex +++ b/tex/context/base/core-int.tex @@ -89,6 +89,16 @@ 6: attachment file -- does not exist \stopmessages +\startmessages french library: interactions + title: interaction + 1: ratio d'aspect -- x -- (b x h) + 2: actif + 3: inactif + 4: pas de synchronisation de page (--) dans le hmode + 5: le fichier joint -- est inconnu + 6: le fichier joint -- n'existe pas +\stopmessages + \startmessages dutch library: versions title: versie 1: er mankeert een @+ @@ -138,6 +148,13 @@ 3: pagini selectate: -- \stopmessages +\startmessages french library: versions + title: version + 1: @+ manquant + 2: marquage des pages + 3: pages sélectionnées : -- +\stopmessages + \unprotect \definesystemconstant {link} diff --git a/tex/context/base/core-itm.tex b/tex/context/base/core-itm.tex index 09fcea312..85dff12bd 100644 --- a/tex/context/base/core-itm.tex +++ b/tex/context/base/core-itm.tex @@ -44,6 +44,10 @@ 9: acum nu se supota mai mult de -- nivele de adancime la iteratii \stopmessages +\startmessages french library: layouts + 9: pas plus de -- niveaux pour l'instant dans les élémentarisations +\stopmessages + \unprotect % - instellingen in macro @@ -369,6 +373,121 @@ \fi \expanded{\redostartitemgroup[\itemgroupoptions]}}% [#2] +% \def\redostartitemgroup[#1][#2]% +% {\setfalse\inlinelistitem % new, no indent (leftskip) +% \setfalse\concatnextitem % new, concat +% \setfalse\txtlistitem +% \ifhmode +% \ifconditional\autoconcatnextitem % new, concat +% \ifdim\lastskip=\itemsignal % new, concat +% \settrue\concatnextitem % new, concat +% \fi % new, concat +% \fi % new, concat +% \ifconditional\textlistitem\else\doifnotinset\v!text{#1}\par\fi % suboptimal +% \fi +% \begingroup +% \ifnum\itemlevel=\plusone % NIEUW +% \doadaptleftskip {\getitemparameter1\c!margin}% +% \doadaptleftskip {\getitemparameter1\c!leftmargin}% +% \doadaptrightskip{\getitemparameter1\c!rightmargin}% +% \fi +% \dosetraggedcommand{\getitemparameter\itemlevel\c!align}\raggedcommand +% \doifsomething{\getitemparameter\itemlevel\c!indenting} +% {% is \expanded needed? +% \expanded{\setupindenting[\getitemparameter\itemlevel\c!indenting]}}% +% \doifinset\v!columns{#1}% +% {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount +% \globallet\itemcolumndepth\itemlevel +% \getitemparameter\itemlevel\c!before +% \processfirstactioninset +% [#1] +% [ \v!one=>\!!counta1\relax, +% \v!two=>\!!counta2\relax, +% \v!three=>\!!counta3\relax, +% \v!four=>\!!counta4\relax, +% \v!five=>\!!counta5\relax, +% \s!unknown=>\@EA\!!counta\getitemparameter\itemlevel\c!n]% +% % +% % now handled in column routines +% % +% % \edef\columneditemleftskip{\the\leftskip}% +% % \def\postprocesscolumnbox##1% +% % {\scratchdimen\columneditemleftskip +% % \divide\scratchdimen \nofcolumns +% % \hbox{\hskip\columneditemleftskip\hbox{\box##1}}}% +% % \scratchdimen-\columneditemleftskip +% % \multiply\scratchdimen \nofcolumns +% % \advance\scratchdimen \columneditemleftskip +% % \advance\scratchdimen \hsize +% % \edef\columntextwidth{\the\scratchdimen}% +% % \leftskip\zeropoint +% % +% \startcolumns +% [\c!n=\!!counta, % netter \??op\itemlevel\c!n +% \c!height=, +% \c!rule=\v!off, +% \c!balance=\v!yes, +% \c!align=\v!no]% +% \fi\fi}% +% \doifinsetelse\v!intro{#1}{\settrue\introlistitem}{\setfalse\introlistitem}% +% % == \doifinsetelse\v!intro{#1}\settrue\setfalse\introlistitem +% \doglobal\increment\noflists +% \let\currentlist\noflists +% \newcounter\noflistelements +% \setfalse\headlistitem +% \setfalse\sublistitem +% \setfalse\symbollistitem +% \let\marsymbol\relax +% \globallet\somdestination\empty +% \let\symsymbol\empty +% \the\itemgroupcommands +% \setitemlevel{#1}% +% %\getitemparameter\itemlevel\empty +% \let\listitem\empty % ** start value +% \doifelsenothing{#1} % iffirstargument +% {\edef\@@opsymbol{\getitemparameter\itemlevel\c!symbol}% +% \letgvalueempty{\@@globalitemsymbol\itemlevel}% +% \global\letitemparameter\itemlevel\v!continue\empty +% % \setitemmark\@@opsymbol % ** default value +% \dosetupitemgroupvariable[\itemlevel][#2]} +% {\dosetupitemgroupconstant[\itemlevel][#1]% +% \dosetupitemgroupvariable[\itemlevel][#2]% +% \doifinsetelse\v!continue{#1}% \noexpand, else problems in non-etex with chinese +% {\edef\@@opsymbol{\noexpand\getvalue{\@@globalitemsymbol\itemlevel}}% +% \getitemparameter\itemlevel\v!continue} +% {\edef\@@opsymbol{\noexpand\getitemparameter{\itemlevel}{\c!symbol}}% +% \global\setitemparameter\itemlevel\v!continue +% {\dosetupitemgroupconstant[\itemlevel][#1]% +% \dosetupitemgroupvariable[\itemlevel][#2]}}% +% \def\docommando##1% \setitemmark resets \docommando +% {\doifnot{##1}{0}{\setitemmark{##1}}}% +% % \processcommalist[#1,\@@opsymbol]\docommando +% \processcommalist[#1]\docommando}% ** preset sequence or provided sequence +% \ifx\listitem\empty +% \setitemmark\@@opsymbol % ** default value +% \ifx\listitem\empty +% \edef\currentitemsymbol{\itemlevel}% ** fall back +% \fi +% \fi +% \ifconditional\autointrolistitem\ifnum\prevgraf<3 +% \settrue\introlistitem +% \fi\fi +% \ifconditional\paragraphlistitem +% \ifnum\itemlevel>\plusone +% \letitemparameter\itemlevel\c!inbetween\empty +% \fi +% \else\ifconditional\packlistitem +% \letitemparameter\itemlevel\c!inbetween\empty +% \fi\fi +% \calculatelistwidth\itemlevel{\dimen0}% +% \ifdim\dimen0>\zeropoint\relax +% \ifconditional\inlinelistitem\else +% \advance\leftskip \dimen0\relax +% \fi +% \fi} +% +% column code moved so that it obeys packed and such + \def\redostartitemgroup[#1][#2]% {\setfalse\inlinelistitem % new, no indent (leftskip) \setfalse\concatnextitem % new, concat @@ -391,40 +510,7 @@ \doifsomething{\getitemparameter\itemlevel\c!indenting} {% is \expanded needed? \expanded{\setupindenting[\getitemparameter\itemlevel\c!indenting]}}% - \doifinset\v!columns{#1}% - {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount - \globallet\itemcolumndepth\itemlevel - \getitemparameter\itemlevel\c!before - \processfirstactioninset - [#1] - [ \v!one=>\!!counta1\relax, - \v!two=>\!!counta2\relax, - \v!three=>\!!counta3\relax, - \v!four=>\!!counta4\relax, - \v!five=>\!!counta5\relax, - \s!unknown=>\@EA\!!counta\getitemparameter\itemlevel\c!n]% - % - % now handled in column routines - % - % \edef\columneditemleftskip{\the\leftskip}% - % \def\postprocesscolumnbox##1% - % {\scratchdimen\columneditemleftskip - % \divide\scratchdimen \nofcolumns - % \hbox{\hskip\columneditemleftskip\hbox{\box##1}}}% - % \scratchdimen-\columneditemleftskip - % \multiply\scratchdimen \nofcolumns - % \advance\scratchdimen \columneditemleftskip - % \advance\scratchdimen \hsize - % \edef\columntextwidth{\the\scratchdimen}% - % \leftskip\zeropoint - % - \startcolumns - [\c!n=\!!counta, % netter \??op\itemlevel\c!n - \c!height=, - \c!rule=\v!off, - \c!balance=\v!yes, - \c!align=\v!no]% - \fi\fi}% + % old location of column code \doifinsetelse\v!intro{#1}{\settrue\introlistitem}{\setfalse\introlistitem}% % == \doifinsetelse\v!intro{#1}\settrue\setfalse\introlistitem \doglobal\increment\noflists @@ -475,6 +561,42 @@ \else\ifconditional\packlistitem \letitemparameter\itemlevel\c!inbetween\empty \fi\fi + % new location of column code + \doifinset\v!columns{#1}% + {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount + \globallet\itemcolumndepth\itemlevel + \getitemparameter\itemlevel\c!before + \processfirstactioninset + [#1] + [ \v!one=>\!!counta1\relax, + \v!two=>\!!counta2\relax, + \v!three=>\!!counta3\relax, + \v!four=>\!!counta4\relax, + \v!five=>\!!counta5\relax, + \s!unknown=>\@EA\!!counta\getitemparameter\itemlevel\c!n]% + % + % now handled in column routines + % + % \edef\columneditemleftskip{\the\leftskip}% + % \def\postprocesscolumnbox##1% + % {\scratchdimen\columneditemleftskip + % \divide\scratchdimen \nofcolumns + % \hbox{\hskip\columneditemleftskip\hbox{\box##1}}}% + % \scratchdimen-\columneditemleftskip + % \multiply\scratchdimen \nofcolumns + % \advance\scratchdimen \columneditemleftskip + % \advance\scratchdimen \hsize + % \edef\columntextwidth{\the\scratchdimen}% + % \leftskip\zeropoint + % + \startcolumns + [\c!n=\!!counta, % netter \??op\itemlevel\c!n + \c!height=, + \c!rule=\v!off, + \c!balance=\v!yes, + \c!align=\v!no]% + \fi\fi} + % end of column code \calculatelistwidth\itemlevel{\dimen0}% \ifdim\dimen0>\zeropoint\relax \ifconditional\inlinelistitem\else @@ -630,6 +752,17 @@ \def\itemnobreak % +5 {\flushnotes\penalty+5\ifinsidecolumns\else00\fi\relax} +\def\dodotxtitem + {\scratchdimen\wd8 + \advance \scratchdimen \getitemparameter\itemlevel\c!distance\relax + \ifdim\scratchdimen>\dimen0 + \advance\scratchdimen -\dimen0 + \else + \scratchdimen\z@ + \fi + \llap{\hbox to \dimen0{\ifconditional\sublistitem\llap{+}\fi\box8\hfill}}% + \hskip\scratchdimen} + \def\dolistitem % evt aantal items opslaan per niveau, scheelt zoeken {\ifconditional\textlistitem % begin of item @@ -690,7 +823,7 @@ \ht8=\strutheight \dp8=\strutdepth % so that content differs per run (esp mp graphics afterwards) -\checkforrepeatedlistitem + \checkforrepeatedlistitem \ifdim\dimen2<\zeropoint\relax \llap{\ifconditional\sublistitem\llap{+}\fi\box8\hskip\leftmargindistance}% \else @@ -704,16 +837,13 @@ \else\ifconditional\inlinelistitem \hbox to \dimen0{\ifconditional\sublistitem\llap{+}\fi\box8\hfill}% \else\ifconditional\txtlistitem - \scratchdimen\wd8 - \llap{\hbox to \dimen0{\ifconditional\sublistitem\llap{+}\fi\box8\hfill}}% - \hskip\scratchdimen - % \hskip-\dimen0 this makes them touch + \dodotxtitem \else % todo: align+marge binnen de hbox \llap{\hbox to \dimen0{\ifconditional\sublistitem\llap{+}\fi\box8\hfill}}% \fi\fi\fi \fi -\forceunexpanded % needed for m conversion (\os) / i need to look into this + \forceunexpanded % needed for m conversion (\os) / i need to look into this \setevalue{\@@currentitemsymbol\itemlevel}% {\getvalue{\@@localitemsymbol\itemlevel}}% still problems with \uchar ? %{\noexpand\getvalue{\@@localitemsymbol\itemlevel}}% no, spoils subrefs @@ -729,22 +859,46 @@ \newconditional\repeatlistitem \def\checkforrepeatedlistitem - {\ifnum\itemlevel=\plusone \ifnum\itemlevel=\plusone + {\ifnum\itemlevel=\plusone \initializeboxstack{item}% - \fi \fi + \fi \ifconditional\repeatlistitem - \savebox{item}{\itemlevel}{\hbox{\ifnum\itemlevel>\plusone \copy8\else\fi}}% - \setbox8\hbox - {\setbox\scratchbox\hbox{\foundbox{item}{\itemlevel}}% + \savebox{item}{\itemlevel}{\hbox{\copy8}}% + \setbox8\hbox to \wd8 + {\setbox\scratchbox\hbox + {\scratchcounter\itemlevel + \advance\scratchcounter\minusone + \dorecurse\scratchcounter{\foundbox{item}{\recurselevel}}}% \ifnum\itemlevel>\plusone - \hskip-\wd\scratchbox - \ifnum\countervalue{\@@itemcounter\itemlevel}>\plusone - \llap{\box\scratchbox}% + \ifdim\wd\scratchbox>\zeropoint + \hskip-\dimen2 + \box\scratchbox \fi \fi - \box8}% + \box8 }% \fi} +% \startbuffer +% \item +% \startitemize[n] +% \item item 1.1 +% \item item 1.2 +% \startitemize[n] \item item 1.2.1 \item item 1.2.2 \stopitemize +% \item item 1.3 +% \stopitemize +% \item +% \startitemize[n] \item item 2.1 \item item 2.2 \stopitemize +% \item item 3 +% \startitemize[n] \item item 3.1 \item item 3.2 \stopitemize +% \item +% \startitemize[n] \item item 4.1 \item item 4.2 \stopitemize +% \stopbuffer +% +% \startitemize[n,repeat,6*broad,packed] \getbuffer \stopitemize \blank[3*big] +% \startitemize[n,repeat,packed] \getbuffer \stopitemize \blank[3*big] +% \setupitemize[each][atmargin][width=3em] +% \startitemize[n,repeat,packed] \getbuffer \stopitemize + \chardef\autoitemgroupspacing=2 % 0 = voor/na, 1=tussen als geen voor 2=(prev)tussen=old/normal \def\complexdoitemgroupitem[#1]% diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex index 0a398f462..58bfacb3f 100644 --- a/tex/context/base/core-job.tex +++ b/tex/context/base/core-job.tex @@ -54,7 +54,7 @@ {% #1=\readlocfile|\readsetfile{dir} #2=filename % #1{#2}\donothing\donothing #1{#2}\donothing{\readfile{#2}\donothing\donothing}} - + \def\processfile#1% {\ifx\allinputpaths\empty \def\next{\processlocalfile\readlocfile}% @@ -74,6 +74,22 @@ \fi \next{#1}} +\def\doifinputfileelse#1% rarely used + {\ifx\allinputpaths\empty + \@EA\secondoftwoarguments + \else + \let\filepath\empty + \def\docommando##1% + {\doiffileelse{\pathplusfile{##1}{#1}}{\donetrue\def\filepath{##1}}\donefalse + \ifdone\expandafter\quitcommalist\fi}% + \processcommacommand[.,\allinputpaths]\docommando + \ifx\filepath\empty + \@EAEAEA\secondoftwoarguments + \else + \@EAEAEA\firstoftwoarguments + \fi + \fi} + \let\allinputpaths\empty % \def\usepath[#1]% diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index 998c7eae6..830d2b5a9 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -52,6 +52,7 @@ % 3: incercati LaTeX % \stopmessages % + % %D You would not expect the next macro in \CONTEXT, % %D wouldn't you? It's there to warn \LATEX\ users that % %D something is wrong. @@ -500,10 +501,13 @@ \resetsubscripts \egroup} -\def\celsius#1{#1\mathematics{^\circ}C} -\def\graden {\mathematics{^\circ}} -\def\inch {\hbox{\rm\char125\relax}} -\def\fraction#1#2{\mathematics{#1\over#2}} +\unexpanded\def\celsius #1{#1\mathematics{^\circ}C} +\unexpanded\def\inch {\mathematics{\prime\prime}} % was: \hbox{\rm\char125\relax} +\unexpanded\def\fraction#1#2{\mathematics{#1\over#2}} + +% very dutch + +\unexpanded\def\graden {\mathematics{^\circ}} \def\bedragprefix {\euro\normalfixedspace} \def\bedragsuffix {} @@ -1374,6 +1378,10 @@ \startmessages romanian library: systems 41: fisierul extern -- din grupul -- nu exista \stopmessages + +\startmessages french library: systems + 41: le fichier externe -- du groupe -- n'existe pas +\stopmessages \definetabulate [\v!legend] diff --git a/tex/context/base/core-new.tex b/tex/context/base/core-new.tex index 0f3cb0c1a..4a255fca3 100644 --- a/tex/context/base/core-new.tex +++ b/tex/context/base/core-new.tex @@ -42,14 +42,14 @@ % % \expanded % {\long\noexpand\def\noexpand\xdostartsetups##1##2\csname\e!stop\v!instellingen\endcsname -% {\egroup +% {\endgroup % \long\noexpand\setvalue{\??su##1}{##2}}} % % \def\startsetups % for international purposes -% {\bgroup\doifnextcharelse[{\startsetupsA\stopsetups}{\startsetupsB\stopsetups}} +% {\begingroup\doifnextcharelse[{\startsetupsA\stopsetups}{\startsetupsB\stopsetups}} % % \def\startlocalsetups % for nested purposes -% {\bgroup\doifnextcharelse[{\startsetupsA\stoplocalsetups}{\startsetupsB\stoplocalsetups}} +% {\begingroup\doifnextcharelse[{\startsetupsA\stoplocalsetups}{\startsetupsB\stoplocalsetups}} % % \def\startsetupsA#1[#2]% % {\catcode`\^^M=\@@ignore @@ -59,7 +59,7 @@ % {\startsetupsA#1[#2]}% % % \long\def\dostartsetups#1#2% watch out: not \grabuntil -% {\dograbuntil#1{\egroup\long\setvalue{\??su#2}}} +% {\dograbuntil#1{\endgroup\long\setvalue{\??su#2}}} % todo : \startsetups[name][XML] \setups[name][XML] @@ -67,7 +67,7 @@ \expanded {\long\def\@EA\noexpand\csname\e!start\v!setups\endcsname - {\bgroup\noexpand\doifnextcharelse[% + {\begingroup\noexpand\doifnextcharelse[% {\noexpand\startsetupsA\@EA\noexpand\csname\e!stop\v!setups\endcsname} {\noexpand\startsetupsB\@EA\noexpand\csname\e!stop\v!setups\endcsname}}} @@ -101,7 +101,7 @@ \def\startrawsetups {\xxstartsetups\zerocount\stoprawsetups } \let\stoprawsetups \relax \def\xxstartsetups#1#2% - {\bgroup\chardef\setupseolmode#1\doifnextcharelse[{\startsetupsA#2}{\startsetupsB#2}} + {\begingroup\chardef\setupseolmode#1\doifnextcharelse[{\startsetupsA#2}{\startsetupsB#2}} \def\startsetupsA#1% [ ] delimited {\ifcase\setupseolmode\or\catcode`\^^M\@@ignore\fi @@ -118,12 +118,12 @@ {\ifthirdargument\@EA\startsetupsC\else\@EA\startsetupsD\fi} % \long\def\dodostartsetups#1#2#3% watch out: not \grabuntil -% {\dograbuntil#1{\egroup\dodoglobal\long\setvalue{\??su#2:#3}}} % \doglobal +% {\dograbuntil#1{\endgroup\dodoglobal\long\setvalue{\??su#2:#3}}} % \doglobal % % better: \long\def\dodostartsetups#1#2#3% watch out: not \grabuntil - {\cleanuplabel{\??su#2:#3}\dograbuntil#1{\egroup\dodoglobal\long\setvalue\cleanlabel}} % \doglobal + {\cleanuplabel{\??su#2:#3}\dograbuntil#1{\endgroup\dodoglobal\long\setvalue\cleanlabel}} % \doglobal \def\systemsetupsprefix{*} @@ -345,25 +345,25 @@ \gdef\cleanedupcolon{:} \catcode`:=\@@active \gdef\cleanuplabel#1% - {\bgroup\let:\cleanedupcolon + {\begingroup\let:\cleanedupcolon \xdef\cleanlabel{#1}% - \egroup} + \endgroup} \gdef\cleanupprefixedlabel#1#2% - {\bgroup\let:\cleanedupcolon + {\begingroup\let:\cleanedupcolon \xdef\cleanprefix{#1}% \xdef\cleanlabel {#2}% - \egroup} + \endgroup} \gdef\protectlabels {\let:\cleanedupcolon} -\global\def\blabelgroup {\bgroup \let:\cleanedupcolon} -\global\let\elabelgroup \egroup +\global\def\blabelgroup {\begingroup \let:\cleanedupcolon} +\global\let\elabelgroup \endgroup \gdef\labelcsname - {\bgroup\let:\cleanedupcolon - \expandafter\egroup\csname} + {\begingroup\let:\cleanedupcolon + \expandafter\endgroup\csname} \gdef\labelvalue#1% {\labelcsname#1\endcsname} diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex index b97745b50..cc817e7ca 100644 --- a/tex/context/base/core-not.tex +++ b/tex/context/base/core-not.tex @@ -29,7 +29,7 @@ %D %D \startitemize[packed] %D \item a small number \footnote {a footnote number} or -%D symbol {\setupfootnotes [conversionconversie=set 2]\footnote +%D symbol {\setupfootnotes [conversion=set 2]\footnote %D {a footnote}} %D \item and a similar mark at the bottom of the page %D \item followed by some additional text @@ -450,7 +450,7 @@ %D %D \bgroup %D \startnarrower -%D \setupfootnotes[conversionconversie=set 1] +%D \setupfootnotes[conversion=set 1] %D \getbuffer %D \stopnarrower %D \egroup @@ -1204,6 +1204,75 @@ \def\postponefootnotes {\postponenotes} \def\autopostponefootnotes{\autopostponenotes} +%D New trickery: + +\def\ownnotesymbol#1% #1 gets number passed + {\executeifdefined{\??vn::\currentnote}\empty} + +\def\setnotesymbol[#1]#2#3% + {\prewordbreak % prevent lookback + \gdef\lastnotenumber{#2}% + \setgvalue{\??vn::#1}{#3} + \dolastnotesymbol} + +\def\ownnote[#1]#2#3#4% + {\setnotesymbol[#1]{#2}{#3}% + \setnotetext [#1]{#4}} + +\defineconversion + [ownnote] + [\ownnotesymbol] + +%D Usage: + +% maybe we should predefine this one + +% \definenote +% [glossary] +% [way=bypage, +% location={page,high}, +% factor=0, +% width=\leftmarginwidth, +% scope=page, +% conversion=ownnote, +% numbercommand=, +% textcommand=, +% textstyle=, +% rule=, +% before=, +% after=] +% +% \setupnotedefinition +% [glossary] +% [location=left, +% width=fit, +% distance=.5em, +% align={right,tolerant,stretch}, +% headstyle=bold, +% hang=1] +% +% \setuplayout +% [width=middle, +% height=middle, +% backspace=5cm, +% margin=4cm, +% margindistance=.25cm, +% cutspace=2cm] +% +% \setuptexttexts +% [margin] +% [\setups{glossary}] +% [\setups{glossary}] +% +% \startsetups glossary +% \vbox to \textheight {\placenotes[glossary]\vfill} +% \stopsetups +% +% \dorecurse{10} +% {\dorecurse{5} +% {\ownnote[glossary]{whow}{whatever needs to be glossed:~\recurselevel}% +% \input tufte \relax}} + \protect \endinput % \def\myfootnote[#1]#2% let's guess that #2 is without catcode problems diff --git a/tex/context/base/core-obj.tex b/tex/context/base/core-obj.tex index 1e6720540..93c21e269 100644 --- a/tex/context/base/core-obj.tex +++ b/tex/context/base/core-obj.tex @@ -50,6 +50,11 @@ 31: obiect duplicat -- \stopmessages +\startmessages french library: references + 30: objet -- inconnu + 31: objet -- dupliqué +\stopmessages + %D \macros %D {setobject,getobject,ifinobject} %D diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex index da69416e7..17474a0b4 100644 --- a/tex/context/base/core-ref.tex +++ b/tex/context/base/core-ref.tex @@ -119,6 +119,17 @@ 23: referinta obscura -- (prefix=--) \stopmessages +\startmessages french library: references + title: references + 1: réference -- inconnue + 2: réference -- dupliquée à la page -- + 3: type -- de réference inconnu + 4: réference -- inconnue + 21: document -- chargé + 22: le document -- n'est pas interactif + 23: reference -- indéterminé (préfixe=--) +\stopmessages + %D This module deals with referencing. In \CONTEXT\ referencing %D is one of the core features, although at a first glance %D probably nobody will notice. This is good, because diff --git a/tex/context/base/core-rul.tex b/tex/context/base/core-rul.tex index 13be56e4d..a617559f2 100644 --- a/tex/context/base/core-rul.tex +++ b/tex/context/base/core-rul.tex @@ -2647,8 +2647,11 @@ \localhsize\hsize \fi\fi} -\def\dododostartframedtext[#1][#2][#3]% - {\doifsomething{#2}{\setvalue{\??kd#1\c!location}{#2}}% +\setfalse\framedtextlocationnone + +\def\dododostartframedtext[#1][#2][#3]% #3 only passed to framed, not to framedtext + {\doifsomething{#2}{\setvalue{\??kd#1\c!location}{#2}}% does not listen to #3 + \setfalse\framedtextlocationnone \processaction % \v!low en \v!depth are already taken ! [\framedtextparameter{#1}\c!location] [ \v!left=>\letvalue{\??kd#1\c!left }\relax @@ -2658,7 +2661,8 @@ \v!middle=>\letvalue{\??kd#1\c!left }\hfill \letvalue{\??kd#1\c!right}\hfill, \v!none=>\letvalue{\??kd#1\c!left }\relax % new - \letvalue{\??kd#1\c!right}\relax]% new + \letvalue{\??kd#1\c!right}\relax % new + \settrue\framedtextlocationnone]% \letvalue{\??kd#1\c!location}\empty % removed 06/2001 % \forgetparindent @@ -2707,16 +2711,33 @@ \verticalstrut} \stopboxedcontent \stopcolor - \egroup - \doif{#2}\v!none\insidefloattrue % new - \doif{\framedtextparameter{#1}\c!location}\v!none\insidefloattrue % newer - \ifinsidefloat + \ifconditional\framedtextlocationnone + \egroup + \box\framebox + \else\ifinsidefloat + \egroup \box\framebox \else + \egroup \doplacement[\??kd#1][\c!depthcorrection=\v!off]{\box\framebox}% - \fi + \fi\fi \egroup} +%D Placement can be ignored: +%D +%D \starttyping +%D \hbox to \hsize \bgroup +%D \startframedtext[none][width=.5\textwidth] \input tufte \stopframedtext +%D \startframedtext[none][width=.5\textwidth] \input zapf \stopframedtext +%D \egroup +%D +%D \hbox to \hsize \bgroup +%D \setupframedtexts[location=none]% +%D \startframedtext[width=.5\textwidth] \input zapf \stopframedtext +%D \startframedtext[width=.5\textwidth] \input tufte \stopframedtext +%D \egroup +%D \stoptyping + %D The simple brace (or group) delimited case is typeset %D slightly different and is not aligned. diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex index 7725d293b..d8ca4cf70 100644 --- a/tex/context/base/core-sec.tex +++ b/tex/context/base/core-sec.tex @@ -67,6 +67,12 @@ 2: sfarsit de bloc sectiune -- \stopmessages +\startmessages english library: structures + title: structure + 1: début de blocsection -- + 2: fin de blocsection -- +\stopmessages + \unprotect % from now on, internaly numbers are separated by a period diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index da8108c22..516cca58f 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -791,11 +791,14 @@ \def\noblankpsignal{1010101} \def\inhibitgridblank % was doinhibitblank - {\ifnum\lastpenalty<10000 - \kern-\noblanksignal % new - \kern \noblanksignal - \else - \penalty\noblankpsignal + {\ifvmode\else\endgraf\fi + \ifvmode + \ifnum\lastpenalty<10000 + \kern-\noblanksignal % new + \kern \noblanksignal + \else + \penalty\noblankpsignal + \fi \fi} \def\inhibittextblank % was inhibitblank diff --git a/tex/context/base/core-sys.tex b/tex/context/base/core-sys.tex index b90f2305b..f75d03513 100644 --- a/tex/context/base/core-sys.tex +++ b/tex/context/base/core-sys.tex @@ -15,8 +15,9 @@ \unprotect -\def\outputfilename{\@@svfile} -\def\inputfilename {\@@svinputfile} +\def\outputfilename {\@@svfile} +\def\inputfilename {\@@svinputfile} +\def\operatingsystem{\@@svtype} \let\jobfilesuffix\c!tex @@ -62,8 +63,17 @@ \or \setsystemmode\v!last % 4 : extra last run \fi + \processaction + [\@@svtype] + [ mswin=>\def\@@svline{\rawcharacter{13}\rawcharacter{10}}, % crlf + darwin=>\def\@@svline{\rawcharacter{13}}, % cr + \s!unknown=>\def\@@svline{\rawcharacter{10}}]% % lf \splitjobfilename} +\def\@@svline{\rawcharacter{10}} % unix is the most critical/sensitive system + +\def\systemendofline{\@@svline} + \def\setupsystem {\dosingleargument\dosetupsystem} @@ -89,8 +99,8 @@ [#1] [ \v!small=>\divide\normaltime 15, % 900, \v!medium=>\divide\normaltime 30, % 1800, - \v!big=>\divide\normaltime 60, % 3600, - \v!normal=>, + \v!big=>\divide\normaltime 60, % 3600, + \v!normal=>, \s!default=>, \s!unknown=>\normaltime=#1]% \nextrandom @@ -103,8 +113,13 @@ \c!random=, \c!file=\jobname, \c!inputfile=\outputfilename, + \c!type=unix, % windows is normally less sensitive to handle \c!bodyfont=\normalizedlocalbodyfontsize] % of iets anders +%D Remark: windows programs normally handle \type {cr|lf|crlf} but unix +%D is more picky, so we default to the \type {cr}. I never understood why +%D \type {crlf} was not used in all systems, since it makes most sense. + %D \def\dostartglobaldefs#1#2% diff --git a/tex/context/base/core-tab.tex b/tex/context/base/core-tab.tex index 51404e689..c23619cb2 100644 --- a/tex/context/base/core-tab.tex +++ b/tex/context/base/core-tab.tex @@ -1087,7 +1087,6 @@ % \catcode`\|=\@@other % \dodoubleargument\dodefinetabletemplate} - % \TABLEnoalign{\page}\TABLEhead is valid \def\douseTABLEtemplate#1#2#3% @@ -1171,7 +1170,10 @@ %D We immediately use this register: -\appendtoks \fixedspaces \to \everytable +\appendtoks + \fixedspaces + \let\_\normalunderscore +\to \everytable %D Now we can start the table. diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex index acb9ab40c..ec438d730 100644 --- a/tex/context/base/core-ver.tex +++ b/tex/context/base/core-ver.tex @@ -48,6 +48,11 @@ 1: fisierul -- nu exista \stopmessages +\startmessages french library: verbatims + title: verbatim + 1: le fichier -- n'existe pas +\stopmessages + \unprotect % \type{ char} geeft bagger @@ -1156,10 +1161,61 @@ \c!step=1, \c!nlines=] +% \def\dodotypefile[#1][#2]#3% +% {\getvalue{\??tp#1\c!before}% +% \doiflocfileelse{#3} +% {\startpacked % includes \bgroup +% \dosetuptypelinenumbering{#1}{#2}% +% \doifinset{\getvalue{\??tp#1\c!option}}{\v!commands,\v!slanted,\v!normal} +% {\setuptyping[#1][\c!option=\v!none]}% +% \doifvalue{\??tp#1\c!option}\v!color +% {\expandafter\aftersplitstring#3\at.\to\prettyidentifier +% \letvalue{\??tp#1\c!option}\prettyidentifier}% +% \initializetyping{#1}% +% \startverbatimcolor +% \makelocreadfilename{#3}% +% \doifundefinedelse{\??tp#3\v!global\c!start} +% {\scratchcounter\zerocount} +% {\scratchcounter\getvalue{\??tp#3\v!global\c!start}}% +% \advance\scratchcounter\plusone +% \setxvalue{\??tp#3\v!global\c!start}{\the\scratchcounter}% +% \doifelsevaluenothing{\??tp#1\c!start} +% {\processfileverbatim\readfilename} +% {\doifvalue{\??tp#1\c!start}\v!continue +% {\setevalue{\??tp#1\c!start}% +% {\getvalue{\??tp#3\v!global\c!start}}}% +% \doifelsevaluenothing{\??tp#1\c!stop} +% {\doifelsevaluenothing{\??tp#1\c!nlines} +% {\processfileverbatim\readfilename} +% {\scratchcounter\getvalue{\??tp#1\c!start}% +% \advance\scratchcounter\getvalue{\??tp#1\c!nlines}% +% \advance\scratchcounter\minusone +% \setxvalue{\??tp#3\v!global\c!start}% +% {\the\scratchcounter}% +% \processfilelinesverbatim\readfilename +% {\getvalue{\??tp#1\c!start}} +% {\getvalue{\??tp#3\v!global\c!start}}}}% +% {\processfilelinesverbatim\readfilename +% {\getvalue{\??tp#1\c!start}} +% {\getvalue{\??tp#1\c!stop }}}}% +% \stopverbatimcolor +% \stoppacked} % includes \egroup +% {\ifmmode\hbox\fi\bgroup +% \expanded{\convertargument#3}\to\ascii +% \tttf[\makemessage\m!verbatims1\ascii]% +% \showmessage\m!verbatims1\ascii +% \egroup}% +% \getvalue{\??tp#1\c!after}} + \def\dodotypefile[#1][#2]#3% {\getvalue{\??tp#1\c!before}% \doiflocfileelse{#3} - {\startpacked % includes \bgroup + \donetrue % sets \readfilename + {\doifinputfileelse{#3} + {\donetrue\let\readfilename\filepath} + \donefalse}% + \ifdone + \startpacked % includes \bgroup \dosetuptypelinenumbering{#1}{#2}% \doifinset{\getvalue{\??tp#1\c!option}}{\v!commands,\v!slanted,\v!normal} {\setuptyping[#1][\c!option=\v!none]}% @@ -1194,14 +1250,17 @@ {\getvalue{\??tp#1\c!start}} {\getvalue{\??tp#1\c!stop }}}}% \stopverbatimcolor - \stoppacked} % includes \egroup - {\ifmmode\hbox\fi\bgroup + \stoppacked % includes \egroup + \else + \ifmmode\hbox\fi\bgroup \expanded{\convertargument#3}\to\ascii \tttf[\makemessage\m!verbatims1\ascii]% \showmessage\m!verbatims1\ascii - \egroup}% + \egroup + \fi \getvalue{\??tp#1\c!after}} - + + %D \macros %D {filename} %D diff --git a/tex/context/base/enco-agr.tex b/tex/context/base/enco-agr.tex index ff53e02de..36251d96a 100644 --- a/tex/context/base/enco-agr.tex +++ b/tex/context/base/enco-agr.tex @@ -12,6 +12,8 @@ \definecharacter endash 2 \definecharacter emdash 3 \definecharacter apostrophe 4 +\definecharacter epih 5 +\definecharacter greekaltbeta 6 \definecharacter textbraceleft 8 \definecharacter textbraceright 9 diff --git a/tex/context/base/enco-def.tex b/tex/context/base/enco-def.tex index af59a799c..0c8fcb923 100644 --- a/tex/context/base/enco-def.tex +++ b/tex/context/base/enco-def.tex @@ -829,4 +829,13 @@ \stopencoding +%D Also new, from Taco, for Mojka, who wanted another 8~regimes. + +\startencoding[\s!default] + +\definecharacter texthorizontalbar {{--\kern\zeropoint--}} +\definecharacter textdong {\underbar{\dstroke}} + +\stopencoding + \endinput diff --git a/tex/context/base/enco-ffr.tex b/tex/context/base/enco-ffr.tex index f321b1005..ae3cd6eb1 100644 --- a/tex/context/base/enco-ffr.tex +++ b/tex/context/base/enco-ffr.tex @@ -20,6 +20,13 @@ \unprotect +\startlanguagespecifics[fr] + \definetextmodediscretionary : {\removeunwantedspaces\prewordbreak\kern\hspaceamount\empty{:}:} + \definetextmodediscretionary ; {\removeunwantedspaces\prewordbreak\kern\hspaceamount\empty{;};} + \definetextmodediscretionary ? {\removeunwantedspaces\prewordbreak\kern\hspaceamount\empty{?}?} + \definetextmodediscretionary ! {\removeunwantedspaces\prewordbreak\kern\hspaceamount\empty{!}!} +\stoplanguagespecifics + \startlanguagespecifics[\s!fr] \defineactivecharacter : {\mathortext{:}{\directdiscretionary{:}}} diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex index 2b7c85fcd..9a3b2c841 100644 --- a/tex/context/base/enco-ini.tex +++ b/tex/context/base/enco-ini.tex @@ -115,6 +115,13 @@ 3: codificarea -- este necunoscuta \stopmessages +\startmessages french library: encodings + title: encoding + 1: encodage -- + 2: l'encodage -- est chargé + 3: encodage -- inconnu +\stopmessages + %D First we define a few local or not yet initialized constants. \def\@map@{@m@ap@} % mapping prefix @@ -377,11 +384,11 @@ \def\douseencoding#1% {\doifundefined{\c!file\f!encodingprefix#1}% {\letvalue{\c!file\f!encodingprefix#1}\empty - \makeshortfilename[\f!encodingprefix#1]% + \makeshortfilename[\truefilename{\f!encodingprefix#1}]% \startreadingfile - \readsysfile\shortfilename - {\showmessage\m!encodings2{#1}} - {\showmessage\m!encodings3{#1}}% + \readsysfile\shortfilename + {\showmessage\m!encodings2{#1}} + {\showmessage\m!encodings3{#1}}% \stopreadingfile}} \def\useencoding[#1]% diff --git a/tex/context/base/enco-mis.tex b/tex/context/base/enco-mis.tex index b089fe569..9a9db0c41 100644 --- a/tex/context/base/enco-mis.tex +++ b/tex/context/base/enco-mis.tex @@ -214,7 +214,9 @@ \ifx\mathunderscore\undefined \let\mathunderscore\fakeunderscore \fi \ifx\textunderscore\undefined \let\textunderscore\fakeunderscore \fi -\def\_{\ifmmode\mathunderscore\else\textunderscore\fi} +\unexpanded\def\normalunderscore{\ifmmode\mathunderscore\else\textunderscore\fi} + +\let\_\normalunderscore % Handy but obsolete, replaced by \unknownchar: % diff --git a/tex/context/base/filt-ini.tex b/tex/context/base/filt-ini.tex index ec4fa257b..f9edc73dc 100644 --- a/tex/context/base/filt-ini.tex +++ b/tex/context/base/filt-ini.tex @@ -58,6 +58,13 @@ 2: filtro sconosciuto -- \stopmessages +\startmessages french library: filters + title: filter + 1: le filtre -- est chargé + 2: filtre -- inconnu +\stopmessages + + %D \macros %D {definefiltersynonym} @@ -129,11 +136,11 @@ \def\dousefilter#1% {\doifundefined{\c!file\f!filterprefix#1}% {\letvalue{\c!file\f!filterprefix#1}\empty - \makeshortfilename[\f!filterprefix#1]% + \makeshortfilename[\truefilename{\f!filterprefix#1}]% \startreadingfile - \readsysfile\shortfilename - {\showmessage\m!filters1{#1}} - {\showmessage\m!filters2{#1}}% + \readsysfile\shortfilename + {\showmessage\m!filters1{#1}} + {\showmessage\m!filters2{#1}}% \stopreadingfile}} \def\usefilter[#1]% diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex index 873d51716..74384e88a 100644 --- a/tex/context/base/font-ini.tex +++ b/tex/context/base/font-ini.tex @@ -226,6 +226,21 @@ 14: bodyfont -- is defined (can better be done global) \stopmessages +\startmessages french library: fonts + title: bodyfont + 1: encodage -- + 2: la variante -- est chargée + 3: variante -- inconnue + 4: policecorps -- n'est pas définie + 5: le style -- n'est pas défini + 6: -- est chargé + 7: format -- inconnu + 8: style -- defini +% 9: mapping -- is loaded + 10: fichier de police -- inconnu + 14: policecorps -- est défini (une définition globale pourrait être plus adéquat) +\stopmessages + %D This module is one of the oldest modules of \CONTEXT. The %D macros below evolved out of the \PLAIN\ \TEX\ macros and %D therefore use a similar naming scheme (\type{\rm}, @@ -2712,30 +2727,13 @@ {\ifloadfontfileonce \letvalue{\c!file\f!fontprefix#2}\empty \fi + \makeshortfilename[\truefilename{\f!fontprefix#2}]% \startreadingfile - \readsysfile{\truefilename{\f!fontprefix#2}} - {\showmessage\m!fonts2{#2}} - {\makeshortfilename[\truefilename{\f!fontprefix#2}]% - \readsysfile\shortfilename - {\showmessage\m!fonts2{#2}} - {\showmessage\m!fonts3{#2}}}% + \readsysfile\shortfilename + {\showmessage\m!fonts2{#2}} + {\showmessage\m!fonts3{#2}}% \stopreadingfile}} -% \def\doreadfontdefinitionfile#1#2% #1 = set/switch state -% {\doifundefined{\c!file\f!fontprefix#2}% -% {\ifloadfontfileonce -% \letvalue{\c!file\f!fontprefix#2}\empty -% \fi -% \startreadingfile -% \readsysfile{\truefilename{\f!fontprefix#2}} -% {\showmessage\m!fonts2} -% {\makeshortfilename[\truefilename{\f!fontprefix#2}]% -% \readsysfile\shortfilename -% {\showmessage\m!fonts2} -% {\showmessage\m!fonts3}}% -% {#2}% argument to \showmessage -% \stopreadingfile}} - %D When \type {\loadfontfileoncetrue}, such files are %D only loaded once! This permits redundant loading, but at %D the same time forced grouping when we want continuously mix @@ -2980,12 +2978,23 @@ \edef\fontbody{#1}% \synchronizefont} +% \def\setcurrentfontstyle#1% +% {%\message{[3 #1]}% +% \edef\fontstyle{#1}% +% \ifmmode\mr\fi % otherwise \rm not downward compatible +% \synchronizefont} +% +% For Taco: optional fall backs: + \def\setcurrentfontstyle#1% {%\message{[3 #1]}% + \checkfontclass{#1}% \edef\fontstyle{#1}% \ifmmode\mr\fi % otherwise \rm not downward compatible \synchronizefont} +\let\checkfontclass\gobbleoneargument % implemented in type-ini + \def\setcurrentfontbodyalternative#1#2% {%\message{[4 #1 #2]}% \edef\fontbody{#1}% diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex index 942c61ae4..dca301a6b 100644 --- a/tex/context/base/font-uni.tex +++ b/tex/context/base/font-uni.tex @@ -45,6 +45,10 @@ 21: å bruke (pdf)eTeX er tryggere \stopmessages +\startmessages french library: fonts + 21: l'utilisation de (pdf)eTeX est plus économe (more save) +\stopmessages + \unprotect %D \macros diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index cdbf5643a..1ce0259e3 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -69,6 +69,13 @@ 3: unknown font handling -- \stopmessages +\startmessages french library: handlings + title: handling + 1: manipulation -- de police + 2: la manipulation -- de police est chargée + 3: manipulation -- inconnue de police +\stopmessages + \newif\iftracefonthandling % \tracefonthandlingtrue \newif\ifskiphandlingdef \skiphandlingdeffalse @@ -642,11 +649,11 @@ \def\dousehandling#1% is the same as encoding {\doifundefined{\c!file\f!handlingprefix#1}% {\letvalueempty{\c!file\f!handlingprefix#1}% - \makeshortfilename[\f!handlingprefix#1]% + \makeshortfilename[\truefilename{\f!handlingprefix#1}]% \startreadingfile - \readsysfile\shortfilename - {\showmessage\m!handlings2{#1}} - {\showmessage\m!handlings3{#1}}% + \readsysfile\shortfilename + {\showmessage\m!handlings2{#1}} + {\showmessage\m!handlings3{#1}}% \stopreadingfile}} \def\usehandling[#1]% diff --git a/tex/context/base/java-ini.tex b/tex/context/base/java-ini.tex index 7ee080238..6135c9941 100644 --- a/tex/context/base/java-ini.tex +++ b/tex/context/base/java-ini.tex @@ -75,6 +75,13 @@ 2: preambul necunoscut -- \stopmessages +\startmessages french library: javascript + title: javascript + 1: chargement du jeu de script -- + 2: préambule -- inconnu +\stopmessages + + %D \TEX\ is not the right tool to check the \JAVA\ code; the %D most we can do is reporting some passed variables: @@ -754,9 +761,8 @@ {\startnointerference \letgvalueempty{\c!file\f!javascriptprefix#1}% \makeshortfilename[\f!javascriptprefix#1]% - \showmessage\m!javascript1{#1}% \startreadingfile - \readsysfile\shortfilename\donothing\donothing + \readsysfile\shortfilename{\showmessage\m!javascript1{#1}}\donothing \stopreadingfile \stopnointerference}}} diff --git a/tex/context/base/lang-chi.tex b/tex/context/base/lang-chi.tex index a9c36e80a..69277a456 100644 --- a/tex/context/base/lang-chi.tex +++ b/tex/context/base/lang-chi.tex @@ -31,14 +31,15 @@ \c!rightquote=\cnencoding\cnupperrightsinglequote, \c!leftquotation=\cnencoding\cnupperleftdoublequote, \c!rightquotation=\cnencoding\cnupperrightdoublequote, - \c!date={\v!month,\ ,\v!day,{,\ },\v!year}, + \c!date={\v!year,\cnyear,\ ,\v!month,\v!day,\cnday}, \c!state=\v!stop] + \setupheadtext [\s!cn] [\v!content={\cnencoding\cnencodedcontents}] \setupheadtext [\s!cn] [\v!tables={\cnencoding\cnencodedtables}] \setupheadtext [\s!cn] [\v!figures={\cnencoding\cnencodedfigures}] -\setupheadtext [\s!cn] [\v!graphics=Graphics] -\setupheadtext [\s!cn] [\v!intermezzi=Intermezzos] +\setupheadtext [\s!cn] [\v!graphics={\cnencoding\cnencodedgraphics}]% RG & XJF +\setupheadtext [\s!cn] [\v!intermezzi={\cnencoding\cnencodedintermezzo}]% RG & XJF \setupheadtext [\s!cn] [\v!index={\cnencoding\cnencodedindex}] \setupheadtext [\s!cn] [\v!abbreviations={\cnencoding\cnencodedabbreviations}] \setupheadtext [\s!cn] [\v!logos={\cnencoding\cnencodedlogos}] @@ -46,14 +47,14 @@ \setuplabeltext [\s!cn] [\v!table={\cnencoding\cnencodedtable}] \setuplabeltext [\s!cn] [\v!figure={\cnencoding\cnencodedfigure}] -\setuplabeltext [\s!cn] [\v!intermezzo=Intermezzo ] -\setuplabeltext [\s!cn] [\v!graphic=Illustration ] -\setuplabeltext [\s!cn] [\v!appendix=] +\setuplabeltext [\s!cn] [\v!intermezzo={\cnencoding\cnencodedintermezzo}]% RG & XJF +\setuplabeltext [\s!cn] [\v!graphic={\cnencoding\cnencodedillustration}]% RG & XJF +\setuplabeltext [\s!cn] [\v!appendix={\cnencoding\cnencodedappendix}]% RG \setuplabeltext [\s!cn] [\v!part={\cnencoding\cnencodedintro,\cnencoding\cnencodedpart}] \setuplabeltext [\s!cn] [\v!chapter={\cnencoding\cnencodedintro,\cnencoding\cnencodedchapter}] \setuplabeltext [\s!cn] [\v!section={\cnencoding\cnencodedintro,\cnencoding\cnencodedsection}] -\setuplabeltext [\s!cn] [\v!line=line ] -\setuplabeltext [\s!cn] [\v!lines=lines ] +\setuplabeltext [\s!cn] [\v!line={\cnencoding\cnencodedline}]% RG & XJF +\setuplabeltext [\s!cn] [\v!lines={\cnencoding\cnencodedline}]% RG & XJF \setuplabeltext [\s!cn] [\v!subsection=] \setuplabeltext [\s!cn] [\v!subsubsection=] @@ -93,9 +94,9 @@ %D the glyphs of both part depend on the encoding. Therefore, %D we have an encoding section here. -\def\cnencoding{\enableencoding[\chineseencoding]} % ugly and temporary +\unexpanded\def\cnencoding{\enableencoding[\chineseencoding]} % ugly and temporary -\startencoding[uni-c] +\startencoding[c-uni] \definecommand cnleftsentence {\uchar{32}{20}\uchar{32}{20}} \definecommand cnrightsentence {\uchar{32}{20}\uchar{32}{20}} \definecommand cnleftsubsentence {\uchar{32}{20}\uchar{32}{20}} @@ -140,6 +141,16 @@ \definecommand cnencodedthursday {\uchar{102}{31}\uchar{103}{31}\uchar{86}{219}} \definecommand cnencodedfriday {\uchar{102}{31}\uchar{103}{31}\uchar{78}{148}} \definecommand cnencodedsaturday {\uchar{102}{31}\uchar{103}{31}\uchar{81}{109}} + % RG & XJF + \definecommand cnencodedgraphics {\uchar{86}{254}} + \definecommand cnencodedintermezzo {\uchar{210}{99}\uchar{242}{102}} + \definecommand cnencodedillustration {\uchar{99}{210}\uchar{86}{254}} + \definecommand cnencodedappendix {\uchar{150}{68}\uchar{95}{85}} + \definecommand cnencodedline {\uchar{136}{76}} + % Tobias Burnus & XJF + \definecommand cnyear {\uchar{94}{116}} + \definecommand cnmonth {\uchar{103}{8}} + \definecommand cnday {\uchar{101}{229}} \stopencoding \startencoding[gbk] @@ -187,6 +198,16 @@ \definecommand cnencodedthursday {\uchar{208}{199}\uchar{198}{218}\uchar{203}{196}} \definecommand cnencodedfriday {\uchar{208}{199}\uchar{198}{218}\uchar{206}{229}} \definecommand cnencodedsaturday {\uchar{208}{199}\uchar{198}{218}\uchar{193}{249}} + % RG & XJF + \definecommand cnencodedgraphics {\uchar{205}{188}} + \definecommand cnencodedintermezzo {\uchar{178}{229}\uchar{199}{250}} + \definecommand cnencodedillustration {\uchar{178}{229}\uchar{205}{188}} + \definecommand cnencodedappendix {\uchar{184}{189}\uchar{194}{188}} + \definecommand cnencodedline {\uchar{208}{208}} + % Tobias Burnus & XJF + \definecommand cnyear {\uchar{196}{234}} + \definecommand cnmonth {\uchar{212}{194}} + \definecommand cnday {\uchar{200}{213}} \stopencoding \startencoding[big5] @@ -234,6 +255,53 @@ \definecommand cnencodedthursday {\uchar{172} {80}\uchar{180}{193}\uchar{165}{124}} \definecommand cnencodedfriday {\uchar{172} {80}\uchar{180}{193}\uchar{164}{173}} \definecommand cnencodedsaturday {\uchar{172} {80}\uchar{180}{193}\uchar{164}{187}} + % Tobias Burnus &\XJF + \definecommand cnyear {\uchar{166}{126}} + \definecommand cnmonth {\uchar{164}{235}} + \definecommand cnday {\uchar{164}{233}} + +% Traditional Chinese characters (only where they differ to the +% simplified ones) for lang-chi.tex and font-chi.tex. + +% \startencoding[c-uni] +% \defineudigit 10000 132 44 +% \defineudigit 100000000 81 4 + +% \definecommand cnencodedsection {\uchar{123}{192}} +% \definecommand cnencodedfigure {\uchar{87}{22}} +% \definecommand cnencodedunits {\uchar{138}{8}\uchar{145}{207}\uchar{85}{174}\uchar{79}{77}} +% \definecommand cnencodedlogos {\uchar{95}{189}\uchar{140}{182}} +% \definecommand cnencodedabbreviations {\uchar{126}{46}\uchar{117}{101}\uchar{138}{158}} +% \definecommand cnencodedfigures {\uchar{87}{22}\uchar{95}{98}} +% \definecommand cnencodedcontents {\uchar{118}{238}\uchar{147}{4}} +% \stopencoding + +% \startencoding[gbk] +% \defineudigit 10000 200 102 +% \defineudigit 100000000 131 124 + +% \definecommand cnencodedsection {\uchar{185}{157}} +% \definecommand cnencodedfigure {\uchar{136}{68}} +% \definecommand cnencodedunits {\uchar{211}{139}\uchar{193}{191}\uchar{134}{206}\uchar{206}{187}} +% \definecommand cnencodedlogos {\uchar{187}{213}\uchar{217}{72} +% \definecommand cnencodedabbreviations {\uchar{191}{115}\uchar{194}{212}\uchar{213}{90}} +% \definecommand cnencodedfigures {\uchar{136}{68}\uchar{208}{206}} +% \definecommand cnencodedcontents {\uchar{196}{191}\uchar{228}{155}} +% \stopencoding + +% \startencoding[big5] +% \defineudigit 10000 184 85 +% \defineudigit 100000000 187 245 + +% \definecommand cnencodedsection {\uchar{184}{96}} +% \definecommand cnencodedfigure {\uchar{185}{207}} +% \definecommand cnencodedunits {\uchar{173}{112}\uchar{182}{113}\uchar{179}{230}\uchar{166}{236}} +% \definecommand cnencodedlogos {\uchar{192}{178}\uchar{182}{83}} +% \definecommand cnencodedabbreviations {\uchar{193}{89}\uchar{178}{164}\uchar{187}{121}} +% \definecommand cnencodedfigures {\uchar{185}{207}\uchar{167}{206}} +% \definecommand cnencodedcontents {\uchar{165}{216}\uchar{191}{253}} +% \stopencoding + \stopencoding \protect \endinput diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex index bda1e392c..3b92f996d 100644 --- a/tex/context/base/lang-ger.tex +++ b/tex/context/base/lang-ger.tex @@ -671,18 +671,22 @@ \def\enordinaldaynumber#1% {#1\ifnum\lasttwodigits{#1}=11 - \ordinalstr{th}% + \highordinalstr{th}% + \else\ifnum\lasttwodigits{#1}=12 + \highordinalstr{th}% + \else\ifnum\lasttwodigits{#1}=13 + \highordinalstr{th}% \else\ifcase\lastdigit{#1}% - \ordinalstr{th}% + \highordinalstr{th}% \or % 1 - \ordinalstr{st}% + \highordinalstr{st}% \or % 2 - \ordinalstr{nd}% + \highordinalstr{nd}% \or % 3 - \ordinalstr{rd}% + \highordinalstr{rd}% \else - \ordinalstr{th}% - \fi\fi} + \highordinalstr{th}% + \fi\fi\fi\fi} % \def\enordinaldaynumber#1% % {#1\ordinalstr{\ifnum\lasttwodigits{#1}=11 th\else\ifcase\lastdigit{#1} diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex index d4a6b37ea..f0b200a29 100644 --- a/tex/context/base/lang-ini.tex +++ b/tex/context/base/lang-ini.tex @@ -122,6 +122,20 @@ 10: sabloanele -- incarcate \stopmessages +\startmessages french library: linguals + title: language + 1: les motifs -- pour -- sont chargés (n=--,e=--,m=--) + 2: pas de motifs -- pour -- (n=--,e=--,m=--) (--,--) + 3: hyphenations -- pour -- chargés (n=--,e=--,m=--) + 4: pas d'hyphenations -- pour -- (n=--,e=--,m=--) + 5: les motifs pour -- ne sont pas chargés + 6: langue -- non définie + 7: les options spécifiques de langue [--] introduisent un -- saut + 8: les options spécifiques de langue [--] sont ajoutés en douceur + 9: la langue -- est active + 10: motifs -- chargés +\stopmessages + %D When loading hyphenation patterns, \TEX\ assign a number to %D each loaded table, starting with~0. Switching to a specific %D table is done by assigning the relevant number to the diff --git a/tex/context/base/lang-spe.tex b/tex/context/base/lang-spe.tex index c030c8045..ed6becb60 100644 --- a/tex/context/base/lang-spe.tex +++ b/tex/context/base/lang-spe.tex @@ -145,6 +145,8 @@ \long\def\dosetlanguagespecifics#1#2% {%ifundefined{\??la\languageencoding#2\??la}\letvalue{\??la\languageencoding#2\??la}\empty\fi \ifundefined{\??la\languageencoding#2\??la}\forgetlanguagespecifics[#2]\fi + % the next line catches the case that specifics are enabled *before* they are defined + \expandafter\ifx\csname\??la\languageencoding#2\??la\endcsname\relax\forgetlanguagespecifics[#2]\fi \appendvalue{\??la\languageencoding#2\??la}{#1}% \bgroup \setbox\scratchbox\hbox{\enablelanguagespecifics[#2]}% diff --git a/tex/context/base/m-gnuplot.tex b/tex/context/base/m-gnuplot.tex new file mode 100644 index 000000000..17900bcdb --- /dev/null +++ b/tex/context/base/m-gnuplot.tex @@ -0,0 +1,156 @@ +%D \module +%D [ file=m-gnuplot, +%D version=2006.01.04, +%D title=\CONTEXT\ Extra Modules, +%D subtitle=\GNUPLOT\ Inclusion, +%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. + +% todo: reuse (only if really needed) + +% \enablemode[demo] + +%D example: +%D +%D \starttyping +%D texexec --pdf --mode=demo m-gnuplot +%D \stoptyping + +\unprotect + +\ifx\operatingsystem\undefined \def\operatingsystem{unix} \fi % texexec will set that + +\newcounter\GNUPLOTnumber + +\def\startGNUPLOTinclusions + {\bgroup + \obeylines + \dostartGNUPLOTinclusions} + +\def\dostartGNUPLOTinclusions#1\stopGNUPLOTinclusions + {\gdef\GNUPLOTinclusions{#1}% + \egroup} + +\let\GNUPLOTinclusions\empty + +\def\startGNUPLOTgraphic#1% + {\bgroup + \obeylines + \dostartGNUPLOTgraphic{#1}} + +\def\dostartGNUPLOTgraphic#1#2\stopGNUPLOTgraphic + {\doglobal\increment\GNUPLOTnumber + \letgvalue{gpg:n:#1}\GNUPLOTnumber + \setgvalue{gpg:d:\GNUPLOTnumber}{#2}% + \egroup} + +\def\useGNUPLOTgraphic + {\dodoubleempty\douseGNUPLOTgraphic} + +\def\douseGNUPLOTgraphic[#1][#2]% + {\iffirstargument + \@EA\dodouseGNUPLOTgraphic % like \externalfigure[name][optional args] + \else + \@EA\redouseGNUPLOTgraphic % like \useMPgraphic{name} + \fi[#1][#2]} + +\def\redouseGNUPLOTgraphic[#1][#2]#3% + {\dodouseGNUPLOTgraphic[#3][]} + +% \bgroup +% \obeylines +% \gdef\fixGNUPLOTnewlines% +% {\def\par{;\@@svline}% +% \def ^^M{;\@@svline}} +% \egroup + +\ifx\systemendofline\undefined \def\systemendofline{\rawcharacter{10}} \fi + +\bgroup + \gdef\fixGNUPLOTnewlines{\obeylines\def\obeyedline{;\systemendofline}} +\egroup + +\def\dodouseGNUPLOTgraphic[#1][#2]% + {\bgroup + \doifdefined{gpg:n:#1} + {\edef\GNUPLOTnumber{\getvalue{gpg:n:#1}}% + \edef\GNUPLOTfile {\bufferprefix gnuplot-\GNUPLOTnumber}% + \bgroup + % hm, gnuplot only seems to handle lf so we cannot use \mappartolineend + % also, in order to prevent fuzzy runs (or no runs) we add a ; to each line + \fixGNUPLOTnewlines + \immediate\openout\scratchwrite=\GNUPLOTfile.gpd + \immediate\write\scratchwrite{set terminal \@@GNUPLOTmethod\space\@@GNUPLOToption}% + \doifnotempty + {\GNUPLOTinclusions}{\immediate\write\scratchwrite{\GNUPLOTinclusions}}% + \immediate\write\scratchwrite{set output "\GNUPLOTfile.\@@GNUPLOTsuffix"}% + \immediate\write\scratchwrite{\getvalue{gpg:d:\GNUPLOTnumber}}% + \immediate\write\scratchwrite{quit}% + \immediate\closeout\scratchwrite + \egroup + \processGNUPLOTgraphic + \convertGNUPLOTgraphic + \externalfigure[\@@GNUPLOTresult][#2]}% + \egroup} + +% we assume pdf inclusion, eps wil be implemented when applicable + +\def\setupGNUPLOT + {\dodoubleempty\getparameters[@@GNUPLOT]} + +\def\processGNUPLOTgraphic + {\doifelse\operatingsystem{mswin} + {\executesystemcommand{start /MIN pgnuplot \GNUPLOTfile.gpd}} % start is needed else gp fails + {\executesystemcommand{gnuplot \GNUPLOTfile.gpd}}} + +\def\convertGNUPLOTgraphic + {\doifsomething\@@GNUPLOThandle{\executesystemcommand{\@@GNUPLOThandle}}} + +\def\defineGNUPLOThandle#1#2#3#4#5% name output suffix conversion-method result + {\setvalue{@@GNUPLOT-#1}{{#2}{#3}{#4}{#5}}} + +\def\@@GNUPLOToutput{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}41} +\def\@@GNUPLOTsuffix{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}42} +\def\@@GNUPLOThandle{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}43} +\def\@@GNUPLOTresult{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}44} + +\defineGNUPLOThandle{postscript}{postscript}{ps} {texmfstart newpstopdf --method=raw \GNUPLOTfile.ps}{\GNUPLOTfile.pdf} +\defineGNUPLOThandle{ps} {postscript}{ps} {texmfstart newpstopdf --method=raw \GNUPLOTfile.ps}{\GNUPLOTfile.pdf} +\defineGNUPLOThandle{pdf} {pdf} {pdf}{} {\GNUPLOTfile.pdf} +\defineGNUPLOThandle{metapost} {mp} {mp} {texmfstart mptopdf \GNUPLOTfile.mp} {\GNUPLOTfile-0.pdf} +\defineGNUPLOThandle{mp} {mp} {mp} {texmfstart mptopdf \GNUPLOTfile.mp} {\GNUPLOTfile-0.pdf} +\defineGNUPLOThandle{png} {png} {png}{} {\GNUPLOTfile.png} + +\setupGNUPLOT[\c!method=ps,\c!option=] + +\protect \doifnotmode{demo}{\endinput} + +\starttext + +\startGNUPLOTinclusions + set title "trigonometry" +\stopGNUPLOTinclusions + +\startGNUPLOTgraphic{sin} + plot sin(x) +\stopGNUPLOTgraphic + +\startGNUPLOTgraphic{cos} + plot cos(x) +\stopGNUPLOTgraphic + +\useGNUPLOTgraphic{sin} \endgraf +\useGNUPLOTgraphic{cos} \endgraf +\useGNUPLOTgraphic[cos] \endgraf + +\setupGNUPLOT[method=ps] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank +%setupGNUPLOT[method=pdf] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank +\setupGNUPLOT[method=png] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank +\setupGNUPLOT[method=mp] \useGNUPLOTgraphic[sin][object=no,height=2cm,option=color] \blank + +\stoptext diff --git a/tex/context/base/m-pstric.tex b/tex/context/base/m-pstric.tex index 707984d28..ac018fe07 100644 --- a/tex/context/base/m-pstric.tex +++ b/tex/context/base/m-pstric.tex @@ -65,45 +65,45 @@ \def\startPSTRICKS {\dosingleempty\dostartPSTRICKS} -\ifx\startTEXapplication\undefined - -\long\def\dostartPSTRICKS[#1]#2\stopPSTRICKS - {\doifelse{\jobsuffix}{dvi} - {#2} - {\bgroup - \setbuffer[pstricks]% - \usemodule[pstric]% - \setbox\scratchbox\hbox{#2}% - % There is probably a nicer way to handle this - \immediate\openout\scratchwrite=\bufferprefix dim.tmp - \immediate\write\scratchwrite{\dimen0=\the\ht\scratchbox}% - \immediate\write\scratchwrite{\dimen2=\the\wd\scratchbox}% - \immediate\closeout\scratchwrite - % Quick and dirty - \startTEXpage[#1]\box\scratchbox\stopTEXpage - \endbuffer - % Here we go! - %\immediate\write18{texexec \bufferprefix pstricks.tmp --once --batch}% - %\immediate\write18{dvips -G0 -Ppdf \bufferprefix pstricks -o}% - %\immediate\write18{ps2pdf \bufferprefix pstricks.ps \bufferprefix pstricks.pdf}% - \executesystemcommand{texexec \bufferprefix pstricks.tmp --once --batch}% - \executesystemcommand{dvips -G0 -Ppdf \bufferprefix pstricks -o}% - \executesystemcommand{ps2pdf \bufferprefix pstricks.ps \bufferprefix pstricks.pdf}% - % We pick up the dimensions from the scratch file. - \readlocfile{\bufferprefix pstricks-dim.tmp}{}{}% - % Since the graphic is put on a page (sigh) by dvips/gs - % we need to shift it around a bit. - \setbox\scratchbox\hbox - {\externalfigure[\bufferprefix pstricks.pdf][\c!object=\v!no]}% - \setbox\scratchbox\hbox - {\lower\ht\scratchbox\hbox{\raise\dimen2\box\scratchbox}}% - \wd\scratchbox\dimen0 - \ht\scratchbox\dimen2 - \dp\scratchbox\zeropoint - \box\scratchbox - \egroup}} - -\fi +% \ifx\startTEXapplication\undefined +% +% \long\def\dostartPSTRICKS[#1]#2\stopPSTRICKS +% {\doifelse{\jobsuffix}{dvi} +% {#2} +% {\bgroup +% \setbuffer[pstricks]% +% \usemodule[pstric]% +% \setbox\scratchbox\hbox{#2}% +% % There is probably a nicer way to handle this +% \immediate\openout\scratchwrite=\bufferprefix dim.tmp +% \immediate\write\scratchwrite{\dimen0=\the\ht\scratchbox}% +% \immediate\write\scratchwrite{\dimen2=\the\wd\scratchbox}% +% \immediate\closeout\scratchwrite +% % Quick and dirty +% \startTEXpage[#1]\box\scratchbox\stopTEXpage +% \endbuffer +% % Here we go! +% %\immediate\write18{texexec \bufferprefix pstricks.tmp --once --batch}% +% %\immediate\write18{dvips -G0 -Ppdf \bufferprefix pstricks -o}% +% %\immediate\write18{ps2pdf \bufferprefix pstricks.ps \bufferprefix pstricks.pdf}% +% \executesystemcommand{texexec \bufferprefix pstricks.tmp --once --batch}% +% \executesystemcommand{dvips -G0 -Ppdf \bufferprefix pstricks -o}% +% \executesystemcommand{texmfstart pstopdf \bufferprefix pstricks.ps \bufferprefix pstricks.pdf}% +% % We pick up the dimensions from the scratch file. +% \readlocfile{\bufferprefix pstricks-dim.tmp}{}{}% +% % Since the graphic is put on a page (sigh) by dvips/gs +% % we need to shift it around a bit. +% \setbox\scratchbox\hbox +% {\externalfigure[\bufferprefix pstricks.pdf][\c!object=\v!no]}% +% \setbox\scratchbox\hbox +% {\lower\ht\scratchbox\hbox{\raise\dimen2\box\scratchbox}}% +% \wd\scratchbox\dimen0 +% \ht\scratchbox\dimen2 +% \dp\scratchbox\zeropoint +% \box\scratchbox +% \egroup}} +% +% \fi \long\def\dostartPSTRICKS[#1]#2\stopPSTRICKS {\doifelse{\jobsuffix}{dvi} % will some day move to app as switch diff --git a/tex/context/base/m-units.tex b/tex/context/base/m-units.tex index 35f870bbf..8e0883a78 100644 --- a/tex/context/base/m-units.tex +++ b/tex/context/base/m-units.tex @@ -59,6 +59,11 @@ 1: folositi \string\Degrees\space\string\Celsius\space in locul \string\Celsius ! \stopmessages +\startmessages french library: units + title: units + 1: utilisez \string\Degrees\space\string\Celsius\space à la place de \string\Celsius ! +\stopmessages + \unprotect %D This runtime loadable module implements a way of defining diff --git a/tex/context/base/math-eul.tex b/tex/context/base/math-eul.tex index 230f7ae11..f89b54125 100644 --- a/tex/context/base/math-eul.tex +++ b/tex/context/base/math-eul.tex @@ -119,7 +119,7 @@ \definemathcharacter [A] [nothing] [mr] ["41] \definemathcharacter [B] [nothing] [mr] ["42] \definemathcharacter [C] [nothing] [mr] ["43] -\definemathcharacter [D] [nothing] [mr] ["45] +\definemathcharacter [D] [nothing] [mr] ["44] \definemathcharacter [E] [nothing] [mr] ["45] \definemathcharacter [F] [nothing] [mr] ["46] \definemathcharacter [G] [nothing] [mr] ["47] diff --git a/tex/context/base/meta-ini.tex b/tex/context/base/meta-ini.tex index 6d054b0fb..16dc96138 100644 --- a/tex/context/base/meta-ini.tex +++ b/tex/context/base/meta-ini.tex @@ -55,6 +55,11 @@ 1: se incarca biblioteca metapost -- \stopmessages +\startmessages french library: metapost + title: metapost + 1: chargement de la bibliothèque metapost -- +\stopmessages + %D This module extends the functionality of the support module %D \type {supp-mps}, the module that is responsible for %D \METAPOST\ inclusion in \CONTEXT. Some basic macros will be @@ -635,10 +640,9 @@ \def\douseMPlibrary#1% {\ifundefined{\c!file\f!javascriptprefix#1}% \letvalueempty{\c!file\f!javascriptprefix#1}% - \makeshortfilename[\f!metapostprefix#1] - \showmessage\m!metapost1{#1} + \makeshortfilename[\truefilename{\f!metapostprefix#1}]% \startreadingfile - \readsysfile\shortfilename\donothing\donothing + \readsysfile\shortfilename{\showmessage\m!metapost1{#1}}\donothing \stopreadingfile \fi} @@ -674,7 +678,7 @@ \def\MPtext #1{\executeifdefined{\@@MPT#1}\empty} \def\MPstring #1{"\executeifdefined{\@@MPT#1}\empty"} -\def\MPbetex #1{btex \executeifdefined{\@@MPT#1}\empty etex} +\def\MPbetex #1{btex \executeifdefined{\@@MPT#1}\empty\space etex} %D Unfortunately \METAPOST\ does not have \CMYK\ support %D built in, but by means of specials we can supply the diff --git a/tex/context/base/mult-com.tex b/tex/context/base/mult-com.tex index 842b3cafe..05e7c66e5 100644 --- a/tex/context/base/mult-com.tex +++ b/tex/context/base/mult-com.tex @@ -54,1801 +54,2363 @@ \startcommands dutch english german czech italian romanian + french language: taal language sprache jazyk lingua limba + langue mainlanguage: hoofdtaal mainlanguage hauptsprache hlavnijazyk linguaprincipale limbaprincipala + langueprincipale translate: vertaal translate uebersetzten prelozit traduci traduce + traduire installlanguage: installeertaal installlanguage installieresprache instalacejazyka installalingua instalarelimba + installelangue setuplanguage: steltaalin setuplanguage stellespracheein nastavjazyk impostalingua setarelimba + reglelangue showmakeup: toonopmaak showmakeup zeigeumbruch ukazupravu mostramakeup afiseazamakeup + montremakeup useencoding: usecodering useencoding benutzekodierung uzijkodovani usacodifica folosestecodificarea + utiliseencodage usespecials: gebruikspecials usespecials benutzespezielles uzijspeciality usaspecialita folosestespeciale + utilisespecialites defineoutput: definieeruitvoer defineoutput defineoutput definujvystup definiscioutput definesteoutput + definitsortie setupoutput: steluitvoerin setupoutput stelleausgabeein nastavvystup impostaoutput setareoutput + reglesortie defineaccent: definieeraccent defineaccent definiereakzent definujakcent definisciaccento definesteaccent + definitaccent definecharacter: definieerkarakter definecharacter definierezeichen definujznak definiscicarattere definestecaracter + definicaractere definecommand: definieercommando definecommand definierebefehl definujprikaz definiscicomando definestecomanda + definitcommande startcoding: startcodering startcoding startkodierung startkodovani iniziacodifica startcodificare + demarrecodage stopcoding: stopcodering stopcoding stopkodierung stopkodovani terminacodifica stopcodificare + stoppecodage definebodyfontenvironment: definieerkorpsomgeving definebodyfontenvironment definierefliesstextumgebung definujprostredizakladnihofontu definisciambientefontdeltesto definestemediulfonttext + definitenvironnementpolicecorps setupbodyfontenvironment: stelkorpsomgevingin setupbodyfontenvironment stellefliesstextumgebungein nastavprostredizakladnihofontu impostaambientefontdeltesto seteazamediulfonttext + regleenvironnementpolicecorps definebodyfont: definieerkorps definebodyfont definierefliesstext definujzakladnifont definiscifontdeltesto definestefonttext + definitpolicecorps definefont: definieerfont definefont definiereschrift definujfont definiscifont definestefont + definitpolice definefontsynonym: definieerfontsynoniem definefontsynonym defineschriftsynonym definujsynonumumfontu definiscisinonimofont definestesinonimfont + definitsynonymepolice definestyle: definieerletter definestyle definierestil definujstyl definiscistile definestestil + definitstyle definefontstyle: definieerfontstijl definefontstyle definiereschriftstil definujstylfontu definiscistilefont definestestilfont + definitstylepolice setupstrut: stelstrutin setupstrut setupstrut setupstrut impostastrut seteazastrut + reglestrut setuptype: steltypein setuptype stelletipein nastavtype impostatype seteazatype + regletype type: type type tippen opis type type + dactylographier typ: typ typ tip pis typ typ + typ arg: arg arg arg arg arg arg + arg tex: tex tex tex tex tex tex + tex definetyping: definieertypen definetyping definieretippen definujopis definiscityping definestetyping + definitdactylo definetype: definieertype definetype definetype definetype definiscitype definetype + definittype setuptyping: steltypenin setuptyping stelletippenein nastavopis impostatyping seteazatyping + regledactylo typefile: typefile typefile tippedatei opissoubor typefile typefile + fichierdactylo setupfootnotes: stelvoetnotenin setupfootnotes stellefussnotenein nastavpoznamkypodcarou impostanotepdp seteazanotasubsol + reglenotepdp setupfootnotedefinition: stelvoetnootdefinitiein setupfootnotedefinition stellefussnotendefinitionein nastavdefinicipoznamekpodcarou impostadefinizionenotepdp seteazadefinireanotasubsol + definitnotepdp note: noot note notiz poznamka nota nota + note footnote: voetnoot footnote fussnote poznamkapodcarou notapdp notasubsol + notepdp footnotetext: voetnoottekst footnotetext footnotetext footnotetext testonotapdp footnotetext + textenotepdp startlocalfootnotes: startlokalevoetnoten startlocalfootnotes startlokalefussnoten startlokalnipoznamkypodcarou inizianotepdplocali startnotesubsollocale + demarrenotespdplocales stoplocalfootnotes: stoplokalevoetnoten stoplocalfootnotes stoplokalefussnoten stoplokalnipoznamkypodcarou terminanotepdplocali stopnotesubsollocale + stoppenotespdplocales placelocalfootnotes: plaatslokalevoetnoten placelocalfootnotes platzierelokalefussnoten umistilokalnipoznamkypodcarou mettinotepdplocali punenotesubsollocale + placenotespdplocales placefootnotes: plaatsvoetnoten placefootnotes platzierefussnoten umistipoznamkypodcarou mettinotepdp punenotesubsol + placenotespdp currentdate: huidigedatum currentdate heutigesdatum aktualnidatum datadioggi datacurenta + datecourante date: datum date datum datum data data + date weekday: weekdag weekday wochentag vsedniden giornosettimana zidinsaptamana + joursemaine WEEKDAY: WEEKDAG WEEKDAY WOCHENTAG VSEDNIDEN GIORNOSETTIMANA ZIDINSAPTAMANA + JOURSEMAINE month: maand month monat mesic mese luna + mois MONTH: MAAND MONTH MONAT MESIC MESE LUNA + MOIS Numbers: Cijfers Numbers Ziffern Cisla Numeri Numere + Numeros numbers: cijfers numbers ziffern cisla numeri numere + numeros romannumerals: romeins romannumerals roemischezahlen rimskecislice numeriromani numereromane + chiffresromains Romannumerals: Romeins Romannumerals Roemischezahlen Rimskecislice Numeriromani Numereromane + Chiffresromains character: letter character buchstabe znak lettera litera + caractere Character: Letter Character Buchstabe Znak Lettera Litera + Caractere characters: letters characters buchstaben znaky lettere litere + caracteres Characters: Letters Characters Buchstaben Znaky Lettere Litere + Caracteres unknown: onbekend unknown unbekant neznamo ignoto necunoscut + inconnu definesymbol: definieersymbool definesymbol definieresymbol definujsymbol definiscisimbolo definestesimbol + definitsymbole definefiguresymbol: definieerfiguursymbool definefiguresymbol definiereabbsymbol definujobrazeksymbol definiscifigurasimbolo definestesimbolfigura + definitsymbolefigure symbol: symbool symbol symbol symbol simbolo simbol + symbole setupsymbolset: stelsymboolsetin setupsymbolset stellesymbolsetein nastavsadusymbolu impostasetsimboli seteazasimbol + reglejeusymboles showsymbolset: toonsymboolset showsymbolset showsymbolset ukazsadusymbolu mostrasetsimboli afiseazasetsimboluri + montrejeusymboles startsymbolset: startsymboolset startsymbolset startsymbolset startsadasymbolu iniziasetsimboli startsetsimboluri + demarrejeusymboles usesymbols: gebruiksymbolen usesymbols verwendesymbole uzijsymbol usasimboli folosestesimboluri + utilisesymboles defineconversion: definieerconversie defineconversion definierekonversion definujkonverzi definisciconversione definesteconversie + definitconversion convertnumber: converteernummer convertnumber konvertierezahl konvertujcislo convertinumero convertestenumar + convertitnumero setupcapitals: stelkapitalenin setupcapitals stelleversalienein nastavkapitalky impostamaiuscole seteazamajuscule + reglecapitales smallcapped: kap cap kap kap cap kap + cap notsmallcapped: nokap nocap nokap nokap nocap nokap + nocap CAPPED: KAP CAP KAP KAP CAP KAP + CAP SmallCapped: Kap Cap Kap Kap Cap Kap + Cap SmallCaps: Kaps Caps Kaps Kaps Caps Kaps + Caps WORD: WOORD WORD WORT SLOVO PAROLA CUVANT + MOT WORDS: WOORDEN WORDS WOERTER SLOVA PAROLE CUVINTE + MOTS Word: Woord Word Wort Slovo Parola Cuvant + Mot Words: Woorden Words Woerter Slova Parole Cuvinte + Mots stretched: uitgerekt stretched gestreckt roztazene stirato intins + etire overstrike: doorstreep overstrike durchgestrichen preskrtnuto sbarrato liniepeste + surlignetout overstrikes: doorstrepen overstrikes durchstreichen preskrtnuti sbarrati liniipeste + surligne overbar: overstreep overbar ueberstrichen nadtrzeno sopralinea barasus + overbar overbars: overstrepen overbars ueberstreichen nadtrzeni sopralinee supralinie + overbars underbar: onderstreep underbar unterstrichen podtrzeno sottolinea sublinie + souslignetout underbars: onderstrepen underbars unterstreichen podtrzeni sottolinee sublinii + sousligne setupunderbar: stelonderstrepenin setupunderbar stelleunterstreichenein nastavpodtrzeni impostasottolinea seteazasublinie + reglesouslignage setupbodyfont: stelkorpsin setupbodyfont stellefliesstextein nastavzakladnifont impostafontdeltesto seteazafonttext + reglepolicecorps switchtobodyfont: switchnaarkorps switchtobodyfont wechselezumfliesstext prepninazakladnifont cambiaafontdeltesto trecilafonttext + changepolicecorps showbodyfont: toonkorps showbodyfont zeigefliesstext ukazzakladnifont mostrafontdeltesto afiseazafonttext + montrepolicecorps showbodyfontenvironment: toonkorpsomgeving showbodyfontenvironment zeigefliesstextumgebung ukazpostredizakladnihofontu mostraambientefontdeltesto afiseazamediufonttext + montreenvironnementpolicecorps headtext: koptekst headtext ueberschrifttext texthlavicky testoinstestazioni texttitlu + textetete labeltext: labeltekst labeltext labeltext textpopisku testoetichetta texteticheta + labeltexte LABELTEXT: LABELTEKST LABELTEXT LABELTEXT TEXTPOPISKU TESTOETICHETTA TEXTETICHETA + LABELTEXTE setupheadtext: stelkoptekstin setupheadtext stelleueberschrifttextein nastavtexthlavicky impostatestointestazioni seteazatexttitlu + regletextetete setuplabeltext: stellabeltekstin setuplabeltext stellelabeltextein nastavtextpopisku impostatestoetichette seteazatexteticheta + reglelabeltexte marginrule: kantlijn marginrule marginallinie marginalnilinka lineamargine liniemargine + margereglee startmarginrule: startkantlijn startmarginrule startmarginallinie startmarginalnilinka inizialineamargine startliniemargine + demarremargereglee stopmarginrule: stopkantlijn stopmarginrule stopmarginallinie stopmarginalnilinka terminalineamargine stopliniemargine + stoppemargereglee setupmarginrules: stelkantlijnin setupmarginrules stellemarginallinieein nastavmarginalnilinky impostalineemargine seteazaliniimargine + reglemargereglee blackrule: blokje blackrule rechteck cernalinka lineanera linieneagra + lignenoire blackrules: blokjes blackrules rechtecke cernelinky lineenere liniinegre + lignesnoires setupblackrules: stelblokjesin setupblackrules stellerechteckein nastavcernelinky impostalineenere seteazaliniinegre + reglelignesnoires setupscreens: stelrastersin setupscreens stellerasterein nastavrastr impostaschermi seteazaecrane + regleecrans framed: omlijnd framed umrahmt oramovani incorniciato framed + framed inframed: inlijnd inframed imumriss zaramovani circondato inframed + inframed mframed: wilijnd maframed maumrise maoramovani maframed maframed + mframed inmframed: inwilijnd inmaframed immaumrise mazaramovani inmaframed inmaframed + inmframed setupframed: stelomlijndin setupframed stelleumrahmtein nastavoramovani impostaincorniciato seteazainconjurat + regleencadre setuplinewidth: stellijndiktein setuplinewidth stellelinienbreiteein nastavsirkucary impostaampiezzariga seteazagrosimelinie + regleepaisseurligne setupthinrules: steldunnelijnenin setupthinrules stelleduennerumrissein nastavtenkelinky impostalineesottili seteazaliniesubtire + regletraitsfins thinrule: dunnelijn thinrule duennelinie tenkalinka lineasottile liniesubtire + traitfin thinrules: dunnelijnen thinrules duennerumriss tenkelinky lineesottili liniisubtiri + traitsfins hairline: haarlijn hairline haarlinie vlasovalinka capello firdepar + ligneh vl: vl vl vl vl vl vl + vl hl: hl hl hl hl hl hl + hl defineframed: definieeromlijnd defineframed definiereumrahmt definujoramovani definisciincorniciato definesteinconjurare + defineframed defineframedtext: definieerkadertekst defineframedtext definiereumrahmtertext definujoramovanytext definiscitestoincorniciato definestetextinconjurat + defineframedtext setupframedtexts: stelkadertekstenin setupframedtexts stelleumrahmtetexteein nastavoramovanetexty impostatestiincorniciati definestetexteinconjurate + setupframedtexts defineoverlay: definieeroverlay defineoverlay definiereoverlay definujprekryv definiscisovrapposizione definesteoverlay + definitrevetement definelayer: definieerlayer definelayer definelayer definelayer definelayer definelayer + definitcalque background: achtergrond background hintergrund pozadi sfondo fundal + arriereplan startbackground: startachtergrond startbackground starthintergrund startpozadi iniziasfondo startfundal + demarrearriereplan stopbackground: stopachtergrond stopbackground stophintergrund stoppozadi terminasfondo stopfundal + stoppearriereplan setupbackground: stelachtergrondin setupbackground stellehintergrundein nastavpozadi impostasfondo seteazafundal + reglearriereplan fillinrules: invullijnen fillinrules gefuelltesrechteck vyplnovelinky % ve formulari lineeriempimento rigleumplere + remplitlignesreglees setupfillinrules: stelinvullijnenin setupfillinrules stellegefuelltesrechteckein nastavvyplnovelinky impostalineeriempimento seteazarigleumplere + regleremplitlignesreglees fillintext: invultekst fillintext ausfuelltext vyplnenytext testoriempimento textumplere + remplittexte setupfillinlines: stelinvulregelsin setupfillinlines stellegefuelltezeileein nastavvyplnoveradky impostarigheriempimento seteazaliniiumplere + regleremplitligne fillinline: invulregel fillinline gefuelltezeile vyplnovyradek rigariempimento linieumplere + remplitligne setuptextrules: steltekstlijnenin setuptextrules stelletextumrissein nastavtextovelinky impostalineetesto seteazarigletext + reglelignesreglestexte textrule: tekstlijn textrule textlinie textovalinka lineatesto riglatext + ligneregleetexte starttextrule: starttekstlijn starttextrule starttextlinie starttextovalinka inizialineatesto startriglatext + demarreligneregleetexte stoptextrule: stoptekstlijn stoptextrule stoptextlinie stoptextovalinka terminalineatesto stopriglatext + stoppeligneregleetexte usemodule: gebruikmodule usemodule verwendemodul uzijmodul usamodulo folosestemodul + utilisemodule usemodules: gebruikmodules usemodules verwendemodule uzijmoduly usamoduli folosestemodule + utilisemodules starttext: starttekst starttext starttext starttext iniziatesto starttext + demarretexte stoptext: stoptekst stoptext stoptext stoptext terminatesto stoptext + stoppetexte margintitle: margetitel margintitle marginaltitel marginalninadpis titoloinmargine titlumarginal + titremarge marginword: margewoord marginword marginalwort marginalnislovo parolainmargine cuvantmarginal + motmarge margintext: margetekst margintext marginaltext marginalnitext testoinmargine textmarginal + textemarge inleft: inlinker inleft imlinken vlevo insinistra instanga + dansgauche inmargin: inmarge inmargin inmarginalie naokraj inmargine marginal + dansmarge inothermargin: inanderemarge inothermargin inanderermarginale nadruhyokraj inaltromargine inaltamargine + dansautremarge inright: inrechter inright imrechten vpravo indestra indreapta -ininner: inbinnen ininner - ininner ininner - ininner ininner -inouter: inbuiten inouter - inouter inouter - inouter inouter + dansdroite + ininner: inbinnen ininner + ininner ininner + ininner ininner + ininner + inouter: inbuiten inouter + inouter inouter + inouter inouter + inouter startmarginblock: startmargeblok startmarginblock startmarginalblock startmarginalniblok iniziabloccomargine startblocmarginal + demarreblocmarge stopmarginblock: stopmargeblok stopmarginblock stopmarginalblock stopmarginalniblok terminabloccomargine stopblocmarginal -defineinmargin: definieerinmarge defineinmargin - defineinmargin defineinmargin - defineinmargin defineinmargin + stoppeblocmarge + defineinmargin: definieerinmarge defineinmargin + defineinmargin defineinmargin + defineinmargin defineinmargin + definitdansmarge setupinmargin: stelinmargein setupinmargin stelleinmarginalieein nastavmarginalie impostainmargine seteazamarginal + regledansmarge setupmarginblocks: stelmargeblokkenin setupmarginblocks stellemarginalblockein nastavmarginalniblok impostablocchimargine seteazablocurimarginale + regleblocmarge inleftedge: inlinkerrand inleftedge imlinkenrand nalevo inlatosinistro inparteastanga + dansbordgauche inleftmargin: inlinkermarge inleftmargin inlinkermarginale nalevyokraj inmarginesinistro inmargineastanga + dansmargegauche inrightmargin: inrechtermarge inrightmargin inrechtermarginale napravyokraj inmarginedestro inmargineadreapta + dansmargedroite inrightedge: inrechterrand inrightedge imrechtenrand napravo inlatodestro inparteadreapta - atleftmargin: oplinkermarge atleftmargin - atleftmargin atleftmargin - atleftmargin atleftmargin -atrightmargin: oprechtermarge atrightmargin - atrightmargin atrightmargin - atrightmargin atrightmargin - + dansborddroit + atleftmargin: oplinkermarge atleftmargin + atleftmargin atleftmargin + atleftmargin atleftmargin + atleftmargin + atrightmargin: oprechtermarge atrightmargin + atrightmargin atrightmargin + atrightmargin atrightmargin + atrightmargin wordright: woordrechts wordright wortrechts slovovpravo paroladestra cuvantdreapta + motdroit defineblank: definieerblanko defineblank definiereblanko definujpreskok definiscirigovuoto definesteblanc + definitvide blank: blanko blank blanko preskoc rigovuoto blanc + vide setupblank: stelblankoin setupblank stelleblankoein nastavpreskok impostarigovuoto seteazablanc + definitvide correctwhitespace: corrigeerwitruimte correctwhitespace korrigierezwischenraum korekcebilehomista correggispaziobianco corecteazaspatiualb + corrigeespaceblanc fixedspaces: vastespaties fixedspaces festesspatium tvrdemezery spazifissi spatiifixate + espacesfixes fixedspace: vastespatie fixedspace festesspatium tvrdamezera spaziofisso spatiufixat + espacefixe nospace: geenspatie nospace keinspatium zadnamezera nientespazio faraspatiu + sansespace space: spatie space spatium mezera spazio spatiu + espace nowhitespace: geenwitruimte nowhitespace keinzwischenraum zadnebilemisto nientespaziobianco faraspatiualb + sansespaceblanc packed: opelkaar packed kleinerdurchschuss zhustene impaccato impachetat + groupe startpacked: startopelkaar startpacked startkleinerdurchschuss startzhustene iniziaimpaccato startimpachetat + demarregroupe stoppacked: stopopelkaar stoppacked stopkleinerdurchschuss stopzhustene terminaimpaccato stopimpachetat + stoppegroupe startunpacked: startvanelkaar startunpacked startgrosserdurchschuss startnezhustene iniziaunpacked startneimpachetat + demarredegroupe stopunpacked: stopvanelkaar stopunpacked stopgrosserdurchschuss stopnezhustene terminaunpacked stopneimpachetat + stoppedegroupe startlinecorrection: startregelcorrectie startlinecorrection startzeilenkorrektur startkorekceradku iniziacorrezioneriga startcorectielinie + demarrecorrectionligne stoplinecorrection: stopregelcorrectie stoplinecorrection stopzeilenkorrektur stopkorekceradku terminacorrezioneriga stopcorectielinie + stoppecorrectionligne godown: omlaag godown nachunten jdidolu vaigiu injos + vaenbas whitespace: witruimte whitespace zwischenraum bilemisto spaziobianco spatiualb + espaceblanc noindenting: nietinspringen noindenting nichteinziehen zadneodsazovani nienterientro faraaliniat + sansalinea indenting: inspringen indenting einziehen odsazovani rientro aliniat + composeenalinea setupindenting: stelinspringenin setupindenting stelleeinziehenein nastavodsazovani impostarientro seteazaaliniat + reglecomposeenalinea startalignment: startuitlijnen startalignment startausrichtung startzarovnavani iniziaallineamento startaliniere + demarrealignement stopalignment: stopuitlijnen stopalignment stopausrichtung stopzarovnavani terminaallineamento stopaliniere + stoppealignement startlines: startregels startlines startzeilen startradky iniziarighe startlinii + demarrelignes stoplines: stopregels stoplines stopzeilen stopradky terminarighe stoplinii + stoppelignes setupparagraphnumbering: stelparagraafnummerenin setupparagraphnumbering stelleabsatznummerierungein nastavcislovaniodstavcu impostanumerazionecapoversi seteazanumerotareparagrafe + reglenumerotationparagraphe setuplinenumbering: stelregelnummerenin setuplinenumbering stellezeilennumerierungein nastavcislovaniradku impostanumerazionerighe seteazanumerotarelinii + reglenumerotationligne startlinenumbering: startregelnummeren startlinenumbering startzeilennumerierung startcislovaniradku inizianumerazionerighe startnumerotarelinii + demarrenumerotationligne stoplinenumbering: stopregelnummeren stoplinenumbering stopzeilennumerierung stopcislovaniradku terminanumerazionerighe stopnumerotarelinii + stoppenumerotationligne startline: startregel startline startzeile startradek iniziariga startlinie + demarreligne stopline: stopregel stopline stopzeile stopradek terminariga stoplinie + stoppeligne someline: eenregel someline einezeile nejakyradek qualcheriga olinie + uneligne inline: inregel inline inzeile vradku inriga inlinie + alaligne crlf: crlf crlf crlf crlf crlf crlf -emptylines: legeregels emptylines - emptylines emptylines - emptylines emptylines + crlf + emptylines: legeregels emptylines + emptylines emptylines + emptylines emptylines + emptylines setuplines: stelregelsin setuplines stellezeilenein nastavradky impostarighe seteazalinii + reglelignes startnarrower: startsmaller startnarrower startenger startzuzeni iniziapiustretto startingust + demarrecompoetroite stopnarrower: stopsmaller stopnarrower stopenger stopzuzeni terminapiustretto stopingust + stopcompoetroite setupnarrower: stelsmallerin setupnarrower stelleengerein nastavzuzeni impostapiustretto seteazaingust + reglecompoetroite definetabulate: definieertabulatie definetabulate definieretabulator definujtabelaci definiscitabulato definestetabulatori + definittabulation setuptabulate: steltabulatiein setuptabulate stelletabulatorein nastavtabelaci impostatabulato seteazatabulatori + regletabulation starttable: starttabel starttable starttabelle starttabulka iniziatabella starttabel + demarretableau stoptable: stoptabel stoptable stoptabelle stoptabulka terminatabella stoptabel + stoppetableau starttables: starttabellen starttables starttabellen starttabulky iniziatabelle starttabele + demarretableaux stoptables: stoptabellen stoptables stoptabellen stoptabulky terminatabelle stoptabele + stoppetableaux setuptables: steltabellenin setuptables stelletabellenein nastavtabulky impostatabelle seteazatabele + regletableaux definetabletemplate: definieertabelvorm definetabletemplate definieretabellenvorlage definujsablonutabulky definiscimodellotabella definestesablontabel + definittrametableau page: pagina page seite strana pagina pagina + page testcolumn: testkolom testcolumn testcolumn testcolumn testcolumn testcolumn + testcolumn testpage: testpagina testpage testpage testpage testpage testpage - couplepage: koppelpagina couplepage + testpage + couplepage: koppelpagina couplepage doppelseite parovastrana accoppiapagina paginadubla + pagedouble pagetype: soortpagina pagetype seitentyp typstrany tipopagina tippagina + tapepage processpage: verwerkpagina processpage bearbeiteseite zpracujstranu elaborapagina proceseazapagina + traitepage couplepaper: koppelpapier couplepaper doppelseitigespapier dvoustrannypapir accoppiacarta hartiedubla + couplepapier selectpaper: selecteerpapier selectpaper waehlepapieraus vyberpapir selezionacarta selecteazahartie + selectionnepapier screen: scherm screen bildschirm obrazovka schermo ecran + ecran definesection: definieersectie definesection definiereabschnitt definujsekci definiscisezione definestesectiune + definitsection definesectionblock: definieersectieblok definesectionblock definiereabschnittsblock definujbloksekce definiscibloccosezione definesteblocsectiune + definitblocsection setupsectionblock: stelsectieblokin setupsectionblock stelleabschnittsblockein nastavbloksekce impostabloccosezione seteazablocsectiune + regleblocsection setupsection: stelsectiein setupsection stelleabschnittein nastavsekci impostasezione seteazasectiune + reglesection notopandbottomlines: geenbovenenonderregels notopandbottomlines keinzeilenobenundunten zadnehorniadolniradky nientelineecimafondo faraliniisussijos + sanslignessupetinf noheaderandfooterlines: geenhoofdenvoetregels noheaderandfooterlines keinekopfundfusszeilen zadnezahlaviaupati nientelineintestazionepdp faraliniiantetsisubsol + sanslignesenteteetpdp setuptop: stelbovenin setuptop stellenobenein nastavhorejsek impostacima seteazasus + reglesup setuptoptexts: stelboventekstenin setuptoptexts stelletextobenein nastavhornitexty impostatesticima seteazatextesus + regletextessup setupheader: stelhoofdin setupheader stellekopfzeileein nastavzahlavi impostainstestazione seteazaantet + regleentete setupheadertexts: stelhoofdtekstenin setupheadertexts stellekopfzeilentextein nastavtextyzahlavi impostatestiintestazioni seteazatexteantet + regletextesentete setuppagenumbering: stelpaginanummeringin setuppagenumbering stelleseitennummeriernungein nastavcislovanistran impostanumerazionepagina seteazanumerotarepagina - getnumber: haalnummer getnumber - getnumber getnumber - getnumber getnumber -incrementnumber: verhoognummer incrementnumber - nummererhoehen zvysujicicislo - incrementanumero numarincrement -decrementnumber: verlaagnummer decrementnumber - decrementnumber decrementnumber - decrementnumber decrementnumber - resetnumber: resetnummer resetnumber - resetnumber resetnumber - resetnumber resetnumber - setnumber: setnummer setnumber - setnumber setnumber - setnumber setnumber - setupnumber: stelnummerin setupnumber - setupnumber setupnumber - impostanumerazione setupnumber + reglenumerotationpage + getnumber: haalnummer getnumber + getnumber getnumber + getnumber getnumber + getnumber + incrementnumber: verhoognummer incrementnumber + nummererhoehen zvysujicicislo + incrementanumero numarincrement + incrementenumero + decrementnumber: verlaagnummer decrementnumber + decrementnumber decrementnumber + decrementnumber decrementnumber + decrementenumero + resetnumber: resetnummer resetnumber + resetnumber resetnumber + resetnumber resetnumber + raznumero + setnumber: setnummer setnumber + setnumber setnumber + setnumber setnumber + affectenumero + setupnumber: stelnummerin setupnumber + setupnumber setupnumber + impostanumerazione setupnumber + reglenumero setupbottom: stelonderin setupbottom stelleuntenein nastavspodek impostafondo seteazajos + regleinf setupbottomtexts: stelondertekstenin setupbottomtexts stelletextuntenein nastavdolnitexty impostatestifondo seteazatextejos + regletextesinf setupfooter: stelvoetin setupfooter stellefusszeileein nastavupati impostapdp seteazasubsol + reglepdp setupfootertexts: stelvoettekstenin setupfootertexts stellefusszeilentextein nastavtextyupati impostatestipdp seteazatextesubsol + regletextespdp setuppagenumber: stelpaginanummerin setuppagenumber stelleseitennummerein nastavcislostrany impostanumeropagina seteazanumarpagina + reglenumeropage setupsubpagenumber: stelsubpaginanummerin setupsubpagenumber stelleunterseitennummerein nastavpodcislostrany impostanumerosottopagina seteazanumarsubpagina -subpagenumber: subpaginanummer subpagenumber - subpagenumber subpagenumber - subpagenumber subpagenumber + reglesousnumeropage + subpagenumber: subpaginanummer subpagenumber + subpagenumber subpagenumber + subpagenumber subpagenumber + sousnumeropage setuptext: steltekstin setuptext stelletextein nastavtext impostatesto seteazatext + regletexte setuptexttexts: stelteksttekstenin setuptexttexts stelletexttexteein nastavtexttexty impostatestotesti seteazatextetext + regletextestexte definetext: definieertekst definetext definieretext definujtext definiscitesto definestetext + definittexte pagenumber: paginanummer pagenumber seitenummer cislostrany numeropagina numarpagina + numeropage completepagenumber: volledigepaginanummer completepagenumber completepagenumber completepagenumber % TOBIAS % TO numeropaginacompleto completeazanumarpagina % TB TH + completenumeropage placepagenumber: plaatspaginanummer placepagenumber placepagenumber placepagenumber % TOBIAS % TOM mettinumeropagina punenumarpagina % TB TH + placenumeropage items: items items posten polozky elementi element + elements setupitems: stelitemsin setupitems stellepostenein nastavpolozky impostaelementi seteazaelemente + regleelements leftaligned: regellinks leftaligned linksbuendig zarovnanovlevo allineasinistra aliniatstanga + aligneagauche midaligned: regelmidden midaligned zentriert zarovnanonastred allineacentro aliniatcentru + aligneaumilieu rightaligned: regelrechts rightaligned rechtsbuendig zarovnanovpravo allineadestra aliniatdreapta + aligneadroite startcolumns: startkolommen startcolumns startspalten startsloupce iniziacolonne startcoloane + demarrecolonnes stopcolumns: stopkolommen stopcolumns stopspalten stopsloupce terminacolonne stopcoloane + stoppecolonnes setupcolumns: stelkolommenin setupcolumns stellespaltenein nastavsloupce impostacolonne seteazacoloane + reglecolonnes column: kolom column spalte sloupec colonna coloana + colonne head: kop head kopf nadpis - testa titlu % GB + testa titlu + tete but: but but but spodek fondo but + but item: som item pos polozka elemento element + element nop: nop nop nop nop nop nop + nop mar: mar mar mar okr mar mar + mar sym: sym sym sym sym sim sim + sym txt: txt txt txt txt txt txt + txt its: its its its pol % abbr. of polozka (it em) el el % abbr. of elemento (it) element (ro) + el % abbr. of element (fr) ran: ran ran ran ran ran ran -% new + ran headsym: kopsym headsym headsym headsym headsym headsym -% new + headsym defineitemgroup: definieeritemgroep defineitemgroup defineitemgroup defineitemgroup defineitemgroup defineitemgroup + defineitemgroup setupitemgroup: stelitemgroepin setupitemgroup setupitemgroup setupitemgroup setupitemgroup setupitemgroup + setupitemgroup setupitemgroups: stelitemgroepenin setupitemgroups setupitemgroups setupitemgroups setupitemgroups setupitemgroups - -% startitemize: startopsomming startitemize -% startaufzaehlung startvycet -% iniziaelenco startenumerare -% setupitemize: stelopsommingin setupitemize -% stelleaufzaehlungein nastavvycet -% impostaelenco setareenumerare -% stopitemize: stopopsomming stopitemize -% stopaufzaehlung stopvycet -% terminaelenco stopenumerare - - % so far - + setupitemgroups definehead: definieerkop definehead definiereueberschrift definujnadpis definiscitesta definesteantet + definittete setuphead: stelkopin setuphead stelleueberschriftein nastavnadpis impostatesta seteazatitlu + regletete setupheads: stelkoppenin setupheads stelleueberschriftenein nastavnadpisy impostateste seteazatitluri + regletetes setupheadnumber: stelkopnummerin setupheadnumber stellekopfzahlein nastavcislonadpisu impostanumerotesta seteazanumartitlu + reglenumerotete headnumber: kopnummer headnumber kopfnummer cislonadpisu numerotesta numartitlu + numerotete currentheadnumber: huidigekopnummer currentheadnumber heutigeskopfnummer aktualnicislonadpisu numerotestacorrente numartitlucurent + numerotetecourant determineheadnumber: bepaalkopnummer determineheadnumber bestimmekopfnummer stanovcislonadpisu determinanumerotesta determinanumartitlu + determinenumerotete resetmarking: resetmarkering resetmarking ruecksetztenbeschriftung resetznaceni reimpostamarcatura reseteazamarcaje + razmarquage setupmarking: stelmarkeringin setupmarking stellebeschriftungein nastavznaceni impostamarcatura seteazamarcaje + reglemarquage definemarking: definieermarkering definemarking definierebeschriftung definujznaceni definiscimarcatura definestemarcaje + definitmarquage nomarking: geenmarkering nomarking keinebeschriftung zadneznaceni nientemarcatura faramarcaje + sansmarquage marking: markeer marking beschriftung znaceni marcatura marcaje + marquage decouplemarking: ontkoppelmarkering decouplemarking entknuepfebeschriftung rozpojeneznaceni - separamarcatura decupleazamarcaje % GB + separamarcatura decupleazamarcaje + decouplemarquage couplemarking: koppelmarkering couplemarking verknuepfebeschriftung propojeneznaceni - accoppiamarcatura cupleazamarcaje % GB + accoppiamarcatura cupleazamarcaje + couplemarquage getmarking: haalmarkering getmarking holebeschriftung ziskejznaceni - prendimarcatura adumarcaje % GB + prendimarcatura adumarcaje + obtientmarquage definelayout: definieerlayout definelayout definelayout definelayout - definiscilayout definelayout %%% + definiscilayout definelayout + definitdisposition setuplayout: stellayoutin setuplayout stellelayoutein nastavvzhled impostalayout seteazaaspect + regledisposition adaptlayout: paslayoutaan adaptlayout passelayoutan prizpusobvzhled adattalayout adapteazaaspect + adaptedisposition placeongrid: plaatsopgrid placeongrid amgitterausrichten umistinamrizku mettiingriglia plaseazapegrid + placesurgrille moveongrid: verplaatsopgrid moveongrid amgitterneuausrichten premistinamrizku spostaagriglia mutapegrid + deplacesurgrille showsetups: tooninstellingen showsetups zeigeeinstellungen ukaznastaveni mostraimpostazioni afiseazasetari + montrereglages showframe: toonkader showframe zeigerahmen ukazramecek mostracornice afiseazarama + montrecadre showgrid: toongrid showgrid zeigegitter ukazmrizku mostragriglia afiseazagrid + montregrille % toonopbouw: toonopbouw showbuildup % zeigeaufbau ukazstrukturu % mostrabuildup afiseazabuildup showlayout: toonlayout showlayout zeigelayout ukazvzhled mostralyout afiseazaaspect + montredisposition showprint: toonprint showprint zeigedruck ukazvytisk mostrastampa afiseazatiparire + montreedition showstruts: toonstruts showstruts zeigestruts ukazpodpery mostrastruts afiseazastruts + montrestruts definepapersize: definieerpapierformaat definepapersize definierepapierformat definujvelikostpapiru definiscidimensionicarta definestedimensiunehartie + definittaillepapier setuppapersize: stelpapierformaatin setuppapersize stellepapierformatein nastavvelikostpapiru impostadimensionicarta seteazadimensiunihartie -setuppaper: stelpapierin setuppaper - setuppaper setuppaper - setuppaper setuppaper + regletaillepapier + setuppaper: stelpapierin setuppaper + setuppaper setuppaper + setuppaper setuppaper + reglepapier setuparranging: stelarrangerenin setuparranging stelleanordnenein nastavusporadani impostaparranging seteazaaranjareapag + reglearrangement version: versie version version verze versione versiune + version setupbackgrounds: stelachtergrondenin setupbackgrounds stellehintergruendeein nastavpozadi impostasfondi seteazafundaluri + reglearriereplans setupalign: steluitlijnenin setupalign stelleausrichtungein nastavzarovnani impostaallineamento seteazaalinierea + reglealignement setupwhitespace: stelwitruimtein setupwhitespace stellezwischenraumein nastavbilamista impostaspaziobianco seteazaspatiualb + regleespaceblanc setupinteraction: stelinteractiein setupinteraction stelleinteraktionein nastavinterakci impostainterazione seteazainteractiunea + regleinteraction setupinteractionmenu: stelinteractiemenuin setupinteractionmenu stelleinteraktionsmenueein nastavinterakcnimenu impostamenuinterazione seteazameniuinteractiune + reglemenuinteraction defineinteractionmenu: definieerinteractiemenu defineinteractionmenu definiereinteraktionsmenue definujinterakcnimenu definiscimenuinterazione definestemeniuinteractiune + definitmenuinteraction disableinteractionmenu: blokkeerinteractiemenu disableinteractionmenu inaktiviereinteraktionsmenue zablokujinterakcnimenu disabilitamenuinterazione dezactiveazameniuinteractiune + inhibemenuinteraction interactionmenu: interactiemenu interactionmenu interaktionsmenue interaktivnimenu menuinterattivo meniuinteractiune + menuinteraction interactionbuttons: interactiebuttons interactionbuttons interaktionsknopfe interakcnitlacitka pulsantinterazione butoaneinteractiune + boutonsinteraction interactionbar: interactiebalk interactionbar interaktionsbalken interakcnilista barrainterazione barainteractiune + barreinteraction setupinteractionbar: stelinteractiebalkin setupinteractionbar stelleinteraktionsbalkenein nastavinterakcnilistu impostabarrainterazione seteazabarainteractiune + reglebarreinteraction setupinteractionscreen: stelinteractieschermin setupinteractionscreen stelleinteraktionsbildschirmein nastavinterakcniobrazovku impostaschermointerazione seteazaecraninteractiune + regleecraninteraction placebookmarks: plaatsbookmarks placebookmarks platzierebookmarks umistizalozky mettisegnalibro plaseazasemnecarte + placemarquespages bookmark: bookmark bookmark bookmark zalozka segnalibro semncarte + marquepage definelogo: definieerbeeldmerk definelogo definierelogo definujlogo definiscilogo definestelogo + definitlogo placelogos: plaatsbeeldmerken placelogos platzierelogo umistiloga mettiloghi punelogouri - definecolor: definieerkleur definecolor + placelogos + definecolor: definieerkleur definecolor definierefarbe definujbarvu definiscicolore definesteculoare -%definespotcolor: definespotcolor definespotcolor -% definespotcolor definespotcolor -% definespotcolor definespotcolor - definecolorgroup: definieerkleurgroep definecolorgroup + definitcouleur + definecolorgroup: definieerkleurgroep definecolorgroup definierefarbengruppe definujskupinubarev definiscigruppocolori definestegrupculori - definepalet: definieerpalet definepalet + definitgroupecouleur + definepalet: definieerpalet definepalet definierepalette definujpaletu definiscitavolozza definestepaleta - graycolor: grijskleur graycolor + definitpalette + graycolor: grijskleur graycolor graufarbe sedabarva coloregrigio culoaregri - color: kleur color + couleurgrise + color: kleur color farbe barva colore culoare - startcolor: startkleur startcolor + couleur + startcolor: startkleur startcolor startfarbe startbarva iniziacolore startculoare - stopcolor: stopkleur stopcolor + demarrecouleur + stopcolor: stopkleur stopcolor stopfarbe stopbarva terminacolore stopculoare - setupcolors: stelkleurenin setupcolors + stoppecouleur + setupcolors: stelkleurenin setupcolors stellefarbenein nastavbarvy impostacolori seteazaculori - setupcolor: stelkleurin setupcolor + reglecouleurs + setupcolor: stelkleurin setupcolor stellefarbeein nastavbarvu impostacolore seteazaculoare - setuppalet: stelpaletin setuppalet + reglecouleur + setuppalet: stelpaletin setuppalet stellepaletteein nastavpaletu impostatavolozza seteazapaleta - showcolor: toonkleur showcolor + reglepalette + showcolor: toonkleur showcolor zeigefarbe ukazbarvu mostracolore afiseazaculoare - showcolorgroup: toonkleurgroep showcolorgroup + montrecouleur + showcolorgroup: toonkleurgroep showcolorgroup zeigefarbengruppe ukazskupinubarev mostragruppocolori afiseazagrupculoare - showpalet: toonpalet showpalet + montregroupecouleur + showpalet: toonpalet showpalet zeigepalette ukazpaletu mostratavolozza afiseazapaleta - comparecolorgroup: vergelijkkleurgroep comparecolorgroup + montrepalette + comparecolorgroup: vergelijkkleurgroep comparecolorgroup vergleichefarbengruppe porovnejskupinubarev confrontagruppocolori comparagrupculoare - comparepalet: vergelijkpalet comparepalet + comparegroupecouleur + comparepalet: vergelijkpalet comparepalet vergleichepalette porovnejpaletu confrontatavolozza comparapaleta - colorvalue: kleurwaarde colorvalue + comparepalette + colorvalue: kleurwaarde colorvalue farbewert hodnotabarvy valorecolore valoareculoare - greyvalue: grijswaarde greyvalue + valeurcouleur + greyvalue: grijswaarde greyvalue grauwert hodnotasedi valoregrigio valoaregri - startraster: startraster startraster + valeurgris + startraster: startraster startraster startraster startrastr - iniziaraster startraster % GB - stopraster: stopraster stopraster + iniziaraster startraster + demarreraster + stopraster: stopraster stopraster stopraster stoprastr terminaraster stopraster - defineblock: definieerblok defineblock + stopperaster + defineblock: definieerblok defineblock definiereblock definujblok definisciblocco definestebloc - setupblock: stelblokin setupblock + definitbloc + setupblock: stelblokin setupblock stelleblockein nastavblok impostablocco seteazabloc - useblocks: gebruikblokken useblocks + reglebloc + useblocks: gebruikblokken useblocks verwendebloecke uzijbloky usablocco folosestebloc - processblocks: verwerkblokken processblocks + utiliseblocs + processblocks: verwerkblokken processblocks bearbeitebloecke zpracujbloky elaborablocchi proceseazabloc - keepblocks: handhaafblokken keepblocks + traiteblocs + keepblocks: handhaafblokken keepblocks behaltebloecke zachovejbloky tieniblocchi pastreazablocuri - selectblocks: selecteerblokken selectblocks + gardeblocs + selectblocks: selecteerblokken selectblocks waehlebloeckeaus vyberbloky selezionablocchi selecteazablocuri - hideblocks: verbergblokken hideblocks + selectionneblocs + hideblocks: verbergblokken hideblocks verbergebloecke schovejbloky nascondiblocchi ascundeblocuri - bypassblocks: passeerblokken bypassblocks + cacheblocs + bypassblocks: passeerblokken bypassblocks bypassblocks bypassblocks saltablocchi saripesteblocuri - forceblocks: forceerblokken forceblocks + sauteblocs + forceblocks: forceerblokken forceblocks forceblocks forceblocks forzablocchi forteazablocuri - nomoreblocks: geenblokkenmeer nomoreblocks + forceblocs + nomoreblocks: geenblokkenmeer nomoreblocks keinebloeckemehr zadnedalsibloky bastablocchi gatablocuri - definelist: definieerlijst definelist + pasplusdeblocs + definelist: definieerlijst definelist definiereliste definujseznam definiscielenco definestelista - definecombinedlist: definieersamengesteldelijst definecombinedlist + definitliste + definecombinedlist: definieersamengesteldelijst definecombinedlist definierezusammengestellteliste definujkombinovanyseznam definiscielencocombinato definestelistacombinata -listsymbol: lijstsymbool listsymbol - listsymbol listsymbol - listsymbol listsymbol - placelist: plaatslijst placelist + definitlisteimbriquee + listsymbol: lijstsymbool listsymbol + listsymbol listsymbol + listsymbol listsymbol + listesymbole + placelist: plaatslijst placelist platziereliste umistiseznam mettielenco punelista - plaatsruwelijst: plaatsruwelijst placerawlist + placeliste + plaatsruwelijst: plaatsruwelijst placerawlist placerawlist placerawlist placerawlist placerawlist - placecombinedlist: plaatssamengesteldelijst placecombinedlist + placerawlist + placecombinedlist: plaatssamengesteldelijst placecombinedlist platzierezusammengestellteliste umistikombinovanyseznam mettielencocombinato punelistacombinata - writetolist: schrijfnaarlijst writetolist + placelisteinmbriquee + writetolist: schrijfnaarlijst writetolist schreibezurliste zapisdoseznamu scriviinelenco scrieinlista - writebetweenlist: schrijftussenlijst writebetweenlist + ecritdansliste + writebetweenlist: schrijftussenlijst writebetweenlist schreibezwischenliste zapismeziseznam scrividentroelenco scrieintreliste - -% new - + ecritentreliste immediatetolist: directnaarlijst immediatetolist immediatetolist immediatetolist immediatetolist immediatetolist - + immediatetolist immediatebetweenlist: directtussenlijst immediatebetweenlist immediatebetweenlist immediatebetweenlist immediatebetweenlist immediatebetweenlist - + immediatebetweenlist setuplist: stellijstin setuplist stellelisteein nastavseznam impostaelenco seteazalista + regleliste setupcombinedlist: stelsamengesteldelijstin setupcombinedlist stellezusammengestelltelisteein nastavkombinovanyseznam impostaelencocombinato seteazalistacombinata + reglelisteimbriquee determinelistcharacteristics: bepaallijstkenmerken determinelistcharacteristics bestimmelistencharakeristika stanovcharakteristickuseznamu determinacarattersticheelenco determinacaracteristicilelistei + determinecaracteristiqueliste listlength: lijstlengte listlength listenlaenge delkaseznamu lunghezzaelenco lungimelista + llongueurliste listwidth: lijstbreedte listwidth listenbreite sirkaseznamu ampiezzaelenco latimelista + largeurliste listheight: lijsthoogte listheight listenhoehe vyskaseznamu altezzaelenco inaltimelista + hauteurliste nolist: geenlijst nolist keineliste zadnyseznam nienteelenco faralista + sansliste definereferencelist: definieerreferentielijst definereferencelist definierereferenzliste definujseznamodkazu definiscilistariferimenti definestelistareferinte + definitlistereference placereferencelist: plaatsreferentielijst placereferencelist platzierereferenzliste umistiseznamodkazu mettilistariferimenti punelistareferinte + placelistereference writetoreferencelist: schrijfnaarreferentielijst writetoreferencelist schreibezurreferenzliste zapisdoseznamuodkazu scriviinlistariferimenti scrieinlistareferinte + ecritdanslistereference setupreferencelist: stelreferentielijstin setupreferencelist stellereferenzlisteein nastavseznamodkazu impostalistariferimenti seteazalistareferinte + reglelistereference definefloat: definieerplaatsblok definefloat definieregleitobjekt definujplvouciobjekt definiscioggettomobile definestefloat + definitflottant setupfloat: stelplaatsblokin setupfloat stellegleitobjektein nastavplvouciobjekt impostaoggettomobile seteazafloat + regleflottant setupfloats: stelplaatsblokkenin setupfloats stellegleitobjekteein nastavplvouciobjekty impostaoggettimobili seteazafloats + regleflottants splitfloat: splitsplaatsblok splitfloat teilegleitobjekt rozdelplvouciobjekt spezzaoggettomobile impartefloat + separeflottant setupfloatsplitting: stelplaatsbloksplitsenin setupfloatsplitting stelleplatziegeteiltegleitobjekt nastavdeleniplvoucichobjektu impostaspezzamentooggettomobile seteazaimpartireafloat + regleseparationflottant placefloat: plaatsplaatsblok placefloat placefloat placefloat - placefloat placefloat %%% - movesidefloat: verplaatszijblok movesidefloat - movesidefloat movesidefloat - movesidefloat movesidefloat -defineplacement: definieerplaats defineplacement - defineplacement defineplacement - defineplacement defineplacement - setupplacement: stelplaatsin setupplacement - setupplacement setupplacement - setupplacement setupplacement + placefloat placefloat + placeflottant + movesidefloat: verplaatszijblok movesidefloat + movesidefloat movesidefloat + movesidefloat movesidefloat + movesidefloat + defineplacement: definieerplaats defineplacement + defineplacement defineplacement + defineplacement defineplacement + defineplacement + setupplacement: stelplaatsin setupplacement + setupplacement setupplacement + setupplacement setupplacement + setupplacement definecombination: definieercombinatie definecombination definecombination definecombination definecombination definecombination + definecombination startcombination: startcombinatie startcombination startkombination startspojeni iniziacombinazione startcombinare + demarrecombinaison stopcombination: stopcombinatie stopcombination stopkombination stopspojeni terminacombinazione stopcombinare + stoppecombinaison placesidebyside: plaatsnaastelkaar placesidebyside platzierenebeneinander umistivedlesebe mettifiancoafianco punefatainfata + placecoteacote placeontopofeachother: plaatsonderelkaar placeontopofeachother platziereuntereinander umistinadsebe mettiunosullaltro punedeasuprafiecareia + placelesunsaudessusdesautres setupcaption: stelblokkopjein setupcaption stellebildunterschriftein nastavpopisek - impostacaption seteazalegenda % GB + impostacaption seteazalegenda + regleintitule setupcaptions: stelblokkopjesin setupcaptions stellebilderunterschriftein nastavpopisky - impostacaptions seteazalegendele % GB + impostacaptions seteazalegendele + regleintitules setupcombinations: stelcombinatiesin setupcombinations stellekombinationein nastavspojeni impostacombinazioni seteazacombinari + reglecombinaisons startoverlay: startoverlay startoverlay startoverlay startprekryv iniziasovrapposizione startoverlay + demarrerevetement stopoverlay: stopoverlay stopoverlay stopoverlay stopprekryv terminasovrapposizione stopoverlay + stopperevetement defineregister: definieerregister defineregister definiereregister definujrejstrik definisciregistro definesteregistru + definitregistre coupleregister: koppelregister coupleregister verknuepfregister propojenyrejstrik accoppiaregistro cupleazaregistru + coupleregistre setupregister: stelregisterin setupregister stelleregisterein nastavrejstrik impostaregistro seteazaregistru + regleregistre writetoregister: schrijfnaarregister writetoregister schreibezumregister zapisdorejstriku scriviinregistro scrieinregistru -completeregister: volledigregister completeregister - completeregister completeregister - completeregister completeregister + ecritregistre + completeregister: volledigregister completeregister + completeregister completeregister + completeregister completeregister + completeregistre placeregister: plaatsregister placeregister platziereregister umistirejstrik mettiregistro puneregistru + placeregistre determineregistercharacteristics: bepaalregisterkenmerken determineregistercharacteristics bestimmeregistercharakteristika urcicharakteristikurejstriku determinacaratteristicheregistro determinacaracteristiciregistru + determinecaracteristiquesregistre definesorting: definieersorteren definesorting definieresortieren definujtrideni definisciordinamento definestesortare + definittri definesynonyms: definieersynoniemen definesynonyms definieresynonyme definujsynonyma definiscisinonimi definestesinonim + definitsynonymes setupsorting: stelsorterenin setupsorting stellesortierenein nastavtrideni impostaordinamento seteazasortare + regletri setupsynonyms: stelsynoniemenin setupsynonyms stellesynonymein nastavsynonyma impostasinonimi seteazasinonime + reglesynonymes startsynchronization: startsynchronisatie startsynchronization startsynchronisation startsynchronizace iniziasincronizzazione startsincronizare + demarresynchronisation stopsynchronization: stopsynchronisatie stopsynchronization stopsynchronisation stopsynchronizace terminasincronizzazione stopsincronizare + stoppesynchronisation setupsynchronizationbar: stelsynchronisatiebalkin setupsynchronizationbar stellesynchronisationsbalkenein nastavsynchronizacnilistu impostabarrasincronizzazione setarebarasincronizare + reglebarresynchronisation setupsynchronization: stelsynchronisatiein setupsynchronization stellesynchronisationein nastavsynchronizaci impostasincronizzazione setaresincronizare + reglesynchronisation synchronizationbar: synchronisatiebalk synchronizationbar synchronisationsbalken synchronizacnilista barrasincronizzazione barasincronizare + barresynchronisation synchronize: synchroniseer synchronize synchronisieren synchronizovat sincronizza sincronizeaza + synchronise useexternaldocument: gebruikexterndocument useexternaldocument verwendeexteresdokument uzijexternidokument usadocumentoesterno folosestedocumentextern + utilisedocumentexterne useURL: gebruikURL useURL verwendeURL uzijURL usaURL folosesteURL + utiliseURL useurl: gebruikurl useurl verwendeurl uzijurl usaurl folosesteurl + utiliseurl setupurl: stelurlin setupurl stelleurlein nastavurl impostaurl seteazaurl + regleurl coupledocument: koppeldocument coupledocument verknuepfedokument propojenydokument accoppiadocumento cupleazadocument + coupledocument setupprograms: stelprogrammasin setupprograms stelleprogrammein nastavprogramy impostaprogrammi seteazaprograme + regleprogrammes defineprogram: definieerprogramma defineprogram definiereprogramme definujprogram definisciprogramma definesteprogram + definitprogramme program: programma program programm program programma program + programme setuppagetransitions: stelpaginaovergangenin setuppagetransitions stelleseitenuebergangein nastavprechodstrany impostatransizionepagina seteazatranzitiepagina + regletransitionspage defineprofile: definieerprofiel defineprofile definiereprofil definujprofil definisciprofilo definesteprofil + definitprofil defineversion: definieerversie defineversion definiereversion definujverzi definisciversion definesteversiune + definitversion markversion: markeerversie markversion beschrifteversion oznacverzi - marcaversione marcheazaversiune % GB + marcaversione marcheazaversiune + marquageversion selectversion: selecteerversie selectversion waehleversionaus vyberverzi - selezionaversione selecteazaversiune % GB + selezionaversione selecteazaversiune + selectionneversion startprofile: startprofiel startprofile startprofil startprofil iniziaprofilo startprofil + demarreprofil startversion: startversie startversion startversion startverze iniziaversione startversiune + demarreversion setupprofiles: stelprofielenin setupprofiles stelleprofilein nastavprofily impostaprofili seteazaprofile + regleprofils setupversions: stelversiesin setupversions stelleversionein nastavverze impostaversioni seteazaversiuni + regleversions stopprofile: stopprofiel stopprofile stopprofil stopprofil terminaprofili stopprofil + stoppeprofil stopversion: stopversie stopversion stopversion stopverze terminaversioni stopversiune + stoppeversion followprofile: volgprofiel followprofile folgeprofil dodrzujprofil seguiprofilo urmeazaprofil + suivantprofil followprofileversion: volgprofielversie followprofileversion folgeprofilversion dodrzujverziprofilu seguiversioneprofilo urmeazaversiuneprofil + suivantversionprofil followversion: volgversie followversion folgeversion dodrzujverzi seguiversione urmeazaversiune + suivantversion definedescription: doordefinieren definedescription definierebeschreibung definujpopis definiscidescrizione definestedescriere + definitdescription definelabel: doorlabelen definelabel definierelabel definujpopisek definiscietichetta definesteeticheta + definitetiquette defineenumeration: doornummeren defineenumeration definierenummerierung definujvycet definiscienumerazione definesteenumerare + definitenumeration defineindenting: doorspringen defineindenting definiereeinzug definujodsazovani definiscirientro definestealiat + definitcompoalinea setupdescriptions: steldoordefinierenin setupdescriptions definierebeschreibungen nastavpopisy impostadescrizioni seteazadescriere + regledescriptions setupenumerations: steldoornummerenin setupenumerations stellebeschreibungein nastavvycty impostaenumerazioni seteazaenumerare + regleenumerations setupindentations: steldoorspringenin setupindentations stelleeinzuegein nastavodsazovani impostarientri seteazaaliniate + reglealineas setuptab: steltabin setuptab stelletabein nastavtab impostatab seteazatab + regletab tab: tab tab tab tab tab tab + tab setupexternalfigures: stelexternefigurenin setupexternalfigures stelleexterneabbildungenein nastavexterniobrazy impostafigureesterne seteazafiguriexterne + reglefiguresexternes showexternalfigures: toonexternefiguren showexternalfigures zeigeexterneabbildungen ukazexterniobrazy mostrafiguresterne afiseazafiguriexterne + montrefiguresexternes externalfigure: externfiguur externalfigure externeabbildung externiobraz figuraesterna figuraexterna + figureexterne useexternalfigure: gebruikexternfiguur useexternalfigure verwendeexterneabbildung uzijexterniobraz usafiguraesterna folosestefiguraexterna + utilisefigureexterne startfigure: startfiguur startfigure startabbildung startobraz iniziafigura startfigura + demarrefigure referring: refereer referring referieren odkazujici - referring referring % GB + referring referring + faitreference remark: toelichting remark bemerkung oznaceni commento remarca + commentaire colorbar: kleurenbalk colorbar farbbalken barevnalista barracolori baraculoare + barrecouleur grid: rooster grid gitter mrizka griglia grid + grille button: button button knopf tlacitko pulsante buton + bouton menubutton: menubutton menubutton menueknopf tlacitkomenu pulsantemenu butonmeniu + boutonmenu setupbuttons: stelbuttonsin setupbuttons stelleknopfein nastavtlacitka impostapulsanti seteazabutoane + regleboutons usereferences: gebruikreferenties usereferences verwendereferenzen uzijodkazy usariferimenti folosestereferinte + utilisereferences placereferencelist: plaatsreferentielijst placereferencelist placereferencelist placereferencelist placereferencelist placereferencelist + placelistereference setupreferencelist: stelreferentielijstin setupreferencelist stellereferenzlisteein nastavseznamodkazu impostalistariferimenti seteazalistareferinte + reglelistereference setupreferencing: stelrefererenin setupreferencing stellereferenzierenein nastavodkazovani impostariferimento seteazareferinte + reglereferencage textreference: tekstreferentie textreference textreferenz odkaznatext riferimentotesto referintatext + referencetexte pagereference: paginareferentie pagereference seitenreferenz odkaznastranu riferimentopagina referintapagina + referencepage reference: referentie reference referenz odkaz riferimento referinta + reference definereference: definieerreferentie definereference definierereferenz definujodkaz definisciriferimento definestereferinte + definitreference definereferenceformat: definieerreferentieformaat definereferenceformat definierereferenzformat definujformatodkazu definisciformatoriferimento definesteformatreferinte + definitformatreference useJSscripts: gebruikJSscripts useJSscripts verwendeJSscript uzijJSscripts usaJSscripts folosestescriptJS + utiliseJSscripts from: uit from von zref da din + de in: in in in tref in in + dans at: op at bei pref - al la % GB + al la + a about: - about ueber oref intorno despre + concernant goto: naar goto zu jdina vaia dute + va atpage: oppagina atpage aufseite nastrane apagina lapagina + alapage somewhere: ergens somewhere irgendwo nekde daqualcheparte undeva -navigating: navigerend navigating - navigating navigating - navigating navigating + qqpart + navigating: navigerend navigating + navigating navigating + navigating navigating + navigating ref: ref ref ref ref rif ref + ref gotobox: naarbox gotobox zurbox jdinabox - vaiabox dutebox % GB + vaiabox dutebox + vaalaboite gotopage: naarpagina gotopage zurseite jdinastranu vaiapagina dutepagina + vaalapage placeformula: plaatsformule placeformula platziereformel umistirovnici mettiformula puneformula + placeformule placesubformula: plaatssubformule placesubformula platziereunterformel umistipodrovnici mettisottoformula punesubformula -moveformula: verplaatsformule moveformula - moveformula moveformula - spostaformula moveformula + placesousformule + moveformula: verplaatsformule moveformula + moveformula moveformula + spostaformula moveformula + deplaceformule setupformulas: stelformulesin setupformulae stelleformelnein nastavrovnice impostaformule seteazaformule + regleformules formulanumber: formulenummer formulanumber formelnummer cislorovnice numeroformula numarformula + numeroformule subformulanumber: subformulenummer subformulanumber unterformelnummer cislopodrovnice numerosottoformula numarsubformula + numerosousformule leg: leg leg leg leg leg leg + leg fact: geg fact geg fakt fatto fact + fait mathematics: wiskunde mathematics mathematik matematika matematica matematica + mathematique dimension: dimensie dimension dimension rozmer dimensione dimensiune + dimension nodimension: geendimensie nodimension keindimension zadnyrozmer nientedimensioni faradimensiune + sansdimension startenvironment: startomgeving startenvironment startumgebung startprostredi iniziaambiente startmediu + demarreenvironement stopenvironment: stopomgeving stopenvironment stopumgebung stopprostredi terminaambiente stopmediu + stoppeenvironement startcomponent: startonderdeel startcomponent startkomponente startkomponenta iniziacomponente startcomponenta + demarrecomposant stopcomponent: stoponderdeel stopcomponent stopkomponente stopkomponenta terminacomponente stopcomponenta + stoppecomposant startproduct: startprodukt startproduct startprodukt startprodukt iniziaprodotto startprodus + demarreproduit stopproduct: stopprodukt stopproduct stopprodukt stopprodukt terminaprodotto stopprodus + stoppeproduit startproject: startprojekt startproject startprojekt startprojekt iniziaprogetto startproiect + demarreprojet stopproject: stopprojekt stopproject stopprojekt stopprojekt terminaprogetto stopproiect + stoppeprojet setups: instellingen setups einstellungen nastaveni impostazioni setari + reglages project: projekt project projekt projekt progetto proiect + projet component: onderdeel component komponente komponenta componenet componenta + composant product: produkt product produkt produkt prodotto produs + produit environment: omgeving environment umgebung prostredi ambiente mediu + environement nomorefiles: geenfilesmeer nomorefiles keinedateienmehr zadnedalsisoubory bastafile farafisiere + pasplusdefichiers getbuffer: haalbuffer getbuffer holepuffer ziskejbuffer prendibuffer adubuffer + prendbuffer setupbuffer: stelbufferin setupbuffer stellepufferein nastavbuffer impostabuffer seteazabuffer + reglebuffer typebuffer: typebuffer typebuffer tippepuffer typebuffer - typebuffer scriebuffer % GB + typebuffer scriebuffer + tapebuffer definebuffer: definieerbuffer definebuffer definierepuffer definujbuffer definiscibuffer definestebuffer + definitbuffer unitmeaning: betekenis unitmeaning bedeutung vyznam - nomeunita numeunitate % GB + nomeunita numeunitate + sensunite infull: voluit infull volleswort plnezneni perlungo pelung + infull quotation: citaat quotation zitat citace citazione citat + citation quote: citeer quote zitieren citovat menzione minicitat + citer startquotation: startcitaat startquotation startzitat startcitace iniziacitazione startcitat + demarrecitation stopquotation: stopcitaat stopquotation stopzitat stopcitace terminacitazione stopcitat + stoppecitation setupquote: stelciterenin setupquote stellezitierenein nastavcitaci impostamenzione seteazaminicitat + demarreciter define: definieer define definieren definuj definisci defineste + definit redo: herhaal redo wiederholen opakovat rifai refa + refait usecommands: gebruikcommandos usecommands verwendebefehl uzijprikazy usacomandi folosestecomenzi + utilisecommandes definestartstop: definieerstartstop definestartstop definierestartstop definujstartstop definisciiniziatermina definestestartstop + definitdemarrestoppe setupstartstop: stelstartstopin setupstartstop setupstartstop setupstartstop impostainiziatermina setupstartstop + regledemarrestoppe startlocal: startlokaal startlocal startlokal startlokalni inizialocale startlocal + demarrelocal stoplocal: stoplokaal stoplocal stoplokal stoplokalni terminalocale stoplocal + stoppelocal startglobal: startglobaal startglobal startglobal startglobalni iniziaglobale startglobal + demarreglobal stopglobal: stopglobaal stopglobal stopglobal stopglobalni terminaglobale stopblobal + stoppeglobal macroname: naam name name jmeno nome nume + nommacro definemakeup: definieeropmaak definemakeup definiereumbruch definujupravu - definiscimakeup definestemakeup % GB + definiscimakeup definestemakeup + definitmakeup setupmakeup: stelopmaakin setupmakeup stelleumbruchein nastavupravu impostamakeup seteazamakeup + reglemakeup startmakeup: startopmaak startmakeup startumbruch startuprava iniziamakeup startmakeup + demarremakeup stopmakeup: stopopmaak stopmakeup stopumbruch stopuprava terminamakeup stopmakeup + stoppemakeup useexternalsoundtrack: gebruikexterngeluidsfragment useexternalsoundtrack verwendeexternestonstueck uzijexternizvuk usacolonnasonoraesterna folosestemuzicaexterna + utilisepsiteaudioexterne useexternalfile: gebruikexternefile useexternalfile verwendeexternedatei uzijexternisoubor usafileesterno folosestefisierextern + utilisefichierexterne useexternalfiles: gebruikexternefiles useexternalfiles verwendeexternedateien uzijexternisoubory usafileesterni folosestefisiereexterne + utilisefichiersexternes referral: kenmerk referral verweis odkaz - referral referit % GB + referral referit + recommandation referraldate: kenmerkdatum referraldate verweisdatum odkaznadatum datareferral datareferit + daterecommandation high: hoog high hoch vysoky ap inalt + haut lohi: laho lohi tiho nivy pedap jossus + baha low: laag low tief nizky ped jos + bas fraction: breuk fraction bruch zlomek frazione fractie + fraction chem: chem chem chem chem chim chem + chem startopposite: startnaast startopposite startgegenueber startprotejsek iniziaopposto startopozit + demarreopposition stopopposite: stopnaast stopopposite stopgegenueber stopprotejsek terminaopposto stopopozit + stoppeopposition setupoppositeplacing: stelnaastplaatsenin setupoppositeplacing stellegegenueberplatzierenein nastavumisteniprotejsku impostaposizionamentoopposti seteazaplasareaopozita + regleplacementopposition startpositioning: startpositioneren startpositioning startpositionieren startumistovani iniziaposizionamento startpozitionare + demarrepositionnement stoppositioning: stoppositioneren stoppositioning stoppositionieren stopumistovani terminaposizionamento stoppozitionare + stoppepositionnement position: positioneer position position pozice posizione pozitie + position setuppositioning: stelpositionerenin setuppositioning stellepositionierenein nastavumistovani impostaposizionamento setarepozitie + reglepositionnement rotate: roteer rotate drehen otocit - ruota roteste % GB + ruota roteste + oriente setuprotate: stelroterenin setuprotate stelledrehenein nastavotoceni impostarotazione seteazarotare + regleoriente mirror: spiegel mirror spiegeln zrcadlit riflessione reflexie + reflete scale: schaal scale format meritko - scala scala % GB + scala scala + echelle setupnumbering: stelnummerenin setupnumbering stellenummerierungein nastavcislovani impostanumerazione seteazanumerotare + reglenumerotation reset: reset reset ruecksetzten reset reimposta reset + raz setuppublications: stelpublicatiesin setuppublications stellepublikationein nastavpublikace impostapubblicazioni seteazapublicatii + reglepublications publication: publicatie publication publikation publikace pubblicazione publicatie + publication definehbox: definieerhbox definehbox definierehbox definujhbox definiscihbox definestehbox + definithbox adding: toevoegen adding zusatz scitani - adding adauga % GB + adding adauga + ajout periods: punten periods punkt tecky punti puncte + periodes setuphyphenmark: stelkoppeltekenin setuphyphenmark stellebindestrichein nastavdelitko - impostasegnosillabazione seteazaliniesilabe % GB + impostasegnosillabazione seteazaliniesilabe + reglemarquagehyphenation setupinterlinespace: stelinterliniein setupinterlinespace stellezeilenabstandein nastavmeziradkovoumezeru impostainterlinea seteazaspatiuinterliniar + regleespacementinterligne setupspacing: stelspatieringin setupspacing stellespatiumein nastavradkovani impostaspaziatura seteazaspatiu + regleespacement setuptolerance: steltolerantiein setuptolerance stelletoleranzein nastavtoleranci impostatolleranza seteazatoleranta + regletolerance setupsystem: stelsysteemin setupsystem stellesystemein nastavsystem impostasistema seteazasistem + reglesysteme usepath: gebruikgebied usedirectory benutzeverzeichnis uzijadresar % TOBIAS - usacartella folosestedirector % GB + usacartella folosestedirector + utilisechemin defineparagraphs: definieeralineas defineparagraphs definiereabsaetze definujodstavce definiscicapoversi definesteparagraf + definitparagraphes setupparagraphs: stelalineasin setupparagraphs stelleabsaetzeein nastavodstavce impostacapoversi seteazaparagrafe + regleparagraphes donttest: geentest donttest keintest zadnytest notest nutesta + sanstest setupcomment: stelcommentaarin setupcomment stellekommentarein nastavkomentar impostacommento seteazacomentariu + reglecommentaire comment: commentaar comment kommentar komentar commento comentariu + commentaire definefield: definieerveld definefield definierefeld definujpole definiscicampo definestecamp + definitchamp definemainfield: definieerhoofdveld definemainfield definierehauptfeld definujhlavnipole definiscicampoprincipale definestecampprincipal + definitchampprincipal definesubfield: definieersubveld definesubfield definieresubfeld definujpodpole definiscisottocampo definestesubcamp + definitsouschamp clonefield: kloonveld clonefield klonierefeld klonujpole clonacampo cloneazacamp + clonechamp copyfield: copieerveld copyfield kopierefeld kopirujpole copiacampo copiazacamp + copitchamp setupfield: stelveldin setupfield stellefeldein nastavpole impostacampo seteazacamp + reglechamp setupfields: stelveldenin setupfields stellefelderin nastavvsechnapole impostacampi seteazacampuri + reglechamps field: veld field feld pole campi camp + champ fitfield: passendveld fitfield passendfeld prizpusobivepole % or vhodnepole adattacampo potrivestecamp + ajustechamp logfields: registreervelden logfields registrierefelder zaznamovepole - logcampi logcampuri % GB + logcampi logcampuri + logchamp showfields: toonvelden showfields zeigefelder ukazpole mostracampi afiseazacampuri + montrechamps tooltip: suggestie tooltip tooltip bublinkovanapoveda - tooltip tooltip % GB + tooltip tooltip + suggestion fillinfield: invulveld fillinfield ausfuellfeld vyplnovepole camporiempimento campumplere + remplitchamp definefieldstack: definieerveldstapel definefieldstack definierefeldstapel definujzasobnikpoli - definiscistackcampi definestestivacampuri % GB + definiscistackcampi definestestivacampuri + definitpilechamp fieldstack: veldstapel fieldstack feldstapel zasobnikpoli stackcampi stivacampuri + pilechamp setupforms: stelformulierenin setupforms setupforms setupforms - impostaforms seteazaformulare % GB + impostaforms seteazaformulare + regleformulaires setupclipping: stelclipin setupclipping stelleausschnittein nastavorez - impostaclippling seteazaclipping % GB + impostaclippling seteazaclipping + regleclipping clip: clip clip ausschnitt orez clip clip + clip placelegend: plaatslegenda placelegend platzierelegende umistilegendu mettilegenda punelegenda + placelegende setuplegend: stellegendain setuplegend stellelegendeein nastavlegendu impostalegenda seteazalegenda + reglelegende setuppagecomment: stelpaginacommentaarin setuppagecomment stelleseitenkommentarein nastavkomentarstrany impostacommentopagina seteazacomentariupagina + reglecommentairepage setupstrut: stelstrutin setupstrut setupstrut setupstrut impostastrut seteazastrut + reglestrut definerule: definieerlijn definerule definerule definerule definiscilinea definesterigla + definitregle placerule: plaatslijn placerule placerule placerule mettilinea punerigla + placeregle setuprule: stellijnin setuprule setuprule setuprule impostalinea seteazarigla + regleregle definetextvariable: definieertekstvariabele definetextvariable definetextvariable definetextvariable definiscivariabiletesto definestevariabilatext + definitvariabletexte setuptextvariable: steltekstvariabelein setuptextvariable setuptextvariable setuptextvariable impostavariabiletesto seteazavariabilatext + reglevariabletexte settextvariable: kentekstvariabeletoe settextvariable settextvariable settextvariable - setvariabiletesto setvariabilatext % GB + setvariabiletesto setvariabilatext + affectevariabletexte placetextvariable: plaatstekstvariabele placetextvariable placetextvariable placetextvariable mettivariabiletesto punevariabilatext + placevariabletexte textvariable: tekstvariabele textvariable textvariable textvariable variabiletesto variabilatext + variabletexte definetextposition: definieertekstpositie definetextposition definetextposition definetextposition definisciposizionetesto definestepozitietext + definitpositiontexte setuptextposition: steltekstpositiein setuptextposition setuptextposition setuptextposition impostaposizionetesto seteazapozitietext + reglepositiontexte positiontext: positioneertekst positiontext positiontext positiontext - posizionatesto pozitietext % GB + posizionatesto pozitietext + positionnetexte definerawfont: definerawfont definerawfont definerawfont definerawfont definiscifontgrezzo definestefontraw + definitpolicebrute switchtorawfont: switchtorawfont switchtorawfont switchtorawfont switchtorawfont passaafontgrezzo trecilafontraw - - placeheadtext: plaatskoptekst placeheadtext - placeheadtext placeheadtext - posizionatestotesta placeheadtext - -placeheadnumber: plaatskopnummer placeheadnumber - placeheadnumber placeheadnumber - posizionanumerotesta placeheadnumber - - definepagebreak: definieerpaginaovergang definepagebreak - definepagebreak definepagebreak - definepagebreak definepagebreak -definecolumnbreak: definieerkolomovergang definecolumnbreak - definecolumnbreak definecolumnbreak - definecolumnbreak definecolumnbreak + changepolicebrute + placeheadtext: plaatskoptekst placeheadtext + placeheadtext placeheadtext + posizionatestotesta placeheadtext + placetextetete + placeheadnumber: plaatskopnummer placeheadnumber + placeheadnumber placeheadnumber + posizionanumerotesta placeheadnumber + placenumerotete + definepagebreak: definieerpaginaovergang definepagebreak + definepagebreak definepagebreak + definepagebreak definepagebreak + definitsautdepage + definecolumnbreak: definieerkolomovergang definecolumnbreak + definecolumnbreak definecolumnbreak + definecolumnbreak definecolumnbreak + definitsautdecolonne \stopcommands @@ -1859,11 +2421,12 @@ definecolumnbreak: definieerkolomovergang definecolumnbreak \startcommands dutch english german czech italian romanian - + french setupitemgroups: stelopsommingenin setupitemizations stelleaufzaehlungenein nastavvycty impostaelencazioni setareitemization + reglegroupeselements \stopcommands @@ -1878,183 +2441,235 @@ definecolumnbreak: definieerkolomovergang definecolumnbreak \startcommands dutch english german czech italian romanian + french topheight: bovenhoogte topheight hoeheoben vyskahorejsku altezzacima inaltimesus + hauteursup topdistance: bovenafstand topdistance abstandoben vzdalenosthorejsku distanzacima distantasus + distancesup headerheight: hoofdhoogte headerheight kopfzeilenhoehe vyskazahlavi altezzaintestazione inaltimeantet + hauteurentete headerdistance: hoofdafstand headerdistance kopfzeilenabstand vzdalenostzahlavi distanzaintestazione distantaantet + distanceentete textheight: teksthoogte textheight texthoehe vyskatextu altezzatesto inaltimetext + hauteurtexte footerdistance: voetafstand footerdistance fusszeileabstand vzdalenostupati distanzapdp distantasubsol + distancepdp footerheight: voethoogte footerheight fusszeilenhoehe vyskaupati altezzapdp inaltimesubsol + hauteurpdp bottomdistance: onderafstand bottomdistance abstandunten vzdalenostspodku distanzafondo distantajos + distanceinf bottomheight: onderhoogte bottomheight hoeheunten vyskaspodku altezzafondo inaltimejos + hauteurinf marginwidth: margebreedte marginwidth marginalbreite sirkamarginalie - ampiezzamargine latimemargine % GB + ampiezzamargine latimemargine + largeurmarge leftmarginwidth: linkermargebreedte leftmarginwidth linkemarginalbreite sirkalevemarginalie ampiezzamarginesinistro latimemarginestanga + largeurmargegauche rightmarginwidth: rechtermargebreedte rightmarginwidth rechtemarginalbreite sirkapravemarginalie ampiezzamarginedestro latimemarginedreapta + largeurmargedroite margindistance: margeafstand margindistance marginalafstand vzdalenostmarginalie distanzamargine distantamargine + distancemarge leftmargindistance: linkermargeafstand leftmargindistance linkemarginalafstand vzdalenostlevemarginalie distanzamarginesinistro distantamarginestanga + distancemargegauche rightmargindistance: rechtermargeafstand rightmargindistance rechtemarginalafstand vzdalenostpravemarginalie distanzamarginedestro distantamarginedreapta + distancemargedroite edgewidth: randbreedte edgewidth randbreite sirkaokraje ampiezzabordo latimecolturi + largeurbord leftedgewidth: linkerrandbreedte leftedgewidth breitelinkerrand sirkalevehookraje ampiezzabordosinistro latimecoltstanga + largeurbrodgauche rightedgewidth: rechterrandbreedte rightedgewidth breiterechterrand sirkapravehookraje ampiezzabordodestro latimecoltdreapta + largeurborddroit edgedistance: randafstand edgedistance randabstand vzdalenostokraje distanzabordo distantacolt + distancebord leftedgedistance: linkerrandafstand leftedgedistance abstandlinkerrand vzdalenostlevehookraje distanzabordosinistro distantacoltstanga + distancebordgauche rightedgedistance: rechterrandafstand rightedgedistance abstandrechterrand vzdalenostpravehookraje distanzabordodestro distantacoltdreapta - innermarginwidth: binnenmargebreedte innermarginwidth - innermarginwidth innermarginwidth - innermarginwidth innermarginwidth - outermarginwidth: buitenmargebreedte outermarginwidth - outermarginwidth outermarginwidth - outermarginwidth outermarginwidth -innermargindistance: binnenmargeafstand innermargindistance - innermargindistance innermargindistance - innermargindistance innermargindistance -outermargindistance: buitenmargeafstand outermargindistance - outermargindistance outermargindistance - outermargindistance outermargindistance - inneredgewidth: binnenrandbreedte inneredgewidth - inneredgewidth inneredgewidth - inneredgewidth inneredgewidth - outeredgewidth: buitenrandbreedte outeredgewidth - outeredgewidth outeredgewidth - outeredgewidth outeredgewidth - inneredgedistance: binnenrandafstand inneredgedistance - inneredgedistance inneredgedistance - inneredgedistance inneredgedistance - outeredgedistance: buitenrandafstand outeredgedistance - outeredgedistance outeredgedistance - outeredgedistance outeredgedistance + distanceborddroit + innermarginwidth: binnenmargebreedte innermarginwidth + innermarginwidth innermarginwidth + innermarginwidth innermarginwidth + innermarginwidth + outermarginwidth: buitenmargebreedte outermarginwidth + outermarginwidth outermarginwidth + outermarginwidth outermarginwidth + outermarginwidth + innermargindistance: binnenmargeafstand innermargindistance + innermargindistance innermargindistance + innermargindistance innermargindistance + innermargindistance + outermargindistance: buitenmargeafstand outermargindistance + outermargindistance outermargindistance + outermargindistance outermargindistance + outermargindistance + inneredgewidth: binnenrandbreedte inneredgewidth + inneredgewidth inneredgewidth + inneredgewidth inneredgewidth + inneredgewidth + outeredgewidth: buitenrandbreedte outeredgewidth + outeredgewidth outeredgewidth + outeredgewidth outeredgewidth + outeredgewidth + inneredgedistance: binnenrandafstand inneredgedistance + inneredgedistance inneredgedistance + inneredgedistance inneredgedistance + inneredgedistance + outeredgedistance: buitenrandafstand outeredgedistance + outeredgedistance outeredgedistance + outeredgedistance outeredgedistance + outeredgedistance textwidth: tekstbreedte textwidth textbreite sirkatextu ampiezzatesto latimetext + largeurtexte makeupwidth: zetbreedte makeupwidth satzbreite sirkasazby - ampiezzamakeup latimemakeup % GB + ampiezzamakeup latimemakeup + largeurmakeup makeupheight: zethoogte makeupheight satzhoehe vyskasazby altezzamakeup inaltimemakeup + hauteurmakeup topspace: kopwit topspace kopfweite odsazenishora spaziocima spatiusus + espacesup bottomspace: bodemwit bottomspace bottomspace bottomspace spaziofondo spatiujos + espaceinf backspace: rugwit backspace rumpfweite odsazenizleva - spaziodietro spatiuspate % GB + spaziodietro spatiuspate + retourarriere cutspace: snijwit cutspace cutspace cutspace - cutspace cutspace % GB + cutspace cutspace + cutspace paperwidth: papierbreedte paperwidth papierbreite sirkapapiru ampiezzacarta latimehartie + largeurpapier paperheight: papierhoogte paperheight papierhoehe vyskapapiru altezzacarta inaltimehartie + hauteurpapier printpaperwidth: printpapierbreedte printpaperwidth printpapierbreite sirkatiskpapiru - ampiezzacartastampa latimehartieimprimanta % GB + ampiezzacartastampa latimehartieimprimanta + largeureditionpapier printpaperheight: printpapierhoogte printpaperheight printpapierhoehe vyskatiskpapiru - altezzacartastampa inaltimehartieimprimanta % GB + altezzacartastampa inaltimehartieimprimanta + hauteureditionpapier pageoffset: paginaoffset pageoffset pageoffset pageoffset pageoffset pageoffset + pageoffset pagedepth: paginadiepte pagedepth pagedepth pagedepth pagedepth pagedepth + pagedepth headlevel: kopniveau headlevel kopfniveau hlavniuroven - livellotesta niveltitlu % GB + livellotesta niveltitlu + niveautete linewidth: lijndikte linethickness liniendicke tloustkacary spessoreriga grosimelinie + largeurligne totalnumberofpages: totaalaantalpaginas totalnumberofpages gesamtseitenanzahl celkovypocetstran numerototaledipagine numartotalpagini -numberofsubpages: aantalsubpaginas numberofsubpages - numberofsubpages numberofsubpages - numberofsubpages numberofsubpages + nombretotaldepages + numberofsubpages: aantalsubpaginas numberofsubpages + numberofsubpages numberofsubpages + numberofsubpages numberofsubpages + nombredesouspages useXMLfilter: gebruikXMLfilter useXMLfilter useXMLfilter useXMLfilter useXMLfilter useXMLfilter - -definecolumnset: definieerkolomgroep definecolumnset - definecolumnset definecolumnset - definiscigruppocolonne definecolumnset - setupcolumnset: stelkolomgroepin setupcolumnset - setupcolumnset setupcolumnset - impostagruppocolonne setupcolumnset - startcolumnset: startkolomgroep startcolumnset - startcolumnset startcolumnset - iniziagruppocolonne startcolumnset - stopcolumnset: stopkolomgroep stopcolumnset - stopcolumnset stopcolumnset - terminagruppocolonne stopcolumnset - - setupcolumnsetlines: stelkolomgroepregelsin setupcolumnsetlines - setupcolumnsetlines setupcolumnsetlines - setupcolumnsetlines setupcolumnsetlines - setupcolumnsetstart: stelkolomgroepstartin setupcolumnsetstart - setupcolumnsetstart setupcolumnsetstart - setupcolumnsetstart setupcolumnsetstart - -startcolumnmakeup: startkolomopmaak startcolumnmakeup - startcolumnmakeup startcolumnmakeup - startcolumnmakeup startcolumnmakeup - - stopcolumnmakeup: stopkolomopmaak stopcolumnmakeup - stopcolumnmakeup stopcolumnmakeup - stopcolumnmakeup stopcolumnmakeup - - usetypescript: gebruiktypescript usetypescript - usetypescript usetypescript - usetypescript usetypescript -usetypescriptfile: gebruiktypescriptfile usetypescriptfile - usetypescriptfile usetypescriptfile - usetypescriptfile usetypescriptfile + useXMLfilter + definecolumnset: definieerkolomgroep definecolumnset + definecolumnset definecolumnset + definiscigruppocolonne definecolumnset + definitjeucolonne + setupcolumnset: stelkolomgroepin setupcolumnset + setupcolumnset setupcolumnset + impostagruppocolonne setupcolumnset + reglejeucolonne + startcolumnset: startkolomgroep startcolumnset + startcolumnset startcolumnset + iniziagruppocolonne startcolumnset + demarrejeucolonne + stopcolumnset: stopkolomgroep stopcolumnset + stopcolumnset stopcolumnset + terminagruppocolonne stopcolumnset + stoppejeucolonne + setupcolumnsetlines: stelkolomgroepregelsin setupcolumnsetlines + setupcolumnsetlines setupcolumnsetlines + setupcolumnsetlines setupcolumnsetlines + setupcolumnsetlines + setupcolumnsetstart: stelkolomgroepstartin setupcolumnsetstart + setupcolumnsetstart setupcolumnsetstart + setupcolumnsetstart setupcolumnsetstart + setupcolumnsetstart + startcolumnmakeup: startkolomopmaak startcolumnmakeup + startcolumnmakeup startcolumnmakeup + startcolumnmakeup startcolumnmakeup + startcolumnmakeup + stopcolumnmakeup: stopkolomopmaak stopcolumnmakeup + stopcolumnmakeup stopcolumnmakeup + stopcolumnmakeup stopcolumnmakeup + stopcolumnmakeup + usetypescript: gebruiktypescript usetypescript + usetypescript usetypescript + usetypescript usetypescript + usetypescript + usetypescriptfile: gebruiktypescriptfile usetypescriptfile + usetypescriptfile usetypescriptfile + usetypescriptfile usetypescriptfile \stopcommands @@ -2069,50 +2684,36 @@ usetypescriptfile: gebruiktypescriptfile usetypescriptfile \startcommands dutch english german czech italian romanian + french startdocument: startdocument startdocument startdokument startdokument iniziadocumento startdocument + demarredocument stopdocument: stopdocument stopdocument stopdokument stopdokument terminadocumento stopdocument + stoppedocument startoverzicht: startoverzicht startoverview startueberblick startprehled - iniziaoverview startoverview % GB + iniziaoverview startoverview + demarrevuedensemble stopoverzicht: stopoverzicht stopoverview stopueberblick stopprehled terminaoverview stopoverview + stoppevuedensemble label: label label label poppisek etichetta eticheta -% -% obsolete -% -% stelbrievenin: stelbrievenin setupcorrespondence -% stellekorrespondenzein nastavkorespondenci -% impostacorrispondenza seteazacorespondenta -% brieven: brieven letters -% briefe dopisy -% lettere litere -% brief: brief letter -% brief dopis -% lettera litera -% sheet: sheet sheet -% blatt list -% foglio sheet -% stelstickersin: stelstickersin setupstickers -% stellestickerein nastavetikety -% impostafrancobolli seteazastickers % GB -% stelsheetsin: stelsheetsin setupsheets -% stelleblattein nastavlisty -% impostafogli seteazasheets -% + etiquette labels: labels labels labels popisky etichette etichete + etiquettes domicile: woonplaats domicile wohnort bydliste domicilio domiciliu + domicile \stopcommands diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex index 53508c297..38d2fad7e 100644 --- a/tex/context/base/mult-con.tex +++ b/tex/context/base/mult-con.tex @@ -11,8 +11,6 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% additions are marked as % new - %D In this rather large definition file we are going to tell %D \CONTEXT\ which constants, variables and elements we use. %D @@ -32,41 +30,52 @@ \startvariables dutch english german czech italian romanian + french one: een one eins jedna uno unu + un two: twee two zwei dve due doi + deux three: drie three drei tri tre trei + trois four: vier four vier ctyri quattro patru + quatre five: vijf five fuenf pet cinque cinci + cinq \stopvariables \startvariables dutch english german czech italian romanian + french environment: omgeving environment umgebung prostredi ambiente mediu + environement component: onderdeel component komponente komponenta componente componenta + composant product: produkt product produkt produkt prodotto produs + produit project: project project projekt projekt progetto proiect + projet \stopvariables @@ -79,70 +88,91 @@ \startvariables dutch english german czech italian romanian + french sunday: zondag sunday sonntag nedele domenica duminica + dimanche monday: maandag monday montag pondeli lunedi luni + lundi tuesday: dinsdag tuesday dienstag utery martedi marti + mardi wednesday: woensdag wednesday mittwoch streda mercoledi miercuri + mercredi thursday: donderdag thursday donnerstag ctvrtek giovedi joi + jeudi friday: vrijdag friday freitag patek venerdi vineri + vendredi saturday: zaterdag saturday samstag sobota sabato sambata + samedi \stopvariables \startvariables dutch english german czech italian romanian + french january: januari January Januar leden gennaio ianuarie + janvier february: februari February Februar unor febbraio februarie + fevrier march: maart March Maerz brezen marzo martie + mars april: april April April duben aprile aprilie + avril may: mei May Mai kveten maggio mai + mai june: juni June Juni cerven giugno iunie + juin july: juli July Juli cervenec luglio iulie + juillet august: augustus August August srpen agosto august + aout september: september September September zari settembre septembrie + septembre october: oktober October Oktober rijen ottobre octombrie + octobre november: november November November listopad novembre noiembrie + novembre december: december December Dezember prosinec dicembre decembrie + decembre \stopvariables %D Next we introduce some general label bound variables: @@ -150,16 +180,20 @@ \startvariables dutch english german czech italian romanian + french atpage: oppagina atpage aufseite nastrance apagina lapagina + alapage hencefore: hierboven hencefore vorher vyse precedente precedent + precedent hereafter: hieronder hereafter nachher nize seguente urmator + suivant \stopvariables @@ -174,64 +208,84 @@ \startvariables dutch english german czech italian romanian + french part: deel part teil cast parte parte + partie chapter: hoofdstuk chapter kapitel kapitola capitolo capitol + chapitre subject: onderwerp subject thema tema argomento subiect + sujet section: paragraaf section absatz sekce capoverso sectiune + section title: titel title titel titul titolo titlu + titre margintitle: margetitel margintitle marginaltitel titulmarginalie titoloinmargine titlumarginal + titremarge content: inhoud content inhalt obsah indice cuprins + contenu contents: inhouden contents inhalte obsah indici cuprinsuri + contenus appendix: bijlage appendix anhang dodatek appendice apendix + annexe appendices: bijlagen appendices anhaenge dodatky appendici apendixuri + annexes bodypart: hoofdtekst bodypart haupttext hlavnicast - testoprincipale principal % GB + testoprincipale principal + corpsdetexte bodymatter: hoofdteksten bodymatter haupttexte hlavnicasti - testiprincipali principalul % GB + testiprincipali principalul + texteprincipal frontpart: inleiding frontpart einleitung prednicast prefazione prolog + preface frontmatter: inleidingen frontmatter einleitungen prednicasti preambolo prologul + preambule backpart: uitleiding backpart epilog epilog - postfazione epilog % GB + postfazione epilog + postface backmatter: uitleidingen backmatter epiloge epilogy - postambolo epilogul % GB + postambolo epilogul + epilogue footnote: voetnoot footnote fussnote poznamkapodcarou notapdp notasubsol + notepdp endnote: eindnoot endnote endnote endnote endnote endnote + notefin system: systeem system systeme system sistema sistem + systeme \stopvariables @@ -240,46 +294,57 @@ \startvariables dutch english german czech italian romanian + french subsection: subparagraaf subsection unterabsatz podsekce sottocapoverso subsectiune + soussection subsubsection: subsubparagraaf subsubsection unterunterabsatz podpodsekce sottosottocapoverso subsubsectiune + soussoussection subsubsubsection: subsubsubparagraaf subsubsubsection unterunterunterabsatz podpodpodsekce sottosottosottocapoverso subsubsubsectiune + soussoussoussection subsubsubsubsection: subsubsubsubparagraaf subsubsubsubsection unterunterunterunterabsatz podpodpodpodsekce sottosottosottosottocapoverso subsubsubsubsectiune + soussoussoussoussection subsubsubsubsubsection: subsubsubsubsubparagraaf subsubsubsubsubsection unterunterunterunterunterabsatz podpodpodpodpodsekce sottosottosottosottosottocapoverso subsubsubsubsubsectiune + soussoussoussoussoussection subsubject: subonderwerp subsubject unterthema podtema sottoargomento subsubiect + soussujet subsubsubject: subsubonderwerp subsubsubject unterunterthema podpodtema sottosottoargomento subsubsubiect + soussoussujet subsubsubsubject: subsubsubonderwerp subsubsubsubject unterunterunterthema podpodpodtema sottosottosottoargomento subsubsubsubiect + soussoussoussujet subsubsubsubsubject: subsubsubsubonderwerp subsubsubsubsubject unterunterunterunterthema podpodpodpodtema sottosottosottosottoargomento subsubsubsubsubiect + soussoussoussoussujet subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsubsubject unterunterunterunterunterthema podpodpodpodpodtema sottosottosottosottosottoargomento subsubsubsubsubsubiect + soussoussoussoussoussujet \stopvariables @@ -288,29 +353,36 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub \startvariables dutch english german czech italian romanian + french flushleft: lijnlinks flushleft flushleft flushleft flushleft flushleft + flushleft flushright: lijnrechts flushright flushright flushright flushright flushright + flushright center: centreer center center center center center + center \stopvariables \startvariables dutch english german czech italian romanian + french typing: typen typing tippen typing - typing typing % GB + typing typing + typing file: file file datei soubor file fisier + fichier \stopvariables @@ -325,82 +397,108 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub \startvariables dutch english german czech italian romanian + french formula: formule formula formel rovnice formula formula + formule formulae: formules formulae formeln rovnice formule formule + formules figure: figuur figure abbildung obrazek figura figura + figure figures: figuren figures abbildungen obrazky figure figure + figures table: tabel table tabelle tabulka tabella tabelul + tableau tables: tabellen tables tabellen tabulky tabelle tabelele + tables graphic: grafiek graphic grafik graf grafico graficul + graphique graphics: grafieken graphics grafiken grafy grafici graficele + graphiques intermezzo: intermezzo intermezzo intermezzo intermezzo intermezzo intermezzo + intermezzo intermezzi: intermezzos intermezzi intermezzi intermezzi intermezzi intermezzi + intermezzi index: index index index rejstrik indiceanalitico index + index indices: indices indices indizies rejstriky indicianalitici indexuri + indices abbreviation: afkorting abbreviation abkuerzung zkratka abbreviazione abreviere + abreviation abbreviations: afkortingen abbreviations abkuerzungen zkratky abbreviazioni abrevieri + abreviations logo: logo logo logo logo logo logo + logo logos: logos logos logos loga loghi logos + logos unit: eenheid unit einheit jednotka unita unitate + unite units: eenheden units einheiten jednotky unita unitati + unites line: regel line zeile radek riga linia + ligne lines: regels lines zeilen radky righe linii + lignes framedtext: kadertekst framedtext umrahmtertext oramovanytext testoincorniciato textinconjurat + texteencadre quotation: citaat quotation zitat citace citazione citat + citation quote: citeer quote zitieren citovat menzione minicitat + citer speech: spraak speech speech speech speech speech + discours itemize: opsomming itemize aufzaehlung vycet elenco enumerare + lister \stopvariables @@ -416,1097 +514,1445 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub \startconstants dutch english german czech italian romanian + french leftquotation: linkercitaat leftquotation linkerzitat citacevlevo citazionesinistra citatstanga + citationgauche rightquotation: rechtercitaat rightquotation rechterzitat citacevpravo citazionedestra citatdreapta + citationdroite leftquote: linkerciteer leftquote linkerzitieren citovatvlevo menzionesinistra minicitatstanga + citergauche rightquote: rechterciteer rightquote rechterzitieren citovatvpravo menzionedestra minicitatdreapta - compoundhyphen: koppelteken compoundhyphen - compoundhyphen compoundhyphen - compoundhyphen compoundhyphen - leftcompoundhyphen: linkerkoppelteken leftcompoundhyphen - leftcompoundhyphen leftcompoundhyphen - leftcompoundhyphen leftcompoundhyphen -rightcompoundhyphen: rechterkoppelteken rightcompoundhyphen - rightcompoundhyphen rightcompoundhyphen - rightcompoundhyphen rightcompoundhyphen -midsentence: middenzin midsentence - midsentence midsentence - midsentence midsentence + citerdroite + compoundhyphen: koppelteken compoundhyphen + compoundhyphen compoundhyphen + compoundhyphen compoundhyphen + compoundhyphen + leftcompoundhyphen: linkerkoppelteken leftcompoundhyphen + leftcompoundhyphen leftcompoundhyphen + leftcompoundhyphen leftcompoundhyphen + leftcompoundhyphen + rightcompoundhyphen: rechterkoppelteken rightcompoundhyphen + rightcompoundhyphen rightcompoundhyphen + rightcompoundhyphen rightcompoundhyphen + rightcompoundhyphen + midsentence: middenzin midsentence + midsentence midsentence + midsentence midsentence + midsentence leftsentence: linkerzin leftsentence linkersatz vetavlevo frasesinistra propozitiestanga + phrasegauche rightsentence: rechterzin rightsentence rechtersatz vetavpravo frasedestra propozitiedreapta + phrasedroite leftsubsentence: linkersubzin leftsubsentence linkersubsatz podvetavlevo sottofrasesinistra subpropozitiestanga + sousphrasegauche rightsubsentence: rechtersubzin rightsubsentence rechtersubsatz podvetavpravo sottofrasedestra subpropozitiedreapta - + sousphrasedroite leftspeech: linkeruitspraak leftspeech leftspeech leftspeech - leftspeech leftspeech %%% + leftspeech leftspeech + leftspeech middlespeech: middenuitspraak middlespeech middlespeech middlespeech - middlespeech middlespeech %%% + middlespeech middlespeech + middlespeech rightspeech: rechteruitspraak rightspeech rightspeech rightspeech - rightspeech rightspeech %%% - + rightspeech rightspeech + rightspeech limittext: limiettekst limittext limittext limittext limittext limittext - + limittext date: datum date datum datum data data + date spacebefore: voorwit spacebefore vorspatium mezerapred spazioprima spatiuinainte + espaceavant spaceinbetween: tussenwit spaceinbetween spaceinbetween spaceinbetween spaceinbetween spaceinbetween + spaceinbetween spaceafter: nawit spaceafter nachspatium mezeraza spaziodopo spatiudupa + espaceapres sidespacebefore: zijvoorwit sidespacebefore nebenvorspatium bocnimezerapred spaziolateraleprima spatiulateralinainte + espacelateralavant sidespaceafter: zijnawit sidespaceafter nebennachspatium bocnimezeraza spaziolateraledopo spatiulateraldupa + espacelateralapres to: aan to zu na verso catre + vers indicator: aanduiding indicator indikator indikator indicatore indicator + indicateur background: achtergrond background hintergrund pozadi sfondo fundal + arriereplan backgrounddepth: achtergronddiepte backgrounddepth hintergrundtiefe hloubkapozadi profonditasfondo adancimefundal + profondeurarriereplan backgroundcorner: achtergrondhoek backgroundcorner hintergrundwinkel rohpozadi angolosfondo coltfundal - splitcolor: splitskleur splitcolor - splitcolor splitcolor - splitcolor splitcolor + coinarriereplan + splitcolor: splitskleur splitcolor + splitcolor splitcolor + splitcolor splitcolor + splitcolor backgroundcolor: achtergrondkleur backgroundcolor hintergrundfarbe barvapozadi coloresfondo culoarefundal + couleurarriereplan foregroundcolor: voorgrondkleur foregroundcolor foregroundcolor foregroundcolor coloreprimopiano foregroundcolor + couleurpremierplan foregroundstyle: voorgrondletter foregroundstyle foregroundstyle foregroundstyle foregroundstyle foregroundstyle -clipoffset: clipoffset clipoffset - clipoffset clipoffset - clipoffset clipoffset + stylepremierplan + clipoffset: clipoffset clipoffset + clipoffset clipoffset + clipoffset clipoffset + clipoffset backgroundoffset: achtergrondoffset backgroundoffset hintergrundoffset offsetpozadi offsetsfondo offsetfundal + decalagearriereplan backgroundscreen: achtergrondraster backgroundscreen hintergrundraster rastrpozadi schermosfondo ecranfundal + ecranarriereplan backgroundradius: achtergrondstraal backgroundradius hintergrundradius polomerpozadi raggiosfondo razafundal + rayonarriereplan address: adres address adresse adresa indirizzo adresa + adresse stopper: afsluiter stopper abschnitttrenner predel stopper stopper + taquet distance: afstand distance abstand vzdalenost distanza distanta + distance paragraph: alinea paragraph absatz odstavec capoverso paragraf + paragraphe axis: assenstelsel axis achsen osa asse axa + axe author: auteur author autor autor autore autor + auteur auto: auto auto auto auto auto auto + auto autofile: autofile autofile autofile autofile - autofile autofile % TB TH + autofile autofile + autofile % TB TH balance: balanceren balance ausgleichen rovnovaha bilanciamento balanta + equilibre wfactor: bfactor wfactor bfaktor sfaktor - wfactor factorw % GB + wfactor factorw + facteurlargeur inner: binnen inner innen vnitrni interno intern + interieur blank: blanko blank blanko prazdny rigovuoto blanc + vide obstruction: blokkade obstruction gesperrt prekazka ostruzione obstructie + obstruction blockway: blokwijze blockway blockauf dobloku - blockway blockway % GB + blockway blockway + blockway bottomspace: bodemwit bottomspace bottomspace bottomspace spaziofondo spatiujos + espaceinf top: boven top oben vrsek cima sus + sup topdistance: bovenafstand topdistance obenabstand vzdalenostvrsku distanzacima distantasus + distancesup topframe: bovenkader topframe obenrahmen rameceknahore cornicecima framesus + cadresup topoffset: bovenoffset topoffset obenoffset offsetvrsku offsetcima offsetsus + decalagesup topstate: bovenstatus topstate statusoben statusvrsku statocima staresus + etatsup width: breedte width breite sirka ampiezza latime + largeur maxwidth: maxbreedte maxwidth maxbreite maxsirka ampiezzamax latimemaxima + largeurmax minwidth: minbreedte minwidth minbreite minsirka - ampiezzamin latimeminima % TB TH + ampiezzamin latimeminima + largeurmin source: bron source quelle zdroj origine sursa + origine command: commando command befehl prikaz comando comanda + commande commands: commandos commands befehle prikazy comandi comenzi -component: component component - component component - component component + commandes + component: component component + component component + component component + composant contrastcolor: contrastkleur contrastcolor kontrastfarbe kontrastnibarva colorecontrasto culoarecontrast + coleurcontraste conversion: conversie conversion konversion konverze conversione conversie + conversion headconversion: kopconversie headconversion headconversion konverzehlavicky - conversionetesta conversietitlu % TB + conversionetesta conversietitlu + conversiontete % TB headlabel: koplabel headlabel headlabel popisekhlavicky - etichettatesta etichetatitlu % TB + etichettatesta etichetatitlu + etiquettetete criterium: criterium criterium kriterium kriterium criterio criteriu + critere date: datum date datum datum data data + date default: default default default implicitni implicito implicit + defaut depth: diepte depth tiefe hloubka profondita inaltime + profondeur depthcorrection: dieptecorrectie depthcorrection tiefekorrektur korekcehloubky correzioneprofondita corectieadancime -% dikte: dikte thickness -% dicke tloustka -% spessore grosime + correctionprofondeur continue: doorgaan continue fortsetzen pokracovat continua continua + continue doublesided: dubbelzijdig doublesided doppelseitig oboustranne doppiafaccia douafete + rectoverso dummy: dummy dummy dummy dummy dummy dummy + dummy unit: eenheid unit einheit jednotka unita unitate + unite ownnumber: eigennummer ownnumber eigenenummer vlastnicislo numeroproprio numarpropriu -% new -% eigenschap: eigenschap property -% property property -% property property + numeroproprio +% eigenschap: eigenschap property +% property property +% property property +% property evenmargin: evenmarge evenmargin geraderand sudamarginalie marginepari marginepara + margepaire expansion: expansie expansion expansion expanzen espansione expansiune -keyexpansion: sleutelexpansie keyexpansion - keyexpansion keyexpansion - keyexpansion keyexpansion + expansion + keyexpansion: sleutelexpansie keyexpansion + keyexpansion keyexpansion + keyexpansion keyexpansion + keyexpansion factor: factor factor faktor faktor fattore factor + facteur convertfile: converteerfile convertfile konvertieredatei konverzesouboru convertifile convertestefisier + conversionfichier file: file file datei soubor file fisier + fichier inputfile: inputfile inputfile inputfile inputfile - inputfile inputfile % !! + inputfile inputfile + fichierentree size: formaat size groesse velikost dimensione dimensiune + dimension autofocus: autofocus autofocus autofocus autoostreni autofocus autofocus + autofocus focus: focus focus focus zaostreni - focus focus % GB + focus focus + focus directory: gebied directory verzeichnis adresar directory director + repertoire cache: cache cache cache cache cache cache + cache grid: grid grid gritter mrizka griglia grid + grille big: groot big gross velky grande mare + grand get: haal get hole ziskat prendi adu + obtient hang: hang hang haengend zaveseni sospendi suspenda + suspend repeat: herhaal repeat wiederholen opakovat ripeti repeta + repete hfactor: hfactor hfactor hfaktor vfaktor - hfactor hfactor % GB + hfactor hfactor + facteurhauteur corner: hoek corner winkel roh angolo colt + coin hoffset: hoffset hoffset hoffset hoffset - hoffset hoffset % GB + hoffset hoffset + decalagehauteur frames: hokjes frames umrahmen ramecky cornici frames + cadres header: hoofd header kopfzeile zahlavi intestazione antet + entete headerdistance: hoofdafstand headerdistance kopfzeilenabstand vzdalenostzahlavi distanzaintestazione distantaantet + distanceentete headerstate: hoofdstatus headerstate kopfzeilenstatus statuszahlavi statointestazione stareantet + etatentete height: hoogte height hoehe vyska altezza inaltime + hauteur maxheight: maxhoogte maxheight maxhoehe maxvyska altezzamax inaltimemaxima + hauteurmax minheight: minhoogte minheight minhoehe minvyska altezzamin inaltimeminima + hauteurmin mindepth: mindiepte mindepth mindepth mindepth - mindeoth mindepth % new GB + mindeoth mindepth + profondeurmin current: huidige current aktuell aktualni corrente curent + courant in: in in in v in in + in indenting: inspringen indenting einziehen odsazovani rientro aliniat + composeenalinea interaction: interactie interaction interaktion interakce interazione interactiune + interaction interlinespace: interlinie interlinespace zeilenabstande meziradkovamezera interlinea spatiereinterliniara + espaceinterligne items: items items posten polozky elementi elemente + elements frame: kader frame rahmen ramecek cornice frame + cadre framedepth: kaderdiepte framedepth rahmentiefe hloubkaramecku profonditacornice adancimeframe + profondeurcadre framecorner: kaderhoek framecorner rahmenwinkel rohramecku angolocornice coltframe + coincadre framecolor: kaderkleur framecolor rahmenfarbe barvaramecku colorecornice culoareframe + couleurcadre frameoffset: kaderoffset frameoffset rahmenoffset offsetramecku offsetcornice offsetframe + decalagecadre frameradius: kaderstraal frameradius rahmenradius polomerramecku raggiocornice razaframe + rayoncadre marginedge: kantlijn marginedge marginalkante textovahrana bordomargine coltbordura + bordmarge marginedgetext: kantlijntekst marginedgetext marginalkantetext textmarginalnihookraje testobordomargine textcoltbordura + textebordmarge aligncharacter: karakteruitlijnen aligncharacter aligncharacter aligncharacter - allineacarattere aliniazacaracter % TB TH + allineacarattere aliniazacaracter + caracterealigne alignmentcharacter: uitlijnkarakter alignmentcharacter alignmentcharacter alignmentcharacter - carattereallineamento alierecaracter % TB TH + carattereallineamento alierecaracter + alignementcaractere small: klein small klein male piccolo mic + petit color: kleur color farbe barva colore culoare + couleur column: kolom column spalte sloupec colonna coloana + colonne columns: kolommen columns spalten sloupce colonne coloane + colonnes columndistance: kolomafstand columndistance spaltenabstand vzdalenostsloupcu distanzacolonne distantacoloane + distancecolonne headcommand: kopcommando headcommand headcommand headcommand headcommand headcommand + commandetete headcolor: kopkleur headcolor kopffarbe barvahlavicky coloretesta culoaretitlu + couleurtete headstyle: kopletter headstyle kopfstil stylhlavicky stiletesta stiltitlu + styletete afterhead: kopna afterhead nachkopf pohlavicce dopotesta dupatitlu + aprestete veroffset: kopoffset veroffset kopfoffset offsethlavicky - veroffset veroffset % GB + veroffset veroffset + veroffset coupling: koppeling coupling verknuepfung propojeni accoppiamento cuplare + couplage couplingway: koppelwijze couplingway verkopplungsart zpusobpropojeni modoaccoppiamento modcuplare + modecouplage beforehead: kopvoor beforehead vorkopf predhlavickou primaditesta inaintetitlu + avanttete topspace: kopwit topspace kopfspatium svrchnimezera spaziocima spatiusus + espacesup bodyfont: korps bodyfont fliesstext zakladnifont fonttesto fonttext + policecorps label: label label label popisek etichetta eticheta + etiquette empty: leeg empty leer prazdne vuoto gol + vide style: letter style stil pismeno stile stil + style rule: lijn rule linie linka linea rigla + ligne rulethickness: lijndikte rulethickness liniendicke tloustkalinky spessorelinea grosimerigla + epaisseurligne rulecolor: lijnkleur rulecolor linienfarbe barvalinky colorelinea culoarerigla + couleurligne list: lijst list liste seznam elenco lista + liste leftwidth: linkerbreedte leftwidth linkerbreite sirkavlevo ampiezzasinistra latimestanga + largeurgauche leftframe: linkerkader leftframe linkerrahmen ramecekvlevo cornicesinistra framestanga + cadregauche leftcolor: linkerkleur leftcolor linkerfarbe barvavlevo coloresinistra culoarestanga + couleurgauche leftstyle: linkerletter leftstyle linkerstil stylvlevo stilesinistra stilstanga + leftstyle leftmargin: linkermarge leftmargin linkerrand levyokraj marginesinistro marginestanga + margegauche leftmargindistance: linkermargeafstand leftmargindistance linkerrandabstand vzdalenostlevehookraje distanzamarginesinistro distantamarginestanga + distancemargegauche leftoffset: linkeroffset leftoffset linkeroffset levyoffset offsetsinistro offsetstanga + decalagegauche leftedge: linkerrand leftedge linkekante levahrana bordosinistro bordurastanga + brodgauche leftedgedistance: linkerrandafstand leftedgedistance linkerkantenabstand vzdalenostlevehrany distanzabordosinistro distantabordurastanga + distancebordgauche lefttext: linkertekst lefttext linkertext textvlevo - testosinistro textstanga % GB + testosinistro textstanga + textegauche left: links left links vlevo sinistra stanga + gauche nleft: nlinks nleft nlinks nvlevo nsinistra nstanga + ngauche logo: logo logo logo logo logo logo + logo logos: logos logos logos loga loghi logos + logos local: lokaal local lokal lokalne locale local + local margin: marge margin marginalie marginalie margine margine + marge margindistance: margeafstand margindistance marginalabstand vzdalenostokraje distanzamargine distantamargine + distancemarge margintext: margetekst margintext marginaltext textmarginalie testomargine textmargine + textemarge marking: markering marking beschriftung znaceni marcatura marcaje + marquage marcolor: markleur marcolor beschrfarbe barvaznacky coloremarcatura culoaremarcaj + couleurmarquage marstyle: marletter marstyle beschrstil stylsnacky stilemarcatura stilmarcaj + stylemarquage menu: menu menu menue menu menu meniu + menu splitmethod: splitsmethode splitmethod splitmethod splitmethod splitmethod splitmethod + splitmethod textmethod: tekstmethode textmethod textmethod textmethod textmethod textmethod + textmethod sidemethod: zijmethode sidemethod sidemethod sidemethod sidemethod sidemethod + sidemethod method: methode method methode metoda metodo metoda + methode middle: midden middle mittig stredni - centro mijloc % GB + centro mijloc + milieu middletext: middentekst middletext mittigertext strednitext - testocentro textmijloc % GB + testocentro textmijloc + textecentre max: max max max max max max + max min: min min min min min min + min sample: monster sample muster vzor campione exemplu + echantillon after: na after nach po dopo dupa + apres name: naam name name jmeno nome nume + nom commandafter: nacommando commandafter zumbefehl prikazpo comdandodopo comandadupa + commandeapres ntop: nboven ntop noben nvrsek ncima nsus + nsup level: niveau level niveau uroven livello nivel + niveau levels: niveaus levels niveaus urovne livelli nivele + niveaux nbottom: nonder nbottom nunten nspodek nfondo njos + ninf norm: norm norm norm norm norma norm + norme nlines: nregels nlines zzeile nradky nrighe nlinii + nlignes number: nummer number nummer cislo numero numar + numero numbercommand: nummercommando numbercommand nummerbefehl ciselnyprikaz comandonumero comandanumar + commandenumero numbering: nummeren numbering nummerierung cislovani numerazione numerotare + numerotation numbercolor: nummerkleur numbercolor nummernfarbe barvacisla colorenumero culoarenumar + couleurnumero numberstyle: nummerletter numberstyle nummernstil stylcisla stilenumero stilnumar + stylenumero numberseparator: nummerscheider numberseparator nummernseperator oddelovaccisla separatorenumero separatornumar + separateurnumbero object: object object objekt objekt oggetto obiect + objet offset: offset offset offset offset offset offset + offset bottom: onder bottom unten spodek fondo jos + inf bottomdistance: onderafstand bottomdistance abstandunten vzdalenostspodku distanzafondo distantajos + distanceinf bottomframe: onderkader bottomframe untenrahmen ramecekdole cornicefondo framejos + cadreinf bottomoffset: onderoffset bottomoffset untenoffset offsetspodku offsetfondo offsetjos + decalageinf bottomstate: onderstatus bottomstate untenstatus statusspodku statofondo starejos + etatinf oddmargin: onevenmarge oddmargin ungeraderand lichyokraj marginedispari margineimpara + margepaire at: op at bei u ad la + a option: optie option option volba opzione optiune + option page: pagina page seite stranka pagina pagina + page pagecommand: paginacommando pagecommand seitenbefehl strankovyprikaz comandopagina comandapagina + commandepage pagecolor: paginakleur pagecolor seitenfarbe barvastranky colorepagina culoarepagina + couleurpage pagestyle: paginaletter pagestyle seitenstil stylstranky stilepagina stilpagina + stylepage pagenumber: paginanummer pagenumber seitennummer cislostranky numeropagina numarpagina + numeropage headnumber: kopnummer headnumber kopfnummer cislonadpisu numerotesta numartitlu + numerotete pageboundaries: paginaovergangen pageboundaries seitenbegrenzung hranicestranky limitipagina marginipagina + limitespage pagestate: paginastatus pagestate pagestate pagestate - statopagina pagestate % TODO + statopagina pagestate + etatpage palet: palet palet palette paleta tavolozza paleta + palette paper: papier paper papier papir carta hartie + papier location: plaats location platz misto luogo locatie + emplacement placestopper: plaatsafsluiter placestopper setzetrenner predelmista - mettistopper punestopper % GB + mettistopper punestopper + emplacementstopper place: plaatsen place platziere umistit - metti pune % GB + metti pune + place placehead: plaatskop placehead setzekopf umistihlavicku - mettitesta punetitlu % GB + mettitesta punetitlu + placetete position: positie position position position - posizione pozitie % TB TH + posizione pozitie + position % TB TH prefix: prefix prefix prefix prefix prefisso prefix + prefixe preset: preset preset voreinstellung prednastaveni - preimpostato preset % GB + preimpostato preset + prereglage preview: preview preview vorschau nahled anteprima previzualizare -process: proces process - process process - process process - spot: spot spot - spot spot - spot spot + previsualisation + process: proces process + process process + process process + process + spot: spot spot + spot spot + spot spot + spot dot: punt dot punkt tecka punto punct + point arrow: pijl arrow pfeil sipka freccia sageata + fleche edge: rand edge kante hrana bordo bordura + bord edgedistance: randafstand edgedistance kantenabstand vzdalenosthrany distanzabordo distantabordura + distancebord screen: raster screen raster rastr schermo ecran + ecran rightwidth: rechterbreedte rightwidth rechterbreite sirkavpravo ampiezzadestra marginedreapta + largeurdroite rightframe: rechterkader rightframe rechterrahmen ramecekvpravo cornicedestra framedreapta + cadredroit rightcolor: rechterkleur rightcolor rechterfarbe barvavpravo coloredestra culoaredreapta + couleurdroite rightstyle: rechterletter rightstyle rechterstil stylvpravo stiledestra stildreapta + styledroit rightmargin: rechtermarge rightmargin rechterrand pravyokraj marginedestro marginedreapta + margedroite rightmargindistance: rechtermargeafstand rightmargindistance rechterrandabstand vzdalenostpravehookraje distanzamarginedestro distantamarginedreapta + distancemargedroite rightoffset: rechteroffset rightoffset rechterabstand pravyoffset offsetdestro offsetdreapta + rightoffset rightedge: rechterrand rightedge rechtekante pravahrana bordodestro borduradreapta + borddroit rightedgedistance: rechterrandafstand rightedgedistance rechterkantenabstand vzdalenostpravehrany distanzabordodestro distantacoltdreapta + distanceborddroit righttext: rechtertekst righttext rechtertext textvpravo - testodestro textdreapta % GB + testodestro textdreapta + textedroit right: rechts right rechts vpravo destra dreapta + droite nright: nrechts nright nrechts nvpravo ndestra ndreapta + ndroite reduction: reductie reduction reduktion redukce riduzione reducere + reduction referencing: refereren referencing referieren odkazujici - referencing referinta % GB + referencing referinta + referencing line: regel line zeile radek riga linie + ligne linecorrection: regelcorrectie linecorrection zeilekorrektur korekceradku correzioneriga corectielinie + correctionligne lines: regels lines zeilen radky righe linii + lignes stretch: rek stretch strecken natahnout - dilata dilatat % CHECK + dilata dilatat + etire resolution: resolutie resolution aufloesung rozliseni risoluzione rezolutie + resolution rotation: rotatie rotation rotation rotace rotazione rotatie -% new + rotation orientation: orientatie orientation orientation orientation orientation orientation - + orientation horoffset: rugoffset horoffset rumpfabstand horoffset - horoffset offsetoriz % GB + horoffset offsetoriz + horoffset backspace: rugwit backspace rumpfspatium zpetnamezera - backspace spatiuspate % GB + backspace spatiuspate + retour direction: richting direction richtung smer direzione directie + direction scale: schaal scale format meritko scala scala + echelle separator: scheider separator seperator oddelovac separatore separator + separateur display: scherm display bildschirm obrazovka - display display % GB + display display + affichage scope: scope scope bereich rozsah - scope scop % GB + scope scop + scope % beware: section is already used for 'paragraph' section: sectie section abschnitt oddil sezione sectiune + section sectionnumber: sectienummer sectionnumber abschnittsnummer cislooddilu numerosezione numarsectiune -setups: setups setups - setups setups - setups setups + numerosection + setups: setups setups + setups setups + setups setups + reglages cutspace: snijwit cutspace cutspace cutspace - cutspace cutspace % GB + cutspace cutspace + cutspace family: soort family familie rodina famiglia familie + famille space: spatie space spatium mezera spazio spatiu + espace spacing: spatiering spacing spatiumausgleich mezerovani spaziatura spatiere + espacement split: splitsen split split split - separa split % TB TH -splitoffset: splitsoffset splitoffset - splitoffset splitoffset - splitoffset splitoffset % TB TH + separa split + split + splitoffset: splitsoffset splitoffset + splitoffset splitoffset + splitoffset splitoffset + splitoffset indentnext: springvolgendein indentnext ziehefolgendeein odsadpristi rientrasuccessivo aliniaturmator + indentesuivant step: stap step schritt krok passo pas + pas stack: stapel stack stack stack - stack stack % TB GB + stack stack + stack start: start start start start inizia start + demarre state: status state status status stato stare + etat stop: stop stop stop stop termina stop + stoppe radius: straal radius radius polomer raggio raza + rayon dash: streep dash strich pomlcka - dash dash % GB + dash dash + pointille sub: sub sub unter pod sotto sub + sous subtitle: subtitel subtitle untertitel podtitulek sottotitolo subtitlu + soustitre symbol: symbool symbol symbol symbol simbolo simbol + symbole symbolset: symboolset symbolset symbolset sadasymbolu setsimboli setsimbol + jeusymbole symcolor: symkleur symcolor symfarbe barvasymbolu coloresimbolo culoaresimbol + couleursym symstyle: symletter symstyle symstil stylsymboly stilesimbolo stilsimbol + stylesym synonym: synoniem synonym synonym synonymum sinonimo sinonim + synonyme synonymcolor: synoniemkleur synonymcolor synonymfarbe barvasynonyma coloresinonimi culoaresinonim + couleursynonyme synonymstyle: synoniemletter synonymstyle synonymstil stylsynonyma stilesinonimi stilsinonim + stylesynonyme tab: tab tab tab tab tab tab + tab sign: teken sign zeichen znak segno semn + signe text: tekst text text text testo text + texte listtext: lijsttekst listtext listtext listtext listtext listtext + texteliste textwidth: tekstbreedte textwidth textbreite sirkatextu ampiezzatesto latimetext + largeurtexte textcommand: tekstcommando textcommand textbefehl textovyprikaz comandotesto comandatext + commandetexte textsize: tekstformaat textsize textgroesse velikosttextu dimensionetesto dimensiunetext + tailletexte textcolor: tekstkleur textcolor textfarbe barvatextu coloretesto culoaretext + couleurtexte textstyle: tekstletter textstyle textstil styltextu stiletesto stiltext + styletexte textseparator: tekstscheider textseparator textseparator oddelovactextu separatoretesto separatortext + separateurtexte textstate: tekststatus textstate textstatus statustextu statotesto staretext + etattexte title: titel title titel titul titolo titlu + titre titlestyle: titelletter titlestyle titelstil styltitulek stiletitolo stiltitlu + styletitre titlecolor: titelkleur titlecolor titelfarbe barvatitulek coloretitolo culoaretitlu + couleurtitre titledistance: titelafstand titledistance titelabstand vzdalenosttitulek distanzatitolo distantatitlu + distancetitre aligntitle: titeluitlijnen aligntitle titelausrichten zarovnejtitul allineatitolo alinieretitlu + alignementtitre tolerance: tolerantie tolerance toleranz tolerance tolleranza toleranta + tolerance inbetween: tussen inbetween zwischen mezi tra intre + entre type: type type typ typ - type type % GB + type type + type align: uitlijnen align ausrichtung zarovnani allinea aliniere + alignement urlspace: urlspatie urlspace urlspatium prostorurl spaziourl spatiuurl + espaceurl urlalternative: urlvariant urlalternative urlalternative urlalternativa alternativaurl urlalternativ + alternativeurl from: van from von z da dela + de alternative: variant alternative alternative alternativa alternativa alternativ + alternative increment: verhoog increment erhoehen zvysit - incremento increment % GB + incremento increment + incremente incrementnumber: verhoognummer incrementnumber nummererhoehen zvysujicicislo incrementanumero numarincrement -resetnumber: resetnummer resetnumber - resetnumber resetnumber - resetnumber resetnumber + incrementenumero + resetnumber: resetnummer resetnumber + resetnumber resetnumber + resetnumber resetnumber + raznumero reference: verwijzing reference referenz odkaz riferimento referinta + reference unknownreference: onbekendeverwijzing unknownreference unbekantereferenz neznamyodkaz riferimentoingoto referintanecunoscuta + referenceinconnue footer: voet footer fusszeile upati piedipagina subsol + pdp footerdistance: voetafstand footerdistance fusszeilenabstand vzdalenostupati distanzapdp distantasubsol + dsitancepdp footerstate: voetstatus footerstate fusszeilenstatus statusupati statopdp staresubsol + etatpdp voffset: voffset voffset voffset voffset voffset voffset + voffset next: volgende next folgende dalsi successivo urmatorul + suivant before: voor before vor pred prima inainte + avant commandbefore: voorcommando commandbefore vorbefehl predchoziprikaz comandoprima comandainainte + commandeavant previous: vorige previous vorige predchozi precedente precendent + precedent previousnumber: vorigenummer previousnumber vorigenummer predchozicislo numeroprecedente numarprecedent + numeroprecedent delay: wachttijd delay wartezeit prodleva attesa intarziere + delai way: wijze way art zpusob modo mod + mode random: willekeur random zufaellig nahodne casuale aleator + aleatoire white: wit white weiss bily bianco alb + blanc xfactor: xfactor xfactor xfaktor xfaktor - xfactor xfactor %GB + xfactor xfactor + xfactor xmax: xmax xmax xmax xmax - xmax xmax % GB + xmax xmax + xmax xoffset: xoffset xoffset xoffset xoffset - xoffset xoffset % GB + xoffset xoffset + xoffset xscale: xschaal xscale xformat xmeritko - xscale xscala % GB + xscale xscala + xscale xstep: xstap xstep xschritt xkrok - xstep xstep % GB + xstep xstep + xstep yfactor: yfactor yfactor yfaktor yfaktor - yfactor yfactor % GB + yfactor yfactor + yfactor ymax: ymax ymax ymax ymax - ymax ymax % GB + ymax ymax + ymax yoffset: yoffset yoffset yoffset yoffset - yoffset yoffset % GB + yoffset yoffset + yoffset yscale: yschaal yscale yformat ymeritko - yscale yscala % GB + yscale yscala + yscale ystep: ystap ystep yschritt ykrok - ystep ystep % GB + ystep ystep + ystep samepage: zelfdepagina samepage selbeseite stejnastranka stessapagina aceeasipagina - sidealign: zijuitlijnen sidealign - sidealign sidealign - sidealign sidealign + memepage + sidealign: zijuitlijnen sidealign + sidealign sidealign + sidealign sidealign + sidealign side: zij side objektabstand pocitat lato parte -% new - fieldlayer: veldlaag fieldlayer - fieldlayer fieldlayer - fieldlayer fieldlayer -textlayer: tekstlaag textlayer - textlayer textlayer - textlayer textlayer + cote + fieldlayer: veldlaag fieldlayer + fieldlayer fieldlayer + fieldlayer fieldlayer + calquechamp + textlayer: tekstlaag textlayer + textlayer textlayer + textlayer textlayer + calquetexte fieldbackgroundcolor: veldachtergrondkleur fieldbackgroundcolor feldhintergrundfarbe barvapozadipole coloresfondocampo culoarefundalcamp + couleurarrierreplanchamp fieldframecolor: veldkaderkleur fieldframecolor feldrahmenfarbe barvarameckupole colorecornicecampo culoareframecamp + couleurcadrechamp fieldoffset: veldoffset fieldoffset feldoffset offsetpole offsetcampo offsetcamp + offsetchamp openaction: openactie openaction oeffenaktion otevriakci azioneapri actiunedeschidere + actionouverture closeaction: sluitactie closeaction schliessenaktion zavriakci azionechiudi actiuneinchidere + actionfermeture openpageaction: openpaginaactie openpageaction openpageaction akceotevrenistranky - azioneapripagina actiunedeschiderepagina % TB + azioneapripagina actiunedeschiderepagina + actionouverturepage closepageaction: sluitpaginaactie closepageaction closepageaction akcezavrenistranky - azionechiudipagina actiuneinchiderepagina % TB + azionechiudipagina actiuneinchiderepagina + actionfermeturepage clickin: klikin clickin klickin klikuvnitr clickdentro clickintru + clicinterieur clickout: klikuit clickout klickaus klikvne clickfuori clickies + clicexterieur regionin: gebiedin regionin regionin oblastuvnitr entraregione regiuneintrare + entreregion regionout: gebieduit regionout regionaus oblastvne esciregione regiuneiesire + regionexterieure focusin: focusin focusin focusin focusin focusin focusin + focusin focusout: focusuit focusout focusout focusout focusout focusout + focusout afterkey: natoets afterkey nachtaste klavesapo dopotasto dupatasta + aprescle format: formatteer format formatieren formatovat - format format % GB + format format + formatter validate: valideer validate validieren validovat verifica verifica + valider calculate: bereken calculate berechnen pocitat calcola calculeaza + calculer click: klik click klick klik click click + clic vcommand: vcommando vcommand vbefehl vprikaz vcomando comandav + vcommande icommand: icommando icommand ibefehl iprikaz icomando comandai + icommande ccommand: ccommando ccommand cbefehl cprikaz ccomando comandac - + ccommande textdistance: tekstafstand textdistance textdistance textdistance - distanzatesto textdistance % TB TH + distanzatesto textdistance + distancetexte textmargin: tekstmarge textmargin textmargin textmargin - textmargin textmargin % TB TH - - keyword: trefwoord keyword - keyword keyword - parolachiave keyword + textmargin textmargin + margetexte + keyword: trefwoord keyword + keyword keyword + parolachiave keyword + motcle \stopconstants @@ -1515,10 +1961,12 @@ textlayer: tekstlaag textlayer \startconstants dutch english german czech italian romanian + french extras: extras extras extras extras extras extras + extras \stopconstants @@ -1533,872 +1981,1151 @@ textlayer: tekstlaag textlayer \startvariables dutch english german czech italian romanian + french on: aan on an zap attivo on + actif serried: aanelkaar serried kleinerabstand semknuto vicino serried + serried joinedup: aansluitend joinedup keinabstand spojeno unito unit + joinedup absolute: absoluut absolute absolut absolutni assoluto absolut + absolute background: achtergrond background hintergrund pozadi sfondo fundal + arriereplan backward: achteruit backward rueckwaerts zpet indietro inapoi + retourarriere subbackward: subachteruit subbackward unterrueckwaerts podzpet sottoindietro subinapoi + sousretourarriere action: actie action aktion akce azione actiune + action stopper: afsluiter stopper trenner predel stopper stopper + stopper paragraph: alinea paragraph absatz odstavec capoverso paragraf + paragraphe all: alles all alles vse tutti tot + tout always: altijd always immer vzdy sempre totdeauna + toujours auto: auto auto auto auto auto auto + auto autointro: autointro autointro autointro autouvod autointro autointro + autointro both: beide both beide obe entrambi ambele + lesdeux inner: binnen inner innen uvnitr interno intern + interieur blank: blanko blank blanko prazdny rigovuoto blank + vide disable: blokkeer disable sperren zablokovat disattiva dezactivat + desactiver top: boven top oben vrsek cima sus + sup wide: breed wide breit siroce ampio larg + ample width: breedte width breite sirka ampiezza latime + largeur minwidth: minbreedte minwidth minbreite minsirka - ampiezzamin latimeminima % TB TH + ampiezzamin latimeminima + largeurmin outer: buiten outer aussen vnejsi esterno extern + exterieur numbers: cijfers numbers ziffern cisla numeri numere + numeros Numbers: Cijfers Numbers Ziffern Cisla Numeri Numere + Numeros command: commando command befehl prikaz comando comanda + commande commands: commandos commands befehle prikazy comandi comenzi + commandes concept: concept concept konzept koncept concetto concept + concept day: dag day tag den giorno zi + jour date: datum date datum datum data data + date default: default default default implicitni implicito implicit + defaut final: definitief final endfassung finalni finale final + final depth: diepte depth tiefe podlehloubky profondita adancime + profondeur doublesided: dubbelzijdig doublesided doppelseitig dvoustranny doppiafaccia douafete + rectoverso first: eerste first erste prvni primo primul + premier each: elk each jede kazdy ogni fiecare + chaque singlesided: enkelzijdig singlesided einzelseitig jednostranne facciasingola ofata + recto somewhere: ergens somewhere irgendwo nekde daqualcheparte undeva + qqpart nowhere: nergens nowhere nirgens nikde danessunaparte niciunde + nulpart even: even even gerade sude pari par + paire external: extern external extern externi esterno extern + external file: file file datei soubor file fisier + fichier flexible: flexibel flexible flexibel prizpusobive flessibile flexibil + flexible force: forceer force zwinge sila forza fortat + force used: gebruikt used verwende uzito usato folosit + used none: geen none kein zadny nessuno niciunul + rien nomarking: geenmarkering nomarking keinebeschriftung zadneznaceni nomarcature faramarcare + sansmarquage nonumber: geennummer nonumber nonumber nonumber - nonumber nonumber % GB ETC NEW + nonumber nonumber + sansnumero % geentekst: geentekst notext % notext notext -% notext notext % GB ETC NEW +% notext notext nowhite: geenwit nowhite keinweiss zadnabila nobianco faraalb + sansblanc rotated: geroteerd rotated gedreht otoceno ruotato rotat + tourne mirrored: gespiegeld mirrored gespiegelt zrcadleno riflesso oglindit + reflete global: globaal global global globalne globale global + global grid: grid grid gritter mrizka griglia grila + grille big: groot big gross velke grande mare + grand bigbodyfont: grootkorps bigbodyfont bigbodyfont bigbodyfont - grossofontdeltesto bigbodyfont %% + grossofontdeltesto bigbodyfont + grandepolicecorp bigpreference: grotevoorkeur bigpreference grosszuegig vysokapriorita grandepreferenza preferintamare + grandepreference gray: grijs gray grau seda grigio gri + gris halfline: halveregel halfline halbezeile pulradku mezzariga jumatatelinie + demiligne keep: handhaaf keep behalte drzet mantieni mentine + maintient hanging: hangend hanging haengend visici sospeso suspendat + suspend spacing: spatiering spacing spatiumausgleich mezerovani spaziatura spatiere + espacement nospacing: geenspatiering nospacing nospacing nospacing nospacing nospacing + sansespacement repeat: herhaal repeat wiederholen opakovat ripeti repetat + repete fix: herstel fix stellewiederher fixuj fisso fix + fixe here: hier here hier zde qui aici + ici header: hoofd header kopfzeile zahlavi intestazione antet + entete high: hoog high hoch vysoko alto inalt + haut height: hoogte height hoehe vyska altezza inaltime + hauteur minheight: minhoogte minheight minhoehe minvyska altezzamin inaltimeminima + hauteurmin horizontal: horizontaal horizontal horizontal horizontalne orizzontale orizontal + horizontale current: huidige current aktuell aktualni corrente curent + courant hz: hz hz hz hz hz hz + hz nohz: geenhz nohz nohz nohz nohz nohz + nohz italic: italic italic italic kurziva corsivo italic + italique inherit: erf inherit inherit inherit - inherit inherit % new + inherit inherit + herite inleft: inlinker inleft imlinken vlevo insinistra instanga + dansgauche inmargin: inmarge inmargin imrand naokraji inmargine inmargine + dansmarge inright: inrechter inright imrechten vpravo indestra indreapta + dansdroit interaction: interactie interaction interaktion interakce interazione interactiune + interaction intext: intekst intext imtext dotextu intesto intext + danstexte intro: intro intro intro uvod intro intro + intro its: its its its pol - its propriu % GB + its propriu + its yes: ja yes ja ano si da + oui year: jaar year jahr rok anno an + annee frame: kader frame rahmen ramecek cornice incadrat + cadre marginedge: kantlijn marginedge marginalkante textovahrana bordomargine marginebordura + bordmarge cap: kap cap kap kap cap cap + cap capital: kapitaal capital versalien kapitalky maiuscolo majuscula + capitale referral: kenmerk referral merkmal znacka referral referinta + referral small: klein small klein male piccolo mic + petit smallnormal: kleinnormaal smallnormal kleinnormal malenormalni piccolonormale micnormal + normalpetit smallslanted: kleinschuin smallslanted kleingeneigt malesklonene piccoloinclinato micinclinat + inclinepetit smallslantedbold: kleinschuinvet smallslantedbold kleingeneigtfett malesklonenetucne piccoloinclinatograssetto micinclinataldin + grasinclinepetit smallitalic: kleinitalic smallitalic kleinitalic malekurzivni piccolocorsivo micitalic + italiquepetit smallitalicbold: kleinitalicvet smallitalicbold kleinitalicfett malekurzivnitucne piccolocorsivograssetto micitalicaldin + grasitaliquepetit smalltype: kleintype smalltype kleintippen maletype piccolotype mictype + petittype smallbold: kleinvet smallbold kleinfett maletucne piccolograssetto micaldin + graspetit smallboldslanted: kleinvetschuin smallboldslanted kleinfettgeneigt maletucnesklonene piccolograssettoinclinato micaldininclinat + inclinegraspetit smallbolditalic: kleinvetitalic smallbolditalic kleinfettitalic maletucnekurzivni piccolograssettocorsivo micaldininclinat + italiquegraspetit smallbodyfont: kleinkorps smallbodyfont smallbodyfont smallbodyfont - piccolofontdelcorpo smallbodyfont %% + piccolofontdelcorpo smallbodyfont + petitepolicecorps toggle: toggle wissel toggle toggle toggle toggle + toggle color: kleur color farbe barevne colore culoare + couleur column: kolom column column column - colonna coloana % TB TH + colonna coloana + colonne columns: kolommen columns spalten sloupce colonne coloane + colonnes head: kop head kopf hlavicka - testa antet % GB + testa antet + tete low: laag low tief nizko basso jos + bas last: laatste last letzte posledni ultimo ultim + dernier label: label label label popisek etichetta eticheta + etiquette lohi: laho lohi hoti nivy - pedap lohi % TB TH + pedap lohi + baha tall: lang tall lang vysoko - alto inalt % GB + alto inalt + long empty: leeg empty leer prazdne vuoto gol + vide Character: Letter Character Buchstabe Pismeno Lettera Caracter + Caratere character: letter character buchstabe pismeno lettera caracter + caractere Characters: Letters Characters Buchstaben Pismena Lettere Caractere + Caracteres characters: letters characters buchstaben pismena lettere caractere + caracteres landscape: liggend landscape querformat nasirku orizzontale vedere + paysage rule: lijn rule linie linka linea rigla + regle list: lijst list liste seznam elenco lista + liste leftmargin: linkermarge leftmargin linkerrand levyokraj marginesinistro marginestanga + margegauche leftpage: linkerpagina leftpage linkerseite levastranka paginasinistra paginastanga + pagegauche leftedge: linkerrand leftedge linkekante levahrana bordosinistro bordurastanga + bordgauche left: links left links vlevo sinistra stanga + gauche local: lokaal local lokal lokalne locale local + local new: nieuw new neu novy nuovo nou + nouveau MONTH: MAAND MONTH MONAT MESIC MESE LUNA + MOIS month: maand month monat mesic mese luna + mois mar: mar mar mar mar mar mar + mar margin: marge margin marginalie marginalie margine margine + marge max: max max max max max max + max min: min min min min min min + min mediaeval: mediaeval mediaeval mittelalterlich stredoveky medievale medieval + medieval medium: middel medium mittel stredni medio mediu + moyen middle: midden middle mittig nastred centro centru + milieu after: na after nach po dopo dupa + apres name: naam name name jmeno nome nume + nom opposite: naast opposite gegenueber naproti opposto opus + opposition no: nee no nein ne no nu + non negative: negatief negative negativ negativ negativo negativ + negatif positive: positief positive positiv positiv positivo positiv + positif not: niet not nicht ne non nu + pas never: nooit never nie nikdy mai niciodata + jamais normal: normaal normal normal normalni normale normal + normal number: nummer number nummer cislo numero numar + numero offset: offset offset offset offset offset offset + offset unknown: onbekend unknown unbekannt neznamy ignoto necunoscut + inconnu bottom: onder bottom unten spodek fondo subsol + inf odd: oneven odd ungerade liche dispari impar + impair packed: opelkaar packed gepackt zhustene impaccato impachetat + groupe unpacked: vanelkaar unpacked ungepackt rozbalene unpacked despachetat + degroupe makeup: opmaak makeup umbruch zlom makeup marcaj + makeup atmargin: opmarge atmargin amrand naokraji almargine lamargine + alamarge overlay: overlay overlay overlay prekryv sovrapponi overlay + revetement page: pagina page seite stranka pagina pagina + page pagenumber: paginanummer pagenumber seitennummer cislostranky numeropagina numarpagina + numeropage paper: papier paper papier papir carta foaie + papier display: scherm display bildschirm obrazovka - schermo display % new + schermo display + affichage reverse: omgekeerd reverse reverse reverse - invertito reverse % new + invertito reverse + inverse fit: passend fit passend prizpusobive adatta ajustat + adapte postscript: postscript postscript postscript postscript postscript postscript + postscript preview: preview preview vorschau nahled anteprima previzualizare + previsualisation program: programma program programm program programma program -process: proces process - process process - process process - spot: spot spot - spot spot - spot spot + programme + process: proces process + process process + process process + process + spot: spot spot + spot spot + spot spot + spot dot: punt dot punkt tecka punto punct + point ran: ran ran ran rozsah corse rulat + cours edge: rand edge kante hrana bordo bordura + bord screen: raster screen raster rastr schermo ecran + ecran rectangular: recht rectangular rechteckig pravouhly rettangolare rectangular + rectangulaire rightmargin: rechtermarge rightmargin rechterrand pravyokraj marginedestro marginedreapta + margedroite rightpage: rechterpagina rightpage rechterseite pravastranka paginadestra paginadreapta + pagedroite rightedge: rechterrand rightedge rechterkante pravahrana bordodestro borduradreapta + borddroit right: rechts right rechts vpravo destra dreapta + droite line: regel line zeile radek riga linie + ligne + hang: hang hang + haengend zaveseni + sospendi suspenda + suspend register: register register register rejstrik registro registru + registre relative: relatief relative relativ relativni relativo relativ + relatif reset: reset reset zuruecksetzten reset reimposta reset + raz Romannumerals: Romeins Romannumerals Roemischezahlen Rimskecislice Numeriromani Numereromane + Chiffresromains romannumerals: romeins romannumerals roemischezahlen rimskecislice numeriromani numereromane + chiffresromains greek: grieks greek griechisch recky greco grec + grec Greek: Grieks Greek Griechisch Recky Greco Grec + Grec round: rond round rund zaobleny rotondo rotund + rond rotate: roteer rotate drehe otoc ruota rotit + oriente stretch: rek stretch strecken natahnout dilata dilatat + etire backspace: rugwit backspace rumpfspatium zpetnamezera - backspace spatiuspate % GB + backspace spatiuspate + retourarriere broad: ruim broad breit siroky ampio broad + large row: rij row row row row rand + rang slanted: schuin slanted geneigt sklonene inclinato inclinat + incline slantedbold: schuinvet slantedbold geneigtfett sklonenetucne inclinatograssetto inclinataldin + grasincline synchronize: synchroniseer synchronize synchronize synchronize synchronize synchronize + synchronize italicbold: italicvet italicbold italicfett kurzivnitucne corsivograssetto italicaldin + grasitalique sectionnumber: sectienummer sectionnumber abschnittsnummer cislooddilu numerosezione numarsetiune + numerosection narrow: smal narrow schmall uzky stretto ingust + etroit cutspace: snijwit cutspace cutspace cutspace - cutspace cutspace % GB + cutspace cutspace + cutspace tolerant: soepel tolerant tolerant tolerantni tollerante tolerant + tolerant space: spatie space spatium mezera - spazio spatiu %% check + spazio spatiu + espace standard: standaard standard standard standardni standard standard + standard start: start start start start inizia start + demarre stop: stop stop stop stop termina stop + stoppe strict: streng strict streng striktni rigido strict + strict strut: strut strut strut strut strut strut + strut sub: sub sub unter pod sotto sub + sous sym: sym sym sym sym sim sym + sym txt: txt txt txt txt txt txt + txt symbol: symbool symbol symbol symbol simbolo simbol + symbole text: tekst text text text testo text + texte back: terug back zurueck zpet dietro inapot + retour test: test test test test test text + test inbetween: tussen inbetween zwischen mezi tra intre + entre type: type type tippen type - type type % GB + type type + type off: uit off aus vyp disattivo dezactivat + desactive url: url url url url url url + url URL: URL URL URL URL URL URL + URL fixed: vast fixed fest fixne fisso fixat + fixe loose: los loose lose uvolnene lento larg + perte continue: verder continue fortsetzten pokracovat continua continuu + continue vertical: vertikaal vertical vertikal vertikalne verticale vertical + verticale bold: vet bold fett tucne grassetto aldin + gras boldslanted: vetschuin boldslanted fettgeneigt tucnesklonene grassettoinclinato aldininclinat + inclinegras bolditalic: vetitalic bolditalic fettitalic tucnekurzivni grassettocorsivo aldinitalic + italiquegras quadruple: viertal quadruple viertel ctyrnasobny quadruplo cvadrupul + quadruple footer: voet footer fusszeile upati piedipagina subsol + pdp next: volgende next folgende dalsi successivo urmatorul + prochain before: voor before vor pred prima inainte + avant foreground: voorgrond foreground vordergrund popredi foreground primplan + premierplan preference: voorkeur preference einstellung nastaveni preferenza preferinta + preference temporary: voorlopig temporary temporaer docasne temporaneo temporar + temporaire forward: vooruit forward vorwaerts vpred avanti avans + avance subforward: subvooruit subforward untervorwaerts podvpred sottoavanti subavans + sousavance previous: vorige previous vorig predchozi precedente precedent + precedent value: waarde value wert hodnota valore valoare + valeur week: week week woche tyden settimana saptamana + semaine weekday: weekdag weekday wochentag vsedniden giornosettimana zisaptamana + joursemaine WEEKDAY: WEEKDAG WEEKDAY WOCHENTAG VSEDNIDEN GIORNOSETTIMANA ZISAPTAMANA + JOURSEMAINE random: willekeurig random zufaellig nahodny casuale aleator + aléatoire white: wit white weiss bily bianco alb + blanc very: zeer very sehr velmi molto foarte + tres verytolerant: zeersoepel verytolerant sehrtolerant velmitolerantni moltotollerante foartetolerant + trestolerant verystrict: zeerstreng verystrict sehrstreng velmistriktni - moltorigido foartestrict % GB + moltorigido foartestrict + tresstrict see: zie see sieh viz vedi vezi + voit smallcaps: smallcaps smallcaps smallcaps kapitalky maiuscoletto majusculemici + petitescapitales WORD: WOORD WORD WORT SLOVO PAROLA CUVANT + MOT firstpage: eerstepagina firstpage ersteseite prvnistranka primapagina primapagina + premierepage firstcolumn: eerstekolom firstcolumn firstcolumn firstcolumn firstcolumn firstcolumn + premierecolonne previouspage: vorigepagina previouspage vorigeseite predchozistranka paginaprecedente paginaanterioara + pageprecedente nextpage: volgendepagina nextpage folgendeseite dalsistranka paginasuccessiva paginaurmatoare + pagesuivante lastpage: laatstepagina lastpage letzteseite poslednistrana ultimapagina ultimapagina + dernierepage lastcolumn: laatstekolom lastcolumn lastcolumn lastcolumn lastcolumn lastcolumn + dernierecolonne lastpagenumber: laatstepaginanummer lastpagenumber lastpagenumber lastpagenumber lastpagenumber lastpagenumber + derniernumeropage subpage: subpagina subpage unterseite podstranka sottopagina subpagina + souspage firstsubpage: eerstesubpagina firstsubpage ersteunterseite prvnipodstranka primasottopagina primasubpagina + premieresouspage previoussubpage: vorigesubpagina previoussubpage vorigeunterseite predchozipodstranka sottopaginaprecedente subpaginaanterioara + souspageprecedente nextsubpage: volgendesubpagina nextsubpage folgendeunterseite dalsipodstranka sottopaginasuccessiva urmatoareasubpagina + souspagesuivante lastsubpage: laatstesubpagina lastsubpage letzteunterseite poslaednipodstranka ultimasottopagina ultimasubpagina + dernieresouspage nextevenpage: volgendeevenpagina nextevenpage naechstegeradeseite dalsisudastranka paginaparisuccessiva paginaparaurmatoarea + pagepairesuivante nextoddpage: volgendeonevenpagina nextoddpage naechsteungeradeseite dalsilichastranka paginadisparisuccessiva paginaimparaurmatoarea + pageimpairesuivante previousevenpage: vorigeevenpagina previousevenpage vorigegeradeseite predchozisudastranka paginapariprecedente paginaparaprecedenta + pagepaireprecedente previousoddpage: vorigeonevenpagina previousoddpage vorigeungeradeseite predchozilichastranka paginadispariprecedente paginaimparaprecedenta + pageimpaireprecedente readonly: alleenleesbaar readonly nurlesbar pouzeprocteni solalettura readonly + lectureseule required: verplicht required obligatorisch pozadovane richiestp obligatoriu + recquis protected: beschermd protected geschuetzt chranene protetto protejat + protege sorted: gesorteerd sorted sortiert tridene ordinato sortat + trie unavailable: nietbeschikbaar unavailable nichtverfuegbar nedostupne nondisponibile nedisponibil + indisponible hidden: verborgen hidden versteckt skryte nascosto ascuns + cache printable: printbaar printable druckbar tisknutelne stampabile tiparibil + editable bookmark: bookmark bookmark bookmark zalozka segnalibro semncarte - - nocheck: geencontrole nocheck - nocheck nocheck - nocheck nocheck - -% GB TB TH : - + marquepage + nocheck: geencontrole nocheck + nocheck nocheck + nocheck nocheck + nonverifie innermargin: binnenmarge innermargin innermargin innermargin margineinterno innermargin + margeinterieure outermargin: buitenmarge outermargin outermargin outermargin margineesterno outermargin + margeexterieure inneredge: binnenrand inneredge inneredge inneredge bordointerno inneredge + bordinterieur outeredge: buitenrand outeredge outeredge outeredge bordoesterno outeredge - + bordexterieur controls: sturing controls controls controls controlli controale + controles nothanging: niethangend nothanging nothanging nothanging nonsospeso nothanging + nonsuspendu hyphenated: afgebroken hyphenated hyphenate hyphenated sillabato despsilabe + hyphenated nothyphenated: nietafgebroken nothyphenated nothyphenated nothyphenated nonsillabato nedespsilabe - + nothyphenated overprint: overprint overprint overprint overprint - overprint overprint % new + overprint overprint + overprint knockout: knockout knockout knockout knockout - knockout knockout % new - + knockout knockout + knockout xml: xml xml xml xml xml xml - + xml enumeration: doornummering enumeration nummerierung vycet enumerazione enumerare + enumeration description: doordefinitie description beschreibung popis descrizione descriere + description \stopvariables \startconstants dutch english german czech italian romanian + french controls: sturing controls controls controls controlli controale + controles global: globaal global global globalne globale global - + global overprint: overprint overprint overprint overprint - overprint overprint % new + overprint overprint + overprint \stopconstants @@ -2414,13 +3141,16 @@ process: proces process \startvariables dutch english german czech italian romanian + french conversion: conversie conversion konversion konverze coversione conversie + conversion by: per by pro skrz da de + par \stopvariables @@ -2463,40 +3193,52 @@ process: proces process \startvariables dutch english german czech italian romanian + french calligraphic: calligrafie calligraphic kalligraphie kaligraficke calligrafico caligrafic + calligraphique handwritten: handschrift handwritten handschrift rukopisne grafiamanuale scrismanual + manuscript sansserif: schreefloos sansserif grotesk bezserifu - sansserif sansserif % GB + sansserif sansserif + sansserif roman: romaan roman antiqua antikva - roman roman % GB + roman roman + roman teletype: teletype teletype fernschreiber strojopis - teletype teletype % GB + teletype teletype + teletype type: type type tippen opis - type type % GB + type type + type serif: serif serif serif serif - serif serif % GB + serif serif + serif regular: regular regular regular pravidelne regolare regular + regulier support: support support support podpora supporto suport + support sans: sans sans sans sans sans sans + sans mono: mono mono mono mono mono mono + mono \stopvariables @@ -2513,77 +3255,101 @@ process: proces process \startsetupvariables dutch english german czech italian romanian + french enumeration: doornummering enumeration nummerierung vycet enumerazione enumerare + enumeration description: doordefinitie description beschreibung popis descrizione descriere + description indentation: doorsprong indentation einzug odsazovani rientro indentare + indentation labeling: doorlabel labeling beschriften oznacovani etichettatura etichetare + etiquettage combinedlist: samengesteldelijst combinedlist kombiniereliste kombinovanyseznam elencocombinato listacombinata + listeimbriquee % beware: section clashes with sectionlevel section: sectie section abschnitt oddil sezione sectiune + section register: register register register rejstrik registro registru + registre interaction: interactie interaction interaktion interakce interazione interactiune + interaction synonym: synoniem synonym synonym synonymum sinonimo sinonim + synonyme synonyms: synoniemen synonyms synonyme synonyma sinonimi sinonime + synonymes sort: sorteer sort sortiere trid - sort sortare % GB + sort sortare + tri sorts: sorteren sorts sortieren tridit - sorts sortari % GB + sorts sortari + tris name: naam name name jmeno nome nume + name float: blok float gleitobjekt plvouciobjekt oggettomobile obiectmobil + flottant floats: blokken floats gleitobjekte plvouciobjekty oggettimobili obiectemobile + flottants paragraph: alinea paragraph absatz odstavec capoverso paragraf + paragraphe framedtext: kadertekst framedtext umrahmtertext oramovanytext testoincorniciato textinconjurat + texteencadre itemgroup: itemgroup itemgroup itemgroup itemgroup itemgroup itemgroup + itemgroup typing: typen typing tippen typing - typing typing % GB + typing typing + typing buffer: buffer buffer puffer buffer buffer buffer + buffer formula: formule formula formel rovnice formula formula + formule subformula: subformule subformula unterformel podrovnice sottoformula subformula + sousformule tabulate: tabulatie tabulate tabulator tabelator tabulato tabulate + tabule \stopsetupvariables @@ -2598,85 +3364,112 @@ process: proces process \startelements dutch english german czech italian romanian + french begin: beginvan begin anfang zacatek inizio inceput + debut end: eindvan end ende konec fine sfarsit + fin coupled: gekoppelde coupled verknuepft propojene accoppiato cuplat + couple get: haal get get ziskat prendi get + obtient currentlocal: huidigelokale currentlocal aktuelllokal aktualnelokalni correntelocale localcurent + localcourant endsetup: in - ein - - - + - load: laad load laden nacist carica incarca + charge emptyone: leeg empty vuoto leer prazdne gol + vide emptytwo: lege empty leer prazdne vuoti gol + vide list: lijst list auflisten seznam elenco lista + liste listof: lijstmet listof auflistenvon seznam elencodi listade + listede local: lokale local lokal lokalne locale local + local place: plaats place platziere umisti metti pune + place reserve: reserveer reserve reservieren rezervovat riserva rezervat + reserver start: start start start start inizia start + demarre setup: stel setup stelle nastaveni imposta setare + regle stop: stop stop stop stop termina stop + stoppe increment: verhoog increment erhoehen zvysit incrementa increment + incremente next: volgende next folgende dalsi successivo urmatorul + suivant complete: volledige complete vollende uplny completo complet + complete previous: vorige previous vorige predchozi precedente precedent + precedent previouslocal: vorigelokale previouslocal voriglokal predchozilokalni precedentelocale precedentlocal + localprecedent see: zie see sieh viz vedi vezi + voit type: type type type opis - type type % GB + type type + type makeup: opmaak makeup umbruch zlom - makeup makeup % GB + makeup makeup + makeup text: tekst text text text testo text + texte \stopelements @@ -2685,64 +3478,84 @@ process: proces process \startvariables dutch english german czech italian romanian + french buffer: buffer buffer puffer buffer buffer buffer + buffer linenote: regelnoot linenote linenote linenote linenote linenote + noteligne comment: commentaar comment kommentar komentar commento comentariu + commentaire interactionmenu: interactiemenu interactionmenu interaktionsmenue interaktivnimenu menuinterattivo meniuinteractiune + menuinteraction postponing: uitstellen postponing verschieben odlozit - posporre postponing % GB + posporre postponing + postponing hiding: verbergen hiding verbergen skryt nascondere ascundere + cache tabulate: tabulatie tabulate tabulator tabelator tabulato tabulate + tabule tabulatehead: tabulatiekop tabulatehead tabulatehead tabulatehead - testatabulato tabulatehead % + testatabulato tabulatehead + tetetabule tabulatetail: tabulatiestaart tabulatetail tabulatetail tabulatetail - codatabulato tabulatetail % + codatabulato tabulatetail + queuetabule fact: gegeven fact gegeben fakt fatto fapt + fait legend: legenda legend legende legenda legenda legenda + legende formula: formule formula formel rovnice formula formula + formule tablehead: tabelkop tablehead tabellenueberschrift zahlavitabulky testatabella antettabel + tetetableau tabletail: tabelstaart tabletail tabellenende konectabulky codatabella subsoltabel + queuetableau setups: instellingen setups impostazioni einstellungen nastaveni setari + reglages helptext: helptekst helptext hilfetext textnapovedy testoaiuto textajutator + texteaide localenvironment: deelomgeving localenvironment lokaleumgebung lokalnihoprostredi ambientelocale mediulocal + environementlocal sectionblockenvironment: sectieblokomgeving sectionblockenvironment sectionblockenvironment sectionblockenvironment - ambientebloccosezione blocsectiuneambient % TB TH + ambientebloccosezione blocsectiuneambient + environementblocsection pagecomment: paginacommentaar pagecomment pagecomment komentarstranky - commentopagina comentariupagina % TB + commentopagina comentariupagina + commentairepage \stopvariables @@ -2757,141 +3570,176 @@ process: proces process \startvariables dutch english german czech italian romanian + french FirstPage: EerstePagina FirstPage ErsteSeite PrvniStrana PrimaPagina PrimaPagina + PremierePage PreviousPage: VorigePagina PreviousPage VorigeSeite PredchoziStrana PaginaPrecedente PaginaPrecedenta + PagePrecedente NextPage: VolgendePagina NextPage FolgendeSeite DalsiStrana PaginaSuccessiva PaginaUrmatoare + PageSuivante LastPage: LaatstePagina LastPage LetzteSeite PosledniStrana UltimaPagina UltimaPagina + DernierePage PreviousJump: VorigeSprong PreviousJump VorigerSprung PredchoziSkok SaltoPrecedente SaltPrecedent + SautPrecedent NextJump: VolgendeSprong NextJump NaechsterSprung NasledujiciSkok SaltoSuccessivo SaltUrmator + SautSuivant ToggleViewer: WisselViewer ToggleViewer WechseleViewer ZmenitProhlizec ScambiaVisualizzatore SchimbaVizualizator + ChangeVisualisateur ExitViewer: VerlaatViewer ExitViewer BeendeViewer UkoncitProhlizec EsciVisualizzatore IesireVizualizator + SortVisualisateur CloseDocument: SluitDocument CloseDocument SchliesseDokument ZavritDokument ChiudiDocumento InchideDocument + FermeDocument SaveDocument: BewaarDocument SaveDocument SpeichereDokument UlozitDokument SalvaDocumento SalvareDocument + SauvegardeDocument SaveNamedDocument: BewaarDocumentOpNaam SaveNamedDocument SaveNamedDocument SaveNamedDocument SaveNamedDocument SaveNamedDocument + SauvegardeDocumentNomme OpenNamedDocument: OpenDocumentOpNaam OpenNamedDocument OpenNamedDocument OpenNamedDocument OpenNamedDocument OpenNamedDocument + OuvreDocumentNomme ViewerHelp: ViewerHelp ViewerHelp ViewerHilfe NapovedaProhlizece AiutoVisualizzatore AjutorVizualizator + AideVisualisateur PrintDocument: PrintDocument PrintDocument DruckeDokument VytisknoutDokument StampaDocumento TiparesteDocument + ImprimeDocument SearchDocument: DoorzoekDocument SearchDocument DokumentDurchsuchen ProhledatDokument CercaDocumento CautaDocument + RechercheDocument SearchAgain: HerhaalZoeken SearchAgain WeiterSuchen HledatZnovu CercaAncora CautaDinNou + RechercheSuivant Query: RaadpleegDocument Query Query Query - Richiesta Query % TB TH GB + Richiesta Query + Query QueryAgain: HerhaalRaadplegen QueryAgain QueryAgain QueryAgain - RinnovaRichiesta QueryAgain % TB TH GB + RinnovaRichiesta QueryAgain + QueryAgain GotoPage: GaNaarPagina GotoPage GotoPage JdiNaStranku - VaiAPagina LaPagina % TB + VaiAPagina LaPagina + VaalaPage StartMovie: StartFilm StartMovie StartFilm SpustitFilm IniziaFilm StartFilm + DemarreFilm StopMovie: StopFilm StopMovie StopFilm ZastavitFilm FermaFilm StopFilm + StoppeFilm PauseMovie: PauzeerFilm PauseMovie PauseFilm PozastavitFilm PausaFilm PauzaFilm + PauseFilm ResumeMovie: HervatFilm ResumeMovie FortsetzenFilm PokracovatFilm RiprendiFilm RepornesteFilm + ReprendFilm StartSound: StartGeluid StartSound StartSound StartZvuk - IniziaSuono StartSunet % TB + IniziaSuono StartSunet + DemarreSon StopSound: StopGeluid StopSound StopSound StopZvuk - FermaSuono StopSunet % TB + FermaSuono StopSunet + StoppeSon PauseSound: PauzeerGeluid PauseSound PauseSound PozastavitZvuk - PausaSuono PauzaSunet % TB + PausaSuono PauzaSunet + PauseSon ResumeSound: HervatGeluid ResumeSound ResumeSound PokracovatZvuk - RiprendiSuono RepornesteSunet % TB - -% new - + RiprendiSuono RepornesteSunet + ReprendSon StartRendering: StartRendering StartRendering StartRendering StartRendering StartRendering StartRendering + StartRendering StopRendering: StopRendering StopRendering StopRendering StopRendering StopRendering StopRendering + StopRendering PauseRendering: PauzeerRendering PauseRendering PauseRendering PauseRendering PauseRendering PauseRendering + PauseRendering ResumeRendering: HervatRendering ResumeRendering ResumeRendering ResumeRendering ResumeRendering ResumeRendering - -% new - + ResumeRendering SaveForm: BewaarFormulier SaveForm SpeicheFormular UlozitFormular SalvaForm SalveazaFormular + SauvegardeForm LoadForm: LaadFormulier LoadForm LadeFormular NacistFormular CaricaForm IncarcaFormular + ChargeForm ResetForm: ResetFormulier ResetForm ZuruecksetzenFormular ResetFormulare ReimpostaForm ResetareFormular + RazForm SubmitForm: VerzendFormulier SubmitForm VersendeFormular PoslatFormular MandaForm TrimiteFormular + SoumettreForm HideField: VerbergVeld HideField VerbergeFeld SkryjPole NascondiCampo AscundeCamp + CacheChamp ShowField: ToonVeld ShowField ZeigeFeld UkazPole MostraCampo AfiseazaCamp - + MontreChamp FitWidth: BreedtePassend FitWidth BreitePassend FitWidth FitWidth AjustatLatime + AjusteLargeur FitHeight: HoogtePassend FitHeight HoehePassend FitHeight FitHeight AjustatInaltime - - HideLayer: VerbergLaag HideLayer - HideLayer HideLayer - HideLayer HideLayer - VideLayer: ToonLaag VideLayer - VideLayer VideLayer - VideLayer VideLayer -ToggleLayer: WisselLaag ToggleLayer - ToggleLayer ToggleLayer - ToggleLayer ToggleLayer + AjusteHauteur + HideLayer: VerbergLaag HideLayer + HideLayer HideLayer + HideLayer HideLayer + CacheCalque + VideLayer: ToonLaag VideLayer + VideLayer VideLayer + VideLayer VideLayer + VideLayer + ToggleLayer: WisselLaag ToggleLayer + ToggleLayer ToggleLayer + ToggleLayer ToggleLayer + ToggleLayer \stopvariables @@ -2901,25 +3749,32 @@ ToggleLayer: WisselLaag ToggleLayer \startvariables dutch english german czech italian romanian + french New: Nieuw New Neu Novy Nuovo Nou + Nouveau Balloon: Ballon Balloon Ballon Bublinka Pallone Balon + Ballon Addition: Toevoeging Addition Zusatz Pridavek Aggiunta Adaugare + Ajout Help: Help Help Hilfe Napoveda Aiuto Ajutor + Aide Paragraph: Paragraaf Paragraph Absatz Odstavec Capoverso Paragraf + Paragraphe Key: Sleutel Key Schluessel Klavesa Tasto Cheie + Cle \stopvariables %D \stopcompressdefinitions diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index b9c45f01a..7db143f97 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -828,6 +828,13 @@ 3: -- -- inlocuieste un macro, folositi MAJUSCULE! \stopmessages +\startmessages french library: check + title: check + 1: missing or ungrouped '=' manquant ou dégroupé après '--' à la ligne -- + 2: -- argument(s) attendu(s) à la ligne -- + 3: -- -- remplace une macro, utilisez des MAJUSCULES ! +\stopmessages + \fi %D Ok, here are some more, because we've got ouselves some diff --git a/tex/context/base/page-app.tex b/tex/context/base/page-app.tex index 6a9a10d33..f31e3ad2d 100644 --- a/tex/context/base/page-app.tex +++ b/tex/context/base/page-app.tex @@ -155,8 +155,10 @@ \else % pdf \executesystemcommand{dvips \bufferprefix\@@texapp}% \executesystemcommand{ps2pdf \bufferprefix\@@texapp.ps \bufferprefix\@@texapp.pdf}% +% \executesystemcommand{texmfstart pstopdf \bufferprefix\@@texapp.ps \bufferprefix\@@texapp.pdf}% \fi \restoreTEXapplication % dimensions + \doifelse\jobsuffix{dvi}\donetrue\donefalse \setbox\scratchbox\hbox {\expanded{\externalfigure [\bufferprefix\@@texapp.\ifdone eps\else pdf\fi] diff --git a/tex/context/base/page-bck.tex b/tex/context/base/page-bck.tex index e95ab8bf6..d69281d63 100644 --- a/tex/context/base/page-bck.tex +++ b/tex/context/base/page-bck.tex @@ -43,6 +43,10 @@ 8: se calculeaza fundalurile \stopmessages +\startmessages french library: layouts + 8: calcul des arrières-plans +\stopmessages + %D \macros %D {recalculatebackgrounds} %D diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex index 33d19c605..3ceabc2e2 100644 --- a/tex/context/base/page-flt.tex +++ b/tex/context/base/page-flt.tex @@ -159,6 +159,22 @@ 11: nu este dat nici un bloc 12: nedefinit \stopmessages + +\startmessages french library: floatblocks + title: floatblocks + 1: -- renuméroté / -- => -- + 2: -- sauvegardé + 3: -- déplacé + 4: -- placé + 5: ordre adapté + 6: n flottants de haut de page limité à -- + 7: n flottants de bas de page limité à -- + 8: moins de -- lignes + 9: ordre perturbé + 10: -- limité + 11: pas de bloc donné + 12: indéfini +\stopmessages \def\setupfloats {\dodoubleargument\getparameters[\??bk]} @@ -395,7 +411,7 @@ % new : \place...[leftmargin,-2*line]; we need to catch fxtb:2*3 % watch out: line alone aligns on the line ! ! ! -\def\movesidefloat[#1]% (-)line|x=,y= +\def\movesidefloat[#1]% (-)n*line|x=,y= {\global\sidefloatdownshift \zeropoint \global\sidefloatextrashift\zeropoint \doifassignmentelse{#1}% @@ -416,17 +432,26 @@ \cleanupfeatures \doifinstringelse{:}{#1} \donothing - {\donefalse - \def\movedownsidefloat##1% + {\def\docommand##1% {\processaction [##1]% - [ \v!line=>\docommando+,% - +\v!line=>\docommando+,% - -\v!line=>\docommando-]}% - \def\docommando##1% + [ \v!line=>\dodocommand+,% + +\v!line=>\dodocommand+,% + -\v!line=>\dodocommand-]}% + \def\dodocommand##1% {\ifdone\else\global\sidefloatdownshift\zeropoint\donetrue\fi \global\advance\sidefloatdownshift##1\lineheight}% - \expanded{\dorepeatwithcommand[#1]}\movedownsidefloat}% + \donefalse\expanded{\dorepeatwithcommand[#1]}\docommand + \def\docommand##1% + {\processaction + [##1]% + [ \v!hang=>\dodocommand+,% + +\v!hang=>\dodocommand+,% + -\v!hang=>\dodocommand-]}% + \def\dodocommand##1% inefficient but who cares + {\ifdone\else\global\sidefloatsidelines\zeropoint\donetrue\fi + \global\advance\sidefloatsidelines\plusone\relax}% + \donefalse\expanded{\dorepeatwithcommand[#1]}\docommand}% \egroup} \def\hangsidefloat[#1]% @@ -442,17 +467,17 @@ % already be set at this point \processallactionsinset [#4] % ininner/inouter : for old times sake - [ \v!inner=>\xxdocompletefloat\v!left \v!right, - \v!outer=>\xxdocompletefloat\v!right \v!left, + [ \v!inner=>\xxdocompletefloat\v!left \v!right, + \v!outer=>\xxdocompletefloat\v!right \v!left, \v!innermargin=>\xxdocompletefloat\v!leftmargin \v!rightmargin, \v!outermargin=>\xxdocompletefloat\v!rightmargin\v!leftmargin, - \v!inneredge=>\xxdocompletefloat\v!leftedge \v!rightedge, - \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge, - \v!backspace=>\xxdocompletefloat\v!backspace \v!cutspace, - \v!cutspace=>\xxdocompletefloat\v!cutspace \v!backspace, - \v!left=>\xxdocompletefloat\v!left \v!left, - \v!right=>\xxdocompletefloat\v!right \v!right, - \v!line=>, % only -n*line is handled (see ***) + \v!inneredge=>\xxdocompletefloat\v!leftedge \v!rightedge, + \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge, + \v!backspace=>\xxdocompletefloat\v!backspace \v!cutspace, + \v!cutspace=>\xxdocompletefloat\v!cutspace \v!backspace, + \v!left=>\xxdocompletefloat\v!left \v!left, + \v!right=>\xxdocompletefloat\v!right \v!right, + \v!line=>, % only -n*line is handled (see ***) \s!unknown=>{\movedownsidefloat[\commalistelement]}]% \ifx\@@extrafloat\empty \docompletefloat{#1}{#2}{#3}{#4}{#5}{#6}\nextbox diff --git a/tex/context/base/page-imp.tex b/tex/context/base/page-imp.tex index b54dcfa99..a37a0ba4b 100644 --- a/tex/context/base/page-imp.tex +++ b/tex/context/base/page-imp.tex @@ -516,8 +516,7 @@ \global\wd\arrangedpageB\paperwidth \global\setbox\arrangedpageA\hbox {\box\arrangedpageA\box\arrangedpageB}% - \global\ht\arrangedpageA\paperheight - \global\setbox\arrangedpageB\box\scratchbox} % ? + \global\ht\arrangedpageA\paperheight} \def\handlearrangedpageTOP {\global\ht\arrangedpageA\paperheight diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex index 7c1ff78d3..09c5368e7 100644 --- a/tex/context/base/page-ini.tex +++ b/tex/context/base/page-ini.tex @@ -243,6 +243,37 @@ 27: Versiune \stopmessages +\startmessages french library: systems + title: system + 1: chargement de fichier utilitaire reporté (typemode) + 2: -- chargé +% 3: try LaTeX + 4: la commande -- est déjà définie + 5: module -- chargé + 6: module -- non trouvé + 7: module -- déjà chargé + 8: nouvelle version de fichier utilitaire, seconde passe nécessaire + 9: -- non trouvé/traité + 10: n'utilisez pas em dans -- + 11: construction util simple + 12: le fichier utilitaire n'est pas trié, utilise texutil + 13: marquage -- defini -- + 14: nouvellepage forcée dans la liste à -- + 15: sauvegarde du tampon (buffer) -- + 16: composition du tampon (buffer) -- + 17: composition textuelle du tampon (buffer) -- + 18: le synonyme -- -- n'existe pas + 19: signification (synonymes) de -- chargée + 20: signification (tris) de -- chargée + 21: pas de données utilitaires chargées + 22: utilise un fichier utilitaire valide + 23: -- arrangé à -- + 24: blocsflottants + 25: Réferences + 26: Registres + 27: Version +\stopmessages + \startmessages dutch library: layouts title: layout 1: teksthoogte aangepast met -- op pagina -- @@ -340,6 +371,20 @@ 10: -- si -- nu se adauga pana la 1.0 11: spatierea -- nu este permisa in gridmode \stopmessages + +\startmessages french library: layouts + title: layout + 1: hauteurtexte adaptée avec -- à la page -- + 2: -- times postponed text placed + 3: -- times text postponed + 4: blocsmarge actifs + 5: blocsmarge inactifs + 6: jeu de souspage -- traité (taille --) +% 7: calculating logospace +% 8: calculating backgrounds + 10: -- and -- don't add up to 1.0 + 11: spacing -- not permitted in gridmode +\stopmessages \def\m!otr{otr} @@ -561,6 +606,23 @@ 12: blocul este mutat pe urmatoarea coloana / -- 13: blocul lat este mutat in partea de sus a coloanelor \stopmessages + +\startmessages french library: columns + title: columns + 1: seules -- colonnes possibles + 2: utilisez \string\filbreak\space en tant qu'alternative + 3: problèmes, désactive l'équilibrage + 4: flottant en partie supérieure pas encore supporté + 5: flottant en partie inférieure pas encore supporté + 6: -- flottant(s) reporté(s)postponed + 7: équilibrage abandonné après 100 pas + 8: équilibré en -- pas + 9: vérification des irrégularités + 10: (moins de) 1 ligne restante + 11: flottant mis à la largeur de la colonne + 12: flottant déplacé à la colonne suivante / -- + 13: flottant large déplacé dans la partie supérieure de la colonne +\stopmessages \ifx\dosetuplayout\undefined % overloaded in page-lay ! diff --git a/tex/context/base/page-log.tex b/tex/context/base/page-log.tex index 19411065e..d124fdd3d 100644 --- a/tex/context/base/page-log.tex +++ b/tex/context/base/page-log.tex @@ -43,6 +43,10 @@ 7: se calculeaza spatiul pentru logo \stopmessages +\startmessages french library: layouts + 7: calcul de l'espace pour le logo +\stopmessages + %D Although logos can conveniently be implemented on top of %D background and text areas, we provide a dedicated mechanism %D here. One reason is that such a separate mechanism cannot diff --git a/tex/context/base/page-lyr.tex b/tex/context/base/page-lyr.tex index c1a9499f0..fc5a17317 100644 --- a/tex/context/base/page-lyr.tex +++ b/tex/context/base/page-lyr.tex @@ -300,7 +300,7 @@ \doifundefined{\@@layerbox#2\currentlayer\layerpage} {\global\expandafter\newbox\csname\@@layerbox#2\currentlayer\layerpage\endcsname}}% \dontcomplain % more comfortable - \chardef\layerpagebox\csname\@@layerbox#2\currentlayer\layerpage\endcsname + \mathchardef\layerpagebox\csname\@@layerbox#2\currentlayer\layerpage\endcsname \ifvoid\layerpagebox \gsetboxllx\layerpagebox\zeropoint \gsetboxlly\layerpagebox\zeropoint @@ -470,7 +470,7 @@ {\doifvalue{\??ll#2\c!repeat}\v!yes\!!donecfalse \doifvalue{\??ll#2\c!state}\v!repeat\!!donecfalse}% \fi - \chardef\layerbox\csname\@@layerbox#3\endcsname + \mathchardef\layerbox\csname\@@layerbox#3\endcsname % we need to copy in order to retain the negative offsets for a next % stage of additions, i.e. llx/lly accumulate in repeat mode and the % compensation may differ each flush depending on added content diff --git a/tex/context/base/page-mar.tex b/tex/context/base/page-mar.tex index 6cec52d04..d05ece78c 100644 --- a/tex/context/base/page-mar.tex +++ b/tex/context/base/page-mar.tex @@ -93,13 +93,13 @@ \setvalue{\s!do\??im\??im\v!inner}{\presignalrightpage\doifrightpageelse\doleftmarginline \dorightmarginline} \setvalue{\s!do\??im\??im\v!outer}{\presignalrightpage\doifrightpageelse\dorightmarginline\doleftmarginline } -\definemarginline[inleftmargin] [\c!location=\v!left, \c!width=\leftmarginwidth, \c!distance=\leftmargindistance] -\definemarginline[inrightmargin][\c!location=\v!right,\c!width=\rightmarginwidth,\c!distance=\rightmargindistance] +\definemarginline[inleftmargin] [\c!location=\v!left, \c!width=\leftmarginwidth, \c!distance=\leftmargindistance,\c!hoffset=\zeropoint] +\definemarginline[inrightmargin][\c!location=\v!right,\c!width=\rightmarginwidth,\c!distance=\rightmargindistance,\c!hoffset=\zeropoint] \definemarginline[inleftedge] [\c!location=\v!left, \c!width=\leftedgewidth, \c!distance=\leftedgedistance, \c!hoffset=\leftmargintotal] \definemarginline[inrightedge] [\c!location=\v!right,\c!width=\rightedgewidth, \c!distance=\rightedgedistance,\c!hoffset=\rightmargintotal] -\definemarginline[inoutermargin][\c!location=\v!outer,\c!width=\outermarginwidth,\c!distance=\outermargindistance] -\definemarginline[ininnermargin][\c!location=\v!inner,\c!width=\innermarginwidth,\c!distance=\innermargindistance] +\definemarginline[inoutermargin][\c!location=\v!outer,\c!width=\outermarginwidth,\c!distance=\outermargindistance,\c!hoffset=\zeropoint] +\definemarginline[ininnermargin][\c!location=\v!inner,\c!width=\innermarginwidth,\c!distance=\innermargindistance,\c!hoffset=\zeropoint] \definemarginline[inouteredge] [\c!location=\v!outer,\c!width=\outeredgewidth, \c!distance=\outeredgedistance,\c!hoffset=\outermargintotal] \definemarginline[ininneredge] [\c!location=\v!inner,\c!width=\inneredgewidth, \c!distance=\inneredgedistance,\c!hoffset=\innermargintotal] diff --git a/tex/context/base/regi-ini.tex b/tex/context/base/regi-ini.tex index 1c3fceb55..34f157ea4 100644 --- a/tex/context/base/regi-ini.tex +++ b/tex/context/base/regi-ini.tex @@ -22,11 +22,11 @@ \def\douseregime#1% nearly identical to encoding {\doifundefined{\c!file\f!regimeprefix#1}% {\setvalue{\c!file\f!regimeprefix#1}{}% - \makeshortfilename[\f!regimeprefix#1]% + \makeshortfilename[\truefilename{\f!regimeprefix#1}]% \startreadingfile - \readsysfile\shortfilename - {\showmessage\m!encodings2{#1}} - {\showmessage\m!encodings3{#1}}% + \readsysfile\shortfilename + {\showmessage\m!encodings2{#1}} + {\showmessage\m!encodings3{#1}}% \stopreadingfile}} \def\useregime[#1]% diff --git a/tex/context/base/spec-ini.tex b/tex/context/base/spec-ini.tex index c53fbbd5c..281cbe0b5 100644 --- a/tex/context/base/spec-ini.tex +++ b/tex/context/base/spec-ini.tex @@ -112,6 +112,17 @@ 7: driver necunoscut -- \stopmessages +\startmessages french library: specials + title: specials + 1: -- chargé + 2: pas d'imbracations plus profondes ne sont permises -- + 3: -- est remis à zéro + 4: la commande -- n'existe pas + 5: chargement du fichier de définition -- + 6: l'imbrication n'est pas permise + 7: pilote -- inconnu +\stopmessages + \startmessages dutch library: interactions 21: -- code tussengevoegd \stopmessages @@ -140,6 +151,10 @@ 21: -- cod inserat \stopmessages +\startmessages french library: interactions + 21: -- code inseré +\stopmessages + %D \TEX\ produces files in the \DVI\ format. This format is %D well defined and stable. In this format one||byte commands %D are used which can optionally be followed by length @@ -393,10 +408,9 @@ {\doifdefinedelse{\@@specfil@@#1} {\edef\currentspecialfile{\getvalue{\@@specfil@@#1}}} {\edef\currentspecialfile{#1}}% - \makeshortfilename[\f!specialprefix\currentspecialfile]% - \showmessage\m!specials5\currentspecialfile + \makeshortfilename[\truefilename{\f!specialprefix\currentspecialfile}]% \startreadingfile - \readsysfile\shortfilename\donothing\donothing + \readsysfile\shortfilename{\showmessage\m!specials5\currentspecialfile}\donothing \stopreadingfile \showmessage\m!specials1\preloadedspecials}} diff --git a/tex/context/base/spec-mis.tex b/tex/context/base/spec-mis.tex index 0134c8bbc..6bd7c6994 100644 --- a/tex/context/base/spec-mis.tex +++ b/tex/context/base/spec-mis.tex @@ -209,7 +209,7 @@ \long\def\preservePSpar#1\to#2% {\bgroup - \def\par{\rawcharacter{12}\rawcharacter{12}}% + \def\par{\rawcharacter{12}\rawcharacter{12}}% hm, should be one 13 but 12 ff is platform safe \expanded{\egroup\noexpand\def\noexpand#2{#1}}} %D \macros diff --git a/tex/context/base/spec-xtx.tex b/tex/context/base/spec-xtx.tex index ea355abd7..b04098472 100644 --- a/tex/context/base/spec-xtx.tex +++ b/tex/context/base/spec-xtx.tex @@ -37,11 +37,10 @@ %D Although hex colors were accommodated by Hans, we'll try the %D more familiar \DVIPDFMX\ ones. One good side-effect of the -%D previous approach -%D was that it kept track of the color state (transparency -%D in XeTeX is accomplished setting the color to an RGBA quadruple, -%D rather than an RGB triple). So transparency will need another -%D plan. +%D previous approach was that it kept track of the color state +%D (transparency in XeTeX is accomplished setting the color to +%D an RGBA quadruple, rather than an RGB triple). So transparency +%D will need another plan. % \macros % {dostarttransparency,dostoptransparency} diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex index 4b451a6bf..0afe4e13b 100644 --- a/tex/context/base/supp-box.tex +++ b/tex/context/base/supp-box.tex @@ -1023,8 +1023,8 @@ \def\obeyedspace{\hskip\zeropoint\hbox to \onepoint{}\hskip\zeropoint}% \let\obeyedline \obeyedspace \ifcase-#1\or - \def\next{#3}\scantokens\expandafter{\next}% - % also ok: \scantokens{#3}% + \def\next{#3\relax}\scantokens\expandafter{\next}% relax catches lookahead problem + % also ok: \scantokens{#3}% % as in \hyphenatedword{spanish|?|} \or \readfile{#3}\donothing\donothing \else diff --git a/tex/context/base/supp-lan.tex b/tex/context/base/supp-lan.tex index ebb47424c..f3699a658 100644 --- a/tex/context/base/supp-lan.tex +++ b/tex/context/base/supp-lan.tex @@ -859,6 +859,8 @@ {\prewordbreak\discretionary{\hbox{$|$}}{}{\hbox{$|$}}% \allowbreak\postwordbreak} +% french + \definetextmodediscretionary : {\removeunwantedspaces\prewordbreak\kern\hspaceamount\empty{:}:} %\space\aftergroup\ignorespaces} @@ -878,6 +880,14 @@ \definetextmodediscretionary * {\prewordbreak\discretionary{-}{}{\kern.05em}\prewordbreak} +% spanish + +\definetextmodediscretionary ?? + {\prewordbreak\questiondown} + +\definetextmodediscretionary !! + {\prewordbreak\exclamdown} + \ifx\hspaceamount\undefined \def\hspaceamount#1#2{\kern.16667em} diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex index 6fc7796c8..dae2b16df 100644 --- a/tex/context/base/supp-mps.tex +++ b/tex/context/base/supp-mps.tex @@ -50,6 +50,8 @@ \bgroup \catcode`\%=\@@other \xdef\letterpercent{\string%} \egroup +% todo : sort out ^^M, \par and ; mess + %D \macros %D {startMPgraphic} %D @@ -394,16 +396,27 @@ % \the\MPTEXgraphicchecks\relax % \relax is end condition! % \fi} +% \long\def\writecheckedMPgraphic#1% +% {\ifforceMPTEXgraphic +% \global\MPTEXgraphictrue +% \else +% \global\MPTEXgraphicfalse +% \expandafter\convertargument#1\to\MPascii +% \the\MPTEXgraphicchecks\relax % \relax is end condition! +% \fi +% \flushMPTEXgraphic % verbatimtex etc +% \writeMPgraphic{#1}} + \long\def\writecheckedMPgraphic#1% {\ifforceMPTEXgraphic \global\MPTEXgraphictrue \else \global\MPTEXgraphicfalse - \expandafter\convertargument#1\to\MPascii + \edef\ascii{#1}\convertcommand\ascii\to\MPascii \the\MPTEXgraphicchecks\relax % \relax is end condition! \fi \flushMPTEXgraphic % verbatimtex etc - \writeMPgraphic{#1}} + \writeMPgraphic{#1}} % potential optimization: pass \ascii %D We could have used a kind of array approach using a %D counter appended to \type {MPascii}, but this is an @@ -546,6 +559,7 @@ \fi \endTEX + % buggy (at least in collected graphics, lazy expansion) % % \def\startwritingMPgraphic diff --git a/tex/context/base/symb-ini.tex b/tex/context/base/symb-ini.tex index 496292c57..30269b6cc 100644 --- a/tex/context/base/symb-ini.tex +++ b/tex/context/base/symb-ini.tex @@ -54,6 +54,11 @@ 1: se incarca setul de simboluri -- \stopmessages +\startmessages french library: symbols + title: symbols + 1: chargement du jeu de symbole -- +\stopmessages + %D \macros %D {definesymbol, symbol} %D @@ -291,10 +296,11 @@ %D \showsetup{usesymbols} \def\dousesymbols#1% - {\makeshortfilename[\f!symbolprefix#1]% - \showmessage\m!symbols1{#1}% + {\makeshortfilename[\truefilename{\f!symbolprefix#1}]% \startreadingfile - \readsysfile\shortfilename\donothing\donothing + \readsysfile\shortfilename + {\showmessage\m!symbols1{#1}} + \donothing \stopreadingfile} \def\usesymbols[#1]% diff --git a/tex/context/base/syst-etx.tex b/tex/context/base/syst-etx.tex index 55837b02f..e2770cfe9 100644 --- a/tex/context/base/syst-etx.tex +++ b/tex/context/base/syst-etx.tex @@ -230,7 +230,7 @@ \chardef\@@insallocation=32 -%D However, there's a bug in \ETEX\ versions smaller that 2.2, +%D However, there's a bug in \ETEX\ versions smaller than 2.2, %D so we need to play safe: \ifnum\etexversion<202 \chardef\@@insallocation=8 \fi diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex index 5e4ed06de..12efab2cb 100644 --- a/tex/context/base/syst-gen.tex +++ b/tex/context/base/syst-gen.tex @@ -13,6 +13,7 @@ % nagaan : \ifinstringelse in syst-ext.tex % do => p! dodo pp! dododo ppp! +% todo: \donetrue etc local maken %D The following macros are responsible for the interaction %D with \CONTEXT. These macros have proven their use. These @@ -441,7 +442,7 @@ \newtoks\everysafeexpanded -\long\def\safeexpanded#1% +\long\def\safeexpanded#1% why the \noexpand {\begingroup \the\everysafeexpanded\long\xdef\@@expanded{\noexpand#1}% \endgroup diff --git a/tex/context/base/type-akb.tex b/tex/context/base/type-akb.tex index 7116cc99a..adf0c6797 100644 --- a/tex/context/base/type-akb.tex +++ b/tex/context/base/type-akb.tex @@ -89,7 +89,7 @@ \stoptypescript -\starttypescript [adobekb] [ec] +\starttypescript [adobekb,berry] [ec] \loadmapfile[8r-base.map] \loadmapfile[ec-base.map] @@ -150,7 +150,7 @@ % the following fonts are normally not present on tex live -\starttypescript [adobekb] [texnansi] +\starttypescript [adobekb,berry] [texnansi] \loadmapfile[texnansi-base.map] @@ -208,6 +208,46 @@ \stoptypescript +\starttypescript [adobekb,berry] [t5] + +\loadmapfile[t5-base.map] + +\definefontsynonym [t5-utmr8a] [ptmr8v] [encoding=t5] +\definefontsynonym [t5-utmri8a] [ptmri8v] [encoding=t5] +\definefontsynonym [t5-utmb8a] [ptmb8v] [encoding=t5] +\definefontsynonym [t5-utmbi8a] [ptmbi8v] [encoding=t5] + +\definefontsynonym [t5-utmr8a-slanted-167] [ptmro8v] [encoding=t5] +\definefontsynonym [t5-utmb8a-slanted-167] [ptmbo8v] [encoding=t5] + +\definefontsynonym [t5-uhvr8a] [phvr8v] [encoding=t5] +\definefontsynonym [t5-uhvro8a] [phvro8v] [encoding=t5] +\definefontsynonym [t5-uhvb8a] [phvb8v] [encoding=t5] +\definefontsynonym [t5-uhvbo8a] [phvbo8v] [encoding=t5] + +\definefontsynonym [t5-ucrr8a] [pcrr8v] [encoding=t5] +\definefontsynonym [t5-ucrb8a] [pcrb8v] [encoding=t5] +\definefontsynonym [t5-ucrro8a] [pcrro8v] [encoding=t5] +\definefontsynonym [t5-ucrbo8a] [pcrbo8v] [encoding=t5] + +\definefontsynonym [t5-uplr8a] [pplr8v] [encoding=t5] +\definefontsynonym [t5-uplri8a] [pplri8v] [encoding=t5] +\definefontsynonym [t5-uplb8a] [pplb8v] [encoding=t5] +\definefontsynonym [t5-uplbi8a] [pplbi8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-slanted-167] [pplro8v] [encoding=t5] +\definefontsynonym [t5-uplb8a-slanted-167] [pplbo8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-capitalized-800] [pplr8v] [encoding=t5] + +\definefontsynonym [t5-ubkl8a] [pbkl8v] [encoding=t5] +\definefontsynonym [t5-ubkli8a] [pbkli8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a] [pbkd8v] [encoding=t5] +\definefontsynonym [t5-ubkdi8a] [pbkdi8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-slanted-167] [pbklo8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a-slanted-167] [pbkdo8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-capitalized-800] [pbkl8v] [encoding=t5] + +\stoptypescript + \stoptypescriptcollection \endinput diff --git a/tex/context/base/type-dis.tex b/tex/context/base/type-dis.tex index c4cbd6f96..55bee181b 100644 --- a/tex/context/base/type-dis.tex +++ b/tex/context/base/type-dis.tex @@ -11,57 +11,14 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -%D Unfortunately not all latin modern metrics ship the way we like: -%D -%D Some day I will replace cmr10 etc by their full names. +%D The next section is obsolete. Although we prefer the original metrics +%D it seems that distributions no longer ship the u-variants, which means +%D that users (if they want) need to fall back to the p-variants. The usual +%D font mess. -\starttypescriptcollection[distributed fonts] - -\starttypescript[all][modern,latin-modern][all] - - % fallbacks, no math in latin modern - - \definefontsynonym[lmbsy10] [cmbsy10] - \definefontsynonym[lmbsy5] [cmbsy5] - \definefontsynonym[lmbsy6] [cmbsy7] - \definefontsynonym[lmbsy7] [cmbsy7] - \definefontsynonym[lmbsy8] [cmbsy7] - \definefontsynonym[lmbsy9] [cmbsy10] - \definefontsynonym[lmdunh10][cmdunh10] - \definefontsynonym[lmex10] [cmex10] - \definefontsynonym[lmex7] [cmex10] - \definefontsynonym[lmex8] [cmex10] - \definefontsynonym[lmex9] [cmex10] - \definefontsynonym[lmff10] [cmff10] - \definefontsynonym[lmfi10] [cmfi10] - \definefontsynonym[lmfib8] [cmfib8] - \definefontsynonym[lmmi10] [cmmi10] - \definefontsynonym[lmmi12] [cmmi12] - \definefontsynonym[lmmi5] [cmmi5] - \definefontsynonym[lmmi6] [cmmi6] - \definefontsynonym[lmmi7] [cmmi7] - \definefontsynonym[lmmi8] [cmmi8] - \definefontsynonym[lmmi9] [cmmi9] - \definefontsynonym[lmmib10] [cmmib10] - \definefontsynonym[lmmib5] [cmmib5] - \definefontsynonym[lmmib6] [cmmib7] - \definefontsynonym[lmmib7] [cmmib7] - \definefontsynonym[lmmib8] [cmmib7] - \definefontsynonym[lmmib9] [cmmib10] - \definefontsynonym[lmsy10] [cmsy10] - \definefontsynonym[lmsy5] [cmsy5] - \definefontsynonym[lmsy6] [cmsy6] - \definefontsynonym[lmsy7] [cmsy7] - \definefontsynonym[lmsy8] [cmsy8] - \definefontsynonym[lmsy9] [cmsy9] - \definefontsynonym[lmtex10] [cmtex10] - \definefontsynonym[lmtex8] [cmtex8] - \definefontsynonym[lmtex9] [cmtex9] - -\stoptypescript +\endinput -%D For those who want to use the existing tfm and vf files we -%D provide: +\starttypescriptcollection[distributed fonts] \starttypescript [berry] [8r] diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index 7d39629de..4d6e24857 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -820,30 +820,30 @@ \starttypescript [math] [antykwa-torunska] [default] \definefontsynonym [AntykwaTorunska-Math-Letters-Regular] [rm-anttr] - \definefontsynonym [AntykwaTorunska-Math-Letters-RegularItalic] [mi-anttr] - \definefontsynonym [AntykwaTorunska-Math-Symbols-Regular] [sy-anttr] + \definefontsynonym [AntykwaTorunska-Math-Letters-RegularItalic] [mi-anttri] + \definefontsynonym [AntykwaTorunska-Math-Symbols-Regular] [sy-anttrz] \definefontsynonym [AntykwaTorunska-Math-Extension-Regular] [ex-anttr] \stoptypescript \starttypescript [math] [antykwa-torunska-light] [default] \definefontsynonym [AntykwaTorunska-Math-Letters-Light] [rm-anttl] - \definefontsynonym [AntykwaTorunska-Math-Letters-LightItalic] [mi-anttl] - \definefontsynonym [AntykwaTorunska-Math-Symbols-Light] [sy-anttl] - \definefontsynonym [AntykwaTorunska-Math-Extension-Light] [ex-anttr] % [ex-anttl] + \definefontsynonym [AntykwaTorunska-Math-Letters-LightItalic] [mi-anttli] + \definefontsynonym [AntykwaTorunska-Math-Symbols-Light] [sy-anttlz] + \definefontsynonym [AntykwaTorunska-Math-Extension-Light] [ex-anttl] \stoptypescript \starttypescript [math] [antykwa-torunska-cond] [default] \definefontsynonym [AntykwaTorunska-Math-Letters-CondRegular] [rm-anttcr] - \definefontsynonym [AntykwaTorunska-Math-Letters-CondRegularItalic] [mi-anttcr] - \definefontsynonym [AntykwaTorunska-Math-Symbols-CondRegular] [sy-anttcr] - \definefontsynonym [AntykwaTorunska-Math-Extension-CondRegular] [ex-anttr] + \definefontsynonym [AntykwaTorunska-Math-Letters-CondRegularItalic] [mi-anttcri] + \definefontsynonym [AntykwaTorunska-Math-Symbols-CondRegular] [sy-anttcrz] + \definefontsynonym [AntykwaTorunska-Math-Extension-CondRegular] [ex-anttcr] \stoptypescript \starttypescript [math] [antykwa-torunska-lightcond] [default] \definefontsynonym [AntykwaTorunska-Math-Letters-CondLight] [rm-anttcl] - \definefontsynonym [AntykwaTorunska-Math-Letters-CondLightItalic] [mi-anttcl] - \definefontsynonym [AntykwaTorunska-Math-Symbols-CondLight] [sy-anttcl] - \definefontsynonym [AntykwaTorunska-Math-Extension-CondLight] [ex-anttr] % [ex-anttl] + \definefontsynonym [AntykwaTorunska-Math-Letters-CondLightItalic] [mi-anttcli] + \definefontsynonym [AntykwaTorunska-Math-Symbols-CondLight] [sy-anttclz] + \definefontsynonym [AntykwaTorunska-Math-Extension-CondLight] [ex-anttcl] \stoptypescript % Antykwa Poltawskiego (GUST) @@ -875,22 +875,22 @@ \starttypescript [math] [iwona] [default] \definefontsynonym [Iwona-Math-Letters-Regular] [rm-iwonar] \definefontsynonym [Iwona-Math-Letters-RegularItalic] [mi-iwonari] - \definefontsynonym [Iwona-Math-Symbols-Regular] [sy-iwonari] + \definefontsynonym [Iwona-Math-Symbols-Regular] [sy-iwonarz] \definefontsynonym [Iwona-Math-Extension-Regular] [ex-iwonar] \stoptypescript \starttypescript [math] [iwona-light] [default] - \definefontsynonym [Iwona-Math-Letters-Light] [rm-iwonal] - \definefontsynonym [Iwona-Math-Letters-LightItalic] [mi-iwonali] - \definefontsynonym [Iwona-Math-Symbols-Light] [sy-iwonali] - \definefontsynonym [Iwona-Math-Extension-Light] [ex-iwonal] + \definefontsynonym [Iwona-Math-Letters-Light] [rm-iwonal] + \definefontsynonym [Iwona-Math-Letters-LightItalic] [mi-iwonali] + \definefontsynonym [Iwona-Math-Symbols-Light] [sy-iwonalz] + \definefontsynonym [Iwona-Math-Extension-Light] [ex-iwonal] \stoptypescript \starttypescript [math] [iwona-medium] [default] - \definefontsynonym [Iwona-Math-Letters-Medium] [rm-iwonam] - \definefontsynonym [Iwona-Math-Letters-MediumItalic] [mi-iwonami] - \definefontsynonym [Iwona-Math-Symbols-Medium] [sy-iwonami] - \definefontsynonym [Iwona-Math-Extension-Medium] [ex-iwonam] + \definefontsynonym [Iwona-Math-Letters-Medium] [rm-iwonam] + \definefontsynonym [Iwona-Math-Letters-MediumItalic] [mi-iwonami] + \definefontsynonym [Iwona-Math-Symbols-Medium] [sy-iwonamz] + \definefontsynonym [Iwona-Math-Extension-Medium] [ex-iwonam] \stoptypescript % Kurier (JMN) @@ -911,22 +911,22 @@ \starttypescript [math] [kurier] [default] \definefontsynonym [Kurier-Math-Letters-Regular] [rm-kurierr] \definefontsynonym [Kurier-Math-Letters-RegularItalic] [mi-kurierri] - \definefontsynonym [Kurier-Math-Symbols-Regular] [sy-kurierri] + \definefontsynonym [Kurier-Math-Symbols-Regular] [sy-kurierrz] \definefontsynonym [Kurier-Math-Extension-Regular] [ex-kurierr] \stoptypescript \starttypescript [math] [kurier-light] [default] - \definefontsynonym [Kurier-Math-Letters-Light] [rm-kurierl] - \definefontsynonym [Kurier-Math-Letters-LightItalic] [mi-kurierli] - \definefontsynonym [Kurier-Math-Symbols-Light] [sy-kurierli] - \definefontsynonym [Kurier-Math-Extension-Light] [ex-kurierl] + \definefontsynonym [Kurier-Math-Letters-Light] [rm-kurierl] + \definefontsynonym [Kurier-Math-Letters-LightItalic] [mi-kurierli] + \definefontsynonym [Kurier-Math-Symbols-Light] [sy-kurierlz] + \definefontsynonym [Kurier-Math-Extension-Light] [ex-kurierl] \stoptypescript \starttypescript [math] [kurier-medium] [default] - \definefontsynonym [Kurier-Math-Letters-Medium] [rm-kurierm] - \definefontsynonym [Kurier-Math-Letters-MediumItalic] [mi-kuriermi] - \definefontsynonym [Kurier-Math-Symbols-Medium] [sy-kuriermi] - \definefontsynonym [Kurier-Math-Extension-medium] [ex-kurierm] + \definefontsynonym [Kurier-Math-Letters-Medium] [rm-kurierm] + \definefontsynonym [Kurier-Math-Letters-MediumItalic] [mi-kuriermi] + \definefontsynonym [Kurier-Math-Symbols-Medium] [sy-kuriermz] + \definefontsynonym [Kurier-Math-Extension-medium] [ex-kurierm] \stoptypescript % Palatino (URW) diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex index 76642010b..e6d79493c 100644 --- a/tex/context/base/type-ini.tex +++ b/tex/context/base/type-ini.tex @@ -1,4 +1,5 @@ %D \module +%D \module %D [ file=type-ini, %D version=2001.03.05, %D title=\CONTEXT\ Typescript Macros, @@ -84,7 +85,7 @@ \usetypescriptfile[\f!typeprefix exa] % some examples \usetypescriptfile[\f!typeprefix syn] % font file synonyms \usetypescriptfile[\f!typeprefix enc] % files and encodings -\usetypescriptfile[\f!typeprefix dis] % funny name remappings +%usetypescriptfile[\f!typeprefix dis] % funny name remappings, obsolete \usetypescriptfile[\f!typeprefix siz] % specific font sizes \usetypescriptfile[\f!typeprefix map] % pdftex mapping \usetypescriptfile[\f!typeprefix spe] % special macros @@ -624,6 +625,30 @@ \def\usetypefile[#1]% recurses on path ! {\readfile{\f!typeprefix#1}\donothing\donothing} +%D For Taco: +%D +%D \starttyping +%D \inherittypeface[palatino][rm][postscript] +%D \inherittypeface[palatino][rm][\fontclass] +%D \inherittypeface[palatino][rm] % == \fontclass +%D \inherittypeface[palatino] % == [rm,ss,tt,mm] +%D \starttyping + +\def\inherittypeface + {\dotripleempty\doinherittypeface} + +\def\doinherittypeface[#1][#2][#3]% + {\doifelsenothing{#2} + {\doinherittypeface[#1][\c!rm,\c!ss,\c!tt,\c!mm][\fontclass]} + {\doifnot{#1}{#3} + {\def\docommand##1{\setevalue{#1-##1}{#3}}% + \processcommalist[#2]\docommand}}} + +%D This hook sinto the font mechanism with: + +\def\checkfontclass#1% + {\edef\fontclass{\executeifdefined{\fontclass-#1}{\fontclass}}} + %D For backward compatibility we reimplement the font file %D loading macro. diff --git a/tex/context/base/x-set-11.tex b/tex/context/base/x-set-11.tex index 5e7068b14..739c07ccf 100644 --- a/tex/context/base/x-set-11.tex +++ b/tex/context/base/x-set-11.tex @@ -264,6 +264,44 @@ content: text \stopmessages +\startmessages french library: setup + title: setup + formula: formule + number: numero + list: liste + dimension: dimension + mark: marquage + reference: reference + command: commande + file: fichier + name: nom + identifier: identificateur + text: texte + section: section + singular: nom singulier + plural: nom pluriel + matrix: n*m + see: vois + inherits: herite de + 1: les caracteres < et > sont globalement actifs ! + 2: -- est traite + 3: -- n'est pas defini + 4: -- est traite de nouveau + optional: optionel + displaymath: formule + index: entree + math: formule + nothing: vide + file: fichier + position: position + reference: reference + csname: nom + destination: destination + triplet: triplet + word: mot + content: texte +\stopmessages + \def\c!setup!internal!#1% {{\dogetmessage{setup}{#1}% \expanded{\setupintfont{\currentmessagetext}}}} diff --git a/tex/context/base/x-set-12.tex b/tex/context/base/x-set-12.tex index f98761513..d7ff8fd18 100644 --- a/tex/context/base/x-set-12.tex +++ b/tex/context/base/x-set-12.tex @@ -18,19 +18,46 @@ \loadsetups -\startinterface dutch \definecolor[LocalColor][green] \stopinterface -\startinterface english \definecolor[LocalColor][red] \stopinterface -\startinterface german \definecolor[LocalColor][blue] \stopinterface -\startinterface czech \definecolor[LocalColor][magenta] \stopinterface -\startinterface italian \definecolor[LocalColor][cyan] \stopinterface -\startinterface romanian \definecolor[LocalColor][yellow] \stopinterface - -\startinterface english \definecolor[TitleColor][g=.5,b=.5] \stopinterface -\startinterface dutch \definecolor[TitleColor][r=.5,b=.5] \stopinterface -\startinterface german \definecolor[TitleColor][r=.5,g=.5] \stopinterface -\startinterface italian \definecolor[TitleColor][r=.5] \stopinterface -\startinterface czech \definecolor[TitleColor][g=.5] \stopinterface -\startinterface romanian \definecolor[TitleColor][b=.5] \stopinterface +\definecolor[TitleColor][r=.375,g=.125,b=.125] +\definecolor[TitleColor][r=.125,g=.375,b=.125] +\definecolor[TitleColor][r=.125,g=.125,b=.375] +\definecolor[TitleColor][r=.375,g=.375,b=.125] +\definecolor[TitleColor][r=.375,g=.125,b=.375] +\definecolor[TitleColor][r=.125,g=.375,b=.375] + +\definecolor[TitleColor][r=.25,g=.20,b=.15] +\definecolor[TitleColor][r=.25,g=.15,b=.20] +\definecolor[TitleColor][r=.20,g=.15,b=.25] +\definecolor[TitleColor][r=.20,g=.25,b=.15] +\definecolor[TitleColor][r=.15,g=.20,b=.25] +\definecolor[TitleColor][r=.15,g=.25,b=.20] + + +\startinterface dutch \definecolor[LocalColor][r=.75,g=.25,b=.25] \stopinterface +\startinterface english \definecolor[LocalColor][r=.25,g=.75,b=.25] \stopinterface +\startinterface german \definecolor[LocalColor][r=.25,g=.25,b=.75] \stopinterface +\startinterface french \definecolor[LocalColor][r=.75,g=.75,b=.25] \stopinterface +\startinterface czech \definecolor[LocalColor][r=.75,g=.25,b=.75] \stopinterface +\startinterface italian \definecolor[LocalColor][r=.25,g=.75,b=.75] \stopinterface +\startinterface romanian \definecolor[LocalColor][r=.5,g=.4,b=.3] \stopinterface +% \definecolor[LocalColor][r=.5,g=.3,b=.4] +% \definecolor[LocalColor][r=.4,g=.3,b=.5] +% \definecolor[LocalColor][r=.4,g=.5,b=.3] +% \definecolor[LocalColor][r=.3,g=.4,b=.5] +% \definecolor[LocalColor][r=.3,g=.5,b=.4] + +\startinterface english \definecolor[TitleColor][r=.375,g=.125,b=.125] \stopinterface +\startinterface dutch \definecolor[TitleColor][r=.125,g=.375,b=.125] \stopinterface +\startinterface german \definecolor[TitleColor][r=.125,g=.125,b=.375] \stopinterface +\startinterface french \definecolor[TitleColor][r=.375,g=.375,b=.125] \stopinterface +\startinterface italian \definecolor[TitleColor][r=.375,g=.125,b=.375] \stopinterface +\startinterface czech \definecolor[TitleColor][r=.125,g=.375,b=.375] \stopinterface +\startinterface romanian \definecolor[TitleColor][r=.25,g=.20,b=.15] \stopinterface +% \definecolor[TitleColor][r=.25,g=.15,b=.20] +% \definecolor[TitleColor][r=.20,g=.15,b=.25] +% \definecolor[TitleColor][r=.20,g=.25,b=.15] +% \definecolor[TitleColor][r=.15,g=.20,b=.25] +% \definecolor[TitleColor][r=.15,g=.25,b=.20] \definecolor [lightgray] [s=.9] \definecolor [darkgray] [s=.1] @@ -133,6 +160,7 @@ \startinterface dutch \strut commando's \par \stopinterface \startinterface english \strut commands \par \stopinterface \startinterface german \strut befehle \par \stopinterface + \startinterface french \strut ....... \par \stopinterface \startinterface czech \strut prikaz\'y \par \stopinterface \startinterface italian \strut comandi \par \stopinterface \startinterface romanian \strut comenzile \par \stopinterface @@ -141,6 +169,7 @@ \startinterface dutch NL\stopinterface \startinterface english EN\stopinterface \startinterface german DE\stopinterface + \startinterface french FR\stopinterface \startinterface czech CZ\stopinterface \startinterface italian IT\stopinterface \startinterface romanian RO\stopinterface @@ -163,6 +192,7 @@ \startinterface dutch \strut commando's \par \stopinterface \startinterface english \strut commands \par \stopinterface \startinterface german \strut befehle \par \stopinterface + \startinterface french \strut ....... \par \stopinterface \startinterface czech \strut prikaz\'y \par \stopinterface \startinterface italian \strut comandi \par \stopinterface \startinterface romanian \strut comenzile \par \stopinterface @@ -171,6 +201,7 @@ \startinterface dutch \strut nl / nederlands \par \stopinterface \startinterface english \strut en / english \par \stopinterface \startinterface german \strut de / deutsch \par \stopinterface + \startinterface french \strut fr / fran\,c ais \par \stopinterface \startinterface czech \strut cz / \^cesk\'y \par \stopinterface \startinterface italian \strut it / italiano \par \stopinterface \startinterface romanian \strut ro / rom\^{a}n\u{a} \par \stopinterface diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex index aa522cc8c..957f6eb1d 100644 --- a/tex/context/base/xtag-ext.tex +++ b/tex/context/base/xtag-ext.tex @@ -225,6 +225,11 @@ \@@XMLsave:\ifcsname\@@XMLsave:#1\endcsname#1\else\@@XMLsave\fi \endcsname} +\gdef\defXMLelement#1#2% + {\@EA\def\@EA#1\csname + \@@XMLsave:\ifcsname\@@XMLsave:#2\endcsname#2\else\@@XMLsave\fi + \endcsname} + \letgvalueempty{\@@XMLsave:\@@XMLsave} \gdef\showXMLelement#1% diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex index 67a73bb3b..61906b621 100644 --- a/tex/context/base/xtag-ini.tex +++ b/tex/context/base/xtag-ini.tex @@ -2766,10 +2766,10 @@ \def\douseXMLfilter#1% {\doifundefined{\c!file\f!xtagprefix#1} {\letvalue{\c!file\f!xtagprefix#1}\empty - \makeshortfilename[\f!xtagprefix#1]% - \writestatus{xml}{loading module #1}% will be \showmessage + \makeshortfilename[\truefilename{\f!xtagprefix#1}]% \startreadingfile - \readsysfile\shortfilename\donothing\donothing + % will be \showmessage + \readsysfile\shortfilename{\writestatus{xml}{loading module #1}}\donothing \stopreadingfile}} %D Temporarily here. @@ -2798,23 +2798,14 @@ \let\dodogetgrouped\relax \getXMLgrouped{#1}} -%\long\gdef\docountXMLgrouped#1\end#2\end % @@ => \relax\relax -% {\long\def\dosplitstring##1#1##2@@##3\end% -% {\def\ascii{##2}% -% \ifx\ascii\empty \else -% \advance\scratchcounter 1 -% \dosplitstring##2@@#1@@\end -% \fi}% -% \dosplitstring#2@@#1@@\end} - \long\gdef\docountXMLgrouped#1\end#2\end % 1 relax is enough since it's - {\long\def\dosplitstring##1#1##2\relax\relax##3\end % another regime + {\long\def\dosplitXMLstring##1#1##2\relax\relax##3\end % another regime {\def\ascii{##2}% \ifx\ascii\empty \else \advance\scratchcounter \plusone - \dosplitstring##2\relax\relax#1\relax\relax\end + \dosplitXMLstring##2\relax\relax#1\relax\relax\end \fi}% - \dosplitstring#2\relax\relax#1\relax\relax\end} + \dosplitXMLstring#2\relax\relax#1\relax\relax\end} \long\unexpanded\gdef\getXMLgrouped#1% #1 kan weg % klopt dit nu? {\groupedtoks\emptytoks diff --git a/tex/context/base/xtag-mmp.tex b/tex/context/base/xtag-mmp.tex index 7cc6e5b26..125315da7 100644 --- a/tex/context/base/xtag-mmp.tex +++ b/tex/context/base/xtag-mmp.tex @@ -57,18 +57,16 @@ \unprotect -\startXMLmapping [mml] - \def\convertasciiafter#1#2% {\convertargument#2\to\asciiafter \@EA#1\@EA{\asciiafter}} -% - \def\checkMMLoperator#1#2% temp hack {\unspaceargument#1\to\ascii \doifXMLentityelse\ascii{\getXMLentity\ascii}{#2}} +\startXMLmapping [mml] + \remapXMLsequence [mi] [CPA] \MMLpMI \remapXMLsequence [mn] [CPA] \MMLpMN \remapXMLsequence [mo] [CPA] \MMLpMO diff --git a/tex/context/config/cont-fr.ini b/tex/context/config/cont-fr.ini new file mode 100644 index 000000000..d65044ff0 --- /dev/null +++ b/tex/context/config/cont-fr.ini @@ -0,0 +1,5 @@ +% This is a configuration file needed for Thomas Esser's teTeX. Don't +% forget to uncomment the context specific lines in "fmtutil --edit". +% You may want to read the ConTeXt installation manual "minstall.pdf". +\input cont-fr.tex +\endinput diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index 2c0da61f3..b6683b0d2 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -20,7 +20,7 @@ --> - + @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index 83291e975..611314833 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -20,7 +20,7 @@ --> - + @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index 74b84d064..b2e9ae113 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml new file mode 100644 index 000000000..00ca36b1e --- /dev/null +++ b/tex/context/interface/cont-fr.xml @@ -0,0 +1,10256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index 2c84db728..ab9b35caa 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -20,7 +20,7 @@ --> - + @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index e76700875..8851f4bf0 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -20,7 +20,7 @@ --> - + @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index 805cd7dc6..edf02151d 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -20,7 +20,7 @@ --> - + @@ -640,7 +640,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -2381,7 +2381,7 @@ - + @@ -3008,13 +3008,13 @@ - + @@ -3296,7 +3296,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3499,7 +3499,7 @@ - + @@ -3526,7 +3526,7 @@ - + @@ -3553,7 +3553,7 @@ - + @@ -3580,7 +3580,7 @@ - + @@ -3607,7 +3607,7 @@ - + @@ -3839,7 +3839,7 @@ - + @@ -3956,7 +3956,7 @@ - + @@ -4213,14 +4213,14 @@ - + - + @@ -4674,7 +4674,7 @@ - + @@ -4935,7 +4935,7 @@ - + @@ -5007,8 +5007,8 @@ - - + + @@ -5088,7 +5088,7 @@ - + @@ -5345,7 +5345,7 @@ - + @@ -5966,14 +5966,14 @@ - + - + @@ -5997,7 +5997,7 @@ - + @@ -6009,8 +6009,8 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -6432,12 +6432,12 @@ - + - + @@ -6664,8 +6664,8 @@ - + @@ -6763,8 +6763,8 @@ - + @@ -7006,7 +7006,7 @@ - + @@ -7234,7 +7234,7 @@ - + @@ -7245,7 +7245,7 @@ - + @@ -7253,7 +7253,7 @@ - + @@ -7890,7 +7890,7 @@ - + @@ -8442,7 +8442,7 @@ - + @@ -8452,7 +8452,7 @@ - + @@ -8655,13 +8655,13 @@ - + - + - + @@ -8954,7 +8954,8 @@ - + + diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 6c7cfe533..e1ac64107 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 9b3549ae2..1c7e91f73 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 77afe6678..a571af6a3 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml new file mode 100644 index 000000000..1d8b92f11 --- /dev/null +++ b/tex/context/interface/keys-fr.xml @@ -0,0 +1,1604 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 173310940..7361b5840 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 5c18c3f7f..3ae79ba40 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index dcc0c0763..e08ac7c67 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + @@ -661,6 +661,7 @@ + -- cgit v1.2.3