diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4186 -> 4186 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-apa.lua | 39 | ||||
| -rw-r--r-- | tex/context/base/publ-imp-apa.mkvi | 131 | ||||
| -rw-r--r-- | tex/context/base/publ-ini.mkiv | 8 | ||||
| -rw-r--r-- | tex/context/base/spac-ver.lua | 18 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24483 -> 24484 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 250255 -> 250250 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
10 files changed, 186 insertions, 16 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 943259fb8..8e1fc40e2 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2015.04.16 15:14} +\newcontextversion{2015.04.16 22:31} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 4fae8a382..a56e6ab81 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 9e54f89a7..23a86b773 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.04.16 15:14} +\edef\contextversion{2015.04.16 22:31} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-imp-apa.lua b/tex/context/base/publ-imp-apa.lua index 8e90bb986..c5d2512fd 100644 --- a/tex/context/base/publ-imp-apa.lua +++ b/tex/context/base/publ-imp-apa.lua @@ -33,9 +33,9 @@ local specification = { author = "author", -- interpreted as name(s) editor = "author", artist = "author", - interpreter = "author", composer = "author", producer = "author", + director = "author", doi = "url", -- an external link url = "url", page = "pagenumber", -- number or range: f--t @@ -427,6 +427,43 @@ categories.electronic = { }, } +-- not bibtex categories... + +categories.film = { + sets = { + doi = generic.doi, + }, + required = { + "producer", "director", + "title", "year", + "address", "publisher", -- aka studio + }, + optional = { + "type", + "note", + "doi", + }, +} + +categories.music = { + sets = { + doi = generic.doi, + author = { "composer", "artist", "title", "album" }, + title = { "title", "album", }, + }, + required = { + "author", + "title", + "year", + "address", "publisher", -- aka label + }, + optional = { + "type", + "note", + "doi", + }, +} + -- use this type when nothing else fits. categories.misc = { diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/publ-imp-apa.mkvi index 648c82d8c..1c2dc02db 100644 --- a/tex/context/base/publ-imp-apa.mkvi +++ b/tex/context/base/publ-imp-apa.mkvi @@ -63,7 +63,7 @@ \c!authorconversion=invertedshort, \c!separator:names:2={,\space}, % aka namesep - in this namespace \c!separator:names:3={,\nobreakspace\textampersand\space}, % comma separated list - \c!separator:names:4= {\nobreakspace\textampersand\space}] % last of two, no comma! + \c!separator:names:4={\nobreakspace\textampersand\space}] % last of two, no comma! \definebtx [apa:list:author] @@ -239,7 +239,7 @@ \c!sorttype=authoryear, \c!separator:names:2={,\space}, \c!separator:names:3={,\space\btxlabeltext{apa:and}\space}, % not \textampersand - \c!separator:names:4= {\space\btxlabeltext{apa:and}\space}] % not \textampersand + \c!separator:names:4={\space\btxlabeltext{apa:and}\space}] % not \textampersand \definebtx [apa:cite:author] @@ -250,7 +250,8 @@ [apa:cite:author] [\c!left={\removeunwantedspaces\pushpunctuation\btxspace(}, \c!right={)\poppunctuation}, - \c!inbetween={,\space}] + \c!inbetween={,\space}, + \c!compress=\v!yes] \definebtx [apa:cite:default] @@ -298,7 +299,7 @@ [apa:cite] [\c!separator:2={,\space}, % :0 and :1 - between items of a list \c!separator:3={,\space\btxlabeltext{apa:and}\space}, % not \textampersand - \c!separator:4= {\space\btxlabeltext{apa:and}\space}, % not \textampersand + \c!separator:4={\space\btxlabeltext{apa:and}\space}, % not \textampersand \c!compress=\v!yes, \c!sorttype=\v!default] @@ -307,7 +308,7 @@ [apa:cite] [\c!separator:2={,\space}, % :0 and :1 - between items of a list \c!separator:3={,\space\btxlabeltext{apa:and}\space}, % not \textampersand - \c!separator:4= {\space\btxlabeltext{apa:and}\space}, % not \textampersand + \c!separator:4={\space\btxlabeltext{apa:and}\space}, % not \textampersand \c!command={\language[\currentbtxlanguage]}, % BAH \c!style=\v!italic] @@ -338,7 +339,7 @@ \c!right=, [\c!separator:2={,\space}, % :0 and :1 - between items of a list \c!separator:3={,\space\btxlabeltext{apa:and}\space}, % not \textampersand - \c!separator:4= {\space\btxlabeltext{apa:and}\space}] % not \textampersand + \c!separator:4={\space\btxlabeltext{apa:and}\space}] % not \textampersand \definebtx [apa:cite:pages] @@ -433,6 +434,12 @@ apa:technicalreport={Tech. Rep.}, % Technical report apa:supplement={Suppl.}, % Supplement (not used?) apa:patent=Patent, + apa:MotionPicture={Motion picture}, + apa:Producer=Producer, + apa:Producers=Producers, + apa:Director=Director, + apa:Directors=Directors, + apa:Recordedby={Recorded by}, apa:Author=Author, apa:Translator={Trans.}, % Translator(s) (not used?) apa:Advanced={Advanced online publication}, @@ -457,6 +464,12 @@ apa:technicalreport={Technisch rapport}, % Technical report apa:supplement=Supplement, apa:patent=Octrooi, + apa:MotionPicture=Film, % ? + apa:Producer=Producent, % ? + apa:Producers=Producents, % ? + apa:Director=Directeur, + apa:Directors=Directeurs, + apa:Recordedby={Opgenomen door}, % ? apa:Author=Auteur, apa:Translator=Vertaler, apa:Advanced={Geavanceerde online publicatie}, @@ -482,6 +495,12 @@ apa:technicalreport={Rapport technique}, apa:supplement=Supplément, apa:patent=Brevet, + apa:MotionPicture={Film cinématographique}, + apa:Producer=Producteur, + apa:Producers=Producteurs, + apa:Director=Réalisateur, + apa:Directors=Réalisateurs, + apa:Recordedby={Enregistré par}, apa:Author=Auteur, apa:Translator=Traducteur, apa:Advanced={Publication en ligne anticipée}, @@ -506,6 +525,12 @@ apa:technicalreport={Technischer Bericht}, apa:supplement={Beilage}, % Supplement apa:patent=Patent, + apa:MotionPicture=Kinofilm, % ? + apa:Producer=Producer, % ? + apa:Producers=Produzenten, % ? + apa:Director=Director, % ? + apa:Directors=Directors, % ? + apa:Recordedby={per Einschreiben}, % ? apa:Author=Autor, apa:Translator={Übersetzer}, % Übers. apa:Advanced={Erweiterte Online-Publikation}, @@ -532,6 +557,12 @@ apa:technicalreport={Relazione tecnica}, apa:supplement={Supplemento}, apa:patent=Brevetto, + apa:MotionPicture=Film, % ? + apa:Producer=Produttore, + apa:Producers=Produttori, + apa:Director=Direttore, + apa:Directors=Direttori, + apa:Recordedby={Registrato da}, apa:Author=Autore, apa:Translator={Trad.}, % Translator(s) apa:Advanced={Pre-pubblicazione on line}, @@ -556,6 +587,12 @@ apa:technicalreport={Informe técnico}, apa:supplement=Suplemento, apa:patent=Patente, + apa:MotionPicture=Cinematográfica, + apa:Producer=Productor, + apa:Producers=Productores, + apa:Director=Director, + apa:Directors=Directores, + apa:Recordedby={Grabada por}, apa:Author=Autor, apa:Translator=Traductor, apa:Advanced={Publicación en línea avanzada}, @@ -566,6 +603,7 @@ \startsetups btx:apa:cite:author:year \texdefinition{\s!btx:\s!cite:concat} + \btxparameter\c!left \ifx\currentbtxfirst\empty \btxlabeltext{apa:nd} \else @@ -585,6 +623,7 @@ } \fi \fi + \btxparameter\c!right \stopsetups \startsetups btx:apa:cite:author:years @@ -747,6 +786,7 @@ \btxdoifelse {year} { \btxflush{year} \btxflush{suffix} + %or \btxflush{suffixedyear} } { \btxlabeltext{apa:nd} } @@ -1269,6 +1309,85 @@ \texdefinition{btx:apa:url-doi-note} \stopsetups +% Film. Note that this category was not defined with BIBTEX. +% Required fields: producer, director, title, year, address, publisher +% Optional fields: subtitle, type, note, url, doi + +\startsetups btx:apa:list:film + \btxdoif {producer} { + \btxflush{producer} + \btxleftparenthesis + \btxsingularorplural {producer} { + \btxlabeltext{apa:Producer} + } { + \btxlabeltext{apa:Producers} + } + \btxrightparenthesis + \btxdoifelse {director} { + \removeunwantedspaces + \btxparameter{\c!separator:names:3} + } { + \btxperiod + } + } + \btxdoif {director} { + \btxflush{director} + \btxleftparenthesis + \btxsingularorplural {director} { + \btxlabeltext{apa:Director} + } { + \btxlabeltext{apa:Directors} + } + \btxrightparenthesisperiod + } + \btxleftparenthesis + \texdefinition{btx:apa:suffixedyear} + \btxrightparenthesisperiod + \texdefinition {btx:apa:title} + \btxleftbracket + \btxdoifelse {type} { + \btxflush{type} + } { + \btxlabeltext{apa:MotionPicture} + } + \btxrightbracketperiod + \texdefinition{btx:apa:wherefrom-publisher} + \texdefinition{btx:apa:url-doi-note} +\stopsetups + +% Music. Note that this category was not defined with BIBTEX. +% Required fields: composer, artist, title, album, year, address, publisher +% Optional fields: subtitle, type, note, url, doi + +\startsetups btx:apa:list:music + \texdefinition{btx:apa:authoryear} + \texdefinition{btx:apa:title-if-not-placed} + \doifnot {\btxfoundname{author}} {artist} { + \btxdoif {artist} { + \btxleftbracket + \btxlabeltext{apa:Recordedby} + \btxspace + \btxflush{artist} + \btxrightbracketperiod + } + } + \doifnot {\btxfoundname{title}} {album} { + \btxdoif {album} { + \btxlabeltext{apa:In} + \btxspace + \btxflush{album} + \btxperiod + } + } + \btxdoif {type} { + \btxleftbracket + \btxflush{type} + \btxrightbracketperiod + } + \texdefinition{btx:apa:wherefrom-publisher} + \texdefinition{btx:apa:url-doi-note} +\stopsetups + % Other. Note that this category was not defined with BIBTEX. Below from JabRef: % Required fields: author or title, year % Optional fields: note, doi, url diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index e26813280..c63fa7ed9 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -1219,7 +1219,7 @@ \dosingleargument\publ_cite_handle_variant_indeed} \unexpanded\def\publ_cite_handle_variant_blob - {\btxparameter\v!left\relax + {%\btxparameter\v!left\relax \clf_btxhandlecite dataset {\currentbtxdataset}% reference {\currentbtxreference}% @@ -1234,7 +1234,7 @@ after {\p_publ_cite_after}% \relax \clf_btxflushmarked % maybe: \iftrialtypesetting\else ... \fi - \btxparameter\v!right\relax} + }%\btxparameter\v!right\relax} \def\publ_cite_handle_variant_indeed[#1]% {\letbtxparameter\c!alternative\currentbtxcitealternative @@ -1422,7 +1422,7 @@ \relax} \unexpanded\def\btxstopsubcite - {\relax + {%\relax % \btxparameter\c!right \endgroup} @@ -1432,7 +1432,7 @@ \setbtxparameterset\s!cite\currentbtxcitealternative \usebtxstyleandcolor\c!style\c!color % \btxparameter\c!left - \relax} + }%\relax} \unexpanded\def\btxstopciterendering {\relax diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua index d222705ca..fc6fba0eb 100644 --- a/tex/context/base/spac-ver.lua +++ b/tex/context/base/spac-ver.lua @@ -1155,7 +1155,14 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also head = insert_node_before(head,current,p) end -- if penalty_data > special_penalty_min and penalty_data < special_penalty_max then - properties[p] = { special_penalty = special_penalty or penalty_data } + local props = properties[p] + if props then + props.special_penalty = special_penalty or penalty_data + else + properties[p] = { + special_penalty = special_penalty or penalty_data + } + end -- end end if glue_data then @@ -1573,7 +1580,14 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also if trace then trace_done("result",p) end head, tail = insert_node_after(head,tail,p) -- if penalty_data > special_penalty_min and penalty_data < special_penalty_max then - properties[p] = { special_penalty = special_penalty or penalty_data } + local props = properties[p] + if props then + props.special_penalty = special_penalty or penalty_data + else + properties[p] = { + special_penalty = special_penalty or penalty_data + } + end -- end end if glue_data then diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 43c8d8898..09f173319 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 1ea18d299..55fba3699 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3b472bcb5..80048e034 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 04/16/15 15:14:10 +-- merge date : 04/16/15 22:31:05 do -- begin closure to overcome local limits and interference |