From 41aff8e7e947c11c2190cd21a26ea4ebd983d7c4 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Fri, 18 Sep 2020 21:28:11 +0200 Subject: [PATCH] Don't end small table entries in period --- chapters/functions.tex | 4 +- chapters/operatorsandexpressions.tex | 82 ++++++++++++++-------------- chapters/synchronous.tex | 6 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/chapters/functions.tex b/chapters/functions.tex index 38f4863b2..457fc5b99 100644 --- a/chapters/functions.tex +++ b/chapters/functions.tex @@ -2045,9 +2045,9 @@ \subsection{Return Type Mapping}\label{return-type-mapping} \lstinline!Integer! & \lstinline!int! & \lstinline!INTEGER!\\ \hline \lstinline!Boolean! & \lstinline!int! & \lstinline!LOGICAL!\\ \hline \lstinline!String! & \lstinline!const char*! & Not allowed.\\ \hline -\lstinline!T[$\mathit{dim}_{1}$, $\ldots$, $\mathit{dim}_{n}$]! & Not allowed. & Not allowed.\\ \hline +\lstinline!T[$\mathit{dim}_{1}$, $\ldots$, $\mathit{dim}_{n}$]! & Not allowed & Not allowed \\ \hline Enumeration type & \lstinline!int! & \lstinline!INTEGER!\\ \hline -Record & See \cref{records}. & Not allowed.\\ \hline +Record & See \cref{records} & Not allowed\\ \hline \end{longtable} The element type \lstinline!T! of an array can be any simple type as defined in diff --git a/chapters/operatorsandexpressions.tex b/chapters/operatorsandexpressions.tex index cbec87a8c..bca149de8 100644 --- a/chapters/operatorsandexpressions.tex +++ b/chapters/operatorsandexpressions.tex @@ -392,12 +392,12 @@ \subsection{Numeric Functions and Conversion Functions}\label{numeric-functions- \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!abs($v$)! & Absolute value (event-free). & \Cref{modelica:abs} \\ -\lstinline!sign($v$)! & Sign of argument (event-free). & \Cref{modelica:sign} \\ -\lstinline!sqrt($v$)! & Square root. & \Cref{modelica:sqrt} \\ +\lstinline!abs($v$)! & Absolute value (event-free) & \Cref{modelica:abs} \\ +\lstinline!sign($v$)! & Sign of argument (event-free) & \Cref{modelica:sign} \\ +\lstinline!sqrt($v$)! & Square root & \Cref{modelica:sqrt} \\ \lstinline!Integer($e$)! & Conversion from enumeration to \lstinline!Integer! & \Cref{modelica:integer-of-enumeration} \\ -\lstinline!EnumTypeName($i$)! & Conversion from \lstinline!Integer! to enumeration. & \Cref{modelica:enumeration-of-integer} \\ -\lstinline!String($\ldots$)! & Conversion to \lstinline!String!. & \Cref{modelica:to-String} \\ +\lstinline!EnumTypeName($i$)! & Conversion from \lstinline!Integer! to enumeration & \Cref{modelica:enumeration-of-integer} \\ +\lstinline!String($\ldots$)! & Conversion to \lstinline!String! & \Cref{modelica:to-String} \\ \hline \end{tabular} \end{center} @@ -506,12 +506,12 @@ \subsection{Event Triggering Mathematical Functions}\label{event-triggering-math \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!div($x$, $y$)! & Division with truncation toward zero. & \Cref{modelica:div} \\ -\lstinline!mod($x$, $y$)! & Integer modulus. & \Cref{modelica:mod} \\ -\lstinline!rem($x$, $y$)! & Integer remainder. & \Cref{modelica:rem} \\ -\lstinline!ceil($x$)! & Smallest integer \lstinline!Real! not less than $x$. & \Cref{modelica:ceil} \\ -\lstinline!floor($x$)! & Largest integer \lstinline!Real! not greater than $x$. & \Cref{modelica:floor} \\ -\lstinline!integer($x$)! & Largest \lstinline!Intger! not greater than $x$. & \Cref{modelica:integer} \\ +\lstinline!div($x$, $y$)! & Division with truncation toward zero & \Cref{modelica:div} \\ +\lstinline!mod($x$, $y$)! & Integer modulus & \Cref{modelica:mod} \\ +\lstinline!rem($x$, $y$)! & Integer remainder & \Cref{modelica:rem} \\ +\lstinline!ceil($x$)! & Smallest integer \lstinline!Real! not less than $x$ & \Cref{modelica:ceil} \\ +\lstinline!floor($x$)! & Largest integer \lstinline!Real! not greater than $x$ & \Cref{modelica:floor} \\ +\lstinline!integer($x$)! & Largest \lstinline!Intger! not greater than $x$ & \Cref{modelica:integer} \\ \hline \end{tabular} \end{center} @@ -608,19 +608,19 @@ \subsection{Built-in Mathematical Functions and External Built-in Functions}\lab \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!sin($x$)! & Sine. & \\ -\lstinline!cos($x$)! & Cosine. & \\ -\lstinline!tan($x$)! & Tangent ($x$ shall not be: $\ldots$, -$\pi/2$, $\pi/2$, $3\pi/2$, $\ldots$). & \\ -\lstinline!asin($x$)! & Inverse sine ($-1 \le x \le 1$). & \\ -\lstinline!acos($x$)! & Inverse cosine ($-1 \le x \le 1$). & \\ -\lstinline!atan($x$)! & Inverse tangent. & \\ -\lstinline!atan2($y$, $x$)! & Principal value of the arc tangent of $y/x$. & \Cref{modelica:atan2} \\ -\lstinline!sinh($x$)! & Hyperbolic sine. & \\ -\lstinline!cosh($x$)! & Hyperbolic cosine. & \\ -\lstinline!tanh($x$)! & Hyperbolic tangent. & \\ -\lstinline!exp($x$)! & Exponential, base $\mathrm{e}$. & \\ -\lstinline!log($x$)! & Natural (base $\mathrm{e}$) logarithm ($x > 0$). & \\ -\lstinline!log10($x$)! & Base 10 logarithm ($x > 0$). & \\ +\lstinline!sin($x$)! & Sine & \\ +\lstinline!cos($x$)! & Cosine & \\ +\lstinline!tan($x$)! & Tangent ($x$ shall not be: $\ldots$, -$\pi/2$, $\pi/2$, $3\pi/2$, $\ldots$) & \\ +\lstinline!asin($x$)! & Inverse sine ($-1 \le x \le 1$) & \\ +\lstinline!acos($x$)! & Inverse cosine ($-1 \le x \le 1$) & \\ +\lstinline!atan($x$)! & Inverse tangent & \\ +\lstinline!atan2($y$, $x$)! & Principal value of the arc tangent of $y/x$ & \Cref{modelica:atan2} \\ +\lstinline!sinh($x$)! & Hyperbolic sine & \\ +\lstinline!cosh($x$)! & Hyperbolic cosine & \\ +\lstinline!tanh($x$)! & Hyperbolic tangent & \\ +\lstinline!exp($x$)! & Exponential, base $\mathrm{e}$ & \\ +\lstinline!log($x$)! & Natural (base $\mathrm{e}$) logarithm ($x > 0$) & \\ +\lstinline!log10($x$)! & Base 10 logarithm ($x > 0$) & \\ \hline \end{tabular} \end{center} @@ -650,15 +650,15 @@ \subsection{Derivative and Special Purpose Operators with Function Syntax}\label \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!der($\mathit{expr}$)! & Time derivative. & \Cref{modelica:der} \\ -\lstinline!delay($\mathit{expr}$, $\ldots$)! & Time delay. & \Cref{modelica:delay} \\ -\lstinline!cardinality($c$)! & Number of occurrences in connect-equations. & \Cref{modelica:cardinality} \\ -\lstinline!homotopy($\mathit{actual}$, $\mathit{simplified}$)! & Homotpy initialization. & \Cref{modelica:homotopy} \\ -\lstinline!semiLinear($x$, $k^{+}$, $k^{-}$)! & Sign-dependent slope. & \Cref{modelica:semiLinear} \\ +\lstinline!der($\mathit{expr}$)! & Time derivative & \Cref{modelica:der} \\ +\lstinline!delay($\mathit{expr}$, $\ldots$)! & Time delay & \Cref{modelica:delay} \\ +\lstinline!cardinality($c$)! & Number of occurrences in connect-equations & \Cref{modelica:cardinality} \\ +\lstinline!homotopy($\mathit{actual}$, $\mathit{simplified}$)! & Homotpy initialization & \Cref{modelica:homotopy} \\ +\lstinline!semiLinear($x$, $k^{+}$, $k^{-}$)! & Sign-dependent slope & \Cref{modelica:semiLinear} \\ \lstinline!inStream($v$)! & Stream variable flow into component & \Cref{modelica:inStream} \\ -\lstinline!actualStream($v$)! & Actual value of stream variable. & \Cref{modelica:actualStream} \\ -\lstinline!spatialDistribution($\ldots$)! & Variable-speed transport. & \Cref{modelica:spatialDistribution} \\ -\lstinline!getInstanceName()! & Name of instance at call site. & \Cref{modelica:getInstanceName} \\ +\lstinline!actualStream($v$)! & Actual value of stream variable & \Cref{modelica:actualStream} \\ +\lstinline!spatialDistribution($\ldots$)! & Variable-speed transport & \Cref{modelica:spatialDistribution} \\ +\lstinline!getInstanceName()! & Name of instance at call site & \Cref{modelica:getInstanceName} \\ \hline \end{tabular} \end{center} @@ -1218,15 +1218,15 @@ \subsection{Event-Related Operators with Function Syntax}\label{event-related-op \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!initial()! & Predicate for the initialization phase. & \Cref{modelica:initial}\\ -\lstinline!terminal()! & Predicate for the end of a successful analysis. & \Cref{modelica:terminal}\\ -\lstinline!noEvent($\mathit{expr}$)! & Evaluate $\mathit{expr}$ without triggering events. & \Cref{modelica:noEvent}\\ -\lstinline!smooth($p$, $\mathit{expr}$)! & Treat $\mathit{expr}$ as $p$ times continuously differentiable. & \Cref{modelica:smooth}\\ -\lstinline!sample($\mathit{start}$, $\mathit{interval}$)! & Periodic triggering of events. & \Cref{modelica:event-sample}\\ -\lstinline!pre($y$)! & Left limit $y(t^{-})$ of variable $y(t)$. & \Cref{modelica:pre}\\ -\lstinline!edge($b$)! & Expands into \lstinline!($b$ and not pre($b$))!. & \Cref{modelica:edge}\\ -\lstinline!change($v$)! & Expands into \lstinline!($v$ <> pre($v$))!. & \Cref{modelica:change}\\ -\lstinline!reinit($x$, $\mathit{expr}$)! & Reinitialize $x$ with $\mathit{expr}$. & \Cref{modelica:reinit}\\ +\lstinline!initial()! & Predicate for the initialization phase & \Cref{modelica:initial}\\ +\lstinline!terminal()! & Predicate for the end of a successful analysis & \Cref{modelica:terminal}\\ +\lstinline!noEvent($\mathit{expr}$)! & Evaluate $\mathit{expr}$ without triggering events & \Cref{modelica:noEvent}\\ +\lstinline!smooth($p$, $\mathit{expr}$)! & Treat $\mathit{expr}$ as $p$ times continuously differentiable & \Cref{modelica:smooth}\\ +\lstinline!sample($\mathit{start}$, $\mathit{interval}$)! & Periodic triggering of events & \Cref{modelica:event-sample}\\ +\lstinline!pre($y$)! & Left limit $y(t^{-})$ of variable $y(t)$ & \Cref{modelica:pre}\\ +\lstinline!edge($b$)! & Expands into \lstinline!($b$ and not pre($b$))! & \Cref{modelica:edge}\\ +\lstinline!change($v$)! & Expands into \lstinline!($v$ <> pre($v$))! & \Cref{modelica:change}\\ +\lstinline!reinit($x$, $\mathit{expr}$)! & Reinitialize $x$ with $\mathit{expr}$ & \Cref{modelica:reinit}\\ \hline \end{tabular} \end{center} diff --git a/chapters/synchronous.tex b/chapters/synchronous.tex index 5bff27c7a..7e03dc557 100644 --- a/chapters/synchronous.tex +++ b/chapters/synchronous.tex @@ -560,7 +560,7 @@ \section{Clocked State Variables}\label{clocked-state-variables} \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!previous($u$)! & Previous value of clocked state variable. & \Cref{modelica:previous} \\ +\lstinline!previous($u$)! & Previous value of clocked state variable & \Cref{modelica:previous} \\ \hline \end{tabular} \end{center} @@ -591,8 +591,8 @@ \subsection{Base-clock conversion operators}\label{base-clock-conversion-operato \tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\ \hline \hline -\lstinline!sample($u$, $\mathit{clock}$)! & Sample continuous-time expression. & \Cref{modelica:clocked-sample} \\ -\lstinline!hold($u$)! & Zeroth order hold of clocked-time variable. & \Cref{modelica:clocked-sample} \\ +\lstinline!sample($u$, $\mathit{clock}$)! & Sample continuous-time expression & \Cref{modelica:clocked-sample} \\ +\lstinline!hold($u$)! & Zeroth order hold of clocked-time variable & \Cref{modelica:clocked-sample} \\ \hline \end{tabular} \end{center}