709de16 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use UTF8 instead of entities in HTML.

Resolves Issue #163. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1744 788f1e2b-df1e-0410-8736-df70ead52e1b

commit709de162232e04b94a67d1d8610f02a11533c319 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 31 Dec 2009, 02:06 (17 years ago) parente620eab

5 files changed+12−14

compare with master

unifiedsplit

src/Text/Pandoc/Writers/HTML.hs+1−3 tests/s5.basic.html+1−1 tests/s5.fragment.html+1−1 tests/s5.inserts.html+1−1 tests/writer.html+8−8

src/Text/Pandoc/Writers/HTML.hs+1−3

@@ -70,9 +70,7 @@ stringToHtml = primHtml . concatMap fixChar

7070 fixChar '>' = ">"

7171 fixChar '&' = "&"

7272 fixChar '"' = """

73− fixChar '\160' = " "

74− fixChar c | ord c < 0xff = [c]

75− fixChar c = "&#" ++ show (ord c) ++ ";"

73+ fixChar c = [c]

7674

7775-- | Convert Pandoc document to Html string.

7876writeHtmlString :: WriterOptions -> Pandoc -> String

tests/s5.basic.html+1−1

@@ -320,7 +320,7 @@

320320 >)=\lim<sub

321321 ><em

322322 >h</em

323− > → 0</sub

323+ > → 0</sub

324324 >\frac{<em

325325 >f</em

326326 >(<em

tests/s5.fragment.html+1−1

@@ -25,7 +25,7 @@

2525 >)=\lim<sub

2626 ><em

2727 >h</em

28− > → 0</sub

28+ > → 0</sub

2929 >\frac{<em

3030 >f</em

3131 >(<em

tests/s5.inserts.html+1−1

@@ -40,7 +40,7 @@ STUFF INSERTED

4040 >)=\lim<sub

4141 ><em

4242 >h</em

43− > → 0</sub

43+ > → 0</sub

4444 >\frac{<em

4545 >f</em

4646 >(<em

tests/writer.html+8−8

@@ -444,7 +444,7 @@ These should not be escaped: \$ \\ \> \[ \{

444444 ><p

445445 >Should not be a list item:</p

446446 ><p

447− >M.A. 2007</p

447+ >M.A. 2007</p

448448 ><p

449449 >B. Williams</p

450450 ><hr

@@ -783,7 +783,7 @@ Blah

783783 >hello</em

784784 ></sup

785785 > a<sup

786− >hello there</sup

786+ >hello there</sup

787787 >.</p

788788 ><p

789789 >Subscripts: H<sub

@@ -791,7 +791,7 @@ Blah

791791 >O, H<sub

792792 >23</sub

793793 >O, H<sub

794− >many of them</sub

794+ >many of them</sub

795795 >O.</p

796796 ><p

797797 >These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.</p

@@ -836,13 +836,13 @@ Blah

836836 ><span class="math"

837837 ><em

838838 >x</em

839− > ∈ <em

839+ > ∈ <em

840840 >y</em

841841 ></span

842842 ></li

843843 ><li

844844 ><span class="math"

845− >α ∧ ω</span

845+ >α ∧ ω</span

846846 ></li

847847 ><li

848848 ><span class="math"

@@ -867,7 +867,7 @@ Blah

867867 >)=\lim<sub

868868 ><em

869869 >h</em

870− > → 0</sub

870+ > → 0</sub

871871 >\frac{<em

872872 >f</em

873873 >(<em

@@ -884,7 +884,7 @@ Blah

884884 ></li

885885 ><li

886886 >Here’s one that has a line break in it: <span class="math"

887− >α+ω × <em

887+ >α+ω × <em

888888 >x</em

889889 ><sup

890890 >2</sup

@@ -930,7 +930,7 @@ Blah

930930 ><li

931931 >section: §</li

932932 ><li

933− >set membership: ∈</li

933+ >set membership: ∈</li

934934 ><li

936936 ></ul