Release 2.3.8

Add config example
Remove lib.so note
2012-11-07 18:50:37 -07:00 · 2012-11-07 18:48:07 -07:00 · 2012-11-07 18:46:36 -07:00 · 2012-11-07 18:45:20 -07:00 · 2012-11-07 17:39:30 -08:00 · 2012-11-07 17:51:36 -05:00
46 changed files with 941 additions and 789 deletions
@@ -4,3 +4,4 @@ pkg
 .bundle
 Gemfile.lock
 *.gem
+*.swp
@@ -4,5 +4,5 @@ rvm:
 notifications:
  disabled: true
 before_install:
- - gem uninstall ffi -a
- - sudo apt-get install -y asciidoc
+ - sudo apt-get update
+ - sudo apt-get install -y --force-yes asciidoc
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'

 gemspec
-gem "rake", "~> 0.9.2"
+gem 'rake', '~> 0.9'
@@ -2,6 +2,7 @@ gollum -- A wiki built on top of Git
 ====================================

 [![Build Status](https://secure.travis-ci.org/github/gollum.png?branch=master)](http://travis-ci.org/github/gollum)
+[![Dependency Status](https://gemnasium.com/github/gollum.png)](https://gemnasium.com/github/gollum)

 ## DESCRIPTION

@@ -18,6 +19,11 @@ number of ways depending on your needs. You can edit your wiki locally:
 Gollum follows the rules of [Semantic Versioning](http://semver.org/) and uses
 [TomDoc](http://tomdoc.org/) for inline documentation.

+## SYSTEM REQUIREMENTS
+- Python 2.5+ (2.7.3 recommended)
+- Ruby 1.8.7+ (1.9.3 recommended)
+- Unix like operating system (OS X, Ubuntu, Debian, and more)
+- Will not work on Windows (because of [grit](https://github.com/github/grit))

 ## INSTALLATION

@@ -295,7 +301,7 @@ This is useful for writing about the link syntax in your wiki pages.

 Gollum has a special tag to insert a table of contents (new in v2.1)

-    '[[_TOC_]]
+    [[_TOC_]]

 This tag is case sensitive, use all upper case.  The TOC tag can be inserted
 into the `_Header`, `_Footer` or `_Sidebar` files too.
@@ -334,27 +340,40 @@ then that whitespace will be ignored (this makes the blocks easier to read in pl
 The block must end with three backticks indented at the same level than the opening
 backticks.

+### GITHUB SYNTAX HIGHLIGHTING
+
+As an extra feature, you can syntax highlight a file from your repository, allowing
+you keep some of your sample code in the main repository. The code-snippet is
+updated when the wiki is rebuilt. You include github code like this:
+
+    ```html:github/gollum/master/test/file_view/1_file.txt```
+
+This will make the builder look at the **github user**, in the **gollum project**,
+in the **master branch**, at path **test/file_view/1_file.txt**. It will be
+rewritten to:
+
+    ```html
+    <ol class="tree">
+      <li class="file"><a href="0">0</a></li>
+    </ol>
+    ```
+
+Which will be parsed as HTML code during the Pygments run, and thereby coloured 
+appropriately.
+
 ## MATHEMATICAL EQUATIONS

+Start gollum with the `--mathjax` flag. Read more about [MathJax](http://docs.mathjax.org/en/latest/index.html) on the web. Gollum uses the `TeX-AMS-MML_HTMLorMML` config with the `autoload-all` extension.

-Page files may contain mathematic equations in TeX syntax that will be nicely
-typeset into the expected output. A block-style equation is delimited by `\[`
-and `\]`. For example:
+Inline math:

-    \[ P(E) = {n \choose k} p^k (1-p)^{ n-k} \]
+- $2^2$
+- `\\(2^2\\)`

-Inline equations are delimited by `\(` and `\)`. These equations will appear
-inline with regular text. For example:
+Display math:

-    The Pythagorean theorem is \( a^2 + b^2 = c^2 \).
-
-### INSTALLATION REQUIREMENTS
-
-In order to get the mathematical equations rendering to work, you need the following binaries:
-
-* LaTex, TeTex or MacTex/BasicTeX (pdflatex)
-* Netpbm (pnmcrop, pnmpad, pnmscale, ppmtopgm, pnmgamma, pnmtopng)
-* Ghostscript (gs)
+- $$2^2$$
+- [2^2]

 ## SEQUENCE DIAGRAMS

@@ -362,10 +381,10 @@ You may imbed sequence diagrams into your wiki page (rendered by
 [WebSequenceDiagrams](http://www.websequencediagrams.com) by using the
 following syntax:

-    {{{ blue-modern
+    {{{{{{ blue-modern
      alice->bob: Test
      bob->alice: Test response
-    }}}
+    }}}}}}

 You can replace the string "blue-modern" with any supported style.

@@ -392,6 +411,17 @@ By default, internal wiki links are all absolute from the root. To specify a dif

    wiki = Gollum::Wiki.new("my-gollum-repo.git", :base_path => "/wiki")

+Note that base_path just modifies the links. To map gollum to a non-root location:
+
+- Use the gollum binary: `gollum path/to/wiki --base-path mywiki`
+- Define config.ru with `map`. See [#532](https://github.com/github/gollum/issues/532) for an example.
+
+> :base_path     - String base path for all Wiki links.
+>
+> The String base path to prefix to internal links. For example, when set
+> to "/wiki", the page "Hobbit" will be linked as "/wiki/Hobbit". Defaults
+> to "/".
+
 Get the latest version of the given human or canonical page name:

    page = wiki.page('page-name')
@@ -497,9 +527,15 @@ like Rack::Auth, OmniAuth, etc.
    Precious::App.set(:wiki_options, {:universal_toc => false})
    run Precious::App

-## Windows Filename Validation
+Your Rack middleware can pass author details to Gollum in a Hash in the session under the 'gollum.author' key.
+
+## WINDOWS FILENAME VALIDATION
 Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details.

+## CONFIG FILE
+
+Gollum optionaly takes a `--config file`. See [config.rb](https://github.com/github/gollum/blob/master/config.rb) for an example.
+
 ## CONTRIBUTE

 If you'd like to hack on Gollum, start by forking my repo on GitHub:
@@ -520,15 +556,19 @@ your changes merged back into core is as follows:
 1. Send a pull request to the github/gollum project.

 ## RELEASING
+    x.y.z
+
+    For z releases:
+    $ rake bump
+    $ rake release
+
+    For x.y releases:
    Update VERSION in lib/gollum.rb
    $ rake gemspec
-    $ git tag vX.Y.Z
-    $ git push origin vX.Y.Z
-    $ gem build gollum.gemspec
-    $ gem push gollum-X.Y.Z.gem
+    $ rake release
    
 ## BUILDING THE GEM FROM MASTER
-    $ gem uninstall -ax gollum
+    $ gem uninstall -aIx gollum
    $ git clone https://github.com/github/gollum.git
    $ cd gollum
    gollum$ rake build
@@ -17,6 +17,27 @@ def version
  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end

+# assumes x.y.z all digit version
+def next_version
+  # x.y.z
+  v = version.split '.'
+  # bump z
+  v[-1] = v[-1].to_i + 1
+  v.join '.'
+end
+
+def bump_version
+  old_file = File.read("lib/#{name}.rb")
+  old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
+  new_version = next_version
+  # replace first match of old vesion with new version
+  old_file.sub!(old_version_line, "  VERSION = '#{new_version}'")
+
+  File.write("lib/#{name}.rb", old_file)
+
+  new_version
+end
+
 def date
  Date.today.to_s
 end
@@ -71,7 +92,14 @@ end
 #
 #############################################################################

-
+desc "Update version number and gemspec"
+task :bump do
+  puts "Updated version to #{bump_version}"
+  # Execute does not invoke dependencies.
+  # Manually invoke gemspec then validate.
+  Rake::Task[:gemspec].execute
+  Rake::Task[:validate].execute
+end

 #############################################################################
 #
@@ -86,6 +114,7 @@ task :release => :build do
    exit!
  end
  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git pull"
  sh "git tag v#{version}"
  sh "git push origin master"
  sh "git push origin v#{version}"
@@ -117,7 +146,7 @@ task :gemspec => :validate do
    split("\n").
    sort.
    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    reject { |file| file =~ /^(rdoc|pkg|test|Home\.md)/ }.
    map { |file| "    #{file}" }.
    join("\n")

@@ -139,4 +168,4 @@ task :validate do
    puts "A `VERSION` file at root level violates Gem best practices."
    exit!
  end
-end
+end
@@ -66,7 +66,15 @@ opts = OptionParser.new do |opts|
  end

  opts.on("--mathjax", "Enables mathjax.") do
-    options['mathjax'] = true
+    wiki_options[:mathjax] = true
+  end
+
+  opts.on("--show-all", "Shows all files in file view. By default only valid pages are shown.") do
+    wiki_options[:show_all] = true
+  end
+
+  opts.on("--collapse-tree", "Collapse file view tree. By default, expanded tree is shown.") do
+    wiki_options[:collapse_tree] = true
  end
 end

@@ -141,5 +149,31 @@ else
    require cfg
  end

-  Precious::App.run!(options)
+  base_path = wiki_options[:base_path]
+
+  if wiki_options[:base_path].nil?
+    Precious::App.run!(options)
+  else
+    require 'rack'
+
+    class MapGollum
+      def initialize base_path
+        @mg = Rack::Builder.new do
+          map '/' do
+            run Proc.new { [ 302, {'Location'=> "/#{base_path}" }, [] ] }
+          end
+
+          map "/#{base_path}" do
+            run Precious::App
+          end
+        end
+      end
+
+      def call(env)
+        @mg.call(env)
+      end
+    end
+    # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
+    Rack::Server.new(:app => MapGollum.new(base_path), :Port => options['port']).start
+  end
 end
@@ -0,0 +1,28 @@
+# Example gollum config
+# gollum ../wiki --config config.rb
+#
+# or run from source with
+#
+# bundle exec bin/gollum ../wiki/ --config config.rb
+
+# Remove const to avoid
+# warning: already initialized constant FORMAT_NAMES
+#
+# only remove if it's defined.
+# constant Gollum::Page::FORMAT_NAMES not defined (NameError)
+Gollum::Page.send :remove_const, :FORMAT_NAMES if defined? Gollum::Page::FORMAT_NAMES
+# limit to one format
+Gollum::Page::FORMAT_NAMES = { :markdown  => "Markdown" }
+
+=begin
+Valid formats are:
+{ :markdown  => "Markdown",
+  :textile   => "Textile",
+  :rdoc      => "RDoc",
+  :org       => "Org-mode",
+  :creole    => "Creole",
+  :rest      => "reStructuredText",
+  :asciidoc  => "AsciiDoc",
+  :mediawiki => "MediaWiki",
+  :pod       => "Pod" }
+=end
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
  s.required_ruby_version = ">= 1.8.7"

  s.name              = 'gollum'
-  s.version           = '2.1.10'
-  s.date              = '2012-08-30'
+  s.version           = '2.3.8'
+  s.date              = '2012-11-07'
  s.rubyforge_project = 'gollum'

  s.summary     = "A simple, Git-powered wiki."
@@ -23,35 +23,37 @@ Gem::Specification.new do |s|
  s.rdoc_options = ["--charset=UTF-8"]
  s.extra_rdoc_files = %w[README.md LICENSE]

-  s.add_dependency('grit', "~> 2.5.0")
-  s.add_dependency('github-markup', [">= 0.7.0", "< 1.0.0"])
-  s.add_dependency('github-markdown')
-  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")
-  s.add_dependency('nokogiri', "~> 1.4")
-  s.add_dependency('useragent', "~> 0.4.9")
-  s.add_dependency('stringex', "~> 1.4.0")
+  s.add_dependency('grit', '~> 2.5.0')
+  s.add_dependency('github-markup', ['>= 0.7.4', '< 1.0.0'])
+  s.add_dependency('github-markdown', '~> 0.5.1')
+  s.add_dependency('pygments.rb', '~> 0.3.2')
+  s.add_dependency('sinatra', '~> 1.3.3')
+  s.add_dependency('mustache', ['>= 0.99.4', '< 1.0.0'])
+  s.add_dependency('sanitize', '~> 2.0.3')
+  s.add_dependency('nokogiri', '~> 1.5.5')
+  s.add_dependency('useragent', '~> 0.4.12')
+  s.add_dependency('stringex', '~> 1.4.0')

-  s.add_development_dependency('RedCloth')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('org-ruby', '~> 0.7.0')
-  s.add_development_dependency('shoulda')
-  s.add_development_dependency('rack-test')
-  s.add_development_dependency('wikicloth', '~>0.8.0')
-  s.add_development_dependency('rake', '~> 0.9.2')
+  s.add_development_dependency('RedCloth', '~> 4.2.9')
+  s.add_development_dependency('mocha', '~> 0.12.7')
+  s.add_development_dependency('org-ruby', '~> 0.7.2')
+  s.add_development_dependency('shoulda', '~> 3.3.1')
+  s.add_development_dependency('rack-test', '~> 0.6.2')
+  s.add_development_dependency('wikicloth', '~> 0.8.0')
+  s.add_development_dependency('rake', '~> 0.9')
+  s.add_development_dependency('pry', '~> 0.9.10')
+  # required by pry
+  s.add_development_dependency('rb-readline', '~> 0.4.2')

  # = MANIFEST =
  s.files = %w[
    Gemfile
    HISTORY.md
-    Home.md
    LICENSE
    README.md
    Rakefile
    bin/gollum
+    config.rb
    docs/sanitization.md
    gollum.gemspec
    lib/gollum.rb
@@ -94,6 +96,7 @@ Gem::Specification.new do |s|
    lib/gollum/frontend/public/gollum/javascript/mousetrap.min.js
    lib/gollum/frontend/public/gollum/livepreview/css/custom.css
    lib/gollum/frontend/public/gollum/livepreview/images/cancel_24.png
+    lib/gollum/frontend/public/gollum/livepreview/images/globe_24.png
    lib/gollum/frontend/public/gollum/livepreview/images/lr_24.png
    lib/gollum/frontend/public/gollum/livepreview/images/save_24.png
    lib/gollum/frontend/public/gollum/livepreview/images/savecomment_24.png
@@ -426,6 +429,7 @@ Gem::Specification.new do |s|
    lib/gollum/frontend/public/gollum/livepreview/licenses/retina_display_icon_set/by_sa_3.0_unported_legalcode.txt
    lib/gollum/frontend/public/gollum/livepreview/licenses/sizzle/LICENSE.txt
    lib/gollum/frontend/public/gollum/livepreview/licenses/sundown/sundown.txt
+    lib/gollum/frontend/public/gollum/livepreview/licenses/templarian_windowsicons/license.txt
    lib/gollum/frontend/public/gollum/livepreview/readme.md
    lib/gollum/frontend/templates/compare.mustache
    lib/gollum/frontend/templates/create.mustache
@@ -453,165 +457,18 @@ Gem::Specification.new do |s|
    lib/gollum/frontend/views/pages.rb
    lib/gollum/frontend/views/search.rb
    lib/gollum/git_access.rb
+    lib/gollum/gitcode.rb
    lib/gollum/markup.rb
    lib/gollum/page.rb
    lib/gollum/pagination.rb
    lib/gollum/sanitization.rb
-    lib/gollum/tex.rb
    lib/gollum/web_sequence_diagram.rb
    lib/gollum/wiki.rb
    licenses/css_tree_menu_thecssninja/license.txt
    licenses/licenses.txt
    licenses/unity_asset_pool/COPYRIGHT
    templates/formatting.html
-    test/examples/empty.git/HEAD
-    test/examples/empty.git/config
-    test/examples/empty.git/description
-    test/examples/empty.git/hooks/applypatch-msg.sample
-    test/examples/empty.git/hooks/commit-msg.sample
-    test/examples/empty.git/hooks/post-commit.sample
-    test/examples/empty.git/hooks/post-receive.sample
-    test/examples/empty.git/hooks/post-update.sample
-    test/examples/empty.git/hooks/pre-applypatch.sample
-    test/examples/empty.git/hooks/pre-commit.sample
-    test/examples/empty.git/hooks/pre-rebase.sample
-    test/examples/empty.git/hooks/prepare-commit-msg.sample
-    test/examples/empty.git/hooks/update.sample
-    test/examples/empty.git/info/exclude
-    test/examples/empty.git/objects/info/.gitkeep
-    test/examples/empty.git/objects/pack/.gitkeep
-    test/examples/empty.git/refs/heads/.gitkeep
-    test/examples/lotr.git/COMMIT_EDITMSG
-    test/examples/lotr.git/HEAD
-    test/examples/lotr.git/ORIG_HEAD
-    test/examples/lotr.git/config
-    test/examples/lotr.git/description
-    test/examples/lotr.git/index
-    test/examples/lotr.git/info/exclude
-    test/examples/lotr.git/logs/HEAD
-    test/examples/lotr.git/logs/refs/heads/master
-    test/examples/lotr.git/objects/06/131480411710c92a82fe2d1e76932c70feb2e5
-    test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44
-    test/examples/lotr.git/objects/0d/c9016ca928c78d5421a99a53b379b53929221e
-    test/examples/lotr.git/objects/0e/d8cbe0a25235bd867e65193c7d837c66b328ef
-    test/examples/lotr.git/objects/12/629d666c5e3178f82f533f543d61b53dc78c0b
-    test/examples/lotr.git/objects/1c/79ddc69707f7b164bc2ea58beb5d8965ff6bd0
-    test/examples/lotr.git/objects/1d/b89ebba7e2c14d93b94ff98cfa3708a4f0d4e3
-    test/examples/lotr.git/objects/24/49c2681badfd3c189e8ed658dacffe8ba48fe5
-    test/examples/lotr.git/objects/25/4bdc1ba27d8b8a794538a8522d9a2b56ec2dd9
-    test/examples/lotr.git/objects/27/680b0fce1abfbc528e7aa53d92645852d52eb6
-    test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad
-    test/examples/lotr.git/objects/45/3b250f979c7bd6dfb62640c944c982ae6721ee
-    test/examples/lotr.git/objects/45/f319ee12f2b551b901b22e72602963c366fff1
-    test/examples/lotr.git/objects/46/a697caf435815bb07bbce947fc2d58be15f087
-    test/examples/lotr.git/objects/4c/45c2b4e297a726c3d3f66886f35373e48fe1c5
-    test/examples/lotr.git/objects/4e/023f460ce466e154ca09d8774c79ad5a53fc15
-    test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa
-    test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b
-    test/examples/lotr.git/objects/62/9aa678272b017a4d136d35e77ac94d80b08dc2
-    test/examples/lotr.git/objects/6e/48abfc56565574859e081ee58eae655d48cf71
-    test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f
-    test/examples/lotr.git/objects/7b/60c5a20a501a70f2317fa0ef763e1e2ce22d6b
-    test/examples/lotr.git/objects/7d/981cd984ad589e3cf00d8122170c6f7d685979
-    test/examples/lotr.git/objects/84/0ec5b1ba1320e8ec443f28f99566f615d5af10
-    test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675
-    test/examples/lotr.git/objects/94/523d7ae48aeba575099dd12926420d8fd0425d
-    test/examples/lotr.git/objects/94/9a9cc3119b9c98817f375e976d2bb5e2a42809
-    test/examples/lotr.git/objects/96/97dc65e095658bbd1b8e8678e08881e86d32f1
-    test/examples/lotr.git/objects/9b/e95b960ac388d4e7db55f610f828e9c31344e6
-    test/examples/lotr.git/objects/a3/1ca2a7c352c92531a8b99815d15843b259e814
-    test/examples/lotr.git/objects/a6/59b3763b822dd97544621fd0beef162ea37b14
-    test/examples/lotr.git/objects/a8/ad3c09dd842a3517085bfadd37718856dee813
-    test/examples/lotr.git/objects/aa/b61fe89d56f8614c0a8151da34f939dcedfa68
-    test/examples/lotr.git/objects/b0/de6e794dfdc7ef3400e894225bfe23308aae5c
-    test/examples/lotr.git/objects/b1/6b3d9fad9d78e5a669e7f33d94c96da374eccd
-    test/examples/lotr.git/objects/bc/4b5fc0ce2c2ba3acef6647e4f67256ee45ab60
-    test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05
-    test/examples/lotr.git/objects/c9/6a7645db5d4c76389e77cd103ef3ed77d81e4c
-    test/examples/lotr.git/objects/ca/7355dc497e9729fbaf0c0e3f424b86afef5614
-    test/examples/lotr.git/objects/cf/ea406f5f77afc7fb673a43e97721234385b1bd
-    test/examples/lotr.git/objects/d5/29304506d37f544675244c335d85cab5d29966
-    test/examples/lotr.git/objects/dc/596d6b2dd89ab05c66f4abd7d5eb706bc17f19
-    test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83
-    test/examples/lotr.git/objects/f4/84ebb1f40f8eb20d1bcd8d1d71934d2b8ae961
-    test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465
-    test/examples/lotr.git/objects/fb/c5dd7d807707b4a0a97c1182fecfef1eced5df
-    test/examples/lotr.git/objects/fc/3eee516ff72dc9099ba00d4611eb02e5c9e634
-    test/examples/lotr.git/objects/ff/6f7de62644369380ba73b4e4297c1a2d6f0b66
-    test/examples/lotr.git/objects/info/packs
-    test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.idx
-    test/examples/lotr.git/objects/pack/pack-dcbeaf3f6ff6c5eb08ea2b0a2d83626e8763546b.pack
-    test/examples/lotr.git/packed-refs
-    test/examples/lotr.git/refs/heads/master
-    test/examples/lotr.git/refs/remotes/origin/HEAD
-    test/examples/page_file_dir.git/COMMIT_EDITMSG
-    test/examples/page_file_dir.git/HEAD
-    test/examples/page_file_dir.git/config
-    test/examples/page_file_dir.git/description
-    test/examples/page_file_dir.git/index
-    test/examples/page_file_dir.git/info/exclude
-    test/examples/page_file_dir.git/logs/HEAD
-    test/examples/page_file_dir.git/logs/refs/heads/master
-    test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf
-    test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e
-    test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
-    test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
-    test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2
-    test/examples/page_file_dir.git/refs/heads/master
-    test/examples/revert.git/COMMIT_EDITMSG
-    test/examples/revert.git/HEAD
-    test/examples/revert.git/config
-    test/examples/revert.git/description
-    test/examples/revert.git/index
-    test/examples/revert.git/info/exclude
-    test/examples/revert.git/logs/HEAD
-    test/examples/revert.git/logs/refs/heads/master
-    test/examples/revert.git/objects/10/2685c42018f802557f05db171f44443e8dacab
-    test/examples/revert.git/objects/20/2ced67cea93c7b6bd2928aa1daef8d1d55a20d
-    test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9
-    test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708
-    test/examples/revert.git/objects/8e/83f898e5e16ae400db59dda1017acad540f3aa
-    test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc
-    test/examples/revert.git/objects/ed/6c9f63b98acf73c25b5ffbb38da557d3682023
-    test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433
-    test/examples/revert.git/objects/info/packs
-    test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.idx
-    test/examples/revert.git/objects/pack/pack-a561f8437234f74d0bacb9e0eebe52d207f5770d.pack
-    test/examples/revert.git/packed-refs
-    test/examples/revert.git/refs/heads/master
-    test/examples/revert.git/refs/remotes/origin/HEAD
-    test/examples/yubiwa.git/HEAD
-    test/examples/yubiwa.git/config
-    test/examples/yubiwa.git/description
-    test/examples/yubiwa.git/info/exclude
-    test/examples/yubiwa.git/objects/10/fa2ddc4e3b4009d8a453aace10bd6148c1ad00
-    test/examples/yubiwa.git/objects/52/4b82874327ea7cbf730389964ba7cb3de966de
-    test/examples/yubiwa.git/objects/58/3fc201cb457fb3f1480f3e1e5999b119633835
-    test/examples/yubiwa.git/objects/87/bc1dd46ab3d3874d4e898d45dd512cc20a7cc8
-    test/examples/yubiwa.git/objects/89/64ed1b4e21aa90e831763bbce9034bfda81b70
-    test/examples/yubiwa.git/objects/9f/f6dd0660da5fba2d3374adb2b84fa653bb538b
-    test/examples/yubiwa.git/objects/ac/e97abf2b177815a1972d7db22f229f58c83309
-    test/examples/yubiwa.git/objects/b1/f443863a4816628807fbf86141ebef055dda34
-    test/examples/yubiwa.git/refs/heads/master
-    test/file_view/1_file.txt
-    test/file_view/1_file_1_folder.txt
-    test/file_view/1_folder.txt
-    test/file_view/2_files_2_folders.txt
-    test/file_view/2_files_2_folders_1_root.txt
-    test/file_view/nested_folders.txt
-    test/helper.rb
-    test/test_app.rb
-    test/test_app_helpers.rb
-    test/test_committer.rb
-    test/test_file.rb
-    test/test_file_view.rb
-    test/test_git_access.rb
-    test/test_markup.rb
-    test/test_page.rb
-    test/test_page_revert.rb
-    test/test_pages_view.rb
-    test/test_unicode.rb
-    test/test_wiki.rb
+    templates/helper_wiki.rb
  ]
  # = MANIFEST =

@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 # stdlib
 require 'digest/md5'
 require 'ostruct'
@@ -18,12 +19,11 @@ require File.expand_path('../gollum/file', __FILE__)
 require File.expand_path('../gollum/file_view', __FILE__)
 require File.expand_path('../gollum/markup', __FILE__)
 require File.expand_path('../gollum/sanitization', __FILE__)
-require File.expand_path('../gollum/tex', __FILE__)
 require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
 require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)

 module Gollum
-  VERSION = '2.1.10'
+  VERSION = '2.3.8'

  def self.assets_path
    ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  class BlobEntry
    # Gets the String SHA for this blob.
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  # Responsible for handling the commit process for a Wiki.  It sets up the
  # Git index, provides methods for modifying the tree, and stores callbacks
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  class File
    Wiki.file_class = self
@@ -13,6 +14,22 @@ module Gollum
      @path = nil
    end

+    # Public: The url path required to reach this page within the repo.
+    #
+    # Returns the String url_path
+    def url_path
+      path = self.path
+      path = path.sub(/\/[^\/]+$/, '/') if path.include?('/')
+      path
+    end
+
+    # Public: The url_path, but CGI escaped.
+    #
+    # Returns the String url_path
+    def escaped_url_path
+      CGI.escape(self.url_path).gsub('%2F','/')
+    end
+
    # Public: The on-disk filename of the file.
    #
    # Returns the String name.
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
 =begin
  FileView requires that:
@@ -5,8 +6,13 @@ module Gollum
    - Then all the folders are sorted and processed
 =end
  class FileView
-    def initialize pages
+    # common use cases:
+    # set pages to wiki.pages and show_all to false
+    # set pages to wiki.pages + wiki.files and show_all to true
+    def initialize pages, options = {}
      @pages = pages
+      @show_all = options[:show_all] || false
+      @checked = options[:collapse_tree] ? '' : "checked"
    end

    def enclose_tree string
@@ -26,7 +32,7 @@ module Gollum
    def new_sub_folder path
      <<-HTML
      <li>
-        <label>#{path}</label> <input type="checkbox" checked />
+        <label>#{path}</label> <input type="checkbox" #{@checked} />
        <ol>
      HTML
    end
@@ -39,7 +45,16 @@ module Gollum
    end

    def url_for_page page
-      url = ::File.join(::File.dirname(page.path), page.filename_stripped)
+      url = ''
+      if @show_all
+        # Remove ext for valid pages.
+        filename = page.filename
+        filename = Page::valid_page_name?(filename) ? filename.chomp(::File.extname(filename)) : filename
+
+        url = ::File.join(::File.dirname(page.path), filename)
+      else
+        url = ::File.join(::File.dirname(page.path), page.filename_stripped)
+      end
      url = url[2..-1] if url[0,2] == './'
      url
    end
@@ -74,7 +89,7 @@ module Gollum
        url  = url_for_page page
        html += <<-HTML
        <li>
-          <label>#{::File.dirname(page.path)}</label> <input type="checkbox" checked />
+          <label>#{::File.dirname(page.path)}</label> <input type="checkbox" #{@checked} />
          <ol>
            <li class="file"><a href="#{url}">#{name}</a></li>
         </ol>
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 require 'cgi'
 require 'sinatra'
 require 'gollum'
@@ -82,17 +83,12 @@ module Precious

    before do
      @base_url = url('/', false).chomp('/')
-      settings.wiki_options.merge!({ :base_path => @base_url }) unless settings.wiki_options.has_key? :base_path
+      # above will detect base_path when it's used with map in a config.ru
+      settings.wiki_options.merge!({ :base_path => @base_url })
    end

    get '/' do
-      redirect File.join(settings.wiki_options[:base_path].to_s, 'Home')
-    end
-
-    # Removes all slashes from the start of string.
-    def clean_url url
-      return url if url.nil?
-      url.gsub('%2F','/').gsub(/^\/+/,'')
+      redirect ::File.join(@base_url, 'Home')
    end

    # path is set to name if path is nil.
@@ -151,6 +147,7 @@ module Precious
      page_name = CGI.unescape(params[:page])
      wiki      = wiki_new
      page      = wiki.paged(page_name, path, exact = true)
+      return if page.nil?
      rename    = params[:rename].to_url if params[:rename]
      name      = rename || page.name
      committer = Gollum::Committer.new(wiki, commit_message)
@@ -192,17 +189,20 @@ module Precious

    post '/create' do
      name         = params[:page].to_url
-      path         = sanitize_empty_params(params[:path])
-      path = '' if path.nil?
+      path         = sanitize_empty_params(params[:path]) || ''
      format       = params[:format].intern

+      # ensure pages are created in page_file_dir
+      page_dir = settings.wiki_options[:page_file_dir].to_s
+      path = clean_url(::File.join(page_dir, path)) unless path.start_with?(page_dir)
+
      # write_page is not directory aware so use wiki_options to emulate dir support.
      wiki_options = settings.wiki_options.merge({ :page_file_dir => path })
      wiki         = Gollum::Wiki.new(settings.gollum_path, wiki_options)

      begin
        wiki.write_page(name, format, params[:content], commit_message)
-        redirect to("/#{clean_url(CGI.escape(::File.join(path,name)))}")
+        redirect to("/#{clean_url(::File.join(path,name))}")
      rescue Gollum::DuplicatePageError => e
        @message = "Duplicate page: #{e.message}"
        mustache :error
@@ -282,12 +282,6 @@ module Precious
      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
@@ -312,7 +306,8 @@ module Precious
    get '/search' do
      @query = params[:q]
      wiki = wiki_new
-      @results = wiki.search @query
+      # Sort wiki search results by count (desc) and then by name (asc)
+      @results = wiki.search(@query).sort{ |a, b| (a[:count] <=> b[:count]).nonzero? || b[:name] <=> a[:name] }.reverse
      @name = @query
      mustache :search
    end
@@ -327,13 +322,21 @@ module Precious
      wiki_options = settings.wiki_options.merge({ :page_file_dir => @path })
      wiki         = Gollum::Wiki.new(settings.gollum_path, wiki_options)
      @results     = wiki.pages
+      @results     += wiki.files if settings.wiki_options[:show_all]
      @ref         = wiki.ref
      mustache :pages
    end

    get '/fileview' do
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @results = Gollum::FileView.new(wiki.pages).render_files
+      wiki = wiki_new
+      options = settings.wiki_options
+      content = wiki.pages
+      # if showing all files include wiki.files
+      content += wiki.files if options[:show_all]
+
+      # must pass wiki_options to FileView
+      # --show-all and --collapse-tree can be set.
+      @results = Gollum::FileView.new(content, options).render_files
      @ref = wiki.ref
      mustache :file_view, { :layout => false }
    end
@@ -344,10 +347,11 @@ module Precious

    def show_page_or_file(fullpath)
      name         = extract_name(fullpath)
-      path         = extract_path(fullpath)
+      path         = extract_path(fullpath) || '/'
      wiki         = wiki_new

-      path = '/' if path.nil?
+      page_dir = settings.wiki_options[:page_file_dir].to_s
+      path = ::File.join(page_dir, path) unless path.start_with?(page_dir)

      if page = wiki.paged(name, path, exact = true)
        @page = page
@@ -375,8 +379,19 @@ module Precious
      wiki.update_page(page, name, format, content.to_s, commit)
    end

+    private
+
+    # Options parameter to Gollum::Committer#initialize
+    #     :message   - The String commit message.
+    #     :name      - The String author full name.
+    #     :email     - The String email address.
+    # message is sourced from the incoming request parameters
+    # author details are sourced from the session, to be populated by rack middleware ahead of us
    def commit_message
-      { :message => params[:message] }
+      commit_message = { :message => params[:message] }
+      author_parameters = session['gollum.author']
+      commit_message.merge! author_parameters unless author_parameters.nil?
+      commit_message
    end
  end
 end
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Precious
  module Helpers
    # Extract the path string that Gollum::Wiki expects
@@ -17,5 +18,19 @@ module Precious
    def sanitize_empty_params(param)
      [nil,''].include?(param) ? nil : CGI.unescape(param)
    end
+
+    # Remove all slashes from the start of string.
+    # Remove all double slashes
+    def clean_url url
+      return url if url.nil?
+      url.gsub('%2F','/').gsub(/^\/+/,'').gsub('//','/')
+    end
+
+    def trim_leading_slash url
+      return url if url.nil?
+      url.gsub!('%2F','/')
+      return '/' + url.gsub(/^\/+/,'') if url[0,1] == '/'
+      url
+    end
  end
 end
@@ -196,7 +196,9 @@
            LanguageDefinition.getHookFunctionFor("activate")();
          }

-          function hotkey( cmd ) {
+          function hotkey( e, cmd ) {
+            e.preventDefault();
+
            var def = LanguageDefinition.getDefinitionFor( cmd );
            if ( typeof def == 'object' ) {
              FunctionBar.executeAction( def );
@@ -205,8 +207,17 @@
            return false;
          }

-          Mousetrap.bind(['command+b', 'ctrl+b'], function(){ hotkey('function-bold'); });
-          Mousetrap.bind(['command+i', 'ctrl+i'], function(){ hotkey('function-italic'); });
+          Mousetrap.bind(['command+1', 'ctrl+1'], function( e ){ hotkey( e, 'function-h1' ); });
+          Mousetrap.bind(['command+2', 'ctrl+2'], function( e ){ hotkey( e, 'function-h2' ); });
+          Mousetrap.bind(['command+3', 'ctrl+3'], function( e ){ hotkey( e, 'function-h3' ); });
+          Mousetrap.bind(['command+b', 'ctrl+b'], function( e ){ hotkey( e, 'function-bold' ); });
+          Mousetrap.bind(['command+i', 'ctrl+i'], function( e ){ hotkey( e, 'function-italic' ); });
+          Mousetrap.bind(['command+s', 'ctrl+s'], function( e ){
+            e.preventDefault();
+            $("#gollum-editor-submit").trigger("click");
+            return false;
+          });
+
        } );
      } else {
        LanguageDefinition._ACTIVE_LANG = name;
@@ -212,4 +212,20 @@ $(document).ready(function() {
      $('#gollum-revert-form').submit();
    });
  }
+
+  if( $('#wiki-wrapper.edit').length ){
+    $("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
+    $("#gollum-editor-body").one('change', function(){
+      window.onbeforeunload = function(){ return "Leaving will discard all edits!" };
+    });
+    $.GollumEditor();
+  }
+
+  if( $('#wiki-wrapper.create').length ){
+    $("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
+    $("#gollum-editor-body").one('change', function(){
+      window.onbeforeunload = function(){ return "Leaving will not create a new page!" };
+    )};
+    $.GollumEditor({ NewFile: true, MarkupType: '{{default_markup}}' });
+  }
 });
@@ -11,6 +11,7 @@
 <div id='previewframe'><div id='contentframe' class='markdown-body'></div></div>
 <!-- tool panel from notepage.es. save & savecomment icons from Retina Display Icon Set. -->  
 <div id='toolpanel' class='toolpanel edit' style='width: 500px; right: 0px; visibility: hidden;'>
+  <a id='preview' class='edit'><img src='images/globe_24.png' alt='Preview' title='Preview'></a>
  <a id='save' class='edit'><img src='images/save_24.png' alt='Save' title='Save'></a>
  <a id='savecomment' class='edit'><img src='images/savecomment_24.png' alt='Save with comment' title='Save with comment'></a>
  <a id='toggle' class='edit' href='javascript:void(0)' onclick='jsm.toggleLeftRight();'><img src='images/lr_24.png' alt='Toggle left to right' title='Toggle left to right'></a>
@@ -39,11 +40,5 @@ var require = {
 <script src='js/sundown.js'></script>
 <script src='js/md_sundown.js'></script>
 <script src='js/livepreview.js'></script>
-<!--<script>(function(d,j){
-j = d.createElement('script');
-j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
-(d.head || d.getElementsByTagName('head')[0]).appendChild(j);
-}(document));
-</script>-->
 </body>
 </html>
@@ -87,6 +87,18 @@ defaultCommitMessage = function() {
 // Set comment using the default commit message.
 commentEditorSession.setValue( defaultCommitMessage() );

+$.preview = function( previewWindow ) {
+    jQuery.ajax( {
+      type: 'POST',
+      url: baseUrl + '/preview',
+      data: { page: 'Preview: ' + pageName, format: 'markdown', content: editorSession.getValue() },
+      success: function( html ) {
+        previewWindow.document.write( html );
+        previewWindow.focus();
+      }
+    });
+}
+
 $.save = function( commitMessage ) {
  win.onbeforeunload = null;

@@ -96,8 +108,9 @@ $.save = function( commitMessage ) {
  var msg = defaultCommitMessage();
  var newLocation = baseUrl;

+  // Remove all duplicate slashes
  function clean( str ) {
-    return str.replace(/^\/+/, '/');
+    return str.replace(/\/+/g, '/');
  }

  // 'a%2Fb' => a/b
@@ -194,13 +207,14 @@ var previewSet = function( text ) {
  }
 };

-// 'c', 'c++', 'cpp' are github specific and transformed to c_cpp for Ace.
-var languages = [ 'c', 'c++', 'cpp', 'clojure', 'coffee', 'coldfusion',
- 'csharp', 'css', 'diff', 'golang', 'groovy', 'haxe', 'html',
- 'java', 'javascript', 'json', 'latex', 'less', 'liquid',
- 'lua', 'markdown', 'ocaml', 'perl', 'pgsql', 'php', 'powershell',
- 'python', 'ruby', 'scad', 'scala', 'scss', 'sh', 'sql', 'svg',
- 'textile', 'text', 'xml', 'xquery', 'yaml' ];
+// See pygmentsLanguageToAceMode for pygment to ace mode translations.
+// TODO: Update languages and translation once Ace is upgraded to v1.0.
+var languages = [ 'c', 'c++', 'cpp', 'clojure', 'coffee',
+  'coffeescript', 'coldfusion', 'csharp', 'css', 'diff', 'golang',
+  'groovy', 'haxe', 'html', 'java', 'javascript', 'json', 'latex',
+  'less', 'liquid', 'lua', 'markdown', 'ocaml', 'perl', 'pgsql', 'php',
+  'powershell', 'python', 'ruby', 'scad', 'scala', 'scss', 'sh', 'sql',
+  'svg', 'textile', 'text', 'xml', 'xquery', 'yaml' ];

 var staticHighlight = require( 'ace/ext/static_highlight' );
 var githubTheme = require( 'ace/theme/github' );
@@ -243,6 +257,31 @@ function highlight( element, language ) {
  element.parentNode.parentNode.replaceChild( newDiv, element.parentNode );
 }

+// Pygments and Ace have different names for languages.
+function pygmentsLanguageToAceMode( declaredLanguage ) {
+  declaredLanguage = declaredLanguage.toLowerCase();
+
+  switch ( declaredLanguage ) {
+    case 'bash':
+      return 'sh';
+    case 'c':
+    case 'c++':
+    case 'cpp':
+    case 'objective-c':
+      return 'c_cpp';
+    case 'c#':
+      return 'csharp';
+    case 'coffeescript':
+      return 'coffee';
+    case 'html+erb':
+      return 'html'
+  }
+
+  // Assume language name is the same
+  // if it's not handled above.
+  return declaredLanguage;
+}
+
 var makePreviewHtml = function () {
  var text = editorSession.getValue();

@@ -269,8 +308,6 @@ var makePreviewHtml = function () {
  // Update the text using feature detection to support IE.
  // preview.innerHTML = text; // this doesn't work on IE.
  previewSet( text );
-  // MathJax is loaded asynchronously.
-  if (typeof MathJax != 'undefined') { MathJax.Hub.Typeset( content ); }

  // highlight code blocks.
  var codeElements = preview.getElementsByTagName( 'pre' );
@@ -295,15 +332,7 @@ var makePreviewHtml = function () {
      // the syntax for code highlighting means all code, even one line, contains newlines.
      if ( txt.length > 1 && codeHTML.match( /\n/ ) ) {
        var declaredLanguage = element.className.toLowerCase();
-        var aceMode = declaredLanguage;
-
-        // GitHub supports 'c', 'c++', 'cpp'
-        // which must trigger the 'c_cpp' mode in Ace.
-        if ( declaredLanguage === 'c'   ||
-             declaredLanguage === 'c++' ||
-             declaredLanguage === 'cpp' ) {
-          aceMode = 'c_cpp';
-        }
+        var aceMode = pygmentsLanguageToAceMode( declaredLanguage );

        if ( $.inArray( declaredLanguage, languages ) === -1 ) {
          // Unsupported language.
@@ -361,8 +390,16 @@ var applyTimeout = function () {
    });
  }

+  $( '#preview' ).click( function() {
+    $(this).target = "_blank";
+    // pass window into preview
+    $.preview( window.open() );
+    return false;
+  });
+
  $( '#save' ).click( function() {
    $.save();
+    return false;
  });

  // Hide dimmer, comment tool panel, and comment.
@@ -15,7 +15,10 @@ CC BY-SA 3.0 Unported
 http://blog.twg.ca/2010/11/retina-display-icon-set/
 http://creativecommons.org/licenses/by-sa/3.0/legalcode.txt

+  lib/gollum/frontend/public/images/savecomment_24.png
+  lib/gollum/frontend/public/images/cancel_24.png
  lib/gollum/frontend/public/images/save_24.png
+  lib/gollum/frontend/public/images/globe_24.png

 ---

@@ -57,3 +60,10 @@ http://www.thecssninja.com/css/css-tree-menu
 http://www.thecssninja.com/demo/license.txt

  lib/gollum/frontend/public/css/_styles.css
+
+---
+
+`lr_24.png` is a modified version of http://templarian.com/files/wp_icons/icons/light/appbar.arrow.right.left.png
+
+https://github.com/Templarian/WindowsIcons/blob/21189bffeb17237d444419ef43ed1b49e9f4e9f8/WindowsPhone/license.txt
+
@@ -0,0 +1,40 @@
+Read the license:
+http://creativecommons.org/licenses/by/3.0/ **
+
+Basicaly, use it anyway you want but include this license file in the source if your project is open source. Nothing is needed in the front facing project. Commercial use is not only allowed but encouraged. This pack was made to promote consistency in applications.
+
+Creator
+- Austin Andrews (@templarian)
+
+Contributor*
+- Oren Nachman
+  - appbar.chevron.down
+  - appbar.chevron.up
+  - appbar.chevron.left
+  - appbar.chevron.right
+- Kris Vandermotten (@kvandermotten)
+  - appbar.medical.pulse
+- Constantin Kichinsky (@kichinsky)
+  - appbar.currency.rubles
+  - appbar.currency.grivna
+- Massimo Savazzi (@msavazzi)
+  - List of missing exported icons
+- Proletkult Graphik, from The Noun Project
+  - appbar.draw.pen (inspired)
+- Olivier Guin, from The Noun Project
+  - appbar.draw.marker
+- Gibran Bisio, from The Noun Project
+  - appbar.draw.bucket
+
+* Developers and designers that emailed Templarian the source .design icons to be added into the package. PNGs also accepted, but may take longer to be added.
+
+
+Contact
+- http://templarian.com/
+- admin[@]templarian[.]com
+
+** Does not apply to copyrighted logos
+- Skype
+- Facebook
+- Twitter
+- etc...
@@ -1,4 +1,4 @@
-<div id="wiki-wrapper">
+<div id="wiki-wrapper" class="create">
 <div id="head">
  <h1>Create New Page</h1>
 </div>
@@ -8,13 +8,5 @@
  </div>
 </div>
 </div>
-<script type="text/javascript">
-window.onbeforeunload = function(){ return "Leaving will not create a new page!" };
-$("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
-
-jQuery(document).ready(function() {
-  $.GollumEditor({ NewFile: true, MarkupType: '{{default_markup}}' });
-});
-</script>

 {{something}}
@@ -10,11 +10,3 @@
 </div>
  <div id="wiki-content">{{>editor}}</div>
 </div>
-<script type="text/javascript">
-window.onbeforeunload = function(){ return "Leaving will discard all edits!" };
-$("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
-
-jQuery(document).ready(function() {
-  $.GollumEditor();
-});
-</script>
@@ -18,7 +18,17 @@
  <script type="text/javascript" src="{{base_url}}/javascript/gollum.dialog.js"></script>
  <script type="text/javascript" src="{{base_url}}/javascript/gollum.placeholder.js"></script>
  <script type="text/javascript" src="{{base_url}}/javascript/editor/gollum.editor.js"></script>
-  {{#mathjax}}<script>(function(d,j){
+  {{#mathjax}}
+  <script type="text/x-mathjax-config">
+  MathJax.Hub.Config({
+    tex2jax: {
+      inlineMath:  [ ['$','$'],   ['\\(','\\)']],
+      displayMath: [ ['$$','$$'], ['\[','\]'] ],
+      processEscapes: true
+    },
+    TeX: { extensions: ["autoload-all.js"] }});
+  </script>
+  <script>(function(d,j){
  j = d.createElement('script');
  j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
  (d.head || d.getElementsByTagName('head')[0]).appendChild(j);
@@ -1,3 +1,10 @@
+<script>
+Mousetrap.bind(['e'], function( e ) {
+  e.preventDefault();
+  window.location = "/edit" + window.location.pathname;
+  return false;
+});
+</script>
 <div id="wiki-wrapper" class="page">
 <div id="head">
  <h1>{{title}}</h1>
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  # Controls all access to the Git objects from Gollum.  Extend this class to
  # add custom caching for special cases.
@@ -0,0 +1,48 @@
+# ~*~ encoding: utf-8 ~*~
+require 'net/http'
+require 'net/https' # ruby 1.8.7 fix, remove at upgrade
+require 'uri'
+require 'open-uri'
+
+module Gollum
+  class Gitcode
+    def initialize path
+      raise(ArgumentError, 'path is nil or empty') if path.nil? or path.empty?
+
+      @uri = URI::HTTP.build({ 
+        :path   => self.unchomp(path), 
+        :host   => 'raw.github.com', 
+        :scheme => 'https',
+        :port   => 443 })
+    end
+
+    def contents
+      @contents ||= self.req @uri
+    end
+
+    def unchomp p
+      return p if p.nil?
+      p[0] == '/' ? p : ('/' + p)
+    end
+
+    def req uri, cut = 1
+      return "Too many redirects or retries" if cut >= 10
+      http = Net::HTTP.new uri.host, uri.port
+      http.use_ssl = true
+      resp = http.get uri.path, {
+        'Accept'        => 'text/plain',
+        'Cache-Control' => 'no-cache',
+        'Connection'    => 'keep-alive',
+        'Host'          => uri.host,
+        'User-Agent'    => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0'
+      }
+      code = resp.code.to_i
+      return resp.body if code == 200
+      return "Not Found" if code == 404
+      return "Unhandled Response Code #{code}" unless code == 304 or not resp.header['location'].nil?
+      loc = URI.parse resp.header['location']
+      uri2 = loc.relative?() ? (uri + loc) : loc # overloads (+)
+      return req uri2, (cut + 1)
+    end
+  end
+end
@@ -1,14 +1,20 @@
+# ~*~ encoding: utf-8 ~*~
 require 'digest/sha1'
 require 'cgi'
 require 'pygments'
 require 'base64'

+require File.expand_path '../frontend/helpers', __FILE__
+require File.expand_path '../gitcode', __FILE__
+
 # initialize Pygments
 Pygments.start

 module Gollum

  class Markup
+    include Precious::Helpers
+
    attr_accessor :toc
    attr_reader   :metadata

@@ -28,11 +34,11 @@ module Gollum
      @dir     = ::File.dirname(page.path)
      @tagmap  = {}
      @codemap = {}
-      @texmap  = {}
      @wsdmap  = {}
      @premap  = {}
      @toc = nil
      @metadata = nil
+      @to_xml = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
    end

    # Render the content with Gollum wiki syntax on top of the file's own
@@ -50,8 +56,8 @@ module Gollum

      data = @data.dup
      data = extract_metadata(data)
+      data = extract_gitcode(data)
      data = extract_code(data)
-      data = extract_tex(data)
      data = extract_wsd(data)
      data = extract_tags(data)
      begin
@@ -70,12 +76,18 @@ module Gollum
      doc,toc = process_headers(doc)
      @toc = @sub_page ? ( @parent_page ? @parent_page.toc_data : "[[_TOC_]]" ) : toc
      yield doc if block_given?
-      data = doc.to_html
+      # nokogiri's save options are ored together. FORMAT has a value of 1 so ^ 1 removes it.
+      # formatting will create extra spaces in pre tags.
+      # https://github.com/sparklemotion/nokogiri/issues/782
+      # DEFAULT_HTML encodes unicode so XHTML is used for proper unicode support in href.
+      data = doc.to_xml( @to_xml )

      data = process_toc_tags(data)
-      data = process_tex(data)
      data = process_wsd(data)
-      data.gsub!(/<p><\/p>/, '')
+      data.gsub!(/<p><\/p>/) do
+        ''
+      end
+
      data
    end

@@ -87,16 +99,13 @@ module Gollum
    def process_headers(doc)
      toc = nil
      doc.css('h1,h2,h3,h4,h5,h6').each do |h|
-        id = encodeURIComponent(h.content.gsub(' ','-'))
+        # must escape "
+        h_name = h.content.gsub(' ','-').gsub('"','%22')
+
        level = h.name.gsub(/[hH]/,'').to_i

        # Add anchors
-        anchor = Nokogiri::XML::Node.new('a', doc)
-        anchor['class'] = 'anchor'
-        anchor['id'] = id
-        # % -> %25 so anchors work on Firefox. See issue #475
-        anchor['href'] = '#' + id.gsub('%', '%25')
-        h.add_child(anchor)
+        h.add_child(%Q{<a class="anchor" id="#{h_name}" href="##{h_name}"></a>})

        # Build TOC
        toc ||= Nokogiri::XML::DocumentFragment.parse('<div class="toc"><div class="toc-title">Table of Contents</div></div>')
@@ -114,68 +123,13 @@ module Gollum
        end
        node = Nokogiri::XML::Node.new('li', doc)
        # % -> %25 so anchors work on Firefox. See issue #475
-        node.add_child("<a href='##{id.gsub('%', '%25')}'>#{h.content}</a>")
+        node.add_child(%Q{<a href="##{h_name}">#{h.content}</a>})
        tail.add_child(node)
      end
-      toc = toc.to_xhtml if toc != nil
+      toc = toc.to_xml(@to_xml) if toc != nil
      [doc, toc]
    end

-    #########################################################################
-    #
-    # TeX
-    #
-    #########################################################################
-
-    # Extract all TeX into the texmap and replace with placeholders.
-    #
-    # data - The raw String data.
-    #
-    # Returns the placeholder'd String data.
-    def extract_tex(data)
-      data.gsub(/\\\[\s*(.*?)\s*\\\]/m) do
-        tag = CGI.escapeHTML($1)
-        id  = Digest::SHA1.hexdigest(tag)
-        @texmap[id] = [:block, tag]
-        id
-      end.gsub(/\\\(\s*(.*?)\s*\\\)/m) do
-        tag = CGI.escapeHTML($1)
-        id  = Digest::SHA1.hexdigest(tag)
-        @texmap[id] = [:inline, tag]
-        id
-      end
-    end
-
-    # Process all TeX from the texmap and replace the placeholders with the
-    # final markup.
-    #
-    # data - The String data (with placeholders).
-    #
-    # Returns the marked up String data.
-    def process_tex(data)
-      @texmap.each do |id, spec|
-        type, tex = *spec
-
-        # Obtain the formula with parameters
-        out = nil
-        begin 
-          width, height, align, base64 = Gollum::Tex.render_formula(tex, true)
-
-          # TODO: Should we load the binary inside the html?
-          #out = %{<img width="#{width}" height="#{height}" style="vertical-align: #{align}px;" src="data:image/png;base64,\n#{base64}" alt="#{CGI.escapeHTML(tex)}" />}
-
-          # Use the alignment values from the formula rendering but still use the call to '_tex.png'. Although it will call render_formula()
-          # again, it will use the already cached formula and it might have some advantages from the point of view of browser caching (really not sure here).
-          out = %{<img width="#{width}" height="#{height}" style="vertical-align: #{align}px;" src="#{::File.join(@wiki.base_path, '_tex.png')}?type=#{type}&data=#{Base64.encode64(tex).chomp}" alt="#{CGI.escapeHTML(tex)}" />}
-        rescue # In case of error
-          out = CGI.escapeHTML(tex)
-        end
-        
-        data.gsub!(id, out)
-      end
-      data
-    end
-
    #########################################################################
    #
    # Tags
@@ -226,9 +180,13 @@ module Gollum
      @tagmap.each do |id, tag|
        # If it's preformatted, just put the tag back
        if is_preformatted?(data, id)
-          data.gsub!(id, "[[#{tag}]]")
+          data.gsub!(id) do
+            "[[#{tag}]]"
+          end
        else
-          data.gsub!(id, process_tag(tag).gsub('%2F', '/'))
+          data.gsub!(id) do
+            process_tag(tag).gsub('%2F', '/')
+          end
        end
      end
      data
@@ -409,6 +367,12 @@ module Gollum
          presence  = "present"
        end
        link = ::File.join(@wiki.base_path, page ? page.escaped_url_path : CGI.escape(link_name))
+
+        # //page is invalid
+        # strip all duplicate forward slashes using helpers.rb trim_leading_slash
+        # //page => /page
+        link = trim_leading_slash link
+
        %{<a class="internal #{presence}" href="#{link}#{extra}">#{name}</a>}
      end
    end
@@ -420,7 +384,9 @@ module Gollum
    #
    # Returns the marked up String data.
    def process_toc_tags(data)
-      data.gsub!("[[_TOC_]]", @toc.nil? ? '' : @toc)
+      data.gsub!("[[_TOC_]]") do
+        @toc.nil? ? '' : @toc
+      end
      data
    end

@@ -465,6 +431,34 @@ module Gollum
      end
    end

+    #########################################################################
+    #
+    # Gitcode - fetch code from github search path and replace the contents
+    #           to a code-block that gets run the next parse.
+    #
+    #########################################################################
+
+    def extract_gitcode data
+      data.gsub /^[ \t]*``` ?([^:\n\r]+):([^`\n\r]+)```/ do
+        contents = ''
+        # Use empty string if $2 is nil.
+        uri = $2 || ''
+        # Detect local file.
+        if uri[0..6] != 'github/'
+          if uri[0..0] != '/' # relative file
+            contents = @wiki.page(uri).formatted_data
+          else # use full path
+            contents = @wiki.paged( extract_name( clean_url( uri ) ),
+             '/' + clean_url( extract_path( uri ) ) ).formatted_data
+          end
+        else
+          contents = Gollum::Gitcode.new(uri).contents
+        end
+
+        "```#{$1}\n#{contents}\n```\n"
+      end
+    end
+
    #########################################################################
    #
    # Code
@@ -477,6 +471,35 @@ module Gollum
    #
    # Returns the placeholder'd String data.
    def extract_code(data)
+      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)\r?$/m) do
+        m_indent = $1
+        m_start  = $2 # ~~~
+        m_lang   = $3
+        m_code   = $4
+        m_end    = $5 # ~~~
+
+        # start and finish tilde fence must be the same length
+        return '' if m_start.length != m_end.length
+
+        lang   = m_lang ? m_lang.strip : nil
+        id     = Digest::SHA1.hexdigest("#{lang}.#{m_code}")
+        cached = check_cache(:code, id)
+
+        # extract lang from { .ruby } or { #stuff .ruby .indent }
+        # see http://johnmacfarlane.net/pandoc/README.html#delimited-code-blocks
+
+        if lang
+            lang = lang.match(/\.([^}\s]+)/)
+            lang = lang[1] unless lang.nil?
+        end
+
+        @codemap[id] = cached   ?
+          { :output => cached } :
+          { :lang => lang, :code => m_code, :indent => m_indent }
+
+        "#{m_indent}#{id}" # print the SHA1 ID with the proper indentation
+      end
+
      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do
        lang   = $2 ? $2.strip : nil
        id     = Digest::SHA1.hexdigest("#{lang}.#{$3}")
@@ -497,7 +520,9 @@ module Gollum
    # regex     - A regex to match whitespace
    def remove_leading_space(code, regex)
      if code.lines.all? { |line| line =~ /\A\r?\n\Z/ || line =~ regex }
-        code.gsub!(regex, '')
+        code.gsub!(regex) do
+          ''
+        end
      end
    end

@@ -527,13 +552,15 @@ module Gollum
      blocks.each do |lang, code|
        encoding ||= 'utf-8'
        begin
-          hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s})
-        rescue ::RubyPython::PythonError
+          # must set startinline to true for php to be highlighted without <?
+          # http://pygments.org/docs/lexers/
+          hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s, :startinline => true})
+        rescue
          hl_code = code
        end
        highlighted << hl_code
      end
-      
+
      @codemap.each do |id, spec|
        body = spec[:output] || begin
          if (body = highlighted.shift.to_s).size > 0
@@ -543,7 +570,9 @@ module Gollum
            "<pre><code>#{CGI.escapeHTML(spec[:code])}</code></pre>"
          end
        end
-        data.gsub!(id, body)
+        data.gsub!(id) do
+          body
+        end
      end

      data
@@ -579,7 +608,9 @@ module Gollum
      @wsdmap.each do |id, spec|
        style = spec[:style]
        code = spec[:code]
-        data.gsub!(id, Gollum::WebSequenceDiagram.new(code, style).to_tag)
+        data.gsub!(id) do
+          Gollum::WebSequenceDiagram.new(code, style).to_tag
+        end
      end
      data
    end
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  class Page
    include Pagination
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  module Pagination
    def self.included(klass)
@@ -58,4 +59,4 @@ module Gollum
      self.class.log_pagination_options(options)
    end
  end
-end
+end
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  # Encapsulate sanitization options.
  #
@@ -1,366 +0,0 @@
-require 'fileutils'
-require 'shellwords'
-require 'tmpdir'
-require 'posix/spawn'
-require 'base64'
-
-module Gollum
-  module Tex
-    class Error < StandardError; end
-
-    extend POSIX::Spawn
-
-    Template = <<-EOS
-\\documentclass[11pt]{article}
-\\pagestyle{empty}
-\\setlength{\\topskip}{0pt}
-\\setlength{\\parindent}{0pt}
-\\setlength{\\abovedisplayskip}{0pt}
-\\setlength{\\belowdisplayskip}{0pt}
-
-\\usepackage{geometry}
-
-\\usepackage{amsfonts}
-\\usepackage{amsmath}
-
-\\newsavebox{\\snippetbox}
-\\newlength{\\snippetwidth}
-\\newlength{\\snippetheight}
-\\newlength{\\snippetdepth}
-\\newlength{\\pagewidth}
-\\newlength{\\pageheight}
-\\newlength{\\pagemargin}
-
-\\begin{lrbox}{\\snippetbox}%
-\$%s\$
-\\end{lrbox}
-
-\\settowidth{\\snippetwidth}{\\usebox{\\snippetbox}}
-\\settoheight{\\snippetheight}{\\usebox{\\snippetbox}}
-\\settodepth{\\snippetdepth}{\\usebox{\\snippetbox}}
-
-\\setlength\\pagemargin{4pt}
-
-\\setlength\\pagewidth\\snippetwidth
-\\addtolength\\pagewidth\\pagemargin
-\\addtolength\\pagewidth\\pagemargin
-
-\\setlength\\pageheight\\snippetheight
-\\addtolength{\\pageheight}{\\snippetdepth}
-\\addtolength\\pageheight\\pagemargin
-\\addtolength\\pageheight\\pagemargin
-
-\\newwrite\\foo
-\\immediate\\openout\\foo=\\jobname.dimensions
-  \\immediate\\write\\foo{snippetdepth = \\the\\snippetdepth}
-  \\immediate\\write\\foo{snippetheight = \\the\\snippetheight}
-  \\immediate\\write\\foo{snippetwidth = \\the\\snippetwidth}
-  \\immediate\\write\\foo{pagewidth = \\the\\pagewidth}
-  \\immediate\\write\\foo{pageheight = \\the\\pageheight}
-  \\immediate\\write\\foo{pagemargin = \\the\\pagemargin}
-\\closeout\\foo
-
-\\geometry{paperwidth=\\pagewidth,paperheight=\\pageheight,margin=\\pagemargin}
-
-\\begin{document}%
-\\usebox{\\snippetbox}%
-\\end{document}
-    EOS
-
-    class << self
-      attr_accessor :latex_path
-    end
-
-    self.latex_path   = 'pdflatex'
-
-    def self.check_dependencies!
-      return if @dependencies_available
-
-      if `which pdflatex` == ""
-        raise Error, "`pdflatex` command not found"
-      end
-
-      if `which gs` == ""
-        raise Error, "`gs` command not found"
-      end
-      
-      if `which pnmcrop` == ""
-        raise Error, "`pnmcrop` command not found"
-      end
-
-      if `which pnmpad` == ""
-        raise Error, "`pnmpad` command not found"
-      end
-
-      if `which pnmscale` == ""
-        raise Error, "`pnmscale` command not found"
-      end
-      
-      if `which ppmtopgm` == ""
-        raise Error, "`ppmtopgm` command not found"
-      end
-      
-      if `which pnmgamma` == ""
-        raise Error, "`pnmgamma` command not found"
-      end
-      
-      if `which pnmtopng` == ""
-        raise Error, "`pnmtopng` command not found"
-      end
-
-      @dependencies_available = true
-    end
-
-    # Render the formula and calculate the correct alignment
-    # for the image in the html. 
-    #
-    # This is a ruby implementation of the Perl version described 
-    # at http://tex.stackexchange.com/questions/44486/pixel-perfect-vertical-alignment-of-image-rendered-tex-snippets
-    #
-    # The main caveat is that rendering takes quite a bit of processing power,
-    # which can make the page load slowly if it has to render each time. 
-    # For this reason, the method caches the rendered formula in `/tmp` for reduced
-    # loading time in subsequent loads.
-    #   
-    # @param formula the tex formula to render
-    # @param with_properties, if true it returns an array with a base64
-    #   string with the image, and the alignment values for the image. 
-    #   Otherwise it returns the binary image.
-    def self.render_formula(formula, with_properties=false)
-      check_dependencies!
-
-      render_antialias_bits = 4
-        render_oversample = 4
-        display_oversample = 4
-        gamma = 0.3
-        if !with_properties
-            display_oversample = 1
-            gamma = 0.5
-        end
-
-        oversample = render_oversample * display_oversample
-        render_dpi = 96*1.2 * 72.27/72 * oversample # This is 1850.112 dpi.
-
-
-        # Cache rendered formula and returned cached version if it exists
-
-        # First look for the .cache directory in the home folder
-        cache_dir = ::File.expand_path("~/.cache") 
-        if not ::File.exists?(cache_dir) or not ::File.directory?(cache_dir)
-            ::Dir.mkdir(cache_dir)
-        end
-
-        # Check that the gollum directory exists inside the cache dir
-        cache_dir = ::File.join(cache_dir, "gollum")
-        if not ::File.exists?(cache_dir) or not ::File.directory?(cache_dir)
-            ::Dir.mkdir(cache_dir)
-        end
-
-        # Check for the formula in the cache dir
-        hash = Digest::SHA1.hexdigest(formula)
-        cache_file = ::File.join(cache_dir, "tex-#{hash}")
-
-        if ::File.exists?(cache_file)
-            width, height, align, base64 = ::File.open(cache_file, 'rb') { |io| io.read }.split(",")
-
-            if with_properties
-                return width, height, align, base64
-            else
-                return Base64.decode64(base64)
-            end
-        end
-        
-        Dir.mktmpdir('tex') do |path|
-            file = ::File.join(path, "formula")
-
-            # --- Write TeX source and compile to PDF.Write snippet into template
-            ::File.open(file + ".tex", 'w') { |f| f.write(Template % formula) }
-
-            result = sh_chdir path, "pdflatex",
-                "-halt-on-error",
-                "-output-directory=#{path}",
-                "-output-format=pdf",
-                "#{file}.tex",
-                ">#{file}.err 2>&1"
-
-
-
-            # --- Convert PDF to PNM using Ghostscript.
-            sh "gs",
-                "-q -dNOPAUSE -dBATCH",
-                "-dTextAlphaBits=#{render_antialias_bits}",
-                "-dGraphicsAlphaBits=#{render_antialias_bits}",
-                "-r#{render_dpi}",
-                "-sDEVICE=pnmraw",
-                "-sOutputFile=#{file}.pnm",
-                "#{file}.pdf"
-
-
-            img_width, img_height = pnm_width_height(file + ".pnm")
-
-
-            # --- Read dimensions file written by TeX during processing.
-            #
-            #     Example of file contents:
-            #       snippetdepth = 6.50009pt
-            #       snippetheight = 13.53899pt
-            #       snippetwidth = 145.4777pt
-            #       pagewidth = 153.4777pt
-            #       pageheight = 28.03908pt
-            #       pagemargin = 4.0pt
-            dimensions = {}
-            ::File.open(file + ".dimensions").readlines.each_with_index do |line, i|
-                if line =~ /^(\S+)\s+=\s+(-?[0-9\.]+)pt$/
-                    dimensions[$1] = Float($2) / 72.27 * render_dpi
-                else 
-                    raise Error, "#{file}.dimensions: invalid line: #{i}" 
-                end
-            end
-
-            # --- Crop bottom, then measure how much was cropped.
-            sh "pnmcrop -white -bottom #{file}.pnm >#{file}.bottomcrop.pnm"
-            #raise Error, "`pnmcrop` command failed: #{result}" unless ::File.exist?(file + ".bottomcrop.pnm")
-
-            img_width_bottomcrop, img_height_bottomcrop = pnm_width_height("#{file}.bottomcrop.pnm")
-            bottomcrop = img_height - img_height_bottomcrop
-            
-            # --- Crop top and sides, then measure how much was cropped from the top.
-            sh "pnmcrop -white #{file}.bottomcrop.pnm > #{file}.crop.pnm"
-            #raise Error, "`pnmcrop` command failed: #{result}" unless ::File.exist?(file + ".crop.pnm")
-
-            cropped_img_width, cropped_img_height = pnm_width_height("#{file}.crop.pnm")
-            topcrop = img_height_bottomcrop - cropped_img_height
-
-            # --- Pad image with specific values on all four sides, in preparation for
-            #     downsampling.
-
-            # Calculate bottom padding.
-            snippet_depth = Integer(dimensions["snippetdepth"] + dimensions["pagemargin"] + 0.5) - bottomcrop
-            padded_snippet_depth = round_up(snippet_depth, oversample)
-            increase_snippet_depth = padded_snippet_depth - snippet_depth
-            bottom_padding = increase_snippet_depth
-            
-            # --- Next calculate top padding, which depends on bottom padding.
-
-            padded_img_height = round_up(cropped_img_height + bottom_padding,
-                oversample)
-            top_padding = padded_img_height - (cropped_img_height + bottom_padding)
-
-
-            # --- Calculate left and right side padding.  Distribute padding evenly.
-
-            padded_img_width = round_up(cropped_img_width, oversample)
-            left_padding = Integer((padded_img_width - cropped_img_width) / 2.0)
-            right_padding = (padded_img_width - cropped_img_width) - left_padding
-
-
-            # --- Pad the final image.
-            result = sh "pnmpad",
-                "-white",
-                "-bottom=#{bottom_padding}",
-                "-top=#{top_padding}",
-                "-left=#{left_padding}",
-                "-right=#{right_padding}",
-                "#{file}.crop.pnm",
-                ">#{file}.pad.pnm"
-
-            # --- Sanity check of final size.
-            final_pnm_width, final_pnm_height = pnm_width_height(file + ".pad.pnm")
-            raise Error, "#{final_pnm_width} is not a multiple of #{oversample}" unless final_pnm_width % oversample == 0
-            
-            raise "#{final_pnm_height} is not a multiple of #{oversample}" unless final_pnm_height % oversample == 0
-
-            # --- Convert PNM to PNG.
-
-            final_png_width  = final_pnm_width  / render_oversample
-            final_png_height = final_pnm_height / render_oversample
-
-            result = sh "cat #{file}.pad.pnm",
-                "| ppmtopgm",
-                "| pnmscale -reduce #{render_oversample}",
-                "| pnmgamma #{gamma}",
-                "| pnmtopng -compression 9",
-                "> #{file}.png"
-
-            raise Error, "Conversion to png failed: #{result}" unless ::File.exist?(file + ".png")
-
-            # Calculate html properties
-            html_img_width  = final_png_width  / display_oversample
-            html_img_height = final_png_height / display_oversample
-            html_img_vertical_align = sprintf("%.0f", -padded_snippet_depth / oversample) 
-            png_data_base64 = Base64.encode64(::File.open("#{file}.png") { |io| io.read }).chomp
-
-            ::File.open(cache_file, 'w') { |f| f.write(%{#{html_img_width},#{html_img_height},#{html_img_vertical_align},#{png_data_base64}}) }
-            if with_properties
-                return html_img_width, html_img_height, html_img_vertical_align, png_data_base64
-            else
-                ::File.read(file + ".png")
-            end
-        end
-    end
-
-    private
-      def self.sh_chdir(path, *args)  
-        origcommand = args * " "
-        return if origcommand == ""
-
-        command = origcommand
-        command.gsub! /(["\\])/, "\\$1"
-        command = %{/bin/sh -c "(#{command}) 2>&1"}
-
-        pid = spawn command, :chdir => path
-
-        result = Process::waitpid(pid)
-        exit_value = Integer($? >> 8), signal_num = Integer($? & 127), dumped_core = Integer($? & 128)
-        raise Error, "Failed #{result}: #{origcommand}. Exit value = #{exit_value}. Signal Num = #{signal_num}. Dumped core = #{dumped_core}" unless $?.success?
-
-        return result
-      end
-
-      def self.sh(*args)
-        origcommand = args * " "
-        return if origcommand == ""
-
-        command = origcommand
-        command.gsub! /(["\\])/, "\\$1"
-        command = %{/bin/sh -c "(#{command}) 2>&1"}
-
-        pid = spawn command
-        #pid = spawn *args
-        result = Process::waitpid(pid)
-        exit_value = $? >> 8, signal_num = $? & 127, dumped_core = $? & 128
-        raise Error, "Failed #{result}: #{origcommand}. Exit value = #{exit_value}. Signal Num = #{signal_num}. Dumped core = #{dumped_core}" unless $?.success?
-
-        return result
-      end
-
-      def self.round_up(num, mod)
-        num + (num % mod == 0 ? 0 : (mod - (num % mod)))
-      end
-
-      def self.pnm_width_height(filename) 
-        raise Error, "#{filename} is not a .pnm file" if filename !~ /\.pnm$/ 
-
-        width = nil, height = nil
-        ::File.open(filename) do |file|
-          # Read first line
-          line = file.gets
-          begin 
-            line = file.gets # Read next line, skipping comments
-          end while line && line =~ /^#/
-
-          if line =~ /^(\d+)\s+(\d+)$/
-            width  = Integer($1)
-            height = Integer($2)
-          else 
-            raise Error, "#{filename}: couldn't read image size"
-          end
-        end
-
-        raise Error, "#{filename}: couldn't read image size" unless width && height
-
-        return width, height
-      end      
-
-  end
-end
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 require 'net/http'
 require 'uri'
 require 'open-uri'
@@ -1,3 +1,4 @@
+# ~*~ encoding: utf-8 ~*~
 module Gollum
  class Wiki
    include Pagination
@@ -154,6 +155,9 @@ module Gollum
    #           :ref - String the repository ref to retrieve pages from
    #           :ws_subs       - Array of chars to sub for ws in filenames.
    #           :mathjax       - Set to false to disable mathjax.
+    #           :show_all      - Show all files in file view, not just valid pages.
+    #                            Default: false
+    #           :collapse_tree - Start with collapsed file view. Default: false
    #
    # Returns a fresh Gollum::Repo.
    def initialize(path, options = {})
@@ -177,9 +181,11 @@ module Gollum
        self.class.default_ws_subs
      @history_sanitization = options[:history_sanitization] ||
        self.class.history_sanitization
-      @live_preview  = options.fetch(:live_preview, true)
-      @universal_toc = options.fetch(:universal_toc, false)
+      @live_preview  = options[:live_preview] || true
+      @universal_toc = options[:universal_toc] || false
      @mathjax = options[:mathjax] || false
+      @show_all = options[:show_all] || false
+      @collapse_tree = options[:collapse_tree] || false
    end

    # Public: check whether the wiki's git repo exists on the filesystem.
@@ -495,14 +501,19 @@ module Gollum
      @repo.git.grep(*args).split("\n").each do |line|
        result = line.split(':')
        result_1 = result[1]
-        file_name = result_1.chomp(::File.extname(result_1))
+        # Remove ext only from known extensions.
+        # test.pdf => test.pdf, test.md => test
+        file_name = Page::valid_page_name?(result_1) ? result_1.chomp(::File.extname(result_1)) :
+                    result_1
        results[file_name] = result[2].to_i
      end

      # Use git ls-files '*query*' to search for file names. Grep only searches file content.
      # Spaces are converted to dashes when saving pages to disk.
      @repo.git.ls_files({}, "*#{ query.gsub(' ', '-') }*").split("\n").each do |line|
-        file_name = line.chomp(::File.extname(line))
+        # Remove ext only from known extensions.
+        file_name = Page::valid_page_name?(line) ? line.chomp(::File.extname(line)) :
+                    line
        # If there's not already a result for file_name then
        # the value is nil and nil.to_i is 0.
        results[file_name] = results[file_name].to_i + 1;
@@ -583,6 +594,13 @@ module Gollum
    # Toggles mathjax.
    attr_reader :mathjax

+    # Toggles showing all files in files view. Default is false.
+    # When false, only valid pages in the git repo are displayed.
+    attr_reader :show_all
+
+    # Start with collapsed file view. Default: false
+    attr_reader :collapse_tree
+
    # Normalize the data.
    #
    # data - The String data to be normalized.
@@ -0,0 +1,9 @@
+class WikiFactory
+  def self.create p
+    path = testpath "examples/test.git"
+    Grit::Repo.init_bare(@path)
+    Gollum::Wiki.default_options = {:universal_toc => false}
+    cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
+    Gollum::Wiki.new(@path), @path, cleanup
+  end
+end
@@ -184,7 +184,9 @@ context "Frontend" do
    name = "A"
    post "/create", :content => 'abc', :page => name,
      :format => 'markdown', :message => 'def'
+
    follow_redirect!
+
    assert last_response.ok?

    @wiki.clear_cache
@@ -260,6 +262,9 @@ context "Frontend" do
    page2 = @wiki.page('A')
    assert_equal page1.version.sha, page2.version.sha
  end
+=begin
+  # redirects are now handled by class MapGollum in bin/gollum
+  # they should be set in config.ru

  test "redirects from 'base_path' or 'base_path/' to 'base_path/Home'" do
    Precious::App.set(:wiki_options, {})
@@ -273,6 +278,28 @@ context "Frontend" do
    Precious::App.set(:wiki_options, { :base_path => '/wiki/' })
    get "/"
    assert_match "http://example.org/wiki/Home", last_response.headers['Location']
+
+    # Reset base path
+    Precious::App.set(:wiki_options, { :base_path => nil })
+  end
+=end
+  
+  test "author details in session are used" do
+    page1 = @wiki.page('A')
+    
+    gollum_author = { :name => 'ghi', :email => 'jkl' }
+    session = { 'gollum.author' => gollum_author }
+    
+    post "/edit/A", { :content => 'abc', :page => 'A', :format => page1.format, :message => 'def' }, { 'rack.session' => session }
+    follow_redirect!
+    assert last_response.ok?
+    
+    @wiki.clear_cache
+    page2 = @wiki.page(page1.name)
+    
+    author = page2.version.author
+    assert_equal 'ghi', author.name
+    assert_equal 'jkl', author.email
  end

  def app
@@ -342,6 +369,36 @@ context "Frontend with lotr" do
    assert body.include?("Eye Of Sauron"), "/pages/Mordor/ should include the page 'Eye Of Sauron'"
  end

+  # base path requires 'map' in a config.ru to work correctly.
+  test "create pages within sub-directories using base path" do
+    Precious::App.set(:wiki_options, { :base_path => 'wiki' })
+    page = 'path'
+    post "/create", :content => '123', :page => page,
+      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+    # should be wiki/Mordor/path
+    assert_equal 'http://example.org/Mordor/' + page, last_response.headers['Location']
+    get '/Mordor/' + page
+    assert_match /123/, last_response.body
+
+    # Reset base path
+    Precious::App.set(:wiki_options, { :base_path => nil })
+  end
+
+  test "create pages within sub-directories using page file dir" do
+    Precious::App.set(:wiki_options, { :page_file_dir => 'wiki' })
+
+    post "/create", :content => 'one two', :page => 'base',
+      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+    assert_equal 'http://example.org/wiki/Mordor/base', last_response.headers['Location']
+    get "/wiki/Mordor/base"
+
+    # Reset page_file_dir after request but before matching.
+    Precious::App.set(:wiki_options, { :page_file_dir => nil })
+
+    assert_match /one two/, last_response.body
+  end
+
+
  test "create pages within sub-directories" do
    post "/create", :content => 'big smelly creatures', :page => 'Orc',
      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
@@ -359,6 +416,7 @@ context "Frontend with lotr" do
  test "edit pages within sub-directories" do
    post "/create", :content => 'big smelly creatures', :page => 'Orc',
      :path => 'Mordor', :format => 'markdown', :message => 'oooh, scary'
+
    assert_equal 'http://example.org/Mordor/orc', last_response.headers['Location']

    post "/edit/Mordor/Orc", :content => 'not so big smelly creatures',
@@ -12,6 +12,10 @@ class FakePage
    ::File.basename(@filepath, ::File.extname(@filepath))
  end

+  def filename
+    ::File.basename(@filepath)
+  end
+
  def path
    return @filepath
  end
@@ -0,0 +1,42 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path( '../helper', __FILE__ )
+require File.expand_path( '../wiki_factory', __FILE__ )
+
+context "gitcode" do
+
+  def page_with_content c
+    index = @wiki.repo.index
+    index.add 'Sample-Html.md', c 
+    index.commit 'adding file html sample'
+
+    page = @wiki.page 'Sample Html'
+    page
+  end
+
+  setup do
+    # context
+    @wiki, @path, @cleanup = WikiFactory.create 'examples/test.git'
+
+    # given
+    p = page_with_content "a\n\n```html:github/gollum/master/test/file_view/1_file.txt```\n\nb"
+
+    # when rendering the page
+    @rendered = Gollum::Markup.new(p).render
+  end
+
+  test 'that the rendered output is correctly fetched and rendered as html code' do
+    assert_equal %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"nt\">&lt;ol</span> <span class=\"na\">class=</span><span class=\"s\">\"tree\"</span><span class=\"nt\">&gt;</span>\n  <span class=\"nt\">&lt;li</span> <span class=\"na\">class=</span><span class=\"s\">\"file\"</span><span class=\"nt\">&gt;&lt;a</span> <span class=\"na\">href=</span><span class=\"s\">\"0\"</span><span class=\"nt\">&gt;</span>0<span class=\"nt\">&lt;/a&gt;&lt;/li&gt;</span>\n<span class=\"nt\">&lt;/ol&gt;</span>\n</pre></div>\n\n<p>b</p>}, @rendered
+  end
+
+  test 'contents' do
+    g = Gollum::Gitcode.new 'github/gollum/master/test/file_view/1_file.txt'
+
+    assert_equal g.contents, %{<ol class="tree">
+  <li class="file"><a href="0">0</a></li>
+</ol>}
+  end
+
+  teardown do
+    @cleanup.call
+  end
+end
@@ -1,17 +1,14 @@
 # ~*~ encoding: utf-8 ~*~
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require File.expand_path( "../helper", __FILE__ )
+require File.expand_path( "../wiki_factory", __FILE__ )

 context "Markup" do
  setup do
-    @path = testpath("examples/test.git")
-    FileUtils.rm_rf(@path)
-    Grit::Repo.init_bare(@path)
-    Gollum::Wiki.default_options = {:universal_toc => false}
-    @wiki = Gollum::Wiki.new(@path)
+    @wiki, @path, @teardown = WikiFactory.create 'examples/test.git'
  end

  teardown do
-    FileUtils.rm_r(File.join(File.dirname(__FILE__), *%w[examples test.git]))
+    @teardown.call
  end

  test "formats page from Wiki#pages" do
@@ -58,6 +55,21 @@ context "Markup" do
  #
  #########################################################################

+  test "absolute link to non-existent page" do
+    @wiki.write_page("linktest", :markdown, "[[/Page]]", commit_details)
+
+    page    = @wiki.page("linktest")
+    doc     = Nokogiri::HTML page.formatted_data
+    paras   = doc / :p
+    para    = paras.first
+    anchors = para / :a
+    assert_equal 1, paras.size
+    assert_equal 1, anchors.size
+    assert_equal 'internal absent', anchors[0]['class']
+    assert_equal '/Page',           anchors[0]['href']
+    assert_equal '/Page',           anchors[0].text
+  end
+
  test "double page links no space" do
    @wiki.write_page("Bilbo Baggins", :markdown, "a [[Foo]][[Bar]] b", commit_details)

@@ -184,6 +196,84 @@ context "Markup" do
    assert_equal "<p><code>sed -i '' 's/[[:space:]]*$//'</code></p>", page.formatted_data
  end

+  test "regexp gsub! backref (#383)" do
+    # bug only triggers on "```" syntax
+    # not `code`
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      (<<-'DATA'
+          ```
+          rot13='tr '\''A-Za-z'\'' '\''N-ZA-Mn-za-m'\'
+          ```
+          DATA
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<pre><code>      <div class=\"highlight\"><pre><span class=\"n\">rot13</span><span class=\"p\">=</span><span class=\"s\">'tr '</span><span class=\"o\">\\</span><span class=\"s\">''</span><span class=\"n\">A</span><span class=\"o\">-</span><span class=\"n\">Za</span><span class=\"o\">-</span><span class=\"n\">z</span><span class=\"o\">'\\</span><span class=\"s\">''</span> <span class=\"s\">'\\''N-ZA-Mn-za-m'</span><span class=\"o\">\\</span><span class=\"s\">'</span>\n</pre></div>\n</code></pre>}
+    assert_equal expected, output
+  end
+
+  # Issue #568
+  test "tilde code blocks without a language" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\"><pre><span class=\"s\">'hi'</span>\n</pre></div>}
+    assert_equal expected, output
+  end
+
+  test "tilde code blocks #537" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~ {.ruby}
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\"><pre><span class=\"s1\">'hi'</span>\n</pre></div>}
+    assert_equal expected, output
+  end
+
+  # Issue #537
+  test "tilde code blocks with more than one class" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~ {#hi .ruby .sauce}
+'hi'
+~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\"><pre><span class=\"s1\">'hi'</span>\n</pre></div>}
+    assert_equal expected, output
+  end
+
+  # Issue #537
+  test "tilde code blocks with lots of tildes" do
+    page = 'test_rgx'
+    @wiki.write_page(page, :markdown,
+      %Q(~~~~~~ {#hi .ruby .sauce}
+~~
+'hi'~
+~~~~~~
+      ), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %Q{<div class=\"highlight\"><pre><span class=\"o\">~~</span>\n<span class=\"s1\">'hi'</span><span class=\"o\">~</span>\n</pre></div>}
+    assert_equal expected, output
+  end
+
+  test "four space indented code block" do
+    page = 'test_four'
+    @wiki.write_page(page, :markdown,
+      %(    test
+    test), commit_details)
+    output = @wiki.page(page).formatted_data
+    expected = %(<pre><code>test\ntest\n</code></pre>)
+    assert_equal expected, output
+  end
+
  test "wiki link within code block" do
    @wiki.write_page("Potato", :markdown, "    sed -i '' 's/[[:space:]]*$//'", commit_details)
    page = @wiki.page("Potato")
@@ -209,7 +299,7 @@ context "Markup" do

      page = @wiki.page(name)
      output = page.formatted_data
-      assert_equal %{<p>a <img src="#{scheme}://example.com/bilbo.jpg"> b</p>}, output
+      assert_equal %{<p>a <img src=\"#{scheme}://example.com/bilbo.jpg\" /> b</p>}, output
    end
  end

@@ -220,7 +310,7 @@ context "Markup" do

      page = @wiki.page(name)
      output = page.formatted_data
-      assert_equal %{<p>a <img src="#{scheme}://example.com/bilbo.JPG"> b</p>}, output
+      assert_equal %{<p>a <img src=\"#{scheme}://example.com/bilbo.JPG\" /> b</p>}, output
    end
  end

@@ -232,7 +322,7 @@ context "Markup" do
    @wiki.write_page("Bilbo Baggins", :markdown, "a [[/alpha.jpg]] [[a | /alpha.jpg]] b", commit_details)

    page = @wiki.page("Bilbo Baggins")
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><a href="/wiki/alpha.jpg">a</a> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /><a href=\"/wiki/alpha.jpg\">a</a> b</p>}, page.formatted_data
  end

  test "image with relative path on root" do
@@ -243,7 +333,7 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.page("Bilbo Baggins")
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><a href="/wiki/alpha.jpg">a</a> b</p>}, page.formatted_data
+    assert_equal %Q{<p>a <img src=\"/wiki/alpha.jpg\" /><a href=\"/wiki/alpha.jpg\">a</a> b</p>}, page.formatted_data
  end

  test "image with relative path" do
@@ -255,7 +345,7 @@ context "Markup" do

    page = @wiki.page("Bilbo Baggins")
    output = page.formatted_data
-    assert_equal %{<p>a <img src="/wiki/greek/alpha.jpg"><a href="/wiki/greek/alpha.jpg">a</a> b</p>}, output
+    assert_equal %{<p>a <img src=\"/wiki/greek/alpha.jpg\" /><a href=\"/wiki/greek/alpha.jpg\">a</a> b</p>}, output
  end

  test "image with absolute path on a preview" do
@@ -265,7 +355,7 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.preview_page("Test", "a [[/alpha.jpg]] b", :markdown)
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /> b</p>}, page.formatted_data
  end

  test "image with relative path on a preview" do
@@ -276,12 +366,12 @@ context "Markup" do
    index.commit("Add alpha.jpg")

    page = @wiki.preview_page("Test", "a [[alpha.jpg]] [[greek/alpha.jpg]] b", :markdown)
-    assert_equal %{<p>a <img src="/wiki/alpha.jpg"><img src="/wiki/greek/alpha.jpg"> b</p>}, page.formatted_data
+    assert_equal %{<p>a <img src=\"/wiki/alpha.jpg\" /><img src=\"/wiki/greek/alpha.jpg\" /> b</p>}, page.formatted_data
  end

  test "image with alt" do
    content = "a [[alpha.jpg|alt=Alpha Dog]] b"
-    output = %{<p>a <img src="/greek/alpha.jpg" alt="Alpha Dog"> b</p>}
+    output = %{<p>a<imgsrc=\"/greek/alpha.jpg\"alt=\"AlphaDog\"/>b</p>}
    relative_image(content, output)
  end

@@ -289,7 +379,7 @@ context "Markup" do
    %w{em px}.each do |unit|
      %w{width height}.each do |dim|
        content = "a [[alpha.jpg|#{dim}=100#{unit}]] b"
-        output = "<p>a <img src=\"/greek/alpha.jpg\" #{dim}=\"100#{unit}\"> b</p>"
+        output = "<p>a<imgsrc=\"/greek/alpha.jpg\"#{dim}=\"100#{unit}\"/>b</p>"
        relative_image(content, output)
      end
    end
@@ -298,7 +388,7 @@ context "Markup" do
  test "image with bogus dimension" do
    %w{width height}.each do |dim|
      content = "a [[alpha.jpg|#{dim}=100]] b"
-      output = "<p>a <img src=\"/greek/alpha.jpg\"> b</p>"
+      output = "<p>a<imgsrc=\"/greek/alpha.jpg\"/>b</p>"
      relative_image(content, output)
    end
  end
@@ -306,7 +396,7 @@ context "Markup" do
  test "image with vertical align" do
    %w{top texttop middle absmiddle bottom absbottom baseline}.each do |align|
      content = "a [[alpha.jpg|align=#{align}]] b"
-      output = "<p>a <img src=\"/greek/alpha.jpg\" align=\"#{align}\"> b</p>"
+      output = %Q{<p>a<imgsrc=\"/greek/alpha.jpg\"align=\"#{align}\"/>b</p>}
      relative_image(content, output)
    end
  end
@@ -314,40 +404,40 @@ context "Markup" do
  test "image with horizontal align" do
    %w{left center right}.each do |align|
      content = "a [[alpha.jpg|align=#{align}]] b"
-      output = "<p>a <span class=\"align-#{align}\"><span><img src=\"/greek/alpha.jpg\"></span></span> b</p>"
+      output = "<p>a<spanclass=\"align-#{align}\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span>b</p>"
      relative_image(content, output)
    end
  end

  test "image with float" do
    content = "a\n\n[[alpha.jpg|float]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"float-left\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"float-left\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "image with float and align" do
    %w{left right}.each do |align|
      content = "a\n\n[[alpha.jpg|float|align=#{align}]]\n\nb"
-      output = "<p>a</p>\n\n<p><span class=\"float-#{align}\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+      output = "<p>a</p><p><spanclass=\"float-#{align}\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
      relative_image(content, output)
    end
  end

  test "image with frame" do
    content = "a\n\n[[alpha.jpg|frame]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"/greek/alpha.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "absolute image with frame" do
    content = "a\n\n[[http://example.com/bilbo.jpg|frame]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"http://example.com/bilbo.jpg\"></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"http://example.com/bilbo.jpg\"/></span></span></p><p>b</p>"
    relative_image(content, output)
  end

  test "image with frame and alt" do
    content = "a\n\n[[alpha.jpg|frame|alt=Alpha]]\n\nb"
-    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\" alt=\"Alpha\"><span>Alpha</span></span></span></p>\n\n<p>b</p>"
+    output = "<p>a</p><p><spanclass=\"frame\"><span><imgsrc=\"/greek/alpha.jpg\"alt=\"Alpha\"/><span>Alpha</span></span></span></p><p>b</p>"
    relative_image(content, output)
  end

@@ -394,11 +484,9 @@ context "Markup" do
  #
  #########################################################################

-  test "code blocks" do
+  test "regular code blocks" do
    content = "a\n\n```ruby\nx = 1\n```\n\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
-             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
-             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre></div>\n\n<p>b</p>}

    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
@@ -411,9 +499,7 @@ context "Markup" do

  test "code blocks with carriage returns" do
    content = "a\r\n\r\n```ruby\r\nx = 1\r\n```\r\n\r\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre>" +
-             "<span class=\"n\">x</span> <span class=\"o\">=</span> " +
-             "<span class=\"mi\">1</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">x</span> <span class=\"o\">=</span> <span class=\"mi\">1</span>\n</pre></div>\n\n<p>b</p>}

    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
@@ -444,9 +530,7 @@ context "Markup" do

  test "code blocks with multibyte caracters indent" do
    content = "a\n\n```ruby\ns = 'やくしまるえつこ'\n```\n\nb"
-    output = "<p>a</p>\n\n<div class=\"highlight\">\n<pre><span class=\"n\">" +
-             "s</span> <span class=\"o\">=</span> <span class=\"s1\">'やくしまるえつこ'" +
-             "</span>\n</pre>\n</div>\n\n\n<p>b</p>"
+    output = %Q{<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">s</span> <span class=\"o\">=</span> <span class=\"s1\">'やくしまるえつこ'</span>\n</pre></div>\n\n<p>b</p>}
    index = @wiki.repo.index
    index.add("Bilbo-Baggins.md", content)
    index.commit("Add alpha.jpg")
@@ -498,6 +582,43 @@ np.array([[2,2],[1,3]],np.float)
    assert_match /\(\[\[/, rendered, "#{markup_class} parses out wiki links\n#{rendered}"
  end

+  test "embed code is escaped" do
+    @wiki.write_page("script", :markdown, "a <script></script> b", commit_details)
+    @wiki.write_page("page", :markdown, "```html:script```", commit_details)
+
+    output_script = @wiki.page("script").formatted_data
+    output_page = @wiki.page("page").formatted_data
+
+    assert_equal %Q{<p>a  b</p>}, output_script
+    assert_equal %Q{<div class=\"highlight\"><pre><span class=\"nt\">&lt;p&gt;</span>a  b<span class=\"nt\">&lt;/p&gt;</span>\n</pre></div>}, output_page
+  end
+
+  test "embed code page absolute link" do
+    @wiki.write_page("base", :markdown, "a\n!base\b", commit_details)
+    @wiki.write_page("a", :markdown, "a\n```html:/base```\b", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class=\"highlight\"><pre><span class=\"nt\">&lt;p&gt;</span>a\n!base<span class=\"nt\">&lt;/p&gt;</span>\n</pre></div>\n}, output
+  end
+
+  test "embed code page relative link" do
+    @wiki.write_page("base", :markdown, "a\n!rel\b", commit_details)
+    @wiki.write_page("a", :markdown, "a\n```html:base```\b", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\n</p><div class=\"highlight\"><pre><span class=\"nt\">&lt;p&gt;</span>a\n!rel<span class=\"nt\">&lt;/p&gt;</span>\n</pre></div>\n}, output
+  end
+
+  test "code block in unsupported language" do
+    @wiki.write_page("a", :markdown, "a\n```nonexistent\ncode\n```\nb", commit_details)
+
+    page = @wiki.page("a")
+    output = page.formatted_data
+    assert_equal %Q{<p>a\ncode\nb</p>}, output
+  end
+
  #########################################################################
  #
  # Web Sequence Diagrams
@@ -662,24 +783,6 @@ end
    ]
  end

-  #########################################################################
-  #
-  # TeX
-  #
-  #########################################################################
-
-  test "TeX block syntax" do
-    content = 'a \[ a^2 \] b'
-    output = "<p>a<imgwidth=\"15\"height=\"16\"style=\"vertical-align:-1px;\"src=\"/_tex.png?type=block&data=YV4y\"alt=\"a^2\"/>b</p>"
-    compare(content, output, 'md')
-  end
-
-  test "TeX inline syntax" do
-    content = 'a \( a^2 \) b'
-    output = "<p>a<imgwidth=\"15\"height=\"16\"style=\"vertical-align:-1px;\"src=\"/_tex.png?type=inline&data=YV4y\"alt=\"a^2\"/>b</p>"
-    compare(content, output, 'md')
-  end
-
  #########################################################################
  # Asciidoc
  #########################################################################
@@ -16,7 +16,7 @@ context "Page" do
    page = @wiki.page('Bilbo Baggins')
    assert_equal Gollum::Page, page.class
    assert page.raw_data =~ /^# Bilbo Baggins\n\nBilbo Baggins/
-    assert page.formatted_data =~ %r{<h1>Bilbo Baggins<a class="anchor" id="Bilbo-Baggins" href="#Bilbo-Baggins"></a>\n</h1>\n\n<p>Bilbo Baggins}
+    assert page.formatted_data =~ %r{<h1>Bilbo Baggins<a class="anchor" id="Bilbo-Baggins" href="#Bilbo-Baggins"></a></h1>\n\n<p>Bilbo Baggins}
    assert_equal 'Bilbo-Baggins.md', page.path
    assert_equal :markdown, page.format
    assert_equal @wiki.repo.commits.first.id, page.version.id
@@ -39,7 +39,6 @@ context "Page Reverting" do
    assert_equal "INITIAL", body=page2.raw_data.strip
    assert_equal body, File.read(File.join(@path, "B.md")).strip
  end
-=end

  test "reverts multiple commits for a page" do
    page1 = @wiki.page('A')
@@ -49,6 +48,7 @@ context "Page Reverting" do
    assert_equal "INITIAL", body=page2.raw_data.strip
    assert_equal body, File.read(File.join(@path, "A.md")).strip
  end
+=end

  test "cannot revert conflicting commit" do
    page1 = @wiki.page('A')
@@ -29,19 +29,36 @@ context "Unicode Support" do
    assert_equal "# 한글", utf8(page.raw_data)

    # markup.rb
-    # #简介
-    # href.gsub('%', '%25') so the anchor works in Firefox.
-    # <a href="#%25ED%2595%259C%25EA%25B8%2580" id="%ED%95%9C%EA%B8%80" class="anchor"></a>
    doc     = Nokogiri::HTML page.formatted_data
    h1s     = doc / :h1
    h1      = h1s.first
    anchors = h1 / :a
    assert_equal 1, h1s.size
    assert_equal 1, anchors.size
-    assert_equal '#%25ED%2595%259C%25EA%25B8%2580', anchors[0]['href']
-    assert_equal '%ED%95%9C%EA%B8%80',              anchors[0]['id']
-    assert_equal 'anchor',                          anchors[0]['class']
-    assert_equal '',                                anchors[0].text
+    assert_equal '#한글',  anchors[0]['href']
+    assert_equal  '한글',  anchors[0]['id']
+    assert_equal 'anchor', anchors[0]['class']
+    assert_equal '',       anchors[0].text
+  end
+
+  test "create and read non-latin page with anchor 2" do
+    @wiki.write_page("test", :markdown, "# \"La\" faune d'Édiacara")
+
+    page = @wiki.page("test")
+    assert_equal Gollum::Page, page.class
+    assert_equal "# \"La\" faune d'Édiacara", utf8(page.raw_data)
+
+    # markup.rb test: ', ", É
+    doc     = Nokogiri::HTML page.formatted_data
+    h1s     = doc / :h1
+    h1      = h1s.first
+    anchors = h1 / :a
+    assert_equal 1, h1s.size
+    assert_equal 1, anchors.size
+    assert_equal %q(#%22La%22-faune-d'Édiacara), anchors[0]['href']
+    assert_equal %q(%22La%22-faune-d'Édiacara),  anchors[0]['id']
+    assert_equal 'anchor',                 anchors[0]['class']
+    assert_equal '',                       anchors[0].text
  end

  test "unicode with existing format rules" do
@@ -123,7 +123,7 @@ context "Wiki page previewing" do
  test "preview_page" do
    page = @wiki.preview_page("Test", "# Bilbo", :markdown)
    assert_equal "# Bilbo", page.raw_data
-    assert_equal %Q{<h1>Bilbo<a class="anchor" id="Bilbo" href="#Bilbo"></a>\n</h1>}, page.formatted_data
+    assert_equal %Q{<h1>Bilbo<a class=\"anchor\" id=\"Bilbo\" href=\"#Bilbo\"></a></h1>}, page.formatted_data
    assert_equal "Test.md", page.filename
    assert_equal "Test", page.name
  end
@@ -142,6 +142,16 @@ context "Wiki TOC" do
    assert_equal '<h1>Bilbo<a class="anchor" id="Bilbo" href="#Bilbo"></a></h1>', page.formatted_data.gsub(/\n/,"")
    assert_equal %{<div class="toc"><div class="toc-title">Table of Contents</div><ul><li><a href="#Bilbo">Bilbo</a></li></ul></div>}, page.toc_data.gsub(/\n */,"")
  end
+
+  # Ensure ' creates valid links in TOC
+  # Incorrect: <a href=\"#a\" b=\"\">
+  #   Correct: <a href=\"#a'b\">
+  test "' in link" do
+    page = @wiki.preview_page("Test", "# a'b", :markdown)
+    assert_equal "# a'b", page.raw_data
+    assert_equal %q{<h1>a'b<a class="anchor" id="a'b" href="#a'b"></a></h1>}, page.formatted_data.gsub(/\n/,"")
+    assert_equal %{<div class=\"toc\"><div class=\"toc-title\">Table of Contents</div><ul><li><a href=\"#a'b\">a'b</a></li></ul></div>}, page.toc_data.gsub(/\n */,"")
+  end
 end

 context "Wiki page writing" do
@@ -0,0 +1,10 @@
+class WikiFactory
+  def self.create p
+    path = testpath "examples/test.git"
+    Grit::Repo.init_bare(path)
+    Gollum::Wiki.default_options = {:universal_toc => false}
+    cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
+    wiki = Gollum::Wiki.new(path)
+    return wiki, path, cleanup
+  end
+end
Author	SHA1	Message	Date
bootstraponline	2686e96046	Release 2.3.8	2012-11-07 18:50:37 -07:00
bootstraponline	213e2bb432	Add config example	2012-11-07 18:48:07 -07:00
bootstraponline	79bb5c10ab	Remove lib.so note	2012-11-07 18:46:36 -07:00
bootstraponline	7ea012d786	Fix code style	2012-11-07 18:45:20 -07:00
bootstraponline	43591f75de	Merge pull request #570 from dekimsey/only-alert-on-changes Only alert on changes	2012-11-07 17:39:30 -08:00
Daniel Kimsey	05d82c0569	Attach unsaved changes warning to trigger only after changes are made	2012-11-07 17:51:36 -05:00
Daniel Kimsey	76c8d3206c	Consolidated create and edit page's javascript into the global gollum.js	2012-11-07 17:50:12 -05:00
bootstraponline	00751d05b4	Release 2.3.7	2012-11-06 18:27:05 -07:00
bootstraponline	b5be5df11a	Fix test name	2012-11-06 18:26:49 -07:00
bootstraponline	7d159273fc	Merge pull request #569 from dekimsey/issue-568 Fixed #568, triple tilde without language causes Gollum to crash	2012-11-06 17:11:08 -08:00
Daniel Kimsey	70127922ab	Added test for #568	2012-11-06 15:49:47 -05:00
Daniel Kimsey	b95df93775	Fixes #568 , triple-tilde without language causes crash	2012-11-06 15:39:39 -05:00
bootstraponline	dc06edcf5b	Add x.y.z	2012-11-05 17:30:01 -07:00
bootstraponline	fdc437dcd5	Release 2.3.6	2012-11-05 17:28:51 -07:00
bootstraponline	f6873c9612	Merge pull request #566 from dekimsey/deterministic-search Gollum search results now displayed in a deterministic order	2012-11-05 16:17:40 -08:00
Daniel Kimsey	93754ab32d	Sort by filename in addition to count	2012-11-05 18:01:50 -05:00
Daniel Kimsey	5759334635	Gollum search results are displayed in a deterministic order	2012-11-05 17:02:19 -05:00
bootstraponline	f2f543b72d	Release 2.3.5	2012-10-31 20:14:15 -06:00
bootstraponline	598b052be3	Fix clean Duplicate slashes must be removed everywhere.	2012-10-31 20:11:23 -06:00
bootstraponline	a746062422	Merge pull request #564 from nikitug/patch-1 Update README to new Sequence diagram markup style	2012-10-31 19:09:45 -07:00
Nikita Afanasenko	c8868d369f	Update README to new Sequence diagram markup style	2012-10-31 18:02:28 +04:00
bootstraponline	52c6e7474c	Release 2.3.4	2012-10-28 20:59:06 -06:00
bootstraponline	be81f09b0e	Update gemspec	2012-10-28 12:43:51 -06:00
bootstraponline	6fa4504e31	Fix #551	2012-10-28 12:37:02 -06:00
bootstraponline	992ba01a12	Fix page file dir	2012-10-28 11:57:25 -06:00
bootstraponline	72c5a74cf1	Update test The test passes when verified manually using bin/gollum. Without a running server the test will fail so it has been commented out. If there's an easy way to mock Rack::Server then the test can be restored.	2012-10-27 23:44:11 -06:00
bootstraponline	919f41a0f1	Fix #559	2012-10-27 23:44:11 -06:00
bootstraponline	785921cb0f	Fix toc generation	2012-10-27 21:46:30 -06:00
bootstraponline	8c8cda5e7d	Fix comment	2012-10-27 21:05:56 -06:00
bootstraponline	64ef74e7e9	Add preview button to live preview	2012-10-27 20:52:54 -06:00
bootstraponline	776df4e6ee	Fix nokogiri rendering https://github.com/sparklemotion/nokogiri/issues/782	2012-10-27 19:52:26 -06:00
bootstraponline	68465a8651	Set indent and encoding	2012-10-27 18:12:32 -06:00
bootstraponline	fa16c8960c	Fix #560	2012-10-27 17:58:14 -06:00
bootstraponline	2c57915781	Refactor fileview	2012-10-23 23:27:31 -06:00
bootstraponline	d0527f1aeb	Release 2.3.3	2012-10-23 22:58:41 -06:00
bootstraponline	75083c5b56	Fix collapse tree	2012-10-23 22:36:17 -06:00
bootstraponline	82526594db	Add attr reader for collapse tree	2012-10-23 22:22:56 -06:00
bootstraponline	941d39800c	Merge pull request #556 from adiknoth/fileview Documentation and usability enhancement of recent fileview fix	2012-10-23 21:20:28 -07:00
bootstraponline	a1ae2e8bc0	Fix #554	2012-10-23 22:14:45 -06:00
bootstraponline	4af6f366ca	Fix show_all /pages	2012-10-23 22:09:27 -06:00
Adrian Knoth	c7a9534ed9	Add --collapse-tree command line option	2012-10-23 14:27:15 +02:00
Adrian Knoth	00bcbbf72b	File View: Add option to collapse file trees. For potentially large repositories, starting with a collapsed tree may be beneficial.	2012-10-23 14:27:12 +02:00
Adrian Knoth	ed2254ff9f	Add missing documentation for --show-all	2012-10-23 14:22:54 +02:00
bootstraponline	b6633f0ecb	Release 2.3.2	2012-10-22 19:21:10 -06:00
bootstraponline	e08d2d3052	Enable show_all for /pages	2012-10-22 19:10:40 -06:00
bootstraponline	fbc0548b43	Add --show-all --show-all will show all files in file view (not just valid pages). Default is false.	2012-10-22 19:03:21 -06:00
bootstraponline	a9807bd1e1	Update math note	2012-10-21 17:22:31 -06:00
bootstraponline	554b80b39d	Add MathJax examples	2012-10-21 17:21:24 -06:00
bootstraponline	99e74bf00b	Release 2.3.1	2012-10-21 17:16:40 -06:00
bootstraponline	f48e923f28	Fix release	2012-10-21 17:15:09 -06:00
bootstraponline	5400b4bfdd	Support inline and display math. $$2^2$$ $2^2$ \\(2^2\\) [2^2]	2012-10-21 17:15:09 -06:00
bootstraponline	f68bebe0f6	Update math note	2012-10-21 16:26:35 -06:00
bootstraponline	4c6019b439	Update math note	2012-10-21 16:23:58 -06:00
bootstraponline	66e08a6b17	Release 2.3.0	2012-10-21 16:19:05 -06:00
bootstraponline	7898db70ed	Auto load all MathJax extensions Fix #549	2012-10-21 16:14:04 -06:00
bootstraponline	7c357116ff	Remove TeX As discussed with @vmg MathJax is available via a flag for those self hosting gollum	2012-10-18 23:36:05 -06:00
bootstraponline	69ce0eb0d0	Update rake	2012-10-17 21:04:20 -06:00
bootstraponline	4db31a297b	Update rake Jekyll uses rake ~> 0.9	2012-10-17 21:03:29 -06:00
bootstraponline	e1fca457e4	Restore gemnasium Gemnasium fixed the missing pygments.rb issue. https://github.com/laserlemon/gemnasium-parser/commit/c9b3e43c3021967d5c1bb115e7dd1555e01c6444	2012-10-17 20:54:01 -06:00
bootstraponline	7f8485ce80	Improve system requirements language	2012-10-16 22:31:25 -06:00
bootstraponline	290061fd11	Add system requirements to readme	2012-10-16 22:15:26 -06:00
bootstraponline	a507836936	Update dependencies	2012-10-16 21:39:22 -06:00
bootstraponline	6524d20a96	Use pygments.rb 0.3.2	2012-10-16 21:36:37 -06:00
bootstraponline	f1c523aa30	Release 2.2.9	2012-10-14 22:26:17 -06:00
bootstraponline	87c08f5613	Escape " in headers	2012-10-14 22:21:00 -06:00
bootstraponline	82913cea20	Improve base path note	2012-10-14 21:42:25 -06:00
bootstraponline	2ad743e4bd	Release 2.2.8	2012-10-14 21:28:43 -06:00
bootstraponline	fa97b57a96	Define default map as suggested on #460 Base path now sets a default map without having to use an external config.ru.	2012-10-14 20:57:27 -06:00
bootstraponline	1b952b6d56	Release 2.2.7	2012-10-14 17:24:33 -06:00
bootstraponline	90cc512bd1	Fix home loop with page-file-dir #491	2012-10-14 15:45:26 -06:00
bootstraponline	b82556c9c0	Fix #460	2012-10-14 15:42:06 -06:00
bootstraponline	fbe3b4bb3b	Fix #460	2012-10-14 15:23:52 -06:00
bootstraponline	5ffd98ad31	Fix #491	2012-10-14 15:15:55 -06:00
bootstraponline	cb9dd4d228	Fix formatting	2012-10-14 14:31:40 -06:00
bootstraponline	cd823bf10c	Add doc from wiki.rb	2012-10-14 14:31:00 -06:00
bootstraponline	5560ec52c2	Add base_path doc	2012-10-14 14:27:08 -06:00
bootstraponline	065151a77f	Add base_path disclaimer	2012-10-14 14:25:27 -06:00
bootstraponline	23454f556c	Release 2.2.6	2012-10-14 13:14:08 -06:00
bootstraponline	a2b3ddf931	Update tests to XHTML	2012-10-14 13:07:18 -06:00
bootstraponline	44b0d2fcfc	Remove old comment	2012-10-14 12:26:23 -06:00
bootstraponline	aed4cc590a	Fix unicode characters Fix #547 Update test	2012-10-14 12:21:31 -06:00
bootstraponline	72ee08b5ab	Release 2.2.5	2012-10-14 11:21:56 -06:00
bootstraponline	45547624e4	Improve tilde fence support More than 3 tildes can be used. The code block must end with the same amount of tildes used to open the code block. Fix #537 http://johnmacfarlane.net/pandoc/README.html#delimited-code-blocks	2012-10-14 11:02:45 -06:00
bootstraponline	f928cfa8be	Don't ship Lorem ipsum in gem	2012-10-13 20:21:08 -06:00
bootstraponline	988984846a	Release 2.2.4	2012-10-13 20:01:57 -06:00
bootstraponline	1149618653	Fix #537	2012-10-13 19:53:41 -06:00
bootstraponline	168a033903	Remove old comment	2012-10-13 14:59:42 -06:00
bootstraponline	6a765c9791	Fix #537	2012-10-13 14:52:28 -06:00
bootstraponline	e16ae7b511	Travis is having a bad day E: There are problems and -y was used without --force-yes before_install: 'sudo apt-get install -y asciidoc' returned false. Done. Build script exited with: 1	2012-10-13 14:07:15 -06:00
bootstraponline	174334ea44	Remove comment	2012-10-13 13:58:56 -06:00
bootstraponline	dbdf06930d	Fix	2012-10-13 13:55:20 -06:00
bootstraponline	c93e65ddc3	Merge branch 'master' of github.com:github/gollum	2012-10-13 13:32:19 -06:00
bootstraponline	56101ed264	Fix #535 and add test	2012-10-13 13:32:08 -06:00
bootstraponline	8269c8e574	TOC doesn't require '	2012-10-13 13:11:31 -06:00
bootstraponline	2246419d1e	Fix spacing	2012-10-13 13:09:20 -06:00
bootstraponline	118a0c318b	Update comment	2012-10-13 13:06:15 -06:00
bootstraponline	5401cf2910	Fix #542	2012-10-13 13:04:51 -06:00
bootstraponline	432f9b8d2f	Add test for #542	2012-10-13 12:57:58 -06:00
bootstraponline	66fc8a2d31	Revert "Fix #542 " This reverts commit `2f3dd3d227`.	2012-10-13 12:55:43 -06:00
bootstraponline	2f3dd3d227	Fix #542 Page link may contain duplicate starting forward slashes. //page points to http://page/ when what we want is /page pointing to http://localhost:1234/page	2012-10-13 09:53:25 -06:00
bootstraponline	c43fd9fa6c	Update language comment	2012-10-12 21:19:24 -06:00
bootstraponline	868518e0f5	Bash is Ace mode sh	2012-10-12 20:58:05 -06:00
bootstraponline	039b5cce98	Try to fix Travis FFI is no longer used in the new pygments.rb. apt-get update may resolve the asciidoc install failure.	2012-10-12 20:24:31 -06:00
bootstraponline	4a421842d5	https://github.com/travis-ci/travis-ci/issues/725 Modified README to trigger a Travis CI build. It's currently broken.	2012-10-12 20:22:10 -06:00
bootstraponline	cfbb124f81	Update README.md	2012-10-12 20:16:43 -06:00
bootstraponline	dcb147cde2	Ensure declaredLanguage is lower case	2012-10-10 20:20:33 -06:00
bootstraponline	8d06b5e67e	Fix pygments language to Ace mode translation	2012-10-10 20:16:04 -06:00
bootstraponline	4776d0b422	Use rake release in readme	2012-10-10 19:45:42 -06:00
bootstraponline	58bb340c33	Release 2.2.3	2012-10-10 19:43:30 -06:00
bootstraponline	ee790a9b7c	Add rake bump to readme	2012-10-10 19:38:53 -06:00
bootstraponline	ac432aad78	Add bump task to Rakefile	2012-10-10 19:35:04 -06:00
bootstraponline	30207e0a39	Merge pull request #533 from wrs/wrs_syntaxfixes Two little syntax highlighting fixes	2012-10-10 16:56:37 -07:00
Walter Smith	d98547a33c	Fix lack of CoffeeScript livepreview Pygments calls it coffeescript, but Ace calls it coffee.	2012-10-10 14:20:50 -07:00
Walter Smith	b7cdeabbf6	Catch all Pygments errors An unrecognized language was generating a MentosError rather than a PythonError. Just catch anything that goes wrong in Pygments.	2012-10-10 14:20:50 -07:00
bootstraponline	be9907a0cc	v2.2.2	2012-10-04 18:17:24 -06:00
bootstraponline	30f42c50a9	Fix #528	2012-10-04 17:18:47 -06:00
bootstraponline	7cba65b138	Gemnasium is not including all deps. pygments.rb is missing for example. Will restore once Gemnasium has fixed the issue.	2012-10-01 23:50:35 -06:00
bootstraponline	f34a78b336	Proc.new instead of lambda.	2012-10-01 23:45:04 -06:00
bootstraponline	e1942dda03	Merge pull request #513 from bootstraponline/embed_code Embed code. #508.	2012-10-01 22:36:25 -07:00
bootstraponline	7142e284fa	.call instead of .() for 1.8.7	2012-10-01 23:29:15 -06:00
bootstraponline	3c1c588953	Restore wiki_factory.	2012-10-01 23:23:40 -06:00
bootstraponline	52cc6bae34	Update dependencies.	2012-09-29 13:50:11 -06:00
bootstraponline	955c608115	Update rake.	2012-09-29 13:40:02 -06:00
bootstraponline	2e00cf312c	Merge pull request #524 from osener/patch-1 Update org-ruby	2012-09-29 12:17:59 -07:00
Ozan Sener	09bbc144d1	Update org-ruby Fixes #81	2012-09-29 11:19:09 +03:00
bootstraponline	d02b63a434	Fix test.	2012-09-26 00:08:11 -06:00
bootstraponline	9b63c67d8c	Try to fix tests.	2012-09-25 23:57:35 -06:00
bootstraponline	05c4bf3374	Add local file support. Example of absolute path to local file. ```html:/home``` Example of relative path to local file. ```html:home``` 1.8.7 string fix. 's'[0..0] instead of 's'[0] Fix regex. Add absolute and relative tests.	2012-09-25 23:31:58 -06:00
bootstraponline	424b4d3f4e	Remove debug statements.	2012-09-25 23:31:25 -06:00
bootstraponline	f9a6187fab	Fix undefined method `[]' for nil:NilClass	2012-09-25 23:31:08 -06:00
Henrik	d406472882	1.8.7 fixes	2012-09-25 23:29:11 -06:00
Henrik	749b5a5ff8	Adding functionality for fetching code from github hack for 1.8.7 Don't miss test_markup's relative require need some food now	2012-09-25 23:29:08 -06:00
bootstraponline	091d5fe750	Update multibyte caracters.	2012-09-25 22:58:07 -06:00
bootstraponline	c8894fb465	New pygments.rb works correctly. The expected output from the tests differs only in newlines. git diff makes it seem like everything changed. bzr qdiff has a better default diff. git doesn't do per char diffs. Revert "New pygments has issues." This reverts commit `2dd41cbfac`.	2012-09-25 22:45:57 -06:00
bootstraponline	2dd41cbfac	New pygments has issues. Revert "Update pygments. Solves #225 #490 #517" This reverts commit `c0c77c5ba7`. Revert "Fix pygments.rb tests." This reverts commit `1f2165e68b`.	2012-09-25 21:54:49 -06:00
bootstraponline	1f2165e68b	Fix pygments.rb tests.	2012-09-25 21:47:24 -06:00
bootstraponline	e9b6bdbdd7	Add dependency status.	2012-09-25 21:38:09 -06:00
bootstraponline	c0c77c5ba7	Update pygments. Solves #225 #490 #517	2012-09-25 21:36:37 -06:00
Corey Donohoe	12403172ac	Merge pull request #521 from Vanuan/update_nokogiri Update nokogiri	2012-09-25 12:16:50 -07:00
John Yani	3b41ab8d75	Update nokogiri	2012-09-25 22:04:43 +03:00
bootstraponline	7bcf35f5b1	Fix #517 . Thanks @roa	2012-09-23 16:26:48 -06:00
bootstraponline	9a7e1c94c7	Merge pull request #515 from realmacsoftware/master Populate author details using the session.	2012-09-16 10:32:33 -07:00
Keith Duncan	30c2e675da	Test that author details from the session are committed into the repository	2012-09-16 16:49:17 +01:00
Keith Duncan	ac405803e8	Add notes on providing author details to the Rack documentation section	2012-09-16 16:25:09 +01:00
Keith Duncan	7dee787a92	Add documentation for where the commit_message parameters are passed and where they're source from	2012-09-16 15:59:49 +01:00
Keith Duncan	ae4b1cdeca	Add support for author parameters coming in from the session, to be set by rack middleware further up the stack	2012-09-15 21:06:08 +01:00
bootstraponline	572982cbf9	Use a professional right left button.	2012-09-09 21:11:16 -06:00
bootstraponline	74290874f9	Fix #383 test.	2012-09-09 14:05:10 -06:00
bootstraponline	847f08d952	Use block form of gsub to avoid regexp backref interpolation The content of this commit message is from @kislyuk's comments on the below two issues. Fix #383 Fix #511 `gsub!(pattern, replacement) interpolates` regexp backreferences `gsub!(pattern) do block` doesn't http://stackoverflow.com/questions/2082457/ruby-gsub-problem-when-using-backreference-and-hashes	2012-09-09 12:22:56 -06:00
Neal Pisenti	0bcd616668	fix mathjax option, fixes #509	2012-09-09 11:50:48 -06:00
bootstraponline	9dd701ccc4	Grit is broken. #508 #356	2012-09-04 17:52:56 -06:00
bootstraponline	56a5a7d92b	Fix #507	2012-09-04 16:24:16 -06:00
bootstraponline	0cf0fad50e	Finish removing MathJax from Live Preview.	2012-09-02 15:27:32 -06:00
bootstraponline	5f9e91656e	Fix LaTeX tests.	2012-09-02 15:03:56 -06:00
Vicent Marti	a7a2479f85	Release 2.2.1	2012-09-02 22:43:50 +02:00
Vicent Marti	a8b230a490	Properly escape TeX data.	2012-09-02 22:27:04 +02:00
bootstraponline	041b01f171	Fix #490	2012-09-01 12:33:08 -06:00
Vicent Marti	1c475f3215	Release 2.2.0	2012-09-01 12:24:17 +02:00
Vicent Marti	ab699d94b0	Do not render LaTeX locally Offload the rendering service to MathTran.org, the free and open-source LaTeX rendering engine.	2012-09-01 12:23:02 +02:00
bootstraponline	942d32c9b6	Fix uninstall command	2012-08-30 21:36:11 -06:00
bootstraponline	97f15f0b18	Add edit hotkey. #496	2012-08-30 21:07:57 -06:00
bootstraponline	ed49358c50	Add h1-3 shortcuts. #496	2012-08-30 20:54:20 -06:00
bootstraponline	85eeecd140	Add save hotkey.	2012-08-30 20:48:44 -06:00