texlive[42086] Master/texmf-dist: markdown (16sep16)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 16 23:33:25 CEST 2016
Revision: 42086
http://tug.org/svn/texlive?view=revision&revision=42086
Author: karl
Date: 2016-09-16 23:33:25 +0200 (Fri, 16 Sep 2016)
Log Message:
-----------
markdown (16sep16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/markdown/markdown.pdf
trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx
trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex
trunk/Master/texmf-dist/tex/latex/markdown/markdown.sty
trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua
Modified: trunk/Master/texmf-dist/doc/generic/markdown/markdown.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx 2016-09-16 05:15:43 UTC (rev 42085)
+++ trunk/Master/texmf-dist/source/generic/markdown/markdown.dtx 2016-09-16 21:33:25 UTC (rev 42086)
@@ -147,7 +147,7 @@
% \fi
% \begin{macrocode}
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ý",
@@ -586,8 +586,8 @@
% \ref{sec:luaoptions}) used during the conversion from markdown to plain
% \TeX{}, and for changing the way markdown the tokens are rendered.
% \begin{macrocode}
-\def\markdownLastModified{2016/09/13}%
-\def\markdownVersion{2.1.2}%
+\def\markdownLastModified{2016/09/15}%
+\def\markdownVersion{2.1.3}%
% \end{macrocode}
%
% The plain \TeX{} interface is implemented by the \t`markdown.tex` file that
@@ -1455,13 +1455,6 @@
\def\markdownOptionSmartEllipses{#1}}%
\define at key{markdownOptions}{startNumber}[true]{%
\def\markdownOptionStartNumber{#1}}%
-% \end{macrocode}
-% If the \t`tightLists=false` option is specified, when loading the package,
-% then the \pkg{paralist} package for typesetting tight lists will not be
-% automatically loaded. This precaution is meant to minimize the footprint of
-% this package, since some documentclasses (\pkg{beamer}) experience clashes
-% with the \pkg{paralist} package.
-% \begin{macrocode}
\define at key{markdownOptions}{tightLists}[true]{%
\def\markdownOptionTightLists{#1}}%
% \end{macrocode}
@@ -4028,14 +4021,39 @@
% If the \m{markdownOptionTightLists} macro expands to \t`false`, do not load
% the \pkg{paralist} package. This is necessary for \Hologo{LaTeX2e} document
% classes that do not play nice with \pkg{paralist}, such as \pkg{beamer}.
+% If the \m{markdownOptionTightLists} is undefined and the \pkg{beamer}
+% document class is in use, then do not load the \pkg{paralist} package either.
% \begin{macrocode}
\RequirePackage{ifthen}
\ifx\markdownOptionTightLists\undefined
- \RequirePackage{paralist}
+ \@ifclassloaded{beamer}{}{
+ \RequirePackage{paralist}}
\else
\ifthenelse{\equal{\markdownOptionTightLists}{false}}{}{
\RequirePackage{paralist}}
\fi
+% \end{macrocode}
+% If we loaded the \pkg{paralist} package, define the respective renderer
+% prototypes to make use of the capabilities of the package. Otherwise,
+% define the renderer prototypes to fall back on the corresponding renderers
+% for the non-tight lists.
+% \begin{macrocode}
+\@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 = {\\},
@@ -4060,21 +4078,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
Modified: trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex 2016-09-16 05:15:43 UTC (rev 42085)
+++ trunk/Master/texmf-dist/tex/generic/markdown/markdown.tex 2016-09-16 21:33:25 UTC (rev 42086)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/markdown/markdown.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/markdown/markdown.sty 2016-09-16 05:15:43 UTC (rev 42085)
+++ trunk/Master/texmf-dist/tex/latex/markdown/markdown.sty 2016-09-16 21:33:25 UTC (rev 42086)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua 2016-09-16 05:15:43 UTC (rev 42085)
+++ trunk/Master/texmf-dist/tex/luatex/markdown/markdown.lua 2016-09-16 21:33:25 UTC (rev 42086)
@@ -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ý",
More information about the tex-live-commits
mailing list