[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: renamed a bunch of commands (they shouldn't be internal) documented the change (affff21e)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Aug 11 10:24:20 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/affff21e3577294888c3b7af6cb7d0129d75f846
>---------------------------------------------------------------
commit affff21e3577294888c3b7af6cb7d0129d75f846
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Aug 11 10:24:20 2020 +0200
renamed a bunch of commands (they shouldn't be internal)
documented the change
>---------------------------------------------------------------
affff21e3577294888c3b7af6cb7d0129d75f846
base/doc/ltnews32.tex | 9 +-
required/tools/changes.txt | 4 +
required/tools/varioref.dtx | 215 ++++++++++++++++++++++----------------------
3 files changed, 115 insertions(+), 113 deletions(-)
diff --git a/base/doc/ltnews32.tex b/base/doc/ltnews32.tex
index bf2adb33..b617684a 100644
--- a/base/doc/ltnews32.tex
+++ b/base/doc/ltnews32.tex
@@ -661,10 +661,11 @@ corrected.
\subsection{\pkg{varioref}: Support Japanese as a language option}
The package now recognizes \texttt{japanese} as a language option.
-The extra complication is that for grammatical reasons \cs{vrefrange}
-needs a structure different from all other languages currently
-supported. To accommodate for this \cs{vrefrangeformat} was added to
-all languages.
+The extra complication is that for grammatical reasons \cs{vref},
+\cs{Vref}, \cs{vrefrange} and \cs{fullref} need a structure different
+from all other languages currently supported. To accommodate for this
+\cs{vrefformat}, \cs{Vrefformat}, \cs{vrefrangeformat}, and \cs{fullrefformat}
+was added to all languages.
%
\githubissue{352}
diff --git a/required/tools/changes.txt b/required/tools/changes.txt
index b0695627..9faebdb6 100644
--- a/required/tools/changes.txt
+++ b/required/tools/changes.txt
@@ -5,6 +5,10 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2020-08-11 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * varioref.dtx: Updated suppor for Japanese (gh/352 and gh/369)
+
2020-07-20 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* array.dtx (subsection{Support for \firsthline ...):
diff --git a/required/tools/varioref.dtx b/required/tools/varioref.dtx
index b27649f4..2bba6046 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/25 v1.6e package for extended references (FMi)]
+%<package> [2020/08/11 v1.6e package for extended references (FMi)]
% \fi
%
%%
@@ -70,7 +70,7 @@
% \PackageWarning{inputenc}{Unicode character \expandafter
% \UTFviii at splitcsname\string##1\relax
% \MessageBreak
-% not set up for use with LaTeX}^^A
+% not set up for use with LaTeX -- ignored}^^A
% \raisebox{.8pt}{\fboxsep1pt\kern.1pt\fbox{$\cdot$}\kern.1pt}^^A
% }}
% \makeatother
@@ -152,11 +152,6 @@
% 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
@@ -235,11 +230,6 @@
% The optional argument the command may take is the text to use in case
% both labels are placed on the current page.
%
-% In some languages (currently only for Japanese) the generated text
-% has to typeset the page range first and the reference range
-% afterwards. To accomodate for this \cs{vrefrangeformat} has been
-% added to allow to alter this on a per language basis.
-%
%
% \DescribeMacro\vpagerefrange This command is similar to |\vpageref|
% but takes two mandatory arguments which are two labels denoting a
@@ -386,11 +376,6 @@
% |\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
@@ -405,6 +390,8 @@
%\end{verbatim}
% textual references can be suppressed.
%
+%
+%
% \section{Multi-lingual usage}
%
% The package works well together with the babel system if it is
@@ -490,6 +477,19 @@
% describes the range of figures, tables, or whatever the labels refer
% to, the default for English is ``|\ref{#1} to~\ref{#2}|''.
%
+%
+% \NewIn{2020}
+% \DescribeMacro\vrefformat
+% \DescribeMacro\Vrefformat
+% \DescribeMacro\vrefrangeformat
+% \DescribeMacro\fullrefformat
+% In some languages (currently only for Japanese) the generated text
+% has to typeset in different word order to most other (Western) languages.
+% To accomodate for this \cs{vrefformat}, etc.\ has been
+% added to allow to alter this on a per language basis.
+% There should be normally no need to alter the setup. For details see
+% the code section.
+%
% \subsection{\ldots\ if Babel is used}
%
% \begin{itshape} If babel is being used then the above commands need to be
@@ -571,10 +571,6 @@
% |\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}
%
@@ -728,8 +724,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -747,8 +743,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -771,8 +767,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -807,8 +803,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -828,8 +824,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -856,8 +852,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -882,8 +878,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -907,8 +903,8 @@
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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -945,8 +941,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -967,8 +963,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -987,8 +983,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1008,8 +1004,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1034,8 +1030,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1077,8 +1073,8 @@
% \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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1098,8 +1094,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1122,8 +1118,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1149,8 +1145,8 @@
% 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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1172,8 +1168,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1197,8 +1193,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1235,8 +1231,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1256,8 +1252,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1279,8 +1275,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1303,8 +1299,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1331,14 +1327,14 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
% \end{macrocode}
-% Defaults for Japanese. It needs a special \cs{vref at starformat},
-% \cs{Vref at starformat}, \cs{fullrefformat} and \cs{vrefrangeformat}
+% Defaults for Japanese. It needs a special \cs{vrefformat},
+% \cs{Vrefformat}, \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
@@ -1357,12 +1353,13 @@
\def\reftextfaraway#1{\pageref{#1}ページ}%
\def\reftextpagerange#1#2{\pageref{#1}から\pageref{#2}ページ}%
\def\reftextlabelrange#1#2{\ref{#1}から\ref{#2}}%
- \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}）}%
+% \end{macrocode}
+% Note that the parentheses beow are not normal ones but full width
+% ones U+FF08 and U+FF09!
+% \begin{macrocode}
+ \def\vrefformat#1#2{\ref{#2}（\vpageref[#1]{#2}）}%
+ \def\Vrefformat#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}）}%
}}
@@ -1412,8 +1409,8 @@
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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}%
@@ -1456,8 +1453,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1471,8 +1468,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1502,8 +1499,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1526,8 +1523,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1549,8 +1546,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1586,8 +1583,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1610,8 +1607,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1630,8 +1627,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1654,8 +1651,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1680,8 +1677,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -1725,8 +1722,8 @@
\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\vrefformat\vrefdefaultformat
+ \let\Vrefformat\Vrefdefaultformat
\let\fullrefformat\fullrefdefaultformat
\let\vrefrangeformat\vrefrangedefaultformat
}}
@@ -2260,23 +2257,23 @@
% \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}}
+\newcommand\vref at star[1][]{\vrefformat{#1}}
% \end{macrocode}
% \end{macro}
%
%
-% \begin{macro}{\vref at starformat,\vref at stardefaultformat}
+% \begin{macro}{\vrefformat,\vrefdefaultformat}
% 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{%
+\def\vrefdefaultformat#1#2{%
\ref{#2}
\vpageref[#1]{#2}}
% \end{macrocode}
% Most languages need the above definition.
% \begin{macrocode}
-\let\vref at starformat\vref at stardefaultformat
+\let\vrefformat\vrefdefaultformat
% \end{macrocode}
% \end{macro}
@@ -2552,23 +2549,23 @@
% \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}}
+\newcommand\Vref at star[1][]{\Vrefformat{#1}}
% \end{macrocode}
% \end{macro}
%
%
-% \begin{macro}{\Vref at starformat,\Vref at stardefaultformat}
+% \begin{macro}{\Vrefformat,\Vrefdefaultformat}
% 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}
-\def\Vref at stardefaultformat#1#2{%
+\def\Vrefdefaultformat#1#2{%
\Ref{#2}
\vpageref[#1]{#2}}
% \end{macrocode}
% Most languages need the above definition.
% \begin{macrocode}
-\let\Vref at starformat\Vref at stardefaultformat
+\let\Vrefformat\Vrefdefaultformat
% \end{macrocode}
% \end{macro}
%
More information about the latex3-commits
mailing list.