summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-28 18:21:27 +0000
committerKarl Berry <karl@freefriends.org>2020-05-28 18:21:27 +0000
commit62000f907f3cbdc7e91cf5ce275d4d588e40b04b (patch)
tree0dd9a38ff74161e58539984265692b34d980545b
parent56c26088816db76b3b76ce8c3dc305d44898ee9d (diff)
xindy doc and makeindex.xdy updates from J\"urgen S, per source patches
git-svn-id: svn://tug.org/texlive/trunk@55317 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/man/man1/tex2xindy.man1.pdfbin6616 -> 24658 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/texindy.126
-rw-r--r--Master/texmf-dist/doc/man/man1/texindy.man1.pdfbin18848 -> 41845 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/xindy.136
-rw-r--r--Master/texmf-dist/doc/man/man1/xindy.man1.pdfbin17288 -> 39832 bytes
-rw-r--r--Master/texmf-dist/doc/xindy/faq-4.html9
-rw-r--r--Master/texmf-dist/xindy/modules/base/makeindex.xdy5
7 files changed, 35 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/man/man1/tex2xindy.man1.pdf b/Master/texmf-dist/doc/man/man1/tex2xindy.man1.pdf
index 3663d72cba9..dbfefa57b6d 100644
--- a/Master/texmf-dist/doc/man/man1/tex2xindy.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tex2xindy.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/texindy.1 b/Master/texmf-dist/doc/man/man1/texindy.1
index 22a19feb4ba..6bbd5953954 100644
--- a/Master/texmf-dist/doc/man/man1/texindy.1
+++ b/Master/texmf-dist/doc/man/man1/texindy.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
..
.nr rF 0
.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
+. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "texindy 1"
-.TH texindy 1 "2014-05-29" "Release 2.5.1" "xindy"
+.TH texindy 1 "2020-05-28" "Release 2.5.1" "xindy"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -179,7 +179,7 @@ A good introductionary description of \fBtexindy\fR appears in the
indexing chapter of the LaTeX Companion (2nd ed.)
.PP
If you want to produce an index for LaTeX documents with special index
-markup, the command \fIxindy\fR\|(1) is probably more of interest for you.
+markup, the command \fBxindy\fR\|(1) is probably more of interest for you.
.PP
\&\fBtexindy\fR is an approach to merge support for the \fImake-rules\fR
framework, own xindy modules (e.g., for special LaTeX commands in the
@@ -434,14 +434,8 @@ behaviour.
.Sp
For more complex usage, when \f(CW\*(C`bbb\*(C'\fR is not an identifier, no such
compatibility definitions exist and may also not been created with
-current \fBxindy\fR. In particular, this means that by default the LaTeX
-package \f(CW\*(C`hyperref\*(C'\fR will create raw index files that cannot be
-processed with \fBxindy\fR. 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 \fBxindy\fR.
-.Sp
-A similar situation is reported to exist for the \f(CW\*(C`memoir\*(C'\fR LaTeX
-class.
+current \fBxindy\fR. Such a situation is reported to exist for the
+\&\f(CW\*(C`memoir\*(C'\fR LaTeX class.
.Sp
Programmers who know Common Lisp and Lex and want to work on a remedy
should please contact the author.
@@ -485,5 +479,5 @@ option) any later version.
.PP
This program is distributed in the hope that it will be useful,
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
\&\s-1GNU\s0 General Public License for more details.
diff --git a/Master/texmf-dist/doc/man/man1/texindy.man1.pdf b/Master/texmf-dist/doc/man/man1/texindy.man1.pdf
index d09098c0645..e5dd2537b04 100644
--- a/Master/texmf-dist/doc/man/man1/texindy.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/texindy.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/xindy.1 b/Master/texmf-dist/doc/man/man1/xindy.1
index c8fc30d91f7..89dd8418a39 100644
--- a/Master/texmf-dist/doc/man/man1/xindy.1
+++ b/Master/texmf-dist/doc/man/man1/xindy.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
..
.nr rF 0
.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
+. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "xindy 1"
-.TH xindy 1 "2014-10-24" "Release 2.5.1" "xindy"
+.TH xindy 1 "2020-05-28" "Release 2.5.1" "xindy"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,7 +178,7 @@ its Web Site, http://www.xindy.org/. A good introductionary
description appears in the indexing chapter of the LaTeX Companion (2nd ed.)
.PP
If you want to produce an index for LaTeX documents, the command
-\&\fItexindy\fR\|(1) is probably more of interest for you. It is a wrapper for
+\&\fBtexindy\fR\|(1) is probably more of interest for you. It is a wrapper for
\&\fBxindy\fR that turns on many LaTeX conventions by default.
.SH "OPTIONS"
.IX Header "OPTIONS"
@@ -247,8 +247,8 @@ group headings.
When \f(CW\*(C`xelatex\*(C'\fR or \f(CW\*(C`omega\*(C'\fR input markup is used, \f(CW\*(C`utf8\*(C'\fR is always
used as codepage, then this option is ignored.
.Sp
-If raw input is in \s-1LICR,\s0 \fItexindy\fR\|(1) should be used instead of
-\&\fIxindy\fR\|(1). It will activate a mapping of \fIinputenc\fR encoding for
+If raw input is in \s-1LICR,\s0 \fBtexindy\fR\|(1) should be used instead of
+\&\fBxindy\fR\|(1). It will activate a mapping of \fIinputenc\fR encoding for
\&\f(CW\*(C`latex\*(C'\fR input markup to the chosen raw input codepage.
.ie n .IP """\-\-module"" \fImodule\fR / \fB\-M\fR \fImodule\fR" 4
.el .IP "\f(CW\-\-module\fR \fImodule\fR / \fB\-M\fR \fImodule\fR" 4
@@ -265,7 +265,7 @@ Specifies the input markup of the raw index. Supported values for
\&\f(CW\*(C`latex\*(C'\fR and \f(CW\*(C`xelatex\*(C'\fR input markup is the one that is emitted by
default from the LaTeX kernel, or by the \f(CW\*(C`index\*(C'\fR macro package of
David Jones. ^^\-notation of single byte characters is supported.
-Remapping of LICR-encoded characters is not done; use \fItexindy\fR\|(1) for
+Remapping of LICR-encoded characters is not done; use \fBtexindy\fR\|(1) for
that. Use input markup \f(CW\*(C`latex\*(C'\fR if you use standard LaTeX or pdfLaTeX
and use input markup \f(CW\*(C`xelatex\*(C'\fR if you use XeLaTeX or LuaLaTeX.
.Sp
@@ -381,14 +381,8 @@ behaviour.
.Sp
For more complex usage, when \f(CW\*(C`bbb\*(C'\fR is not an identifier, no such
compatibility definitions exist and may also not been created with
-current \fBxindy\fR. In particular, this means that by default the LaTeX
-package \f(CW\*(C`hyperref\*(C'\fR will create raw index files that cannot be
-processed with \fBxindy\fR. 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 \fBxindy\fR.
-.Sp
-A similar situation is reported to exist for the \f(CW\*(C`memoir\*(C'\fR LaTeX
-class.
+current \fBxindy\fR. Such a situation is reported to exist for the
+\&\f(CW\*(C`memoir\*(C'\fR LaTeX class.
.Sp
Programmers who know Common Lisp and Lex and want to work on a remedy
should please contact the author.
@@ -425,8 +419,8 @@ Codepage \f(CW\*(C`utf8\*(C'\fR should be supported for all languages, and shoul
used as internal codepage for LaTeX inputenc re-encoding.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
-\&\fItexindy\fR\|(1),
-\&\fItex2xindy\fR\|(1)
+\&\fBtexindy\fR\|(1),
+\&\fBtex2xindy\fR\|(1)
.SH "AUTHOR"
.IX Header "AUTHOR"
Joachim Schrod
@@ -441,5 +435,5 @@ option) any later version.
.PP
This program is distributed in the hope that it will be useful,
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
\&\s-1GNU\s0 General Public License for more details.
diff --git a/Master/texmf-dist/doc/man/man1/xindy.man1.pdf b/Master/texmf-dist/doc/man/man1/xindy.man1.pdf
index eaeb774854d..342caa2cfe5 100644
--- a/Master/texmf-dist/doc/man/man1/xindy.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/xindy.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xindy/faq-4.html b/Master/texmf-dist/doc/xindy/faq-4.html
index 81052562f1d..3a57b7ac8ad 100644
--- a/Master/texmf-dist/doc/xindy/faq-4.html
+++ b/Master/texmf-dist/doc/xindy/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&nbsp;2.
<P>
<P>
diff --git a/Master/texmf-dist/xindy/modules/base/makeindex.xdy b/Master/texmf-dist/xindy/modules/base/makeindex.xdy
index c859ecac651..94db4bb052e 100644
--- a/Master/texmf-dist/xindy/modules/base/makeindex.xdy
+++ b/Master/texmf-dist/xindy/modules/base/makeindex.xdy
@@ -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 ", ")