Skip to content

Commit c125834

Browse files
Start36 (#3330)
* Update copyright year. * Add new revision section. * Update status for MCPs. (Yes, I know that the tag doesn't yet exist - but I think this is easier.) * Adding new index entries. There are a lot more things we could add, but these are primarily adding new indices for existing entries (even if they are very different). * Use smarter macro and give hints for finding pull requests. * Clean up introduction, sentence based lines and skip www. --------- Co-authored-by: Henrik Tidefelt <[email protected]>
1 parent 3f4875d commit c125834

File tree

9 files changed

+302
-13
lines changed

9 files changed

+302
-13
lines changed

MLS.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
% Define title for use by LaTeXML.
1313
% An extended title is defined separately in the 'titlepage'.
14-
\newcommand{\mlsversion}{3.6-dev}
14+
\newcommand{\mlsversion}{3.6}
1515
\newcommand{\mlsdate}{\today}
1616
\title{Modelica\textsuperscript{\textregistered} Language Specification version~\mlsversion}
1717

RationaleMCP/Hints.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Hints for generating a release.
2+
3+
Currently there are no automated procedures for generating the revision-history.
4+
5+
For the MCPs it is good to list additional pull requests considered, they can be found in GitHub's Pull Request list by searching for:
6+
```
7+
-base:master -base:maint/ is:merged
8+
```
9+
This can either be combined with limiting it to one MCP `label:MCP0035` or excluding some (earlier and later) MCPs `-label:MCP0031 -label:MCP0033`.
10+
Additionally it is good to list all pull request merged into the main branch after the latest release:
11+
```
12+
base:master merged:>=2020-12-31
13+
```

RationaleMCP/ReadMe.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ but the rest of the development on a branch/pull-request before being accepted.
2424
|Active|0038|Initialization of Clocked Partitions|[MCP/0038](https://github.com/modelica/ModelicaSpecification/tree/MCP/0038/RationaleMCP/0038)||
2525
|Active|0037|Generalized Modelica URIs|[MCP/0037](https://github.com/modelica/ModelicaSpecification/tree/MCP/0037/RationaleMCP/0037)|https://github.com/modelica/ModelicaSpecification/pull/2663|
2626
|Active|0036|Setting states|[MCP/0036](https://github.com/modelica/ModelicaSpecification/tree/MCP/0036/RationaleMCP/0036)|https://github.com/modelica/ModelicaSpecification/pull/3164|
27-
|Active|0035|Multilingual support of Modelica|[MCP/0035](https://github.com/modelica/ModelicaSpecification/tree/MCP/0035/RationaleMCP/0035)|https://github.com/modelica/ModelicaSpecification/pull/2956|
27+
|Accepted in [3.6](https://github.com/modelica/ModelicaSpecification/releases/tag/v3.6)|0035|Multilingual support of Modelica|[MCP/0035](https://github.com/modelica/ModelicaSpecification/tree/MCP/0035/RationaleMCP/0035)|https://github.com/modelica/ModelicaSpecification/pull/2956|
2828
|Active|0034|Ternary|[MCP/0034](https://github.com/modelica/ModelicaSpecification/tree/MCP/0034/RationaleMCP/0034)|https://github.com/modelica/ModelicaSpecification/pull/2477|
2929
|Added in [3.5](https://github.com/modelica/ModelicaSpecification/releases/tag/v3.5)|0033|Annotations for Predefined Plots|[MCP/0033](https://github.com/modelica/ModelicaSpecification/tree/MCP/0033/RationaleMCP/0033)||
30-
|Active|0032|Selective Model Extension|[MCP/0032](https://github.com/modelica/ModelicaSpecification/tree/MCP/0032/RationaleMCP/0032)|https://github.com/modelica/ModelicaSpecification/pull/3166|
30+
|Accepted in [3.6](https://github.com/modelica/ModelicaSpecification/releases/tag/v3.6)|0032|Selective Model Extension|[MCP/0032](https://github.com/modelica/ModelicaSpecification/tree/MCP/0032/RationaleMCP/0032)|https://github.com/modelica/ModelicaSpecification/pull/3166|
3131
|Active|0031|Flat Modelica and MLS modularization|[MCP/0031](https://github.com/modelica/ModelicaSpecification/tree/MCP/0031/RationaleMCP/0031)|
3232
|On hold|0030|IsClocked Operator||[#2238](https://github.com/modelica/ModelicaSpecification/issues/2238)|
3333
|Active|0029|License Export|[MCP/0029](https://github.com/modelica/ModelicaSpecification/tree/MCP/0029/RationaleMCP/0029)||
@@ -50,7 +50,7 @@ but the rest of the development on a branch/pull-request before being accepted.
5050
|Active|0012|Calling blocks as functions|[MCP/0012](https://github.com/modelica/ModelicaSpecification/tree/MCP/0012/RationaleMCP/0012)||
5151
|On hold|0011|Allow user-defined functions in reductions|||
5252
|On hold|0010|Adding guards to reductions|||
53-
|Active|0009|Undefined modification|[MCP/0009](https://github.com/modelica/ModelicaSpecification/tree/MCP/0009/RationaleMCP/0009)|https://github.com/modelica/ModelicaSpecification/pull/3167|
53+
|Accepted in [3.6](https://github.com/modelica/ModelicaSpecification/releases/tag/v3.6)|0009|Undefined modification|[MCP/0009](https://github.com/modelica/ModelicaSpecification/tree/MCP/0009/RationaleMCP/0009)|https://github.com/modelica/ModelicaSpecification/pull/3167|
5454
|On hold|0008|Custom annotations|||
5555
|On hold|0007|Match expressions|||
5656
|On hold|0006|Atomic blocks|||

chapters/copyright.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright \textcopyright{} 1998-2021, Modelica Association (\url{https://modelica.org})
1+
Copyright \textcopyright{} 1998-2023, Modelica Association (\url{https://modelica.org})
22

33
All rights reserved.
44
Reproduction or use of editorial or pictorial content is permitted, i.e., this document can be freely distributed especially electronically, provided the copyright notice and these conditions are retained.

chapters/inheritance.tex

+4-2
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ \subsection{Final Element Modification Prevention}\label{final-element-modificat
567567
\end{example}
568568

569569
\subsection{Removing Modifiers -- break}\label{removing-modifiers-break}
570-
Modifications may contain the special keyword \lstinline!break! instead of an expression.
570+
Modifications may contain the special keyword \lstinline!break!\index{break@\robustinline{break}!removing modifier} instead of an expression.
571571
The intention of \lstinline!break! is to remove the value.
572572

573573
The modifiers using \lstinline!break! are merged using the same rule as other modifications, and follow the same restrictions so they cannot override a final modifier.
@@ -1149,7 +1149,8 @@ \subsection{Annotations for Redeclaration and Modification}\label{annotation-cho
11491149
parameter Boolean useHeatPort = false annotation(choices(checkBox = true));
11501150
\end{lstlisting}
11511151
\end{example}
1152-
\section{Selective Model Extension}\label{selective-model-extension}
1152+
1153+
\section{Selective Model Extension}\label{selective-model-extension}\index{deselection!selective model extension}
11531154
\begin{nonnormative}
11541155
The goal of selective model extension is to enable unforeseen structural variability without requiring deliberately prepared base-models, \textcite{Buerger2019SelectiveModel}.
11551156

@@ -1167,6 +1168,7 @@ \section{Selective Model Extension}\label{selective-model-extension}
11671168
$\ldots$
11681169
end C;
11691170
\end{lstlisting}
1171+
\index{break@\robustinline{break}!deselection}
11701172
The semantic rules are:
11711173
\begin{enumerate}
11721174
\item The deselection \lstinline!break $D$! is applied before any other, non selective model extension related, modifications of \lstinline!B! in \lstinline!C!.

chapters/introduction.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ \section{Some Definitions}\label{some-definitions}
9393
The model can be analyzed in ways other than simulation, e.g., linearization, and parameter estimation, but they are not described in the specification.
9494
\end{nonnormative}
9595

96-
\begin{definition}[Translation]\index{translation}
96+
\begin{definition}[Translation]\index{translation!of simulation model}
9797
Translation is the process of preparing a Modelica simulation model for simulation, starting with flattening but not including the simulation itself.
9898
\end{definition}
9999

chapters/packages.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ \section{External Resources}\label{external-resources}
322322
The references \filename{modelica://Modelica.Mechanics/C.jpg} and \filename{modelica://Modelica/C.jpg} must also refer to two distinct resources.
323323
\end{example}
324324

325-
\section{Multilingual Descriptions}\label{multilingual-descriptions}
325+
\section{Multilingual Descriptions}\label{multilingual-descriptions}\index{translation!multilingual libraries}
326326

327327
\begin{nonnormative}
328328
Descriptive texts in a model or library are usually formulated in English.

0 commit comments

Comments
 (0)