From 692575a36c0469a733dc7a6f68e945db811fb0c6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 1 Sep 2021 03:02:13 +0000 Subject: CTAN sync 202109010302 --- .../biblatex-contrib/biblatex-ext/CHANGES.md | 10 + .../biblatex-ext/biblatex-ext-oa-doiapi.sty | 2 +- .../biblatex-ext/biblatex-ext-oa.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-l3draw.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-pict2e.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-tikz.sty | 2 +- .../biblatex-ext/biblatex-ext-tabular.sty | 2 +- .../biblatex-contrib/biblatex-ext/biblatex-ext.pdf | Bin 835302 -> 834577 bytes .../biblatex-contrib/biblatex-ext/biblatex-ext.tex | 10 +- .../biblatex-contrib/biblatex-ext/blxextdoiapi.lua | 4 +- .../biblatex-ext/ext-alphabetic-verb.bbx | 2 +- .../biblatex-ext/ext-alphabetic-verb.cbx | 2 +- .../biblatex-ext/ext-alphabetic.bbx | 2 +- .../biblatex-ext/ext-alphabetic.cbx | 2 +- .../biblatex-ext/ext-authortitle-common.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.cbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.bbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.cbx | 4 +- .../biblatex-ext/ext-authortitle-icomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-terse.bbx | 2 +- .../biblatex-ext/ext-authortitle-terse.cbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.cbx | 2 +- .../biblatex-ext/ext-authortitle.bbx | 2 +- .../biblatex-ext/ext-authortitle.cbx | 4 +- .../biblatex-ext/ext-authoryear-common.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.bbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.cbx | 4 +- .../biblatex-ext/ext-authoryear-icomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-terse.bbx | 2 +- .../biblatex-ext/ext-authoryear-terse.cbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear.bbx | 2 +- .../biblatex-ext/ext-authoryear.cbx | 7 +- .../biblatex-ext/ext-biblatex-aux.def | 11 +- .../biblatex-ext/ext-dashed-common.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.cbx | 2 +- .../biblatex-ext/ext-numeric-verb.bbx | 2 +- .../biblatex-ext/ext-numeric-verb.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-standard.bbx | 6 +- .../biblatex-ext/ext-verbose-common.cbx | 2 +- .../biblatex-ext/ext-verbose-ibid.bbx | 2 +- .../biblatex-ext/ext-verbose-ibid.cbx | 2 +- .../biblatex-ext/ext-verbose-inote.bbx | 2 +- .../biblatex-ext/ext-verbose-inote.cbx | 2 +- .../biblatex-ext/ext-verbose-note-common.cbx | 2 +- .../biblatex-ext/ext-verbose-note.bbx | 2 +- .../biblatex-ext/ext-verbose-note.cbx | 2 +- .../biblatex-ext/ext-verbose-trad1.bbx | 2 +- .../biblatex-ext/ext-verbose-trad1.cbx | 2 +- .../biblatex-ext/ext-verbose-trad2.bbx | 2 +- .../biblatex-ext/ext-verbose-trad2.cbx | 2 +- .../biblatex-ext/ext-verbose-trad3.bbx | 2 +- .../biblatex-ext/ext-verbose-trad3.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.cbx | 2 +- macros/latex/contrib/easybook/easybook.dtx | 24 +- macros/latex/contrib/easybook/easybook.pdf | Bin 590675 -> 590672 bytes macros/latex/contrib/easybook/easybook.tex | 4 +- .../contrib/profcollege/doc/ProfCollege-doc.pdf | Bin 3380542 -> 3604456 bytes .../contrib/profcollege/latex/ProfCollege.sty | 736 +++++++++++++++++---- macros/latex/contrib/xmpincl/xmpincl.dtx | 8 +- 83 files changed, 728 insertions(+), 238 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md index f869b92791..4eddff4931 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md @@ -1,5 +1,15 @@ # Changelog +## Version 0.14 (2021-08-31) + +See + +### Fixed +- Use `language` bibmacro in `@dataset` driver instead of bare + `\printlist{language}`. +- Fixed inner cite delims for `\bbx@xrefcite` + . + ## Version 0.13 (2021-06-08) See 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 47710a0dd7..8822d6e000 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} - [2021/06/08 v0.13 Obtain open access information from DOI via + [2021/08/31 v0.14 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 a38bbb7031..b64fec05dd 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} - [2021/06/08 v0.13 mark open access in biblatex bibliographies (MW)] + [2021/08/31 v0.14 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 5e79a0c4b3..bdafcd02a9 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} - {2021/06/08} {0.13} + {2021/08/31} {0.14} {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 dd7fd379d9..95697fb624 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} - [2021/06/08 v0.13 open access symbols with pict2e (MW)] + [2021/08/31 v0.14 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 8e91d82ed4..22ea6648b0 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} - [2021/06/08 v0.13 open access symbols with TikZ (MW)] + [2021/08/31 v0.14 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 3ced33d766..7e8a039af8 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} - [2021/06/08 v0.13 tabular bibliographies for biblatex (MW)] + [2021/08/31 v0.14 tabular bibliographies for biblatex (MW)] % Code based on Audrey's % (https://tex.stackexchange.com/users/4483/audrey) 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 0557c4d30c..075c68cfcf 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf 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 bc425aebd3..28969eb88c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex @@ -586,7 +586,7 @@ \newcommand*{\ctan}{\mkbibacro{CTAN}} \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext} -\newcommand*{\extblxversion}{0.13} +\newcommand*{\extblxversion}{0.14} \newcommand*{\biber}{Biber} \newcommand*{\gitissuelink}[1]{% \href{\gitbaseurl/issues/#1}{issue \##1 on github}} @@ -659,7 +659,7 @@ author = {Moritz Wemheuer}, email = {mwemheu@posteo.de},% revision = {\extblxversion}, - date = {\DTMDate{2021-06-08}}, + date = {\DTMDate{2021-08-31}}, } \hypersetup{% @@ -3937,6 +3937,12 @@ See also \filename{CHANGES.md}. The numbers on the right indicate the relevant section of the manual. \begin{changelog} +\begin{release}{0.14}{2021-08-31} + \item Use \hyperbibmacro{language} bibmacro also in + \bibtype{dataset} driver\see{sec:opt:bibmacros} + \item Fixed inner cite delims for \hyperopt{citexref}/% + \cmd{bbx@xrefcite}\see{sec:opt:gen} +\end{release} \begin{release}{0.13}{2021-06-08} \item Fixed title formatting with related entries in \blxstyle{authoryear} style family diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua index 4218deef6a..b3a891a0a7 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.13", - date = "2021/06/08", + version = "v0.14", + date = "2021/08/31", 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 91f9925778..3dee92a2bc 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} - [2021/06/08 v0.13 extended biblatex alphabetic-verb + [2021/08/31 v0.14 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 f77d84ea48..a46d86834c 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} - [2021/06/08 v0.13 extended biblatex alphabetic-verb citation style + [2021/08/31 v0.14 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 0cfdeedfd3..c84dde210c 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} - [2021/06/08 v0.13 extended biblatex alphabetic bibliography style (MW)] + [2021/08/31 v0.14 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 cd78c92994..3f9883a07f 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} - [2021/06/08 v0.13 extended biblatex alphabetic citation style (MW)] + [2021/08/31 v0.14 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 c4ce93a0ac..f22e131fd0 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} - [2021/06/08 v0.13 common files for extended biblatex + [2021/08/31 v0.14 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 7f8b5d1cfd..0d5bc47f50 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} - [2021/06/08 v0.13 extended biblatex authortitle-comp + [2021/08/31 v0.14 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 a8dda2f73b..4a5919e24c 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} - [2021/06/08 v0.13 extended biblatex authortitle-comp + [2021/08/31 v0.14 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 f1c414d68e..771435d2e0 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} - [2021/06/08 v0.13 extended biblatex authortitle-ibid + [2021/08/31 v0.14 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 f8fd669adf..4e5c905f68 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} - [2021/06/08 v0.13 extended biblatex authortitle-ibid + [2021/08/31 v0.14 extended biblatex authortitle-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -24,6 +24,8 @@ \DeclareFieldAlias {extblx@innerfootcitetextdelims} {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} \renewbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% 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 35628c3a94..d63019e0cf 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} - [2021/06/08 v0.13 extended biblatex authortitle-icomp + [2021/08/31 v0.14 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 970d14a937..17fffafea9 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} - [2021/06/08 v0.13 extended biblatex authortitle-icomp + [2021/08/31 v0.14 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 19239c314f..f189f64116 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} - [2021/06/08 v0.13 extended biblatex authortitle-tcomp + [2021/08/31 v0.14 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 94f0d3ff69..1ca2289999 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} - [2021/06/08 v0.13 extended biblatex authortitle-tcomp + [2021/08/31 v0.14 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 bb11205615..c16a6193f5 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} - [2021/06/08 v0.13 extended biblatex authortitle-terse + [2021/08/31 v0.14 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 daf2d35cb4..872872860f 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} - [2021/06/08 v0.13 extended biblatex authortitle-terse + [2021/08/31 v0.14 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 5c52351f76..d04a19a073 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} - [2021/06/08 v0.13 extended biblatex authortitle-ticomp + [2021/08/31 v0.14 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 adc6e7fddb..ae4a378612 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} - [2021/06/08 v0.13 extended biblatex authortitle-ticomp citation style + [2021/08/31 v0.14 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 df694cddfa..184c389fac 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} - [2021/06/08 v0.13 extended biblatex authortitle + [2021/08/31 v0.14 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 41b1f0e4aa..efdd18d612 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} - [2021/06/08 v0.13 extended biblatex authortitle citation style (MW)] + [2021/08/31 v0.14 extended biblatex authortitle citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -23,6 +23,8 @@ \DeclareFieldAlias {extblx@innerfootcitetextdelims} {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} \renewbibmacro*{textcite}{% \printnames{labelname}% 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 cdd9e8602e..208b02428d 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} - [2021/06/08 v0.13 common files for extended biblatex + [2021/08/31 v0.14 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 7b8ff065cf..6774ecba64 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} - [2021/06/08 v0.13 extended biblatex authoryear-comp + [2021/08/31 v0.14 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 9f621acde8..5185971fef 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} - [2021/06/08 v0.13 extended biblatex authoryear-comp + [2021/08/31 v0.14 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 ecbb2a2035..e3ff65386c 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} - [2021/06/08 v0.13 biblatex authoryear-ecomp + [2021/08/31 v0.14 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 f764d0c763..638c13e51e 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} - [2021/06/08 v0.13 biblatex authoryear-ecomp + [2021/08/31 v0.14 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 35371ee6ce..d67ec295ac 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} - [2021/06/08 v0.13 extended biblatex authoryear-ibid + [2021/08/31 v0.14 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 8e83a69ce7..729dfa5f45 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} - [2021/06/08 v0.13 extended biblatex authoryear-ibid + [2021/08/31 v0.14 extended biblatex authoryear-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -21,6 +21,8 @@ \DeclareFieldAlias {extblx@innerfootcitetextdelims} {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} \DeclareFieldFormat{citelabeldate}{#1} \DeclareFieldFormat{parencitelabeldate}{#1} 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 55cc87fbff..b851ee725f 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} - [2021/06/08 v0.13 extended biblatex authoryear-icomp + [2021/08/31 v0.14 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 3dcd322c20..e98cc96707 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} - [2021/06/08 v0.13 extended biblatex authoryear-icomp + [2021/08/31 v0.14 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 7e52c85f5e..c0dc7e484c 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} - [2021/06/08 v0.13 biblatex authoryear-iecomp + [2021/08/31 v0.14 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 541305d258..29c6a17919 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} - [2021/06/08 v0.13 biblatex authoryear-iecomp + [2021/08/31 v0.14 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 bf1ce45681..e8eb31a122 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} - [2021/06/08 v0.13 extended biblatex authoryear-tcomp + [2021/08/31 v0.14 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 875fba04a4..acdc3aaaca 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} - [2021/06/08 v0.13 extended biblatex authoryear-tcomp + [2021/08/31 v0.14 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 46ee8ab8ed..9bdb017bba 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} - [2021/06/08 v0.13 extended biblatex authoryear-tecomp + [2021/08/31 v0.14 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 63b017d056..233e05bff3 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} - [2021/06/08 v0.13 extended biblatex authoryear-tecomp + [2021/08/31 v0.14 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 e3cfa20125..4a315a300c 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} - [2021/06/08 v0.13 extended biblatex authoryear-terse + [2021/08/31 v0.14 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 ba4fd61a66..f2e332625c 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} - [2021/06/08 v0.13 extended biblatex authoryear-terse + [2021/08/31 v0.14 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 59c4f07fef..df3d4f9013 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} - [2021/06/08 v0.13 extended biblatex authoryear-ticomp + [2021/08/31 v0.14 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 44266a8d9a..4049a09357 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} - [2021/06/08 v0.13 extended biblatex authoryear-ticomp citation style + [2021/08/31 v0.14 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 934611ea30..11617e4fc3 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} - [2021/06/08 v0.13 extended biblatex authoryear-tiecomp + [2021/08/31 v0.14 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 f8346f9d24..f53e1771a1 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} - [2021/06/08 v0.13 extended biblatex authoryear-tiecomp citation style + [2021/08/31 v0.14 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 d32cce8a2b..04eafe29cb 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} - [2021/06/08 v0.13 extended biblatex authoryear bibliography style (MW)] + [2021/08/31 v0.14 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 303292ec60..7bee70bb26 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} - [2021/06/08 v0.13 extended biblatex authoryear citation style (MW)] + [2021/08/31 v0.14 extended biblatex authoryear citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -10,6 +10,7 @@ \DeclareInnerCiteDelims{textcite}{\bibopenparen}{\bibcloseparen} + \DeclareFieldFormat{extblx@innercitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} \DeclareFieldFormat{extblx@innerparencitedelims}{% @@ -17,11 +18,11 @@ \DeclareFieldFormat{extblx@innertextcitedelims}{#1} \DeclareFieldFormat{extblx@innerfootcitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} -\DeclareFieldFormat{extblx@innerfootcitetextdelims}{% - \csuse{mkinner\blx@delimcontext delims}{#1}} \DeclareFieldAlias {extblx@innerfootcitetextdelims} {extblx@innerfootcitedelims} +\DeclareFieldFormat{extblx@innerbbx@xrefcitedelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} \DeclareFieldFormat{citelabeldate}{#1} \DeclareFieldFormat{parencitelabeldate}{#1} 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 aff330e29c..5faf08e154 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} - [2021/06/08 v0.13 auxiliaries for extended biblatex citation style + [2021/08/31 v0.14 auxiliaries for extended biblatex citation style (MW)] \def\extblx@requiredbiblatexversion{3.16} @@ -143,11 +143,12 @@ \def\extblx@deprecate@delimcommand@robust#1#2{% \protected\csedef{#1}{% \noexpand\extblx@warning{% - \expandafter\string\csname#1\endcsname\space is deprecated. + \expandafter\string\csname#1\endcsname\space is deprecated.% \MessageBreak - Use \expandafter\string\csname#2\endcsname\space (with s) instead. - \MessageBreak - Using \expandafter\string\csname#2\endcsname}% + Use \expandafter\string\csname#2\endcsname\MessageBreak + (with s in 'Delims') instead.\MessageBreak + Using\MessageBreak + \expandafter\string\csname#2\endcsname\MessageBreak}% \expandonce{\csname#2\endcsname}}} \extblx@deprecate@delimcommand@robust{DeclareOuterCiteDelim} 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 abda2f4fee..7103a96f3f 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} - [2021/06/08 v0.13 common files for extended biblatex + [2021/08/31 v0.14 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 88928c4300..5fd583c082 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} - [2021/06/08 v0.13 extended biblatex numeric-comp + [2021/08/31 v0.14 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 5ac8ea0f28..99c666662e 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} - [2021/06/08 v0.13 extended biblatex numeric-comp citation style (MW)] + [2021/08/31 v0.14 extended biblatex numeric-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-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx index 3dde2b96f4..18c4e607e0 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} - [2021/06/08 v0.13 extended biblatex numeric-verb + [2021/08/31 v0.14 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 c25d71d2a1..69450a8636 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} - [2021/06/08 v0.13 extended biblatex numeric-verb citation style (MW)] + [2021/08/31 v0.14 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 cdedfb81b1..6771ab4945 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} - [2021/06/08 v0.13 extended biblatex numeric bibliography style (MW)] + [2021/08/31 v0.14 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 a5efe54826..17770dd4d8 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} - [2021/06/08 v0.13 extended biblatex numeric citation style (MW)] + [2021/08/31 v0.14 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 e9e9526fd1..1c36a02519 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.13 (2021-06-08) +% biblatex-ext v0.14 (2021-08-31) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2021/06/08 v0.13 extended biblatex standard style (MW)] + [2021/08/31 v0.14 extended biblatex standard style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -554,7 +554,7 @@ \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% \newunit - \printlist{language}% + \usebibmacro{language}% \newunit\newblock \usebibmacro{byauthor}% \newunit\newblock diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx index 85dd5c3596..d89cbcb911 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-common.cbx} - [2021/06/08 v0.13 extended biblatex verbose citation style (MW)] + [2021/08/31 v0.14 extended biblatex verbose 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-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx index 9e0f28c783..5f0239676d 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} - [2021/06/08 v0.13 extended biblatex verbose-ibid + [2021/08/31 v0.14 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 f62bb975a3..484cf74968 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} - [2021/06/08 v0.13 extended biblatex verbose-ibid citation style (MW)] + [2021/08/31 v0.14 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 1fc9165ffd..392694a91f 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} - [2021/06/08 v0.13 extended biblatex verbose-inote + [2021/08/31 v0.14 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 6cddc781ee..f4c0f214df 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} - [2021/06/08 v0.13 extended biblatex verbose-inote citation style (MW)] + [2021/08/31 v0.14 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-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx index ee47d58cbc..4e17e1e711 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note-common.cbx} - [2021/06/08 v0.13 extended biblatex verbose citation style (MW)] + [2021/08/31 v0.14 extended biblatex verbose 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 43cefe940d..71c7205583 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} - [2021/06/08 v0.13 extended biblatex verbose-note + [2021/08/31 v0.14 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 485b8fd274..65941b148f 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} - [2021/06/08 v0.13 extended biblatex verbose-note citation style (MW)] + [2021/08/31 v0.14 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 21541c5543..906cf86f05 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} - [2021/06/08 v0.13 extended biblatex verbose-trad1 + [2021/08/31 v0.14 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 00e63a39ca..988cda81fc 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} - [2021/06/08 v0.13 extended biblatex verbose-trad1 citation style (MW)] + [2021/08/31 v0.14 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 993e5c4d07..24c2361c8a 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} - [2021/06/08 v0.13 extended biblatex verbose-trad2 + [2021/08/31 v0.14 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 2db10acc3c..418e92ef9f 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} - [2021/06/08 v0.13 extended biblatex verbose-trad2 citation style (MW)] + [2021/08/31 v0.14 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 a29268a06b..9062b843e4 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} - [2021/06/08 v0.13 extended biblatex verbose-trad3 + [2021/08/31 v0.14 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 0bdbd02ec5..c75f0f8ed0 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} - [2021/06/08 v0.13 extended biblatex verbose-trad3 citation style (MW)] + [2021/08/31 v0.14 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 9ffb44df4c..7d56e01b6e 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} - [2021/06/08 v0.13 extended biblatex verbose + [2021/08/31 v0.14 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 24343f7466..4bdd0bd8df 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} - [2021/06/08 v0.13 extended biblatex verbose citation style (MW)] + [2021/08/31 v0.14 extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 7c5e902059..3c11935729 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/26}{1.29e} +\ProvidesExplClass{easybook}{2021/08/31}{1.29h} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/26}{1.29e} +\ProvidesExplPackage{easybase}{2021/08/31}{1.29h} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -1307,8 +1307,8 @@ { \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } } } -\prop_new:N \l__eb_label_name_prop -\prop_set_from_keyval:Nn \l__eb_label_name_prop +\prop_new:N \l__eb_list_label_name_prop +\prop_set_from_keyval:Nn \l__eb_list_label_name_prop { figure = \eb@labelname@lof, table = \eb@labelname@lot @@ -1318,7 +1318,7 @@ \addcontentsline{#1}{#2} { \ifbool{eb@titletoc@hang@fix}{\eb@numberline}{} - {\prop_item:Nn \l__eb_label_name_prop {#2}{#3}}#4 + {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4 } } \ctex_patch_cmd:Nnn \lst@MakeCaption @@ -1363,9 +1363,9 @@ \int_compare:nNnT { \c@chapter } > { 0 } { \use:c { the#1chapter }. } \int_to_arabic:v { c@#1section } } -\cs_set:Npn \thebichapter { \eb_arabic:n { bichapter } } +\cs_set:Npn \thebichapter { \@arabic\c@bichapter } \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } } -\cs_set:Npn \thebisubsection { \thebisection.\eb_arabic:n { bisubsection } } +\cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection } \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } } \contentsuse{}{tec} @@ -1936,10 +1936,16 @@ \bool_if:NT \l__eb_thmbox_bool { \@ifpackageloaded{tcolorbox} - {\tcolorboxenvironment{#1}{#4}}{} + {\tcolorboxenvironment{#1}{#4}} + {\msg_warning:nn { easybase } { need-tcolorbox }} } \labelformat{#1}{\tl_use:c { c__eb_name_#1_tl }~##1} } +\msg_new:nnn { easybase } { need-tcolorbox } + { + Now~that~the~thmbox~option~is~true. \\ + Please~load~the~tcolorbox~macro~package. + } \cs_set_eq:NN \EBNewTheorem \DeclareTheorem \prop_new:N \l__eb_thmtools_entry_prop \clist_const:Nn \c__eb_thmtools_entry_clist @@ -2394,7 +2400,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/26}{1.29e} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/31}{1.29h} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 117cc43f28..61676923f4 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 2c340d9b21..a7b3d93c2f 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -12,8 +12,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.29e, - date = 2021/08/26, + version = v1.29h, + date = 2021/08/31, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = quee123@foxmail.com, diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf index b411e0ee22..743db170d1 100644 Binary files a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf and b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf differ diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty index ab00d8a9b9..5fe1d04716 100644 --- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty +++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty @@ -3,7 +3,7 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfCollege}[2021/08/22 v0.99-f Aide pour l'utilisation de LaTeX au collège] +\ProvidesPackage{ProfCollege}[2021/09/01 v0.99-g Aide pour l'utilisation de LaTeX au collège] \RequirePackage{verbatim} @@ -99,6 +99,8 @@ \RequirePackage{stackengine} \RequirePackage[thicklines]{cancel} +\RequirePackage{fontawesome5}%Pour l'environnement Twitter + \RequirePackage{nicematrix}%pour le tableur \let\myoldmulticolumn\multicolumn @@ -155,6 +157,17 @@ \end{tikzpicture}% } +\newcommand\LogoTW[2]{% +\setbox1=\hbox{\includegraphics[scale=#2]{#1}} +\begin{tikzpicture}% + \clip (0,0) circle (4mm); + \draw (0,0) circle (4mm); + \node[xshift=0mm, yshift=0mm, inner xsep=0pt, inner ysep=0pt] (0,0) {% + \includegraphics[scale=#2]{#1}% + };% +\end{tikzpicture}% +}% + \makeatletter \def\Dotfill{% \leavevmode @@ -505,6 +518,166 @@ }%\raisebox } +%%% +% Twitter +%%% +\setKVdefault[Twitter]{Largeur=0.95\linewidth,Auteur=Christophe,Date=\today,Url=ViveLaTeX,EchelleLogo=0.035,Logo=DrStrange,Publie=false} + +\NewEnviron{Twitter}[1][]{% + \useKVdefault[Twitter]% + \setKV[Twitter]{#1}% + \xdef\EchelleLogo{\useKV[Twitter]{EchelleLogo}}% + \begin{tcolorbox}[% + enhanced,% + overlay unbroken and first={% + \node[anchor=west,xshift=3em,yshift=-2em] at (frame.north west) {\textbf{\useKV[Twitter]{Auteur}}~{\color{gray}@\ttfamily \useKV[Twitter]{Url} - \useKV[Twitter]{Date}}}; + \node[anchor=center,xshift=1em+2mm,yshift=-2em] at (frame.north west) {\LogoTW{\useKV[Twitter]{Logo}}{\EchelleLogo}}; + \node[xshift=-1em,yshift=-2em] at (frame.north east) {\color{gray}...}; + \coordinate[yshift=1em] (A) at (frame.south west); + \coordinate[yshift=1em] (B) at (frame.south east); + \node[] (C1) at ($(A)!0.1!(B)$) {\faComment[regular]\ifboolKV[Twitter]{Publie}{~\fpeval{randint(1,10)}}{}}; + \node[] (C2) at ($(A)!0.325!(B)$) {\faRetweet\ifboolKV[Twitter]{Publie}{~\fpeval{randint(1,10)}}{}}; + \node[] (C3) at ($(A)!0.55!(B)$) {\faHeart[regular]\ifboolKV[Twitter]{Publie}{~\fpeval{randint(1,10)}}{}}; + \node[] (C4) at ($(A)!0.775!(B)$) {\faShareSquare}; + }, + colback=white, + colframe=gray!15, + top=2em, + left=3em, + bottom=2em] + \vspace*{0.5em}\par + \BODY% + \end{tcolorbox} +} + +%%% +% Facebook +%%% +\setKVdefault[Facebook]{Largeur=0.95\linewidth,Auteur=Christophe,Date=\today,Heure=3:14,EchelleLogo=0.035,Logo=DrStrange,Publie=false} + +\NewEnviron{Facebook}[1][]{% + \useKVdefault[Facebook]% + \setKV[Facebook]{#1}% + \xdef\EchelleLogo{\useKV[Facebook]{EchelleLogo}}% + \begin{tcolorbox}[% + enhanced,% + overlay unbroken and first={% + \node[anchor=west,xshift=3em,yshift=-1em] at (frame.north west) {\textbf{\useKV[Facebook]{Auteur}}}; + \node[anchor=west,xshift=3em,yshift=-2em] at (frame.north west) {\scriptsize\color{gray}\useKV[Facebook]{Date}, \useKV[Facebook]{Heure}}; + \node[anchor=center,xshift=1em+2mm,yshift=-1.5em] at (frame.north west) {\LogoTW{\useKV[Facebook]{Logo}}{\EchelleLogo}}; + \node[xshift=-1em,yshift=-1.5em] at (frame.north east) {\bfseries\color{gray}...}; + \coordinate[yshift=1.15em] (A) at (frame.south west); + \coordinate[yshift=1.15em] (B) at (frame.south east); + \coordinate[xshift=0.5em,yshift=1.8em] (A1) at (frame.south west); + \coordinate[xshift=-0.5em,yshift=1.8em] (B1) at (frame.south east); + \coordinate[xshift=0.5em,yshift=0.5em] (A2) at (frame.south west); + \coordinate[xshift=-0.5em,yshift=0.5em] (B2) at (frame.south east); + \ifboolKV[Facebook]{Publie}{% + \coordinate[xshift=1em,yshift=1em] (A3) at (A1); + \draw[blue,fill=blue] (A3) circle (1.5mm); + \node[] at (A3) {\tiny\color{white}\faThumbsUp}; + \node[anchor=west] at (A3) {~\scriptsize\fpeval{randint(1,150)}}; + \node[anchor=east,xshift=-1em,yshift=1em] at (B1) {\scriptsize\fpeval{randint(2,20)} commentaires~\fpeval{randint(2,10)} partages}; + }{} + \draw[gray] (A1)--(B1); + \draw[gray] (A2)--(B2); + \node[] (C1) at ($(A)!0.15!(B)$) {\footnotesize\faThumbsUp{}~\bfseries J'aime}; + \node[] (C2) at ($(A)!0.5!(B)$) {\footnotesize\faComment*[regular]~\bfseries Commenter}; \node[] (C3) at ($(A)!0.85!(B)$) {\footnotesize\faShareSquare~\bfseries Partager}; + }, + colback=white, + colframe=gray!15, + top=2em, + left=3em, + bottom=4em] + %\vspace*{0.5em}\par + \BODY% + \end{tcolorbox} +} + +%%% +% Instagram +%%% +\setKVdefault[Instagram]{Largeur=0.95\linewidth,Auteur=Christophe,Expediteur=Pierre,Date=\today,Temps=34,Publie=false,Logo=DrStrange,LogoEx=tiger,EchelleLogo=0.035,Texte={}} + +\NewEnviron{Instagram}[1][]{% + \useKVdefault[Instagram]% + \setKV[Instagram]{#1}% + \xdef\EchelleLogo{\useKV[Instagram]{EchelleLogo}}% + \begin{tcolorbox}[% + enhanced,% + underlay unbroken and first={% + \node[anchor=west,xshift=3em,yshift=-1.5em] at (frame.north west) {\textbf{\useKV[Instagram]{Expediteur}}}; + \node[anchor=center,xshift=1em+2mm,yshift=-1.5em] at (frame.north west) {\LogoTW{\useKV[Instagram]{LogoEx}}{\EchelleLogo}}; + \node[xshift=-1em,yshift=-1.5em,rotate=90] at (frame.north east) {\bfseries\color{gray}...}; + \coordinate[yshift=-3em] (HA) at (frame.north west); + \coordinate[yshift=-3em] (HB) at (frame.north east); + \draw[gray!15] (HA)--(HB); + \coordinate[yshift=7em] (BA) at (frame.south west); + \coordinate[yshift=7em] (BB) at (frame.south east); + \draw[gray!15] (BA)--(BB); + \coordinate[xshift=1em,yshift=6em] (A) at (frame.south west); + \node[anchor=west] at (A) {\bfseries\faHeart[regular]\quad\faComment[regular]\quad\faPaperPlane}; + \coordinate[xshift=-1em,yshift=6em] (A1) at (frame.south east); + \node[anchor=east] at (A1) {\bfseries\faBookmark[regular]}; + \coordinate[xshift=1em,yshift=5em] (B) at (frame.south west); + \node[anchor=west] at (B) {\footnotesize\bfseries\fpeval{randint(10,30)} J'aime}; + \coordinate[xshift=1em,yshift=4em] (C) at (frame.south west); + \node[anchor=west] at (C) {\textbf{\useKV[Instagram]{Expediteur}}~\useKV[Instagram]{Texte}}; + \node[anchor=center,xshift=2em,yshift=2.25em] at (frame.south west) {\LogoTW{\useKV[Instagram]{Logo}}{\EchelleLogo}}; + \node[anchor=west,xshift=4em,yshift=2.25em] at (frame.south west) {\textcolor{gray!50}{Ajouter un commentaire\dots}}; + \node[anchor=east,xshift=-1em,yshift=2.25em] at (frame.south east) {\textcolor{red}{\faHeart}\quad\textcolor{Gold}{\faHandSpock}\quad\textcolor{gray!50}{\faPlusCircle}}; + \node[anchor=west,xshift=1em,yshift=0.5em] at (frame.south west) {\scriptsize\color{gray} Il y a \useKV[Instagram]{Temps} secondes}; + }, + colback=white, + colframe=gray!15, + top=3em, + left=3em, + bottom=7em] + \BODY% + \end{tcolorbox} +} + +%%% +% Snapchat +%%% +\setKVdefault[Snapchat]{Largeur=0.95\linewidth,Auteur=Christophe,Date=\today,Temps=34,Logo=DrStrange,EchelleLogo=0.035,Texte=Envoyer un Chat} + +\NewEnviron{Snapchat}[1][]{% + \useKVdefault[Snapchat]% + \setKV[Snapchat]{#1}% + \xdef\EchelleLogo{\useKV[Snapchat]{EchelleLogo}}% + \begin{tcolorbox}[% + enhanced,% + underlay unbroken and first={% + \node[anchor=west,xshift=3em,yshift=-1em] at (frame.north west) {\textbf{\useKV[Snapchat]{Auteur}}}; + \node[anchor=west,xshift=3em,yshift=-2em] at (frame.north west) {\scriptsize\color{gray} il y a \useKV[Snapchat]{Temps}~min}; + \node[anchor=center,xshift=1em+2mm,yshift=-1.5em] at (frame.north west) {\LogoTW{\useKV[Snapchat]{Logo}}{\EchelleLogo}}; + \node[xshift=-1em,yshift=-1.5em,rotate=90] at (frame.north east) {\bfseries...}; + \node[xshift=-3em,yshift=-1.5em] at (frame.north east) {\faBell[regular]}; + \coordinate[xshift=2em,yshift=2em] (P1) at (frame.south west); + \coordinate[xshift=4.5em,yshift=2em] (P2) at (frame.south west); + \coordinate[xshift=-3em,yshift=2em] (P4) at (frame.south west); + \coordinate[xshift=-2em,yshift=2em] (P3) at (frame.south east); + \coordinate[xshift=4.5em,yshift=1em] (P5) at (frame.south west); + \coordinate[xshift=4.5em,yshift=3em] (P8) at (frame.south west); + \coordinate[xshift=-4.5em,yshift=1em] (P6) at (frame.south east); + \coordinate[xshift=-4.5em,yshift=3em] (P7) at (frame.south east); + \draw (P1) circle (1em); + \node at (P1) {\faCamera}; + \draw (P3) circle (1em); + \node[xshift=-0.125em,rotate=-45] at (P3) {\faLocationArrow}; + \node[anchor=west,inner sep=0pt] at (P2) {\useKV[Snapchat]{Texte}}; + \draw (P5) -- (P6) arc(270:450:1em) -- (P7) -- (P8) arc(90:270:1em) -- cycle; + }, + colback=white, + colframe=gray!15, + top=3em, + left=3em, + bottom=3em] + \BODY% + \end{tcolorbox} +} + %%% % Bon de sortie %%% @@ -1188,6 +1361,151 @@ d\'efinitions de {\ttfamily Colonnes} et {\ttfamily Lignes} !}}% } +%%% +% Triominos +%%% +\setKVdefault[ClesTriomino]{Longueur=5cm,Etages=3,AffichagePiece=false} +\defKV[ClesTriomino]{Piece=\setKV[ClesTriomino]{AffichagePiece=true}}% + +\def\TraceTriomino#1{% + \ifluatex + \mplibforcehmode + \begin{mplibcode} + u:=\useKV[ClesTriomino]{Longueur}; + Rayon:=0.75*u*sqrt(3)/6; + Etages:=\useKV[ClesTriomino]{Etages}; + pair A,B,C,D,E,F; + A=(0,0); + B-A=Etages*u*(1,0); + C=rotation(B,A,60); + D=(1/Etages)[C,A]; + E=(1/Etages)[C,B]; + F=C; + trace polygone(A,B,C); + for k=1 upto Etages-1: + trace (k/Etages)[C,A]--(k/Etages)[C,B]; + trace (k/Etages)[A,C]--(k/Etages)[A,B]; + trace (k/Etages)[B,A]--(k/Etages)[B,C]; + endfor; + pair G[];color H[];%Couleur pour garder l'orientation des textes... + G[1]=iso(D,E,F); + H1=blue; + n=1; + for k=1 upto Etages-1: + for l=0 upto (2*k): + n:=n+1; + if (l mod 2=0): + G[n]=G[1] shifted(k*(D-F)+(l div 2)*(E-D)); + H[n]=blue; + else: + G[n]=symetrie(G[1],D,E) shifted((k-1)*(D-F)+(l div 2)*(E-D)); + H[n]=green; + fi; + endfor; + endfor; + % affichage des textes + nba=0; + for p_=#1: + if (nba mod 3)=1: + if H[(nba div 3)+1]=blue: + label(TEX(p_) rotated 120,pointarc(cercles(G[(nba div 3)+1],Rayon),30)); + else: + label(TEX(p_) rotated 180,pointarc(cercles(G[(nba div 3)+1],Rayon),90)); + fi; + elseif (nba mod 3)=2: + if H[(nba div 3)+1]=blue: + label(TEX(p_),pointarc(cercles(G[(nba div 3)+1],Rayon),270)); + else: + label(TEX(p_) rotated 60,pointarc(cercles(G[(nba div 3)+1],Rayon),330)); + fi; + else: + if H[(nba div 3)+1]=blue: + label(TEX(p_) rotated 240,pointarc(cercles(G[(nba div 3)+1],Rayon),150)); + else: + label(TEX(p_) rotated 300,pointarc(cercles(G[(nba div 3)+1],Rayon),210)); + fi; + fi; + nba:=nba+1; + endfor; + \end{mplibcode} + \else + \begin{mpost}[mpsettings={u:=\useKV[ClesTriomino]{Longueur}; Etages:=\useKV[ClesTriomino]{Etages};}] + Rayon:=0.75*u*sqrt(3)/6; + pair A,B,C,D,E,F; + A=(0,0); + B-A=Etages*u*(1,0); + C=rotation(B,A,60); + D=(1/Etages)[C,A]; + E=(1/Etages)[C,B]; + F=C; + trace polygone(A,B,C); + for k=1 upto Etages-1: + trace (k/Etages)[C,A]--(k/Etages)[C,B]; + trace (k/Etages)[A,C]--(k/Etages)[A,B]; + trace (k/Etages)[B,A]--(k/Etages)[B,C]; + endfor; + pair G[];color H[];%Couleur pour garder l'orientation des textes... + G[1]=iso(D,E,F); + H1=blue; + n=1; + for k=1 upto Etages-1: + for l=0 upto (2*k): + n:=n+1; + if (l mod 2=0): + G[n]=G[1] shifted(k*(D-F)+(l div 2)*(E-D)); + H[n]=blue; + else: + G[n]=symetrie(G[1],D,E) shifted((k-1)*(D-F)+(l div 2)*(E-D)); + H[n]=green; + fi; + endfor; + endfor; + % affichage des textes + nba=0; + for p_=#1: + if (nba mod 3)=1: + if H[(nba div 3)+1]=blue: + label(LATEX(p_) rotated 120,pointarc(cercles(G[(nba div 3)+1],Rayon),30)); + else: + label(LATEX(p_) rotated 180,pointarc(cercles(G[(nba div 3)+1],Rayon),90)); + fi; + elseif (nba mod 3)=2: + if H[(nba div 3)+1]=blue: + label(LATEX(p_),pointarc(cercles(G[(nba div 3)+1],Rayon),270)); + else: + label(LATEX(p_) rotated 60,pointarc(cercles(G[(nba div 3)+1],Rayon),330)); + fi; + else: + if H[(nba div 3)+1]=blue: + label(LATEX(p_) rotated 240,pointarc(cercles(G[(nba div 3)+1],Rayon),150)); + else: + label(LATEX(p_) rotated 300,pointarc(cercles(G[(nba div 3)+1],Rayon),210)); + fi; + fi; + nba:=nba+1; + endfor; + \end{mpost} + \fi +} + +\newtoks\toklisteTriomino% +\def\UpdatetoksTriomino#1\nil{\addtotok\toklisteTriomino{"#1",}}% + +\newcommand\Triomino[2][]{% + \useKVdefault[ClesTriomino]% + \setKV[ClesTriomino]{#1}% + \setsepchar{§}%\ignoreemptyitems% + \readlist*\ListeTriominos{#2}% + \toklisteTriomino{} + \ifboolKV[ClesTriomino]{AffichagePiece}{% + \setKV[ClesTriomino]{Etages=1}% + \TraceTriomino{"\ListeTriominos[\fpeval{3*\useKV[ClesTriomino]{Piece}-2}]","\ListeTriominos[\fpeval{3*\useKV[ClesTriomino]{Piece}-1}]","\ListeTriominos[\fpeval{3*\useKV[ClesTriomino]{Piece}}]"}% + }{% + \foreachitem\compteur\in\ListeTriominos{\expandafter\UpdatetoksTriomino\compteur\nil}% + \TraceTriomino{\the\toklisteTriomino}% + }% +}% + %%% % Labyrinthe Nombre %%% @@ -3041,6 +3359,76 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. }% }% +%%% +% Rapido +%%% +%% D'après https://www.facebook.com/groups/994675223903586/user/100017057226847 +%% et une programmation de Laurent Lassale-Carrere +\newcounter{nexo} +\newtcolorbox[use counter=nexo,number format=\arabic]{RapidoBox}{% + % Titre + colbacktitle=white, + fonttitle=\color{black}\Large\bfseries, + toptitle=1mm, + bottomtitle=1mm, + bottom=1mm, + title={Rapido n°\thetcbcounter\hfill Date :\hspace*{2.5cm}}, + %% Cadre principal + enhanced, + %nobeforeafter, + width=\WidthRapido, + colback=white, + valign=top, + drop lifted shadow%, + %grow to left by=5mm +} +\newtcolorbox{QuestionBox}{enhanced,nobeforeafter,size=small,sidebyside adapt=left} +\newtcolorbox{QuestionReponse}{enhanced,nobeforeafter,upperbox=invisible,colback=white,width=1.5cm,grow to left by=3mm,grow to right by=3mm,height=10mm} + +\setKVdefault[ClesRapido]{Debut=false,Largeur=0.9\linewidth}% +\defKV[ClesRapido]{Numero=\setKV[ClesRapido]{Debut=true}} + +\newlength{\WidthRapido} + +\newcommand\Rapido[2][]{% numéro +\useKVdefault[ClesRapido]% +\setKV[ClesRapido]{#1}% +% +\ifboolKV[ClesRapido]{Debut}{% + \setcounter{nexo}{\fpeval{\useKV[ClesRapido]{Numero}-1}} +}{}% +\setlength{\WidthRapido}{\useKV[ClesRapido]{Largeur}}% +% +\setsepchar[*]{§*/}% +\readlist*\ListeRapido{#2}% +\begin{RapidoBox} + \xintFor* ##1 in {\xintSeq {1}{\ListeRapidolen}}\do{% + \tcbsidebyside[ + sidebyside adapt=right, + bicolor, + colback=white,colbacklower=yellow!10!white, + nobeforeafter, + top=0mm,left=1mm, + grow to left by=3mm, + grow to right by=3mm, + bottom=0mm, + ]{% + \ListeRapido[##1,1] + }{% + \ListeRapido[##1,2] + } +} +\end{RapidoBox} +} + +\newcommand\BoiteRapido[1]{% + \ifx\bla#1\bla% + \tcbox[BoiteExpression]{\phantom{100000}}% + \else + \tcbox[BoiteExpression]{#1}% + \fi +} + %%% % Fractions %%% @@ -4454,7 +4842,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. %%% % Le th\'eor\`eme de Pythagore %%% -\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0,Perso=false} +\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0,Perso=false,AllPerso=false} % On d\'efinit les figures \`a utiliser \def\MPFigurePytha#1#2#3#4#5#6{% @@ -4635,9 +5023,13 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \fi } -\newcommand\RedactionPythagore{} +\newcommand\RedactionPythagore{}% +\newcommand\RedactionReciPythagore{}% +\newcommand\RedactionCalculsPythagore{}% +\newcommand\RedactionCalculsReciPythagore{}% +\newcommand\RedactionConclusionReciPythagore{}% -\newcommand{\Pythagore}[5][]{% +\newcommand\Pythagore[5][]{% % #1 Param\`etres sous forme de cl\'es % #2 Nom "complet" du triangle : ABC par exemple % #3 Premi\`ere longueur @@ -4650,10 +5042,14 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \StrMid{#2}{1}{1}[\NomA]% \StrMid{#2}{2}{2}[\NomB]% \StrMid{#2}{3}{3}[\NomC]% + \xdef\NomTriangle{\NomA\NomB\NomC}% % on stocke les valeurs donn\'ees \opcopy{#3}{A1}% \opcopy{#4}{A2}% \opcopy{#5}{A3}% + \xdef\GrandCote{#3}% + \xdef\PetitCote{#4}% + \xdef\MoyenCote{#5}% % On trace une figure ou pas ? \ifboolKV[ClesPythagore]{FigureSeule}{% \MPFigureReciPytha{\NomA}{\NomB}{\NomC}{#3}{#4}{#5}{\useKV[ClesPythagore]{Angle}}% @@ -4663,8 +5059,56 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. {\em La figure est donn\'ee \`a titre indicatif.}% \[\MPFigureReciPytha{\NomA}{\NomB}{\NomC}{#3}{#4}{#5}{\useKV[ClesPythagore]{Angle}}\]% \par\columnbreak\par% - % on r\'edige - Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand c\^ot\'e.% + \ifboolKV[ClesPythagore]{AllPerso}{% + \RedactionReciPythagore% + \RedactionCalculsReciPythagore% + \RedactionConclusionReciPythagore% + }{% + % on r\'edige + \ifboolKV[ClesPythagore]{Perso}{% + \RedactionReciPythagore% + }{% + Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand c\^ot\'e.% + } + \ifboolKV[ClesPythagore]{ReciColonnes}{% + \[ + \begin{array}{cccc|cccc} + &&\NomA\NomC^2&&&\NomA\NomB^2&+&\NomB\NomC^2\\ + &&\opexport{A1}{\Aun}\num{\Aun}^2&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ + &&\opmul*{A1}{A1}{a1}&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ + &&\opexport{a1}{\Aun}\num{\Aun}&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ + \end{array} + \] + }{% + \[\left. + \begin{array}{l} + \NomA\NomC^2=\opexport{A1}{\Aun}\num{\Aun}^2=\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}\\ + \\ + \NomA\NomB^2+\NomB\NomC^2=\opexport{A2}{\Adeux}\num{\Adeux}^2+\opexport{A3}{\Atrois}\num{\Atrois}^2=\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}+\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}=\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}\\ + \end{array} + \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi + \] + } + \ifboolKV[ClesPythagore]{Egalite}{% + \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% + \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore n'est pas v\'erifi\'ee. Donc le triangle $#2$ n'est pas rectangle.\fi% + }{% + \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ est rectangle + en $\NomB$ d'apr\`es la r\'eciproque du th\'eor\`eme de Pythagore.\fi% + \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le + triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'apr\`es la contrapos\'ee du th\'eor\`eme de Pythagore.}\fi% + } + } + \end{multicols} + }{% + \ifboolKV[ClesPythagore]{AllPerso}{% + \RedactionReciPythagore% + \RedactionCalculsReciPythagore% + \RedactionConclusionReciPythagore% + }{% + \ifboolKV[ClesPythagore]{Perso}{\RedactionReciPythagore}{% + Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand c\^ot\'e.% + } \ifboolKV[ClesPythagore]{ReciColonnes}{% \[ \begin{array}{cccc|cccc} @@ -4683,7 +5127,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \end{array} \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi \] - } + }% \ifboolKV[ClesPythagore]{Egalite}{% \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore n'est pas v\'erifi\'ee. Donc le triangle $#2$ n'est pas rectangle.\fi% @@ -4692,37 +5136,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. en $\NomB$ d'apr\`es la r\'eciproque du th\'eor\`eme de Pythagore.\fi% \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'apr\`es la contrapos\'ee du th\'eor\`eme de Pythagore.}\fi% - } - \end{multicols} - }{% - Dans le triangle $#2$, $[\NomA\NomC]$ est le plus grand c\^ot\'e.% - \ifboolKV[ClesPythagore]{ReciColonnes}{% - \[ - \begin{array}{cccc|cccc} - &&\NomA\NomC^2&&&\NomA\NomB^2&+&\NomB\NomC^2\\ - &&\opexport{A1}{\Aun}\num{\Aun}^2&&&\opexport{A2}{\Adeux}\num{\Adeux}^2&+&\opexport{A3}{\Atrois}\num{\Atrois}^2\\ - &&\opmul*{A1}{A1}{a1}&&&\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}&+&\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}\\ - &&\opexport{a1}{\Aun}\num{\Aun}&&&\multicolumn{3}{c}{\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}}\\ - \end{array} - \] - }{% - \[\left. - \begin{array}{l} - \NomA\NomC^2=\opexport{A1}{\Aun}\num{\Aun}^2=\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}\\ - \\ - \NomA\NomB^2+\NomB\NomC^2=\opexport{A2}{\Adeux}\num{\Adeux}^2+\opexport{A3}{\Atrois}\num{\Atrois}^2=\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}+\opmul*{A3}{A3}{a3}\opexport{a3}{\Atrois}\num{\Atrois}=\opadd*{a2}{a3}{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}\\ - \end{array} - \right\}\opcmp{a1}{a4}\ifopeq\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2\fi\opcmp{a1}{a4}\ifopneq\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2\fi - \] - }% - \ifboolKV[ClesPythagore]{Egalite}{% - \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee. Donc le triangle $#2$ est rectangle en $\NomB$.\fi% - \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors l'\'egalit\'e de Pythagore n'est pas v\'erifi\'ee. Donc le triangle $#2$ n'est pas rectangle.\fi% - }{% - \opcmp{a1}{a4}\ifopeq Comme $\NomA\NomC^2=\NomA\NomB^2+\NomB\NomC^2$, alors le triangle $#2$ est rectangle - en $\NomB$ d'apr\`es la r\'eciproque du th\'eor\`eme de Pythagore.\fi% - \opcmp{a1}{a4}\ifopneq Comme $\NomA\NomC^2\not=\NomA\NomB^2+\NomB\NomC^2$, alors le - triangle $#2$ n'est pas rectangle\ifboolKV[ClesPythagore]{Faible}{.}{ d'apr\`es la contrapos\'ee du th\'eor\`eme de Pythagore.}\fi% + }% }% }% }% @@ -4731,6 +5145,13 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \opcopy{#3}{A1}% \opcopy{#4}{A2}% \opcopy{\useKV[ClesPythagore]{Precision}}{pres}% + \xintifboolexpr{#3<#4 || #3==#4}{ + \xdef\PetitCote{#3}% + \xdef\MoyenCote{#4}% + }{% + \xdef\GrandCote{#3}% + \xdef\MoyenCote{#4}% + } % On retient les noms des sommets \StrMid{#2}{1}{1}[\NomA]% \StrMid{#2}{2}{2}[\NomB]% @@ -4754,12 +5175,55 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \[\MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}}\] \par\columnbreak\par% % On d\'emarre la r\'esolution + \ifboolKV[ClesPythagore]{AllPerso}{% + \RedactionPythagore% + \RedactionCalculsPythagore% + }{% + \ifboolKV[ClesPythagore]{Perso}{% + \RedactionCalculsPythagore% + }{% + \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% + }% + } + \xintifboolexpr{#3<#4 || #3==#4}{%\ifnum#3<#4% + \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% + % \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% + \begin{align*} + \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ + \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + }% + \end{align*} + }{%\else% + \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% + \begin{align*} + \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + }% + \end{align*} + }%\fi% + } + \end{multicols} + }{% + % On d\'emarre la r\'esolution + \ifboolKV[ClesPythagore]{AllPerso}{% + \RedactionPythagore% + \RedactionCalculsPythagore% + }{% \ifboolKV[ClesPythagore]{Perso}{\RedactionPythagore}{\ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% - }% - }% + }}% \xintifboolexpr{#3<#4 || #3==#4}{%\ifnum#3<#4% \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% - %\xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% \begin{align*} \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ @@ -4767,67 +5231,37 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul. \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ \ifboolKV[ClesPythagore]{AvantRacine}{}{% \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} - \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - }% + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + } \end{align*} - }{%\else% + }{%\else \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% - \begin{align*} - \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} - \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - }% - \end{align*} + \ifboolKV[ClesPythagore]{Soustraction}{% + \begin{align*} + \NomA\NomB^2&=\NomA\NomC^2-\NomB\NomC^2\\ + \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}-\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + } + \end{align*} + }{% + \begin{align*} + \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ + \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ + \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ + \ifboolKV[ClesPythagore]{AvantRacine}{}{% + \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}}% + \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ + } + \end{align*} + }% }%\fi% - \end{multicols} - }{% - % On d\'emarre la r\'esolution - \ifboolKV[ClesPythagore]{Perso}{\RedactionPythagore}{\ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'\'egalit\'e de Pythagore est v\'erifi\'ee :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :% - }}% - \xintifboolexpr{#3<#4 || #3==#4}{%\ifnum#3<#4% - \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}% - \begin{align*} - \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ - \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opcopy{\useKV[ClesPythagore]{ValeurA}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} - \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomC&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomC&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } - \end{align*} - }{%\else - \xdef\ResultatPytha{\fpeval{round(sqrt(#3^2-#4^2),\useKV[ClesPythagore]{Precision})}}% - \ifboolKV[ClesPythagore]{Soustraction}{% - \begin{align*} - \NomA\NomB^2&=\NomA\NomC^2-\NomB\NomC^2\\ - \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}-\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}} - \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } - \end{align*} - }{% - \begin{align*} - \NomA\NomC^2&=\NomA\NomB^2+\NomB\NomC^2\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opexport{A1}{\Aun}\num{\Aun}^2}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opcopy{\useKV[ClesPythagore]{ValeurB}}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}{\opexport{A2}{\Adeux}\num{\Adeux}^2}\\ - \ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}&=\NomA\NomB^2+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\ifboolKV[ClesPythagore]{EnchaineC}{\opcopy{\useKV[ClesPythagore]{ValeurC}}{a1}\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}-\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\ - \NomA\NomB^2&=\opsub*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\ - \ifboolKV[ClesPythagore]{AvantRacine}{}{% - \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomB&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}}% - \ifboolKV[ClesPythagore]{Racine}{}{\\\ifboolKV[ClesPythagore]{Exact}{\NomA\NomB&=\opsqrt[maxdivstep=3]{a3}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}{\NomA\NomB&\approx\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\num{\Aquatre}~\text{\useKV[ClesPythagore]{Unite}}}}%\\ - } - \end{align*} - }% - }%\fi% + }% }% }% }% @@ -6853,7 +7287,7 @@ vardef Positions(expr Step)= \ppcm=\numexpr#1*#2/\pgcd\relax } -\setKVdefault[ClesThales]{Calcul=true,Droites=false,Propor=false,Segment=false,Figure=false,FigureSeule=false,Figurecroisee=false,FigurecroiseeSeule=false,Angle=0,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false,Echelle=1cm} +\setKVdefault[ClesThales]{Calcul=true,Droites=false,Propor=false,Segment=false,Figure=false,FigureSeule=false,Figurecroisee=false,FigurecroiseeSeule=false,Angle=0,Precision=2,Entier=false,Unite=cm,Reciproque=false,Produit=false,ChoixCalcul=0,Simplification,Redaction=false,Remediation=false,Echelle=1cm,Perso=false,CalculsPerso=false} %On d\'efinit la figure \`a utiliser \def\MPFigThales#1#2#3#4#5#6{ @@ -6862,6 +7296,7 @@ vardef Positions(expr Step)= % #3 Troisi\`eme sommet % #4 point sur le segment #1#2 % #5 point sur le segment #1#3 + % #6 angle de rotation \ifluatex \mplibcodeinherit{enable} \mplibforcehmode @@ -7263,33 +7698,39 @@ vardef Positions(expr Step)= \fi } +\newcommand\RedactionThales{}% +\newcommand\EcritureCalculs{}% +\newcommand\EcritureQuotients{}% + %%% \newcommand{\TTThales}[6][]{% \useKVdefault[ClesThales]% \setKV[ClesThales]{#1}% - \ifboolKV[ClesThales]{Droites}{% - Les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#5)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#4#6)$} sont s\'ecantes en \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2$}.% - }{% - Dans le triangle \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2#3#4$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#5$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la - droite} - \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#3]$}{$(#2#3)$}}, - \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#6$} est un - point \ifboolKV[ClesThales]{Segment}{du segment}{de la droite} - \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#4]$}{$(#2#4)$}}.% - } - \\Comme les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#5#6)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#4)$} sont parall\`eles, alors \ifboolKV[ClesThales]{Propor}{le tableau% - \[\begin{array}{c|c|c} - \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}\\ - \hline - \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}\\ - \end{array} - \] - est un tableau de proportionnalit\'e\ifboolKV[ClesThales]{Segment}{.}{ d'apr\`es le th\'eor\`eme de Thal\`es.}% - }{% - \ifboolKV[ClesThales]{Segment}{on a :}{le th\'eor\`eme de Thal\`es permet d'\'ecrire :}% - \[\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}}\]% - } -} + \ifboolKV[ClesThales]{Perso}{\RedactionThales}{% + \ifboolKV[ClesThales]{Droites}{% + Les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#5)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#4#6)$} sont s\'ecantes en \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2$}.% + }{% + Dans le triangle \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$#2#3#4$}, \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#5$} est un point \ifboolKV[ClesThales]{Segment}{du segment}{de la + droite} + \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#3]$}{$(#2#3)$}}, + \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{$#6$} est un + point \ifboolKV[ClesThales]{Segment}{du segment}{de la droite} + \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{\ifboolKV[ClesThales]{Segment}{$[#2#4]$}{$(#2#4)$}}.% + } + \\Comme les droites \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#5#6)$} et \ifboolKV[ClesThales]{Remediation}{\pointilles[2cm]}{$(#3#4)$} sont parall\`eles, alors \ifboolKV[ClesThales]{Propor}{le tableau% + \[\begin{array}{c|c|c} + \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}\\ + \hline + \ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}&\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}\\ + \end{array} + \] + est un tableau de proportionnalit\'e\ifboolKV[ClesThales]{Segment}{.}{ d'apr\`es le th\'eor\`eme de Thal\`es.}% + }{% + \ifboolKV[ClesThales]{Segment}{on a :}{le th\'eor\`eme de Thal\`es permet d'\'ecrire :}% + \[\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#5}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#3}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#2#4}}=\frac{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#5#6}}{\ifboolKV[ClesThales]{Remediation}{\pointilles[1cm]}{#3#4}}\]% + }% + }% +}% \newcommand{\TThalesCalculsD}[8][]{% \setKV[ClesThales]{#1}% @@ -7422,23 +7863,30 @@ vardef Positions(expr Step)= \ifboolKV[ClesThales]{Calcul}{% %%%%%%%%%%%%%%%%%%%%%%%%%%% On remplace par les longueurs connues :% - \ifboolKV[ClesThales]{Propor}{% - \[\begin{array}{c|c|c} - \IfDecimal{#3}{\num{#3}}{#3}&\IfDecimal{#4}{\num{#4}}{#4}&\IfDecimal{#5}{\num{#5}}{#5}\\ - \hline - \IfDecimal{#6}{\num{#6}}{#6}&\IfDecimal{#7}{\num{#7}}{#7}&\IfDecimal{#8}{\num{#8}}{#8} - \end{array} - \] + \ifboolKV[ClesThales]{CalculsPerso}{% + \EcritureQuotients% }{% - \[\frac{\IfDecimal{#3}{\num{#3}}{#3}}{\IfDecimal{#6}{\num{#6}}{#6}}=\frac{\IfDecimal{#4}{\num{#4}}{#4}}{\IfDecimal{#7}{\num{#7}}{#7}}=\frac{\IfDecimal{#5}{\num{#5}}{#5}}{\IfDecimal{#8}{\num{#8}}{#8}}\] + \ifboolKV[ClesThales]{Propor}{% + \[\begin{array}{c|c|c} + \IfDecimal{#3}{\num{#3}}{#3}&\IfDecimal{#4}{\num{#4}}{#4}&\IfDecimal{#5}{\num{#5}}{#5}\\ + \hline + \IfDecimal{#6}{\num{#6}}{#6}&\IfDecimal{#7}{\num{#7}}{#7}&\IfDecimal{#8}{\num{#8}}{#8} + \end{array} + \] + }{% + \[\frac{\IfDecimal{#3}{\num{#3}}{#3}}{\IfDecimal{#6}{\num{#6}}{#6}}=\frac{\IfDecimal{#4}{\num{#4}}{#4}}{\IfDecimal{#7}{\num{#7}}{#7}}=\frac{\IfDecimal{#5}{\num{#5}}{#5}}{\IfDecimal{#8}{\num{#8}}{#8}}\] + }% }% % On choisit \'eventuellement le calcul \`a faire s'il y en a plusieurs. \xdef\CompteurCalcul{\useKV[ClesThales]{ChoixCalcul}}% \xintifboolexpr{\CompteurCalcul>0}{\xintifboolexpr{\CompteurCalcul==1}{\xdef\cmya{0}\xdef\cmza{0}}{\xintifboolexpr{\CompteurCalcul==2}{\xdef\cmxa{0}\xdef\cmza{0}}{\xdef\cmxa{0}\xdef\cmya{0}}}}{}% - %%on fait les calculs -\begin{align*} - %Premier compteur \xxx - \ifnum\cmxa>0 + %% on fait les calculs + \ifboolKV[ClesThales]{CalculsPerso}{% + \EcritureCalculs% + }{% + \begin{align*} + % Premier compteur \xxx + \ifnum\cmxa>0 \Nomx\uppercase{&}=\frac{\opexport{valx}{\valx}\num{\valx}\times\opexport{Valx}{\Valx}\num{\Valx}}{\opexport{denox}{\denox}\num{\denox}}\relax%\global\numx=\numexpr\opprint{valx}*\opprint{Valx}\relax \fi % % Deuxi\`eme compteur \yyy @@ -7517,7 +7965,8 @@ vardef Positions(expr Step)= \uppercase{&}\Nomz\uppercase{&}\opdiv*{numz}{denoz}{resultatz}{restez}\opcmp{restez}{0}\ifopeq=\num{\ResultatThalesz}\else\approx\num{\fpeval{round(\ResultatThalesz,\useKV[ClesThales]{Precision})}}\fi~\text{\useKV[ClesThales]{Unite}}% \fi \fi -\end{align*} + \end{align*} + } }{} } @@ -7638,7 +8087,7 @@ vardef Positions(expr Step)= \StrMid{\the\xxx}{1}{1}[\cmxa]% \ifboolKV[ClesThales]{Calcul}{% %%%%%%%%%%%%%%%%%%%%%%%%%%% - On remplace par les longueurs connues : + On remplace par les longueurs connues : \ifboolKV[ClesThales]{Propor}{% \[\begin{array}{c|c|c} \IfDecimal{#3}{\num{#3}}{#3}&\IfDecimal{#4}{\num{#4}}{#4}&\IfDecimal{#5}{\num{#5}}{#5}\\ @@ -7875,7 +8324,7 @@ vardef Positions(expr Step)= }% %%%% -\newcommand{\ReciThales}[6][]{% +\newcommand\ReciThales[6][]{% \ifboolKV[ClesThales]{Droites}{% Les droites $(#3#5)$ et $(#4#6)$ sont s\'ecantes en $#2$. }{% @@ -8004,9 +8453,18 @@ vardef Positions(expr Step)= }% }% -\newcommand{\Thales}[8][]{% +\newcommand\Thales[8][]{% \useKVdefault[ClesThales]% \setKV[ClesThales]{#1}% + %Définir les points pour une utilisation perso + \StrMid{#2}{1}{1}[\NomA]\StrMid{#2}{2}{2}[\NomB]\StrMid{#2}{3}{3}[\NomC]\StrMid{#2}{4}{4}[\NomM]\StrMid{#2}{5}{5}[\NomN]% + \xdef\NomPointA{\NomA}% + \xdef\NomPointB{\NomB}% + \xdef\NomPointC{\NomC}% + \xdef\NomTriangle{\NomA\NomB\NomC}% + \xdef\NomPointM{\NomM}% + \xdef\NomPointN{\NomN}% + % \ifboolKV[ClesThales]{Reciproque}{% \ReciproqueThales[#1]{#2}{#3}{#4}{#5}{#6}{#7}{#8}% }{% diff --git a/macros/latex/contrib/xmpincl/xmpincl.dtx b/macros/latex/contrib/xmpincl/xmpincl.dtx index 8683edec2d..2b9b8744cd 100644 --- a/macros/latex/contrib/xmpincl/xmpincl.dtx +++ b/macros/latex/contrib/xmpincl/xmpincl.dtx @@ -20,7 +20,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{xmpincl} %<*package> - [2008/05/10 v2.2 Include XMP data in pdflatex] + [2021/08/31 v2.3 Include XMP data in pdflatex] % % %<*driver> @@ -77,6 +77,8 @@ % \changes{v2.2}{2008/05/10}{Minor update: made |~| and |&| normal characters % when writing the xmpi file. I still need to find a way to include |%| % characters in the xmpi file.} +% \changes{v2.3}{2021/08/31}{Replaced \cs{if}\cs{par} with \cs{ifx}\cs{par} +% because the former caused an error with the new definition of \cs{par}.} % % \GetFileInfo{xmpincl.dtx} % @@ -94,7 +96,7 @@ % \maketitle % % \section{Introduction} -% +% % The |XMP| (eXtensible Metadata Platform) is a framework to add metadata % to digital material to enhance the workflow in publication. References % are given below, but the essence is that the metadata is stored in an @@ -300,7 +302,7 @@ \equal{\mcs@xmpinclEnd}{\xmpinclReadln}% }{% Note: no if. }{% - \if\par\xmpinclReadln\else% + \ifx\par\xmpinclReadln\else% \immediate\write\xmpinclWrite{\xmpinclReadln}% \fi% }% -- cgit v1.2.3