Skip to content

Commit

Permalink
Remove misplaced paragraph breaks
Browse files Browse the repository at this point in the history
If an empty line is desired for improved readability of the source, it needs to be commented-out.
  • Loading branch information
henrikt-ma committed Apr 26, 2020
1 parent 83cace5 commit d03d893
Show file tree
Hide file tree
Showing 22 changed files with 6 additions and 187 deletions.
21 changes: 1 addition & 20 deletions chapters/annotations.tex
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ \section{Annotations for Code Generation}\doublelabel{annotations-for-code-gener
\end{lstlisting}
These annotations can influence the code generation. The details are
defined in the next table:

\begin{longtable}[]{|p{4.2cm}|p{10cm}|}
\hline \endhead
\lstinline!Evaluate!&
Expand Down Expand Up @@ -433,7 +432,6 @@ \subsubsection{Coordinate Systems}\doublelabel{coordinate-systems}
\end{lstlisting}
The coordinate system (including preserveAspectRatio) of a class is
defined by the following priority:

\begin{enumerate}
\item
The coordinate system annotation given in the class (if specified).
Expand Down Expand Up @@ -540,7 +538,6 @@ \subsection{Component Instance}\doublelabel{component-instance}
A component instance can be placed within a diagram or icon layer. It
has an annotation with a \lstinline!Placement! modifier to describe the placement.
Placements are defined in term of coordinate systems transformations:

\begin{lstlisting}[language=modelica]
record Transformation
Point origin = {0, 0};
Expand Down Expand Up @@ -719,7 +716,6 @@ \subsection{Graphical primitives}\doublelabel{graphical-primitives}
\subsubsection{Line}\doublelabel{line}

A line is specified as follows:

\begin{lstlisting}[language=modelica]
record Line
extends GraphicItem;
Expand All @@ -736,7 +732,6 @@ \subsubsection{Line}\doublelabel{line}
representation of a connection.

For arrows:

\begin{itemize}
\item
The arrow is drawn with an aspect ratio of 1/3 for each arrow half, i.e.,
Expand All @@ -755,7 +750,6 @@ \subsubsection{Line}\doublelabel{line}
\subsubsection{Polygon}\doublelabel{polygon}

A polygon is specified as follows:

\begin{lstlisting}[language=modelica]
record Polygon
extends GraphicItem;
Expand All @@ -770,7 +764,6 @@ \subsubsection{Polygon}\doublelabel{polygon}
\subsubsection{Rectangle}\doublelabel{rectangle}

A rectangle is specified as follows:

\begin{lstlisting}[language=modelica]
record Rectangle
extends GraphicItem;
Expand All @@ -787,7 +780,6 @@ \subsubsection{Rectangle}\doublelabel{rectangle}
\subsubsection{Ellipse}\doublelabel{ellipse}

An ellipse is specified as follows:

\begin{lstlisting}[language=modelica]
record Ellipse
extends GraphicItem;
Expand Down Expand Up @@ -829,7 +821,6 @@ \subsubsection{Ellipse}\doublelabel{ellipse}
\subsubsection{Text}\doublelabel{text}

A text string is specified as follows:

\begin{lstlisting}[language=modelica]
record Text
extends GraphicItem;
Expand All @@ -849,7 +840,6 @@ \subsubsection{Text}\doublelabel{text}

There are a number of common macros that can be used in the text, and
they should be replaced when displaying the text as follows:

\begin{itemize}
\item
\%\emph{par} and \%\{\emph{par\}} replaced by the value of the parameter \lstinline!par!.
Expand Down Expand Up @@ -901,7 +891,6 @@ \subsubsection{Text}\doublelabel{text}
\subsubsection{Bitmap}\doublelabel{bitmap}

A bitmap image is specified as follows:

\begin{lstlisting}[language=modelica]
record Bitmap
extends GraphicItem;
Expand Down Expand Up @@ -974,7 +963,6 @@ \subsubsection{Mouse input}\doublelabel{mouse-input}
A Boolean variable can be changed when the cursor is held over a
graphical item or component and the selection button is pressed if the
interaction annotation contains \lstinline!OnMouseDownSetBoolean!:

\begin{lstlisting}[language=modelica]
record OnMouseDownSetBoolean
Boolean variable "Name of variable to change when mouse button pressed";
Expand Down Expand Up @@ -1068,7 +1056,6 @@ \section{Annotations for the Graphical User Interface}\doublelabel{annotations-f

A class may have the following annotations to define properties of the
graphical user interface:

\begin{lstlisting}[language=modelica]
annotation(defaultComponentName = "name")
\end{lstlisting}
Expand Down Expand Up @@ -1668,7 +1655,6 @@ \subsubsection{Conversion rules}\doublelabel{conversion-rules}
If the modifiers contain literal string values they must be quoted.

Behaviour in unusual cases:

\begin{itemize}
\item
if NewModifier list is empty then the modifier is just removed
Expand Down Expand Up @@ -1800,7 +1786,6 @@ \subsection{Version Date and Build Information}\doublelabel{version-date-and-bui
Besides version information, a top level class can have additionally the
following top-level annotations to specify associated information to the
version number:

\begin{lstlisting}[language=modelica]
String versionDate "UTC date of first version build (in format: YYYY-MM-DD)";
Integer versionBuild "Larger number is a more recent maintenance update";
Expand Down Expand Up @@ -1932,7 +1917,6 @@ \section{Annotations for Access Control to Protect Intellectual Property}\double
licensing. Obfuscation and encryption are not standardized.
protection and licensing are both defined inside the
\lstinline!Protection! annotation:

\begin{lstlisting}[language=modelica]
annotation(Protection(...));
\end{lstlisting}
Expand All @@ -1943,15 +1927,14 @@ \subsection{Protection of Classes}\doublelabel{protection-of-classes}
class are visible, and only the parts explicitly listed as visible below can be accessed
(if a class is encrypted and no Protection annotation is defined, the access annotation has the default value
\lstinline!Access.documentation!):

\begin{lstlisting}[language=modelica]
type Access = enumeration(hide, icon, documentation,
diagram, nonPackageText, nonPackageDuplicate,
packageText, packageDuplicate);
annotation(Protection(access = Access.documentation));
\end{lstlisting}
The items of the Access enumeration have the following meaning:

The items of the Access enumeration have the following meaning:
\begin{enumerate}
\item
\lstinline!Access.hide!\\
Expand Down Expand Up @@ -2053,7 +2036,6 @@ \subsection{Licensing}\doublelabel{licensing}

In this section annotations within the \lstinline!Protection! annotation are
defined to restrict the usage of the encrypted package:

\begin{lstlisting}[language=modelica]
record Protection
...
Expand Down Expand Up @@ -2100,7 +2082,6 @@ \subsection{Licensing}\doublelabel{licensing}
without classes that has a \lstinline!Protection! annotation of the following form
which specifies a sequence of target records, which makes it natural to
define start/end dates for different sets of targets individually:

\begin{lstlisting}[language=modelica]
record Authorization
String licensor="" "Optional string to show information about the licensor";
Expand Down
14 changes: 1 addition & 13 deletions chapters/arrays.tex
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ \section{Array Declarations}\doublelabel{array-declarations}

Upper and lower array dimension index bounds are described in \autoref{array-dimension-lower-and-upper-index-bounds}.

An array indexed by Boolean or enumeration type can only be used in the
following ways:

An array indexed by Boolean or enumeration type can only be used in the following ways:
\begin{itemize}
\item
Subscripted using expressions of the appropriate type (i.e. Boolean or
Expand Down Expand Up @@ -186,7 +184,6 @@ \subsection{Array Dimension Lower and Upper Index Bounds}\doublelabel{array-dime

The lower and upper index bounds for a dimension of an array indexed by
\lstinline!Integer!, \lstinline!Boolean!, or \lstinline!enumeration! values are as follows:

\begin{itemize}
\item
An array dimension indexed by integers has a lower bound of 1 and an
Expand All @@ -212,7 +209,6 @@ \section{Built-in Array Functions}\doublelabel{built-in-array-functions}

The following \lstinline!promote! function cannot be used in Modelica, but is
utilized below to define other array operators and functions:

\begin{longtable}[]{|l|p{9cm}|}
\caption{Promote function (cannot be used in Modelica).}\\
\hline \endhead
Expand Down Expand Up @@ -246,7 +242,6 @@ \subsection{Array Dimension and Size Functions}\doublelabel{array-dimension-and-

The following built-in functions for array dimensions and dimension
sizes are provided:

\begin{longtable}[]{|l|p{9cm}|}
\caption{Built-in array dimension and size functions.}\\
\hline
Expand Down Expand Up @@ -348,7 +343,6 @@ \subsection{Reduction Functions and Operators}\doublelabel{reduction-functions-a
then assumed to form an additive group.

The following reduction functions are available:

\begin{longtable}{|p{4.1cm}|p{10.1cm}|}
\caption{Array reduction functions and operators.}\\
\hline
Expand Down Expand Up @@ -509,7 +503,6 @@ \subsection{Matrix and Vector Algebra Functions}\doublelabel{matrix-and-vector-a
functions outerProduct, cross and skew require Real/Integer
vector(s) or matrix as input(s) and returns a Real/Integer vector or matrix (the result is only Integer
if the input/all inputs are Integer):

\begin{longtable}[]{|p{3.5cm}|p{11.5cm}|}
\caption{Matrix and vector algebra functions.}\\
\hline
Expand Down Expand Up @@ -645,7 +638,6 @@ \subsection{Array Concatenation}\doublelabel{array-concatenation}
The function \lstinline!cat(k,A,B,C,...)! concatenates arrays
\lstinline!A!,\lstinline!B!,\lstinline!C!,... along
dimension k according to the following rules:

\begin{itemize}
\item
Arrays A, B, C, ... must have the same number of dimensions, i.e.,
Expand Down Expand Up @@ -750,7 +742,6 @@ \subsection{Vector Construction}\doublelabel{vector-construction}
used instead of or in combination with this general constructor to
construct Real, Integer, Boolean or enumeration type vectors. Semantics
of the colon operator:

\begin{itemize}
\item
\lstinline!j : k! is the \lstinline!Integer! vector \lstinline!{j, j+1, ..., k}!, if \lstinline!j! and \lstinline!k! are of type
Expand Down Expand Up @@ -984,7 +975,6 @@ \subsection{Array Element-wise Multiplication}\doublelabel{array-element-wise-mu

Scalar multiplication \lstinline!s*a! or \lstinline!a*s! with numeric scalar s and numeric
scalar, vector, matrix or array \lstinline!a! is defined element-wise:

\begin{longtable}[]{|l|l|l|l|}
\caption{Scalar and scalar to array multiplication of numeric elements}\\
\hline
Expand Down Expand Up @@ -1025,7 +1015,6 @@ \subsection{Matrix and Vector Multiplication of Numeric Arrays}\doublelabel{matr

Multiplication \lstinline!a*b! of numeric vectors and matrices is defined only for
the following combinations:

\begin{longtable}[]{|l|l|l|l|}
\caption{Matrix and vector multiplication of arrays with numeric elements.}\\
\hline
Expand Down Expand Up @@ -1173,7 +1162,6 @@ \subsection{Scalar Exponentiation of Square Matrices of Numeric Elements}\double
\subsection{Slice Operation}\doublelabel{slice-operation}

The following holds for slice operations:

\begin{itemize}
\item
If \lstinline!a! is an array containing scalar components and \lstinline!m! is a component of
Expand Down
3 changes: 0 additions & 3 deletions chapters/classes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ \subsection{Syntax and Examples of Component Declarations}\doublelabel{syntax-an

The formal syntax of a component declaration clause is given by the
following syntactic rules:

\begin{lstlisting}[language=grammar]
component-clause:
type-prefix type-specifier [ array-subscripts ] component-list
Expand Down Expand Up @@ -1062,7 +1061,6 @@ \section{Balanced Models}\doublelabel{balanced-models}
expanding all unknowns (i.e. excluding parameters and constants) into a
set of scalars of primitive types. This should match the global equation
size defined as:

\begin{itemize}
\item
The number of equations defined (included in any model or block
Expand Down Expand Up @@ -1461,7 +1459,6 @@ \section{Predefined Types and Classes}\doublelabel{predefined-types-and-classes}
\subsection{Real Type}\doublelabel{real-type}

The following is the predefined \lstinline!Real! type:

\begin{lstlisting}[language=modelica]
type Real // Note: Defined with Modelica syntax although predefined
RealType value; // Accessed without dot-notation
Expand Down
4 changes: 0 additions & 4 deletions chapters/connectors.tex
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,6 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabe

A type or record declaration may have an optional definition of function
\lstinline!equalityConstraint(..)! that shall have the following prototype:

\begin{lstlisting}[language=modelica]
type Type // overdetermined type
extends <base type>;
Expand Down Expand Up @@ -850,7 +849,6 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabe
$n$. The set of n non-redundant equations stating that \lstinline!R1 = R2! is given by
the equation (\textbf{0} characterizes a vector of zeros of appropriate
size):

\begin{lstlisting}[language=modelica]
Record R1, R2;
equation
Expand Down Expand Up @@ -964,7 +962,6 @@ \subsection{Converting the Connection Graph into Trees and Generating Connection
Before \lstinline!connect(...)! equations are generated, the virtual connection
graph is transformed into a set of spanning trees by removing optional spanning tree edges
from the graph. This is performed in the following way:

\begin{enumerate}
\item
Every root node defined via the \lstinline!Connections.root(..)! statement is
Expand All @@ -986,7 +983,6 @@ \subsection{Converting the Connection Graph into Trees and Generating Connection

After this analysis, the connection equations are generated in the
following way:

\begin{enumerate}
\item
For every optional spanning-tree edge (i.e., a \lstinline!connect(A, B)!
Expand Down
3 changes: 0 additions & 3 deletions chapters/dae.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ \chapter{Modelica DAE Representation}\doublelabel{modelica-dae-representation}
Modelica simulation model into a ``flat'' set of Modelica
``statements'', consisting of the equation and algorithm sections of all
used components by:

\begin{itemize}
\item
expanding all class definitions (flattening the inheritance tree) and
Expand Down Expand Up @@ -74,7 +73,6 @@ \chapter{Modelica DAE Representation}\doublelabel{modelica-dae-representation}
have discontinuities, a variable structure and/or which are controlled
by a discrete-event system. Such types of systems are called
\emph{hybrid DAEs}. Simulation is performed in the following way:

\begin{enumerate}
\item
The DAE (\ref{eq:dae}) is solved by a numerical integration method. In this
Expand Down Expand Up @@ -111,7 +109,6 @@ \chapter{Modelica DAE Representation}\doublelabel{modelica-dae-representation}

At an event instant, including the initial event, the model equations
are reinitialized according to the following iteration procedure:

\begin{lstlisting}[language=modelica]
known variables: x, t, p
unkown variables: dx/dt, y, m, pre(m), c
Expand Down
1 change: 0 additions & 1 deletion chapters/derivationofstream.tex
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ \subsection{Connection of 3 stream connectors where two mass flow rates are posi
the required flow direction should be defined in the connector instance
with the \lstinline!min! attribute (the \lstinline!max! attribute could be also defined,
however it does not lead to simplifications):

\begin{lstlisting}[language=modelica]
model m2
Fluidport c(m_flow(min=0));
Expand Down
Loading

0 comments on commit d03d893

Please sign in to comment.