summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/bxpdfver/LICENSE2
-rw-r--r--macros/latex/contrib/bxpdfver/README-ja.md3
-rw-r--r--macros/latex/contrib/bxpdfver/README.md3
-rw-r--r--macros/latex/contrib/bxpdfver/bxpdfver.sty13
-rw-r--r--macros/latex/contrib/sidenotesplus/README.txt5
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.dtx34
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.ins8
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.pdfbin235661 -> 236525 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdfbin142743 -> 142745 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex7
10 files changed, 57 insertions, 18 deletions
diff --git a/macros/latex/contrib/bxpdfver/LICENSE b/macros/latex/contrib/bxpdfver/LICENSE
index f6ebffefca..305f94fbad 100644
--- a/macros/latex/contrib/bxpdfver/LICENSE
+++ b/macros/latex/contrib/bxpdfver/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2014-2024 Takayuki YATO (aka. "ZR")
+Copyright (c) 2014-2025 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/macros/latex/contrib/bxpdfver/README-ja.md b/macros/latex/contrib/bxpdfver/README-ja.md
index ea1a7e4ee1..06b89ef5c7 100644
--- a/macros/latex/contrib/bxpdfver/README-ja.md
+++ b/macros/latex/contrib/bxpdfver/README-ja.md
@@ -125,6 +125,9 @@ dvipdfmx のバージョン判定について:
更新履歴
--------
+ * Version 0.8a ‹2025/02/18›
+ - 新実装の extractbb が使われている場合は, dvipdfmx のバージョン
+ 検査を取りやめる。
* Version 0.8 ‹2024/08/03›
- カーネルの新 PDF マネジメントが有効な場合にも一部の機能が使える
ようにする(“latex-pdf”モード)。
diff --git a/macros/latex/contrib/bxpdfver/README.md b/macros/latex/contrib/bxpdfver/README.md
index 1b78b5da1c..54625f4e50 100644
--- a/macros/latex/contrib/bxpdfver/README.md
+++ b/macros/latex/contrib/bxpdfver/README.md
@@ -127,6 +127,9 @@ More notices:
REVISION HISTORY
----------------
+ * Version 0.8a ‹2025/02/18›
+ - Give up checking dvipdfmx version when the scratch extractbb
+ is used.
* Version 0.8 ‹2024/08/03›
- Support some features even when the new PDF management of the
LaTeX kernel is activated (“latex-pdf” mode).
diff --git a/macros/latex/contrib/bxpdfver/bxpdfver.sty b/macros/latex/contrib/bxpdfver/bxpdfver.sty
index 296774068c..6891a204e0 100644
--- a/macros/latex/contrib/bxpdfver/bxpdfver.sty
+++ b/macros/latex/contrib/bxpdfver/bxpdfver.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'bxpdfver.sty'.
%%
-%% Copyright (c) 2014-2024 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2014-2025 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxpdfver}[2024/08/03 v0.8]
+\ProvidesPackage{bxpdfver}[2025/02/18 v0.8a]
\def\bxpv@pkgname{bxpdfver}
\providecommand\bxDebug[1]{}
@@ -936,11 +936,20 @@
\ifnum\bxpv@cache@@newtex>\z@
\def\bxpv@tmpc{This is extractbb Version }%
\bxpv@detokenize\bxpv@tmpc
+ \def\bxpv@tmpb{extractbb.lua v}%
+ \bxpv@detokenize\bxpv@tmpb
\bxpv@read@file{"|extractbb --version"}{%
\bxpv@split@at{\bxpv@tmpc}{##1}%
\ifx\bxpv@pre\relax\else
\global\let\bxpv@gtmpa\bxpv@post
\fi
+ \bxpv@split@at{\bxpv@tmpb}{##1}%
+ \ifx\bxpv@pre\relax\else
+ % The scratch extractbb is used,
+ % so the dvipdfmx version cannot be guessed.
+ % In this case, we'll drop the version check.
+ \gdef\bxpv@gtmpa{88888888}% assume it's new
+ \fi
}%
\fi
\ifx\bxpv@gtmpa\relax % failed somewhere
diff --git a/macros/latex/contrib/sidenotesplus/README.txt b/macros/latex/contrib/sidenotesplus/README.txt
index 23817d80ea..f0e34b7ee3 100644
--- a/macros/latex/contrib/sidenotesplus/README.txt
+++ b/macros/latex/contrib/sidenotesplus/README.txt
@@ -1,8 +1,8 @@
LaTeX package sidenotesplus
-Copyright (c) Anton Vrba, 2022
+Copyright (c) Anton Vrba, 2022-2025
-------------------------------------------------------------------
Version:
- 2023/12/19 1.04 fixed bug in \sidecite (Trailing comma replaced by trailing period)
+ 2025/02/18 1.05 added package option per=page, section, chapter or none
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:
+ 2023/12/19 1.04 fixed bug in \sidecite (Trailing comma replaced by trailing period)
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
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
index 4379b0152c..0288782981 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2022/23 by Anton Vrba
+% Copyright (C) 2022-2025 by Anton Vrba
%
% Home Page: https://github.com/anton-vrba/sidenotesplus
% Issues: https://github.com/anton-vrba/sidenotesplus/issues
@@ -36,7 +36,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<package>\ProvidesPackage{sidenotesplus}
%<*package>
- [2023/12/19 1.04 rich text marginal notes, tables and figures ]
+ [2025/2/18 1.05 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)
@@ -99,6 +99,7 @@
% \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}
+% \changes{1.05}{2025/2/18}{resetting sidenote counter per page, section, chapter or none}
%
% \begin{abstract}
% \noindent A package to manage the margin notes, figures, tables and captions.
@@ -131,6 +132,7 @@
% |classic| & switches to a classic look\\
% |sepdiff=| & |1em|, or a valid length within reason \\
% |alerton| & switches on the rendering of the margin alerts \\
+% |per=| & |page, section, chapter, none| defaults to counter per page \\
% \end{tabularx}
%
% ~
@@ -403,6 +405,7 @@
\bool_new:N \l@snp@Ragged
\bool_new:N \l@snp@symmetric
\bool_new:N \l@snp@page
+\bool_new:N \l@snp@counterset
\bool_set_false:N \l@snp@margincaption
\bool_set_false:N \l@snp@alerton
@@ -410,6 +413,7 @@
\bool_set_false:N \l@snp@ragged
\bool_set_false:N \l@snp@Ragged
\bool_set_true:N \l@snp@symmetric
+\bool_set_false:N \l@snp@counterset
%
@@ -442,6 +446,21 @@
{up}{\RenewDocumentCommand \snp@shape{}{\upshape}}%
{it}{\RenewDocumentCommand \snp@shape{}{\itshape}}%
{Other}{} },
+ per .code:n = \str_case:nn {#1}%
+ { {page}{ \newcounter{sidenote}[page] % make a counter%
+ \newcounter{sidealert}[page]
+ \bool_set_true:N \l@snp@counterset } % init the counter%
+ {section}{ \newcounter{sidenote}[section] %
+ \newcounter{sidealert}[section]
+ \bool_set_true:N \l@snp@counterset }%
+ {chapter}{ \newcounter{sidenote}[chapter] %
+ \newcounter{sidealert}[chapter]
+ \bool_set_true:N \l@snp@counterset } %
+ {none}{ \newcounter{sidenote}%
+ \newcounter{sidealert}
+ \bool_set_true:N \l@snp@counterset } %
+ {Other}{} %
+ },
sepdiff .code:n = \setlength{\snp@marginsepdiff}{#1},
classic .code:n = \bool_set_false:N \l@snp@symmetric,
ragged .code:n = { \RenewDocumentCommand \snp@leftmarginstyle {}{\raggedleft}
@@ -464,9 +483,14 @@
{\setlength{\snp@marginsepdiff}{0pt} \bool_set_false:N \l@snp@symmetric}
{\relax}
\bool_if:NTF \l@snp@symmetric {\setlength{\snp@marginsepdiff}{0pt}}{\relax}
- \newcounter{sidenote}[page] % make a counter
-\setcounter{sidenote}{0} % init the counter
- \newcounter{sidealert}[page] % make a counter
+
+\bool_if:NTF \l@snp@counterset
+ {\relax}
+ {\newcounter{sidenote}[page] % make a counter%
+ \newcounter{sidealert}[page]
+ \bool_set_true:N \l@snp@counterset }
+
+\setcounter{sidenote}{0} % init the counter%
\setcounter{sidealert}{0} % init the counter
% \end{macrocode}
%
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.ins b/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
index dbcf54724f..3dca44590f 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.ins
@@ -4,11 +4,11 @@
%% Issues: https://github.com/anton-vrba/sidenotesplus/issues
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
@@ -25,11 +25,11 @@
\preamble
- Copyright (C) 2022 by Anton Vrba
+ Copyright (C) 2022-2025 by Anton Vrba
--------------------------------
This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3
+ conditions of the LaTeX Project Public License, either version 1.3c
of this license or (at your option) any later version.
The latest version of this license is in
http://www.latex-project.org/lppl.txt
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
index 0f8f05d746..8603f7edcc 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
index a946ed6a01..a2906cfb0e 100644
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
index 26afebbb76..43d94432c8 100644
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
+++ b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
@@ -14,7 +14,7 @@
includeall} {geometry}%
\usepackage {geometry}
\RequirePackage[utf8]{inputenc}\usepackage[T1]{fontenc}
-\usepackage[alerton]{sidenotesplus}
+\usepackage[alerton, per=none]{sidenotesplus}
\RequirePackage[svgnames,dvipsnames]{xcolor}
\usepackage{lipsum}
@@ -100,7 +100,7 @@
backend=bibtex,bibencoding=ascii,%
language=auto,%
style=verbose-ibid,
- bibstyle=authoryear,dashed=false,
+ bibstyle=authoryear,dashed=false,
sorting = anyvt,
maxbibnames=10, % default: 3, et al.
natbib=true, % natbib compatibility mode (\citep and \citet still work)
@@ -205,8 +205,7 @@ Here we have three \sidenote<-15pt>{\textsf{\upshape\textbackslash sidenote<-15p
\sidenote!Blue!{\textsf{\upshape\textbackslash sidenote!Blue!} Test colour}%
\sidenote|-12mm|{\textsf{\upshape\textbackslash sidenote|-12mm|} but cannot float past \textsuperscript d above}
and the commas are inserted automatically between the text markers. But, if a line break
- is between the two \verb"\sidenote " commands, then that requires a \% sign before the line
- break.
+ is between the two \verb"\sidenote " commands, then that requires a \% sign before the line break.
In many environments the floating option fails thus the fixed option is used. Example, a side
note used in an equation: