diff options
Diffstat (limited to 'tests')
47 files changed, 1406 insertions, 2141 deletions
diff --git a/tests/RunTests.hs b/tests/RunTests.hs index 0b5555ed1..1715400fd 100644 --- a/tests/RunTests.hs +++ b/tests/RunTests.hs @@ -13,9 +13,7 @@ -- cabal install Diff module Main where -import System.IO.UTF8 import System.IO ( openTempFile, stderr, stdout, hFlush ) -import Prelude hiding ( putStrLn, putStr, readFile ) import System.Process ( runProcess, waitForProcess ) import System.FilePath ( (</>), (<.>) ) import System.Directory @@ -23,6 +21,12 @@ import System.Environment import System.Exit import Text.Printf import Data.Algorithm.Diff +import Prelude hiding ( readFile ) +import qualified Data.ByteString.Lazy as B +import Data.ByteString.Lazy.UTF8 (toString, fromString) + +readFileUTF8 :: FilePath -> IO String +readFileUTF8 f = B.readFile f >>= return . toString pandocPath :: FilePath pandocPath = ".." </> "dist" </> "build" </> "pandoc" </> "pandoc" @@ -127,7 +131,7 @@ main = do -- makes sure file is fully closed after reading readFile' :: FilePath -> IO String -readFile' f = do s <- readFile f +readFile' f = do s <- readFileUTF8 f return $! (length s `seq` s) runLhsWriterTest :: String -> IO Bool @@ -161,8 +165,7 @@ runTest testname opts inp norm = do let normPath = norm hFlush stdout -- Note: COLUMNS must be set for markdown table reader - -- and we need LANG set for ghc 6.12 - ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing (Just [("COLUMNS", "80"),("LANG","en_US.UTF-8")]) Nothing (Just hOut) (Just stderr) + ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing (Just [("COLUMNS", "80")]) Nothing (Just hOut) (Just stderr) ec <- waitForProcess ph result <- if ec == ExitSuccess then do @@ -174,5 +177,5 @@ runTest testname opts inp norm = do else return $ TestFailed $ getDiff (lines outputContents) (lines normContents) else return $ TestError ec removeFile outputPath - putStrLn (show result) + B.putStrLn (fromString $ show result) return (result == TestPassed) diff --git a/tests/html-reader.native b/tests/html-reader.native index 5eb74768c..ee419d3ac 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -344,4 +344,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA , Para [Str "Caret",Space,Str "characters",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "indicate",Space,Str "that",Space,Str "the",Space,Str "blocks",Space,Str "all",Space,Str "belong",Space,Str "to",Space,Str "a",Space,Str "single",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "block",Space,Str "quotes)."] , CodeBlock ("",[],[]) " { <code> }" , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "use",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "every",Space,Str "line,",Space,Str "as",Space,Str "with",Space,Str "blockquotes,",Space,Str "but",Space,Str "all",Space,Str "that",Space,Str "you",Space,Str "need",Space,Str "is",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "the",Space,Str "block",Space,Str "and",Space,Str "any",Space,Str "preceding",Space,Str "blank",Space,Str "lines."] ] - diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 76e5daf08..921bf9d77 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -375,4 +375,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]] ] ] , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] ] - diff --git a/tests/lhs-test.fragment.html+lhs b/tests/lhs-test.fragment.html+lhs index fec6bb750..74180d5c1 100644 --- a/tests/lhs-test.fragment.html+lhs +++ b/tests/lhs-test.fragment.html+lhs @@ -1,51 +1,39 @@ -<div id="lhs-test" -><h1 - >lhs test</h1 - ><p - ><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p - ><pre class="sourceCode haskell" - ><code - ><span class="Special" - >> </span - ><span class="Function FunctionDefinition" - >unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Special" - >> </span - ><span class="Normal NormalText" - >unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Special" - >> </span - ><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></code - ></pre - ><p - ><code - >(***)</code - > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p - ><pre - ><code - >f *** g = first f >>> second g +<h1 id="lhs-test" +>lhs test</h1 +><p +><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p +><pre class="sourceCode haskell" +><code + >> unsplit :: (<span class="dt" + >Arrow</span + > a) => (b -> c -> d) -> a (b, c) d<br + />> unsplit <span class="fu" + >=</span + > arr <span class="fu" + >.</span + > <span class="fu" + >uncurry</span + > <br + />> <span class="co" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></code + ></pre +><p +><code + >(***)</code + > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p +><pre +><code + >f *** g = first f >>> second g </code - ></pre - ><p - >Block quote:</p - ><blockquote - ><p - >foo bar</p - ></blockquote - ></div -> + ></pre +><p +>Block quote:</p +><blockquote +><p + >foo bar</p + ></blockquote +>
\ No newline at end of file diff --git a/tests/lhs-test.html b/tests/lhs-test.html index 5f015db0f..1cfcb199a 100644 --- a/tests/lhs-test.html +++ b/tests/lhs-test.html @@ -4,74 +4,65 @@ <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> - <meta name="date" content="" /> <style type="text/css"> - table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; } - td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; } - td.sourceCode { padding-left: 5px; } - pre.sourceCode { } - pre.sourceCode span.Normal { } - pre.sourceCode span.Keyword { color: #007020; font-weight: bold; } - pre.sourceCode span.DataType { color: #902000; } - pre.sourceCode span.DecVal { color: #40a070; } - pre.sourceCode span.BaseN { color: #40a070; } - pre.sourceCode span.Float { color: #40a070; } - pre.sourceCode span.Char { color: #4070a0; } - pre.sourceCode span.String { color: #4070a0; } - pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; } - pre.sourceCode span.Others { color: #007020; } - pre.sourceCode span.Alert { color: red; font-weight: bold; } - pre.sourceCode span.Function { color: #06287e; } - pre.sourceCode span.RegionMarker { } - pre.sourceCode span.Error { color: red; font-weight: bold; } +table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre + { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; } +td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; } +td.sourceCode { padding-left: 5px; } +pre.sourceCode span.kw { color: #007020; font-weight: bold; } +pre.sourceCode span.dt { color: #902000; } +pre.sourceCode span.dv { color: #40a070; } +pre.sourceCode span.bn { color: #40a070; } +pre.sourceCode span.fl { color: #40a070; } +pre.sourceCode span.ch { color: #4070a0; } +pre.sourceCode span.st { color: #4070a0; } +pre.sourceCode span.co { color: #60a0b0; font-style: italic; } +pre.sourceCode span.ot { color: #007020; } +pre.sourceCode span.al { color: red; font-weight: bold; } +pre.sourceCode span.fu { color: #06287e; } +pre.sourceCode span.re { } +pre.sourceCode span.er { color: red; font-weight: bold; } </style> </head> <body> -<div id="lhs-test" -><h1 - >lhs test</h1 - ><p - ><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p - ><pre class="sourceCode haskell" - ><code - ><span class="Function FunctionDefinition" - >unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Normal NormalText" - >unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></code - ></pre - ><p - ><code - >(***)</code - > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p - ><pre - ><code - >f *** g = first f >>> second g +<h1 id="lhs-test" +>lhs test</h1 +><p +><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p +><pre class="sourceCode haskell" +><code + >unsplit :: (<span class="dt" + >Arrow</span + > a) => (b -> c -> d) -> a (b, c) d<br + />unsplit <span class="fu" + >=</span + > arr <span class="fu" + >.</span + > <span class="fu" + >uncurry</span + > <br + /> <span class="co" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></code + ></pre +><p +><code + >(***)</code + > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p +><pre +><code + >f *** g = first f >>> second g </code - ></pre - ><p - >Block quote:</p - ><blockquote - ><p - >foo bar</p - ></blockquote - ></div + ></pre +><p +>Block quote:</p +><blockquote +><p + >foo bar</p + ></blockquote > </body> </html> - diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs index 210054bf6..a33bf83ce 100644 --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -4,80 +4,65 @@ <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> - <meta name="date" content="" /> <style type="text/css"> - table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; } - td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; } - td.sourceCode { padding-left: 5px; } - pre.sourceCode { } - pre.sourceCode span.Normal { } - pre.sourceCode span.Keyword { color: #007020; font-weight: bold; } - pre.sourceCode span.DataType { color: #902000; } - pre.sourceCode span.DecVal { color: #40a070; } - pre.sourceCode span.BaseN { color: #40a070; } - pre.sourceCode span.Float { color: #40a070; } - pre.sourceCode span.Char { color: #4070a0; } - pre.sourceCode span.String { color: #4070a0; } - pre.sourceCode span.Comment { color: #60a0b0; font-style: italic; } - pre.sourceCode span.Others { color: #007020; } - pre.sourceCode span.Alert { color: red; font-weight: bold; } - pre.sourceCode span.Function { color: #06287e; } - pre.sourceCode span.RegionMarker { } - pre.sourceCode span.Error { color: red; font-weight: bold; } +table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre + { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; } +td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; } +td.sourceCode { padding-left: 5px; } +pre.sourceCode span.kw { color: #007020; font-weight: bold; } +pre.sourceCode span.dt { color: #902000; } +pre.sourceCode span.dv { color: #40a070; } +pre.sourceCode span.bn { color: #40a070; } +pre.sourceCode span.fl { color: #40a070; } +pre.sourceCode span.ch { color: #4070a0; } +pre.sourceCode span.st { color: #4070a0; } +pre.sourceCode span.co { color: #60a0b0; font-style: italic; } +pre.sourceCode span.ot { color: #007020; } +pre.sourceCode span.al { color: red; font-weight: bold; } +pre.sourceCode span.fu { color: #06287e; } +pre.sourceCode span.re { } +pre.sourceCode span.er { color: red; font-weight: bold; } </style> </head> <body> -<div id="lhs-test" -><h1 - >lhs test</h1 - ><p - ><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p - ><pre class="sourceCode haskell" - ><code - ><span class="Special" - >> </span - ><span class="Function FunctionDefinition" - >unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Special" - >> </span - ><span class="Normal NormalText" - >unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Special" - >> </span - ><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></code - ></pre - ><p - ><code - >(***)</code - > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p - ><pre - ><code - >f *** g = first f >>> second g +<h1 id="lhs-test" +>lhs test</h1 +><p +><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p +><pre class="sourceCode haskell" +><code + >> unsplit :: (<span class="dt" + >Arrow</span + > a) => (b -> c -> d) -> a (b, c) d<br + />> unsplit <span class="fu" + >=</span + > arr <span class="fu" + >.</span + > <span class="fu" + >uncurry</span + > <br + />> <span class="co" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></code + ></pre +><p +><code + >(***)</code + > combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p +><pre +><code + >f *** g = first f >>> second g </code - ></pre - ><p - >Block quote:</p - ><blockquote - ><p - >foo bar</p - ></blockquote - ></div + ></pre +><p +>Block quote:</p +><blockquote +><p + >foo bar</p + ></blockquote > </body> </html> - diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index ee078546b..331f429ef 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -1,5 +1,5 @@ \documentclass{article} -\usepackage{amsmath} +\usepackage{amssymb,amsmath} \usepackage[mathletters]{ucs} \usepackage[utf8x]{inputenc} \usepackage[breaklinks=true,unicode=true]{hyperref} @@ -35,4 +35,3 @@ foo bar \end{quote} \end{document} - diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs index e4041a3af..a6270afcf 100644 --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -1,5 +1,5 @@ \documentclass{article} -\usepackage{amsmath} +\usepackage{amssymb,amsmath} \usepackage[mathletters]{ucs} \usepackage[utf8x]{inputenc} \usepackage{listings} @@ -37,4 +37,3 @@ foo bar \end{quote} \end{document} - diff --git a/tests/lhs-test.markdown b/tests/lhs-test.markdown index 5b7c6465a..834d642d8 100644 --- a/tests/lhs-test.markdown +++ b/tests/lhs-test.markdown @@ -16,6 +16,3 @@ and one arrow on the second item of the pair). Block quote: > foo bar - - - diff --git a/tests/lhs-test.markdown+lhs b/tests/lhs-test.markdown+lhs index fa8564a98..187fa630f 100644 --- a/tests/lhs-test.markdown+lhs +++ b/tests/lhs-test.markdown+lhs @@ -17,6 +17,3 @@ and one arrow on the second item of the pair). Block quote: > foo bar - - - diff --git a/tests/lhs-test.native b/tests/lhs-test.native index 51274399b..94150f069 100644 --- a/tests/lhs-test.native +++ b/tests/lhs-test.native @@ -8,4 +8,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) , BlockQuote [ Para [Str "foo",Space,Str "bar"] ] ] - diff --git a/tests/lhs-test.rst b/tests/lhs-test.rst index c567fb4ed..67f7b3984 100644 --- a/tests/lhs-test.rst +++ b/tests/lhs-test.rst @@ -22,5 +22,3 @@ Block quote: foo bar - - diff --git a/tests/lhs-test.rst+lhs b/tests/lhs-test.rst+lhs index 7feeea2dc..22d54e85e 100644 --- a/tests/lhs-test.rst+lhs +++ b/tests/lhs-test.rst+lhs @@ -20,5 +20,3 @@ Block quote: foo bar - - diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native index 9ce783fb8..104baeaa6 100644 --- a/tests/markdown-reader-more.native +++ b/tests/markdown-reader-more.native @@ -31,5 +31,12 @@ Pandoc (Meta {docTitle = [Str "Title",Space,Str "spanning",Space,Str "multiple", , Header 2 [Str "Multilingual",Space,Str "URLs"] , Para [Link [Code "http://\27979.com?\27979=\27979"] ("http://%E6%B5%8B.com?%E6%B5%8B=%E6%B5%8B","")] , Para [Link [Str "foo"] ("/bar/%E6%B5%8B?x=%E6%B5%8B","title")] -, Para [Link [Code "\27979@foo.\27979.baz"] ("mailto:%E6%B5%8B@foo.%E6%B5%8B.baz","")] ] - +, Para [Link [Code "\27979@foo.\27979.baz"] ("mailto:%E6%B5%8B@foo.%E6%B5%8B.baz","")] +, Header 2 [Str "Numbered",Space,Str "examples"] +, OrderedList (1,Example,TwoParens) + [ [ Plain [Str "First",Space,Str "example",Str "."] ] + , [ Plain [Str "Second",Space,Str "example",Str "."] ] ] +, Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(",Str "2",Str ")",Space,Str "and",Space,Str "(",Str "3",Str ")",Str "."] +, OrderedList (3,Example,TwoParens) + [ [ Plain [Str "Third",Space,Str "example",Str "."] ] + ] ] diff --git a/tests/markdown-reader-more.txt b/tests/markdown-reader-more.txt index 1feb1e5d4..29e210088 100644 --- a/tests/markdown-reader-more.txt +++ b/tests/markdown-reader-more.txt @@ -91,3 +91,12 @@ there` <测@foo.测.baz> +## Numbered examples + +(@) First example. +(@foo) Second example. + +Explanation of examples (@foo) and (@bar). + +(@bar) Third example. + diff --git a/tests/rst-reader.native b/tests/rst-reader.native index eddeb6e8d..b79d35bd9 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -309,4 +309,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ": [ [ Plain [Str "b"] ] , [ Plain [Str "b",Space,Str "2"] ] , [ Plain [Str "b",Space,Str "2"] ] ] ], [ Plain [Str "c",Space,Str "c",Space,Str "2",Space,Str "c",Space,Str "2"] ] ] ] ] - diff --git a/tests/s5.basic.html b/tests/s5.basic.html index 253bcab2f..825d05868 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -10,289 +10,30 @@ <!-- configuration parameters --> <meta name="defaultView" content="slideshow" /> <meta name="controlVis" content="hidden" /> - <style type="text/css" media="projection" id="slideProj"> - /* Do not edit or override these styles! The system will likely break if you do. */ - - div#header, div#footer, div#controls, .slide {position: absolute;} - html>body div#header, html>body div#footer, - html>body div#controls, html>body .slide {position: fixed;} - .handout {display: none;} - .layout {display: block;} - .slide, .hideme, .incremental {visibility: hidden;} - #slide0 {visibility: visible;} - - /* The following styles size, place, and layer the slide components. - Edit these if you want to change the overall slide layout. - The commented lines can be uncommented (and modified, if necessary) - to help you with the rearrangement process. */ - - /* target = 1024x768 */ - - div#header, div#footer, .slide {width: 100%; top: 0; left: 0;} - div#header {top: 0; height: 3em; z-index: 1;} - div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;} - .slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2; list-style: none;} - div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;} - div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0;} - #currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;} - html>body #currentSlide {position: fixed;} - - /* - div#header {background: #FCC;} - div#footer {background: #CCF;} - div#controls {background: #BBD;} - div#currentSlide {background: #FFC;} - */ - - /* Following are the presentation styles -- edit away! */ - - body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;} - :link, :visited {text-decoration: none; color: #00C;} - #controls :active {color: #88A !important;} - #controls :focus {outline: 1px dotted #227;} - h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;} - ul, pre {margin: 0; line-height: 1em;} - html, body {margin: 0; padding: 0;} - - blockquote, q {font-style: italic;} - blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em; text-align: center; font-size: 1em;} - blockquote p {margin: 0;} - blockquote i {font-style: normal;} - blockquote b {display: block; margin-top: 0.5em; font-weight: normal; font-size: smaller; font-style: normal;} - blockquote b i {font-style: italic;} - - kbd {font-weight: bold; font-size: 1em;} - sup {font-size: smaller; line-height: 1px;} - - .slide code {padding: 2px 0.25em; font-weight: bold; color: #533;} - .slide code.bad, code del {color: red;} - .slide code.old {color: silver;} - .slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;} - .slide pre code {display: block;} - .slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;} - .slide li {margin-top: 0.75em; margin-right: 0;} - .slide ul ul {line-height: 1;} - .slide ul ul li {margin: .2em; font-size: 85%; list-style: square;} - .slide img.leader {display: block; margin: 0 auto;} - - div#header, div#footer {background: #005; color: #AAB; - font-family: Verdana, Helvetica, sans-serif;} - div#header {background: #005 url(bodybg.gif) -16px 0 no-repeat; - line-height: 1px;} - div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;} - #footer h1, #footer h2 {display: block; padding: 0 1em;} - #footer h2 {font-style: italic;} - - div.long {font-size: 0.75em;} - .slide h1 {position: absolute; top: 0.7em; left: 87px; z-index: 1; - margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap; - font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize; - color: #DDE; background: #005;} - .slide h3 {font-size: 130%;} - h1 abbr {font-variant: small-caps;} - - div#controls {position: absolute; left: 50%; bottom: 0; - width: 50%; - text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;} - html>body div#controls {position: fixed; padding: 0 0 1em 0; - top: auto;} - div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0; padding: 0;} - #controls #navLinks a {padding: 0; margin: 0 0.5em; - background: #005; border: none; color: #779; - cursor: pointer;} - #controls #navList {height: 1em;} - #controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;} - - #currentSlide {text-align: center; font-size: 0.5em; color: #449;} - - #slide0 {padding-top: 3.5em; font-size: 90%;} - #slide0 h1 {position: static; margin: 1em 0 0; padding: 0; - font: bold 2em Helvetica, sans-serif; white-space: normal; - color: #000; background: transparent;} - #slide0 h2 {font: bold italic 1em Helvetica, sans-serif; margin: 0.25em;} - #slide0 h3 {margin-top: 1.5em; font-size: 1.5em;} - #slide0 h4 {margin-top: 0; font-size: 1em;} - - ul.urls {list-style: none; display: inline; margin: 0;} - .urls li {display: inline; margin: 0;} - .note {display: none;} - .external {border-bottom: 1px dotted gray;} - html>body .external {border-bottom: none;} - .external:after {content: " \274F"; font-size: smaller; color: #77B;} - - .incremental, .incremental *, .incremental *:after {color: #DDE; visibility: visible;} - img.incremental {visibility: hidden;} - .slide .current {color: #B02;} - - - /* diagnostics - - li:after {content: " [" attr(class) "]"; color: #F88;} - */ - - </style> - <style type="text/css" media="projection" id="operaFix"> - /* DO NOT CHANGE THESE unless you really want to break Opera Show */ - .slide { - visibility: visible !important; - position: static !important; - page-break-before: always; - } - #slide0 {page-break-before: avoid;} - - </style> - <style type="text/css" media="screen" id="outlineStyle"> - /* don't change this unless you want the layout stuff to show up in the outline view! */ - - .layout div, #footer *, #controlForm * {display: none;} - #footer, #controls, #controlForm, #navLinks, #toggle { - display: block; visibility: visible; margin: 0; padding: 0;} - #toggle {float: right; padding: 0.5em;} - html>body #toggle {position: fixed; top: 0; right: 0;} - - /* making the outline look pretty-ish */ - - #slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;} - #slide0 h1 {padding-top: 1.5em;} - .slide h1 {margin: 1.5em 0 0; padding-top: 0.25em; - border-top: 1px solid #888; border-bottom: 1px solid #AAA;} - #toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;} - - </style> - <style type="text/css" media="print" id="slidePrint"> - /* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */ - .slide, ul {page-break-inside: avoid; visibility: visible !important;} - h1 {page-break-after: avoid;} - - body {font-size: 12pt; background: white;} - * {color: black;} - - #slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} - #slide0 h3 {margin: 0; padding: 0;} - #slide0 h4 {margin: 0 0 0.5em; padding: 0;} - #slide0 {margin-bottom: 3em;} - - h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;} - .extra {background: transparent !important;} - div.extra, pre.extra, .example {font-size: 10pt; color: #333;} - ul.extra a {font-weight: bold;} - p.example {display: none;} - - #header {display: none;} - #footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;} - #footer h2, #controls {display: none;} - - /* The following rule keeps the layout stuff out of print. Remove at your own risk! */ - .layout, .layout * {display: none !important;} - - </style> - <script type="text/javascript"> - // S5 v1.1 slides.js -- released into the Public Domain - // - // Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information - // about all the wonderful and talented contributors to this code! - var undef;var slideCSS='';var snum=0;var smax=1;var incpos=0;var number=undef;var s5mode=true;var defaultView='slideshow';var controlVis='visible';var isIE=navigator.appName=='Microsoft Internet Explorer'&&navigator.userAgent.indexOf('Opera')<1?1:0;var isOp=navigator.userAgent.indexOf('Opera')>-1?1:0;var isGe=navigator.userAgent.indexOf('Gecko')>-1&&navigator.userAgent.indexOf('Safari')<1?1:0;function hasClass(object,className){if(!object.className)return false;return(object.className.search('(^|\\s)'+className+'(\\s|$)')!=-1);} - function hasValue(object,value){if(!object)return false;return(object.search('(^|\\s)'+value+'(\\s|$)')!=-1);} - function removeClass(object,className){if(!object)return;object.className=object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'),RegExp.$1+RegExp.$2);} - function addClass(object,className){if(!object||hasClass(object,className))return;if(object.className){object.className+=' '+className;}else{object.className=className;}} - function GetElementsWithClassName(elementName,className){var allElements=document.getElementsByTagName(elementName);var elemColl=new Array();for(var i=0;i<allElements.length;i++){if(hasClass(allElements[i],className)){elemColl[elemColl.length]=allElements[i];}} - return elemColl;} - function isParentOrSelf(element,id){if(element==null||element.nodeName=='BODY')return false;else if(element.id==id)return true;else return isParentOrSelf(element.parentNode,id);} - function nodeValue(node){var result="";if(node.nodeType==1){var children=node.childNodes;for(var i=0;i<children.length;++i){result+=nodeValue(children[i]);}} - else if(node.nodeType==3){result=node.nodeValue;} - return(result);} - function slideLabel(){var slideColl=GetElementsWithClassName('*','slide');var list=document.getElementById('jumplist');smax=slideColl.length;for(var n=0;n<smax;n++){var obj=slideColl[n];var did='slide'+n.toString();obj.setAttribute('id',did);if(isOp)continue;var otext='';var menu=obj.firstChild;if(!menu)continue;while(menu&&menu.nodeType==3){menu=menu.nextSibling;} - if(!menu)continue;var menunodes=menu.childNodes;for(var o=0;o<menunodes.length;o++){otext+=nodeValue(menunodes[o]);} - list.options[list.length]=new Option(n+' : '+otext,n);}} - function currentSlide(){var cs;if(document.getElementById){cs=document.getElementById('currentSlide');}else{cs=document.currentSlide;} - cs.innerHTML='<span id="csHere">'+snum+'<\/span> '+'<span id="csSep">\/<\/span> '+'<span id="csTotal">'+(smax-1)+'<\/span>';if(snum==0){cs.style.visibility='hidden';}else{cs.style.visibility='visible';}} - function go(step){if(document.getElementById('slideProj').disabled||step==0)return;var jl=document.getElementById('jumplist');var cid='slide'+snum;var ce=document.getElementById(cid);if(incrementals[snum].length>0){for(var i=0;i<incrementals[snum].length;i++){removeClass(incrementals[snum][i],'current');removeClass(incrementals[snum][i],'incremental');}} - if(step!='j'){snum+=step;lmax=smax-1;if(snum>lmax)snum=lmax;if(snum<0)snum=0;}else - snum=parseInt(jl.value);var nid='slide'+snum;var ne=document.getElementById(nid);if(!ne){ne=document.getElementById('slide0');snum=0;} - if(step<0){incpos=incrementals[snum].length}else{incpos=0;} - if(incrementals[snum].length>0&&incpos==0){for(var i=0;i<incrementals[snum].length;i++){if(hasClass(incrementals[snum][i],'current')) - incpos=i+1;else - addClass(incrementals[snum][i],'incremental');}} - if(incrementals[snum].length>0&&incpos>0) - addClass(incrementals[snum][incpos-1],'current');ce.style.visibility='hidden';ne.style.visibility='visible';jl.selectedIndex=snum;currentSlide();number=0;} - function goTo(target){if(target>=smax||target==snum)return;go(target-snum);} - function subgo(step){if(step>0){removeClass(incrementals[snum][incpos-1],'current');removeClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos],'current');incpos++;}else{incpos--;removeClass(incrementals[snum][incpos],'current');addClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos-1],'current');}} - function toggle(){var slideColl=GetElementsWithClassName('*','slide');var slides=document.getElementById('slideProj');var outline=document.getElementById('outlineStyle');if(!slides.disabled){slides.disabled=true;outline.disabled=false;s5mode=false;fontSize('1em');for(var n=0;n<smax;n++){var slide=slideColl[n];slide.style.visibility='visible';}}else{slides.disabled=false;outline.disabled=true;s5mode=true;fontScale();for(var n=0;n<smax;n++){var slide=slideColl[n];slide.style.visibility='hidden';} - slideColl[snum].style.visibility='visible';}} - function showHide(action){var obj=GetElementsWithClassName('*','hideme')[0];switch(action){case's':obj.style.visibility='visible';break;case'h':obj.style.visibility='hidden';break;case'k':if(obj.style.visibility!='visible'){obj.style.visibility='visible';}else{obj.style.visibility='hidden';} - break;}} - function keys(key){if(!key){key=event;key.which=key.keyCode;} - if(key.which==84){toggle();return;} - if(s5mode){switch(key.which){case 10:case 13:if(window.event&&isParentOrSelf(window.event.srcElement,'controls'))return;if(key.target&&isParentOrSelf(key.target,'controls'))return;if(number!=undef){goTo(number);break;} - case 32:case 34:case 39:case 40:if(number!=undef){go(number);}else if(!incrementals[snum]||incpos>=incrementals[snum].length){go(1);}else{subgo(1);} - break;case 33:case 37:case 38:if(number!=undef){go(-1*number);}else if(!incrementals[snum]||incpos<=0){go(-1);}else{subgo(-1);} - break;case 36:goTo(0);break;case 35:goTo(smax-1);break;case 67:showHide('k');break;} - if(key.which<48||key.which>57){number=undef;}else{if(window.event&&isParentOrSelf(window.event.srcElement,'controls'))return;if(key.target&&isParentOrSelf(key.target,'controls'))return;number=(((number!=undef)?number:0)*10)+(key.which-48);}} - return false;} - function clicker(e){number=undef;var target;if(window.event){target=window.event.srcElement;e=window.event;}else target=e.target;if(target.getAttribute('href')!=null||hasValue(target.rel,'external')||isParentOrSelf(target,'controls')||isParentOrSelf(target,'embed')||isParentOrSelf(target,'object'))return true;if(!e.which||e.which==1){if(!incrementals[snum]||incpos>=incrementals[snum].length){go(1);}else{subgo(1);}}} - function findSlide(hash){var target=null;var slides=GetElementsWithClassName('*','slide');for(var i=0;i<slides.length;i++){var targetSlide=slides[i];if((targetSlide.name&&targetSlide.name==hash)||(targetSlide.id&&targetSlide.id==hash)){target=targetSlide;break;}} - while(target!=null&&target.nodeName!='BODY'){if(hasClass(target,'slide')){return parseInt(target.id.slice(5));} - target=target.parentNode;} - return null;} - function slideJump(){if(window.location.hash==null)return;var sregex=/^#slide(\d+)$/;var matches=sregex.exec(window.location.hash);var dest=null;if(matches!=null){dest=parseInt(matches[1]);}else{dest=findSlide(window.location.hash.slice(1));} - if(dest!=null) - go(dest-snum);} - function fixLinks(){var thisUri=window.location.href;thisUri=thisUri.slice(0,thisUri.length-window.location.hash.length);var aelements=document.getElementsByTagName('A');for(var i=0;i<aelements.length;i++){var a=aelements[i].href;var slideID=a.match('\#slide[0-9]{1,2}');if((slideID)&&(slideID[0].slice(0,1)=='#')){var dest=findSlide(slideID[0].slice(1));if(dest!=null){if(aelements[i].addEventListener){aelements[i].addEventListener("click",new Function("e","if (document.getElementById('slideProj').disabled) return;"+"go("+dest+" - snum); "+"if (e.preventDefault) e.preventDefault();"),true);}else if(aelements[i].attachEvent){aelements[i].attachEvent("onclick",new Function("","if (document.getElementById('slideProj').disabled) return;"+"go("+dest+" - snum); "+"event.returnValue = false;"));}}}}} - function externalLinks(){if(!document.getElementsByTagName)return;var anchors=document.getElementsByTagName('a');for(var i=0;i<anchors.length;i++){var anchor=anchors[i];if(anchor.getAttribute('href')&&hasValue(anchor.rel,'external')){anchor.target='_blank';addClass(anchor,'external');}}} - function createControls(){var controlsDiv=document.getElementById("controls");if(!controlsDiv)return;var hider=' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';var hideDiv,hideList='';if(controlVis=='hidden'){hideDiv=hider;}else{hideList=hider;} - controlsDiv.innerHTML='<form action="#" id="controlForm"'+hideDiv+'>'+'<div id="navLinks">'+'<a accesskey="t" id="toggle" href="javascript:toggle();">Ø<\/a>'+'<a accesskey="z" id="prev" href="javascript:go(-1);">«<\/a>'+'<a accesskey="x" id="next" href="javascript:go(1);">»<\/a>'+'<div id="navList"'+hideList+'><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>'+'<\/div><\/form>';if(controlVis=='hidden'){var hidden=document.getElementById('navLinks');}else{var hidden=document.getElementById('jumplist');} - addClass(hidden,'hideme');} - function fontScale(){if(!s5mode)return false;var vScale=22;var hScale=32;if(window.innerHeight){var vSize=window.innerHeight;var hSize=window.innerWidth;}else if(document.documentElement.clientHeight){var vSize=document.documentElement.clientHeight;var hSize=document.documentElement.clientWidth;}else if(document.body.clientHeight){var vSize=document.body.clientHeight;var hSize=document.body.clientWidth;}else{var vSize=700;var hSize=1024;} - var newSize=Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale));fontSize(newSize+'px');if(isGe){var obj=document.getElementsByTagName('body')[0];obj.style.display='none';obj.style.display='block';}} - function fontSize(value){if(!(s5ss=document.getElementById('s5ss'))){if(!isIE){document.getElementsByTagName('head')[0].appendChild(s5ss=document.createElement('style'));s5ss.setAttribute('media','screen, projection');s5ss.setAttribute('id','s5ss');}else{document.createStyleSheet();document.s5ss=document.styleSheets[document.styleSheets.length-1];}} - if(!isIE){while(s5ss.lastChild)s5ss.removeChild(s5ss.lastChild);s5ss.appendChild(document.createTextNode('body {font-size: '+value+' !important;}'));}else{document.s5ss.addRule('body','font-size: '+value+' !important;');}} - function notOperaFix(){slideCSS=document.getElementById('slideProj').href;var slides=document.getElementById('slideProj');var outline=document.getElementById('outlineStyle');slides.setAttribute('media','screen');outline.disabled=true;if(isGe){slides.setAttribute('href','null');slides.setAttribute('href',slideCSS);} - if(isIE&&document.styleSheets&&document.styleSheets[0]){document.styleSheets[0].addRule('img','behavior: url(ui/default/iepngfix.htc)');document.styleSheets[0].addRule('div','behavior: url(ui/default/iepngfix.htc)');document.styleSheets[0].addRule('.slide','behavior: url(ui/default/iepngfix.htc)');}} - function getIncrementals(obj){var incrementals=new Array();if(!obj) - return incrementals;var children=obj.childNodes;for(var i=0;i<children.length;i++){var child=children[i];if(hasClass(child,'incremental')){if(child.nodeName=='OL'||child.nodeName=='UL'){removeClass(child,'incremental');for(var j=0;j<child.childNodes.length;j++){if(child.childNodes[j].nodeType==1){addClass(child.childNodes[j],'incremental');}}}else{incrementals[incrementals.length]=child;removeClass(child,'incremental');}} - if(hasClass(child,'show-first')){if(child.nodeName=='OL'||child.nodeName=='UL'){removeClass(child,'show-first');if(child.childNodes[isGe].nodeType==1){removeClass(child.childNodes[isGe],'incremental');}}else{incrementals[incrementals.length]=child;}} - incrementals=incrementals.concat(getIncrementals(child));} - return incrementals;} - function createIncrementals(){var incrementals=new Array();for(var i=0;i<smax;i++){incrementals[i]=getIncrementals(document.getElementById('slide'+i));} - return incrementals;} - function defaultCheck(){var allMetas=document.getElementsByTagName('meta');for(var i=0;i<allMetas.length;i++){if(allMetas[i].name=='defaultView'){defaultView=allMetas[i].content;} - if(allMetas[i].name=='controlVis'){controlVis=allMetas[i].content;}}} - function trap(e){if(!e){e=event;e.which=e.keyCode;} - try{modifierKey=e.ctrlKey||e.altKey||e.metaKey;} - catch(e){modifierKey=false;} - return modifierKey||e.which==0;} - function startup(){defaultCheck();if(!isOp) - createControls();slideLabel();fixLinks();externalLinks();fontScale();if(!isOp){notOperaFix();incrementals=createIncrementals();slideJump();if(defaultView=='outline'){toggle();} - document.onkeyup=keys;document.onkeypress=trap;document.onclick=clicker;}} - window.onload=startup;window.onresize=function(){setTimeout('fontScale()',50);} - </script> + <!-- style sheet links --> + <link rel="stylesheet" href="ui/default/slides.css" type="text/css" media="projection" id="slideProj" /> + <link rel="stylesheet" href="ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" /> + <link rel="stylesheet" href="ui/default/print.css" type="text/css" media="print" id="slidePrint" /> + <link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" /> + <!-- S5 JS --> + <script src="ui/default/slides.js" type="text/javascript"></script> </head> <body> -<h1 class="title">My S5 Document</h1> <div class="layout"> <div id="controls"></div> <div id="currentSlide"></div> <div id="header"></div> <div id="footer"> -<h1 ->July 15, 2006</h1 -><h2 ->My S5 Document</h2 -></div> + <h1>July 15, 2006</h1> + <h2>My S5 Document</h2> +</div> </div> <div class="presentation"> - <div class="slide"> -<h1 ->My S5 Document</h1 -><h3 ->Sam Smith<br - />Jen Jones</h3 -><h4 ->July 15, 2006</h4 -></div> + <h1>My S5 Document</h1> + <h3>Sam Smith<br/>Jen Jones</h3> + <h4>July 15, 2006</h4> +</div> <div class="slide"> <h1 >First slide</h1 @@ -309,35 +50,10 @@ ><ul ><li ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span ></li ></ul ></div> </div> </body> </html> - diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index 1379c3e2e..f4f2e7815 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -7,6 +7,16 @@ <meta name="author" content="Sam Smith" /> <meta name="author" content="Jen Jones" /> <meta name="date" content="July 15, 2006" /> + <!-- configuration parameters --> + <meta name="defaultView" content="slideshow" /> + <meta name="controlVis" content="hidden" /> + <!-- style sheet links --> + <link rel="stylesheet" href="ui/default/slides.css" type="text/css" media="projection" id="slideProj" /> + <link rel="stylesheet" href="ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" /> + <link rel="stylesheet" href="ui/default/print.css" type="text/css" media="print" id="slidePrint" /> + <link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" /> + <!-- S5 JS --> + <script src="ui/default/slides.js" type="text/javascript"></script> <script type="text/javascript" >/* LaTeXMathML.js from http://math.etsu.edu/LaTeXMathML/ @@ -208,292 +218,23 @@ {window.onload=generic;}} </script > - <!-- configuration parameters --> - <meta name="defaultView" content="slideshow" /> - <meta name="controlVis" content="hidden" /> - <style type="text/css" media="projection" id="slideProj"> - /* Do not edit or override these styles! The system will likely break if you do. */ - - div#header, div#footer, div#controls, .slide {position: absolute;} - html>body div#header, html>body div#footer, - html>body div#controls, html>body .slide {position: fixed;} - .handout {display: none;} - .layout {display: block;} - .slide, .hideme, .incremental {visibility: hidden;} - #slide0 {visibility: visible;} - - /* The following styles size, place, and layer the slide components. - Edit these if you want to change the overall slide layout. - The commented lines can be uncommented (and modified, if necessary) - to help you with the rearrangement process. */ - - /* target = 1024x768 */ - - div#header, div#footer, .slide {width: 100%; top: 0; left: 0;} - div#header {top: 0; height: 3em; z-index: 1;} - div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;} - .slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2; list-style: none;} - div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;} - div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0;} - #currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;} - html>body #currentSlide {position: fixed;} - - /* - div#header {background: #FCC;} - div#footer {background: #CCF;} - div#controls {background: #BBD;} - div#currentSlide {background: #FFC;} - */ - - /* Following are the presentation styles -- edit away! */ - - body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;} - :link, :visited {text-decoration: none; color: #00C;} - #controls :active {color: #88A !important;} - #controls :focus {outline: 1px dotted #227;} - h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;} - ul, pre {margin: 0; line-height: 1em;} - html, body {margin: 0; padding: 0;} - - blockquote, q {font-style: italic;} - blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em; text-align: center; font-size: 1em;} - blockquote p {margin: 0;} - blockquote i {font-style: normal;} - blockquote b {display: block; margin-top: 0.5em; font-weight: normal; font-size: smaller; font-style: normal;} - blockquote b i {font-style: italic;} - - kbd {font-weight: bold; font-size: 1em;} - sup {font-size: smaller; line-height: 1px;} - - .slide code {padding: 2px 0.25em; font-weight: bold; color: #533;} - .slide code.bad, code del {color: red;} - .slide code.old {color: silver;} - .slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;} - .slide pre code {display: block;} - .slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;} - .slide li {margin-top: 0.75em; margin-right: 0;} - .slide ul ul {line-height: 1;} - .slide ul ul li {margin: .2em; font-size: 85%; list-style: square;} - .slide img.leader {display: block; margin: 0 auto;} - - div#header, div#footer {background: #005; color: #AAB; - font-family: Verdana, Helvetica, sans-serif;} - div#header {background: #005 url(bodybg.gif) -16px 0 no-repeat; - line-height: 1px;} - div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;} - #footer h1, #footer h2 {display: block; padding: 0 1em;} - #footer h2 {font-style: italic;} - - div.long {font-size: 0.75em;} - .slide h1 {position: absolute; top: 0.7em; left: 87px; z-index: 1; - margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap; - font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize; - color: #DDE; background: #005;} - .slide h3 {font-size: 130%;} - h1 abbr {font-variant: small-caps;} - - div#controls {position: absolute; left: 50%; bottom: 0; - width: 50%; - text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;} - html>body div#controls {position: fixed; padding: 0 0 1em 0; - top: auto;} - div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0; padding: 0;} - #controls #navLinks a {padding: 0; margin: 0 0.5em; - background: #005; border: none; color: #779; - cursor: pointer;} - #controls #navList {height: 1em;} - #controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;} - - #currentSlide {text-align: center; font-size: 0.5em; color: #449;} - - #slide0 {padding-top: 3.5em; font-size: 90%;} - #slide0 h1 {position: static; margin: 1em 0 0; padding: 0; - font: bold 2em Helvetica, sans-serif; white-space: normal; - color: #000; background: transparent;} - #slide0 h2 {font: bold italic 1em Helvetica, sans-serif; margin: 0.25em;} - #slide0 h3 {margin-top: 1.5em; font-size: 1.5em;} - #slide0 h4 {margin-top: 0; font-size: 1em;} - - ul.urls {list-style: none; display: inline; margin: 0;} - .urls li {display: inline; margin: 0;} - .note {display: none;} - .external {border-bottom: 1px dotted gray;} - html>body .external {border-bottom: none;} - .external:after {content: " \274F"; font-size: smaller; color: #77B;} - - .incremental, .incremental *, .incremental *:after {color: #DDE; visibility: visible;} - img.incremental {visibility: hidden;} - .slide .current {color: #B02;} - - - /* diagnostics - - li:after {content: " [" attr(class) "]"; color: #F88;} - */ - - </style> - <style type="text/css" media="projection" id="operaFix"> - /* DO NOT CHANGE THESE unless you really want to break Opera Show */ - .slide { - visibility: visible !important; - position: static !important; - page-break-before: always; - } - #slide0 {page-break-before: avoid;} - - </style> - <style type="text/css" media="screen" id="outlineStyle"> - /* don't change this unless you want the layout stuff to show up in the outline view! */ - - .layout div, #footer *, #controlForm * {display: none;} - #footer, #controls, #controlForm, #navLinks, #toggle { - display: block; visibility: visible; margin: 0; padding: 0;} - #toggle {float: right; padding: 0.5em;} - html>body #toggle {position: fixed; top: 0; right: 0;} - - /* making the outline look pretty-ish */ - - #slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;} - #slide0 h1 {padding-top: 1.5em;} - .slide h1 {margin: 1.5em 0 0; padding-top: 0.25em; - border-top: 1px solid #888; border-bottom: 1px solid #AAA;} - #toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;} - - </style> - <style type="text/css" media="print" id="slidePrint"> - /* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */ - .slide, ul {page-break-inside: avoid; visibility: visible !important;} - h1 {page-break-after: avoid;} - - body {font-size: 12pt; background: white;} - * {color: black;} - - #slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} - #slide0 h3 {margin: 0; padding: 0;} - #slide0 h4 {margin: 0 0 0.5em; padding: 0;} - #slide0 {margin-bottom: 3em;} - - h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;} - .extra {background: transparent !important;} - div.extra, pre.extra, .example {font-size: 10pt; color: #333;} - ul.extra a {font-weight: bold;} - p.example {display: none;} - - #header {display: none;} - #footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;} - #footer h2, #controls {display: none;} - - /* The following rule keeps the layout stuff out of print. Remove at your own risk! */ - .layout, .layout * {display: none !important;} - - </style> - <script type="text/javascript"> - // S5 v1.1 slides.js -- released into the Public Domain - // - // Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information - // about all the wonderful and talented contributors to this code! - var undef;var slideCSS='';var snum=0;var smax=1;var incpos=0;var number=undef;var s5mode=true;var defaultView='slideshow';var controlVis='visible';var isIE=navigator.appName=='Microsoft Internet Explorer'&&navigator.userAgent.indexOf('Opera')<1?1:0;var isOp=navigator.userAgent.indexOf('Opera')>-1?1:0;var isGe=navigator.userAgent.indexOf('Gecko')>-1&&navigator.userAgent.indexOf('Safari')<1?1:0;function hasClass(object,className){if(!object.className)return false;return(object.className.search('(^|\\s)'+className+'(\\s|$)')!=-1);} - function hasValue(object,value){if(!object)return false;return(object.search('(^|\\s)'+value+'(\\s|$)')!=-1);} - function removeClass(object,className){if(!object)return;object.className=object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'),RegExp.$1+RegExp.$2);} - function addClass(object,className){if(!object||hasClass(object,className))return;if(object.className){object.className+=' '+className;}else{object.className=className;}} - function GetElementsWithClassName(elementName,className){var allElements=document.getElementsByTagName(elementName);var elemColl=new Array();for(var i=0;i<allElements.length;i++){if(hasClass(allElements[i],className)){elemColl[elemColl.length]=allElements[i];}} - return elemColl;} - function isParentOrSelf(element,id){if(element==null||element.nodeName=='BODY')return false;else if(element.id==id)return true;else return isParentOrSelf(element.parentNode,id);} - function nodeValue(node){var result="";if(node.nodeType==1){var children=node.childNodes;for(var i=0;i<children.length;++i){result+=nodeValue(children[i]);}} - else if(node.nodeType==3){result=node.nodeValue;} - return(result);} - function slideLabel(){var slideColl=GetElementsWithClassName('*','slide');var list=document.getElementById('jumplist');smax=slideColl.length;for(var n=0;n<smax;n++){var obj=slideColl[n];var did='slide'+n.toString();obj.setAttribute('id',did);if(isOp)continue;var otext='';var menu=obj.firstChild;if(!menu)continue;while(menu&&menu.nodeType==3){menu=menu.nextSibling;} - if(!menu)continue;var menunodes=menu.childNodes;for(var o=0;o<menunodes.length;o++){otext+=nodeValue(menunodes[o]);} - list.options[list.length]=new Option(n+' : '+otext,n);}} - function currentSlide(){var cs;if(document.getElementById){cs=document.getElementById('currentSlide');}else{cs=document.currentSlide;} - cs.innerHTML='<span id="csHere">'+snum+'<\/span> '+'<span id="csSep">\/<\/span> '+'<span id="csTotal">'+(smax-1)+'<\/span>';if(snum==0){cs.style.visibility='hidden';}else{cs.style.visibility='visible';}} - function go(step){if(document.getElementById('slideProj').disabled||step==0)return;var jl=document.getElementById('jumplist');var cid='slide'+snum;var ce=document.getElementById(cid);if(incrementals[snum].length>0){for(var i=0;i<incrementals[snum].length;i++){removeClass(incrementals[snum][i],'current');removeClass(incrementals[snum][i],'incremental');}} - if(step!='j'){snum+=step;lmax=smax-1;if(snum>lmax)snum=lmax;if(snum<0)snum=0;}else - snum=parseInt(jl.value);var nid='slide'+snum;var ne=document.getElementById(nid);if(!ne){ne=document.getElementById('slide0');snum=0;} - if(step<0){incpos=incrementals[snum].length}else{incpos=0;} - if(incrementals[snum].length>0&&incpos==0){for(var i=0;i<incrementals[snum].length;i++){if(hasClass(incrementals[snum][i],'current')) - incpos=i+1;else - addClass(incrementals[snum][i],'incremental');}} - if(incrementals[snum].length>0&&incpos>0) - addClass(incrementals[snum][incpos-1],'current');ce.style.visibility='hidden';ne.style.visibility='visible';jl.selectedIndex=snum;currentSlide();number=0;} - function goTo(target){if(target>=smax||target==snum)return;go(target-snum);} - function subgo(step){if(step>0){removeClass(incrementals[snum][incpos-1],'current');removeClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos],'current');incpos++;}else{incpos--;removeClass(incrementals[snum][incpos],'current');addClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos-1],'current');}} - function toggle(){var slideColl=GetElementsWithClassName('*','slide');var slides=document.getElementById('slideProj');var outline=document.getElementById('outlineStyle');if(!slides.disabled){slides.disabled=true;outline.disabled=false;s5mode=false;fontSize('1em');for(var n=0;n<smax;n++){var slide=slideColl[n];slide.style.visibility='visible';}}else{slides.disabled=false;outline.disabled=true;s5mode=true;fontScale();for(var n=0;n<smax;n++){var slide=slideColl[n];slide.style.visibility='hidden';} - slideColl[snum].style.visibility='visible';}} - function showHide(action){var obj=GetElementsWithClassName('*','hideme')[0];switch(action){case's':obj.style.visibility='visible';break;case'h':obj.style.visibility='hidden';break;case'k':if(obj.style.visibility!='visible'){obj.style.visibility='visible';}else{obj.style.visibility='hidden';} - break;}} - function keys(key){if(!key){key=event;key.which=key.keyCode;} - if(key.which==84){toggle();return;} - if(s5mode){switch(key.which){case 10:case 13:if(window.event&&isParentOrSelf(window.event.srcElement,'controls'))return;if(key.target&&isParentOrSelf(key.target,'controls'))return;if(number!=undef){goTo(number);break;} - case 32:case 34:case 39:case 40:if(number!=undef){go(number);}else if(!incrementals[snum]||incpos>=incrementals[snum].length){go(1);}else{subgo(1);} - break;case 33:case 37:case 38:if(number!=undef){go(-1*number);}else if(!incrementals[snum]||incpos<=0){go(-1);}else{subgo(-1);} - break;case 36:goTo(0);break;case 35:goTo(smax-1);break;case 67:showHide('k');break;} - if(key.which<48||key.which>57){number=undef;}else{if(window.event&&isParentOrSelf(window.event.srcElement,'controls'))return;if(key.target&&isParentOrSelf(key.target,'controls'))return;number=(((number!=undef)?number:0)*10)+(key.which-48);}} - return false;} - function clicker(e){number=undef;var target;if(window.event){target=window.event.srcElement;e=window.event;}else target=e.target;if(target.getAttribute('href')!=null||hasValue(target.rel,'external')||isParentOrSelf(target,'controls')||isParentOrSelf(target,'embed')||isParentOrSelf(target,'object'))return true;if(!e.which||e.which==1){if(!incrementals[snum]||incpos>=incrementals[snum].length){go(1);}else{subgo(1);}}} - function findSlide(hash){var target=null;var slides=GetElementsWithClassName('*','slide');for(var i=0;i<slides.length;i++){var targetSlide=slides[i];if((targetSlide.name&&targetSlide.name==hash)||(targetSlide.id&&targetSlide.id==hash)){target=targetSlide;break;}} - while(target!=null&&target.nodeName!='BODY'){if(hasClass(target,'slide')){return parseInt(target.id.slice(5));} - target=target.parentNode;} - return null;} - function slideJump(){if(window.location.hash==null)return;var sregex=/^#slide(\d+)$/;var matches=sregex.exec(window.location.hash);var dest=null;if(matches!=null){dest=parseInt(matches[1]);}else{dest=findSlide(window.location.hash.slice(1));} - if(dest!=null) - go(dest-snum);} - function fixLinks(){var thisUri=window.location.href;thisUri=thisUri.slice(0,thisUri.length-window.location.hash.length);var aelements=document.getElementsByTagName('A');for(var i=0;i<aelements.length;i++){var a=aelements[i].href;var slideID=a.match('\#slide[0-9]{1,2}');if((slideID)&&(slideID[0].slice(0,1)=='#')){var dest=findSlide(slideID[0].slice(1));if(dest!=null){if(aelements[i].addEventListener){aelements[i].addEventListener("click",new Function("e","if (document.getElementById('slideProj').disabled) return;"+"go("+dest+" - snum); "+"if (e.preventDefault) e.preventDefault();"),true);}else if(aelements[i].attachEvent){aelements[i].attachEvent("onclick",new Function("","if (document.getElementById('slideProj').disabled) return;"+"go("+dest+" - snum); "+"event.returnValue = false;"));}}}}} - function externalLinks(){if(!document.getElementsByTagName)return;var anchors=document.getElementsByTagName('a');for(var i=0;i<anchors.length;i++){var anchor=anchors[i];if(anchor.getAttribute('href')&&hasValue(anchor.rel,'external')){anchor.target='_blank';addClass(anchor,'external');}}} - function createControls(){var controlsDiv=document.getElementById("controls");if(!controlsDiv)return;var hider=' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';var hideDiv,hideList='';if(controlVis=='hidden'){hideDiv=hider;}else{hideList=hider;} - controlsDiv.innerHTML='<form action="#" id="controlForm"'+hideDiv+'>'+'<div id="navLinks">'+'<a accesskey="t" id="toggle" href="javascript:toggle();">Ø<\/a>'+'<a accesskey="z" id="prev" href="javascript:go(-1);">«<\/a>'+'<a accesskey="x" id="next" href="javascript:go(1);">»<\/a>'+'<div id="navList"'+hideList+'><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>'+'<\/div><\/form>';if(controlVis=='hidden'){var hidden=document.getElementById('navLinks');}else{var hidden=document.getElementById('jumplist');} - addClass(hidden,'hideme');} - function fontScale(){if(!s5mode)return false;var vScale=22;var hScale=32;if(window.innerHeight){var vSize=window.innerHeight;var hSize=window.innerWidth;}else if(document.documentElement.clientHeight){var vSize=document.documentElement.clientHeight;var hSize=document.documentElement.clientWidth;}else if(document.body.clientHeight){var vSize=document.body.clientHeight;var hSize=document.body.clientWidth;}else{var vSize=700;var hSize=1024;} - var newSize=Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale));fontSize(newSize+'px');if(isGe){var obj=document.getElementsByTagName('body')[0];obj.style.display='none';obj.style.display='block';}} - function fontSize(value){if(!(s5ss=document.getElementById('s5ss'))){if(!isIE){document.getElementsByTagName('head')[0].appendChild(s5ss=document.createElement('style'));s5ss.setAttribute('media','screen, projection');s5ss.setAttribute('id','s5ss');}else{document.createStyleSheet();document.s5ss=document.styleSheets[document.styleSheets.length-1];}} - if(!isIE){while(s5ss.lastChild)s5ss.removeChild(s5ss.lastChild);s5ss.appendChild(document.createTextNode('body {font-size: '+value+' !important;}'));}else{document.s5ss.addRule('body','font-size: '+value+' !important;');}} - function notOperaFix(){slideCSS=document.getElementById('slideProj').href;var slides=document.getElementById('slideProj');var outline=document.getElementById('outlineStyle');slides.setAttribute('media','screen');outline.disabled=true;if(isGe){slides.setAttribute('href','null');slides.setAttribute('href',slideCSS);} - if(isIE&&document.styleSheets&&document.styleSheets[0]){document.styleSheets[0].addRule('img','behavior: url(ui/default/iepngfix.htc)');document.styleSheets[0].addRule('div','behavior: url(ui/default/iepngfix.htc)');document.styleSheets[0].addRule('.slide','behavior: url(ui/default/iepngfix.htc)');}} - function getIncrementals(obj){var incrementals=new Array();if(!obj) - return incrementals;var children=obj.childNodes;for(var i=0;i<children.length;i++){var child=children[i];if(hasClass(child,'incremental')){if(child.nodeName=='OL'||child.nodeName=='UL'){removeClass(child,'incremental');for(var j=0;j<child.childNodes.length;j++){if(child.childNodes[j].nodeType==1){addClass(child.childNodes[j],'incremental');}}}else{incrementals[incrementals.length]=child;removeClass(child,'incremental');}} - if(hasClass(child,'show-first')){if(child.nodeName=='OL'||child.nodeName=='UL'){removeClass(child,'show-first');if(child.childNodes[isGe].nodeType==1){removeClass(child.childNodes[isGe],'incremental');}}else{incrementals[incrementals.length]=child;}} - incrementals=incrementals.concat(getIncrementals(child));} - return incrementals;} - function createIncrementals(){var incrementals=new Array();for(var i=0;i<smax;i++){incrementals[i]=getIncrementals(document.getElementById('slide'+i));} - return incrementals;} - function defaultCheck(){var allMetas=document.getElementsByTagName('meta');for(var i=0;i<allMetas.length;i++){if(allMetas[i].name=='defaultView'){defaultView=allMetas[i].content;} - if(allMetas[i].name=='controlVis'){controlVis=allMetas[i].content;}}} - function trap(e){if(!e){e=event;e.which=e.keyCode;} - try{modifierKey=e.ctrlKey||e.altKey||e.metaKey;} - catch(e){modifierKey=false;} - return modifierKey||e.which==0;} - function startup(){defaultCheck();if(!isOp) - createControls();slideLabel();fixLinks();externalLinks();fontScale();if(!isOp){notOperaFix();incrementals=createIncrementals();slideJump();if(defaultView=='outline'){toggle();} - document.onkeyup=keys;document.onkeypress=trap;document.onclick=clicker;}} - window.onload=startup;window.onresize=function(){setTimeout('fontScale()',50);} - </script> </head> <body> -<h1 class="title">My S5 Document</h1> <div class="layout"> <div id="controls"></div> <div id="currentSlide"></div> <div id="header"></div> <div id="footer"> -<h1 ->July 15, 2006</h1 -><h2 ->My S5 Document</h2 -></div> + <h1>July 15, 2006</h1> + <h2>My S5 Document</h2> +</div> </div> <div class="presentation"> - <div class="slide"> -<h1 ->My S5 Document</h1 -><h3 ->Sam Smith<br - />Jen Jones</h3 -><h4 ->July 15, 2006</h4 -></div> + <h1>My S5 Document</h1> + <h3>Sam Smith<br/>Jen Jones</h3> + <h4>July 15, 2006</h4> +</div> <div class="slide"> <h1 >First slide</h1 @@ -517,4 +258,3 @@ </div> </body> </html> - diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html index 6ab704d41..cc111566a 100644 --- a/tests/s5.fragment.html +++ b/tests/s5.fragment.html @@ -1,45 +1,17 @@ -<div id="first-slide" -><h1 - >First slide</h1 - ><ul +<h1 id="first-slide" +>First slide</h1 +><ul +><li + >first bullet</li ><li - >first bullet</li - ><li - >second bullet</li - ></ul - ></div -><div id="math" -><h1 - >Math</h1 - ><ul - ><li - ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span - ></li - ></ul - ></div -> + >second bullet</li + ></ul +><h1 id="math" +>Math</h1 +><ul +><li + ><span class="math" + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span + ></li + ></ul +>
\ No newline at end of file diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index efce03868..90014f2e6 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -11,54 +11,25 @@ STUFF INSERTED </head> <body> -<h1 class="title">My S5 Document</h1> STUFF INSERTED -<div id="first-slide" -><h1 - >First slide</h1 - ><ul - ><li - >first bullet</li - ><li - >second bullet</li - ></ul - ></div -><div id="math" -><h1 - >Math</h1 - ><ul +<h1 class="title">My S5 Document</h1> +<h1 id="first-slide" +>First slide</h1 +><ul +><li + >first bullet</li ><li - ><span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span - ></li - ></ul - ></div + >second bullet</li + ></ul +><h1 id="math" +>Math</h1 +><ul +><li + ><span class="math" + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span + ></li + ></ul > STUFF INSERTED </body> </html> - diff --git a/tests/tables-rstsubset.native b/tests/tables-rstsubset.native index f26e46e90..7941772b5 100644 --- a/tests/tables-rstsubset.native +++ b/tests/tables-rstsubset.native @@ -116,4 +116,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) , [ Plain [Str "row"] ] , [ Plain [Str "5.0"] ] , [ Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."] ] ] ] ] - diff --git a/tests/tables.docbook b/tests/tables.docbook index 6483a97c0..a24964600 100644 --- a/tests/tables.docbook +++ b/tests/tables.docbook @@ -399,4 +399,4 @@ </td> </tr> </tbody> -</informaltable> +</informaltable>
\ No newline at end of file diff --git a/tests/tables.html b/tests/tables.html index e4dd6be58..93944828c 100644 --- a/tests/tables.html +++ b/tests/tables.html @@ -298,4 +298,4 @@ ></tr ></tbody ></table -> +>
\ No newline at end of file diff --git a/tests/tables.latex b/tests/tables.latex index 7f29b72c3..5dac8e2a0 100644 --- a/tests/tables.latex +++ b/tests/tables.latex @@ -175,4 +175,3 @@ Second \\ \end{tabular} \end{center} - diff --git a/tests/tables.markdown b/tests/tables.markdown index a605137d1..95bcc667e 100644 --- a/tests/tables.markdown +++ b/tests/tables.markdown @@ -6,7 +6,7 @@ Simple table with caption: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Simple table without caption: @@ -24,7 +24,7 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: @@ -40,7 +40,7 @@ Multiline table with caption: rows. -------------------------------------------------------------- - Table: Here's the caption. It may span multiple lines. + : Here's the caption. It may span multiple lines. Multiline table without caption: @@ -74,6 +74,3 @@ Multiline table without column headers: the blank line between rows. ----------- ---------- ------------ -------------------------- - - - diff --git a/tests/tables.mediawiki b/tests/tables.mediawiki index 4836ecd79..d0e5c7b9e 100644 --- a/tests/tables.mediawiki +++ b/tests/tables.mediawiki @@ -209,4 +209,3 @@ Multiline table without column headers: </tr> </tbody> </table> - diff --git a/tests/tables.native b/tests/tables.native index 11304795c..8592831fe 100644 --- a/tests/tables.native +++ b/tests/tables.native @@ -113,4 +113,3 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) , [ Plain [Str "row"] ] , [ Plain [Str "5",Str ".",Str "0"] ] , [ Plain [Str "Here",Str "'",Str "s",Space,Str "another",Space,Str "one",Str ".",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows",Str "."] ] ] ] ] - diff --git a/tests/tables.opendocument b/tests/tables.opendocument index 6cbfa00eb..c071e526d 100644 --- a/tests/tables.opendocument +++ b/tests/tables.opendocument @@ -381,4 +381,4 @@ <text:p text:style-name="Table_20_Contents">Here's another one. Note the blank line between rows.</text:p> </table:table-cell> </table:table-row> -</table:table> +</table:table>
\ No newline at end of file diff --git a/tests/tables.plain b/tests/tables.plain index a605137d1..95bcc667e 100644 --- a/tests/tables.plain +++ b/tests/tables.plain @@ -6,7 +6,7 @@ Simple table with caption: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Simple table without caption: @@ -24,7 +24,7 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: @@ -40,7 +40,7 @@ Multiline table with caption: rows. -------------------------------------------------------------- - Table: Here's the caption. It may span multiple lines. + : Here's the caption. It may span multiple lines. Multiline table without caption: @@ -74,6 +74,3 @@ Multiline table without column headers: the blank line between rows. ----------- ---------- ------------ -------------------------- - - - diff --git a/tests/tables.rst b/tests/tables.rst index c7c0c954d..25d5932ea 100644 --- a/tests/tables.rst +++ b/tests/tables.rst @@ -88,5 +88,3 @@ Multiline table without column headers: | | | | the blank line between | | | | | rows. | +-------------+------------+--------------+----------------------------+ - - diff --git a/tests/tables.rtf b/tests/tables.rtf index e7c1e9f60..011724967 100644 --- a/tests/tables.rtf +++ b/tests/tables.rtf @@ -357,4 +357,3 @@ } \intbl\row} {\pard \ql \f0 \sa180 \li0 \fi0 \par} - diff --git a/tests/tables.texinfo b/tests/tables.texinfo index f18de7012..b82006f1a 100644 --- a/tests/tables.texinfo +++ b/tests/tables.texinfo @@ -156,4 +156,3 @@ Second @tab 5.0 @tab Here's another one. Note the blank line between rows. @end multitable - diff --git a/tests/tables.txt b/tests/tables.txt index 62d431597..d70492262 100644 --- a/tests/tables.txt +++ b/tests/tables.txt @@ -24,10 +24,13 @@ Simple table indented two spaces: 123 123 123 123 1 1 1 1 - Table: Demonstration of simple table syntax. + : Demonstration of simple table syntax. Multiline table with caption: +: Here's the caption. +It may span multiple lines. + --------------------------------------------------------------- Centered Left Right Header Aligned Aligned Default aligned @@ -39,9 +42,6 @@ Multiline table with caption: the blank line between rows. --------------------------------------------------------------- -Table: Here's the caption. -It may span multiple lines. - Multiline table without caption: --------------------------------------------------------------- diff --git a/tests/testsuite.native b/tests/testsuite.native index 7560317c5..ced38537c 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -415,4 +415,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ] ] , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ] - diff --git a/tests/writer.context b/tests/writer.context index 288d6970c..2c53fde5c 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -906,4 +906,3 @@ This paragraph should not be part of the note, as it is not indented. \stoptext - diff --git a/tests/writer.docbook b/tests/writer.docbook index f771bf4af..c17513cf9 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -1077,17 +1077,17 @@ Blah </listitem> <listitem> <para> - 2+2=4 + 2 + 2 = 4 </para> </listitem> <listitem> <para> - <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> + <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> </para> </listitem> <listitem> <para> - α ∧ ω + α ∧ ω </para> </listitem> <listitem> @@ -1103,13 +1103,13 @@ Blah <listitem> <para> Here's some display math: - \frac{<emphasis>d</emphasis>}{<emphasis>dx</emphasis>}<emphasis>f</emphasis>(<emphasis>x</emphasis>)=\lim<subscript><emphasis>h</emphasis> → 0</subscript>\frac{<emphasis>f</emphasis>(<emphasis>x</emphasis>+<emphasis>h</emphasis>)-<emphasis>f</emphasis>(<emphasis>x</emphasis>)}{<emphasis>h</emphasis>} + $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$ </para> </listitem> <listitem> <para> Here's one that has a line break in it: - α+ω × <emphasis>x</emphasis><superscript>2</superscript>. + α + ω × <emphasis>x</emphasis><superscript>2</superscript>. </para> </listitem> </itemizedlist> @@ -1462,5 +1462,3 @@ or here: <http://example.com/> </para> </section> </article> - - diff --git a/tests/writer.html b/tests/writer.html index f41a8e60a..39ae2ebb7 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -13,119 +13,96 @@ <p >This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.</p ><hr - /><div id="headers" -><h1 - >Headers</h1 - ><div id="level-2-with-an-embedded-link" - ><h2 - >Level 2 with an <a href="/url" - >embedded link</a - ></h2 - ><div id="level-3-with-emphasis" - ><h3 - >Level 3 with <em - >emphasis</em - ></h3 - ><div id="level-4" - ><h4 - >Level 4</h4 - ><div id="level-5" - ><h5 - >Level 5</h5 - ></div - ></div - ></div - ></div - ></div -><div id="level-1" -><h1 - >Level 1</h1 - ><div id="level-2-with-emphasis" - ><h2 - >Level 2 with <em - >emphasis</em - ></h2 - ><div id="level-3" - ><h3 - >Level 3</h3 - ><p - >with no blank line</p - ></div - ></div - ><div id="level-2" - ><h2 - >Level 2</h2 - ><p - >with no blank line</p - ><hr - /></div - ></div -><div id="paragraphs" -><h1 - >Paragraphs</h1 - ><p - >Here’s a regular paragraph.</p - ><p - >In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p - ><p - >Here’s one with a bullet. * criminey.</p + /><h1 id="headers" +>Headers</h1 +><h2 id="level-2-with-an-embedded-link" +>Level 2 with an <a href="/url" + >embedded link</a + ></h2 +><h3 id="level-3-with-emphasis" +>Level 3 with <em + >emphasis</em + ></h3 +><h4 id="level-4" +>Level 4</h4 +><h5 id="level-5" +>Level 5</h5 +><h1 id="level-1" +>Level 1</h1 +><h2 id="level-2-with-emphasis" +>Level 2 with <em + >emphasis</em + ></h2 +><h3 id="level-3" +>Level 3</h3 +><p +>with no blank line</p +><h2 id="level-2" +>Level 2</h2 +><p +>with no blank line</p +><hr + /><h1 id="paragraphs" +>Paragraphs</h1 +><p +>Here’s a regular paragraph.</p +><p +>In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item.</p +><p +>Here’s one with a bullet. * criminey.</p +><p +>There should be a hard line break<br + />here.</p +><hr + /><h1 id="block-quotes" +>Block Quotes</h1 +><p +>E-mail style:</p +><blockquote +><p + >This is a block quote. It is pretty short.</p + ></blockquote +><blockquote +><p + >Code in a block quote:</p + ><pre + ><code + >sub status { + print "working"; +} +</code + ></pre ><p - >There should be a hard line break<br - />here.</p - ><hr - /></div -><div id="block-quotes" -><h1 - >Block Quotes</h1 + >A list:</p + ><ol style="list-style-type: decimal;" + ><li + >item one</li + ><li + >item two</li + ></ol ><p - >E-mail style:</p + >Nested block quotes:</p ><blockquote ><p - >This is a block quote. It is pretty short.</p + >nested</p ></blockquote ><blockquote ><p - >Code in a block quote:</p - ><pre - ><code - >sub status { - print "working"; -} -</code - ></pre - ><p - >A list:</p - ><ol style="list-style-type: decimal;" - ><li - >item one</li - ><li - >item two</li - ></ol - ><p - >Nested block quotes:</p - ><blockquote - ><p - >nested</p - ></blockquote - ><blockquote - ><p - >nested</p - ></blockquote + >nested</p ></blockquote - ><p - >This should not be a block quote: 2 > 1.</p - ><p - >And a following paragraph.</p - ><hr - /></div -><div id="code-blocks" -><h1 - >Code Blocks</h1 - ><p - >Code:</p - ><pre - ><code - >---- (should be four hyphens) + ></blockquote +><p +>This should not be a block quote: 2 > 1.</p +><p +>And a following paragraph.</p +><hr + /><h1 id="code-blocks" +>Code Blocks</h1 +><p +>Code:</p +><pre +><code + >---- (should be four hyphens) sub status { print "working"; @@ -133,540 +110,524 @@ sub status { this code block is indented by one tab </code - ></pre - ><p - >And:</p - ><pre - ><code - > this code block is indented by two tabs + ></pre +><p +>And:</p +><pre +><code + > this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ </code - ></pre - ><hr - /></div -><div id="lists" -><h1 - >Lists</h1 - ><div id="unordered" - ><h2 - >Unordered</h2 - ><p - >Asterisks tight:</p - ><ul - ><li - >asterisk 1</li - ><li - >asterisk 2</li - ><li - >asterisk 3</li - ></ul + ></pre +><hr + /><h1 id="lists" +>Lists</h1 +><h2 id="unordered" +>Unordered</h2 +><p +>Asterisks tight:</p +><ul +><li + >asterisk 1</li + ><li + >asterisk 2</li + ><li + >asterisk 3</li + ></ul +><p +>Asterisks loose:</p +><ul +><li + ><p + >asterisk 1</p + ></li + ><li + ><p + >asterisk 2</p + ></li + ><li + ><p + >asterisk 3</p + ></li + ></ul +><p +>Pluses tight:</p +><ul +><li + >Plus 1</li + ><li + >Plus 2</li + ><li + >Plus 3</li + ></ul +><p +>Pluses loose:</p +><ul +><li + ><p + >Plus 1</p + ></li + ><li + ><p + >Plus 2</p + ></li + ><li + ><p + >Plus 3</p + ></li + ></ul +><p +>Minuses tight:</p +><ul +><li + >Minus 1</li + ><li + >Minus 2</li + ><li + >Minus 3</li + ></ul +><p +>Minuses loose:</p +><ul +><li + ><p + >Minus 1</p + ></li + ><li + ><p + >Minus 2</p + ></li + ><li + ><p + >Minus 3</p + ></li + ></ul +><h2 id="ordered" +>Ordered</h2 +><p +>Tight:</p +><ol style="list-style-type: decimal;" +><li + >First</li + ><li + >Second</li + ><li + >Third</li + ></ol +><p +>and:</p +><ol style="list-style-type: decimal;" +><li + >One</li + ><li + >Two</li + ><li + >Three</li + ></ol +><p +>Loose using tabs:</p +><ol style="list-style-type: decimal;" +><li + ><p + >First</p + ></li + ><li + ><p + >Second</p + ></li + ><li + ><p + >Third</p + ></li + ></ol +><p +>and using spaces:</p +><ol style="list-style-type: decimal;" +><li + ><p + >One</p + ></li + ><li + ><p + >Two</p + ></li + ><li + ><p + >Three</p + ></li + ></ol +><p +>Multiple paragraphs:</p +><ol style="list-style-type: decimal;" +><li + ><p + >Item 1, graf one.</p ><p - >Asterisks loose:</p - ><ul + >Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p + ></li + ><li + ><p + >Item 2.</p + ></li + ><li + ><p + >Item 3.</p + ></li + ></ol +><h2 id="nested" +>Nested</h2 +><ul +><li + >Tab<ul ><li - ><p - >asterisk 1</p - ></li - ><li - ><p - >asterisk 2</p - ></li - ><li - ><p - >asterisk 3</p + >Tab<ul + ><li + >Tab</li + ></ul ></li ></ul - ><p - >Pluses tight:</p - ><ul - ><li - >Plus 1</li - ><li - >Plus 2</li - ><li - >Plus 3</li - ></ul - ><p - >Pluses loose:</p - ><ul + ></li + ></ul +><p +>Here’s another:</p +><ol style="list-style-type: decimal;" +><li + >First</li + ><li + >Second:<ul ><li - ><p - >Plus 1</p - ></li + >Fee</li ><li - ><p - >Plus 2</p - ></li + >Fie</li ><li - ><p - >Plus 3</p - ></li + >Foe</li ></ul - ><p - >Minuses tight:</p + ></li + ><li + >Third</li + ></ol +><p +>Same thing but with paragraphs:</p +><ol style="list-style-type: decimal;" +><li + ><p + >First</p + ></li + ><li + ><p + >Second:</p ><ul ><li - >Minus 1</li + >Fee</li ><li - >Minus 2</li + >Fie</li ><li - >Minus 3</li + >Foe</li ></ul - ><p - >Minuses loose:</p + ></li + ><li + ><p + >Third</p + ></li + ></ol +><h2 id="tabs-and-spaces" +>Tabs and spaces</h2 +><ul +><li + ><p + >this is a list item indented with tabs</p + ></li + ><li + ><p + >this is a list item indented with spaces</p ><ul ><li ><p - >Minus 1</p - ></li - ><li - ><p - >Minus 2</p - ></li - ><li - ><p - >Minus 3</p - ></li - ></ul - ></div - ><div id="ordered" - ><h2 - >Ordered</h2 - ><p - >Tight:</p - ><ol style="list-style-type: decimal;" - ><li - >First</li - ><li - >Second</li - ><li - >Third</li - ></ol - ><p - >and:</p - ><ol style="list-style-type: decimal;" - ><li - >One</li - ><li - >Two</li - ><li - >Three</li - ></ol - ><p - >Loose using tabs:</p - ><ol style="list-style-type: decimal;" - ><li - ><p - >First</p - ></li - ><li - ><p - >Second</p - ></li - ><li - ><p - >Third</p - ></li - ></ol - ><p - >and using spaces:</p - ><ol style="list-style-type: decimal;" - ><li - ><p - >One</p - ></li - ><li - ><p - >Two</p - ></li - ><li - ><p - >Three</p - ></li - ></ol - ><p - >Multiple paragraphs:</p - ><ol style="list-style-type: decimal;" - ><li - ><p - >Item 1, graf one.</p - ><p - >Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p - ></li - ><li - ><p - >Item 2.</p + >this is an example list item indented with tabs</p ></li ><li ><p - >Item 3.</p - ></li - ></ol - ></div - ><div id="nested" - ><h2 - >Nested</h2 - ><ul - ><li - >Tab<ul - ><li - >Tab<ul - ><li - >Tab</li - ></ul - ></li - ></ul + >this is an example list item indented with spaces</p ></li ></ul + ></li + ></ul +><h2 id="fancy-list-markers" +>Fancy list markers</h2 +><ol start="2" style="list-style-type: decimal;" +><li + >begins with 2</li + ><li + ><p + >and now 3</p ><p - >Here’s another:</p - ><ol style="list-style-type: decimal;" - ><li - >First</li - ><li - >Second:<ul - ><li - >Fee</li - ><li - >Fie</li - ><li - >Foe</li - ></ul - ></li - ><li - >Third</li - ></ol - ><p - >Same thing but with paragraphs:</p - ><ol style="list-style-type: decimal;" - ><li - ><p - >First</p - ></li - ><li - ><p - >Second:</p - ><ul - ><li - >Fee</li - ><li - >Fie</li - ><li - >Foe</li - ></ul - ></li - ><li - ><p - >Third</p - ></li - ></ol - ></div - ><div id="tabs-and-spaces" - ><h2 - >Tabs and spaces</h2 - ><ul - ><li - ><p - >this is a list item indented with tabs</p - ></li - ><li - ><p - >this is a list item indented with spaces</p - ><ul - ><li - ><p - >this is an example list item indented with tabs</p - ></li - ><li - ><p - >this is an example list item indented with spaces</p - ></li - ></ul - ></li - ></ul - ></div - ><div id="fancy-list-markers" - ><h2 - >Fancy list markers</h2 - ><ol start="2" style="list-style-type: decimal;" + >with a continuation</p + ><ol start="4" style="list-style-type: lower-roman;" ><li - >begins with 2</li + >sublist with roman numerals, starting with 4</li ><li - ><p - >and now 3</p - ><p - >with a continuation</p - ><ol start="4" style="list-style-type: lower-roman;" + >more items<ol style="list-style-type: upper-alpha;" ><li - >sublist with roman numerals, starting with 4</li + >a subsublist</li ><li - >more items<ol style="list-style-type: upper-alpha;" - ><li - >a subsublist</li - ><li - >a subsublist</li - ></ol - ></li + >a subsublist</li ></ol ></li ></ol - ><p - >Nesting:</p - ><ol style="list-style-type: upper-alpha;" + ></li + ></ol +><p +>Nesting:</p +><ol style="list-style-type: upper-alpha;" +><li + >Upper Alpha<ol style="list-style-type: upper-roman;" ><li - >Upper Alpha<ol style="list-style-type: upper-roman;" + >Upper Roman.<ol start="6" style="list-style-type: decimal;" ><li - >Upper Roman.<ol start="6" style="list-style-type: decimal;" + >Decimal start with 6<ol start="3" style="list-style-type: lower-alpha;" ><li - >Decimal start with 6<ol start="3" style="list-style-type: lower-alpha;" - ><li - >Lower alpha with paren</li - ></ol - ></li + >Lower alpha with paren</li ></ol ></li ></ol ></li ></ol - ><p - >Autonumbering:</p - ><ol + ></li + ></ol +><p +>Autonumbering:</p +><ol +><li + >Autonumber.</li + ><li + >More.<ol ><li - >Autonumber.</li - ><li - >More.<ol - ><li - >Nested.</li - ></ol - ></li + >Nested.</li ></ol - ><p - >Should not be a list item:</p - ><p - >M.A. 2007</p - ><p - >B. Williams</p - ><hr - /></div - ></div -><div id="definition-lists" -><h1 - >Definition Lists</h1 - ><p - >Tight using spaces:</p - ><dl + ></li + ></ol +><p +>Should not be a list item:</p +><p +>M.A. 2007</p +><p +>B. Williams</p +><hr + /><h1 id="definition-lists" +>Definition Lists</h1 +><p +>Tight using spaces:</p +><dl +><dt + >apple</dt + ><dd + >red fruit</dd ><dt - >apple</dt - ><dd - >red fruit</dd - ><dt - >orange</dt - ><dd - >orange fruit</dd - ><dt - >banana</dt - ><dd - >yellow fruit</dd - ></dl - ><p - >Tight using tabs:</p - ><dl + >orange</dt + ><dd + >orange fruit</dd ><dt - >apple</dt - ><dd - >red fruit</dd - ><dt - >orange</dt - ><dd - >orange fruit</dd - ><dt - >banana</dt - ><dd - >yellow fruit</dd - ></dl - ><p - >Loose:</p - ><dl + >banana</dt + ><dd + >yellow fruit</dd + ></dl +><p +>Tight using tabs:</p +><dl +><dt + >apple</dt + ><dd + >red fruit</dd ><dt - >apple</dt - ><dd - ><p - >red fruit</p - ></dd - ><dt - >orange</dt - ><dd - ><p - >orange fruit</p - ></dd - ><dt - >banana</dt - ><dd - ><p - >yellow fruit</p - ></dd - ></dl - ><p - >Multiple blocks with italics:</p - ><dl + >orange</dt + ><dd + >orange fruit</dd ><dt - ><em - >apple</em - ></dt - ><dd - ><p - >red fruit</p - ><p - >contains seeds, crisp, pleasant to taste</p - ></dd - ><dt - ><em - >orange</em - ></dt - ><dd - ><p - >orange fruit</p - ><pre - ><code - >{ orange code block } -</code - ></pre - ><blockquote - ><p - >orange block quote</p - ></blockquote - ></dd - ></dl - ><p - >Multiple definitions, tight:</p - ><dl + >banana</dt + ><dd + >yellow fruit</dd + ></dl +><p +>Loose:</p +><dl +><dt + >apple</dt + ><dd + ><p + >red fruit</p + ></dd ><dt - >apple</dt - ><dd - >red fruit</dd - ><dd - >computer</dd - ><dt - >orange</dt - ><dd - >orange fruit</dd - ><dd - >bank</dd - ></dl + >orange</dt + ><dd ><p - >Multiple definitions, loose:</p - ><dl + >orange fruit</p + ></dd ><dt - >apple</dt - ><dd - ><p - >red fruit</p - ></dd - ><dd - ><p - >computer</p - ></dd - ><dt - >orange</dt - ><dd - ><p - >orange fruit</p - ></dd - ><dd - ><p - >bank</p - ></dd - ></dl - ><p - >Blank line after term, indented marker, alternate markers:</p - ><dl + >banana</dt + ><dd + ><p + >yellow fruit</p + ></dd + ></dl +><p +>Multiple blocks with italics:</p +><dl +><dt + ><em + >apple</em + ></dt + ><dd + ><p + >red fruit</p + ><p + >contains seeds, crisp, pleasant to taste</p + ></dd ><dt - >apple</dt - ><dd - ><p - >red fruit</p - ></dd - ><dd - ><p - >computer</p - ></dd - ><dt - >orange</dt - ><dd + ><em + >orange</em + ></dt + ><dd + ><p + >orange fruit</p + ><pre + ><code + >{ orange code block } +</code + ></pre + ><blockquote ><p - >orange fruit</p - ><ol style="list-style-type: decimal;" - ><li - >sublist</li - ><li - >sublist</li - ></ol - ></dd - ></dl - ></div -><div id="html-blocks" -><h1 - >HTML Blocks</h1 + >orange block quote</p + ></blockquote + ></dd + ></dl +><p +>Multiple definitions, tight:</p +><dl +><dt + >apple</dt + ><dd + >red fruit</dd + ><dd + >computer</dd + ><dt + >orange</dt + ><dd + >orange fruit</dd + ><dd + >bank</dd + ></dl +><p +>Multiple definitions, loose:</p +><dl +><dt + >apple</dt + ><dd + ><p + >red fruit</p + ></dd + ><dd + ><p + >computer</p + ></dd + ><dt + >orange</dt + ><dd + ><p + >orange fruit</p + ></dd + ><dd + ><p + >bank</p + ></dd + ></dl +><p +>Blank line after term, indented marker, alternate markers:</p +><dl +><dt + >apple</dt + ><dd + ><p + >red fruit</p + ></dd + ><dd + ><p + >computer</p + ></dd + ><dt + >orange</dt + ><dd ><p - >Simple block on one line:</p - ><div>foo</div> + >orange fruit</p + ><ol style="list-style-type: decimal;" + ><li + >sublist</li + ><li + >sublist</li + ></ol + ></dd + ></dl +><h1 id="html-blocks" +>HTML Blocks</h1 +><p +>Simple block on one line:</p +><div>foo</div> <p - >And nested without indentation:</p - ><div> +>And nested without indentation:</p +><div> <div> <div>foo</div> </div> <div>bar</div> </div> <p - >Interpreted markdown in a table:</p - ><table> +>Interpreted markdown in a table:</p +><table> <tr> <td>This is <em - >emphasized</em - ></td> +>emphasized</em +></td> <td>And this is <strong - >strong</strong - ></td> +>strong</strong +></td> </tr> </table> <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> <p - >Here’s a simple block:</p - ><div> +>Here’s a simple block:</p +><div> foo</div> <p - >This should be a code block, though:</p - ><pre - ><code - ><div> +>This should be a code block, though:</p +><pre +><code + ><div> foo </div> </code - ></pre - ><p - >As should this:</p - ><pre - ><code - ><div>foo</div> + ></pre +><p +>As should this:</p +><pre +><code + ><div>foo</div> </code - ></pre - ><p - >Now, nested:</p - ><div> + ></pre +><p +>Now, nested:</p +><div> <div> <div> foo</div> </div> </div> <p - >This should just be an HTML comment:</p - ><!-- Comment --> +>This should just be an HTML comment:</p +><!-- Comment --> <p - >Multiline:</p - ><!-- +>Multiline:</p +><!-- Blah Blah --> @@ -675,25 +636,25 @@ Blah This is another comment. --> <p - >Code block:</p - ><pre - ><code - ><!-- Comment --> +>Code block:</p +><pre +><code + ><!-- Comment --> </code - ></pre - ><p - >Just plain comment, with trailing spaces on the line:</p - ><!-- foo --> + ></pre +><p +>Just plain comment, with trailing spaces on the line:</p +><!-- foo --> <p - >Code:</p - ><pre - ><code - ><hr /> +>Code:</p +><pre +><code + ><hr /> </code - ></pre - ><p - >Hr’s:</p - ><hr> + ></pre +><p +>Hr’s:</p +><hr> <hr /> @@ -711,499 +672,454 @@ Blah <hr class="foo" id="bar"> <hr - /></div -><div id="inline-markup" -><h1 - >Inline Markup</h1 - ><p + /><h1 id="inline-markup" +>Inline Markup</h1 +><p +>This is <em + >emphasized</em + >, and so <em + >is this</em + >.</p +><p +>This is <strong + >strong</strong + >, and so <strong + >is this</strong + >.</p +><p +>An <em + ><a href="/url" + >emphasized link</a + ></em + >.</p +><p +><strong + ><em + >This is strong and em.</em + ></strong + ></p +><p +>So is <strong + ><em + >this</em + ></strong + > word.</p +><p +><strong + ><em + >This is strong and em.</em + ></strong + ></p +><p +>So is <strong + ><em + >this</em + ></strong + > word.</p +><p +>This is code: <code + >></code + >, <code + >$</code + >, <code + >\</code + >, <code + >\$</code + >, <code + ><html></code + >.</p +><p +><span style="text-decoration: line-through;" >This is <em - >emphasized</em - >, and so <em - >is this</em - >.</p - ><p - >This is <strong - >strong</strong - >, and so <strong - >is this</strong - >.</p - ><p - >An <em - ><a href="/url" - >emphasized link</a - ></em - >.</p - ><p - ><strong - ><em - >This is strong and em.</em - ></strong - ></p - ><p - >So is <strong - ><em - >this</em - ></strong - > word.</p - ><p - ><strong + >strikeout</em + >.</span + ></p +><p +>Superscripts: a<sup + >bc</sup + >d a<sup + ><em + >hello</em + ></sup + > a<sup + >hello there</sup + >.</p +><p +>Subscripts: H<sub + >2</sub + >O, H<sub + >23</sub + >O, H<sub + >many of them</sub + >O.</p +><p +>These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</p +><hr + /><h1 id="smart-quotes-ellipses-dashes" +>Smart quotes, ellipses, dashes</h1 +><p +>“Hello,” said the spider. “‘Shelob’ is my name.”</p +><p +>‘A’, ‘B’, and ‘C’ are letters.</p +><p +>‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p +><p +>‘He said, “I want to go.”’ Were you alive in the 70’s?</p +><p +>Here is some quoted ‘<code + >code</code + >’ and a “<a href="http://example.com/?foo=1&bar=2" + >quoted link</a + >”.</p +><p +>Some dashes: one—two — three—four — five.</p +><p +>Dashes between numbers: 5–7, 255–66, 1987–1999.</p +><p +>Ellipses…and…and….</p +><hr + /><h1 id="latex" +>LaTeX</h1 +><ul +><li + ></li + ><li + ><span class="math" + >2 + 2 = 4</span + ></li + ><li + ><span class="math" ><em - >This is strong and em.</em - ></strong - ></p - ><p - >So is <strong + >x</em + > ∈ <em + >y</em + ></span + ></li + ><li + ><span class="math" + >α ∧ ω</span + ></li + ><li + ><span class="math" + >223</span + ></li + ><li + ><span class="math" ><em - >this</em - ></strong - > word.</p - ><p - >This is code: <code - >></code - >, <code + >p</em + ></span + >-Tree</li + ><li + >Here’s some display math: <br + /><span class="math" + >$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span + ><br + /></li + ><li + >Here’s one that has a line break in it: <span class="math" + >α + ω × <em + >x</em + ><sup + >2</sup + ></span + >.</li + ></ul +><p +>These shouldn’t be math:</p +><ul +><li + >To get the famous equation, write <code + >$e = mc^2$</code + >.</li + ><li + >$22,000 is a <em + >lot</em + > of money. So is $34,000. (It worked if “lot” is emphasized.)</li + ><li + >Shoes ($20) and socks ($5).</li + ><li + >Escaped <code >$</code - >, <code - >\</code - >, <code - >\$</code - >, <code - ><html></code - >.</p - ><p - ><span style="text-decoration: line-through;" - >This is <em - >strikeout</em - >.</span - ></p - ><p - >Superscripts: a<sup - >bc</sup - >d a<sup - ><em - >hello</em - ></sup - > a<sup - >hello there</sup - >.</p - ><p - >Subscripts: H<sub - >2</sub - >O, H<sub - >23</sub - >O, H<sub - >many of them</sub - >O.</p - ><p - >These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</p - ><hr - /></div -><div id="smart-quotes-ellipses-dashes" -><h1 - >Smart quotes, ellipses, dashes</h1 - ><p - >“Hello,” said the spider. “‘Shelob’ is my name.”</p - ><p - >‘A’, ‘B’, and ‘C’ are letters.</p - ><p - >‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’</p - ><p - >‘He said, “I want to go.”’ Were you alive in the 70’s?</p - ><p - >Here is some quoted ‘<code - >code</code - >’ and a “<a href="http://example.com/?foo=1&bar=2" - >quoted link</a - >”.</p - ><p - >Some dashes: one—two — three—four — five.</p - ><p - >Dashes between numbers: 5–7, 255–66, 1987–1999.</p - ><p - >Ellipses…and…and….</p - ><hr - /></div -><div id="latex" -><h1 - >LaTeX</h1 - ><ul + >: $73 <em + >this should be emphasized</em + > 23$.</li + ></ul +><p +>Here’s a LaTeX table:</p +><p +></p +><hr + /><h1 id="special-characters" +>Special Characters</h1 +><p +>Here is some unicode:</p +><ul +><li + >I hat: Î</li ><li - ></li - ><li - ><span class="math" - >2+2=4</span - ></li - ><li - ><span class="math" - ><em - >x</em - > ∈ <em - >y</em - ></span - ></li - ><li - ><span class="math" - >α ∧ ω</span - ></li - ><li - ><span class="math" - >223</span - ></li - ><li - ><span class="math" - ><em - >p</em - ></span - >-Tree</li - ><li - >Here’s some display math: <span class="math" - >\frac{<em - >d</em - >}{<em - >dx</em - >}<em - >f</em - >(<em - >x</em - >)=\lim<sub - ><em - >h</em - > → 0</sub - >\frac{<em - >f</em - >(<em - >x</em - >+<em - >h</em - >)-<em - >f</em - >(<em - >x</em - >)}{<em - >h</em - >}</span - ></li - ><li - >Here’s one that has a line break in it: <span class="math" - >α+ω × <em - >x</em - ><sup - >2</sup - ></span - >.</li - ></ul - ><p - >These shouldn’t be math:</p - ><ul + >o umlaut: ö</li ><li - >To get the famous equation, write <code - >$e = mc^2$</code - >.</li - ><li - >$22,000 is a <em - >lot</em - > of money. So is $34,000. (It worked if “lot” is emphasized.)</li - ><li - >Shoes ($20) and socks ($5).</li - ><li - >Escaped <code - >$</code - >: $73 <em - >this should be emphasized</em - > 23$.</li - ></ul - ><p - >Here’s a LaTeX table:</p - ><p - ></p - ><hr - /></div -><div id="special-characters" -><h1 - >Special Characters</h1 - ><p - >Here is some unicode:</p - ><ul + >section: §</li ><li - >I hat: Î</li - ><li - >o umlaut: ö</li - ><li - >section: §</li - ><li - >set membership: ∈</li - ><li - >copyright: ©</li - ></ul - ><p - >AT&T has an ampersand in their name.</p - ><p - >AT&T is another way to write it.</p - ><p - >This & that.</p - ><p - >4 < 5.</p - ><p - >6 > 5.</p - ><p - >Backslash: \</p - ><p - >Backtick: `</p - ><p - >Asterisk: *</p - ><p - >Underscore: _</p - ><p - >Left brace: {</p - ><p - >Right brace: }</p - ><p - >Left bracket: [</p - ><p - >Right bracket: ]</p - ><p - >Left paren: (</p - ><p - >Right paren: )</p - ><p - >Greater-than: ></p - ><p - >Hash: #</p - ><p - >Period: .</p - ><p - >Bang: !</p - ><p - >Plus: +</p - ><p - >Minus: -</p - ><hr - /></div -><div id="links" -><h1 - >Links</h1 - ><div id="explicit" - ><h2 - >Explicit</h2 - ><p - >Just a <a href="/url/" - >URL</a - >.</p - ><p - ><a href="/url/" title="title" - >URL and title</a - >.</p - ><p - ><a href="/url/" title="title preceded by two spaces" - >URL and title</a - >.</p - ><p - ><a href="/url/" title="title preceded by a tab" - >URL and title</a - >.</p - ><p - ><a href="/url/" title="title with "quotes" in it" - >URL and title</a - ></p - ><p - ><a href="/url/" title="title with single quotes" - >URL and title</a - ></p - ><p - ><a href="/url/with_underscore" - >with_underscore</a - ></p - ><p - ><script type="text/javascript" - > + >set membership: ∈</li + ><li + >copyright: ©</li + ></ul +><p +>AT&T has an ampersand in their name.</p +><p +>AT&T is another way to write it.</p +><p +>This & that.</p +><p +>4 < 5.</p +><p +>6 > 5.</p +><p +>Backslash: \</p +><p +>Backtick: `</p +><p +>Asterisk: *</p +><p +>Underscore: _</p +><p +>Left brace: {</p +><p +>Right brace: }</p +><p +>Left bracket: [</p +><p +>Right bracket: ]</p +><p +>Left paren: (</p +><p +>Right paren: )</p +><p +>Greater-than: ></p +><p +>Hash: #</p +><p +>Period: .</p +><p +>Bang: !</p +><p +>Plus: +</p +><p +>Minus: -</p +><hr + /><h1 id="links" +>Links</h1 +><h2 id="explicit" +>Explicit</h2 +><p +>Just a <a href="/url/" + >URL</a + >.</p +><p +><a href="/url/" title="title" + >URL and title</a + >.</p +><p +><a href="/url/" title="title preceded by two spaces" + >URL and title</a + >.</p +><p +><a href="/url/" title="title preceded by a tab" + >URL and title</a + >.</p +><p +><a href="/url/" title="title with "quotes" in it" + >URL and title</a + ></p +><p +><a href="/url/" title="title with single quotes" + >URL and title</a + ></p +><p +><a href="/url/with_underscore" + >with_underscore</a + ></p +><p +><script type="text/javascript" + > <!-- h='nowhere.net';a='@';n='nobody';e=n+a+h; document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'Email link'+'<\/'+'a'+'>'); // --> </script - ><noscript - >Email link (nobody at nowhere dot net)</noscript - ></p - ><p - ><a href="" - >Empty</a - >.</p - ></div - ><div id="reference" - ><h2 - >Reference</h2 - ><p - >Foo <a href="/url/" - >bar</a - >.</p - ><p - >Foo <a href="/url/" - >bar</a - >.</p - ><p - >Foo <a href="/url/" - >bar</a - >.</p - ><p - >With <a href="/url/" - >embedded [brackets]</a - >.</p - ><p - ><a href="/url/" - >b</a - > by itself should be a link.</p - ><p - >Indented <a href="/url" - >once</a - >.</p - ><p - >Indented <a href="/url" - >twice</a - >.</p - ><p - >Indented <a href="/url" - >thrice</a - >.</p - ><p - >This should [not][] be a link.</p - ><pre - ><code - >[not]: /url + ><noscript + >Email link (nobody at nowhere dot net)</noscript + ></p +><p +><a href="" + >Empty</a + >.</p +><h2 id="reference" +>Reference</h2 +><p +>Foo <a href="/url/" + >bar</a + >.</p +><p +>Foo <a href="/url/" + >bar</a + >.</p +><p +>Foo <a href="/url/" + >bar</a + >.</p +><p +>With <a href="/url/" + >embedded [brackets]</a + >.</p +><p +><a href="/url/" + >b</a + > by itself should be a link.</p +><p +>Indented <a href="/url" + >once</a + >.</p +><p +>Indented <a href="/url" + >twice</a + >.</p +><p +>Indented <a href="/url" + >thrice</a + >.</p +><p +>This should [not][] be a link.</p +><pre +><code + >[not]: /url </code - ></pre - ><p - >Foo <a href="/url/" title="Title with "quotes" inside" - >bar</a - >.</p - ><p - >Foo <a href="/url/" title="Title with "quote" inside" - >biz</a - >.</p - ></div - ><div id="with-ampersands" - ><h2 - >With ampersands</h2 - ><p - >Here’s a <a href="http://example.com/?foo=1&bar=2" - >link with an ampersand in the URL</a - >.</p - ><p - >Here’s a link with an amersand in the link text: <a href="http://att.com/" title="AT&T" - >AT&T</a - >.</p - ><p - >Here’s an <a href="/script?foo=1&bar=2" - >inline link</a - >.</p - ><p - >Here’s an <a href="/script?foo=1&bar=2" - >inline link in pointy braces</a - >.</p - ></div - ><div id="autolinks" - ><h2 - >Autolinks</h2 - ><p - >With an ampersand: <a href="http://example.com/?foo=1&bar=2" - ><code - >http://example.com/?foo=1&bar=2</code - ></a - ></p - ><ul - ><li - >In a list?</li - ><li - ><a href="http://example.com/" - ><code - >http://example.com/</code - ></a - ></li - ><li - >It should.</li - ></ul - ><p - >An e-mail address: <script type="text/javascript" - > + ></pre +><p +>Foo <a href="/url/" title="Title with "quotes" inside" + >bar</a + >.</p +><p +>Foo <a href="/url/" title="Title with "quote" inside" + >biz</a + >.</p +><h2 id="with-ampersands" +>With ampersands</h2 +><p +>Here’s a <a href="http://example.com/?foo=1&bar=2" + >link with an ampersand in the URL</a + >.</p +><p +>Here’s a link with an amersand in the link text: <a href="http://att.com/" title="AT&T" + >AT&T</a + >.</p +><p +>Here’s an <a href="/script?foo=1&bar=2" + >inline link</a + >.</p +><p +>Here’s an <a href="/script?foo=1&bar=2" + >inline link in pointy braces</a + >.</p +><h2 id="autolinks" +>Autolinks</h2 +><p +>With an ampersand: <a href="http://example.com/?foo=1&bar=2" + ><code + >http://example.com/?foo=1&bar=2</code + ></a + ></p +><ul +><li + >In a list?</li + ><li + ><a href="http://example.com/" + ><code + >http://example.com/</code + ></a + ></li + ><li + >It should.</li + ></ul +><p +>An e-mail address: <script type="text/javascript" + > <!-- h='nowhere.net';a='@';n='nobody';e=n+a+h; document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+'a'+'>'); // --> </script - ><noscript - >nobody at nowhere dot net</noscript - ></p - ><blockquote - ><p - >Blockquoted: <a href="http://example.com/" - ><code - >http://example.com/</code - ></a - ></p - ></blockquote - ><p - >Auto-links should not occur here: <code - ><http://example.com/></code - ></p - ><pre + ><noscript + >nobody at nowhere dot net</noscript + ></p +><blockquote +><p + >Blockquoted: <a href="http://example.com/" ><code - >or here: <http://example.com/> + >http://example.com/</code + ></a + ></p + ></blockquote +><p +>Auto-links should not occur here: <code + ><http://example.com/></code + ></p +><pre +><code + >or here: <http://example.com/> </code - ></pre - ><hr - /></div + ></pre +><hr + /><h1 id="images" +>Images</h1 +><p +>From “Voyage dans la Lune” by Georges Melies (1902):</p +><div class="figure" +><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" + /><p class="caption" + >lalune</p ></div -><div id="images" -><h1 - >Images</h1 - ><p - >From “Voyage dans la Lune” by Georges Melies (1902):</p - ><div class="figure" - ><img src="lalune.jpg" title="Voyage dans la Lune" alt="lalune" - /><p class="caption" - >lalune</p - ></div - ><p - >Here is a movie <img src="movie.jpg" alt="movie" - /> icon.</p - ><hr - /></div -><div id="footnotes" -><h1 - >Footnotes</h1 - ><p - >Here is a footnote reference,<sup - ><a href="#fn1" class="footnoteRef" id="fnref1" - >1</a - ></sup - > and another.<sup - ><a href="#fn2" class="footnoteRef" id="fnref2" - >2</a - ></sup - > This should <em - >not</em - > be a footnote reference, because it contains a space.[^my note] Here is an inline note.<sup - ><a href="#fn3" class="footnoteRef" id="fnref3" - >3</a +><p +>Here is a movie <img src="movie.jpg" alt="movie" + /> icon.</p +><hr + /><h1 id="footnotes" +>Footnotes</h1 +><p +>Here is a footnote reference,<sup + ><a href="#fn1" class="footnoteRef" id="fnref1" + >1</a + ></sup + > and another.<sup + ><a href="#fn2" class="footnoteRef" id="fnref2" + >2</a + ></sup + > This should <em + >not</em + > be a footnote reference, because it contains a space.[^my note] Here is an inline note.<sup + ><a href="#fn3" class="footnoteRef" id="fnref3" + >3</a + ></sup + ></p +><blockquote +><p + >Notes can go in quotes.<sup + ><a href="#fn4" class="footnoteRef" id="fnref4" + >4</a ></sup ></p - ><blockquote - ><p - >Notes can go in quotes.<sup - ><a href="#fn4" class="footnoteRef" id="fnref4" - >4</a - ></sup - ></p - ></blockquote - ><ol style="list-style-type: decimal;" - ><li - >And in list items.<sup - ><a href="#fn5" class="footnoteRef" id="fnref5" - >5</a - ></sup - ></li - ></ol - ><p - >This paragraph should not be part of the note, as it is not indented.</p - ></div + ></blockquote +><ol style="list-style-type: decimal;" +><li + >And in list items.<sup + ><a href="#fn5" class="footnoteRef" id="fnref5" + >5</a + ></sup + ></li + ></ol +><p +>This paragraph should not be part of the note, as it is not indented.</p ><div class="footnotes" ><hr /><ol @@ -1247,4 +1163,3 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+ > </body> </html> - diff --git a/tests/writer.latex b/tests/writer.latex index dbefdb8fd..1621a4844 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -1,5 +1,5 @@ \documentclass{article} -\usepackage{amsmath} +\usepackage{amssymb,amsmath} \usepackage[mathletters]{ucs} \usepackage[utf8x]{inputenc} \usepackage{fancyvrb} @@ -14,6 +14,15 @@ \newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} \usepackage{url} \usepackage{graphicx} +% We will generate all images so they have a width \maxwidth. This means +% that they will get their normal width if they fit onto the page, but +% are scaled down if they would overflow the margins. +\makeatletter +\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth +\else\Gin@nat@width\fi} +\makeatother +\let\Oldincludegraphics\includegraphics +\renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} \usepackage[breaklinks=true,unicode=true]{hyperref} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} @@ -855,4 +864,3 @@ This paragraph should not be part of the note, as it is not indented. \end{document} - diff --git a/tests/writer.man b/tests/writer.man index 1048bc701..e4dc0c7de 100644 --- a/tests/writer.man +++ b/tests/writer.man @@ -50,12 +50,14 @@ It is pretty short. .RS .PP Code in a block quote: -.PP -\f[CR] - sub\ status\ { - \ \ \ \ print\ "working"; - } +.IP +.nf +\f[C] +sub\ status\ { +\ \ \ \ print\ "working"; +} \f[] +.fi .PP A list: .IP "1." 3 @@ -82,24 +84,28 @@ And a following paragraph. .SH Code Blocks .PP Code: -.PP -\f[CR] - ----\ (should\ be\ four\ hyphens) - - sub\ status\ { - \ \ \ \ print\ "working"; - } - - this\ code\ block\ is\ indented\ by\ one\ tab +.IP +.nf +\f[C] +----\ (should\ be\ four\ hyphens) + +sub\ status\ { +\ \ \ \ print\ "working"; +} + +this\ code\ block\ is\ indented\ by\ one\ tab \f[] +.fi .PP And: -.PP -\f[CR] - \ \ \ \ this\ code\ block\ is\ indented\ by\ two\ tabs - - These\ should\ not\ be\ escaped:\ \ \\$\ \\\\\ \\>\ \\[\ \\{ +.IP +.nf +\f[C] +\ \ \ \ this\ code\ block\ is\ indented\ by\ two\ tabs + +These\ should\ not\ be\ escaped:\ \ \\$\ \\\\\ \\>\ \\[\ \\{ \f[] +.fi .PP * * * * * .SH Lists @@ -372,10 +378,12 @@ contains seeds, crisp, pleasant to taste .B \f[I]orange\f[] orange fruit .RS -.PP -\f[CR] - {\ orange\ code\ block\ } +.IP +.nf +\f[C] +{\ orange\ code\ block\ } \f[] +.fi .RS .PP orange block quote @@ -453,18 +461,22 @@ Here's a simple block: foo .PP This should be a code block, though: -.PP -\f[CR] - <div> - \ \ \ \ foo - </div> +.IP +.nf +\f[C] +<div> +\ \ \ \ foo +</div> \f[] +.fi .PP As should this: -.PP -\f[CR] - <div>foo</div> +.IP +.nf +\f[C] +<div>foo</div> \f[] +.fi .PP Now, nested: foo @@ -474,18 +486,22 @@ This should just be an HTML comment: Multiline: .PP Code block: -.PP -\f[CR] - <!--\ Comment\ --> +.IP +.nf +\f[C] +<!--\ Comment\ --> \f[] +.fi .PP Just plain comment, with trailing spaces on the line: .PP Code: -.PP -\f[CR] - <hr\ /> +.IP +.nf +\f[C] +<hr\ /> \f[] +.fi .PP Hr's: .PP @@ -506,8 +522,8 @@ So is \f[B]\f[I]this\f[]\f[] word. .PP So is \f[B]\f[I]this\f[]\f[] word. .PP -This is code: \f[B]>\f[], \f[B]$\f[], \f[B]\\\f[], \f[B]\\$\f[], -\f[B]<html>\f[]. +This is code: \f[C]>\f[], \f[C]$\f[], \f[C]\\\f[], \f[C]\\$\f[], +\f[C]<html>\f[]. .PP [STRIKEOUT:This is \f[I]strikeout\f[].] .PP @@ -531,7 +547,7 @@ So is `pine.' .PP `He said, \[lq]I want to go.\[rq]' Were you alive in the 70's? .PP -Here is some quoted `\f[B]code\f[]' and a +Here is some quoted `\f[C]code\f[]' and a \[lq]quoted link (http://example.com/?foo=1&bar=2)\[rq]. .PP Some dashes: one\[em]two \[em] three\[em]four \[em] five. @@ -544,27 +560,26 @@ Ellipses\&...and\&...and\&.... .SH LaTeX .IP \[bu] 2 .IP \[bu] 2 -\f[B]2+2=4\f[] +2 + 2 = 4 .IP \[bu] 2 -\f[B]x\ \\in\ y\f[] +\f[I]x\f[] ∈ \f[I]y\f[] .IP \[bu] 2 -\f[B]\\alpha\ \\wedge\ \\omega\f[] +α ∧ ω .IP \[bu] 2 -\f[B]223\f[] +223 .IP \[bu] 2 -\f[B]p\f[]-Tree +\f[I]p\f[]-Tree .IP \[bu] 2 Here's some display math: .RS -\f[B]\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h}\f[] +$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$ .RE .IP \[bu] 2 -Here's one that has a line break in it: -\f[B]\\alpha\ +\ \\omega\ \\times\ x^2\f[]. +Here's one that has a line break in it: α + ω × \f[I]x\f[]^2^. .PP These shouldn't be math: .IP \[bu] 2 -To get the famous equation, write \f[B]$e\ =\ mc^2$\f[]. +To get the famous equation, write \f[C]$e\ =\ mc^2$\f[]. .IP \[bu] 2 $22,000 is a \f[I]lot\f[] of money. So is $34,000. @@ -572,7 +587,7 @@ So is $34,000. .IP \[bu] 2 Shoes ($20) and socks ($5). .IP \[bu] 2 -Escaped \f[B]$\f[]: $73 \f[I]this should be emphasized\f[] 23$. +Escaped \f[C]$\f[]: $73 \f[I]this should be emphasized\f[] 23$. .PP Here's a LaTeX table: .PP @@ -674,10 +689,12 @@ Indented twice (/url). Indented thrice (/url). .PP This should [not][] be a link. -.PP -\f[CR] - [not]:\ /url +.IP +.nf +\f[C] +[not]:\ /url \f[] +.fi .PP Foo bar (/url/). .PP @@ -709,11 +726,13 @@ An e-mail address: <nobody@nowhere.net> Blockquoted: <http://example.com/> .RE .PP -Auto-links should not occur here: \f[B]<http://example.com/>\f[] -.PP -\f[CR] - or\ here:\ <http://example.com/> +Auto-links should not occur here: \f[C]<http://example.com/>\f[] +.IP +.nf +\f[C] +or\ here:\ <http://example.com/> \f[] +.fi .PP * * * * * .SH Images @@ -754,10 +773,12 @@ This one contains multiple blocks. .PP Subsequent blocks are indented to show that they belong to the footnote (as with list items). -.PP -\f[CR] - \ \ {\ <code>\ } +.IP +.nf +\f[C] +\ \ {\ <code>\ } \f[] +.fi .PP If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. @@ -765,7 +786,7 @@ and just indent the first line of each block. .SS [3] .PP This is \f[I]easier\f[] to type. -Inline notes may contain links (http://google.com) and \f[B]]\f[] +Inline notes may contain links (http://google.com) and \f[C]]\f[] verbatim characters, as well as [bracketed text]. .SS [4] @@ -777,4 +798,3 @@ In quote. In list. .SH AUTHORS John MacFarlane; Anonymous. - diff --git a/tests/writer.markdown b/tests/writer.markdown index 1bc9b76f0..b417a8fee 100644 --- a/tests/writer.markdown +++ b/tests/writer.markdown @@ -3,7 +3,7 @@ % July 17, 2006 This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. * * * * * @@ -35,13 +35,13 @@ with no blank line # Paragraphs -Here's a regular paragraph. +Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item. -Here's one with a bullet. \* criminey. +Here’s one with a bullet. \* criminey. There should be a hard line break here. @@ -185,7 +185,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -201,7 +201,7 @@ Multiple paragraphs: -Here's another: +Here’s another: 1. First 2. Second: @@ -395,7 +395,7 @@ And this is **strong** <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> -Here's a simple block: +Here’s a simple block: <div> @@ -450,7 +450,7 @@ Code: <hr /> -Hr's: +Hr’s: <hr> @@ -505,22 +505,22 @@ unescaped spaces: a\^b c\^d, a\~b c\~d. # Smart quotes, ellipses, dashes -"Hello," said the spider. "'Shelob' is my name." +“Hello,” said the spider. “‘Shelob’ is my name.” -'A', 'B', and 'C' are letters. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted '`code`' and a -"[quoted link](http://example.com/?foo=1&bar=2)". +Here is some quoted ‘`code`’ and a +“[quoted link](http://example.com/?foo=1&bar=2)”. -Some dashes: one--two -- three--four -- five. +Some dashes: one—two — three—four — five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. * * * * * @@ -533,20 +533,20 @@ Ellipses...and...and.... - $\alpha \wedge \omega$ - $223$ - $p$-Tree -- Here's some display math: +- Here’s some display math: $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ -- Here's one that has a line break in it: +- Here’s one that has a line break in it: $\alpha + \omega \times x^2$. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write `$e = mc^2$`. -- $22,000 is a *lot* of money. So is $34,000. (It worked if "lot" +- $22,000 is a *lot* of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped `$`: $73 *this should be emphasized* 23$. -Here's a LaTeX table: +Here’s a LaTeX table: \begin{tabular}{|l|l|}\hline Animal & Number \\ \hline @@ -662,15 +662,15 @@ Foo [biz](/url/ "Title with "quote" inside"). ## With ampersands -Here's a +Here’s a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2). -Here's a link with an amersand in the link text: +Here’s a link with an amersand in the link text: [AT&T](http://att.com/ "AT&T"). -Here's an [inline link](/script?foo=1&bar=2). +Here’s an [inline link](/script?foo=1&bar=2). -Here's an [inline link in pointy braces](/script?foo=1&bar=2). +Here’s an [inline link in pointy braces](/script?foo=1&bar=2). ## Autolinks @@ -693,7 +693,7 @@ Auto-links should not occur here: `<http://example.com/>` # Images -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902):  @@ -715,13 +715,12 @@ note] Here is an inline note.[^3] This paragraph should not be part of the note, as it is not indented. - [^1]: Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document. [^2]: - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). @@ -741,5 +740,3 @@ indented. [^5]: In list. - - diff --git a/tests/writer.mediawiki b/tests/writer.mediawiki index 5873ea831..557396bfb 100644 --- a/tests/writer.mediawiki +++ b/tests/writer.mediawiki @@ -660,4 +660,3 @@ If you want, you can indent every line, but you can also be lazy and just indent This paragraph should not be part of the note, as it is not indented. <references /> - diff --git a/tests/writer.native b/tests/writer.native index 7560317c5..ced38537c 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -415,4 +415,3 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA [ [ Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items",Str ".",Note [Para [Str "In",Space,Str "list",Str "."]]] ] ] , Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented",Str "."] ] - diff --git a/tests/writer.opendocument b/tests/writer.opendocument index b10c5bef1..a08e5cf0a 100644 --- a/tests/writer.opendocument +++ b/tests/writer.opendocument @@ -689,30 +689,17 @@ <style:style style:name="T59" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T60" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T61" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T62" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T62" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style> <style:style style:name="T63" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T64" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" style:text-position="sub 58%" /></style:style> - <style:style style:name="T66" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style> - <style:style style:name="T67" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style> + <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T66" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> + <style:style style:name="T67" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T68" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T69" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T70" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T71" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="T72" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T73" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T74" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T75" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style> - <style:style style:name="T76" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T77" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T78" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T79" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T80" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T81" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T82" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T83" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T84" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> - <style:style style:name="T85" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Quotations"> <style:paragraph-properties fo:margin-left="0.5in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" /> </style:style> @@ -1317,13 +1304,13 @@ <text:p text:style-name="P51"><text:span text:style-name="Teletype">\cite[22-23]{smith.1899}</text:span></text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">2+2=4</text:p> + <text:p text:style-name="P51">2 + 2 = 4</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51"><text:span text:style-name="T58">x</text:span> ∈ <text:span text:style-name="T59">y</text:span></text:p> + <text:p text:style-name="P51"><text:span text:style-name="T58">x</text:span> ∈ <text:span text:style-name="T59">y</text:span></text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">α ∧ ω</text:p> + <text:p text:style-name="P51">α ∧ ω</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P51">223</text:p> @@ -1332,10 +1319,10 @@ <text:p text:style-name="P51"><text:span text:style-name="T60">p</text:span>-Tree</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s some display math: \frac{<text:span text:style-name="T61">d</text:span>}{<text:span text:style-name="T62">dx</text:span>}<text:span text:style-name="T63">f</text:span>(<text:span text:style-name="T64">x</text:span>)=\lim<text:span text:style-name="T65">h</text:span><text:span text:style-name="T66"> → </text:span><text:span text:style-name="T67">0</text:span>\frac{<text:span text:style-name="T68">f</text:span>(<text:span text:style-name="T69">x</text:span>+<text:span text:style-name="T70">h</text:span>)-<text:span text:style-name="T71">f</text:span>(<text:span text:style-name="T72">x</text:span>)}{<text:span text:style-name="T73">h</text:span>}</text:p> + <text:p text:style-name="P51">Here’s some display math: $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P51">Here’s one that has a line break in it: α+ω × <text:span text:style-name="T74">x</text:span><text:span text:style-name="T75">2</text:span>.</text:p> + <text:p text:style-name="P51">Here’s one that has a line break in it: α + ω × <text:span text:style-name="T61">x</text:span><text:span text:style-name="T62">2</text:span>.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">These shouldn’t be math:</text:p> @@ -1344,13 +1331,13 @@ <text:p text:style-name="P52">To get the famous equation, write <text:span text:style-name="Teletype">$e = mc^2$</text:span>.</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">$22,000 is a <text:span text:style-name="T76">lot</text:span> of money. So is $34,000. (It worked if “lot” is emphasized.)</text:p> + <text:p text:style-name="P52">$22,000 is a <text:span text:style-name="T63">lot</text:span> of money. So is $34,000. (It worked if “lot” is emphasized.)</text:p> </text:list-item> <text:list-item> <text:p text:style-name="P52">Shoes ($20) and socks ($5).</text:p> </text:list-item> <text:list-item> - <text:p text:style-name="P52">Escaped <text:span text:style-name="Teletype">$</text:span>: $73 <text:span text:style-name="T77">this</text:span><text:span text:style-name="T78"> </text:span><text:span text:style-name="T79">should</text:span><text:span text:style-name="T80"> </text:span><text:span text:style-name="T81">be</text:span><text:span text:style-name="T82"> </text:span><text:span text:style-name="T83">emphasized</text:span> 23$.</text:p> + <text:p text:style-name="P52">Escaped <text:span text:style-name="Teletype">$</text:span>: $73 <text:span text:style-name="T64">this</text:span><text:span text:style-name="T65"> </text:span><text:span text:style-name="T66">should</text:span><text:span text:style-name="T67"> </text:span><text:span text:style-name="T68">be</text:span><text:span text:style-name="T69"> </text:span><text:span text:style-name="T70">emphasized</text:span> 23$.</text:p> </text:list-item> </text:list> <text:p text:style-name="Text_20_body">Here’s a LaTeX table:</text:p> @@ -1454,7 +1441,7 @@ Cat <text:s text:c="3" />& 1 <text:s text:c="5" />\\ \hline <text:p text:style-name="Text_20_body">Here is a movie <draw:frame><draw:image xlink:href="movie.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" /></draw:frame> icon.</text:p> <text:p text:style-name="Horizontal_20_Line" /> <text:h text:style-name="Heading_20_1" text:outline-level="1">Footnotes</text:h> -<text:p text:style-name="Text_20_body">Here is a footnote reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.</text:p></text:note-body></text:note> and another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s the long note. This one contains multiple blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are indented to show that they belong to the footnote (as with list items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</text:p></text:note-body></text:note> This should <text:span text:style-name="T84">not</text:span> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This is <text:span text:style-name="T85">easier</text:span> to type. Inline notes may contain <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> and <text:span text:style-name="Teletype">]</text:span> verbatim characters, as well as [bracketed text].</text:p></text:note-body></text:note></text:p> +<text:p text:style-name="Text_20_body">Here is a footnote reference,<text:note text:id="ftn0" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.</text:p></text:note-body></text:note> and another.<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">Here’s the long note. This one contains multiple blocks.</text:p><text:p text:style-name="Footnote">Subsequent blocks are indented to show that they belong to the footnote (as with list items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ <code> }</text:p><text:p text:style-name="Footnote">If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.</text:p></text:note-body></text:note> This should <text:span text:style-name="T71">not</text:span> be a footnote reference, because it contains a space.[^my note] Here is an inline note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This is <text:span text:style-name="T72">easier</text:span> to type. Inline notes may contain <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a> and <text:span text:style-name="Teletype">]</text:span> verbatim characters, as well as [bracketed text].</text:p></text:note-body></text:note></text:p> <text:p text:style-name="P59">Notes can go in quotes.<text:note text:id="ftn3" text:note-class="footnote"><text:note-citation>4</text:note-citation><text:note-body><text:p text:style-name="Footnote">In quote.</text:p></text:note-body></text:note></text:p> <text:list text:style-name="L30"> <text:list-item> @@ -1465,4 +1452,3 @@ Cat <text:s text:c="3" />& 1 <text:s text:c="5" />\\ \hline </office:text> </office:body> </office:document-content> - diff --git a/tests/writer.plain b/tests/writer.plain index 27ed0add9..bc6d25467 100644 --- a/tests/writer.plain +++ b/tests/writer.plain @@ -3,7 +3,7 @@ John MacFarlane; Anonymous July 17, 2006 This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. * * * * * @@ -41,13 +41,13 @@ with no blank line Paragraphs ========== -Here's a regular paragraph. +Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item. -Here's one with a bullet. * criminey. +Here’s one with a bullet. * criminey. There should be a hard line break here. @@ -196,7 +196,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -213,7 +213,7 @@ Nested -Here's another: +Here’s another: 1. First 2. Second: @@ -388,7 +388,7 @@ Interpreted markdown in a table: This is emphasized And this is strong -Here's a simple block: +Here’s a simple block: foo This should be a code block, though: @@ -418,7 +418,7 @@ Code: <hr /> -Hr's: +Hr’s: * * * * * @@ -457,21 +457,21 @@ unescaped spaces: a^b c^d, a~b c~d. Smart quotes, ellipses, dashes ============================== -"Hello," said the spider. "'Shelob' is my name." +“Hello,” said the spider. “‘Shelob’ is my name.” -'A', 'B', and 'C' are letters. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted 'code' and a "quoted link". +Here is some quoted ‘code’ and a “quoted link”. -Some dashes: one--two -- three--four -- five. +Some dashes: one—two — three—four — five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. * * * * * @@ -485,20 +485,20 @@ LaTeX - \alpha \wedge \omega - 223 - p-Tree -- Here's some display math: +- Here’s some display math: \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} -- Here's one that has a line break in it: +- Here’s one that has a line break in it: \alpha + \omega \times x^2. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write $e = mc^2$. -- $22,000 is a lot of money. So is $34,000. (It worked if "lot" +- $22,000 is a lot of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped $: $73 this should be emphasized 23$. -Here's a LaTeX table: +Here’s a LaTeX table: @@ -615,13 +615,13 @@ Foo biz. With ampersands --------------- -Here's a link with an ampersand in the URL. +Here’s a link with an ampersand in the URL. -Here's a link with an amersand in the link text: AT&T. +Here’s a link with an amersand in the link text: AT&T. -Here's an inline link. +Here’s an inline link. -Here's an inline link in pointy braces. +Here’s an inline link in pointy braces. Autolinks --------- @@ -646,7 +646,7 @@ Auto-links should not occur here: <http://example.com/> Images ====== -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902): @@ -669,13 +669,12 @@ Here is an inline note.[^3] This paragraph should not be part of the note, as it is not indented. - [^1]: Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document. [^2]: - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). @@ -694,5 +693,3 @@ indented. [^5]: In list. - - diff --git a/tests/writer.rst b/tests/writer.rst index e68343b01..dff04bc81 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -10,7 +10,7 @@ Pandoc Test Suite :format: html latex This is a set of tests for pandoc. Most of them are adapted from -John Gruber's markdown test suite. +John Gruber’s markdown test suite. -------------- @@ -50,13 +50,13 @@ with no blank line Paragraphs ========== -Here's a regular paragraph. +Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like a list item. -Here's one with a bullet. \* criminey. +Here’s one with a bullet. \* criminey. There should be a hard line break here. @@ -224,7 +224,7 @@ Multiple paragraphs: 1. Item 1, graf one. - Item 1. graf two. The quick brown fox jumped over the lazy dog's + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. 2. Item 2. @@ -244,7 +244,7 @@ Nested -Here's another: +Here’s another: 1. First @@ -489,7 +489,7 @@ And this is **strong** <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> -Here's a simple block: +Here’s a simple block: .. raw:: html @@ -575,7 +575,7 @@ Code: <hr /> -Hr's: +Hr’s: .. raw:: html @@ -635,22 +635,22 @@ unescaped spaces: a^b c^d, a~b c~d. Smart quotes, ellipses, dashes ============================== -"Hello," said the spider. "'Shelob' is my name." +“Hello,” said the spider. “‘Shelob’ is my name.” -'A', 'B', and 'C' are letters. +‘A’, ‘B’, and ‘C’ are letters. -'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' +‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’ -'He said, "I want to go."' Were you alive in the 70's? +‘He said, “I want to go.”’ Were you alive in the 70’s? -Here is some quoted '``code``' and a -"`quoted link <http://example.com/?foo=1&bar=2>`_". +Here is some quoted ‘``code``’ and a +“`quoted link <http://example.com/?foo=1&bar=2>`_”. -Some dashes: one--two -- three--four -- five. +Some dashes: one—two — three—four — five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5–7, 255–66, 1987–1999. -Ellipses...and...and.... +Ellipses…and…and…. -------------- @@ -664,21 +664,21 @@ LaTeX - :math:`$\alpha \wedge \omega$` - :math:`$223$` - :math:`$p$`-Tree -- Here's some display math: +- Here’s some display math: :math:`$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$` -- Here's one that has a line break in it: +- Here’s one that has a line break in it: :math:`$\alpha + \omega \times x^2$`. -These shouldn't be math: +These shouldn’t be math: - To get the famous equation, write ``$e = mc^2$``. -- $22,000 is a *lot* of money. So is $34,000. (It worked if "lot" +- $22,000 is a *lot* of money. So is $34,000. (It worked if “lot” is emphasized.) - Shoes ($20) and socks ($5). - Escaped ``$``: $73 *this should be emphasized* 23$. -Here's a LaTeX table: +Here’s a LaTeX table: @@ -796,15 +796,15 @@ Foo `biz </url/>`_. With ampersands --------------- -Here's a +Here’s a `link with an ampersand in the URL <http://example.com/?foo=1&bar=2>`_. -Here's a link with an amersand in the link text: +Here’s a link with an amersand in the link text: `AT&T <http://att.com/>`_. -Here's an `inline link </script?foo=1&bar=2>`_. +Here’s an `inline link </script?foo=1&bar=2>`_. -Here's an `inline link in pointy braces </script?foo=1&bar=2>`_. +Here’s an `inline link in pointy braces </script?foo=1&bar=2>`_. Autolinks --------- @@ -832,7 +832,7 @@ Auto-links should not occur here: ``<http://example.com/>`` Images ====== -From "Voyage dans la Lune" by Georges Melies (1902): +From “Voyage dans la Lune” by Georges Melies (1902): .. figure:: lalune.jpg :align: center @@ -865,7 +865,7 @@ indented. reference. It need not be placed at the end of the document. .. [2] - Here's the long note. This one contains multiple blocks. + Here’s the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the footnote (as with list items). @@ -888,6 +888,4 @@ indented. .. [5] In list. - .. |movie| image:: movie.jpg - diff --git a/tests/writer.rtf b/tests/writer.rtf index ae3776261..3cb1d2996 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -264,13 +264,13 @@ quoted link {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par} {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 LaTeX\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 2+2=4\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x}\u8201?\u8712?\u8201?{\i y}\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8201?\u8743?\u8201?\u969?\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 2\u8197?+\u8197?2\u8196?=\u8196?4\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x}\u8196?\u8712?\u8196?{\i y}\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8197?\u8743?\u8197?\u969?\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 223\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i p}-Tree\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's some display math: \\frac\{{\i d}\}\{{\i dx}\}{\i f}({\i x})=\\lim{\sub {\i h}\u8201?\u8594?\u8201?0}\\frac\{{\i f}({\i x}+{\i h})-{\i f}({\i x})\}\{{\i h}\}\par} -{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?+\u969?\u8201?\u215?\u8201?{\i x}{\super 2}.\sa180\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's some display math: $\\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}$\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?\u8197?+\u8197?\u969?\u8197?\u215?\u8197?{\i x}{\super 2}.\sa180\par} {\pard \ql \f0 \sa180 \li0 \fi0 These shouldn\u8217't be math:\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab To get the famous equation, write {\f1 $e = mc^2$}.\par} {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab $22,000 is a {\i lot} of money. So is $34,000. (It worked if \u8220"lot\u8221" is emphasized.)\par} @@ -450,4 +450,3 @@ links }\sa180\par} {\pard \ql \f0 \sa180 \li0 \fi0 This paragraph should not be part of the note, as it is not indented.\par} } - diff --git a/tests/writer.texinfo b/tests/writer.texinfo index 149b5a737..3344845b0 100644 --- a/tests/writer.texinfo +++ b/tests/writer.texinfo @@ -1014,4 +1014,3 @@ And in list items.@footnote{In list.} This paragraph should not be part of the note@comma{} as it is not indented. @bye - |