From 141affdb5140478464bf3c7331f6be4cf9454dd6 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 27 Jan 2007 22:13:11 +0000 Subject: More changes in entity handling: Instead of using entities for characters above 128 in HTML and Docbook output, we now just use unicode. After all, we're declaring UTF-8 content in the header. This makes the HTML and docbook files produced by pandoc much more readable and editable. Changes to Entities.hs: + Removed specialCharToEntity + Added escapeSGMLChar (which just escapes the basic four, <>&") + Modified encodeEntities and stringToSGML to use escapeSGMLChar + Removed encodeEntitiesNumerical + Rewrote encodeEntities for better performance + Rewrote stringToSGML for better performance git-svn-id: https://pandoc.googlecode.com/svn/trunk@516 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/writer.docbook | 60 ++++++++++++++++++++++++++-------------------------- tests/writer.html | 10 ++++----- 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'tests') diff --git a/tests/writer.docbook b/tests/writer.docbook index 600c52d6a..675a115cc 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -89,7 +89,7 @@ sub status { - print "working"; + print "working"; } @@ -122,7 +122,7 @@ sub status { - This should not be a block quote: 2 > 1. + This should not be a block quote: 2 > 1. Box-style: @@ -133,7 +133,7 @@ sub status { sub status { - print "working"; + print "working"; } @@ -177,7 +177,7 @@ sub status { ---- (should be four hyphens) sub status { - print "working"; + print "working"; } this code block is indented by one tab @@ -188,7 +188,7 @@ this code block is indented by one tab this code block is indented by two tabs -These should not be escaped: \$ \\ \> \[ \{ +These should not be escaped: \$ \\ \> \[ \{
@@ -577,9 +577,9 @@ These should not be escaped: \$ \\ \> \[ \{ word. - This is code: >, $, + This is code: >, $, \, \$, - <html>. + <html>.
@@ -602,7 +602,7 @@ These should not be escaped: \$ \\ \> \[ \{ Here is some quoted code and a - quoted link. + quoted link. Some dashes: one—two—three—four—five. @@ -691,9 +691,9 @@ These should not be escaped: \$ \\ \> \[ \{ \begin{tabular}{|l|l|}\hline -Animal & Number \\ \hline -Dog & 2 \\ -Cat & 1 \\ \hline +Animal & Number \\ \hline +Dog & 2 \\ +Cat & 1 \\ \hline \end{tabular}
@@ -705,44 +705,44 @@ Cat & 1 \\ \hline - I hat: Î + I hat: Î - o umlaut: ö + o umlaut: ö - section: § + section: § - set membership: ∈ + set membership: ∈ - copyright: © + copyright: © - AT&T has an ampersand in their name. + AT&T has an ampersand in their name. - AT&T is another way to write it. + AT&T is another way to write it. - This & that. + This & that. - 4 < 5. + 4 < 5. - 6 > 5. + 6 > 5. Backslash: \ @@ -775,7 +775,7 @@ Cat & 1 \\ \hline Right paren: ) - Greater-than: > + Greater-than: > Hash: # @@ -868,25 +868,25 @@ Cat & 1 \\ \hline With ampersands Here's a - link with an ampersand in the URL. + link with an ampersand in the URL. Here's a link with an amersand in the link text: - AT&T. + AT&T. - Here's an inline link. + Here's an inline link. Here's an - inline link in pointy braces. + inline link in pointy braces.
Autolinks With an ampersand: - http://example.com/?foo=1&bar=2 + http://example.com/?foo=1&bar=2 @@ -916,10 +916,10 @@ Cat & 1 \\ \hline Auto-links should not occur here: - <http://example.com/> + <http://example.com/> -or here: <http://example.com/> +or here: <http://example.com/>
@@ -970,7 +970,7 @@ or here: <http://example.com/> footnote (as with list items). - { <code> } + { <code> } If you want, you can indent every line, but you can also be lazy diff --git a/tests/writer.html b/tests/writer.html index 3213bb9ce..356e4cb3e 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -557,11 +557,11 @@ Cat & 1 \\ \hline Here is some unicode:

    -
  • I hat: Î
    • -
  • o umlaut: ö
    • -
  • section: §
    • -
  • set membership: ∈
    • -
  • copyright: ©
    • +
  • I hat: Î
    • +
  • o umlaut: ö
    • +
  • section: §
    • +
  • set membership: ∈
    • +
  • copyright: ©

AT&T has an ampersand in their name. -- cgit v1.2.3