summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-09 22:35:40 +0000
committerKarl Berry <karl@freefriends.org>2018-01-09 22:35:40 +0000
commit9b0b462cc883d8c84c94de90d3efbb96c4f1edf5 (patch)
treecc5409882242e2046a5381e01c74ec010e332012 /Master
parent1dbc8fa89c0f6fc256c3c480740e52bd6d47ba05 (diff)
markdown (9jan18)
git-svn-id: svn://tug.org/texlive/trunk@46265 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/markdown/markdown.pdfbin349755 -> 349893 bytes
-rw-r--r--Master/texmf-dist/source/generic/markdown/docstrip.cfg4
-rw-r--r--Master/texmf-dist/source/generic/markdown/markdown.dtx42
-rw-r--r--Master/texmf-dist/tex/generic/markdown/markdown.tex6
-rw-r--r--Master/texmf-dist/tex/luatex/markdown/markdown.lua10
5 files changed, 31 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
index a73738445ca..308b347fc51 100644
--- a/Master/texmf-dist/doc/generic/markdown/markdown.pdf
+++ b/Master/texmf-dist/doc/generic/markdown/markdown.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/markdown/docstrip.cfg b/Master/texmf-dist/source/generic/markdown/docstrip.cfg
index b740bf6dbcb..465fa1838ef 100644
--- a/Master/texmf-dist/source/generic/markdown/docstrip.cfg
+++ b/Master/texmf-dist/source/generic/markdown/docstrip.cfg
@@ -1,7 +1,7 @@
\askforoverwritefalse
\def\luapreamble{%
-- ^^J%
--- Copyright (C) 2009-2017 John MacFarlane, Hans Hagen^^J%
+-- Copyright (C) 2009-2016 John MacFarlane, Hans Hagen^^J%
-- ^^J%
-- Permission is hereby granted, free of charge, to any person obtaining^^J%
-- a copy of this software and associated documentation files (the^^J%
@@ -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) 2017 Vít Novotný^^J%
+-- Copyright (C) 2018 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 406029330ea..03c95872f4e 100644
--- a/Master/texmf-dist/source/generic/markdown/markdown.dtx
+++ b/Master/texmf-dist/source/generic/markdown/markdown.dtx
@@ -80,21 +80,22 @@
title = {File transclusion syntax for Markdown},
date = {2017-01-19},
url = {https://github.com/iainc/Markdown-Content-Blocks},
- urldate = {2017-03-18}}
- @book{luatex16,
+ urldate = {2018-01-08}}
+ @book{luatex17,
author = {{Lua\TeX{} development team}},
title = {Lua\TeX{} reference manual},
- date = {2016-09-27},
+ year = {2017},
+ month = {2},
url = {http://www.luatex.org/svn/trunk/manual/luatex.pdf},
- urldate = {2016-11-27}}
- @book{latex16,
+ urldate = {2018-01-08}}
+ @book{latex17,
author = {Braams, Johannes and Carlisle, David and Jeffrey, Alan and
Lamport, Leslie and Mittelbach, Frank and Rowley, Chris and
Schöpf, Rainer},
title = {The \Hologo{LaTeX2e} Sources},
- date = {2016-03-31},
+ date = {2017-04-15},
url = {http://mirrors.ctan.org/macros/latex/base/source2e.pdf},
- urldate = {2016-09-27}}
+ urldate = {2018-01-08}}
@book{ierusalimschy13,
author = {Ierusalimschy, Roberto},
year = {2013},
@@ -156,11 +157,11 @@
% \fi
% \begin{macrocode}
local metadata = {
- version = "2.5.4",
+ version = "2.5.5",
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; " ..
- "2016-2017 Vít Novotný",
+ copyright = "2009-2016 John MacFarlane, Hans Hagen; " ..
+ "2016-2018 Vít Novotný",
license = "LPPL 1.3"
}
if not modules then modules = { } end
@@ -221,7 +222,7 @@ local md5 = require("md5")
% \end{macrocode}
% \end{description}
% All the abovelisted modules are statically linked into the current version of
-% the Lua\TeX{} engine (see \cite[Section~3.3]{luatex16}).
+% the Lua\TeX{} engine (see \cite[Section~3.3]{luatex17}).
%
% \iffalse
%</lua>
@@ -241,10 +242,10 @@ local md5 = require("md5")
%
% The plain \TeX{} code makes use of the \luam{isdir} method that was added
% to the \pkg{Lua File System} library by the Lua\TeX{} engine developers
-% (see \cite[Section~3.2]{luatex16}).
+% (see \cite[Section~3.2]{luatex17}).
% \end{description}
% The \pkg{Lua File System} module is statically linked into the Lua\TeX{}
-% engine (see \cite[Section~3.3]{luatex16}).
+% engine (see \cite[Section~3.3]{luatex17}).
%
% The plain \TeX{} part of the package also requires that either the Lua\TeX{}
% \m{directlua} primitive or the shell access file stream 18 is available in
@@ -747,8 +748,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/09/12}%
-\def\markdownVersion{2.5.4}%
+\def\markdownLastModified{2018/01/08}%
+\def\markdownVersion{2.5.5}%
% \end{macrocode}
%
% The plain \TeX{} interface is implemented by the \t`markdown.tex` file that
@@ -777,7 +778,7 @@ defaultOptions.underscores = true
% The first limitation concerns the \m{markdownEnd} macro, which must be
% visible directly from the input line buffer (it may not be produced as a
% result of input expansion). Otherwise, it will not be recognized as the end
-% of the markdown string otherwise. As a corrolary, the \m{markdownEnd} string
+% of the markdown string. As a corrolary, the \m{markdownEnd} string
% may not appear anywhere inside the markdown input.
%
% Another limitation concerns spaces at the right end of an input line. In
@@ -1053,8 +1054,7 @@ defaultOptions.underscores = true
% \t`contentBlocksLanguageMap` Lua option.} contains a record $(k, v)$, then a
% non-online-image content block with the filename extension $s,
% s$\t`:lower()`${}=k$ is considered to be in a known programming language $v$.
-%
-% The macro receives four arguments: the local file name extension $s$ cast to
+% The macro receives five arguments: the local file name extension $s$ cast to
% the lower case, the language $v$, the fully escaped \acro{uri} that can be
% directly typeset, the raw \acro{uri} that can be used outside typesetting,
% and the title of the content block.
@@ -1414,7 +1414,7 @@ defaultOptions.underscores = true
\def\markdownRendererImagePrototype#1#2#3#4{}%
\def\markdownRendererContentBlockPrototype#1#2#3#4{}%
\def\markdownRendererContentBlockOnlineImagePrototype#1#2#3#4{}%
-\def\markdownRendererContentBlockCodePrototype#1#2#3#4{}%
+\def\markdownRendererContentBlockCodePrototype#1#2#3#4#5{}%
\def\markdownRendererUlBeginPrototype{}%
\def\markdownRendererUlBeginTightPrototype{}%
\def\markdownRendererUlItemPrototype{}%
@@ -4704,7 +4704,7 @@ local convert = md.new(\markdownLuaOptions)
% The package assumes that although the user is not using the Lua\TeX{} engine,
% their TeX distribution contains it, and uses shell access to produce and
% execute Lua scripts using the \TeX{}Lua interpreter (see
-% \cite[Section~3.1.1]{luatex16}).
+% \cite[Section~3.1.1]{luatex17}).
% \begin{macrocode}
\ifnum\markdownMode<2\relax
\ifnum\markdownMode=0\relax
@@ -4890,7 +4890,7 @@ local convert = md.new(\markdownLuaOptions)
% \fi\subsection{\LaTeX{} Implementation}\label{sec:lateximplementation}
% The \LaTeX{} implemenation makes use of the fact that, apart from some subtle
% differences, \LaTeX{} implements the majority of the plain \TeX{} format
-% (see \cite[Section~9]{latex16}). As a consequence, we can directly reuse the
+% (see \cite[Section~9]{latex17}). As a consequence, we can directly reuse the
% existing plain \TeX{} implementation.
% \begin{macrocode}
\input markdown
diff --git a/Master/texmf-dist/tex/generic/markdown/markdown.tex b/Master/texmf-dist/tex/generic/markdown/markdown.tex
index 1e5d4618516..74f1ca40cfb 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/09/12}%
-\def\markdownVersion{2.5.4}%
+\def\markdownLastModified{2018/01/08}%
+\def\markdownVersion{2.5.5}%
\let\markdownBegin\relax
\let\markdownEnd\relax
\let\markdownInput\relax
@@ -211,7 +211,7 @@
\def\markdownRendererImagePrototype#1#2#3#4{}%
\def\markdownRendererContentBlockPrototype#1#2#3#4{}%
\def\markdownRendererContentBlockOnlineImagePrototype#1#2#3#4{}%
-\def\markdownRendererContentBlockCodePrototype#1#2#3#4{}%
+\def\markdownRendererContentBlockCodePrototype#1#2#3#4#5{}%
\def\markdownRendererUlBeginPrototype{}%
\def\markdownRendererUlBeginTightPrototype{}%
\def\markdownRendererUlItemPrototype{}%
diff --git a/Master/texmf-dist/tex/luatex/markdown/markdown.lua b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
index fd190e628c6..61f2b734bbc 100644
--- a/Master/texmf-dist/tex/luatex/markdown/markdown.lua
+++ b/Master/texmf-dist/tex/luatex/markdown/markdown.lua
@@ -1,5 +1,5 @@
--
--- Copyright (C) 2009-2017 John MacFarlane, Hans Hagen
+-- Copyright (C) 2009-2016 John MacFarlane, Hans Hagen
--
-- Permission is hereby granted, free of charge, to any person obtaining
-- a copy of this software and associated documentation files (the
@@ -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) 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
@@ -58,11 +58,11 @@
-- those in the standard .ins files.
--
local metadata = {
- version = "2.5.4",
+ version = "2.5.5",
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; " ..
- "2016-2017 Vít Novotný",
+ copyright = "2009-2016 John MacFarlane, Hans Hagen; " ..
+ "2016-2018 Vít Novotný",
license = "LPPL 1.3"
}
if not modules then modules = { } end