summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/schooldocs/schooldocs.dtx121
-rw-r--r--macros/latex/contrib/schooldocs/schooldocs.ins4
-rw-r--r--macros/latex/contrib/schooldocs/schooldocs.pdfbin567470 -> 568734 bytes
-rw-r--r--macros/latex/contrib/tiscreen/README5
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdfbin133505 -> 150094 bytes
-rw-r--r--macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex58
-rw-r--r--macros/latex/contrib/tiscreen/tex/tiscreen.sty46
7 files changed, 153 insertions, 81 deletions
diff --git a/macros/latex/contrib/schooldocs/schooldocs.dtx b/macros/latex/contrib/schooldocs/schooldocs.dtx
index 284d239bcd..6d66e09605 100644
--- a/macros/latex/contrib/schooldocs/schooldocs.dtx
+++ b/macros/latex/contrib/schooldocs/schooldocs.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2020-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
% ----------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{schooldocs}
%<*package>
- [2020/07/13 v1.0 .dtx schooldocs file]
+ [2021/09/18 v1.1 .dtx schooldocs file]
%</package>
%
%<*driver>
@@ -58,7 +58,7 @@
% corresponds to \textsf{schooldocs}~\fileversion, dated \filedate.}}
\subject{Antoine Missier \\ %
\texttt{antoine.missier@ac-toulouse.fr}}
-\date{July 13, 2020, \fileversion}
+\date{\filedate, \fileversion}
\hypersetup{%
colorlinks,
@@ -76,7 +76,7 @@
%</driver>
% \fi
%
-% \CheckSum{792}
+% \CheckSum{766}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -96,9 +96,10 @@
%
%
% \changes{v0.0}{2010/09/01}{Initial personal version}
-% \changes{v0.1}{2020/01/05}{Initial documentation in french}
+% \changes{v0.1}{2020/01/05}{Initial documentation in French}
% \changes{v0.2}{2020/05/04}{Examples file}
-% \changes{v1.0}{2020/07/13}{Initial public version with documentation in english}
+% \changes{v1.0}{2020/07/13}{Initial public version with documentation in English}
+% \changes{v1.1}{2021/09/18}{Using the translations package for internationalization}
%
% \GetFileInfo{schooldocs.dtx}
%
@@ -107,7 +108,7 @@
% \section{Introduction}
%
% The purpose of this package is to provide several layout styles for school documents.
-% It can be used for exercices sheets, exams, course materials.
+% It can be used for exercises sheets, exams, course materials.
% The package sets the page geometry (dimensions of text and margins)
% and the title typesetting;
% the various \emph{styles} define the header, footer and title formatting,
@@ -140,7 +141,7 @@
% |\thispagestyle|\marg{style} at the page you want.
% For example, you can place the command |\thispagestyle{identity}|
% in an appendix page to render.
-% \subsection{Informations fields}
+% \subsection{Information fields}
%
% \DescribeMacro{\title}
% Usually a \LaTeX\ document title is made up of information
@@ -179,7 +180,7 @@
% So, if you do not want any date, just write |\date{}|.
% When title elements like subject, date are missing, the title height will be reduced accordingly.
%
-% Except |\date|, all these information macros accept multiline arguments,
+% Except |\date|, all these information macros accept multi-line arguments,
% for example |\school{Royal College of Pataphysics\\London}|.
% To typeset the main title on two (or more) lines, use |\\[1ex]|
% for a good vertical spacing.
@@ -213,7 +214,7 @@
% provided by the macro |\subtitle|\marg{text}. The parameter \meta{text}
% will be placed under the other title elements and before the separation rule,
% if there is one. For instance |\subtitle{Duration of the test: 2\,h}|.
-% For a multi-line argument, the linebreak instruction must be
+% For a multi-line argument, the line break instruction must be
% |\par| and not |\\|.
%
% \subsection{Making the title}
@@ -255,7 +256,7 @@
% which adds \textsf{-- Correct Version} to the title.
% It should be placed in the preamble.
% Combined with packages that deal with multiple versions of a document,
-% this macro avoids to define different titles for a an exercice sheet an its correct version.
+% this macro avoids to define different titles for a an exercise sheet an its correct version.
% However in the \textbf{exam} style, the text \textsf{Correct version}
% will not be added in the title (except in headers), but will be substituted for
% the subtitle.
@@ -419,9 +420,9 @@
% \textsf{geometry} (by Hideo Umeki and David Carlisle).
% According to good typographic practice (see the \LaTeX\ Companion,
% the \textsf{typearea} package or \textsf{KOMA-Script} bundle documentation)
-% the ratio between the text body (the type area as named by typographs)
+% the ratio between the text body (the type area as named by typographers)
% and the page size must be the same horizontally and vertically.
-% This ratio gauges the ``shades of grey'' of a page.
+% This ratio gauges the ``shades of gray'' of a page.
% The default scale in the \textsf{geometry} package is 0.7.
% For school documents, it seems that this setting leaves too much white space in the margins, thus this ratio has been set to 0.75.
% Of course, it can be freely redefined with the |\geometry| command.
@@ -443,7 +444,7 @@
% and lengths with |\setlength|.
% Most of command names are explicit enough to give some information about their use.
%
-% Let us specifiy nevertheless that |\titleflush| manages the alignment:
+% Let us specify nevertheless that |\titleflush| manages the alignment:
% centered by default, it can be left-aligned with
% |\renewcommand{\titleflush}{flushleft}| or right-aligned with
% |\renewcommand{\titleflush}{flushright}|\footnote{This macro has no effect
@@ -481,7 +482,7 @@
% \end{center}
%
% \DescribeMacro{\subtitlestyle}\DescribeMacro{\titlecorrectstyle}
-% The \textbf{exam} style has two additionnal setting macros:
+% The \textbf{exam} style has two additional setting macros:
% |\subtitlestyle|, set by default to |\large\slshape|,
% and |\titlecorrectstyle|, for the composition of \textsf{Correct Version}
% produced by |\correct|, set by default to |\color{red}\large\scshape|.
@@ -497,7 +498,7 @@
%
% \medskip
% \DescribeMacro{\boxedshape}
-% A particular formatting has been predefined to produce a slighlty shaded box around the title: |\boxedshape|\marg{text}
+% A particular formatting has been predefined to produce a slightly shaded box around the title: |\boxedshape|\marg{text}
% (thanks to the \textsf{fancybox} package by Timothy Van Zandt).
% It is not activated by default but it can be used within the
% command |\titlestyle| if we want to get this kind of effect, e.g.
@@ -553,19 +554,20 @@
% |\renewcommand\footrulewidth{0.4pt}|
%
% \subsection{Internationalization}
-% Four keywords are used by the package: page, Correct version, Name and Forename,
+% Four keywords are used by the package: \emph{page}, \emph{Correct version},
+% \emph{Name} and \emph{Forename},
% defined by the macros |\pagename|, |\correctname|, |\identityname| and |\identityforename|.
% |\pagename| is used in header or footer, |\correctname| by the macro |\correct|
% and both others by the \textbf{identity} style.
% These keywords get automatic translation in a few languages\footnote{Translation
% is currently integrated into the package for the following languages:
-% French, German, Spanish, Italian, Portuguese.}
-% when the \textsf{babel} package is loaded.
+% French, German, Spanish, Italian, Portuges.}
+% according to the selected language by \textsf{babel} package or \textsf{polyglossia}.
% They can be redefined, with |\renewcommand|,
% which should be placed \emph{after} |\begin{document}|,
-% or else we can use macros from the \textsf{babel} package
+% or else we can use macros from the \textsf{translations} package by Clemens Niederberger
% (allowing dynamic language change), e.g.\\
-% |\addto\captionsromanian{\def\pagename{pagin\u{a}}}| (in the preamble).
+% |\DeclareTranslation{romanian}{pagin\u{a}}| (in the preamble).
%
%
% \StopEventually{}
@@ -585,6 +587,7 @@
\RequirePackage{lastpage}
\RequirePackage{fancybox}
\RequirePackage{xcolor}
+\RequirePackage{translations}
\geometry{scale=0.75,vmarginratio=3:4,heightrounded}
@@ -597,47 +600,45 @@
% \subsection{Internationalization}
%
% \begin{macrocode}
-\providecommand{\pagename}{page}
-\def\correctname{Correct version}
-\def\identityname{Name:}
-\def\identityforename{Forename:}
+\DeclareTranslationFallback{schooldocs-pagename}{page}
+\DeclareTranslationFallback{schooldocs-correct}{Correct version}
+\DeclareTranslationFallback{schooldocs-name}{Name:}
+\DeclareTranslationFallback{schooldocs-forename}{Forename:}
-\newcommand\schooldocstranslate{%
- \@ifpackageloaded{babel}{%
- \addto\captionsfrench{%
- \def\correctname{Corrig\'e}
- \def\identityname{Nom :}
- \def\identityforename{Pr\'enom :}
- }
- \addto\captionsgerman{%
- \def\pagename{Seite}
- \def\correctname{Musterl\"osung}
- \def\identityname{Name :}
- \def\identityforename{Vorname :}
- }
- \addto\captionsspanish{%
- \def\pagename{p\'agina}
- \def\correctname{Correccion}
- \def\identityname{Apellido:}
- \def\identityforename{Nombre:}
- }
- \addto\captionsitalian{%
- \def\pagename{Seite}
- \def\correctname{Corretto}
- \def\identityname{Nome :}
- \def\identityforename{Conome :}
- }
- \addto\captionsportuges{%
- \def\pagename{p\'agina}
- \def\correctname{Corrigiu}
- \def\identityname{Nome :}
- \def\identityforename{Primeiro nome :}
- }
- }{}
- }
+\DeclareTranslation{english}{schooldocs-pagename}{page}
+\DeclareTranslation{english}{schooldocs-correct}{Correct version}
+\DeclareTranslation{english}{schooldocs-name}{Name:}
+\DeclareTranslation{english}{schooldocs-forename}{Forename:}
+
+\DeclareTranslation{french}{schooldocs-pagename}{page}
+\DeclareTranslation{french}{schooldocs-correct}{Corrigé}
+\DeclareTranslation{french}{schooldocs-name}{Nom :}
+\DeclareTranslation{french}{schooldocs-forename}{Prénom :}
+
+\DeclareTranslation{german}{schooldocs-pagename}{Seite}
+\DeclareTranslation{german}{schooldocs-correct}{Musterlösung}
+\DeclareTranslation{german}{schooldocs-name}{Name:}
+\DeclareTranslation{german}{schooldocs-forename}{Vorname:}
+
+\DeclareTranslation{spanish}{schooldocs-pagename}{página}
+\DeclareTranslation{spanish}{schooldocs-correct}{Correccion}
+\DeclareTranslation{spanish}{schooldocs-name}{Apellido:}
+\DeclareTranslation{spanish}{schooldocs-forename}{Nombre:}
+
+\DeclareTranslation{italian}{schooldocs-pagename}{pagina}
+\DeclareTranslation{italian}{schooldocs-correct}{Corretto}
+\DeclareTranslation{italian}{schooldocs-name}{Nome:}
+\DeclareTranslation{italian}{schooldocs-forename}{Conome:}
+
+\DeclareTranslation{portuges}{schooldocs-pagename}{página}
+\DeclareTranslation{portuges}{schooldocs-correct}{Corrigiu}
+\DeclareTranslation{portuges}{schooldocs-name}{Nome:}
+\DeclareTranslation{portuges}{schooldocs-forename}{Primeiro nome:}
-\AtBeginDocument{\schooldocstranslate} % if loaded before babel
-\schooldocstranslate % necessary when loaded after babel
+\newcommand*\pagename{\GetTranslation{schooldocs-pagename}}
+\newcommand*\correctname{\GetTranslation{schooldocs-correct}}
+\newcommand*\identityname{\GetTranslation{schooldocs-name}}
+\newcommand*\identityforename{\GetTranslation{schooldocs-forename}}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/schooldocs/schooldocs.ins b/macros/latex/contrib/schooldocs/schooldocs.ins
index f764055184..cc1b62e92c 100644
--- a/macros/latex/contrib/schooldocs/schooldocs.ins
+++ b/macros/latex/contrib/schooldocs/schooldocs.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2020-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2020-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
diff --git a/macros/latex/contrib/schooldocs/schooldocs.pdf b/macros/latex/contrib/schooldocs/schooldocs.pdf
index 28eb97e8bd..63716e22f3 100644
--- a/macros/latex/contrib/schooldocs/schooldocs.pdf
+++ b/macros/latex/contrib/schooldocs/schooldocs.pdf
Binary files differ
diff --git a/macros/latex/contrib/tiscreen/README b/macros/latex/contrib/tiscreen/README
index b7e593c24e..17f81e8592 100644
--- a/macros/latex/contrib/tiscreen/README
+++ b/macros/latex/contrib/tiscreen/README
@@ -1,9 +1,10 @@
tiscreen (TI calculator screen)
-This package mimics the screen of older Texas instruments dot matrix display
-calculators, specifically the TI-82 STATS.
+This package mimics the screen and buttons of older Texas instruments dot
+matrix display calculators, specifically the TI-82 STATS.
Changes:
+- 2021/09/18 Added buttons
- 2021/07/22 Added bracket symbols
- 2021/06/10 Simplified example code in documentation
- 2021/06/07 Simplified characters table in documentation
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
index 33e5b2d735..3b8f41078b 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
index dfe6216dc6..b1e689ba74 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
@@ -1,3 +1,5 @@
+% TODO: make funciton for printing \LCDcmd
+
\documentclass[a4paper,12pt]{article}
\usepackage[iso,english]{isodate}
\usepackage[margin=1in]{geometry}
@@ -17,9 +19,9 @@
}
\newcommand{\LCDsymb}[1]{\large \textLCD{1}|{#1}~|}
-\newcommand{\LCDcmd}{\texttt{\textbackslash LCD}}
+\newcommand{\printcmd}[1]{\texttt{\textbackslash #1}}
-\title{TI calculator display\\{\small(TI-82 STATS)}}
+\title{TI calculator screen (and buttons)\\{\small TI-82 STATS}}
\author{Mustafa Ibrahim}
\begin{document}
@@ -36,13 +38,15 @@
| 62.11246|
|{fcur} |
| |
+
+\tibtnmatrixextra
\end{center}
\tableofcontents\newpage
\section{Quickstart}
-\begin{SideBySideExample}[xrightmargin=6cm]
+\begin{SideBySideExample}[xrightmargin=5.5cm]
%\usepackage[color]{tiscreen}
\tiscreen
@@ -54,15 +58,23 @@
| |
| |
| |
+
+\tibtnmatrixextra
+
+Lorem
+\tibtn[white]{tibtngray}{MATH}
+ipsum
+
+\tibtnextra{\tibtn[white]{tibtngray}{MATH}}{TEST}{A}
\end{SideBySideExample}
\section{Package option(s)}
\subsection{Color}
-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:
+Using the \texttt{color} option will change the colors used by the
+\printcmd{LCD} command for printing the screen using \printcmd{tiscreen}. The
+colors are defined as \texttt{tiscreenfg} (foreground, i.e. font color) and
+\texttt{tiscreenbg} (background) and redefined like this:
\begin{Verbatim}
% Add this to your preamble
@@ -70,11 +82,12 @@ this:
\definecolor{tiscreenfg}{HTML}{FFFFFF}
\end{Verbatim}
+\part{Screen}
\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 \LCDcmd{} command.
+or by using the original \printcmd{LCD} command.
\begin{Verbatim}
% First method (For entire document)
@@ -95,7 +108,7 @@ or by using the original \LCDcmd{} command.
\begin{tabular}{|l|l|>{\ttfamily}l|}
\multicolumn{3}{c}{\textbf{Added characters}} \\
\hline
- Name & Symbol &\textnormal{\LCDcmd{} Code} \\
+ Name & Symbol &\textnormal{\printcmd{LCD} Code} \\
\hline
E & \LCDsymb{sciE} & \{sciE\} \\
$\sigma$ & \LCDsymb{sigma} & \{sigma\} \\
@@ -127,4 +140,31 @@ or by using the original \LCDcmd{} command.
\end{tabular}
\end{center}
+\part{Buttons}
+\section{Usage}
+
+Use the \printcmd{tibtn} command only prints the button and is usefull when
+needing the buttons to be displayed inline. The \printcmd{tibtnextra} takes
+extra arguments to show extra options for the button (accesed by the
+\tibtnsecond{} and \tibtnalpha{} buttons).
+
+\begin{SideBySideExample}[xrightmargin=5.5cm]
+\tibtnextra{\tibtn[white]{tibtngray}{MATH}}{TEST}{A}
+
+Lorem
+\tibtn[white]{tibtngray}{MATH}
+ipsum
+\end{SideBySideExample}
+
+\section{Defined buttons}
+
+\begin{center}
+ \begin{tabular}{|>{\ttfamily}l|l|}
+ \multicolumn{2}{c}{\textbf{Defined buttons}} \\ \hline
+ \textnormal{Command} & Output \\ \hline
+ \printcmd{tibtnmatrix} & \tibtnmatrix{} \\ \hline
+ \printcmd{tibtnmatrixextra} & \tibtnmatrixextra{} \\ \hline
+ \end{tabular}
+\end{center}
+
\end{document}
diff --git a/macros/latex/contrib/tiscreen/tex/tiscreen.sty b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
index 36cbdedfd4..d4219f1eb7 100644
--- a/macros/latex/contrib/tiscreen/tex/tiscreen.sty
+++ b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
@@ -1,18 +1,20 @@
% Copyright (C) 2021 Mustafa Ibrahim
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3c or higher. The latest version the
-% license is at: http://www.latex-project.org/lppl.txt
+% This work may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License, either version 1.3c or higher. The latest
+% version the license is at: http://www.latex-project.org/lppl.txt
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tiscreen}[2021/07/22 Ti calculator screen]
-
-% TODO: Scaling option
+\ProvidesPackage{tiscreen}[2021/09/18 Ti calculator screen]
\def\tiscreenX{16}
\def\tiscreenY{8}
\RequirePackage{lcd}
-% Define
+\RequirePackage{tikz}
+\RequirePackage{tcolorbox}
+\RequirePackage{array}
+
+% Define screen characters
\DefineLCDchar{barx}{11111000001000101010001000101010001}
\DefineLCDchar{bary}{11111000001000110001011110000101110}
\DefineLCDchar{ar}{00011000011100100001000010000000000}
@@ -26,7 +28,7 @@
\DefineLCDchar{sub5}{00000000000111001000011000001001100}
\DefineLCDchar{sub6}{00000000000011001000011100101001110}
\DefineLCDchar{cx}{00101000100010100000000000000000000}
-% Redefine
+% Redefine screen characters
\DefineLCDchar{sqrt}{00111001000010000100101000110000100}
\DefineLCDchar{!}{00100001000010000100000000010000100}
\DefineLCDchar{e}{00000000000111010001111101000001100}
@@ -39,11 +41,39 @@
\DefineLCDchar{rb}{11000001000010000010001000010011000}
\RequirePackage{xcolor}
+% Screen colors
\definecolor{tiscreenfg}{HTML}{000000}
\definecolor{tiscreenbg}{HTML}{5d9345}
+% Button colors
+\definecolor{tibtngray}{HTML}{494F54}
+\definecolor{tibtnyellow}{HTML}{F1E78B}
+\definecolor{tibtngreen}{HTML}{D5DE93}
+\definecolor{tibtnwhite}{HTML}{E2E2E2}
+\definecolor{tibtnblue}{HTML}{CDE2E9}
+\definecolor{tibtncaseblack}{HTML}{232A32}
\DeclareOption{color}{\LCDcolors{tiscreenfg}{tiscreenbg}}
\DeclareOption*{\PackageWarning{tiscreen}{Unknown ‘\CurrentOption’}}
\ProcessOptions\relax
+% Screen commands
\newcommand{\tiscreen}{\LCD{\tiscreenY}{\tiscreenX}}
+
+% Button commands
+\newcommand{\tibtn}[3][black]{\tikz{\bfseries\tiny\sffamily \node[fill=#2, draw, rounded corners, minimum height=2.5em, minimum width=4.5em, align=center] {\textcolor{#1}{#3}};}}
+\newcommand{\tibtnextra}[3]{%
+ \tcbox[colback=tibtncaseblack,size=small]{%
+ \begin{tabular}{l@{}r}%
+ \bfseries\tiny\sffamily \textcolor{tibtnyellow}{#2} &
+ \bfseries\tiny\sffamily \textcolor{tibtngreen}{#3} \\
+ \multicolumn{2}{c}{#1}
+ \end{tabular}%
+ }%
+}
+
+% Button definitions
+\def\tibtnsecond{\tibtn{tibtnyellow}{2nd}}
+\def\tibtnalpha{\tibtn{tibtngreen}{ALPHA}}
+
+\def\tibtnmatrix{\tibtn[white]{tibtngray}{MATRX}}
+\def\tibtnmatrixextra{\tibtnextra{\tibtnmatrix}{ANGLE}{B}}