Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latexml 0.8.4 #2546

Merged
merged 1 commit into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .CI/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ pipeline {
stage('build') {
agent {
docker {
image 'modelicaspec/latexml:20190319'
image 'modelicaspec/latexml:20200415'
label 'linux'
alwaysPull true
}
}
environment {
HOME = '/tmp/jenkins'
}
steps {
sh 'mkdir -p /tmp/jenkins'
sh 'latexmk -pdf MLS.tex'
sh 'latexml MLS.tex --dest MLS.xml'
sh 'latexml --path=media MLS.tex --dest MLS.xml'
sh 'latexmlpost MLS.xml -format html -pmml --splitat=chapter --javascript=css/LatexML-maybeMathJax.js --navigationtoc=context --css=css/LaTeXML-navbar-left.css --dest MLS.html'
sh 'tar czf MLS.tar.gz *.html *.css media css/'
archiveArtifacts artifacts: 'MLS.tar.gz', fingerprint: true
Expand Down
3 changes: 0 additions & 3 deletions .CI/latexml-iterative/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions .CI/latexml/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirro
&& REMOTE="http://mirror.ctan.org/systems/texlive/tlnet" \
&& INSTALL="/tmp/install-texlive" \
&& mkdir -p $INSTALL \
&& echo "export PATH=$PATH:/usr/local/texlive/2018/bin" >> /etc/environment \
&& echo "export PATH=$PATH:/usr/local/texlive/2020/bin" >> /etc/environment \
&& curl -sSL $REMOTE/install-tl-unx.tar.gz | tar -xzv -C $INSTALL --strip-components=1 \
&& echo selected_scheme scheme-basic > texlive.profile \
&& echo TEXDIR /usr/local/texlive/ >> texlive.profile \
Expand All @@ -25,7 +25,7 @@ RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirro
&& tlmgr update --self --all --reinstall-forcibly-removed \
&& tlmgr install latexmk listings xcolor float multirow tocloft parskip etoolbox \
&& cpanm JSON \
&& cpanm --notest https://github.com/HansOlsson/LaTeXML.git@UseLabel \
&& cpanm LaTeXML \
&& apt-get autoremove -qy make gcc curl wget git cpanminus libxml2-dev libxslt-dev \
&& latexmk --version \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/ /root/.cpanm/work*
4 changes: 2 additions & 2 deletions chapters/derivationofstream.tex
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ \subsection{Connection of 2 stream connectors, one to one connections (N=2):}\do
simplifications of the form $a * b / a = b$ must be provided, or that this
case is treated directly.

\subsection{Connection of 3 stream connectors where one mass flow rate is identical to zero (N=3 and $\dot{m}_3=0$):}\doublelabel{connection-of-3-stream-connectors-where-one-mass-flow-rate-is-identical-to-zero-n-3-and}
This case occurs, when a one-port sensor (like a temperature sensor) is
\subsection{Connection of 3 stream connectors where one mass flow rate is identical to zero:}\doublelabel{connection-of-3-stream-connectors-where-one-mass-flow-rate-is-identical-to-zero-n-3-and}
The case where N=3 and $\dot{m}_3=0$ occurs when a one-port sensor (like a temperature sensor) is
connected to two connected components. For the sensor, the min attribute
of the mass flow rate should be set to zero (no fluid exiting the
component via this connector).
Expand Down