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.

Sign up for GitHub

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

Remove <mroot> from MathML in user manual #422

Merged
merged 3 commits into from
Mar 13, 2024
Merged

Remove <mroot> from MathML in user manual #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cadb106
Remove `<mroot>` from MathML in user manual
Witiko Mar 13, 2024
55b2a0a
Update `CHANGES.md`
Witiko Mar 13, 2024
2a15a52
Retry updating packages in non-historic TeX Live versions for 30 minutes
Witiko Mar 13, 2024
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Documentation:

- Add slides from the defense of projects MUNI/33/1654/2022 and
MUNI/33/1658/2022 to `README.md`. (49f01ccf)
- Remove `<mroot>` from MathML in the user manual. (#420, #422,
contributed by @quark67)

Contributed Software:

Expand Down
41 changes: 21 additions & 20 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ARG DEPENDENCIES="\
poppler-utils \
python3-pygments \
python3-venv \
retry \
ruby \
unzip \
wget \
Expand Down Expand Up @@ -66,19 +67,19 @@ set -o errexit
set -o nounset
set -o xtrace

# Install dependencies
apt-get -qy update
apt-get -qy install --no-install-recommends ${DEPENDENCIES}

# Update packages in non-historic TeX Live versions
if echo ${TEXLIVE_TAG} | grep -q latest
then
tlmgr update --self --all
retry -t 30 -d 60 tlmgr update --self --all
elif echo ${TEXLIVE_TAG} | grep -q pretest
then
tlmgr update --self --all --repository ftp://ftp.cstug.cz/pub/tex/local/tlpretest/
retry -t 30 -d 60 tlmgr update --self --all --repository ftp://ftp.cstug.cz/pub/tex/local/tlpretest/
fi

# Install dependencies
apt-get -qy update
apt-get -qy install --no-install-recommends ${DEPENDENCIES}

# Generate the ConTeXt file database
mtxrun --generate

Expand Down Expand Up @@ -150,13 +151,25 @@ set -o errexit
set -o nounset
set -o xtrace

# Install dependencies, but this time we clean up after ourselves
apt-get -qy update
apt-get -qy install --no-install-recommends ${DEPENDENCIES}
if [ ${DEV_IMAGE} = true ]
then
apt-get -qy install --no-install-recommends ${DEV_DEPENDENCIES}
fi
apt-get -qy autoclean
apt-get -qy clean
apt-get -qy autoremove --purge
rm -rfv ${AUXILIARY_FILES}

# Update packages in non-historic TeX Live versions
if echo ${TEXLIVE_TAG} | grep -q latest
then
tlmgr update --self --all
retry -t 30 -d 60 tlmgr update --self --all
elif echo ${TEXLIVE_TAG} | grep -q pretest
then
tlmgr update --self --all --repository ftp://ftp.cstug.cz/pub/tex/local/tlpretest/
retry -t 30 -d 60 tlmgr update --self --all --repository ftp://ftp.cstug.cz/pub/tex/local/tlpretest/
fi

# Uninstall the distribution Markdown package
Expand Down Expand Up @@ -186,18 +199,6 @@ set -o xtrace
# Make the markdown-cli script executable
chmod +x ${BINARY_DIR}/markdown-cli

# Install dependencies, but this time we clean up after ourselves
apt-get -qy update
apt-get -qy install --no-install-recommends ${DEPENDENCIES}
if [ ${DEV_IMAGE} = true ]
then
apt-get -qy install --no-install-recommends ${DEV_DEPENDENCIES}
fi
apt-get -qy autoclean
apt-get -qy clean
apt-get -qy autoremove --purge
rm -rfv ${AUXILIARY_FILES}

# Generate the ConTeXt file database
mtxrun --generate

Expand Down
28 changes: 14 additions & 14 deletions markdown.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -1924,7 +1924,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -1977,7 +1977,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -7157,7 +7157,7 @@ following text:

> \$\\sqrt {-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -7199,7 +7199,7 @@ following text:

> \$\\sqrt {-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -7231,7 +7231,7 @@ following text:

> \$\\sqrt {-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -7263,7 +7263,7 @@ following text:

> \$\\sqrt {-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -7295,7 +7295,7 @@ following text:

> \$\\sqrt {-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -11298,7 +11298,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -14083,7 +14083,7 @@ following text:
>
> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -14124,7 +14124,7 @@ following text:
>
> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -14161,7 +14161,7 @@ following text:
>
> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -21053,7 +21053,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down Expand Up @@ -21674,7 +21674,7 @@ following text:

> \$\\sqrt{-1}\$ *equals* \$i\$.
>
> <math><mroot><msqrt><mo>−</mo><mn>1</mn></msqrt></mroot></math>
> <math><msqrt><mo>−</mo><mn>1</mn></msqrt></math>
> *equals*
> <math><mi>i</mi></math>.

Expand Down