tiscreen (11jun21)

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

4 files changed, 50 insertions, 59 deletions

diff --git a/Master/texmf-dist/doc/latex/tiscreen/README b/Master/texmf-dist/doc/latex/tiscreen/README
index d5e7e22e3f6..dd49e6c91ba 100644
--- a/Master/texmf-dist/doc/latex/tiscreen/README
+++ b/Master/texmf-dist/doc/latex/tiscreen/README
@@ -4,7 +4,8 @@ This package mimics the screen of older Texas instruments dot matrix display
 calculators, specifically the TI-82 STATS.
 
 Changes:
-- 2021/07/07 Simplified characters table in documentation
+- 2021/06/10 Simplified example code in documentation
+- 2021/06/07 Simplified characters table in documentation
 - 2021/06/01 Added more characters
 - 2021/05/21 Minor README and documentation issues
 - 2021/05/17 Initial version
diff --git a/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.pdf b/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.pdf
index 145a8be7167..ff9ccf19b0d 100644
--- a/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.pdf
+++ b/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.tex b/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.tex
index b4112c25243..925cb809f8c 100644
--- a/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.tex
+++ b/Master/texmf-dist/doc/latex/tiscreen/tiscreen-doc.tex
@@ -6,17 +6,20 @@
 \usepackage[color]{tiscreen}
 \usepackage{multicol}
 \usepackage{hyperref}
-
-\usepackage{listings}
-\lstset{
-	numbers=left, numberstyle=\tiny,
+\usepackage{xspace}
+\usepackage{array}
+\usepackage{fancyvrb-ex}
+\fvset{
 	frame=single,
-	basicstyle=\footnotesize\ttfamily,
-	language=Tex,
+	label=\fbox{Source},
+	framesep=4mm,
+	numbers=left,
+	fontsize=\footnotesize,
 }
 
 \newcommand{\LCDsymb}[1]{\large \textLCD{1}|{#1}~|}
 \newcommand{\LCDcode}[1]{\texttt{\{#1\}}}
+\newcommand{\LCDcmd}{\textbackslash\texttt{LCD}\xspace}
 
 \title{TI calculator display\\{\small(TI-82 STATS)}}
 \author{Mustafa Ibrahim}
@@ -39,96 +42,83 @@
 \newpage
 
 \section{Quickstart}
-\tiscreen
-|4+1             |
-|               5|
-|Ans{sq}         |
-|              25|
-|                |
-|                |
-|                |
-|                |
 
-\begin{lstlisting}
-\documentclass{article}
-\usepackage[color]{tiscreen}
-% Remove 'color' to display in back and white
-
-\begin{document}
+\begin{SideBySideExample}[xrightmargin=6cm]
+%\usepackage[color]{tiscreen}
 
 \tiscreen
 |4+1             |
 |               5|
 |Ans{sq}         |
 |              25|
+|{fcur}          |
 |                |
 |                |
 |                |
-|                |
+\end{SideBySideExample}
 
-\end{document}
-\end{lstlisting}
 
 \section{Package option(s)}
 \subsection{Color}
-Using the \texttt{color} option will change the colors used by the
-\textbackslash\texttt{LCD} command. The colors are defined as
-\texttt{tiscreenfg} (foreground. i.e. font color) and \texttt{tiscreenbg}
-(background). These colors can be redefined like this:
+Using the \texttt{color} option will change the colors used by the \LCDcmd
+command. The colors are defined as \texttt{tiscreenfg} (foreground. i.e. font
+color) and \texttt{tiscreenbg} (background). These colors can be redefined like
+this:
 
-\begin{lstlisting}
+\begin{Verbatim}
 % Add this to your preamble
 \definecolor{tiscreenbg}{HTML}{5d9345}
 \definecolor{tiscreenfg}{HTML}{FFFFFF}
-\end{lstlisting}
+\end{Verbatim}
 
 \section{LCD size}
-The default LCD size is $8\times 16$ (the size of the TI-82 STATS). It can be
-changed by redefining the variables used to determine the size of the display
-or by using the original {\textbackslash LCD} command.
+The default LCD size is $8\times 16$ (the size of the TI-82
+STATS). It can be changed by redefining the variables used to
+determine the size of the display or by using the original
+\LCDcmd command.
 
-\begin{lstlisting}
-% First method:
+\begin{Verbatim}
+% First method (For entire document)
 \def\tiscreenX{16}
 \def\tiscreenY{8}
 
-% Second method:
+% Second method (Only once)
 \LCD{5}{11}
 |ANOTHER  |
 |EXAMPLE  |
 |WITH A   |
 |DIFFERENT|
 |SIZE     |
-\end{lstlisting}
+\end{Verbatim}
 
 \section{Additional defined characters} \LCDcolors{black}{white}
-\begin{tabular}{l|l|l}
+\begin{tabular}{l|l|>{\ttfamily}l}
 	\hline
 	\multicolumn{3}{c}{\textbf{Added characters}} \\
 	\hline \hline
-	Name			& Symbol		& Code \\
+	Name		& Symbol		&\normalfont{\LCDcmd Code} \\
 	\hline
-	E 			& \LCDsymb{sciE}	& \LCDcode{sciE} \\
-	$\sigma$ 		& \LCDsymb{sigma}	& \LCDcode{sigma} \\
-	$\bar x$		& \LCDsymb{barx}	& \LCDcode{barx} \\
-	$\bar y$		& \LCDsymb{bary}	& \LCDcode{bary} \\
-	$^\wedge 2$ 		& \LCDsymb{sq}		& \LCDcode{sq} \\
-	$^\wedge (-1)$		& \LCDsymb{ar}		& \LCDcode{ar} \\
-	$_1$			& \LCDsymb{sub1}	& \LCDcode{sub1} \\
-	$_2$			& \LCDsymb{sub2}	& \LCDcode{sub2} \\
-	$_3$			& \LCDsymb{sub3}	& \LCDcode{sub3} \\
-	$_4$			& \LCDsymb{sub4}	& \LCDcode{sub4} \\
-	$_5$			& \LCDsymb{sub5}	& \LCDcode{sub5} \\
-	$_6$			& \LCDsymb{sub6}	& \LCDcode{sub6} \\
+	E		& \LCDsymb{sciE}	& \{sciE\} \\
+	$\sigma$	& \LCDsymb{sigma}	& \{sigma\} \\
+	$\bar x$	& \LCDsymb{barx}	& \{barx\} \\
+	$\bar y$	& \LCDsymb{bary}	& \{bary\} \\
+	$x^2$		& \LCDsymb{sq}		& \{sq\} \\
+	$x^{-1}$	& \LCDsymb{ar}		& \{ar\} \\
+	$x_1$		& \LCDsymb{sub1}	& \{sub1\} \\
+	$x_2$		& \LCDsymb{sub2}	& \{sub2\} \\
+	$x_3$		& \LCDsymb{sub3}	& \{sub3\} \\
+	$x_4$		& \LCDsymb{sub4}	& \{sub4\} \\
+	$x_5$		& \LCDsymb{sub5}	& \{sub5\} \\
+	$x_6$		& \LCDsymb{sub6}	& \{sub6\} \\
 	\hline
 	\multicolumn{3}{c}{\textbf{Redefined characters}} \\
 	\hline \hline
-	!			& \LCDsymb{!}		& \LCDcode{!} \\
-	$\sqrt{\hphantom{0}}$ 	& \LCDsymb{sqrt}	& \LCDcode{sqrt} \\
-	e			& \LCDsymb{e}		& \texttt{e} \\
-	i			& \LCDsymb{i}		& \texttt{i} \\
-	v			& \LCDsymb{v}		& \texttt{v} \\
-	w			& \LCDsymb{w}		& \texttt{w} \\
+	!		& \LCDsymb{!}		& \{!\} \\
+	$\sqrt{x}$	& \LCDsymb{sqrt}	& \{sqrt\} \\
+	e		& \LCDsymb{e}		& e \\
+	i		& \LCDsymb{i}		& i \\
+	v		& \LCDsymb{v}		& v \\
+	w		& \LCDsymb{w}		& w \\
 \end{tabular}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/tiscreen/tiscreen.sty b/Master/texmf-dist/tex/latex/tiscreen/tiscreen.sty
index d1693eb1b26..3cc0136c8c0 100644
--- a/Master/texmf-dist/tex/latex/tiscreen/tiscreen.sty
+++ b/Master/texmf-dist/tex/latex/tiscreen/tiscreen.sty
@@ -4,7 +4,7 @@
 % license is at: http://www.latex-project.org/lppl.txt
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tiscreen}[2021/06/07 Ti calculator screen]
+\ProvidesPackage{tiscreen}[2021/06/10 Ti calculator screen]
 
 % TODO
 % Scaling option