Merge branch 'feature-file-transclusion' (closes #4)

README.md

@@ -24,6 +24,7 @@ To perform a local installation, place these files into your TeX directory
 structure. This is generally where the individual files should be placed:
 
  * `<TEXMF>/tex/luatex/markdown/markdown.lua`
+ * `<TEXMF>/tex/luatex/markdown/Language.json`
  * `<TEXMF>/tex/generic/markdown/markdown.tex`
  * `<TEXMF>/tex/latex/markdown/markdown.sty`
  * `<TEXMF>/tex/context/third/markdown/t-markdown.tex`

examples/context.tex

@@ -8,6 +8,7 @@
 \def\markdownOptionFootnotes{true}
 \def\markdownOptionInlineFootnotes{true}
 \def\markdownOptionFencedCode{true}
+\def\markdownOptionContentBlocks{true}
 \definetyping [latex]
 \setuptyping  [latex] [option=TEX]
 \starttext

examples/example.md

@@ -17,6 +17,8 @@ This is inline `code`. This is a [link](http://google.cz "Google").  _This is an
 
   ![tux](tux.pdf "Tux by Larry Ewing <lewing@isc.tamu.edu> (created in GIMP)")
 
+  /scientists.csv (The great minds of the 19th century rendered via a content block)
+
 This is a fenced code block:
 
 ``` latex

examples/latex.tex

@@ -21,6 +21,7 @@
   inlineFootnotes,
   smartEllipses,
   fencedCode,
+  contentBlocks
 ]{markdown}
 \begin{document}
   \markdownInput{example.md}

examples/scientists.csv

@@ -0,0 +1,4 @@
+Name,Surname,Born
+Albert,Einstein,1879
+Marie,Curie,1867
+Thomas,Edison,1847

tests/support/latex-setup.tex

@@ -58,6 +58,28 @@
     \TYPE{- URI:            #2}%
     \TYPE{- title:          #4}%
     \TYPE{END image}},
+  contentBlock = {%
+    \TYPE{BEGIN contentBlock}%
+    \TYPE{- suffix:         #1}%
+    \TYPE{- URI:            #2}%
+    \TYPE{- title:          #4}%
+    \TYPE{END contentBlock}%
+  },
+  contentBlockOnlineImage = {%
+    \TYPE{BEGIN contentBlockOnlineImage}%
+    \TYPE{- suffix:         #1}%
+    \TYPE{- URI:            #2}%
+    \TYPE{- title:          #4}%
+    \TYPE{END contentBlockOnlineImage}%
+  },
+  contentBlockCode = {%
+    \TYPE{BEGIN contentBlockCode}%
+    \TYPE{- suffix:         #1}%
+    \TYPE{- language:       #2}%
+    \TYPE{- URI:            #3}%
+    \TYPE{- title:          #5}%
+    \TYPE{END contentBlockCode}%
+  },
   ulBegin = {%
     \TYPE{ulBegin}},
   ulBeginTight = {%

tests/support/markdown-languages-nonstandard.json

@@ -0,0 +1,3 @@
+{
+  "weirdextension": "weirdLANGUAGE"
+}

tests/support/markdown-languages.json

@@ -0,0 +1,3 @@
+{
+  "js": "JavaScript"
+}

tests/support/plain-setup.tex

@@ -42,6 +42,25 @@
   \TYPE{- URI:            #2}%
   \TYPE{- title:          #4}%
   \TYPE{END image}}%
+\def\markdownRendererContentBlock#1#2#3#4{%
+  \TYPE{BEGIN contentBlock}%
+  \TYPE{- suffix:         #1}%
+  \TYPE{- URI:            #2}%
+  \TYPE{- title:          #4}%
+  \TYPE{END contentBlock}}%
+\def\markdownRendererContentBlockOnlineImage#1#2#3#4{%
+  \TYPE{BEGIN contentBlockOnlineImage}%
+  \TYPE{- suffix:         #1}%
+  \TYPE{- URI:            #2}%
+  \TYPE{- title:          #4}%
+  \TYPE{END contentBlockOnlineImage}}%
+\def\markdownRendererContentBlockCode#1#2#3#4#5{%
+  \TYPE{BEGIN contentBlockCode}%
+  \TYPE{- suffix:         #1}%
+  \TYPE{- language:       #2}%
+  \TYPE{- URI:            #3}%
+  \TYPE{- title:          #5}%
+  \TYPE{END contentBlockCode}}%
 \def\markdownRendererUlBegin{%
   \TYPE{ulBegin}}%
 \def\markdownRendererUlBeginTight{%

tests/testfiles/lunamark-markdown/content-blocks-language-map.test

@@ -0,0 +1,16 @@
+\def\markdownOptionContentBlocks{true}
+\def\markdownOptionContentBlocksLanguageMap{markdown-languages-nonstandard.json}
+<<<
+This test ensures that the Lua `contentBlockLanguages` option correctly
+propagates through the plain TeX interface.
+
+/basename.WEIRDextension (title)
+>>>
+codeSpan: contentBlockLanguages
+interblockSeparator
+BEGIN contentBlockCode
+- suffix: weirdextension
+- language: weirdLANGUAGE
+- URI: basename.WEIRDextension
+- title: title
+END contentBlockCode

tests/testfiles/lunamark-markdown/content-blocks.test

@@ -0,0 +1,64 @@
+\def\markdownOptionContentBlocks{true}
+<<<
+This test ensures that the Lua `contentBlocks` option correctly propagates
+through the plain TeX interface.
+/not/a/translusion.md
+
+/not/a/
+transclusion/either.md
+
+<http://example.com/minard.jpg>
+<http://example.com/minard.jpg> <-- This is just a link.
+
+htt(p:/)/exam(ple.c)om/m\(inard.jpg (Napoleon's disastrous Russian campaign of 1812)
+/Flowchart.png "Engineering Flowchart"
+
+/Savings Account.csv 'Recent Transactions'
+/Example.jS (Source code)
+/Lorem Ipsum.txt
+>>>
+codeSpan: contentBlocks
+interblockSeparator
+interblockSeparator
+BEGIN contentBlockOnlineImage
+- suffix: jpg
+- URI: http://example.com/minard.jpg
+- title: 
+END contentBlockOnlineImage
+interblockSeparator
+BEGIN link
+- label: http://example.com/minard.jpg
+- URI: http://example.com/minard.jpg
+- title: 
+END link
+interblockSeparator
+BEGIN contentBlockOnlineImage
+- suffix: jpg
+- URI: htt(p:/)/exam(ple.c)om/m(inard.jpg
+- title: Napoleon's disastrous Russian campaign of 1812
+END contentBlockOnlineImage
+interblockSeparator
+BEGIN contentBlock
+- suffix: png
+- URI: Flowchart.png
+- title: Engineering Flowchart
+END contentBlock
+interblockSeparator
+BEGIN contentBlock
+- suffix: csv
+- URI: Savings Account.csv
+- title: Recent Transactions
+END contentBlock
+interblockSeparator
+BEGIN contentBlockCode
+- suffix: js
+- language: JavaScript
+- URI: Example.jS
+- title: Source code
+END contentBlockCode
+interblockSeparator
+BEGIN contentBlock
+- suffix: txt
+- URI: Lorem Ipsum.txt
+- title: 
+END contentBlock

tests/testfiles/lunamark-markdown/no-content-blocks.test

@@ -0,0 +1,32 @@
+<<<
+This test ensures that the Lua `contentBlocks` option is disabled by default.
+/not/a/translusion.md
+
+/not/a/
+transclusion/either.md
+
+<http://example.com/minard.jpg>
+<http://example.com/minard.jpg> <-- This is just a link.
+
+htt(p:/)/exam(ple.c)om/m\(inard.jpg (Napoleon's disastrous Russian campaign of 1812)
+/Flowchart.png "Engineering Flowchart"
+
+/Savings Account.csv 'Recent Transactions'
+/Example.swift (Source code)
+/Lorem Ipsum.txt
+>>>
+codeSpan: contentBlocks
+interblockSeparator
+interblockSeparator
+BEGIN link
+- label: http://example.com/minard.jpg
+- URI: http://example.com/minard.jpg
+- title: 
+END link
+BEGIN link
+- label: http://example.com/minard.jpg
+- URI: http://example.com/minard.jpg
+- title: 
+END link
+interblockSeparator
+interblockSeparator