Merge remote-tracking branch 'central/master' into cleanup/misc-lstin…

…line

.CI/Jenkinsfile

@@ -18,7 +18,7 @@ pipeline {
   stage('build') {
     agent {
       docker {
-        image 'modelicaspec/latexml:20200803'
+        image 'modelicaspec/latexml:20200804'
         label 'linux'
         alwaysPull true
       }
@@ -30,7 +30,7 @@ pipeline {
       sh 'mkdir -p /tmp/jenkins'
       sh 'latexmk -pdf MLS.tex'
       sh 'latexml --path=media MLS.tex --dest MLS.xml'
-      sh 'latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/LaTeXML-navbar-left.css --dest MLS.html'
+      sh 'latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/MLS.css --css=css/LaTeXML-navbar-left.css --dest MLS.html'
       sh 'ln -s preface.html Chx1.html'
       sh 'ln -s lexical-structure.html Ch2.html'
       sh 'ln -s operators-and-expressions.html Ch3.html'

.CI/latexml/Dockerfile

@@ -23,7 +23,7 @@ RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirro
  && $INSTALL/install-tl --profile texlive.profile \
  && rm texlive.profile \
  && tlmgr update --self --all --reinstall-forcibly-removed \
- && tlmgr install latexmk listings cleveref xcolor float multirow tocloft parskip etoolbox \
+ && tlmgr install latexmk listings caption cleveref xcolor float multirow tocloft parskip etoolbox \
  && cpanm JSON \
  && cpanm LaTeXML \
  && apt-get autoremove -qy make gcc curl wget git cpanminus libxml2-dev libxslt-dev \

.CI/latexml/Dockerfile.incremental

@@ -1,5 +1,5 @@
 FROM modelicaspec/latexml:20200415
 
 RUN tlmgr update --self \
- && tlmgr install cleveref \
+ && tlmgr install cleveref caption \
  && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/ /root/.cpanm/work*

.gitignore

@@ -149,5 +149,20 @@ MLS\.pdf
 
 LaTeXML.css
 MLS.tar.gz
+ltx-article.css
 ltx-listings.css
 ltx-report.css
+
+# Directories belonging to the LaTeXML build
+/annotations/
+/connectors-and-connections/
+/interface-or-type-relationships/
+/modelica-dae-representation/
+/overloaded-operators/
+/packages/
+/preface/
+/state-machines/
+/stream-connectors/
+/synchronous-language-elements/
+/the-modelica-standard-library/
+/unit-expressions/

LICENSE.md

@@ -0,0 +1,6 @@
+Copyright (C) 1998-2020 Modelica Association Project "Modelica Language"
+              All rights reserved.
+
+![Creative Commons License](https://i.creativecommons.org/l/by-sa/4.0/88x31.png)
+
+The Modelica Specification is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/).

MLS.tex

@@ -16,7 +16,7 @@
 % needed for over-determined connectors (as it would otherwise overflow)
 \pagestyle{fancy}
 \rhead{Modelica Language Specification 3.5-dev\\ \nouppercase{\rightmark} \vspace{1mm}}
-\lhead{\includegraphics[scale=0.1]{Modelica_Language}}
+\lhead{\includegraphics[height=6.5mm]{Modelica_Language}}
 \renewcommand{\headrulewidth}{0.0pt}
 
 % Abstract

Makefile

@@ -1,4 +1,4 @@
-# Note: You should really repeat pdflatex run 1-3 times depending on status, I did not manage to make that conditional for nmake
+# Note: Using latexmk, since it automatically runs pdflatex as many times as needed.
 #
 # If you have latexml source (preferably with UseLabal patch) set:
 #    LATEXMLPREFIX=perl <latexmlinstallation/bin>
@@ -18,10 +18,10 @@ clean-html:
 clean: clean-pdf clean-html
 
 MLS.pdf: *.tex chapters/*.tex
-	pdflatex MLS.tex
+	latexmk -pdf MLS.tex
 
 # Seems to be some issue with graphicpath, so set path here as well
 # Not using %.html since nmake does not support it (instead using old-style suffix rules)
 MLS.html: MLS.tex chapters/*.tex
 	$(LATEXMLPREFIX)latexml MLS.tex --path=media --dest MLS.xml
-	$(LATEXMLPREFIX)latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/LaTeXML-navbar-left.css --dest $@
+	$(LATEXMLPREFIX)latexmlpost MLS.xml -format html -pmml --splitat=chapter --splitnaming=labelrelative --javascript=css/LaTeXML-maybeMathJax.js --navigationtoc=context --css=css/MLS.css --css=css/LaTeXML-navbar-left.css --dest $@

RationaleMCP/ReadMe.md

@@ -17,7 +17,7 @@ New MCP should be added to the following list - on the main branch to keep track
 but the rest of the development on a branch/pull-request before being accepted.
 
 ## List of existing MCPs
-- MCP0037 Generalized Modelica URIs for external resources
+- MCP0037 Generalized Modelica URIs ([MCP/0037])(https://github.com/modelica/ModelicaSpecification/tree/MCP/0037/RationaleMCP/0037))
 - MCP0036 Setting states ([MCP/0036]) (https://github.com/modelica/ModelicaSpecification/tree/MCP/0036/RationaleMCP/0036))
 - MCP0035 Multilingual support of Modelica([MCP/0035](https://github.com/modelica/ModelicaSpecification/tree/MCP/0035/RationaleMCP/0035))
 - MCP0034 Ternary ([MCP/0034](https://github.com/modelica/ModelicaSpecification/tree/MCP/0034/RationaleMCP/0034))

chapters/abstract.tex

@@ -31,8 +31,7 @@
 utilized to enable efficient handling of large models having more than
 one hundred thousand equations. Modelica is suited and used for
 hardware-in-the-loop simulations and for embedded control systems. More
-information is available at
-\url{https://www.modelica.org}
+information is available at \url{https://www.modelica.org}.
 \end{abstract}
 
 \hypersetup{pageanchor=true}