4 files changed, 29 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xeindex/README b/Master/texmf-dist/doc/xelatex/xeindex/README
index fd11de2f3d0..3a77ed39eb4 100644
--- a/Master/texmf-dist/doc/xelatex/xeindex/README
+++ b/Master/texmf-dist/doc/xelatex/xeindex/README
@@ -1,4 +1,4 @@
-This is the README file for xeindex.sty v.0.1.
+This is the README file for xeindex.sty v.0.2.
 Read xeindex.pdf for the documentation.
 
 XeIndex, based on XeSearch, automatically 
diff --git a/Master/texmf-dist/doc/xelatex/xeindex/xeindex.pdf b/Master/texmf-dist/doc/xelatex/xeindex/xeindex.pdf
index ac077efc140..8f9b2b5a22c 100644
--- a/Master/texmf-dist/doc/xelatex/xeindex/xeindex.pdf
+++ b/Master/texmf-dist/doc/xelatex/xeindex/xeindex.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xeindex/xeindex.tex b/Master/texmf-dist/doc/xelatex/xeindex/xeindex.tex
index 13d4b4b4d05..6fb65423530 100644
--- a/Master/texmf-dist/doc/xelatex/xeindex/xeindex.tex
+++ b/Master/texmf-dist/doc/xelatex/xeindex/xeindex.tex
@@ -13,7 +13,7 @@
 \setsansfont[Mapping=tex-text]{Arial}
 \usepackage[paperwidth=23cm,paperheight=17.5cm,top=1.5cm,bottom=1.5cm,textwidth=14.5cm,right=1.5cm]{geometry}
 
-\ProduceFile{xeindex.sty}[xeindex][v.0.1][\the\year/\month/\day]
+\ProduceFile{xeindex.sty}[xeindex][v.0.2][\the\year/\month/\day]
 \let\printmacro\PrintMacro
 \newskip\macroskip
 \def\PrintMacro#1{%
@@ -262,6 +262,17 @@ hand, MakeIndex automatically creates page ranges as soon as
 an entry is found on at least three successive pages, unless you run it
 with the "-r" option.
 
+If you want a comma in the right part of the entry, enclose
+the entire entry, minus the MakeIndex operator if any, between braces, e.g.:
+
+\begin{example}
+\IndexList{writers}{Kafka={Kafka, Franz}}
+\end{example}
+
+\noindent
+(This did not work in version 0.1, and now it's corrected
+thanks to Simon Spiegel who indicated it to me.)
+
 \DescribeMacro{\StopIndexList\marg{lists}}\macroskip\baselineskip
 \DescribeMacro{\StopIndex}\macroskip2\baselineskip
 \DescribeMacro{\NoIndex\marg{text}}
@@ -479,15 +490,16 @@ associated macro is created.
 
 \DefineMacro\xi@MakeEntry
 This determines whether the entry starts with one
-of the MakeIndex operators.
+of the MakeIndex operators. 
 /
 \newif\ifxi@NoWord
+\def\xi@exclam{!} \def\xi@at{@} \def\xi@bar{|}
 \def\xi@MakeEntry#1#2={%
   \def\xi@temp{#1#2}%
   \xi@NoWordtrue
-  \expandafter\unless\expandafter\if\noexpand#1!%
-    \expandafter\unless\expandafter\if\noexpand#1@%
-      \expandafter\unless\expandafter\if\noexpand#1|%
+  \unless\ifx\xi@temp\xi@exclam
+    \unless\ifx\xi@temp\xi@at
+      \unless\ifx\xi@temp\xi@bar
         \xi@NoWordfalse
       \fi
     \fi
@@ -561,10 +573,8 @@ These are straightforward.
 Finally, we patch "\printindex" so it won't be searched,
 and sets xesearch's parameters.
 /
-\let\xi@PrintIndex\printindex
-\def\printindex{\StopIndex\xi@PrintIndex}
-\SortByLength{pPsS}
-\SearchOnlyOne{pPsS}
+\let\xi@PrintIndex\printindex \def\printindex{\StopIndex\xi@PrintIndex}
+\SortByLength{pPsS} \SearchOnlyOne{pPsS}
 \makeatother
 /
 \end{document}
diff --git a/Master/texmf-dist/tex/xelatex/xeindex/xeindex.sty b/Master/texmf-dist/tex/xelatex/xeindex/xeindex.sty
index 098e44a34ac..89ed574b7dc 100644
--- a/Master/texmf-dist/tex/xelatex/xeindex/xeindex.sty
+++ b/Master/texmf-dist/tex/xelatex/xeindex/xeindex.sty
@@ -5,9 +5,9 @@
 % without the `produce' option. 
 % 
 % SOURCE: xeindex.tex
-% DATE: 2009/10/24
-% VERSION: v.0.1
-\ProvidesPackage{xeindex}[2009/10/24 v.0.1 Automatic index for XeLaTeX.]
+% DATE: 2010/01/17
+% VERSION: v.0.2
+\ProvidesPackage{xeindex}[2010/01/17 v.0.2 Automatic index for XeLaTeX.]
 \RequirePackage{makeidx,xesearch}
 \makeatletter
 \newif\ifxi@mark
@@ -104,12 +104,13 @@
   \fi
   }
 \newif\ifxi@NoWord
+\def\xi@exclam{!} \def\xi@at{@} \def\xi@bar{|}
 \def\xi@MakeEntry#1#2={%
   \def\xi@temp{#1#2}%
   \xi@NoWordtrue
-  \expandafter\unless\expandafter\if\noexpand#1!%
-    \expandafter\unless\expandafter\if\noexpand#1@%
-      \expandafter\unless\expandafter\if\noexpand#1|%
+  \unless\ifx\xi@temp\xi@exclam
+    \unless\ifx\xi@temp\xi@at
+      \unless\ifx\xi@temp\xi@bar
         \xi@NoWordfalse
       \fi
     \fi
@@ -159,8 +160,6 @@
   #1%
   \egroup
   }
-\let\xi@PrintIndex\printindex
-\def\printindex{\StopIndex\xi@PrintIndex}
-\SortByLength{pPsS}
-\SearchOnlyOne{pPsS}
+\let\xi@PrintIndex\printindex \def\printindex{\StopIndex\xi@PrintIndex}
+\SortByLength{pPsS} \SearchOnlyOne{pPsS}
 \makeatother