From 6ba0e12b9f635f5a03ab3e8637bf260548e23ba6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 May 2017 21:22:21 +0000 Subject: markdown (7may17) git-svn-id: svn://tug.org/texlive/trunk@44237 c570f23f-e606-0410-a88d-b1316a301751 --- .../context/third/markdown/examples/context.tex | 21 ++++ .../doc/context/third/markdown/examples/example.md | 121 +++++++++++++++++++++ .../context/third/markdown/examples/scientists.csv | 4 + .../texmf-dist/doc/generic/markdown/markdown.pdf | Bin 346756 -> 346725 bytes .../doc/latex/markdown/examples/example.md | 121 +++++++++++++++++++++ .../doc/latex/markdown/examples/latex.tex | 31 ++++++ .../doc/latex/markdown/examples/scientists.csv | 4 + .../source/generic/markdown/docstrip.cfg | 2 +- .../source/generic/markdown/markdown.dtx | 6 +- .../texmf-dist/tex/generic/markdown/markdown.tex | 4 +- Master/texmf-dist/tex/luatex/markdown/markdown.lua | 4 +- 11 files changed, 310 insertions(+), 8 deletions(-) create mode 100644 Master/texmf-dist/doc/context/third/markdown/examples/context.tex create mode 100644 Master/texmf-dist/doc/context/third/markdown/examples/example.md create mode 100644 Master/texmf-dist/doc/context/third/markdown/examples/scientists.csv create mode 100644 Master/texmf-dist/doc/latex/markdown/examples/example.md create mode 100644 Master/texmf-dist/doc/latex/markdown/examples/latex.tex create mode 100644 Master/texmf-dist/doc/latex/markdown/examples/scientists.csv (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/context.tex b/Master/texmf-dist/doc/context/third/markdown/examples/context.tex new file mode 100644 index 00000000000..5c1caf25de1 --- /dev/null +++ b/Master/texmf-dist/doc/context/third/markdown/examples/context.tex @@ -0,0 +1,21 @@ +\enableregime[utf] +\usetypescript[modern][ec] +\setupbodyfont[10pt,rm] +\setupexternalfigures[location={local,global,default}] +\usemodule[t][markdown] +\def\markdownOptionHashEnumerators{true} +\def\markdownOptionDefinitionLists{true} +\def\markdownOptionSmartEllipses{true} +\def\markdownOptionFootnotes{true} +\def\markdownOptionInlineFootnotes{true} +\def\markdownOptionFencedCode{true} +\def\markdownOptionContentBlocks{true} +\definetyping [latex] +\setuptyping [latex] [option=TEX] +\starttext + \markdownInput{example.md} + \startmarkdown +Here are some non-ASCII characters: *ěščřžýáíé* +and ConTeXt special characters: *|*. + \stopmarkdown +\stoptext diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/example.md b/Master/texmf-dist/doc/context/third/markdown/examples/example.md new file mode 100644 index 00000000000..73f5ab9c26a --- /dev/null +++ b/Master/texmf-dist/doc/context/third/markdown/examples/example.md @@ -0,0 +1,121 @@ +This is an H1 +============= + +This is an H2 +------------- + +### This is an H3 +#### This is an H4 +##### This is an H5 +###### This is an H6 + +This is a text paragraph containing an ellipsis ... and followed by a horizontal rule. + +*** + +This is inline `code`. This is a [link](http://google.cz "Google"). _This is an *emphasized* span of text_. __This is a **strongly emphasized** span of text__. + + ![example image](example-image.pdf "An example image from Martin Scharrer's mwe package") + + /scientists.csv (The great minds of the 19th century rendered via a content block) + +This is a fenced code block: + +``` latex +\documentclass{article} +\begin{document} + Hello world! +\end{document} +``` + +This is a bullet list: + + * The first item of a bullet list + + that spans several paragraphs, + * the second item of a bullet list, + * the third item of a bullet list. + +This is a compact bullet list: + + * The first item of a bullet list, + * the second item of a bullet list, + * the third item of a bullet list. + +This is an ordered list: + + 5. The first item of an ordered list + + that spans several paragraphs, + 6. the second item of an ordered list, + 7. the third item of an ordered list. + +This is an ordered list using hash enumerators: + + #. The first item of an ordered list + + that spans several paragraphs, + #. the second item of an ordered list, + #. the third item of an ordered list. + +This is a compact ordered list: + + 5. The first item of an ordered list, + 6. the second item of an ordered list, + 7. the third item of an ordered list. + +This is a compact ordered list using hash enumerators: + + #. The first item of an ordered list, + #. the second item of an ordered list, + #. the third item of an ordered list. + +This is a definition list: + +Term 1 + +: Definition 1 + +*Term 2* + +: Definition 2 + + Some code, part of Definition 2 + + Third paragraph of Definition 2. + +: Definition 3 + +This is a compact definition list: + +Term 1 +: Definition 1 +*Term 2* +: Definition 2 +: Definition 3 + +This is a block quote: + +> This is the first level of quoting. +> +> > This is nested blockquote. +> +> Back to the first level. + +Here is a footnote reference[^1] and another.[^longnote] +Here is an inline note.^[Inlines notes are easier to +write, since you don't have to pick an identifier and +move down to type the note.] + +[^1]: Here is the footnote. + +[^longnote]: Here's one with multiple blocks. + + Subsequent paragraphs are indented to show that they +belong to the previous footnote. + + Some code + + The whole paragraph can be indented, or just the first + line. In this way, multi-paragraph footnotes work like + multi-paragraph list items. diff --git a/Master/texmf-dist/doc/context/third/markdown/examples/scientists.csv b/Master/texmf-dist/doc/context/third/markdown/examples/scientists.csv new file mode 100644 index 00000000000..dee7830edf8 --- /dev/null +++ b/Master/texmf-dist/doc/context/third/markdown/examples/scientists.csv @@ -0,0 +1,4 @@ +Name,Surname,Born +Albert,Einstein,1879 +Marie,Curie,1867 +Thomas,Edison,1847 diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf index 4d3419676b9..c65e88ee0e0 100644 Binary files a/Master/texmf-dist/doc/generic/markdown/markdown.pdf and b/Master/texmf-dist/doc/generic/markdown/markdown.pdf differ diff --git a/Master/texmf-dist/doc/latex/markdown/examples/example.md b/Master/texmf-dist/doc/latex/markdown/examples/example.md new file mode 100644 index 00000000000..73f5ab9c26a --- /dev/null +++ b/Master/texmf-dist/doc/latex/markdown/examples/example.md @@ -0,0 +1,121 @@ +This is an H1 +============= + +This is an H2 +------------- + +### This is an H3 +#### This is an H4 +##### This is an H5 +###### This is an H6 + +This is a text paragraph containing an ellipsis ... and followed by a horizontal rule. + +*** + +This is inline `code`. This is a [link](http://google.cz "Google"). _This is an *emphasized* span of text_. __This is a **strongly emphasized** span of text__. + + ![example image](example-image.pdf "An example image from Martin Scharrer's mwe package") + + /scientists.csv (The great minds of the 19th century rendered via a content block) + +This is a fenced code block: + +``` latex +\documentclass{article} +\begin{document} + Hello world! +\end{document} +``` + +This is a bullet list: + + * The first item of a bullet list + + that spans several paragraphs, + * the second item of a bullet list, + * the third item of a bullet list. + +This is a compact bullet list: + + * The first item of a bullet list, + * the second item of a bullet list, + * the third item of a bullet list. + +This is an ordered list: + + 5. The first item of an ordered list + + that spans several paragraphs, + 6. the second item of an ordered list, + 7. the third item of an ordered list. + +This is an ordered list using hash enumerators: + + #. The first item of an ordered list + + that spans several paragraphs, + #. the second item of an ordered list, + #. the third item of an ordered list. + +This is a compact ordered list: + + 5. The first item of an ordered list, + 6. the second item of an ordered list, + 7. the third item of an ordered list. + +This is a compact ordered list using hash enumerators: + + #. The first item of an ordered list, + #. the second item of an ordered list, + #. the third item of an ordered list. + +This is a definition list: + +Term 1 + +: Definition 1 + +*Term 2* + +: Definition 2 + + Some code, part of Definition 2 + + Third paragraph of Definition 2. + +: Definition 3 + +This is a compact definition list: + +Term 1 +: Definition 1 +*Term 2* +: Definition 2 +: Definition 3 + +This is a block quote: + +> This is the first level of quoting. +> +> > This is nested blockquote. +> +> Back to the first level. + +Here is a footnote reference[^1] and another.[^longnote] +Here is an inline note.^[Inlines notes are easier to +write, since you don't have to pick an identifier and +move down to type the note.] + +[^1]: Here is the footnote. + +[^longnote]: Here's one with multiple blocks. + + Subsequent paragraphs are indented to show that they +belong to the previous footnote. + + Some code + + The whole paragraph can be indented, or just the first + line. In this way, multi-paragraph footnotes work like + multi-paragraph list items. diff --git a/Master/texmf-dist/doc/latex/markdown/examples/latex.tex b/Master/texmf-dist/doc/latex/markdown/examples/latex.tex new file mode 100644 index 00000000000..c02aedbaaa0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/markdown/examples/latex.tex @@ -0,0 +1,31 @@ +\documentclass{book} +\usepackage{ifxetex,ifluatex} +\ifxetex + \usepackage{polyglossia} + \setmainlanguage{english} + \usepackage{fontspec} +\else\ifluatex + \usepackage{polyglossia} + \setmainlanguage{english} + \usepackage{fontspec} +\else + \usepackage[english]{babel} + \usepackage[utf8]{inputenc} + \usepackage[T1]{fontenc} + \usepackage{lmodern} +\fi\fi +\usepackage[ + hashEnumerators, + definitionLists, + footnotes, + inlineFootnotes, + smartEllipses, + fencedCode, + contentBlocks +]{markdown} +\begin{document} + \markdownInput{example.md} + \begin{markdown} +Here are some non-ASCII characters: *ěščřžýáíé*. + \end{markdown} +\end{document} diff --git a/Master/texmf-dist/doc/latex/markdown/examples/scientists.csv b/Master/texmf-dist/doc/latex/markdown/examples/scientists.csv new file mode 100644 index 00000000000..dee7830edf8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/markdown/examples/scientists.csv @@ -0,0 +1,4 @@ +Name,Surname,Born +Albert,Einstein,1879 +Marie,Curie,1867 +Thomas,Edison,1847 diff --git a/Master/texmf-dist/source/generic/markdown/docstrip.cfg b/Master/texmf-dist/source/generic/markdown/docstrip.cfg index 41622d0afd0..b740bf6dbcb 100644 --- a/Master/texmf-dist/source/generic/markdown/docstrip.cfg +++ b/Master/texmf-dist/source/generic/markdown/docstrip.cfg @@ -22,7 +22,7 @@ -- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE^^J% -- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.^^J% -- ^^J% --- Copyright (C) 2016 Vít Novotný^^J% +-- Copyright (C) 2017 Vít Novotný^^J% -- ^^J% -- This work may be distributed and/or modified under the^^J% -- conditions of the LaTeX Project Public License, either version 1.3^^J% diff --git a/Master/texmf-dist/source/generic/markdown/markdown.dtx b/Master/texmf-dist/source/generic/markdown/markdown.dtx index b836b44ef38..e0595966a24 100644 --- a/Master/texmf-dist/source/generic/markdown/markdown.dtx +++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx @@ -156,7 +156,7 @@ % \fi % \begin{macrocode} local metadata = { - version = "2.5.2", + version = "2.5.3", comment = "A module for the conversion from markdown to plain TeX", author = "John MacFarlane, Hans Hagen, Vít Novotný", copyright = "2009-2017 John MacFarlane, Hans Hagen; " .. @@ -719,8 +719,8 @@ defaultOptions.underscores = true % \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{2017/04/28}% -\def\markdownVersion{2.5.2}% +\def\markdownLastModified{2017/05/07}% +\def\markdownVersion{2.5.3}% % \end{macrocode} % % The plain \TeX{} interface is implemented by the \t`markdown.tex` file that diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex index 1e80158f326..9900f543122 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{2017/04/28}% -\def\markdownVersion{2.5.2}% +\def\markdownLastModified{2017/05/07}% +\def\markdownVersion{2.5.3}% \let\markdownBegin\relax \let\markdownEnd\relax \let\markdownInput\relax diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua index e2c7527b3fd..fdb0d624982 100644 --- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua +++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua @@ -20,7 +20,7 @@ -- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- --- Copyright (C) 2016 Vít Novotný +-- Copyright (C) 2017 Vít Novotný -- -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either version 1.3 @@ -58,7 +58,7 @@ -- those in the standard .ins files. -- local metadata = { - version = "2.5.2", + version = "2.5.3", comment = "A module for the conversion from markdown to plain TeX", author = "John MacFarlane, Hans Hagen, Vít Novotný", copyright = "2009-2017 John MacFarlane, Hans Hagen; " .. -- cgit v1.2.3