From e27140d91533e1578b76f32fb956d72d1d00439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Novotn=C3=BD?= <witiko@mail.muni.cz>
Date: Thu, 19 Mar 2020 21:38:07 +0100
Subject: [PATCH] Prepare the package for the 2.8.2 release and pretest TeX
 Live 2020

---
 .circleci/config.yml | 24 ++++++++++--------------
 LICENSE              |  2 +-
 docstrip.cfg         |  4 ++--
 markdown.dtx         |  8 ++++----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7624cffe..74b924e4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,20 +10,15 @@ jobs:
     steps:
     - restore_cache:
         keys:
-        - markdown-v2.8.1-tl2019-{{ .Branch }}
-        - markdown-v2.8.1-tl2019-master
-        - markdown-v2.8.1-tl2019-
+        - markdown-v2.8.2-tl2020_pretest-{{ .Branch }}
+        - markdown-v2.8.2-tl2020_pretest-master
+        - markdown-v2.8.2-tl2020_pretest-
     # Install TeX Live
     - run: |
         set -e
-        mkdir -p ~/apt-cache/partial
-        sudo apt-get -o dir::cache::archives="$HOME"/apt-cache update
         if [[ ! -e ~/texlive-cache ]]; then
-          cd /tmp
-          sudo apt-get -o dir::cache::archives="$HOME"/apt-cache install p7zip-full
-          wget ftp://tug.org/tex-archive/systems/texlive/Images/texlive2019.iso
-          7z x texlive2019.iso
-          chmod +x install-tl
+          rsync -v -a --delete --exclude="mactex*" ftp.cstug.cz::pub/tex/local/tlpretest /tmp
+          cd /tmp/tlpretest
           sudo ./install-tl <<<I
           sudo mv /usr/local/texlive ~/texlive-cache
           cd -
@@ -31,10 +26,11 @@ jobs:
     # Install additional packages
     - run: |
         set -e
-        sudo apt-get -o dir::cache::archives="$HOME"/apt-cache install pandoc parallel
-        sudo pip install pygments
+        mkdir -p ~/apt-cache/partial
+        sudo apt-get -o dir::cache::archives="$HOME"/apt-cache update
+        sudo apt-get -o dir::cache::archives="$HOME"/apt-cache install pandoc parallel python-pygments
     - save_cache:
-        key: markdown-v2.8.1-tl2019-{{ .Branch }}
+        key: markdown-v2.8.2-tl2020_pretest-{{ .Branch }}
         paths:
         - ~/apt-cache/partial
         - ~/texlive-cache
@@ -42,7 +38,7 @@ jobs:
     - run: |
         set -e
         sudo mv ~/texlive-cache /usr/local/texlive
-        echo 'export PATH=/usr/local/texlive/2019/bin/x86_64-linux:"$PATH"' >>$BASH_ENV
+        echo 'export PATH=/usr/local/texlive/2020/bin/x86_64-linux:"$PATH"' >>$BASH_ENV
     - checkout
     # Install the Markdown package
     - run: |
diff --git a/LICENSE b/LICENSE
index 72d52c06d..17717b884 100644
--- a/LICENSE
+++ b/LICENSE
@@ -19,7 +19,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Copyright (C) 2016-2018 Vít Novotný
+Copyright (C) 2016-2020 Vít Novotný
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/docstrip.cfg b/docstrip.cfg
index a03b51c87..60f15d393 100644
--- a/docstrip.cfg
+++ b/docstrip.cfg
@@ -22,7 +22,7 @@
 -- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE^^J%
 -- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.^^J%
 -- ^^J%
--- Copyright (C) 2016-2019 Vít Novotný^^J%
+-- Copyright (C) 2016-2020 Vít Novotný^^J%
 -- ^^J%
 -- This work may be distributed and/or modified under the^^J%
 -- conditions of the LaTeX Project Public License, either version 1.3^^J%
@@ -62,7 +62,7 @@
 \let\luapostamble\empty
 \declarepreamble\texpreamble
 
-Copyright (C) 2016-2019 Vít Novotný
+Copyright (C) 2016-2020 Vít Novotný
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/markdown.dtx b/markdown.dtx
index 462b149a4..0cf9f4f9a 100644
--- a/markdown.dtx
+++ b/markdown.dtx
@@ -570,11 +570,11 @@ documentation][techdoc].
 % \fi
 %  \begin{macrocode}
 local metadata = {
-    version   = "2.8.1",
+    version   = "2.8.2",
     comment   = "A module for the conversion from markdown to plain TeX",
     author    = "John MacFarlane, Hans Hagen, Vít Novotný",
     copyright = {"2009-2016 John MacFarlane, Hans Hagen",
-                 "2016-2019 Vít Novotný"},
+                 "2016-2020 Vít Novotný"},
     license   = "LPPL 1.3"
 }
 
@@ -5660,8 +5660,8 @@ pdftex --shell-escape document.tex
 %
 % \end{markdown}
 %  \begin{macrocode}
-\def\markdownLastModified{2019/04/30}%
-\def\markdownVersion{2.8.1}%
+\def\markdownLastModified{2020/03/20}%
+\def\markdownVersion{2.8.2}%
 %    \end{macrocode}
 % \par
 % \begin{markdown}