texosquery (29mar17)

git-svn-id: svn://tug.org/texlive/trunk@43641 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 19 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
index f88771a6934..95aeff3b3d0 100644
--- a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
+++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
@@ -43,7 +43,7 @@
 %%   Right brace   \}     Tilde         \~}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{texosquery}[2017/03/23 v1.2 (NLCT)]
+\ProvidesPackage{texosquery}[2017/03/28 v1.2.1 (NLCT)]
 \input{texosquery}
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.tex b/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
index 843196b21a7..9bc4aad662a 100644
--- a/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
+++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
@@ -54,7 +54,7 @@
   \@texosquery@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@texosquery.tex\endcsname{2017/03/23 v1.2 (NLCT)}
+\expandafter\def\csname ver@texosquery.tex\endcsname{2017/03/28 v1.2.1 (NLCT)}
 \ifx\@tracklang@pkgwarn\undefined
   \ifx\PackageWarning\undefined
     \def\@texosquery@warn#1{%
@@ -1397,6 +1397,7 @@
      \let\@texosquery@currentsign\texosquerypatfmtplus
    \fi
    \@texosquery@digitindex=0\relax
+   \let\@texosquery@patfmt@dosep\empty
    \@texosquery@digitfoundfalse
    #1%
   \endgroup
@@ -1561,6 +1562,7 @@
 \def\texosquerypatfmt@plusminus#1#2{%
  \edef\@texosquery@current{\expandafter\@texosquery@gobble\@texosquery@int}%
  \@texosquery@digitindex=0\relax
+ \let\@texosquery@patfmt@dosep\empty
  \@texosquery@digitfoundfalse
  \expandafter\ifx\@texosquery@sgn-%
   #2%
@@ -1592,6 +1594,7 @@
  \fi
  \edef\@texosquery@current{\expandafter\@texosquery@gobble\@texosquery@mantissa}%
  \@texosquery@digitindex=0\relax
+ \let\@texosquery@patfmt@dosep\empty
  \@texosquery@digitfoundfalse
  #2}}
 \def\texosquerypatfmtdecsep{.}
@@ -1599,6 +1602,7 @@
 \def\texosquerypatfmt@dec#1#2{%
  \edef\@texosquery@current{\expandafter\@texosquery@gobble\@texosquery@int}%
  \@texosquery@digitindex=0\relax
+ \let\@texosquery@patfmt@dosep\empty
  \@texosquery@digitfoundfalse
  \let\@texosquery@zerodigit\@texosquery@zerodigit@leading
  #1%
@@ -1606,7 +1610,7 @@
  \else
   \@texosquery@invalidpattern{#1}%
  \fi
- \texosquerypatfmt@decsep
+ \let\@texosquery@patfmt@dosep\texosquerypatfmt@decsep
  \let\@texosquery@current\@texosquery@frac
  \@texosquery@digitindex=0\relax
  \@texosquery@digitfoundfalse
@@ -1688,6 +1692,9 @@
    \ifx\@texosquery@currentsign\texosquerypatfmtminus
     \texosquerypatfmtminus
     \let\@texosquery@currentsign\empty
+   \else
+    \@texosquery@patfmt@dosep
+    \let\@texosquery@patfmt@dosep\empty
    \fi
  \fi
  \@texosquery@digitfoundtrue
@@ -1751,6 +1758,9 @@
      \ifx\@texosquery@currentsign\texosquerypatfmtminus
       \texosquerypatfmtminus
       \let\@texosquery@currentsign\empty
+     \else
+       \@texosquery@patfmt@dosep
+       \let\@texosquery@patfmt@dosep\empty
      \fi
    \fi
    \@texosquery@digitfoundtrue
@@ -1790,6 +1800,9 @@
    \else
      \ifx\texosquerypatminus\texosquerypatfmtminus
       \texosquerypatfmtminus
+     \else
+       \@texosquery@patfmt@dosep
+       \let\@texosquery@patfmt@dosep\empty
      \fi
    \fi
    \@texosquery@digitfoundtrue
@@ -1829,6 +1842,9 @@
    \else
      \ifx\texosquerypatminus\texosquerypatfmtminus
       \texosquerypatfmtminus
+     \else
+       \@texosquery@patfmt@dosep
+       \let\@texosquery@patfmt@dosep\empty
      \fi
    \fi
    \@texosquery@digitfoundtrue