diff --git a/autotests/folding/example.rmd.fold b/autotests/folding/example.rmd.fold --- a/autotests/folding/example.rmd.fold +++ b/autotests/folding/example.rmd.fold @@ -1,15 +1,15 @@ --- -title: "test" -author: "me" -date: "07.10.2014" +title: "test" +author: "me" +date: "07.10.2014" output: html_document --- This is a simple test document. It shows syntax highlighting switches between YAML (above), R blocks ```{r, echo=FALSE} -for (i in 1:10) { +for (i in 1:10) { if(i>=10) print(i) -} +} # two blank lines below sessionInfo() diff --git a/autotests/folding/test.markdown.fold b/autotests/folding/test.markdown.fold --- a/autotests/folding/test.markdown.fold +++ b/autotests/folding/test.markdown.fold @@ -37,3 +37,31 @@ Title: some text normal text + +# Fenced code blocks (bug 356974) + +## PHP + +```php +namespace Application\Controller; + +use Zend\Mvc\Controller\AbstractActionController; + +class IndexController extends AbstractActionController +{ +} +``` + +## Python + +```python +def addXToY(x, y): + total = x + y + print total +``` + +## No language specified + +``` +No language is specified, but it should be still rendered as code block. +``` diff --git a/autotests/html/test.markdown.html b/autotests/html/test.markdown.html --- a/autotests/html/test.markdown.html +++ b/autotests/html/test.markdown.html @@ -43,4 +43,32 @@ Title: some text normal text + +# Fenced code blocks (bug 356974) + +## PHP + +```php +namespace Application\Controller; + +use Zend\Mvc\Controller\AbstractActionController; + +class IndexController extends AbstractActionController +{ +} +``` + +## Python + +```python +def addXToY(x, y): + total = x + y + print total +``` + +## No language specified + +``` +No language is specified, but it should be still rendered as code block. +``` diff --git a/autotests/input/test.markdown b/autotests/input/test.markdown --- a/autotests/input/test.markdown +++ b/autotests/input/test.markdown @@ -37,3 +37,31 @@ Title: some text normal text + +# Fenced code blocks (bug 356974) + +## PHP + +```php +namespace Application\Controller; + +use Zend\Mvc\Controller\AbstractActionController; + +class IndexController extends AbstractActionController +{ +} +``` + +## Python + +```python +def addXToY(x, y): + total = x + y + print total +``` + +## No language specified + +``` +No language is specified, but it should be still rendered as code block. +``` diff --git a/autotests/reference/test.markdown.ref b/autotests/reference/test.markdown.ref --- a/autotests/reference/test.markdown.ref +++ b/autotests/reference/test.markdown.ref @@ -37,3 +37,31 @@ Title: some text

normal text
+
+

# Fenced code blocks (bug 356974)


+
+

## PHP


+
+```php
+namespace Application\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+
+class IndexController extends AbstractActionController
+{
+}
+```
+
+

## Python


+
+```python
+def addXToY(x, y):
+ total = x + y
+ print total
+```
+
+

## No language specified


+
+```
+No language is specified, but it should be still rendered as code block.
+```
diff --git a/data/syntax/markdown.xml b/data/syntax/markdown.xml --- a/data/syntax/markdown.xml +++ b/data/syntax/markdown.xml @@ -35,7 +35,7 @@ ]> - + @@ -74,6 +74,17 @@ + + + + + + + + + + + @@ -87,6 +98,9 @@ + + +