markdown (5jan17)

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

1 files changed, 17 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty
index 97b42f5f766..94997e75fb8 100644
--- a/Master/texmf-dist/tex/latex/markdown/markdown.sty
+++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty
@@ -63,6 +63,8 @@
   \def\markdownOptionBlankBeforeCodeFence{#1}}%
 \define@key{markdownOptions}{blankBeforeHeading}[true]{%
   \def\markdownOptionBlankBeforeHeading{#1}}%
+\define@key{markdownOptions}{breakableBlockquotes}[true]{%
+  \def\markdownOptionBreakableBlockquotes{#1}}%
 \define@key{markdownOptions}{citations}[true]{%
   \def\markdownOptionCitations{#1}}%
 \define@key{markdownOptions}{citationNbsps}[true]{%
@@ -77,6 +79,8 @@
   \def\markdownOptionFencedCode{#1}}%
 \define@key{markdownOptions}{hashEnumerators}[true]{%
   \def\markdownOptionHashEnumerators{#1}}%
+\define@key{markdownOptions}{html}[true]{%
+  \def\markdownOptionHtml{#1}}%
 \define@key{markdownOptions}{hybrid}[true]{%
   \def\markdownOptionHybrid{#1}}%
 \define@key{markdownOptions}{inlineFootnotes}[true]{%
@@ -403,12 +407,6 @@
   dlItem = {\item[#1]},
   dlEnd = {\end{description}},
   emphasis = {\emph{#1}},
-  strongEmphasis = {%
-    \ifx\alert\undefined
-      \textbf{\emph{#1}}%
-    \else % Beamer support
-      \alert{\emph{#1}}%
-    \fi},
   blockQuoteBegin = {\begin{quotation}},
   blockQuoteEnd = {\end{quotation}},
   inputVerbatim = {\VerbatimInput{#1}},
@@ -428,7 +426,19 @@
     \fi},
   horizontalRule = {\noindent\rule[0.5ex]{\linewidth}{1pt}},
   footnote = {\footnote{#1}}}}
-
+\newif\ifmarkdownLATEXStrongEmphasisNested
+\markdownLATEXStrongEmphasisNestedfalse
+\markdownSetup{rendererPrototypes={
+  strongEmphasis = {%
+    \ifmarkdownLATEXStrongEmphasisNested
+      \markdownLATEXStrongEmphasisNestedfalse
+      \textmd{#1}%
+      \markdownLATEXStrongEmphasisNestedtrue
+    \else
+      \markdownLATEXStrongEmphasisNestedtrue
+      \textbf{#1}%
+      \markdownLATEXStrongEmphasisNestedfalse
+    \fi}}}
 \ifx\chapter\undefined
   \markdownSetup{rendererPrototypes = {
     headingOne = {\section{#1}},
@@ -491,24 +501,6 @@
       \markdownLaTeXBibLaTeXTextCitations
       \expandafter{\expandafter}%
     \fi}}}
-\let\markdownLuaRegisterIBCallbackPrevious
-  \markdownLuaRegisterIBCallback
-\let\markdownLuaUnregisterIBCallbackPrevious
-  \markdownLuaUnregisterIBCallback
-\renewcommand\markdownLuaRegisterIBCallback[1]{%
-  if luatexbase and luatexbase.add_to_callback then
-    luatexbase.add_to_callback("process_input_buffer", #1, %
-      "The markdown input processor")
-  else
-    \markdownLuaRegisterIBCallbackPrevious{#1}
-  end}
-\renewcommand\markdownLuaUnregisterIBCallback{%
-  if luatexbase and luatexbase.add_to_callback then
-    luatexbase.remove_from_callback("process_input_buffer",%
-      "The markdown input processor")
-  else
-    \markdownLuaUnregisterIBCallbackPrevious;
-  end}
 \newcommand\markdownMakeOther{%
   \count0=128\relax
   \loop