sidenotesplus (19dec23)

git-svn-id: svn://tug.org/texlive/trunk@69176 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 79 insertions, 73 deletions

diff --git a/Master/texmf-dist/doc/latex/sidenotesplus/README.txt b/Master/texmf-dist/doc/latex/sidenotesplus/README.txt
index e8d6a21a011..23817d80eac 100644
--- a/Master/texmf-dist/doc/latex/sidenotesplus/README.txt
+++ b/Master/texmf-dist/doc/latex/sidenotesplus/README.txt
@@ -2,7 +2,7 @@ LaTeX package sidenotesplus
 Copyright (c) Anton Vrba, 2022
 -------------------------------------------------------------------
 Version:
-  2023/10/05 1.03  added \sidecitebefore and \sidecitemark
+  2023/12/19 1.04  fixed bug in \sidecite (Trailing comma replaced by trailing period)
 Licence:
   This work may be distributed and/or modified under the conditions
   of the LaTeX Project Public License, version 1.3c of the license.
@@ -18,6 +18,7 @@ Abstract:
 -------------------------------------------------------------------
 
 Previous Versions: 
-  2202/07/09 1.02  Added Ragged option
+  2023/10/05 1.03  added \sidecitebefore and \sidecitemark
+  2022/07/09 1.02  Added Ragged option
   2022/05/31 1.01  Minor bug fix
   2022/05/15 1.00  Initial release
diff --git a/Master/texmf-dist/doc/latex/sidenotesplus/sidenotesplus.pdf b/Master/texmf-dist/doc/latex/sidenotesplus/sidenotesplus.pdf
index cf8d8c792c9..0f8f05d7461 100644
--- a/Master/texmf-dist/doc/latex/sidenotesplus/sidenotesplus.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotesplus/sidenotesplus.pdf
diff --git a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.bib b/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.bib
deleted file mode 100644
index 6dc192ea7bf..00000000000
--- a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.bib
+++ /dev/null
@@ -1,45 +0,0 @@
-%% LaTeX2e file `tests-sidenoteplus.bib'
-%% generated by the `filecontents' environment
-%% from source `tests-sidenoteplus' on 2022/07/09.
-%%
-@book{Tufte1990,
- author = {Edward R. Tufte},
- title = {Envisioning Information},
- publisher = {Graphics Press},
- year = {1990},
- isbn = {0-9613921-1-8}
-}
-
-@book{Tufte2006,
- author = {Edward R. Tufte},
- title = {Beautiful Evidence},
- year = {2006},
- publisher = {Graphics Press, {LLC}},
- isbn = {0-9613921-7-7}
-}
-
-@BOOK{bringhurst:2002,
-    title = {{T}he {E}lements of {T}ypographic {S}tyle},
-    publisher = {Hartley \& Marks Publishers},
-    year = {2013},
-    author = {Robert Bringhurst},
-    series = {Version 4.0: 20th Anniversary Edition},
-    address = {Point Roberts, WA, USA}
-    }
-
-@Article{Einstein_1905e,
-  author    = {A. Einstein},
-  journal   = {Annalen der Physik},
-  title     = {Ist die Trägheit eines Körpers von seinem Energieinhalt abhängig?},
-  year      = {1905},
-  number    = {13},
-  pages     = {639--641},
-  volume    = {323},
-  doi       = {10.1002/andp.19053231314},
-  file      = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its
-  Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem
-  Energieinhalt Abhängig_.pdf:PDF},
-  groups    = {Relativity},
-  publisher = {Wiley},
-}
-
diff --git a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.pdf b/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.pdf
index 9d2049e2578..a946ed6a011 100644
--- a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.pdf
diff --git a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.tex b/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.tex
index 41eccf6e4a1..26afebbb767 100644
--- a/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.tex
+++ b/Master/texmf-dist/doc/latex/sidenotesplus/tests-sidenoteplus.tex
@@ -55,7 +55,25 @@
     address = {Point Roberts, WA, USA}
     }
 
-@Article{Einstein_1905e,
+
+
+
+@Article{Einstein_str,
+  author    = {A. Einstein},
+  journal   = {Annalen der Physik},
+  title     = {Zur Elektrodynamik bewegter Körper},
+  year      = {1905},
+  number    = {10},
+  pages     = {891--921},
+  volume    = {322},
+  doi       = {10.1002/andp.19053221004},
+  file      = {:Articles/Einstein_1905d - On the Electrodynamics of Moving Bodies.pdf:PDF;:Articles/Einstein_1905d - Zur Elektrodynamik Bewegter Körper.pdf:PDF},
+  groups    = {Relativity},
+  publisher = {Wiley},
+    sorttitle = {a},
+}
+
+@Article{Einstein_mc2,
   author    = {A. Einstein},
   journal   = {Annalen der Physik},
   title     = {Ist die Trägheit eines Körpers von seinem Energieinhalt abhängig?},
@@ -64,21 +82,36 @@
   pages     = {639--641},
   volume    = {323},
   doi       = {10.1002/andp.19053231314},
-  file      = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its
-  Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem
-  Energieinhalt Abhängig_.pdf:PDF},
+  file      = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem Energieinhalt Abhängig_.pdf:PDF},
   groups    = {Relativity},
   publisher = {Wiley},
+    sorttitle = {b},
 }
 
+
+
 \end{filecontents}
 \usepackage{mwe}
 % -- language: English --
 %
 \usepackage[english]{babel}
 % -- biblatex --
-\usepackage[backend=biber,style=nature]{biblatex} % xxx
-% the .bib file with the references
+\PassOptionsToPackage{%
+  backend=bibtex,bibencoding=ascii,%
+  language=auto,%
+ style=verbose-ibid,
+  bibstyle=authoryear,dashed=false, 
+  sorting = anyvt,
+  maxbibnames=10, % default: 3, et al.
+  natbib=true, % natbib compatibility mode (\citep and \citet still work)
+  urldate=iso,date=iso,
+  isbn=false,
+  doi=false,
+  url=false,
+  eprint=false,
+}{biblatex}
+\usepackage{biblatex}
+
 \addbibresource{\jobname.bib}
 
 
@@ -199,7 +232,7 @@ set. In usage \verb"\sidenotemark" is followed by \verb"\sidenotetext", whereas
 to the \verb"\sidenotetext" commands.
 
   \sidecitet*{bringhurst:2002} expertise is in typography, and the famous expression $E=mc^2$ was
-  first presented in this paper\sidecite{Einstein_1905e}.
+  first presented with these papers\sidecite{Einstein_mc2, Einstein_str}.
 
 ~
 
@@ -207,7 +240,7 @@ to the \verb"\sidenotetext" commands.
   \begin{verbatim}
    \sidecitet*{bringhurst:2002} expertise is in typography,
    and the famous expression $E=mc^2$ was first presented
-   in this paper\sidecite{Einstein_1905e}.
+   with these papers\sidecite{Einstein_mc2, Einstein_str}.
   \end{verbatim}
 
 
diff --git a/Master/texmf-dist/source/latex/sidenotesplus/sidenotesplus.dtx b/Master/texmf-dist/source/latex/sidenotesplus/sidenotesplus.dtx
index 4d559deb3fe..4379b0152c7 100644
--- a/Master/texmf-dist/source/latex/sidenotesplus/sidenotesplus.dtx
+++ b/Master/texmf-dist/source/latex/sidenotesplus/sidenotesplus.dtx
@@ -36,7 +36,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
 %<package>\ProvidesPackage{sidenotesplus}
 %<*package>
-    [2023/10/05 1.03 rich text marginal notes, tables and figures ]
+    [2023/12/19 1.04 rich text marginal notes, tables and figures ]
 %</package>
 %<package>\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
 %<package>\RequirePackage{caption} % handles the captions (in the margin)
@@ -98,6 +98,7 @@
 % \changes{1.01}{2022/05/31}{Environment text* improved}
 % \changes{1.02}{2022/07/09}{added Ragged option}
 % \changes{1.03}{2023/10/05}{added commands sidecitebefore, sideciteafter and sidcitemark}
+% \changes{1.04}{2023/12/19}{fixed bug in the sidecite commands (Trailing comma replaced by trailing period}
 %
 % \begin{abstract}
 %  \noindent A package to manage the margin notes, figures, tables and captions.
@@ -1267,8 +1268,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenote|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 %    \end{macrocode}
@@ -1282,8 +1285,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
    \IfBooleanTF{#1}
    {
       \citeauthor{#8}'s\sidenote|#2|<#3>(#4)!#5!
@@ -1310,8 +1315,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenotetextbefore|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 %    \end{macrocode}
@@ -1329,8 +1336,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenotetext|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/sidenotesplus/sidenotesplus.sty b/Master/texmf-dist/tex/latex/sidenotesplus/sidenotesplus.sty
index ba8cd69342a..a63a96025ed 100644
--- a/Master/texmf-dist/tex/latex/sidenotesplus/sidenotesplus.sty
+++ b/Master/texmf-dist/tex/latex/sidenotesplus/sidenotesplus.sty
@@ -25,7 +25,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \ProvidesPackage{sidenotesplus}
-    [2023/10/05 1.03 rich text marginal notes, tables and figures ]
+    [2023/12/19 1.04 rich text marginal notes, tables and figures ]
 \RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
 \RequirePackage{caption} % handles the captions (in the margin)
 \RequirePackage{xparse} % new LaTeX3 syntax to define macros and environments
@@ -652,8 +652,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenote|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 \NewDocumentCommand \sidecitet {s d|| d<> d() d!! o o m }
@@ -661,8 +663,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
    \IfBooleanTF{#1}
    {
       \citeauthor{#8}'s\sidenote|#2|<#3>(#4)!#5!
@@ -678,8 +682,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenotetextbefore|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 \NewDocumentCommand \sideciteafter {s d|| d<> d() d!! o o m }
@@ -687,8 +693,10 @@
   {\RenewDocumentCommand \snp@before {} {}}
   {\RenewDocumentCommand \snp@before {} {#6}}
   \IfNoValueOrEmptyTF{#7}
-  {\RenewDocumentCommand \snp@after {} {}}
-  {\RenewDocumentCommand \snp@after {} {#7}}
+  {  \DeclareDelimFormat{postnotedelim}{\addperiod}
+     \RenewDocumentCommand \snp@after {} {}}
+  {  \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+     \RenewDocumentCommand \snp@after {} { #7}}
   \sidenotetext|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
 }
 \NewDocumentCommand \sidecitemark {s d() d!! }