markdown (9apr18)

git-svn-id: svn://tug.org/texlive/trunk@47397 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 16 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index f60dc234e7e..251a2f62d74 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -6,7 +6,7 @@
 %%
 %% markdown.dtx  (with options: `latex')
 %% 
-%% Copyright (C) 2017 Vít Novotný
+%% Copyright (C) 2018 Vít Novotný
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -110,6 +110,8 @@
   \def\markdownOptionTightLists{#1}}%
 \define@key{markdownOptions}{underscores}[true]{%
   \def\markdownOptionUnderscores{#1}}%
+\define@key{markdownOptions}{stripPercentSigns}[true]{%
+  \def\markdownOptionStripPercentSigns{#1}}%
 \define@key{markdownRenderers}{interblockSeparator}{%
   \renewcommand\markdownRendererInterblockSeparator{#1}}%
 \define@key{markdownRenderers}{lineBreak}{%
@@ -410,8 +412,6 @@
   tilde = {\textasciitilde},
   pipe = {\textbar},
   codeSpan = {\texttt{#1}},
-  link = {#1\footnote{\ifx\empty#4\empty\else#4:
-    \fi\texttt<\url{#3}\texttt>}},
   contentBlock = {%
     \ifthenelse{\equal{#1}{csv}}{%
       \begin{table}%
@@ -452,7 +452,7 @@
     \ifx\relax#2\relax
       \VerbatimInput{#1}%
     \else
-      \ifx\minted@jobname\undefined
+      \ifx\minted@code\undefined
         \ifx\lst@version\undefined
           \markdownRendererInputFencedCode{#1}{}%
         \else
@@ -482,16 +482,16 @@
     headingOne = {\section{#1}},
     headingTwo = {\subsection{#1}},
     headingThree = {\subsubsection{#1}},
-    headingFour = {\paragraph{#1}},
-    headingFive = {\subparagraph{#1}}}}
+    headingFour = {\paragraph{#1}\leavevmode},
+    headingFive = {\subparagraph{#1}\leavevmode}}}
 \else
   \markdownSetup{rendererPrototypes = {
     headingOne = {\chapter{#1}},
     headingTwo = {\section{#1}},
     headingThree = {\subsection{#1}},
     headingFour = {\subsubsection{#1}},
-    headingFive = {\paragraph{#1}},
-    headingSix = {\subparagraph{#1}}}}
+    headingFive = {\paragraph{#1}\leavevmode},
+    headingSix = {\subparagraph{#1}\leavevmode}}}
 \fi
 \newcount\markdownLaTeXCitationsCounter
 
@@ -539,6 +539,14 @@
       \markdownLaTeXBibLaTeXTextCitations
       \expandafter{\expandafter}%
     \fi}}}
+\def\markdownRendererLinkPrototype{%
+  \begingroup
+  \catcode`\#=12
+  \def\next##1##2##3##4{%
+    ##1\footnote{%
+      \ifx\empty##4\empty\else##4: \fi\texttt<\url{##3}\texttt>}%
+    \endgroup}%
+  \next}
 \newcommand\markdownMakeOther{%
   \count0=128\relax
   \loop