Skip to content

Commit

Permalink
Drop the ':' in "$k$:th"
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikt-ma committed Jan 7, 2021
1 parent 620c253 commit f218aa8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions chapters/arrays.tex
Expand Up @@ -84,7 +84,7 @@ \section{Array Declarations}\label{array-declarations}
A component declared with array dimensions, or where the element type is an array type, is called an \firstuse{array variable}\index{array!variable}.
It is a component whose components are \willintroduce{array elements} (see below).
For an array variable, the ordering of its components matters:
The $k$:th element in the sequence of components of an array variable \lstinline!x! is the array element with index \lstinline!k!, denoted \lstinline!x[k]!.
The $k$th element in the sequence of components of an array variable \lstinline!x! is the array element with index \lstinline!k!, denoted \lstinline!x[k]!.
% henrikt-ma: The following statement seems like an over-simplification; for Flat Modelica, we've spent some time trying to figure out how to deal with the fact that Modelica arrays are not homogenous in general...
All elements of an array have the same type.
An array element may again be an array, i.e., arrays can be nested.
Expand Down Expand Up @@ -1033,7 +1033,7 @@ \subsection{Indexing with Boolean or Enumeration Values}\label{indexing-with-boo

\subsection{Indexing with end}\label{indexing-with-end}

The expression \lstinline!end!\indexinline{end} may only appear inside array subscripts, and if used in the $i$:th subscript of an array expression \lstinline!A! it is equivalent to the upper bound of the $i$:th dimension of \lstinline!A!.
The expression \lstinline!end!\indexinline{end} may only appear inside array subscripts, and if used in the $i$th subscript of an array expression \lstinline!A! it is equivalent to the upper bound of the $i$th dimension of \lstinline!A!.
If used inside nested array subscripts it refers to the most closely nested array.

\begin{nonnormative}
Expand Down
2 changes: 1 addition & 1 deletion chapters/equations.tex
Expand Up @@ -2,7 +2,7 @@ \chapter{Equations}\label{equations}

An \firstuse{equation}\index{equation} is part of a class definition.
A scalar equation relates scalar variables, i.e., constrains the values that these variables can take simultaneously.
When $n$-1 variables of an equation containing $n$ variables are known, the value of the $n$:th variable can be inferred (solved for).
When $n$-1 variables of an equation containing $n$ variables are known, the value of the $n$th variable can be inferred (solved for).
In contrast to a statement in an algorithm section, an equation does not define for which of its variable it is to be solved.
% henrikt-ma: Keeping this sentence from the old glossary only because it mentions the 'instantaneous equations':
Special cases are: initial equations, instantaneous equations, declaration equations.
Expand Down
6 changes: 2 additions & 4 deletions chapters/functions.tex
Expand Up @@ -1747,10 +1747,8 @@ \subsubsection{Simple Types}\label{simple-types}
compatibility with C. Returning strings from FORTRAN~77
subroutines/functions is currently not supported.

Enumeration types used as arguments are mapped to type int when calling
an external C function, and to type \lstinline!INTEGER! when calling an external
FORTRAN function. The $i$:th enumeration literal is mapped to integer
value $i$, starting at 1.
Enumeration types used as arguments are mapped to type int when calling an external C function, and to type \lstinline!INTEGER! when calling an external FORTRAN function.
The $i$th enumeration literal is mapped to integer value $i$, starting at 1.

Return values are mapped to enumeration types analogously: integer value
1 is mapped to the first enumeration literal, 2 to the second, etc.
Expand Down
2 changes: 1 addition & 1 deletion chapters/synchronous.tex
Expand Up @@ -670,7 +670,7 @@ \subsection{Sub-clock conversion operators}\label{sub-clock-conversion-operators
\begin{semantics}
The clock of \lstinline!y = subSample($u$, $\mathit{factor}$)! is $\mathit{factor}$ times slower than the clock of $u$.
At every $\mathit{factor}$ ticks of the clock of $u$, the operator returns the value of $u$.
The first activation of the clock of \lstinline!y! coincides with the first activation of the clock of $u$, and then every activation of the clock of \lstinline!y! coincides with the every $\mathit{factor}$:th activativation of the clock of $u$.
The first activation of the clock of \lstinline!y! coincides with the first activation of the clock of $u$, and then every activation of the clock of \lstinline!y! coincides with the every $\mathit{factor}$th activativation of the clock of $u$.
If argument $\mathit{factor}$ is not provided or is equal to zero, it is inferred, see \cref{sub-clock-inferencing}.
\end{semantics}
\end{operatordefinition}
Expand Down

0 comments on commit f218aa8

Please sign in to comment.