From 47ba15f5a1e4da7d9754dc0258a11798d69254b0 Mon Sep 17 00:00:00 2001 From: John MacFarlane <jgm@berkeley.edu> Date: Sun, 6 Feb 2011 10:30:52 -0800 Subject: [PATCH] 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. --- src/Text/Pandoc/Writers/HTML.hs | 1 - templates/html.template | 8 -------- 2 files changed, 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,17 +7,9 @@ $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)$