texlive[46051] Master: hvindex (12dec17)

commits+karl at tug.org commits+karl at tug.org
Tue Dec 12 23:35:12 CET 2017


Revision: 46051
          http://tug.org/svn/texlive?view=revision&revision=46051
Author:   karl
Date:     2017-12-12 23:35:11 +0100 (Tue, 12 Dec 2017)
Log Message:
-----------
hvindex (12dec17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/hvindex/Changes
    trunk/Master/texmf-dist/doc/latex/hvindex/README
    trunk/Master/texmf-dist/tex/latex/hvindex/hvindex.sty
    trunk/Master/tlpkg/libexec/ctan2tds

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
    trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.pdf
    trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.tex

Modified: trunk/Master/texmf-dist/doc/latex/hvindex/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvindex/Changes	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/texmf-dist/doc/latex/hvindex/Changes	2017-12-12 22:35:11 UTC (rev 46051)
@@ -1,5 +1,5 @@
 hvindex.sty --------
-0.03  2009-10-24  - fixed an introduced bug with the last version
+0.04  2017-12-12  - added \iVert and \IVert
 0.02  2009-10-18  - makeidx and makeindex now depend on the
                     optional argument [makeidx]
                   - do not use @ operator when there is no

Modified: trunk/Master/texmf-dist/doc/latex/hvindex/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvindex/README	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/texmf-dist/doc/latex/hvindex/README	2017-12-12 22:35:11 UTC (rev 46051)
@@ -1,9 +1,3 @@
-%% Package `hvindex.sty'
-%%
-%% Herbert Voss <herbert _at_ dante.de> (Germany)
-%%
-%% (C) 2009
-%%
 This package defines some macros as a 
 replacement for \index which makes 
 live easier. You have to type every
@@ -10,7 +4,6 @@
 word only once to get it into the index 
 and into the text.
 
-
 Save the file hvindex.sty in a directory, 
 which is part of your  local TeX tree. 
 Then do not forget to run texhash to update this tree.
@@ -18,3 +11,7 @@
 on installing packages into your local TeX system or read the 
 TeX Frequently Asked Questions:
 (http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.

Added: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf	2017-12-12 22:35:11 UTC (rev 46051)

Property changes on: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex	2017-12-12 22:35:11 UTC (rev 46051)
@@ -0,0 +1,138 @@
+\listfiles
+\documentclass[ngerman]{article}
+\usepackage{fontspec}
+\usepackage{dejavu-otf}
+\usepackage{babel}
+\usepackage{longtable}
+\usepackage[makeidx]{hvindex}
+\usepackage[colorlinks,linktocpage]{hyperref}
+\providecommand\phantomsection{}
+\title{\texttt{hvindex}, v. \fileversion\\ simplifying indexing \ldots}
+\author{Herbert Voß}
+\date{\filedate}
+\begin{document}
+\maketitle
+
+\tableofcontents
+
+\section{Package options}
+With the \Index{option} \ttIndex{makeidx} the also called package is 
+loaded and the macro \texttt{\textbackslash{}makeindex}
+is executed.
+
+The package should be loaded \emph{after} package \ttIndex{babel}.
+
+\section{Introduction}
+The \Index{package} \ttIndex{hvindex} defines some \Index{macros}
+as a \Index{macro!replacement} for 
+\Index{macros!index@\texttt{\textbackslash index}} 
+which makes \Index{live} easier\index{easy}. You have to type every
+\Index{word} only \Index{once} to get it into the \Index{index} 
+and into the \Index{text}.
+
+
+\small
+\begin{verbatim}
+The \Index{package} \ttIndex{hvindex} defines some \Index{macros}
+as a \Index{macro!replacement} for 
+\Index{macros!index@\texttt{\textbackslash index}} 
+which makes \Index{live} easier\index{easy}. You have to type every
+\Index{word} only \Index{once} to get it into the \Index{index} 
+and into the \Index{text}.
+\end{verbatim}
+\normalsize
+
+
+\clearpage
+\section{The macros}
+
+\begin{longtable}{@{} l  l l @{}}\\\hline
+\emph{code} & \emph{Text} & \emph{index}\\\hline
+\endfirsthead
+\multicolumn{3}{@{}l}{\ldots\ continued from previous page}\\\hline
+\emph{code} & \emph{Text} & \emph{index}\\\hline
+\endhead
+\hline
+\multicolumn{3}{r@{}}{continued on next page \ldots}\\
+\hline
+\endfoot
+\hline
+\endlastfoot
+\verb+\Index{foo}+                      & \Index{foo}                   & foo\\
+\verb+\Index{foo!bar}+                  & \Index{foo!bar}               & foo\\
+                                        &                                            & \kern1em bar\\
+\verb+\Index{foo!bar!baz}+              & \Index{foo!bar!baz}           & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em baz\\
+\verb+\Index{foo@\textsc{foo}}+         & \Index{foo@\textsc{foo}}      & \textsc{foo}\\
+\verb+\Index{foo!bar@\textsf{baz}}+     & \Index{foo!bar@\textsf{bar}}  & foo\\
+                                        &                                            & \kern1em\textsf{bar}\\
+\verb+\Index{foo!bar!baz@\texttt{baz}}+ & \Index{foo!bar!baz@\texttt{baz}}&foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em \texttt{baz}\\
+\verb+\Index{foo@\textsc{foo}!bar}+     & \Index{foo@\textsc{foo}!bar}  & \textsc{foo}\\
+                                        &                                            & \kern1em bar\\
+\verb+\Index{foo!bar@\textsc{bar}!baz}+ & \Index{foo!bar@\textsc{bar}!baz}& foo\\
+                                        &                                            & \kern1em\textsc{bar}\\
+                                        &                                            & \kern2em baz\\
+\verb+\Index{foo@\textsc{foo}}+         & \Index{foo@\textsc{foo}}      & \textsc{foo}\\ 
+\verb+\Index{foo!bar@\textsf{baz}}+     & \Index{foo!bar@\textsf{bar}}  & foo\\
+                                        &                                            & \kern1em\textsf{bar}\\
+\verb+\Index{foo!bar!baz@\texttt{baz}}+ & \Index{foo!bar!baz@\texttt{baz}}& foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\texttt{baz}\\
+\verb+\ttIndex{foo}+                    & \ttIndex{foo} & \texttt{foo}\\
+\verb+\bfIndex{foo}+                    & \bfIndex{foo} & \textbf{foo}\\
+\verb+\sfIndex{foo}+                    & \sfIndex{foo} & \textsf{foo}\\
+\verb+\scIndex{foo}+                    & \scIndex{foo} & \textsc{foo}\\
+\verb+\itIndex{foo}+                    & \itIndex{foo} & \textit{foo}\\
+\verb+\ttIndex{foo!bar}+                & \ttIndex{foo!bar} & foo\\
+                                        &                                            & \kern1em\texttt{bar}\\
+\verb+\bfIndex{foo!bar}+                & \bfIndex{foo!bar} & foo\\
+                                        &                                            & \kern1em\textbf{bar}\\
+\verb+\sfIndex{foo!bar}+                & \sfIndex{foo!bar} & foo\\
+                                        &                                            & \kern1em\textsf{bar}\\
+\verb+\scIndex{foo!bar}+                & \scIndex{foo!bar} & foo\\
+                                        &                                            & \kern1em\textsc{bar}\\
+\verb+\itIndex{foo!bar}+                & \itIndex{foo!bar} & foo\\
+                                        &                                            & \kern1em\textit{bar}\\
+\clearpage
+\verb+\ttIndex{foo!bar!baz}+            & \ttIndex{foo!bar!baz} & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\texttt{baz}\\
+\verb+\bfIndex{foo!bar!baz}+            & \bfIndex{foo!bar!baz} & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\textbf{baz}\\
+\verb+\sfIndex{foo!bar!baz}+            & \sfIndex{foo!bar!baz} & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\textsf{baz}\\
+\verb+\scIndex{foo!bar!baz}+            & \scIndex{foo!bar!baz} & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\textsc{baz}\\
+\verb+\itIndex{foo!bar!baz}+            & \itIndex{foo!bar!baz} & foo\\
+                                        &                                            & \kern1em bar\\
+                                        &                                            & \kern2em\textit{baz}\\\hline
+\verb+\sIndex{foo|bar}+                 & \sIndex{foo|bar}    & foo, see bar \\
+\verb+\saIndex{baz|bar}+                & \saIndex{baz|bar}& baz, see also bar\\\hline
+
+\end{longtable}
+
+It is not easy to get the braces into an index, because \verb+\index+ reads its argument \Index{verbatim}.
+The package defines the follwong macros:
+
+\verb+\iBraceL+, which writes the \IBraceL{} into the \Index{index}, same for \verb+\iBraceR+ for the right \IBraceR.
+With the upper case variant it is writen into the index and also printed into the text,
+like this one: \IBraceL\ and \IBraceR\ (\verb|\IBraceL\ and \IBraceR|). The advantage of these macros is, that
+the \Index{braces} are sorted correct, the character \IVert{} (written as \verb|\IVert|) must appear between them and it does \ldots
+
+%BTW: with \texttt{hyperref} we have to write \verb+\index{{"|}}+, to get it as a correct \Index{link} into
+%the index. \texttt{hvindex} does it for you if you use \verb+\Index{"|}+.
+\index{bar}\iVert
+
+\clearpage
+\phantomsection
+\addcontentsline{toc}{section}{Index}
+\printindex
+\end{document}
+
+


Property changes on: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.pdf
===================================================================
(Binary files differ)

Deleted: trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.tex	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/texmf-dist/doc/latex/hvindex/hvindex.tex	2017-12-12 22:35:11 UTC (rev 46051)
@@ -1,140 +0,0 @@
-\listfiles
-\documentclass[ngerman]{article}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[osf]{mathpazo}
-\usepackage[scaled]{beramono}
-\usepackage{babel}
-\usepackage{longtable}
-\usepackage[makeidx]{hvindex}
-\usepackage[colorlinks,linktocpage]{hyperref}
-\providecommand\phantomsection{}
-\title{\texttt{hvindex}, v. \fileversion\\ simplifying indexing \ldots}
-\author{Herbert Voß}
-\date{\filedate}
-\begin{document}
-\maketitle
-
-\tableofcontents
-
-\section{Package options}
-With the \Index{option} \ttIndex{makeidx} the also called package is 
-loaded and the macro \texttt{\textbackslash{}makeindex}
-is executed.
-
-The package should be loaded \emph{after} package \ttIndex{babel}.
-
-\section{Introduction}
-The \Index{package} \ttIndex{hvindex} defines some \Index{macros}
-as a \Index{macro!replacement} for 
-\Index{macros!index@\texttt{\textbackslash index}} 
-which makes \Index{live} easier\index{easy}. You have to type every
-\Index{word} only \Index{once} to get it into the \Index{index} 
-and into the \Index{text}.
-
-
-\small
-\begin{verbatim}
-The \Index{package} \ttIndex{hvindex} defines some \Index{macros}
-as a \Index{macro!replacement} for 
-\Index{macros!index@\texttt{\textbackslash index}} 
-which makes \Index{live} easier\index{easy}. You have to type every
-\Index{word} only \Index{once} to get it into the \Index{index} 
-and into the \Index{text}.
-\end{verbatim}
-\normalsize
-
-
-\clearpage
-\section{The macros}
-
-\begin{longtable}{@{} l  l l @{}}\\\hline
-\emph{code} & \emph{Text} & \emph{index}\\\hline
-\endfirsthead
-\multicolumn{3}{@{}l}{\ldots\ continued from previous page}\\\hline
-\emph{code} & \emph{Text} & \emph{index}\\\hline
-\endhead
-\hline
-\multicolumn{3}{r@{}}{continued on next page \ldots}\\
-\hline
-\endfoot
-\hline
-\endlastfoot
-\verb+\Index{foo}+                      &$\Rightarrow$ \Index{foo}                   & foo\\
-\verb+\Index{foo!bar}+                  &$\Rightarrow$ \Index{foo!bar}               & foo\\
-                                        &                                            & \kern1em bar\\
-\verb+\Index{foo!bar!baz}+              &$\Rightarrow$ \Index{foo!bar!baz}           & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em baz\\
-\verb+\Index{foo@\textsc{foo}}+         &$\Rightarrow$ \Index{foo@\textsc{foo}}      & \textsc{foo}\\
-\verb+\Index{foo!bar@\textsf{baz}}+     &$\Rightarrow$ \Index{foo!bar@\textsf{bar}}  & foo\\
-                                        &                                            & \kern1em\textsf{bar}\\
-\verb+\Index{foo!bar!baz@\texttt{baz}}+ &$\Rightarrow$ \Index{foo!bar!baz@\texttt{baz}}&foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em \texttt{baz}\\
-\verb+\Index{foo@\textsc{foo}!bar}+     &$\Rightarrow$ \Index{foo@\textsc{foo}!bar}  & \textsc{foo}\\
-                                        &                                            & \kern1em bar\\
-\verb+\Index{foo!bar@\textsc{bar}!baz}+ &$\Rightarrow$ \Index{foo!bar@\textsc{bar}!baz}& foo\\
-                                        &                                            & \kern1em\textsc{bar}\\
-                                        &                                            & \kern2em baz\\
-\verb+\Index{foo@\textsc{foo}}+         &$\Rightarrow$ \Index{foo@\textsc{foo}}      & \textsc{foo}\\ 
-\verb+\Index{foo!bar@\textsf{baz}}+     &$\Rightarrow$ \Index{foo!bar@\textsf{bar}}  & foo\\
-                                        &                                            & \kern1em\textsf{bar}\\
-\verb+\Index{foo!bar!baz@\texttt{baz}}+ &$\Rightarrow$ \Index{foo!bar!baz@\texttt{baz}}& foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\texttt{baz}\\
-\verb+\ttIndex{foo}+                    &$\Rightarrow$ \ttIndex{foo} & \texttt{foo}\\
-\verb+\bfIndex{foo}+                    &$\Rightarrow$ \bfIndex{foo} & \textbf{foo}\\
-\verb+\sfIndex{foo}+                    &$\Rightarrow$ \sfIndex{foo} & \textsf{foo}\\
-\verb+\scIndex{foo}+                    &$\Rightarrow$ \scIndex{foo} & \textsc{foo}\\
-\verb+\itIndex{foo}+                    &$\Rightarrow$ \itIndex{foo} & \textit{foo}\\
-\verb+\ttIndex{foo!bar}+                &$\Rightarrow$ \ttIndex{foo!bar} & foo\\
-                                        &                                            & \kern1em\texttt{bar}\\
-\verb+\bfIndex{foo!bar}+                &$\Rightarrow$ \bfIndex{foo!bar} & foo\\
-                                        &                                            & \kern1em\textbf{bar}\\
-\verb+\sfIndex{foo!bar}+                &$\Rightarrow$ \sfIndex{foo!bar} & foo\\
-                                        &                                            & \kern1em\textsf{bar}\\
-\verb+\scIndex{foo!bar}+                &$\Rightarrow$ \scIndex{foo!bar} & foo\\
-                                        &                                            & \kern1em\textsc{bar}\\
-\verb+\itIndex{foo!bar}+                &$\Rightarrow$ \itIndex{foo!bar} & foo\\
-                                        &                                            & \kern1em\textit{bar}\\
-\clearpage
-\verb+\ttIndex{foo!bar!baz}+            &$\Rightarrow$ \ttIndex{foo!bar!baz} & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\texttt{baz}\\
-\verb+\bfIndex{foo!bar!baz}+            &$\Rightarrow$ \bfIndex{foo!bar!baz} & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\textbf{baz}\\
-\verb+\sfIndex{foo!bar!baz}+            &$\Rightarrow$ \sfIndex{foo!bar!baz} & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\textsf{baz}\\
-\verb+\scIndex{foo!bar!baz}+            &$\Rightarrow$ \scIndex{foo!bar!baz} & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\textsc{baz}\\
-\verb+\itIndex{foo!bar!baz}+            &$\Rightarrow$ \itIndex{foo!bar!baz} & foo\\
-                                        &                                            & \kern1em bar\\
-                                        &                                            & \kern2em\textit{baz}\\\hline
-\verb+\sIndex{foo|bar}+                 &$\Rightarrow$ \sIndex{foo|bar}    & foo, see bar \\
-\verb+\saIndex{baz|bar}+                &$\Rightarrow$ \saIndex{baz|bar}& baz, see also bar\\\hline
-
-\end{longtable}
-
-It is not easy to get the braces into an index, because \verb+\index+ reads its argument \Index{verbatim}.
-The package defines the follwong macros:
-
-\verb+\iBraceL+, which writes the \IBraceL{} into the \Index{index}, same for \verb+\iBraceR+ for the right \IBraceR.
-With the upper case variant it is writen into the index and also printed into the text,
-like this one: \IBraceL\ and \IBraceR\ (\verb|\IBraceL\ and \IBraceR|). The advantage of these macros is, that
-the \Index{braces} are sorted correct.
-%, the character \Index{"|} must appear between them and it does \ldots
-%BTW: with \texttt{hyperref} we have to write \verb+\index{{"|}}+, to get it as a correct \Index{link} into
-%the index. \texttt{hvindex} does it for you if you use \verb+\Index{"|}+.
-\index{bar}\index{{"|}}
-
-\clearpage
-\phantomsection
-\addcontentsline{toc}{section}{Index}
-\printindex
-\end{document}
-
-

Modified: trunk/Master/texmf-dist/tex/latex/hvindex/hvindex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvindex/hvindex.sty	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/texmf-dist/tex/latex/hvindex/hvindex.sty	2017-12-12 22:35:11 UTC (rev 46051)
@@ -5,7 +5,7 @@
 %% This is file `hvindex.sty',
 %%
 %% Herbert Voss <herbert at dante.de>
-%% October 01, 2009
+%% October 01, 2009-
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -15,60 +15,56 @@
 %%   `hvindex' offers macros for simplifing indexing of words
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{0.03}
-\def\filedate{2009/10/24}
-%
-\ProvidesPackage{hvindex}[\filedate\ \fileversion\ Index macros (hv)]
+\def\fileversion{0.04}
+\def\filedate{2017/12/12}
 \message{`hvindex' v\fileversion, \filedate\space (hv)}
 %
+\ProvidesPackage{hvindex}[\filedate~Index macros (hv)]
+%
+\RequirePackage{xkeyval}
 \newif\ifhv at makeidx\hv at makeidxfalse
-\DeclareOption{makeidx}{\hv at makeidxtrue}
-\ProcessOptions\relax
+\DeclareOptionX{makeidx}{\hv at makeidxtrue}
+\newcommand*\hv at index@quote{>}
+\DeclareOptionX{quote}{\renewcommand*\hv at index@quote{#1}}
 
+
+\ProcessOptionsX\relax
+
 \ifhv at makeidx
-  \RequirePackage{makeidx}\makeindex
+  \RequirePackage{makeidx}
+  \makeindex
 \fi
 %
 \let\IndexNIL\@nil
 \def\hvIDXfontDefault#1{#1}
 \let\hvIDXfont\hvIDXfontDefault
-%\providecommand*\shorthandoff[1]{}
-%\providecommand*\shorthandon[1]{}
-\newif\ifhvShortHandOff\hvShortHandOfffalse
-%\ifcat"~\shorthandoff{"}\hvShortHandOfftrue\fi
-\def\hvEncap{"|}
 %
 \makeatother
 \def\Index#1{\expandafter\IndexXi#1!!!\IndexNIL}
 \def\IndexXi#1!#2!#3!#4\IndexNIL{%
-  \ifx\relax#3\relax 			% 	no 3rd argument
-    \ifx\relax#2\relax			% 	no 2nd argument
-      \IndexXXi#1@@\IndexNIL		% 	scan #1 for @
-    \else\IndexXXii#1!#2@@\IndexNIL\fi	% 	scan #2 for @
+  \ifx\relax#3\relax% 			% 	no 3rd argument
+    \ifx\relax#2\relax%			% 	no 2nd argument
+      \IndexXXi#1@@==%\IndexNIL%		% 	scan #1 for @
+    \else\IndexXXii#1!#2@@\IndexNIL\fi%	% 	scan #2 for @
   \else\IndexXXiii#1!\noexpand#2!#3@@\IndexNIL% scan #3 for @
   \fi}
 \def\IndexXXi#1@#2@#3\IndexNIL{%
-  \ifx\relax#2\relax % 				no @ in last arg
-    \def\hvTemp{#1}%
-    \ifx\hvTemp\hvEncap\index{{#1}}#1\else% {{...}} to get "| with hyperref
-      \ifx\hvIDXfont\hvIDXfontDefault\index{#1}#1
-      \else\index{#1@\hvIDXfont{#1}}\hvIDXfont{#1}\fi\fi%#1
+  \ifx\relax#2\relax% 				no @ in last arg
+    \ifx\hvIDXfont\hvIDXfontDefault
+    \index{#1}#1%
+    \else\index{#1@\hvIDXfont{#1}}\hvIDXfont{#1}\fi%#1
   \else\index{#1@#2}#2\fi}%		% #1@#2
 %
 \def\IndexXXii#1!#2@#3@#4\IndexNIL{%
   \ifx\relax#3\relax 		% 		no @ in last arg
-    \def\hvTemp{#2}%
-    \ifx\hvTemp\hvEncap\index{#1!{#2}}#2\else
-      \ifx\hvIDXfont\hvIDXfontDefault\index{#2}#2
-      \else\index{#1!#2@\hvIDXfont{#2}}\hvIDXfont{#2}\fi\fi%
+    \ifx\hvIDXfont\hvIDXfontDefault\index{#2}#2%
+    \else\index{#1!#2@\hvIDXfont{#2}}\hvIDXfont{#2}\fi%
   \else\index{#1!\protect#2@#3}#3\fi}
 %
 \def\IndexXXiii#1!#2!#3@#4@#5\IndexNIL{%
   \ifx\relax#4\relax 		% 		no @ in last arg
-    \def\hvTemp{#3}%
-    \ifx\hvTemp\hvEncap\index{#1!#2!{#3}}#3\else
-      \ifx\hvIDXfont\hvIDXfontDefault\index{#3}#3
-      \else\index{#1!#2!#3@\hvIDXfont{#3}}\hvIDXfont{#3}\fi\fi%
+    \ifx\hvIDXfont\hvIDXfontDefault\index{#3}#3%
+    \else\index{#1!#2!#3@\hvIDXfont{#3}}\hvIDXfont{#3}\fi%
   \else\index{#1!#2!\protect#3@#4}#4\fi}
 %
 \def\sfIndex#1{\let\hvIDXfont\textsf\Index{#1}\let\hvIDXfont\hvIDXfontDefault}
@@ -83,15 +79,15 @@
 \def\saIndex#1{\expandafter\saIndex at i#1\@nil}
 \def\saIndex at i#1|#2\@nil{\index{#1|seealso{#2}}#1}
 %
+\iffalse
 \begingroup
   \lccode`0=`\{
   \lccode`1=`\}
 \lowercase{%
   \endgroup
-  \newcommand\hv at BraceLeft{0}%
-  \newcommand\hv at BraceRight{1}%
+  \newcommand\hvBraceLeft{0}%
+  \newcommand\hvBraceRight{1}%
 }
-\iffalse
 \def\iBraceL{%
   \begingroup
     \edef\x{\endgroup
@@ -102,22 +98,26 @@
     \edef\x{\endgroup
       \noexpand\index{\string"\string{@\string\textbraceleft}%
     }\x}
-\fi
 %\begingroup
 %  \edef\x{\endgroup
 %    \noexpand\index{\string"\string{@\string\textbraceleft}%
 %  }%
 %\x
-\newcommand*{\hv at braceIndex}[1]{\index{#1}}
-\newcommand*\iBraceL{\hv at braceIndex{\string"\hv at BraceLeft @\string\textbraceleft}}
-\newcommand*\iBraceR{\hv at braceIndex{\string"\hv at BraceRight @\string\textbraceright}}
-\newcommand*\IBraceL{\hv at braceIndex{\string"\hv at BraceLeft @\string\textbraceleft}\{}
-\newcommand*\IBraceR{\hv at braceIndex{\string"\hv at BraceRight @\string\textbraceright}\}}
+\else
+%\newcommand*{\hv at braceIndex}[1]{\index{#1}}
+%\newcommand*\iBraceL{\hv at braceIndex{"\hvBraceLeft @\string\textbraceleft}}
+%\newcommand*\iBraceR{\hv at braceIndex{"\hvBraceRight @\string\textbraceright}}
+%\newcommand*\IBraceL{\hv at braceIndex{"\hvBraceLeft @\textbraceleft}\{}
+%\newcommand*\IBraceR{\hv at braceIndex{"\hvBraceRight @\textbraceright}\}}
+\def\iBraceL{\index{\char123}}
+\def\iBraceR{\index{\char125}}
+\def\iVert{\index{\char124}}
 
-%\newcommand*\iBraceL{\iBraceL}
-%\newcommand*\iBraceR{\iBraceR}
-%\newcommand*\IBraceL{\iBraceL\textbraceleft}
-%\newcommand*\IBraceR{\iBraceR\textbraceright}
-%\ifhvShortHandOff\shorthandon{"}\fi
+\fi
+\newcommand*\IBraceL{\iBraceL\textbraceleft}
+\newcommand*\IBraceR{\iBraceR\textbraceright}
+\newcommand*\IVert{\iVert|}
 
+
+
 \endinput

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2017-12-12 01:22:17 UTC (rev 46050)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2017-12-12 22:35:11 UTC (rev 46051)
@@ -542,6 +542,7 @@
  'hm-xbs',      "die 'skipping, use persian-hm-xbs'",
  'html2latex',  "die 'skipping, no self-locating of Perl modules'",
  'hvfloat',     "&MAKEflatten",
+ 'hvindex',     "&MAKEflatten",
  'hyph-utf8',   "&MAKEcopy",
  'hyphen-german',"die 'skipping, part of hyph-utf8'",
  'ibygrk',      "&MAKEflatten",



More information about the tex-live-commits mailing list