aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2011-02-06 10:30:52 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2011-02-06 10:30:52 -0800
commit47ba15f5a1e4da7d9754dc0258a11798d69254b0 (patch)
tree7ae259946984f1497774319b96729b92338313f9
parentfb5faaa91e32ee252eef2ca542c7666d800591e5 (diff)
downloadpandoc-47ba15f5a1e4da7d9754dc0258a11798d69254b0.tar.gz
Revert "Use us-ascii charset in HTML template if --ascii option."
This reverts commit aec54899606bed2580394baa1369e58ede20fde8. No need for this, since a UTF-8 charset will handle ascii just fine.
-rw-r--r--src/Text/Pandoc/Writers/HTML.hs1
-rw-r--r--templates/html.template8
2 files changed, 0 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 576a21dd7..b3320fa06 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -178,7 +178,6 @@ inTemplate opts tit auths date toc body' newvars =
(case toc of
Just t -> [ ("toc", showHtmlFragment t)]
Nothing -> []) ++
- [ ("ascii","true") | writerAscii opts ] ++
[ ("author", a) | a <- authors ]
in renderTemplate context $ writerTemplate opts
diff --git a/templates/html.template b/templates/html.template
index 3f0e41679..3f8b76fed 100644
--- a/templates/html.template
+++ b/templates/html.template
@@ -7,18 +7,10 @@ $else$
$endif$
<head>
$if(html5)$
-$if(ascii)$
- <meta charset="us-ascii" />
-$else$
<meta charset="utf-8" />
-$endif$
-$else$
-$if(ascii)$
- <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
$else$
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
$endif$
-$endif$
<meta name="generator" content="pandoc" />
$for(author)$
<meta name="author" content="$author$" />