summaryrefslogtreecommitdiff
path: root/lib/coderay/encoders
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2010-04-02 00:14:27 +0000
committermurphy <murphy@rubychan.de>2010-04-02 00:14:27 +0000
commit1de8e57c915561e0c5ce7e98e8760c7e7ad0a38e (patch)
tree164e7ddcc5495534de4deb136fbc3c8c0e0fb87f /lib/coderay/encoders
parent71cf11e7137e39c5ef1e9840adda6bcfb38f7432 (diff)
downloadcoderay-1de8e57c915561e0c5ce7e98e8760c7e7ad0a38e.tar.gz
HTML encoder is HTML 5 and CSS 3 compatible (closes #215).
This also means it's incompatible to previous versions of HTML and CSS. Also, the output may not show correctly on IE. I officially drop support for Internet Explorer with no regrets.
Diffstat (limited to 'lib/coderay/encoders')
-rw-r--r--lib/coderay/encoders/html/numerization.rb2
-rw-r--r--lib/coderay/encoders/html/output.rb7
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/coderay/encoders/html/numerization.rb b/lib/coderay/encoders/html/numerization.rb
index 7058edd..5bfcc2d 100644
--- a/lib/coderay/encoders/html/numerization.rb
+++ b/lib/coderay/encoders/html/numerization.rb
@@ -77,11 +77,9 @@ module Encoders
# FIXME Still not working perfect for Mr. Internet Exploder
line_numbers = (start ... start + line_count).to_a.map(&bolding).join("\n")
line_numbers << "\n" # also for Mr. MS Internet Exploder :-/
- line_numbers.gsub!(/\n/) { "<tt>\n</tt>" }
line_numbers_table_tpl = TABLE.apply('LINE_NUMBERS', line_numbers)
gsub!(/<\/div>\n/) { '</div>' }
- gsub!(/\n/) { "<tt>\n</tt>" }
wrap_in! line_numbers_table_tpl
@wrapped_in = :div
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb
index 57d2e88..83c4ec6 100644
--- a/lib/coderay/encoders/html/output.rb
+++ b/lib/coderay/encoders/html/output.rb
@@ -181,11 +181,10 @@ module Encoders
LIST
PAGE = <<-`PAGE`
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="de">
+<!DOCTYPE html>
+<html>
<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<style type="text/css">
<%CSS%>