texlive[55315] Build/source/utils/xindy: handle hyperref \see and
commits+karl at tug.org
commits+karl at tug.org
Thu May 28 19:59:35 CEST 2020
Revision: 55315
http://tug.org/svn/texlive?view=revision&revision=55315
Author: karl
Date: 2020-05-28 19:59:35 +0200 (Thu, 28 May 2020)
Log Message:
-----------
handle hyperref \see and \seealso, from J\"urgen S
Modified Paths:
--------------
trunk/Build/source/utils/xindy/ChangeLog
trunk/Build/source/utils/xindy/TLpatches/ChangeLog
trunk/Build/source/utils/xindy/TLpatches/patch-10-doc-min-range
trunk/Build/source/utils/xindy/xindy-src/modules/base/makeindex.xdy
trunk/Build/source/utils/xindy/xindy-src/user-commands/texindy.in
trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
Added Paths:
-----------
trunk/Build/source/utils/xindy/TLpatches/patch-08-hyperref-seealso
Modified: trunk/Build/source/utils/xindy/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/ChangeLog 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/ChangeLog 2020-05-28 17:59:35 UTC (rev 55315)
@@ -1,5 +1,14 @@
2020-05-28 J\"urgen Spitzm\"uller <spitz at lyx.org>
+ These patches from
+ https://tug.org/pipermail/tex-live/2020-May/045760.html
+
+ * xindy-src/modules/base/makeindex.xdy
+ (define-crossref-class, markup-crossref-list): handle
+ \see and \seealso added by hyperref.
+ * xindy-src/user-commands/texindy.in,
+ * xindy-src/user-commands/xindy.in: corresponding doc updates.
+
* xindy-src/doc/faq-4.html,
* xindy-src/doc/manual-3.html: document workaround for
:min-range-length none being broken.
Modified: trunk/Build/source/utils/xindy/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/TLpatches/ChangeLog 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/TLpatches/ChangeLog 2020-05-28 17:59:35 UTC (rev 55315)
@@ -1,3 +1,9 @@
+2020-05-28 Karl Berry <karl at tug.org>
+
+ * patch-08-hyperref-seealso,
+ * patch-10-doc-min-range: new patches from J\"urgen S.
+ https://tug.org/pipermail/tex-live/2020-May/045760.html
+
2017-11-13 Karl Berry <karl at tug.org>
* patch-02-lbrace: new file.
Added: trunk/Build/source/utils/xindy/TLpatches/patch-08-hyperref-seealso
===================================================================
--- trunk/Build/source/utils/xindy/TLpatches/patch-08-hyperref-seealso (rev 0)
+++ trunk/Build/source/utils/xindy/TLpatches/patch-08-hyperref-seealso 2020-05-28 17:59:35 UTC (rev 55315)
@@ -0,0 +1,63 @@
+ https://sourceforge.net/p/xindy/bugs/62/
+ https://tug.org/pipermail/tex-live/2020-May/045753.html
+
+Index: xindy-src/modules/base/makeindex.xdy
+===================================================================
+--- xindy-src/modules/base/makeindex.xdy (revision 55307)
++++ xindy-src/modules/base/makeindex.xdy (working copy)
+@@ -17,6 +17,11 @@
+ (define-crossref-class "seealso")
+ (markup-crossref-list :class "seealso" :open "\seealso{" :sep "; " :close "}{}")
+
++;; \hyperindexformat is a wrapper to \see and \seealso added by hyperref.
++;; We treat it like \see and \seealso
++(define-crossref-class "hyperindexformat" :unverified)
++(markup-crossref-list :class "hyperindexformat" :open "\hyperindexformat{" :sep "; " :close "}{}")
++
+ ;; Subentries in cross references are seperated by comma for all
+ ;; crossref classes.
+ (markup-crossref-layer-list :sep ", ")
+Index: xindy-src/user-commands/texindy.in
+===================================================================
+--- xindy-src/user-commands/texindy.in (revision 55307)
++++ xindy-src/user-commands/texindy.in (working copy)
+@@ -308,15 +308,9 @@ behaviour.
+
+ For more complex usage, when C<bbb> is not an identifier, no such
+ compatibility definitions exist and may also not been created with
+-current B<xindy>. In particular, this means that by default the LaTeX
+-package C<hyperref> will create raw index files that cannot be
+-processed with B<xindy>. This is not a bug, this is the unfortunate
+-result of an intented incompatibility. It is currently not possible to
+-get both hyperref's index links and use B<xindy>.
++current B<xindy>. Such a situation is reported to exist for the
++C<memoir> LaTeX class.
+
+-A similar situation is reported to exist for the C<memoir> LaTeX
+-class.
+-
+ Programmers who know Common Lisp and Lex and want to work on a remedy
+ should please contact the author.
+
+Index: xindy-src/user-commands/xindy.in
+===================================================================
+--- xindy-src/user-commands/xindy.in (revision 55307)
++++ xindy-src/user-commands/xindy.in (working copy)
+@@ -260,15 +260,9 @@ behaviour.
+
+ For more complex usage, when C<bbb> is not an identifier, no such
+ compatibility definitions exist and may also not been created with
+-current B<xindy>. In particular, this means that by default the LaTeX
+-package C<hyperref> will create raw index files that cannot be
+-processed with B<xindy>. This is not a bug, this is the unfortunate
+-result of an intented incompatibility. It is currently not possible to
+-get both hyperref's index links and use B<xindy>.
++current B<xindy>. Such a situation is reported to exist for the
++C<memoir> LaTeX class.
+
+-A similar situation is reported to exist for the C<memoir> LaTeX
+-class.
+-
+ Programmers who know Common Lisp and Lex and want to work on a remedy
+ should please contact the author.
+
Modified: trunk/Build/source/utils/xindy/TLpatches/patch-10-doc-min-range
===================================================================
--- trunk/Build/source/utils/xindy/TLpatches/patch-10-doc-min-range 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/TLpatches/patch-10-doc-min-range 2020-05-28 17:59:35 UTC (rev 55315)
@@ -1,29 +1,10 @@
-diff --git a/doc/faq-4.html b/doc/faq-4.html
-index 8105256..3a57b7a 100644
---- a/doc/faq-4.html
-+++ b/doc/faq-4.html
-@@ -460,11 +460,12 @@ location references. For exmaple the sequence
- the form
- <P>
- <PRE>
-- (define-location-class ... :min-range-length none)
-+ (define-location-class ... :min-range-length 100000)
- </PRE>
--<P>The argument <CODE>:min-range-length none</CODE> avoids forming of ranges.
--Arbitrary numbers instead of <CODE>none</CODE> define the minimum length of a
--sequence of location references that are needed to form a range.
-+<P>Arbitrary numbers define the minimum length of a sequence of location references that are needed to form a range.
-+The use of a sufficiently large number (such as <CODE>:min-range-length 100000</CODE>) avoids forming of ranges
-+(unless your document has more than 100.000 pages and an index entry spans all of them; in this unlikely case, just increase
-+the number sufficiently).
- <SF>xindy</SF>s default value is 2.
- <P>
- <P>
-diff --git a/doc/manual-3.html b/doc/manual-3.html
-index 3520de7..e00cf79 100644
---- a/doc/manual-3.html
-+++ b/doc/manual-3.html
-@@ -185,8 +185,8 @@ strings representing separators. Separators must follow the
+ https://tug.org/pipermail/tex-live/2020-May/045760.html
+
+Index: xindy-src/doc/manual-3.html
+===================================================================
+--- xindy-src/doc/manual-3.html (revision 54835)
++++ xindy-src/doc/manual-3.html (working copy)
+@@ -185,8 +185,8 @@
keyword argument <CODE>:sep</CODE>. If the keyword <CODE>:min-range-length</CODE> is
specified we define the <EM>minimum range length</EM> to be used when
building ranges. The argument <CODE>num</CODE> must be a positive integer
@@ -34,7 +15,7 @@
is of type <EM>variable</EM>, i.e. it is a <EM>var-location-class</EM>. Since
building of ranges is currently only allowed for standard classes
<CODE>:var</CODE> and <CODE>:min-range-length</CODE> must not be used together. The
-@@ -198,7 +198,7 @@ layers the hierarchy does contain. See command
+@@ -198,7 +198,7 @@
<P>
<PRE>
(define-location-class "page-numbers" ("arabic-numbers")
@@ -43,3 +24,24 @@
</PRE>
<P>Defines the location class <CODE>page-numbers</CODE> consisting of one layer
which is the alphabet <CODE>arabic-numbers</CODE>. Since the minimum
+Index: xindy-src/doc/faq-4.html
+===================================================================
+--- xindy-src/doc/faq-4.html (revision 54835)
++++ xindy-src/doc/faq-4.html (working copy)
+@@ -460,11 +460,12 @@
+ the form
+ <P>
+ <PRE>
+- (define-location-class ... :min-range-length none)
++ (define-location-class ... :min-range-length 100000)
+ </PRE>
+-<P>The argument <CODE>:min-range-length none</CODE> avoids forming of ranges.
+-Arbitrary numbers instead of <CODE>none</CODE> define the minimum length of a
+-sequence of location references that are needed to form a range.
++<P>Arbitrary numbers define the minimum length of a sequence of location references that are needed to form a range.
++The use of a sufficiently large number (such as <CODE>:min-range-length 100000</CODE>) avoids forming of ranges
++(unless your document has more than 100.000 pages and an index entry spans all of them; in this unlikely case, just increase
++the number sufficiently).
+ <SF>xindy</SF>s default value is 2.
+ <P>
+ <P>
Modified: trunk/Build/source/utils/xindy/xindy-src/modules/base/makeindex.xdy
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/modules/base/makeindex.xdy 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/xindy-src/modules/base/makeindex.xdy 2020-05-28 17:59:35 UTC (rev 55315)
@@ -17,6 +17,11 @@
(define-crossref-class "seealso")
(markup-crossref-list :class "seealso" :open "\seealso{" :sep "; " :close "}{}")
+;; \hyperindexformat is a wrapper to \see and \seealso added by hyperref.
+;; We treat it like \see and \seealso
+(define-crossref-class "hyperindexformat" :unverified)
+(markup-crossref-list :class "hyperindexformat" :open "\hyperindexformat{" :sep "; " :close "}{}")
+
;; Subentries in cross references are seperated by comma for all
;; crossref classes.
(markup-crossref-layer-list :sep ", ")
Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/texindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/texindy.in 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/texindy.in 2020-05-28 17:59:35 UTC (rev 55315)
@@ -308,15 +308,9 @@
For more complex usage, when C<bbb> is not an identifier, no such
compatibility definitions exist and may also not been created with
-current B<xindy>. In particular, this means that by default the LaTeX
-package C<hyperref> will create raw index files that cannot be
-processed with B<xindy>. This is not a bug, this is the unfortunate
-result of an intented incompatibility. It is currently not possible to
-get both hyperref's index links and use B<xindy>.
+current B<xindy>. Such a situation is reported to exist for the
+C<memoir> LaTeX class.
-A similar situation is reported to exist for the C<memoir> LaTeX
-class.
-
Programmers who know Common Lisp and Lex and want to work on a remedy
should please contact the author.
Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in 2020-05-28 17:48:11 UTC (rev 55314)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in 2020-05-28 17:59:35 UTC (rev 55315)
@@ -260,15 +260,9 @@
For more complex usage, when C<bbb> is not an identifier, no such
compatibility definitions exist and may also not been created with
-current B<xindy>. In particular, this means that by default the LaTeX
-package C<hyperref> will create raw index files that cannot be
-processed with B<xindy>. This is not a bug, this is the unfortunate
-result of an intented incompatibility. It is currently not possible to
-get both hyperref's index links and use B<xindy>.
+current B<xindy>. Such a situation is reported to exist for the
+C<memoir> LaTeX class.
-A similar situation is reported to exist for the C<memoir> LaTeX
-class.
-
Programmers who know Common Lisp and Lex and want to work on a remedy
should please contact the author.
More information about the tex-live-commits
mailing list.