Skip to content

Commit

Permalink
Replace closed em-dash by open en-dash
Browse files Browse the repository at this point in the history
As long as the spaces on either side remain the space character (and not a newline), it will be trivial to change back to either closed or open em-dash.  The biggest threat is thus the line breaks inserted just to avoid long lines of source code.
  • Loading branch information
henrikt-ma committed Aug 6, 2020
1 parent c06ec05 commit e559aab
Show file tree
Hide file tree
Showing 20 changed files with 62 additions and 62 deletions.
18 changes: 9 additions & 9 deletions chapters/annotations.tex
Expand Up @@ -14,7 +14,7 @@ \chapter{Annotations}\label{annotations}

\section{Vendor-Specific Annotations}\label{vendor-specific-annotations}

A vendor may---anywhere inside an annotation---add specific, possibly
A vendor may -- anywhere inside an annotation -- add specific, possibly
undocumented, annotations which are not intended to be interpreted by
other tools. Two variants of vendor-specific annotations exist; one
simple and one hierarchical. Double underscore concatenated with a
Expand Down Expand Up @@ -473,7 +473,7 @@ \subsubsection{Graphical Properties}\label{graphical-properties}
\includegraphics[width=2.08333in,height=1.66667in]{bezierpoints}

The border pattern attributes \lstinline!Raised!, \lstinline!Sunken! and \lstinline!Engraved! represent frames
which are rendered in a tool-dependent way---inside the extent of the
which are rendered in a tool-dependent way -- inside the extent of the
filled shape.

The \lstinline!smooth! attribute specifies that a line can be drawn as straight line
Expand Down Expand Up @@ -642,7 +642,7 @@ \subsection{Extends clause}\label{extends-clause}
end B;
\end{lstlisting}
In this example the diagram of \lstinline!A! contains the graphical primitives
from \lstinline!A! and \lstinline!B! (but not from \lstinline!C! since they were hidden in \lstinline!B!)---the ones
from \lstinline!A! and \lstinline!B! (but not from \lstinline!C! since they were hidden in \lstinline!B!) -- the ones
from \lstinline!B! are rescaled, and the icon of \lstinline!A! contains the graphical primitives
from \lstinline!A! (but neither from \lstinline!B! nor from \lstinline!C!).
\end{example}
Expand All @@ -661,7 +661,7 @@ \subsection{Connections}\label{connections1}

The optional Text-primitive defines a text that will be written on the
connection line. It has the following definition (\emph{it is not equal
to the Text-primitive as part of graphics---the differences are marked as bold lines}):
to the Text-primitive as part of graphics -- the differences are marked as bold lines}):
% NOTE: Technically just the names -- not the entire lines are marked in bold
\begin{lstlisting}[language=modelica]
record Text
Expand Down Expand Up @@ -873,15 +873,15 @@ \subsubsection{Text}\label{text}

If the \lstinline!extent! specifies a box with zero width and positive height the
height is used as height for the text (unless \lstinline!fontSize! attribute is
non-zero---which specifies the absolute size), and the text is not
non-zero -- which specifies the absolute size), and the text is not
truncated (the \lstinline!horizontalAlignment! is still used in this case).

\begin{nonnormative}
A zero-width \lstinline!extent! is convenient for handling texts where the width is unknown.
\end{nonnormative}

If the string \lstinline!fontName! is empty, the tool may choose a font. The font names \lstinline!"serif"!, \lstinline!"sans-serif"!, and \lstinline!"monospace"! shall be recognized. If possible
the correct font should be used---otherwise a reasonable match, or treat as if \lstinline!fontName! was empty.
the correct font should be used -- otherwise a reasonable match, or treat as if \lstinline!fontName! was empty.

The style attribute \lstinline!textStyle! specifies variations of the font.

Expand Down Expand Up @@ -1154,7 +1154,7 @@ \section{Annotations for the Graphical User Interface}\label{annotations-for-the
a message indicating the recommended action.
This annotation is not inherited, the assumption is that if a class uses
an obsolete class (as a base-class or as the class of one of the components)
that shall be updated---ideally without impacting users of the class.
that shall be updated -- ideally without impacting users of the class.
If that is not possible the current class can have also have an obsolete-annotation.

A declaration may have the following annotations:
Expand Down Expand Up @@ -1543,7 +1543,7 @@ \subsubsection{Conversion rules}\label{conversion-rules}
and vectorize according to \cref{scalar-functions-applied-to-array-arguments}.

All of these convert-functions only use inheritance among user
models, and not in the library that is used for the conversion---thus
models, and not in the library that is used for the conversion -- thus
conversions of base-classes will require multiple conversion-calls; this
ensures that the conversion is independent of the new library structure.
The name of the class used as argument to \lstinline!convertElement! and \lstinline!convertModifiers!
Expand Down Expand Up @@ -1945,7 +1945,7 @@ \subsection{Protection of Classes}\label{protection-of-classes}
documentation annotation is normally performed before encryption, but
the generated HTML is intended to be used with the encrypted package.
Thus the HTML-generation should use the same access as the encrypted
version---even before encryption.
version -- even before encryption.
\item
\lstinline!Access.diagram!\\
Same as \lstinline!Access.documentation! and additionally, the diagram annotation,
Expand Down
6 changes: 3 additions & 3 deletions chapters/arrays.tex
Expand Up @@ -506,7 +506,7 @@ \subsection{Matrix and Vector Algebra Functions}\label{matrix-and-vector-algebra
\lstinline!skew(x)!
&
\begin{tabular}{@{}p{10cm}@{}}
Returns the $3 \times 3$ skew symmetric matrix associated with a 3-vector, i.e., \lstinline!cross(x, y) = skew(x) * y!, or---equivalently---\lstinline!skew(x)!
Returns the $3 \times 3$ skew symmetric matrix associated with a 3-vector, i.e., \lstinline!cross(x, y) = skew(x) * y!, or -- equivalently -- \lstinline!skew(x)!
\begin{lstlisting}[frame=none,aboveskip=-\parskip,belowskip=-\medskipamount]
= [ 0, -x[3], x[2] ;
x[3], 0, -x[1] ;
Expand Down Expand Up @@ -573,7 +573,7 @@ \subsection{Array Constructor with Iterators}\label{array-constructor-with-itera
IDENT in array_expression
\end{lstlisting}
the loop-variable, \lstinline!IDENT!, is in scope inside expression in the array construction. The loop-variable may hide other variables, as in for-clauses. The loop-variable has the same type as
the type of the elements of \lstinline!array_expression!; and can be simple type as well as a record type. The loop-variable will have the same type for the entire loop---i.e., for an
the type of the elements of \lstinline!array_expression!; and can be simple type as well as a record type. The loop-variable will have the same type for the entire loop -- i.e., for an
\lstinline!array_expression! \lstinline!{1, 3.2}! the iterator will have the type of the type-compatible expression (\lstinline!Real!) for all iterations. For deduction of ranges, see
\cref{implicit-iteration-ranges}; and for using types as range see \cref{types-as-iteration-ranges}.

Expand Down Expand Up @@ -728,7 +728,7 @@ \subsection{Vector Construction}\label{vector-construction}
\item
\lstinline!$j$ : $d$ : $k$! is the \lstinline!Real! vector \lstinline!{$j$, $j+d$, $\ldots$, $j + n d$}!, with $n = \text{\lstinline!floor!}((k-j)/d)$,
if $j$, $d$, or $k$ are of type \lstinline!Real!. In order to avoid rounding issues for the length it is recommended to use \lstinline!{j + d * i for i in 0 : n}! or
\lstinline!linspace(j, k, n + 1)!---if the number of elements are known.
\lstinline!linspace(j, k, n + 1)! -- if the number of elements are known.
\item
\lstinline!$j$ : $d$ : $k$! is a \lstinline!Real! or \lstinline!Integer! vector with zero elements, if $d > 0$ and $j > k$ or if $d < 0$ and $j < k$.
\item
Expand Down
16 changes: 8 additions & 8 deletions chapters/classes.tex
Expand Up @@ -5,14 +5,14 @@ \chapter{Classes, Predefined Types, and Declarations}\label{class-predefined-typ
Classes can contain equations which provide the basis for the executable
code that is used for computation in Modelica. Conventional algorithmic
code can also be part of classes. All data objects in Modelica are
instantiated from classes, including the basic data types---\lstinline!Real!,
\lstinline!Integer!, \lstinline!String!, \lstinline!Boolean!---and enumeration types, which are built-in
instantiated from classes, including the basic data types -- \lstinline!Real!,
\lstinline!Integer!, \lstinline!String!, \lstinline!Boolean! -- and enumeration types, which are built-in
classes or class schemata.

Declarations are the syntactic constructs needed to introduce classes
and objects (i.e., components).

\section{Access Control---Public and Protected Elements}\label{access-control-public-and-protected-elements}
\section{Access Control -- Public and Protected Elements}\label{access-control-public-and-protected-elements}

Members of a Modelica class can have two levels of visibility: \lstinline!public! or
\lstinline!protected!. The default is \lstinline!public! if nothing else is specified
Expand Down Expand Up @@ -220,7 +220,7 @@ \subsubsection{Prefix Rules}\label{prefix-rules}
subtype of Real.

Type prefixes (that is, \lstinline!flow!, \lstinline!stream!, \lstinline!discrete!, \lstinline!parameter!, \lstinline!constant!, \lstinline!input!, \lstinline!output!) shall only be applied for type,
record and connector components---see also record specialized class, \cref{specialized-classes}.
record and connector components -- see also record specialized class, \cref{specialized-classes}.

An exception is \lstinline!input! for components whose type is of the special class
function type (these can only be used for function formal parameters and
Expand Down Expand Up @@ -763,7 +763,7 @@ \subsection{Restriction on combining base-classes and other elements}\label{rest
\end{lstlisting}
\end{example}

\subsection{Local Class Definitions---Nested Classes}\label{local-class-definitions-nested-classes}
\subsection{Local Class Definitions -- Nested Classes}\label{local-class-definitions-nested-classes}

The local class should be statically flattenable with the partially
flattened enclosing class of the local class apart from local class
Expand Down Expand Up @@ -939,7 +939,7 @@ \section{Balanced Models}\label{balanced-models}
\end{lstlisting}

In this case one can argue that both \lstinline!UseCorrelation! (adding an acausal equation) and \lstinline!SpecialCorrelation! (adding a default to an input) are correct. Still, when combined they
lead to a model with too many equations, and it is not possible to determine which model is incorrect without strict rules---as the ones defined here.
lead to a model with too many equations, and it is not possible to determine which model is incorrect without strict rules -- as the ones defined here.

In Modelica 2.2, model \lstinline!Broken! will work with some models.
However, by just redeclaring it to model \lstinline!SpecialCorrelation!, an
Expand All @@ -951,7 +951,7 @@ \section{Balanced Models}\label{balanced-models}
redeclaration cannot lead to an unbalanced model any more.
\end{nonnormative}

The restrictions below apply after flattening---i.e.\ inherited components are included---possibly modified. The corresponding restrictions on connectors and connections are in
The restrictions below apply after flattening -- i.e.\ inherited components are included -- possibly modified. The corresponding restrictions on connectors and connections are in
\cref{restrictions-of-connections-and-connectors}.

\begin{definition}[Local number of unknowns]
Expand Down Expand Up @@ -1387,7 +1387,7 @@ \section{Balanced Models}\label{balanced-models}

Therefore, \lstinline!FixedBoundary_pTX! is a locally balanced model. The predefined boundary variables \lstinline!p! and \lstinline!Xi! are
provided via equations to the input arguments \lstinline!medium.p! and \lstinline!medium.Xi!, in addition there is an equation for \lstinline!T!
in the same way---even though \lstinline!T! is not an input. Depending on the flow direction, either the specific enthalpy in the port
in the same way -- even though \lstinline!T! is not an input. Depending on the flow direction, either the specific enthalpy in the port
(\lstinline!port.h!) or \lstinline!h! is used to compute the enthalpy flow rate \lstinline!H_flow!. \lstinline!h! is provided as binding equation
to the medium. With the equation \lstinline!medium.T = T!, the specific enthalpy \lstinline!h! of the reservoir is indirectly computed via the
medium equations. Again, this demonstrates, that an \lstinline!input! just defines the number of equations have to be provided, but that it not
Expand Down
8 changes: 4 additions & 4 deletions chapters/connectors.tex
Expand Up @@ -425,7 +425,7 @@ \section{Generation of Connection Equations}\label{generation-of-connection-equa
The bold-face $\mathbf{0}$ represents an array or scalar zero of
appropriate dimensions (i.e.\ the same size as $z$).

For an \lstinline!operator record! type this uses the operator \lstinline!'0'!---which must be defined in the operator record---and all of the flow-variables for the \lstinline!operator record!
For an \lstinline!operator record! type this uses the operator \lstinline!'0'! -- which must be defined in the operator record -- and all of the flow-variables for the \lstinline!operator record!
must be of the same \lstinline!operator record! type. This implies that in order to have flow variables of an \lstinline!operator record! type the \lstinline!operator record! must define addition,
negation, and \lstinline!'0'!; and these operations should define an additive group.

Expand Down Expand Up @@ -606,7 +606,7 @@ \section{Restrictions of Connections and Connectors}\label{restrictions-of-conne
connector that is not part of an expandable connector. \label{enum:exc-conn-case}
\end{enumerate}
\begin{nonnormative}
I.e., a connection set must---unless the model or block is partial---contain one source of a signal (\cref{enum:exc-conn-case}
I.e., a connection set must -- unless the model or block is partial -- contain one source of a signal (\cref{enum:exc-conn-case}
covers the case where a connector of a component is left unconnected and the source given textually).
\end{nonnormative}
\item
Expand Down Expand Up @@ -838,7 +838,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over

A type class with an \lstinline!equalityConstraint! function declaration is called \firstuse{overdetermined type}. A record class with an \lstinline!equalityConstraint! function definition is called
\firstuse{overdetermined record}. A connector that contains instances of overdetermined type and/or record classes is called overdetermined connector. An overdetermined type or record may neither
have flow components nor may be used as a type of flow components. If an array is used as argument to any of the \lstinline!Connections.*! functions it is treated as one unit---unlike
have flow components nor may be used as a type of flow components. If an array is used as argument to any of the \lstinline!Connections.*! functions it is treated as one unit -- unlike
\lstinline!connect!, there is no special treatment of this case, compare \cref{connect-equations-and-connectors}.

Every instance of an overdetermined type or record in an overdetermined
Expand Down Expand Up @@ -898,7 +898,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over
root.
\par
\begin{nonnormative*}
This definition may be used if in a model with connector \lstinline!A! the overdetermined record \lstinline!A.R! appears differentiated---\lstinline!der(A.R)!---together
This definition may be used if in a model with connector \lstinline!A! the overdetermined record \lstinline!A.R! appears differentiated -- \lstinline!der(A.R)! -- together
with the \emph{constraint equations} of \lstinline!A.R!, i.e., a non-redundant subset of \lstinline!A.R! maybe used as states.
\end{nonnormative*}
%\strut
Expand Down
6 changes: 3 additions & 3 deletions chapters/equations.tex
Expand Up @@ -78,7 +78,7 @@ \subsection{Simple Equality Equations}\label{simple-equality-equations}
functions with several results in assignment statements.
\end{nonnormative}

\subsection{For-Equations---Repetitive Equation Structures}\label{for-equations-repetitive-equation-structures}
\subsection{For-Equations -- Repetitive Equation Structures}\label{for-equations-repetitive-equation-structures}

The syntax of a for-equation is as follows:
\begin{lstlisting}[language=grammar]
Expand Down Expand Up @@ -570,7 +570,7 @@ \section{Synchronous Data-flow Principle and Single Assignment Rule}\label{synch

\item There must exist a perfect matching of variables to equations after flattening, where a variable can only
be matched to equations that can contribute to solving for the variable
(\firstuse{perfect matching rule}---previously called \emph{single assignment rule}); see also globally balanced \cref{balanced-models}.
(\firstuse{perfect matching rule} -- previously called \emph{single assignment rule}); see also globally balanced \cref{balanced-models}.
\end{enumerate}

\section{Events and Synchronization}\label{events-and-synchronization}
Expand Down Expand Up @@ -814,7 +814,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali
that need to be set.
\end{nonnormative}

All variables declared as \lstinline!parameter! having \lstinline!fixed = false! are treated as unknowns during the initialization phase, i.e.\ there must be additional equations for them---and
All variables declared as \lstinline!parameter! having \lstinline!fixed = false! are treated as unknowns during the initialization phase, i.e.\ there must be additional equations for them -- and
the \lstinline!start!-value can be used as a guess-value during initialization.

\begin{nonnormative}
Expand Down

0 comments on commit e559aab

Please sign in to comment.