summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-06 03:02:30 +0000
committerNorbert Preining <norbert@preining.info>2020-05-06 03:02:30 +0000
commit36d8a5cd45b5a96007208a0d5b1f52e708d0fec8 (patch)
tree88afba6aec450f4aa0ec17a34a55465435c6ed5d /macros/latex
parent12fef7aa53e3695c36d3650fa4fb98f991bc223e (diff)
CTAN sync 202005060302
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx94
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib42
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdfbin221746 -> 224606 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdfbin66175 -> 66410 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex8
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6-test.pdfbin0 -> 110080 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6.pdfbin0 -> 92893 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty48
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdfbin551082 -> 551630 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex10
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx11
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx2
-rw-r--r--macros/latex/contrib/mercatormap/README2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap-example.tex2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex3
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex46
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex60
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex184
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex2
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex50
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.sty5
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex20
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.pdfbin25704396 -> 26056519 bytes
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.sty146
-rw-r--r--macros/latex/contrib/mercatormap/mercatormap.tex6
-rw-r--r--macros/latex/contrib/mercatormap/mercatorpy.def4
-rw-r--r--macros/latex/contrib/mercatormap/mercatorsupplier.def2
-rw-r--r--macros/latex/contrib/showexpl/README16
-rw-r--r--macros/latex/contrib/showexpl/README.md24
-rw-r--r--macros/latex/contrib/showexpl/doc/showexpl-test.pdfbin332458 -> 350530 bytes
-rw-r--r--macros/latex/contrib/showexpl/doc/showexpl-test.tex39
-rw-r--r--macros/latex/contrib/showexpl/doc/showexpl.pdfbin243219 -> 250331 bytes
-rw-r--r--macros/latex/contrib/showexpl/showexpl.dtx90
-rw-r--r--macros/latex/contrib/showexpl/showexpl.ins2
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/README.md6
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct-main.pdfbin0 -> 732338 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdfbin729845 -> 0 bytes
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex3
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex3
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex73
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex3
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex29
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex2
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex169
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex25
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex10
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex1
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex8
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex23
-rw-r--r--macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty254
-rw-r--r--macros/latex/contrib/univie-ling/README10
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdfbin173907 -> 173916 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex9
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdfbin170172 -> 170180 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex9
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdfbin224787 -> 225826 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin443458 -> 444376 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex13
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin438208 -> 438957 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex13
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin441864 -> 442832 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex36
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin329512 -> 329557 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex11
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls53
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls55
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls81
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls14
174 files changed, 1313 insertions, 763 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
index 86333cdf81..972dc51bb2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{american}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
index 8997133548..3f5b459d88 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2020/05/02\space v9.11\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/05/05\space v9.12\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -352,6 +352,20 @@
\step[typesource=hardware, typetarget=software]
}
\map{
+ \pertype{proceedings}
+ \step[fieldsource=booktitle, fieldtarget=title]
+ \step[typesource=proceedings, typetarget=book]
+ }
+ \map{
+ \pertype{inproceedings}
+ \step[notfield=editor, final]
+ \step[fieldsource=booktitle, fieldtarget=journaltitle]
+ \step[typesource=inproceedings, typetarget=article]
+ }
+ \map{
+ \step[typesource=inproceedings, typetarget=inbook]
+ }
+ \map{
\step[fieldsource=year, final]
\step[fieldset=pubstate, null]
}
@@ -423,7 +437,7 @@
{\bibcpstring{volume}~\apanum{#1}}
{\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[inproceedings,periodical]{volume}{\mkbibemph{\apanum{#1}}}
% VOLUMES
\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
@@ -439,7 +453,7 @@
{\apanum{#1}}}
{\mkbibemph{\apanum{#1}}}}
\DeclareFieldFormat[report]{number}{\apanum{#1}}
-\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat[article,periodical,inproceedings]{number}{\mkbibparens{\apanum{#1}}}
\DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}}
\DeclareFieldFormat{legmaterialnum}{%
\ifthenelse{%
@@ -720,7 +734,7 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
- \ifthenelse{\ifentrytype{inbook}\OR\ifentrytype{inproceedings}}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
\setunit{\addspace}%
\printfield{titleaddon}%
\setunit{\addspace}%
@@ -1113,7 +1127,11 @@
\renewbibmacro*{maintitle+booktitle}{%
\ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}
{}
- {\usebibmacro{in}%
+ {\ifthenelse{\ifnameundef{editor}\AND
+ \ifnameundef{editora}\AND
+ \ifnameundef{editorb}\AND
+ \ifnameundef{editorc}\AND
+ \(\ifnameundef{groupauthor}\AND\NOT\ifnameundef{author}\)}{}{\usebibmacro{in}}%
\iffieldundef{maintitle}
{}
{\usebibmacro{maintitle}%
@@ -1617,39 +1635,6 @@
\usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{inproceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \setunit{\addspace}\newblock
- \usebibmacro{apa:related}%
- \setunit*{\addcomma\addspace}\newblock
- \usebibmacro{maintitle+booktitle}%
- \newunit\newblock
- \usebibmacro{eventinfo}%
- \newunit\newblock
- \printlist{organization}%
- \newunit
- \usebibmacro{location+publisher}%
- \newunit\newblock
- \printfield{pages}%
- \newunit\newblock
- \usebibmacro{origyear}%
- \newunit\newblock
- \usebibmacro{doi+url}%
- \newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{pageref}%
- \usebibmacro{annotation}%
- \usebibmacro{finentry}}
-
\DeclareBibliographyDriver{jurisdiction}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1886,39 +1871,6 @@
\usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{proceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \setunit{\addspace}\newblock
- \usebibmacro{apa:related}%
- \newunit\newblock
- \usebibmacro{eventinfo}%
- \setunit{\addcomma\addspace}%
- \usebibmacro{booktitle}%
- \setunit{\addcomma\addspace}%
- \printfield{volume}%
- \setunit*{\adddot}%
- \printfield{number}%
- \setunit{\addcomma\addspace}
- \printfield{pages}%
- \newunit\newblock
- \printlist{organization}%
- \newunit\newblock
- \usebibmacro{doi+url}%
- \newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{pageref}%
- \usebibmacro{annotation}%
- \usebibmacro{finentry}}
-
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
index 7d14955ac4..5db566a725 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2020/05/02\space v9.11\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2020/05/05\space v9.12\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
index 08462285d3..e43ea42963 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2020/05/02\space v9.11\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2020/05/05\space v9.12\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
index 4ec57b4ccd..0ce160ef37 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
index c6736f1469..446a1b009d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib
@@ -1515,6 +1515,48 @@
EVENTDATE = {2018-04-26/2018-04-29}
}
+% (APA 10.5 Addendum Example 1)
+% Mapped to ARTICLE as per https://apastyle.apa.org/style-grammar-guidelines/references/examples/conference-proceeding-references
+% BOOKTITLE mapped to JOURNALTITLE
+@INPROCEEDINGS{10.5:A1,
+ AUTHOR = {Duckworth, A. L. and Quirk, A. and Gallop, R. and Hoyle, R. H. and
+ Kelly, D. R. and Matthews, M. D.},
+ TITLE = {Cognitive and Noncognitive Predictors of Success},
+ BOOKTITLE = {Proceedings of the National Academy of Sciences, USA},
+ VOLUME = {116},
+ NUMBER = {47},
+ PAGES = {23499–-23504},
+ DATE = {2019},
+ DOI = {10.1073/pnas.1910510116}
+}
+
+% (APA 10.5 Addendum Example 2)
+% Mapped to BOOK as per https://apastyle.apa.org/style-grammar-guidelines/references/examples/conference-proceeding-references
+@PROCEEDINGS{10.5:A2,
+ EDITOR = {Kushilevitz, E. and Malkin, T.},
+ MAINTITLE = {Lecture Notes in Computer Science},
+ MAINSUBTITLE = {Vol. 9562},
+ BOOKTITLE = {Theory of Cryptography},
+ PUBLISHER = {Springer},
+ DATE = {2016},
+ DOI = {10.1007/978-3-662-49096-9}
+}
+
+% (APA 10.5 Addendum Example 3)
+% Mapped to INBOOK as per https://apastyle.apa.org/style-grammar-guidelines/references/examples/conference-proceeding-references
+@INPROCEEDINGS{10.5:A3,
+ AUTHOR = {Bedenel, Alan-Louis. and Jourdan, L. and Biernacki, C.},
+ EDITOR = {R. Battiti and M. Brunato and I. Kotsireas and P. Pardalos},
+ TITLE = {Probability Estimation by an Adapted Genetic Algorithm in Web Insurance},
+ MAINTITLE = {Lecture Notes in Computer Science},
+ MAINSUBTITLE = {Vol. 11353},
+ BOOKTITLE = {Learning and Intelligent Optimization},
+ PUBLISHER = {Springer},
+ DATE = {2019},
+ PAGES = {225-–240},
+ DOI = {10.1007/978-3-030-05348-2_21}
+}
+
% (APA 10.6 Example 64)
@THESIS{10.6:64,
AUTHOR = {L. Harris},
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
index b909920cfe..67a3ab7034 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
index 47255082d8..ace7384700 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
@@ -687,7 +687,7 @@ the help of lower-level commands:\\\\
\apaex{\parencite{10.4:59}}\\
\apaex{\textcite{10.4:59}}
-\printbibliography[title={APA 10.4 References }]
+\printbibliography[title={APA 10.4 References}]
\end{refsection}
\newpage
\subsection{APA 10.5--Conference Sessions and Presentations}
@@ -710,7 +710,22 @@ the help of lower-level commands:\\\\
\apaex{\parencite{10.5:63}}\\
\apaex{\textcite{10.5:63}}
-\printbibliography[title={APA 10.5 References }]
+\noindent The following are proper proceedings types and are included in a web
+addendum here: \url{https://apastyle.apa.org/style-grammar-guidelines/references/examples/conference-proceeding-references}
+
+\noindent\apa{10.5 Addendum Example 1}\\
+\apaex{\parencite{10.5:A1}}\\
+\apaex{\textcite{10.5:A1}}
+
+\noindent\apa{10.5 Addendum Example 2}\\
+\apaex{\parencite{10.5:A2}}\\
+\apaex{\textcite{10.5:A2}}
+
+\noindent\apa{10.5 Addendum Example 3}\\
+\apaex{\parencite{10.5:A3}}\\
+\apaex{\textcite{10.5:A3}}
+
+\printbibliography[title={APA 10.5 References}]
\end{refsection}
\newpage
\subsection{APA 10.6--Dissertations and Theses}
@@ -729,7 +744,7 @@ the help of lower-level commands:\\\\
\apaex{\parencite{10.6:66}}\\
\apaex{\textcite{10.6:66}}
-\printbibliography[title={APA 10.6 References }]
+\printbibliography[title={APA 10.6 References}]
\end{refsection}
\newpage
\subsection{APA 10.7--Reviews}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
index 4f221fd5eb..060ef251e5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
index 5be364d90b..5e46846f84 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.tex
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={9.11},
+ revision={9.12},
date={\today}}
\hypersetup{%
@@ -397,7 +397,11 @@ the examples.
\begin{changelog}
-\begin{release}{9.11}{2020-05}
+\begin{release}{9.11}{2020-05-05}
+\item Fixed INPROCEEDINGS/PROCEEDINGS
+\end{release}
+
+\begin{release}{9.11}{2020-05-02}
\item Introduced new PRESENTATION type
\end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6-test.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6-test.pdf
new file mode 100644
index 0000000000..c056b75b0f
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6-test.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6.pdf
new file mode 100644
index 0000000000..0a57a7be90
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa6.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
index 8bd39972e9..e700f19109 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
index bf632c1b0d..eefca870a3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{british}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
index 155575778e..0b9cf0d3ae 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
index 23a4d04ee3..036e9da076 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
index 07933266a9..13ffad747b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{english}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
index 52222d5520..5e77896946 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{french}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
index fc51bea007..33c72b9fd9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{galician}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
index 3544f52ba8..ed643434a6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% Following DGPs guidlines for German/Austrian
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
index a308000d3f..7c3d5480f5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
index d2a7adcf10..f8052bf705 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
index 76fec122a6..1ba2490f0a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% Following DGPs guidlines for German/Austrian
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
index e6cffe38af..e88f26e3ba 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% Following DGPs guidlines for German/Austrian
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
index 4eefef3a02..9c08165e50 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
\NewBibliographyString{revisededition}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
index 11eb979604..ab3b089979 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
\NewBibliographyString{revisededition}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
index 71d7268be9..d5225a0321 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
index a3df3ed4e4..c0593dc742 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
index dbad255c3c..59cac63b76 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/portuguese-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
index 7ebbb38369..aa3a40c199 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
index 052550b5a2..6cf598049a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
index da8916544f..9206498d3f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
index 0c04de0a5f..f653f2cda5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
\NewBibliographyString{jourarticle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
index c194ae7bcb..cabc3685aa 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/swissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2020/05/02\space v9.11\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2020/05/05\space v9.12\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
index c317295d77..2aa2f2c4e1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
@@ -1,5 +1,19 @@
# Changelog
+
+## Version 0.8e (2020-05-05)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8d...v0.8e>
+
+### Fixed
+- Fixed `bbx:introcite` definition for `ext-numeric-comp`.
+- Fixed issue with `labelprefix` in `\printbibtabular` (#18).
+
+### Changed
+- `biblatex-ext-tabular` now checks for the recommended `biblatex`
+ version and aborts if loaded before `biblatex`.
+
+
## Version 0.8d (2020-03-15)
See <https://github.com/moewew/biblatex-ext/compare/v0.8c...v0.8d>
@@ -7,10 +21,11 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8c...v0.8d>
### Fixed
- Avoid an error about the bibmacro `labeltitle` being undefined
in some contexts.
- Define and use `tabular:labeltitle` in 'tabular:sortname`.
+ Define and use `tabular:labeltitle` in `tabular:sortname`.
If available `tabular:labeltitle` is just `labeltitle`,
if not we recreate the definition from `authoryear.bbx`.
+
## Version 0.8c (2019-11-30)
See <https://github.com/moewew/biblatex-ext/compare/v0.8b...v0.8c>
@@ -23,6 +38,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8b...v0.8c>
macros documented that would expose the answer of the DOI.org
query, so we can simply drop that function.
+
## Version 0.8b (2019-11-01)
See <https://github.com/moewew/biblatex-ext/compare/v0.8a...v0.8b>
@@ -30,6 +46,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.8a...v0.8b>
### Fixed
- Call to removed option in `ext-verbose-trad2`.
+
## Version 0.8a (2019-10-31)
See <https://github.com/moewew/biblatex-ext/compare/v0.8...v0.8a>
@@ -53,6 +70,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.7a...v0.8>
### Changed
- Require `biblatex` v3.13 (some backwards compatiblity is in place).
+
## Version 0.7a (2019-04-04)
See <https://github.com/moewew/biblatex-ext/compare/v0.7...v0.7a>
@@ -67,6 +85,7 @@ See <https://github.com/moewew/biblatex-ext/compare/v0.7...v0.7a>
### Changed
- `biblatex-ext-doiapi` warns about missing email just a tad earlier.
+
## Version 0.7 (2019-02-08)
See <https://github.com/moewew/biblatex-ext/compare/v0.6b...v0.7>
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
index 73c8034a52..0f725cf626 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa-doiapi}
- [2020/03/15 v0.8d Obtain open access information from DOI via
+ [2020/05/05 v0.8e Obtain open access information from DOI via
unpaywall.org and doi.org (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
index 1cc321adf2..3923763c44 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa}
- [2020/03/15 v0.8d mark open access in biblatex bibliographies (MW)]
+ [2020/05/05 v0.8e mark open access in biblatex bibliographies (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index dad02d54b7..b2857aa666 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
\RequirePackage{expl3}
\ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
- {2020/03/15} {0.8d}
+ {2020/05/05} {0.8e}
{open access symbols with l3draw (MW)}
\RequirePackage{xparse}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index ba430c0c68..7ec90ba7a1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-pict2e}
- [2020/03/15 v0.8d open access symbols with pict2e (MW)]
+ [2020/05/05 v0.8e open access symbols with pict2e (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index 625d67484d..8ce360fb61 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-tikz}
- [2020/03/15 v0.8d open access symbols with TikZ (MW)]
+ [2020/05/05 v0.8e open access symbols with TikZ (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
index 85500743cc..1e9d4989d5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-tabular}
- [2020/03/15 v0.8d tabular bibliographies for biblatex (MW)]
+ [2020/05/05 v0.8e tabular bibliographies for biblatex (MW)]
% Code based on Audrey's
% (https://tex.stackexchange.com/users/4483/audrey)
@@ -21,6 +21,29 @@
\protected\def\extblxtab@warning{%
\PackageWarning{biblatex-ext-tabular}}}
+\@ifpackageloaded{biblatex}
+ {}
+ {\extblxtab@error
+ {biblatex not loaded!\MessageBreak
+ Please load biblatex before you\MessageBreak
+ load biblatex-ext-tabular}
+ {biblatex needs to be loaded before biblatex-ext-tabular.%
+ \MessageBreak
+ This is a fatal error. I'm aborting now}%
+ \endinput}
+
+\def\extblxtab@requiredbiblatexversion{3.14}
+\def\extblxtab@requiredbiblatexdate{2019/12/01}
+
+\@ifpackagelater{biblatex}{\extblxtab@requiredbiblatexdate}
+ {}
+ {\extblxtab@warning@noline{%
+ Outdated version of biblatex detected.\MessageBreak
+ Upgrade to biblatex \extblxtab@requiredbiblatexversion\space
+ (\extblxtab@requiredbiblatexdate) or later.\MessageBreak
+ I found '\csuse{abx@version} (\csuse{abx@date})'}}
+
+
% user-level command for printing tabular bibliography
\newrobustcmd*{\printbibtabular}{%
@@ -42,11 +65,19 @@
\def\extblxtab@printbibtabular[#1]{%
\toggletrue{blx@tempa}%
\toggletrue{blx@tempb}%
- \def\blx@theheading{bibliography}%
+ \ifundef\blx@default@theheading
+ {\def\blx@theheading{bibliography}}
+ {\let\blx@theheading\blx@default@theheading}%
\def\blx@theenv{bibtabular}%
- \let\blx@theprenote\@empty
- \let\blx@thepostnote\@empty
- \let\blx@thetitle\@empty
+ \ifundef\blx@default@theprenote
+ {\let\blx@theprenote\@empty}
+ {\let\blx@theprenote\blx@default@theprenote}%
+ \ifundef\blx@default@thepostnote
+ {\let\blx@thepostnote\@empty}
+ {\let\blx@thepostnote\blx@default@thepostnote}%
+ \ifundef\blx@default@thetitle
+ {\let\blx@thetitle\@empty}
+ {\let\blx@thetitle\blx@default@thetitle}%
\let\blx@key@env\extblxtab@key@env % redirect the 'env' option
% to tabular envs
% defaults
@@ -56,12 +87,17 @@
\togglefalse{blx@resetnumsexplicit}%
% First pass options keys - section and resetnumbers
\setkeys{blx@bib1}{#1}%
+ \ifundef\blx@refcontext@labelprefix@real
+ {\let\blx@refcontext@labelprefix@real\blx@refcontext@labelprefix}
+ {}%
% Is there a user-specified option for resetnumbers
% If so, this overrides the default
% "labelprefix implies resetnumbers" behaviour
\iftoggle{blx@resetnumsexplicit}
{}
{\ifdefempty\blx@refcontext@labelprefix
+ {\ifdefempty\blx@refcontext@labelprefix@real}
+ {\@secondoftwo}
{}
{\setkeys{blx@bib2}{resetnumbers}}}%
\blx@rest@actives
@@ -87,7 +123,7 @@
\blx@xml@dlist@refcontext
{\blx@refcontext@sortingtemplatename}
{\blx@refcontext@sortingnamekeytemplatename}
- {\blx@refcontext@labelprefix}
+ {\blx@refcontext@labelprefix@real}
{\blx@refcontext@uniquenametemplatename}
{\blx@refcontext@labelalphanametemplatename}}{}}}%
\ifdefvoid\blx@tempa
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
index f040de55f1..5753cb029d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
index a3485ec19b..e66aa4e21c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
@@ -455,7 +455,7 @@
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.8d}
+\newcommand*{\extblxversion}{0.8e}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -528,7 +528,7 @@
author = {Moritz Wemheuer},
link = {mwemheu@gmail.com},%
revision = {\extblxversion},
- date = {\DTMDate{2020-03-15}},
+ date = {\DTMDate{2020-05-05}},
}
\hypersetup{%
@@ -3176,6 +3176,12 @@ See also \filename{CHANGES.md}.
The numbers on the right indicate the relevant section of the manual.
\begin{changelog}
+\begin{release}{0.8e}{2020-05-05}
+ \item Fixed \hyperopt{introcite} definition for
+ \blxstyle{ext-numeric-comp}\see{sec:opt:style}
+ \item Fixed issue with \bibfield{labelprefix} in
+ \hypercmd{printbibtabular}\see{sec:tabularbib}
+\end{release}
\begin{release}{0.8d}{2020-03-15}
\item Fixed issue with \hyperbibmacro{tabular:sortname}\see{sec:tabularbib}
\end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
index 5793769dc9..35cf4d3496 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
local blxextdoiapi_module = {
name = "blxextdoiapi",
- version = "v0.8d",
- date = "2020/03/15",
+ version = "v0.8e",
+ date = "2020/05/05",
description = "Obtain open access information from DOI via unpaywall.org",
author = "Moritz Wemheuer",
license = "LPPL v1.3c",
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
index 8c666baab1..0301dff918 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2020/03/15 v0.8d extended biblatex alphabetic-verb
+ [2020/05/05 v0.8e extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
index f15217f528..a7f71436d0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2020/03/15 v0.8d extended biblatex alphabetic-verb citation style
+ [2020/05/05 v0.8e extended biblatex alphabetic-verb citation style
(MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
index 2f470bda86..0e960af4ba 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2020/03/15 v0.8d extended biblatex alphabetic bibliography style (MW)]
+ [2020/05/05 v0.8e extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
index 322e5c309c..a205aee7fd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2020/03/15 v0.8d extended biblatex alphabetic citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex alphabetic citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
index c53138d5f9..041f62aae6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2020/03/15 v0.8d common files for extended biblatex
+ [2020/05/05 v0.8e common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
index bb641162df..495463a078 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-comp
+ [2020/05/05 v0.8e extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
index 40ae7bf49c..70696801b0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-comp
+ [2020/05/05 v0.8e extended biblatex authortitle-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
index 7f0c00ff76..0bc38eed59 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-ibid
+ [2020/05/05 v0.8e extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
index c8739a0054..f98db03fe8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-ibid
+ [2020/05/05 v0.8e extended biblatex authortitle-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
index 75c73b2110..7876e9e561 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-icomp
+ [2020/05/05 v0.8e extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
index 6e4a4d17a8..4dfcf3e596 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-icomp
+ [2020/05/05 v0.8e extended biblatex authortitle-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
index f7b89bcab3..e64e4d6b06 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-tcomp
+ [2020/05/05 v0.8e extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
index 4211e23e58..d42065b8e4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-tcomp
+ [2020/05/05 v0.8e extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
index 45c105c729..2ea567a395 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-terse
+ [2020/05/05 v0.8e extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
index 94512c2f7f..f7e80f8d2e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-terse
+ [2020/05/05 v0.8e extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
index 68cd1cd07b..d66403c07f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle-ticomp
+ [2020/05/05 v0.8e extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
index c104f72c53..e14d08d3b9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle-ticomp citation style
+ [2020/05/05 v0.8e extended biblatex authortitle-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authortitle-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
index 32d7c05546..f681222b4a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2020/03/15 v0.8d extended biblatex authortitle
+ [2020/05/05 v0.8e extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
index 7d23543d32..e4970f6f02 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2020/03/15 v0.8d extended biblatex authortitle citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex authortitle citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
index b13da3a86d..d7d13ae99b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2020/03/15 v0.8d common files for extended biblatex
+ [2020/05/05 v0.8e common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
index 504df8b4dd..da8576b8a4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-comp
+ [2020/05/05 v0.8e extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
index 6b8b391572..730a019236 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-comp
+ [2020/05/05 v0.8e extended biblatex authoryear-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
index 1fa1d080c7..636eb7fc15 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.bbx}
- [2020/03/15 v0.8d biblatex authoryear-ecomp
+ [2020/05/05 v0.8e biblatex authoryear-ecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
index 75af266356..52c3128efc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.cbx}
- [2020/03/15 v0.8d biblatex authoryear-ecomp
+ [2020/05/05 v0.8e biblatex authoryear-ecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
index 04edea84dd..2b9524b738 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-ibid
+ [2020/05/05 v0.8e extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
index 08278f8c99..435fbd61df 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-ibid
+ [2020/05/05 v0.8e extended biblatex authoryear-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
index 883545cc18..05c0f43147 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-icomp
+ [2020/05/05 v0.8e extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
index 0408a79c05..1ecbe0bcbc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-icomp
+ [2020/05/05 v0.8e extended biblatex authoryear-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
index ebc60b2cba..26282876cc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.bbx}
- [2020/03/15 v0.8d biblatex authoryear-iecomp
+ [2020/05/05 v0.8e biblatex authoryear-iecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
index 2a78bcdddb..d236e3ac8a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.cbx}
- [2020/03/15 v0.8d biblatex authoryear-iecomp
+ [2020/05/05 v0.8e biblatex authoryear-iecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
index 6fdf039da1..246e337f48 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tcomp
+ [2020/05/05 v0.8e extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
index e9a7cc08c6..31047b784b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tcomp
+ [2020/05/05 v0.8e extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
index 0ba10be06c..504e21601e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tecomp
+ [2020/05/05 v0.8e extended biblatex authoryear-tecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
index 31a942594d..cb5d0a7be2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tecomp
+ [2020/05/05 v0.8e extended biblatex authoryear-tecomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-ecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
index 5115dc8bcd..ecc6743314 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-terse
+ [2020/05/05 v0.8e extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
index f8ad390401..64608d3328 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-terse
+ [2020/05/05 v0.8e extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
index 5c5cb0ef41..8ecb5c681f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-ticomp
+ [2020/05/05 v0.8e extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
index 1fc55ebf89..7d5b4fca1b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-ticomp citation style
+ [2020/05/05 v0.8e extended biblatex authoryear-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
index e586b240b1..896f94d3b2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tiecomp
+ [2020/05/05 v0.8e extended biblatex authoryear-tiecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
index f778df25bb..a464fdb3d2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear-tiecomp citation style
+ [2020/05/05 v0.8e extended biblatex authoryear-tiecomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-iecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
index b134ddf872..695a6b787c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2020/03/15 v0.8d extended biblatex authoryear bibliography style (MW)]
+ [2020/05/05 v0.8e extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
index 0661cb4862..207fb40552 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2020/03/15 v0.8d extended biblatex authoryear citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex authoryear citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
index 869ea690d5..7c03f1dd33 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
@@ -1,5 +1,5 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2020/03/15 v0.8d auxiliaries for extended biblatex citation style
+ [2020/05/05 v0.8e auxiliaries for extended biblatex citation style
(MW)]
\def\extblx@requiredbiblatexversion{3.14}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
index 44764981e7..f9491984c5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2020/03/15 v0.8d common files for extended biblatex
+ [2020/05/05 v0.8e common files for extended biblatex
dashed bibliography styles (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
index 182abbb619..8dc1e5f515 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2020/03/15 v0.8d extended biblatex numeric-comp
+ [2020/05/05 v0.8e extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
index 6c725966b7..cfc18f1da5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2020/03/15 v0.8d extended biblatex numeric-comp citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex numeric-comp citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -126,6 +126,7 @@
\DeclareMultiCiteCommand{\smartcites}[\mksmartcite]
{\smartcite}{\multicitedelim}
+
\DeclareCiteCommand{\bbx@xrefcite}[\mkouterbbx@xrefcitedelims]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -136,11 +137,9 @@
{}
\renewbibmacro*{bbx:introcite}{%
- \printfield{labelprefix}%
- \printfield{labelnumber}%
- \ifbool{bbx:subentry}
- {\printfield{entrysetcount}}
- {}}
+ \usebibmacro{cite:init}%
+ \usebibmacro{cite:comp}%
+ \usebibmacro{cite:dump}}
\endinput
%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
index a3f25d89ad..99d666664d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2020/03/15 v0.8d extended biblatex numeric-verb
+ [2020/05/05 v0.8e extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
index 9329075202..be6ec78e99 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2020/03/15 v0.8d extended biblatex numeric-verb citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex numeric-verb citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
index 4ba671890a..13a6891446 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2020/03/15 v0.8d extended biblatex numeric bibliography style (MW)]
+ [2020/05/05 v0.8e extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
index 53c669bb63..9357060a6d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2020/03/15 v0.8d extended biblatex numeric citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex numeric citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
index b147192e20..af1a5f3abc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.8d (2020-03-15)
+% biblatex-ext v0.8e (2020-05-05)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2020/03/15 v0.8d extended biblatex standard style (MW)]
+ [2020/05/05 v0.8e extended biblatex standard style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
index 9fe1fafe5d..7a628b8f79 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-ibid
+ [2020/05/05 v0.8e extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
index 77002522b7..8271dbc79d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-ibid citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-ibid citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
index ae8a1636e9..30694a6e6f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-inote
+ [2020/05/05 v0.8e extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
index a97685ae39..c15b65704a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-inote citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-inote citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
index 92f2929ec0..eb83127ee2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-note
+ [2020/05/05 v0.8e extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
index c30d9fc2dc..65f928af8f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-note citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-note citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
index c3d884aded..189110d53f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad1
+ [2020/05/05 v0.8e extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
index 6a7fb52723..acb9111ead 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad1 citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-trad1 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
index 507c33ccda..798f81eb07 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad2
+ [2020/05/05 v0.8e extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
index 6eda3ffe63..441a31bff7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad2 citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-trad2 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
index a74c5622dc..3f9d00ef11 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad3
+ [2020/05/05 v0.8e extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
index 81a20c7ba6..5119adad2b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2020/03/15 v0.8d extended biblatex verbose-trad3 citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose-trad3 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
index 5e0ba9f2b1..983e5507e8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2020/03/15 v0.8d extended biblatex verbose
+ [2020/05/05 v0.8e extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
index 576c4b4433..aeaee467cd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2020/03/15 v0.8d extended biblatex verbose citation style (MW)]
+ [2020/05/05 v0.8e extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/mercatormap/README b/macros/latex/contrib/mercatormap/README
index eb1212c1ac..52881c1162 100644
--- a/macros/latex/contrib/mercatormap/README
+++ b/macros/latex/contrib/mercatormap/README
@@ -1,4 +1,4 @@
-%% The LaTeX package mercatormap - version 1.00 (2020/04/20)
+%% The LaTeX package mercatormap - version 1.01 (2020/05/05)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/macros/latex/contrib/mercatormap/mercatormap-example.tex b/macros/latex/contrib/mercatormap/mercatormap-example.tex
index 196906fc85..cbd153db91 100644
--- a/macros/latex/contrib/mercatormap/mercatormap-example.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap-example.tex
@@ -1,7 +1,7 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
%%
-%% The LaTeX package mercatormap - version 1.00 (2020/04/20)
+%% The LaTeX package mercatormap - version 1.01 (2020/05/05)
%% mercatormap-example.tex: Example document with a map
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
index 0013fd5ff9..43bb9cf516 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex
@@ -74,7 +74,8 @@
\footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik,
Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany;
email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip
-\normalsize\url{http://www.ctan.org/pkg/mercatormap}\par
+\normalsize%
+\url{https://www.ctan.org/pkg/mercatormap}\par
\url{https://github.com/T-F-S/mercatormap}
}
\end{center}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
index 5b53178e4a..ad285fb7c9 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.definition.tex
@@ -58,25 +58,25 @@ See \Fullref{sec:automated_map} for script aided map definitions.
\end{docCommand}
-\begin{docMrcKey}{mapdef/north}{=\meta{map north latitude}}{no default, initially 50}
+\begin{docMrcKey}[mapdef]{north}{=\meta{map north latitude}}{no default, initially 50}
Northern latitude degree of the visible map, possibly negative for the southern hemisphere,
lower than $90$ but always larger than \refKey{/mermap/mapdef/south}.
It is accessible as \docAuxCommand{mrcmapnorth} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/south}{=\meta{map south latitude}}{no default, initially 48}
+\begin{docMrcKey}[mapdef]{south}{=\meta{map south latitude}}{no default, initially 48}
Southern latitude degree of the visible map, possibly negative for the southern hemisphere,
larger than $-90$ but always lower than \refKey{/mermap/mapdef/north}.
It is accessible as \docAuxCommand{mrcmapsouth} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/west}{=\meta{map west longitude}}{no default, initially 11}
+\begin{docMrcKey}[mapdef]{west}{=\meta{map west longitude}}{no default, initially 11}
Western longitude degree of the visible map, possibly negative for the western hemisphere,
possibly shifted periodically, but always lower than \refKey{/mermap/mapdef/east}.
It is accessible as \docAuxCommand{mrcmapwest} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/east}{=\meta{map east longitude}}{no default, initially 13}
+\begin{docMrcKey}[mapdef]{east}{=\meta{map east longitude}}{no default, initially 13}
Eastern longitude degree of the visible map, possibly negative for the western hemisphere,
possibly shifted periodically, but always larger than \refKey{/mermap/mapdef/west}.
It is accessible as \docAuxCommand{mrcmapeast} (use read-only).
@@ -92,62 +92,62 @@ and not manually by \refCom{mrcdefinemap}. However, some values are
computationally used in all cases. They can be ignored as pure technical
information.
-\begin{docMrcKey}{mapdef/xmin}{=\meta{map tile x minimum}}{no default, initially 271}
+\begin{docMrcKey}[mapdef]{xmin}{=\meta{map tile x minimum}}{no default, initially 271}
Minimal $x$ coordinate of the map tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/xmax}{=\meta{map tile x maximum}}{no default, initially 275}
+\begin{docMrcKey}[mapdef]{xmax}{=\meta{map tile x maximum}}{no default, initially 275}
Maximal $x$ coordinate of the map tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/ymin}{=\meta{map tile y minimum}}{no default, initially 173}
+\begin{docMrcKey}[mapdef]{ymin}{=\meta{map tile y minimum}}{no default, initially 173}
Minimal $y$ coordinate of the map tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/ymax}{=\meta{map tile y maximum}}{no default, initially 177}
+\begin{docMrcKey}[mapdef]{ymax}{=\meta{map tile y maximum}}{no default, initially 177}
Maximal $y$ coordinate of the map tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/zoom}{=\meta{map zoom}}{no default, initially 9}
+\begin{docMrcKey}[mapdef]{zoom}{=\meta{map zoom}}{no default, initially 9}
Map tile zoom factor alias $z$ coordinate of the map tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/pixelwidth}{=\meta{map width in pixels}}{no default, initially 100}
+\begin{docMrcKey}[mapdef]{pixelwidth}{=\meta{map width in pixels}}{no default, initially 100}
Width of the visible map expressed in pixels of the source file(s).
It is accessible as \docAuxCommand{mrcpixelwidth} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/pixelheight}{=\meta{map height in tiles}}{no default, initially 100}
+\begin{docMrcKey}[mapdef]{pixelheight}{=\meta{map height in tiles}}{no default, initially 100}
Height of the visible map expressed in pixels of the source file(s).
It is accessible as \docAuxCommand{mrcpixelheight} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/westoffset}{=\meta{map tile offset (west)}}{no default, initially 0}
+\begin{docMrcKey}[mapdef]{westoffset}{=\meta{map tile offset (west)}}{no default, initially 0}
Distance of the visible map from the western edge of the most western tile
expressed in tiles (range from 0 to 1).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/northoffset}{=\meta{map tile offset (north)}}{no default, initially 0}
+\begin{docMrcKey}[mapdef]{northoffset}{=\meta{map tile offset (north)}}{no default, initially 0}
Distance of the visible map from the northern edge of the most northern tile
expressed in tiles (range from 0 to 1).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/southoffset}{=\meta{map tile offset (south)}}{no default, initially 0}
+\begin{docMrcKey}[mapdef]{southoffset}{=\meta{map tile offset (south)}}{no default, initially 0}
Distance of the visible map from the southern edge of the most southern tile
expressed in tiles (range from 0 to 1).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/basename}{=\meta{map tile base name}}{no default, initially \texttt{tiles/tile}}
+\begin{docMrcKey}[mapdef]{basename}{=\meta{map tile base name}}{no default, initially \texttt{tiles/tile}}
File base name for the tiles.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/attribution}{=\meta{attribution text}}{no default, initially empty}
+\begin{docMrcKey}[mapdef]{attribution}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source. Typically, it acknowledges the copyright
of the map data provider. It may contain hyperlinks.
It is accessible as \docAuxCommand{mrcmapattribution} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/attribution print}{=\meta{attribution text}}{no default, initially empty}
+\begin{docMrcKey}[mapdef]{attribution print}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source.
In contrast to \refKey{/mermap/mapdef/attribution} it is intended for media
that does not support hyperlinks like printed posters, books, etc.
@@ -155,7 +155,7 @@ information.
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/resource}{=\meta{map resource}}{no default, initially |none|}
+\begin{docMrcKey}[mapdef]{resource}{=\meta{map resource}}{no default, initially |none|}
Available map resource with following feasible values:
\begin{itemize}
\item\docValue{none}: No tiles and no merged map.
@@ -165,7 +165,7 @@ information.
\end{itemize}
\end{docMrcKey}
-\begin{docMrcKey}{mapdef/tile size}{=\meta{length}}{no default, initially |32.512mm|}
+\begin{docMrcKey}[mapdef]{tile size}{=\meta{length}}{no default, initially |32.512mm|}
Typically set computationally. It is identical to \refKey{/mermap/tile size}
which is the recommended user option for manual setup.
\end{docMrcKey}
@@ -206,11 +206,11 @@ The border of the visible map is denoted by a \tikzname\ node \docNode{mrcmap}.
The |mrc cs| coordinate system defines a map point by
\refKey{/mermap/cs/latitude} and \refKey{/mermap/cs/longitude}
-\begin{docMrcKey}{cs/latitude}{=\meta{latitude}}{no default}
+\begin{docMrcKey}[cs]{latitude}{=\meta{latitude}}{no default}
Sets the \meta{latitude} of a map point.
\end{docMrcKey}
-\begin{docMrcKey}{cs/longitude}{=\meta{longitude}}{no default}
+\begin{docMrcKey}[cs]{longitude}{=\meta{longitude}}{no default}
Sets the \meta{longitude} of a map point.
\end{docMrcKey}
@@ -222,11 +222,11 @@ The |mrc cs| coordinate system defines a map point by
A map point can also be defined by shorter variants
\refKey{/mermap/cs/lat} and \refKey{/mermap/cs/lon}
-\begin{docMrcKey}{cs/lat}{=\meta{latitude}}{no default}
+\begin{docMrcKey}[cs]{lat}{=\meta{latitude}}{no default}
Sets the \meta{latitude} of a map point.
\end{docMrcKey}
-\begin{docMrcKey}{cs/lon}{=\meta{longitude}}{no default}
+\begin{docMrcKey}[cs]{lon}{=\meta{longitude}}{no default}
Sets the \meta{longitude} of a map point.
\end{docMrcKey}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
index c5289f537c..b038b3d619 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex
@@ -188,7 +188,7 @@ accompanying Python script. The technical background is documented in
the option list for \refCom{mrcsupplymap}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/type}{=\meta{type}}{no default, initially |reference|}
+\begin{docMrcKey}[supply]{type}{=\meta{type}}{no default, initially |reference|}
The \meta{type} defines the basic computation for the map. Feasible values are
\begin{itemize}
\item\docValue{reference}: \flqq map with reference position\frqq\\
@@ -220,37 +220,37 @@ accompanying Python script. The technical background is documented in
\end{itemize}
\end{docMrcKey}
-\begin{docMrcKey}{supply/zoom}{=\meta{setup zoom}}{no default, initially |9|}
+\begin{docMrcKey}[supply]{zoom}{=\meta{setup zoom}}{no default, initially |9|}
Map tile zoom factor alias $z$ coordinate of the map tiles.
Used for map types \docValue{boundaries} and \docValue{reference}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/north}{=\meta{setup north latitude}}{no default, initially |50|}
+\begin{docMrcKey}[supply]{north}{=\meta{setup north latitude}}{no default, initially |50|}
Northern latitude degree, possibly negative for the southern hemisphere,
lower than $90$ but always larger than \refKey{/mermap/supply/south}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/south}{=\meta{setup south latitude}}{no default, initially |48|}
+\begin{docMrcKey}[supply]{south}{=\meta{setup south latitude}}{no default, initially |48|}
Southern latitude degree, possibly negative for the southern hemisphere,
larger than $-90$ but always lower than \refKey{/mermap/supply/north}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/west}{=\meta{setup west longitude}}{no default, initially |11|}
+\begin{docMrcKey}[supply]{west}{=\meta{setup west longitude}}{no default, initially |11|}
Western longitude degree, possibly negative for the western hemisphere,
possibly shifted periodically, but always lower than \refKey{/mermap/supply/east}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/east}{=\meta{setup east longitude}}{no default, initially |13|}
+\begin{docMrcKey}[supply]{east}{=\meta{setup east longitude}}{no default, initially |13|}
Eastern longitude degree, possibly negative for the western hemisphere,
possibly shifted periodically, but always larger than \refKey{/mermap/supply/west}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/area}{=\marg{comma separated list of named positions}}{no default}
+\begin{docMrcKey}[supply]{area}{=\marg{comma separated list of named positions}}{no default}
Sets
\refKey{/mermap/supply/north}, \refKey{/mermap/supply/south},
\refKey{/mermap/supply/west}, \refKey{/mermap/supply/east}
@@ -263,7 +263,7 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/add area}{=\marg{comma separated list of named positions}}{no default}
+\begin{docMrcKey}[supply]{add area}{=\marg{comma separated list of named positions}}{no default}
Nearly identical to \refKey{/mermap/supply/area}, but
the given \meta{comma separated list of named positions}
does not reset the current area, i.e. the positions are added to the
@@ -272,7 +272,7 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/area to reference}{}{no value, initially unset}
+\begin{docMrcKey}[supply]{area to reference}{}{no value, initially unset}
The map settings
\refKey{/mermap/supply/north}, \refKey{/mermap/supply/south},
\refKey{/mermap/supply/west}, \refKey{/mermap/supply/east}
@@ -283,24 +283,24 @@ accompanying Python script. The technical background is documented in
-\begin{docMrcKey}{supply/latitude}{=\meta{setup latitude}}{no default, initially |49|}
+\begin{docMrcKey}[supply]{latitude}{=\meta{setup latitude}}{no default, initially |49|}
Latitude degree of a reference point, possibly negative for the southern hemisphere.
Used for map type \docValue{reference}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/longitude}{=\meta{setup longitude}}{no default, initially |12|}
+\begin{docMrcKey}[supply]{longitude}{=\meta{setup longitude}}{no default, initially |12|}
Longitude degree of a reference point, possibly negative for the western hemisphere.
Used for map type \docValue{reference}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/position}{=\meta{setup latitude}:\meta{setup longitude}}{no default, initially |49:12|}
+\begin{docMrcKey}[supply]{position}{=\meta{setup latitude}:\meta{setup longitude}}{no default, initially |49:12|}
Latitude degree and longitude of a reference point.
Used for map type \docValue{reference}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/named position}{=\meta{name}}{style, no default}
+\begin{docMrcKey}[supply]{named position}{=\meta{name}}{style, no default}
The \emph{named position} given by \meta{name} describes
a reference point, see \Fullref{sec:names_positions}.
Used for map type \docValue{reference}.
@@ -308,36 +308,36 @@ accompanying Python script. The technical background is documented in
\pagebreak
-\begin{docMrcKey}{supply/width}{=\meta{setup width in tiles}}{no default, initially |4|}
+\begin{docMrcKey}[supply]{width}{=\meta{setup width in tiles}}{no default, initially |4|}
Width of the map as multiplicity of map tiles.
Used for map types \docValue{reference} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/tex width}{=\meta{width}}{style, no default}
+\begin{docMrcKey}[supply]{tex width}{=\meta{width}}{style, no default}
Width of the map as \TeX\ dimension.
This is a style to compute \refKey{/mermap/supply/width} according to
the current \refKey{/mermap/tile size}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/height}{=\meta{setup height in tiles}}{no default, initially |4|}
+\begin{docMrcKey}[supply]{height}{=\meta{setup height in tiles}}{no default, initially |4|}
Height of the map as multiplicity of map tiles.
Used for map types \docValue{reference} and \docValue{areafit}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/tex height}{=\meta{width}}{style, no default}
+\begin{docMrcKey}[supply]{tex height}{=\meta{width}}{style, no default}
Height of the map as \TeX\ dimension.
This is a style to compute \refKey{/mermap/supply/height} according to
the current \refKey{/mermap/tile size}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/align}{=\meta{setup alignment}}{no default, initially |center|}
+\begin{docMrcKey}[supply]{align}{=\meta{setup alignment}}{no default, initially |center|}
Alignment of reference point or area for map types \docValue{reference} and \docValue{areafit}.
Feasible values are
\docValue{northwest}, \docValue{north}, \docValue{northeast}, \docValue{west},
\docValue{center}, \docValue{east}, \docValue{southwest},\docValue{south}, \docValue{southeast}.
\end{docMrcKey}
-\begin{docMrcKey}{supply/target}{=\meta{setup target}}{no default, initially |tiles|}
+\begin{docMrcKey}[supply]{target}{=\meta{setup target}}{no default, initially |tiles|}
Defines the type of output for the Python~3 script. Feasible values are:
\begin{itemize}
\item\docValue{none}: No tiles are downloaded and no merged map is generated, just map computation.
@@ -365,7 +365,7 @@ accompanying Python script. The technical background is documented in
\clearpage
-\begin{docMrcKey}{supply/url}{=\meta{setup URL}}{no default, initially empty}
+\begin{docMrcKey}[supply]{url}{=\meta{setup URL}}{no default, initially empty}
Here, the url format with placeholder |{z}{x}{y}| for map tile download is defined.
\textbf{Be sure that you have the permission to download, save, and use
the map tiles from that URL. Illegal downloads are not endorsed in any
@@ -377,7 +377,7 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/url with api key}{=\marg{prefix}\marg{name}\marg{postfix}}{no default}
+\begin{docMrcKey}[supply]{url with api key}{=\marg{prefix}\marg{name}\marg{postfix}}{no default}
This is an alternative version of \refKey{/mermap/supply/url}.
The URL is constructed from some fixed \meta{prefix} and \meta{postfix} with
an API key in between. The API key is retrieved by \meta{name} from a
@@ -402,7 +402,7 @@ accompanying Python script. The technical background is documented in
-\begin{docMrcKey}{supply/attribution}{=\meta{attribution text}}{no default, initially empty}
+\begin{docMrcKey}[supply]{attribution}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source. Typically, it acknowledges the copyright
of the map data provider. It may contain hyperlinks.
It is used to set up \refKey{/mermap/mapdef/attribution} afterwards
@@ -412,7 +412,7 @@ accompanying Python script. The technical background is documented in
\verb+\"{u}+, but umlauts can also be used directly, e.g. as UTF-8 coded characters.
\end{docMrcKey}
-\begin{docMrcKey}{supply/attribution print}{=\meta{attribution text}}{no default, initially empty}
+\begin{docMrcKey}[supply]{attribution print}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source.
In contrast to \refKey{/mermap/supply/attribution} it is intended for media
that does not support hyperlinks like printed posters, books, etc.
@@ -421,13 +421,13 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/basename}{=\meta{setup tile base name}}{no default, initially \texttt{tiles/tile}}
+\begin{docMrcKey}[supply]{basename}{=\meta{setup tile base name}}{no default, initially \texttt{tiles/tile}}
Prefix for local tile files, e.g. '|tiles/map|' for '|tiles/map_10_10_10.png|'.
\end{docMrcKey}
\clearpage
-\begin{docMrcKey}{supply/flex reference scale}{=\meta{scale denominator}}{no default}
+\begin{docMrcKey}[supply]{flex reference scale}{=\meta{scale denominator}}{no default}
With the given \meta{scale denominator}, an appropriate \refKey{/mermap/supply/zoom}
and \refKey{/mermap/tile size} is computed. Note that
the \meta{scale denominator}
@@ -469,7 +469,7 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/flex area scale}{=\meta{scale denominator}}{no default}
+\begin{docMrcKey}[supply]{flex area scale}{=\meta{scale denominator}}{no default}
This is a shortcut for setting \refKey{/mermap/supply/area to reference}
and \refKey{/mermap/supply/flex reference scale}=\meta{scale denominator}.
Used for map type \docValue{boundaries} and \docValue{reference}.
@@ -486,7 +486,7 @@ accompanying Python script. The technical background is documented in
\clearpage
-\begin{docMrcKey}{supply/flex area fit}{\colOpt{=\meta{size}}}{default |0pt|}
+\begin{docMrcKey}[supply]{flex area fit}{\colOpt{=\meta{size}}}{default |0pt|}
This key can be used for map type \docValue{areafit} as \emph{final}
option \emph{after} all other options.
It applies a fine tuning to \refKey{/mermap/tile size},
@@ -522,7 +522,7 @@ accompanying Python script. The technical background is documented in
\clearpage
-\begin{docMrcKey}{supply/pixel}{=\meta{setup pixel size}}{no default, initially |256|}
+\begin{docMrcKey}[supply]{pixel}{=\meta{setup pixel size}}{no default, initially |256|}
Pixel width (and height) of a tile. It is especially needed for
target \docValue{mergedmap} and also \docValue{wmsmap}.
For \docValue{wmsmap}, it is multiplied with a pseudo tile calculation
@@ -530,7 +530,7 @@ accompanying Python script. The technical background is documented in
\end{docMrcKey}
-\begin{docMrcKey}{supply/dpi}{=\meta{dpi value}}{style, no default}
+\begin{docMrcKey}[supply]{dpi}{=\meta{dpi value}}{style, no default}
This style sets \refKey{/mermap/supply/pixel} such that the given \meta{dpi value}
is resulting (approximately).
\begin{itemize}
@@ -631,7 +631,7 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\medskip
-\begin{docMrcKey}{supply/source}{=\meta{source}}{style, no default}
+\begin{docMrcKey}[supply]{source}{=\meta{source}}{style, no default}
This style sets \refKey{/mermap/supply/url}, \refKey{/mermap/supply/attribution},\\
\refKey{/mermap/supply/attribution print} and \refKey{/mermap/supply/basename}.\\
Feasible values for \meta{source} are:
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
index 070b12acda..02a3f981fe 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.marker.tex
@@ -58,44 +58,44 @@ may be helpful which provides some predefined marker types.
\pagebreak
-\begin{docMrcKey}{marker/first options}{=\meta{options}}{no default, initially unset}
+\begin{docMrcKey}[marker]{first options}{=\meta{options}}{no default, initially unset}
The given list of \meta{options} is used inside every \refCom{mrcmarker}
\emph{before} the options of \refCom{mrcmarker}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/last options}{=\meta{options}}{no default, initially unset}
+\begin{docMrcKey}[marker]{last options}{=\meta{options}}{no default, initially unset}
The given list of \meta{options} is used inside every \refCom{mrcmarker}
\emph{after} the options of \refCom{mrcmarker}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/latitude}{=\meta{latitude}}{no default, initially |12|}
+\begin{docMrcKey}[marker]{latitude}{=\meta{latitude}}{no default, initially |12|}
Latitude degree of the place marker.
It is accessible as \docAuxCommand{mrcmarkerlatitude} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/lat}{=\meta{latitude}}{no default, initially |12|}
+\begin{docMrcKey}[marker]{lat}{=\meta{latitude}}{no default, initially |12|}
Alias for \refKey{/mermap/marker/latitude}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/longitude}{=\meta{longitude}}{no default, initially |49|}
+\begin{docMrcKey}[marker]{longitude}{=\meta{longitude}}{no default, initially |49|}
Longitude degree of the place marker.
It is accessible as \docAuxCommand{mrcmarkerlongitude} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/lon}{=\meta{longitude}}{no default, initially |49|}
+\begin{docMrcKey}[marker]{lon}{=\meta{longitude}}{no default, initially |49|}
Alias for \refKey{/mermap/marker/longitude}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/position}{=\meta{place latitude}:\meta{place longitude}}{no default, initially |12:49|}
+\begin{docMrcKey}[marker]{position}{=\meta{place latitude}:\meta{place longitude}}{no default, initially |12:49|}
Sets the latitude degree and the longitude degree of the place marker.
\end{docMrcKey}
-\begin{docMrcKey}{marker/named position}{=\meta{name}}{style, no default}
+\begin{docMrcKey}[marker]{named position}{=\meta{name}}{style, no default}
Sets the latitude degree and the longitude degree of the place marker
to the \emph{named position} denoted by \meta{name}, see \Fullref{sec:names_positions}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/use inside}{=\meta{area}}{no default, initially |map|}
+\begin{docMrcKey}[marker]{use inside}{=\meta{area}}{no default, initially |map|}
The place marker is used or ignored according to its belonging inside the
given \meta{area}. Feasible values for \meta{area} are:
\begin{itemize}
@@ -105,72 +105,85 @@ may be helpful which provides some predefined marker types.
\end{docMrcKey}
-\begin{docMrcKey}{marker/contents}{=\meta{text}}{no default, initially empty}
+\begin{docMrcKey}[marker]{contents}{=\meta{text}}{no default, initially empty}
Sets \meta{text} for displaying inside the marker, if
the marker type supports such a thing.
It is accessible as \docAuxCommand{mrcmarkercontents} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/pictocontents}{=\meta{code}}{no default, initially empty}
+\begin{docMrcKey}[marker]{pictocontents}{=\meta{code}}{no default, initially empty}
Sets \tikzname\ \meta{code} for displaying inside the marker, if
the marker type supports such a thing.
It is accessible as \docAuxCommand{mrcmarkerpictocontents} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/alias}{=\meta{text}}{no default, initially |noname|}
+\begin{docMrcKey}[marker]{alias}{=\meta{text}}{no default, initially |noname|}
The position of the marker is available as \tikzname\ coordinate by
the given \meta{text}, e.g. to draw to or from the marker.
\end{docMrcKey}
-\begin{docMrcKey}{marker/uuid}{=\meta{uuid}}{no default, initially empty}
+\begin{docMrcKey}[marker][doc updated=2020-05-04]{uuid}{=\meta{uuid}}{no default, initially empty}
Sets a \meta{uuid} for unique identification of markers.
- It is accessible as \docAuxCommand{mrcmarkeruuid} (use read-only).
+ It is accessible as \docAuxCommand{mrcmarkeruuid} (use read-only)
+ and \docAuxCommand[doc sort index=mermap_marker_uuid_tl]{l_mermap_marker_uuid_tl} (use read-only).
The \meta{uuid} is provided for user applications.
\end{docMrcKey}
+\begin{docMrcKeys}[
+ doc keypath = marker,
+ doc name = generic,
+ doc parameter = {=\meta{text}},
+ doc description = {no default, initially empty},
+ doc new = 2020-05-04,
+]{}
+ Sets \meta{text} as generic content for user applications.
+ It is accessible as \docAuxCommand{mrcmarkergeneric} (use read-only)
+ and \docAuxCommand[doc sort index=mermap_marker_generic_tl]{l_mermap_marker_generic_tl} (use read-only).
+\end{docMrcKeys}
-\begin{docMrcKey}{marker/category}{=\meta{category}}{no default, initially empty}
+
+\begin{docMrcKey}[marker]{category}{=\meta{category}}{no default, initially empty}
Sets a \meta{category} to group markers.
It is accessible as \docAuxCommand{mrcmarkercategory} (use read-only).
\end{docMrcKey}
\clearpage
-\begin{docMrcKey}{marker/show}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
+\begin{docMrcKey}[marker]{show}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |true|, the marker is shown, if it lies inside the map (or vicinity).
Otherwise, the place marker is not used.
\end{docMrcKey}
-\begin{docMrcKey}{marker/hide}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+\begin{docMrcKey}[marker]{hide}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the marker is not used.
\refKey{/mermap/marker/hide} is inverse to \refKey{/mermap/marker/show}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/show category}{=\meta{category}}{style, no default}
+\begin{docMrcKey}[marker]{show category}{=\meta{category}}{style, no default}
Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} equals \meta{category}.
Otherwise, nothing happens.
\refKey{/mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/show all but category}{=\meta{category}}{style, no default}
+\begin{docMrcKey}[marker]{show all but category}{=\meta{category}}{style, no default}
Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} does not equal \meta{category}.
Otherwise, nothing happens.
\refKey{/mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/hide category}{=\meta{category}}{style, no default}
+\begin{docMrcKey}[marker]{hide category}{=\meta{category}}{style, no default}
Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} equals \meta{category}.
Otherwise, nothing happens.
\refKey{/mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
-\begin{docMrcKey}{marker/hide all but category}{=\meta{category}}{style, no default}
+\begin{docMrcKey}[marker]{hide all but category}{=\meta{category}}{style, no default}
Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} does not equal \meta{category}.
Otherwise, nothing happens.
\refKey{/mermap/marker/category} has to be set \emph{before}.
@@ -191,10 +204,113 @@ may be helpful which provides some predefined marker types.
\clearpage
+
+The following options require the package |hyperref| to be loaded.
+If |hyperref| is not loaded, \refKey{/mermap/marker/url} and
+\refKey{/mermap/marker/link} are ignored.\\
+Note that if \refKey{/mermap/marker/url} and \refKey{/mermap/marker/link}
+are applied concurrently, then \refKey{/mermap/marker/link} will win.
+
+
+\begin{docMrcKeys}[
+ doc keypath = marker,
+ doc name = url,
+ doc parameter = {=\meta{URL}},
+ doc description = {no default, initially empty},
+ doc new = 2020-05-04,
+]{}
+ Sets \meta{URL} as external link of the marker.
+ The package is required for this option.
+ For an own marker type, it is applied as \tikzname\ option \docValue{mrchyperpath}.
+
+\tikzsetnextfilename{marker_url}%
+\begin{dispExample}
+\begin{tikzpicture}
+ \mrcNPdef{unibwm}{48.0802826}{11.6381048}
+ \mrcmap[type=reference, named position=unibwm,
+ flex reference scale=100000,
+ source=topplusopen web grau,
+ tex width=\linewidth,tex height=4cm]{}
+ \mrcdrawmap
+ \node[below,font=\fontsize{7pt}{7pt}\sffamily] at (mrcmap.south)
+ {\mrcmapattribution};
+ \mrcdrawnetwork
+ \mrcclipmap
+ \mrcmarker{ named position = unibwm,
+ type = pin,
+ draw = red,
+ fill = red!20!white,
+ url = {https://www.unibw.de},
+ contents = {Universit\"at der Bundeswehr M\"unchen},
+ }
+\end{tikzpicture}
+\end{dispExample}
+
+
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = marker,
+ doc name = link,
+ doc parameter = {=\meta{name}},
+ doc description = {no default, initially empty},
+ doc new = 2020-05-04,
+]{}
+ Sets an internal link of the marker to a document target with
+ the given \meta{name}.
+ The package |hyperref| is required for this option.
+ For an own marker type, it is applied as \tikzname\ option \docValue{mrchyperpath}.
+\end{docMrcKeys}
+
+
+
+\begin{docMrcKeys}[
+ doc keypath = marker,
+ doc parameter = {\colOpt{=true\textbar false}},
+ doc new = 2020-05-04,
+]{
+ {
+ doc name = use urls,
+ doc description = {default |true|, initially |true|},
+ },
+ {
+ doc name = ignore urls,
+ doc description = {default |true|, initially |false|},
+ },
+}
+ If \refKey{/mermap/marker/use urls} is set to |false|, external links
+ with \refKey{/mermap/marker/url} are ignored.\\
+ \refKey{/mermap/marker/ignore urls} is inverse to \refKey{/mermap/marker/use urls}.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = marker,
+ doc parameter = {\colOpt{=true\textbar false}},
+ doc new = 2020-05-04,
+]{
+ {
+ doc name = use links,
+ doc description = {default |true|, initially |true|},
+ },
+ {
+ doc name = ignore links,
+ doc description = {default |true|, initially |false|},
+ },
+}
+ If \refKey{/mermap/marker/use links} is set to |false|, internal links
+ with \refKey{/mermap/marker/link} are ignored.\\
+ \refKey{/mermap/marker/ignore links} is inverse to \refKey{/mermap/marker/use links}.
+\end{docMrcKeys}
+
+
+
+\clearpage
%-------------------------------------------------------------------------------
\subsection{Marker Types}
-\begin{docMrcKey}{marker/type}{=\meta{type}}{no default, initially |classic|}
+\begin{docMrcKey}[marker]{type}{=\meta{type}}{no default, initially |classic|}
Decides about the basic shape and style of the marker.
Feasible values for \meta{type} are listed in the following.
More values can be defined by \refCom{mrcnewmarkertype}.
@@ -396,19 +512,19 @@ may be helpful which provides some predefined marker types.
\medskip
The different marker types can be customized by some additional options:
-\begin{docMrcKey}{marker/font}{=\meta{font}}{no default, initially \texttt{\textbackslash sffamily\textbackslash small}}
+\begin{docMrcKey}[marker]{font}{=\meta{font}}{no default, initially \texttt{\textbackslash sffamily\textbackslash small}}
Font of the marker text
(\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}).
It is accessible as \docAuxCommand{mrcmarkerfont} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/text}{=\meta{color}}{no default, initially |black|}
+\begin{docMrcKey}[marker]{text}{=\meta{color}}{no default, initially |black|}
Color of the marker text
(\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}).
It is accessible as \docColor{mrcmarkertext} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/draw}{=\meta{color}}{no default, initially |gray|}
+\begin{docMrcKey}[marker]{draw}{=\meta{color}}{no default, initially |gray|}
Color of the marker frame
(\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop},
\docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring},
@@ -416,7 +532,7 @@ The different marker types can be customized by some additional options:
It is accessible as \docColor{mrcmarkerdraw} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/fill}{=\meta{color}}{no default, initially |gray!20|}
+\begin{docMrcKey}[marker]{fill}{=\meta{color}}{no default, initially |gray!20|}
Color of the marker interior
(\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop},
\docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring},
@@ -424,12 +540,12 @@ The different marker types can be customized by some additional options:
It is accessible as \docColor{mrcmarkerfill} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/angle}{=\meta{angle}}{no default, initially |90|}
+\begin{docMrcKey}[marker]{angle}{=\meta{angle}}{no default, initially |90|}
Angle of the marker (\docValue{classic}).
It is accessible as \docAuxCommand{mrcmarkerangle} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/shift}{=\meta{length}}{no default, initially |0pt|}
+\begin{docMrcKey}[marker]{shift}{=\meta{length}}{no default, initially |0pt|}
Shift of the marker text
(\docValue{pin}, \docValue{pinflip}).
It also shifts the drop center
@@ -437,7 +553,9 @@ The different marker types can be customized by some additional options:
It is accessible as \docAuxCommand{mrcmarkershift} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/radius}{=\meta{length}}{no default, initially |3mm|}
+\clearpage
+
+\begin{docMrcKey}[marker]{radius}{=\meta{length}}{no default, initially |3mm|}
Radius of the marker
(\docValue{classic}, \docValue{drop}, \docValue{pictodrop},
\docValue{pictodropring}, \docValue{knob}, \docValue{pictoknob}, \docValue{pictoknobring},
@@ -445,13 +563,13 @@ The different marker types can be customized by some additional options:
It is accessible as \docAuxCommand{mrcmarkerradius} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/inner radius}{=\meta{length}}{no default, initially |2.25mm|}
+\begin{docMrcKey}[marker]{inner radius}{=\meta{length}}{no default, initially |2.25mm|}
Inner radius of the marker
(\docValue{pictodropring}, \docValue{pictoknobring}, \docValue{ringx}).
It is accessible as \docAuxCommand{mrcmarkerinnerradius} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/path style}{=\marg{options}}{no default, initially empty}
+\begin{docMrcKey}[marker]{path style}{=\marg{options}}{no default, initially empty}
\tikzname\ \meta{options} which are added to (some) path elements of
of the marker
(\docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{pictodrop},
@@ -460,7 +578,7 @@ The different marker types can be customized by some additional options:
It is accessible as \tikzname\ option \docValue{mrcpathstyle} (use read-only).
\end{docMrcKey}
-\begin{docMrcKey}{marker/node style}{=\marg{options}}{no default, initially empty}
+\begin{docMrcKey}[marker]{node style}{=\marg{options}}{no default, initially empty}
\tikzname\ \meta{options} which are added to the node element of
of the marker
(\docValue{classic}, \docValue{pin}, \docValue{pinflip}, \docValue{drop}, \docValue{knob}).
@@ -545,7 +663,7 @@ The different marker types can be customized by some additional options:
\end{docCommand}
-\begin{docMrcKey}{marker/style}{=\meta{style name}}{no default, initially unset}
+\begin{docMrcKey}[marker]{style}{=\meta{style name}}{no default, initially unset}
Applies a given \meta{style name}, i.e. all options which were stored
by \refCom{mrcnewmarkerstyle} under this name.
\end{docMrcKey}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
index 1785515841..cddb277c86 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex
@@ -29,6 +29,7 @@ The mathematical background and further information are found in \cite{Sturm:202
\tikzname\ variant to set \refKey{/mermap/samples}.
\end{docTikzKey}
+\enlargethispage*{1cm}
\begin{docCommand}{mrcdraworthodrome}{\oarg{options}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}}
Draws an orthodrome curve from a point with
@@ -155,6 +156,7 @@ The mathematical background and further information are found in \cite{Sturm:202
\end{dispExample}
\end{docCommand}
+\enlargethispage*{1cm}
\begin{docCommand}{mrcstoreloxodistance}{\marg{macro}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}}
Stores the approximate loxodromic distance (in kilometers) between two points
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
index 4c139d1449..6efc4fe0d0 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex
@@ -206,45 +206,45 @@ but not for critical navigation purposes etc.
node[pos=0.8]{80} node[pos=1]{100} node[pos=1,right,yshift=-1mm]{km};
\end{tikzpicture}
\end{dispExample}
-
\end{docCommand}
+\clearpage
-\begin{docMrcKey}{scalebar/width-in-km}{=\meta{number}}{no default, initially |0|}
+\begin{docMrcKey}[scalebar]{width-in-km}{=\meta{number}}{no default, initially |0|}
Sets the width of the scale bar to match the real word length \meta{number}
in kilometers.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/width-in-kilometer}{=\meta{number}}{no default, initially |0|}
+\begin{docMrcKey}[scalebar]{width-in-kilometer}{=\meta{number}}{no default, initially |0|}
Alias for \refKey{/mermap/scalebar/width-in-km}
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/width-in-meter}{=\meta{number}}{no default, initially |0|}
+\begin{docMrcKey}[scalebar]{width-in-meter}{=\meta{number}}{no default, initially |0|}
Sets the width of the scale bar to match the real word length \meta{number}
in meters.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/width-in-mile}{=\meta{number}}{no default, initially |0|}
+\begin{docMrcKey}[scalebar]{width-in-mile}{=\meta{number}}{no default, initially |0|}
Sets the width of the scale bar to match the real word length \meta{number}
in miles.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/width-in-yard}{=\meta{number}}{no default, initially |0|}
+\begin{docMrcKey}[scalebar]{width-in-yard}{=\meta{number}}{no default, initially |0|}
Sets the width of the scale bar to match the real word length \meta{number}
in yards.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/partitions}{=\meta{number}}{no default, initially |5|}
+\begin{docMrcKey}[scalebar]{partitions}{=\meta{number}}{no default, initially |5|}
Determines the \meta{number} of partitions for the scale bar. If \meta{number}
is set to 1, there is no partitioning.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/height}{=\meta{length}}{no default, initially |2mm|}
+\begin{docMrcKey}[scalebar]{height}{=\meta{length}}{no default, initially |2mm|}
Sets the height of the scale bar to the given \TeX\ \meta{length}.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/at}{=\marg{\tikzname\ coordinate}}{no default,
+\begin{docMrcKey}[scalebar]{at}{=\marg{\tikzname\ coordinate}}{no default,
initially \texttt{\brackets{(0,0)}}}
The scale bar is positioned at the given \meta{\tikzname\ coordinate}.
The placement is done with the \refKey{/mermap/scalebar/placement} option.
@@ -283,7 +283,7 @@ but not for critical navigation purposes etc.
\pagebreak
-\begin{docMrcKey}{scalebar/placement}{=\meta{\tikzname\ positioning}}{no default, initially empty}
+\begin{docMrcKey}[scalebar]{placement}{=\meta{\tikzname\ positioning}}{no default, initially empty}
\meta{\tikzname\ positioning} of a scale bar in combination with
\refKey{/mermap/scalebar/at}. All \tikzname\ placement options for nodes
can be used, e.g. \texttt{above left} or \texttt{anchor=mid west}, etc.
@@ -292,7 +292,7 @@ but not for critical navigation purposes etc.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/south-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{south-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar at the south east corner of the map.
The optional \mbox{\meta{x shift}} and \meta{y shift} denote the
absolute shift values in each direction, i.e. the algebraic sign is
@@ -302,36 +302,36 @@ but not for critical navigation purposes etc.
are set by this option.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/south-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{south-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar below the south east corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/south-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{south-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar at the south west corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/south-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{south-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar below the south west corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/north-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{north-west-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar at the north west corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/north-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{north-west-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar above the north west corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/north-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{north-east-inside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar at the north east corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/north-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
+\begin{docMrcKey}[scalebar]{north-east-outside}{\colOpt{=\meta{x shift};\meta{y shift}}}{default |0pt;0pt|, initially unset}
Shortcut for placing the scale bar above the north east corner of the map.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/major style}{=\marg{\tikzname\ options}}{no default, initially empty}
+\begin{docMrcKey}[scalebar]{major style}{=\marg{\tikzname\ options}}{no default, initially empty}
The \emph{major} part of the scale bar is a single \tikzname\ path object
which can be customized by the given \meta{\tikzname\ options}.
The \emph{major} part consists of the black area in the default case.
@@ -345,7 +345,7 @@ but not for critical navigation purposes etc.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/minor style}{=\marg{\tikzname\ options}}{no default, initially empty}
+\begin{docMrcKey}[scalebar]{minor style}{=\marg{\tikzname\ options}}{no default, initially empty}
The \emph{minor} part of the scale bar is a single \tikzname\ path object
which can be customized by the given \meta{\tikzname\ options}.
The \emph{minor} part is seen as holes in the default case.
@@ -362,12 +362,12 @@ but not for critical navigation purposes etc.
\pagebreak
-\begin{docMrcKey}{scalebar/double}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
+\begin{docMrcKey}[scalebar]{double}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |true|, the scale bar is drawn as a double ruler.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/single}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+\begin{docMrcKey}[scalebar]{single}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the scale bar is drawn as a single ruler.
\refKey{/mermap/scalebar/single} is inverse to \refKey{/mermap/scalebar/double}.
\tikzsetnextfilename{scales_scalebar6}
@@ -379,20 +379,20 @@ but not for critical navigation purposes etc.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/transparent}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
+\begin{docMrcKey}[scalebar]{transparent}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |true|, the \emph{minor} part of the scale bar is drawn transparent,
i.e. as holes inside the ruler.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/solid}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+\begin{docMrcKey}[scalebar]{solid}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the \emph{minor} part of the scale bar is drawn opaque.
It is drawn white or according to \refKey{/mermap/scalebar/minor style}.
\refKey{/mermap/scalebar/solid} is inverse to \refKey{/mermap/scalebar/transparent}.
\end{docMrcKey}
-\begin{docMrcKey}{scalebar/scale}{=\meta{scale denominator}}{no default, initially unset}
+\begin{docMrcKey}[scalebar]{scale}{=\meta{scale denominator}}{no default, initially unset}
Sets or overwrites the \meta{scale denominator} setting.
\textbf{Using this key is not needed and may even lead to erroneous displays
inside a |tikzpicture| with a defined map setting.}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.sty b/macros/latex/contrib/mercatormap/mercatormap.doc.sty
index e2ecc0fe9f..7ef0480a7f 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.sty
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.sty
@@ -97,8 +97,13 @@
#1}{#2}
\tcbmakedocSubKey{docMrcKey}{mermap}
+\tcbmakedocSubKeys{docMrcKeys}{mermap}
\tcbmakedocSubKey{docTikzKey}{tikz}
\def\tikzname{\textup{Ti\textit{k}Z}}
\let\docNode\docValue
+
+\renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1}
+\renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1}
+
diff --git a/macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex b/macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex
index 9d5ece4dff..121b9f3e55 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex
@@ -9,3 +9,23 @@
\begin{itemize}
\item Initial public release.
\end{itemize}
+
+\section*{v1.01 (2020/05/05)}
+\begin{itemize}
+\item Sorting of index key entries fixed for the documentation.
+\item User messages for failed Python script calls are changed from warnings to
+ errors to fail fast and to provide more information and hints about
+ possible reasons.
+\item New general marker option
+ \refKey{/mermap/marker/generic} with corresponding macros
+ \docAuxCommand*{mrcmarkergeneric}
+ and \docAuxCommand*{l_mermap_marker_generic_tl}. Also, the marker uuid is
+ made |expl3| accessible as \docAuxCommand*{l_mermap_marker_uuid_tl}.
+\item New hyper marker options
+ \refKey{/mermap/marker/url},
+ \refKey{/mermap/marker/link},
+ \refKey{/mermap/marker/use urls},
+ \refKey{/mermap/marker/ignore urls},
+ \refKey{/mermap/marker/use links},
+ \refKey{/mermap/marker/ignore links}.
+\end{itemize}
diff --git a/macros/latex/contrib/mercatormap/mercatormap.pdf b/macros/latex/contrib/mercatormap/mercatormap.pdf
index 15bb306604..4e6f43986d 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.pdf
+++ b/macros/latex/contrib/mercatormap/mercatormap.pdf
Binary files differ
diff --git a/macros/latex/contrib/mercatormap/mercatormap.sty b/macros/latex/contrib/mercatormap/mercatormap.sty
index d05872b77f..488548c96f 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.sty
+++ b/macros/latex/contrib/mercatormap/mercatormap.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package mercatormap - version 1.00 (2020/04/20)
+%% The LaTeX package mercatormap - version 1.01 (2020/05/05)
%% mercatormap.sty: geographic coordinates (Mercator projection) and map tiles for TikZ pictures
%%
%% -------------------------------------------------------------------------------------------
@@ -19,7 +19,7 @@
%%
\RequirePackage{expl3}[2020/02/25]
\RequirePackage{xparse}
-\ProvidesExplPackage{mercatormap}{2020/04/20}{1.00}
+\ProvidesExplPackage{mercatormap}{2020/05/05}{1.01}
{A Web Mercator projection package with map tile support}
\@ifpackagelater { expl3 } { 2020/02/25 }
{ }
@@ -486,7 +486,7 @@
\tl_const:Nn \c__mermap_supply_call_boundaries_tl
{%
- \l__mermap_python\c_space_tl boundaries
+ \l__mermap_python_tl\c_space_tl boundaries
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
-atp "\str_use:N\l__mermap_supply_attribution_print_str"
@@ -504,7 +504,7 @@
\tl_const:Nn \c__mermap_supply_call_reference_tl
{%
- \l__mermap_python\c_space_tl reference
+ \l__mermap_python_tl\c_space_tl reference
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
-atp "\str_use:N\l__mermap_supply_attribution_print_str"
@@ -524,7 +524,7 @@
\tl_const:Nn \c__mermap_supply_call_areafit_tl
{%
- \l__mermap_python\c_space_tl areafit
+ \l__mermap_python_tl\c_space_tl areafit
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
-atp "\str_use:N\l__mermap_supply_attribution_print_str"
@@ -573,7 +573,7 @@
\tl_new:N \l__mermap_last_mdfivesum_tl
\tl_new:N \l__mermap_mdfivesum_tl
-\tl_new:N \l__mermap_python
+\tl_new:N \l__mermap_python_tl
\tl_new:N \l__mermap_supply_align_tl
\tl_new:N \l__mermap_supply_basename_tl
\tl_new:N \l__mermap_supply_call_tl
@@ -748,7 +748,7 @@
{
definition~prefix .code:n = {\str_set:Nn\l__mermap_definition_prefix_str{#1}},
python .code:n = {
- \tl_set:Nx \l__mermap_python {#1~maptiles.texpy}
+ \tl_set:Nx \l__mermap_python_tl {#1~maptiles.texpy}
},
}
@@ -841,9 +841,7 @@
{
\__mermap_supplymap_call:
}
- %\dim_gset_eq:NN \g_tmpa_dim \l__mermap_tile_size_dim
\group_end:
- %\dim_set_eq:NN \l__mermap_tile_size_dim \g_tmpa_dim
}
\NewDocumentCommand \mrcsupplymap { O{} m }
@@ -853,14 +851,24 @@
}
-\msg_new:nnn { mercatormap }{ shell-escape }
+\msg_new:nnnn { mercatormap }{ shell-escape }
{ You~must~invoke~LaTeX~with~the~--shell-escape~flag~to~produce~map~'#1'. }
+ { The~--shell-escape~flag~is~needed,~because~a~Python~sript~has~to~be~called;~see~package~documentation. }
-\msg_new:nnn { mercatormap }{ target-resource }
+\msg_new:nnnn { mercatormap }{ target-resource }
{ Target~and~produced~resource~are~different~for~map~'#1'. }
+ { Your~target~was~'\l__mermap_supply_target_tl'.\\
+ The~produced~resource~is~'\l__mermap_tile_resource_tl'.\\
+ Check,~if~'\l__mermap_supply_target_tl'~is~available~via~'\str_use:N\l__mermap_supply_url_str'\\
+ or~if~the~zoom~value~is~too~large.
+ }
-\msg_new:nnn { mercatormap }{ definition-production }
+\msg_new:nnnn { mercatormap }{ definition-production }
{ Map~definition~file~not~produced~for~map~'#1'. }
+ { **~The~failed~shell~command~was:\\
+ \l__mermap_supply_call_tl\\
+ **~Python~setup~correct?
+ }
\cs_new:Npn \__mermap_supplymap_call:
{
@@ -868,11 +876,11 @@
c__mermap_supply_call_\l__mermap_supply_type_tl _tl }
\tl_set:Nx \l__mermap_supply_call_tl \l_tmpa_tl
\tl_set:Nx \l__mermap_mdfivesum_tl { \pdf@mdfivesum{\l__mermap_supply_call_tl} }
- \tl_clear:N \l__mermap_last_mdfivesum_tl
- \file_if_exist_input:n {\l__mermap_definition_id_str.md5}
- \str_if_eq:VVTF \l__mermap_mdfivesum_tl \l__mermap_last_mdfivesum_tl
+ \file_if_exist:nTF {\l__mermap_definition_id_str.def}
{
- \file_if_exist:nF {\l__mermap_definition_id_str.def}
+ \tl_clear:N \l__mermap_last_mdfivesum_tl
+ \file_if_exist_input:n {\l__mermap_definition_id_str.md5}
+ \str_if_eq:VVF \l__mermap_mdfivesum_tl \l__mermap_last_mdfivesum_tl
{
\__mermap_supplymap_call_shell:
}
@@ -904,17 +912,15 @@
}
{
\__mermap_write_mdfive:n {false}
- \msg_warning:nnx { mercatormap }{ target-resource }{ \l__mermap_definition_id_str }
+ \msg_error:nnx { mercatormap }{ target-resource }{ \l__mermap_definition_id_str }
}
}
{
- \__mermap_write_mdfive:n {false}
- \msg_warning:nnx { mercatormap }{ definition-production }{ \l__mermap_definition_id_str }
+ \msg_error:nnx { mercatormap }{ definition-production }{ \l__mermap_definition_id_str }
}
}
{
- \__mermap_write_mdfive:n {false}
- \msg_warning:nnx { mercatormap }{ shell-escape }{ \l__mermap_definition_id_str }
+ \msg_error:nnx { mercatormap }{ shell-escape }{ \l__mermap_definition_id_str }
}
}
@@ -1604,8 +1610,6 @@
double = true,
transparent = true,
height = 2mm,
- %at = {([xshift=-10mm,yshift=5mm]mrcmap.south~east)},
- %placement = above~left,
at = {(0,0)},
placement =,
major~style =,
@@ -1719,6 +1723,8 @@
%---- markers ------------------------------------------------------------------
\bool_new:N \l__mermap_marker_show_bool
+\bool_new:N \l__mermap_marker_use_links
+\bool_new:N \l__mermap_marker_use_urls
\fp_new:N \l__mermap_marker_angle_fp
\fp_new:N \l__mermap_marker_inner_radius_fp
@@ -1733,9 +1739,14 @@
\tl_new:N \l__mermap_marker_category_tl
\tl_new:N \l__mermap_marker_contents_tl
\tl_new:N \l__mermap_marker_font_tl
+\tl_new:N \l_mermap_marker_generic_tl
+\tl_new:N \l__mermap_marker_link_tl
\tl_new:N \l__mermap_marker_pictocontents_tl
\tl_new:N \l__mermap_marker_type_tl
-\tl_new:N \l__mermap_marker_uuid_tl
+\tl_new:N \l__mermap_marker_url_tl
+\tl_new:N \l_mermap_marker_uuid_tl
+
+
\use:x
@@ -1763,8 +1774,10 @@
alias .tl_set:N = \l__mermap_marker_alias_tl,
contents .tl_set:N = \l__mermap_marker_contents_tl,
pictocontents .tl_set:N = \l__mermap_marker_pictocontents_tl,
- % name .meta:nn = {mermap/marker}{contents={#1},alias={#1}},
- uuid .tl_set:N = \l__mermap_marker_uuid_tl,
+ uuid .tl_set:N = \l_mermap_marker_uuid_tl,
+ generic .tl_set:N = \l_mermap_marker_generic_tl,
+ url .tl_set:N = \l__mermap_marker_url_tl,
+ link .tl_set:N = \l__mermap_marker_link_tl,
category .tl_set:N = \l__mermap_marker_category_tl,
type .tl_set:N = \l__mermap_marker_type_tl,
angle .fp_set:N = \l__mermap_marker_angle_fp,
@@ -1787,6 +1800,10 @@
{ \str_if_eq:VnT \l__mermap_marker_category_tl {#1} {\bool_set_false:N \l__mermap_marker_show_bool} },
hide~all~but~category .code:n =
{ \str_if_eq:VnF \l__mermap_marker_category_tl {#1} {\bool_set_false:N \l__mermap_marker_show_bool} },
+ use~links .bool_set:N = \l__mermap_marker_use_links,
+ ignore~links .bool_set_inverse:N = \l__mermap_marker_use_links,
+ use~urls .bool_set:N = \l__mermap_marker_use_urls,
+ ignore~urls .bool_set_inverse:N = \l__mermap_marker_use_urls,
first~options .tl_set:N = \l__mermap_every_marker_first_tl,
last~options .tl_set:N = \l__mermap_every_marker_last_tl,
style .choice: =,
@@ -1799,7 +1816,6 @@
latitude = 12,
longitude = 49,
use~inside = map,
- % name = noname,
contents =,
alias = noname,
pictocontents =,
@@ -1815,8 +1831,13 @@
font = \sffamily\small,
type = classic,
uuid =,
+ generic =,
+ url =,
+ link =,
category =,
show = true,
+ use~links = true,
+ use~urls = true,
}
@@ -1824,7 +1845,8 @@
\NewExpandableDocumentCommand\mrcmarkerlongitude{}{\fp_to_decimal:N \l__mermap_marker_longitude_fp}
\NewDocumentCommand\mrcmarkercontents{}{\tl_use:N \l__mermap_marker_contents_tl}
\NewDocumentCommand\mrcmarkerpictocontents{}{\tl_use:N \l__mermap_marker_pictocontents_tl}
-\NewExpandableDocumentCommand\mrcmarkeruuid{}{\tl_use:N \l__mermap_marker_uuid_tl}
+\NewExpandableDocumentCommand\mrcmarkeruuid{}{\tl_use:N \l_mermap_marker_uuid_tl}
+\NewDocumentCommand\mrcmarkergeneric{}{\tl_use:N \l_mermap_marker_generic_tl}
\NewExpandableDocumentCommand\mrcmarkercategory{}{\tl_use:N \l__mermap_marker_category_tl}
\NewDocumentCommand\mrcmarkerfont{}{\tl_use:N \l__mermap_marker_font_tl}
\NewExpandableDocumentCommand\mrcmarkerangle{}{\fp_to_decimal:N \l__mermap_marker_angle_fp}
@@ -1849,6 +1871,56 @@
}
+\cs_new_nopar:Npn \__mermap_hyper_path:n #1
+ {
+ \pgfpointanchor{path~picture~bounding~box}{south~west}
+ \pgf@xb-\pgf@x
+ \pgf@yb-\pgf@y
+ \pgfpointanchor{path~picture~bounding~box}{north~east}
+ \advance\pgf@xb\pgf@x
+ \advance\pgf@yb\pgf@y
+ \advance\pgf@x-1bp
+ \advance\pgf@y-1bp
+ \advance\pgf@xb-2bp
+ \advance\pgf@yb-2bp
+ \pgftext[at={\pgfqpoint{\pgf@x}{\pgf@y}},right,top]
+ {
+ \hypersetup{pdfborder=0~0~0}
+ #1{\vrule height\pgf@yb depth0ptwidth0pt\vrule height0ptdepth0ptwidth\pgf@xb}
+ }
+ }
+
+
+\cs_new_nopar:Npn \__mermap_hyper_path_insert:
+ {
+ \cs_if_exist:NT \hypersetup
+ {
+ \bool_if:NT \l__mermap_marker_use_urls
+ {
+ \tl_if_empty:NF \l__mermap_marker_url_tl
+ {
+ \__mermap_hyper_path:n {\href{\l__mermap_marker_url_tl}}
+ }
+ }
+ \bool_if:NT \l__mermap_marker_use_links
+ {
+ \tl_if_empty:NF \l__mermap_marker_link_tl
+ {
+ \__mermap_hyper_path:n {\hyperlink{\l__mermap_marker_link_tl}}
+ }
+ }
+ }
+ }
+
+
+\tikzset
+ {
+ mrchyperpath/.style =
+ {
+ path~picture = {\__mermap_hyper_path_insert:}
+ }
+ }
+
\NewDocumentCommand \mrcmarker { m }
{
\group_begin:
@@ -1890,7 +1962,7 @@
\node[circle,fill=black,inner~sep=0pt,minimum~width=4pt,
pin={[text=mrcmarkertext,font=\mrcmarkerfont,
pin~distance=\mrcmarkerradius,
- pin~position=\mrcmarkerangle,mrcnodestyle]\mrcmarkercontents}] {};
+ pin~position=\mrcmarkerangle,mrcnodestyle,mrchyperpath]\mrcmarkercontents}] {};
}
\__mermap_new_marker_type:nn {pin}
@@ -1900,7 +1972,7 @@
\node[fill=white,draw=none,text=mrcmarkertext,
above,font=\mrcmarkerfont,inner~sep=0.5mm,align=center,
line~width=0mm,xshift=\mrcmarkershift,
- fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle]
+ fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath]
(pin_node) at (0,0.5) {\mrcmarkercontents};
\path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle]
(0,0) -- (0.1,0.5) -- (pin_node.south~east) -- (pin_node.north~east)
@@ -1915,7 +1987,7 @@
\node[fill=white,draw=none,text=mrcmarkertext,
below,font=\mrcmarkerfont,inner~sep=0.5mm,align=center,
line~width=0mm,xshift=\mrcmarkershift,
- fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle]
+ fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath]
(pin_node) at (0,-0.5) {\mrcmarkercontents};
\path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle]
(0,0) -- (-0.1,-0.5) -- (pin_node.north~west) -- (pin_node.south~west)
@@ -1930,7 +2002,7 @@
\tl_set:Nn \l_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}}
\__mermap_tikz_path_begin:n
{
- line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle
+ line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath
}
\pgfpathmoveto{\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}}
\pgfpathcurveto{\pgfpoint{\l_tmpb_tl}{-\l_tmpa_tl}}{\pgfpoint{\l_tmpa_tl}{-\l_tmpb_tl}}
@@ -1992,21 +2064,21 @@
\__mermap_new_marker_type:nn {knob}
{
- \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle]
+ \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath]
circle (\fp_to_dim:N\l__mermap_marker_radius_fp);
\__mermap_tikz_circle_node:
}
\__mermap_new_marker_type:nn {pictoknob}
{
- \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle]
+ \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath]
circle (\fp_to_dim:N\l__mermap_marker_radius_fp);
\tl_use:N \l__mermap_marker_pictocontents_tl
}
\__mermap_new_marker_type:nn {pictoknobring}
{
- \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,even~odd~rule]
+ \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule]
circle (\fp_to_dim:N\l__mermap_marker_radius_fp)
circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp);
\tl_use:N \l__mermap_marker_pictocontents_tl
@@ -2018,14 +2090,14 @@
\path[draw=mrcmarkerdraw,very~thin]
(45 \c_colon_str \l_tmpa_tl)--(225\c_colon_str \l_tmpa_tl)
(135\c_colon_str \l_tmpa_tl)--(315\c_colon_str \l_tmpa_tl);
- \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,even~odd~rule]
+ \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule]
circle (\l_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp);
}
\__mermap_new_marker_type:nn {markx}
{
\tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
- \path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle]
+ \path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath]
(0,0) -- (35 \c_colon_str \l_tmpa_tl) -- (55 \c_colon_str \l_tmpa_tl) -- cycle
(0,0) -- (125 \c_colon_str \l_tmpa_tl) -- (145 \c_colon_str \l_tmpa_tl) -- cycle
(0,0) -- (215 \c_colon_str \l_tmpa_tl) -- (235 \c_colon_str \l_tmpa_tl) -- cycle
diff --git a/macros/latex/contrib/mercatormap/mercatormap.tex b/macros/latex/contrib/mercatormap/mercatormap.tex
index cba748e181..8e993db58b 100644
--- a/macros/latex/contrib/mercatormap/mercatormap.tex
+++ b/macros/latex/contrib/mercatormap/mercatormap.tex
@@ -2,7 +2,7 @@
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
%%
-%% The LaTeX package mercatormap - version 1.00 (2020/04/20)
+%% The LaTeX package mercatormap - version 1.01 (2020/05/05)
%% mercatormap.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -33,8 +33,8 @@
% \mrcsetapikey{openrouteservice}{YOUR-API-KEY} % registered key
% \mrcsetapikey{thunderforest}{YOUR-API-KEY} % registered key
-\def\version{1.00}%
-\def\datum{2020/04/20}%
+\def\version{1.01}%
+\def\datum{2020/05/05}%
\mrcactivatescript% activates Python script
diff --git a/macros/latex/contrib/mercatormap/mercatorpy.def b/macros/latex/contrib/mercatormap/mercatorpy.def
index fe608f47b4..c148e26116 100644
--- a/macros/latex/contrib/mercatormap/mercatorpy.def
+++ b/macros/latex/contrib/mercatormap/mercatorpy.def
@@ -1,6 +1,6 @@
\begin{filecontents*}[overwrite]{maptiles.texpy}
"""
-The LaTeX package mercatormap - version 1.00 (2020/04/20)
+The LaTeX package mercatormap - version 1.01 (2020/05/05)
maptiles.texpy: Python script for map tile download
-------------------------------------------------------------------------------------------
@@ -28,7 +28,7 @@ from pathlib import Path
from PIL import Image
-packageversion = '1.00 (2020/04/20)'
+packageversion = '1.01 (2020/05/05)'
def gd(x):
diff --git a/macros/latex/contrib/mercatormap/mercatorsupplier.def b/macros/latex/contrib/mercatormap/mercatorsupplier.def
index 438374ba26..dd3544d7ee 100644
--- a/macros/latex/contrib/mercatormap/mercatorsupplier.def
+++ b/macros/latex/contrib/mercatormap/mercatorsupplier.def
@@ -1,4 +1,4 @@
-%% The LaTeX package mercatormap - version 1.00 (2020/04/20)
+%% The LaTeX package mercatormap - version 1.01 (2020/05/05)
%% mercatorsupplier.def: predefined map supplier list
%%
%% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/showexpl/README b/macros/latex/contrib/showexpl/README
deleted file mode 100644
index f16e1bc655..0000000000
--- a/macros/latex/contrib/showexpl/README
+++ /dev/null
@@ -1,16 +0,0 @@
-showexpl
-========
-
-The LaTeX package 'showexpl' provides a way to typeset LaTeX source code and
-the related result in the same document. The `listings' package is required.
-See 'doc/showexpl-test.tex' for the details.
-
-Recommended TDS locations:
-
- showexpl.sty: tex/latex/showexpl
- README, showexpl.pdf, showexpl-test.pdf,
- showexpl-test.tex, result-picture.pdf: doc/latex/showexpl
-
-For general installation advice, see
-http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages
-
diff --git a/macros/latex/contrib/showexpl/README.md b/macros/latex/contrib/showexpl/README.md
new file mode 100644
index 0000000000..0c2fb4d52f
--- /dev/null
+++ b/macros/latex/contrib/showexpl/README.md
@@ -0,0 +1,24 @@
+showexpl
+========
+
+The LaTeX package `showexpl` provides a way to typeset LaTeX source code and
+the related result in the same document. The `listings` package is required.
+See `doc/showexpl-test.tex` for the details.
+
+Recommended TDS locations:
+
+```text
+ showexpl.sty: tex/latex/showexpl
+ README, showexpl.pdf, showexpl-test.pdf,
+ showexpl-test.tex, result-picture.pdf: doc/latex/showexpl
+```
+
+For general installation advice, see
+<http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages>
+
+The showexpl package is also on
+CTAN:[macros/latex/contrib/showexpl](http://www.ctan.org/tex-archive/macros/latex/contrib/showexpl)
+
+Rolf Niepraschk,
+email: Rolf.Niepraschk@gmx.de,
+2020-05-03
diff --git a/macros/latex/contrib/showexpl/doc/showexpl-test.pdf b/macros/latex/contrib/showexpl/doc/showexpl-test.pdf
index ed08ca09e9..a645e087ae 100644
--- a/macros/latex/contrib/showexpl/doc/showexpl-test.pdf
+++ b/macros/latex/contrib/showexpl/doc/showexpl-test.pdf
Binary files differ
diff --git a/macros/latex/contrib/showexpl/doc/showexpl-test.tex b/macros/latex/contrib/showexpl/doc/showexpl-test.tex
index 316049f555..75b4664a5b 100644
--- a/macros/latex/contrib/showexpl/doc/showexpl-test.tex
+++ b/macros/latex/contrib/showexpl/doc/showexpl-test.tex
@@ -1,36 +1,33 @@
-% Rolf Niepraschk, 2005-07-16, Rolf.Niepraschk@ptb.de
+% Rolf Niepraschk, 2020-05-03, Rolf.Niepraschk@gmx.de
\listfiles\errorcontextlines=100
\documentclass[a4paper,draft,twoside]{article}
\usepackage[dvipsnames]{xcolor}
\usepackage[textwidth=12cm,marginparwidth=4cm]{geometry}
-
\usepackage[final]{showexpl}
-\usepackage[T1]{fontenc}
+\usepackage{iftex}
-\IfFileExists{luximono.sty}%
-{%
- \usepackage[scaled]{luximono}%
-}
-{%
- \IfFileExists{beramono.sty}%
- {%
- \usepackage[scaled]{beramono}%
- }{}
-}
+\iftutex % LuaTeX, XeTeX
+ \usepackage{fontspec}
+ \setmonofont{DejaVuSansMono}[Scale=MatchUppercase]
+\else % old engines
+ \usepackage[T1]{fontenc}
+ \usepackage{lmodern}
+ \usepackage[scaled]{DejaVuSansMono}
+\fi
\lstset{%
- basicstyle=\ttfamily\small,
- commentstyle=\itshape\ttfamily\small,
- showspaces=false,
- showstringspaces=false,
- breaklines=true,
- backgroundcolor=\color{lightgray},
- breakautoindent=true,
- captionpos=t
+ basicstyle=\ttfamily\small,
+ commentstyle=\itshape\ttfamily\small,
+ showspaces=false,
+ showstringspaces=false,
+ breaklines=true,
+ backgroundcolor=\color{lightgray},
+ breakautoindent=true,
+ captionpos=t
}
\iftrue
diff --git a/macros/latex/contrib/showexpl/doc/showexpl.pdf b/macros/latex/contrib/showexpl/doc/showexpl.pdf
index 31c82aad6d..31c0ffac2e 100644
--- a/macros/latex/contrib/showexpl/doc/showexpl.pdf
+++ b/macros/latex/contrib/showexpl/doc/showexpl.pdf
Binary files differ
diff --git a/macros/latex/contrib/showexpl/showexpl.dtx b/macros/latex/contrib/showexpl/showexpl.dtx
index a7c3c96677..4102c6b8dd 100644
--- a/macros/latex/contrib/showexpl/showexpl.dtx
+++ b/macros/latex/contrib/showexpl/showexpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2004 -- 2016 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+% Copyright (C) 2004 -- by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
% --------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{showexpl}
%<*package>
- [2016/12/11 v0.3o Typesetting example code (RN)]
+ [2020/05/04 v0.3p Typesetting example code (RN)]
%</package>
%
%<*driver>
@@ -39,7 +39,7 @@
%</driver>
% \fi
%
-% \CheckSum{887}
+% \CheckSum{880}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -206,6 +206,7 @@
%
% \section{Implementation}
% \changes{v0.1e}{2004/11/24}{Loading of |showexpl.cfg| added (RN).}
+% \changes{v0.3p}{2020/05/04}{Remove package `calc' (RN).}
% \begin{macrocode}
\DeclareOption{final}{%
\PassOptionsToPackage{\CurrentOption}{graphicx}%
@@ -224,7 +225,7 @@
}%
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{listings}}
\ProcessOptions\relax
-\RequirePackage{listings,calc,ifthen,graphicx,varwidth}
+\RequirePackage{refcount,listings,graphicx,varwidth,float}
% \end{macrocode}
% We must aktivate code from package \textsf{listings} for writing files.
% \begin{macrocode}
@@ -316,13 +317,12 @@
% typesetting the result of the example code. More can be added with
% the user key ``|preset=...|''.
% \changes{v0.3e}{2006/04/05}{More redefinitions added (RN).}
+% \changes{v0.3p}{2020/05/04}{Remove extra treatment of `figure'/`table' (RN).}
% \begin{macrocode}
\newcommand*\SX@@preset{%
\renewcommand\documentclass[2][]{\SX@eat@version}%
\renewcommand\usepackage[2][]{\SX@eat@version}%
\renewenvironment{document}{}{}%
- \renewenvironment{figure}[1][]{\def\@captype{figure}}{}%
- \renewenvironment{table}[1][]{\def\@captype{table}}{}%
\renewcommand\cite[1][]{}%
\let\tableofcontens\relax \let\listoffigures\relax
\let\listoftables\relax \let\printindex\relax
@@ -344,14 +344,28 @@
% \begin{macro}{\isSX@odd}
% Parameter |#1| is executed on odd pages, parameter |#2| on
% even pages.
+% \changes{v0.3p}{2020/05/04}{Replace \cmd{\isodd} with
+% \cmd{\ifodd}\cmd{\getpagerefnumber} (remove package `ifthen') (RN).}
% \begin{macrocode}
\newif\ifSX@wasodd
\if@twoside
- \newcommand*{\isSX@odd}[2]{%
- \ifthenelse{\isodd{\pageref{\SX@IDENT}}}%
- {\SX@wasoddtrue #1}{\SX@wasoddfalse #2}}
+ \newcommand*\isSX@odd{%
+ \begingroup
+ \ifodd\getpagerefnumber{\SX@IDENT}%
+ \aftergroup\SX@wasoddtrue
+ \else
+ \aftergroup\SX@wasoddfalse
+ \fi
+ \endgroup
+ \ifSX@wasodd
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
\else
- \newcommand*{\isSX@odd}[2]{#1}\SX@wasoddtrue
+ \SX@wasoddtrue
+ \newcommand*\isSX@odd[2]{#1}
\fi
% \end{macrocode}
% The call of \cmd{\isSX@odd} sets also \cmd{\ifSX@wasodd} to true or
@@ -388,20 +402,20 @@
% \begin{macrocode}
\newcommand*\SX@put@t[3]{%
\SX@ResultArea{\linewidth}{#2}\endgraf\pagebreak[2]%
- \setlength\@tempdima{\SX@vsep}\vskip\@tempdima
+ \@tempdima=\dimexpr\SX@vsep\vskip\@tempdima
\SX@CodeArea{\linewidth}{#3}%
}
\newcommand*\SX@put@b[3]{%
\SX@CodeArea{\linewidth}{#3}\endgraf\pagebreak[2]%
- \setlength\@tempdima{\SX@vsep}\vskip\@tempdima
+ \@tempdima=\dimexpr\SX@vsep\vskip\@tempdima
\SX@ResultArea{\linewidth}{#2}%
}
\newcommand*\SX@put@l[3]{%
- \setlength\@tempdimc{\linewidth-#1-\SX@hsep}%
+ \@tempdimc=\dimexpr\linewidth-#1-\SX@hsep %
\SX@ResultArea{#1}{#2}\hfill\SX@CodeArea{\@tempdimc}{#3}%
}
\newcommand*\SX@put@r[3]{%
- \setlength\@tempdimc{\linewidth-#1-\SX@hsep}%
+ \@tempdimc=\dimexpr\linewidth-#1-\SX@hsep %
\SX@CodeArea{\@tempdimc}{#3}\hfill\SX@ResultArea{#1}{#2}%
}
\newcommand*\SX@put@o[3]{%
@@ -411,12 +425,11 @@
\@nameuse{SX@put@\ifSX@wasodd l\else r\fi}{#1}{#2}{#3}%
}
\newcommand\SX@ResultArea[2]{%
- \SX@justification\setlength\@tempdima{#1}%
- %\minipage\@tempdima#2\endminipage
+ \SX@justification\@tempdima=\dimexpr #1 %
\parbox\@tempdima{#2}%
}
\newcommand\SX@CodeArea[2]{%
- \setlength\@tempdima{#1}%
+ \@tempdima=\dimexpr #1 %
\sbox\@tempboxa{\parbox\@tempdima{#2}}%
\@tempdima=\dp\@tempboxa\usebox\@tempboxa
\rlap{\raisebox{-\@tempdima}[0pt][0pt]{\SX@attachfile}}%
@@ -477,19 +490,12 @@
\newcommand*\SX@put@code@result{%
\begingroup
\expandafter\lstset\expandafter{\SX@explpreset}%
- \let\lst@float=\relax\let\SX@float=\relax
-% \end{macrocode}
-% Without the following call \cmd{\lst@beginfloat} is undefined.
-% \begin{macrocode}
\expandafter\lstset\expandafter{\SX@@explpreset}%
- \ifx\lst@float\relax\else
% \end{macrocode}
-% \cmd{\lst@float} must be \cmd{\relax} because the whole ``example''
-% should float but not the listings part in addition.
+% Use listings floating procedure if necessary.
% \begin{macrocode}
- \let\SX@float=\lst@float\let\lst@float=\relax
- \g@addto@macro\SX@@explpreset{,float=false}%
- \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\SX@float]}%
+ \ifx\lst@float\relax\else
+ \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}
\expandafter\@tempa
\fi
\ifx\lst@caption\@empty
@@ -511,7 +517,7 @@
\ifx\@tempa\SX@pos\@tempswafalse\fi
\def\@tempa{b}%
\ifx\@tempa\SX@pos\@tempswafalse\fi
- \setlength\@tempdima{\linewidth+\SX@overhang}%
+ \@tempdima=\dimexpr\linewidth+\SX@overhang %
\if@tempswa\@tempdima=.5\@tempdima\fi%
\edef\SX@width{\the\@tempdima}%
\fi
@@ -523,12 +529,12 @@
\long\def\SX@frame##1{##1}%
\else
\let\SX@frame\ResultBox
- \setlength\@tempdima{\SX@width-2\ResultBoxSep-2\ResultBoxRule}%
+ \@tempdima=\dimexpr\SX@width-2\ResultBoxSep-2\ResultBoxRule %
\edef\SX@width{\the\@tempdima}%
\fi
\isSX@odd{\def\@tempa{l}}{\def\@tempa{r}}%
\makebox[\linewidth][\@tempa]{%
- \parbox{\linewidth+\SX@overhang}{%
+ \parbox{\dimexpr\linewidth+\SX@overhang}{%
% \end{macrocode}
% \cmd{\SX@codefile} (|\jobname.tmp|) is not nessesary for the filelist.
% \changes{v0.3m}{2016/08/05}{Wrong assignement for \cmd{\lst@belowskip} (RN).}
@@ -541,10 +547,7 @@
% true.
% \changes{v0.3k}{2013/03/21}{Setting \cmd{\lst@MakeCaption} to \cmd{\@gobble}
% again (prevent multiply defined labels; label key)}.
-% \begin{macrocode}
- \let\SX@MakeCaption\lst@MakeCaption
- \let\lst@MakeCaption\@gobble{}
-% \end{macrocode}
+% \changes{v0.3p}{2020/05/04}{Let's leave \cmd{\lst@MakeCaption} untouched (RN).}
% \changes{v0.3j}{2012/09/22}{Setting \cmd{\lst@MakeCaption} to
% was a bad idea for hyperlinks. Group added to
% varwidth environment. (Suggestions by Ulrike Fischer.).}
@@ -564,12 +567,11 @@
{\@latex@error{Parameter `\SX@pos' undefined}\@ehd}%
{\@nameuse{SX@put@\SX@pos}%
{\SX@width}{\box\SX@ResBox}{\SX@codeInput}}%
- \let\lst@MakeCaption\SX@MakeCaption
\lst@MakeCaption{b}\SX@KillBelowCaptionskip
}%
}%
\endtrivlist
- \ifx\SX@float\relax\else\expandafter\lst@endfloat\fi
+ \ifx\lst@float\relax\else\expandafter\lst@endfloat\fi
\gdef\SX@@explpreset{}%
\endgroup
}
@@ -693,6 +695,20 @@
\def\SX@tempb##1{\scalebox{\SX@scaled}{##1}}%
\fi
\fi
+ \let\SX@lst@Init=\lst@Init
+% \end{macrocode}
+% Prevents float environments from floating. This is not enough for floating
+% listing environments! Why?
+% \changes{v0.3p}{2020/05/04}{Better handling of floats (RN).}
+% \begin{macrocode}
+ \def\@xfloat##1[##2]{\@float@HH{##1}[H]}%
+% \end{macrocode}
+% Special handling of floating listing environments.
+% \begin{macrocode}
+ \def\lst@Init{%
+ \let\lst@float=\relax
+ \SX@lst@Init
+ }
\SX@tempb{\SX@tempa{\SX@codefile}}\par
\endgroup
\else
@@ -726,7 +742,7 @@
\fi
\SX@Info
\expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,%
- caption={},belowskip=\z@,aboveskip=\z@]{\SX@codefile}%
+ caption={},belowskip=\z@,aboveskip=\z@,float=false]{\SX@codefile}%
\endgroup
}%
% \end{macrocode}
diff --git a/macros/latex/contrib/showexpl/showexpl.ins b/macros/latex/contrib/showexpl/showexpl.ins
index 98548e0467..773270fdd0 100644
--- a/macros/latex/contrib/showexpl/showexpl.ins
+++ b/macros/latex/contrib/showexpl/showexpl.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% Copyright (C) 2004 -- by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
diff --git a/macros/latex/contrib/tkz/tkz-fct/README.md b/macros/latex/contrib/tkz/tkz-fct/README.md
index 489d65958d..58db1ab82d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/README.md
+++ b/macros/latex/contrib/tkz/tkz-fct/README.md
@@ -1,6 +1,6 @@
# tkz-fct – Tools for drawing graphs of functions
-Release 1.3c 2020/04/11
+Release 1.4c 2020/05/05
## Description
@@ -53,8 +53,10 @@ Documentation for `tkz-fct` is available on CTAN and in your TeX distribution.
## History
+- 1.4c Correction of a bug in the macro \tkzFct. Correction of the documentation.
+
- 1.3c Correction of a bug ( incompatibility between tkz-fct and tkzexample).
- Add compatibility between t tkz-fct and tkz-base.
+ Add compatibility between ttkz-fct and tkz-base.
Correction of the documentation.
- 1.2c Add compatibility with tkz-base > 3.01.
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct-main.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct-main.pdf
new file mode 100644
index 0000000000..f89652cfb2
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct-main.pdf
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf b/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf
deleted file mode 100644
index 33c8012059..0000000000
--- a/macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
index 189e2d0427..19c518a17a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-VDW.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\subsection{Courbes de \tkzname{Van der Waals}}
\bigskip
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
index c87045bbec..19a4f5ea17 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-area.tex
@@ -1,5 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
-\section{Macros pour définir des surfaces }
+\section{Macros pour définir des surfaces }
Il s'agit par exemple de représenter la partie du plan comprise entre la courbe représentative d'une fonction, l'axe des abscisses et les droites
d'équation $x=a$ et $x=b$.
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
index fdcf8a686e..0f70287d1a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-asymptote.tex
@@ -1,7 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
-%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
\section{Droites particulières}
-%<–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––>
\subsection{ Tracer une ligne verticale }
\begin{NewMacroBox}{tkzVLine}{\oarg{local options}\marg{decimal number}}
Attention, la syntaxe est celle de \tkzname{fp} car on n'utilise pas \tkzname{gnuplot} pour tracer une droite.
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
index 4a2fe0a813..4fd537ea7f 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-bac.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Exemples avec les packages \tkzname{alterqcm} et \tkzname{tkz-tab}}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
index 5b828f7862..854571f57a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-compilation.tex
@@ -113,19 +113,8 @@ La table contiendra 201 couples de coordonnées.
Elle est la plus délicate car le fichier \tkzname{sample.f1.gnuplot} doit être ouvert par \tkzname{gnuplot}. Cela implique d'une part, que \TEX\ autorise l'ouverture\footnote{c'est ici que l'on parle des options \tkzname{--shell-escape} et \tkzname{--enable-write18}}
du fichier \tkzname{sample.f1.gnuplot} par \tkzname{gnuplot} et d'autre part, que \TEX\ puisse trouver \tkzname{gnuplot}\footnote{c'est ici que l'on parle de \tkzname{PATH}}.
-Si \tkzname{gnuplot} trouve \tkzname{sample.f1.gnuplot} alors il produit un fichier texte \tkzname{sample.f1.table}, évidemment s'il ne trouve d'erreur de syntaxe dans l'expression de la fonction.
+Si \tkzname{gnuplot} trouve \tkzname{sample.f1.gnuplot} alors il produit un fichier texte \tkzname{sample.f1.table} si l'expression de la fonction est correcte.
-\tkzHandBomb Malheureusement, une incompréhension peut surgir entre \TIKZ\ et \tkzname{gnuplot}. \TIKZ\ jusqu'à sa version 2.00 officielle, est conçu pour fonctionner avec \tkzname{gnuplot} version 4.0 et malheureusement, \tkzname{gnuplot} a changé de syntaxe. la documentation de gnuplot indique :
-
-\medskip\hspace{1cm}
-\begin{tkzltxexample}[]
- Features, changes and fixes in gnuplot version 4.2 (and >)
-'set table "outfile"; ---.; unset table' replaces 'set term table'
-\end{tkzltxexample}
-
-
-La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'incompatibilité entre \TIKZ\ et les versions récentes de \tkzname{gnuplot} (v>4.2).
-
\item \textcolor{red}{\textbf{Étape 3}}
Le fichier \tkzname{sample.f1.table} obtenu à l'étape précédente est utilisé par \TIKZ\ pour tracer la courbe.
@@ -148,7 +137,7 @@ La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'inco
\item Il faut remarquer qu'au cours d'une seconde compilation, si le fichier \tkzname{sample.f1.gnuplot} ne change pas, alors \tkzname{gnuplot} n'est pas lancé et le fichier présent \tkzname{sample.f1.table} est utilisé.
-\item On peut aussi remarquer que si vous êtes paranoïaque et que vous n'autorisez pas le lancement de gnuplot, alors un première compilation permettra de créer le fichier \tkzname{sample.f1.table}, ensuite manuellement, vous pourrez lancer gnuplot et obtenir le fichier \tkzname{sample.f1.table}.
+\item On peut aussi remarquer que si vous êtes paranoïaque et que vous n'autorisez pas le lancement de gnuplot, alors une première compilation permettra de créer le fichier \tkzname{sample.f1.table}, ensuite manuellement, vous pourrez lancer gnuplot et obtenir le fichier \tkzname{sample.f1.table}.
\item Il est aussi possible de créer manuellement ou encore avec un quelconque programme, un fichier data.table que \TIKZ\ pourra lire avec
@@ -157,8 +146,6 @@ La version 2.1 de \TIKZ\ a adopté \tkzname{set table} et il n'y a plus d'inco
\end{tkzltxexample}
\end{enumerate}
-
-
\subsection{Installation de \tkzname{Gnuplot}}
Gnuplot est proposé avec la plupart des distributions Linux, et existe pour OS X ainsi que pour Windows.
@@ -167,58 +154,31 @@ Gnuplot est proposé avec la plupart des distributions Linux, et existe pour OS
\item \tkzname{Ubuntu}\NameSys{Linux Ubuntu} ou un autre système Linux: on l'installe en suivant la procédure classique d'installation d'un nouveau paquetage.
\item \tkzname{Windows}\NameSys{Windows XP} Les utilisateurs de Windows doivent se méfier, après avoir téléchargé la bonne version et installé \tkzname{gnuplot} alors il faudra renommé wgnuplot en gnuplot. Ensuite il faudra modifier le \tkzname{path}. Si le chemin du programme est \shorthandoff{:}\tkzname{C:\textbackslash gnuplot} alors il faudra ajouter \tkzname{{C:}\textbackslash gnuplot\textbackslash bin\textbackslash}\shorthandon{:} aux variables environnement (Aller à "Poste de Travail" puis faire "propriétés", dans l'onglet "Avancé", cliquer sur "Variables d'environnement". ).
Ensuite pour compiler sous latex, il faudra ajouter au script de compilation l'option \tkzname{--enable-write18 }.
- \item \tkzname{OS X}\NameSys{OS X} C'est le système en version Snow Leopard qui pose le plus de problème, car il faut compiler les sources.
- Si vous n'utilisez \tkzname{gnuplot} qu'en collaboration avec \TIKZ\ alors il vous suffit de compiler les sources ainsi :
-
- \begin{enumerate}
-
-\item Télécharger les sources de \tkzname{gnuplot}, déposer les sources sur le bureau.
-\item Ouvrir un terminal puis taper cd et glisser le dossier des sources après cd (en laissant un espace)
-Cela doit donner
-
-\begin{tkzltxexample}[]
-$ cd /Users/ego/Desktop/gnuplot-4.4.2
-\end{tkzltxexample}
-
-\item ensuite taper la ligne suivante et valider
- \begin{tkzltxexample}[]
-$ ./configure --with-readline=builtin
-\end{tkzltxexample}
- \item puis
-\begin{tkzltxexample}[]
-$ make\end{tkzltxexample}
- \item et enfin
- \begin{tkzltxexample}[]
-$ sudo make install
-\end{tkzltxexample}
- \end{enumerate}
+ \item \tkzname{OS X}\NameSys{OS X} C'est le système qui pose le plus de problème, car il faut compiler les sources.
\end{enumerate}
-
\subsection{ Test de l'installation de tkz-base}
-Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler avec pdflatex ou bien la chaîne dvi-->ps-->pdf. Vous devez obtenir cela :
+Enregister le code suivant dans un fichier avec le nom test.tex, puis compiler avec pdflatex ou bien lualatex. Vous devez obtenir cela :
\begin{tkzltxexample}[]
\documentclass{scrartcl}
-\usepackage[usenames,dvipsnames]{xcolor}
- \usepackage{tkz-fct}
- \begin{document}
- \begin{tikzpicture}
+\usepackage{tkz-fct}
+\begin{document}
+ \begin{tikzpicture}
\tkzInit[xmin=-5,xmax=5,ymax=2]
\tkzGrid
\tkzAxeXY
- \end{tikzpicture}
- \end{document}
+ \end{tikzpicture}
+\end{document}
\end{tkzltxexample}
-\begin{tkzexample}[vbox,small]
- \begin{tikzpicture}
- \tkzInit[xmin=-5,xmax=5,ymax=2]
- \tkzGrid
- \tkzAxeXY
- \end{tikzpicture}
-\end{tkzexample}
+ \begin{tikzpicture}
+ \tkzInit[xmin=-5,xmax=5,ymax=2]
+ \tkzGrid
+ \tkzAxeXY
+ \end{tikzpicture}
+
\subsection{ Test de l'installation de tkz-fct}
@@ -246,5 +206,4 @@ Il suffit d'ajouter une ligne pour tracer la représentation graphique d'une fon
\tkzFct[color=red]{2*x**2/(x**2+1)}
\end{tikzpicture}
\end{tkzexample}
-\endinput
-
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
index d5d3583a60..d7207dd7c3 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Quelques exemples}
\subsection{Variante intermédiaire : \TIKZ\ + \tkzname{tkz-fct}}
@@ -105,7 +104,7 @@ Les codes de \TIKZ\ et de \tkzname{tkz-fct} peuvent se compléter. Ainsi les axe
\tkzDrawX[label=$q$]
\tkzDrawY[label=$C(q)$]
\tkzLabelXY
- \tkzGrid[orange]
+ \tkzGrid[color=orange]
\tkzFct[domain=5:40]{0.1*\x**2+2*\x+60}
\foreach \vv in {5,10,...,40}{%
\tkzDefPointByFct(\vv)
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex
index 031891c855..09d574f526 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-faq.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Quelques remarques}
\begin{enumerate}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
index f65fad9650..7830f4f338 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Les différentes macros}
\tkzname{Gnuplot} détermine les points nécessaires pour tracer la courbe. Le nombre de points est fixé par l'option \tkzname{samples}; dans les premiers exemples la valeur du nombre de points est celle donnée par défaut. Ensuite Tikz va utiliser cette table pour tracer la courbe. C'est donc \tkzname{Tikz} qui trace la courbe.
@@ -80,9 +79,9 @@ On demande 400 valeurs pour la table qui va permettre le tracé. Par défaut, la
\begin{tikzpicture}
\tkzInit[xmax= 110,xstep=10,
ymax=6,ystep=1]
-\tkzDrawX[label={\textit{Age}},below= -18pt]
+\tkzDrawX[label={\textit{Âge}},below= -18pt]
\tkzLabelX
-\tkzDrawY[label={\textit{litres}}]
+\tkzDrawY[label={\textit{Litres}}]
\tkzFct[domain = 0.1:100 ]{50/\x}
\end{tikzpicture}
\end{tkzexample}
@@ -105,18 +104,18 @@ Ensuite, j'utilise les macros pour placer des points
\subsection{\tkzname{ystep} et les fonctions constantes}
-Attention, ici \tkzname{ystep=6} or \tkzname{gnuplot} donne $80\div=13$. il faut donc écrire $80.$
+Attention, ici \tkzname{ystep=6} or \tkzname{gnuplot} donne $80\div 6=13$. il faut donc écrire $80.$
-% \begin{tkzexample}[vbox]
-% \begin{tikzpicture}[scale=0.4]
-% \tkzInit[xmax=30,ymax=90,ystep=6]
-% \tkzAxeX[nograd,noticks,poslabel=right,label=$t$]
-% \tkzAxeY[nograd,noticks,poslabel=above,label=$P$]
-% \tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0}
-% \tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))}
-% \tkzText[above,color=red](20,80){$P=80$}
-% \end{tikzpicture}
-% \end{tkzexample}
+\begin{tkzexample}[vbox]
+ \begin{tikzpicture}[scale=0.4]
+ \tkzInit[xmax=30,ymax=90,ystep=6]
+ \tkzDrawX[right,label=$t$]
+ \tkzDrawY[above,label=$P$]
+ \tkzFct[line width=1pt,color=red,dashed,domain=0:30]{80.0}
+ \tkzFct[line width=1pt,color=blue,domain=0:30]{80/(1.0+4.0*exp(-0.21*x))}
+ \tkzText[above,color=red](20,80){$P=80$}
+\end{tikzpicture}
+\end{tkzexample}
\subsection{Les fonctions affines ou linéaires}
Pour obtenir des droites, on peut utiliser \tkzname{gnuplot} même si l'outil est un peu lourd dans ce cas. Pour alléger les calculs, il est possible de ne demander que deux points !
@@ -159,7 +158,7 @@ Toutes les macros de \tkzname{tkz-base} sont bien sûr utilisables, en voici qu
\begin{center}
\begin{tkzexample}[vbox]
\begin{tikzpicture}[scale=2]
- \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=3]
+ \tkzInit[xmin=-3,xmax=3, ymin=-1,ymax=4]
\tkzGrid[sub,subxstep=.5,subystep=.5]
\tkzAxeXY
\tkzFct[domain = -3:2]{(2-x)*exp(x)}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
index fda81f58f3..531287c400 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fppgf.tex
@@ -1,5 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
-
\section{Utilisation \tkzname{pgfmath} et de \tkzname{fp.sty} }
%--------------------------------------------------------------------------->
\subsection{\tkzname{pgfmath}}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex
new file mode 100644
index 0000000000..c2eff97ee6
--- /dev/null
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-installation.tex
@@ -0,0 +1,169 @@
+\section{Installation de \tkzname{tkz-fct}}
+Il est possible que lorsque vous lirez ce document, \tkzname{tkz-fct} soit présent sur le serveur du \tkzname{CTAN}\footnote{\tkzname{tkz-fct} ne fait pas encore partie de \tkzname{TeXLive} mais il sera bientôt possible de l'installer avec \emph{tlmgr}}. Si \tkzname{tkz-fct} ne fait pas encore partie de votre distribution, cette section vous montre comment l'installer, elle est aussi nécessaire, si vous avez envie d'installer une version plus récente ou personnalisée de \tkzname{tkz-fct}. \emph{Attention, la présence dans mon dossier texmf, des fichiers de \PGF, s'explique par l'utilisation occasionnelle de la version CVS de \PGF}.
+
+\subsection{Avec TeXLive sous OS X, Linux et Windows}\NameDist{TeXLive}
+Créer un dossier \tikz[remember picture,baseline=(n1.base)]\node [fill=blue!30,draw] (n1) {tkz}; avec comme chemin : \textcolor{red!60}{ texmf/tex/latex/tkz}. Le nom « tkz » n'est pas une obligation, tout autre nom est possible.
+
+\tikz[baseline=(t.base)]\node [fill=blue!30,draw] (t) {texmf}; est un dossier personnel, voici les chemins de ce dossier sur mes deux ordinateurs:
+
+\medskip
+\begin{itemize}\setlength{\itemsep}{5pt}
+\item sous OS X \colorbox{blue!30}{\textbf{/Users/ego/Library/texmf}};
+\item sous Ubuntu \colorbox{blue!30}{\textbf{/home/ego/texmf}}.
+\end{itemize}
+
+\medskip
+\begin{enumerate}
+\item
+
+ Placez le fichier \tikz[remember picture,baseline=(n2.base)]\node [fill=blue!20,draw] (n2) {tkz-fct.sty};
+ dans le dossier \tikz[baseline=(p.base)]\node [fill=blue!20,draw] (p) {tkz};.
+
+
+
+\medskip
+\begin{tikzpicture} [remember picture,rotate=90]
+
+\node (texmf) at (4,2) [draw,fill=blue!30 ] {texmf};
+
+\node (tex) at (6,0) [draw ] {tex};
+\node (doc) at (2,0) [draw ] {doc};
+
+\node (texgen) at (7,-2) [draw ] {generic};
+\node (docgen) at (0,-2) [draw ] {generic};
+
+\node (latex) at (4,-2) [draw ] {latex};
+
+\node (genpgf) at (7,-4) [draw] {pgf};
+\node (latpgf) at (5,-4) [draw] {pgf};
+\node (tkz) at (4,-4) [draw,fill=blue!20 ] {tkz};
+
+\node (docpgf) at (0,-4) [draw] {pgf};
+
+\node (fct) at (6,-6) [draw,fill=orange!20] {tkz-fct.sty};
+\node (tkb) at (4,-6) [draw,fill=blue!20] {tkzbase};
+\node (tke) at (2,-6) [draw,fill=blue!20] {tkzeuclide};
+
+\node (tari) at (9,-11) [draw,fill=green!20] {tkz-tools-arith.tex};
+\node (tuti) at (8,-11) [draw,fill=green!20] {tkz-tools-utilities.tex};
+\node (tmisc) at (7,-11) [draw,fill=green!20] {tkz-tools-misc.tex};
+\node (tmath) at (6,-11) [draw,fill=green!20] {tkz-tools-math.tex};
+\node (tbas) at (5,-11) [draw,fill=green!20] {tkz-tools-base.tex};
+\node (base) at (4,-11) [draw,fill=green!20] {tkz-base.sty};
+\node (cfg) at (3,-11) [draw,fill=red!20] {tkz-base.cfg};
+\node (mark) at (2,-11) [draw,fill=red!20] {tkz-obj-marks.tex};
+\node (pts) at (1,-11) [draw,fill=red!20] {tkz-obj-points.tex};
+\node (seg) at (0,-11) [draw,fill=red!20] {tkz-obj-segments.tex};
+
+
+
+\draw[-open triangle 90](texmf.north east) --(tex.south west) ;
+\draw[-open triangle 90](texmf.south east) -- (doc.north west) ;
+
+\draw[-open triangle 90](tex.north east) --(texgen.south west) ;
+\draw[-open triangle 90](tex.south east) -- (latex.north west) ;
+\draw[-open triangle 90](texgen.east) -- (genpgf.west) ;
+
+\draw[-open triangle 90](doc.south east) -- (docgen.north west) ;
+\draw[-open triangle 90](docgen.east) -- (docpgf.west) ;
+
+\draw[-open triangle 90](latex.north east) -- (latpgf.south west) ;
+\draw[-open triangle 90](latex.east) -- (tkz.west) ;
+
+\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](fct.west) ;
+\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tkb.west) ;
+\draw[-open triangle 90,blue!40](tkz.east) to[out=-90,in=90](tke.west) ;
+
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tari.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tuti.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmisc.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tmath.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](tbas.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](base.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](cfg.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](mark.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](pts.west) ;
+\draw[-open triangle 90,blue!40](tkb.east) to[out=-90,in=90](seg.west) ;
+
+\end{tikzpicture}
+
+\begin{tikzpicture}[remember picture,overlay]
+ \path[->,thin,red!50,>=latex] (n1) edge [bend left] (tkz);
+ \path[->,thin,red!50,>=latex] (n2) edge [bend left] (fct);
+\end{tikzpicture}
+
+\vfill
+\newpage
+\item Ouvrir un terminal, puis faire \tkzname{sudo texhash} si nécessaire.
+\item Vérifier que \tkzname{Ti\emph{k}Z 2.10}\index{TikZ@Ti\emph{k}Z} est installé car c'est la version minimum pour le bon fonctionnement de \tkzname{tkz-fct}. \tkzname{tkz-base} doit aussi être installé, de même le binaire « gnuplot» doit être installé sur votre ordinateur. \tkzname{fp.sty} est intensément utilisé mais il est présent dans toutes les distributions.
+\end{enumerate}
+
+
+\subsection{Avec MikTeX sous Windows XP}\NameDist{MikTeX}\NameSys{Windows XP}
+
+Je ne connais pas grand-chose à ce système mais un utilisateur de mes packages \textbf{Wolfgang Buechel} a eu la gentillesse de me faire parvenir ce qui suit~:
+
+Pour ajouter \tkzname{tkz-fct.sty} à MiKTeX\footnote{Essai réalisé avec la version \tkzname{2.7}}:
+
+\begin{itemize}\setlength{\itemsep}{10pt}
+ \item ajouter un dossier \tkzname{tkz} dans le dossier
+ \textcolor{red}{\texttt{[MiKTeX-dir]/tex/latex}}
+ \item copier \tkzname{tkz-fct.sty} et tous les packages nécessaires à son fonctionnement dans le dossier \tkzname{tkz},
+ \item mettre à jour MiKTeX, pour cela dans shell DOS lancer la commande \textbf{\textcolor{red}{|mktexlsr -u|}}
+
+ ou bien encore, choisir \textcolor{red}{|Start/Programs/Miktex/Settings/General|}
+
+ puis appuyer sur le bouton \textbf{\textcolor{red}{|Refresh FNDB|}}.
+\end{itemize}
+
+\subsection{Résumé de l'installation}
+
+Pour résumer, \tkzname{Ti\emph{k}Z 2.10} est nécessaire, ensuite soit \tkzname{tkz-fct} est dans votre distribution et le seul problème est l'installation de \tkzname{gnuplot}; soit il n'est pas dans votre distribution et dans ce cas, il suffit de créer un dossier qui le contiendra ainsi que \tkzname{tkz-base} et les fichiers qui l'accompagnent.
+
+Au moment où j'écris ces lignes les fichiers nécessaires pour utiliser \tkzname{tkz-fct} sont~:
+
+\vspace*{8pt}
+\begin{itemize}
+
+ \item \tkzname{tkz-fct.sty} un fichier
+
+\vspace*{20pt}
+ \item \tkzname{tkz-base} dossier nécessaire qui comprend~:
+
+ \vspace*{8pt}
+ \begin{itemize}
+ \item \tkzname{tkz-base.sty} fichier principal
+ \item \tkzname{tkz-base.cfg} fichier de configuration
+ \item \tkzname{tkz-tools-base.tex}
+ \item \tkzname{tkz-tools-arith.tex}
+ \item \tkzname{tkz-tools-misc.tex}
+ \item \tkzname{tkz-tools-utilities.tex}
+ \item \tkzname{tkz-obj-points.tex}
+ \item \tkzname{tkz-obj-segments.tex}
+ \item \tkzname{tkz-obj-marks.tex}
+ \end{itemize}
+
+\vspace*{20pt}
+ \item \tkzname{tkz-euclide} dossier qui comprend~:
+
+ \vspace*{8pt}
+ \begin{itemize}
+ \item \tkzname{tkz-euclide.sty} fichier principal
+ \item \tkzname{tkz-tools-intersections.tex}
+ \item \tkzname{tkz-tools-math.tex}
+ \item \tkzname{tkz-tools-transformations.tex}
+ \item \tkzname{tkz-lib-symbols.tex} ajoute des formes nouvelles
+ \item \tkzname{tkz-obj-lines.tex}
+ \item \tkzname{tkz-obj-addpoints.tex} compléments sur les points
+ \item \tkzname{tkz-obj-circles.tex}
+ \item \tkzname{tkz-obj-arcs.tex}
+ \item \tkzname{tkz-obj-angles.tex}
+ \item \tkzname{tkz-obj-polygons.tex}
+ \item \tkzname{tkz-obj-sectors.tex}
+ \item \tkzname{tkz-obj-protractor.tex}
+\end{itemize}
+
+\end{itemize}
+
+\endinput
+
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex
index 822844b18d..e00ec4fa3e 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-interpolation.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\subsection{Interpolation}
Il s'agit ici de trouver un polynôme d'interpolation sur l'intervalle $[-1~;~1]$ de la fonction $f$ définie par :
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
index fc0925ffd4..52a46a3555 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-label.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Labels}
Ce qui est souhaitable, c'est de pouvoir nommer les courbes. Prenons comme exemple, la fonction $f$ définie par :
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex
index b84191a233..be214721e3 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-liste.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Liste de toutes les macros}
\subsection{Liste de toutes les macros fournies par ce package}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
index cc7407c5a7..ccb2775561 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex
@@ -21,11 +21,11 @@
]{tkz-doc}
\usepackage{etoc}
\gdef\tkznameofpack{tkz-fct}
-\gdef\tkzversionofpack{2.3c}
-\gdef\tkzdateofpack{2020/04/11}
+\gdef\tkzversionofpack{1.4c}
+\gdef\tkzdateofpack{2020/05/01}
\gdef\tkznameofdoc{doc-tkz-tab}
-\gdef\tkzdateofdoc{2020/04/11}
-\gdef\tkzversionofdoc{2.3c}
+\gdef\tkzdateofdoc{2020/05/01}
+\gdef\tkzversionofdoc{1.4c}
\gdef\tkzauthorofpack{Alain Matthes}
\gdef\tkzadressofauthor{}
\gdef\tkznamecollection{AlterMundus}
@@ -107,7 +107,7 @@
\makeindex
\newcommand*{\E}{\ensuremath{\mathrm{e}}}
\colorlet{graphicbackground}{white}
-\colorlet{codebackground}{Gray!20}
+\colorlet{codebackground}{Gray!10}
% \usepackage[saved]{tkzexample}
% \def\tkzFileSavedPrefix{tkzFct}
\def\blue{\color{blue}}
@@ -123,10 +123,9 @@
\clearpage
-
\nameoffile{\tkznameofpack}
-\defoffile{\textbf{tkz-fct.sty} est un package pour créer à l'aide de \TIKZ, des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, la création de dessins utiles dans l'enseignement des mathématiques.}
+\defoffile{\textbf{tkz-fct.sty (v1.4c)} est un package pour créer à l'aide de \TIKZ, des représentations graphiques de fonctions en 2D le plus simplement possible. Il est dépendant de \TIKZ\ et fera partie d'une série de modules ayant comme point commun, La création de dessins utiles dans l’enseignement des mathématiques. Ce sont des représentations du type scolaire qui correspondent à l’enseignement proposé dans les lycées français.}
\presentation
@@ -135,10 +134,10 @@
\vspace*{12pt}
-\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques.
+\noindent\lefthand\ Je souhaite remercier aussi \tkzimp{David Arnold} qui a corrigé un grand nombre d'erreurs et qui a testé de nombreux exemples, \tkzimp{Pablo González Luengo } pour son aide sur la documentation et la gestion du dépôt "GitHub", \tkzimp{Wolfgang Büchel} qui a corrigé également des erreurs et a construit de superbes scripts pour obtenir les fichiers d'exemples, \tkzimp{John Kitzmiller} et ses exemples, et enfin \tkzimp{Gaétan Marris} pour ses remarques.
\vspace*{12pt}
-\noindent\lefthand\ Vous trouverez de nombreux exemples sur mes sites~:
+\noindent\lefthand\ Vous trouverez bientôt de nombreux exemples sur mon site~:
\href{http://altermundus.fr}{altermundus.fr}
\vfill
@@ -147,8 +146,7 @@ Vous pouvez envoyer vos remarques, et les rapports sur des erreurs que vous aure
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or (at your option) any later version.
-
-
+%<--------------------------------------------------------------------------->
\clearpage
\tableofcontents
@@ -158,9 +156,7 @@ of this license or (at your option) any later version.
\setlength{\parskip}{1ex plus 0.5ex minus 0.2ex}
%<---------------------------- the files ------------------------------------>
-
\include{TKZdoc-fct-why}
-%\include{TKZdoc-fct-installation}
\include{TKZdoc-fct-compilation}
\include{TKZdoc-fct-fonctions}
\include{TKZdoc-fct-point}
@@ -180,7 +176,6 @@ of this license or (at your option) any later version.
\include{TKZdoc-fct-faq}
\include{TKZdoc-fct-liste}
%<--------------------------------------------------------------------------->
-
\clearpage\newpage
\printindex
-\end{document}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
index a99cf86365..3c9f8dd930 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-param.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Courbes avec équations paramétrées}
\hypertarget{tfpa}{}
\begin{NewMacroBox}{tkzFctPar}{\oarg{local options}\marg{$x(t)$}\marg{$y(t)$}}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
index cd9ca26441..fde88c84b0 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex
@@ -1,6 +1,4 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
-
-\section{Placer un point sur une courbe} \hypertarget{tptfct}{}
+\section{Placer un point sur une courbe \tkzcname{tkzDefPointByFct}} \hypertarget{tptfct}{}
\begin{NewMacroBox}{tkzDefPointByFct}{\parg{$decimal number$}}
\emph{Cette macro permet de calculer l'image par la fonction définie précédemment, d'un nombre décimal.}
@@ -94,7 +92,7 @@ Attention, ceci est délicat. Il suffit de définir la macro \tkzcname{tkzFctLas
\newpage\null
\subsection{Placer des points sans se soucier des coordonnées}
-Cette fois le domaine s'étend de 0 à 800, les valeurs prises par la fonction de $0$ à $\numprint{2000}$. \tkzname{xstep=100} donc il faut utliser |\x| à la place de $x$. Une petite astuce au niveau de gnuplot, 1. et 113. permettent d'obtenir une division dans les décimaux sinon la division se fait dans les entiers.
+Cette fois, le domaine s'étend de 0 à 800, les valeurs prises par la fonction de $0$ à $\numprint{2000}$. \tkzname{xstep=100} donc il faut utliser |\x| à la place de $x$. Une petite astuce au niveau de gnuplot, 1. et 113. permettent d'obtenir une division dans les décimaux sinon la division se fait dans les entiers.
Ensuite, j'utilise les macros pour placer des points
@@ -128,7 +126,7 @@ Revoir \tkzcname{tkzSetUpPoint} et \tkzcname{tkzText} du module \tkzname{tkz-ba
\tkzGrid(0,0)(3,2)
\tkzFct[color = red,domain = 1./3:3]{0.125*(3*x-1)+0.375*(3*x-1)/(x*x)}
\tkzFct[color = green,domain = 1./3:3]{0.125*(3*x-1)}
- \tkzSetUpPoint[shape=circle, size = 10, color=black, fill=lightgray]
+ \tkzSetUpPoint[shape=circle, size = 4, color=black, fill=lightgray]
\tkzDefPointByFct[draw,with = a](1)
\tkzDefPointByFct[draw,with = a](2)
\tkzDefPointByFct[draw,with = a](3)
@@ -149,7 +147,7 @@ Revoir \tkzcname{tkzSetUpPoint} et \tkzcname{tkzText} du module \tkzname{tkz-ba
\tkzGrid(0,0)(3,2)
\tkzFct[color = red,domain = 1./3:3]{0.125*(3*x-1)+0.375*(3*x-1)/(x*x)}
\tkzFct[color = green,domain = 1./3:3]{0.125*(3*x-1)}
- \tkzSetUpPoint[shape=circle, size = 10, color=black, fill=lightgray]
+ \tkzSetUpPoint[shape=circle, size = 4, color=black, fill=lightgray]
\tkzDefPointByFct[draw,with = a](1)
\tkzDefPointByFct[draw,with = a](2)
\tkzDefPointByFct[draw,with = a](3)
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
index 9b23cc5728..640409445a 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-polar.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Courbes en coordonnées polaires}
\hypertarget{tfpo}{}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex
index d60148ba7e..45f4cfabf3 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-riemann.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Sommes de Riemann}
\hypertarget{tdrs}{}
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
index 718914699c..8f8bdca471 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-symbol.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Symboles}
Certains ajoutent aux courbes des symboles afin de donner des indications supplémentaires au lecteur. Voici quelques exemples possibles~:
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
index 683ee7a5bd..ad5b8088ff 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-tangent.tex
@@ -103,12 +103,10 @@ Soit on place la macro \tkzcname{tkzDrawTangentLine} après la ligne
\tkzDrawTangentLine[with=a,
color=blue](1)
\tkzText[draw,
- color= red,
- fill=brown!50](1,1.5)%
+ color= red](1,1.5)%
{$f(x)=\frac{1}{8}(3x-1)+\frac{3}{8}\left(\frac{3x-1}{x^2}\right)$}
\tkzText[draw,
- color= green!50!black,
- fill=brown!50](2,0.3)%
+ color= blue](2,0.3)%
{$g(x)=\frac{1}{8}(3x-1)$}
\end{tikzpicture}
\end{tkzexample}
@@ -218,7 +216,7 @@ Un problème surgit si on emploie une expression contenant des parenthèses dans
\begin{tkzltxexample}[] \FPeval\vx{1/exp(1)}
\end{tkzltxexample}
-\subsubsection{utilisation de la valeur numérique}
+\subsubsection{Utilisation de la valeur numérique}
\begin{center}
\begin{tkzexample}[]
\begin{tikzpicture}[scale=1]
diff --git a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
index 131d1b8b89..9108d7118d 100644
--- a/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
+++ b/macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex
@@ -1,4 +1,3 @@
-%!TEX root = /Users/ego/Boulot/TKZ/tkz-fct/doc-fr/TKZdoc-fct-main.tex
\section{Fonctionnement}
\TIKZ\ apporte différentes possibilités pour obtenir les représentations graphiques des fonctions. J'ai privilégié l'utilisation de \tkzname{gnuplot}, car je trouve \tkzname{pgfmath} trop lent et les résultats trop imprécis.
@@ -28,16 +27,18 @@ Les valeurs de $f(x)$ sont comprises entre 0 et $\numprint{1000000}$. En choisis
Les valeurs du domaine seront comprises entre $0$ et $10$, mais l'expression donnée à \tkzname{gnuplot}, comportera des \tkzcname{x} équivalents à $x \times 10$, enfin, la valeur finale sera divisée par \tkzname{ystep=100000}. Les valeurs de $f(x)$ resteront ainsi comprises entre $0$ et $10$.
\begin{tkzexample}[latex=10cm,small]
-\begin{tikzpicture}[scale=.5]
- \tkzInit[xmax=100,xstep=10,
- ymax=1000000,
- ystep=100000]
- \tkzAxeX[right]
- \tkzAxeY[above]
- \tkzGrid
- \tkzFct[color=red,
- domain=0:100]{\x**3}
-\end{tikzpicture}
+ \begin{tikzpicture}[scale=.5]
+ \tkzInit[xmax=100,xstep=10,
+ ymax=1000000,
+ ystep=100000]
+ \tkzDrawX[right]
+ \tkzDrawY[above]
+ \tkzLabelX[below=6pt]
+ \tkzLabelY[left=6pt]
+ \tkzGrid
+ \tkzFct[color=red,
+ domain=0:100]{\x**3}
+ \end{tikzpicture}
\end{tkzexample}
diff --git a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
index 37213a70d6..401fa985bf 100644
--- a/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
+++ b/macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty
@@ -13,10 +13,10 @@
% constants from tkz-base
% \tkz@init@xstep
% \tkz@init@ystep
-\typeout{2020/04/11 1.3c function tkz-fct}
+\typeout{2020/05/01 1.4c function tkz-fct}
%<--------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-fct}[2020/04/11 1.3c function ]
+\ProvidesPackage{tkz-fct}[2020/05/01 1.4c function ]
\newcount\tkz@tkzf@fct
\edef\tkzTWOPTCode{\the\catcode`\:}
\tkz@tkzf@fct=0 %
@@ -83,17 +83,17 @@
\global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016
\catcode`\:=12
\pgfkeys{/@tkzfct/.cd,
- domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
- domain = \tkz@tmp@xa:\tkz@tmp@xb,
- samples/.store in = \tkz@fct@samples,
- id/.store in = \tkz@fct@id,
- fp/.is if = tkz@fp,
- fp/.default = false,
- samples = 200,
- fp = true,
- id = tkzfct,
- /@tkzfct/.search also = {/tikz},
+ domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ domain = \tkz@tmp@xa:\tkz@tmp@xb,
+ samples/.store in = \tkz@fct@samples,
+ id/.store in = \tkz@fct@id,
+ fp/.is if = tkz@fp,
+ fp/.default = false,
+ samples = 200,
+ fp = true,
+ id = tkzfct,
+ /@tkzfct/.search also = {/tikz},
}%
\def\tkzFct{\pgfutil@ifnextchar[{\tkzActivOff\tkz@fct}{\tkz@fct[]}}
@@ -113,12 +113,14 @@
\def\x{(x*\tkz@init@xstep)}%
\expandafter\edef\csname tkzFctgnu\@alph\tkz@tkzf@fct \endcsname{#2}%
\expandafter\edef\csname tkzFctgnuLast\endcsname{#2}
-% %%%%%%%
+%%%%%%%
\begin{scope}
- \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
- \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]%
- plot[ samples = \tkz@fct@samples,id=\tkz@fct@id,
- domain= \tkz@ba:\tkz@bb] function{(#2)/\tkz@init@ystep};%
+ \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
+ % \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]
+ \draw[#1, xshift = -\tkz@x@delta cm,]
+ plot[samples = \tkz@fct@samples,id=\tkz@fct@id,
+ domain= \tkz@ba:\tkz@bb] function{((#2)-\tkz@init@yorigine)/\tkz@init@ystep};
+ % \node {-\tkz@y@delta cm };
\end{scope}
% %%%%%%%
\let\tkz@tmp@xstep\tkz@init@xstep
@@ -140,30 +142,30 @@
% point d'une courbe (new method)
%<--------------------------------------------------------------------------->
\pgfkeys{/tkzfctpt/.cd,
- draw/.is if = tkz@draw,
- draw/.default = true,
- with/.store in = \tkz@fct@used,
- ref/.store in = \tkz@fct@ref,
- draw = false,
- with = {},
- ref = {}
- }
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ with/.store in = \tkz@fct@used,
+ ref/.store in = \tkz@fct@ref,
+ draw = false,
+ with = {},
+ ref = {}
+ }
\def\tkzDefPointByFct{\pgfutil@ifnextchar[{\tkz@fctpoint}{\tkz@fctpoint[]}}
\def\tkz@fctpoint[#1](#2){%
\pgfqkeys{/tkzfctpt}{#1}
\FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
- \FPeval\tkz@fx{\tkzFctLast}
- \else
+ \FPeval\tkz@fx{\tkzFctLast}
+ \else
\edef\tkz@fct{\csname tkzFct\tkz@fct@used\endcsname}
- \FPeval\tkz@fx{\tkz@fct}
- \fi
+ \FPeval\tkz@fx{\tkz@fct}
+ \fi
\tkzDefPoint(\x,\tkz@fx){tkzPointResult}%
- \iftkz@draw
+ \iftkz@draw
\tkzDrawPoint(tkzPointResult)
\fi
-\ifx\tkzutil@empty\tkz@fct@ref
+\ifx\tkzutil@empty\tkz@fct@ref
\else
\tkzGetPoint{\tkz@fct@ref}
\fi
@@ -172,16 +174,16 @@
% tangente \tkzDrawTangentLine
%<--------------------------------------------------------------------------->
\pgfkeys{/@tkztan/.cd,
- with/.store in = \tkz@fct@used,
- kr/.store in = \tkz@tan@kr,
- kl/.store in = \tkz@tan@kl,
- draw/.is if = tkz@draw,
- draw/.default = true,
- draw = false,
- with = {},
- kr = 1,
- kl = 1,
- /@tkztan/.search also = {/tikz},
+ with/.store in = \tkz@fct@used,
+ kr/.store in = \tkz@tan@kr,
+ kl/.store in = \tkz@tan@kl,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ draw = false,
+ with = {},
+ kr = 1,
+ kl = 1,
+ /@tkztan/.search also = {/tikz},
}%
%<--------------------------------------------------------------------------->
\def\tkzDrawTangentLine{\pgfutil@ifnextchar[{\tkz@DrawTangentLine}{%
@@ -236,19 +238,19 @@
%<--------------------------------------------------------------------------->
\pgfkeys{%
/tkzarea/.cd,
- domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
- opacity/.store in = \tkz@fct@opacity,
- id/.store in = \tkz@fct@id,
- color/.store in = \tkz@fct@color,
- samples/.store in = \tkz@fct@samples,
- domain = -5:5,
- color = \tkz@otherlinecolor,
- samples = 200,
- id = tkzfonct,
- opacity = .5,
- /tkzarea/.search also = {/tikz}
- }
+ domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ color = \tkz@otherlinecolor,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /tkzarea/.search also = {/tikz}
+ }
\def\tkzArea{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@aire}{\tkz@aire[]}}
\def\tkz@aire[#1]{%
\begingroup
@@ -282,22 +284,22 @@
% tkzAreafg
%<--------------------------------------------------------------------------->
\pgfkeys{/@tkzareafg/.cd,
- domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
- between/.code args ={#1 and #2}{\def\tkzfct@below{#1}
- \def\tkzfct@above{#2}},
- opacity/.store in = \tkz@fct@opacity,
- id/.store in = \tkz@fct@id,
- color/.store in = \tkz@fct@color,
- samples/.store in = \tkz@fct@samples,
- domain = -5:5,
- between = a and b,
- color = lightgray,
- samples = 200,
- id = tkzfonct,
- opacity = .5,
+ domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ between/.code args ={#1 and #2}{\def\tkzfct@below{#1}
+ \def\tkzfct@above{#2}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ between = a and b,
+ color = lightgray,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
/@tkzareafg/.search also = {/tikz}
- }
+ }
\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
\def\tkz@airefg[#1]{%
@@ -340,10 +342,10 @@
\def\tkz@fctp[#1]#2#3{%
\begingroup
\pgfkeys{/@tkzfct/.cd,
- domain = \tkz@pamin:\tkz@pamax,
- samples = 200,
- fp = true,
- id = tkzfct}
+ domain = \tkz@pamin:\tkz@pamax,
+ samples = 200,
+ fp = true,
+ id = tkzfct}
\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -374,11 +376,11 @@
\def\tkz@FctPolar[#1]#2{%
\begingroup
\pgfkeys{/@tkzfct/.cd,
- domain = \tkz@pomin:\tkz@pomax,
- fp = true,
- samples = 200,
- id = tkzfctpolar
- }
+ domain = \tkz@pomin:\tkz@pomax,
+ fp = true,
+ samples = 200,
+ id = tkzfctpolar
+ }
\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -403,11 +405,11 @@
% tkzDrawRiemannSum
%<--------------------------------------------------------------------------->
\pgfkeys{/@tkzriemann/.cd,
- interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
- number/.store in = \tkz@fct@nb,
- opacity/.store in = \tkz@fct@opacity,
- color/.store in = \tkz@fct@color,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
/@tkzriemann/.search also = {/tikz},
}
\def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
@@ -415,10 +417,10 @@
\def\tkz@DrawRiemannSum[#1]{%
\begingroup
\pgfkeys{/@tkzriemann/.cd,
- interval = 1:2,
- number = 10,
- opacity = 0.5,
- line width = 1pt
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
}
\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
@@ -437,9 +439,9 @@
\FPeval\tkz@fx{\tkzFcta}
\FPadd\tkz@next{\x}{\tkz@delta}
\draw[ color=\tkz@fct@color,
- opacity=\tkz@fct@opacity,
- /@tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next,
- \tkz@fx/\tkz@init@ystep );
+ opacity=\tkz@fct@opacity,
+ /@tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next,
+ \tkz@fx/\tkz@init@ystep );
}
\end{scope}
\endgroup
@@ -448,23 +450,23 @@
% tkzDrawRiemannSumInf
%<--------------------------------------------------------------------------->
\pgfkeys{/@tkzriemann/.cd,
- interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
- number/.store in = \tkz@fct@nb,
- opacity/.store in = \tkz@fct@opacity,
- color/.store in = \tkz@fct@color,
- /@tkzriemann/.search also = {/tikz},
- }
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /@tkzriemann/.search also = {/tikz},
+ }
\def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
\catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
\def\tkz@DrawRiemannSumInf[#1]{%
\begingroup
\pgfkeys{/@tkzriemann/.cd,
- interval = 1:2,
- number = 10,
- opacity = 0.5,
- line width = 1pt
- }
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -505,11 +507,11 @@
\def\tkz@DrawRiemannSumSup[#1]{%
\begingroup
\pgfkeys{/@tkzriemann/.cd,
- interval = 1:2,
- number = 10,
- opacity = 0.5,
- line width = 1pt
- }
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -550,11 +552,11 @@
\def\tkz@DrawRiemannSumMid[#1]{%
\begingroup
\pgfkeys{/@tkzriemann/.cd,
- interval = 1:2,
- number = 10,
- opacity = 0.5,
- line width = 1pt
- }
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -590,14 +592,14 @@
\def\tkz@ComT{v} % need
\pgfkeys{/@tkzxh/.cd,
- posgrad/.store in = \tkz@tkzXh@posgrad,
- left/.store in = \tkz@tkzXh@left,
- right/.store in = \tkz@tkzXh@right,
- color/.store in = \tkz@tkzXh@color,
- posgrad = {below=6 pt},
- color = \tkz@mainlinecolor,
- left = {},
- right = {},
+ posgrad/.store in = \tkz@tkzXh@posgrad,
+ left/.store in = \tkz@tkzXh@left,
+ right/.store in = \tkz@tkzXh@right,
+ color/.store in = \tkz@tkzXh@color,
+ posgrad = {below=6 pt},
+ color = \tkz@mainlinecolor,
+ left = {},
+ right = {},
}
\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
\def\tkz@xh[#1]#2{%
@@ -635,11 +637,11 @@
%
% \def\tkz@Tan[#1]#2(#3)#{
% \pgfkeys{/@tkztan/.cd,
-% draw = false,
-% with = {},
-% kr = 1,
-% kl = 1
-% }
+% draw = false,
+% with = {},
+% kr = 1,
+% kl = 1
+% }
% \pgfqkeys{/@tkztan}{#1}
% \global\edef\tkz@opttan{#1}
% \FPeval\x{(#3)}%
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index 3992b6e1a2..9ca2bd9af7 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,16 @@ also have a look at the example files.
== CHANGES ==
+V. 1.11 (2020-05-05):
+ - univie-ling-paper.cls:
+ - univie-ling-expose.cls:
+ - univie-ling-thesis.cls:
+ * new option "polyglossia"
+ - univie-ling-thesis.cls:
+ * new option "pdfa"
+ - univie-ling-wlg.cls:
+ * update editorial board information.
+
V. 1.10 (2020-05-01):
- univie-ling-wlg.cls:
* fix encoding incompatibilities.
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
index 9365a6b6e6..c1de8f5eb8 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
index 6f9a1eb566..ec96559ba7 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
@@ -1,13 +1,10 @@
% Beispieldatei für die Klasse ``univie-ling-thesis''
% Ãœbersetzen mit pdflatex -- biber -- pdflatex
-\documentclass[naustrian]{univie-ling-thesis}
-
-\usepackage{babel}
-
% Verwende den vom Hochschulschriftenservice verlangten Standard PDF/A1-b
% (siehe http://e-theses.univie.ac.at/elektronische_einreichung.html)
-\usepackage[a-1b]{pdfx}
-\hypersetup{pdfborder={0 0 0}}
+\documentclass[naustrian,pdfa]{univie-ling-thesis}
+
+\usepackage{babel}
% Standardmäßig wird das Biblatex-Paket mit Unified-Stil und
% Biber-Backend geladen.
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
index 4978646332..2c95c63b6d 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
index 7b479f4777..4fea4ea8b4 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
@@ -1,13 +1,10 @@
% Example file for the class ``univie-ling-thesis''
% Run pdflatex -- biber -- pdflatex
-\documentclass[naustrian,english]{univie-ling-thesis}
-
-\usepackage{babel}
-
% Use the PDF/A1-b standard as required by the Hochschulschriften-Service
% (see http://e-theses.univie.ac.at/elektronische_einreichung.html)
-\usepackage[a-1b]{pdfx}
-\hypersetup{pdfborder={0 0 0}}
+\documentclass[naustrian,english,pdfa]{univie-ling-thesis}
+
+\usepackage{babel}
% By default, the class loads the biblatex package
% with Unified style and biber backend.
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index 3f2849c4b8..4c6af984c7 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index a0b21eae63..2b17fcbea1 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index 26a611ffcd..7f664a24d7 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.10, 2020/05/01}
+\date{Version 1.11, 2020/05/05}
\maketitle
@@ -78,8 +78,6 @@ In this case, however, some settings might have to be adjusted. This manual docu
\tableofcontents
-\clearpage
-
\section{Aims and scope}
The \uvlt\ class has been written mainly with my own field in mind: Applied Linguistics. Therefore, the defaults are closely tied to
@@ -128,7 +126,8 @@ The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
- \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX)
+ \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
+ \item \textsf{polyglossia}: Multi-language and script support.
\end{itemize}
\section{Fonts}\label{fonts}
@@ -170,6 +169,11 @@ The class provides the following option to set the font handling:
nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself).
\end{description}
+\subsection{Polyglossia}
+
+If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but
+rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}.
+
\subsection{Package loading}\label{packageloading}
Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway,
@@ -315,6 +319,7 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}.
\item 2020/05/01 (v.\,1.10) No change to this class.
\item 2019/01/21 (v.\,1.9) No change to this class.
\item 2019/01/15 (v.\,1.8) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 78f1ef1fb5..2c9a11aa07 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index c691588972..8e9e432933 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.10, 2020/05/01}
+\date{Version 1.11, 2020/05/05}
\maketitle
@@ -74,8 +74,6 @@ be adjusted. This manual documents the class as well as the configuration possib
\tableofcontents
-\clearpage
-
\section{Aims and scope}
The \uvlt\ class has been written mainly with my own field in mind: Applied Linguistics. Therefore, the defaults are closely tied to
@@ -120,8 +118,9 @@ The following packages are required for specific features and loaded by default.
The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
- \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX)
+ \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
+ \item \textsf{polyglossia}: Multi-language and script support.
\end{itemize}
\section{Fonts}\label{fonts}
@@ -184,6 +183,11 @@ The class provides the following option to set the font handling:
nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself).
\end{description}
+\subsection{Polyglossia}
+
+If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but
+rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}.
+
\subsection{Package loading}\label{packageloading}
Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway,
@@ -339,6 +343,7 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}.
\item 2020/05/01 (v.\,1.10) No change to this class.
\item 2019/01/21 (v.\,1.9) No change to this class.
\item 2019/01/15 (v.\,1.8) Fix encoding of German declaration string.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index 471763d75c..4f79c0ebe8 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index 4c43f624ce..63979e76f8 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.10, 2020/05/01}
+\date{Version 1.11, 2020/05/05}
\maketitle
@@ -122,7 +122,9 @@ The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
- \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX)
+ \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
+ \item \textsf{polyglossia}: Multi-language and script support.
+ \item \textsf{pdfa}: Create PDF/A compliant files.
\end{itemize}
\section{Fonts}\label{fonts}
@@ -185,6 +187,11 @@ The class provides the following option to set the font handling:
nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself).
\end{description}
+\subsection{Polyglossia}
+
+If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but
+rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}.
+
\subsection{Package loading}\label{packageloading}
Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway,
@@ -213,6 +220,7 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages
\begin{description}
\setlength\itemsep{0pt}
\item{\joption{fdegree=true|false}}: Prefer feminine forms for the targeted degree on the title page (such as \emph{Magistra}, \emph{Doktorin}). Default: \joption{false}.
+ \item{\joption{pdfa=true|false}}: Generate PDF/A compliant output (see sec.~\ref{sec:pdfa} for details). Default: \joption{false}.
\end{description}
The class builds on \textsf{scrreprt} (KOMA report), which provides many more options to tweak the appearance of your document. You can use
all these options via the \jfcsmacro{KOMAoptions} macro. Please refer to the \textsf{KOMA-Script} manual \cite{koma} for details.
@@ -323,24 +331,20 @@ Please refer to the comprehensive KOMA-Script manual \cite{koma} for information
Please also refer to the template files included in the package for some further usage instructions and hints.
-\subsection{Generating PDF/A}
+\subsection{Generating PDF/A}\label{sec:pdfa}
In order to submit your thesis to the \emph{Hochschulschriften-Server}, it must follow the PDF/A-1 or PDF/A-2 standard (a specific form of PDF aimed at long-time archiving).\footnote{\url{http://e-theses.univie.ac.at/pdf-erstellung.html}}
-With PDFLaTeX or LuaTeX, you can achieve PDF/A-1b or PDF/A-2b compliant files by means of the \textsf{pdfx} package. If you do not use specific color profiles in
+With PDFLaTeX or LuaTeX, you can achieve PDF/A-1b or PDF/A-2b compliant files by means of the \textsf{pdfx} package.\footnote{XeTeX also works with recent versions of the \textsf{pdfx} package, if you use the command line option \texttt{--shell-escape -output-driver="xdvipdfmx -z 0"} of \texttt{xelatex}. Please refer to the \textsf{pdfx} manual for details.} If you do not use specific color profiles in
your document and provided that all your graphics follow the requirements of
the PDF/A standard (all fonts embedded, no transparency groups etc.), producing
-a PDF/A-1b compliant file is straightforward. Firstly, put the following to the preamble:
-
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={hypersetup}]
-\usepackage[a-1b]{pdfx}
-\hypersetup{pdfborder={0 0 0}}
-\end{lstlisting}
-The second line is not strictly necessary, but it prevents that colored borders
-are drawn around the hyperlinks in your document.
+a PDF/A-1b compliant file is straightforward:
-Secondly, create a text file called \texttt{<name>.xmpdata} (where <name> is to be replaced by the name of your [master] TeX file or the produced PDF file, respectively), which contains some metadata of your document (author's name, title, keywords, etc.). This file needs to be stored next to your TeX file(s). Example \texttt{*.xmpdata} files are included in the \uvlt\ bundle (and used
-in the accompanying templates); you can use them as a model and adapt them to your needs.
+\begin{enumerate}
+ \item Use the class option \joption{pdfa=true}.
+ \item Create a text file called \texttt{<name>.xmpdata} (where <name> is to be replaced by the name of your [master] TeX file or the produced PDF file, respectively), which contains some metadata of your document (author's name, title, keywords, etc.). This file needs to be stored next to your TeX file(s). Example \texttt{*.xmpdata} files are included in the \uvlt\ bundle (and used in the accompanying templates); you can use them as a model and adapt them to your needs.
+\end{enumerate}
+%
Note that \textsf{pdfx} does not verify whether the produced output really conforms to the standard. You need to use a PDF/A verification tool to ensure
that. If you own Adobe Acrobat Pro, you can use its \emph{preflight} tool for this task. Alternatively, a number of free validation programs and online services are available
on the Internet.
@@ -363,6 +367,10 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2020/05/05 (v.\,1.11)\begin{itemize}
+ \item New option \joption{polyglossia}.
+ \item New option \joption{pdfa}.
+ \end{itemize}
\item 2020/05/01 (v.\,1.10) No change to this class.
\item 2019/01/21 (v.\,1.9) No change to this class.
\item 2019/01/15 (v.\,1.8) Fix title abbreviations (MA, BA).
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index d9bac596d1..c29b6a7220 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 34fc150c1e..ad80246023 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.10, 2020/05/01}
+\date{Version 1.11, 2020/05/05}
\maketitle
@@ -212,11 +212,12 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\section{Release History}
\begin{itemize}
+ \item 2020/05/05 (v.\,1.11) Update editorial board info.
\item 2020/05/01 (v.\,1.10) Fix encoding incompatibilities.
- \item 2019/01/21 (v.\,1.9) No change to this class.
- \item 2019/01/15 (v.\,1.8) No change to this class.
- \item 2018/11/07 (v.\,1.7) No change to this class.
- \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}.
+ \item 2019/01/21 (v.\,1.9) No change to this class.
+ \item 2019/01/15 (v.\,1.8) No change to this class.
+ \item 2018/11/07 (v.\,1.7) No change to this class.
+ \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}.
\item 2018/09/03 (v.\,1.5)
\begin{itemize}
\item Introduce \jmacro{subexamples} environment.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index b135db0976..d49c8fff59 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2019/05/01 v1.10 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2020/05/05 v1.11 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
@@ -41,6 +41,10 @@
\newif\ifrefsp\refsptrue
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
+\newif\ifpolyglossia\polyglossiafalse
+\newif\ifpsfonts\psfontstrue
+\newif\ifotffonts\otffontsfalse
+\newif\ifnofonts\nofontsfalse
% all=<true|false>
% Load all packages
@@ -61,7 +65,7 @@
}{%
\ClassWarning{univie-ling-expose}{unknown 'all' value}%
}
-\DeclareOptionX{all}{\setkeys{uvt}{all=#1}}
+\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}}
% biblatex=<true|false>
% Load biblatex
@@ -74,7 +78,7 @@
}{%
\ClassWarning{univie-ling-expose}{unknown biblatex value}%
}
-\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}}
+\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}}
% apa=<true|false>
% Load APA style
@@ -87,7 +91,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown apa value}%
}
-\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}}
+\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}}
% caption=<true|false>
% Load caption
@@ -100,7 +104,7 @@
}{%
\ClassWarning{univie-ling-expose}{unknown caption value}%
}
-\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}}
+\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}}
% ref=<true|false>
% Load varioref and prettyref
@@ -113,7 +117,7 @@
}{%
\ClassWarning{univie-ling-expose}{unknown ref value}%
}
-\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}}
+\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}}
% covington=<true|false>
% Load covington
@@ -126,7 +130,7 @@
}{%
\ClassWarning{univie-ling-expose}{unknown covington value}%
}
-\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}}
+\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}}
% microtype=<true|false>
% Load microtype
@@ -139,11 +143,24 @@
}{%
\ClassWarning{univie-ling-expose}{unknown microtype value}%
}
-\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}}
+\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}}
+
+% polyglossia=<true|false>
+% Load polyglossia
+\define@boolkey+{uvt}{polyglossia}[true]{%
+ \ifKV@uvt@polyglossia
+ \polyglossiatrue
+ \psfontsfalse
+ \otffontstrue
+ \nofontsfalse
+ \else
+ \polyglossiafalse
+ \fi
+}{%
+ \ClassWarning{univie-ling-expose}{unknown polyglossia value}%
+}
+\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}}
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
% fonts=<ps|otf|none>
\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
\ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
@@ -160,7 +177,7 @@
\nofontstrue
\fi
}{%
- \PackageWarning{jsdossier}{unknown fonts value '#1'}%
+ \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}%
}
\DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}}
@@ -216,7 +233,6 @@
\ifpsfonts
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
% Times
\usepackage{mathptmx}
@@ -566,6 +582,17 @@
\fi
%% =============================================================
+%% POLYGLOSSIA:
+%% =============================================================
+
+\ifpolyglossia
+ \ifcaptionp
+ \RequirePackage{ragged2e}
+ \fi
+ \RequirePackage{polyglossia}
+\fi
+
+%% =============================================================
%% BIBLIOGRAPHY:
%% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index c190660feb..b63e553b58 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2019/05/01 v1.10 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2020/05/05 v1.11 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
@@ -42,6 +42,10 @@
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
\newif\ifmultiauthors\multiauthorsfalse
+\newif\ifpolyglossia\polyglossiafalse
+\newif\ifpsfonts\psfontstrue
+\newif\ifotffonts\otffontsfalse
+\newif\ifnofonts\nofontsfalse
% all=<true|false>
% Load all packages
@@ -62,7 +66,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown 'all' value}%
}
-\DeclareOptionX{all}{\setkeys{uvt}{all=#1}}
+\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}}
% biblatex=<true|false>
% Load biblatex
@@ -75,7 +79,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown biblatex value}%
}
-\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}}
+\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}}
% apa=<true|false>
% Load APA style
@@ -88,7 +92,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown apa value}%
}
-\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}}
+\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}}
% caption=<true|false>
% Load caption
@@ -101,7 +105,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown caption value}%
}
-\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}}
+\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}}
% ref=<true|false>
% Load varioref and prettyref
@@ -114,7 +118,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown ref value}%
}
-\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}}
+\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}}
% covington=<true|false>
% Load covington
@@ -127,7 +131,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown covington value}%
}
-\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}}
+\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}}
% microtype=<true|false>
% Load microtype
@@ -138,13 +142,26 @@
\microtypefalse
\fi
}{%
- \ClassWarning{univie-ling-thesis}{unknown microtype value}%
+ \ClassWarning{univie-ling-paper}{unknown microtype value}%
+}
+\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}}
+
+% polyglossia=<true|false>
+% Load polyglossia
+\define@boolkey+{uvt}{polyglossia}[true]{%
+ \ifKV@uvt@polyglossia
+ \polyglossiatrue
+ \psfontsfalse
+ \otffontstrue
+ \nofontsfalse
+ \else
+ \polyglossiafalse
+ \fi
+}{%
+ \ClassWarning{univie-ling-paper}{unknown polyglossia value}%
}
-\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}}
+\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}}
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
% fonts=<ps|otf|none>
\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
\ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
@@ -161,7 +178,7 @@
\nofontstrue
\fi
}{%
- \PackageWarning{jsdossier}{unknown fonts value '#1'}%
+ \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}%
}
\DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}}
@@ -227,7 +244,6 @@ This includes all drawings, sketches, graphics and internet sources.}
\ifpsfonts
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
% Palatino
\usepackage[osf]{mathpazo}
@@ -669,6 +685,17 @@ This includes all drawings, sketches, graphics and internet sources.}
\fi
%% =============================================================
+%% POLYGLOSSIA:
+%% =============================================================
+
+\ifpolyglossia
+ \ifcaptionp
+ \RequirePackage{ragged2e}
+ \fi
+ \RequirePackage{polyglossia}
+\fi
+
+%% =============================================================
%% BIBLIOGRAPHY:
%% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index b43242a9ed..90f2bf9591 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2019/05/01 v1.10 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2020/05/05 v1.11 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
@@ -41,6 +41,12 @@
\newif\ifrefsp\refsptrue
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
+\newif\ifpolyglossia\polyglossiafalse
+\newif\ifpsfonts\psfontstrue
+\newif\ifotffonts\otffontsfalse
+\newif\ifnofonts\nofontsfalse
+\newif\iffdegree\fdegreefalse
+\newif\ifpdfa\pdfafalse
% all=<true|false>
% Load all packages
@@ -61,7 +67,7 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown 'all' value}%
}
-\DeclareOptionX{all}{\setkeys{uvt}{all=#1}}
+\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}}
% biblatex=<true|false>
% Load biblatex
@@ -74,7 +80,7 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown biblatex value}%
}
-\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}}
+\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}}
% apa=<true|false>
% Load APA style
@@ -87,7 +93,7 @@
}{%
\ClassWarning{univie-ling-paper}{unknown apa value}%
}
-\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}}
+\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}}
% caption=<true|false>
% Load caption
@@ -100,7 +106,7 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown caption value}%
}
-\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}}
+\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}}
% ref=<true|false>
% Load varioref and prettyref
@@ -113,7 +119,7 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown ref value}%
}
-\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}}
+\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}}
% covington=<true|false>
% Load covington
@@ -126,7 +132,7 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown covington value}%
}
-\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}}
+\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}}
% microtype=<true|false>
% Load microtype
@@ -139,9 +145,8 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown microtype value}%
}
-\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}}
+\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}}
-\newif\iffdegree\fdegreefalse
% fdegree=<true|false>
% Female degree forms
\define@boolkey+{uvt}{fdegree}[true]{%
@@ -153,11 +158,37 @@
}{%
\ClassWarning{univie-ling-thesis}{unknown fdegree value}%
}
-\DeclareOptionX{fdegree}{\setkeys{uvt}{fdegree=#1}}
+\DeclareOptionX{fdegree}[true]{\setkeys{uvt}{fdegree=#1}}
+
+% polyglossia=<true|false>
+% Load polyglossia
+\define@boolkey+{uvt}{polyglossia}[true]{%
+ \ifKV@uvt@polyglossia
+ \polyglossiatrue
+ \psfontsfalse
+ \otffontstrue
+ \nofontsfalse
+ \else
+ \polyglossiafalse
+ \fi
+}{%
+ \ClassWarning{univie-ling-thesis}{unknown polyglossia value}%
+}
+\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}}
+
+% pdfa=<true|false>
+% PDF/A
+\define@boolkey+{uvt}{pdfa}[true]{%
+ \ifKV@uvt@pdfa
+ \pdfatrue
+ \else
+ \pdfafalse
+ \fi
+}{%
+ \ClassWarning{univie-ling-thesis}{unknown pdfa value}%
+}
+\DeclareOptionX{pdfa}[true]{\setkeys{uvt}{pdfa=#1}}
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
% fonts=<ps|otf|none>
\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
\ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
@@ -174,7 +205,7 @@
\nofontstrue
\fi
}{%
- \PackageWarning{jsdossier}{unknown fonts value '#1'}%
+ \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}%
}
\DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}}
@@ -213,7 +244,6 @@
\ifpsfonts
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
% Palatino
\usepackage[osf]{mathpazo}
@@ -622,6 +652,27 @@
]{caption}
\fi
+
+%% =============================================================
+%% PDF-A:
+%% =============================================================
+
+\ifpdfa
+ \RequirePackage[a-1b]{pdfx}
+ \hypersetup{pdfborder={0 0 0}}
+\fi
+
+%% =============================================================
+%% POLYGLOSSIA:
+%% =============================================================
+
+\ifpolyglossia
+ \ifcaptionp
+ \RequirePackage{ragged2e}
+ \fi
+ \RequirePackage{polyglossia}
+\fi
+
%% =============================================================
%% BIBLIOGRAPHY:
%% =============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index f24a6c12bf..1e74546d3c 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2019/01/21 v1.9 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2020/05/05 v1.11 WLG journal layout (JSp)]
%% ============================================================
@@ -212,8 +212,12 @@
All issues as of 72 (2005) are available online.}
\deftranslation[to=German]{applied}{Angewandte Sprachwissenschaft}
\deftranslation[to=English]{applied}{Applied Linguistics}
-\deftranslation[to=German]{genhist}{Allgemeine und Historische Sprachwissenschaft}
+\deftranslation[to=German]{genhist}{Allgemeine Sprachwissenschaft}
+\deftranslation[to=German]{general}{Allgemeine Sprachwissenschaft}
+\deftranslation[to=German]{hist}{Historische Sprachwissenschaft}
\deftranslation[to=English]{genhist}{General and Historical Linguistics}
+\deftranslation[to=English]{general}{General Linguistics}
+\deftranslation[to=English]{hist}{Historical Linguistics}
\deftranslation[to=German]{license}{Dieses Werk unterliegt der Creative-Commons-Lizenz \doclicenseNameRef\\
(Namensnennung -- Nicht kommerziell -- Keine Bearbeitungen)}
\deftranslation[to=English]{license}{This work is published under a Creative Commons \doclicenseNameRef\ license\\
@@ -249,9 +253,9 @@
\setlength\parsep{0pt}
\setlength{\parskip}{0pt}
\item[\textbf{\translate{edboard}:}]
- Christian Bendl,
- Mi-Cha Flubacher (\translate{applied}),\\
- Stefan Schumacher (\translate{genhist})
+ Markus P\"ochtrager (\translate{general}),\\
+ Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner (\translate{applied}),\\
+ Stefan Schumacher (\translate{hist})
%\item[\textbf{\translate{techboard}:}] Markus Rheindorf
\item[\textbf{\translate{contact}:}] \href{mailto:wlg@univie.ac.at}{wlg@univie.ac.at}
\item[\textbf{Homepage:}] \expandafter\url{\wlgurl}