Skip to content

Commit

Permalink
Table fine (modelica#3208)
Browse files Browse the repository at this point in the history
* Also need to handle first argument, or separator is lost.
Closes modelica#3156
* All including first.

* Mistake

* FixLatex
  • Loading branch information
HansOlsson committed Jun 22, 2022
1 parent 9973541 commit b345cb7
Show file tree
Hide file tree
Showing 10 changed files with 347 additions and 347 deletions.
20 changes: 10 additions & 10 deletions chapters/annotations.tex
Expand Up @@ -219,8 +219,8 @@ \subsubsection{Escape Sequences}\label{text-markup-escape-sequences}
\tablehead{Sequence} & \tablehead{Encoded character} & \tablehead{Comment}\\
\hline
\hline
\lstinline!%%! & `\%' & Only way to encode character. \\
\lstinline!%]! & `]' & Prevents termination of markup delimited by \lstinline![$\ldots$]!. \\
{\lstinline!%%!} & `\%' & Only way to encode character. \\
{\lstinline!%]!} & `]' & Prevents termination of markup delimited by {\lstinline![$\ldots$]!}. \\
\hline
\end{tabular}
\end{center}
Expand All @@ -243,10 +243,10 @@ \subsubsection{Variable Replacements}\label{variable-replacements}
\tablehead{Attribute} & \tablehead{Annotation}\\
\hline
\hline
\lstinline!title! & \lstinline!Figure! and \lstinline!Plot! \\
\lstinline!caption! & \lstinline!Figure! \\
\lstinline!legend! & \lstinline!Curve! \\
\lstinline!label! & \lstinline!Axis! \\
{\lstinline!title!} & {\lstinline!Figure!} and {\lstinline!Plot!} \\
{\lstinline!caption!} & {\lstinline!Figure!} \\
{\lstinline!legend!} & {\lstinline!Curve!} \\
{\lstinline!label!} & {\lstinline!Axis!} \\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -352,7 +352,7 @@ \section{Symbolic Processing}\label{annotations-for-symbolic-processing}\label{s
\tablehead{Annotation} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!Evaluate! & Use parameter value for symbolic processing & \Cref{modelica:Evaluate}\\
{\lstinline!Evaluate!} & Use parameter value for symbolic processing & \Cref{modelica:Evaluate}\\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -387,9 +387,9 @@ \section{Simulations}\label{annotations-for-simulations}\label{simulations}
\tablehead{Annotation} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!experiment! & Simulation experiment settings & \Cref{modelica:experiment}\\
\lstinline!HideResult! & Don't show component's simulation result & \Cref{modelica:HideResult}\\
\lstinline!TestCase! & Information for model used as test case & \Cref{modelica:TestCase}\\
{\lstinline!experiment!} & Simulation experiment settings & \Cref{modelica:experiment}\\
{\lstinline!HideResult!} & Don't show component's simulation result & \Cref{modelica:HideResult}\\
{\lstinline!TestCase!} & Information for model used as test case & \Cref{modelica:TestCase}\\
\hline
\end{tabular}
\end{center}
Expand Down
46 changes: 23 additions & 23 deletions chapters/arrays.tex
Expand Up @@ -211,7 +211,7 @@ \section{Built-in Array Functions}\label{built-in-array-functions}
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!promote($A$, $n$)! & Append dimensions of size 1 & \Cref{modelica:promote} \\
{\lstinline!promote($A$, $n$)!} & Append dimensions of size 1 & \Cref{modelica:promote} \\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -256,9 +256,9 @@ \subsection{Dimension and Size Functions}\label{array-dimension-and-size-functio
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!ndims($A$)! & Number of dimensions & \Cref{modelica:ndims} \\
\lstinline!size($A$, $i$)! & Size of single array dimension & \Cref{modelica:size-of-dim} \\
\lstinline!size($A$)! & Sizes of all array dimensions & \Cref{modelica:size-vector} \\
{\lstinline!ndims($A$)!} & Number of dimensions & \Cref{modelica:ndims} \\
{\lstinline!size($A$, $i$)!} & Size of single array dimension & \Cref{modelica:size-of-dim} \\
{\lstinline!size($A$)!} & Sizes of all array dimensions & \Cref{modelica:size-vector} \\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -303,9 +303,9 @@ \subsection{Dimensionality Conversion Functions}\label{dimensionality-conversion
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!scalar($A$)! & Extract only element & \Cref{modelica:scalar} \\
\lstinline!vector($A$)! & Vector of all elements & \Cref{modelica:vector} \\
\lstinline!matrix($A$)! & Two-dimensional array & \Cref{modelica:matrix} \\
{\lstinline!scalar($A$)!} & Extract only element & \Cref{modelica:scalar} \\
{\lstinline!vector($A$)!} & Vector of all elements & \Cref{modelica:vector} \\
{\lstinline!matrix($A$)!} & Two-dimensional array & \Cref{modelica:matrix} \\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -353,12 +353,12 @@ \subsection{Specialized Array Constructor Functions}\label{specialized-array-con
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!identity($n$)! & Identity matrix & \Cref{modelica:identity} \\
\lstinline!diagonal($v$)! & Diagonal matrix & \Cref{modelica:diagonal} \\
\lstinline!zeros($n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)! & Array with all elements being 0 & \Cref{modelica:zeros} \\
\lstinline!ones($n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)! & Array with all elements being 1 & \Cref{modelica:ones} \\
\lstinline!fill($s$, $n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)! & Array with all elements equal & \Cref{modelica:fill} \\
\lstinline!linspace($x_{1}$, $x_{2}$, $n$)! & Vector with equally spaced elements & \Cref{modelica:linspace} \\
{\lstinline!identity($n$)!} & Identity matrix & \Cref{modelica:identity} \\
{\lstinline!diagonal($v$)!} & Diagonal matrix & \Cref{modelica:diagonal} \\
{\lstinline!zeros($n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)!} & Array with all elements being 0 & \Cref{modelica:zeros} \\
{\lstinline!ones($n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)!} & Array with all elements being 1 & \Cref{modelica:ones} \\
{\lstinline!fill($s$, $n_{1}$, $n_{2}$, $n_{3}$, $\ldots$)!} & Array with all elements equal & \Cref{modelica:fill} \\
{\lstinline!linspace($x_{1}$, $x_{2}$, $n$)!} & Vector with equally spaced elements & \Cref{modelica:linspace} \\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -440,18 +440,18 @@ \subsection{Reduction Functions and Operators}\label{reduction-functions-and-ope
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!min($A$)! & Least element or array & \Cref{modelica:min-of-array} \\
\lstinline!min($x$, $y$)! & Least of two scalars & \Cref{modelica:min-binary} \\
\lstinline!min($\ldots$ for $\ldots$)! & Reduction to least value & \Cref{modelica:min-reduction} \\
\lstinline!max($A$)! & Greatest element or array & \Cref{modelica:max-of-array} \\
\lstinline!max($x$, $y$)! & Greatest of two scalars & \Cref{modelica:max-binary} \\
\lstinline!max($\ldots$ for $\ldots$)! & Reduction to greatest value & \Cref{modelica:max-reduction} \\
{\lstinline!min($A$)!} & Least element or array & \Cref{modelica:min-of-array} \\
{\lstinline!min($x$, $y$)!} & Least of two scalars & \Cref{modelica:min-binary} \\
{\lstinline!min($\ldots$ for $\ldots$)!} & Reduction to least value & \Cref{modelica:min-reduction} \\
{\lstinline!max($A$)!} & Greatest element or array & \Cref{modelica:max-of-array} \\
{\lstinline!max($x$, $y$)!} & Greatest of two scalars & \Cref{modelica:max-binary} \\
{\lstinline!max($\ldots$ for $\ldots$)!} & Reduction to greatest value & \Cref{modelica:max-reduction} \\
% Not saying "scalar sum" for symmetry with the product case below:
\lstinline!sum($A$)! & Sum of scalar array elements & \Cref{modelica:sum-of-array} \\
\lstinline!sum($\ldots$ for $\ldots$)! & Sum reduction & \Cref{modelica:sum-reduction} \\
{\lstinline!sum($A$)!} & Sum of scalar array elements & \Cref{modelica:sum-of-array} \\
{\lstinline!sum($\ldots$ for $\ldots$)!} & Sum reduction & \Cref{modelica:sum-reduction} \\
% Not saying "scalar product" to avoid confusion with inner products:
\lstinline!product($A$)! & Product of scalar array elements & \Cref{modelica:product-of-array} \\
\lstinline!product($\ldots$ for $\ldots$)! & Product reduction & \Cref{modelica:product-reduction} \\
{\lstinline!product($A$)!} & Product of scalar array elements & \Cref{modelica:product-of-array} \\
{\lstinline!product($\ldots$ for $\ldots$)!} & Product reduction & \Cref{modelica:product-reduction} \\
\hline
\end{tabular}
\end{center}
Expand Down
12 changes: 6 additions & 6 deletions chapters/connectors.tex
Expand Up @@ -790,12 +790,12 @@ \subsection{Connection Graphs and Their Operators}\label{overconstrained-equatio
\tablehead{Expression} & \tablehead{Description} & \tablehead{Details}\\
\hline
\hline
\lstinline!connect(A, B)! & Optional spanning-tree edge & \Cref{modelica:optional-spanning-tree-edge}\\
\lstinline!Connections.branch(A.R, B.R)! & Required spanning-tree edge & \Cref{modelica:Connections.branch}\\
\lstinline!Connections.root(A.R)! & Definite root node & \Cref{modelica:Connections.root}\\
\lstinline!Connections.potentialRoot(A.R, $\ldots$)! & Potential root node & \Cref{modelica:Connections.potentialRoot}\\
\lstinline!Connections.isRoot(A.R)! & Predicate for being selected as root & \Cref{modelica:Connections.isRoot}\\
\lstinline!Connections.rooted(A.R)! & Predicate for being closer to root & \Cref{modelica:Connections.rooted}\\
{\lstinline!connect(A, B)!} & Optional spanning-tree edge & \Cref{modelica:optional-spanning-tree-edge}\\
{\lstinline!Connections.branch(A.R, B.R)!} & Required spanning-tree edge & \Cref{modelica:Connections.branch}\\
{\lstinline!Connections.root(A.R)!} & Definite root node & \Cref{modelica:Connections.root}\\
{\lstinline!Connections.potentialRoot(A.R, $\ldots$)!} & Potential root node & \Cref{modelica:Connections.potentialRoot}\\
{\lstinline!Connections.isRoot(A.R)!} & Predicate for being selected as root & \Cref{modelica:Connections.isRoot}\\
{\lstinline!Connections.rooted(A.R)!} & Predicate for being closer to root & \Cref{modelica:Connections.rooted}\\
\hline
\end{tabular}
\end{center}
Expand Down

0 comments on commit b345cb7

Please sign in to comment.