Merge branch 'master' into code_with_multibyte

Conflicts: lib/gollum/markup.rb test/test_markup.rb
github · Apr 10, 2012 · eed9b26 · eed9b26
2 parents 5b84ecf + 337a9b1
commit eed9b26
Show file tree

Hide file tree

Showing 395 changed files with 361 additions and 8,163 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,3 @@ source "http://rubygems.org"
 
 gemspec
 gem "rake", "~> 0.9.2"
-gem "grit", :git => "git://github.com/mojombo/grit.git"
diff --git a/README.md b/README.md
@@ -320,9 +320,6 @@ inline with regular text. For example:
 
     The Pythagorean theorem is \( a^2 + b^2 = c^2 \).
 
-Gollum uses [MathJax](http://www.mathjax.org/) to convert the TeX syntax into
-output suitable for display in web browsers.
-
 
 ## API DOCUMENTATION
 

diff --git a/gollum.gemspec b/gollum.gemspec
@@ -23,8 +23,9 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency('grit', "~> 2.4.1")
-  s.add_dependency('github-markup', [">= 0.4.0", "< 1.0.0"])
+  s.add_dependency('github-markup', [">= 0.7.0", "< 1.0.0"])
   s.add_dependency('pygments.rb', "~> 0.2.0")
+  s.add_dependency('posix-spawn', "~> 0.3.0")
   s.add_dependency('sinatra', "~> 1.0")
   s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
   s.add_dependency('sanitize', "~> 2.0.0")
@@ -34,7 +35,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('RedCloth')
   s.add_development_dependency('mocha')
   s.add_development_dependency('org-ruby')
-  s.add_development_dependency('rdiscount')
   s.add_development_dependency('shoulda')
   s.add_development_dependency('rack-test')
   s.add_development_dependency('wikicloth', '~> 0.6.3')

diff --git a/lib/gollum.rb b/lib/gollum.rb
@@ -17,6 +17,7 @@
 require File.expand_path('../gollum/file', __FILE__)
 require File.expand_path('../gollum/markup', __FILE__)
 require File.expand_path('../gollum/sanitization', __FILE__)
+require File.expand_path('../gollum/tex', __FILE__)
 
 module Gollum
   VERSION = '1.3.1'

diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
@@ -144,6 +144,12 @@ class App < Sinatra::Base
       mustache :compare
     end
 
+    get '/_tex.png' do
+      content_type 'image/png'
+      formula = Base64.decode64(params[:data])
+      Gollum::Tex.render_formula(formula)
+    end
+
     get %r{^/(javascript|css|images)} do
       halt 404
     end
@@ -199,7 +205,7 @@ def show_page_or_file(name)
     end
 
     def update_wiki_page(wiki, page, content, commit_message, name = nil, format = nil)
-      return if !page ||  
+      return if !page ||
         ((!content || page.raw_data == content) && page.format == format)
       name    ||= page.name
       format    = (format || page.format).to_sym

diff --git a/lib/gollum/frontend/public/css/gollum.css b/lib/gollum/frontend/public/css/gollum.css
@@ -1,3 +1,10 @@
+#wiki-wrapper #template blockquote {
+  margin: 1em 0;
+  border-left: 4px solid #ddd;
+  padding-left: .8em;
+  color: #555;
+}
+
 /*
   gollum.css
   A basic stylesheet for Gollum
@@ -6,7 +13,7 @@
 /* @section core */
 body, html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 10px; /* -> 1em */
+  font-size: 10px;
   margin: 0;
   padding: 0;
 }
@@ -30,18 +37,13 @@ a:hover, a:visited {
 
 /* @section head */
 #head {
-  border-bottom: 1px solid #ccc;
   margin: 4.5em 0 0.5em;
   padding: 0.5em 0;
   overflow: hidden;
 }
 
   #head h1 {
-    font-size: 3.3em;
-    float: left;
-    line-height: normal;
-    margin: 0;
-    padding: 0.08em 0 0 0;
+     display: none;
   }
 
   #head ul.actions {
@@ -206,12 +208,11 @@ a:hover, a:visited {
 
   /* @section page-footer */
   .page #footer {
-    border-top: 1px solid #ccc;
     margin: 1em 0 7em;
   }
 
   #footer p#last-edit {
-    font-size: 1.2em;
+    font-size: .9em;
     line-height: 1.6em;
     color: #999;
     margin: 0.9em 0;
@@ -647,18 +648,13 @@ ul.actions {
     text-indent: -5000px;
     width: 28px;
   }
-  
+
   .ff #head #searchbar #searchbar-fauxtext #search-submit span,
   .ie #head #searchbar #searchbar-fauxtext #search-submit span {
     height: 2.2em;
   }
-  
+
   #head #searchbar #searchbar-fauxtext #search-submit:hover span {
     background-position: -431px -28px;
     padding: 0;
   }
-
-
-#MathJax_Message {
-  display: none;
-}
diff --git a/lib/gollum/frontend/public/css/template.css b/lib/gollum/frontend/public/css/template.css
@@ -2,9 +2,29 @@
   Gollum v3 Template
 */
 
+/* margin & padding reset*/
+* {
+  margin: 0;
+  padding: 0;
+}
+
+
+html, body {
+  color: black;
+}
+
+body {
+  font: 13.34px helvetica,arial,freesans,clean,sans-serif;
+  line-height: 1.4;
+}
+
+img {
+  border: 0;
+}
+
 #template {
-  font-size: 13px;
-  line-height: 23px;
+  font-size: 14px;
+  line-height: 1.4;
   margin-bottom: 40px;
 }
 
@@ -15,7 +35,7 @@ a.absent {
 
 /* Primary Body Copy */
 #template p {
-  margin: 16px 0 0;
+  margin: 1em 0;
   padding: 0;
 }
 
@@ -32,15 +52,14 @@ a.absent {
 }
 
 #template h1 {
-  border-top: 4px solid #ccc;
-  font-size: 32px;
+  border-bottom: 1px solid #ccc;
+  font-size: 33px; /* was 32, GH is 33px */
   line-height: normal;
-  padding: 10px 0 0;
-  margin: 30px 0 0;
+  padding: .08em 0 0 0;
+  margin: 0;
 }
 
 #template h2 {
-  border-top: 4px solid #ccc;
   font-size: 22px;
   line-height: normal;
   margin: 22px 0 0;
@@ -91,7 +110,6 @@ a.absent {
   /* Border Reset for headers with horizontal rules */ 
   #template > h2:first-child, 
   #template > h1:first-child {
-    border: 0;
     margin: 12px 0 0;
     padding: 10px 0 0;
   }
@@ -100,19 +118,21 @@ a.absent {
 /* Lists, Blockquotes & Such */
 #template ul, 
 #template ol {
-  margin: 0;
-  padding: 20px 0 0;
-  list-style-position: inside;  
+  margin-top: 1.5em;
+  margin-left: 2.6em;
 }
 
   /* Nested Lists */
+  #template ul li, 
+  #template ol li, 
   #template ul li ul, 
   #template ol li ol,
   #template ul li ol,
   #template ol li ul,
   #template ul ul, 
   #template ol ol {
-    padding: 0 0 0 14px;
+    padding: 0;
+    margin: .5em 0;
   }
 
 #template dl {
@@ -266,7 +286,7 @@ a.absent {
   background-color: #f8f8f8;
   border: 1px solid #dedede;
   font-size: 13px;
-  padding: 1px 5px;
+  padding: 0;
 
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -279,38 +299,83 @@ a.absent {
   font-size: 13px;
   line-height: 19px;
   overflow: auto;
-  padding: 6px;
+  padding: 6px 10px;
 
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
 
+pre, code {
+  font: 12px 'Bitstream Vera Sans Mono','Courier',monospace
+}
+
 #template pre code, #template pre tt {
   background-color: transparent;
   border: none;
 }
 
-#template .highlight { background: #ffffff; }
-#template .highlight .c { color: #999988; font-style: italic }
-#template .highlight .err { color: #a61717; background-color: #e3d2d2 }
-#template .highlight .k { font-weight: bold }
-#template .highlight .o { font-weight: bold }
-#template .highlight .cm { color: #999988; font-style: italic }
-#template .highlight .cp { color: #999999; font-weight: bold }
-#template .highlight .c1 { color: #999988; font-style: italic }
-#template .highlight .cs { color: #999999; font-weight: bold; font-style: italic }
-#template .highlight .gd { color: #000000; background-color: #ffdddd }
-#template .highlight .gd .x { color: #000000; background-color: #ffaaaa }
-#template .highlight .ge { font-style: italic }
-#template .highlight .gr { color: #aa0000 }
-#template .highlight .gh { color: #999999 }
-#template .highlight .gi { color: #000000; background-color: #ddffdd }
-#template .highlight .gi .x { color: #000000; background-color: #aaffaa }
-#template .highlight .gc { color: #999; background-color: #EAF2F5 }
-#template .highlight .go { color: #888888 }
-#template .highlight .gp { color: #555555 }
-#template .highlight .gs { font-weight: bold }
-#template .highlight .gu { color: #aaaaaa }
-#template .highlight .gt { color: #aa0000 }
-
+/*
+  Highlight rules from pull req 191 
+  https://github.com/eboto/gollum/commit/5df09477abf4a04c82c7fcaa2bd7ee2a85e7ec82
+*/
+#template .highlight { background:#fff; }
+#template .highlight .c { color:#998;font-style:italic; }
+#template .highlight .err { color:#a61717;background-color:#e3d2d2; }
+#template .highlight .k { font-weight:bold; }
+#template .highlight .o { font-weight:bold; }
+#template .highlight .cm { color:#998;font-style:italic; }
+#template .highlight .cp { color:#999;font-weight:bold; }
+#template .highlight .c1 { color:#998;font-style:italic; }
+#template .highlight .cs { color:#999;font-weight:bold;font-style:italic; }
+#template .highlight .gd { color:#000;background-color:#fdd; }
+#template .highlight .gd .x { color:#000;background-color:#faa; }
+#template .highlight .ge { font-style:italic; }
+#template .highlight .gr { color:#a00; }
+#template .highlight .gh { color:#999; }
+#template .highlight .gi { color:#000;background-color:#dfd; }
+#template .highlight .gi .x { color:#000;background-color:#afa; }
+#template .highlight .go { color:#888; }
+#template .highlight .gp { color:#555; }
+#template .highlight .gs { font-weight:bold; }
+#template .highlight .gu { color:#800080;font-weight:bold; }
+#template .highlight .gt { color:#a00; }
+#template .highlight .kc { font-weight:bold; }
+#template .highlight .kd { font-weight:bold; }
+#template .highlight .kp { font-weight:bold; }
+#template .highlight .kr { font-weight:bold; }
+#template .highlight .kt { color:#458;font-weight:bold; }
+#template .highlight .m { color:#099; }
+#template .highlight .s { color:#d14; }
+#template .highlight .na { color:#008080; }
+#template .highlight .nb { color:#0086B3; }
+#template .highlight .nc { color:#458;font-weight:bold; }
+#template .highlight .no { color:#008080; }
+#template .highlight .ni { color:#800080; }
+#template .highlight .ne { color:#900;font-weight:bold; }
+#template .highlight .nf { color:#900;font-weight:bold; }
+#template .highlight .nn { color:#555; }
+#template .highlight .nt { color:#000080; }
+#template .highlight .nv { color:#008080; }
+#template .highlight .ow { font-weight:bold; }
+#template .highlight .w { color:#bbb; }
+#template .highlight .mf { color:#099; }
+#template .highlight .mh { color:#099; }
+#template .highlight .mi { color:#099; }
+#template .highlight .mo { color:#099; }
+#template .highlight .sb { color:#d14; }
+#template .highlight .sc { color:#d14; }
+#template .highlight .sd { color:#d14; }
+#template .highlight .s2 { color:#d14; }
+#template .highlight .se { color:#d14; }
+#template .highlight .sh { color:#d14; }
+#template .highlight .si { color:#d14; }
+#template .highlight .sx { color:#d14; }
+#template .highlight .sr { color:#009926; }
+#template .highlight .s1 { color:#d14; }
+#template .highlight .ss { color:#990073; }
+#template .highlight .bp { color:#999; }
+#template .highlight .vc { color:#008080; }
+#template .highlight .vg { color:#008080; }
+#template .highlight .vi { color:#008080; }
+#template .highlight .il { color:#099; }
diff --git a/lib/gollum/frontend/public/javascript/MathJax/MathJax.js b/lib/gollum/frontend/public/javascript/MathJax/MathJax.js
diff --git a/lib/gollum/frontend/public/javascript/MathJax/config/MMLorHTML.js b/lib/gollum/frontend/public/javascript/MathJax/config/MMLorHTML.js