fnspe (20sep17)

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

4 files changed, 157 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/fnspe/README b/Master/texmf-dist/doc/latex/fnspe/README
index 84dc0c3fd28..8f6e011818a 100644
--- a/Master/texmf-dist/doc/latex/fnspe/README
+++ b/Master/texmf-dist/doc/latex/fnspe/README
@@ -1,8 +1,8 @@
 README for fnspe.sty
 
-fnspe 1.1b
+fnspe 1.2a
 Created by Michal Zeman
-Updated February 28, 2017
+Updated September 20, 2017
 
 E-mail comments and suggestions to: michalzemaster@gmail.com
 GIT contribution: https://bitbucket.org/Zemaster/fnspe-latex-package
diff --git a/Master/texmf-dist/doc/latex/fnspe/fnspe.pdf b/Master/texmf-dist/doc/latex/fnspe/fnspe.pdf
index df0ee007330..e14ff0884df 100644
--- a/Master/texmf-dist/doc/latex/fnspe/fnspe.pdf
+++ b/Master/texmf-dist/doc/latex/fnspe/fnspe.pdf
diff --git a/Master/texmf-dist/doc/latex/fnspe/fnspe.tex b/Master/texmf-dist/doc/latex/fnspe/fnspe.tex
index c64cc357a53..6986fd4d635 100644
--- a/Master/texmf-dist/doc/latex/fnspe/fnspe.tex
+++ b/Master/texmf-dist/doc/latex/fnspe/fnspe.tex
@@ -1,20 +1,20 @@
-% fnspe 1.1b
+% fnspe 1.2a
 % This material is subject to the LaTeX Project Public License.
 % See https://www.latex-project.org/lppl/ for the details of that license.
 %
 % Useful commands for FNSPE students 
 %
 % Created by Michal Zeman
-% Updated on February 28, 2017
-% Uploaded on February 28, 2017
+% Updated on September 20, 2017
+% Uploaded on September 20, 2017
 
 \documentclass{article}
-\usepackage[arrowtensor,oldcomplex]{zefnspe}
+\usepackage[arrowtensor,oldcomplex]{fnspe}
 \usepackage{hyperref}
 \begin{document}
 	\section*{Options}
 	
-	In this package there are three types of options (examples and differences will be shown further)
+	In this package there are four categories of options (examples and differences will be shown further)
 	\begin{enumerate}
 		\item for interval notation
 			\begin{itemize}
@@ -33,6 +33,11 @@
 				\item \texttt{isocomplex} for using standardized format of complex and real part 
 				\item \texttt{oldcomplex} for using old \LaTeX{} default format of complex and real part 
 			\end{itemize}
+		\item for definition notation
+		\begin{itemize}
+			\item \texttt{deftext} for definition using \textit{def.} over the equal
+			\item \texttt{defcolon} for definition using the colon with equal
+		\end{itemize}
 	\end{enumerate}
 
 	\section*{Macros}
@@ -188,6 +193,60 @@
 		\end{lstlisting}
 		which casts: Let \vec{x} be real.
 	
+	\subsection*{Macro for set}
+		
+		\subsubsection*{Set of natural numbers from 1 to $n$}
+			Using of macro
+			\begin{lstlisting}
+				\allset{n}
+			\end{lstlisting}
+			as \textbf{all} natural number up to $n$ \textbf{set} leads to
+			\begin{equation*}
+				\allset{n}.
+			\end{equation*}
+		
+		\subsubsection*{Set of natural numbers from 0 to $n$}
+			Using of macro
+			\begin{lstlisting}
+				\allsetzero{n}
+			\end{lstlisting}
+			as \textbf{all} natural number up to $n$ \textbf{set} with \textbf{zero} leads to
+			\begin{equation*}
+				\allsetzero{n}.
+			\end{equation*}
+			
+	\subsection*{Differentiability class}
+		
+		\subsubsection*{Just symbol}
+			Using of macro
+			\begin{lstlisting}
+				\cclass
+			\end{lstlisting}
+			as \textbf{C} \textbf{class} leads to
+			\begin{equation*}
+				\cclass.
+			\end{equation*}
+			
+		\subsubsection*{C infinity}
+			Using of macro
+			\begin{lstlisting}
+				\ccinf
+			\end{lstlisting}
+			as \textbf{C} \textbf{class} of \textbf{inf}inity leads to
+			\begin{equation*}
+				\ccinf.
+			\end{equation*}
+			
+		\subsubsection*{C of order $d$}
+			Using of macro
+			\begin{lstlisting}
+				\ccof{d}
+			\end{lstlisting}
+			as \textbf{C} \textbf{class} \textbf{of} order leads to
+			\begin{equation*}
+				\ccof{d}.
+			\end{equation*}
+	
 	\subsection*{Complex}
 		Let $z \in \compn$.
 	
@@ -235,7 +294,7 @@
 		which casts: Let $x$ equal to $\mathrm{Re}\;z$.
 	
 	\subsection*{Subscript}
-	In scientific \LaTeX{} text with two or more character should be in roman style (not italic as default), due to one can use prefix ! which make the word after it in roman style. Using of macro
+	Subscript text with two or more characters should be written in roman style (not italic as default). One can use prefix ! which makes the word after it in roman style. Using of macro
 	\begin{lstlisting}
 		A_{!unique}
 	\end{lstlisting}
@@ -248,6 +307,47 @@
 		A_{unique}
 	\end{equation*}
 	
+	\subsection*{Floor and ceiling functions}
+		\subsubsection*{Floor function}
+		Macro
+		\begin{lstlisting}
+		\floor{x}
+		\end{lstlisting}
+		as \textbf{floor} function leads to
+		\begin{equation*}
+		\floor{x}
+		\end{equation*}
+		
+		\subsubsection*{Ceil function}
+		Macro
+		\begin{lstlisting}
+		\ceil{x}
+		\end{lstlisting}
+		as \textbf{ceil} function leads to
+		\begin{equation*}
+		\ceil{x}
+		\end{equation*}
+		
+	\subsection*{Definition operator}
+	There are two ways to set a definition operator. First with \textit{text} and the second with \textit{colon}.
+		
+		\subsubsection*{Text definition}
+		Macro
+		\begin{lstlisting}
+		x \df a
+		\end{lstlisting}
+		\begin{itemize}
+			\item \texttt{deftext}
+			\begin{equation*}
+			x \stackrel{\mathclap{\normalfont{\mbox{\tiny def.}}}}{=} a
+			\end{equation*}
+			\item \texttt{defcolon}
+			\begin{equation*}
+				x \df a
+			\end{equation*}
+		\end{itemize}
+		
+	
 	\subsection*{Special sets of numbers}
 	
 		\subsubsection*{Natural number}
@@ -260,6 +360,16 @@
 			\natun
 		\end{equation*}
 		
+		\subsubsection*{Natural number with zero included}
+		Macro
+		\begin{lstlisting}
+		\nnzero
+		\end{lstlisting}
+		as \textbf{n}atural \textbf{n}umber \textbf{zero} leads to
+		\begin{equation*}
+		\nnzero
+		\end{equation*}
+		
 		\subsubsection*{Integers}
 		Macro
 		\begin{lstlisting}
@@ -333,7 +443,7 @@
 			\div
 		\end{equation*}
 	
-		Derived from \textit{physics} package, old mean of this command as math symbol from dividing has alias as
+		\noindent Derived from \textit{physics} package, the original meaning of this command as a maths symbol for dividing has alias
 		\begin{lstlisting}
 			\divisionsymbol
 		\end{lstlisting}
@@ -352,7 +462,7 @@
 			\rot
 		\end{equation*}
 	
-		One can also use \textit{physics} package command
+		\noindent One can also use \textit{physics} package command
 		\begin{lstlisting}
 			\curl
 		\end{lstlisting}
@@ -367,7 +477,7 @@
 			\lapl
 		\end{equation*}
 	
-		One can also use \textit{physics} package notation
+		\noindent One can also use \textit{physics} package notation
 		\begin{equation*}
 			\laplacian
 		\end{equation*}
@@ -394,7 +504,7 @@
 			\varun{m}{kg}
 		\end{equation*}
 	
-		This macro can be used directly in text (thanks to the \textit{ensure} function). Therefore one can use
+		\noindent This macro can be used directly in text (thanks to the \textit{ensure} function). Therefore one can use
 		\begin{lstlisting}
 			where \varun{m}{kg} is the mass.
 		\end{lstlisting}
diff --git a/Master/texmf-dist/tex/latex/fnspe/fnspe.sty b/Master/texmf-dist/tex/latex/fnspe/fnspe.sty
index 409e1d11624..a1ca922bb8d 100644
--- a/Master/texmf-dist/tex/latex/fnspe/fnspe.sty
+++ b/Master/texmf-dist/tex/latex/fnspe/fnspe.sty
@@ -1,15 +1,15 @@
-% fnspe 1.1b
+% fnspe 1.2a
 % This material is subject to the LaTeX Project Public License.
 % See https://www.latex-project.org/lppl/ for the details of that license.
 %
 % Useful commands for FNSPE students 
 %
 % Created by Michal Zeman
-% Updated on February 28, 2017
-% Uploaded on February 28, 2017
+% Updated on September 20, 2017
+% Uploaded on September 20, 2017
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fnspe}[2017/02/27 Package for FNSPE CTU in Prague made by Michal Zeman]
+\ProvidesPackage{fnspe}[2017/09/20 Package for FNSPE CTU in Prague made by Michal Zeman]
 
 \RequirePackage{xstring}
 \RequirePackage{bm}
@@ -23,6 +23,8 @@
 \RequirePackage{listings}
 \RequirePackage{physics}
 \RequirePackage{tikz}         % For arrow and dots in \xvec
+\RequirePackage{substr}
+\RequirePackage{mathtools}
 
 \newif\if@isointerval\@isointervalfalse
 \DeclareOption{isointerval}{
@@ -64,6 +66,16 @@
 	\@isocomplextrue
 }
 
+\newif\if@deftext\@deftextfalse
+\DeclareOption{deftext}{
+	\@deftexttrue
+}
+
+\newif\if@defcolon\@defcolonfalse
+\DeclareOption{defcolon}{
+	\@defcolontrue
+}
+
 \ProcessOptions\relax
 
 \newlength\xvec@height%
@@ -97,7 +109,8 @@
 	language=[LaTeX]TeX,
 	breaklines=true,
 	basicstyle=\tt\scriptsize,
-	morekeywords = [28]{ci,oi,lci,rci,rest,dif, hlf, degree, hem, htem, oover, realn, inte, ratin, compn, natun, impem, rot, dive, grad, lapl, varun, unit, expv, norm, abs, pder, tder,mat,curl,laplacian,divisionsymbol},
+	morekeywords = [28]{ci,oi,lci,rci,rest,dif, hlf, degree, hem, htem, oover, realn, inte, ratin, compn, natun, impem, rot, dive, grad, lapl, varun, unit, expv, norm, abs, pder, tder,mat,curl,laplacian, divisionsymbol,
+	floor, ceil, df, allsetzero, allset, cclass, ccinf, ccof},
 	keywordstyle=\color{blue},
 	identifierstyle=\color{magenta},
 }
@@ -111,7 +124,7 @@
 
 \begingroup
 \catcode`\_=\active
-\gdef_#1{\IfSubStr{#1}{!}{\sb{\mathrm{\StrBehind{#1}{!}}}}{\sb{#1}} }
+\gdef_#1{\IfCharInString{!}{#1}{\sb{\mathrm{\StrBehind{#1}{!}}}}{\sb{#1}} }
 \endgroup
 \mathcode`\_=\string"8000
 \catcode`\_=12
@@ -157,6 +170,7 @@
 \newcommand{\inte}{\ensuremath{\mathbb{Z}}}
 \newcommand{\ratin}{\ensuremath{\mathbb{Q}}}
 \newcommand{\natun}{\ensuremath{\mathbb{N}}}
+\newcommand{\nnzero}{\ensuremath{\mathbb{N}_0}}
 
 \newcommand{\impem}{\hem \Rightarrow \hem}
 
@@ -187,3 +201,18 @@
 %\newcommand{\maxv}[1]{\vec{\mathcal{#1}}}
 %\newcommand{\maxs}[1]{\mathcal{#1}}
 
+\DeclarePairedDelimiter{\ceil}{\lceil}{\rceil}
+\DeclarePairedDelimiter{\floor}{\lfloor}{\rfloor}
+
+\if@deftext
+\newcommand{\df}{\stackrel{\mathclap{\normalfont{\mbox{\tiny def.}}}}{=}}
+\else
+\newcommand{\df}{\mbox{:=}}
+\fi
+
+\newcommand{\allset}[1]{\{1,2,\ldots,#1\}}
+\newcommand{\allsetzero}[1]{\{0,1,\ldots,#1\}}
+
+\newcommand{\cclass}{\mathscr{C}}
+\newcommand{\ccof}[1]{\cclass^{#1}}
+\newcommand{\ccinf}{\ccof{\infty}}
\ No newline at end of file