diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-29 22:46:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-29 22:46:11 +0000 |
commit | 64fe492d04d786d03d443b50d3834e1c6a1f6a53 (patch) | |
tree | 989dd683cc5c372b9f6bddd1202e7509375591e6 /Master/texmf-dist/source/support | |
parent | 37d0e4d4792840953b9a6b17a251924f32ca9f6f (diff) |
texosquery (29mar17)
git-svn-id: svn://tug.org/texlive/trunk@43641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/support')
-rw-r--r-- | Master/texmf-dist/source/support/texosquery/java/TeXOSQuery.java | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/support/texosquery/texosquery.dtx | 41 |
2 files changed, 36 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/support/texosquery/java/TeXOSQuery.java b/Master/texmf-dist/source/support/texosquery/java/TeXOSQuery.java index 882cd3afb44..aad5a50a790 100644 --- a/Master/texmf-dist/source/support/texosquery/java/TeXOSQuery.java +++ b/Master/texmf-dist/source/support/texosquery/java/TeXOSQuery.java @@ -53,7 +53,7 @@ import java.io.Serializable; * There's a debug mode to print error messages to STDERR to * investigate the reason for failure. * @author Nicola Talbot - * @version 1.2 + * @version 1.2.1 * @since 1.0 */ public class TeXOSQuery implements Serializable @@ -4299,8 +4299,8 @@ public class TeXOSQuery implements Serializable public static final int DEFAULT_COMPATIBLE=2; - private static final String VERSION_NUMBER = "1.2"; - private static final String VERSION_DATE = "2017-03-23"; + private static final String VERSION_NUMBER = "1.2.1"; + private static final String VERSION_DATE = "2017-03-28"; private static final char BACKSLASH = '\\'; private static final long ZERO = 0L; diff --git a/Master/texmf-dist/source/support/texosquery/texosquery.dtx b/Master/texmf-dist/source/support/texosquery/texosquery.dtx index a532e96c577..16dca119d00 100644 --- a/Master/texmf-dist/source/support/texosquery/texosquery.dtx +++ b/Master/texmf-dist/source/support/texosquery/texosquery.dtx @@ -53,7 +53,7 @@ \renewcommand{\meta@font@select}{\rmfamily\itshape} \makeatother -\CheckSum{3260} +\CheckSum{3292} \RecordChanges \PageIndex @@ -123,7 +123,7 @@ Organization for Standardization} %\author{Nicola L. C. Talbot\\ %\href{http://www.dickimaw-books.com/}{\nolinkurl{dickimaw-books.com}} %\and Paulo Cereda} -%\date{2017-03-23 (v1.2)} +%\date{2017-03-28 (v1.2.1)} %\maketitle % %\begin{abstract} @@ -157,7 +157,9 @@ Organization for Standardization} %\item \file{texosquery.jar}: requires at least Java~7, has medium locale %support, obeys \texttt{openin\_any} but has additional %restrictions imposed for security reasons (no listings outside the -%current working directory path); +%current working directory path); Note that Java 7 has reached its +%\href{http://www.oracle.com/technetwork/java/eol-135779.html}{end +%of life and is now deprecated}. %\item \file{texosquery-jre8.jar}: requires at least Java~8, has best locale %support, obeys \texttt{openin\_any} but has additional %restrictions imposed for security reasons (no listings outside the @@ -2580,7 +2582,7 @@ Organization for Standardization} % \end{macrocode} % Version info. % \begin{macrocode} -\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)} % \end{macrocode} % %\begin{macro}{\@texosquery@warn} @@ -6812,6 +6814,7 @@ Organization for Standardization} \let\@texosquery@currentsign\texosquerypatfmtplus \fi \@texosquery@digitindex=0\relax + \let\@texosquery@patfmt@dosep\empty \@texosquery@digitfoundfalse #1% \endgroup @@ -6833,6 +6836,7 @@ Organization for Standardization} % \end{macrocode} %\end{macro} % +%Macros to shift the decimal place. %\begin{macro}{\@texosquery@pos@shift} %\changes{1.2}{2017-03-23}{new} % \begin{macrocode} @@ -6904,10 +6908,10 @@ Organization for Standardization} \or \let\@texosquery@int\@texosquery@frac \edef\@texosquery@frac{0}% -% \end{macrocode} +% \end{macrocode} %Anything larger will require scientific notation. Hopefully the %pattern supports this. -% \begin{macrocode} +% \begin{macrocode} \fi } % \end{macrocode} @@ -7031,6 +7035,7 @@ Organization for Standardization} \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% @@ -7079,6 +7084,7 @@ Organization for Standardization} \fi \edef\@texosquery@current{\expandafter\@texosquery@gobble\@texosquery@mantissa}% \@texosquery@digitindex=0\relax + \let\@texosquery@patfmt@dosep\empty \@texosquery@digitfoundfalse #2}} % \end{macrocode} @@ -7105,6 +7111,7 @@ Organization for Standardization} \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% @@ -7112,7 +7119,13 @@ Organization for Standardization} \else \@texosquery@invalidpattern{#1}% \fi - \texosquerypatfmt@decsep +% \end{macrocode} +%\changes{1.2.1}{2017-03-28}{moved decimal sep} +%We can't display the decimal separator just yet as the pattern may +%not show any digits for the fractional part. So only do the +%separator just before the first digit. +% \begin{macrocode} + \let\@texosquery@patfmt@dosep\texosquerypatfmt@decsep \let\@texosquery@current\@texosquery@frac \@texosquery@digitindex=0\relax \@texosquery@digitfoundfalse @@ -7256,6 +7269,9 @@ Organization for Standardization} \ifx\@texosquery@currentsign\texosquerypatfmtminus \texosquerypatfmtminus \let\@texosquery@currentsign\empty + \else + \@texosquery@patfmt@dosep + \let\@texosquery@patfmt@dosep\empty \fi \fi \@texosquery@digitfoundtrue @@ -7324,6 +7340,9 @@ Organization for Standardization} \ifx\@texosquery@currentsign\texosquerypatfmtminus \texosquerypatfmtminus \let\@texosquery@currentsign\empty + \else + \@texosquery@patfmt@dosep + \let\@texosquery@patfmt@dosep\empty \fi \fi \@texosquery@digitfoundtrue @@ -7369,6 +7388,9 @@ Organization for Standardization} \else \ifx\texosquerypatminus\texosquerypatfmtminus \texosquerypatfmtminus + \else + \@texosquery@patfmt@dosep + \let\@texosquery@patfmt@dosep\empty \fi \fi \@texosquery@digitfoundtrue @@ -7414,6 +7436,9 @@ Organization for Standardization} \else \ifx\texosquerypatminus\texosquerypatfmtminus \texosquerypatfmtminus + \else + \@texosquery@patfmt@dosep + \let\@texosquery@patfmt@dosep\empty \fi \fi \@texosquery@digitfoundtrue @@ -7540,7 +7565,7 @@ Organization for Standardization} %Identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{texosquery}[2017/03/23 v1.2 (NLCT)] +\ProvidesPackage{texosquery}[2017/03/28 v1.2.1 (NLCT)] % \end{macrocode} %Load \file{texosquery.tex}: % \begin{macrocode} |