4 files changed, 48 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/latex/refcheck/README b/Master/texmf-dist/doc/latex/refcheck/README
index 16e9de22c26..94ad7f1cc61 100644
--- a/Master/texmf-dist/doc/latex/refcheck/README
+++ b/Master/texmf-dist/doc/latex/refcheck/README
@@ -5,4 +5,4 @@ it displays label and bibitem `keys' in text margins.
 
 RefDemo.tex is a short description of usage of RefCheck.sty.
 
-Oleg Motygin, mov@snark.ipme.ru
+Oleg Motygin, mov222@gmail.com
diff --git a/Master/texmf-dist/doc/latex/refcheck/refdemo.pdf b/Master/texmf-dist/doc/latex/refcheck/refdemo.pdf
index 20fd6bbe3ef..2640d8692aa 100644
--- a/Master/texmf-dist/doc/latex/refcheck/refdemo.pdf
+++ b/Master/texmf-dist/doc/latex/refcheck/refdemo.pdf
diff --git a/Master/texmf-dist/doc/latex/refcheck/refdemo.tex b/Master/texmf-dist/doc/latex/refcheck/refdemo.tex
index 0eb5372dcd6..a40d2c9c5af 100644
--- a/Master/texmf-dist/doc/latex/refcheck/refdemo.tex
+++ b/Master/texmf-dist/doc/latex/refcheck/refdemo.tex
@@ -17,8 +17,8 @@
 \def\AmS{\mbox{$\mathcal{A}$\kern-0.17em\raise-2.1pt\hbox{$\mathcal{M}$}%
 \kern-0.115em$\mathcal{S}$}}
 \renewcommand{\refname}{{\normalsize References}}
-\def\curversion{1.9}
-\def\curvertime{2004/03/31}
+\def\curversion{1.9.1}
+\def\curvertime{2013/02/14}
 
 \section*{\RefCheck{\tiny${}^{\mathrm{\ \ ver.
 \curversion}}_{\mathrm{\curvertime}}$} for \LaTeXe}
@@ -29,7 +29,7 @@ with \LaTeXe. The package looks for useless labels,
 unlabelled equations, unused bibliography references
 and puts `keys' of labels on margins.
 
-To start checking one should just write
+To start checking, one should just write
 \begin{verbatim}
      \documentclass{article}
      \usepackage{refcheck}
@@ -55,8 +55,8 @@ written as
 Then the \texttt{.log} file will contains the following messages:
 {\small
 \begin{verbatim}
- <Info by RefCheck> Unused label `eq.2' on page 1
- <Info by RefCheck> Unlabelled equation (3) on page 1
+ Package refcheck Warning: Unused label `eq.2' on input line 44.
+ Package refcheck Warning: Unlabelled equation (3) on input line 46.
 \end{verbatim}
 }
 \noindent
@@ -83,9 +83,9 @@ Consider the following short list of books:
 \vspace{-1\baselineskip}
 
 \begin{thebibliography}{9}
-\bibitem{book1}A book.
-\bibitem{book2}Another book.
-\bibitem{book3}Third book.
+ \bibitem{book1}A book.
+ \bibitem{book2}Another book.
+ \bibitem{book3}Third book.
 \end{thebibliography}
 defined as follows
 \begin{verbatim}
@@ -100,7 +100,7 @@ command \verb#\cite{book1,book2}# and do not use the label
 `book3'. Then, the \texttt{.log} file will contain the following message
 {\small
 \begin{verbatim}
- <Info by RefCheck> Unused bibitem `book3' on page 2
+ Package refcheck Warning: Unused bibitem `book3' on input line 88.
 \end{verbatim}}
 
 Commands \verb#\showcitenames# and \verb#\nocitenames# for
@@ -212,11 +212,15 @@ processed to \verb#\write#, in particular, to be put into \texttt{.toc},
 problem. Besides, some more work was done to provide compability with
 \AmS-\LaTeX\ and \textbf{hyperref}.
 
-\item The current version \textbf{\curversion} adds possibility to check
-usage of labels in external files. More compability with \textbf{cite} package
-was achieved.
+\item The version \textbf{1.9} added possibility to check usage of labels in external
+files. More compability with \textbf{cite} package was achieved.
 
-\medskip
+\item The current minor version \textbf{\curversion} is intended to fix the bug discussed
+at \\
+{\small\texttt{http://tex.stackexchange.com/questions/88046/problem-with-refcheck}}.\\
+Besides, the format of refcheck warnings is changed.
+
+\bigskip
 
 \textbf{New options and commands:}
 
diff --git a/Master/texmf-dist/tex/latex/refcheck/refcheck.sty b/Master/texmf-dist/tex/latex/refcheck/refcheck.sty
index 702042f4158..c6f4fc29394 100644
--- a/Master/texmf-dist/tex/latex/refcheck/refcheck.sty
+++ b/Master/texmf-dist/tex/latex/refcheck/refcheck.sty
@@ -2,11 +2,11 @@
 % checks lost and useless labels, shows `keys' of \label
 % in the margins
 %
-% version 1.9 for LaTeX2e
-% 31 March 2004
+% version 1.9.1 for LaTeX2e, 14 February 2013
+% (minor correction of ver. 1.9, issued on 31 March 2004)
 %
-% Copyright 1997--2004 by Oleg Motygin
-% (mov@snark.ipme.ru, mov@mail15.com)
+% Copyright 1997--2004, 2013 by Oleg Motygin
+% (mov222@gmail.com, mov@mail15.com)
 % this program is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License
 %
@@ -24,9 +24,9 @@
 % Options msgs (default) and nomsgs state whether refcheck writes
 % its messages to .log file or not.
 % The messages have the format
-% <Info by RefCheck> Unused bibitem..
-% <Info by RefCheck> Unused label..
-% <Info by RefCheck> Unlabelled equation..
+% Package refcheck Warning: Unused bibitem..
+% Package refcheck Warning: Unused label..
+% Package refcheck Warning: Unlabelled equation..
 %
 % The check of unlabelled equations can be switched off by the option
 % ignoreunlbld and on (default) by the option chkunlbld.
@@ -50,10 +50,10 @@
 %
 
 \def\filename{refcheck}
-\def\fileversion{v1.9}
-\def\filedate{2004/03/31}
+\def\fileversion{v1.9.1}
+\def\filedate{2013/02/14}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{refcheck}[2004/03/31 v1.9]
+\ProvidesPackage{refcheck}[2013/02/14 v1.9.1]
 
 \let\mark@size=\footnotesize
 \newif\if@labelled
@@ -86,14 +86,14 @@
 \def\checkunlbld{\global\@show@unl@bldtrue}
 \def\ignoreunlbld{\global\@show@unl@bldfalse}
 
-\def\@warning@rc@#1{\if@give@msgs\typeout{<Info by RefCheck> #1}\else\relax\fi}
+\def\@warning@rc@#1{\if@give@msgs\PackageWarning{refcheck}{#1}\else\relax\fi}
 
 \newif\if@unsdlbl
 
 \newtoks\btoks
 
 \AtBeginDocument{%
-\typeout{Package: `refcheck' v1.9\space<2004/03/31>}%
+\typeout{Package: `refcheck' v1.9.1\space<2013/02/14>}%
 \typeout{options: showrefs, showcites, msgs, chckunlbld}%
 \immediate\write\@auxout{%
   \string\providecommand\string{\string\usedref\string}[1]%
@@ -106,7 +106,7 @@
 \renewcommand{\label}[1]{\@bsphack\global\@labelledtrue
   \gdef\last@lbl{\@verbatim@{#1}}%
   \@ifundefined{lab@#1}{\global\@unsdlbltrue
-  \@warning@rc@{Unused label `#1' on page \thepage}}%
+  \@warning@rc@{Unused label `#1'}}%
   {\global\@unsdlblfalse}%
   \ifmmode\relax\else
     {\setbox0=\vbox{\vss\@setnmmarginlbl}%
@@ -126,32 +126,33 @@
 \expandafter\DeclareRobustCommand\expandafter
   {\csname relax\string\pageref\endcsname}[1]{\@@pageref@@{#1}\wrtusdrf{#1}}%
 \expandafter\let\expandafter\pageref\csname relax\string\pageref\endcsname
-\renewcommand{\bibitem}[2][\@nil]{%
- \@ifundefined{cit@#2}{%
-  \@warning@rc@{Unused bibitem `#2' on page \thepage}%
+%
+\def\@bibitem@proceed@#1{%
+\@ifundefined{cit@#1}{\@warning@rc@{Unused bibitem `#1'}%
   \if@show@cite
     \gdef\@biblabel{\makebox[0pt][r]{\zero@height{{\mark@size{\bfseries\upshape?}}%
-      \underline{\@verbatim@{#2}}{\mark@size{\bfseries\upshape?}}$\,$}}%
-      \@@@biblabel@@
-    }%
+      \underline{\@verbatim@{#1}}{\mark@size{\bfseries\upshape?}}$\,$}}%
+      \@@@biblabel@@}%
   \fi
  }{%
   \if@show@cite
     \set@fbox@par
-    \gdef\@biblabel{\makebox[0pt][r]{\zero@height{\fbox{\@verbatim@{#2}}$\,$}}\@@@biblabel@@}%
+    \gdef\@biblabel{\makebox[0pt][r]{\zero@height{\fbox{\@verbatim@{#1}}$\,$}}\@@@biblabel@@}%
   \fi
- }%
- \ifx#1\@nil\@@bibitem@@{#2}%
- \else\@@bibitem@@[#1]{#2}%
- \fi
-}%
+ }}%
+\def\bibitem{\@ifnextchar[\@lbibitem@rc@\@bibitem@rc@}%
+\def\@lbibitem@rc@[#1]#2{%
+\@bibitem@proceed@{#2}\@@bibitem@@[#1]{#2}}%
+\def\@bibitem@rc@#1{%
+\@bibitem@proceed@{#1}\@@bibitem@@{#1}}%
+%
 \@ifpackageloaded{amsmath}{% With AMS-LaTeX tags
 \let\@@label@@in@@=\label@in@display
 \def\label@in@display#1{\@bsphack\global\@labelledtrue
   \gdef\last@lbl{\@verbatim@{#1}}%
   \@ifundefined{lab@#1}{%
     \global\@unsdlbltrue
-    \@warning@rc@{Unused label `#1' on page \thepage}}%
+    \@warning@rc@{Unused label `#1'}}%
   {\global\@unsdlblfalse}%
   \@@label@@in@@{#1}\@esphack
 }%
@@ -164,7 +165,7 @@
 \def\tagform@#1{\@tagform@@@@{#1}%
   \ifmeasuring@\relax\else\if@display
     \if@labelled\relax\else\if@show@unl@bld
-      \@warning@rc@{Unlabelled equation (\theequation) on page \thepage}%
+      \@warning@rc@{Unlabelled equation (\theequation)}%
     \fi\fi
     \@setmarginlbl
   \fi\fi
@@ -172,7 +173,7 @@
 }{\let\@@eqnnum@@=\@eqnnum
 \def\@eqnnum{%
   \if@labelled\relax\else\if@show@unl@bld
-    \@warning@rc@{Unlabelled equation (\theequation) on page \thepage}%
+    \@warning@rc@{Unlabelled equation (\theequation)}%
   \fi\fi
   \@@eqnnum@@
   \@setmarginlbl
@@ -214,7 +215,7 @@
 
 \def\zero@height#1{\setbox0=\hbox{#1}\dp0=0pt\ht0=0pt\copy0}
 
-\long\def\@verbatim@#1{\def\next{#1}%
+\long\def\@verbatim@#1{\edef\next{#1}%
   {\mark@size\ttfamily\upshape\frenchspacing\expandafter\@strip@\meaning\next}}
 \def\@strip@#1>{}