From ca20f2236eab614bf306254209820363b1b4c273 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Sep 2016 21:33:25 +0000 Subject: markdown (16sep16) git-svn-id: svn://tug.org/texlive/trunk@42086 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/markdown/markdown.sty | 25 ++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/markdown') 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 -- cgit v1.2.3