summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-16 21:33:25 +0000
committerKarl Berry <karl@freefriends.org>2016-09-16 21:33:25 +0000
commitca20f2236eab614bf306254209820363b1b4c273 (patch)
treec50c2b12c069422f033688d3043678ecbacba53b /Master/texmf-dist/tex
parentb929a3c77186d35e3899355fa3a140fe159f2658 (diff)
markdown (16sep16)
git-svn-id: svn://tug.org/texlive/trunk@42086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdown.tex4
-rw-r--r--Master/texmf-dist/tex/latex/markdown/markdown.sty25
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua2
3 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index d058b57541c..ae4811949d7 100644
--- a/Master/texmf-dist/tex/generic/markdown/markdown.tex
+++ b/Master/texmf-dist/tex/generic/markdown/markdown.tex
@@ -45,8 +45,8 @@
%%
%% The names of the source files used are shown above.
%%
-\def\markdownLastModified{2016/09/13}%
-\def\markdownVersion{2.1.2}%
+\def\markdownLastModified{2016/09/15}%
+\def\markdownVersion{2.1.3}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markdownInput\relax
diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index 34f443fef1b..ecaa4448cc2 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -345,11 +345,28 @@
\RequirePackage{graphicx}
\RequirePackage{ifthen}
\ifx\markdownOptionTightLists\undefined
- \RequirePackage{paralist}
+ \@ifclassloaded{beamer}{}{
+ \RequirePackage{paralist}}
\else
\ifthenelse{\equal{\markdownOptionTightLists}{false}}{}{
\RequirePackage{paralist}}
\fi
+\@ifpackageloaded{paralist}{
+ \markdownSetup{rendererPrototypes={
+ ulBeginTight = {\begin{compactitem}},
+ ulEndTight = {\end{compactitem}},
+ olBeginTight = {\begin{compactenum}},
+ olEndTight = {\end{compactenum}},
+ dlBeginTight = {\begin{compactdesc}},
+ dlEndTight = {\end{compactdesc}}}}
+}{
+ \markdownSetup{rendererPrototypes={
+ ulBeginTight = {\markdownRendererUlBegin},
+ ulEndTight = {\markdownRendererUlEnd},
+ olBeginTight = {\markdownRendererOlBegin},
+ olEndTight = {\markdownRendererOlEnd},
+ dlBeginTight = {\markdownRendererDlBegin},
+ dlEndTight = {\markdownRendererDlEnd}}}}
\RequirePackage{fancyvrb}
\markdownSetup{rendererPrototypes={
lineBreak = {\\},
@@ -374,21 +391,15 @@
\label{fig:#1}%
\end{figure}},
ulBegin = {\begin{itemize}},
- ulBeginTight = {\begin{compactitem}},
ulItem = {\item},
ulEnd = {\end{itemize}},
- ulEndTight = {\end{compactitem}},
olBegin = {\begin{enumerate}},
- olBeginTight = {\begin{compactenum}},
olItem = {\item},
olItemWithNumber = {\item[#1.]},
olEnd = {\end{enumerate}},
- olEndTight = {\end{compactenum}},
dlBegin = {\begin{description}},
- dlBeginTight = {\begin{compactdesc}},
dlItem = {\item[#1]},
dlEnd = {\end{description}},
- dlEndTight = {\end{compactdesc}},
emphasis = {\emph{#1}},
strongEmphasis = {%
\ifx\alert\undefined
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index a8e6ce7f9e5..bddbcaa6c07 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -58,7 +58,7 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "2.1.2",
+ version = "2.1.3",
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 Vít Novotný",