[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: patch from #369 (aca993c5)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Aug 11 09:16:56 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/aca993c50a3324d9537d577f593f83b9b51f882f
>---------------------------------------------------------------
commit aca993c50a3324d9537d577f593f83b9b51f882f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Aug 11 09:16:56 2020 +0200
patch from #369
>---------------------------------------------------------------
aca993c50a3324d9537d577f593f83b9b51f882f
required/tools/varioref.dtx | 214 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 198 insertions(+), 16 deletions(-)
diff --git a/required/tools/varioref.dtx b/required/tools/varioref.dtx
index 06af00bc..b27649f4 100644
--- a/required/tools/varioref.dtx
+++ b/required/tools/varioref.dtx
@@ -40,7 +40,7 @@
%<package>\DeclareCurrentRelease{}{2019-10-01}
%<package>
%<package>\ProvidesPackage{varioref}
-%<package> [2020/07/20 v1.6d package for extended references (FMi)]
+%<package> [2020/07/25 v1.6e package for extended references (FMi)]
% \fi
%
%%
@@ -152,6 +152,11 @@
% arabic numbering (e.g., |\pagenumbering{roman}|) then there will be
% no distinction between one or many pages off.
%
+% In some languages (currently only for Japanese) the generated text
+% has to typeset in different word order to other Western languages.
+% To accomodate for this \cs{vref at starformat} has been
+% added to allow to alter this on a per language basis.
+%
%\DescribeMacro\vpageref Sometimes one wants to refer only to page
% number and again such a reference should normally be suppressed if
% we are referring to the current page. For this purpose the package
@@ -381,6 +386,11 @@
% |\labelformat{figure}{ábra~\thefigure}| which avoids the brace
% problem.
%
+% In some languages (currently only for Japanese) the generated text
+% has to typeset in different word order to other Western languages.
+% To accomodate for this \cs{Vref at starformat} has been
+% added to allow to alter this on a per language basis.
+%
% \DescribeMacro\thevpagerefnum
% If you like to have |\vref| suppress the page number on pages where
% label and reference fall onto the same page, but prefer reference to
@@ -561,6 +571,11 @@
% |\fullref| is also provided. This command can be used whenever you
% know for sure that label and reference can't fall onto nearby pages.
%
+% In some languages (currently only for Japanese) the generated text
+% has to typeset in different word order to other Western languages.
+% To accomodate for this \cs{fullrefformat} has been
+% added to allow to alter this on a per language basis.
+%
% \StopEventually{\PrintIndex\PrintChanges}
%
%
@@ -713,6 +728,9 @@
\def\reftextfaraway#1{op bladsy~\pageref{#1}}%
\def\reftextpagerange#1#2{op bladsye~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} tot~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -729,6 +747,9 @@
\def\reftextfaraway#1{on page~\pageref{#1}}%
\def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -750,6 +771,9 @@
\def\reftextfaraway#1{بالصفحة رقم~\pageref{#1}}%
\def\reftextpagerange#1#2{بالصفحات~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} حتى~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -783,6 +807,9 @@
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
\def\reftextpagerange#1#2{auf Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -801,6 +828,9 @@
\def\reftextfaraway#1{~\pageref{#1}. orrialdean}%
\def\reftextpagerange#1#2{~\pageref{#1}--\pageref{#2} orrialdeetan}%
\def\reftextlabelrange#1#2{\ref{#1}.etik \ref{#2}.eraino}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -826,6 +856,9 @@
\def\reftextfaraway#1{pada muka surat~\pageref{#1}}%
\def\reftextpagerange#1#2{pada muka surat~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -849,6 +882,9 @@
\def\reftextfaraway#1{na p\'agina~\pageref{#1}}%
\def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -871,6 +907,9 @@
on pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\vref at stringwarning\reflabelpagerange
\ref{#1} to~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -906,6 +945,9 @@
\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyri
~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} \cyrd\cyro~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -925,6 +967,9 @@
\def\reftextpagerange#1#2{a les
p\`agines~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -942,6 +987,9 @@
\def\reftextfaraway#1{na stranici~\pageref{#1}}%
\def\reftextpagerange#1#2{na stranicama~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} do~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -960,6 +1008,9 @@
\def\reftextfaraway#1{na stran\v{e}~\pageref{#1}}%
\def\reftextpagerange#1#2{na stran\'ach~\pageref{#1}\--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a\v{z}~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -983,6 +1034,9 @@
\def\reftextfaraway#1{p\aa{} side~\pageref{#1}}%
\def\reftextpagerange#1#2{p\aa{} side~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1023,6 +1077,9 @@
% \begin{macrocode}
\def\reftextpagerange#1#2{op pagina's~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1041,6 +1098,9 @@
\def\reftextfaraway#1{on page~\pageref{#1}}%
\def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1062,6 +1122,9 @@
\def\reftextfaraway#1{en pa\^go~\pageref{#1}}%
\def\reftextpagerange#1#2{en pa\^goj~\pageref{#1} \^gis \pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} \^gis~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1086,6 +1149,9 @@
% Can't combine numbers with the necessary suffix well.
% \begin{macrocode}
\def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1106,6 +1172,9 @@
\def\reftextfaraway#1{page~\pageref{#1}}%
\def\reftextpagerange#1#2{pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} \`a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1128,6 +1197,9 @@
\def\reftextpagerange#1#2{%
nas p\'axinas~\pageref{#1}-\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1163,6 +1235,9 @@
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
\def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1181,6 +1256,9 @@
\def\reftextfaraway#1{auf Seite~\pageref{#1}}%
\def\reftextpagerange#1#2{auf den Seiten~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} bis~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1201,6 +1279,9 @@
\def\reftextpagerange#1#2{stis sel'ides\nobreakspace
\pageref{#1}---\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} ws\nobreakspace\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1222,6 +1303,9 @@
\def\reftextfaraway#1{\'{a} s\'{i}{\dh}u~\pageref{#1}}%
\def\reftextpagerange#1#2{\'{a} s\'{i}{\dh}um~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1247,29 +1331,40 @@
\def\reftextfaraway#1{a pagina~\pageref{#1}}%
\def\reftextpagerange#1#2{nelle pagine~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
-% Defaults for Japanese. It needs a special \cs{vrefrangeformat}
+% Defaults for Japanese. It needs a special \cs{vref at starformat},
+% \cs{Vref at starformat}, \cs{fullrefformat} and \cs{vrefrangeformat}
% for gramatical reasons. As our standard documentation
% workflow uses pdf\TeX{} the Japanese letters can't be displayed
% easily, so you will see missing glyphs below. To see the real
% letters you have to look at the source or package file.
% \changes{v1.6d}{2020/07/20}{Option japanese added (gh/352)}
+% \changes{v1.6e}{2020/07/25}{Option japanese changed (gh/352)}
% \begin{allowtofu}
% \begin{macrocode}
\DeclareOption{japanese}
{\vref at addto\extrasjapanese{%
- \def\reftextfaceafter {\reftextvario{見開き}{次}頁}%
- \def\reftextfacebefore{\reftextvario{見開き}{前}頁}%
- \def\reftextafter {\reftextvario{直後の}{次}頁}%
- \def\reftextbefore {\reftextvario{直前の}{前}頁}%
- \def\reftextcurrent {\reftextvario{この}{現}頁}%
- \def\reftextfaraway#1{\pageref{#1}頁}%
- \def\reftextpagerange#1#2{\pageref{#1}頁から\pageref{#2}頁}%
+ \def\reftextfaceafter {\reftextvario{見開き}{次}ページ}%
+ \def\reftextfacebefore{\reftextvario{見開き}{前}ページ}%
+ \def\reftextafter {\reftextvario{直後の}{次}ページ}%
+ \def\reftextbefore {\reftextvario{直前の}{前}ページ}%
+ \def\reftextcurrent {\reftextvario{この}{現}ページ}%
+ \def\reftextfaraway#1{\pageref{#1}ページ}%
+ \def\reftextpagerange#1#2{\pageref{#1}から\pageref{#2}ページ}%
\def\reftextlabelrange#1#2{\ref{#1}から\ref{#2}}%
- \def\vrefrangeformat#1#2#3{\vpagerefrange[{#1}]{#2}{#3}の%
- \reftextlabelrange{#2}{#3}}%
+ \def\vref at starformat#1#2{\ref{#2}%
+ (\vpageref[#1]{#2})}%
+ \def\Vref at starformat#1#2{\Ref{#2}%
+ (\vpageref[#1]{#2})}%
+ \def\fullrefformat#1{\ref{#1}%
+ (\reftextfaraway{#1})}%
+ \def\vrefrangeformat#1#2#3{\reftextlabelrange{#2}{#3}%
+ (\vpagerefrange[{#1}]{#2}{#3})}%
}}
% \end{macrocode}
% \end{allowtofu}
@@ -1317,6 +1412,9 @@
on pages~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\vref at stringwarning\reflabelpagerange
\ref{#1} to~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}%
% \end{macrocode}
@@ -1358,6 +1456,9 @@
\def\reftextfaraway#1{p\aa{} side~\pageref{#1}}%
\def\reftextpagerange#1#2{p\aa{} side~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
\DeclareOption{nynorsk}
@@ -1370,6 +1471,9 @@
\def\reftextfaraway#1{p\aa{} side~\pageref{#1}}%
\def\reftextpagerange#1#2{p\aa{} side~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1398,6 +1502,9 @@
\def\reftextfaraway#1{na stronie~\pageref{#1}}%
\def\reftextpagerange#1#2{na stronach~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{od~\ref{#1} do~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1419,6 +1526,9 @@
\def\reftextfaraway#1{na p\'agina~\pageref{#1}}%
\def\reftextpagerange#1#2{nas p\'aginas~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1439,6 +1549,9 @@
\def\reftextfaraway#1{pe pagina~\pageref{#1}}%
\def\reftextpagerange#1#2{pe paginile~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} la~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1473,6 +1586,9 @@
\def\reftextpagerange#1#2{\cyrn\cyra\ \cyrs\cyrt\cyrr\cyra\cyrn
\cyri\cyrc\cyra\cyrh~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\cyrs~\ref{#1}\ \cyrp\cyro~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1494,6 +1610,9 @@
\def\reftextfaraway#1{na strane~\pageref{#1}}%
\def\reftextpagerange#1#2{na stran\'ach~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a\v z~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1511,6 +1630,9 @@
\def\reftextfaraway#1{na strani~\pageref{#1}}%
\def\reftextpagerange#1#2{na straneh~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{od~\ref{#1} do~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1532,6 +1654,9 @@
\def\reftextpagerange#1#2{en las p\'aginas~\pageref{#1}%
-\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} a~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1555,6 +1680,9 @@
\def\reftextpagerange#1#2{p\aa\
sidorna~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\ref{#1} till~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
\DeclareOption{turkish}
@@ -1597,6 +1725,9 @@
\def\reftextpagerange#1#2{\cyrn\cyra\ \cyrs\cyrt\cyro\cyrr\cyrii
\cyrn\cyrk\cyra\cyrh~\pageref{#1}--\pageref{#2}}%
\def\reftextlabelrange#1#2{\cyrz~\ref{#1}\ \cyrd\cyro~\ref{#2}}%
+ \let\vref at starformat\vref at stardefaultformat
+ \let\Vref at starformat\Vref at stardefaultformat
+ \let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
@@ -1651,7 +1782,6 @@
% \pkg{babel} package).
% \begin{macrocode}
\ExecuteOptions{english,final,space}
-\ProcessOptions*
% \end{macrocode}
%
%
@@ -2128,11 +2258,26 @@
% |\vpageref|, it that is needed one has to call both commands
% explicitly
% \changes{v1.6a}{2019/08/25}{Command added to support hyperref better}
+% \changes{v1.6e}{2020/07/25}{Changed for Japanese (gh/352)}
% \begin{macrocode}
-\newcommand\vref at star[2][]{%
+\newcommand\vref at star[1][]{\vref at starformat{#1}}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\vref at starformat,\vref at stardefaultformat}
+% Japanese needs a different word order in \cs{vref at star} so this
+% is separated out o that it can be changed on language level.
+% \changes{v1.6e}{2020/07/25}{Macro added (gh/352)}
+% \begin{macrocode}
+\def\vref at stardefaultformat#1#2{%
\ref{#2}
\vpageref[#1]{#2}}
% \end{macrocode}
+% Most languages need the above definition.
+% \begin{macrocode}
+\let\vref at starformat\vref at stardefaultformat
+% \end{macrocode}
% \end{macro}
% \begin{macro}{\vr at f}
@@ -2238,8 +2383,24 @@
% \begin{macro}{\fullref}
% And here is the primitive command that always produces a |\ref|
% and a |\pageref|.
+% \changes{v1.6e}{2020/07/25}{Changed for Japanese (gh/352)}
% \begin{macrocode}
-\def\fullref#1{\ref{#1} \reftextfaraway{#1}}
+\newcommand\fullref{\fullrefformat}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\fullrefformat,\fullrefdefaultformat}
+% Japanese needs a different word order in \cs{fullref} so this
+% is separated out o that it can be changed on language level.
+% \changes{v1.6e}{2020/07/25}{Macro added (gh/352)}
+% \begin{macrocode}
+\def\fullrefdefaultformat#1{%
+ \ref{#1} \reftextfaraway{#1}}
+% \end{macrocode}
+% Most languages need the above definition.
+% \begin{macrocode}
+\let\fullrefformat\fullrefdefaultformat
% \end{macrocode}
% \end{macro}
%
@@ -2362,7 +2523,7 @@
%
%
% \begin{macro}{\vrefrangeformat,\vrefrangedefaultformat}
-% Japanese needs a different word order in \cs{vrefrange} so this
+% Japanese needs a different word order in \cs{vrefrange} so this
% is separated out o that it can be changed on language level.
% \changes{v1.6d}{2020/07/20}{Macro added (gh/352)}
% \begin{macrocode}
@@ -2389,11 +2550,26 @@
%
% \begin{macro}{\Vref at star}
% \changes{v1.6a}{2019/08/25}{Command added to support hyperref better}
+% \changes{v1.6e}{2020/07/25}{Changed for Japanese (gh/352)}
+% \begin{macrocode}
+\newcommand\Vref at star[1][]{\Vref at starformat{#1}}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\Vref at starformat,\Vref at stardefaultformat}
+% Japanese needs a different word order in \cs{Vref} so this
+% is separated out o that it can be changed on language level.
+% \changes{v1.6e}{2020/07/25}{Macro added (gh/352)}
% \begin{macrocode}
-\newcommand\Vref at star[2][]{%
+\def\Vref at stardefaultformat#1#2{%
\Ref{#2}
\vpageref[#1]{#2}}
% \end{macrocode}
+% Most languages need the above definition.
+% \begin{macrocode}
+\let\Vref at starformat\Vref at stardefaultformat
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\Vr at f}
@@ -2524,6 +2700,12 @@
% \end{macro}
% \end{macro}
%
+% \changes{v1.6e}{2020/07/25}{Move to handle
+% the language-specific reference formats. (gh/352)}
+% \begin{macrocode}
+\ProcessOptions*
+% \end{macrocode}
+%
% \begin{macrocode}
%</package>
% \end{macrocode}
More information about the latex3-commits
mailing list.