From 22dcf7afdd7ea4508d9b739a3b48138022d361e6 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Thu, 31 Dec 2009 01:14:27 +0000 Subject: Tweaked templates and tests. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1711 788f1e2b-df1e-0410-8736-df70ead52e1b --- templates/context.template | 3 +- templates/html.template | 34 +- templates/latex.template | 1 + templates/markdown.template | 2 + tests/s5.basic.html | 651 ++++++++++++++------------- tests/s5.fancy.html | 1020 +++++++++++++++++++++---------------------- tests/s5.inserts.html | 121 +++-- tests/writer.context | 1 + tests/writer.html | 4 +- 9 files changed, 917 insertions(+), 920 deletions(-) diff --git a/templates/context.template b/templates/context.template index 835f7333f..d450634ee 100644 --- a/templates/context.template +++ b/templates/context.template @@ -70,7 +70,7 @@ after={\blank[medium]}, ] \protect -$endif$ +$endif$ $if(header-includes)$ $header-includes$ $endif$ @@ -91,4 +91,5 @@ $if(toc)$ $endif$ $body$ + \stoptext diff --git a/templates/html.template b/templates/html.template index 45eb225ef..129febb03 100644 --- a/templates/html.template +++ b/templates/html.template @@ -1,14 +1,12 @@ - - $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ - + $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ - $if(highlighting)$ +$if(highlighting)$ - $endif$ - $if(header-includes)$ - $header-includes$ - $endif$ - $if(latexmathml-script)$ - $latexmathml-script$ - $endif$ +$endif$ +$if(header-includes)$ + $header-includes$ +$endif$ +$if(latexmathml-script)$ + $latexmathml-script$ +$endif$ - $if(title)$ -

$title$

- $endif$ - $if(toc)$ - $toc$ - $endif$ - $body$ +$if(title)$ +

$title$

+$endif$ +$if(toc)$ +$toc$ +$endif$ +$body$ diff --git a/templates/latex.template b/templates/latex.template index bd31b5bb6..fe4af083d 100644 --- a/templates/latex.template +++ b/templates/latex.template @@ -52,4 +52,5 @@ $if(toc)$ \tableofcontents $endif$ $body$ + \end{document} diff --git a/templates/markdown.template b/templates/markdown.template index bd373d95f..18e8ff378 100644 --- a/templates/markdown.template +++ b/templates/markdown.template @@ -1,10 +1,12 @@ $if(titleblock)$ $titleblock$ + $endif$ $if(header-includes)$ $header-includes$ $endif$ $if(toc)$ $toc$ + $endif$ $body$ diff --git a/tests/s5.basic.html b/tests/s5.basic.html index bb2b25ae3..5e1b0abcf 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -1,343 +1,342 @@ -My S5 Document - - - - - - - -
+ + + My S5 Document + + + + + + + + + + + + + + +

My S5 Document

+
+>July 15, 2006

My S5 Document

My S5 Document

Sam Smith, Jen Jones

July 15, 2006

+>My S5 Document

Sam Smith
Jen Jones

July 15, 2006

First slide

+>First slide

Math

+>Math - + + diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index 9b82feb35..5a2e534f0 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -1,527 +1,527 @@ -My S5 Document - - - - - - - - -
+ + + My S5 Document + + + + + + + + + + + + + + + +

My S5 Document

+
+>July 15, 2006

My S5 Document

My S5 Document

Sam Smith, Jen Jones

July 15, 2006

+>My S5 Document

Sam Smith
Jen Jones

July 15, 2006

First slide

+>First slide

Math

+>Math - + + diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index d6f0d6fbd..53a89457e 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -1,66 +1,61 @@ -My S5 Document + + + My S5 Document + + + + + STUFF INSERTED + + +

My S5 Document

STUFF INSERTED -STUFF INSERTED -

My S5 Document

First slide

Math

STUFF INSERTED - +

First slide

Math

STUFF INSERTED + + diff --git a/tests/writer.context b/tests/writer.context index 17466a752..017b7ed25 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -926,5 +926,6 @@ Notes can go in quotes. This paragraph should not be part of the note, as it is not indented. + \stoptext diff --git a/tests/writer.html b/tests/writer.html index 01b93481c..2996c135d 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -6,9 +6,9 @@ - + -

Pandoc Test Suite

+

Pandoc Test Suite

This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.