summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-12-12 22:35:11 +0000
committerKarl Berry <karl@freefriends.org>2017-12-12 22:35:11 +0000
commit30805115760a177fe5e900fba3a50daa015cd619 (patch)
tree9cbcc8fe55aa61eff189abbedae306de1e4ac25a
parent14bee2a0037224f3fcae29a24b09bb9ba37c982e (diff)
hvindex (12dec17)
git-svn-id: svn://tug.org/texlive/trunk@46051 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hvindex/Changes2
-rw-r--r--Master/texmf-dist/doc/latex/hvindex/README11
-rw-r--r--Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdfbin0 -> 74896 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex (renamed from Master/texmf-dist/doc/latex/hvindex/hvindex.tex)68
-rw-r--r--Master/texmf-dist/doc/latex/hvindex/hvindex.pdfbin80769 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/latex/hvindex/hvindex.sty88
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
7 files changed, 83 insertions, 87 deletions
diff --git a/Master/texmf-dist/doc/latex/hvindex/Changes b/Master/texmf-dist/doc/latex/hvindex/Changes
index 6a9f2578882..467f4082173 100644
--- a/Master/texmf-dist/doc/latex/hvindex/Changes
+++ b/Master/texmf-dist/doc/latex/hvindex/Changes
@@ -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
diff --git a/Master/texmf-dist/doc/latex/hvindex/README b/Master/texmf-dist/doc/latex/hvindex/README
index 527d6f326f6..0e5fa9ab4d2 100644
--- a/Master/texmf-dist/doc/latex/hvindex/README
+++ b/Master/texmf-dist/doc/latex/hvindex/README
@@ -1,16 +1,9 @@
-%% 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
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 @@ For more information see the documentation of your LaTeX distribution
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.
diff --git a/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf b/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
new file mode 100644
index 00000000000..815a79ade65
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvindex/hvindex.tex b/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex
index 464956fdf70..6791ba89c07 100644
--- a/Master/texmf-dist/doc/latex/hvindex/hvindex.tex
+++ b/Master/texmf-dist/doc/latex/hvindex/hvindex-doc.tex
@@ -1,9 +1,7 @@
\listfiles
\documentclass[ngerman]{article}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[osf]{mathpazo}
-\usepackage[scaled]{beramono}
+\usepackage{fontspec}
+\usepackage{dejavu-otf}
\usepackage{babel}
\usepackage{longtable}
\usepackage[makeidx]{hvindex}
@@ -60,62 +58,62 @@ and into the \Index{text}.
\endfoot
\hline
\endlastfoot
-\verb+\Index{foo}+ &$\Rightarrow$ \Index{foo} & foo\\
-\verb+\Index{foo!bar}+ &$\Rightarrow$ \Index{foo!bar} & foo\\
+\verb+\Index{foo}+ & \Index{foo} & foo\\
+\verb+\Index{foo!bar}+ & \Index{foo!bar} & foo\\
& & \kern1em bar\\
-\verb+\Index{foo!bar!baz}+ &$\Rightarrow$ \Index{foo!bar!baz} & foo\\
+\verb+\Index{foo!bar!baz}+ & \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\\
+\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}}+ &$\Rightarrow$ \Index{foo!bar!baz@\texttt{baz}}&foo\\
+\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}+ &$\Rightarrow$ \Index{foo@\textsc{foo}!bar} & \textsc{foo}\\
+\verb+\Index{foo@\textsc{foo}!bar}+ & \Index{foo@\textsc{foo}!bar} & \textsc{foo}\\
& & \kern1em bar\\
-\verb+\Index{foo!bar@\textsc{bar}!baz}+ &$\Rightarrow$ \Index{foo!bar@\textsc{bar}!baz}& foo\\
+\verb+\Index{foo!bar@\textsc{bar}!baz}+ & \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\\
+\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}}+ &$\Rightarrow$ \Index{foo!bar!baz@\texttt{baz}}& foo\\
+\verb+\Index{foo!bar!baz@\texttt{baz}}+ & \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\\
+\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}+ &$\Rightarrow$ \bfIndex{foo!bar} & foo\\
+\verb+\bfIndex{foo!bar}+ & \bfIndex{foo!bar} & foo\\
& & \kern1em\textbf{bar}\\
-\verb+\sfIndex{foo!bar}+ &$\Rightarrow$ \sfIndex{foo!bar} & foo\\
+\verb+\sfIndex{foo!bar}+ & \sfIndex{foo!bar} & foo\\
& & \kern1em\textsf{bar}\\
-\verb+\scIndex{foo!bar}+ &$\Rightarrow$ \scIndex{foo!bar} & foo\\
+\verb+\scIndex{foo!bar}+ & \scIndex{foo!bar} & foo\\
& & \kern1em\textsc{bar}\\
-\verb+\itIndex{foo!bar}+ &$\Rightarrow$ \itIndex{foo!bar} & foo\\
+\verb+\itIndex{foo!bar}+ & \itIndex{foo!bar} & foo\\
& & \kern1em\textit{bar}\\
\clearpage
-\verb+\ttIndex{foo!bar!baz}+ &$\Rightarrow$ \ttIndex{foo!bar!baz} & foo\\
+\verb+\ttIndex{foo!bar!baz}+ & \ttIndex{foo!bar!baz} & foo\\
& & \kern1em bar\\
& & \kern2em\texttt{baz}\\
-\verb+\bfIndex{foo!bar!baz}+ &$\Rightarrow$ \bfIndex{foo!bar!baz} & foo\\
+\verb+\bfIndex{foo!bar!baz}+ & \bfIndex{foo!bar!baz} & foo\\
& & \kern1em bar\\
& & \kern2em\textbf{baz}\\
-\verb+\sfIndex{foo!bar!baz}+ &$\Rightarrow$ \sfIndex{foo!bar!baz} & foo\\
+\verb+\sfIndex{foo!bar!baz}+ & \sfIndex{foo!bar!baz} & foo\\
& & \kern1em bar\\
& & \kern2em\textsf{baz}\\
-\verb+\scIndex{foo!bar!baz}+ &$\Rightarrow$ \scIndex{foo!bar!baz} & foo\\
+\verb+\scIndex{foo!bar!baz}+ & \scIndex{foo!bar!baz} & foo\\
& & \kern1em bar\\
& & \kern2em\textsc{baz}\\
-\verb+\itIndex{foo!bar!baz}+ &$\Rightarrow$ \itIndex{foo!bar!baz} & foo\\
+\verb+\itIndex{foo!bar!baz}+ & \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
+\verb+\sIndex{foo|bar}+ & \sIndex{foo|bar} & foo, see bar \\
+\verb+\saIndex{baz|bar}+ & \saIndex{baz|bar}& baz, see also bar\\\hline
\end{longtable}
@@ -125,11 +123,11 @@ 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
+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}\index{{"|}}
+\index{bar}\iVert
\clearpage
\phantomsection
diff --git a/Master/texmf-dist/doc/latex/hvindex/hvindex.pdf b/Master/texmf-dist/doc/latex/hvindex/hvindex.pdf
deleted file mode 100644
index b1dc16b70c9..00000000000
--- a/Master/texmf-dist/doc/latex/hvindex/hvindex.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvindex/hvindex.sty b/Master/texmf-dist/tex/latex/hvindex/hvindex.sty
index 7b39cb999f0..f6dba8e127a 100644
--- a/Master/texmf-dist/tex/latex/hvindex/hvindex.sty
+++ b/Master/texmf-dist/tex/latex/hvindex/hvindex.sty
@@ -5,7 +5,7 @@
%% This is file `hvindex.sty',
%%
%% Herbert Voss <herbert@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@makeidx\hv@makeidxfalse
-\DeclareOption{makeidx}{\hv@makeidxtrue}
-\ProcessOptions\relax
+\DeclareOptionX{makeidx}{\hv@makeidxtrue}
+\newcommand*\hv@index@quote{>}
+\DeclareOptionX{quote}{\renewcommand*\hv@index@quote{#1}}
+
+
+\ProcessOptionsX\relax
\ifhv@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@i#1\@nil}
\def\saIndex@i#1|#2\@nil{\index{#1|seealso{#2}}#1}
%
+\iffalse
\begingroup
\lccode`0=`\{
\lccode`1=`\}
\lowercase{%
\endgroup
- \newcommand\hv@BraceLeft{0}%
- \newcommand\hv@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@braceIndex}[1]{\index{#1}}
-\newcommand*\iBraceL{\hv@braceIndex{\string"\hv@BraceLeft @\string\textbraceleft}}
-\newcommand*\iBraceR{\hv@braceIndex{\string"\hv@BraceRight @\string\textbraceright}}
-\newcommand*\IBraceL{\hv@braceIndex{\string"\hv@BraceLeft @\string\textbraceleft}\{}
-\newcommand*\IBraceR{\hv@braceIndex{\string"\hv@BraceRight @\string\textbraceright}\}}
+\else
+%\newcommand*{\hv@braceIndex}[1]{\index{#1}}
+%\newcommand*\iBraceL{\hv@braceIndex{"\hvBraceLeft @\string\textbraceleft}}
+%\newcommand*\iBraceR{\hv@braceIndex{"\hvBraceRight @\string\textbraceright}}
+%\newcommand*\IBraceL{\hv@braceIndex{"\hvBraceLeft @\textbraceleft}\{}
+%\newcommand*\IBraceR{\hv@braceIndex{"\hvBraceRight @\textbraceright}\}}
+\def\iBraceL{\index{\char123}}
+\def\iBraceR{\index{\char125}}
+\def\iVert{\index{\char124}}
+
+\fi
+\newcommand*\IBraceL{\iBraceL\textbraceleft}
+\newcommand*\IBraceR{\iBraceR\textbraceright}
+\newcommand*\IVert{\iVert|}
+
-%\newcommand*\iBraceL{\iBraceL}
-%\newcommand*\iBraceR{\iBraceR}
-%\newcommand*\IBraceL{\iBraceL\textbraceleft}
-%\newcommand*\IBraceR{\iBraceR\textbraceright}
-%\ifhvShortHandOff\shorthandon{"}\fi
\endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c9859f7e5ad..a768395c86f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -542,6 +542,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'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",