Skip to content

Commit

Permalink
lstinline etc
Browse files Browse the repository at this point in the history
  • Loading branch information
HansOlsson committed May 16, 2019
1 parent a203a87 commit 9e55018
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion chapters/annotations.tex
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ \subsection{Component Instance}\doublelabel{component-instance}

\subsection{Extends clause}\doublelabel{extends-clause}

Each extends clause (and short class definition, as stated in \autoref{annotations-for-graphical-objects})
Each extends-clause (and short-class-definition, as stated in \autoref{annotations-for-graphical-objects})
may have layer specific annotations which describe
the rendering of the base class' icon and diagram layers in the
subclass.
Expand Down
12 changes: 6 additions & 6 deletions chapters/arrays.tex
Original file line number Diff line number Diff line change
Expand Up @@ -652,21 +652,21 @@ \subsection{Array Concatenation}\doublelabel{array-concatenation}
\begin{itemize}
\item
Arrays A, B, C, ... must have the same number of dimensions, i.e.,
ndims(A) = ndims(B) = ...
\lstinline!ndims(A)! = \lstinline!ndims(B)! = ...
\item
Arrays A, B, C, ... must be type compatible expressions (\autoref{type-compatible-expressions})
giving the type of the elements of the result. The maximally expanded
types should be equivalent. Real and Integer subtypes can be mixed
resulting in a Real result array where the Integer numbers have been
transformed to Real numbers.
\item
k has to characterize an existing dimension, i.e., 1 \textless{}= k
\textless{}= ndims(A) = ndims(B) = ndims(C); k shall be a parameter expression of integer type.
k has to characterize an existing dimension, i.e., 1 $<=$ k
$<=$ \lstinline!ndims(A)! = \lstinline!ndims(B)! = \lstinline!ndims(C)!; k shall be a parameter expression of \lstinline!Integer! type.
\item
Size matching: Arrays A, B, C, ... must have identical array sizes
with the exception of the size of dimension k, i.e., size(A,j) =
size(B,j), for 1 \textless{}= j \textless{}= ndims(A) and j
\textless{}\textgreater{} k.
with the exception of the size of dimension k, i.e., \lstinline!size(A,j)! =
\lstinline!size(B,j)!, for 1 $<=$ j $<=$ \lstinline!ndims(A)! and j
$\neq$ k.
\end{itemize}

{[}\emph{Examples}:
Expand Down
6 changes: 3 additions & 3 deletions chapters/functions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2451,10 +2451,10 @@ \subsection{Utility Functions}\doublelabel{utility-functions}
\end{tabular}\\ \hline
\end{longtable}
The valid return values for an external function returning a string are:
The valid return values for an external function returning a \lstinline!String! are:
\begin{itemize}
\item A literal string.
\item A string given as String input to the external function
\item A literal \lstinline!String!.
\item A string given as \lstinline!String! input to the external function
\item A string pointer returned by \lstinline!ModelicaAllocateString! or \lstinline!ModelicaAllocateStringWithErrorReturn!.
\end{itemize}
Expand Down
3 changes: 2 additions & 1 deletion chapters/synchronous.tex
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ \subsection{Argument Restrictions (Component Expression)}\doublelabel{argument-r

Note that the operators defined in this chapter do not automatically vectorize,
but some operate on arrays in a similar way.

\section{Clock Constructors}\doublelabel{clock-constructors}

The following overloaded constructors are available to generate clocks:
Expand Down Expand Up @@ -924,7 +925,7 @@ \subsection{Flattening of Model}\doublelabel{flattening-of-model}

Furthermore, each non-trivial expression (non-literal, non-constant,
non-parameter, non-variable), expr\textsubscript{i}, appearing as first
argument of a clock conversion operator (except hold and backSample)
argument of a clock conversion operator (except \lstinline!hold! and \lstinline!backSample!)
is recursively replaced by a
unique variable, v\textsubscript{i}, and the equation v\textsubscript{i}
= expr\textsubscript{i} is added to the equation set.
Expand Down

0 comments on commit 9e55018

Please sign in to comment.