diff options
55 files changed, 4803 insertions, 542 deletions
diff --git a/scripts/context/lua/mtx-server.lua b/scripts/context/lua/mtx-server.lua index 615506ac0..a1a5d51b3 100644 --- a/scripts/context/lua/mtx-server.lua +++ b/scripts/context/lua/mtx-server.lua @@ -281,8 +281,11 @@ function scripts.webserver.run(configuration) logs.simple("scripts subpath: %s",configuration.scripts) logs.simple("context services: http://localhost:%s/mtx-server-ctx-startup.lua",configuration.port) local server = assert(socket.bind("*", configuration.port)) +--~ local reading = { server } while true do -- no multiple clients local start = os.clock() +--~ local input = socket.select(reading) +--~ local client = input:accept() local client = server:accept() client:settimeout(configuration.timeout or 60) local request, e = client:receive() diff --git a/tex/context/base/bibl-bib.mkiv b/tex/context/base/bibl-bib.mkiv index 51db67ed7..e0476c473 100644 --- a/tex/context/base/bibl-bib.mkiv +++ b/tex/context/base/bibl-bib.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\writestatus{loading}{ConTeXt Bibliography Support / BibTeX} +\writestatus{loading}{ConTeXt Bibliography Support / Experimental BibTeX} \registerctxluafile{bibl-bib}{1.001} diff --git a/tex/context/base/bibl-tra.lua b/tex/context/base/bibl-tra.lua new file mode 100644 index 000000000..2258902bb --- /dev/null +++ b/tex/context/base/bibl-tra.lua @@ -0,0 +1,189 @@ +if not modules then modules = { } end modules ['bibl-bib'] = { + version = 1.001, + comment = "this module is the basis for the lxml-* ones", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +bibtex = bibtex or { } +bibtex.hacks = bibtex.hacks or { } + +local match, gmatch, format, concat, sort = string.match, string.gmatch, string.format, table.concat, table.sort +local texsprint, ctxcatcodes = tex.sprint, tex.ctxcatcodes +local variables, constants = interfaces.variables, interfaces.constants + +local hacks = bibtex.hacks + +local list, done, alldone, used, registered, ordered = { }, { }, { }, { }, { }, { } +local mode = 0 + +local template = [[ + \citation{*} + \bibstyle{%s} + \bibdata{%s} +]] + +function hacks.process(settings) + local style = settings.style or "" + local database = settings.database or "" + local jobname = tex.jobname + if database ~= "" then + interfaces.showmessage("publications",3) + io.savedata(file.addsuffix(jobname,"aux"),format(template,style,database)) + os.execute(format("bibtex %s",jobname)) + -- purge 'm + end +end + +function hacks.register(str) + registered[#registered+1] = str + ordered[str] = #registered +end + +function hacks.reset(m) + mode, list, done = m, { }, { } +end + +function hacks.add(str,listindex) + if mode == 0 then + -- skip + elseif mode == 1 then + -- all locals but no duplicates + local sc = structure.sections.currentid() + if done[str] ~= sc then + done[str], alldone[str] = sc, true + list[#list+1] = { str, listindex } + end + elseif mode == 2 then + -- all locals but no preceding + local sc = structure.sections.currentid() + if not alldone[str] and done[str] ~= sc then + done[str], alldone[str] = sc, true + list[#list+1] = { str, listindex } + end + end +end + +local function compare(a,b) + return ordered[a[1]] < ordered[b[1]] +end + +function hacks.flush(sortvariant) + if sortvariant == "" or sortvariant == variables.cite or sortvariant == "default" then + -- order is cite order i.e. same as list + else + sort(list,compare) + end + for i=1,#list do + texsprint(ctxcatcodes,format("\\doprocessbibtexentry{%s}",list[i][1])) + end +end + +function hacks.registerplaced(str) + used[str] = true +end + +function hacks.doifalreadyplaced(str) + commands.testcase(used[str]) +end + +-- we ask for <n>:tag but when we can't find it we go back +-- to look for previous definitions, and when not found again +-- we look forward + +-- we directly operate on the reference list so that we avoid +-- references to be resolved completely; for the moment we just +-- ignore prefix (we assume that it's "") + +local function compare(a,b) + return a[3] < b[3] +end + +function hacks.resolve(prefix,block,reference) -- maybe already feed it split + local subset = jobreferences.collected[prefix or ""] or jobreferences.collected[""] + if subset then + local result, done = { }, { } + block = tonumber(block) + for rest in gmatch(reference,"([^,]+)") do + local blk, tag, found = block, nil, nil + if block then + tag = blk .. ":" .. rest + found = subset[tag] + if not found then + for i=block-1,1,-1 do + tag = i .. ":" .. rest + found = subset[tag] + if found then + blk = i + break + end + end + end + end + if not found then + blk = "*" + tag = blk .. ":" .. rest + found = subset[tag] + end + if found then + local current = found.entries and found.entries.text +--~ local current = found.userdata and found.userdata.number +--~ local current = found.userdata and found.userdata.year + if current and not done[current] then + result[#result+1] = { blk, rest, current } + done[current] = true + end + end + end + -- todo: ranges so the interface will change + sort(result,compare) + local first, last, firsti, lasti, firstr, lastr + local collected = { } + for i=1,#result do + local r = result[i] + local current = r[3] + if not first then + first, last, firsti, lasti, firstr, lastr = current, current, i, i, r, r + elseif current == last + 1 then + last, lasti, lastr = current, i, r + else + if last > first + 1 then + collected[#collected+1] = { firstr[1], firstr[2], lastr[1], lastr[2] } + else + collected[#collected+1] = { firstr[1], firstr[2] } + if last > first then + collected[#collected+1] = { lastr[1], lastr[2] } + end + end + first, last, firsti, lasti, firstr, lastr = current, current, i, i, r, r + end + end + if first then + if last > first + 1 then + collected[#collected+1] = { firstr[1], firstr[2], lastr[1], lastr[2] } + else + collected[#collected+1] = { firstr[1], firstr[2] } + if last > first then + collected[#collected+1] = { lastr[1], lastr[2] } + end + end + end + for i=1,#collected do + local c = collected[i] + if c[3] then + texsprint(ctxcatcodes,format("\\dowithbibtexnumrefrange{%s}{%s}{%s}{%s}{%s}{%s}{%s}",#collected,i,prefix,c[1],c[2],c[3],c[4])) + else + texsprint(ctxcatcodes,format("\\dowithbibtexnumref{%s}{%s}{%s}{%s}{%s}",#collected,i,prefix,c[1],c[2])) + end + end + end +end + +--~ function jobreferences.filters.user.number(data) +--~ texsprint(ctxcatcodes,data.userdata.number) +--~ end + +--~ function jobreferences.filters.user.year(data) +--~ texsprint(ctxcatcodes,data.userdata.year) +--~ end diff --git a/tex/context/base/bibl-tra.mkii b/tex/context/base/bibl-tra.mkii new file mode 100644 index 000000000..6e5e7c1ef --- /dev/null +++ b/tex/context/base/bibl-tra.mkii @@ -0,0 +1,1764 @@ +%D \module +%D [ file=bibl-tra, +%D version=2009.08.13, +%D title=\CONTEXT\ Publication Module, +%D subtitle=Publications, +%D author=Taco Hoekwater, +%D date=\currentdate, +%D copyright=Public Domain] +%C +%C Donated to the public domain. + +%D This used to be module \type {t-bib} but due to the number of differences +%D in handling structure between \MKII\ and \MKIV\ we now have \BIBTEX\ support +%D in the kernel. The only patches concerns some namespace issues. Also, +%D constants and variables are now predefined. When the \MKIV\ code is well +%D tested I might backport a couple of adaptions to this \MKII\ variant. + +\writestatus{loading}{ConTeXt Bibliography Support / BibTeX} + +\definefilesynonym[bib][obsolete] + +% here starts t-bib.tex + +%D The original was developed independantly by Taco Hoekwater while still working for Kluwer +%D Academic publishers (it still used the dutch interface then). Development continued after +%D he left Kluwer, and in Januari 2005, the then already internationalized file was merged +%D with the core distribution by Hans Hagen. The current version is once again by Taco. +%D +%D More documentation and additional resources can be found on the contextgarden: +%D \hyphenatedurl{http://wiki.contextgarden.net//Bibliography}. + +%D \subject{DONE (dd/mm/yyyy)} +%D +%D \startitemize +%D \item add author definition (and associated system variable) (26/05/2005) +%D \item add finalnamesep support for Oxford comma (17/09/2005) +%D \item add \type{\insert...} for: doi, eprint, howpublished (19/09/2005) +%D \item allow a defaulted \type{\setupcite} (19/11/2005) +%D \item renamed citation type 'number' to 'serial' (19/11/2005) +%D \item better definition of \type{\inverted...author} (19/11/2005) +%D \item don't reset [numbercommand] in \type {\setuppublication} by default (20/11/2005) +%D \item don't disable other \type {\setuppublication} keys if alternative is present (20/11/2005) +%D \item drop \type{\sanitizeaccents} (20/11/2005) +%D \item added \type{\nocite} and \type{\cite[none]} (21/11/2005) +%D \item added headtext for it (23/11/2005) +%D \item make \type{\cite[url]} and \type{\cite[doi]} interactive (23/11/2005) +%D \item make right-aligned labels in the list work even when autohang=no +%D \item use 'et al.' instead of 'et.al.'. Pointed out by Peter M�nster (30/12/2005) +%D \item added headtext for cz (31/12/2005) +%D \item Keep whitespace after \type{\cite} with single argument (31/12/2005) +%D \item Fix broken \type{\cite{}} support (31/12/2005) +%D \item Use \type{\readfile} inside \type{\usepublications} instead of \type{\readsysfile} (12/01/2006) +%D \item Use \type{\currentbibyear} and \type{\currentbibauthor} instead of \type{\YR} and \type{\AU} (05/02/2006) +%D \item Fix compressed version of authoryear style (05/02/2006) +%D \item Rename the clashing data fields \type{\url} and \type{\type} to \type{\biburl} and \type{\bibtype} (05/02/2006) +%D \item Added two french bibl files from Renaud Aubin (06/02/2006) +%D \item Five new bib class and eight extra bib fields, for IEEEtran (07/02/2006) +%D \item French keyword translation, provided by Renaud (08/02/2006) +%D \item fix underscores in undefined keys (22/02/2006) +%D \item Destroy interactivity in labels of the publication list (13/03/2006) +%D \item fix multi-cite list compression (11/4/2006) +%D \item fix \type{\getcitedata} (11/4/2006) +%D \item magic for chapter bibs (18-25/4/2006) +%D \item language setting (25/4/2006) +%D \item use \type{\hyphenatedurl} for \type{\inserturl} (25/4/2006) +%D \item Add \type{\docitation} to \type{\nocite}(26/4/2006) +%D \item patents can have numbers, added to bst files (26/4/2006) +%D \item \type{\docitation} needs a \type{\iftrialtypesetting} (27/4/2006) +%D \item \type{\filllocalpublist}'s loop is bound by definedness, not resolvedness (27/4/2006) +%D \item \type{\setuppublications[monthconversion=]} added (15/5/2006) +%D \item use \type{\undefinedreference} instead of bare question marks (15/5/2006) +%D \item add grouping around \type{\placepublications} commands (16/5/2006) +%D \item fix a bug in \type{\cite{<item>}} (17/5/2006) +%D \item support \type{\cite[authornum]} (18/5/2006) +%D \item make \type{\cite} unexpandable (20/6/2006) +%D \item allow hyperlinks in author\&year combo's +%D (cite list compression has to be off) (20/6/2006) +%D \item fix duplicate labels for per-chapter style (20/6/2006) +%D \item allow \type{\setupcite[interaction=(start|stop)]} +%D \item fix the item number in the publication list with 'numbering=yes' (22/6/2006) +%D \item make the default criterium for \type{\placepublications} be \type{previous} (23/6/2006) +%D \item fix \type{\normalauthor} and \type{\normalshortauthor} spacing (29/6/2006) +%D \item do not typeset empty arguments to \type{\typesetapublication} (29/6/2006) +%D \item add \type{symbol=none} to \type{\setuplist} in unnumbered +%D mode to prevent typesetting of bare numbers (29/6/2006) +%D \item remove two incorrect spaces from bibl-num.tex (1/7/2006) +%D \item reset font styles within \type{\cite}, so that font switches +%D in \type{left} stay in effect (12/7/2006) +%D \item guard added against loading bbl files multiple times (13/7/2006) +%D \item fix \type{\cite[num]} with compression is on. (14/7/2006) +%D \item test \type{\iflocation} before deciding to use the +%D interactive version of cite (18/7/2006) +%D \item support \type{\setupcite[authoretallimit=1]} (18/7/2006) +%D \item support use of \type{\cite} within titles and captions by +%D saveguarding the list item extraction and reference placement +%D code (19/7/2006) +%D \item support \type{\setuppublicationlist[title=\chapter]} (4/8/2006) +%D \item use the expansion of \type{\headtext{pubs}} (4/8/2006) +%D \item hook added for repeated authors in publication list +%D \type{\setuppublicationlist[artauthorcommand=\mythreeargscommand]} +%D (4/8/2006) +%D \item make the bracketed arguments of \type{\artauthor}, \type{\author} +%D and \type{\editor} (bbl commands) optional (4/8/2006) +%D \item the constants \type{sorttype}, \type{compress} and +%D \type{autohang} have moved to the core (8/8/2006) +%D \item bibtex is now registered as a program to be run by texexec (8/8/2006) +%D \item fix a bug in \type{\setupcite[authoretallimit=1]} (9/8/2006) +%D \item fix a bug inside citations that prevented lastpubsep from ever being +%D used due to a volatile \type{\commalistsize} (25/8/2006). +%D \item added the possibility of \type{\placepublications[option=continue]} +%D (6/9/2006) +%D \item Mojca translated Master's Thesis to Masterarbeit (bibl-apa-de.tex) +%D (12/9/2006) +%D \item Added \type{\setuppublicationlist[maybeyear=off]} by request from +%D Thomas Schmitz (15/9/2006) +%D \item Removed some spurious spaces pointed out by willi egger (19/9/2006) +%D \item Add configuration of bibtex executable name (4/11/2006) +%D \item Fix numbering=short and numbering=bib (spotted by Matthias W�chter) (4/11/2006) +%D \item third attempt to get a correct release (5/11/2006) +%D \item fix a few missing dots in bibl-num.tex (7/12/2006) +%D \item Patch for DOI's by Tobias Burnus (17/4/2007) +%D \item Patch for \type{\insertbiburl} and \type{\insertdoi} for Tobias Burnus (18/4/2007) +%D \item Added a missing \type{\relax} in \type{\dospecialbibinsert}, +%D that made the space before the {\it et al.} text disappear. (18/4/2007) +%D \item Attempt to fix percent signs in bbl files. As a side-effect, +%D this prohibits comments in \tex{startpublication} blocks! (17/4/2008) +%D \item Patch from Matthias W\"achter that allows arbitrary .bst +%D files to be used with \tex{setupbibtex} (25/9/2008) +%D \item Extended for the new multilingual setups for the Oct 2008 current of ConTeXt (23/10/2008) +%D \item Multilingual setups needed another fix (27/10/2008) +%D \item Two fixes for bibl-apa by Michael Green (27/10/2008) +%D \item Catalan translation of 'References' (10/11/2008) +%D \item 'chapter' -> 'chapitre' in bibl-apa-fr (27/11/2008) +%D \item Run bibtex via os.execute in mkiv modee (01/12/2008) +%D \item Small correction in bibl-apa's placement of volume +%D information in articles (05/01/2009) +%D \item Handle multi-author (more than two) cases in \type{\cite} +%D (02/03/2009) +%D \item Suppress a syntax error in \type{cont-xp} mode. The output is +%D probably not right, though (02/03/2009) +%D \item Added a \tex{loadmarkfile} at the end, and two new files +%D from Hans. The \type{t-bib.mkiv} is needed to make the module +%D work with the new structure code (17/04/2009) +%D \item Added a patch to \type{t-bib.mkiv} from Hans to make the +%D cross referencing between multiple citations an +%D bibliographies work (27/04/2009) +%D \item Remove a superfluous \type{\unprotect} in t-bib.mkiv (11/05/2009). +%D \item Patch of incollection in bibl-ams.tex from Xan (08/06/2009). +%D \item Patch of unpublished in bibl-ams.tex from Xan (22/07/2009). +%D \item Modified \type{\bibdogetupsometextprefix} so it works for undefined +%D language labels, from Hans (13/08/2009). +%D \item Removed some \MKIV\ hacks as well as some things that are in the +%D core like variables, constants and messages (HH:22/08/2009). +%D \item Added \type{bib} in front of \type {insert} macros and initialize +%D then later on (HH:22/08/2009). +%D \item Removed test for type {\currentlocationreference} plus associated +%D code (HH:22/08/2009). +%D \stopitemize +%D +%D \subject{WISHLIST} +%D +%D \startitemize +%D \item link back from publication list to citation +%D \item export \type {\citation{<cited item>}} +%D \item support mlbibtex +%D \item don't load the whole lot, but filter entries instead +%D \stopitemize + +\unprotect + +%D Variables, constants and messages are removed as they are now in the +%D multilingual interface modules. + +\def\biblistname{pubs} % for compatibility + +%D how to load the references. There is some new stuff here +%D to support Idris' (incorrect :-)) use of projects + +\let\preloadbiblist\relax + +\ifx\currentcomponent\v!text + % single file + \edef\temp{\the\everystarttext}% + \ifx\temp\empty + % post-starttext + \def\preloadbiblist{\dousepublications\jobname }% + \else + % pre-starttext + \appendtoks \dousepublications\jobname \to \everystarttext + \fi + % +\else \ifx\currentcomponent\v!project + % a project file, have to set up the partial products! + \def\startproduct #1 % + {\doateverystarttext + \dousepublications{#1}% + \donextlevel\v!product\currentproduct + \doexecutefileonce\doexecutefileonce + \donotexecutefile\doexecutefile#1\\}% + % +\else \ifx\currentcomponent\v!product + % a product file + \def\preloadbiblist{\dousepublications\jobname }% + % +\else + % a component? not sure what to do + \def\preloadbiblist{\dousepublications\jobname }% + % +\fi \fi \fi + +\definelist[pubs] +\setuplist[pubs][\c!width=] + +%D \macros{bibdoif,bibdoifnot,bibdoifelse} +%D +%D Here are a few small helpers that are used a lot +%D in all the typesetting commands +%D (\type{\insert...}) we will encounter later. + +\long\def\bibdoifelse#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\secondoftwoarguments + \else + \expandafter\firstoftwoarguments + \fi} + +\long\def\bibdoifnot#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\firstofoneargument + \else + \expandafter\gobbleoneargument + \fi} + +\long\def\bibdoif#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\gobbleoneargument + \else + \expandafter\firstofoneargument + \fi} + +%D Bibtex settings separated out + +%D No point in writing the aux file if there is no database... + +\def\setupbibtex{\dosingleempty\dosetupbibtex} + +\def\dosetupbibtex[#1]% + {\let\@@pbdatabase\empty + \getparameters[\??pb][\c!sort=\s!default,#1]% + \expanded{\processaction[\@@pbsort]} + [ \v!no=>\def\bibstyle{cont-no}, + \v!author=>\def\bibstyle{cont-au}, + \v!title=>\def\bibstyle{cont-ti}, + \v!short=>\def\bibstyle{cont-ab}, + \s!default=>\def\bibstyle{cont-no}, + \s!unknown=>\def\bibstyle{\@@pbsort}]% + \ifx\@@pbdatabase\empty\else \writeauxfile \fi} + +\dosetupbibtex[bibtex=bibtex] + +%D \macros{writeauxfile} +%D +%D Unfortunately, \BIBTEX\ is not the best configurable program +%D around. The names of the commands it parses as well as the \type{.aux} +%D extension to the file name are both hardwired. +%D +%D This means \CONTEXT\ has to write a \LATEX-style auxiliary file, yuk! +%D The good news is that it can be rather short. We'll just ask +%D \BIBTEX\ to output the entire database(s) into the \type{bbl} file. +%D +%D The \type{\bibstyle} command controls how the \type{bbl} file will +%D be sorted. The possibilities are: +%D +%D \startitemize[packed] +%D \item by author (+year, title): cont-au.bst +%D \item by title (+author, year): cont-ti.bst +%D \item by short key as in abbrev.bst: cont-ab.bst +%D \item not sorted at all: cont-no.bst +%D \stopitemize + +\def\writeauxfile + {\doifmode{*\v!first} + {\openout \scratchwrite \jobname.aux + \write \scratchwrite {\string\citation{*}}% + \write \scratchwrite {\string\bibstyle{\bibstyle}}% + \write \scratchwrite {\string\bibdata{\@@pbdatabase}}% + \closeout\scratchwrite + \showmessage\m!publications{3}{}% + \expanded{\installprogram{\@@pbbibtex\space\jobname}}}} + +%D \macros{ifsortbycite,iftypesetall,ifautohang,ifbibcitecompress} +%D +%D The module needs some new \type{\if} statements. + +%D Default sort order of the reference list is by citation. + +\newif\ifsortbycite \sortbycitetrue + +%D By default, only referenced publications are typeset + +\newif\iftypesetall \typesetallfalse + +%D Hanging indentation of the publication list +%D will not adjust itself according to the width of the label. + +\newif\ifautohang \autohangfalse + +%D Cite lists are compressed, if possible. + +\newif\ifbibcitecompress \bibcitecompresstrue + +\def\setuppublications + {\dosingleargument\dosetuppublications} + +\def\bibleftnumber#1% + {#1\hfill~} + +\def\dosetuppublications[#1]% + {\getparameters + [\??pb] + [\c!alternative=,#1]% + \doifsomething\@@pbalternative + {\readsysfile + {bibl-\@@pbalternative.tex} + {\showmessage\m!publications{6}{bibl-\@@pbalternative}\let\@@pbalternative\empty} + {\showmessage\m!publications{1}{bibl-\@@pbalternative}\let\@@pbalternative\empty}}% + \getparameters + [\??pb] + [#1]% + \processaction + [\@@pbcriterium] + [ \v!all=>\typesetalltrue, + \s!unknown=>\typesetallfalse]% + \processaction + [\@@pbautohang] + [ \v!yes=>\autohangtrue, + \s!unknown=>\autohangfalse]% + \processaction + [\@@pbsorttype] + [ \v!cite=>\sortbycitetrue, + \v!bbl=>\sortbycitefalse, + \s!default=>\sortbycitetrue, + \s!unknown=>\sortbycitefalse]% + \processaction + [\@@pbnumbering] + [ \v!yes=>\let\@@pbinumbercommand\firstofoneargument, + \v!no=>\let\@@pbinumbercommand\gobbleoneargument, + \v!short=>\def\@@pbinumbercommand##1{\getvalue{pbds-\@@pbk}}, + \v!bib=>\def\@@pbinumbercommand##1{\getvalue{pbdn-\@@pbk}}, + \s!unknown=>\let\@@pbinumbercommand\firstofoneargument]% + \processaction + [\@@pbrefcommand] + [\s!default=>\edef\@@citedefault{\@@pbrefcommand}, + \s!unknown=>\edef\@@citedefault{\@@pbrefcommand}]} + +% initialize + +\def\@@pbrefcommand{num} +\def\@@pbnumbercommand{\bibleftnumber} + +%D \macros{usepublications} +%D +%D We need \type{\usereferences} so that it is possible to +%D refer to page and/or appearance number for publications +%D in the other document. + +\def\usepublications[#1]% + {\usereferences[#1]\processcommalist[#1]\dousepublications} + +\def\dousepublications#1% + {\doonlyonce + {#1.\f!bibextension} + {\readfile{#1.\f!bibextension} + {\showmessage\m!publications{4}{#1.\f!bibextension}} + {\showmessage\m!publications{2}{#1.\f!bibextension}}}} + +%D \macros{setuppublicationlist} +%D +%D This will be the first command in (\BIBTEX-generated) \type{bbl} +%D files. `samplesize' is a sample value (in case of \BIBTEX-generated +%D files, this will be the longest `short' key). `totalnumber' +%D is the total number of entries that will follow in this +%D file. + +%D Both values are only needed for the label calculation +%D if `autohang' is `true', so by default the command is +%D not even needed, and therefore I saw no need to give +%D it it's own system variable and it just re-uses \type{pb}. + +\def\setuppublicationlist + {\dosingleempty\dosetuppublicationlist} + +\def\dosetuppublicationlist[#1]% + {\getparameters[\??pv data][#1]% + \setuplist + [pubs] + [\c!samplesize={AA99},\c!totalnumber={99}, + \c!alternative=a,\c!interaction=,\c!pagenumber=\v!no,#1]} + +\def\setuppublicationlayout[#1]#2% + {\setvalue{\??pv data#1}{#2\unskip}} + +%D \macros{bibalternative} +%D +%D A nice little shorthand that will be used so we don't have to +%D key in the weird \type{\@@pv} parameter names all the time. + +\def\bibalternative#1% + {\getvalue{\??pv\@@currentalternative#1}} + +%D \macros{simplebibdef,bibcommandlist} +%D +%D \type{\simplebibdef} defines \type{bib@#1}, which in turn will +%D use one argument that is stored in \type{@@pb@#1}. +%D +%D \type{\simplebibdef} also defines \type{insert#1}, which can be +%D used in the argument of \type{\setuppublicationlayout} to fetch +%D one of the \type{@@pb@} data entries. \type{insert#1} then has +%D three arguments: \type{#1} are commands to be executed before the +%D data, \type{#2} are commands to be executed after the data, and +%D \type{#3} are commands to be executed if the data is not found. + +%D \type{\bibcommandlist} is the list of commands that is affected +%D by this approach. Later on, it will be used to do a series +%D of assignments from \type{#1} to \type{bib@#1}: e.g +%D \type{\title} becomes \type{\bib@title} when used within +%D a publication. + +\newtoks\initializebibdefinitions % we need to prevent clashes (HH) + +% \def\simplebibdef#1% hh: funny expansion ? +% {\@EA\long\@EA\def\csname bib@#1\endcsname##1% +% {\setvalue{\??pb @#1}{##1}% +% \ignorespaces}% +% \@EA\def\csname insert#1\endcsname##1##2##3% +% {\@EA\bibdoifelse +% \@EA{\csname @@pb@#1\endcsname}% +% {##1\csname @@pb@#1\endcsname##2}% +% {##3}% +% }} + +\def\simplebibdef#1% hh: funny expansion ? + {\@EA\long\@EA\def\csname bib@#1\endcsname##1% + {\setvalue{\??pb @#1}{##1}\ignorespaces}% + \expandafter \appendtoks + \expandafter\let\csname insert#1\expandafter\endcsname\csname bibinsert#1\endcsname + \to \initializebibdefinitions + \@EA\unexpanded\@EA\def\csname bibinsert#1\endcsname##1##2##3% + {\@EA\bibdoifelse\@EA{\csname\??pb @#1\endcsname}{##1\csname\??pb @#1\endcsname##2}{##3}}} + +\def\bibcommandlist + {abstract, annotate, arttitle, assignee, bibnumber, bibtype, biburl, chapter, city, + comment, country, day, dayfiled, doi, edition, eprint, howpublished, isbn, issn, + issue, journal, keyword, keywords, lastchecked, month, monthfiled, names, nationality, + note, notes, organization, pages, pubname, pubyear, revision, series, size, thekey, + title, volume, yearfiled} + +\processcommacommand[\bibcommandlist]\simplebibdef + +\def\bibinsertdoi#1#2#3% + {{\bibdoifelse{\@@pb@doi}% + {\edef\ascii{\@EA\detokenize\@EA{\@@pb@doi}}% + #1\expanded{\gotoDOI{\@@pb@thekey}{\ascii}}#2}{#3}}} + +\def\bibinsertbiburl#1#2#3% + {{\bibdoifelse{\@@pb@biburl}% + {\edef\ascii{\@EA\detokenize\@EA{\@@pb@biburl}}% + #1\expanded{\gotoURL{\@@pb@thekey}{\ascii}}#2}{#3}}} + +\def\bibinsertmonth#1#2#3% + {\bibdoifelse{\@@pb@month}% + {#1\doifnumberelse{\@@pb@month}% + {\doifconversiondefinedelse\@@pbmonthconversion + {\convertnumber\@@pbmonthconversion{\@@pb@month}}{\@@pb@month}}% + {\@@pb@month}#2}{#3}} + +\appendtoks + \let\inserturl \bibinsertbiburl % for backward compat. + \let\inserttype\bibinsertbibtype % for backward compat. +\to\initializebibdefinitions + +\def\newbibfield[#1]% + {\simplebibdef{#1}% + \edef\bibcommandlist{\bibcommandlist,#1}} + +%D \macros{bib@crossref} +%D +%D \type{\crossref} is used in database files to point to another +%D entry. Because of this special situation, it has to be defined +%D separately. Since this command will not be seen until at +%D \type{\placepublications}, it may force extra runs. The same is +%D true for \type{\cite} commands inside of publications. + +\def\bib@crossref#1% + {\setvalue{\??pb @crossref}{#1}\ignorespaces} + +\def\bibinsertcrossref#1#2#3% + {\bibdoifelse{\@@pb@crossref} + {#1\@EA\cite\@EA[\@@pb@crossref]#2} + {#3}} + +\appendtoks\let\insertcrossref\bibinsertcrossref\to\initializebibdefinitions + +%D \macros{complexbibdef,specialbibinsert} +%D +%D The commands \type{\artauthor}, \type{\author} and +%D \type{\editor} are more complex than the other commands. +%D Their argument lists have this form: +%D +%D \type{\author[junior]{firstnames}[inits]{von}{surname}} +%D +%D (bracketed stuff is optional) +%D +%D And not only that, but there also might be more than one of each of +%D these commands. This is why a special command is needed to insert +%D them, as well as one extra counter for each command. + +%D All of these \type{\@EA}'s and \type{\csnames} make this code +%D look far more complex than it really is. For example, the argument +%D \type{author} defines the macro \type{\bib@author} to do two +%D things: increment the counter \type{\author@num} (let's say to 2) +%D and next store it's arguments in the macro \type{\@@pb@author2}. +%D And it defines \type{\insertauthors} to expand into +%D \starttyping +%D \specialbibinsert{author}{\author@num}{<before>}{<after>}{<not>} +%D \stoptyping + +\def\docomplexbibdef#1% + {\def\currentype{#1}% + \dosingleempty\dodocomplexbibdef} + +\def\dodocomplexbibdef[#1]#2% + {\def\firstarg{#1}\def\secondarg{#2}% + \dosingleempty\dododocomplexbibdef} + +\def\dododocomplexbibdef[#1]#2#3% + {\@EA\increment\csname \currentype @num\endcsname + \setevalue{\??pb @\currentype\csname \currentype @num\endcsname}% + {{\secondarg}{#2}{#3}{#1}{\firstarg}}\ignorespaces}% + +% \def\complexbibdef#1% +% {\@EA\newcounter\csname #1@num\endcsname +% \@EA\def\csname bib@#1\endcsname{\docomplexbibdef{#1}}% +% \@EA\def\csname insert#1s\endcsname##1##2##3% +% {\specialbibinsert{#1}{\csname #1@num\endcsname}{##1}{\unskip ##2}{##3}}} + +\def\complexbibdef#1% + {\@EA\newcounter\csname #1@num\endcsname + \@EA\def\csname bib@#1\endcsname{\docomplexbibdef{#1}}% + \expandafter \appendtoks + \expandafter\let\csname insert#1s\expandafter\endcsname\csname bibinsert#1s\endcsname + \to \initializebibdefinitions + \@EA\def\csname bibinsert#1s\endcsname##1##2##3{\specialbibinsert{#1}{\csname #1@num\endcsname}{##1}{\unskip ##2}{##3}}} + +\processcommalist[author,artauthor,editor]\complexbibdef + +%D Another level of indirection is needed to control the +%D typesetting of all of these arguments. + +%D Btw, there is a conflict between `author' and the predefined interface +%D variable `auteur'. The old version is overruled `auteur' is +%D overruled by the systemconstant definition at the top of this file! + +\newcount\etallimitcounter +\newcount\etaldisplaycounter +\newcount\todocounter + +\def\specialbibinsert#1#2#3#4#5% + {\bgroup + \ifnum#2>\zerocount + \etallimitcounter =0\bibalternative{#1etallimit}\relax + \etaldisplaycounter=0\bibalternative{#1etaldisplay}\relax + \ifnum #2>\etallimitcounter + \todocounter\etaldisplaycounter + % just in case ... + \ifnum\todocounter>\etallimitcounter + \todocounter\etallimitcounter + \fi + \else + \todocounter#2\relax + \fi + \ifnum\todocounter>\zerocount + % find the current author list + \let\templist\empty + \dorecurse{#2} + {\toks0=\@EA\@EA\@EA{\csname @@pb@#1\recurselevel\endcsname}% + \ifx\templist\empty \edef\templist{\the\toks0}% + \else \edef\templist{\templist,\the\toks0}\fi }% + \doifdefinedelse + {\??pv data#1\c!command} + {\doifemptyelsevalue + {\??pv data#1\c!command} + {#3\dospecialbibinsert{#1}{\todocounter}{\templist}#4}% + {#3\getvalue{\??pv data#1\c!command}{#1}{\todocounter}{\templist}#4}}% + {#3\dospecialbibinsert{#1}{\todocounter}{\templist}#4}% + \else + #5% + \fi + \else + #5% + \fi + \egroup} + +%D This macro does the hard work of inserting a list of people in the +%D output, with proper regard of all the inbetween strings that can +%D arise depending on length of the list of people. + +%D \#1 = type +%D \#2 = number of items to be typeset +%D \#3 = commacommand containing authors + +\def\dospecialbibinsert#1#2#3% + {\getcommacommandsize[#3]% + \scratchcounter 0 + \def\processauthoritem##1% + {\advance\scratchcounter1 + \ifnum \numexpr\scratchcounter-1\relax<#2\relax + \getvalue{\??pv data#1}##1% + \ifnum \scratchcounter=#2\relax + \ifnum\etallimitcounter<\commalistsize\relax \bibalternative{#1etaltext}\fi + \else \ifnum\numexpr\scratchcounter+1 = #2\relax + \ifnum \commalistsize > \plustwo \bibalternative\c!finalnamesep + \else \bibalternative\c!lastnamesep \fi + \else + \bibalternative\c!namesep + \fi \fi + \fi}% + \processcommacommand[#3]\processauthoritem } + +%D \macros{invertedauthor,normalauthor,invertedshortauthor,normalshortauthor} +%D +%D Just some commands that can be used in \type{\setuppublicationparameters} +%D If you want to write an extension to the styles, you might +%D as well define some of these commands yourself. +%D +%D The argument liust has been reordered here, and the meanings +%D are: +%D +%D {\obeylines\parskip0pt +%D \type{#1} firstnames +%D \type{#2} von +%D \type{#3} surname +%D \type{#4} inits +%D \type{#5} junior +%D } +%D + +\def\normalauthor#1#2#3#4#5% + {\bibdoif{#1}{#1\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!surnamesep#5\unskip}} + +\def\normalshortauthor#1#2#3#4#5% + {\bibdoif{#4}{#4\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!surnamesep#5\unskip}} + +\def\invertedauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!juniorsep #5}% + \bibdoif{#1}{\bibalternative\c!surnamesep #1\unskip}} + +\def\invertedshortauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!juniorsep #5}% + \bibdoif{#4}{\bibalternative\c!surnamesep #4\unskip}} + +%D \macros{clearbibitem,clearbibitemtwo,bibitemdefs} +%D +%D These are used in \type{\typesetapublication} to do +%D initializations and cleanups. + +\def\clearbibitem#1{\setvalue{\??pb @#1}{}}% + +\def\clearbibitemtwo#1% + {\letvalue{#1@num}\!!zerocount + \scratchcounter\plusone + \doloop + {\doifdefinedelse{\??pb @#1\the\scratchcounter} + {\letvalue{\??pb @#1\the\scratchcounter}\empty + \advance\scratchcounter\plusone}% + {\exitloop}}} + +\def\bibitemdefs#1% + {\@EA\let\@EA\tempa \csname bib@#1\endcsname + \@EA\let\csname #1\endcsname \tempa } + +%D \macros{startpublication} +%D +%D We are coming to the end of this module, to the macros that +%D do typesetting and read the \type{bbl} file. + +\newcounter\bibcounter + +%D Just a \type{\dosingleempty} is the most friendly +%D of doing this: there need not even be an argument +%D to \type{\startpublication}. Of course, then there +%D is no key either, and it had better be an +%D article (otherwise the layout will be all screwed up). +%D +%D Now prohibits comments, so % can be used for urls + +\def\startpublication + {\edef\bibmodsavedpercent{\the\catcode`\%}% + \catcode`\%=12 + \dosingleempty\dostartpublication} + +\def\stoppublication + {} % the \catcode of % is reset below + +%D Only specifying the key in the argument is also +%D legal. In storing this stuff into macros, some trickery with +%D token registers is needed to fix the expansion problems. Even so, +%D this appears to not always be 100\% safe, so people are +%D urgently advised to use \ETEX\ instead of traditional \TEX. +%D +%D In \ETEX, all expansion problems are conviniently solved by +%D the primitive \type{\protected}. To put that another way: +%D +%D It's not a bug in this module if it does not appear in \ETEX! + +\long\def\dostartpublication[#1]#2\stoppublication% + {\increment\bibcounter + \bgroup + \doifassignmentelse{#1}% + {\getparameters[\??pb][k=,t=article,n=,s=,a=,y=,o=,u=,#1]}% + {\getparameters[\??pb][k=#1,t=article,n=,s=,a=,y=,o=,u=]}% + \@EA\toks\@EA2\@EA{\@@pba}% + \@EA\toks\@EA4\@EA{\@@pbs}% + \toks0={\ignorespaces #2}% + \setxvalue{pbdk-\@@pbk}{\@@pbk} + \setxvalue{pbda-\@@pbk}{\the\toks2} + \setxvalue{pbdy-\@@pbk}{\@@pby} + \setxvalue{pbds-\@@pbk}{\the\toks4} + \setxvalue{pbdn-\@@pbk}{\@@pbn} + \setxvalue{pbdt-\@@pbk}{\@@pbt} + \setxvalue{pbdo-\@@pbk}{\@@pbo} + \setxvalue{pbdu-\@@pbk}{\@@pbu} + \setxvalue{pbdd-\@@pbk}{\the\toks0} + \xdef\allrefs{\allrefs,\@@pbk}% + \egroup + \catcode`\%=\bibmodsavedpercent\relax } + +% intialization of the order-list: + +\let\allrefs\empty + +%D The next macro is needed because the number command of the +%D publist sometimes needs to fetch something from the current +%D item (like the 'short' key). For this, the ID of the current +%D item is passed in the implict parameter \type{\@@pbk} + +\def\makepbkvalue#1{\def\@@pbk{#1}} + +\newif\ifinpublist + +% from Hans + +\def\ignoresectionconversion + {\let\@@sectionconversion\secondoftwoarguments} + +\let\normaldosetfilterlevel\dosetfilterlevel + +\def\patcheddosetfilterlevel#1#2% beware: this one is \let + {\bgroup + \ignoresectionconversion + \edef\askedlevel{#1}% + \edef\askedfilter{#2}% +% \message{ASKD: \meaning\askedlevel}% +% \message{PREV: \meaning\v!previous}% + \ifx\askedlevel\v!current + \dosetcurrentlevel\askedlevel + \else\ifx\askedlevel\v!previous + \dosetpreviouslevel\askedlevel + \else\ifx\askedlevel\v!all + \global\chardef\alltoclevels\plusone + \else\ifx\askedlevel\v!text + \global\chardef\alltoclevels\plusone + \else + \edef\byaskedlevel{\csname\??by\askedlevel\endcsname}% + \ifx\byaskedlevel\v!text + \dosettextlevel\askedlevel + \else + \dosetotherlevel\askedlevel + \fi + \fi\fi\fi\fi + % experiment + \ifx\askedfilter\empty \else + \xdef\currentlevel{\currentlevel\sectionseparator\askedfilter}% + \fi + \egroup} + +\def\filllocalpublist% + {\doifdefinedelse{\alltoclevels} + {\let\dosetfilterlevel\patcheddosetfilterlevel + \dosettoclevel\??li{pubs}% + \let\dosetfilterlevel\normaldosetfilterlevel }% + {\dosettoclevel\??li{pubs}}% + \global\let\glocalpublist\empty + \doloop + {\doifdefinedelse + {\r!cross cite-\jobname-\recurselevel} + {\doifreferencefoundelse + {cite-\jobname-\recurselevel} + {\@EA\doifreglevelelse\@EA[\currentlocationreference] + {\@EA\doglobal\@EA\addtocommalist\@EA + {\currenttextreference}\glocalpublist}{}} + {}}% + {\exitloop}}% + \let\localpublist\glocalpublist} + +\def\typesetpubslist + {\dobeginoflist + \the\initializebibdefinitions + \edef\askedlevel{\csname \??li pubs\c!criterium\endcsname}% + \ifx\askedlevel\v!all + \def\bibrefprefix{}% + \else % + \preparebibrefprefix + \fi + \ifsortbycite + \filllocalpublist + \iftypesetall + \let\localallrefs\allrefs + \processcommacommand[\localpublist]\typesetapublication + \def\removefromallrefs##1% + {\removefromcommalist{##1}\localallrefs }% + \processcommacommand[\localpublist]\removefromallrefs + \processcommacommand[\localallrefs]\typesetapublication + \else + \processcommacommand[\localpublist]\typesetapublication + \fi + \else + \iftypesetall + \processcommacommand[\allrefs]\typesetapublication + \else + % + \filllocalpublist + \processcommacommand[\allrefs]\maybetypesetapublication + \fi + \fi + \doendoflist} + +\newif\ifinpublist + +\def\maybetypesetapublication#1% + {\global\inpublistfalse + \def\test{#1}% + \def\runtest##1% + {\def\tempa{##1}\ifx \test\tempa \global\inpublisttrue \fi}% + \processcommacommand[\localpublist]\runtest + \ifinpublist \typesetapublication{#1}\fi} + +\def\initializepubslist + {\edef\@@pbnumbering{\@@pbnumbering}% + \ifautohang + \ifx\@@pbnumbering\v!short + \setbox\scratchbox\hbox{\@@pbnumbercommand{\getvalue{\??li pubs\c!samplesize}}}% + \else\iftypesetall + \setbox\scratchbox\hbox{\@@pbnumbercommand{\getvalue{\??li pubs\c!totalnumber}}}% + \else + \setbox\scratchbox\hbox{\@@pbnumbercommand{\numreferred}}% + \fi\fi + \edef\samplewidth{\the\wd\scratchbox}% + \setuplist[pubs][\c!width=\samplewidth,\c!distance=0pt]% + \ifx\@@pbnumbering\v!short + \def\@@pblimitednumber##1{\hbox to \samplewidth + {\@@pbnumbercommand{\getvalue{pbds-\@@pbk}}}}% + \else \ifx \@@pbnumbering\v!bib + \def\@@pblimitednumber##1{\hbox to \samplewidth + {\@@pbnumbercommand{\getvalue{pbdn-\@@pbk}}}}% + \else + \def\@@pblimitednumber##1{\hbox to \samplewidth{\@@pbnumbercommand{##1}}}% + \fi \fi + \else + \ifx\@@pbnumbering\v!short + \doifemptyelse + {\getvalue{\??li pubs\c!width}} + {\def\@@pblimitednumber##1{\hbox + {\@@pbnumbercommand{\getvalue{pbds-\@@pbk}}}}}% + {\def\@@pblimitednumber##1{\hbox to \getvalue{\??li pubs\c!width}% + {\@@pbnumbercommand{\getvalue{pbds-\@@pbk}}}}}% + \else \ifx \@@pbnumbering\v!bib + \doifemptyelse + {\getvalue{\??li pubs\c!width}} + {\def\@@pblimitednumber##1{\hbox + {\@@pbnumbercommand{\getvalue{pbdn-\@@pbk}}}}}% + {\def\@@pblimitednumber##1{\hbox to \getvalue{\??li pubs\c!width}% + {\@@pbnumbercommand{\getvalue{pbdn-\@@pbk}}}}}% + \else + \doifemptyelse + {\getvalue{\??li pubs\c!width}} + {\def\@@pblimitednumber##1{\hbox{\@@pbnumbercommand{##1}}}}% + {\def\@@pblimitednumber##1{\hbox to \getvalue{\??li pubs\c!width}{\@@pbnumbercommand{##1}}}}% + \fi + \fi + \fi + \ifx\@@pbnumbering\v!no + \setuplist[pubs][\c!numbercommand=,\c!symbol=\v!none,\c!textcommand=\outdented]% + \else + \setuplist[pubs][\c!numbercommand=\@@pblimitednumber]% + \fi + \doifelsevalue + {\??pv data\c!maybeyear}{\v!off}{\def\maybeyear##1{}}{\def\maybeyear##1{##1}}% + \forgetall} % bugfix 2005/03/18 + +\def\outdented#1% move to supp-box ? + {\hskip -\hangindent #1} + +%D The full list of publications + +\def\completepublications + {\dosingleempty\docompletepublications} + +\def\bibdogetupsometextprefix#1#2#3% + {\ifcsname#2#1#3\endcsname + \csname#2#1#3\endcsname + \else\ifcsname\??la#1\c!default\endcsname + \@EA\ifx\csname\??la#1\c!default\endcsname\empty + \ifcsname#2#3\endcsname + \csname#2#3\endcsname + \else\ifcsname#2\s!en#3\endcsname + \csname#2\s!en#3\endcsname + \fi\fi + \else + \expandafter\bibdogetupsometextprefix + \csname\??la#1\c!default\endcsname{#2}{#3}% + \fi + \else + \ifcsname#2#3\endcsname + \csname#2#3\endcsname + \else\ifcsname#2\s!en#3\endcsname + \csname#2\s!en#3\endcsname + \fi\fi + \fi\fi} + +\def\docompletepublications[#1]% + {\begingroup + \setuplist[pubs][\c!criterium=\v!previous,#1] + \begingroup + \let\handletextprefix\firstoftwoarguments + \edef\headtextpubs{\bibdogetupsometextprefix\headlanguage\c!title{pubs}}% + \doifdefinedelse + {\??pv data\v!title} + {\doifemptyelsevalue + {\??pv data\v!title} + {\expanded{\systemsuppliedtitle[pubs]{\headtextpubs}}}% + {\expanded{\getvalue{\??pv data\v!title}{\headtextpubs}}}% + }% + {\expanded{\systemsuppliedtitle[pubs]{\headtextpubs}}}% + \endgroup + \dodoplacepublications } + +%D And the portion with the entries only. + +\def\placepublications + {\dosingleempty\doplacepublications} + +\def\doplacepublications[#1]% + {%\getparameters[\??pv data][#1] + \begingroup + \setuplist[pubs][\c!criterium=\v!previous,#1]% + \dodoplacepublications }% + +\def\dodoplacepublications% + {\initializepubslist + \doifelsevalue + {\??li pubs\c!option}{\v!continue}% + {}% + {\global\let\bibcounter\!!zerocount }% + \inpublisttrue + \typesetpubslist + \inpublistfalse + \endgroup} + +%D \subsubject{What's in a publication} + +\unexpanded\def\typesetapublication#1% + {\doifsomething{#1}{\doglobal\increment\bibcounter + \bgroup + \makepbkvalue{#1}% + \ifgridsnapping + \snaptogrid\vbox{\dodolistelement{pubs}{}{\bibcounter}% + {\expanded{\reference[\bibrefprefix#1]{\bibcounter}}% + \strut \dotypesetapublication{#1}\strut }{}{}}% + \else + \dodolistelement{pubs}{}{\bibcounter}% + {\expanded{\reference[\bibrefprefix#1]{\bibcounter}}% + \strut \dotypesetapublication{#1}\strut }{}{}% + \fi + \egroup }} + +\def\dotypesetapublication#1% + {\bgroup + \def\@@currentalternative{data}% + \processcommacommand[\bibcommandlist,crossref]\clearbibitem + \processcommalist [artauthor,author,editor]\clearbibitemtwo + \processcommacommand[\bibcommandlist]\bibitemdefs + \processcommalist [artauthor,author,editor,crossref]\bibitemdefs + \let\biblanguage\empty + \getvalue{pbdd-#1}% + \ifcsname pbdt-#1\endcsname \bibalternative{\getvalue{pbdt-#1}}\fi + \egroup } + +%D An afterthought: + +\def\maybeyear#1{} + +%D An another: + +\def\noopsort#1{} + +%D This is the result of bibtex's `language' field. + +\def\setbiblanguage#1#2{\setvalue{\??pb @lang@#1}{#2}} + +\def\lang#1% + {\def\biblanguage{#1}% + \ifcsname \??pb @lang@#1\endcsname + \expanded{\language[\getvalue{\??pb @lang@#1}]}% + \fi \ignorespaces} + +%D \subject{Citations} +%D +%D \macros{cite,bibref} +%D +%D The indirection with \type{\dobibref} allows \LATEX\ style +%D \type{\cite} commands with a braced argument (these might appear +%D in included data from the \type{.bib} file). + +\unexpanded\def\cite + {\doifnextcharelse{[} + {\dodocite} + {\dobibref}} + +\def\dobibref#1% + {\docite[#1][]} + +\def\dodocite[#1]% + {\startstrictinspectnextcharacter + \dodoubleempty\dododocite[#1]} + +\def\dododocite[#1][#2]{% + \stopstrictinspectnextcharacter + \docite[#1][#2]} + +\def\docite[#1][#2]% + {\begingroup + \setupinteraction[\c!style=]% + \edef\temp{#2}% + \ifx\empty\temp \secondargumentfalse + \else \secondargumenttrue \fi + \ifsecondargument + \processcommalist[#2]\docitation + \doifassignmentelse + {#1}% + {\getparameters[LO][\c!alternative=,\c!extras=,#1]% + \edef\@@currentalternative{\LOalternative}% + \ifx\@@currentalternative\empty + \edef\@@currentalternative{\@@citedefault}% + \fi + \ifx\LOextras\empty + \setupcite[\@@currentalternative][#1]% + \else + \expandafter\ifx\csname LOright\endcsname \relax + \edef\LOextras{{\LOextras\bibalternative\c!right}}% + \else + \edef\LOextras{{\LOextras\LOright}}% + \fi + \expanded{\setupcite[\@@currentalternative][#1,\c!right=\LOextras]}% + \fi + }% + {\def\@@currentalternative{#1}}% + \expanded{% + \processaction[\csname @@pv\@@currentalternative \c!compress\endcsname]} + [ \v!yes=>\bibcitecompresstrue, + \v!no=>\bibcitecompressfalse, + \s!default=>\bibcitecompresstrue, + \s!unknown=>\bibcitecompresstrue]% + \getvalue{bib\@@currentalternative ref}[#2]% + \else + \processcommalist[#1]\docitation + \expanded{\processaction[\csname @@pv\@@citedefault \c!compress\endcsname]} + [ \v!yes=>\bibcitecompresstrue, + \v!no=>\bibcitecompressfalse, + \s!default=>\bibcitecompresstrue, + \s!unknown=>\bibcitecompresstrue]% + \edef\@@currentalternative{\@@citedefault}% + \getvalue{bib\@@citedefault ref}[#1]% + \fi + \endgroup} + +%D \macros{nocite} + +\def\nocite[#1]% + {\processcommalist[#1]\addthisref + \processcommalist[#1]\docitation } + +%D \macros{setupcite} + +\def\setupcite{\dodoubleempty\dosetupcite} + +\def\dosetupcite[#1][#2]% + {\ifsecondargument + \def\dodosetupcite##1{\getparameters[\??pv##1][#2]}% + \processcommalist[#1]\dodosetupcite + \else % default case + \getparameters[\??pv\@@citedefault][#1]% + \fi } + +%D Low-level stuff + +\def\getcitedata#1[#2]#3[#4]#5to#6% + {\bgroup + \addthisref{#4}% + \dofetchapublication{#4}% + \doifdefinedelse{@@pb@bib#2}% + {\xdef#6{\getvalue{@@pb@bib#2}}}% + {\xdef#6{\getvalue{@@pb@#2}}}% + \egroup} + +\def\dofetchapublication#1% + {\makepbkvalue{#1}% + \processcommacommand[\bibcommandlist,crossref]\clearbibitem + \processcommalist [artauthor,author,editor]\clearbibitemtwo + \processcommacommand[\bibcommandlist]\bibitemdefs + \processcommalist [artauthor,author,editor,crossref]\bibitemdefs + \getvalue{pbdd-#1}} + +%D This new version writes a reference out to the tui file for every +%D \type{\cite}. This will allow backlinking. +%D +%D Some special care is needed so that references are not added from +%D weird locations like in the TOC or within a \type{\setbox} command. + +\newcounter\citationnumber + +\def\docitation#1{% + \iftrialtypesetting \else + \ifdoinpututilities\else + \doglobal\increment\citationnumber + \expanded{\rawreference{}{cite-\jobname-\citationnumber}{#1}}% + \fi \fi } + +%D \macros{numreferred,doifreferredelse,addthisref,publist} +%D +%D The interesting command here is \type{\addthisref}, which maintains +%D the global list of references. +%D +%D \type{\numreferred} is needed to do automatic calculations on +%D the label width, and \type{\doifreferredelse} will be used +%D to implement \type{criterium=cite}. + +\newcounter\numreferred + +\long\def\doifreferredelse#1{\doifdefinedelse{pbr-#1}} + +\def\addthisref#1% + {\doifundefinedelse{pbr-#1} + {\setxvalue{pbr-#1}{\citationnumber}% + \doglobal\increment\numreferred + \ifx\publist\empty \gdef\publist{#1}\else\appended\gdef\publist{,#1}\fi} + {\setxvalue{pbr-#1}{\getvalue{pbr-#1},\citationnumber}}} + +\let\publist\empty + +%D \macros{doifbibreferencefoundelse} +%D +%D Some macros to fetch the information provided by +%D \type{\startpublication}. + +\def\doifbibreferencefoundelse#1#2#3% + {\doifdefinedelse{pbdk-#1} + {#2} + {\showmessage\m!publications{5}{#1 is unknown}#3}} + +%D \macros{ixbibauthoryear,thebibauthors,thebibyears} +%D +%D If compression of \type{\cite}'s argument expansion is on, +%D the macros that deal with authors and years call this internal +%D command to do the actual typesetting. +%D +%D Two entries with same author but with different years may +%D be condensed into ``Author (year1,year2)''. This is about the +%D only optimization that makes sense for the (author,year) +%D style of citations (years within one author have to be unique +%D anyway so no need to test for that, and ``Author1, Author2 (year)'' +%D creates more confusion than it does good). +%D +%D In the code below, +%D the macro \type{\thebibauthors} holds the names of the alternative +%D author info fields for the current list. This is a commalist, +%D and \type{\thebibyears} holds the (collection of) year(s) that go with +%D this author (possibly as a nested commalist). +%D +%D There had better be an author for all cases, but there +%D does not have to be year info always. \type{\thebibyears} is +%D pre-initialized because this makes the insertion macros simpler. +%D +%D In `normal' \TeX, of course there are expansion problems again. + +\def\ixbibauthoryear#1#2#3#4% + {\bgroup + \gdef\ixlastcommand {#4}% + \gdef\ixsecondcommand{#3}% + \gdef\ixfirstcommand {#2}% + \glet\thebibauthors \empty + \glet\thebibyears \empty + \getcommalistsize[#1]% + \ifbibcitecompress + \dorecurse\commalistsize{\xdef\thebibyears{\thebibyears,}}% + \processcommalist[#1]\docompressbibauthoryear + \else + \processcommalist[#1]\donormalbibauthoryear + \fi + \egroup + \dobibauthoryear} + +%D \macros{dodobibauthoryear} +%D +%D This macro only has to make sure that the lists +%D \type{\thebibauthors} and \type{\thebibyears} are printed. + +\def\dobibauthoryear + {\scratchcounter\zerocount + \getcommacommandsize[\thebibauthors]% + \edef\authorcount{\commalistsize}% + \@EA\processcommalist\@EA[\thebibauthors]\dodobibauthoryear} + +\def\dodobibauthoryear#1% + {\advance\scratchcounter\plusone + \edef\wantednumber{\the\scratchcounter}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \@EA\def\@EA\currentbibyear\@EA{\commalistelement}% + \setcurrentbibauthor{#1}% + \ifnum\scratchcounter=\plusone + \ixfirstcommand + \else\ifnum \scratchcounter=\authorcount\relax + \ixlastcommand + \else + \ixsecondcommand + \fi\fi} + +\def\setcurrentbibauthor#1% + {\getcommacommandsize[#1]% + \ifcase\commalistsize + % anonymous? + \def\currentbibauthor{}% + \or + \def\currentbibauthor{#1}% + \or + \expanded{\docurrentbibauthor#1}% + \else + \handlemultiplebibauthors{\commalistsize}{#1}% + \fi } + +\newcount\citescratchcounter + +\def\handlemultiplebibauthors#1#2% + {\citescratchcounter 0 + \def\currentbibauthor{}% + \def\bibprocessauthoritem##1% + {\advance\citescratchcounter1 + \ifnum \citescratchcounter=#1\relax + \edef\currentbibauthor{\currentbibauthor##1}% + \else \ifnum\numexpr\citescratchcounter+1 = #1\relax + \edef\currentbibauthor{\currentbibauthor ##1\bibalternative{andtext}}% + \else + \edef\currentbibauthor{\currentbibauthor ##1\bibalternative{namesep}}% + \fi + \fi }% + \processcommalist[#2]\bibprocessauthoritem } + +\setupcite + [author,authoryear,authoryears] + [\c!namesep={, }] + +%D This discovery of authoretallimit is not the best one, +%D but it will do for now. + +\def\docurrentbibauthor#1,#2% + {\doifemptyelse{#2} + {\def\currentbibauthor{#1\bibalternative{otherstext}}} + {\@EA + \ifx\csname \??pv\@@currentalternative authoretallimit\endcsname\relax + \edef\currentbibauthor{#1\bibalternative{andtext}#2}% + \else + \edef\currentbibauthor{#1% + \ifcase0\bibalternative{authoretallimit}\relax\or + \bibalternative{otherstext}\else\bibalternative{andtext}#2\fi}% + \fi}} + +%D This is not the one Hans made for me, because I need a global +%D edef, and the \type{\robustdoifinsetelse} doesn't listen to +%D \type{\doglobal } + +\def\robustaddtocommalist#1#2% {item} \cs + {\robustdoifinsetelse{#1}#2\resetglobal + {\dodoglobal\xdef#2{\ifx#2\empty\else#2,\fi#1}}} + +%D \macros{donormalbibauthoryear} +%D +%D Now we get to the macros that fill the two lists. +%D The `simple' one really is quite simple. + +\def\donormalbibauthoryear#1% + {\addthisref{#1}% + \def\myauthor{Xxxxxxxxxx}% + \def\myyear{0000}% + \doifbibreferencefoundelse{#1} + {\def\myauthor{{\getvalue{pbda-#1}}}% + \def\myyear {\getvalue{pbdy-#1}}}% + {}% + \@EA\doglobal\@EA\appendtocommalist\@EA{\myauthor}\thebibauthors + \@EA\doglobal\@EA\appendtocommalist\@EA{\myyear }\thebibyears} + +%D \macros{docompressbibauthoryear} +%D +%D So much for the easy parts. Nothing at all will be done if +%D the reference is not found or the reference does not contain +%D author data. No questions marks o.s.s. (to be fixed later) + +\def\docompressbibauthoryear#1% + {\addthisref{#1}% + \def\myauthor{Xxxxxxxxxx}% + \def\myyear {0000}% + \doifbibreferencefoundelse{#1} + {\xdef\myauthor{\csname pbda-#1\endcsname }% + \xdef\myyear {\csname pbdy-#1\endcsname }} + {}% + \ifx\myauthor\empty\else + \checkifmyauthoralreadyexists + \findmatchingyear + \fi} + +%D two temporary counters. One of these two can possibly be replaced +%D by \type{\scratchcounter}. + +\newcount\bibitemcounter +\newcount\bibitemwanted + +%D The first portion is simple enough: if this is the very first author +%D it is quite straightforward to add it. \type{\bibitemcounter} and +%D \type{\bibitemwanted} are needed later to insert the year +%D information in the correct item of \type{\thebibyears} + +\def\checkifmyauthoralreadyexists + {\doifemptyelsevalue{thebibauthors} + {\global\bibitemwanted \plusone + \global\bibitemcounter \plusone + \xdef\thebibauthors{{\myauthor}}} + {% the next weirdness is because according to \getcommalistsize, + % the length of \type{[{{},{}}]} is 2. + \@EA\getcommalistsize\@EA[\thebibauthors,]% + \global\bibitemcounter\commalistsize + \global\advance\bibitemcounter\minusone + \global\bibitemwanted \zerocount + \processcommacommand[\thebibauthors]\docomparemyauthor}} + +%D The outer \type{\ifnum} accomplishes the addition of +%D a new author to \type{\thebibauthors}. The messing about with +%D the two counters is again to make sure that \type{\thebibyears} +%D will be updated correctly.If the author {\it was} found, +%D the counters will stay at their present values and everything +%D will be setup properly to insert the year info. + +\def\docomparemyauthor#1% + {\global\advance\bibitemwanted \plusone + \def\mytempc{#1}% +% \message{authors: \myauthor <=>\mytempc \ifx\mytempc\myauthor :Y \else :N +% \meaning \myauthor, \meaning\mytempc\fi (\the\bibitemwanted = \the\bibitemcounter)}% + \ifx\mytempc\myauthor + \quitcommalist + \else + \ifnum\bibitemwanted = \bibitemcounter\relax + \global\advance\bibitemwanted \plusone + \global\bibitemcounter\bibitemwanted\relax + \@EA\doglobal\@EA\robustaddtocommalist\@EA{{\myauthor}}\thebibauthors + \fi + \fi} + +%D This macro should be clear now. + +\def\findmatchingyear + {\edef\wantednumber{\the\bibitemwanted}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \ifx\commalistelement\empty + \edef\myyear{{\myyear}}% + \else + \edef\myyear{{\commalistelement, \myyear}}% + \fi + \edef\newcommalistelement{\myyear}% + \doglobal\replaceincommalist \thebibyears \wantednumber} + +%D \macros{preparebibrefprefix} +%D +%D The reference list only writes bare references when the criterium +%D is `all'. Otherwise, a prefix is added to make sure that pdfTeX +%D does not encounter duplicate named references. On the generation +%D side, this is not a big problem. \type{\preparebibrefprefix} +%D creates a suitable string to prepend if a prefix is needed. +%D +%D Because this macro is used within \type{\cite } that itself +%D can be used within lists like the table of contents, it needs +%D to save and restore \type{\savedalltoclevels} and +%D \type{\currentlevel} (\type{\dosetfilterlevel} needs to change +%D their values globally). + +\def\preparebibrefprefix + {\chardef\savedalltoclevels \alltoclevels + \let\savedcurrentlevel\currentlevel + \let\dosetfilterlevel\patcheddosetfilterlevel + \dosettoclevel\??li{pubs}% + \edef\bibrefprefix{\@@sectiontype\currentlevel\sectionseparator}% + \let\dosetfilterlevel\normaldosetfilterlevel + \global\let\currentlevel\savedcurrentlevel + \global\chardef\alltoclevels \savedalltoclevels } + +%D \macros{preparebibreflist} +%D +%D But this optional prefixing is a bit of a problem on the +%D other side. We would like to do \type{\goto{}[article-full]} +%D but can't do it like that, because the actual label may be +%D \type{1:2:0:3:4:article-full]} or so. The problem is solved +%D by building a commalist that looks like this: +%D \starttyping +%D \def\bibreflist% +%D {1:2:0:3:4:article-full, +%D 1:2:0:3:article-full, +%D 1:2:0:article-full, +%D 1:2:article-full, +%D 1:article-full, +%D article-full} +%D \stoptyping + +\def\preparebibreflist#1% + {\let\bibreflist\empty + \def\storeitem##1% + {\ifx\bibreflist\empty + \edef\prefix{##1\sectionseparator}% + \edef\bibreflist{\prefix#1,#1}% + \else + \edef\prefix{\prefix##1\sectionseparator}% + \edef\bibreflist{\prefix#1,\bibreflist}% + \fi}% + \expanded{\processseparatedlist[\bibrefprefix][\sectionseparator]}\storeitem } + +%D \macros{gotobiblink,inbiblink,atbiblink} +%D +%D The final task is looping over that list until a match is found. + +\newif\ifbibreffound + +\def\gotobiblink#1[#2]% + {\bgroup + \preparebibrefprefix + \preparebibreflist{#2}% + \global\bibreffoundfalse + \def\setuplink##1% + {\ifbibreffound\else + \doifreferencefoundelse + {##1} + {\global\bibreffoundtrue \goto{#1}[##1]}% + {}\fi}% + \processcommacommand[\bibreflist]\setuplink + \ifbibreffound \else \unknownreference{#2}\fi + \egroup } + +\def\atbiblink[#1]% + {\bgroup + \preparebibrefprefix + \preparebibreflist{#1}% + \global\bibreffoundfalse + \def\setuplink##1% + {\ifbibreffound\else + \doifreferencefoundelse + {##1} + {\global\bibreffoundtrue \at[##1]}% + {}\fi}% + \processcommacommand[\bibreflist]\setuplink + \ifbibreffound \else \unknownreference{#1}\fi + \egroup } + +\def\inbiblink[#1]% + {\bgroup + \preparebibrefprefix + \preparebibreflist{#1}% + \global\bibreffoundfalse + \def\setuplink##1% + {\ifbibreffound\else + \doifreferencefoundelse + {##1} + {\global\bibreffoundtrue \in[##1]}% + {}\fi}% + \processcommacommand[\bibreflist]\setuplink + \ifbibreffound \else \unknownreference{#1}\fi + \egroup } + +%D \macros{bibauthoryearref,bibauthoryearsref,bibauthorref,bibyearref} +%D +%D Now that all the hard work has been done, these are simple. +%D \type{\ixbibauthoryearref} stores the data in the macros +%D \type{\currentbibauthor} and \type{\currentbibyear}. + +\def\ifbibinteractionelse% + {\iflocation + \edef\test{\bibalternative\c!interaction}% + \ifx\test\v!stop + \@EA\@EA\@EA\secondoftwoarguments + \else + \@EA\@EA\@EA\firstoftwoarguments + \fi + \else + \@EA\secondoftwoarguments + \fi + } + +\def\bibmaybeinteractive#1#2% + {\ifbibcitecompress #2\else + \ifbibinteractionelse{\gotobiblink{#2}[#1]}{#2}\fi } + +\def\bibauthoryearref[#1]% + {\ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left{\currentbibyear}\bibalternative\v!right}} + {\bibalternative\c!pubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left {\currentbibyear}\bibalternative\v!right}} + {\bibalternative\c!lastpubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left {\currentbibyear}\bibalternative\v!right}}} + +\def\bibauthoryearsref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1} + {\bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}} + {\bibalternative\c!pubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}} + {\bibalternative\c!lastpubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}}% + \bibalternative\v!right} + +\def\bibauthorref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibauthor}}} + {\bibalternative\c!pubsep \bibmaybeinteractive{#1}{{\currentbibauthor}}} + {\bibalternative\c!lastpubsep\bibmaybeinteractive{#1}{{\currentbibauthor}}}% + \bibalternative\v!right} + +\def\bibyearref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibyear}}} + {\bibalternative\c!pubsep \bibmaybeinteractive{#1}{{\currentbibyear}}} + {\bibalternative\c!lastpubsep\bibmaybeinteractive{#1}{{\currentbibyear}}}% + \bibalternative\v!right} + +%D ML problems: + +%D \macros{bibshortref,bibkeyref,bibpageref,bibtyperef,bibserialref} +%D +%D There is hardly any point in trying to compress these. The only +%D thing that needs to be done is making sure that +%D the separations are inserted correctly. And that is +%D what \type{\refsep} does. + +\newif\iffirstref + +\def\refsep{\iffirstref\firstreffalse\else\bibalternative\c!pubsep\fi} + +\def\bibshortref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibshortref + \bibalternative\v!right} + +\def\dobibshortref#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\gotobiblink{\getvalue{pbds-#1}}[#1]} + {\unknownreference{#1}}} + + +\def\bibserialref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibserialref + \bibalternative\v!right} + +\def\dobibserialref#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\gotobiblink{\getvalue{pbdn-#1}}[#1]} + {\unknownreference{#1}}} + +\def\bibkeyref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibkeyref + \bibalternative\v!right} + +\def\dobibkeyref#1% + {\addthisref{#1}\refsep\gotobiblink{#1}[#1]} + +\def\gotoDOI#1#2% + {\ifbibinteractionelse + {\useURL[bibfooDoi#1][#2]% + \useURL[bibfoo#1][http://dx.doi.org/#2]% + \goto{\url[bibfooDoi#1]}[url(bibfoo#1)]} + {\hyphenatedurl{#2}}} + +\def\bibdoiref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibdoiref + \bibalternative\v!right} + +\def\dobibdoiref#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\expanded{\gotoDOI{#1}{\getvalue{pbdo-#1}}}} + {\unknownreference{#1}}} + +\def\biburlref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobiburlref + \bibalternative\v!right} + +\def\gotoURL#1#2% + {\ifbibinteractionelse + {\useURL[bibfoo#1][#2]\goto{\url[bibfoo#1]}[url(bibfoo#1)]} + {\hyphenatedurl{#2}}} + +\def\dobiburlref#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\expanded{\gotoURL{#1}{\getvalue{pbdu-#1}}}} + {\unknownreference{#1}}} + +\def\bibtyperef[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibtyperef + \bibalternative\v!right} + +\def\dobibtyperef#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\gotobiblink{\getvalue{pbdt-#1}}[#1]} + {\unknownreference{#1}}} + +\def\bibpageref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibpageref + \bibalternative\v!right} + +\def\dobibpageref#1% + {\addthisref{#1}\refsep + \ifbibinteractionelse{\atbiblink[#1]}{{\referencingfalse\at[#1]}}} + +\def\bibdataref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibdata + \bibalternative\v!right} + +\def\dobibdata#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\dotypesetapublication{#1}} + {\unknownreference{#1}}} + +\let\bibnoneref\nocite + +%D \macros{bibnumref} +%D +%D It makes sense to try and compress the argument list of +%D \type{\bibnumref}. There are two things involved: the actual +%D compression, and a sort routine. The idea is to store the +%D found values in a new commalist called \type{\therefs}. + +%D But that is not too straight-forward, because \type{\in} is +%D not expandable, +%D so that the macro \type{\expandrefs} is needed. + +\def\expandrefs#1% + {\bgroup + \preparebibrefprefix + \preparebibreflist{#1}% + \global\bibreffoundfalse + \def\setuplink##1% + {\ifbibreffound\else + \doifreferencefoundelse + {##1} + {\global\bibreffoundtrue + \@EA\doglobal\@EA\addtocommalist\@EA{\reftypet}\therefs }% + {}\fi}% + \processcommacommand[\bibreflist]\setuplink + \ifbibreffound \else \showmessage\m!publications{5}{#1 unknown}% + \doglobal\addtocommalist{0}\therefs\fi + \egroup } + +%D But at least the actual sorting code is simple (note that sorting +%D a list with exactly one entry fails to return anything, which +%D is why the \type{\ifx} is needed). + +\def\bibnumref[#1]% + {\bibalternative\v!left + \penalty\!!tenthousand + \processcommalist[#1]\addthisref + \firstreftrue + \ifbibcitecompress + \glet\therefs\empty + \processcommalist[#1]\expandrefs + \sortcommacommand[\therefs]\donumericcompare + \ifx\empty\sortedcommalist\else + \let\therefs\sortedcommalist + \fi + \compresscommacommandnrs[\therefs]% + \processcommacommand[\compressedlist]\verysimplebibnumref + \else + \processcommalist[#1]\dosimplebibnumref + \fi + \bibalternative\v!right} + +\def\dosimplebibnumref #1% + {\refsep\ifbibinteractionelse + {\inbiblink[#1]}{{\referencingfalse\inbiblink[#1]}}} + +\def\verysimplebibnumref#1{\doverysimplebibnumref#1} + +\def\doverysimplebibnumref#1#2% + {\refsep + \ifcase#1\relax \unknownreference{#1}\else + \def\tempa{#2}\ifx\empty\tempa#1\else#1\bibalternative\c!inbetween#2\fi + \fi} + +%D By request from Sanjoy. This makes it easier to implement +%D \type{\citeasnoun}. + +\def\bibauthornumref[#1]% + {\getcommalistsize[#1]% + \global\bibitemcounter\commalistsize + \firstreftrue + \processcommalist[#1]\dobibauthornumref } + +\def\dobibauthornumref#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1} + {\getvalue{pbda-#1}% + \bibalternative\c!inbetween + \bibalternative\v!left + \ifbibinteractionelse{\inbiblink[#1]} + {{\referencingfalse\inbiblink[#1]}}% + \bibalternative\v!right} + {\unknownreference{#1}}} + +%D And some defaults are loaded from bibl-apa: + +\setuppublications + [\v!month\v!conversion=, + \c!alternative=apa] + +\appendtoks + \preloadbiblist +\to \everystarttext + +\protect \endinput diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv new file mode 100644 index 000000000..30211fcad --- /dev/null +++ b/tex/context/base/bibl-tra.mkiv @@ -0,0 +1,1498 @@ +%D \module +%D [ file=bibl-tra, +%D version=2009.08.22, +%D title=\CONTEXT\ Publication Module, +%D subtitle=Publications, +%D author=Taco Hoekwater, +%D date=\currentdate, +%D copyright=Public Domain] +%C +%C Donated to the public domain. + +%D This module has been adapted to \MKIV\ by Hans Hagen so if things go wrong, +%D he is to blame. The changes concern references and lists but teh rendering +%D itself is unchanged. Future versions might provide variants as we have plans +%D for an upgrade. +%D +%D We use a still somewhat experimental extension to the list +%D mechanism. Eventually the bibtex module will use the bibl loader +%D and access the data by means of lpath expressions. In that case we +%D don't need to process the bibliography but still need to track +%D usage as done here. +%D +%D A bit ongoing: make more local macros prefixed with bib, i.e. the bib +%D namespace is reserved. + +\writestatus{loading}{ConTeXt Bibliography Support / BibTeX} + +\definefilesynonym[bib][obsolete] + +\registerctxluafile{bibl-tra}{1.001} + +%D The original was developed independantly by Taco Hoekwater while still working for Kluwer +%D Academic publishers (it still used the dutch interface then). Development continued after +%D he left Kluwer, and in Januari 2005, the then already internationalized file was merged +%D with the core distribution by Hans Hagen. The current version is once again by Taco. +%D +%D More documentation and additional resources can be found on the contextgarden: +%D \hyphenatedurl{http://wiki.contextgarden.net//Bibliography}. + +%D \subject{DONE (dd/mm/yyyy)} +%D +%D \startitemize +%D \item add author definition (and associated system variable) (26/05/2005) +%D \item add finalnamesep support for Oxford comma (17/09/2005) +%D \item add \type{\insert...} for: doi, eprint, howpublished (19/09/2005) +%D \item allow a defaulted \type{\setupcite} (19/11/2005) +%D \item renamed citation type 'number' to 'serial' (19/11/2005) +%D \item better definition of \type{\inverted...author} (19/11/2005) +%D \item don't reset [numbercommand] in \type {\setuppublication} by default (20/11/2005) +%D \item don't disable other \type {\setuppublication} keys if alternative is present (20/11/2005) +%D \item drop \type{\sanitizeaccents} (20/11/2005) +%D \item added \type{\nocite} and \type{\cite[none]} (21/11/2005) +%D \item added headtext for it (23/11/2005) +%D \item make \type{\cite[url]} and \type{\cite[doi]} interactive (23/11/2005) +%D \item make right-aligned labels in the list work even when autohang=no +%D \item use 'et al.' instead of 'et.al.'. Pointed out by Peter M�nster (30/12/2005) +%D \item added headtext for cz (31/12/2005) +%D \item Keep whitespace after \type{\cite} with single argument (31/12/2005) +%D \item Fix broken \type{\cite{}} support (31/12/2005) +%D \item Use \type{\readfile} inside \type{\usepublications} instead of \type{\readsysfile} (12/01/2006) +%D \item Use \type{\currentbibyear} and \type{\currentbibauthor} instead of \type{\YR} and \type{\AU} (05/02/2006) +%D \item Fix compressed version of authoryear style (05/02/2006) +%D \item Rename the clashing data fields \type{\url} and \type{\type} to \type{\biburl} and \type{\bibtype} (05/02/2006) +%D \item Added two french bibl files from Renaud Aubin (06/02/2006) +%D \item Five new bib class and eight extra bib fields, for IEEEtran (07/02/2006) +%D \item French keyword translation, provided by Renaud (08/02/2006) +%D \item fix underscores in undefined keys (22/02/2006) +%D \item Destroy interactivity in labels of the publication list (13/03/2006) +%D \item fix multi-cite list compression (11/4/2006) +%D \item fix \type{\getcitedata} (11/4/2006) +%D \item magic for chapter bibs (18-25/4/2006) +%D \item language setting (25/4/2006) +%D \item use \type{\hyphenatedurl} for \type{\inserturl} (25/4/2006) +%D \item Add \type{\docitation} to \type{\nocite}(26/4/2006) +%D \item patents can have numbers, added to bst files (26/4/2006) +%D \item \type{\docitation} needs a \type{\iftrialtypesetting} (27/4/2006) +%D \item \type{\filllocalpublist}'s loop is bound by definedness, not resolvedness (27/4/2006) +%D \item \type{\setuppublications[monthconversion=]} added (15/5/2006) +%D \item use \type{\undefinedreference} instead of bare question marks (15/5/2006) +%D \item add grouping around \type{\placepublications} commands (16/5/2006) +%D \item fix a bug in \type{\cite{<item>}} (17/5/2006) +%D \item support \type{\cite[authornum]} (18/5/2006) +%D \item make \type{\cite} unexpandable (20/6/2006) +%D \item allow hyperlinks in author\&year combo's +%D (cite list compression has to be off) (20/6/2006) +%D \item fix duplicate labels for per-chapter style (20/6/2006) +%D \item allow \type{\setupcite[interaction=(start|stop)]} +%D \item fix the item number in the publication list with 'numbering=yes' (22/6/2006) +%D \item make the default criterium for \type{\placepublications} be \type{previous} (23/6/2006) +%D \item fix \type{\normalauthor} and \type{\normalshortauthor} spacing (29/6/2006) +%D \item do not typeset empty arguments to \type{\typesetapublication} (29/6/2006) +%D \item add \type{symbol=none} to \type{\setuplist} in unnumbered +%D mode to prevent typesetting of bare numbers (29/6/2006) +%D \item remove two incorrect spaces from bibl-num.tex (1/7/2006) +%D \item reset font styles within \type{\cite}, so that font switches +%D in \type{left} stay in effect (12/7/2006) +%D \item guard added against loading bbl files multiple times (13/7/2006) +%D \item fix \type{\cite[num]} with compression is on. (14/7/2006) +%D \item test \type{\iflocation} before deciding to use the +%D interactive version of cite (18/7/2006) +%D \item support \type{\setupcite[authoretallimit=1]} (18/7/2006) +%D \item support use of \type{\cite} within titles and captions by +%D saveguarding the list item extraction and reference placement +%D code (19/7/2006) +%D \item support \type{\setuppublicationlist[title=\chapter]} (4/8/2006) +%D \item use the expansion of \type{\headtext{pubs}} (4/8/2006) +%D \item hook added for repeated authors in publication list +%D \type{\setuppublicationlist[artauthorcommand=\mythreeargscommand]} +%D (4/8/2006) +%D \item make the bracketed arguments of \type{\artauthor}, \type{\author} +%D and \type{\editor} (bbl commands) optional (4/8/2006) +%D \item the constants \type{sorttype}, \type{compress} and +%D \type{autohang} have moved to the core (8/8/2006) +%D \item bibtex is now registered as a program to be run by texexec (8/8/2006) +%D \item fix a bug in \type{\setupcite[authoretallimit=1]} (9/8/2006) +%D \item fix a bug inside citations that prevented lastpubsep from ever being +%D used due to a volatile \type{\commalistsize} (25/8/2006). +%D \item added the possibility of \type{\placepublications[option=continue]} +%D (6/9/2006) +%D \item Mojca translated Master's Thesis to Masterarbeit (bibl-apa-de.tex) +%D (12/9/2006) +%D \item Added \type{\setuppublicationlist[maybeyear=off]} by request from +%D Thomas Schmitz (15/9/2006) +%D \item Removed some spurious spaces pointed out by willi egger (19/9/2006) +%D \item Add configuration of bibtex executable name (4/11/2006) +%D \item Fix numbering=short and numbering=bib (spotted by Matthias W�chter) (4/11/2006) +%D \item third attempt to get a correct release (5/11/2006) +%D \item fix a few missing dots in bibl-num.tex (7/12/2006) +%D \item Patch for DOI's by Tobias Burnus (17/4/2007) +%D \item Patch for \type{\insertbiburl} and \type{\insertdoi} for Tobias Burnus (18/4/2007) +%D \item Added a missing \type{\relax} in \type{\dospecialbibinsert}, +%D that made the space before the {\it et al.} text disappear. (18/4/2007) +%D \item Attempt to fix percent signs in bbl files. As a side-effect, +%D this prohibits comments in \tex{startpublication} blocks! (17/4/2008) +%D \item Patch from Matthias W\"achter that allows arbitrary .bst +%D files to be used with \tex{setupbibtex} (25/9/2008) +%D \item Extended for the new multilingual setups for the Oct 2008 current of ConTeXt (23/10/2008) +%D \item Multilingual setups needed another fix (27/10/2008) +%D \item Two fixes for bibl-apa by Michael Green (27/10/2008) +%D \item Catalan translation of 'References' (10/11/2008) +%D \item 'chapter' -> 'chapitre' in bibl-apa-fr (27/11/2008) +%D \item Run bibtex via os.execute in mkiv modee (01/12/2008) +%D \item Small correction in bibl-apa's placement of volume +%D information in articles (05/01/2009) +%D \item Handle multi-author (more than two) cases in \type{\cite} +%D (02/03/2009) +%D \item Suppress a syntax error in \type{cont-xp} mode. The output is +%D probably not right, though (02/03/2009) +%D \item Added a \tex{loadmarkfile} at the end, and two new files +%D from Hans. The \type{t-bib.mkiv} is needed to make the module +%D work with the new structure code (17/04/2009) +%D \item Added a patch to \type{t-bib.mkiv} from Hans to make the +%D cross referencing between multiple citations an +%D bibliographies work (27/04/2009) +%D \item Remove a superfluous \type{\unprotect} in t-bib.mkiv (11/05/2009). +%D \item Patch of incollection in bibl-ams.tex from Xan (08/06/2009). +%D \item Patch of unpublished in bibl-ams.tex from Xan (22/07/2009). +%D \item Modified \type{\bibdogetupsometextprefix} so it works for undefined +%D language labels, from Hans (13/08/2009). +%D \item Adapt referencing and list insertion to \MKIV. Update some code +%D to the latest \CONTEXT. Change some names in order to avoid conflicts +%D with existing core names (like \type {\insertpages}). +%D \item All constants, variables, message etc.\ are now in the core. +%D \item Added: method=local|global (when global, previous shown entries are +%D not shown again. +%D \stopitemize +%D +%D \subject{WISHLIST} +%D +%D \startitemize +%D \item link back from publication list to citation +%D \item export \type {\citation{<cited item>}} +%D \item support mlbibtex +%D \item don't load the whole lot, but filter entries instead +%D \item 9 vs 10, 19 vs 20 ... prevent extra runs when only subtle changes in wd of reference +%D \stopitemize + +\unprotect + +\def\biblistname{pubs} % for compatibility + +\definelist + [pubs] + +\setuplist + [pubs] + [\c!state=\s!start, + \c!width=] + +\installstructurelistprocessor{pubs:userdata}% + {\ctxlua{bibtex.hacks.add(structure.lists.uservalue("\currentlist",\currentlistindex,"bibref"),\currentlistindex)}} + +\newcount\bibtexblock \bibtexblock\plusone + +%D \macros{bibdoif,bibdoifnot,bibdoifelse} +%D +%D Here are a few small helpers that are used a lot in all the typesetting commands +%D (\type{\bibinsert...}) we will encounter later. + +\long\def\bibdoifelse#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\secondoftwoarguments + \else + \expandafter\firstoftwoarguments + \fi} + +\long\def\bibdoifnot#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\firstofoneargument + \else + \expandafter\gobbleoneargument + \fi} + +\long\def\bibdoif#1% + {\@EA\def\@EA\!!stringa\@EA{#1}% + \ifx\!!stringa\empty + \expandafter\gobbleoneargument + \else + \expandafter\firstofoneargument + \fi} + +%D Unfortunately, \BIBTEX\ is not the best configurable program +%D around. The names of the commands it parses as well as the \type{.aux} +%D extension to the file name are both hardwired. +%D +%D This means \CONTEXT\ has to write a \LATEX-style auxiliary file, yuk! +%D The good news is that it can be rather short. We'll just ask +%D \BIBTEX\ to output the entire database(s) into the \type{bbl} file. +%D +%D The \type{\bibstyle} command controls how the \type{bbl} file will +%D be sorted. The possibilities are: +%D +%D \startitemize[packed] +%D \item by author (+year, title): cont-au.bst +%D \item by title (+author, year): cont-ti.bst +%D \item by short key as in abbrev.bst: cont-ab.bst +%D \item not sorted at all: cont-no.bst +%D \stopitemize + +\newtoks\everysetupbibtex + +\def\setupbibtex + {\dosingleempty\dosetupbibtex} + +\def\dosetupbibtex[#1]% + {\let\@@pbdatabase\empty + \getparameters[\??pb][#1]% + \the\everysetupbibtex} + +\def\installbibtexsorter#1#2% + {\setvalue{\??pb:\c!sort:#1}{#2}} + +\installbibtexsorter\v!no {no} +\installbibtexsorter\v!author {au} +\installbibtexsorter\v!title {ti} +\installbibtexsorter\v!short {ab} +\installbibtexsorter\empty {no} +\installbibtexsorter\s!default{no} + +\def\thebibtexsorter{\executeifdefined{\??pb:\c!sort:\@@pbsort}\@@pbsort} + +\appendtoks + \ifx\@@pbdatabase\empty\else + \doifmode{*\v!first}{\ctxlua{bibtex.hacks.process { style="\thebibtexsorter", database="\@@pbdatabase" }}}% + \fi +\to \everysetupbibtex + +\setupbibtex + [\c!sorttype=\v!cite, + \c!sort=no] + +%D \macros{iftypesetall,ifbibcitecompress} +%D +%D The module needs some new \type{\if} statements. + +\newtoks\everysetuppublications + +\def\setuppublications + {\dosingleargument\dosetuppublications} + +\def\dosetuppublications[#1]% + {\getparameters[\??pb][\c!alternative=,#1]% + \doifsomething\@@pbalternative + {\readsysfile{bibl-\@@pbalternative.tex} + {\showmessage\m!publications{6}{bibl-\@@pbalternative}} + {\showmessage\m!publications{1}{bibl-\@@pbalternative}}% + \let\@@pbalternative\empty}% + \getparameters[\??pb][#1]% as bibl-* can have set things back + \the\everysetuppublications} + +%D We can omit already shown references (\v!global) or use fresh +%D lists each time (\v!local). + +\chardef\bibtexoncemode\plusone % 0=disable, 1=local, 2=global + +\appendtoks + \doifelse\@@pbmethod\v!local + {\chardef\bibtexoncemode\plusone}% + {\chardef\bibtexoncemode\plustwo}% +\to \everysetuppublications + +%D Cite lists are compressed, if possible. This is set later on. + +\newif\ifbibcitecompress\bibcitecompresstrue + +\appendtoks + \processaction + [\@@pbnumbering] + [ \v!yes=>\let\@@pbinumbercommand\firstofoneargument, + \v!no=>\let\@@pbinumbercommand\gobbleoneargument, + \v!short=>\def\@@pbinumbercommand##1{\bibgetvars\currentpublicationkey}, + \v!bib=>\def\@@pbinumbercommand##1{\bibgetvarn\currentpublicationkey}, + \s!unknown=>\let\@@pbinumbercommand\firstofoneargument]% +\to \everysetuppublications + +\appendtoks + \processaction + [\@@pbrefcommand] + [\s!default=>\edef\@@citedefault{\@@pbrefcommand}, + \s!unknown=>\edef\@@citedefault{\@@pbrefcommand}]% +\to \everysetuppublications + +\def\bibleftnumber#1{#1\hfill~} + +%D \macros{usepublications} +%D +%D We need \type{\usereferences} so that it is possible to +%D refer to page and/or appearance number for publications +%D in the other document. + +\def\usepublications[#1]% + {\usereferences[#1]\processcommalist[#1]\dousepublications} + +\def\dousepublications#1% + {\doonlyonce{#1.\f!bibextension} + {\readfile{#1.\f!bibextension} + {\showmessage\m!publications{4}{#1.\f!bibextension}} + {\showmessage\m!publications{2}{#1.\f!bibextension}}}} + +%D \macros{setuppublicationlist} +%D +%D This will be the first command in (\BIBTEX-generated) \type{bbl} +%D files. `samplesize' is a sample value (in case of \BIBTEX-generated +%D files, this will be the longest `short' key). `totalnumber' +%D is the total number of entries that will follow in this +%D file. +%D +%D Both values are only needed for the label calculation +%D if `autohang' is `true', so by default the command is +%D not even needed, and therefore I saw no need to give +%D it it's own system variable and it just re-uses \type{pb}. + +\def\publicationlistparameter#1{\csname\??pv:l:#1\endcsname} + +\def\setuppublicationlist + {\dosingleempty\dosetuppublicationlist} + +\def\dosetuppublicationlist[#1]% + {\getparameters[\??pv:l:][#1]% + \setuplist[pubs][\c!samplesize={AA99},\c!alternative=a,\c!interaction=,\c!pagenumber=\v!no,#1,\c!command=]} + +\def\setuppublicationlayout[#1]#2% + {\setvalue{\??pv:l:#1}{#2\unskip}} + +\setuppublicationlist[\c!title=,\c!command=\dospecialbibinsert,\c!maybeyear=\v!on] + +%D \macros{bibalternative} +%D +%D A nice little shorthand that will be used so we don't have to +%D key in the weird \type{\@@pv} parameter names all the time. + +\def\bibalternative#1% + {\csname\??pv\@@currentalternative#1\endcsname} + +%D \macros{simplebibdef,bibcommandlist} +%D +%D \type{\simplebibdef} defines \type{bib@#1}, which in turn will +%D use one argument that is stored in \type{@@pb@#1}. +%D +%D \type{\simplebibdef} also defines \type{bibinsert#1}, which can be +%D used in the argument of \type{\setuppublicationlayout} to fetch +%D one of the \type{@@pb@} data entries. \type{bibinsert#1} then has +%D three arguments: \type{#1} are commands to be executed before the +%D data, \type{#2} are commands to be executed after the data, and +%D \type{#3} are commands to be executed if the data is not found. +%D +%D \type{\bibcommandlist} is the list of commands that is affected +%D by this approach. Later on, it will be used to do a series +%D of assignments from \type{#1} to \type{bib@#1}: e.g +%D \type{\title} becomes \type{\bib@title} when used within +%D a publication. + +\newtoks\initializebibdefinitions % we need to prevent clashes + +\def\simplebibdef#1% hh: funny expansion ? + {\@EA\long\@EA\def\csname bib@#1\endcsname##1% + {\setvalue{\??pb @#1}{##1}\ignorespaces}% + \expandafter \appendtoks + \expandafter\let\csname insert#1\expandafter\endcsname\csname bibinsert#1\endcsname + \to \initializebibdefinitions + \@EA\unexpanded\@EA\def\csname bibinsert#1\endcsname##1##2##3% + {\@EA\bibdoifelse\@EA{\csname\??pb @#1\endcsname}{##1\csname\??pb @#1\endcsname##2}{##3}}} + +\def\bibcommandlist + {abstract, annotate, arttitle, assignee, bibnumber, bibtype, biburl, chapter, city, + comment, country, day, dayfiled, doi, edition, eprint, howpublished, isbn, issn, + issue, journal, keyword, keywords, lastchecked, month, monthfiled, names, nationality, + note, notes, organization, pages, pubname, pubyear, revision, series, size, thekey, + title, volume, yearfiled} + +\processcommacommand[\bibcommandlist]\simplebibdef + +% \def\bibinsertdoi#1#2#3% +% {\begingroup +% \bibdoifelse{\@@pb@doi}% +% {\edef\ascii{\detokenize\expandafter{\@@pb@doi}}% probably not ok, to less expansion +% #1\expanded{\bibgotoDOI{\@@pb@thekey}{\ascii}}#2}{#3}% +% \endgroup} +% +% \def\bibinsertbiburl#1#2#3% +% {\begingroup +% \bibdoifelse{\@@pb@biburl}% +% {\edef\ascii{\detokenize\expandafter{\@@pb@biburl}}% probably not ok, to less expansion +% #1\expanded{\bibgotoURL{\@@pb@thekey}{\ascii}}#2}{#3}% +% \endgroup} + +\def\bibinsertdoi#1#2#3% let's see how this fails + {\bibdoifelse{\@@pb@doi}{#1\expanded{\bibgotoDOI{\@@pb@thekey}{\@@pb@doi}}#2}{#3}} + +\def\bibinsertbiburl#1#2#3% let's see how this fails + {\bibdoifelse{\@@pb@biburl}{#1\expanded{\bibgotoURL{\@@pb@thekey}{\@@pb@biburl}}#2}{#3}} + +\def\bibinsertmonth#1#2#3% + {\bibdoifelse\@@pb@month + {#1\doifnumberelse\@@pb@month + {\doifconversiondefinedelse\@@pbmonthconversion + {\convertnumber\@@pbmonthconversion{\@@pb@month}}{\@@pb@month}}% + {\@@pb@month}#2}% + {#3}} + +\appendtoks + \let\inserturl \bibinsertbiburl % for backward compat. + \let\inserttype\bibinsertbibtype % for backward compat. +\to\initializebibdefinitions + +\def\newbibfield[#1]% + {\simplebibdef{#1}% + \edef\bibcommandlist{\bibcommandlist,#1}} + +%D \macros{complexbibdef,specialbibinsert} +%D +%D The commands \type{\artauthor}, \type{\author} and +%D \type{\editor} are more complex than the other commands. +%D Their argument lists have this form: +%D +%D \type{\author[junior]{firstnames}[inits]{von}{surname}} +%D +%D (bracketed stuff is optional) +%D +%D And not only that, but there also might be more than one of each of +%D these commands. This is why a special command is needed to insert +%D them, as well as one extra counter for each command. + +% todo: instead of \getvalue{bla@num} in specs we should do +% \bibentrynum{bla} so that we can create a better namespace + +%D All of these \type{\@EA}'s and \type{\csnames} make this code +%D look far more complex than it really is. For example, the argument +%D \type{author} defines the macro \type{\bib@author} to do two +%D things: increment the counter \type{\author@num} (let's say to 2) +%D and next store it's arguments in the macro \type{\@@pb@author2}. +%D And it defines \type{\bibinsertauthors} to expand into +%D \starttyping +%D \specialbibinsert{author}{\author@num}{<before>}{<after>}{<not>} +%D \stoptyping + +% \def\docomplexbibdef#1% +% {\def\currentype{#1}% +% \dosingleempty\dodocomplexbibdef} + +% \def\dodocomplexbibdef[#1]#2% +% {\def\firstarg{#1}\def\secondarg{#2}% +% \dosingleempty\dododocomplexbibdef} + +% \def\dododocomplexbibdef[#1]#2#3% +% {\@EA\increment\csname\currentype @num\endcsname +% \setevalue{\??pb @\currentype\csname \currentype @num\endcsname}% +% {{\secondarg}{#2}{#3}{#1}{\firstarg}}\ignorespaces} + +\def\docomplexbibdef#1% + {\dodoubleempty\dodocomplexbibdef[#1]} + +\def\dodocomplexbibdef[#1][#2]#3% + {\doquadrupleempty\dododocomplexbibdef[#1][#2][#3]} + +\def\dododocomplexbibdef[#1][#2][#3][#4]#5#6% + {\@EA\increment\csname#1@num\endcsname % todo: bib in name + \setevalue{\??pb @#1\csname#1@num\endcsname}{{#3}{#5}{#6}{#4}{#2}}\ignorespaces} + +\def\complexbibdef#1% + {\@EA\newcounter\csname #1@num\endcsname + \@EA\def\csname bib@#1\endcsname{\docomplexbibdef{#1}}% + \expandafter \appendtoks + \expandafter\let\csname insert#1s\expandafter\endcsname\csname bibinsert#1s\endcsname + \to \initializebibdefinitions + \@EA\def\csname bibinsert#1s\endcsname##1##2##3{\specialbibinsert{#1}{\csname #1@num\endcsname}{##1}{\unskip ##2}{##3}}} + +\processcommalist[author,artauthor,editor]\complexbibdef + +%D Another level of indirection is needed to control the +%D typesetting of all of these arguments. + +\newcount\etallimitcounter +\newcount\etaldisplaycounter +\newcount\todocounter + +\def\specialbibinsert#1#2#3#4#5% + {\bgroup + \ifnum#2>\zerocount + \etallimitcounter =0\bibalternative{#1etallimit}\relax + \etaldisplaycounter=0\bibalternative{#1etaldisplay}\relax + \ifnum #2>\etallimitcounter + \todocounter\etaldisplaycounter + % just in case ... + \ifnum\todocounter>\etallimitcounter + \todocounter\etallimitcounter + \fi + \else + \todocounter#2\relax + \fi + \ifnum\todocounter>\zerocount + % find the current author list + \let\templist\empty + \dorecurse{#2} + {\scratchtoks\@EA\@EA\@EA{\csname\??pb @#1\recurselevel\endcsname}% + \edef\templist{\ifx\templist\empty\else\templist,\fi\the\scratchtoks}}% + #3\publicationlistparameter\c!command{#1}{\todocounter}{\templist}#4\relax + \else + #5% + \fi + \else + #5% + \fi + \egroup} + +%D This macro does the hard work of inserting a list of people in the +%D output, with proper regard of all the inbetween strings that can +%D arise depending on length of the list of people. + +%D \#1 = type +%D \#2 = number of items to be typeset +%D \#3 = commacommand containing authors + +% \def\dospecialbibinsert#1#2#3% +% {\getcommacommandsize[#3]% +% \scratchcounter\zerocount +% \def\processauthoritem##1% +% {\advance\scratchcounter\plusone +% \ifnum\numexpr\scratchcounter-\plusone\relax<#2\relax +% \publicationlistparameter{#1}##1% +% \ifnum\scratchcounter=#2\relax +% \ifnum\etallimitcounter<\commalistsize\relax +% \bibalternative{#1etaltext}% +% \fi +% \else\ifnum\numexpr\scratchcounter+\plusone\relax=#2\relax +% \ifnum\commalistsize>\plustwo +% \bibalternative\c!finalnamesep +% \else +% \bibalternative\c!lastnamesep +% \fi +% \else +% \bibalternative\c!namesep +% \fi\fi +% \fi}% +% \processcommacommand[#3]\processauthoritem} + +\def\doprocessauthoritem#1#2#3% + {\advance\scratchcounter\plusone + \ifnum\numexpr\scratchcounter-\plusone\relax<#2\relax + \publicationlistparameter{#1}#3% + \ifnum\scratchcounter=#2\relax + \ifnum\etallimitcounter<\commalistsize\relax + \bibalternative{#1etaltext}% + \fi + \else\ifnum\numexpr\scratchcounter+\plusone\relax=#2\relax + \ifnum\commalistsize>\plustwo + \bibalternative\c!finalnamesep + \else + \bibalternative\c!lastnamesep + \fi + \else + \bibalternative\c!namesep + \fi\fi + \fi} + +\def\dospecialbibinsert#1#2#3% + {\getcommacommandsize[#3]% + \scratchcounter\zerocount + \processcommacommand[#3]{\doprocessauthoritem{#1}{#2}}} + +%D \macros{invertedauthor,normalauthor,invertedshortauthor,normalshortauthor} +%D +%D Just some commands that can be used in \type{\setuppublicationparameters} +%D If you want to write an extension to the styles, you might +%D as well define some of these commands yourself. +%D +%D The argument list has been reordered here, and the meanings +%D are: +%D +%D \startlines +%D \type{#1} firstnames +%D \type{#2} von +%D \type{#3} surname +%D \type{#4} inits +%D \type{#5} junior +%D \stoplines + +\def\normalauthor#1#2#3#4#5% + {\bibdoif{#1}{#1\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!surnamesep#5\unskip}} + +\def\normalshortauthor#1#2#3#4#5% + {\bibdoif{#4}{#4\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!surnamesep#5\unskip}} + +\def\invertedauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!juniorsep#5}% + \bibdoif{#1}{\bibalternative\c!surnamesep#1\unskip}} + +\def\invertedshortauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3% + \bibdoif{#5}{\bibalternative\c!juniorsep#5}% + \bibdoif{#4}{\bibalternative\c!surnamesep#4\unskip}} + +%D \macros{clearbibitem,clearbibitemtwo,bibitemdefs} +%D +%D These are used in \type{\typesetapublication} to do +%D initializations and cleanups. + +\def\clearbibitem#1{\setvalue{\??pb @#1}{}}% + +% \def\clearbibitemtwo#1% +% {\letvalue{#1@num}\!!zerocount +% \doloop +% {\doifdefinedelse{\??pb @#1\recurselevel} +% {\letvalue{\??pb @#1\recurselevel}\empty} % why not undefined? +% {\exitloop}}} + +% \def\clearbibitemtwo#1% +% {\letvalue{#1@num}\!!zerocount +% \doloop +% {\ifcsname\??pb @#1\recurselevel\endcsname +% \expandafter\let\csname\??pb @#1\recurselevel\undefined +% \else +% \exitloop +% \fi}} + +\def\clearbibitemtwo#1% is this reset really needed? after all we reset the counter adn we are local + {%\dofastrecurse\plusone{\csname#1@num\endcsname}\plusone{\expandafter\let\csname\??pb @#1\recurselevel\undefined}% + \letvalue{#1@num}\!!zerocount} + +\def\bibitemdefs#1% + {\@EA\let\csname#1\expandafter\endcsname\csname bib@#1\endcsname} + +\def\presetbibvariables % make a fast resetter (toks) + {\processcommacommand[\bibcommandlist,crossref]\clearbibitem + \processcommalist [artauthor,author,editor]\clearbibitemtwo + \processcommacommand[\bibcommandlist]\bibitemdefs + \processcommalist [artauthor,author,editor,crossref]\bibitemdefs} + +%D \macros{startpublication} +%D +%D We are coming to the end of this module, to the macros that +%D do typesetting and read the \type{bbl} file. + +\newcount\bibtexcounter + +%D Just a \type{\dosingleempty} is the most friendly +%D of doing this: there need not even be an argument +%D to \type{\startpublication}. Of course, then there +%D is no key either, and it had better be an +%D article (otherwise the layout will be all screwed up). +%D +%D Only specifying the key in the argument is also +%D legal. In storing this stuff into macros, some trickery with +%D token registers is needed to fix the expansion problems. Even so, +%D this appears to not always be 100\% safe, so people are +%D urgently advised to use \ETEX\ instead of traditional \TEX. +%D +%D In \ETEX, all expansion problems are conveniently solved by +%D the primitive \type{\protected}. To put that another way: +%D +%D It's not a bug in this module if it does not appear in \ETEX! +%D +%D Now prohibits comments, so % can be used for urls + +\def\startpublication + {\begingroup + \catcode`\%=\othercatcode + \dosingleempty\dostartpublication} + +\let\stoppublication\relax + +% this is rather memory hungry; some day i will rewrite this so that +% we use the database instead + +%D \macros{doifbibreferencefoundelse} +%D +%D Some macros to fetch the information provided by +%D \type{\startpublication}. + +% we can consider a faster variant in the bbl file; we can also consider +% storing the keys in lua (and then do more in lua) and use calls to +% fetch the variables + +\long\def\dostartpublication[#1]#2\stoppublication + {\doifassignmentelse{#1}% + {\getparameters[\??pb][k=\s!unknown,t=article,n=,s=,a=,y=,o=,u=,#1]}% + {\getparameters[\??pb][k=#1,t=article,n=,s=,a=,y=,o=,u=]}% + \ctxlua{bibtex.hacks.register("\@@pbk")}% + \setxvalue{pbd:\@@pbk}##1{\noexpand\ifcase##1\noexpand\or + \@@pbk\noexpand\or + \@@pba\noexpand\or + \@@pby\noexpand\or + \@@pbs\noexpand\or + \@@pbn\noexpand\or + \@@pbt\noexpand\or + \@@pbo\noexpand\or + \@@pbu\noexpand\or + \normalunexpanded{#2}\noexpand\fi}% + \endgroup} + +\def\bibgetvark#1{\csname pbd:#1\endcsname\plusone } +\def\bibgetvara#1{\csname pbd:#1\endcsname\plustwo } +\def\bibgetvary#1{\csname pbd:#1\endcsname\plusthree} +\def\bibgetvars#1{\csname pbd:#1\endcsname\plusfour } +\def\bibgetvarn#1{\csname pbd:#1\endcsname\plusfive } +\def\bibgetvart#1{\csname pbd:#1\endcsname\plussix } +\def\bibgetvaro#1{\csname pbd:#1\endcsname\plusseven} +\def\bibgetvaru#1{\csname pbd:#1\endcsname\pluseight} +\def\bibgetvard#1{\csname pbd:#1\endcsname\plusnine } + +\def\doifbibreferencefoundelse#1#2#3% + {\doifdefinedelse{pbd:#1}{#2}{\showmessage\m!publications{5}{#1 is unknown}#3}} + +%D \macros{bib@crossref} +%D +%D \type{\crossref} is used in database files to point to another +%D entry. Because of this special situation, it has to be defined +%D separately. Since this command will not be seen until at +%D \type{\placepublications}, it may force extra runs. The same is +%D true for \type{\cite} commands inside of publications. + +% used in bib self + +\def\bib@crossref#1% called via \csname \endcsname + {\setvalue{\??pb @crossref}{#1}\ignorespaces} + +\def\bibinsertcrossref#1#2#3% + {\bibdoifelse\@@pb@crossref{#1\cite[\@@pb@crossref]#2}{#3}} + +\appendtoks\let\insertcrossref\bibinsertcrossref\to\initializebibdefinitions + +%D The next macro is needed because the number command of the +%D publist sometimes needs to fetch something from the current +%D item (like the 'short' key). For this, the ID of the current +%D item is passed in the implict parameter \type{\currentpublicationkey} + +\def\doprocessbibtexentry#1{\typesetapublication{#1}} + +\def\typesetpubslist + {\dobeginoflist + \the\initializebibdefinitions + \edef\currentlist{pubs}% +% \doif{\listparameter\c!criterium}\v!cite{\setuplist[pubs][\c!criterium=\v!here]}% + \doif{\listparameter\c!criterium}\v!cite{\setuplist[pubs][\c!criterium=\v!previous]}% + \ctxlua{bibtex.hacks.reset(\number\bibtexoncemode)}% + \placestructurelist{pubs}{\listparameter\c!criterium}{\listparameter\c!number}% only collects + \ctxlua{bibtex.hacks.flush("\@@pbsorttype")}% + \doendoflist} + +\newif\ifinpublist + +\def\initializepubslist + {\def\currentlist{pubs}% + \edef\@@pbnumbering{\@@pbnumbering}% + \doifelse\@@pbautohang\v!yes + {\ifx\@@pbnumbering\v!short + \setbox\scratchbox\hbox{\@@pbnumbercommand{\listparameter\c!samplesize}}% + \else + \setbox\scratchbox\hbox{\@@pbnumbercommand{\ctxlua{tex.write(structure.lists.size())}}}% + \fi + \edef\publistnumberbox{\hbox to \the\wd\scratchbox}% + \expanded{\setuplist[pubs][\c!width=\the\wd\scratchbox,\c!distance=\zeropoint]}% + \ifx\@@pbnumbering\v!short + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{\bibgetvars\currentpublicationkey}}}% + \else\ifx\@@pbnumbering\v!bib + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{\bibgetvarn\currentpublicationkey}}}% + \else + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{##1}}}% + \fi\fi} + {\doifelsenothing{\listparameter\c!width} + {\let \publistnumberbox \hbox} + {\edef\publistnumberbox{\hbox to \listparameter\c!width}}% + \ifx\@@pbnumbering\v!short + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{\bibgetvars\currentpublicationkey}}}% + \else\ifx\@@pbnumbering\v!bib + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{\bibgetvarn\currentpublicationkey}}}% + \else + \def\@@pblimitednumber##1{\publistnumberbox{\@@pbnumbercommand{##1}}}% + \fi\fi}% + \ifx\@@pbnumbering\v!no + \setuplist[pubs][\c!numbercommand=,\c!symbol=\v!none,\c!textcommand=\outdented]% + \else + \setuplist[pubs][\c!numbercommand=\@@pblimitednumber]% + \fi + \doifelse{\publicationlistparameter\c!maybeyear}{\v!off}{\def\maybeyear##1{}}{\def\maybeyear##1{##1}}% + \forgetall} + +\def\outdented#1% move to supp-box ? + {\hskip-\hangindent#1\relax} + +%D The full list of publications + +\def\completepublications + {\dosingleempty\docompletepublications} + +\def\docompletepublications[#1]% + {\begingroup + \setuplist[pubs][\c!criterium=\v!previous,#1] + \doifelsenothing{\publicationlistparameter\c!title} + {\systemsuppliedchapter[pubs]{\headtext{pubs}}} + {\normalexpanded{\systemsuppliedchapter[pubs]{\publicationlistparameter\c!title}}}% + \dodoplacepublications} + +%D And the portion with the entries only. + +\def\bibrefprefix{\number\bibtexblock:} + +\def\placepublications + {\dosingleempty\doplacepublications} + +\def\doplacepublications[#1]% + {\begingroup + \setuplist[pubs][\c!criterium=\v!previous,#1]% + \dodoplacepublications} + +\def\dodoplacepublications + {\determinelistcharacteristics[pubs]% + \initializepubslist + \doifnot{\namedlistparameter{pubs}\c!option}\v!continue + {\global\bibtexcounter\zerocount}% + \inpublisttrue + \typesetpubslist + \inpublistfalse + \endgroup + \global\advance\bibtexblock\plusone} + +%D \subsubject{What's in a publication} + +\unexpanded\def\typesetapublication#1% + {\doifsomething{#1} + {\ifgridsnapping\expandafter\snaptogrid\expandafter\vbox\fi\bgroup + \doifelse{\namedlistparameter{pubs}\c!criterium}\v!all + {\doplacepublicationindeed{#1}}% + {\ctxlua{bibtex.hacks.doifalreadyplaced("#1")} + {} + {\doplacepublicationindeed{#1}}}% + \egroup}} + +% for the moment we don't access the data directly but we will do that +% later when we get away from storing the data and only deal with +% references + +% we'll define proper handlers later + +\def\doplacepublicationindeed#1% + {\global\advance\bibtexcounter\plusone + \def\currentpublicationkey{#1}% + \ctxlua{bibtex.hacks.registerplaced("#1")}% + \dodolistelement + {pubs}% + {}% + {\number\bibtexcounter}% + {\expanded{\reference[\bibrefprefix#1]{\number\bibtexcounter}}% + \strut\dotypesetapublication{#1}\strut}% + {}% + {}} + +\def\dotypesetapublication#1% + {\bgroup + \def\@@currentalternative{:l:}% + \presetbibvariables + \let\biblanguage\empty + \ignorespaces\bibgetvard{#1}% + %\ifcsname pbdt-#1\endcsname + \bibalternative{\bibgetvart{#1}}% + %\fi + \egroup} + +%D An few afterthoughts: + +\let\maybeyear\gobbleoneargument +\let\noopsort \gobbleoneargument + +%D This is the result of bibtex's `language' field. + +\def\setbiblanguage#1#2{\setvalue{\??pb\s!language#1}{#2}} + +\def\lang#1% + {\edef\biblanguage{#1}% + \ifcsname\??pb\s!language#1\endcsname + \language[\getvalue{\??pb\s!language#1}]% + \fi + \ignorespaces} + +%D \subject{Citations} + +%D \macros{cite,bibref} +%D +%D The indirection with \type{\dobibref} allows \LATEX\ style +%D \type{\cite} commands with a braced argument (these might appear +%D in included data from the \type{.bib} file). + +\unexpanded\def\cite + {\doifnextoptionalelse\dodocite\dobibref} + +\def\dobibref#1% + {\docite[#1][]} + +\def\dodocite[#1]% + {\startstrictinspectnextcharacter + \dodoubleempty\dododocite[#1]} + +\def\dododocite % [#1][#2] + {\stopstrictinspectnextcharacter + \docite} + +\def\docite[#1][#2]% + {\begingroup + \doifelsenothing{#2}\secondargumentfalse\secondargumenttrue + \ifsecondargument + \dowhatevercite{#1}{#2}% + \else + \donumberedcite{#1}% + \fi + \endgroup} + +\def\dowhatevercite#1#2% + {\processcommalist[#2]\docitation + \setupinteraction[\c!style=]% + \doifassignmentelse + {#1}% + {\getparameters[LO][\c!alternative=,\c!extras=,#1]% + \edef\@@currentalternative{\LOalternative}% + \ifx\@@currentalternative\empty + \edef\@@currentalternative{\@@citedefault}% + \fi + \ifx\LOextras\empty + \setupcite[\@@currentalternative][#1]% + \else + \expandafter\ifx\csname LOright\endcsname \relax + \edef\LOextras{{\LOextras\bibalternative\c!right}}% + \else + \edef\LOextras{{\LOextras\LOright}}% + \fi + \expanded{\setupcite[\@@currentalternative][#1,\c!right=\LOextras]}% + \fi}% + {\def\@@currentalternative{#1}}% + \doifelsevalue{@@pv\@@currentalternative\c!compress}\v!no\bibcitecompressfalse\bibcitecompresstrue + \getvalue{bib\@@currentalternative ref}[#2]} + +\def\donumberedcite#1% + {\processcommalist[#1]\docitation + \setupinteraction[\c!style=]% + \edef\@@currentalternative{\@@citedefault}% + \doifelsevalue{@@pv\@@currentalternative\c!compress}\v!no\bibcitecompressfalse\bibcitecompresstrue + \getvalue{bib\@@citedefault ref}[#1]} + +%D \macros{nocite} + +\def\nocite[#1]% + {\processcommalist[#1]\docitation} + +%D \macros{setupcite} + +\def\setupcite{\dodoubleempty\dosetupcite} + +\def\dosetupcite[#1][#2]% + {\ifsecondargument + \def\dodosetupcite##1{\getparameters[\??pv##1][#2]}% + \processcommalist[#1]\dodosetupcite + \else % default case + \getparameters[\??pv\@@citedefault][#1]% + \fi} + +%D Low-level stuff + +\def\getcitedata#1[#2]#3[#4]#5to#6% + {\bgroup + \dofetchapublication{#4}% + \doifdefinedelse{\??pb @bib#2}% + {\xdef#6{\getvalue{\??pb @bib#2}}}% + {\xdef#6{\getvalue{\??pb @#2}}}% + \egroup} + +\def\dofetchapublication#1% + {\def\currentpublicationkey{#1}% + \presetbibvariables + \ignorespaces\bibgetvard{#1}} + +\def\docitation#1% + {\iftrialtypesetting \else + \expanded{\writedatatolist[pubs][bibref=#1]}% + \fi} + +\let\addthisref\gobbleoneargument % keep this for compatibility + +%D \macros{ixbibauthoryear,thebibauthors,thebibyears} +%D +%D If compression of \type{\cite}'s argument expansion is on, +%D the macros that deal with authors and years call this internal +%D command to do the actual typesetting. +%D +%D Two entries with same author but with different years may +%D be condensed into ``Author (year1,year2)''. This is about the +%D only optimization that makes sense for the (author,year) +%D style of citations (years within one author have to be unique +%D anyway so no need to test for that, and ``Author1, Author2 (year)'' +%D creates more confusion than it does good). +%D +%D In the code below, +%D the macro \type{\thebibauthors} holds the names of the alternative +%D author info fields for the current list. This is a commalist, +%D and \type{\thebibyears} holds the (collection of) year(s) that go with +%D this author (possibly as a nested commalist). +%D +%D There had better be an author for all cases, but there +%D does not have to be year info always. \type{\thebibyears} is +%D pre-initialized because this makes the insertion macros simpler. +%D +%D In `normal' \TeX, of course there are expansion problems again. + +\def\ixbibauthoryear#1#2#3#4% + {\bgroup + \gdef\ixlastcommand {#4}% + \gdef\ixsecondcommand{#3}% + \gdef\ixfirstcommand {#2}% + \glet\thebibauthors \empty + \glet\thebibyears \empty + \getcommalistsize[#1]% + \ifbibcitecompress + \dorecurse\commalistsize{\xdef\thebibyears{\thebibyears,}}% + \processcommalist[#1]\docompressbibauthoryear + \else + \processcommalist[#1]\donormalbibauthoryear + \fi + \egroup + \dobibauthoryear} + +%D \macros{dodobibauthoryear} +%D +%D This macro only has to make sure that the lists +%D \type{\thebibauthors} and \type{\thebibyears} are printed. + +\def\dobibauthoryear + {\scratchcounter\zerocount + \getcommacommandsize[\thebibauthors]% + \edef\authorcount{\commalistsize}% + \@EA\processcommalist\@EA[\thebibauthors]\dodobibauthoryear} + +\def\dodobibauthoryear#1% + {\advance\scratchcounter\plusone + \edef\wantednumber{\the\scratchcounter}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \@EA\def\@EA\currentbibyear\@EA{\commalistelement}% + \setcurrentbibauthor{#1}% + \ifnum\scratchcounter=\plusone + \ixfirstcommand + \else\ifnum \scratchcounter=\authorcount\relax + \ixlastcommand + \else + \ixsecondcommand + \fi\fi} + +\def\setcurrentbibauthor#1% + {\getcommacommandsize[#1]% + \ifcase\commalistsize + % anonymous? + \let\currentbibauthor\empty + \or + \def\currentbibauthor{#1}% + \or + \expanded{\docurrentbibauthor#1}% + \else + \handlemultiplebibauthors{\commalistsize}{#1}% + \fi} + +\newcount\citescratchcounter + +\def\handlemultiplebibauthors#1#2% + {\citescratchcounter\zerocount + \let\currentbibauthor\empty + \def\bibprocessauthoritem##1% + {\advance\citescratchcounter\plusone + \ifnum \citescratchcounter=#1\relax + \edef\currentbibauthor{\currentbibauthor##1}% + \else\ifnum\numexpr\citescratchcounter+\plusone\relax=#1\relax + \edef\currentbibauthor{\currentbibauthor##1\bibalternative{andtext}}% + \else + \edef\currentbibauthor{\currentbibauthor##1\bibalternative{namesep}}% + \fi\fi}% + \processcommalist[#2]\bibprocessauthoritem} + +\setupcite + [author,authoryear,authoryears] + [\c!namesep={, }] + +%D This discovery of authoretallimit is not the best one, +%D but it will do for now. + +\def\docurrentbibauthor#1,#2% + {\doifemptyelse{#2} + {\def\currentbibauthor{#1\bibalternative{otherstext}}} + {\@EA\ifx\csname\??pv\@@currentalternative authoretallimit\endcsname\relax + \edef\currentbibauthor{#1\bibalternative{andtext}#2}% + \else + \edef\currentbibauthor{#1% + \ifcase0\bibalternative{authoretallimit}\relax\or + \bibalternative{otherstext}\else\bibalternative{andtext}#2\fi}% + \fi}} + +%D This is not the one Hans made for me, because I need a global +%D edef, and the \type{\robustdoifinsetelse} doesn't listen to +%D \type{\doglobal } + +\def\robustaddtocommalist#1#2% {item} \cs + {\robustdoifinsetelse{#1}#2\resetglobal + {\dodoglobal\xdef#2{\ifx#2\empty\else#2,\fi#1}}} + +%D \macros{donormalbibauthoryear} +%D +%D Now we get to the macros that fill the two lists. +%D The `simple' one really is quite simple. + +\def\donormalbibauthoryear#1% + {\def\myauthor{Xxxxxxxxxx}% + \def\myyear{0000}% + \doifbibreferencefoundelse{#1} + {\def\myauthor{{\bibgetvara{#1}}}% + \def\myyear {\bibgetvary{#1}}}% + {}% + \@EA\doglobal\@EA\appendtocommalist\@EA{\myauthor}\thebibauthors + \@EA\doglobal\@EA\appendtocommalist\@EA{\myyear }\thebibyears} + +%D \macros{docompressbibauthoryear} +%D +%D So much for the easy parts. Nothing at all will be done if +%D the reference is not found or the reference does not contain +%D author data. No questions marks o.s.s. (to be fixed later) + +\def\docompressbibauthoryear#1% + {\def\myauthor{Xxxxxxxxxx}% + \def\myyear {0000}% + \doifbibreferencefoundelse{#1} + {\xdef\myauthor{\bibgetvara{#1}}% + \xdef\myyear {\bibgetvary{#1}}} + {}% + \ifx\myauthor\empty\else + \checkifmyauthoralreadyexists + \findmatchingyear + \fi} + +%D two temporary counters. One of these two can possibly be replaced +%D by \type{\scratchcounter}. + +\newcount\bibitemcounter +\newcount\bibitemwanted + +%D The first portion is simple enough: if this is the very first author +%D it is quite straightforward to add it. \type{\bibitemcounter} and +%D \type{\bibitemwanted} are needed later to insert the year +%D information in the correct item of \type{\thebibyears} + +\def\checkifmyauthoralreadyexists + {\doifemptyelsevalue{thebibauthors} + {\global\bibitemwanted \plusone + \global\bibitemcounter\plusone + \xdef\thebibauthors{{\myauthor}}} + {% the next weirdness is because according to \getcommalistsize, + % the length of \type{[{{},{}}]} is 2. + \@EA\getcommalistsize\@EA[\thebibauthors,]% + \global\bibitemcounter\numexpr\commalistsize+\minusone\relax + \global\bibitemwanted \zerocount + \processcommacommand[\thebibauthors]\docomparemyauthor}} + +%D The outer \type{\ifnum} accomplishes the addition of +%D a new author to \type{\thebibauthors}. The messing about with +%D the two counters is again to make sure that \type{\thebibyears} +%D will be updated correctly.If the author {\it was} found, +%D the counters will stay at their present values and everything +%D will be setup properly to insert the year info. + +\def\docomparemyauthor#1% + {\global\advance\bibitemwanted \plusone + \def\mytempc{#1}% + \ifx\mytempc\myauthor + \quitcommalist + \else\ifnum\bibitemwanted=\bibitemcounter\relax + \global\advance\bibitemwanted \plusone + \global\bibitemcounter\bibitemwanted\relax + \@EA\doglobal\@EA\robustaddtocommalist\@EA{{\myauthor}}\thebibauthors + \fi\fi} + +%D This macro should be clear now. + +\def\findmatchingyear + {\edef\wantednumber{\the\bibitemwanted}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \ifx\commalistelement\empty + \edef\myyear{{\myyear}}% + \else + \edef\myyear{{\commalistelement,\myyear}}% + \fi + \edef\newcommalistelement{\myyear}% + \doglobal\replaceincommalist \thebibyears \wantednumber} + +%D \macros{gotobiblink,inbiblink,atbiblink} +%D +%D The final task is looping over that list until a match is found. + +\def\gotobiblink#1[#2]{\doifreferencefoundelse{\bibrefprefix#2}{\goto{#1}[\bibrefprefix#2]}{\unknownreference{#2}}} +\def\atbiblink [#1]{\doifreferencefoundelse{\bibrefprefix#1}{\at [\bibrefprefix#1]}{\unknownreference{#1}}} +\def\inbiblink [#1]{\doifreferencefoundelse{\bibrefprefix#1}{\expanded{\goto{\currentreferencetext}}[\bibrefprefix#1]}{\unknownreference{#1}}} + +%D \macros{bibauthoryearref,bibauthoryearsref,bibauthorref,bibyearref} +%D +%D Now that all the hard work has been done, these are simple. +%D \type{\ixbibauthoryearref} stores the data in the macros +%D \type{\currentbibauthor} and \type{\currentbibyear}. + +\def\ifbibinteractionelse + {\iflocation + \edef\test{\bibalternative\c!interaction}% + \ifx\test\v!stop + \@EA\@EA\@EA\secondoftwoarguments + \else + \@EA\@EA\@EA\firstoftwoarguments + \fi + \else + \@EA\secondoftwoarguments + \fi} + +\def\ifbibinteractionelse + {\iflocation + \doifelse{\bibalternative\c!interaction}\v!stop + {\@EA\secondoftwoarguments} + {\@EA\firstoftwoarguments}% + \else + \@EA\secondoftwoarguments + \fi} + +\def\bibmaybeinteractive#1#2% + {\ifbibcitecompress + #2% + \else + \ifbibinteractionelse{\gotobiblink{#2}[#1]}{#2}% + \fi} + +\def\bibauthoryearref[#1]% + {\ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left{\currentbibyear}\bibalternative\v!right}} + {\bibalternative\c!pubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left {\currentbibyear}\bibalternative\v!right}} + {\bibalternative\c!lastpubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween + \bibalternative\v!left {\currentbibyear}\bibalternative\v!right}}} + +\def\bibauthoryearsref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1} + {\bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}} + {\bibalternative\c!pubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}} + {\bibalternative\c!lastpubsep + \bibmaybeinteractive{#1}{{\currentbibauthor}\bibalternative\c!inbetween{\currentbibyear}}}% + \bibalternative\v!right} + +\def\bibauthorref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibauthor}}} + {\bibalternative\c!pubsep \bibmaybeinteractive{#1}{{\currentbibauthor}}} + {\bibalternative\c!lastpubsep\bibmaybeinteractive{#1}{{\currentbibauthor}}}% + \bibalternative\v!right} + +\def\bibyearref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {\bibmaybeinteractive{#1}{{\currentbibyear}}} + {\bibalternative\c!pubsep \bibmaybeinteractive{#1}{{\currentbibyear}}} + {\bibalternative\c!lastpubsep\bibmaybeinteractive{#1}{{\currentbibyear}}}% + \bibalternative\v!right} + +%D \macros{bibshortref,bibkeyref,bibpageref,bibtyperef,bibserialref} +%D +%D There is hardly any point in trying to compress these. The only +%D thing that needs to be done is making sure that +%D the separations are inserted correctly. And that is +%D what \type{\bibinsertrefsep} does. + +\newconditional\firstbibrefsep + +\def\bibresetrefsep + {\settrue\firstbibrefsep} + +\def\bibinsertrefsep + {\ifconditional\firstbibrefsep + \setfalse\firstbibrefsep + \else + \bibalternative\c!pubsep + \fi} + +\def\bibshortref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibshortref + \bibalternative\v!right} + +\def\dobibshortref#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\gotobiblink{\bibgetvars{#1}}[#1]} + {\unknownreference{#1}}} + +\def\bibserialref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibserialref + \bibalternative\v!right} + +\def\dobibserialref#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\gotobiblink{\bibgetvarn{#1}}[#1]} + {\unknownreference{#1}}} + +\def\bibkeyref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibkeyref + \bibalternative\v!right} + +\def\dobibkeyref#1% + {\bibinsertrefsep + \gotobiblink{#1}[#1]} + +\def\bibgotoDOI#1#2% + {\ifbibinteractionelse + {\useURL[bibfooDoi#1][#2]% + \useURL[bibfoo#1][http://dx.doi.org/#2]% + \goto{\url[bibfooDoi#1]}[url(bibfoo#1)]} + {\hyphenatedurl{#2}}} + +\def\bibdoiref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibdoiref + \bibalternative\v!right} + +\def\dobibdoiref#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\expanded{\bibgotoDOI{#1}{\bibgetvaro{#1}}}} + {\unknownreference{#1}}} + +\def\biburlref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobiburlref + \bibalternative\v!right} + +\def\bibgotoURL#1#2% + {\ifbibinteractionelse + {\useURL[bibfoo#1][#2]\goto{\url[bibfoo#1]}[url(bibfoo#1)]} + {\hyphenatedurl{#2}}} + +\def\dobiburlref#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\expanded{\bibgotoURL{#1}{\bibgetvaru{#1}}}} + {\unknownreference{#1}}} + +\def\bibtyperef[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibtyperef + \bibalternative\v!right} + +\def\dobibtyperef#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\gotobiblink{\bibgetvart{#1}}[#1]} + {\unknownreference{#1}}} + +\def\bibpageref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibpageref + \bibalternative\v!right} + +\def\dobibpageref#1% + {\bibinsertrefsep + \ifbibinteractionelse + {\atbiblink[#1]} + {{\referencingfalse\at[#1]}}} + +\def\bibdataref[#1]% + {\bibalternative\v!left + \bibresetrefsep\processcommalist[#1]\dobibdata + \bibalternative\v!right} + +\def\dobibdata#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\dotypesetapublication{#1}} + {\unknownreference{#1}}} + +\let\bibnoneref\nocite + +%D \macros{bibnumref} + +\def\bibnumref[#1]% + {\begingroup + \bibalternative\v!left + \penalty\!!tenthousand + \ctxlua{bibtex.hacks.resolve("","\number\bibtexblock","#1")}% + \bibalternative\v!right + \endgroup} + +\def\dowithbibtexnumrefconnector#1#2% + {\ifnum#1>\plusone + \ifnum#2>\plusone + \ifnum#2=#1\relax + \bibalternative{lastpubsep}% + \else + \bibalternative{pubsep}% + \fi + \fi + \fi} + +\def\dowithbibtexnumref#1#2#3#4#5% n, i, prefix block ref + {\dowithbibtexnumrefconnector{#1}{#2}% + \def\bibrefprefix{#4:}% + \inbiblink[#5]} + +\def\dowithbibtexnumrefrange#1#2#3#4#5#6#7% n, i, prefix block ref + {\dowithbibtexnumrefconnector{#1}{#2}% + \def\bibrefprefix{#4:}% + \inbiblink[#5]% + \endash + \def\bibrefprefix{#6:}% + \inbiblink[#7]} + +%D By request from Sanjoy. This makes it easier to implement +%D \type{\citeasnoun}. + +\def\bibauthornumref[#1]% + {\getcommalistsize[#1]% + \global\bibitemcounter\commalistsize + \bibresetrefsep + \processcommalist[#1]\dobibauthornumref } + +\def\dobibauthornumref#1% + {\bibinsertrefsep + \doifbibreferencefoundelse{#1} + {\bibgetvara{#1}% + \bibalternative\c!inbetween\cite[#1]} + {\unknownreference{#1}}} + +%D And some defaults are loaded from bibl-apa: + +\setuppublications + [\v!month\v!conversion=, % hm, will become \c!monthconversion + \c!alternative=apa, + \c!method=\v!global, + \c!refcommand=num, + \c!numbercommand=\bibleftnumber] + +\def\preloadbiblist{\dousepublications\jobname} + +\appendtoks \preloadbiblist \to \everystarttext + +\protect \endinput diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/buff-ver.mkiv index 28e3e60d5..1e37dd626 100644 --- a/tex/context/base/buff-ver.mkiv +++ b/tex/context/base/buff-ver.mkiv @@ -93,6 +93,7 @@ %setvalue{\??tp:\c!empty:\v!all }{\obeyallemptylines} \setvalue{\??tp:\c!option:\v!none }{\let\obeycharacters\relax} +\setvalue{\??tp:\c!option:\empty }{\let\obeycharacters\relax} \setvalue{\??tp:\c!option:\v!color }{\setupprettiesintype{TEX}% \let\obeycharacters\setupprettytype \let\obeytabs\ignoretabs} diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 161d4c918..3a6fc6c99 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2009.08.19 17:10} +\newcontextversion{2009.08.22 18:35} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 4f8f16163..7c1294f3b 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -333,6 +333,10 @@ \loadcorefile{lang-spa} +%D Bibliographies: + +\loadmarkfile{bibl-tra} + %D Only the basic XML parser and remapper are part of the core. %D These macros are loaded last since they overload and|/|or %D extend previously defined ones. diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 03f26c8f0..5771f1950 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -164,8 +164,6 @@ \loadmarkfile{strc-ref} \loadmarkfile{strc-reg} -\loadmarkfile{bibl-bib} - \loadmarkfile{core-spa} \loadmarkfile{core-grd} @@ -307,6 +305,9 @@ \loadcorefile{lang-spa} +\loadmarkfile{bibl-bib} +\loadmarkfile{bibl-tra} + \loadcorefile{xtag-ini} % might go away \loadcorefile{xtag-ext} % might go away \loadcorefile{xtag-exp} % will go away diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 5f9615230..01fe25f90 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2009.08.19 17:10} +\edef\contextversion{2009.08.22 18:35} %D For those who want to use this: diff --git a/tex/context/base/core-job.mkii b/tex/context/base/core-job.mkii index a8a753e0d..5c280c15b 100644 --- a/tex/context/base/core-job.mkii +++ b/tex/context/base/core-job.mkii @@ -203,6 +203,11 @@ \expandafter\finalend \fi} +\def\forcequitjob#1% + {\writestatus\m!systems{forcing quit: #1}% + \batchmode + \dorecurse\textlevel\stoptext + \normalend} \let\autostoptext\relax diff --git a/tex/context/base/core-job.mkiv b/tex/context/base/core-job.mkiv index 7231ac383..4333b3c69 100644 --- a/tex/context/base/core-job.mkiv +++ b/tex/context/base/core-job.mkiv @@ -132,6 +132,12 @@ \expandafter\finalend \fi} +\def\forcequitjob#1% + {\writestatus\m!systems{forcing quit: #1}% + \batchmode + \dorecurse\textlevel{\stoptext} + \normalend} + \let\autostoptext\relax \def\autostarttext diff --git a/tex/context/base/core-uti.lua b/tex/context/base/core-uti.lua index 98e60be2e..9a44aef78 100644 --- a/tex/context/base/core-uti.lua +++ b/tex/context/base/core-uti.lua @@ -195,7 +195,7 @@ local packlist = { "pagedata", "directives", "specification", ---~ "references", + "references", } local jobpacker = packer.new(packlist,1.01) diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua index 3dfcee739..ef1df8e0b 100644 --- a/tex/context/base/grph-inc.lua +++ b/tex/context/base/grph-inc.lua @@ -291,7 +291,8 @@ do end -- maybe move texsprint to tex function figures.get(category,tag,default) - local value = figuredata[category][tag] + local value = figuredata[category] + value = value and value[tag] if not value or value == "" or value == true then return default or "" else @@ -299,6 +300,7 @@ do end end function figures.tprint(category,tag,default) +--~ print("!!!!!!!!",category,tag,default) texsprint(ctxcatcodes,figures.get(category,tag,default)) end function figures.current() diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex index b9717ce9a..1ffbb33e6 100644 --- a/tex/context/base/lang-ger.tex +++ b/tex/context/base/lang-ger.tex @@ -315,6 +315,15 @@ \setupheadtext [\s!nb] [\v!units=Enheter] \setupheadtext [\s!nn] [\v!units=Einingar] +\setupheadtext [\s!en] [pubs=References] +\setupheadtext [\s!nl] [pubs=Literatuur] +\setupheadtext [\s!de] [pubs=Literatur] +%setupheadtext [\s!da] [pubs=?] +%setupheadtext [\s!sv] [pubs=?] +%setupheadtext [\s!af] [pubs=?] +%setupheadtext [\s!nb] [pubs=?] +%setupheadtext [\s!nn] [pubs=?] + \setuplabeltext [\s!en] [\v!table=Table ] \setuplabeltext [\s!nl] [\v!table=Tabel ] \setuplabeltext [\s!de] [\v!table=Tabelle ] diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex index c714be775..dd4e04461 100644 --- a/tex/context/base/lang-ita.tex +++ b/tex/context/base/lang-ita.tex @@ -225,6 +225,14 @@ \setupheadtext [\s!pt] [\v!units=Unidades] \setupheadtext [\s!ro] [\v!units=Unit\u{a}\c{t}i] +\setupheadtext [\s!fr] [pubs=Bibliographie] +%setupheadtext [\s!es] [pubs=?] +\setupheadtext [\s!ca] [pubs=Referències] +\setupheadtext [\s!it] [pubs=Bibliografia] +%setupheadtext [\s!la] [pubs=?] +%setupheadtext [\s!pt] [pubs=?] +%setupheadtext [\s!ro] [pubs=?] + \setuplabeltext [\s!fr] [\v!table=Tableau ] \setuplabeltext [\s!es] [\v!table=Tabla ] \setuplabeltext [\s!ca] [\v!table=Taula ] diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex index cd3c75b61..dbed4e10a 100644 --- a/tex/context/base/lang-sla.tex +++ b/tex/context/base/lang-sla.tex @@ -240,6 +240,12 @@ \setupheadtext [\s!hr] [\v!units=Jednostki] \setupheadtext [\s!sl] [\v!units=Enote] +%setupheadtext [\s!pl] [pubs=?] +%setupheadtext [\s!cs] [pubs=?] +%setupheadtext [\s!sk] [pubs=?] +%setupheadtext [\s!hr] [pubs=?] +\setupheadtext [\s!sl] [pubs=Literatura] + \setuplabeltext [\s!pl] [\v!table=Tabela ] \setuplabeltext [\s!cs] [\v!table=Tabulka ] \setuplabeltext [\s!sk] [\v!table=Tabu\lcaron ka ] diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/lpdf-ano.lua index 87014365b..e22353b7c 100644 --- a/tex/context/base/lpdf-ano.lua +++ b/tex/context/base/lpdf-ano.lua @@ -337,7 +337,7 @@ end function specials.url(var,actions) local url = var.operation if url then - local u = jobreferences.urls[url] + local u = jobreferences.urls.data[url] if u then local u, f = u[1], u[2] if f and f ~= "" then @@ -353,7 +353,7 @@ end function specials.file(var,actions) local file = var.operation if file then - local f = jobreferences.files[file] + local f = jobreferences.files.data[file] if f then file = f[1] or file end @@ -361,6 +361,27 @@ function specials.file(var,actions) return link(nil,file,var.arguments,nil,actions) end +function specials.fileorurl(var,actions) + local whatever, url, file = var.operation, nil, nil + if whatever then + local w = jobreferences.files.data[whatever] + if w then + file = w[1] + else + w = jobreferences.urls.data[whatever] + if w then + local u, f = w[1], w[2] + if f and f ~= "" then + url = u .. "/" .. f + else + url = u + end + end + end + end + return link(url,file,var.arguments,nil,actions) +end + function specials.program(var,content) local program = var.operation if program then diff --git a/tex/context/base/m-obsolete.tex b/tex/context/base/m-obsolete.tex new file mode 100644 index 000000000..a97002cf6 --- /dev/null +++ b/tex/context/base/m-obsolete.tex @@ -0,0 +1,5 @@ +\unprotect + +\writestatus\m!systems{skipping obsolete module} + +\protect \endinput diff --git a/tex/context/base/mult-de.tex b/tex/context/base/mult-de.tex index 3213fa7de..66736e6e9 100644 --- a/tex/context/base/mult-de.tex +++ b/tex/context/base/mult-de.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{amrand} \setinterfacevariable{atpage}{aufseite} \setinterfacevariable{august}{August} +\setinterfacevariable{author}{autor} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{zurueck} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{epilog} \setinterfacevariable{backspace}{rumpfspatium} \setinterfacevariable{backward}{rueckwaerts} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{vor} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{gross} \setinterfacevariable{bigbodyfont}{bigbodyfont} \setinterfacevariable{bigpreference}{grosszuegig} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{kapitel} \setinterfacevariable{character}{buchstabe} \setinterfacevariable{characters}{buchstaben} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{farbe} \setinterfacevariable{column}{column} \setinterfacevariable{columns}{spalten} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{kleinerabstand} \setinterfacevariable{setups}{impostazioni} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{kurz} \setinterfacevariable{singlesided}{einzelseitig} \setinterfacevariable{slanted}{geneigt} \setinterfacevariable{slantedbold}{geneigtfett} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{alignmentcharacter} \setinterfaceconstant{aligntitle}{titelausrichten} \setinterfaceconstant{alternative}{alternative} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{pfeil} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{bei} \setinterfaceconstant{author}{autor} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{cutspace} \setinterfaceconstant{dash}{strich} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{datum} \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{kante} \setinterfaceconstant{edgedistance}{kantenabstand} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{leer} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{feldoffset} \setinterfaceconstant{file}{datei} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusout} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{zeilenabstande} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{posten} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{keyexpansion} \setinterfaceconstant{keyword}{keyword} \setinterfaceconstant{label}{label} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{links} \setinterfaceconstant{leftcolor}{linkerfarbe} \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{maxhoehe} \setinterfaceconstant{maxwidth}{maxbreite} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{menue} \setinterfaceconstant{method}{methode} \setinterfaceconstant{middle}{mittig} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{minbreite} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{name} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{nunten} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{folgende} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{openpageaction} \setinterfaceconstant{option}{option} \setinterfaceconstant{orientation}{orientation} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{outermargin} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{eigenenummer} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{vorige} \setinterfaceconstant{previousnumber}{vorigenummer} \setinterfaceconstant{process}{process} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{radius} \setinterfaceconstant{random}{zufaellig} \setinterfaceconstant{reduction}{reduktion} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{referenz} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{referieren} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{liniendicke} \setinterfaceconstant{samepage}{selbeseite} \setinterfaceconstant{sample}{muster} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{format} \setinterfaceconstant{scope}{bereich} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{zeichen} \setinterfaceconstant{size}{groesse} \setinterfaceconstant{small}{klein} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} \setinterfaceconstant{source}{quelle} \setinterfaceconstant{space}{spatium} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{unter} \setinterfaceconstant{subtitle}{untertitel} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symausrichtung} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{obenoffset} \setinterfaceconstant{topspace}{kopfspatium} \setinterfaceconstant{topstate}{statusoben} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{typ} \setinterfaceconstant{unit}{einheit} \setinterfaceconstant{unknownreference}{unbekantereferenz} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{kopfoffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{art} \setinterfaceconstant{wfactor}{bfaktor} \setinterfaceconstant{white}{weiss} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index 2fea7dfe7..91ea6230b 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -6532,6 +6532,87 @@ return { }, }, ["constants"]={ + ["database"]={ + ["en"]="database" + }, + ["artauthor"]={ + ["en"]="artauthor" + }, + ["editor"]={ + ["en"]="editor" + }, + ["authoretallimit"]={ + ["en"]="authoretallimit" + }, + ["artauthoretallimit"]={ + ["en"]="artauthoretallimit" + }, + ["editoretallimit"]={ + ["en"]="editoretallimit" + }, + ["authoretaldisplay"]={ + ["en"]="authoretaldisplay" + }, + ["artauthoretaldisplay"]={ + ["en"]="artauthoretaldisplay" + }, + ["editoretaldisplay"]={ + ["en"]="editoretaldisplay" + }, + ["authoretaltext"]={ + ["en"]="authoretaltext" + }, + ["artauthoretaltext"]={ + ["en"]="artauthoretaltext" + }, + ["editoretaltext"]={ + ["en"]="editoretaltext" + }, + ["otherstext"]={ + ["en"]="otherstext" + }, + ["andtext"]={ + ["en"]="andtext" + }, + ["totalnumber"]={ + ["en"]="totalnumber" + }, + ["firstnamesep"]={ + ["en"]="firstnamesep" + }, + ["vonsep"]={ + ["en"]="vonsep" + }, + ["juniorsep"]={ + ["en"]="juniorsep" + }, + ["surnamesep"]={ + ["en"]="surnamesep" + }, + ["lastnamesep"]={ + ["en"]="lastnamesep" + }, + ["finalnamesep"]={ + ["en"]="finalnamesep" + }, + ["namesep"]={ + ["en"]="namesep" + }, + ["pubsep"]={ + ["en"]="pubsep" + }, + ["lastpubsep"]={ + ["en"]="lastpubsep" + }, + ["refcommand"]={ + ["en"]="refcommand" + }, + ["samplesize"]={ + ["en"]="samplesize" + }, + ["maybeyear"]={ + ["en"]="maybeyear" + }, ["action"]={ ["cs"]="akce", ["de"]="aktion", @@ -9891,6 +9972,9 @@ return { ["pe"]="کوچک", ["ro"]="mic", }, + ["sort"]={ + ["en"]="sort", + }, ["sorttype"]={ ["cs"]="sorttype", ["de"]="sorttype", @@ -11045,6 +11129,33 @@ return { }, }, ["variables"]={ + ["short"]={ + ["nl"]="kort", + ["en"]="short", + ["de"]="kurz", + ["cs"]="short", + ["it"]="short", + ["ro"]="short", + ["fr"]="short", + }, + ["cite"]={ + ["en"]="cite", + }, + ["bbl"]={ + ["en"]="bbl", + }, + ["bib"]={ + ["en"]="bib", + }, + ["author"]={ + ["nl"]="auteur", + ["en"]="author", + ["de"]="autor", + ["cs"]="autor", + ["it"]="autore", + ["ro"]="autor", + ["fr"]="auteur", + }, ["Addition"]={ ["cs"]="Pridavek", ["de"]="Zusatz", diff --git a/tex/context/base/mult-en.tex b/tex/context/base/mult-en.tex index 50997b1d8..3b3dbb46e 100644 --- a/tex/context/base/mult-en.tex +++ b/tex/context/base/mult-en.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{atmargin} \setinterfacevariable{atpage}{atpage} \setinterfacevariable{august}{August} +\setinterfacevariable{author}{author} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{back} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{backpart} \setinterfacevariable{backspace}{backspace} \setinterfacevariable{backward}{backward} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{before} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{big} \setinterfacevariable{bigbodyfont}{bigbodyfont} \setinterfacevariable{bigpreference}{bigpreference} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{chapter} \setinterfacevariable{character}{character} \setinterfacevariable{characters}{characters} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{color} \setinterfacevariable{column}{column} \setinterfacevariable{columns}{columns} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{setups} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{short} \setinterfacevariable{singlesided}{singlesided} \setinterfacevariable{slanted}{slanted} \setinterfacevariable{slantedbold}{slantedbold} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{alignmentcharacter} \setinterfaceconstant{aligntitle}{aligntitle} \setinterfaceconstant{alternative}{alternative} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{arrow} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{at} \setinterfaceconstant{author}{author} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{cutspace} \setinterfaceconstant{dash}{dash} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{date} \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{edge} \setinterfaceconstant{edgedistance}{edgedistance} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{empty} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{fieldoffset} \setinterfaceconstant{file}{file} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusout} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{interlinespace} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{items} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{keyexpansion} \setinterfaceconstant{keyword}{keyword} \setinterfaceconstant{label}{label} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{left} \setinterfaceconstant{leftcolor}{leftcolor} \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{maxheight} \setinterfaceconstant{maxwidth}{maxwidth} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{menu} \setinterfaceconstant{method}{method} \setinterfaceconstant{middle}{middle} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{minwidth} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{name} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{nbottom} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{next} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{openpageaction} \setinterfaceconstant{option}{option} \setinterfaceconstant{orientation}{orientation} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{outermargin} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{ownnumber} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{previous} \setinterfaceconstant{previousnumber}{previousnumber} \setinterfaceconstant{process}{process} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{radius} \setinterfaceconstant{random}{random} \setinterfaceconstant{reduction}{reduction} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{reference} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{referencing} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{rulethickness} \setinterfaceconstant{samepage}{samepage} \setinterfaceconstant{sample}{sample} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{scale} \setinterfaceconstant{scope}{scope} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{sign} \setinterfaceconstant{size}{size} \setinterfaceconstant{small}{small} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} \setinterfaceconstant{source}{source} \setinterfaceconstant{space}{space} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{sub} \setinterfaceconstant{subtitle}{subtitle} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symalign} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{topoffset} \setinterfaceconstant{topspace}{topspace} \setinterfaceconstant{topstate}{topstate} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{type} \setinterfaceconstant{unit}{unit} \setinterfaceconstant{unknownreference}{unknownreference} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{veroffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{way} \setinterfaceconstant{wfactor}{wfactor} \setinterfaceconstant{white}{white} diff --git a/tex/context/base/mult-fr.tex b/tex/context/base/mult-fr.tex index 16f22ec7f..7b0ee13ba 100644 --- a/tex/context/base/mult-fr.tex +++ b/tex/context/base/mult-fr.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{alamarge} \setinterfacevariable{atpage}{alapage} \setinterfacevariable{august}{aout} +\setinterfacevariable{author}{auteur} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{retour} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{postface} \setinterfacevariable{backspace}{retourarriere} \setinterfacevariable{backward}{retourarriere} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{avant} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{grand} \setinterfacevariable{bigbodyfont}{grandepolicecorp} \setinterfacevariable{bigpreference}{grandepreference} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{chapitre} \setinterfacevariable{character}{caractere} \setinterfacevariable{characters}{caracteres} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{couleur} \setinterfacevariable{column}{colonne} \setinterfacevariable{columns}{colonnes} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{reglages} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{short} \setinterfacevariable{singlesided}{recto} \setinterfacevariable{slanted}{incline} \setinterfacevariable{slantedbold}{grasincline} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{alignementcaractere} \setinterfaceconstant{aligntitle}{alignementtitre} \setinterfaceconstant{alternative}{alternative} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{fleche} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{a} \setinterfaceconstant{author}{auteur} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{cutspace} \setinterfaceconstant{dash}{pointille} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{date} \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{bord} \setinterfaceconstant{edgedistance}{distancebord} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{vide} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{offsetchamp} \setinterfaceconstant{file}{fichier} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusout} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{espaceinterligne} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elements} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{keyexpansion} \setinterfaceconstant{keyword}{motcle} \setinterfaceconstant{label}{etiquette} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{gauche} \setinterfaceconstant{leftcolor}{couleurgauche} \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{hauteurmax} \setinterfaceconstant{maxwidth}{largeurmax} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{menu} \setinterfaceconstant{method}{methode} \setinterfaceconstant{middle}{milieu} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{largeurmin} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nom} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{ninf} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{suivant} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{actionouverturepage} \setinterfaceconstant{option}{option} \setinterfaceconstant{orientation}{orientation} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{margeexterieure} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{numeroproprio} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{precedent} \setinterfaceconstant{previousnumber}{numeroprecedent} \setinterfaceconstant{process}{process} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{rayon} \setinterfaceconstant{random}{aleatoire} \setinterfaceconstant{reduction}{reduction} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{reference} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{referencing} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{epaisseurligne} \setinterfaceconstant{samepage}{memepage} \setinterfaceconstant{sample}{echantillon} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{echelle} \setinterfaceconstant{scope}{scope} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{signe} \setinterfaceconstant{size}{dimension} \setinterfaceconstant{small}{petit} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} \setinterfaceconstant{source}{origine} \setinterfaceconstant{space}{espace} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{sous} \setinterfaceconstant{subtitle}{soustitre} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symalignement} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{decalagesup} \setinterfaceconstant{topspace}{espacesup} \setinterfaceconstant{topstate}{etatsup} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{type} \setinterfaceconstant{unit}{unite} \setinterfaceconstant{unknownreference}{referenceinconnue} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{veroffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{mode} \setinterfaceconstant{wfactor}{facteurlargeur} \setinterfaceconstant{white}{blanc} diff --git a/tex/context/base/mult-it.tex b/tex/context/base/mult-it.tex index 530a49152..e28880b97 100644 --- a/tex/context/base/mult-it.tex +++ b/tex/context/base/mult-it.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{almargine} \setinterfacevariable{atpage}{apagina} \setinterfacevariable{august}{agosto} +\setinterfacevariable{author}{autore} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{dietro} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{postfazione} \setinterfacevariable{backspace}{backspace} \setinterfacevariable{backward}{indietro} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{prima} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{grande} \setinterfacevariable{bigbodyfont}{grossofontdeltesto} \setinterfacevariable{bigpreference}{grandepreferenza} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{capitolo} \setinterfacevariable{character}{lettera} \setinterfacevariable{characters}{lettere} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{colore} \setinterfacevariable{column}{colonna} \setinterfacevariable{columns}{colonne} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{vicino} \setinterfacevariable{setups}{nastaveni} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{short} \setinterfacevariable{singlesided}{facciasingola} \setinterfacevariable{slanted}{inclinato} \setinterfacevariable{slantedbold}{inclinatograssetto} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{carattereallineamento} \setinterfaceconstant{aligntitle}{allineatitolo} \setinterfaceconstant{alternative}{alternativa} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{freccia} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{ad} \setinterfaceconstant{author}{autore} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{cutspace} \setinterfaceconstant{dash}{dash} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{data} \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{bordo} \setinterfaceconstant{edgedistance}{distanzabordo} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{vuoto} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{offsetcampo} \setinterfaceconstant{file}{file} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusout} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{interlinea} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elementi} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{keyexpansion} \setinterfaceconstant{keyword}{parolachiave} \setinterfaceconstant{label}{etichetta} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{sinistra} \setinterfaceconstant{leftcolor}{coloresinistra} \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{altezzamax} \setinterfaceconstant{maxwidth}{ampiezzamax} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{menu} \setinterfaceconstant{method}{metodo} \setinterfaceconstant{middle}{centro} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{ampiezzamin} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nome} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{nfondo} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{successivo} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{azioneapripagina} \setinterfaceconstant{option}{opzione} \setinterfaceconstant{orientation}{orientation} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{margineesterno} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{numeroproprio} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{precedente} \setinterfaceconstant{previousnumber}{numeroprecedente} \setinterfaceconstant{process}{process} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{raggio} \setinterfaceconstant{random}{casuale} \setinterfaceconstant{reduction}{riduzione} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{riferimento} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{referencing} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{spessorelinea} \setinterfaceconstant{samepage}{stessapagina} \setinterfaceconstant{sample}{campione} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{scala} \setinterfaceconstant{scope}{scope} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{segno} \setinterfaceconstant{size}{dimensione} \setinterfaceconstant{small}{piccolo} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} \setinterfaceconstant{source}{origine} \setinterfaceconstant{space}{spazio} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{sotto} \setinterfaceconstant{subtitle}{sottotitolo} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symallinea} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{offsetcima} \setinterfaceconstant{topspace}{spaziocima} \setinterfaceconstant{topstate}{statocima} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{type} \setinterfaceconstant{unit}{unita} \setinterfaceconstant{unknownreference}{riferimentoingoto} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{veroffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{modo} \setinterfaceconstant{wfactor}{wfactor} \setinterfaceconstant{white}{bianco} diff --git a/tex/context/base/mult-mcs.tex b/tex/context/base/mult-mcs.tex index bee7b777d..ac2a8b6f0 100644 --- a/tex/context/base/mult-mcs.tex +++ b/tex/context/base/mult-mcs.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interakce} \setinterfacemessage{interactions}{21}{-- kod vlozen} +\setinterfacemessage{regimes}{1}{kodovani --} +\setinterfacemessage{regimes}{3}{nezname kodovani --} +\setinterfacemessage{regimes}{2}{je nacteno kodovani --} +\setinterfacemessage{regimes}{title}{kodovani} \setinterfacemessage{structures}{1}{zacatek oddilu (sekce) --} \setinterfacemessage{structures}{title}{struktury} \setinterfacemessage{structures}{2}{konec oddilu (sekce) --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{specificke volby jazyka [--] bez mezer pripojeny} \setinterfacemessage{linguals}{title}{jazyky} \setinterfacemessage{linguals}{10}{vzory --nacteny} -\setinterfacemessage{regimes}{1}{kodovani --} -\setinterfacemessage{regimes}{3}{nezname kodovani --} -\setinterfacemessage{regimes}{2}{je nacteno kodovani --} -\setinterfacemessage{regimes}{title}{kodovani} +\setinterfacemessage{verbatims}{1}{soubor -- neexistuje} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- is loaded} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{soubor -- neexistuje} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{nova verze, je treba druhy beh} +\setinterfacemessage{textblocks}{3}{ctu bloky z --} +\setinterfacemessage{textblocks}{2}{zapisuji bloky do --} +\setinterfacemessage{textblocks}{5}{-- neni skryto} +\setinterfacemessage{textblocks}{4}{je treba druhy beh} +\setinterfacemessage{textblocks}{7}{-- skryto} +\setinterfacemessage{textblocks}{6}{-- skryto a zpracovano} +\setinterfacemessage{textblocks}{9}{-- nevysazeno} +\setinterfacemessage{textblocks}{8}{-- vysazeno} +\setinterfacemessage{textblocks}{title}{textovyblok} +\setinterfacemessage{textblocks}{12}{-- preskoceno} +\setinterfacemessage{textblocks}{11}{-- nacteno a vysazeno} +\setinterfacemessage{textblocks}{10}{-- nacteno a zpracovano} \setinterfacemessage{encodings}{1}{kodovani --} \setinterfacemessage{encodings}{3}{nezname kodovani --} \setinterfacemessage{encodings}{2}{je nacteno kodovani --} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{plovouci objekt je presunut do nasledujiciho sloupce / --} \setinterfacemessage{columns}{11}{plovouci objekt je pro sloupec prilis siroky} \setinterfacemessage{columns}{10}{zbyl (mene nez) 1 radek} -\setinterfacemessage{textblocks}{1}{nova verze, je treba druhy beh} -\setinterfacemessage{textblocks}{3}{ctu bloky z --} -\setinterfacemessage{textblocks}{2}{zapisuji bloky do --} -\setinterfacemessage{textblocks}{5}{-- neni skryto} -\setinterfacemessage{textblocks}{4}{je treba druhy beh} -\setinterfacemessage{textblocks}{7}{-- skryto} -\setinterfacemessage{textblocks}{6}{-- skryto a zpracovano} -\setinterfacemessage{textblocks}{9}{-- nevysazeno} -\setinterfacemessage{textblocks}{8}{-- vysazeno} -\setinterfacemessage{textblocks}{title}{textovyblok} -\setinterfacemessage{textblocks}{12}{-- preskoceno} -\setinterfacemessage{textblocks}{11}{-- nacteno a vysazeno} -\setinterfacemessage{textblocks}{10}{-- nacteno a zpracovano} \setinterfacemessage{symbols}{1}{nacita se soubor symbolu --} \setinterfacemessage{symbols}{title}{symboly} +\setinterfacemessage{files}{1}{synonymum souboru -- je jiz pouzito pro --} +\setinterfacemessage{files}{title}{soubory} \setinterfacemessage{versions}{1}{postradam @+} \setinterfacemessage{versions}{3}{oznacene strany: --} \setinterfacemessage{versions}{2}{oznacuji se strany} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{neznamy ovladac (driver) --} \setinterfacemessage{specials}{6}{zanoreni neni dovoleno} \setinterfacemessage{specials}{title}{speciality} -\setinterfacemessage{javascript}{1}{nacita se soubor skriptu --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{neznama preambule --} +\setinterfacemessage{layouts}{1}{vyska textu prizpusobena s -- na strane --} +\setinterfacemessage{layouts}{3}{-- krat text odlozen} +\setinterfacemessage{layouts}{2}{-- krat odlozeny text umisten} +\setinterfacemessage{layouts}{5}{okrajove bloky neaktivni} +\setinterfacemessage{layouts}{4}{okrajove bloky aktivni} +\setinterfacemessage{layouts}{7}{pocita se misto pro logo} +\setinterfacemessage{layouts}{6}{sada stran -- zpracovana (velikost --)} +\setinterfacemessage{layouts}{9}{aktualne ne vice nez -- urovne/urovni vyctu} +\setinterfacemessage{layouts}{8}{pocita se pozadi} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{svisla mezera -- neni povolena v pevnem radkovem rejstriku} +\setinterfacemessage{layouts}{10}{-- a -- nedava dohromady 1.0} \setinterfacemessage{fonts}{1}{kodovani --} \setinterfacemessage{fonts}{3}{neznama varianta --} \setinterfacemessage{fonts}{2}{varianta -- je nactena} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{local file --} \setinterfacemessage{databases}{4}{unknown file --} \setinterfacemessage{databases}{title}{databases} -\setinterfacemessage{colors}{1}{system -- je globalne aktivovana} -\setinterfacemessage{colors}{3}{-- neni definovana --} -\setinterfacemessage{colors}{2}{system -- je lokalne activovana} -\setinterfacemessage{colors}{5}{neznamy system --} -\setinterfacemessage{colors}{4}{system -- je nacten} -\setinterfacemessage{colors}{7}{palette -- neni k dispozici} -\setinterfacemessage{colors}{6}{palette -- je k dispozici} -\setinterfacemessage{colors}{9}{-- prostor barev neni podporovan} -\setinterfacemessage{colors}{8}{specifikace -- v barve -- bude cerna} -\setinterfacemessage{colors}{title}{barva} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{barva je prevedena na sed} -\setinterfacemessage{colors}{10}{-- prostor barev je podporovan} -\setinterfacemessage{layouts}{1}{vyska textu prizpusobena s -- na strane --} -\setinterfacemessage{layouts}{3}{-- krat text odlozen} -\setinterfacemessage{layouts}{2}{-- krat odlozeny text umisten} -\setinterfacemessage{layouts}{5}{okrajove bloky neaktivni} -\setinterfacemessage{layouts}{4}{okrajove bloky aktivni} -\setinterfacemessage{layouts}{7}{pocita se misto pro logo} -\setinterfacemessage{layouts}{6}{sada stran -- zpracovana (velikost --)} -\setinterfacemessage{layouts}{9}{aktualne ne vice nez -- urovne/urovni vyctu} -\setinterfacemessage{layouts}{8}{pocita se pozadi} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{svisla mezera -- neni povolena v pevnem radkovem rejstriku} -\setinterfacemessage{layouts}{10}{-- a -- nedava dohromady 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{nacita se soubor skriptu --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{neznama preambule --} \setinterfacemessage{check}{1}{postradam '=' po '--' na radku --} \setinterfacemessage{check}{3}{-- -- nahrazuje makro, uzijte VERZALKY!} \setinterfacemessage{check}{2}{ocekavam -- argument(y) na radku --} \setinterfacemessage{check}{title}{kontrola} \setinterfacemessage{metapost}{1}{loading metapost library --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{synonymum souboru -- je jiz pouzito pro --} -\setinterfacemessage{files}{title}{soubory} \setinterfacemessage{figures}{1}{obraz -- nelze nalezt} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{obraz -- nepritomen} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimenze obrazu -- spocteny programem rlxtools} \setinterfacemessage{figures}{8}{obrazovy objekt -- je znovu pouzit} \setinterfacemessage{figures}{title}{obrazy} +\setinterfacemessage{colors}{1}{system -- je globalne aktivovana} +\setinterfacemessage{colors}{3}{-- neni definovana --} +\setinterfacemessage{colors}{2}{system -- je lokalne activovana} +\setinterfacemessage{colors}{5}{neznamy system --} +\setinterfacemessage{colors}{4}{system -- je nacten} +\setinterfacemessage{colors}{7}{palette -- neni k dispozici} +\setinterfacemessage{colors}{6}{palette -- je k dispozici} +\setinterfacemessage{colors}{9}{-- prostor barev neni podporovan} +\setinterfacemessage{colors}{8}{specifikace -- v barve -- bude cerna} +\setinterfacemessage{colors}{title}{barva} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{barva je prevedena na sed} +\setinterfacemessage{colors}{10}{-- prostor barev je podporovan} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mde.tex b/tex/context/base/mult-mde.tex index a80ac4306..a708657a1 100644 --- a/tex/context/base/mult-mde.tex +++ b/tex/context/base/mult-mde.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{Interaktion} \setinterfacemessage{interactions}{21}{-- Code eingefuegt} +\setinterfacemessage{regimes}{1}{Kodierung --} +\setinterfacemessage{regimes}{3}{Unbekannte Kodierung --} +\setinterfacemessage{regimes}{2}{Kodierung -- ist geladen} +\setinterfacemessage{regimes}{title}{Kodierung} \setinterfacemessage{structures}{1}{Begin des Abschnittsblocks --} \setinterfacemessage{structures}{title}{struktur} \setinterfacemessage{structures}{2}{Ende des Abschnittsblocks --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{Sprachenspezifische Option [--] nahtlos hinzugefuegt} \setinterfacemessage{linguals}{title}{Sprache} \setinterfacemessage{linguals}{10}{Trennmuster --geladen} -\setinterfacemessage{regimes}{1}{Kodierung --} -\setinterfacemessage{regimes}{3}{Unbekannte Kodierung --} -\setinterfacemessage{regimes}{2}{Kodierung -- ist geladen} -\setinterfacemessage{regimes}{title}{Kodierung} +\setinterfacemessage{verbatims}{1}{Datei -- existiert nicht} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- ist geladen} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{Datei -- existiert nicht} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{neue Version, zweiter Durchlauf benoetigt} +\setinterfacemessage{textblocks}{3}{lese Bloecke von --} +\setinterfacemessage{textblocks}{2}{schreibe Bloecke zu --} +\setinterfacemessage{textblocks}{5}{-- nicht verborgen} +\setinterfacemessage{textblocks}{4}{zweiter Durchlauf benoetigt} +\setinterfacemessage{textblocks}{7}{-- verborgen} +\setinterfacemessage{textblocks}{6}{-- verborgen und verarbeitet} +\setinterfacemessage{textblocks}{9}{-- nicht gesetzt} +\setinterfacemessage{textblocks}{8}{-- gesetzt} +\setinterfacemessage{textblocks}{title}{textblock} +\setinterfacemessage{textblocks}{12}{-- ausgelassen} +\setinterfacemessage{textblocks}{11}{-- geladen und gesetzt} +\setinterfacemessage{textblocks}{10}{-- geladen und verarbeitet} \setinterfacemessage{encodings}{1}{Kodierung --} \setinterfacemessage{encodings}{3}{Unbekannte Kodierung --} \setinterfacemessage{encodings}{2}{Kodierung -- ist geladen} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{Gleitobjekt in naechste Zeile verschoben / --} \setinterfacemessage{columns}{11}{Gleitobjekt zu breit fuer Spalte} \setinterfacemessage{columns}{10}{(weniger als) 1 Zeile uebrig} -\setinterfacemessage{textblocks}{1}{neue Version, zweiter Durchlauf benoetigt} -\setinterfacemessage{textblocks}{3}{lese Bloecke von --} -\setinterfacemessage{textblocks}{2}{schreibe Bloecke zu --} -\setinterfacemessage{textblocks}{5}{-- nicht verborgen} -\setinterfacemessage{textblocks}{4}{zweiter Durchlauf benoetigt} -\setinterfacemessage{textblocks}{7}{-- verborgen} -\setinterfacemessage{textblocks}{6}{-- verborgen und verarbeitet} -\setinterfacemessage{textblocks}{9}{-- nicht gesetzt} -\setinterfacemessage{textblocks}{8}{-- gesetzt} -\setinterfacemessage{textblocks}{title}{textblock} -\setinterfacemessage{textblocks}{12}{-- ausgelassen} -\setinterfacemessage{textblocks}{11}{-- geladen und gesetzt} -\setinterfacemessage{textblocks}{10}{-- geladen und verarbeitet} \setinterfacemessage{symbols}{1}{Lade Symboldatei --} \setinterfacemessage{symbols}{title}{Symbole} +\setinterfacemessage{files}{1}{Dateisynonym -- wird bereits fuer -- benutzt} +\setinterfacemessage{files}{title}{files} \setinterfacemessage{versions}{1}{fehlendes @+} \setinterfacemessage{versions}{3}{Ausgewaehlte Seiten: --} \setinterfacemessage{versions}{2}{Erstelle Seiten} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{unbekante Driver --} \setinterfacemessage{specials}{6}{Verschachtelung nicht erlaubt} \setinterfacemessage{specials}{title}{spezielles} -\setinterfacemessage{javascript}{1}{Lade Scriptdatei --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{unbekannte Preamble --} +\setinterfacemessage{layouts}{1}{Texthoehe angepasst mit -- auf Seite --} +\setinterfacemessage{layouts}{3}{-- mal Text verschoben} +\setinterfacemessage{layouts}{2}{-- mal verschobener Text plaziert} +\setinterfacemessage{layouts}{5}{marginalbloecke inaktiv} +\setinterfacemessage{layouts}{4}{marginalbloecke aktiv} +\setinterfacemessage{layouts}{7}{berechne Platzbedarf des Logos} +\setinterfacemessage{layouts}{6}{Unterseitenfolge -- verarbeitet (Groesse --)} +\setinterfacemessage{layouts}{9}{z.Z. nicht mehr als -- Ebenen in Aufzaehlungen} +\setinterfacemessage{layouts}{8}{berechne Hintergrund} +\setinterfacemessage{layouts}{title}{Layout} +\setinterfacemessage{layouts}{11}{Zwischenraum -- nicht im Grittermoduserlau} +\setinterfacemessage{layouts}{10}{-- und -- ergeben zusammen nicht 1.0} \setinterfacemessage{fonts}{1}{Kodierung --} \setinterfacemessage{fonts}{3}{Unbekannte Variante --} \setinterfacemessage{fonts}{2}{Variante -- ist geladen} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{lokale Datei --} \setinterfacemessage{databases}{4}{unbekannte Datei --} \setinterfacemessage{databases}{title}{Datenbank} -\setinterfacemessage{colors}{1}{system -- ist global aktiviert} -\setinterfacemessage{colors}{3}{-- ist undefiniert --} -\setinterfacemessage{colors}{2}{system -- ist lokal aktiviert} -\setinterfacemessage{colors}{5}{unbekanntes System --} -\setinterfacemessage{colors}{4}{system -- ist geladen} -\setinterfacemessage{colors}{7}{palette -- ist nicht verfuegbar} -\setinterfacemessage{colors}{6}{palette -- ist verfuegbar} -\setinterfacemessage{colors}{9}{-- Farbraum wird nicht unterstuetzt} -\setinterfacemessage{colors}{8}{Spezifikation -- bei Farbe -- wird schwarz} -\setinterfacemessage{colors}{title}{farbe} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{Farbe wird in Grau umgewandelt} -\setinterfacemessage{colors}{10}{-- Farbraum wird unterstuetzt} -\setinterfacemessage{layouts}{1}{Texthoehe angepasst mit -- auf Seite --} -\setinterfacemessage{layouts}{3}{-- mal Text verschoben} -\setinterfacemessage{layouts}{2}{-- mal verschobener Text plaziert} -\setinterfacemessage{layouts}{5}{marginalbloecke inaktiv} -\setinterfacemessage{layouts}{4}{marginalbloecke aktiv} -\setinterfacemessage{layouts}{7}{berechne Platzbedarf des Logos} -\setinterfacemessage{layouts}{6}{Unterseitenfolge -- verarbeitet (Groesse --)} -\setinterfacemessage{layouts}{9}{z.Z. nicht mehr als -- Ebenen in Aufzaehlungen} -\setinterfacemessage{layouts}{8}{berechne Hintergrund} -\setinterfacemessage{layouts}{title}{Layout} -\setinterfacemessage{layouts}{11}{Zwischenraum -- nicht im Grittermoduserlau} -\setinterfacemessage{layouts}{10}{-- und -- ergeben zusammen nicht 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{Lade Scriptdatei --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{unbekannte Preamble --} \setinterfacemessage{check}{1}{Fehlendes '=' nach '--' in Zeile --} \setinterfacemessage{check}{3}{-- -- ersetzt ein Makro, verwende VERSALIEN!} \setinterfacemessage{check}{2}{-- Argument(e) in Zeile -- erwartet} \setinterfacemessage{check}{title}{check} \setinterfacemessage{metapost}{1}{Lade metapost Bibliothek --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{Dateisynonym -- wird bereits fuer -- benutzt} -\setinterfacemessage{files}{title}{files} \setinterfacemessage{figures}{1}{Abbildung -- kann nicht gefunden werden} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{Abbildung -- wird nicht erstellt} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{Dimensionen von -- ausgerechnet durch rlxtools} \setinterfacemessage{figures}{8}{Abbildungobjekt -- wurde wiederverwandt} \setinterfacemessage{figures}{title}{Abbildungen} +\setinterfacemessage{colors}{1}{system -- ist global aktiviert} +\setinterfacemessage{colors}{3}{-- ist undefiniert --} +\setinterfacemessage{colors}{2}{system -- ist lokal aktiviert} +\setinterfacemessage{colors}{5}{unbekanntes System --} +\setinterfacemessage{colors}{4}{system -- ist geladen} +\setinterfacemessage{colors}{7}{palette -- ist nicht verfuegbar} +\setinterfacemessage{colors}{6}{palette -- ist verfuegbar} +\setinterfacemessage{colors}{9}{-- Farbraum wird nicht unterstuetzt} +\setinterfacemessage{colors}{8}{Spezifikation -- bei Farbe -- wird schwarz} +\setinterfacemessage{colors}{title}{farbe} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{Farbe wird in Grau umgewandelt} +\setinterfacemessage{colors}{10}{-- Farbraum wird unterstuetzt} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-men.tex b/tex/context/base/mult-men.tex index 8335d2911..ab10cebcd 100644 --- a/tex/context/base/mult-men.tex +++ b/tex/context/base/mult-men.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interaction} \setinterfacemessage{interactions}{21}{-- code inserted} +\setinterfacemessage{regimes}{1}{regime --} +\setinterfacemessage{regimes}{3}{unknown regime --} +\setinterfacemessage{regimes}{2}{regime -- is loaded} +\setinterfacemessage{regimes}{title}{regime} \setinterfacemessage{structures}{1}{begin of sectionblock --} \setinterfacemessage{structures}{title}{structure} \setinterfacemessage{structures}{2}{end of sectionblock --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{language specific options [--] seamless appended} \setinterfacemessage{linguals}{title}{language} \setinterfacemessage{linguals}{10}{patterns --loaded} -\setinterfacemessage{regimes}{1}{regime --} -\setinterfacemessage{regimes}{3}{unknown regime --} -\setinterfacemessage{regimes}{2}{regime -- is loaded} -\setinterfacemessage{regimes}{title}{regime} +\setinterfacemessage{verbatims}{1}{file -- does not exist} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- is loaded} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{file -- does not exist} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{new version, second pass needed} +\setinterfacemessage{textblocks}{3}{reading blocks from --} +\setinterfacemessage{textblocks}{2}{writing blocks to --} +\setinterfacemessage{textblocks}{5}{-- not hidden} +\setinterfacemessage{textblocks}{4}{second pass needed} +\setinterfacemessage{textblocks}{7}{-- hidden} +\setinterfacemessage{textblocks}{6}{-- hidden and processed} +\setinterfacemessage{textblocks}{9}{-- not typeset} +\setinterfacemessage{textblocks}{8}{-- typeset} +\setinterfacemessage{textblocks}{title}{textblocks} +\setinterfacemessage{textblocks}{12}{-- skipped} +\setinterfacemessage{textblocks}{11}{-- loaded and typeset} +\setinterfacemessage{textblocks}{10}{-- loaded and processed} \setinterfacemessage{encodings}{1}{coding --} \setinterfacemessage{encodings}{3}{unknown coding --} \setinterfacemessage{encodings}{2}{coding -- is loaded} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{float moved to next column / --} \setinterfacemessage{columns}{11}{float too wide for column} \setinterfacemessage{columns}{10}{(less than) 1 line left} -\setinterfacemessage{textblocks}{1}{new version, second pass needed} -\setinterfacemessage{textblocks}{3}{reading blocks from --} -\setinterfacemessage{textblocks}{2}{writing blocks to --} -\setinterfacemessage{textblocks}{5}{-- not hidden} -\setinterfacemessage{textblocks}{4}{second pass needed} -\setinterfacemessage{textblocks}{7}{-- hidden} -\setinterfacemessage{textblocks}{6}{-- hidden and processed} -\setinterfacemessage{textblocks}{9}{-- not typeset} -\setinterfacemessage{textblocks}{8}{-- typeset} -\setinterfacemessage{textblocks}{title}{textblocks} -\setinterfacemessage{textblocks}{12}{-- skipped} -\setinterfacemessage{textblocks}{11}{-- loaded and typeset} -\setinterfacemessage{textblocks}{10}{-- loaded and processed} \setinterfacemessage{symbols}{1}{loading symbolset --} \setinterfacemessage{symbols}{title}{symbols} +\setinterfacemessage{files}{1}{file synonym -- is already used for --} +\setinterfacemessage{files}{title}{files} \setinterfacemessage{versions}{1}{missing @+} \setinterfacemessage{versions}{3}{selected pages: --} \setinterfacemessage{versions}{2}{marking pages} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{unknown driver --} \setinterfacemessage{specials}{6}{nesting is not permitted} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{loading script set --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{unknown preamble --} +\setinterfacemessage{layouts}{1}{textheight adapted with -- at page --} +\setinterfacemessage{layouts}{3}{-- times text postponed} +\setinterfacemessage{layouts}{2}{-- times postponed text placed} +\setinterfacemessage{layouts}{5}{marginblocks inactive} +\setinterfacemessage{layouts}{4}{marginblocks active} +\setinterfacemessage{layouts}{7}{calculating logospace} +\setinterfacemessage{layouts}{6}{subpage set -- processed (size --)} +\setinterfacemessage{layouts}{9}{currently no more than -- levels in itemizations} +\setinterfacemessage{layouts}{8}{calculating backgrounds} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{spacing -- not permitted in gridmode} +\setinterfacemessage{layouts}{10}{-- and -- don't add up to 1.0} \setinterfacemessage{fonts}{1}{coding --} \setinterfacemessage{fonts}{3}{unknown variant --} \setinterfacemessage{fonts}{2}{variant -- is loaded} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{local file --} \setinterfacemessage{databases}{4}{unknown file --} \setinterfacemessage{databases}{title}{databases} -\setinterfacemessage{colors}{1}{system -- is global activated} -\setinterfacemessage{colors}{3}{-- is not defined --} -\setinterfacemessage{colors}{2}{system -- is local activated} -\setinterfacemessage{colors}{5}{unknown system --} -\setinterfacemessage{colors}{4}{system -- is loaded} -\setinterfacemessage{colors}{7}{palette -- is not available} -\setinterfacemessage{colors}{6}{palette -- is available} -\setinterfacemessage{colors}{9}{-- color space is not supported} -\setinterfacemessage{colors}{8}{specification -- at color -- becomes black} -\setinterfacemessage{colors}{title}{color} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{color is converted to gray} -\setinterfacemessage{colors}{10}{-- color space is supported} -\setinterfacemessage{layouts}{1}{textheight adapted with -- at page --} -\setinterfacemessage{layouts}{3}{-- times text postponed} -\setinterfacemessage{layouts}{2}{-- times postponed text placed} -\setinterfacemessage{layouts}{5}{marginblocks inactive} -\setinterfacemessage{layouts}{4}{marginblocks active} -\setinterfacemessage{layouts}{7}{calculating logospace} -\setinterfacemessage{layouts}{6}{subpage set -- processed (size --)} -\setinterfacemessage{layouts}{9}{currently no more than -- levels in itemizations} -\setinterfacemessage{layouts}{8}{calculating backgrounds} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{spacing -- not permitted in gridmode} -\setinterfacemessage{layouts}{10}{-- and -- don't add up to 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{loading script set --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{unknown preamble --} \setinterfacemessage{check}{1}{missing or ungrouped '=' after '--' in line --} \setinterfacemessage{check}{3}{-- -- replaces a macro, use CAPITALS!} \setinterfacemessage{check}{2}{-- argument(s) expected in line --} \setinterfacemessage{check}{title}{check} \setinterfacemessage{metapost}{1}{loading metapost library --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{file synonym -- is already used for --} -\setinterfacemessage{files}{title}{files} \setinterfacemessage{figures}{1}{figure -- can not be found} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{figure -- is not preset} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimensions of -- calculated by rlxtools} \setinterfacemessage{figures}{8}{figureobject -- is reused} \setinterfacemessage{figures}{title}{figures} +\setinterfacemessage{colors}{1}{system -- is global activated} +\setinterfacemessage{colors}{3}{-- is not defined --} +\setinterfacemessage{colors}{2}{system -- is local activated} +\setinterfacemessage{colors}{5}{unknown system --} +\setinterfacemessage{colors}{4}{system -- is loaded} +\setinterfacemessage{colors}{7}{palette -- is not available} +\setinterfacemessage{colors}{6}{palette -- is available} +\setinterfacemessage{colors}{9}{-- color space is not supported} +\setinterfacemessage{colors}{8}{specification -- at color -- becomes black} +\setinterfacemessage{colors}{title}{color} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{color is converted to gray} +\setinterfacemessage{colors}{10}{-- color space is supported} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mes.lua b/tex/context/base/mult-mes.lua index 6d177fd8f..09baf2f3b 100644 --- a/tex/context/base/mult-mes.lua +++ b/tex/context/base/mult-mes.lua @@ -1,4 +1,28 @@ return { + ["publications"]={ + ["files"]={ "bibl-tra.mkiv" }, + ["title"]={ + ["en"]="publications", + }, + ["1"]={ + ["en"]="file -- not found, unknown style ignored", + }, + ["2"]={ + ["en"]="file -- not found, waiting for bibtex", + }, + ["3"]={ + ["en"]="wrote a new auxiliary file \\jobname.aux", + }, + ["4"]={ + ["en"]="loading database from --", + }, + ["5"]={ + ["en"]="warning: cite argument -- on line \\the\\inputlineno", + }, + ["6"]={ + ["en"]="loading formatting style from --", + }, + }, ["check"]={ ["1"]={ ["cs"]="postradam '=' po '--' na radku --", @@ -2002,4 +2026,4 @@ return { ["ro"]="versiuni", }, }, -}
\ No newline at end of file +} diff --git a/tex/context/base/mult-mfr.tex b/tex/context/base/mult-mfr.tex index ecfd88ecc..86097e88d 100644 --- a/tex/context/base/mult-mfr.tex +++ b/tex/context/base/mult-mfr.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{le fichier joint -- n'existe pas} \setinterfacemessage{interactions}{title}{interaction} \setinterfacemessage{interactions}{21}{-- code inseré} +\setinterfacemessage{regimes}{1}{encodage --} +\setinterfacemessage{regimes}{3}{encodage -- inconnu} +\setinterfacemessage{regimes}{2}{l'encodage -- est chargé} +\setinterfacemessage{regimes}{title}{encodage} \setinterfacemessage{structures}{1}{début de blocsection --} \setinterfacemessage{structures}{title}{structure} \setinterfacemessage{structures}{2}{fin de blocsection --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{les options spécifiques de langue [--] sont ajoutés en douceur} \setinterfacemessage{linguals}{title}{langue} \setinterfacemessage{linguals}{10}{motifs -- chargés} -\setinterfacemessage{regimes}{1}{encodage --} -\setinterfacemessage{regimes}{3}{encodage -- inconnu} -\setinterfacemessage{regimes}{2}{l'encodage -- est chargé} -\setinterfacemessage{regimes}{title}{encodage} +\setinterfacemessage{verbatims}{1}{le fichier -- n'existe pas} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{le filtre -- est chargé} \setinterfacemessage{filters}{title}{filtre} \setinterfacemessage{filters}{2}{filtre -- inconnu} -\setinterfacemessage{verbatims}{1}{le fichier -- n'existe pas} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{nouvelle version, une seconde passe est nécessaire} +\setinterfacemessage{textblocks}{3}{lecture des blocs en provenance de --} +\setinterfacemessage{textblocks}{2}{ecriture des blocs vers --} +\setinterfacemessage{textblocks}{5}{-- non caché} +\setinterfacemessage{textblocks}{4}{seconde passe nécessaire} +\setinterfacemessage{textblocks}{7}{-- caché} +\setinterfacemessage{textblocks}{6}{-- caché et traité} +\setinterfacemessage{textblocks}{9}{-- non composé} +\setinterfacemessage{textblocks}{8}{-- composé} +\setinterfacemessage{textblocks}{title}{blocs de texte} +\setinterfacemessage{textblocks}{12}{-- sauté} +\setinterfacemessage{textblocks}{11}{-- chargé et composé} +\setinterfacemessage{textblocks}{10}{-- chargé et traité} \setinterfacemessage{encodings}{1}{encodage --} \setinterfacemessage{encodings}{3}{encodage -- inconnu} \setinterfacemessage{encodings}{2}{l'encodage -- est chargé} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{flottant déplacé à la colonne suivante / --} \setinterfacemessage{columns}{11}{flottant mis à la largeur de la colonne} \setinterfacemessage{columns}{10}{(moins de) 1 ligne restante} -\setinterfacemessage{textblocks}{1}{nouvelle version, une seconde passe est nécessaire} -\setinterfacemessage{textblocks}{3}{lecture des blocs en provenance de --} -\setinterfacemessage{textblocks}{2}{ecriture des blocs vers --} -\setinterfacemessage{textblocks}{5}{-- non caché} -\setinterfacemessage{textblocks}{4}{seconde passe nécessaire} -\setinterfacemessage{textblocks}{7}{-- caché} -\setinterfacemessage{textblocks}{6}{-- caché et traité} -\setinterfacemessage{textblocks}{9}{-- non composé} -\setinterfacemessage{textblocks}{8}{-- composé} -\setinterfacemessage{textblocks}{title}{blocs de texte} -\setinterfacemessage{textblocks}{12}{-- sauté} -\setinterfacemessage{textblocks}{11}{-- chargé et composé} -\setinterfacemessage{textblocks}{10}{-- chargé et traité} \setinterfacemessage{symbols}{1}{chargement du jeu de symbole --} \setinterfacemessage{symbols}{title}{symboles} +\setinterfacemessage{files}{1}{le synonyme de fichier -- est déjà utilisé pour --} +\setinterfacemessage{files}{title}{fichiers} \setinterfacemessage{versions}{1}{@+ manquant} \setinterfacemessage{versions}{3}{pages sélectionnées : --} \setinterfacemessage{versions}{2}{marquage des pages} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{pilote -- inconnu} \setinterfacemessage{specials}{6}{l'imbrication n'est pas permise} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{chargement du jeu de script --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{préambule -- inconnu} +\setinterfacemessage{layouts}{1}{hauteurtexte adaptée avec -- à la page --} +\setinterfacemessage{layouts}{3}{-- times text postponed} +\setinterfacemessage{layouts}{2}{-- times postponed text placed} +\setinterfacemessage{layouts}{5}{blocsmarge inactifs} +\setinterfacemessage{layouts}{4}{blocsmarge actifs} +\setinterfacemessage{layouts}{7}{calcul de l'espace pour le logo} +\setinterfacemessage{layouts}{6}{jeu de souspage -- traité (taille --)} +\setinterfacemessage{layouts}{9}{pas plus de -- niveaux pour l'instant dans les élémentarisations} +\setinterfacemessage{layouts}{8}{calcul des arrières-plans} +\setinterfacemessage{layouts}{title}{calque} +\setinterfacemessage{layouts}{11}{espacement -- non permis en modegrille} +\setinterfacemessage{layouts}{10}{-- et -- ne sont pas ajoutés à 1.0} \setinterfacemessage{fonts}{1}{encodage --} \setinterfacemessage{fonts}{3}{variante -- inconnue} \setinterfacemessage{fonts}{2}{la variante -- est chargée} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{fichier local --} \setinterfacemessage{databases}{4}{fichier inconnu --} \setinterfacemessage{databases}{title}{bases de données} -\setinterfacemessage{colors}{1}{le système -- est globalement activé} -\setinterfacemessage{colors}{3}{-- n'est pas défini --} -\setinterfacemessage{colors}{2}{le système -- est localement activé} -\setinterfacemessage{colors}{5}{système -- inconnu} -\setinterfacemessage{colors}{4}{le système -- est chargé} -\setinterfacemessage{colors}{7}{le palette -- n'est pas disponible} -\setinterfacemessage{colors}{6}{la palette -- est disponible} -\setinterfacemessage{colors}{9}{l'espace de couleur -- n'est pas supporté} -\setinterfacemessage{colors}{8}{la spécification -- de la couleur -- devient noire} -\setinterfacemessage{colors}{title}{couleurs} -\setinterfacemessage{colors}{12}{-- est enregistré} -\setinterfacemessage{colors}{11}{la couleur est convertie en niveau de gris} -\setinterfacemessage{colors}{10}{-- l'espace de couleur est supporté} -\setinterfacemessage{layouts}{1}{hauteurtexte adaptée avec -- à la page --} -\setinterfacemessage{layouts}{3}{-- times text postponed} -\setinterfacemessage{layouts}{2}{-- times postponed text placed} -\setinterfacemessage{layouts}{5}{blocsmarge inactifs} -\setinterfacemessage{layouts}{4}{blocsmarge actifs} -\setinterfacemessage{layouts}{7}{calcul de l'espace pour le logo} -\setinterfacemessage{layouts}{6}{jeu de souspage -- traité (taille --)} -\setinterfacemessage{layouts}{9}{pas plus de -- niveaux pour l'instant dans les élémentarisations} -\setinterfacemessage{layouts}{8}{calcul des arrières-plans} -\setinterfacemessage{layouts}{title}{calque} -\setinterfacemessage{layouts}{11}{espacement -- non permis en modegrille} -\setinterfacemessage{layouts}{10}{-- et -- ne sont pas ajoutés à 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{chargement du jeu de script --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{préambule -- inconnu} \setinterfacemessage{check}{1}{manquant ou dégroupé '=' après '--' à la ligne --} \setinterfacemessage{check}{3}{-- -- remplace une macro, utilisez des MAJUSCULES !} \setinterfacemessage{check}{2}{-- argument(s) attendu(s) à la ligne --} \setinterfacemessage{check}{title}{vérification} \setinterfacemessage{metapost}{1}{chargement de la bibliothèque metapost --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{le synonyme de fichier -- est déjà utilisé pour --} -\setinterfacemessage{files}{title}{fichiers} \setinterfacemessage{figures}{1}{la figure -- ne peut être trouvée} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{la figure -- n'est pas pré-sélectionnée} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{les dimensions de -- calculées par rlxtools} \setinterfacemessage{figures}{8}{figureobject -- est réutilisé} \setinterfacemessage{figures}{title}{figures} +\setinterfacemessage{colors}{1}{le système -- est globalement activé} +\setinterfacemessage{colors}{3}{-- n'est pas défini --} +\setinterfacemessage{colors}{2}{le système -- est localement activé} +\setinterfacemessage{colors}{5}{système -- inconnu} +\setinterfacemessage{colors}{4}{le système -- est chargé} +\setinterfacemessage{colors}{7}{le palette -- n'est pas disponible} +\setinterfacemessage{colors}{6}{la palette -- est disponible} +\setinterfacemessage{colors}{9}{l'espace de couleur -- n'est pas supporté} +\setinterfacemessage{colors}{8}{la spécification -- de la couleur -- devient noire} +\setinterfacemessage{colors}{title}{couleurs} +\setinterfacemessage{colors}{12}{-- est enregistré} +\setinterfacemessage{colors}{11}{la couleur est convertie en niveau de gris} +\setinterfacemessage{colors}{10}{-- l'espace de couleur est supporté} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mit.tex b/tex/context/base/mult-mit.tex index 0efb03e90..b64e4c864 100644 --- a/tex/context/base/mult-mit.tex +++ b/tex/context/base/mult-mit.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interazione} \setinterfacemessage{interactions}{21}{codice -- inserito} +\setinterfacemessage{regimes}{1}{codifica --} +\setinterfacemessage{regimes}{3}{codifica sconosciuta --} +\setinterfacemessage{regimes}{2}{codifica -- caricata} +\setinterfacemessage{regimes}{title}{codifica} \setinterfacemessage{structures}{1}{inizio del blocco (sezione) --} \setinterfacemessage{structures}{title}{struttura} \setinterfacemessage{structures}{2}{fine del blocco (sezione) --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{opzioni specifiche per la lingua [--] aggiunte trasparentemente} \setinterfacemessage{linguals}{title}{lingua} \setinterfacemessage{linguals}{10}{schemi -- caricati} -\setinterfacemessage{regimes}{1}{codifica --} -\setinterfacemessage{regimes}{3}{codifica sconosciuta --} -\setinterfacemessage{regimes}{2}{codifica -- caricata} -\setinterfacemessage{regimes}{title}{codifica} +\setinterfacemessage{verbatims}{1}{il file -- non esiste} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filtro -- caricato} \setinterfacemessage{filters}{title}{filtri} \setinterfacemessage{filters}{2}{filtro sconosciuto --} -\setinterfacemessage{verbatims}{1}{il file -- non esiste} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{nuova versione, seconda passata necessaria} +\setinterfacemessage{textblocks}{3}{lettura dei blocchi da --} +\setinterfacemessage{textblocks}{2}{scrittura dei blocchi su --} +\setinterfacemessage{textblocks}{5}{-- non nascosto} +\setinterfacemessage{textblocks}{4}{seconda passata necessaria} +\setinterfacemessage{textblocks}{7}{-- nascosto} +\setinterfacemessage{textblocks}{6}{-- nascosto ed elaborato} +\setinterfacemessage{textblocks}{9}{-- non composto} +\setinterfacemessage{textblocks}{8}{-- composto} +\setinterfacemessage{textblocks}{title}{blocchi di testo} +\setinterfacemessage{textblocks}{12}{-- saltato} +\setinterfacemessage{textblocks}{11}{-- caricato e composto} +\setinterfacemessage{textblocks}{10}{-- caricato ed elaborato} \setinterfacemessage{encodings}{1}{codifica --} \setinterfacemessage{encodings}{3}{codifica sconosciuta --} \setinterfacemessage{encodings}{2}{codifica -- caricata} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{oggetto mobile spostata alla colonna successiva / --} \setinterfacemessage{columns}{11}{oggetto mobile troppo ampio per la colonna} \setinterfacemessage{columns}{10}{(meno di) una riga rimasta} -\setinterfacemessage{textblocks}{1}{nuova versione, seconda passata necessaria} -\setinterfacemessage{textblocks}{3}{lettura dei blocchi da --} -\setinterfacemessage{textblocks}{2}{scrittura dei blocchi su --} -\setinterfacemessage{textblocks}{5}{-- non nascosto} -\setinterfacemessage{textblocks}{4}{seconda passata necessaria} -\setinterfacemessage{textblocks}{7}{-- nascosto} -\setinterfacemessage{textblocks}{6}{-- nascosto ed elaborato} -\setinterfacemessage{textblocks}{9}{-- non composto} -\setinterfacemessage{textblocks}{8}{-- composto} -\setinterfacemessage{textblocks}{title}{blocchi di testo} -\setinterfacemessage{textblocks}{12}{-- saltato} -\setinterfacemessage{textblocks}{11}{-- caricato e composto} -\setinterfacemessage{textblocks}{10}{-- caricato ed elaborato} \setinterfacemessage{symbols}{1}{caricamento gruppo di simboli --} \setinterfacemessage{symbols}{title}{simboli} +\setinterfacemessage{files}{1}{sinonimo file -- già in uso per --} +\setinterfacemessage{files}{title}{file} \setinterfacemessage{versions}{1}{@+ mancante} \setinterfacemessage{versions}{3}{pagine selezionate: --} \setinterfacemessage{versions}{2}{marcatura pagine} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{driver sconosciuto --} \setinterfacemessage{specials}{6}{annidamento non permesso} \setinterfacemessage{specials}{title}{specialitø} -\setinterfacemessage{javascript}{1}{caricamento dello script set --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{preambolo sconosciuto --} +\setinterfacemessage{layouts}{1}{altezza del testo adattata con -- a pagina --} +\setinterfacemessage{layouts}{3}{testo posticipato -- volte} +\setinterfacemessage{layouts}{2}{posizionato testo posticipato -- volte} +\setinterfacemessage{layouts}{5}{blocchi in margine inattivi} +\setinterfacemessage{layouts}{4}{blocchi in margine attivi} +\setinterfacemessage{layouts}{7}{calcolo dello spazio per logo} +\setinterfacemessage{layouts}{6}{gruppo di sottopagine -- elaborato (dimensione --)} +\setinterfacemessage{layouts}{9}{attualmente non più di -- livelli di elencazione} +\setinterfacemessage{layouts}{8}{calcolo dello sfondo} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{spaziatura -- non permessa in modo griglia} +\setinterfacemessage{layouts}{10}{-- e -- non sommano a 1.0} \setinterfacemessage{fonts}{1}{codifica --} \setinterfacemessage{fonts}{3}{variante sconosciuta --} \setinterfacemessage{fonts}{2}{variante -- caricata} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{file locale --} \setinterfacemessage{databases}{4}{file sconosciuto --} \setinterfacemessage{databases}{title}{database} -\setinterfacemessage{colors}{1}{sistema -- attivato globalmente} -\setinterfacemessage{colors}{3}{-- non definito --} -\setinterfacemessage{colors}{2}{sistema -- attivato localmente} -\setinterfacemessage{colors}{5}{sistema -- sconosciuto} -\setinterfacemessage{colors}{4}{sistema -- caricato} -\setinterfacemessage{colors}{7}{tavolozza -- non disponibile} -\setinterfacemessage{colors}{6}{tavolozza -- resa disponibile} -\setinterfacemessage{colors}{9}{spazio dei colori -- non supportato} -\setinterfacemessage{colors}{8}{specifica -- del colore -- convertita in nero} -\setinterfacemessage{colors}{title}{colore} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{il colore ø convertito in grigio} -\setinterfacemessage{colors}{10}{spazio dei colori -- supportato} -\setinterfacemessage{layouts}{1}{altezza del testo adattata con -- a pagina --} -\setinterfacemessage{layouts}{3}{testo posticipato -- volte} -\setinterfacemessage{layouts}{2}{posizionato testo posticipato -- volte} -\setinterfacemessage{layouts}{5}{blocchi in margine inattivi} -\setinterfacemessage{layouts}{4}{blocchi in margine attivi} -\setinterfacemessage{layouts}{7}{calcolo dello spazio per logo} -\setinterfacemessage{layouts}{6}{gruppo di sottopagine -- elaborato (dimensione --)} -\setinterfacemessage{layouts}{9}{attualmente non più di -- livelli di elencazione} -\setinterfacemessage{layouts}{8}{calcolo dello sfondo} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{spaziatura -- non permessa in modo griglia} -\setinterfacemessage{layouts}{10}{-- e -- non sommano a 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{caricamento dello script set --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{preambolo sconosciuto --} \setinterfacemessage{check}{1}{'=' mancante o non raggruppato dopo '--' alla riga --} \setinterfacemessage{check}{3}{-- -- sostituisce una macro, usare le MAIUSCOLE!} \setinterfacemessage{check}{2}{-- argomento/i attesi alla riga --} \setinterfacemessage{check}{title}{controllo} \setinterfacemessage{metapost}{1}{caricamento della libreria metapost --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{sinonimo file -- già in uso per --} -\setinterfacemessage{files}{title}{file} \setinterfacemessage{figures}{1}{figura -- non trovata} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{la figura -- non è preimpostata} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimensioni di -- calcolate da rlxtools} \setinterfacemessage{figures}{8}{oggetto-figura -- riutilizzato} \setinterfacemessage{figures}{title}{figure} +\setinterfacemessage{colors}{1}{sistema -- attivato globalmente} +\setinterfacemessage{colors}{3}{-- non definito --} +\setinterfacemessage{colors}{2}{sistema -- attivato localmente} +\setinterfacemessage{colors}{5}{sistema -- sconosciuto} +\setinterfacemessage{colors}{4}{sistema -- caricato} +\setinterfacemessage{colors}{7}{tavolozza -- non disponibile} +\setinterfacemessage{colors}{6}{tavolozza -- resa disponibile} +\setinterfacemessage{colors}{9}{spazio dei colori -- non supportato} +\setinterfacemessage{colors}{8}{specifica -- del colore -- convertita in nero} +\setinterfacemessage{colors}{title}{colore} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{il colore ø convertito in grigio} +\setinterfacemessage{colors}{10}{spazio dei colori -- supportato} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mnl.tex b/tex/context/base/mult-mnl.tex index 5c52f7aff..3958e2762 100644 --- a/tex/context/base/mult-mnl.tex +++ b/tex/context/base/mult-mnl.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- bestaat niet} \setinterfacemessage{interactions}{title}{interactie} \setinterfacemessage{interactions}{21}{-- code tussengevoegd} +\setinterfacemessage{regimes}{1}{regime --} +\setinterfacemessage{regimes}{3}{onbekend regime --} +\setinterfacemessage{regimes}{2}{regime -- wordt geladen} +\setinterfacemessage{regimes}{title}{regime} \setinterfacemessage{structures}{1}{begin van sectieblok --} \setinterfacemessage{structures}{title}{structuur} \setinterfacemessage{structures}{2}{eind van sectieblok --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{taal specifieke opties [--] naadloos toegevoegd} \setinterfacemessage{linguals}{title}{taal} \setinterfacemessage{linguals}{10}{patronen --geladen} -\setinterfacemessage{regimes}{1}{regime --} -\setinterfacemessage{regimes}{3}{onbekend regime --} -\setinterfacemessage{regimes}{2}{regime -- wordt geladen} -\setinterfacemessage{regimes}{title}{regime} +\setinterfacemessage{verbatims}{1}{file -- bestaat niet} +\setinterfacemessage{verbatims}{title}{typen} \setinterfacemessage{filters}{1}{filter -- wordt geladen} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{onbekend filter --} -\setinterfacemessage{verbatims}{1}{file -- bestaat niet} -\setinterfacemessage{verbatims}{title}{typen} +\setinterfacemessage{textblocks}{1}{nieuwe versie, tweede run nodig} +\setinterfacemessage{textblocks}{3}{inlezen blokken uit --} +\setinterfacemessage{textblocks}{2}{wegschrijven blokken naar --} +\setinterfacemessage{textblocks}{5}{-- niet verborgen} +\setinterfacemessage{textblocks}{4}{er is een tweede run nodig} +\setinterfacemessage{textblocks}{7}{-- verborgen} +\setinterfacemessage{textblocks}{6}{-- verborgen en verwerkt} +\setinterfacemessage{textblocks}{9}{-- niet gehandhaafd} +\setinterfacemessage{textblocks}{8}{-- gehandhaafd} +\setinterfacemessage{textblocks}{title}{tekstblokken} +\setinterfacemessage{textblocks}{12}{-- overgeslagen} +\setinterfacemessage{textblocks}{11}{-- geladen en geplaatst} +\setinterfacemessage{textblocks}{10}{-- geladen en verwerkt} \setinterfacemessage{encodings}{1}{codering --} \setinterfacemessage{encodings}{3}{onbekende codering --} \setinterfacemessage{encodings}{2}{codering -- wordt geladen} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{plaatsblok verplaatst naar volgende kolom / --} \setinterfacemessage{columns}{11}{plaatsblok te breed voor kolom} \setinterfacemessage{columns}{10}{(minder dan) 1 regel over} -\setinterfacemessage{textblocks}{1}{nieuwe versie, tweede run nodig} -\setinterfacemessage{textblocks}{3}{inlezen blokken uit --} -\setinterfacemessage{textblocks}{2}{wegschrijven blokken naar --} -\setinterfacemessage{textblocks}{5}{-- niet verborgen} -\setinterfacemessage{textblocks}{4}{er is een tweede run nodig} -\setinterfacemessage{textblocks}{7}{-- verborgen} -\setinterfacemessage{textblocks}{6}{-- verborgen en verwerkt} -\setinterfacemessage{textblocks}{9}{-- niet gehandhaafd} -\setinterfacemessage{textblocks}{8}{-- gehandhaafd} -\setinterfacemessage{textblocks}{title}{tekstblokken} -\setinterfacemessage{textblocks}{12}{-- overgeslagen} -\setinterfacemessage{textblocks}{11}{-- geladen en geplaatst} -\setinterfacemessage{textblocks}{10}{-- geladen en verwerkt} \setinterfacemessage{symbols}{1}{symboolset -- wordt geladen} \setinterfacemessage{symbols}{title}{symbolen} +\setinterfacemessage{files}{1}{file synoniem -- is al in gebruik voor --} +\setinterfacemessage{files}{title}{files} \setinterfacemessage{versions}{1}{er mankeert een @+} \setinterfacemessage{versions}{3}{geselecteerde pagina's: --} \setinterfacemessage{versions}{2}{markeren pagina's} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{onbekende driver --} \setinterfacemessage{specials}{6}{nesting is niet toegestaan} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{script set -- wordt geladen} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{onbekende preamble --} +\setinterfacemessage{layouts}{1}{teksthoogte aangepast met -- op pagina --} +\setinterfacemessage{layouts}{3}{-- maal tekst plaatsen uitstellen} +\setinterfacemessage{layouts}{2}{-- maal uitgestelde tekst tussengevoegd} +\setinterfacemessage{layouts}{5}{margeblokken inactief} +\setinterfacemessage{layouts}{4}{margeblokken actief} +\setinterfacemessage{layouts}{7}{beeldmerken berekenen} +\setinterfacemessage{layouts}{6}{subpagina reeks -- verwerkt (aantal --)} +\setinterfacemessage{layouts}{9}{momenteel maximaal -- niveaus in opsommingen} +\setinterfacemessage{layouts}{8}{achtergronden berekenen} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{interlinie -- niet toegestaan in gridmode} +\setinterfacemessage{layouts}{10}{-- en -- tellen niet op tot 1.0} \setinterfacemessage{fonts}{1}{codering --} \setinterfacemessage{fonts}{3}{onbekende variant --} \setinterfacemessage{fonts}{2}{variant -- wordt geladen} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{lokaal bestand --} \setinterfacemessage{databases}{4}{onbekend bestand --} \setinterfacemessage{databases}{title}{database} -\setinterfacemessage{colors}{1}{systeem -- is globaal actief} -\setinterfacemessage{colors}{3}{-- is niet gedefinieerd --} -\setinterfacemessage{colors}{2}{systeem -- is lokaal actief} -\setinterfacemessage{colors}{5}{onbekend systeem --} -\setinterfacemessage{colors}{4}{systeem -- wordt geladen} -\setinterfacemessage{colors}{7}{palet -- is niet beschikbaar} -\setinterfacemessage{colors}{6}{palet -- is beschikbaar} -\setinterfacemessage{colors}{9}{-- kleurruimte wordt niet ondersteund} -\setinterfacemessage{colors}{8}{specificatie -- bij -- wordt zwart} -\setinterfacemessage{colors}{title}{kleur} -\setinterfacemessage{colors}{12}{-- is geregistreerd} -\setinterfacemessage{colors}{11}{kleur wordt vertaald in grijs} -\setinterfacemessage{colors}{10}{-- kleurruimte wordt ondersteund} -\setinterfacemessage{layouts}{1}{teksthoogte aangepast met -- op pagina --} -\setinterfacemessage{layouts}{3}{-- maal tekst plaatsen uitstellen} -\setinterfacemessage{layouts}{2}{-- maal uitgestelde tekst tussengevoegd} -\setinterfacemessage{layouts}{5}{margeblokken inactief} -\setinterfacemessage{layouts}{4}{margeblokken actief} -\setinterfacemessage{layouts}{7}{beeldmerken berekenen} -\setinterfacemessage{layouts}{6}{subpagina reeks -- verwerkt (aantal --)} -\setinterfacemessage{layouts}{9}{momenteel maximaal -- niveaus in opsommingen} -\setinterfacemessage{layouts}{8}{achtergronden berekenen} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{interlinie -- niet toegestaan in gridmode} -\setinterfacemessage{layouts}{10}{-- en -- tellen niet op tot 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{script set -- wordt geladen} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{onbekende preamble --} \setinterfacemessage{check}{1}{'=' ontbreekt of zonder {} na '--' in regel --} \setinterfacemessage{check}{3}{-- -- vervangt een macro, gebruik HOOFDLETTERS!} \setinterfacemessage{check}{2}{-- argument(en) verwacht in regel --} \setinterfacemessage{check}{title}{controle} \setinterfacemessage{metapost}{1}{metapost bibliotheek -- wordt geladen} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{file synoniem -- is al in gebruik voor --} -\setinterfacemessage{files}{title}{files} \setinterfacemessage{figures}{1}{figuur -- is niet te vinden} \setinterfacemessage{figures}{3}{maten van -- worden extern vastgesteld} \setinterfacemessage{figures}{2}{figuur -- wordt niet preset} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{maten van -- berekend door rlxtools} \setinterfacemessage{figures}{8}{figuurobject -- wordt opnieuw gebruikt} \setinterfacemessage{figures}{title}{figuren} +\setinterfacemessage{colors}{1}{systeem -- is globaal actief} +\setinterfacemessage{colors}{3}{-- is niet gedefinieerd --} +\setinterfacemessage{colors}{2}{systeem -- is lokaal actief} +\setinterfacemessage{colors}{5}{onbekend systeem --} +\setinterfacemessage{colors}{4}{systeem -- wordt geladen} +\setinterfacemessage{colors}{7}{palet -- is niet beschikbaar} +\setinterfacemessage{colors}{6}{palet -- is beschikbaar} +\setinterfacemessage{colors}{9}{-- kleurruimte wordt niet ondersteund} +\setinterfacemessage{colors}{8}{specificatie -- bij -- wordt zwart} +\setinterfacemessage{colors}{title}{kleur} +\setinterfacemessage{colors}{12}{-- is geregistreerd} +\setinterfacemessage{colors}{11}{kleur wordt vertaald in grijs} +\setinterfacemessage{colors}{10}{-- kleurruimte wordt ondersteund} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mno.tex b/tex/context/base/mult-mno.tex index 676c2cb2c..93dcc3cf6 100644 --- a/tex/context/base/mult-mno.tex +++ b/tex/context/base/mult-mno.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interaksjon} \setinterfacemessage{interactions}{21}{-- kode satt inn / tilføyd} +\setinterfacemessage{regimes}{1}{koding --} +\setinterfacemessage{regimes}{3}{ukjent koding --} +\setinterfacemessage{regimes}{2}{koding -- er lest inn} +\setinterfacemessage{regimes}{title}{koding} \setinterfacemessage{structures}{1}{starten av blokk -- (seksjon)} \setinterfacemessage{structures}{title}{struktur} \setinterfacemessage{structures}{2}{slutten av blokk -- (seksjon)} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{spràk spesifikk opsjon [--] problemfritt tilføyd} \setinterfacemessage{linguals}{title}{sprøk} \setinterfacemessage{linguals}{10}{orddelingsmønster -- er lest inn} -\setinterfacemessage{regimes}{1}{koding --} -\setinterfacemessage{regimes}{3}{ukjent koding --} -\setinterfacemessage{regimes}{2}{koding -- er lest inn} -\setinterfacemessage{regimes}{title}{koding} +\setinterfacemessage{verbatims}{1}{fil -- eksisterer ikke} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- is loaded} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{fil -- eksisterer ikke} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{ny versjon, andre gjennomkjøring nødvendig} +\setinterfacemessage{textblocks}{3}{leser blokker fra --} +\setinterfacemessage{textblocks}{2}{skriver blokker til --} +\setinterfacemessage{textblocks}{5}{-- ikke skjult} +\setinterfacemessage{textblocks}{4}{andre gjennomkjøring nødvendig} +\setinterfacemessage{textblocks}{7}{-- skjult} +\setinterfacemessage{textblocks}{6}{-- skjult og behandlet} +\setinterfacemessage{textblocks}{9}{-- ikke tegnsatt} +\setinterfacemessage{textblocks}{8}{-- tegnsatt} +\setinterfacemessage{textblocks}{title}{tekstblokker} +\setinterfacemessage{textblocks}{12}{-- utelatt} +\setinterfacemessage{textblocks}{11}{-- lest inn og tegnsatt} +\setinterfacemessage{textblocks}{10}{-- lest inn og behandlet} \setinterfacemessage{encodings}{1}{koding --} \setinterfacemessage{encodings}{3}{ukjent koding --} \setinterfacemessage{encodings}{2}{koding -- er lest inn} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{flytblokk forskjøvet til neste kolonne / --} \setinterfacemessage{columns}{11}{flytblokk for bredt for kolonna} \setinterfacemessage{columns}{10}{(mindre enn) 1 linje igjen} -\setinterfacemessage{textblocks}{1}{ny versjon, andre gjennomkjøring nødvendig} -\setinterfacemessage{textblocks}{3}{leser blokker fra --} -\setinterfacemessage{textblocks}{2}{skriver blokker til --} -\setinterfacemessage{textblocks}{5}{-- ikke skjult} -\setinterfacemessage{textblocks}{4}{andre gjennomkjøring nødvendig} -\setinterfacemessage{textblocks}{7}{-- skjult} -\setinterfacemessage{textblocks}{6}{-- skjult og behandlet} -\setinterfacemessage{textblocks}{9}{-- ikke tegnsatt} -\setinterfacemessage{textblocks}{8}{-- tegnsatt} -\setinterfacemessage{textblocks}{title}{tekstblokker} -\setinterfacemessage{textblocks}{12}{-- utelatt} -\setinterfacemessage{textblocks}{11}{-- lest inn og tegnsatt} -\setinterfacemessage{textblocks}{10}{-- lest inn og behandlet} \setinterfacemessage{symbols}{1}{leser inn symbolsett --} \setinterfacemessage{symbols}{title}{symboler} +\setinterfacemessage{files}{1}{filesynonym -- er allerede brukt for --} +\setinterfacemessage{files}{title}{filer} \setinterfacemessage{versions}{1}{manglende @+} \setinterfacemessage{versions}{3}{valgte sider: --} \setinterfacemessage{versions}{2}{markerer sider} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{ukjent driver --} \setinterfacemessage{specials}{6}{'nesting' er ikke tillatt} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{leser inn scriptsett --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{ukjent 'preamble' --} +\setinterfacemessage{layouts}{1}{teksthøyde tilpasset med -- på side --} +\setinterfacemessage{layouts}{3}{-- ganger tekst forskjøvet} +\setinterfacemessage{layouts}{2}{-- ganger forskjøvet tekst plassert} +\setinterfacemessage{layouts}{5}{margblokker inaktive} +\setinterfacemessage{layouts}{4}{margblokker aktive} +\setinterfacemessage{layouts}{7}{beregner plass for logo} +\setinterfacemessage{layouts}{6}{delside sett -- behandlet (størrelse --)} +\setinterfacemessage{layouts}{9}{for øyeblikket maksimalt -- nivåer i opplisting} +\setinterfacemessage{layouts}{8}{beregner bakgrunn} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{mellomrom -- ikke tillatt i gridmodus} +\setinterfacemessage{layouts}{10}{-- og -- er ikke 1.0 til sammen} \setinterfacemessage{fonts}{1}{koding --} \setinterfacemessage{fonts}{3}{ukjent variant --} \setinterfacemessage{fonts}{2}{variant -- er lest inn} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{lokal fil --} \setinterfacemessage{databases}{4}{ukjent fil --} \setinterfacemessage{databases}{title}{databaser} -\setinterfacemessage{colors}{1}{system -- er aktivert globalt} -\setinterfacemessage{colors}{3}{-- er udefinert --} -\setinterfacemessage{colors}{2}{system -- er aktivert lokalt} -\setinterfacemessage{colors}{5}{ukjent system --} -\setinterfacemessage{colors}{4}{system -- er lest inn} -\setinterfacemessage{colors}{7}{palett -- er ikke tilgjengelig} -\setinterfacemessage{colors}{6}{palett -- er tilgjengelig} -\setinterfacemessage{colors}{9}{-- fargerom er ikke støttet} -\setinterfacemessage{colors}{8}{spesifikasjon -- for farge -- gir kun svart} -\setinterfacemessage{colors}{title}{farge} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{fargen vil bli vist som grø} -\setinterfacemessage{colors}{10}{-- fargerom er støttet} -\setinterfacemessage{layouts}{1}{teksthøyde tilpasset med -- på side --} -\setinterfacemessage{layouts}{3}{-- ganger tekst forskjøvet} -\setinterfacemessage{layouts}{2}{-- ganger forskjøvet tekst plassert} -\setinterfacemessage{layouts}{5}{margblokker inaktive} -\setinterfacemessage{layouts}{4}{margblokker aktive} -\setinterfacemessage{layouts}{7}{beregner plass for logo} -\setinterfacemessage{layouts}{6}{delside sett -- behandlet (størrelse --)} -\setinterfacemessage{layouts}{9}{for øyeblikket maksimalt -- nivåer i opplisting} -\setinterfacemessage{layouts}{8}{beregner bakgrunn} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{mellomrom -- ikke tillatt i gridmodus} -\setinterfacemessage{layouts}{10}{-- og -- er ikke 1.0 til sammen} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{leser inn scriptsett --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{ukjent 'preamble' --} \setinterfacemessage{check}{1}{manglende '=' etter '--' i linje --} \setinterfacemessage{check}{3}{-- -- overskygger en makro, bruk STORE BOKSTAVER!} \setinterfacemessage{check}{2}{-- argument forventet i linje --} \setinterfacemessage{check}{title}{kontroll} \setinterfacemessage{metapost}{1}{metapost bibliotek -- blir lest inn} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{filesynonym -- er allerede brukt for --} -\setinterfacemessage{files}{title}{filer} \setinterfacemessage{figures}{1}{figure -- can not be found} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{figure -- is not preset} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimensions of -- calculated by rlxtools} \setinterfacemessage{figures}{8}{figureobject -- is reused} \setinterfacemessage{figures}{title}{figures} +\setinterfacemessage{colors}{1}{system -- er aktivert globalt} +\setinterfacemessage{colors}{3}{-- er udefinert --} +\setinterfacemessage{colors}{2}{system -- er aktivert lokalt} +\setinterfacemessage{colors}{5}{ukjent system --} +\setinterfacemessage{colors}{4}{system -- er lest inn} +\setinterfacemessage{colors}{7}{palett -- er ikke tilgjengelig} +\setinterfacemessage{colors}{6}{palett -- er tilgjengelig} +\setinterfacemessage{colors}{9}{-- fargerom er ikke støttet} +\setinterfacemessage{colors}{8}{spesifikasjon -- for farge -- gir kun svart} +\setinterfacemessage{colors}{title}{farge} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{fargen vil bli vist som grø} +\setinterfacemessage{colors}{10}{-- fargerom er støttet} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mpe.tex b/tex/context/base/mult-mpe.tex index 8335d2911..ab10cebcd 100644 --- a/tex/context/base/mult-mpe.tex +++ b/tex/context/base/mult-mpe.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interaction} \setinterfacemessage{interactions}{21}{-- code inserted} +\setinterfacemessage{regimes}{1}{regime --} +\setinterfacemessage{regimes}{3}{unknown regime --} +\setinterfacemessage{regimes}{2}{regime -- is loaded} +\setinterfacemessage{regimes}{title}{regime} \setinterfacemessage{structures}{1}{begin of sectionblock --} \setinterfacemessage{structures}{title}{structure} \setinterfacemessage{structures}{2}{end of sectionblock --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{language specific options [--] seamless appended} \setinterfacemessage{linguals}{title}{language} \setinterfacemessage{linguals}{10}{patterns --loaded} -\setinterfacemessage{regimes}{1}{regime --} -\setinterfacemessage{regimes}{3}{unknown regime --} -\setinterfacemessage{regimes}{2}{regime -- is loaded} -\setinterfacemessage{regimes}{title}{regime} +\setinterfacemessage{verbatims}{1}{file -- does not exist} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- is loaded} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{file -- does not exist} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{new version, second pass needed} +\setinterfacemessage{textblocks}{3}{reading blocks from --} +\setinterfacemessage{textblocks}{2}{writing blocks to --} +\setinterfacemessage{textblocks}{5}{-- not hidden} +\setinterfacemessage{textblocks}{4}{second pass needed} +\setinterfacemessage{textblocks}{7}{-- hidden} +\setinterfacemessage{textblocks}{6}{-- hidden and processed} +\setinterfacemessage{textblocks}{9}{-- not typeset} +\setinterfacemessage{textblocks}{8}{-- typeset} +\setinterfacemessage{textblocks}{title}{textblocks} +\setinterfacemessage{textblocks}{12}{-- skipped} +\setinterfacemessage{textblocks}{11}{-- loaded and typeset} +\setinterfacemessage{textblocks}{10}{-- loaded and processed} \setinterfacemessage{encodings}{1}{coding --} \setinterfacemessage{encodings}{3}{unknown coding --} \setinterfacemessage{encodings}{2}{coding -- is loaded} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{float moved to next column / --} \setinterfacemessage{columns}{11}{float too wide for column} \setinterfacemessage{columns}{10}{(less than) 1 line left} -\setinterfacemessage{textblocks}{1}{new version, second pass needed} -\setinterfacemessage{textblocks}{3}{reading blocks from --} -\setinterfacemessage{textblocks}{2}{writing blocks to --} -\setinterfacemessage{textblocks}{5}{-- not hidden} -\setinterfacemessage{textblocks}{4}{second pass needed} -\setinterfacemessage{textblocks}{7}{-- hidden} -\setinterfacemessage{textblocks}{6}{-- hidden and processed} -\setinterfacemessage{textblocks}{9}{-- not typeset} -\setinterfacemessage{textblocks}{8}{-- typeset} -\setinterfacemessage{textblocks}{title}{textblocks} -\setinterfacemessage{textblocks}{12}{-- skipped} -\setinterfacemessage{textblocks}{11}{-- loaded and typeset} -\setinterfacemessage{textblocks}{10}{-- loaded and processed} \setinterfacemessage{symbols}{1}{loading symbolset --} \setinterfacemessage{symbols}{title}{symbols} +\setinterfacemessage{files}{1}{file synonym -- is already used for --} +\setinterfacemessage{files}{title}{files} \setinterfacemessage{versions}{1}{missing @+} \setinterfacemessage{versions}{3}{selected pages: --} \setinterfacemessage{versions}{2}{marking pages} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{unknown driver --} \setinterfacemessage{specials}{6}{nesting is not permitted} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{loading script set --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{unknown preamble --} +\setinterfacemessage{layouts}{1}{textheight adapted with -- at page --} +\setinterfacemessage{layouts}{3}{-- times text postponed} +\setinterfacemessage{layouts}{2}{-- times postponed text placed} +\setinterfacemessage{layouts}{5}{marginblocks inactive} +\setinterfacemessage{layouts}{4}{marginblocks active} +\setinterfacemessage{layouts}{7}{calculating logospace} +\setinterfacemessage{layouts}{6}{subpage set -- processed (size --)} +\setinterfacemessage{layouts}{9}{currently no more than -- levels in itemizations} +\setinterfacemessage{layouts}{8}{calculating backgrounds} +\setinterfacemessage{layouts}{title}{layout} +\setinterfacemessage{layouts}{11}{spacing -- not permitted in gridmode} +\setinterfacemessage{layouts}{10}{-- and -- don't add up to 1.0} \setinterfacemessage{fonts}{1}{coding --} \setinterfacemessage{fonts}{3}{unknown variant --} \setinterfacemessage{fonts}{2}{variant -- is loaded} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{local file --} \setinterfacemessage{databases}{4}{unknown file --} \setinterfacemessage{databases}{title}{databases} -\setinterfacemessage{colors}{1}{system -- is global activated} -\setinterfacemessage{colors}{3}{-- is not defined --} -\setinterfacemessage{colors}{2}{system -- is local activated} -\setinterfacemessage{colors}{5}{unknown system --} -\setinterfacemessage{colors}{4}{system -- is loaded} -\setinterfacemessage{colors}{7}{palette -- is not available} -\setinterfacemessage{colors}{6}{palette -- is available} -\setinterfacemessage{colors}{9}{-- color space is not supported} -\setinterfacemessage{colors}{8}{specification -- at color -- becomes black} -\setinterfacemessage{colors}{title}{color} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{color is converted to gray} -\setinterfacemessage{colors}{10}{-- color space is supported} -\setinterfacemessage{layouts}{1}{textheight adapted with -- at page --} -\setinterfacemessage{layouts}{3}{-- times text postponed} -\setinterfacemessage{layouts}{2}{-- times postponed text placed} -\setinterfacemessage{layouts}{5}{marginblocks inactive} -\setinterfacemessage{layouts}{4}{marginblocks active} -\setinterfacemessage{layouts}{7}{calculating logospace} -\setinterfacemessage{layouts}{6}{subpage set -- processed (size --)} -\setinterfacemessage{layouts}{9}{currently no more than -- levels in itemizations} -\setinterfacemessage{layouts}{8}{calculating backgrounds} -\setinterfacemessage{layouts}{title}{layout} -\setinterfacemessage{layouts}{11}{spacing -- not permitted in gridmode} -\setinterfacemessage{layouts}{10}{-- and -- don't add up to 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{loading script set --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{unknown preamble --} \setinterfacemessage{check}{1}{missing or ungrouped '=' after '--' in line --} \setinterfacemessage{check}{3}{-- -- replaces a macro, use CAPITALS!} \setinterfacemessage{check}{2}{-- argument(s) expected in line --} \setinterfacemessage{check}{title}{check} \setinterfacemessage{metapost}{1}{loading metapost library --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{file synonym -- is already used for --} -\setinterfacemessage{files}{title}{files} \setinterfacemessage{figures}{1}{figure -- can not be found} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{figure -- is not preset} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimensions of -- calculated by rlxtools} \setinterfacemessage{figures}{8}{figureobject -- is reused} \setinterfacemessage{figures}{title}{figures} +\setinterfacemessage{colors}{1}{system -- is global activated} +\setinterfacemessage{colors}{3}{-- is not defined --} +\setinterfacemessage{colors}{2}{system -- is local activated} +\setinterfacemessage{colors}{5}{unknown system --} +\setinterfacemessage{colors}{4}{system -- is loaded} +\setinterfacemessage{colors}{7}{palette -- is not available} +\setinterfacemessage{colors}{6}{palette -- is available} +\setinterfacemessage{colors}{9}{-- color space is not supported} +\setinterfacemessage{colors}{8}{specification -- at color -- becomes black} +\setinterfacemessage{colors}{title}{color} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{color is converted to gray} +\setinterfacemessage{colors}{10}{-- color space is supported} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-mro.tex b/tex/context/base/mult-mro.tex index 3f52fbc70..2958d862c 100644 --- a/tex/context/base/mult-mro.tex +++ b/tex/context/base/mult-mro.tex @@ -66,6 +66,10 @@ \setinterfacemessage{interactions}{6}{attachment file -- does not exist} \setinterfacemessage{interactions}{title}{interactiuni} \setinterfacemessage{interactions}{21}{-- cod inserat} +\setinterfacemessage{regimes}{1}{codificarea --} +\setinterfacemessage{regimes}{3}{codificarea -- este necunoscuta} +\setinterfacemessage{regimes}{2}{codificarea -- este Encarcata} +\setinterfacemessage{regimes}{title}{codificari} \setinterfacemessage{structures}{1}{inceput de bloc sectiune --} \setinterfacemessage{structures}{title}{structuri} \setinterfacemessage{structures}{2}{sfarsit de bloc sectiune --} @@ -80,15 +84,24 @@ \setinterfacemessage{linguals}{8}{optiunile specifice ale limbii [--] adaugate} \setinterfacemessage{linguals}{title}{limbi} \setinterfacemessage{linguals}{10}{sabloanele -- incarcate} -\setinterfacemessage{regimes}{1}{codificarea --} -\setinterfacemessage{regimes}{3}{codificarea -- este necunoscuta} -\setinterfacemessage{regimes}{2}{codificarea -- este Encarcata} -\setinterfacemessage{regimes}{title}{codificari} +\setinterfacemessage{verbatims}{1}{fisierul -- nu exista} +\setinterfacemessage{verbatims}{title}{verbatim} \setinterfacemessage{filters}{1}{filter -- is loaded} \setinterfacemessage{filters}{title}{filter} \setinterfacemessage{filters}{2}{unknown filter --} -\setinterfacemessage{verbatims}{1}{fisierul -- nu exista} -\setinterfacemessage{verbatims}{title}{verbatim} +\setinterfacemessage{textblocks}{1}{o noua versiune, este nevoie de inca o trecere} +\setinterfacemessage{textblocks}{3}{se citesc blocurile din --} +\setinterfacemessage{textblocks}{2}{se scriu blocurile in --} +\setinterfacemessage{textblocks}{5}{-- nu este ascuns} +\setinterfacemessage{textblocks}{4}{este nevoie de inca o trecere} +\setinterfacemessage{textblocks}{7}{-- ascuns} +\setinterfacemessage{textblocks}{6}{-- ascuns si procesat} +\setinterfacemessage{textblocks}{9}{-- nu este cules} +\setinterfacemessage{textblocks}{8}{-- cules} +\setinterfacemessage{textblocks}{title}{blocuri de text} +\setinterfacemessage{textblocks}{12}{-- sarit peste} +\setinterfacemessage{textblocks}{11}{-- incarcat si cules} +\setinterfacemessage{textblocks}{10}{-- incarcat si procesat} \setinterfacemessage{encodings}{1}{codificarea --} \setinterfacemessage{encodings}{3}{codificarea -- este necunoscuta} \setinterfacemessage{encodings}{2}{codificarea -- este Encarcata} @@ -107,21 +120,10 @@ \setinterfacemessage{columns}{12}{blocul este mutat pe urmatoarea coloana / --} \setinterfacemessage{columns}{11}{blocul este prea lat pentru coloana} \setinterfacemessage{columns}{10}{a mai ramas (mai putin de) 1 linie} -\setinterfacemessage{textblocks}{1}{o noua versiune, este nevoie de inca o trecere} -\setinterfacemessage{textblocks}{3}{se citesc blocurile din --} -\setinterfacemessage{textblocks}{2}{se scriu blocurile in --} -\setinterfacemessage{textblocks}{5}{-- nu este ascuns} -\setinterfacemessage{textblocks}{4}{este nevoie de inca o trecere} -\setinterfacemessage{textblocks}{7}{-- ascuns} -\setinterfacemessage{textblocks}{6}{-- ascuns si procesat} -\setinterfacemessage{textblocks}{9}{-- nu este cules} -\setinterfacemessage{textblocks}{8}{-- cules} -\setinterfacemessage{textblocks}{title}{blocuri de text} -\setinterfacemessage{textblocks}{12}{-- sarit peste} -\setinterfacemessage{textblocks}{11}{-- incarcat si cules} -\setinterfacemessage{textblocks}{10}{-- incarcat si procesat} \setinterfacemessage{symbols}{1}{se incarca setul de simboluri --} \setinterfacemessage{symbols}{title}{simboluri} +\setinterfacemessage{files}{1}{sinonimul fisierelor -- este folosit deja pentru --} +\setinterfacemessage{files}{title}{fisiere} \setinterfacemessage{versions}{1}{lipseste @+} \setinterfacemessage{versions}{3}{pagini selectate: --} \setinterfacemessage{versions}{2}{pagini marcate} @@ -134,9 +136,18 @@ \setinterfacemessage{specials}{7}{driver necunoscut --} \setinterfacemessage{specials}{6}{imbricarea nu este permisa} \setinterfacemessage{specials}{title}{specials} -\setinterfacemessage{javascript}{1}{se incarca scriptul --} -\setinterfacemessage{javascript}{title}{javascript} -\setinterfacemessage{javascript}{2}{preambul necunoscut --} +\setinterfacemessage{layouts}{1}{textheight adaptat cu -- la pagina --} +\setinterfacemessage{layouts}{3}{textul amanat de -- ori} +\setinterfacemessage{layouts}{2}{textul amanat de -- ori a fost plasat} +\setinterfacemessage{layouts}{5}{blocuri marginale inactive} +\setinterfacemessage{layouts}{4}{blocuri marginale active} +\setinterfacemessage{layouts}{7}{se calculeaza spatiul pentru logo} +\setinterfacemessage{layouts}{6}{setul -- de subpagini procesat (dimensiunea --)} +\setinterfacemessage{layouts}{9}{acum nu se supota mai mult de -- nivele de adancime la iteratii} +\setinterfacemessage{layouts}{8}{se calculeaza fundalurile} +\setinterfacemessage{layouts}{title}{aranjamente} +\setinterfacemessage{layouts}{11}{spatierea -- nu este permisa in gridmode} +\setinterfacemessage{layouts}{10}{-- si -- nu se adauga pana la 1.0} \setinterfacemessage{fonts}{1}{codificarea --} \setinterfacemessage{fonts}{3}{varianta necunoscuta --} \setinterfacemessage{fonts}{2}{varianta -- este incarcata} @@ -153,39 +164,22 @@ \setinterfacemessage{databases}{2}{fisier local --} \setinterfacemessage{databases}{4}{fisier necunoscut --} \setinterfacemessage{databases}{title}{baze de date} -\setinterfacemessage{colors}{1}{sistem -- este activata global} -\setinterfacemessage{colors}{3}{-- nu este definita --} -\setinterfacemessage{colors}{2}{sistem -- este activata local} -\setinterfacemessage{colors}{5}{sistem -- necunoscuta} -\setinterfacemessage{colors}{4}{sistem -- este incarcata} -\setinterfacemessage{colors}{7}{palette -- nu este disponibila} -\setinterfacemessage{colors}{6}{paleta -- este disponibila} -\setinterfacemessage{colors}{9}{spatiul de culoare -- nu este suportat} -\setinterfacemessage{colors}{8}{specificatia -- la culoarea -- devine neagra} -\setinterfacemessage{colors}{title}{culori} -\setinterfacemessage{colors}{12}{-- is registered} -\setinterfacemessage{colors}{11}{culoarea este convertita la gri} -\setinterfacemessage{colors}{10}{spatiul de culoare -- este suportat} -\setinterfacemessage{layouts}{1}{textheight adaptat cu -- la pagina --} -\setinterfacemessage{layouts}{3}{textul amanat de -- ori} -\setinterfacemessage{layouts}{2}{textul amanat de -- ori a fost plasat} -\setinterfacemessage{layouts}{5}{blocuri marginale inactive} -\setinterfacemessage{layouts}{4}{blocuri marginale active} -\setinterfacemessage{layouts}{7}{se calculeaza spatiul pentru logo} -\setinterfacemessage{layouts}{6}{setul -- de subpagini procesat (dimensiunea --)} -\setinterfacemessage{layouts}{9}{acum nu se supota mai mult de -- nivele de adancime la iteratii} -\setinterfacemessage{layouts}{8}{se calculeaza fundalurile} -\setinterfacemessage{layouts}{title}{aranjamente} -\setinterfacemessage{layouts}{11}{spatierea -- nu este permisa in gridmode} -\setinterfacemessage{layouts}{10}{-- si -- nu se adauga pana la 1.0} +\setinterfacemessage{publications}{1}{file -- not found, unknown style ignored} +\setinterfacemessage{publications}{3}{wrote a new auxiliary file \jobname.aux} +\setinterfacemessage{publications}{title}{publications} +\setinterfacemessage{publications}{2}{file -- not found, waiting for bibtex} +\setinterfacemessage{publications}{4}{loading database from --} +\setinterfacemessage{publications}{5}{warning: cite argument -- on line \the\inputlineno} +\setinterfacemessage{publications}{6}{loading formatting style from --} +\setinterfacemessage{javascript}{1}{se incarca scriptul --} +\setinterfacemessage{javascript}{title}{javascript} +\setinterfacemessage{javascript}{2}{preambul necunoscut --} \setinterfacemessage{check}{1}{lipseste '=' dupa '--' in linia --} \setinterfacemessage{check}{3}{-- -- inlocuieste un macro, folositi MAJUSCULE!} \setinterfacemessage{check}{2}{argumentul(ele) -- sunt asteptate in linia --} \setinterfacemessage{check}{title}{verificari} \setinterfacemessage{metapost}{1}{se incarca biblioteca metapost --} \setinterfacemessage{metapost}{title}{metapost} -\setinterfacemessage{files}{1}{sinonimul fisierelor -- este folosit deja pentru --} -\setinterfacemessage{files}{title}{fisiere} \setinterfacemessage{figures}{1}{figura -- nu poate fi gasita} \setinterfacemessage{figures}{3}{dimensions of -- are determined externally} \setinterfacemessage{figures}{2}{figura -- nu este presetata} @@ -194,5 +188,18 @@ \setinterfacemessage{figures}{6}{dimensiunea figurii -- este calculata de rlxtools} \setinterfacemessage{figures}{8}{obiectul figura -- este refolosit} \setinterfacemessage{figures}{title}{figuri} +\setinterfacemessage{colors}{1}{sistem -- este activata global} +\setinterfacemessage{colors}{3}{-- nu este definita --} +\setinterfacemessage{colors}{2}{sistem -- este activata local} +\setinterfacemessage{colors}{5}{sistem -- necunoscuta} +\setinterfacemessage{colors}{4}{sistem -- este incarcata} +\setinterfacemessage{colors}{7}{palette -- nu este disponibila} +\setinterfacemessage{colors}{6}{paleta -- este disponibila} +\setinterfacemessage{colors}{9}{spatiul de culoare -- nu este suportat} +\setinterfacemessage{colors}{8}{specificatia -- la culoarea -- devine neagra} +\setinterfacemessage{colors}{title}{culori} +\setinterfacemessage{colors}{12}{-- is registered} +\setinterfacemessage{colors}{11}{culoarea este convertita la gri} +\setinterfacemessage{colors}{10}{spatiul de culoare -- este suportat} % \endinput
\ No newline at end of file diff --git a/tex/context/base/mult-nl.tex b/tex/context/base/mult-nl.tex index 492220961..7fe9e0e98 100644 --- a/tex/context/base/mult-nl.tex +++ b/tex/context/base/mult-nl.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{opmarge} \setinterfacevariable{atpage}{oppagina} \setinterfacevariable{august}{augustus} +\setinterfacevariable{author}{auteur} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{terug} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{uitleiding} \setinterfacevariable{backspace}{rugwit} \setinterfacevariable{backward}{achteruit} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{voor} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{groot} \setinterfacevariable{bigbodyfont}{grootkorps} \setinterfacevariable{bigpreference}{grotevoorkeur} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{hoofdstuk} \setinterfacevariable{character}{letter} \setinterfacevariable{characters}{letters} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{kleur} \setinterfacevariable{column}{kolom} \setinterfacevariable{columns}{kolommen} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{aanelkaar} \setinterfacevariable{setups}{instellingen} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{kort} \setinterfacevariable{singlesided}{enkelzijdig} \setinterfacevariable{slanted}{schuin} \setinterfacevariable{slantedbold}{schuinvet} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{uitlijnkarakter} \setinterfaceconstant{aligntitle}{titeluitlijnen} \setinterfaceconstant{alternative}{variant} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{pijl} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{op} \setinterfaceconstant{author}{auteur} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{snijwit} \setinterfaceconstant{dash}{streep} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{datum} \setinterfaceconstant{deepnumbercommand}{diepnummercommando} \setinterfaceconstant{deeptextcommand}{dieptekstcommando} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{rand} \setinterfaceconstant{edgedistance}{randafstand} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{leeg} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{veldoffset} \setinterfaceconstant{file}{file} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusuit} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{interlinie} \setinterfaceconstant{itemalign}{itemuitlijnen} \setinterfaceconstant{items}{items} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{sleutelexpansie} \setinterfaceconstant{keyword}{trefwoord} \setinterfaceconstant{label}{label} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{links} \setinterfaceconstant{leftcolor}{linkerkleur} \setinterfaceconstant{leftcompoundhyphen}{linkerkoppelteken} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{maxhoogte} \setinterfaceconstant{maxwidth}{maxbreedte} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{menu} \setinterfaceconstant{method}{methode} \setinterfaceconstant{middle}{midden} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{minbreedte} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{naam} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{nonder} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{volgende} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{openpaginaactie} \setinterfaceconstant{option}{optie} \setinterfaceconstant{orientation}{orientatie} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{buitenmarge} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{eigennummer} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{vorige} \setinterfaceconstant{previousnumber}{vorigenummer} \setinterfaceconstant{process}{proces} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{straal} \setinterfaceconstant{random}{willekeur} \setinterfaceconstant{reduction}{reductie} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{verwijzing} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{refereren} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{lijndikte} \setinterfaceconstant{samepage}{zelfdepagina} \setinterfaceconstant{sample}{monster} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{schaal} \setinterfaceconstant{scope}{scope} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{teken} \setinterfaceconstant{size}{formaat} \setinterfaceconstant{small}{klein} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sortering} \setinterfaceconstant{source}{bron} \setinterfaceconstant{space}{spatie} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{sub} \setinterfaceconstant{subtitle}{subtitel} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symuitlijnen} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{bovenoffset} \setinterfaceconstant{topspace}{kopwit} \setinterfaceconstant{topstate}{bovenstatus} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{type} \setinterfaceconstant{unit}{eenheid} \setinterfaceconstant{unknownreference}{onbekendeverwijzing} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{kopoffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{wijze} \setinterfaceconstant{wfactor}{bfactor} \setinterfaceconstant{white}{wit} diff --git a/tex/context/base/mult-ro.tex b/tex/context/base/mult-ro.tex index ece67fead..894b2e0d1 100644 --- a/tex/context/base/mult-ro.tex +++ b/tex/context/base/mult-ro.tex @@ -75,6 +75,7 @@ \setinterfacevariable{atmargin}{lamargine} \setinterfacevariable{atpage}{lapagina} \setinterfacevariable{august}{august} +\setinterfacevariable{author}{autor} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} \setinterfacevariable{back}{inapot} @@ -83,7 +84,9 @@ \setinterfacevariable{backpart}{epilog} \setinterfacevariable{backspace}{spatiuspate} \setinterfacevariable{backward}{inapoi} +\setinterfacevariable{bbl}{bbl} \setinterfacevariable{before}{inainte} +\setinterfacevariable{bib}{bib} \setinterfacevariable{big}{mare} \setinterfacevariable{bigbodyfont}{bigbodyfont} \setinterfacevariable{bigpreference}{preferintamare} @@ -108,6 +111,7 @@ \setinterfacevariable{chapter}{capitol} \setinterfacevariable{character}{caracter} \setinterfacevariable{characters}{caractere} +\setinterfacevariable{cite}{cite} \setinterfacevariable{color}{culoare} \setinterfacevariable{column}{coloana} \setinterfacevariable{columns}{coloane} @@ -386,6 +390,7 @@ \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{setari} \setinterfacevariable{sheet}{sheet} +\setinterfacevariable{short}{short} \setinterfacevariable{singlesided}{ofata} \setinterfacevariable{slanted}{inclinat} \setinterfacevariable{slantedbold}{inclinataldin} @@ -504,10 +509,18 @@ \setinterfaceconstant{alignmentcharacter}{alierecaracter} \setinterfaceconstant{aligntitle}{alinieretitlu} \setinterfaceconstant{alternative}{alternativ} +\setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arrow}{sageata} +\setinterfaceconstant{artauthor}{artauthor} +\setinterfaceconstant{artauthoretaldisplay}{artauthoretaldisplay} +\setinterfaceconstant{artauthoretallimit}{artauthoretallimit} +\setinterfaceconstant{artauthoretaltext}{artauthoretaltext} \setinterfaceconstant{at}{la} \setinterfaceconstant{author}{autor} +\setinterfaceconstant{authoretaldisplay}{authoretaldisplay} +\setinterfaceconstant{authoretallimit}{authoretallimit} +\setinterfaceconstant{authoretaltext}{authoretaltext} \setinterfaceconstant{auto}{auto} \setinterfaceconstant{autofile}{autofile} \setinterfaceconstant{autofocus}{autofocus} @@ -576,6 +589,7 @@ \setinterfaceconstant{cutspace}{cutspace} \setinterfaceconstant{dash}{dash} \setinterfaceconstant{dat}{dat} +\setinterfaceconstant{database}{database} \setinterfaceconstant{date}{data} \setinterfaceconstant{deepnumbercommand}{deepnumbercommand} \setinterfaceconstant{deeptextcommand}{deeptextcommand} @@ -594,6 +608,10 @@ \setinterfaceconstant{dy}{dy} \setinterfaceconstant{edge}{bordura} \setinterfaceconstant{edgedistance}{distantabordura} +\setinterfaceconstant{editor}{editor} +\setinterfaceconstant{editoretaldisplay}{editoretaldisplay} +\setinterfaceconstant{editoretallimit}{editoretallimit} +\setinterfaceconstant{editoretaltext}{editoretaltext} \setinterfaceconstant{empty}{gol} \setinterfaceconstant{equalheight}{equalheight} \setinterfaceconstant{equalwidth}{equalwidth} @@ -610,6 +628,8 @@ \setinterfaceconstant{fieldoffset}{offsetcamp} \setinterfaceconstant{file}{fisier} \setinterfaceconstant{filtercommand}{filtercommand} +\setinterfaceconstant{finalnamesep}{finalnamesep} +\setinterfaceconstant{firstnamesep}{firstnamesep} \setinterfaceconstant{focus}{focus} \setinterfaceconstant{focusin}{focusin} \setinterfaceconstant{focusout}{focusout} @@ -662,10 +682,13 @@ \setinterfaceconstant{interlinespace}{spatiereinterliniara} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elemente} +\setinterfaceconstant{juniorsep}{juniorsep} \setinterfaceconstant{ken}{ken} \setinterfaceconstant{keyexpansion}{keyexpansion} \setinterfaceconstant{keyword}{keyword} \setinterfaceconstant{label}{eticheta} +\setinterfaceconstant{lastnamesep}{lastnamesep} +\setinterfaceconstant{lastpubsep}{lastpubsep} \setinterfaceconstant{left}{stanga} \setinterfaceconstant{leftcolor}{culoarestanga} \setinterfaceconstant{leftcompoundhyphen}{leftcompoundhyphen} @@ -707,6 +730,7 @@ \setinterfaceconstant{max}{max} \setinterfaceconstant{maxheight}{inaltimemaxima} \setinterfaceconstant{maxwidth}{latimemaxima} +\setinterfaceconstant{maybeyear}{maybeyear} \setinterfaceconstant{menu}{meniu} \setinterfaceconstant{method}{metoda} \setinterfaceconstant{middle}{mijloc} @@ -719,6 +743,7 @@ \setinterfaceconstant{minwidth}{latimeminima} \setinterfaceconstant{n}{n} \setinterfaceconstant{name}{nume} +\setinterfaceconstant{namesep}{namesep} \setinterfaceconstant{nbottom}{njos} \setinterfaceconstant{nc}{nc} \setinterfaceconstant{next}{urmatorul} @@ -755,6 +780,7 @@ \setinterfaceconstant{openpageaction}{actiunedeschiderepagina} \setinterfaceconstant{option}{optiune} \setinterfaceconstant{orientation}{orientation} +\setinterfaceconstant{otherstext}{otherstext} \setinterfaceconstant{outermargin}{outermargin} \setinterfaceconstant{overprint}{overprint} \setinterfaceconstant{ownnumber}{numarpropriu} @@ -799,10 +825,12 @@ \setinterfaceconstant{previous}{precendent} \setinterfaceconstant{previousnumber}{numarprecedent} \setinterfaceconstant{process}{process} +\setinterfaceconstant{pubsep}{pubsep} \setinterfaceconstant{radius}{raza} \setinterfaceconstant{random}{aleator} \setinterfaceconstant{reduction}{reducere} \setinterfaceconstant{ref}{ref} +\setinterfaceconstant{refcommand}{refcommand} \setinterfaceconstant{reference}{referinta} \setinterfaceconstant{referenceprefix}{referenceprefix} \setinterfaceconstant{referencing}{referinta} @@ -836,6 +864,7 @@ \setinterfaceconstant{rulethickness}{grosimerigla} \setinterfaceconstant{samepage}{aceeasipagina} \setinterfaceconstant{sample}{exemplu} +\setinterfaceconstant{samplesize}{samplesize} \setinterfaceconstant{saveinlist}{saveinlist} \setinterfaceconstant{scale}{scala} \setinterfaceconstant{scope}{scop} @@ -860,6 +889,7 @@ \setinterfaceconstant{sign}{semn} \setinterfaceconstant{size}{dimensiune} \setinterfaceconstant{small}{mic} +\setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} \setinterfaceconstant{source}{sursa} \setinterfaceconstant{space}{spatiu} @@ -884,6 +914,7 @@ \setinterfaceconstant{sub}{sub} \setinterfaceconstant{subtitle}{subtitlu} \setinterfaceconstant{suffix}{suffix} +\setinterfaceconstant{surnamesep}{surnamesep} \setinterfaceconstant{sx}{sx} \setinterfaceconstant{sy}{sy} \setinterfaceconstant{symalign}{symaliniere} @@ -923,6 +954,7 @@ \setinterfaceconstant{topoffset}{offsetsus} \setinterfaceconstant{topspace}{spatiusus} \setinterfaceconstant{topstate}{staresus} +\setinterfaceconstant{totalnumber}{totalnumber} \setinterfaceconstant{type}{type} \setinterfaceconstant{unit}{unitate} \setinterfaceconstant{unknownreference}{referintanecunoscuta} @@ -933,6 +965,7 @@ \setinterfaceconstant{veroffset}{veroffset} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{voffset}{voffset} +\setinterfaceconstant{vonsep}{vonsep} \setinterfaceconstant{way}{mod} \setinterfaceconstant{wfactor}{factorw} \setinterfaceconstant{white}{alb} diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index 2fd74251c..2bf22e208 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -119,6 +119,7 @@ \definemessageconstant {versions} \definemessageconstant {metapost} \definemessageconstant {chemicals} +\definemessageconstant {publications} %D Net come some \CONTEXT\ constants, used in the definition %D of private commands: @@ -530,7 +531,7 @@ \definesystemvariable {ov} % OVerlay \definesystemvariable {ox} % OffsetBox \definesystemvariable {pa} % PAlet -\definesystemvariable {pb} % PuBlicatie +\definesystemvariable {pb} % PuBlication \definesystemvariable {pc} % PageComment \definesystemvariable {pe} % PagEhandler \definesystemvariable {pf} % ProFiel @@ -544,6 +545,7 @@ \definesystemvariable {ps} % PoSitioneren \definesystemvariable {pt} % PageshifT \definesystemvariable {py} % PropertYs +\definesystemvariable {pv} % PublicationVariable \definesystemvariable {rd} % RenDering \definesystemvariable {rf} % ReFereren \definesystemvariable {rg} % ReGel @@ -680,6 +682,7 @@ \definefileconstant {patternsextension} {pat} \definefileconstant {hyphensextension} {hyp} \definefileconstant {fontmapextension} {map} +\definefileconstant {bibextension} {bbl} %D These files are loaded at start||up. They may contain system %D specific setups (or calls to other files), old macro's, to diff --git a/tex/context/base/strc-itm.mkiv b/tex/context/base/strc-itm.mkiv index 6799a02a6..4b3f09e21 100644 --- a/tex/context/base/strc-itm.mkiv +++ b/tex/context/base/strc-itm.mkiv @@ -734,40 +734,50 @@ \dorechecknextindentation} \newtoks\itemgroupcommands +\newtoks\itemgroupfinalizer \def\itemgroupitem - {\doitemgroupitem} + {\the\itemgroupfinalizer + \doitemgroupitem} \def\itemgroupnoitem - {\doitemgroupnoitem} + {\the\itemgroupfinalizer + \doitemgroupnoitem} \def\itemgroupbutton[#1]% - {\gdef\doitemdestination{#1}% + {\the\itemgroupfinalizer + \gdef\doitemdestination{#1}% \itemgroupitem} \def\itemgroupdummy - {\itemgroupsymbol{\strut}\strut} + {\the\itemgroupfinalizer + \itemgroupsymbol{\strut}\strut} \def\itemgroupsubitem - {\settrue\sublistitem + {\the\itemgroupfinalizer + \settrue\sublistitem \itemgroupitem} \def\itemgroupsymbol#1% - {\def\symsymbol{#1}% + {\the\itemgroupfinalizer + \def\symsymbol{#1}% \settrue\symbollistitem \itemgroupitem} \def\itemgroupedge#1% - {\itemgroupsymbol + {\the\itemgroupfinalizer + \itemgroupsymbol {\calculatelistwidth\currentitemlevel \hbox to \itemgrouplistwidth {#1\hskip\getitemparameter\currentitemlevel\c!distance}}} \def\itemgrouphead - {\settrue\headlistitem\doitemgrouphead} + {\the\itemgroupfinalizer + \settrue\headlistitem\doitemgrouphead} \def\itemgroupitems - {\dosingleempty\doitemgroupitems} + {\the\itemgroupfinalizer + \dosingleempty\doitemgroupitems} \def\doitemgroupitems[#1]% {\itemgroupedge @@ -775,7 +785,8 @@ \unskip}} \def\itemgroupmargin#1% - {\def\marsymbol + {\the\itemgroupfinalizer + \def\marsymbol {\llap {\dosetitemattributes\currentitemlevel\c!marstyle\c!marcolor{#1}% \hskip\leftskip\hskip\leftmargindistance}}% @@ -1113,6 +1124,8 @@ % the next solution accepts \head test \type{x{x}x} test ... +\let\doenditemhead\relax + \def\complexdoitemgrouphead[#1]% beter in \complexdosom hangen met een if {\ifconditional\firstlistitem\else\allowitembreak\fi \ifconditional\packlistitem\else\itembeforeheadcommand\fi @@ -1123,6 +1136,7 @@ \bgroup \dosetitemattributes\currentitemlevel\c!headstyle\c!headcolor\empty \ignorespaces + \itemgroupfinalizer{\enditemhead}% \let\par\enditemhead} % brrrr but simple anyway \def\enditemhead diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua index dd45e7f68..592ea35e7 100644 --- a/tex/context/base/strc-lst.lua +++ b/tex/context/base/strc-lst.lua @@ -141,7 +141,16 @@ local function filter_collected(names, criterium, number, collected) hash[s] = true end end - if criterium == variables.all or criterium == variables.text then + if criterium == variables.intro then + -- special case, no structure yet + for i=1,#collected do + local v = collected[i] + local r = v.references + if r and r.section == 0 then + result[#result+1] = v + end + end + elseif criterium == variables.all or criterium == variables.text then for i=1,#collected do local v = collected[i] local r = v.references @@ -156,26 +165,30 @@ local function filter_collected(names, criterium, number, collected) end end elseif criterium == variables.current then - for i=1,#collected do - local v = collected[i] - local r = v.references - if r then - local sectionnumber = jobsections.collected[r.section] - if sectionnumber then -- and not sectionnumber.hidenumber then - local cnumbers = sectionnumber.numbers - local metadata = v.metadata - if cnumbers then - if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers > depth then - local ok = true - for d=1,depth do - local cnd = cnumbers[d] - if not (cnd == 0 or cnd == numbers[d]) then - ok = false - break + if depth == 0 then + return filter_collected(names,variables.intro,number,collected) + else + for i=1,#collected do + local v = collected[i] + local r = v.references + if r then + local sectionnumber = jobsections.collected[r.section] + if sectionnumber then -- and not sectionnumber.hidenumber then + local cnumbers = sectionnumber.numbers + local metadata = v.metadata + if cnumbers then + if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers > depth then + local ok = true + for d=1,depth do + local cnd = cnumbers[d] + if not (cnd == 0 or cnd == numbers[d]) then + ok = false + break + end + end + if ok then + result[#result+1] = v end - end - if ok then - result[#result+1] = v end end end @@ -183,26 +196,30 @@ local function filter_collected(names, criterium, number, collected) end end elseif criterium == variables.here then - for i=1,#collected do - local v = collected[i] - local r = v.references - if r then - local sectionnumber = jobsections.collected[r.section] - if sectionnumber then -- and not sectionnumber.hidenumber then - local cnumbers = sectionnumber.numbers - local metadata = v.metadata - if cnumbers then - if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers >= depth then - local ok = true - for d=1,depth do - local cnd = cnumbers[d] - if not (cnd == 0 or cnd == numbers[d]) then - ok = false - break + if depth == 0 then + return filter_collected(names,variables.intro,number,collected) + else + for i=1,#collected do + local v = collected[i] + local r = v.references + if r then + local sectionnumber = jobsections.collected[r.section] + if sectionnumber then -- and not sectionnumber.hidenumber then + local cnumbers = sectionnumber.numbers + local metadata = v.metadata + if cnumbers then + if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers >= depth then + local ok = true + for d=1,depth do + local cnd = cnumbers[d] + if not (cnd == 0 or cnd == numbers[d]) then + ok = false + break + end + end + if ok then + result[#result+1] = v end - end - if ok then - result[#result+1] = v end end end @@ -210,26 +227,30 @@ local function filter_collected(names, criterium, number, collected) end end elseif criterium == variables.previous then - for i=1,#collected do - local v = collected[i] - local r = v.references - if r then - local sectionnumber = jobsections.collected[r.section] - if sectionnumber then -- and not sectionnumber.hidenumber then - local cnumbers = sectionnumber.numbers - local metadata = v.metadata - if cnumbers then - if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers >= depth then - local ok = true - for d=1,depth-1 do - local cnd = cnumbers[d] - if not (cnd == 0 or cnd == numbers[d]) then - ok = false - break + if depth == 0 then + return filter_collected(names,variables.intro,number,collected) + else + for i=1,#collected do + local v = collected[i] + local r = v.references + if r then + local sectionnumber = jobsections.collected[r.section] + if sectionnumber then -- and not sectionnumber.hidenumber then + local cnumbers = sectionnumber.numbers + local metadata = v.metadata + if cnumbers then + if metadata and not metadata.nolist and (all or hash[metadata.name or false]) and #cnumbers >= depth then + local ok = true + for d=1,depth-1 do + local cnd = cnumbers[d] + if not (cnd == 0 or cnd == numbers[d]) then + ok = false + break + end + end + if ok then + result[#result+1] = v end - end - if ok then - result[#result+1] = v end end end diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv index 440047a42..7ac68abc8 100644 --- a/tex/context/base/strc-lst.mkiv +++ b/tex/context/base/strc-lst.mkiv @@ -355,11 +355,11 @@ \utilitydonetrue \setsystemmode \v!list \fi} -\def\systemsuppliedchapter {\getvalue{\v!chapter}} % brrr -\def\systemsuppliedtitle {\getvalue{\v!title}} % brrr +\unexpanded\def\systemsuppliedchapter {\getvalue{\v!chapter}} % brrr +\unexpanded\def\systemsuppliedtitle {\getvalue{\v!title}} % brrr \def\dodocompletelist[#1][#2][#3]% enkelvoud, meervoud, instellingen - {\normalexpanded{\noexpand\systemsuppliedtitle[#2]{\noexpand\headtext{#2}}}% expansion needed for v! vs french ! + {\normalexpanded{\systemsuppliedtitle[#2]{\noexpand\headtext{#2}}}% expansion needed for v! vs french ! \doplacelist[#1][#3]} \def\docompletelist[#1][#2]% @@ -850,7 +850,7 @@ \dosetlistmode} \def\docompletecombinedlist[#1][#2]% - {\normalexpanded{\noexpand\systemsuppliedtitle[#1]{\noexpand\headtext{#1}}}% expansion due to v! vs french ! + {\normalexpanded{\systemsuppliedtitle[#1]{\noexpand\headtext{#1}}}% expansion due to v! vs french ! \doplacecombinedlist[#1][#2]} % lists that have a number/title are kind of generic and can share code diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv index 4b033cbf9..7c2b082fa 100644 --- a/tex/context/base/strc-not.mkiv +++ b/tex/context/base/strc-not.mkiv @@ -1014,7 +1014,7 @@ {\ifcase\clevernotes % tricky here ! ! ! to be sorted out ! ! ! \doaddtototalnoteheight\currentnoteins \else - \doaddtototalnoteheight\currentbackupnoteins +% \doaddtototalnoteheight\currentbackupnoteins \fi} \def\docalculatetotalclevernoteheight diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua index eb4f74ce8..2684c287e 100644 --- a/tex/context/base/strc-ref.lua +++ b/tex/context/base/strc-ref.lua @@ -444,6 +444,15 @@ local function identify(prefix,reference) for i=1,#set do local var = set[i] local special, inner, outer, arguments, operation = var.special, var.inner, var.outer, var.arguments, var.operation +--~ local uo = urls[outer] +--~ if uo then +--~ special, operation, argument = "url", uo[1], inner or uo[2] -- maybe more is needed +--~ else +--~ local fo = files[outer] +--~ if fo then +--~ special, operation, argument = "file", fo[1], inner -- maybe more is needed +--~ end +--~ end if special then local s = specials[special] if s then @@ -665,9 +674,9 @@ function jobreferences.filter(name) -- number page title ... local kind = data.metadata and data.metadata.kind if kind then local filter = filters[kind] or filters.generic - filter = filter and (filter[name] or filters.generic[name]) + filter = filter and (filter[name] or filter.unknown or filters.generic[name] or filters.generic.unknown) if filter then - filter(data) + filter(data,name) elseif trace_referencing then logs.report("referencing","no (generic) filter.name for '%s'",name) end @@ -713,6 +722,27 @@ function filters.generic.page(data,prefixspec,pagespec) helpers.prefixpage(data,prefixspec,pagespec) end +filters.user = { } + +function filters.user.unknown(data,name) + if data then + local userdata = data.userdata + local userkind = userdata and userdata.kind + if userkind then + local filter = filters[userkind] or filters.generic + filter = filter and (filter[name] or filter.unknown) + if filter then + filter(data,name) + return + end + end + local namedata = userdata and userdata[name] + if namedata then + texsprint(ctxcatcodes,namedata) + end + end +end + filters.text = { } function filters.text.title(data) diff --git a/tex/context/base/strc-ref.mkiv b/tex/context/base/strc-ref.mkiv index 5db3d0013..7f5ebd0b3 100644 --- a/tex/context/base/strc-ref.mkiv +++ b/tex/context/base/strc-ref.mkiv @@ -46,6 +46,7 @@ \let\setexecutecommandcheck\gobbletwoarguments \def\s!full{full} +\def\s!user{user} \def\s!text{text} \def\s!page{page} @@ -92,12 +93,14 @@ \def\textreference {\dosingleargument\dotextreference} \def\pagereference {\dosingleargument\dopagereference} \def\reference {\dosingleargument\doreference } +\def\setreference {\dodoubleargument\dosetreference } %D These are implemented in a low level form as: -\def\dotextreference[#1]{\dosetreference\s!text{#1}} -\def\dopagereference[#1]{\dosetreference\s!page{#1}{}} -\def\doreference [#1]{\dosetreference\s!full{#1}} +\def\dotextreference [#1]{\dodosetreference\s!text{#1}{}} +\def\dopagereference [#1]{\dodosetreference\s!page{#1}{}{}} +\def\doreference [#1]{\dodosetreference\s!full{#1}{}} +\def\dosetreference[#1][#2]{\dodosetreference\s!user{#1}{#2}{}} %D Actually there is not much difference between a text and a %D full reference, but it's the concept that counts. The low @@ -110,8 +113,9 @@ \def\dofinishtextreference#1#2{\normalexpanded{\ctxlatelua{jobreferences.enhance("#1","#2",{})}}} \let\dofinishpagereference\dofinishfullreference +\let\dofinishuserreference\dofinishfullreference -\def\dosetreference#1#2#3% kind labels text -> todo: userdata +\def\dodosetreference#1#2#3#4% kind labels userdata text -> todo: userdata {\ifreferencing \edef\currentreferencekind{#1}% \edef\currentreferencelabels{#2}% @@ -119,14 +123,14 @@ \ifx\currentreferencelabels\empty \else \ifx\currentreferenceexpansion\s!xml \xmlstartraw - \xdef\currentreferencetext{#3}% + \xdef\currentreferencedata{#4}% data, no text else conflict \xmlstopraw \globallet\currentreferencecoding\s!xml \else \ifx\currentreferenceexpansion\v!yes - \xdef\currentreferencetext{#3}% + \xdef\currentreferencedata{#4}% \else - \xdef\currentreferencetext{\detokenize{#3}}% + \xdef\currentreferencedata{\detokenize{#4}}% \fi \globallet\currentreferencecoding\s!tex \fi @@ -144,9 +148,12 @@ catcodes = \the\catcodetable, xmlroot = \ifx\currentreferencecoding\s!xml "\xmldocument" \else nil \fi, % only useful when text }, - entries = { - text = \!!bs\currentreferencetext\!!es - } + \ifx\currentreferencedata\empty\else + entries = { + text = \!!bs\currentreferencedata\!!es + }, + \fi + userdata = structure.helpers.touserdata(\!!bs\detokenize{#3}\!!es) }) }% \xdef\currentdestinationattribute{\number\lastdestinationattribute}% @@ -733,6 +740,8 @@ \def\currentreferencetext {\ctxlua{jobreferences.filter("text")}} \def\currentreferencerealpage{\ctxlua{jobreferences.realpage()}} +\def\getreferenceentry#1{\ctxlua{jobreferences.filter("#1")}} % user entry + \unexpanded\def\dospecialabout[#1]% {\dontleavehmode \begingroup @@ -1239,7 +1248,7 @@ {\dosingleempty\dodospecialfrom} \def\dodospecialfrom[#1]% - {\dontleavehmode\goto{\ctxlua{jobreferences.from("#1")}}[url(#1)]} + {\dontleavehmode\goto{\ctxlua{jobreferences.from("#1")}}[fileorurl(#1)]} %D We also support: %D diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv index 2ec448d97..86b828b53 100644 --- a/tex/context/base/strc-reg.mkiv +++ b/tex/context/base/strc-reg.mkiv @@ -417,7 +417,7 @@ \begingroup \edef\currentregister{#1}% % the expansion is needed because we don't want \v!'s in the tuo file (french) - \normalexpanded{\noexpand\systemsuppliedchapter[\currentregister]{\noexpand\headtext{\currentregister}}}% + \normalexpanded{\systemsuppliedchapter[\currentregister]{\noexpand\headtext{\currentregister}}}% \placeregister[\currentregister][#2]% \page[\v!yes]% \endgroup diff --git a/tex/context/base/strc-syn.mkiv b/tex/context/base/strc-syn.mkiv index 9865305c7..a6a7eac71 100644 --- a/tex/context/base/strc-syn.mkiv +++ b/tex/context/base/strc-syn.mkiv @@ -192,7 +192,7 @@ \endgroup} \def\docompletelistofsynonyms#1#2% expansion needed to avoid v! (due to french active !) - {\normalexpanded{\noexpand\systemsuppliedchapter[#1]{\noexpand\headtext{#2}}}% + {\normalexpanded{\systemsuppliedchapter[#1]{\noexpand\headtext{#2}}}% \doplacelistofsynonyms{#1}{#2}% \page[\v!yes]} @@ -322,7 +322,7 @@ \endgroup} \def\docompletelistofsorts#1#2% - {\normalexpanded{\noexpand\systemsuppliedchapter[#1]{\noexpand\headtext{#2}}}% + {\normalexpanded{\systemsuppliedchapter[#1]{\noexpand\headtext{#2}}}% \doplacelistofsorts{#1}% \page[\v!yes]} diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index e15d017a2..e3cb1e2fb 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -4997,6 +4997,8 @@ <cd:constant type="local"/> <cd:constant type="previous"/> <cd:constant type="current"/> + <cd:constant type="here"/> + <cd:constant type="intro"/> <cd:constant type="all"/> </cd:parameter> <cd:parameter name="pageboundaries"> diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 352245d6b..7806bf329 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='naokraji'/> <cd:variable name='atpage' value='nastrance'/> <cd:variable name='august' value='srpen'/> + <cd:variable name='author' value='autor'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autouvod'/> <cd:variable name='back' value='zpet'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='epilog'/> <cd:variable name='backspace' value='zpetnamezera'/> <cd:variable name='backward' value='zpet'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='pred'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='velke'/> <cd:variable name='bigbodyfont' value='bigbodyfont'/> <cd:variable name='bigpreference' value='vysokapriorita'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='kapitola'/> <cd:variable name='character' value='pismeno'/> <cd:variable name='characters' value='pismena'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='barevne'/> <cd:variable name='column' value='column'/> <cd:variable name='columns' value='sloupce'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='semknuto'/> <cd:variable name='setups' value='einstellungen'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='jednostranne'/> <cd:variable name='slanted' value='sklonene'/> <cd:variable name='slantedbold' value='sklonenetucne'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='alignmentcharacter'/> <cd:constant name='aligntitle' value='zarovnejtitul'/> <cd:constant name='alternative' value='alternativa'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='sipka'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='u'/> <cd:constant name='author' value='autor'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autoostreni'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='pomlcka'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='datum'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='hrana'/> <cd:constant name='edgedistance' value='vzdalenosthrany'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='prazdne'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='offsetpole'/> <cd:constant name='file' value='soubor'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='zaostreni'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='meziradkovamezera'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='polozky'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='keyword'/> <cd:constant name='label' value='popisek'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='vlevo'/> <cd:constant name='leftcolor' value='barvavlevo'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='maxvyska'/> <cd:constant name='maxwidth' value='maxsirka'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='metoda'/> <cd:constant name='middle' value='stredni'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='minsirka'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='jmeno'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nspodek'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='dalsi'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='akceotevrenistranky'/> <cd:constant name='option' value='volba'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='outermargin'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='vlastnicislo'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='predchozi'/> <cd:constant name='previousnumber' value='predchozicislo'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='polomer'/> <cd:constant name='random' value='nahodne'/> <cd:constant name='reduction' value='redukce'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='odkaz'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='odkazujici'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='tloustkalinky'/> <cd:constant name='samepage' value='stejnastranka'/> <cd:constant name='sample' value='vzor'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='meritko'/> <cd:constant name='scope' value='rozsah'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='znak'/> <cd:constant name='size' value='velikost'/> <cd:constant name='small' value='male'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='zdroj'/> <cd:constant name='space' value='mezera'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='pod'/> <cd:constant name='subtitle' value='podtitulek'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symzarovnani'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='offsetvrsku'/> <cd:constant name='topspace' value='svrchnimezera'/> <cd:constant name='topstate' value='statusvrsku'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='typ'/> <cd:constant name='unit' value='jednotka'/> <cd:constant name='unknownreference' value='neznamyodkaz'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='offsethlavicky'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='zpusob'/> <cd:constant name='wfactor' value='sfaktor'/> <cd:constant name='white' value='bily'/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 521a731c6..495c469f1 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='amrand'/> <cd:variable name='atpage' value='aufseite'/> <cd:variable name='august' value='August'/> + <cd:variable name='author' value='autor'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='zurueck'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='epilog'/> <cd:variable name='backspace' value='rumpfspatium'/> <cd:variable name='backward' value='rueckwaerts'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='vor'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='gross'/> <cd:variable name='bigbodyfont' value='bigbodyfont'/> <cd:variable name='bigpreference' value='grosszuegig'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='kapitel'/> <cd:variable name='character' value='buchstabe'/> <cd:variable name='characters' value='buchstaben'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='farbe'/> <cd:variable name='column' value='column'/> <cd:variable name='columns' value='spalten'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='kleinerabstand'/> <cd:variable name='setups' value='impostazioni'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='kurz'/> <cd:variable name='singlesided' value='einzelseitig'/> <cd:variable name='slanted' value='geneigt'/> <cd:variable name='slantedbold' value='geneigtfett'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='alignmentcharacter'/> <cd:constant name='aligntitle' value='titelausrichten'/> <cd:constant name='alternative' value='alternative'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='pfeil'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='bei'/> <cd:constant name='author' value='autor'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='strich'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='datum'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='kante'/> <cd:constant name='edgedistance' value='kantenabstand'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='leer'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='feldoffset'/> <cd:constant name='file' value='datei'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='zeilenabstande'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='posten'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='keyword'/> <cd:constant name='label' value='label'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='links'/> <cd:constant name='leftcolor' value='linkerfarbe'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='maxhoehe'/> <cd:constant name='maxwidth' value='maxbreite'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menue'/> <cd:constant name='method' value='methode'/> <cd:constant name='middle' value='mittig'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='minbreite'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='name'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nunten'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='folgende'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='openpageaction'/> <cd:constant name='option' value='option'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='outermargin'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='eigenenummer'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='vorige'/> <cd:constant name='previousnumber' value='vorigenummer'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='radius'/> <cd:constant name='random' value='zufaellig'/> <cd:constant name='reduction' value='reduktion'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='referenz'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='referieren'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='liniendicke'/> <cd:constant name='samepage' value='selbeseite'/> <cd:constant name='sample' value='muster'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='format'/> <cd:constant name='scope' value='bereich'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='zeichen'/> <cd:constant name='size' value='groesse'/> <cd:constant name='small' value='klein'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='quelle'/> <cd:constant name='space' value='spatium'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='unter'/> <cd:constant name='subtitle' value='untertitel'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symausrichtung'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='obenoffset'/> <cd:constant name='topspace' value='kopfspatium'/> <cd:constant name='topstate' value='statusoben'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='typ'/> <cd:constant name='unit' value='einheit'/> <cd:constant name='unknownreference' value='unbekantereferenz'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='kopfoffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='art'/> <cd:constant name='wfactor' value='bfaktor'/> <cd:constant name='white' value='weiss'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 2b7c68915..de535add6 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='atmargin'/> <cd:variable name='atpage' value='atpage'/> <cd:variable name='august' value='August'/> + <cd:variable name='author' value='author'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='back'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='backpart'/> <cd:variable name='backspace' value='backspace'/> <cd:variable name='backward' value='backward'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='before'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='big'/> <cd:variable name='bigbodyfont' value='bigbodyfont'/> <cd:variable name='bigpreference' value='bigpreference'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='chapter'/> <cd:variable name='character' value='character'/> <cd:variable name='characters' value='characters'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='color'/> <cd:variable name='column' value='column'/> <cd:variable name='columns' value='columns'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='setups'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='singlesided'/> <cd:variable name='slanted' value='slanted'/> <cd:variable name='slantedbold' value='slantedbold'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='alignmentcharacter'/> <cd:constant name='aligntitle' value='aligntitle'/> <cd:constant name='alternative' value='alternative'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='arrow'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='at'/> <cd:constant name='author' value='author'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='dash'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='date'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='edge'/> <cd:constant name='edgedistance' value='edgedistance'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='empty'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='fieldoffset'/> <cd:constant name='file' value='file'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='interlinespace'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='items'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='keyword'/> <cd:constant name='label' value='label'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='left'/> <cd:constant name='leftcolor' value='leftcolor'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='maxheight'/> <cd:constant name='maxwidth' value='maxwidth'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='method'/> <cd:constant name='middle' value='middle'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='minwidth'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='name'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nbottom'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='next'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='openpageaction'/> <cd:constant name='option' value='option'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='outermargin'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='ownnumber'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='previous'/> <cd:constant name='previousnumber' value='previousnumber'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='radius'/> <cd:constant name='random' value='random'/> <cd:constant name='reduction' value='reduction'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='reference'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='referencing'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='rulethickness'/> <cd:constant name='samepage' value='samepage'/> <cd:constant name='sample' value='sample'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='scale'/> <cd:constant name='scope' value='scope'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='sign'/> <cd:constant name='size' value='size'/> <cd:constant name='small' value='small'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='source'/> <cd:constant name='space' value='space'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='sub'/> <cd:constant name='subtitle' value='subtitle'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symalign'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='topoffset'/> <cd:constant name='topspace' value='topspace'/> <cd:constant name='topstate' value='topstate'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='type'/> <cd:constant name='unit' value='unit'/> <cd:constant name='unknownreference' value='unknownreference'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='veroffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='way'/> <cd:constant name='wfactor' value='wfactor'/> <cd:constant name='white' value='white'/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index d03d72a88..daa878d8c 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='alamarge'/> <cd:variable name='atpage' value='alapage'/> <cd:variable name='august' value='aout'/> + <cd:variable name='author' value='auteur'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='retour'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='postface'/> <cd:variable name='backspace' value='retourarriere'/> <cd:variable name='backward' value='retourarriere'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='avant'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='grand'/> <cd:variable name='bigbodyfont' value='grandepolicecorp'/> <cd:variable name='bigpreference' value='grandepreference'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='chapitre'/> <cd:variable name='character' value='caractere'/> <cd:variable name='characters' value='caracteres'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='couleur'/> <cd:variable name='column' value='colonne'/> <cd:variable name='columns' value='colonnes'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='reglages'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='recto'/> <cd:variable name='slanted' value='incline'/> <cd:variable name='slantedbold' value='grasincline'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='alignementcaractere'/> <cd:constant name='aligntitle' value='alignementtitre'/> <cd:constant name='alternative' value='alternative'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='fleche'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='a'/> <cd:constant name='author' value='auteur'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='pointille'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='date'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='bord'/> <cd:constant name='edgedistance' value='distancebord'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='vide'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='offsetchamp'/> <cd:constant name='file' value='fichier'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='espaceinterligne'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elements'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='motcle'/> <cd:constant name='label' value='etiquette'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='gauche'/> <cd:constant name='leftcolor' value='couleurgauche'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='hauteurmax'/> <cd:constant name='maxwidth' value='largeurmax'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='methode'/> <cd:constant name='middle' value='milieu'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='largeurmin'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nom'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='ninf'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='suivant'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='actionouverturepage'/> <cd:constant name='option' value='option'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='margeexterieure'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='numeroproprio'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='precedent'/> <cd:constant name='previousnumber' value='numeroprecedent'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='rayon'/> <cd:constant name='random' value='aleatoire'/> <cd:constant name='reduction' value='reduction'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='reference'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='referencing'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='epaisseurligne'/> <cd:constant name='samepage' value='memepage'/> <cd:constant name='sample' value='echantillon'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='echelle'/> <cd:constant name='scope' value='scope'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='signe'/> <cd:constant name='size' value='dimension'/> <cd:constant name='small' value='petit'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='origine'/> <cd:constant name='space' value='espace'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='sous'/> <cd:constant name='subtitle' value='soustitre'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symalignement'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='decalagesup'/> <cd:constant name='topspace' value='espacesup'/> <cd:constant name='topstate' value='etatsup'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='type'/> <cd:constant name='unit' value='unite'/> <cd:constant name='unknownreference' value='referenceinconnue'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='veroffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='mode'/> <cd:constant name='wfactor' value='facteurlargeur'/> <cd:constant name='white' value='blanc'/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index b2c01b916..1a099484d 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='almargine'/> <cd:variable name='atpage' value='apagina'/> <cd:variable name='august' value='agosto'/> + <cd:variable name='author' value='autore'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='dietro'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='postfazione'/> <cd:variable name='backspace' value='backspace'/> <cd:variable name='backward' value='indietro'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='prima'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='grande'/> <cd:variable name='bigbodyfont' value='grossofontdeltesto'/> <cd:variable name='bigpreference' value='grandepreferenza'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='capitolo'/> <cd:variable name='character' value='lettera'/> <cd:variable name='characters' value='lettere'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='colore'/> <cd:variable name='column' value='colonna'/> <cd:variable name='columns' value='colonne'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='vicino'/> <cd:variable name='setups' value='nastaveni'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='facciasingola'/> <cd:variable name='slanted' value='inclinato'/> <cd:variable name='slantedbold' value='inclinatograssetto'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='carattereallineamento'/> <cd:constant name='aligntitle' value='allineatitolo'/> <cd:constant name='alternative' value='alternativa'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='freccia'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='ad'/> <cd:constant name='author' value='autore'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='dash'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='data'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='bordo'/> <cd:constant name='edgedistance' value='distanzabordo'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='vuoto'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='offsetcampo'/> <cd:constant name='file' value='file'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='interlinea'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elementi'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='parolachiave'/> <cd:constant name='label' value='etichetta'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='sinistra'/> <cd:constant name='leftcolor' value='coloresinistra'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='altezzamax'/> <cd:constant name='maxwidth' value='ampiezzamax'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='metodo'/> <cd:constant name='middle' value='centro'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='ampiezzamin'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nome'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nfondo'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='successivo'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='azioneapripagina'/> <cd:constant name='option' value='opzione'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='margineesterno'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='numeroproprio'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='precedente'/> <cd:constant name='previousnumber' value='numeroprecedente'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='raggio'/> <cd:constant name='random' value='casuale'/> <cd:constant name='reduction' value='riduzione'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='riferimento'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='referencing'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='spessorelinea'/> <cd:constant name='samepage' value='stessapagina'/> <cd:constant name='sample' value='campione'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='scala'/> <cd:constant name='scope' value='scope'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='segno'/> <cd:constant name='size' value='dimensione'/> <cd:constant name='small' value='piccolo'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='origine'/> <cd:constant name='space' value='spazio'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='sotto'/> <cd:constant name='subtitle' value='sottotitolo'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symallinea'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='offsetcima'/> <cd:constant name='topspace' value='spaziocima'/> <cd:constant name='topstate' value='statocima'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='type'/> <cd:constant name='unit' value='unita'/> <cd:constant name='unknownreference' value='riferimentoingoto'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='veroffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='modo'/> <cd:constant name='wfactor' value='wfactor'/> <cd:constant name='white' value='bianco'/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 9bb953e9b..791111c8e 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='opmarge'/> <cd:variable name='atpage' value='oppagina'/> <cd:variable name='august' value='augustus'/> + <cd:variable name='author' value='auteur'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='terug'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='uitleiding'/> <cd:variable name='backspace' value='rugwit'/> <cd:variable name='backward' value='achteruit'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='voor'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='groot'/> <cd:variable name='bigbodyfont' value='grootkorps'/> <cd:variable name='bigpreference' value='grotevoorkeur'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='hoofdstuk'/> <cd:variable name='character' value='letter'/> <cd:variable name='characters' value='letters'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='kleur'/> <cd:variable name='column' value='kolom'/> <cd:variable name='columns' value='kolommen'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='aanelkaar'/> <cd:variable name='setups' value='instellingen'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='kort'/> <cd:variable name='singlesided' value='enkelzijdig'/> <cd:variable name='slanted' value='schuin'/> <cd:variable name='slantedbold' value='schuinvet'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='uitlijnkarakter'/> <cd:constant name='aligntitle' value='titeluitlijnen'/> <cd:constant name='alternative' value='variant'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='pijl'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='op'/> <cd:constant name='author' value='auteur'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='snijwit'/> <cd:constant name='dash' value='streep'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='datum'/> <cd:constant name='deepnumbercommand' value='diepnummercommando'/> <cd:constant name='deeptextcommand' value='dieptekstcommando'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='rand'/> <cd:constant name='edgedistance' value='randafstand'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='leeg'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='veldoffset'/> <cd:constant name='file' value='file'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusuit'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='interlinie'/> <cd:constant name='itemalign' value='itemuitlijnen'/> <cd:constant name='items' value='items'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='sleutelexpansie'/> <cd:constant name='keyword' value='trefwoord'/> <cd:constant name='label' value='label'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='links'/> <cd:constant name='leftcolor' value='linkerkleur'/> <cd:constant name='leftcompoundhyphen' value='linkerkoppelteken'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='maxhoogte'/> <cd:constant name='maxwidth' value='maxbreedte'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='methode'/> <cd:constant name='middle' value='midden'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='minbreedte'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='naam'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nonder'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='volgende'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='openpaginaactie'/> <cd:constant name='option' value='optie'/> <cd:constant name='orientation' value='orientatie'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='buitenmarge'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='eigennummer'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='vorige'/> <cd:constant name='previousnumber' value='vorigenummer'/> <cd:constant name='process' value='proces'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='straal'/> <cd:constant name='random' value='willekeur'/> <cd:constant name='reduction' value='reductie'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='verwijzing'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='refereren'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='lijndikte'/> <cd:constant name='samepage' value='zelfdepagina'/> <cd:constant name='sample' value='monster'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='schaal'/> <cd:constant name='scope' value='scope'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='teken'/> <cd:constant name='size' value='formaat'/> <cd:constant name='small' value='klein'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sortering'/> <cd:constant name='source' value='bron'/> <cd:constant name='space' value='spatie'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='sub'/> <cd:constant name='subtitle' value='subtitel'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symuitlijnen'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='bovenoffset'/> <cd:constant name='topspace' value='kopwit'/> <cd:constant name='topstate' value='bovenstatus'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='type'/> <cd:constant name='unit' value='eenheid'/> <cd:constant name='unknownreference' value='onbekendeverwijzing'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='kopoffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='wijze'/> <cd:constant name='wfactor' value='bfactor'/> <cd:constant name='white' value='wit'/> diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index 0086e5d13..62b4c5af6 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='درحاشیه'/> <cd:variable name='atpage' value='درصفحه'/> <cd:variable name='august' value='آگوست'/> + <cd:variable name='author' value='author'/> <cd:variable name='auto' value='خودکار'/> <cd:variable name='autointro' value='پیشگفتارخودکار'/> <cd:variable name='back' value='پشت'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='پسقسمت'/> <cd:variable name='backspace' value='فضایپشت'/> <cd:variable name='backward' value='عقبگرد'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='قبلاز'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='بزرگ'/> <cd:variable name='bigbodyfont' value='قلمبدنهبزرگ'/> <cd:variable name='bigpreference' value='اولویتبزرگ'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='فصل'/> <cd:variable name='character' value='حرف'/> <cd:variable name='characters' value='حرفها'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='رنگ'/> <cd:variable name='column' value='ستون'/> <cd:variable name='columns' value='ستونها'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='تنگهم'/> <cd:variable name='setups' value='بارگذاریها'/> <cd:variable name='sheet' value='ورقه'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='یکرو'/> <cd:variable name='slanted' value='خوابیده'/> <cd:variable name='slantedbold' value='مشکیخوابیده'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='حرفتنظیمکردن'/> <cd:constant name='aligntitle' value='عنوانتنظیم'/> <cd:constant name='alternative' value='جایگزین'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='پیکان'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='در'/> <cd:constant name='author' value='نویسنده'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='خودکار'/> <cd:constant name='autofile' value='پروندهخودکار'/> <cd:constant name='autofocus' value='تمرکزخودکار'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='فضایبرش'/> <cd:constant name='dash' value='دش'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='تاریخ'/> <cd:constant name='deepnumbercommand' value='فرمانشمارهعمیق'/> <cd:constant name='deeptextcommand' value='فرمانمتنعمیق'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='لبه'/> <cd:constant name='edgedistance' value='فاصلهلبه'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='تهی'/> <cd:constant name='equalheight' value='ارتفاعیکسان'/> <cd:constant name='equalwidth' value='عرضیکسان'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='آفستمیدان'/> <cd:constant name='file' value='پرونده'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='تمرکز'/> <cd:constant name='focusin' value='تمرکزدرون'/> <cd:constant name='focusout' value='تمرکزبیرون'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='فضایبینخط'/> <cd:constant name='itemalign' value='تنظیمآیتم'/> <cd:constant name='items' value='آیتمها'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='گسترشکلید'/> <cd:constant name='keyword' value='کلیدواژه'/> <cd:constant name='label' value='برچسب'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='چپ'/> <cd:constant name='leftcolor' value='رنگچپ'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='بیشترین'/> <cd:constant name='maxheight' value='بیشترینارتفاع'/> <cd:constant name='maxwidth' value='بیشترینعرض'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='منو'/> <cd:constant name='method' value='روش'/> <cd:constant name='middle' value='میان'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='کمترینعرض'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='نام'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='nbottom'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='بعدی'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='عملصفحهباز'/> <cd:constant name='option' value='گزینه'/> <cd:constant name='orientation' value='جهتدهی'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='حاشیهخارجی'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='شمارهخود'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='قبلی'/> <cd:constant name='previousnumber' value='شمارهقبلی'/> <cd:constant name='process' value='پردازش'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='شعاع'/> <cd:constant name='random' value='تصادفی'/> <cd:constant name='reduction' value='کاهش'/> <cd:constant name='ref' value='رج'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='مرجع'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='مراجعه'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='ضخامتخط'/> <cd:constant name='samepage' value='همانصفحه'/> <cd:constant name='sample' value='نمونه'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='مقیاس'/> <cd:constant name='scope' value='طرح'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='علامت'/> <cd:constant name='size' value='اندازه'/> <cd:constant name='small' value='کوچک'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='ترتیبتایپ'/> <cd:constant name='source' value='منبع'/> <cd:constant name='space' value='فضا'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='زیر'/> <cd:constant name='subtitle' value='زیرعنوان'/> <cd:constant name='suffix' value='پسوند'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='تنظیمنماد'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='آفستبالا'/> <cd:constant name='topspace' value='فضایبالا'/> <cd:constant name='topstate' value='وضعیتبالا'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='تایپ'/> <cd:constant name='unit' value='واحد'/> <cd:constant name='unknownreference' value='مرجعناشناس'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='آفستعم'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='آفستع'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='راه'/> <cd:constant name='wfactor' value='wfactor'/> <cd:constant name='white' value='سفید'/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 964c8a714..f4faf5e4d 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -78,6 +78,7 @@ <cd:variable name='atmargin' value='lamargine'/> <cd:variable name='atpage' value='lapagina'/> <cd:variable name='august' value='august'/> + <cd:variable name='author' value='autor'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> <cd:variable name='back' value='inapot'/> @@ -86,7 +87,9 @@ <cd:variable name='backpart' value='epilog'/> <cd:variable name='backspace' value='spatiuspate'/> <cd:variable name='backward' value='inapoi'/> + <cd:variable name='bbl' value='bbl'/> <cd:variable name='before' value='inainte'/> + <cd:variable name='bib' value='bib'/> <cd:variable name='big' value='mare'/> <cd:variable name='bigbodyfont' value='bigbodyfont'/> <cd:variable name='bigpreference' value='preferintamare'/> @@ -111,6 +114,7 @@ <cd:variable name='chapter' value='capitol'/> <cd:variable name='character' value='caracter'/> <cd:variable name='characters' value='caractere'/> + <cd:variable name='cite' value='cite'/> <cd:variable name='color' value='culoare'/> <cd:variable name='column' value='coloana'/> <cd:variable name='columns' value='coloane'/> @@ -389,6 +393,7 @@ <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='setari'/> <cd:variable name='sheet' value='sheet'/> + <cd:variable name='short' value='short'/> <cd:variable name='singlesided' value='ofata'/> <cd:variable name='slanted' value='inclinat'/> <cd:variable name='slantedbold' value='inclinataldin'/> @@ -510,10 +515,18 @@ <cd:constant name='alignmentcharacter' value='alierecaracter'/> <cd:constant name='aligntitle' value='alinieretitlu'/> <cd:constant name='alternative' value='alternativ'/> + <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arrow' value='sageata'/> + <cd:constant name='artauthor' value='artauthor'/> + <cd:constant name='artauthoretaldisplay' value='artauthoretaldisplay'/> + <cd:constant name='artauthoretallimit' value='artauthoretallimit'/> + <cd:constant name='artauthoretaltext' value='artauthoretaltext'/> <cd:constant name='at' value='la'/> <cd:constant name='author' value='autor'/> + <cd:constant name='authoretaldisplay' value='authoretaldisplay'/> + <cd:constant name='authoretallimit' value='authoretallimit'/> + <cd:constant name='authoretaltext' value='authoretaltext'/> <cd:constant name='auto' value='auto'/> <cd:constant name='autofile' value='autofile'/> <cd:constant name='autofocus' value='autofocus'/> @@ -582,6 +595,7 @@ <cd:constant name='cutspace' value='cutspace'/> <cd:constant name='dash' value='dash'/> <cd:constant name='dat' value='dat'/> + <cd:constant name='database' value='database'/> <cd:constant name='date' value='data'/> <cd:constant name='deepnumbercommand' value='deepnumbercommand'/> <cd:constant name='deeptextcommand' value='deeptextcommand'/> @@ -600,6 +614,10 @@ <cd:constant name='dy' value='dy'/> <cd:constant name='edge' value='bordura'/> <cd:constant name='edgedistance' value='distantabordura'/> + <cd:constant name='editor' value='editor'/> + <cd:constant name='editoretaldisplay' value='editoretaldisplay'/> + <cd:constant name='editoretallimit' value='editoretallimit'/> + <cd:constant name='editoretaltext' value='editoretaltext'/> <cd:constant name='empty' value='gol'/> <cd:constant name='equalheight' value='equalheight'/> <cd:constant name='equalwidth' value='equalwidth'/> @@ -616,6 +634,8 @@ <cd:constant name='fieldoffset' value='offsetcamp'/> <cd:constant name='file' value='fisier'/> <cd:constant name='filtercommand' value='filtercommand'/> + <cd:constant name='finalnamesep' value='finalnamesep'/> + <cd:constant name='firstnamesep' value='firstnamesep'/> <cd:constant name='focus' value='focus'/> <cd:constant name='focusin' value='focusin'/> <cd:constant name='focusout' value='focusout'/> @@ -668,10 +688,13 @@ <cd:constant name='interlinespace' value='spatiereinterliniara'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elemente'/> + <cd:constant name='juniorsep' value='juniorsep'/> <cd:constant name='ken' value='ken'/> <cd:constant name='keyexpansion' value='keyexpansion'/> <cd:constant name='keyword' value='keyword'/> <cd:constant name='label' value='eticheta'/> + <cd:constant name='lastnamesep' value='lastnamesep'/> + <cd:constant name='lastpubsep' value='lastpubsep'/> <cd:constant name='left' value='stanga'/> <cd:constant name='leftcolor' value='culoarestanga'/> <cd:constant name='leftcompoundhyphen' value='leftcompoundhyphen'/> @@ -713,6 +736,7 @@ <cd:constant name='max' value='max'/> <cd:constant name='maxheight' value='inaltimemaxima'/> <cd:constant name='maxwidth' value='latimemaxima'/> + <cd:constant name='maybeyear' value='maybeyear'/> <cd:constant name='menu' value='meniu'/> <cd:constant name='method' value='metoda'/> <cd:constant name='middle' value='mijloc'/> @@ -725,6 +749,7 @@ <cd:constant name='minwidth' value='latimeminima'/> <cd:constant name='n' value='n'/> <cd:constant name='name' value='nume'/> + <cd:constant name='namesep' value='namesep'/> <cd:constant name='nbottom' value='njos'/> <cd:constant name='nc' value='nc'/> <cd:constant name='next' value='urmatorul'/> @@ -761,6 +786,7 @@ <cd:constant name='openpageaction' value='actiunedeschiderepagina'/> <cd:constant name='option' value='optiune'/> <cd:constant name='orientation' value='orientation'/> + <cd:constant name='otherstext' value='otherstext'/> <cd:constant name='outermargin' value='outermargin'/> <cd:constant name='overprint' value='overprint'/> <cd:constant name='ownnumber' value='numarpropriu'/> @@ -805,10 +831,12 @@ <cd:constant name='previous' value='precendent'/> <cd:constant name='previousnumber' value='numarprecedent'/> <cd:constant name='process' value='process'/> + <cd:constant name='pubsep' value='pubsep'/> <cd:constant name='radius' value='raza'/> <cd:constant name='random' value='aleator'/> <cd:constant name='reduction' value='reducere'/> <cd:constant name='ref' value='ref'/> + <cd:constant name='refcommand' value='refcommand'/> <cd:constant name='reference' value='referinta'/> <cd:constant name='referenceprefix' value='referenceprefix'/> <cd:constant name='referencing' value='referinta'/> @@ -842,6 +870,7 @@ <cd:constant name='rulethickness' value='grosimerigla'/> <cd:constant name='samepage' value='aceeasipagina'/> <cd:constant name='sample' value='exemplu'/> + <cd:constant name='samplesize' value='samplesize'/> <cd:constant name='saveinlist' value='saveinlist'/> <cd:constant name='scale' value='scala'/> <cd:constant name='scope' value='scop'/> @@ -866,6 +895,7 @@ <cd:constant name='sign' value='semn'/> <cd:constant name='size' value='dimensiune'/> <cd:constant name='small' value='mic'/> + <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> <cd:constant name='source' value='sursa'/> <cd:constant name='space' value='spatiu'/> @@ -890,6 +920,7 @@ <cd:constant name='sub' value='sub'/> <cd:constant name='subtitle' value='subtitlu'/> <cd:constant name='suffix' value='suffix'/> + <cd:constant name='surnamesep' value='surnamesep'/> <cd:constant name='sx' value='sx'/> <cd:constant name='sy' value='sy'/> <cd:constant name='symalign' value='symaliniere'/> @@ -929,6 +960,7 @@ <cd:constant name='topoffset' value='offsetsus'/> <cd:constant name='topspace' value='spatiusus'/> <cd:constant name='topstate' value='staresus'/> + <cd:constant name='totalnumber' value='totalnumber'/> <cd:constant name='type' value='type'/> <cd:constant name='unit' value='unitate'/> <cd:constant name='unknownreference' value='referintanecunoscuta'/> @@ -939,6 +971,7 @@ <cd:constant name='veroffset' value='veroffset'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='voffset' value='voffset'/> + <cd:constant name='vonsep' value='vonsep'/> <cd:constant name='way' value='mod'/> <cd:constant name='wfactor' value='factorw'/> <cd:constant name='white' value='alb'/> diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 3834afce5..e9f92f5c3 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua --- merge date : 08/19/09 17:12:50 +-- merge date : 08/22/09 18:36:59 do -- begin closure to overcome local limits and interference |