cplusplus · godbyk · Apr 2, 2018 · Apr 2, 2018 · Apr 3, 2018 · Apr 3, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -38,11 +38,11 @@ script:
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && pdflatex std";
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && pdflatex std";
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && pdflatex std";
-      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex generalindex";
-      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex libraryindex";
-      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex grammarindex";
-      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex impldefindex";
-      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && pdflatex std";
+      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && xindy -M texindy -M idxbfpage -C utf8 -L english -t generalindex.ilg generalindex.idx";
+      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && xindy -M texindy -M idxbfpage -C utf8 -L english -t headerindex.ilg headerindex.idx";
+      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && xindy -M texindy -M idxbfpage -C utf8 -L english -t libraryindex.ilg libraryindex.idx";
+      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && xindy -M texindy -M idxbfpage -C utf8 -L english -t grammarindex.ilg grammarindex.idx";
+      docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && xindy -M texindy -M idxbfpage -C utf8 -L english -t impldefindex.ilg impldefindex.idx";
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex -s basic.gst -o xrefindex.gls xrefindex.glo";
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && makeindex -s basic.gst -o xrefdelta.gls xrefdelta.glo";
       docker exec -it texlive-basic bash -c "cd /$TRAVIS_REPO_SLUG/source && pdflatex std";

diff --git a/README.rst b/README.rst
@@ -32,15 +32,15 @@ Getting Started on Debian-based Systems
 
 Install the following packages:
 
-   sudo apt-get install latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
+   sudo apt-get install latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended xindy
 
 -------------------------
 Getting Started on Fedora
 -------------------------
 
 Install the following packages:
 
-   dnf install texlive texlive-isodate texlive-relsize texlive-ulem texlive-fixme texlive-extract
+   dnf install texlive texlive-isodate texlive-relsize texlive-ulem texlive-fixme texlive-extract texlive-xindy
 
 -----------------------------
 Getting Started on Arch Linux
@@ -75,6 +75,7 @@ If you can't use latexmk or make for some reason, you can run LaTeX manually ins
 #. run ``makeindex generalindex``
 #. run ``makeindex libraryindex``
 #. run ``makeindex grammarindex``
+#. run ``xindy -M idxbfpage -M texindy -C utf8 -L english -t grammarindex.ilg grammarindex.idx``
 #. run ``makeindex impldefindex``
 #. run ``pdflatex std`` once more.
 #. run ``makeindex -s basic.gst -o xrefindex.gls xrefindex.glo``

diff --git a/source/Makefile b/source/Makefile
@@ -37,12 +37,11 @@ reindex:
 	$(STDPDF)
 	$(STDPDF)
 	$(STDPDF)
-	makeindex generalindex
-	makeindex headerindex
-	makeindex libraryindex
-	makeindex grammarindex
-	makeindex impldefindex
-	$(STDPDF)
+	xindy -M texindy -M idxbfpage -C utf8 -L english -t generalindex.ilg generalindex.idx
+	xindy -M texindy -M idxbfpage -C utf8 -L english -t headerindex.ilg headerindex.idx
+	xindy -M texindy -M idxbfpage -C utf8 -L english -t libraryindex.ilg libraryindex.idx
+	xindy -M texindy -M idxbfpage -C utf8 -L english -t grammarindex.ilg grammarindex.idx
+	xindy -M texindy -M idxbfpage -C utf8 -L english -t impldefindex.ilg impldefindex.idx
 	makeindex -s basic.gst -o xrefindex.gls xrefindex.glo
 	makeindex -s basic.gst -o xrefdelta.gls xrefdelta.glo
 	$(STDPDF)

diff --git a/source/access.tex b/source/access.tex
@@ -3,9 +3,9 @@
 \indextext{access control|(}
 
 \indextext{protection|see{access control}}
-\indextext{\idxcode{private}|see{access control, \tcode{private}}}
-\indextext{\idxcode{protected}|see{access control, \tcode{protected}}}
-\indextext{\idxcode{public}|see{access control, \tcode{public}}}
+\indextext{\idxcode{private}|see{access control!\tcode{private}}}
+\indextext{\idxcode{protected}|see{access control!\tcode{protected}}}
+\indextext{\idxcode{public}|see{access control!\tcode{public}}}
 
 \pnum
 A member of a class can be
@@ -36,7 +36,7 @@
 
 \pnum
 \indextext{access control!member name}%
-\indextext{default access control|see{access control, default}}%
+\indextext{default access control|see{access control!default}}%
 \indextext{access control!default}%
 Members of a class defined with the keyword
 \tcode{class}

diff --git a/source/basic.tex b/source/basic.tex
@@ -877,7 +877,7 @@
 
 \pnum
 \indextext{scope!function parameter}%
-\indextext{scope!function prototype|see{scope, function parameter}}%
+\indextext{scope!function prototype|see{scope!function parameter}}%
 \indextext{parameter!scope of}%
 A function parameter
 (including one appearing in a
@@ -1751,7 +1751,7 @@
 
 \pnum
 \indextext{operator!scope resolution}%
-\indextext{scope resolution operator|see{operator, scope resolution}}%
+\indextext{scope resolution operator|see{operator!scope resolution}}%
 A name prefixed by the unary scope operator \tcode{::}\iref{expr.prim.id.qual}
 is looked up in global scope, in the translation unit where it is used.
 The name shall be declared in global namespace scope or shall be a name
@@ -3531,7 +3531,7 @@
 \pnum
 \indextext{alignment!extended}%
 \indextext{alignment!new-extended}%
-\indextext{over-aligned type|see{type, over-aligned}}%
+\indextext{over-aligned type|see{type!over-aligned}}%
 An \defn{extended alignment} is represented by an alignment
 greater than \tcode{alignof(std::max_align_t)}. It is \impldef{support for extended alignments}
 whether any extended alignments are supported and the contexts in which they are
@@ -3791,7 +3791,7 @@
 \pnum
 \indextext{type!fundamental}%
 \indextext{type!integral}%
-\indextext{floating-point type|see{type, floating-point}}%
+\indextext{floating-point type|see{type!floating-point}}%
 \indextext{type!implementation-defined \tcode{sizeof}}%
 \indextext{type!Boolean}%
 \indextext{type!\idxcode{char}}%
@@ -3915,13 +3915,13 @@
 that can be represented by the resulting unsigned integer type.}
 
 \pnum
-\indextext{\idxcode{char16_t}|see{type, \tcode{char16_t}}}%
-\indextext{\idxcode{char32_t}|see{type, \tcode{char32_t}}}%
-\indextext{\idxcode{wchar_t}|see{type, \tcode{wchar_t}}}%
+\indextext{\idxcode{char16_t}|see{type!\tcode{char16_t}}}%
+\indextext{\idxcode{char32_t}|see{type!\tcode{char32_t}}}%
+\indextext{\idxcode{wchar_t}|see{type!\tcode{wchar_t}}}%
 \indextext{type!\idxcode{char16_t}}%
 \indextext{type!\idxcode{char32_t}}%
 \indextext{type!\idxcode{wchar_t}}%
-\indextext{underlying type|see{type, underlying}}%
+\indextext{underlying type|see{type!underlying}}%
 \indextext{type!underlying!\idxcode{char16_t}}%
 \indextext{type!underlying!\idxcode{char32_t}}%
 Type \tcode{wchar_t} is a distinct type whose values can represent
@@ -4103,10 +4103,10 @@
 \item
 a \defn{pointer past the end of} an object\iref{expr.add}, or
 \item
-\indextext{null pointer value|see{value, null pointer}}
+\indextext{null pointer value|see{value!null pointer}}
 the \defnx{null pointer value}{value!null pointer}\iref{conv.ptr} for that type, or
 \item
-\indextext{invalid pointer value|see{value, invalid pointer}}
+\indextext{invalid pointer value|see{value!invalid pointer}}
 an \defnx{invalid pointer value}{value!invalid pointer}.
 \end{itemize}
 A value of a
@@ -5399,7 +5399,7 @@
 \end{note}
 
 \pnum
-\indextext{non-initialization odr-use|see{odr-use, non-initialization}}%
+\indextext{non-initialization odr-use|see{odr-use!non-initialization}}%
 A \defnx{non-initialization odr-use}{odr-use!non-initialization}
 is an odr-use\iref{basic.def.odr} not caused directly or indirectly by
 the initialization of a non-local static or thread storage duration variable.

diff --git a/source/classes.tex b/source/classes.tex
@@ -4,7 +4,7 @@
 
 \gramSec[gram.class]{Classes}
 
-\indextext{class!member function|see{member function, class}}
+\indextext{class!member function|see{member function!class}}
 
 \pnum
 \indextext{\idxcode{\{\}}!class declaration}%
@@ -128,7 +128,7 @@
 Aggregates of class type are described in~\ref{dcl.init.aggr}.
 \end{note}
 
-\indextext{trivial class|see{class, trivial}}%
+\indextext{trivial class|see{class!trivial}}%
 \pnum
 A \defnx{trivially copyable class}{class!trivially copyable} is a class:
 
@@ -148,7 +148,7 @@
 \begin{note} In particular, a trivially copyable or trivial class does not have
 virtual functions or virtual base classes.\end{note}
 
-\indextext{standard-layout|see{class, standard-layout}}%
+\indextext{standard-layout|see{class!standard-layout}}%
 \pnum
 A class \tcode{S} is a \defnx{standard-layout class}{class!standard-layout} if it:
 \begin{itemize}
@@ -385,7 +385,7 @@
 
 \pnum
 \indextext{class name!elaborated}%
-\indextext{elaborated type specifier|see{class name, elaborated}}%
+\indextext{elaborated type specifier|see{class name!elaborated}}%
 \begin{note}
 An \grammarterm{elaborated-type-specifier}\iref{dcl.type.elab} can also
 be used as a \grammarterm{type-specifier} as part of a declaration. It

diff --git a/source/conversions.tex b/source/conversions.tex
@@ -1,9 +1,9 @@
 %!TEX root = std.tex
 \rSec0[conv]{Standard conversions}
 
-\indextext{implicit conversion|see{conversion, implicit}}
-\indextext{contextually converted to bool|see{conversion, contextual}}
-\indextext{rvalue!lvalue conversion to|see{conversion, lvalue-to-rvalue}}%
+\indextext{implicit conversion|see{conversion!implicit}}
+\indextext{contextually converted to bool|see{conversion!contextual}}
+\indextext{rvalue!lvalue conversion to|see{conversion!lvalue-to-rvalue}}%
 
 \pnum
 \indextext{conversion!standard|(}%
@@ -191,8 +191,8 @@
 
 \pnum
 \indextext{conversion!array-to-pointer}%
-\indextext{decay!array|see{conversion, array-to-pointer}}%
-\indextext{decay!function|see{conversion, function-to-pointer}}%
+\indextext{decay!array|see{conversion!array-to-pointer}}%
+\indextext{decay!function|see{conversion!function-to-pointer}}%
 An lvalue or rvalue of type ``array of \tcode{N} \tcode{T}'' or ``array
 of unknown bound of \tcode{T}'' can be converted to a prvalue of type
 ``pointer to \tcode{T}''.
@@ -486,8 +486,8 @@
 
 \pnum
 \indextext{conversion!pointer}%
-\indextext{null pointer conversion|see{conversion, null pointer}}%
-\indextext{pointer!zero|see{value, null pointer}}%
+\indextext{null pointer conversion|see{conversion!null pointer}}%
+\indextext{pointer!zero|see{value!null pointer}}%
 \indextext{value!null pointer}%
 A \defnx{null pointer constant}{constant!null pointer} is an integer literal\iref{lex.icon} with
 value zero
@@ -528,7 +528,7 @@
 
 \pnum
 \indextext{conversion!pointer-to-member}%
-\indextext{null member pointer conversion|see{conversion, null member pointer}}%
+\indextext{null member pointer conversion|see{conversion!null member pointer}}%
 \indextext{constant!null pointer}%
 A null pointer constant\iref{conv.ptr} can be converted to a
 pointer-to-member

diff --git a/source/declarations.tex b/source/declarations.tex
@@ -4,7 +4,7 @@
 
 \gramSec[gram.dcl]{Declarations}
 
-\indextext{linkage specification|see{specification, linkage}}
+\indextext{linkage specification|see{specification!linkage}}
 
 \pnum
 Declarations generally specify how names are to be interpreted. Declarations have
@@ -489,7 +489,10 @@
 
 \rSec2[dcl.fct.spec]{Function specifiers}%
 \indextext{specifier!function}%
-\indextext{function|seealso{friend function; member function; inline function; virtual function}}
+\indextext{function|seealso{friend function}}
+\indextext{function|seealso{member function}}
+\indextext{function|seealso{inline function}}
+\indextext{function|seealso{virtual function}}
 
 \pnum
 A
@@ -2050,7 +2053,7 @@
 
 \pnum
 \indextext{\idxcode{enum}!type of}%
-\indextext{\idxcode{enum}!underlying type|see{type, underlying}}%
+\indextext{\idxcode{enum}!underlying type|see{type!underlying}}%
 Each enumeration defines a type that is different from all other types.
 Each enumeration also has an \defnx{underlying type}{type!underlying!enumeration}.
 The underlying type can be explicitly specified using an \grammarterm{enum-base}.
@@ -2304,7 +2307,7 @@
 in which the \grammarterm{named-namespace-definition} appears
 or that was introduced in a member of the inline namespace set of that namespace,
 the \grammarterm{namespace-definition}
-\indextext{extend|see{namespace, extend}}
+\indextext{extend|see{namespace!extend}}
 \defnx{extends}{namespace!extend} the previously-declared namespace.
 Otherwise, the \grammarterm{identifier} is introduced
 as a \grammarterm{namespace-name} into the declarative region

diff --git a/source/declarators.tex b/source/declarators.tex
@@ -5,11 +5,11 @@
 \gramSec[gram.decl]{Declarators}
 
 \indextext{initialization!class object|seealso{constructor}}%
-\indextext{\idxcode{*}|see{declarator, pointer}}
-\indextext{\idxcode{\&}|see{declarator, reference}}%
-\indextext{\idxcode{::*}|see{declarator, pointer-to-member}}%
-\indextext{\idxcode{[]}|see{declarator, array}}%
-\indextext{\idxcode{()}|see{declarator, function}}%
+\indextext{\idxcode{*}|see{declarator!pointer}}
+\indextext{\idxcode{\&}|see{declarator!reference}}%
+\indextext{\idxcode{::*}|see{declarator!pointer-to-member}}%
+\indextext{\idxcode{[]}|see{declarator!array}}%
+\indextext{\idxcode{()}|see{declarator!function}}%
 
 \pnum
 A declarator declares a single variable, function, or type, within a declaration.
@@ -102,7 +102,7 @@
 shall not be present when the declarator does not declare a
 function\iref{dcl.fct}.
 %
-\indextext{trailing requires-clause@trailing \textit{requires-clause}|see{\textit{requires-clause}, trailing}}%
+\indextext{trailing requires-clause@trailing \textit{requires-clause}|see{\textit{requires-clause}!trailing}}%
 When present after a declarator, the \grammarterm{requires-clause}
 is called the \defnx{trailing \grammarterm{requires-clause}}{%
 \idxgram{requires-clause}!trailing}.

diff --git a/source/derived.tex b/source/derived.tex
@@ -4,9 +4,9 @@
 
 \gramSec[gram.derived]{Derived classes}
 
-\indextext{virtual base class|see{base class, virtual}}
-\indextext{virtual function|see{function, virtual}}
-\indextext{dynamic binding|see{function, virtual}}
+\indextext{virtual base class|see{base class!virtual}}
+\indextext{virtual function|see{function!virtual}}
+\indextext{dynamic binding|see{function!virtual}}
 
 \pnum
 \indextext{base class}%
@@ -136,7 +136,7 @@
 derived object\iref{intro.object} is unspecified.
 \begin{note}
 \indextext{directed acyclic graph|see{DAG}}%
-\indextext{lattice|see{DAG, subobject}}%
+\indextext{lattice|see{DAG!subobject}}%
 A derived class and its base class subobjects can be represented by a
 directed acyclic graph (DAG) where an arrow means ``directly derived
 from''. An arrow need not have a physical representation in memory.

diff --git a/source/exceptions.tex b/source/exceptions.tex
@@ -4,8 +4,8 @@
 
 \gramSec[gram.except]{Exception handling}
 
-\indextext{exception object|see{exception handling, exception object}}%
-\indextext{object!exception|see{exception handling, exception object}}
+\indextext{exception object|see{exception handling!exception object}}%
+\indextext{object!exception|see{exception handling!exception object}}
 
 \pnum
 Exception handling provides a way of transferring control and information
@@ -54,8 +54,8 @@
 \pnum
 \indextext{exception handling!try block}%
 \indextext{exception handling!handler}%
-\indextext{try block|see{exception handling, try block}}%
-\indextext{handler|see{exception handling, handler}}%
+\indextext{try block|see{exception handling!try block}}%
+\indextext{handler|see{exception handling!handler}}%
 A \grammarterm{try-block} is a \grammarterm{statement}\iref{stmt.stmt}.
 \begin{note} Within this Clause
 ``try block'' is taken to mean both \grammarterm{try-block} and
@@ -140,7 +140,7 @@
 \end{example}
 
 \pnum
-\indextext{function try block|see{exception handling, function try block}}%
+\indextext{function try block|see{exception handling!function try block}}%
 \indextext{exception handling!function try block}%
 A
 \grammarterm{function-try-block}
@@ -185,7 +185,7 @@
 
 \rSec1[except.throw]{Throwing an exception}%
 \indextext{exception handling!throwing}%
-\indextext{throwing|see{exception handling, throwing}}
+\indextext{throwing|see{exception handling!throwing}}
 
 \pnum
 Throwing an exception transfers control to a handler.
@@ -314,7 +314,7 @@
 
 \pnum
 \indextext{exception handling!rethrow}%
-\indextext{rethrow|see{exception handling, rethrow}}%
+\indextext{rethrow|see{exception handling!rethrow}}%
 An exception is considered caught when a handler for that exception
 becomes active\iref{except.handle}.
 \begin{note}
@@ -355,8 +355,8 @@
 
 \rSec1[except.ctor]{Constructors and destructors}%
 \indextext{exception handling!constructors and destructors}%
-\indextext{constructor!exception handling|see{exception handling, constructors and destructors}}%
-\indextext{destructor!exception handling|see{exception handling, constructors and destructors}}
+\indextext{constructor!exception handling|see{exception handling!constructors and destructors}}%
+\indextext{destructor!exception handling|see{exception handling!constructors and destructors}}
 
 \pnum
 \indextext{unwinding!stack}%
@@ -597,7 +597,7 @@
 catch clause exits.
 
 \pnum
-\indextext{currently handled exception|see{exception handling, currently handled exception}}%
+\indextext{currently handled exception|see{exception handling!currently handled exception}}%
 The exception with the most recently activated handler that is
 still active is called the
 \defnx{currently handled exception}{exception handling!currently handled exception}.