Ensure <title> is rendered for pages

I made a mistake when I made `#title` a private method. I did not see that it was being called from `layout.mustache` to generate the `<title></title>` tag in the `<head></head>` of each page. This fixes my error, and adds tests so the behaviour is more explicit.
Release 5.2.2
2021-04-04 13:16:52 -07:00 · 2021-03-27 19:43:38 +01:00 · 2021-03-27 19:40:35 +01:00 · 2021-03-27 14:05:03 +01:00 · 2021-03-23 09:13:23 -07:00 · 2021-03-23 07:49:52 -07:00
1974 changed files with 28500 additions and 55412 deletions
@@ -0,0 +1,40 @@
+# https://help.github.com/articles/dealing-with-line-endings
+#
+# For Mac & Linux
+# git config --global core.autocrlf input
+#
+# For windows
+# git config --global core.autocrlf true
+#
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.txt text
+*.md text
+*.rb text
+*.js text
+*.html text
+*.yml text
+*.mustache text
+*.css text
+Rakefile text
+Gemfile text
+LICENSE text
+COPYRIGHT text
+gollum text
+.gitattributes text
+.gitignore text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+
+# Make github-linguist ignore files that aren't our own
+
+lib/gollum/public/gollum/* linguist-vendored
+lib/gollum/public/gollum/javascript/gollum* linguist-vendored=false
+lib/gollum/public/gollum/javascript/*/gollum* linguist-vendored=false
+lib/gollum/public/gollum/css linguist-vendored=false
+
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Please read the [CONTRIBUTION GUIDELINES](https://github.com/gollum/gollum/blob/master/CONTRIBUTING.md) before submitting!**
+
+If your have problems using or installing the software which stem from bugs in the software or a lack of documentation, we are always happy to help out! However, **for ordinary usage questions, please consider asking elsewhere**, for instance on [StackOverflow](http://stackoverflow.com/questions/tagged/gollum-wiki).
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment Info**
+
+Always include the output of the `gollum --versions` command (NB: `versions` in plural).
@@ -3,3 +3,8 @@ pkg
 .DS_Store
 .bundle
 Gemfile.lock
+*.gem
+*.swp
+.*
+!.sprockets*
+!lib/gollum/public/gollum/stylesheets/_styles.css
@@ -0,0 +1,10 @@
+rvm:
+  - 2.4.0
+  - 2.6.0
+  - 3.0.0
+  - jruby-9.2.9.0
+jdk:
+  - oraclejdk9
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install libicu-dev
@@ -0,0 +1,111 @@
+# Contributing to Gollum
+
+Thanks for your interest in the gollum project!
+
+## Submitting an Issue
+
+Please note that the issue tracker is meant for:
+
+1. Bug reports.
+2. Feature requests.
+
+If your have problems using or installing the software which stem from bugs in the software or a lack of documentation, we are always happy to help out! However, **for ordinary usage questions, please consider asking elsewhere**, for instance on [StackOverflow](http://stackoverflow.com/questions/tagged/gollum-wiki).
+
+Gollum supports [custom macros](https://github.com/gollum/gollum/wiki#macros) for the creation of additional wiki markup tags. Please **do not** use this tracker to request macros specific to your situation. However, if you have or are working on a macro that you think may be useful to more users, you can share it as a GitHub [gist](https://gist.github.com) and link to it in the [wiki](https://github.com/gollum/gollum/wiki/Custom-macros).
+
+Before submitting an issue, **please carefully look through the following places** to make sure your problem is not already addressed:
+
+1. The issue tracker.
+1. The [README](https://github.com/gollum/gollum/blob/master/README.md).
+1. The project's [wiki](https://github.com/gollum/gollum/wiki).
+
+Security vulnerabilities can be reported directly to the maintainers using these GPG keys:
+
+* [@dometto](https://keys.openpgp.org/vks/v1/by-fingerprint/02354CC9F820B52CC2791979BB8CCC95FD83B795)
+
+Lastly, please **consider helping out** by opening a Pull Request!
+
+## Triaging Issues [![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
+
+You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to gollum on CodeTriage](https://www.codetriage.com/gollum/gollum).
+
+
+## Opening a Pull Request
+
+Pull Requests fixing bugs, implementing new features, or updating documentation and dependencies are all very welcome! If you would like to help out with the project, you can pick an open issue from the issue tracker. We're more than happy to help you get started! Here's how you can proceed:
+
+1. Fork and clone Gollum.
+2. Create a thoughtfully named topic branch to contain your changes.
+3. If you haven't installed dependencies yet, navigate to your clone and execute:  
+	```
+	[sudo] bundle install
+	```
+4. Hack away.
+5. Add your own tests and make sure they're all still passing.
+6. If some of your changes deserve a mention on Gollum's home page, edit the README accordingly.
+7. If necessary, rebase your commits into logical chunks, without errors.
+8. Push the branch to your fork on GitHub.
+9. Create a pull request for Gollum.
+
+**Notes:**
+* Do not change Gollum's version numbers, we will do that on our own.
+
+### Running tests
+
+1. Install [Bundler](http://bundler.io/).
+2. Navigate to the cloned source of Gollum.
+3. Install dependencies:  
+	```
+	[sudo] bundle install
+	```
+4. Run the tests:  
+	```
+	bundle exec rake test
+	```
+	
+To profile slow tests, you can use `bundle exec rake test TESTOPTS="--verbose"`.
+
+### Working with test repositories
+
+An example of how to add a test file to the bare repository lotr.git.
+
+```
+mkdir tmp
+cd tmp
+git clone ../test/examples/lotr.git/
+git log
+echo "test" > test.md
+git add .
+git commit -am "Add test"
+git push ../lotr.git/ master
+```
+
+## Updating static assets
+
+This is necessary whenever changes have been made to the assets in `lib/gollum/public/gollum/javascript` (mostly SASS, CSS, and JS files), to ensure the changes are also present in the [released](#releasing-the-gem) version of the gem. Steps:
+
+1. `git rm -r lib/gollum/public/assets`
+1. `bundle exec rake precompile`
+1. `git add lib/gollum/public/assets`
+1. `git commit`
+
+## Releasing the gem
+
+Gollum uses [Semantic Versioning](http://semver.org/).
+
+    x.y.z
+
+For z releases:
+
+```
+rake bump
+rake release
+```
+
+For x.y releases:
+
+```
+# First update VERSION in lib/gollum.rb and then:
+rake gemspec
+rake release
+```
@@ -1,3 +1,9 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
+
+if RUBY_PLATFORM == 'java'
+  gem 'warbler'
+end

 gemspec
+
+gem 'rake', '~> 13.0'
@@ -1,4 +1,127 @@
-# HEAD
+# 5.2.1 2021-02-25
+
+* Fix include call to a missing asset (@benjaminwil). This caused slow first page loads on JRuby.
+
+# 5.2 2021-02-24
+
+* Improved styling and Primer upgrade (@benjaminwil)
+* Add redirect to rename commit (@ViChyavIn)
+* Updated dependencies
+* Bugfixes
+
+# 5.1.2
+
+* Guard against malicious filenames in breadcrumbs
+
+# 5.1
+
+* Bugfixes
+* Add autosave feature (#1576)
+* Add Add quick access to diff of each commit in the history
+
+# 5.0 / 2020-03-17
+
+This is a major new release that introduces many new features, bugfixes, and removes major limitations. See [here](https://github.com/gollum/gollum/wiki/5.0-release-notes) for a list of changes.
+
+**Note**: due to changes to the way in which Gollum handles filenames, you may have to change some links in your wiki when migrating from gollum 4.x. See the [release notes](https://github.com/gollum/gollum/wiki/5.0-release-notes#migrating-your-wiki) for more details. You may be find the `bin/gollum-migrate-tags` script helpful to accomplish this. Also see the `--lenient-tag-lookup` option for making tag lookup backwards compatible with 4.x, though note that this will decrease performance on large wikis with many tags.
+
+Many thanks to all the users who have provided feedback, and everyone who has chipped in in the development process!
+
+Many of these changes have been made possible by removing the default grit adapter in favour of the new [rugged adapter](https://github.com/gollum/rugged_adapter).
+
+# 4.1.4 /2018-01-10
+
+* Depend on new version of gollum-lib that relies on a patched version of sanitize, which solves a vulnerability (CVE-2018-3740). See https://github.com/gollum/gollum-lib/pull/296.
+
+# 4.1.3 /2018-17-09
+
+* Solves a vulnerability in the File view and All Pages view that would allow XSS.
+
+# 4.1.2 /2017-08-07
+
+* Lock to a newer version of gollum-lib to avoid installing an outdated and vulnerable dependency (nokogiri) on ruby 2.0. See https://github.com/gollum/gollum-lib/pull/279. Note: this breaks semantic versioning so those using outdated rubies will discover the problem on update.
+
+# 4.1.0 /2017-03-09
+
+* Added file deletion functionality to file view
+* Various performance improvements
+* Emoji support
+
+# 4.0.0 /2015-04-11
+
+* Now compatible with JRuby (via the [rjgit](https://github.com/repotag/rjgit) [adapter](https://github.com/repotag/gollum-lib_rjgit_adapter))
+
+# 3.1.1 /2014-12-04
+
+* Security fix for [remote code execution issue](https://github.com/gollum/gollum/issues/913). Please update!
+
+# 3.1 / 2014-11-28
+
+* New features
+  * Drag-and-drop uploading in the editor [@lucas-clemente](https://github.com/lucas-clemente)
+  * Latest changes view [@etienneCharignon](https://github.com/etienneCharignon) (#707)
+  * Option `--no-edit` to disable editing from the web interface [@bambycha](https://github.com/bambycha) (#879)
+  * Option `--mathjax-config` to specify custom mathjax configuration [@hardywu](https://github.com/hardywu) (#842)
+* Major enhancements
+  * Made the Gollum theme responsive [@rtrvrtg](https://github.com/rtrvrtg) (#831)
+  * Depends on new [gollum-lib](https://github.com/gollum/gollum-lib) `4.0.0`
+    * Allows specifiying [git adapter](https://github.com/gollum/gollum/wiki/Git-adapters) with `--adapter` [@bartkamphorst](https://github.com/bartkamphorst), [@dometto](https://github.com/dometto)
+* Numerous bugfixes
+  * **NB**: please pass `--h1-title` if you do not want page titles to default to the page's filepath. See [here](https://github.com/gollum/gollum/wiki/Page-titles).
+
+# 2.4.11 / 2013-01-08
+
+* Numerous security issues have been fixed. Please update to `2.4.11`
+
+# 1.4.0 / 2012-04-10
+
+* Minor
+  * Add a way to configure the `#id_prefix` property of Sanitization
+    objects.
+  * Add web sequence diagrams support
+  * Support for updating wysiwyg components when markup language changes
+  * Support RedCarpet 2.0
+  * Allow ftp and irc links in wiki markup
+  * Minor ui fixups
+
+* Bug Fixes
+  * Include the language of the code snippet when making a uniquely
+    identifiable sha of a code snippet while rendering a page.
+  * Pygments lexer forces utf8 encoding
+  * Remove MathJax, this created problems in production for us.
+    We'll look at bringing it back in future releases
+
+# 1.3.1 / 2011-07-21
+
+* Major Enhancements
+  * Allow prefixed ID attributes in headers to support internal linking
+    (#146).
+  * Markdown pages are rendered through Redcarpet by default (#176).
+* Minor Enhancements
+  * Remove Edit button on Preview pages (#164).
+  * Simplify Wiki#inspect and Page#inspect.
+* Bug Fixes
+  * Fixed broken preview functionality (#157).
+  * Fixed sidebar/footer rendering problems related to whitespace (#145).
+
+# 1.3.0 / 2011-04-25
+
+* Major Enhancements
+  * Listing of all Pages
+  * Support for running Gollum under a separate branch.
+* Minor Enhancements
+  * Fix a security issue with rendering Mathjax.
+
+# 1.2.0 / 2011-03-11
+
+* Major Enhancements
+  * Major HTML/CSS/JS overhaul.
+  * Add Sidebars (similar to Footers).
+  * Add commit reverts.
+* Minor Enhancements
+  * Optimization in source code highlighting, resulting in a huge
+    decrease in rendering time.
+  * Security fixes related to source code highlighting.

 * Major Enhancements
  * Add Page sidebars, similar to Page footers.
@@ -51,4 +174,4 @@

 # 1.0.0 / 2010-08-12

-* Open Source Birthday!
+* Open Source Birthday!
@@ -1,3 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vulputate tincidunt sollicitudin. Quisque sit amet leo sed nunc eleifend rhoncus in consectetur leo. Vivamus posuere semper convallis. Duis malesuada lacus sed erat lobortis tincidunt mattis ligula consectetur. Sed aliquam vulputate eros at euismod. Aenean egestas lorem ligula, quis faucibus turpis. Curabitur a eros in ipsum gravida ornare. Sed elementum enim vel mi scelerisque dapibus. Nulla id libero ligula, quis tempus sem. Morbi nec felis tortor, ac cursus risus. Mauris elementum tortor id lacus eleifend non lobortis tellus pharetra. Etiam posuere cursus vestibulum.  $x \lt y$ 
-
-Morbi tincidunt dolor vel massa dictum volutpat. Vestibulum quis nibh metus, id tincidunt nisl. Vivamus eget sem ac risus eleifend rhoncus at eu nisl. Nunc elit massa, vulputate ac gravida eget, condimentum quis justo. Integer scelerisque, libero vel consequat ultricies, eros libero sagittis libero, pellentesque bibendum quam massa ut orci. Maecenas sit amet urna eget quam aliquam posuere. Nulla facilisi. Duis imperdiet augue sit amet metus ornare et hendrerit dui feugiat. Aenean a lacus neque. Sed eu enim tincidunt dolor pharetra porttitor. Vestibulum ut felis dui, rutrum iaculis orci. Duis eu bibendum tortor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse mollis sagittis purus sit amet sollicitudin. Phasellus vel interdum erat. 
@@ -1,6 +1,6 @@
 (The MIT License)

-Copyright (c) Tom Preston-Werner, Rick Olson
+Copyright (c) Tom Preston-Werner, Rick Olson, Dawa Ometto, Bart Kamphorst

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal
@@ -1,452 +1,151 @@
-gollum -- A wiki built on top of Git
+gollum -- A git-based Wiki
 ====================================

+[![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
+[![Build Status](https://travis-ci.org/gollum/gollum.svg?branch=master)](https://travis-ci.org/gollum/gollum)
+[![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
+[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/info)
+
+**Gollum version 5.0 is out!** See [here](https://github.com/gollum/gollum/wiki/5.0-release-notes) for a list of changes and new features compared to Gollum version 4.x, and see some [Screenshots](https://github.com/gollum/gollum/wiki/Screenshots) of Gollum's features.
+
 ## DESCRIPTION

-Gollum is a simple wiki system built on top of Git that powers GitHub Wikis.
+Gollum is a simple wiki system built on top of Git. A Gollum Wiki is simply a git repository of a specific nature:
+* A Gollum repository's contents are human-editable text or markup files.
+* Pages may be organized into directories any way you choose.
+* Other content can also be included, for example images, PDFs and headers/footers for your pages.
+* Gollum pages:
+	* May be written in a variety of [markups](#markups).
+	* Can be edited with your favourite system editor or IDE (changes will be visible after committing) or with the built-in web interface.
+	* Can be displayed in all versions, reverted, etc.
+* Gollum strives to be compatible with GitHub wikis (see `--lenient-tag-lookup`)
+* Gollum supports advanced functionality like:
+  * [UML diagrams](https://github.com/gollum/gollum/wiki#plantuml-diagrams)
+  * [BibTeX and Citation support](https://github.com/gollum/gollum/wiki/BibTeX-and-Citations)
+  * Annotations using [CriticMarkup](https://github.com/gollum/gollum/wiki#criticmarkup-annotations)
+  * Mathematics via [MathJax](https://github.com/gollum/gollum/wiki#mathematics)
+  * [Macros](https://github.com/gollum/gollum/wiki/Standard-Macros)
+  * [Redirects](https://github.com/gollum/gollum/wiki#redirects)
+  * [RSS Feed](https://github.com/gollum/gollum/wiki/5.0-release-notes#rss-feed) of latest changes
+  * ...and [more](https://github.com/gollum/gollum/wiki)

-Gollum wikis are simply Git repositories that adhere to a specific format.
-Gollum pages may be written in a variety of formats and can be edited in a
-number of ways depending on your needs. You can edit your wiki locally:
-
-* With your favorite text editor or IDE (changes will be visible after committing).
-* With the built-in web interface.
-* With the Gollum Ruby API.
-
-Gollum follows the rules of [Semantic Versioning](http://semver.org/) and uses
-[TomDoc](http://tomdoc.org/) for inline documentation.
+### SYSTEM REQUIREMENTS

+Gollum runs on Unix-like systems using its [adapter](https://github.com/gollum/rugged_adapter) for [rugged](https://github.com/libgit2/rugged) by default. You can also run Gollum on [JRuby](https://github.com/jruby/jruby) via its [adapter](https://github.com/repotag/gollum-lib_rjgit_adapter) for [RJGit](https://github.com/repotag/rjgit/). On Windows, Gollum runs only on JRuby.

 ## INSTALLATION

-The best way to install Gollum is with RubyGems:
+1. Ruby is best installed either via [RVM](https://rvm.io/) or a package manager of choice.
+2. Gollum is best installed via RubyGems:  
+	```
+	[sudo] gem install gollum
+	```
+	
+Installation examples for individual systems can be seen [here](https://github.com/gollum/gollum/wiki/Installation).

-    $ [sudo] gem install gollum
+To run, simply:

-If you're installing from source, you can use [Bundler][bundler] to pick up all the
-gems:
+1. Run: `gollum /path/to/wiki`.
+2. Open `http://localhost:4567` in your browser.

-    $ bundle install # ([more info](http://gembundler.com/bundle_install.html))
+See [below](#running-from-source) for information on running Gollum from source, as a Rack app, and more.

-In order to use the various formats that Gollum supports, you will need to
-separately install the necessary dependencies for each format. You only need
-to install the dependencies for the formats that you plan to use.
+### Markups

-* [ASCIIDoc](http://www.methods.co.nz/asciidoc/) -- `brew install asciidoc`
-* [Creole](http://wikicreole.org/) -- `gem install creole`
-* [Markdown](http://daringfireball.net/projects/markdown/) -- `gem install rdiscount`
-* [Org](http://orgmode.org/) -- `gem install org-ruby`
-* [Pod](http://search.cpan.org/dist/perl/pod/perlpod.pod) -- `Pod::Simple::HTML` comes with Perl >= 5.10. Lower versions should install Pod::Simple from CPAN.
+Gollum allows using different markup languages on different wiki pages. It presently ships with support for the following markups:
+* [Markdown](http://daringfireball.net/projects/markdown/syntax) (see [below](#Markdown-flavors) for more information on Markdown flavors)
 * [RDoc](http://rdoc.sourceforge.net/)
-* [ReStructuredText](http://docutils.sourceforge.net/rst.html) -- `easy_install docutils`
-* [Textile](http://www.textism.com/tools/textile/) -- `gem install RedCloth`
-* [MediaWiki](http://www.mediawiki.org/wiki/Help:Formatting) -- `gem install wikicloth`

-[bundler]: http://gembundler.com/
+You can easily activate support for other markups by installing additional renderers (any that are supported by [github-markup](https://github.com/github/markup)):
+* [AsciiDoc](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/) -- `[sudo] gem install asciidoctor`
+* [Creole](http://www.wikicreole.org/wiki/CheatSheet) -- `[sudo] gem install creole`
+* [MediaWiki](http://www.mediawiki.org/wiki/Help:Formatting) -- `[sudo] gem install wikicloth`
+* [Org](http://orgmode.org/worg/dev/org-syntax.html) -- `[sudo] gem install org-ruby`
+* [Pod](http://perldoc.perl.org/perlpod.html) -- requires Perl >= 5.10 (the `perl` command must be available on your command line)
+	* Lower versions should install `Pod::Simple` from CPAN.
+* [ReStructuredText](http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html) -- requires python >= 2 (the `python2` command must be available on your command line)
+	* Note that Gollum will also need you to install `docutils` for your Python 2.
+* [Textile](http://redcloth.org/hobix.com/textile/quick.html) -- `[sudo] gem install RedCloth`

-## RUNNING
+### Markdown flavors

-To view and edit your Gollum repository locally via the built in web
-interface, simply install the Gollum gem, navigate to your repository via the
-command line, and run the executable:
+By default, Gollum ships with the `kramdown` gem to render Markdown. However, you can use any [Markdown renderer supported by github-markup](https://github.com/github/markup/blob/master/lib/github/markup/markdown.rb). This includes [CommonMark](https://commonmark.org/) support via the `commonmarker` gem. The first installed renderer from the list will be used (e.g., `redcarpet` will NOT be used if `github/markdown` is installed). Just `gem install` the renderer of your choice.

-    $ gollum
+See [here](https://github.com/gollum/gollum/wiki/Custom-rendering-gems) for instructions on how to use custom rendering gems and set custom options.

-This will start up a web server running the Gollum frontend and you can view
-and edit your wiki at http://localhost:4567. To get help on the command line
-utility, you can run it like so:
+## RUNNING FROM SOURCE

-    $ gollum --help
+1. `git clone https://github.com/gollum/gollum`
+2. `cd gollum`
+3. `[sudo] bundle install`
+4. `bundle exec bin/gollum`
+5. Open `http://localhost:4567` in your browser.

+### Rack

-## REPO STRUCTURE
+Gollum can also be ran with any [rack-compatible web server](https://github.com/rack/rack#supported-web-servers). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack).

-A Gollum repository's contents are designed to be human editable. Page content
-is written in `page files` and may be organized into directories any way you
-choose. Special footers can be created in `footer files`. Other content
-(images, PDFs, etc) may also be present and organized in the same way.
+### Rack, with an authentication server

+Gollum can also be ran alongside a CAS (Central Authentication Service) SSO (single sign-on) server. With a bit of tweaking, this adds basic user-support to Gollum. To see an example and an explanation, navigate [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack-and-CAS-SSO).

-## PAGE FILES
+### Docker

-Page files may be written in any format supported by
-[GitHub-Markup](http://github.com/github/markup) (except roff). The
-current list of formats and allowed extensions is:
+Gollum can also be ran via [Docker](https://www.docker.com/). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Docker).

-* ASCIIDoc: .asciidoc
-* Creole: .creole
-* Markdown: .markdown, .mdown, .mkdn, .mkd, .md
-* Org Mode: .org
-* Pod: .pod
-* RDoc: .rdoc
-* ReStructuredText: .rest.txt, .rst.txt, .rest, .rst
-* Textile: .textile
-* MediaWiki: .mediawiki, .wiki
+### Service

-Gollum detects the page file format via the extension, so files must have one
-of the supported extensions in order to be converted.
+Gollum can also be ran as a service. More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-as-a-service).

-Page file names may contain any printable UTF-8 character except space
-(U+0020) and forward slash (U+002F). If you commit a page file with any of
-these characters in the name it will not be accessible via the web interface.
+## CONFIGURATION

-Even though page files may be placed in any directory, there is still only a
-single namespace for page names, so all page files should have globally unique
-names regardless of where they are located in the repository.
+Gollum comes with the following command line options:

-The special page file `Home.ext` (where the extension is one of the supported
-formats) will be used as the entrance page to your wiki. If it is missing, an
-automatically generated table of contents will be shown instead.
+| Option            | Arguments | Description |
+| ----------------- | --------- | ----------- |
+| --host            | [HOST]    | Specify the hostname or IP address to listen on. Default: '0.0.0.0'.<sup>1</sup> |
+| --port            | [PORT]    | Specify the port to bind Gollum with. Default: `4567`. |
+| --config          | [FILE]    | Specify path to Gollum's configuration file. |
+| --ref             | [REF]     | Specify the git branch to serve. Default: `master`. |
+| --bare            | none      | Tell Gollum that the git repository should be treated as bare. |
+| --adapter         | [ADAPTER] | Launch Gollum using a specific git adapter. Default: `rugged`.<sup>2</sup> |
+| --base-path       | [PATH]    | Specify the leading portion of all Gollum URLs (path info). Setting this to `/wiki` will make the wiki accessible under `http://localhost:4567/wiki/`. Default: `/`. |
+| --page-file-dir   | [PATH]    | Specify the subdirectory for all pages. If set, Gollum will only serve pages from this directory and its subdirectories. Default: repository root. |
+| --static, --no-static | none  | Use static assets. Defaults to false in development/test,  true in production/staging. |
+| --assets          |  [PATH]   | Set the path to look for static assets. |
+| --css             | none      | Tell Gollum to inject custom CSS into each page. Uses `custom.css` from wiki root.<sup>3</sup> |
+| --js              | none      | Tell Gollum to inject custom JS into each page. Uses `custom.js` from wiki root.<sup>3</sup> |
+| --no-edit         | none      | Disable the feature of editing pages. |
+| --follow-renames, --no-follow-renames  | none      | Follow pages across renames in the History view. Default: true.
+| --allow-uploads   | [MODE]    | Enable file uploads. If set to `dir`, Gollum will store all uploads in the `/uploads/` directory in repository root. If set to `page`, Gollum will store each upload at the currently edited page.<sup>4</sup> |
+| --mathjax         | none      | Enables MathJax (renders mathematical equations). By default, uses the `TeX-AMS-MML_HTMLorMML` config with the `autoload-all` extension.<sup>5</sup> |
+| --critic-markup   | none      | Enable support for annotations using [CriticMarkup](http://criticmarkup.com/). |
+| --irb             | none      | Launch Gollum in "console mode", with a [predefined API](https://github.com/gollum/gollum-lib/). |
+| --h1-title        | none      | Tell Gollum to use the first `<h1>` as page title. |
+| --no-display-metadata | none  | Do not render metadata tables in pages. |
+| --user-icons      | [MODE]    | Tell Gollum to use specific user icons for history view. Can be set to `gravatar`, `identicon` or `none`. Default: `none`. |
+| --mathjax-config  | [FILE]    | Specify path to a custom MathJax configuration. If not specified, uses the `mathjax.config.js` file from repository root. |
+| --template-dir    | [PATH]    | Specify custom mustache template directory. |
+| --template-page   | none      | Use _Template in root as a template for new pages. Must be committed. |
+| --emoji           | none      | Parse and interpret emoji tags (e.g. `:heart:`) except when the leading colon is backslashed (e.g. `\:heart:`). |
+| --lenient-tag-lookup | none | Internal links resolve case-insensitively, will treat spaces as hyphens, and will match the first page found with a certain filename, anywhere in the repository. Provides compatibility with Gollum 4.x. |
+| --help            | none      | Display the list of options on the command line. |
+| --version         | none      | Display the current version of Gollum. |
+| --versions        | none      | Display the current version of Gollum and auxiliary gems. |

-## SIDEBAR FILES
+**Notes:**

-Sidebar files allow you to add a simple sidebar to your wiki.  Sidebar files
-are named `_Sidebar.ext` where the extension is one of the supported formats.
-Sidebars affect all pages in their directory and any subdirectories that do not
-have a sidebar file of their own.
+1. The `0.0.0.0` IP address allows remote access. Should you wish for Gollum to turn into a personal Wiki, use `127.0.0.1`.
+2. Before using `--adapter`, you should probably read [this](https://github.com/gollum/gollum/wiki/Git-adapters) first.
+3. When `--css` or `--js` is used, respective files must be committed to your git repository or you will get a 302 redirect to the create a page.
+4. Files can be uploaded simply by dragging and dropping them onto the editor's text area when `--allow-uploads` is used.

-## FOOTER FILES
+### Config file

-Footer files allow you to add a simple footer to your wiki. Footer files must
-be named `_Footer.ext` where the extension is one of the supported formats.
-Like sidebars, footers affect all pages in their directory and any
-subdirectories that do not have a footer file of their own.
+When `--config` option is used, certain inner parts of Gollum can be customized. This is used throughout our wiki for certain user-level alterations, among which [customizing supported markups](https://github.com/gollum/gollum/wiki/Formats-and-extensions) will probably stand out.

+**All of the mentioned alterations work both for Gollum's config file (`config.rb`) and Rack's config file (`config.ru`).**

-## HTML SANITIZATION
+## CONTRIBUTING

-For security and compatibility reasons Gollum wikis may not contain custom CSS
-or JavaScript. These tags will be stripped from the converted HTML. See
-`docs/sanitization.md` for more details on what tags and attributes are
-allowed.
-
-
-## BRACKET TAGS
-
-A variety of Gollum tags use a double bracket syntax. For example:
-
-    [[Link]]
-
-Some tags will accept attributes which are separated by pipe symbols. For
-example:
-
-    [[Link|Page Title]]
-
-In all cases, the first thing in the link is what is displayed on the page.
-So, if the tag is an internal wiki link, the first thing in the tag will be
-the link text displayed on the page. If the tag is an embedded image, the
-first thing in the tag will be a path to an image file. Use this trick to
-easily remember which order things should appear in tags.
-
-Some formats, such as MediaWiki, support the opposite syntax:
-
-    [[Page Title|Link]]
-
-## PAGE LINKS
-
-To link to another Gollum wiki page, use the Gollum Page Link Tag.
-
-    [[Frodo Baggins]]
-
-The above tag will create a link to the corresponding page file named
-`Frodo-Baggins.ext` where `ext` may be any of the allowed extension types. The
-conversion is as follows:
-
-  1. Replace any spaces (U+0020) with dashes (U+002D)
-  2. Replace any slashes (U+002F) with dashes (U+002D)
-
-If you'd like the link text to be something that doesn't map directly to the
-page name, you can specify the actual page name after a pipe:
-
-    [[Frodo|Frodo Baggins]]
-
-The above tag will link to `Frodo-Baggins.ext` using "Frodo" as the link text.
-
-The page file may exist anywhere in the directory structure of the repository.
-Gollum does a breadth first search and uses the first match that it finds.
-
-Here are a few more examples:
-
-    [[J. R. R. Tolkien]] -> J.-R.-R.-Tolkien.ext
-    [[Movies / The Hobbit]] -> Movies---The-Hobbit.ext
-    [[モルドール]] -> モルドール.ext
-
-
-## EXTERNAL LINKS
-
-As a convenience, simple external links can be placed within brackets and they
-will be linked to the given URL with the URL as the link text. For example:
-
-    [[http://example.com]]
-
-External links must begin with either "http://" or "https://". If you need
-something more flexible, you can resort to the link syntax in the page's
-underlying markup format.
-
-
-## ABSOLUTE VS. RELATIVE VS. EXTERNAL PATH
-
-For Gollum tags that operate on static files (images, PDFs, etc), the paths
-may be referenced as either relative, absolute, or external. Relative paths
-point to a static file relative to the page file within the directory
-structure of the Gollum repo (even though after conversion, all page files
-appear to be top level). These paths are NOT prefixed with a slash. For
-example:
-
-    gollum.pdf
-    docs/diagram.png
-
-Absolute paths point to a static file relative to the Gollum repo's
-root, regardless of where the page file is stored within the directory
-structure. These paths ARE prefixed with a slash. For example:
-
-    /pdfs/gollum.pdf
-    /docs/diagram.png
-
-External paths are full URLs. An external path must begin with either
-"http://" or "https://". For example:
-
-    http://example.com/pdfs/gollum.pdf
-    http://example.com/images/diagram.png
-
-All of the examples in this README use relative paths, but you may use
-whatever works best in your situation.
-
-
-## FILE LINKS
-
-To link to static files that are contained in the Gollum repository you should
-use the Gollum File Link Tag.
-
-    [[Gollum|gollum.pdf]]
-
-The first part of the tag is the link text. The path to the file appears after
-the pipe.
-
-
-## IMAGES
-
-To display images that are contained in the Gollum repository you should use
-the Gollum Image Tag. This will display the actual image on the page.
-
-    [[gollum.png]]
-
-In addition to the simple format, there are a variety of options that you
-can specify between pipe delimiters.
-
-To specify alt text, use the `alt=` option. Default is no alt text.
-
-    [[gollum.png|alt=Gollum and his precious wiki]]
-
-To place the image in a frame, use the `frame` option. When combined with the
-`alt=` option, the alt text will be used as a caption as well. Default is no
-frame.
-
-    [[gollum.png|frame|alt=Gollum and his precious wiki]]
-
-To specify the alignment of the image on the page, use the `align=` option.
-Possible values are `left`, `center`, and `right`. Default is `left`.
-
-    [[gollum.png|align=center]]
-
-To float an image so that text flows around it, use the `float` option. When
-`float` is specified, only `left` and `right` are valid `align` options.
-Default is not floating. When floating is activated but no alignment is
-specified, default alignment is `left`.
-
-    [[gollum.png|float]]
-
-To specify a max-width, use the `width=` option. Units must be specified in
-either `px` or `em`.
-
-    [[gollum.png|width=400px]]
-
-To specify a max-height, use the `height=` option. Units must be specified in
-either `px` or `em`.
-
-    [[gollum.png|height=300px]]
-
-Any of these options may be composed together by simply separating them with
-pipes.
-
-
-## ESCAPING GOLLUM TAGS
-
-If you need the literal text of a wiki or static link to show up in your final
-wiki page, simply preface the link with a single quote (like in LISP):
-
-    '[[Page Link]]
-    '[[File Link|file.pdf]]
-    '[[image.jpg]]
-
-This is useful for writing about the link syntax in your wiki pages.
-
-
-## SYNTAX HIGHLIGHTING
-
-In page files you can get automatic syntax highlighting for a wide range of
-languages (courtesy of [Pygments](http://pygments.org/) - must install
-separately) by using the following syntax:
-
-    ```ruby
-      def foo
-        puts 'bar'
-      end
-    ```
-
-The block must start with three backticks (as the first characters on the
-line). After that comes the name of the language that is contained by the
-block. The language must be one of the `short name` lexer strings supported by
-Pygments. See the [list of lexers](http://pygments.org/docs/lexers/) for valid
-options.
-
-If the block contents are indented two spaces or one tab, then that whitespace
-will be ignored (this makes the blocks easier to read in plaintext).
-
-The block must end with three backticks as the first characters on a
-line.
-
-
-## MATHEMATICAL EQUATIONS
-
-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:
-
-    \[ P(E) = {n \choose k} p^k (1-p)^{ n-k} \]
-
-Inline equations are delimited by `\(` and `\)`. These equations will appear
-inline with regular text. For example:
-
-    The Pythagorean theorum is \( a^2 + b^2 = c^2 \).
-
-Gollum uses [MathJax](http://www.mathjax.org/) to convert the TeX syntax into
-output suitable for display in web browsers.
-
-
-## API DOCUMENTATION
-
-The Gollum API allows you to retrieve raw or formatted wiki content from a Git
-repository, write new content to the repository, and collect various meta data
-about the wiki as a whole.
-
-Initialize the Gollum::Repo object:
-
-    # Require rubygems if necessary
-    require 'rubygems'
-
-    # Require the Gollum library
-    require 'gollum'
-
-    # Create a new Gollum::Wiki object by initializing it with the path to the
-    # Git repository.
-    wiki = Gollum::Wiki.new("my-gollum-repo.git")
-    # => <Gollum::Wiki>
-
-By default, internal wiki links are all absolute from the root. To specify a different base path, you can specify the `:base_path` option:
-
-    wiki = Gollum::Wiki.new("my-gollum-repo.git", :base_path => "/wiki")
-
-Get the latest version of the given human or canonical page name:
-
-    page = wiki.page('page-name')
-    # => <Gollum::Page>
-
-    page.raw_data
-    # => "# My wiki page"
-
-    page.formatted_data
-    # => "<h1>My wiki page</h1>"
-
-    page.format
-    # => :markdown
-
-    vsn = page.version
-    # => <Grit::Commit>
-
-    vsn.id
-    # => '3ca43e12377ea1e32ea5c9ce5992ec8bf266e3e5'
-
-Get the footer (if any) for a given page:
-
-    page.footer
-    # => <Gollum::Page>
-
-Get a list of versions for a given page:
-
-    vsns = wiki.page('page-name').versions
-    # => [<Grit::Commit, <Grit::Commit, <Grit::Commit>]
-
-    vsns.first.id
-    # => '3ca43e12377ea1e32ea5c9ce5992ec8bf266e3e5'
-
-    vsns.first.authored_date
-    # => Sun Mar 28 19:11:21 -0700 2010
-
-Get a specific version of a given canonical page file:
-
-    wiki.page('page-name', '5ec521178e0eec4dc39741a8978a2ba6616d0f0a')
-
-Get the latest version of a given static file:
-
-    file = wiki.file('asset.js')
-    # => <Gollum::File>
-
-    file.raw_data
-    # => "alert('hello');"
-
-    file.version
-    # => <Grit::Commit>
-
-Get a specific version of a given static file:
-
-    wiki.file('asset.js', '5ec521178e0eec4dc39741a8978a2ba6616d0f0a')
-
-Get an in-memory Page preview (useful for generating previews for web
-interfaces):
-
-    preview = wiki.preview_page("My Page", "# Contents", :markdown)
-    preview.formatted_data
-    # => "<h1>Contents</h1>"
-
-Methods that write to the repository require a Hash of commit data that takes
-the following form:
-
-    commit = { :message => 'commit message',
-               :name => 'Tom Preston-Werner',
-               :email => 'tom@github.com' }
-
-Write a new version of a page (the file will be created if it does not already
-exist) and commit the change. The file will be written at the repo root.
-
-    wiki.write_page('Page Name', :markdown, 'Page contents', commit)
-
-Update an existing page. If the format is different than the page's current
-format, the file name will be changed to reflect the new format.
-
-    page = wiki.page('Page Name')
-    wiki.update_page(page, page.name, page.format, 'Page contents', commit)
-
-To delete a page and commit the change:
-
-    wiki.delete_page(page, commit)
-
-
-## CONTRIBUTE
-
-If you'd like to hack on Gollum, start by forking my repo on GitHub:
-
-http://github.com/github/gollum
-
-To get all of the dependencies, install the gem first. The best way to get
-your changes merged back into core is as follows:
-
-1. Clone down your fork
-1. Create a thoughtfully named topic branch to contain your change
-1. Hack away
-1. Add tests and make sure everything still passes by running `rake`
-1. If you are adding new functionality, document it in the README
-1. Do not change the version number, I will do that on my end
-1. If necessary, rebase your commits into logical chunks, without errors
-1. Push the branch up to GitHub
-1. Send a pull request to the github/gollum project.
+Please consider helping out! See [CONTRIBUTING](CONTRIBUTING.md) for information on how to submit issues, and how to start hacking on gollum.
@@ -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
@@ -50,6 +71,7 @@ Rake::TestTask.new(:test) do |test|
  test.libs << 'lib' << 'test' << '.'
  test.pattern = 'test/**/test_*.rb'
  test.verbose = true
+  test.warning = false
 end

 desc "Generate RCov test coverage and open in your browser"
@@ -60,14 +82,6 @@ task :coverage do
  sh "open coverage/index.html"
 end

-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Open an irb session preloaded with this library"
 task :console do
  sh "irb -rubygems -r ./lib/#{name}.rb"
@@ -79,7 +93,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

 #############################################################################
 #
@@ -87,24 +108,36 @@ end
 #
 #############################################################################

+desc 'Create a release build and push to rubygems'
 task :release => :build do
  unless `git branch` =~ /^\* master$/
    puts "You must be on the master branch to release!"
    exit!
  end
  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git pull --rebase origin master"
  sh "git tag v#{version}"
  sh "git push origin master"
  sh "git push origin v#{version}"
  sh "gem push pkg/#{name}-#{version}.gem"
 end

+desc 'Publish to rubygems. Same as release'
+task :publish => :release
+
+desc 'Build gem'
 task :build => :gemspec do
  sh "mkdir -p pkg"
  sh "gem build #{gemspec_file}"
  sh "mv #{gem_file} pkg"
 end

+desc "Build and install"
+task :install => :build do
+  sh "gem install --local --no-document pkg/#{name}-#{version}.gem"
+end
+
+desc 'Update gemspec'
 task :gemspec => :validate do
  # read spec file and split out manifest section
  spec = File.read(gemspec_file)
@@ -122,7 +155,7 @@ task :gemspec => :validate do
    split("\n").
    sort.
    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    reject { |file| file =~ /^(rdoc|pkg|test|Home\.md|\.gitattributes)/ }.
    map { |file| "    #{file}" }.
    join("\n")

@@ -133,6 +166,7 @@ task :gemspec => :validate do
  puts "Updated #{gemspec_file}"
 end

+desc 'Validate lib files and version file'
 task :validate do
  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
  unless libfiles.empty?
@@ -144,3 +178,21 @@ task :validate do
    exit!
  end
 end
+
+desc 'Precompile assets'
+task :precompile do
+  require './lib/gollum/app.rb'
+  Precious::App.set(:environment, :production)
+  env = Precious::Assets.sprockets
+  path = ENV.fetch('GOLLUM_ASSETS_PATH', ::File.join(File.dirname(__FILE__), 'lib/gollum/public/assets'))
+  manifest = Sprockets::Manifest.new(env, path)
+  Sprockets::Helpers.configure do |config|
+    config.environment = env
+    config.prefix      = Precious::Assets::ASSET_URL
+    config.digest      = true
+    config.public_path = path
+    config.manifest    = manifest
+  end
+  puts "Precompiling assets to #{path}..."
+  manifest.compile(Precious::Assets::MANIFEST)
+end
@@ -2,66 +2,217 @@

 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])

-help = <<HELP
-Gollum is a multi-format Wiki Engine/API/Frontend.
-
-Basic Command Line Usage:
-  gollum [OPTIONS] [PATH]
-
-        PATH                         The path to the Gollum repository (default .).
-
-Options:
-HELP
-
 require 'optparse'
 require 'rubygems'
 require 'gollum'
+require 'erb'
+require 'sprockets'

-exec = {}
-options = { 'port' => 4567, 'bind' => '0.0.0.0' }
-wiki_options = {}
+exec         = {}
+options      = {
+  :port => 4567,
+  :bind => '0.0.0.0',
+}
+wiki_options = {
+  :allow_uploads => false,
+  :allow_editing => true,
+}

 opts = OptionParser.new do |opts|
-  opts.banner = help
+  # define program name (although this defaults to the name of the file, just in case...)
+  opts.program_name = 'gollum'

-  opts.on("--port [PORT]", "Bind port (default 4567).") do |port|
-    options['port'] = port.to_i
+  # set basic info for the '--help' command (options will be appended automatically from the below definitions)
+  opts.banner = '
+  Gollum is a multi-format Wiki Engine/API/Frontend.
+
+  Usage:
+      gollum [options] [git-repo]
+
+  Arguments:
+      [git-repo]                     Path to the git repository being served. If not specified, current working directory is used.
+
+  Notes:
+      Paths for all options are relative to <git-repo> unless absolute.
+      This message is only a basic description. For more information, please visit:
+          https://github.com/gollum/gollum
+
+  OPTIONS'
+
+  # define gollum options
+  opts.separator ''
+  opts.separator '  Major:'
+
+  opts.on('-h', '--host [HOST]', 'Specify the hostname or IP address to listen on. Default: \'0.0.0.0\'.') do |host|
+    options[:bind] = host
+  end
+  opts.on('-p', '--port [PORT]', 'Specify the port to bind Gollum with. Default: \'4567\'.') do |port|
+    begin
+      # don't use 'port.to_i' here... it doesn't raise errors which might result in a nice confusion later on
+      options[:port] = Integer(port)
+    rescue ArgumentError
+      puts "Error: '#{port}' is not a valid port number."
+      exit 1
+    end
+  end
+  opts.on('-c', '--config [FILE]', 'Specify path to the Gollum\'s configuration file.') do |file|
+    options[:config] = file
+  end
+  opts.on('-r', '--ref [REF]', 'Specify the branch to serve. Default: \'master\'.') do |ref|
+    wiki_options[:ref] = ref
+  end
+  opts.on("--bare", "Declare '<git-repo>' to be bare.") do
+    wiki_options[:repo_is_bare] = true
+  end
+  opts.on('-a', '--adapter [ADAPTER]', 'Launch Gollum using a specific git adapter. Default: \'rugged\'.') do |adapter|
+    Gollum::GIT_ADAPTER = adapter
+  end
+  opts.on('-b', '--base-path [PATH]', 'Specify the leading portion of all Gollum URLs (path info). Default: \'/\'.',
+    'Example: setting this to \'/wiki\' will make the wiki accessible under \'http://localhost:4567/wiki/\'.') do |base_path|
+
+    # first trim a leading slash, if any
+    base_path.sub!(/^\/+/, '')
+
+    # make a backup of the option and sanitize it
+    base_path_original = base_path.dup
+    base_path = ERB::Util.url_encode(base_path)
+    base_path.gsub!('%2F', '/')
+
+    # then let the user know if we changed the URL
+    unless base_path_original == base_path
+      puts <<MSG
+Warning: your base-path has been sanitized:
+  - original: "#{base_path_original}"
+  - sanitized: "#{base_path}"
+MSG
+    end
+
+    # and finally, let others enjoy our hard work:
+    wiki_options[:base_path] = base_path unless base_path.empty?
+  end
+  opts.on('--page-file-dir [PATH]', 'Specify the subdirectory for all pages. Default: repository root.',
+    'Example: setting this to \'pages\' will make Gollum serve only pages at \'<git-repo>/pages/*\'.') do |path|
+    wiki_options[:page_file_dir] = path
+  end
+  opts.on('--static', 'Use static assets. Defaults to false in development/test, defaults to true in production/staging.') do
+    wiki_options[:static] = true
+  end
+  opts.on('--no-static', 'Do not use static assets (even when in production/staging).') do
+    wiki_options[:static] = false
+  end
+  opts.on('--assets [PATH]', 'Set the path to look for static assets. Only used if --static is set to true, or environment is production/staging. Default: ./public/assets') do |path|
+    wiki_options[:static_assets_path] = path
+  end
+  opts.on('--css', 'Inject custom CSS into each page. The \'<wiki-root>/custom.css\' file is used (must be committed).') do
+    wiki_options[:css] = true
+  end
+  opts.on('--js', 'Inject custom JavaScript into each page. The \'<wiki-root>/custom.js\' file is used (must be committed).') do
+    wiki_options[:js] = true
+  end
+  opts.on('--no-edit', 'Disable the feature of editing pages.')  do
+    wiki_options[:allow_editing] = false
+  end
+  opts.on('--follow-renames', 'Follow pages across renames in the History view. Default: true.') do
+    wiki_options[:follow_renames] = true
+  end
+  opts.on('--no-follow-renames', 'Do not follow pages across renames in the History view.') do
+    wiki_options[:follow_renames] = false
+  end
+  opts.on('--allow-uploads [MODE]', [:dir, :page], 'Enable file uploads.',
+    'If set to \'dir\', Gollum will store all uploads in the \'<git-repo>/uploads/\' directory.',
+    'If set to \'page\', Gollum will store uploads per page in \'<git-repo>/uploads/[pagename]\'.') do |mode|
+    wiki_options[:allow_uploads]    = true
+    wiki_options[:per_page_uploads] = true if mode == :page
+  end
+  opts.on('--mathjax', 'Enable MathJax (renders mathematical equations).',
+    'By default, uses the \'TeX-AMS-MML_HTMLorMML\' config with the \'autoload-all\' extension.') do
+    wiki_options[:mathjax] = true
+    wiki_options[:mathjax_config] = 'mathjax.config.js'
+  end
+  opts.on('--critic-markup', 'Enable support for annotations using CriticMarkup.') do
+    wiki_options[:critic_markup] = true
+  end
+  opts.on('--irb', 'Launch Gollum in \'console mode\', with a predefined API.') do
+    options[:irb] = true
  end

-  opts.on("--host [HOST]", "Hostname or IP address to listen on (default 0.0.0.0).") do |host|
-    options['bind'] = host
-  end
+  opts.separator ''
+  opts.separator '  Minor:'

-  opts.on("--version", "Display current version.") do
-    puts "Gollum " + Gollum::VERSION
+  opts.on('--h1-title', 'Use the first \'<h1>\' as page title.') do
+    wiki_options[:h1_title] = true
+  end
+  opts.on('--no-display-metadata', 'Do not render metadata tables in pages.') do
+    wiki_options[:display_metadata] = false
+  end
+  opts.on('--user-icons [MODE]', [:gravatar, :identicon], 'Use specific user-icons for history view.',
+    'Can be set to \'gravatar\' or \'identicon\'. Default: standard avatar.') do |mode|
+    wiki_options[:user_icons] = mode.to_s
+  end
+  opts.on('--template-dir [PATH]', 'Specify custom mustache template directory.') do |path|
+    wiki_options[:template_dir] = path
+  end
+  opts.on('--template-page', 'Use _Template.{ext} as a template for new pages.') do
+    wiki_options[:template_page] = true
+  end
+  opts.on('--lenient-tag-lookup', 'Internal links resolve case-insensitively, will treat spaces as hyphens, and will match the first page found with a certain filename, anywhere in the repository. Provides compatibility with Gollum 4.x.') do
+    wiki_options[:case_insensitive_tag_lookup] = true
+    wiki_options[:global_tag_lookup] = true
+    wiki_options[:hyphened_tag_lookup] = true
+  end
+  opts.on('--emoji', 'Parse and interpret emoji tags (e.g. :heart:) except when the leading colon is backslashed (e.g. \\:heart:).') do
+    wiki_options[:emoji] = true
+  end
+  opts.separator ''
+  opts.separator '  Common:'
+
+  opts.on('--help', 'Display this message.') do
+    puts opts
+    exit 0
+  end
+  opts.on('--version', 'Display the current version of Gollum.') do
+    puts 'Gollum ' + Gollum::VERSION
+    exit 0
+  end
+  opts.on('--versions', 'Display the current version of Gollum and auxiliary gems.') do
+    require 'gollum-lib'
+    puts 'Gollum ' + Gollum::VERSION
+    puts "Running on: #{RUBY_PLATFORM} with Ruby version #{RUBY_VERSION}"
+    puts 'Using:'
+    loaded_gemspecs =  Gem.loaded_specs
+    gollum_gems = ['gollum-lib', 'gollum-rjgit_adapter', 'rjgit', 'gollum-rugged_adapter', 'rugged']
+    puts Gem.loaded_specs.select{|name, spec| gollum_gems.include?(name)}.map {|name, spec| "#{name} #{spec.version}"}
+    puts "Markdown rendering gem: #{GitHub::Markup::Markdown.implementation_name}"
+    puts 'Other renderering gems:'
+    renderer_gems = ['RedCloth', 'org-ruby', 'creole', 'asciidoctor', 'wikicloth']
+    renderer_gems.each do |renderer|
+      begin
+        require renderer
+      rescue LoadError
+      end
+    end
+    results = Gem.loaded_specs.select{|name, spec| renderer_gems.include?(name)}.map {|name, spec| "#{name} #{spec.version}"}
+    puts results.empty? ? 'none' : results
    exit 0
  end

-  opts.on("--config [CONFIG]", "Path to additional configuration file") do |config|
-    options['config'] = config
-  end

-  opts.on("--irb", "Start an irb process with gollum loaded for the current wiki.") do
-    options['irb'] = true
-  end
-
-  opts.on("--page-file-dir [PATH]", "Specify the sub directory for all page files (default: repository root).") do |path|
-    wiki_options[:page_file_dir] = path
-  end
+  opts.separator ''
 end

 # Read command line options into `options` hash
 begin
  opts.parse!
-rescue OptionParser::InvalidOption
-  puts "gollum: #{$!.message}"
-  puts "gollum: try 'gollum --help' for more information"
+rescue OptionParser::InvalidOption => e
+  puts "gollum: #{e.message}"
+  puts 'gollum: try \'gollum --help\' for more information'
  exit
 end

+# --gollum-path wins over ARGV[0]
 gollum_path = ARGV[0] || Dir.pwd

-if options['irb']
+if options[:irb]
  require 'irb'
  # http://jameskilton.com/2009/04/02/embedding-irb-into-your-ruby-application/
  module IRB # :nodoc:
@@ -87,36 +238,56 @@ if options['irb']
  end

  begin
+    require 'gollum-lib'
    wiki = Gollum::Wiki.new(gollum_path, wiki_options)
-    if !wiki.exist? then raise Grit::InvalidGitRepositoryError end
-    puts "Loaded Gollum wiki at #{File.expand_path(gollum_path).inspect}."
+    if !wiki.exist? then
+      raise Gollum::InvalidGitRepositoryError
+    end
+
    puts
+    puts 'Loaded Gollum wiki at:'
+    puts "#{File.expand_path(gollum_path).inspect}"
+    puts
+    puts 'Example API calls:'
    puts %(    page = wiki.page('page-name'))
    puts %(    # => <Gollum::Page>)
    puts
    puts %(    page.raw_data)
-    puts %(    # => "# My wiki page")
+    puts %(    # => '# My wiki page')
    puts
    puts %(    page.formatted_data)
-    puts %(    # => "<h1>My wiki page</h1>")
+    puts %(    # => '<h1>My wiki page</h1>')
+    puts
+    puts 'Full API documentation at:'
+    puts 'https://github.com/gollum/gollum-lib'
    puts
-    puts "Check out the Gollum README for more."
    IRB.start_session(binding)
-  rescue Grit::InvalidGitRepositoryError, Grit::NoSuchPathError
+  rescue Gollum::InvalidGitRepositoryError, Gollum::NoSuchPathError
    puts "Invalid Gollum wiki at #{File.expand_path(gollum_path).inspect}"
    exit 0
  end
 else
-  require 'gollum/frontend/app'
+  require 'gollum/app'
+  Precious::App.set(:environment, ENV.fetch('RACK_ENV', :production).to_sym)
  Precious::App.set(:gollum_path, gollum_path)
  Precious::App.set(:wiki_options, wiki_options)
+  Precious::App.settings.mustache[:templates] = wiki_options[:template_dir] if wiki_options[:template_dir]

-  if cfg = options['config']
+  if cfg = options[:config]
    # If the path begins with a '/' it will be considered an absolute path,
    # otherwise it will be relative to the CWD
    cfg = File.join(Dir.getwd, cfg) unless cfg.slice(0) == File::SEPARATOR
    require cfg
  end

-  Precious::App.run!(options)
+  base_path = wiki_options[:base_path]
+
+  if base_path.nil?
+    Precious::App.run!(options)
+  else
+    require 'rack'
+
+    # Rack::Handler does not work with Ctrl + C. Use Rack::Server instead.
+    Rack::Server.new(:app => Precious::MapGollum.new(base_path), :Port => options[:port], :Host => options[:bind]).start
+  end
 end
@@ -0,0 +1,271 @@
+#!/usr/bin/env ruby
+#coding:utf-8
+require 'optparse'
+require 'pathname'
+require 'rubygems'
+
+wiki_options = {}
+options = {}
+
+migrate_options = {
+  :hyphenate => true
+}
+
+def setting(const)
+  Object.const_defined?(const.upcase) && Object.const_get(const.upcase)
+end
+
+opts = OptionParser.new do |opts|
+opts.banner = <<EOF
+Use this tool to migrate a wiki repository created under Gollum versions 4.x or earlier to a 5.x compatibile repo.
+It finds and repairs Gollum link tags that no longer work under 5.x for three reasons:
+
+* 5.x wiki internal links may contain spaces. [[Bilbo Baggins]] and [[Bilbo-Baggins]] therefore link to distinct pages.
+* 5.x wiki internal links are case senitive
+* 5.x wiki internal links are no longer 'global'.
+
+* NB: you can use the --lenient-tag-lookup option in gollum >= 5.x to enable 4.x-backwards compatible tags.
+  
+See https://github.com/gollum/gollum/wiki/5.0-release-notes#filename-handling for more information.
+Usage of this script comes without any warranty.
+
+Usage: gollum-migrate-tags /path/to/repo
+
+NB: without the --write flag, this will be a 'dry run' that doesn't actually make any changes, but outputs the changes that would be made.
+
+You can use the --page-file-dir and --config options as you would normally with gollum.
+
+Requires a non-bare repository. Recommended usage:
+
+1. Clone your wiki's repository to create a backup.
+2. Run this script on your cloned repo. 
+3. If all looks sane, run the script with the --write option. This will overwrite files in your working directory, but not commit the changes, so you have time to review them.
+4. Do a 'git diff' to inspect the changes.
+5. Commit the changes if all looks sane, and push/pull them back into your original repo.
+
+Options:
+EOF
+  opts.on('-c', '--config [FILE]', 'Specify path to the Gollum\'s configuration file.') do |file|
+    options[:config] = file
+  end
+
+  opts.on('--page-file-dir [PATH]', 'Specify the subdirectory for all pages. Default: repository root.') do |path|
+    wiki_options[:page_file_dir] = path
+  end
+    
+  opts.on('--prefer-relative-links', 'When specified, will try to replace broken links with relative links (\'[[Foo/Bar]]\' instead of \'[[/Subdir/Foo/Bar]]\') where possible.') do
+    migrate_options[:prefer_relative] = true
+  end
+  
+  opts.on('--hyphenate', 'Default. Repair links that use spaces instead of hyphens: [[Bilbo Baggins]] -> [[Bilbo-Baggins]]') do
+    migrate_options[:hyphenate] = true
+  end
+  
+  opts.on('--no-hyphenate', 'Turn off the --hyphenate option.') do
+    migrate_options[:hyphenate] = false
+  end
+  
+  opts.on('--run-silent', 'Don\'t output anything.') do
+    migrate_options[:run_silent] = true
+  end
+  
+  opts.on('--write', 'No dry run: actually perform the substitutions.') do
+    migrate_options[:no_dry_run] = true
+  end
+end
+
+# Read command line options into `options` hash
+begin
+  opts.parse!
+  migrate_options.each do |setting, value|
+    const = setting.to_s.upcase
+    Object.const_set(const, value) unless Object.const_defined?(const)
+  end
+  wiki_options[:page_file_dir] = setting(:page_file_dir) ? setting(:page_file_dir) : wiki_options[:page_file_dir] # Allow settings :page_file_dir through PAGE_FILE_DIR constant.
+rescue OptionParser::InvalidOption
+  puts "gollum-migrate-tags: #{$!.message}"
+  puts "gollum-migrate-tags: try 'gollum-migrate-tags --help' for more information"
+  exit
+end
+
+REPO = ARGV[0] || Dir.pwd
+
+require 'gollum-lib'
+
+if cfg = options[:config]
+  # If the path begins with a '/' it will be considered an absolute path,
+  # otherwise it will be relative to the CWD
+  cfg = File.join(Dir.getwd, cfg) unless cfg.slice(0) == File::SEPARATOR
+  require cfg
+end
+  
+class Gollum::Filter::CodeMigrator < Gollum::Filter::Code
+  def extract(data)
+    case @markup.format
+    when :asciidoc
+      data.gsub!(/^(\[source,([^\r\n]*)\]\n)?----\n(.+?)\n----$/m) do
+        cache_codeblock($~.to_s)
+      end
+    when :org
+      org_headers = %r{([ \t]*#\+HEADER[S]?:[^\r\n]*\n)*}
+      org_name = %r{([ \t]*#\+NAME:[^\r\n]*\n)?}
+      org_lang = %r{[ ]*([^\n \r]*)[ ]*[^\r\n]*}
+      org_begin = %r{([ \t]*)#\+BEGIN_SRC#{org_lang}\r?\n}
+      org_end = %r{\r?\n[ \t]*#\+END_SRC[ \t\r]*}
+      data.gsub!(/^#{org_headers}#{org_name}#{org_begin}(.+?)#{org_end}$/mi) do
+        cache_codeblock($~.to_s)
+      end
+    when :markdown
+      data.gsub!(/^([ ]{0,3})(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n[ ]{0,3}(~~~+)[ \t\r]*$/m) do
+        m_indent = Regexp.last_match[1]
+        m_start  = Regexp.last_match[2] # ~~~
+        m_lang   = Regexp.last_match[3]
+        m_code   = Regexp.last_match[4]
+        m_end    = Regexp.last_match[5] # ~~~
+        # The closing code fence must be at least as long as the opening fence
+        next '' if m_end.length < m_start.length
+        lang = m_lang ? m_lang.strip.split.first : nil
+        cache_codeblock($~.to_s)
+      end  
+    end
+
+    data.gsub!(/^([ ]{0,3})``` ?([^\r\n]+)?\r?\n(.+?)\r?\n[ ]{0,3}```[ \t]*\r?$/m) do
+      cache_codeblock($~.to_s)
+    end
+    data
+  end
+  
+  def process(data)
+    return data if data.nil? || data.size.zero? || @map.size.zero?
+    @map.each do |id, block| ## Just put the code blocks back in verbatim
+      data.gsub!(id, block)
+    end
+    data
+  end
+  
+  def cache_codeblock(block)
+    id = "#{open_pattern}#{Digest::SHA1.hexdigest(block)}#{close_pattern}"
+    @map[id] = block
+    id
+  end
+end
+  
+class ::Gollum::Filter::TagMigrator < Gollum::Filter::Tags
+  def process_tag(tag)
+    link_part, extra = parse_tag_parts(tag)
+    orig_tag = %{[[#{tag}]]}
+    return orig_tag if link_part.nil?
+    
+    img_args = extra ? [extra, link_part] : [link_part]
+    mime = MIME::Types.type_for(::File.extname(img_args.first.to_s)).first
+    
+    # For any kind of tag other than an internal link: just return the tag.
+    if tag =~ /^_TOC_/ || link_part =~ /^_$/ || link_part =~ /^#{INCLUDE_TAG}/ || (mime && mime.content_type =~ /^image/) || process_external_link_tag(link_part, extra) || process_file_link_tag(link_part, extra)
+      return orig_tag
+    end
+
+    # Try to resolve it as an internal Page link tag.
+    link = link_part
+    page = find_page_or_file_from_path(link)
+    anchor = nil
+    
+    if page.nil? # No match yet, now try finding the page with anchor removed
+      if pos = link.rindex('#')
+        anchor = link[pos..-1]
+        link  = link[0...pos]
+      end
+
+      if link.empty? && anchor # Internal anchor link, don't search for the page but return the original tag
+        return orig_tag
+      end
+
+      page  = find_page_or_file_from_path(link)
+    end
+
+    if page
+      # Great, the link is not broken. Return the original tag.
+      return orig_tag
+    else
+      possibles = find_linked(link)
+      if possibles.empty?
+        log(:info, "Found no candidates for broken link: #{orig_tag}")
+        return orig_tag
+      else
+        if possibles.size > 1
+          log(:empty)
+          log(:warn, "Found multiple possibilities for the link '#{orig_tag}':")
+          possibles.map! {|p| Pathname.new(p)}
+          possibles.sort!
+          possibles.each{|p| log(:none, "* #{p}")}
+          log(:warn,"Picking #{possibles.first}")
+          log(:empty)
+        end
+        pick = possibles.first
+        return tag_for_pick(pick, orig_tag, extra, anchor, @markup.page.path)
+      end
+        
+    end
+  end
+  
+  private
+  
+  def tag_for_pick(pick, orig_tag, extra, anchor, linking_page_path)
+    pick = if setting(:prefer_relative)
+      overlapping_path = Pathname.new(linking_page_path).dirname.to_s
+      overlapping_path = overlapping_path == '.' ? '' : ::File.join('/', overlapping_path)
+      relative_path = pick.to_s.match(/^#{overlapping_path}\/(.+)/)
+      relative_path ? relative_path[1] : pick
+    else
+      pick
+    end
+    new_tag = extra.nil? ? %{[[#{pick}#{anchor}]]} : %{[[#{extra}|#{pick}#{anchor}]]}
+    log(:info, "#{@markup.page.path}: Changing #{orig_tag} -> #{new_tag}")
+    new_tag    
+  end
+end
+
+class ::Gollum::Filter::PlainTextMigrator < Gollum::Filter::PlainText
+  def extract(data)
+    data
+  end
+end
+
+filter_chain = [:PlainTextMigrator, :CodeMigrator, :TagMigrator]
+
+wiki = ::Gollum::Wiki.new(REPO, wiki_options.merge({:filter_chain => filter_chain}))
+TREE = wiki.tree_list(wiki.ref, true, true).map {|file| ::File.join('/', file.path)}
+
+def find_linked(link)
+  link.gsub!(' ', '-') if setting(:hyphenate) # Match paths containing dashes instead of spaces
+  # If the link has no explicit file extension, test against the link + the '.' character.
+  # This is to avoid that 'Samwi' matches 'Samwise.md'
+  # If it has an explicit file extension ('Samwi.md'), just test against that.
+  test_path = ::File.extname(link).empty? ? /#{link}\..+/ : link
+  # Select pages from the wiki whose path =~ 'Foo/Bar/Samwi.*'
+  # Match case-insenstively to mimic 4.x behavior!
+  TREE.select {|path| path =~ /^\/(.*\/)?#{test_path}/i}
+end
+
+def log(kind, msg = nil)
+  unless setting(:run_silent)
+    if kind == :none
+      puts msg
+    elsif kind == :empty
+      puts
+    else
+    puts "[#{kind.to_s.upcase}] #{msg}"
+    end
+  end
+end
+
+wiki.pages.each do |page|
+  log(:info,"Page #{page.path}")
+  new_data = page.formatted_data
+  if setting(:no_dry_run)
+    path = ::File.join(wiki.path, page.path)
+    f = File.new(path, 'w')
+    f.write(new_data)
+    f.close
+  end
+  log(:none, '====')
+end
@@ -0,0 +1,11 @@
+=begin
+This file can be used to (e.g.):
+- alter certain inner parts of Gollum,
+- extend it with your stuff.
+
+It is especially useful for customizing supported formats/markups. For more information and examples:
+- https://github.com/gollum/gollum#config-file
+
+=end
+
+# enter your Ruby code here ...
@@ -0,0 +1,12 @@
+=begin
+You should use this file, if you wish to:
+- launch Gollum as a Rack app,
+- alter certain startup behaviour of Gollum.
+
+For more information and examples:
+- https://github.com/gollum/gollum/wiki/Gollum-via-Rack
+- https://github.com/gollum/gollum#config-file
+
+=end
+
+# enter your Ruby code here ...
@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+#
+# Distributed under the terms of the MIT License.
+#
+# Author: Sam Baskinger <basking2@yahoo.com>
+#
+# Description: gollum-post is an example script that shows how 
+#              to post a file to Gollum. This may be used
+#              to build scripts around CI/CD pipelines that 
+#              publish their documentation to Gollum.
+#
+
+require 'uri'
+require 'mechanize'
+require 'digest'
+
+GOLLUM=URI('https://mygollum.server')
+
+m = Mechanize.new()
+
+page="TestPage"
+path="/automated/docs"
+format="asciidoc"
+content="""
+= This is #{page}
+
+This page is automatically generated.
+"""
+message='Posting current documentation.'
+
+# Check if the page exists.
+p = m.get("#{GOLLUM}#{path}/#{page}")
+
+# If we were redirected to the creat page...
+if p.uri.to_s =~ /\/gollum\/create/
+
+  # ... then create the page.
+  p = m.post("#{GOLLUM}/gollum/create",
+             'keybinding' => 'default',
+             'page' => page,
+             'path' => path,
+             'format' => 'asciidoc',
+             'message' => 'Publish bot.',
+             'content' => content)
+else
+  # ... else, get the previous content and update it.
+  p = m.get("#{GOLLUM}/gollum/edit#{path}/#{page}")
+
+  # Get the previous content. You _could_ check if this is unchanged at this 
+  # step and post nothing.
+  previous_content = p.xpath('//textarea[@id="gollum-editor-body"]')[0].text
+
+  # The previous ETag is the Git SHA-1. We need this to replace the previous contents.
+  prev_etag = Digest::SHA1.hexdigest("blob #{previous_content.length}\0#{previous_content}")
+
+  # Post the updated document using the ETag of the previous document to avoid collisions.
+  p = m.post("#{GOLLUM}/gollum/edit#{path}/#{page}",
+             'keybinding' => 'default',
+             'page' => page,
+             'path' => path,
+             'format' => 'asciidoc',
+             'message' => message,
+             'etag' => prev_etag,
+             'content' => content)
+end
+
@@ -0,0 +1,3 @@
+GOLLUM_USER=gollum
+GOLLUM_BASE=/home/gollum/wiki
+GOLLUM_OPTS="--config /home/gollum/config.rb"
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Distributed under the terms of the MIT License
+
+NAME=gollum
+PID=/var/run/${NAME}.pid
+EXEC=/usr/local/bin/gollum
+LOG=/var/log/gollum.log
+
+depend() {
+	need net
+}
+
+start() {
+	# Change log file to be owned by GOLLUM_USER
+	touch "${LOG}"
+	chown "${GOLLUM_USER}" "${LOG}"
+
+	ebegin "Starting Gollum"
+	start-stop-daemon --start \
+		--name "${NAME}" \
+		--user "${GOLLUM_USER}" \
+		--pidfile "${PID}" \
+		--make-pidfile --background \
+		--stderr "${LOG}" \
+		--exec "${EXEC}" -- $GOLLUM_OPTS "$GOLLUM_BASE"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Gollum"
+	start-stop-daemon --stop \
+		--name "${NAME}" \
+		--user "${GOLLUM_USER}" \
+		--pidfile "${PID}"
+	eend $?
+}
@@ -0,0 +1,12 @@
+[Unit]
+Description=Gollum wiki server
+After=network.target
+
+[Service]
+Type=simple
+User=%i
+ExecStart=/usr/bin/gollum
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
@@ -0,0 +1,79 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          gollum
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# X-Interactive:     true
+# Short-Description: Start/stop gollum wiki
+### END INIT INFO
+
+# Distributed under the terms of the MIT License
+
+set -e
+
+# Edit these settings to your liking:
+GOLLUM_USER=gollum
+GOLLUM_BASE=/var/lib/gollum/.git
+GOLLUM_OPTS="--bare"
+
+NAME=gollum
+PID=/var/run/${NAME}.pid
+EXEC=/usr/local/bin/gollum
+LOG=/var/log/gollum.log
+
+. /lib/lsb/init-functions
+
+start ()
+{
+    # Change log file to be owned by GOLLUM_USER
+    touch "${LOG}"
+    chown "${GOLLUM_USER}" "${LOG}"
+
+    log_daemon_msg "Starting Gollum"
+    start-stop-daemon --start \
+        --name "${NAME}" \
+        --user "${GOLLUM_USER}" \
+        --chuid "${GOLLUM_USER}" \
+        --pidfile "${PID}" \
+        --make-pidfile --background \
+        --startas /bin/sh -- -c "exec ${EXEC} $GOLLUM_OPTS \"$GOLLUM_BASE\" > \"${LOG}\" 2>&1"
+    log_end_msg $?
+}
+
+stop ()
+{
+    log_daemon_msg "Stopping Gollum"
+    start-stop-daemon --stop \
+        --user "${GOLLUM_USER}" \
+        --signal INT \
+        --pidfile "${PID}" \
+        --retry 10
+    log_end_msg $?
+}
+
+status ()
+{
+    status_of_proc -p $PID $EXEC $NAME
+}
+
+case $1 in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    status)
+        status
+        ;;
+    *)
+        log_success_msg "Usage: $0 {start|stop|restart|status}"
+        exit 1
+        ;;
+esac
@@ -1,32 +0,0 @@
-Sanitization Rules
-==================
-
-Gollum uses the [Sanitize](http://wonko.com/post/sanitize) gem for HTML
-sanitization.
-
-See `lib/gollum.rb` for actual settings.
-
-## ALLOWED TAGS
-
-a, abbr, acronym, address, area, b, big, blockquote, br, button, caption,
-center, cite, code, col, colgroup, dd, del, dfn, dir, div, dl, dt, em,
-fieldset, font, form, h1, h2, h3, h4, h5, h6, hr, i, img, input, ins, kbd,
-label, legend, li, map, menu, ol, optgroup, option, p, pre, q, s, samp,
-select, small, span, strike, strong, sub, sup, table, tbody, td, textarea,
-tfoot, th, thead, tr, tt, u, ul, var
-
-## ALLOWED ATTRIBUTES
-
-abbr, accept, accept-charset, accesskey, action, align, alt, axis, border,
-cellpadding, cellspacing, char, charoff, charset, checked, cite, class, clear,
-cols, colspan, color, compact, coords, datetime, dir, disabled, enctype, for,
-frame, headers, height, href, hreflang, hspace, id, ismap, label, lang,
-longdesc, maxlength, media, method, multiple, name, nohref, noshade, nowrap,
-prompt, readonly, rel, rev, rows, rowspan, rules, scope, selected, shape,
-size, span, src, start, summary, tabindex, target, title, type, usemap,
-valign, value, vspace, width
-
-## ALLOWED PROTOCOLS
-
-a href: http, https, mailto
-img src: http, https
@@ -1,43 +1,36 @@
+# ~*~ encoding: utf-8 ~*~
 # stdlib
 require 'digest/md5'
+require 'digest/sha1'
 require 'ostruct'

 # external
-require 'grit'
 require 'github/markup'
-require 'sanitize'
-
-# ruby 1.8 compatibility
-require 'gollum/ruby1.8'
+require 'rhino' if RUBY_PLATFORM == 'java'

 # internal
-require 'gollum/git_access'
-require 'gollum/committer'
-require 'gollum/pagination'
-require 'gollum/blob_entry'
-require 'gollum/wiki'
-require 'gollum/page'
-require 'gollum/file'
-require 'gollum/markup'
-require 'gollum/albino'
-require 'gollum/sanitization'
+require File.expand_path('../gollum/uri_encode_component', __FILE__)

 module Gollum
-  VERSION = '1.2.0'
+  VERSION = '5.2.2'

-  class Error < StandardError; end
+  def self.assets_path
+    ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
+  end
+  
+  class TemplateFilter
+    @@filters = {}

-  class DuplicatePageError < Error
-    attr_accessor :dir
-    attr_accessor :existing_path
-    attr_accessor :attempted_path
+    def self.add_filter(pattern, &replacement)
+      @@filters[pattern] = replacement
+    end

-    def initialize(dir, existing, attempted, message = nil)
-      @dir            = dir
-      @existing_path  = existing
-      @attempted_path = attempted
-      super(message || "Cannot write #{@dir}/#{@attempted_path}, found #{@dir}/#{@existing_path}.")
+    def self.apply_filters(data)
+      @@filters.each do |pattern, replacement|
+        data.gsub!(pattern, replacement.call)
+      end
+      data
    end
  end
-end

+end
@@ -1,5 +0,0 @@
-require 'albino/multi'
-
-class Gollum::Albino < Albino::Multi
-  self.bin = ::Albino::Multi.bin
-end
@@ -0,0 +1,686 @@
+# ~*~ encoding: utf-8 ~*~
+require 'cgi'
+require 'sinatra'
+require 'sinatra/namespace'
+require 'gollum-lib'
+require 'mustache/sinatra'
+require 'json'
+require 'sprockets'
+require 'sprockets-helpers'
+require 'octicons'
+require 'sass'
+require 'pathname'
+
+require 'gollum'
+require 'gollum/assets'
+require 'gollum/views/helpers'
+require 'gollum/views/layout'
+require 'gollum/views/editable'
+require 'gollum/views/has_page'
+require 'gollum/views/has_user_icons'
+require 'gollum/views/pagination'
+require 'gollum/views/rss.rb'
+
+require File.expand_path '../helpers', __FILE__
+
+#required to upload bigger binary files
+Gollum::set_git_timeout(120)
+Gollum::set_git_max_filesize(190 * 10**6)
+
+# Run the frontend, based on Sinatra
+#
+# There are a number of wiki options that can be set for the frontend
+#
+# Example
+# require 'gollum/app'
+# Precious::App.set(:wiki_options, {
+#     :universal_toc => false,
+# }
+#
+# See the wiki.rb file for more details on wiki options
+
+module Precious
+  
+  # For use with the --base-path option.
+  class MapGollum
+    def initialize(base_path)
+      @mg = Rack::Builder.new do
+
+        map "/#{base_path}" do
+          run Precious::App
+        end
+        map '/' do
+          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+        end
+        map '/*' do
+          run Proc.new { [302, { 'Location' => "/#{base_path}" }, []] }
+        end
+
+      end
+    end
+
+    def call(env)
+      @mg.call(env)
+    end
+  end
+  
+  class App < Sinatra::Base
+    register Mustache::Sinatra
+    register Sinatra::Namespace
+    include Precious::Helpers
+    
+    dir = File.dirname(File.expand_path(__FILE__))
+
+    set :sprockets, ::Precious::Assets.sprockets(dir)
+
+    set :default_markup, :markdown
+
+    set :mustache, {
+        # Tell mustache where the Views constant lives
+        :namespace => Precious,
+
+        # Mustache templates live here
+        :templates => "#{dir}/templates",
+
+        # Tell mustache where the views are
+        :views     => "#{dir}/views"
+    }
+
+    # Sinatra error handling
+    configure :development, :staging do
+      enable :show_exceptions, :dump_errors
+      disable :raise_errors, :clean_trace
+    end
+
+    configure :test do
+      enable :logging, :raise_errors, :dump_errors
+    end
+
+    before do
+      settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true)
+      @allow_editing = settings.wiki_options[:allow_editing]
+      @critic_markup = settings.wiki_options[:critic_markup]
+      @redirects_enabled = settings.wiki_options.fetch(:redirects_enabled, true)
+      @per_page_uploads = settings.wiki_options[:per_page_uploads]
+      
+      @wiki_title = settings.wiki_options.fetch(:title, 'Gollum Wiki')
+
+      forbid unless @allow_editing || request.request_method == 'GET'
+      Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir]
+
+      @base_url = url('/', false).chomp('/').force_encoding('utf-8')
+      @page_dir = settings.wiki_options[:page_file_dir].to_s
+
+      # above will detect base_path when it's used with map in a config.ru
+      settings.wiki_options.merge!({ :base_path => @base_url })
+      @css = settings.wiki_options[:css]
+      @js  = settings.wiki_options[:js]
+      @mathjax_config = settings.wiki_options[:mathjax_config]
+
+      @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
+      @static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
+      @mathjax_path = ::File.join(File.dirname(__FILE__), 'public/gollum/javascript/MathJax')
+      
+      Sprockets::Helpers.configure do |config|
+        config.environment = settings.sprockets
+        config.environment.context_class.class_variable_set(:@@base_url, @base_url)
+        config.prefix      = "#{@base_url}/#{Precious::Assets::ASSET_URL}"
+        config.digest      = @use_static_assets
+        if @use_static_assets
+          config.public_path = @static_assets_path
+          config.manifest = Sprockets::Manifest.new(settings.sprockets, @static_assets_path)
+        end
+      end
+    end
+
+    get '/' do
+      redirect clean_url(::File.join(@base_url, wiki_new.index_page))
+    end
+
+    namespace '/gollum' do
+      get '/feed/' do
+        url = "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}"
+        changes = wiki_new.latest_changes(::Gollum::Page.log_pagination_options(
+          per_page: settings.wiki_options.fetch(:pagination_count, 10),
+          page_num: 0)
+        )
+        content_type :rss
+        RSSView.new(@base_url, @wiki_title, url, changes).render
+      end
+
+      get '/assets/mathjax/*' do
+        env['PATH_INFO'].sub!('/gollum/assets/mathjax', '')
+        Rack::Static.new(not_found_proc, {:root => @mathjax_path, :urls => ['']}).call(env)
+      end
+
+      get '/assets/*' do
+        env['PATH_INFO'].sub!("/#{Precious::Assets::ASSET_URL}", '')
+        if @use_static_assets
+          env['PATH_INFO'].sub!(Sprockets::Helpers.prefix, '') if @base_url
+          Rack::Static.new(not_found_proc, {:root => @static_assets_path, :urls => ['']}).call(env)
+        else
+          settings.sprockets.call(env)
+        end
+      end
+
+      get '/last_commit_info' do
+        content_type :json
+        if page = wiki_page(params[:path]).page
+          version = page.last_version
+          {:author => version.author.name, :date => version.authored_date}.to_json
+        end
+      end
+
+      get '/emoji/:name' do
+        begin
+          [200, {'Content-Type' => 'image/png'}, emoji(params['name'])]
+        rescue ArgumentError
+          not_found
+        end
+      end
+
+      get '/data/*' do
+        if page = wiki_page(params[:splat].first).page
+          page.raw_data
+        end
+      end
+
+      get %r{/(edit|create)/(\.redirects.gollum|(custom|mathjax\.config)\.(js|css))} do
+        forbid('Changing this resource is not allowed.')
+      end
+
+      post %r{/(delete|rename|edit|create)/(\.redirects.gollum|(custom|mathjax\.config)\.(js|css))} do
+        forbid('Changing this resource is not allowed.')
+      end
+
+      post %r{/revert/(\.redirects.gollum|(custom|mathjax\.config\.)\.(js|css)/.*/.*)} do
+        forbid('Changing this resource is not allowed.')
+      end
+
+      get '/edit/*' do
+        forbid unless @allow_editing
+        wikip = wiki_page(params[:splat].first)
+        @name = wikip.fullname
+        @path = wikip.path
+        @upload_dest = find_upload_dest(wikip.fullpath)
+        wiki = wikip.wiki
+        @allow_uploads = wiki.allow_uploads
+          if page = wikip.page
+              @page         = page
+              @content      = page.text_data
+              @mathjax      = wiki.mathjax
+              @etag         = page.sha
+              mustache :edit
+          else
+            path = ::File.join('gollum/create', @path, @name)
+            redirect to(clean_url(encodeURIComponent(path)))
+          end
+        end
+
+      # AJAX calls only
+      post '/upload_file' do
+        
+        wiki = wiki_new
+        halt 405 unless wiki.allow_uploads
+
+        if params[:file]
+          fullname = params[:file][:filename]
+          tempfile = params[:file][:tempfile]
+        end
+        halt 500 unless tempfile.is_a? Tempfile
+
+        if wiki.per_page_uploads
+          dir = request.referer.sub(request.base_url, '')
+          # remove base path if it is set
+          dir.sub!(/^#{wiki.base_path}/, '') if wiki.base_path
+          # remove base_url and gollum/* subpath if necessary
+          dir.sub!(/^\/gollum\/[-\w]+\//, '')
+          # remove file extension 
+          dir.sub!(/#{::File.extname(dir)}$/, '')
+          # revert escaped whitespaces
+          dir.gsub!(/%20/, ' ')
+          dir = ::File.join('uploads', dir)
+        else
+          # store all uploads together
+          dir = 'uploads'
+        end
+        halt 500 if dir.include?('..')
+        halt 500 unless Pathname(dir).relative?
+
+        ext      = ::File.extname(fullname)
+        format   = ext.split('.').last || 'txt'
+        filename = ::File.basename(fullname, ext)
+        contents = ::File.read(tempfile)
+        reponame = "#{dir}/#{filename}.#{format}"
+
+        options = { :message => "Uploaded file to #{reponame}" }
+        options[:parent] = wiki.repo.head.commit if wiki.repo.head
+
+        author  = session['gollum.author']
+        unless author.nil?
+          options.merge! author
+        end
+
+        normalize = Gollum::Page.valid_extension?(fullname)
+
+        begin
+          wiki.write_file(reponame, contents, options)
+          redirect to(request.referer)
+        rescue Gollum::IllegalDirectoryPath => e
+          @message = e.message
+          mustache :error
+        rescue Gollum::DuplicatePageError
+          halt 409 # Signal conflict
+        end
+      end
+
+
+      post '/rename/*' do
+        wikip = wiki_page(params[:splat].first)
+        halt 500 if wikip.nil?
+        wiki   = wikip.wiki
+        page   = wikip.page
+        rename = params[:rename]
+        halt 500 if page.nil?
+        halt 500 if rename.nil? or rename.empty?
+
+        # Fixup the rename if it is a relative path
+        # In 1.8.7 rename[0] != rename[0..0]
+        if rename[0..0] != '/'
+          source_dir                = ::File.dirname(page.path)
+          source_dir                = '' if source_dir == '.'
+          (target_dir, target_name) = ::File.split(rename)
+          target_dir                = target_dir == '' ? source_dir : "#{source_dir}/#{target_dir}"
+          rename                    = "#{target_dir}/#{target_name}"
+        end
+
+        committer = Gollum::Committer.new(wiki, commit_message)
+        commit    = { :committer => committer }
+
+        success = wiki.rename_page(page, rename, commit)
+        if !success
+          # This occurs on NOOPs, for example renaming A => A
+          redirect to("/#{page.escaped_url_path}")
+          return
+        end
+
+        # Renaming preserves format, so add the page's format to the renamed path to retrieve the renamed page
+        new_path = "#{rename}.#{Gollum::Page.format_to_ext(page.format)}"
+        # Add a redirect from the old page to the new
+        wiki.add_redirect(page.url_path, clean_url(new_path), commit) if @redirects_enabled
+
+        committer.commit
+
+        page = wiki_page(new_path).page
+        return if page.nil?
+        redirect to("/#{page.escaped_url_path}")
+      end
+
+      post '/edit/*' do
+        etag      = params[:etag]        
+        path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
+        wiki      = wiki_new
+        page      = wiki.page(::File.join(path, params[:page]))
+
+        return if page.nil?
+        if etag != page.sha
+          # Signal edit collision and return the page's most recent version
+          halt 412, {etag: page.sha, text_data: page.text_data}.to_json
+        end
+        
+        committer = Gollum::Committer.new(wiki, commit_message)
+        commit    = { :committer => committer }
+
+        update_wiki_page(wiki, page, params[:content], commit, page.name, params[:format])
+        update_wiki_page(wiki, page.header, params[:header], commit) if params[:header]
+        update_wiki_page(wiki, page.footer, params[:footer], commit) if params[:footer]
+        update_wiki_page(wiki, page.sidebar, params[:sidebar], commit) if params[:sidebar]
+        committer.commit
+
+      end
+
+      post '/delete/*' do
+        forbid unless @allow_editing
+        wiki = wiki_new
+        filepath = params[:splat].first
+        unless filepath.nil?
+          commit           = commit_message
+          commit[:message] = "Deleted #{filepath}"
+          wiki.delete_file(filepath, commit)
+        end
+      end      
+
+      get '/create/*' do
+        forbid unless @allow_editing
+        wikip = wiki_page(params[:splat].first)
+        @name = wikip.name
+        @ext  = wikip.ext
+        @path = wikip.path
+        @template_page = load_template(@path) if settings.wiki_options[:template_page]
+        @allow_uploads = wikip.wiki.allow_uploads
+        @upload_dest   = find_upload_dest(wikip.fullpath)
+
+        page = wikip.page
+        if page
+          redirect to("/#{clean_url(page.escaped_url_path)}")
+        else
+          unless Gollum::Page.format_for("#{@name}#{@ext}")
+            @name = "#{@name}#{@ext}"
+            @ext = nil
+          end
+          mustache :create
+        end
+      end
+
+      post '/create' do
+        name   = params[:page]
+        path   = sanitize_empty_params(params[:path]) || ''
+        format = params[:format].intern
+        wiki   = wiki_new
+
+        path.gsub!(/^\//, '')
+
+        begin
+          wiki.write_page(::File.join(path, name), format, params[:content], commit_message)
+
+          redirect to("/#{clean_url(::File.join(encodeURIComponent(path), encodeURIComponent(wiki.page_file_name(name, format))))}")
+        rescue Gollum::DuplicatePageError, Gollum::IllegalDirectoryPath => e
+          @message = e.message
+          mustache :error
+        end
+      end
+
+      post '/revert/*/:sha1/:sha2' do
+        wikip = wiki_page(params[:splat].first)
+        @path = wikip.path
+        @name = wikip.fullname
+        wiki  = wikip.wiki
+        @page = wikip.page
+        sha1  = params[:sha1]
+        sha2  = params[:sha2]
+
+        commit           = commit_message
+        commit[:message] = "Revert commit #{sha2.chars.take(7).join}"
+        if wiki.revert_page(@page, sha1, sha2, commit)
+          redirect to("/#{@page.escaped_url_path}")
+        else
+          sha2, sha1 = sha1, "#{sha1}^" if !sha2
+          @versions  = [sha1, sha2]
+          @diff      = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+          @message   = 'The patch does not apply.'
+          mustache :compare
+        end
+      end
+
+      post '/preview' do
+        wiki           = wiki_new
+        @name          = params[:page] ? strip_page_name(params[:page]) : 'Preview'
+        @page          = wiki.preview_page(@name, params[:content], params[:format])
+        ['sidebar', 'header', 'footer'].each do |subpage|
+          @page.send("set_#{subpage}".to_sym, params[subpage]) if params[subpage]
+        end
+        @content       = @page.formatted_data
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @editable      = false
+        @bar_side      = wiki.bar_side
+        @allow_uploads = false
+        @navbar        = false
+        @preview       = true
+        mustache :page
+      end
+
+      get '/history/*' do
+        wikip      = wiki_page(params[:splat].first)
+        @name      = wikip.fullname
+        @page      = wikip.page
+        @page_num  = [params[:page_num].to_i, 1].max
+        @max_count = settings.wiki_options.fetch(:pagination_count, 10)
+        unless @page.nil?
+          @wiki      = @page.wiki
+          @versions = @page.versions(
+            per_page: @max_count,
+            page_num: @page_num,
+            follow: settings.wiki_options.fetch(:follow_renames, true)
+          )
+          mustache :history
+        else
+          redirect to("/")
+        end
+      end
+
+      get '/latest_changes' do
+        @wiki = wiki_new
+        @page_num = [params[:page_num].to_i, 1].max
+        @max_count = settings.wiki_options.fetch(:pagination_count, 10)
+        @versions = @wiki.latest_changes(::Gollum::Page.log_pagination_options(per_page: @max_count, page_num: @page_num))
+        mustache :latest_changes
+      end
+
+      get %r{
+        /compare/ # match any URL beginning with /compare/
+        (.+)      # extract the full path (including any directories)
+        /         # match the final slash
+        ([^.]+)   # match the first SHA1
+        \.{2,3}   # match .. or ...
+        (.+)      # match the second SHA1
+      }x do |path, start_version, end_version|
+        wikip     = wiki_page(path)
+        @path     = wikip.path
+        @name     = wikip.fullname
+        @versions = [start_version, end_version]
+        wiki      = wikip.wiki
+        @page     = wikip.page
+        @diff     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+        if @diff.empty?
+          @message = 'Could not compare these two revisions, no differences were found.'
+          mustache :error
+        else
+          mustache :compare
+        end
+      end
+
+      get '/compare/*' do
+        @file     = clean_url(encodeURIComponent(params[:splat].first))
+        @versions = params[:versions] || []
+        if @versions.size == 1
+          wikip  = wiki_page(params[:splat].first)
+          commit = wikip.wiki.repo.commit(@versions.first)
+          parent = commit.parent
+          if parent.nil?
+            redirect to("#{@file}/#{@commit.id}")
+          else
+            @versions.push(parent.id)
+          end
+        end
+        if @versions.empty?
+          redirect to("gollum/history/#{@file}")
+        else
+          redirect to("gollum/compare/%s/%s...%s" % [
+              @file,
+              @versions.last,
+              @versions.first]
+                   )
+        end
+      end
+
+
+      get %r{
+        /commit/  # match any URL beginning with /show/
+        (\w+)     # match the SHA1
+      }x do |version|
+        @version = version
+        wiki = wiki_new
+        begin
+          @commit = wiki.repo.commit(version)
+          parent = @commit.parent
+          parent_id = parent.nil? ? nil : parent.id
+          @diff = wiki.repo.diff(parent_id, version)
+          mustache :commit
+        rescue Gollum::Git::NoSuchShaFound
+          @message = "Invalid commit: #{@version}"
+          mustache :error
+        end
+      end
+
+      get '/search' do
+        @query     = params[:q] || ''
+        @name      = @query
+        if @query.empty?
+          @results = []
+          @search_terms = []
+        else
+          @page_num  = [params[:page_num].to_i, 1].max
+          @max_count = 10
+          wiki       = wiki_new
+          @results, @search_terms = wiki.search(@query)
+        end
+        mustache :search
+      end
+
+      get %r{
+        /overview  # match any URL beginning with /overview
+        (?:     # begin an optional non-capturing group
+          /(.+) # capture any path after the "/overview" excluding the leading slash
+        )?      # end the optional non-capturing group
+      }x do |path|
+        wiki         = wiki_new
+        @results     = wiki.tree_list
+
+        if path
+          @path = Pathname.new(path).cleanpath.to_s
+          check_path   = wiki.page_file_dir ? ::File.join(wiki.page_file_dir, @path, '/') : "#{@path}/"
+          @results.select!  {|result| result.path.start_with?(check_path) }
+        end
+
+        @results.sort_by! {|result| result.name.downcase}
+
+        @ref         = wiki.ref
+        @newable     = true
+        mustache :overview
+      end
+    end # gollum namespace
+
+    get %r{/(.+?)/([0-9a-f]{40})} do
+      file_path = params[:captures][0]
+      version   = params[:captures][1]
+      wikip     = wiki_page(file_path, version)
+      name      = wikip.fullname
+      path      = wikip.path
+      if page = wikip.page
+        @page    = page
+        @name    = name
+        @content = page.formatted_data
+        @version = version
+        @historical = true
+        @bar_side = wikip.wiki.bar_side
+        @navbar   = true
+        mustache :page
+      elsif file = wikip.wiki.file(file_path, version, true)
+        show_file(file)
+      else
+        halt 404
+      end
+    end
+
+    get '/\.redirects\.gollum' do
+      forbid('Accessing this resource is not allowed.')
+    end
+
+    get '/*' do
+      show_page_or_file(params[:splat].first)
+    end
+
+    private
+
+    def show_page_or_file(fullpath)
+      wiki = wiki_new
+      if page = wiki.page(fullpath)
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @mathjax       = wiki.mathjax
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
+      elsif file = wiki.file(fullpath, wiki.ref, true)
+        show_file(file)
+      elsif @redirects_enabled && redirect_path = wiki.redirects[fullpath]
+        redirect to("#{encodeURIComponent(redirect_path)}?redirected_from=#{encodeURIComponent(fullpath)}")
+      else
+        if @allow_editing
+          path = fullpath[-1] == '/' ? "#{fullpath}#{wiki.index_page}" : fullpath # Append default index page if no page name is supplied
+          redirect to("/gollum/create/#{clean_url(encodeURIComponent(path))}")
+        else
+          @message = "The requested page does not exist."
+          status 404
+          return mustache :error
+        end
+      end
+    end
+    
+    def show_file(file)
+      return unless file
+      if file.on_disk?
+        send_file file.on_disk_path, :disposition => 'inline'
+      else
+        content_type file.mime_type
+        file.raw_data
+      end
+    end
+
+    def load_template(path)
+      template_page = wiki_page(::File.join(path, '_Template')).page || wiki_page('/_Template').page
+      template_page ? Gollum::TemplateFilter.apply_filters(template_page.raw_data) : nil
+    end
+
+    def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)
+      return if !page ||
+          ((!content || page.raw_data == content) && page.format == format)
+      name    ||= page.name
+      format  = (format || page.format).to_sym
+      content ||= page.raw_data
+      wiki.update_page(page, name, format, content.to_s, commit)
+    end
+
+    def wiki_page(path, version = nil)
+      pathname = (Pathname.new('/') + path).cleanpath
+      wiki = wiki_new
+      OpenStruct.new(:wiki => wiki, :page => wiki.page(pathname.to_s, version = version),
+                     :name => pathname.basename.sub_ext('').to_s, :path => pathname.dirname.to_s, :ext => pathname.extname, :fullname => pathname.basename.to_s, :fullpath => pathname.to_s)
+    end
+
+    def wiki_new
+      Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+    end
+
+    # 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
+      msg               = (params[:message].nil? or params[:message].empty?) ? "[no message]" : params[:message]
+      commit_message    = { :message => msg }
+      author_parameters = session['gollum.author']
+      commit_message.merge! author_parameters unless author_parameters.nil?
+      commit_message
+    end
+
+    def find_upload_dest(path)
+      settings.wiki_options[:allow_uploads] ?
+          (settings.wiki_options[:per_page_uploads] ?
+              path : 'uploads'
+          ) : ''
+    end
+
+  end
+end
@@ -0,0 +1,29 @@
+require 'octicons'
+
+module Precious
+  module Assets
+    MANIFEST = %w(app.js editor.js app.css criticmarkup.css fileview.css ie7.css print.css *.png *.jpg *.svg *.eot *.ttf)
+    ASSET_URL = 'gollum/assets'
+
+    def self.sprockets(dir = File.dirname(File.expand_path(__FILE__)))
+      env = Sprockets::Environment.new
+      env.append_path ::File.join(dir, 'public/gollum/stylesheets/')
+      env.append_path ::File.join(dir, 'public/gollum/javascript')
+      env.append_path ::File.join(dir, 'public/gollum/images')
+      env.append_path ::File.join(dir, 'public/gollum/fonts')
+
+      env.js_compressor  = :uglify unless Precious::App.development?
+      env.css_compressor = :scss
+
+      env.context_class.class_eval do
+        def base_url
+          self.class.class_variable_get(:@@base_url)
+        end
+        include ::Octicons
+        include ::Precious::Views::RouteHelpers
+        include ::Precious::Views::OcticonHelpers
+      end
+      env
+    end
+  end
+end
@@ -1,78 +0,0 @@
-module Gollum
-  class BlobEntry
-    # Gets the String SHA for this blob.
-    attr_reader :sha
-
-    # Gets the full path String for this blob.
-    attr_reader :path
-
-    # Gets the Fixnum size of this blob.
-    attr_reader :size
-
-    def initialize(sha, path, size = nil)
-      @sha  = sha
-      @path = path
-      @size = size
-      @dir  = @name = @blob = nil
-    end
-
-    # Gets the normalized directory path String for this blob.
-    def dir
-      @dir ||= self.class.normalize_dir(::File.dirname(@path))
-    end
-
-    # Gets the file base name String for this blob.
-    def name
-      @name ||= ::File.basename(@path)
-    end
-
-    # Gets a Grit::Blob instance for this blob.
-    #
-    # repo - Grit::Repo instance for the Grit::Blob.
-    #
-    # Returns an unbaked Grit::Blob instance.
-    def blob(repo)
-      @blob ||= Grit::Blob.create(repo,
-        :id => @sha, :name => name, :size => @size)
-    end
-
-    # Gets a Page instance for this blob.
-    #
-    # wiki - Gollum::Wiki instance for the Gollum::Page
-    #
-    # Returns a Gollum::Page instance.
-    def page(wiki, commit)
-      blob = self.blob(wiki.repo)
-      page = wiki.page_class.new(wiki).populate(blob, self.dir)
-      page.version = commit
-      page
-    end
-
-    def inspect
-      %(#<Gollum::BlobEntry #{@sha} #{@path}>)
-    end
-
-    # Normalizes a given directory name for searching through tree paths.
-    # Ensures that a directory begins with a slash, or
-    #
-    #   normalize_dir("")      # => ""
-    #   normalize_dir(".")     # => ""
-    #   normalize_dir("foo")   # => "/foo"
-    #   normalize_dir("/foo/") # => "/foo"
-    #   normalize_dir("/")     # => ""
-    #   normalize_dir("c:/")   # => ""
-    #
-    # dir - String directory name.
-    #
-    # Returns a normalized String directory name, or nil if no directory
-    # is given.
-    def self.normalize_dir(dir)
-      return '' if dir =~ /^.:\/$/
-      if dir
-        dir = ::File.expand_path(dir, '/')
-        dir = '' if dir == '/'
-      end
-      dir
-    end
-  end
-end
@@ -1,217 +0,0 @@
-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
-  # to be fired after the commit has been made.  This is specifically 
-  # designed to handle multiple updated pages in a single commit.
-  class Committer
-    # Gets the instance of the Gollum::Wiki that is being updated.
-    attr_reader :wiki
-
-    # Gets a Hash of commit options.
-    attr_reader :options
-
-    # Initializes the Committer.
-    #
-    # wiki    - The Gollum::Wiki instance that is being updated.
-    # options - The commit Hash details:
-    #           :message   - The String commit message.
-    #           :name      - The String author full name.
-    #           :email     - The String email address.
-    #           :parent    - Optional Grit::Commit parent to this update.
-    #           :tree      - Optional String SHA of the tree to create the
-    #                        index from.
-    #           :committer - Optional Gollum::Committer instance.  If provided,
-    #                        assume that this operation is part of batch of 
-    #                        updates and the commit happens later.
-    #
-    # Returns the Committer instance.
-    def initialize(wiki, options = {})
-      @wiki      = wiki
-      @options   = options
-      @callbacks = []
-    end
-
-    # Public: References the Git index for this commit.
-    #
-    # Returns a Grit::Index.
-    def index
-      @index ||= begin
-        idx = @wiki.repo.index
-        if tree   = options[:tree]
-          idx.read_tree(tree)
-        elsif parent = parents.first
-          idx.read_tree(parent.tree.id)
-        end
-        idx
-      end
-    end
-
-    # Public: The committer for this commit.
-    #
-    # Returns a Grit::Actor.
-    def actor
-      @actor ||= begin
-        @options[:name]  = @wiki.default_committer_name  if @options[:name].to_s.empty?
-        @options[:email] = @wiki.default_committer_email if @options[:email].to_s.empty?
-        Grit::Actor.new(@options[:name], @options[:email])
-      end
-    end
-
-    # Public: The parent commits to this pending commit.
-    #
-    # Returns an array of Grit::Commit instances.
-    def parents
-      @parents ||= begin
-        arr = [@options[:parent] || @wiki.repo.commit('master')]
-        arr.flatten!
-        arr.compact!
-        arr
-      end
-    end
-
-    # Adds a page to the given Index.
-    #
-    # dir    - The String subdirectory of the Gollum::Page without any
-    #          prefix or suffix slashes (e.g. "foo/bar").
-    # name   - The String Gollum::Page name.
-    # format - The Symbol Gollum::Page format.
-    # data   - The String wiki data to store in the tree map.
-    # allow_same_ext - A Boolean determining if the tree map allows the same
-    #                  filename with the same extension.
-    #
-    # Raises Gollum::DuplicatePageError if a matching filename already exists.
-    # This way, pages are not inadvertently overwritten.
-    #
-    # Returns nothing (modifies the Index in place).
-    def add_to_index(dir, name, format, data, allow_same_ext = false)
-      path = @wiki.page_file_name(name, format)
-
-      dir = '/' if dir.strip.empty?
-
-      fullpath = ::File.join(*[@wiki.page_file_dir, dir, path].compact)
-      fullpath = fullpath[1..-1] if fullpath =~ /^\//
-
-      if index.current_tree && tree = index.current_tree / dir
-        downpath = path.downcase.sub(/\.\w+$/, '')
-
-        tree.blobs.each do |blob|
-          next if page_path_scheduled_for_deletion?(index.tree, fullpath)
-          file = blob.name.downcase.sub(/\.\w+$/, '')
-          file_ext = ::File.extname(blob.name).sub(/^\./, '')
-          if downpath == file && !(allow_same_ext && file_ext == ext)
-            raise DuplicatePageError.new(dir, blob.name, path)
-          end
-        end
-      end
-
-      index.add(fullpath, @wiki.normalize(data))
-    end
-
-    # Update the given file in the repository's working directory if there
-    # is a working directory present.
-    #
-    # dir    - The String directory in which the file lives.
-    # name   - The String name of the page (may be in human format).
-    # format - The Symbol format of the page.
-    #
-    # Returns nothing.
-    def update_working_dir(dir, name, format)
-      unless @wiki.repo.bare
-        if @wiki.page_file_dir
-          dir = dir.size.zero? ? @wiki.page_file_dir : File.join(dir, @wiki.page_file_dir)
-        end
-
-        path =
-          if dir == ''
-            @wiki.page_file_name(name, format)
-          else
-            ::File.join(dir, @wiki.page_file_name(name, format))
-          end
-
-        Dir.chdir(::File.join(@wiki.repo.path, '..')) do
-          if file_path_scheduled_for_deletion?(index.tree, path)
-            @wiki.repo.git.rm({'f' => true}, '--', path)
-          else
-            @wiki.repo.git.checkout({}, 'HEAD', '--', path)
-          end
-        end
-      end
-    end
-
-    # Writes the commit to Git and runs the after_commit callbacks.
-    #
-    # Returns the String SHA1 of the new commit.
-    def commit
-      sha1 = index.commit(@options[:message], parents, actor)
-      @callbacks.each do |cb|
-        cb.call(self, sha1)
-      end
-      sha1
-    end
-
-    # Adds a callback to be fired after a commit.
-    #
-    # block - A block that expects this Committer instance and the created 
-    #         commit's SHA1 as the arguments.
-    #
-    # Returns nothing.
-    def after_commit(&block)
-      @callbacks << block
-    end
-
-    # Determine if a given page (regardless of format) is scheduled to be
-    # deleted in the next commit for the given Index.
-    #
-    # map   - The Hash map:
-    #         key - The String directory or filename.
-    #         val - The Hash submap or the String contents of the file.
-    # path - The String path of the page file. This may include the format
-    #         extension in which case it will be ignored.
-    #
-    # Returns the Boolean response.
-    def page_path_scheduled_for_deletion?(map, path)
-      parts = path.split('/')
-      if parts.size == 1
-        deletions = map.keys.select { |k| !map[k] }
-        downfile = parts.first.downcase.sub(/\.\w+$/, '')
-        deletions.any? { |d| d.downcase.sub(/\.\w+$/, '') == downfile }
-      else
-        part = parts.shift
-        if rest = map[part]
-          page_path_scheduled_for_deletion?(rest, parts.join('/'))
-        else
-          false
-        end
-      end
-    end
-
-    # Determine if a given file is scheduled to be deleted in the next commit
-    # for the given Index.
-    #
-    # map   - The Hash map:
-    #         key - The String directory or filename.
-    #         val - The Hash submap or the String contents of the file.
-    # path - The String path of the file including extension.
-    #
-    # Returns the Boolean response.
-    def file_path_scheduled_for_deletion?(map, path)
-      parts = path.split('/')
-      if parts.size == 1
-        deletions = map.keys.select { |k| !map[k] }
-        deletions.any? { |d| d == parts.first }
-      else
-        part = parts.shift
-        if rest = map[part]
-          file_path_scheduled_for_deletion?(rest, parts.join('/'))
-        else
-          false
-        end
-      end
-    end
-
-    # Proxies methods t
-    def method_missing(name, *args)
-      index.send(name, *args)
-    end
-  end
-end
@@ -1,64 +0,0 @@
-module Gollum
-  class File
-    Wiki.file_class = self
-
-    # Public: Initialize a file.
-    #
-    # wiki - The Gollum::Wiki in question.
-    #
-    # Returns a newly initialized Gollum::File.
-    def initialize(wiki)
-      @wiki = wiki
-      @blob = nil
-      @path = nil
-    end
-
-    # Public: The on-disk filename of the file.
-    #
-    # Returns the String name.
-    def name
-      @blob && @blob.name
-    end
-
-    # Public: The raw contents of the page.
-    #
-    # Returns the String data.
-    def raw_data
-      @blob && @blob.data
-    end
-
-    # Public: The Grit::Commit version of the file.
-    attr_reader :version
-
-    # Public: The String path of the file.
-    attr_reader :path
-
-    # Public: The String mime type of the file.
-    def mime_type
-      @blob.mime_type
-    end
-
-    #########################################################################
-    #
-    # Internal Methods
-    #
-    #########################################################################
-
-    # Find a file in the given Gollum repo.
-    #
-    # name    - The full String path.
-    # version - The String version ID to find.
-    #
-    # Returns a Gollum::File or nil if the file could not be found.
-    def find(name, version)
-      checked = name.downcase
-      map     = @wiki.tree_map_for(version)
-      if entry = map.detect { |entry| entry.path.downcase == checked }
-        @path    = name
-        @blob    = entry.blob(@wiki.repo)
-        @version = version.is_a?(Grit::Commit) ? version : @wiki.commit_for(version)
-        self
-      end
-    end
-  end
-end
@@ -1,205 +0,0 @@
-require 'cgi'
-require 'sinatra'
-require 'gollum'
-require 'mustache/sinatra'
-
-require 'gollum/frontend/views/layout'
-require 'gollum/frontend/views/editable'
-
-module Precious
-  class App < Sinatra::Base
-    register Mustache::Sinatra
-
-    dir = File.dirname(File.expand_path(__FILE__))
-
-    # We want to serve public assets for now
-
-    set :public,    "#{dir}/public"
-    set :static,    true
-
-    set :mustache, {
-      # Tell mustache where the Views constant lives
-      :namespace => Precious,
-
-      # Mustache templates live here
-      :templates => "#{dir}/templates",
-
-      # Tell mustache where the views are
-      :views => "#{dir}/views"
-    }
-
-    # Sinatra error handling
-    configure :development, :staging do
-      enable :show_exceptions, :dump_errors
-      disable :raise_errors, :clean_trace
-    end
-
-    configure :test do
-      enable :logging, :raise_errors, :dump_errors
-    end
-
-    get '/' do
-      show_page_or_file('Home')
-    end
-
-    get '/edit/*' do
-      @name = params[:splat].first
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      if page = wiki.page(@name)
-        @page = page
-        @content = page.raw_data
-        mustache :edit
-      else
-        mustache :create
-      end
-    end
-
-    post '/edit/*' do
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      page = wiki.page(params[:splat].first)
-      name = params[:rename] || page.name
-      committer = Gollum::Committer.new(wiki, commit_message)
-      commit    = {:committer => committer}
-
-      update_wiki_page(wiki, page, params[:content], commit, name,
-        params[:format])
-      update_wiki_page(wiki, page.footer,  params[:footer],  commit) if params[:footer]
-      update_wiki_page(wiki, page.sidebar, params[:sidebar], commit) if params[:sidebar]
-      committer.commit
-
-      redirect "/#{CGI.escape(Gollum::Page.cname(name))}"
-    end
-
-    post '/create' do
-      name = params[:page]
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-
-      format = params[:format].intern
-
-      begin
-        wiki.write_page(name, format, params[:content], commit_message)
-        redirect "/#{CGI.escape(name)}"
-      rescue Gollum::DuplicatePageError => e
-        @message = "Duplicate page: #{e.message}"
-        mustache :error
-      end
-    end
-
-    post '/revert/:page/*' do
-      wiki  = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @name = params[:page]
-      @page = wiki.page(@name)
-      shas  = params[:splat].first.split("/")
-      sha1  = shas.shift
-      sha2  = shas.shift
-
-      if wiki.revert_page(@page, sha1, sha2, commit_message)
-        redirect "/#{CGI.escape(@name)}"
-      else
-        sha2, sha1 = sha1, "#{sha1}^" if !sha2
-        @versions = [sha1, sha2]
-        diffs     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
-        @diff     = diffs.first
-        @message  = "The patch does not apply."
-        mustache :compare
-      end
-    end
-
-    post '/preview' do
-      wiki     = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @name    = "Preview"
-      @page    = wiki.preview_page(@name, params[:content], params[:format])
-      @content = @page.formatted_data
-      mustache :page
-    end
-
-    get '/history/:name' do
-      @name     = params[:name]
-      wiki      = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @page     = wiki.page(@name)
-      @page_num = [params[:page].to_i, 1].max
-      @versions = @page.versions :page => @page_num
-      mustache :history
-    end
-
-    post '/compare/:name' do
-      @versions = params[:versions] || []
-      if @versions.size < 2
-        redirect "/history/#{CGI.escape(params[:name])}"
-      else
-        redirect "/compare/%s/%s...%s" % [
-          CGI.escape(params[:name]),
-          @versions.last,
-          @versions.first]
-      end
-    end
-
-    get '/compare/:name/:version_list' do
-      @name     = params[:name]
-      @versions = params[:version_list].split(/\.{2,3}/)
-      wiki      = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @page     = wiki.page(@name)
-      diffs     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
-      @diff     = diffs.first
-      mustache :compare
-    end
-
-    get %r{^/(javascript|css|images)} do
-      halt 404
-    end
-
-    get %r{/(.+?)/([0-9a-f]{40})} do
-      name = params[:captures][0]
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      if page = wiki.page(name, params[:captures][1])
-        @page = page
-        @name = name
-        @content = page.formatted_data
-        mustache :page
-      else
-        halt 404
-      end
-    end
-
-    get '/search' do
-      @query = params[:q]
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      @results = wiki.search @query
-      @name = @query
-      mustache :search
-    end
-
-    get '/*' do
-      show_page_or_file(params[:splat].first)
-    end
-
-    def show_page_or_file(name)
-      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
-      if page = wiki.page(name)
-        @page = page
-        @name = name
-        @content = page.formatted_data
-        mustache :page
-      elsif file = wiki.file(name)
-        content_type file.mime_type
-        file.raw_data
-      else
-        @name = name
-        mustache :create
-      end
-    end
-
-    def update_wiki_page(wiki, page, content, commit_message, name = nil, format = nil)
-      return if !page ||  
-        ((!content || page.raw_data == content) && page.format == format)
-      name    ||= page.name
-      format    = (format || page.format).to_sym
-      content ||= page.raw_data
-      wiki.update_page(page, name, format, content.to_s, commit_message)
-    end
-
-    def commit_message
-      { :message => params[:message] }
-    end
-  end
-end
@@ -1,141 +0,0 @@
-/* @control dialog */
-
-#gollum-dialog-dialog {
-  display: block;
-  overflow: visible;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-}
-
-#gollum-dialog-dialog.active {
-  display: block;
-}
-
-#gollum-dialog-dialog-inner {
-  margin: 0 0 0 -225px;
-  position: relative;
-  width: 450px;
-
-  border: 7px solid #999;
-  border: 7px solid rgba(0, 0, 0, 0.3); 
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
-
-#gollum-dialog-dialog-bg {
-  background-color: #fff;
-  overflow: hidden;
-  padding: 1em;
-  
-  background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff));
-  background: -moz-linear-gradient(top, #f7f7f7, #ffffff);
-}
-
-#gollum-dialog-dialog-inner h4 {
-  border-bottom: 1px solid #ddd;
-  color: #000;
-  font-size: 1.8em;
-  line-height: normal;
-  font-weight: bold;
-  margin: 0 0 0.75em 0;
-  padding: 0 0 0.3em 0;
-}
-
-#gollum-dialog-dialog-body {
-  font-size: 1.2em;
-  line-height: 1.6em;
-}
-
-#gollum-dialog-dialog-body fieldset {
-  display: block;
-  border: 0;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-}
-
-#gollum-dialog-dialog-body fieldset .field {
-  margin: 0 0 1.5em 0;
-  padding: 0;
-}
-
-  #gollum-dialog-dialog-body fieldset .field label {
-    color: #000;
-    display: block;
-    font-size: 1.2em;
-    font-weight: bold;
-    line-height: 1.6em;
-    margin: 0;
-    padding: 0;
-    min-width: 80px;
-  }
-  
-  #gollum-dialog-dialog-body fieldset .field input[type="text"] {
-    border: 1px solid #ddd;
-    display: block;
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    font-size: 1.2em;
-    line-height: 1.6em;
-    margin: 0.3em 0 0 0;
-    padding: 0.3em 0.5em;
-    width: 96.5%;
-  }
-  
-  #gollum-dialog-dialog-body fieldset .field input.code {
-    font-family: 'Monaco', 'Courier New', Courier, monospace;
-  }
-  
-#gollum-dialog-dialog-body fieldset .field:last-child {
-  margin: 0 0 1em 0;
-}
-
-#gollum-dialog-dialog-buttons {
-  border-top: 1px solid #ddd;
-  overflow: hidden;
-  margin: 1.5em 0 0 0;
-  padding: 1em 0 0 0;
-}
-
-#gollum-dialog-dialog a.minibutton {
-  float: right;
-  margin-right: 0.5em;
-  width: auto;
-}
-
-#gollum-dialog-dialog a.minibutton,
-#gollum-dialog-dialog a.minibutton:visited {
-  background-color: #f7f7f7;
-  border: 1px solid #d4d4d4;
-  color: #333;
-  cursor: pointer;
-  display: block;
-  font-size: 1.2em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: bold;
-  margin: 0 0 0 0.8em;
-  padding: 0.4em 1em;
-
-  text-shadow: 0 1px 0 #fff;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-}
-
-#gollum-dialog-dialog a.minibutton:hover {
-  background: #3072b3;
-  border-color: #518cc6 #518cc6 #2a65a0;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
@@ -1,537 +0,0 @@
-/*
-  editor.css
-  Wiki editor formatting
-*/
-
-a {
-  -moz-outline: none !important;
-}
-
-.jaws {
-  /* JAWS should see it, but you can't */
-  display: block;
-  height: 1px;
-  left: -5000px;
-  overflow: hidden;
-  position: absolute;
-  top: -5000px;
-  width: 1px;
-}
-
-#gollum-editor {
-  border: 1px solid #e4e4e4;
-  background: #f9f9f9;
-  margin: 1em 0 5em;
-  overflow: hidden;
-  padding: 1em 1em 0.4em;
-
-  border-radius: 1em;
-  -moz-border-radius: 1em;
-  -webkit-border-radius: 1em;
-}
-
-.ie #gollum-editor {
-  padding-bottom: 1em;  
-}
-
-#gollum-editor form fieldset {
-  border: 0;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-}
-
-#gollum-editor .singleline {
-  display: block;
-  margin: 0 0 0.7em 0;
-  overflow: hidden;
-}
-
-#gollum-editor .singleline input {
-  background: #fff;
-  border: 1px solid #ddd;
-  color: #000;
-  font-size: 1.3em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.8em;
-  margin: 1em 0 0.4em;
-  padding: 0.5em;
-  width: 98%;
-}
-
-#gollum-editor .singleline input.ph {
-  color: #999;
-}
-
-#gollum-editor-title-field input#gollum-editor-page-title {
-  font-weight: bold;
-  margin-top: 0;
-}
-
-#gollum-editor-title-field.active {
-  border-bottom: 1px solid #ddd;
-  display: block;
-  margin: 0 0 0.3em 0;
-  padding: 0 0 0.5em 0;
-}
-
-#gollum-editor-title-field input#gollum-editor-page-title.ph {
-  color: #000;
-}
-
-/* @control editor-view-tab */
-#gollum-editor #gollum-editor-type-switcher {
-  display: none;
-}
-
-/* @control function-bar */
-#gollum-editor #gollum-editor-function-bar  {
-  border-bottom: 1px solid #ddd;
-  overflow: hidden;
-  padding: 0;
-}
-
-
-#gollum-editor-title-field + #gollum-editor-function-bar {
-  margin-top: 0.6em;
-}
-
-#gollum-editor #gollum-editor-function-bar #gollum-editor-function-buttons {
-  display: none;
-}
-
-#gollum-editor #gollum-editor-function-bar.active #gollum-editor-function-buttons {
-  display: block;
-  float: left;
-  overflow: hidden;
-  padding: 0 0 1.1em 0;
-}
-
-#gollum-editor #gollum-editor-function-bar a.function-button {
-  background: #f7f7f7;
-  border: 1px solid #ddd;
-  color: #333;
-  display: block;
-  float: left;
-  height: 25px;
-  overflow: hidden;
-  margin: 0.2em 0.5em 0 0;
-  /* text-indent: -5000px; */
-  text-shadow: 0 1px 0 #fff;
-  width: 25px;
-  
-  border-radius: 0.3em;
-  -moz-border-radius: 0.3em;
-  -webkit-border-radius: 0.3em;
-  
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-}
-
-#gollum-editor #gollum-editor-function-bar a.function-button:hover {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-  
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
-
-#gollum-editor #gollum-editor-function-bar a span {
-  background-image: url(../images/icon-sprite.png);
-  background-repeat: no-repeat;
-  display: block;
-  height: 25px;
-  overflow: hidden;
-  text-indent: -5000px;
-  width: 25px;
-}
-
-a#function-bold span { background-position: 0 0; }
-a#function-italic span { background-position: -27px 0; }
-a#function-underline span { background-position: -54px 0; }
-a#function-code span { background-position: -82px 0; }
-a#function-ul span { background-position: -109px 0; }
-a#function-ol span { background-position: -136px 0; }
-a#function-blockquote span { background-position: -163px 0; }
-a#function-hr span { background-position: -190px 0; }
-a#function-h1 span { background-position: -217px 0; }
-a#function-h2 span { background-position: -244px 0; }
-a#function-h3 span { background-position: -271px 0; }
-a#function-link span { background-position: -298px 0; }
-a#function-image span { background-position: -324px 0; }
-a#function-help span { background-position: -405px 0; } 
-
-a#function-bold:hover span { background-position: 0 -28px; }
-a#function-italic:hover span { background-position: -27px -28px; }
-a#function-underline:hover span { background-position: -54px -28px; }
-a#function-code:hover span { background-position: -82px -28px; }
-a#function-ul:hover span { background-position: -109px -28px; }
-a#function-ol:hover span { background-position: -136px -28px; }
-a#function-blockquote:hover span { background-position: -163px -28px; }
-a#function-hr:hover span { background-position: -190px -28px; }
-a#function-h1:hover span { background-position: -217px -28px; }
-a#function-h2:hover span { background-position: -244px -28px; }
-a#function-h3:hover span { background-position: -271px -28px; }
-a#function-link:hover span { background-position: -298px -28px; }
-a#function-image:hover span { background-position: -324px -28px; }
-a#function-help:hover span { background-position: -405px -28px; } 
-
-
-#gollum-editor #gollum-editor-function-bar a.disabled {
-  display: none;
-}
-
-#gollum-editor #gollum-editor-function-bar span.function-divider {
-  display: block;
-  float: left;
-  width: 0.5em;
-}
-
-#gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector {
-  overflow: hidden;
-  padding: 0 0 1.1em 0;
-}
-
-#gollum-editor #gollum-editor-function-bar 
-  #gollum-editor-format-selector select {  
-  background-color: #f9f9f9;
-  border: 1px solid transparent;
-  
-  float: right;
-  font-size: 1.1em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: bold;
-  line-height: 1.6em;
-  padding: 0.5em 0.7em;
-  margin-bottom: 0;
- 
- 
-  border-radius: 0.5em;
-  -moz-border-radius: 0.5em;
-  -webkit-border-radius: 0.5em; 
-  -moz-outline: none;
-}
-
-#gollum-editor #gollum-editor-function-bar 
-  #gollum-editor-format-selector select:hover {
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -moz-outline: none;
-}
-
-#gollum-editor #gollum-editor-function-bar
-  #gollum-editor-format-selector label {
-  color: #999;
-  float: right;
-  font-size: 1.1em;
-  font-weight: bold;
-  line-height: 1.6em;
-  padding: 0.6em 0.5em 0 0;
-}
-  
-#gollum-editor #gollum-editor-function-bar
-  #gollum-editor-format-selector label:after {
-  content: ':';
-}
-  
-  
-/* @section form-fields */
-
-#gollum-editor textarea#gollum-editor-body {
-  background: #fff;
-  border: 1px solid #ddd;
-  font-size: 1.3em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.8em;
-  margin: 1em 0 0.4em;
-  padding: 0.5em; /* I don't really like mixing pct & em here… */
-  width: 98%;
-  height: 20em;
-}
-
-#gollum-editor input#gollum-editor-submit {
-  background-color: #f7f7f7;
-  border: 1px solid #d4d4d4;
-  color: #333;
-  cursor: pointer;
-  display: block;
-  float: left;
-  font-size: 1.2em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: bold;
-  margin: 0;
-  padding: 0.4em 1em;
-
-  text-shadow: 0 1px 0 #fff;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-}
-
-.webkit #gollum-editor input#gollum-editor-submit {
-  padding: 0.5em 1em 0.45em;
-}
-
-.ie #gollum-editor input#gollum-editor-submit {
-  padding: 0.4em 1em 0.5em;
-}
-
-#gollum-editor input#gollum-editor-submit:hover {
-  background: #3072b3;
-  border-color: #518cc6 #518cc6 #2a65a0;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
-
-#gollum-editor .collapsed,
-#gollum-editor .expanded {
-  border-bottom: 1px solid #ddd;
-  display: block;
-  overflow: hidden;
-  padding: 1em 0 0.5em;
-}
-
-#gollum-editor #gollum-editor-body + .collapsed,
-#gollum-editor #gollum-editor-body + .expanded {
-  border-top: 1px solid #ddd;
-  margin-top: 0.7em;
-}
-
-#gollum-editor .collapsed a.button,
-#gollum-editor .expanded a.button {
-  background: #f7f7f7;
-  border: 1px solid #ddd;
-  color: #333;
-  display: block;
-  float: left;
-  height: 25px;
-  overflow: hidden;
-  margin: 0.2em 0.5em 0.75em 0;
-  text-shadow: 0 1px 0 #fff;
-  width: 25px;
-  
-  border-radius: 0.3em;
-  -moz-border-radius: 0.3em;
-  -webkit-border-radius: 0.3em;
-  
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-}
-
-#gollum-editor .collapsed h4,
-#gollum-editor .expanded h4 {
-  font-size: 1.6em;
-  float: left;
-  margin: 0;
-  padding: 0.4em 0 0 0.3em;
-  text-shadow: 0 -1px 0 #fff;
-}
-
-#gollum-editor .collapsed a.button:hover,
-#gollum-editor .expanded h4 a.button:hover {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-  
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
-
-#gollum-editor .collapsed a span,
-#gollum-editor .expanded a span {
-  background-image: url(../images/icon-sprite.png);
-  background-position: -351px -1px;
-  background-repeat: no-repeat;
-  display: block;
-  height: 25px;
-  overflow: hidden;
-  text-indent: -5000px;
-  width: 25px;
-}
-
-#gollum-editor .collapsed a:hover span {
-  background-position: -351px -28px;
-}
-
-#gollum-editor .expanded a span {
-  background-position: -378px 0;
-}
-
-#gollum-editor .expanded a:hover span {
-  background-position: -378px -28px;
-}
-
-#gollum-editor .collapsed textarea {
-  display: none;
-}
-
-#gollum-editor .expanded textarea {
-  background-color: #fff;
-  border: 1px solid #ddd;
-  clear: both;
-  display: block;
-  font-size: 1.3em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  height: 7em;
-  line-height: 1.8em;
-  margin: 0.7em 0;
-  padding: 0.5em;
-  width: 98%;
-}
-
-/* @control minibutton */
-
-#gollum-editor a.minibutton,
-#gollum-editor a.minibutton:visited {
-  background-color: #f7f7f7;
-  border: 1px solid #d4d4d4;
-  color: #333;
-  cursor: pointer;
-  display: block;
-  font-size: 1.2em;
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: bold;
-  line-height: 1.2em;
-  margin: 0 0 0 0.8em;
-  padding: 0.5em 1em;
-
-  text-shadow: 0 1px 0 #fff;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-}
-
-#gollum-editor a.minibutton:hover {
-  background: #3072b3;
-  border-color: #518cc6 #518cc6 #2a65a0;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
-
-
-#gollum-editor #gollum-editor-preview {
-  float: left;
-  font-weight: normal;
-  padding: left;
-}
-
-
-/* @section help */
-#gollum-editor-help {
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  border: 1px solid #ddd;
-  border-width: 0 1px 1px 1px;
-}
-
-  #gollum-editor-help-parent,
-  #gollum-editor-help-list {
-    display: block;
-    float: left;
-    height: 17em;
-    list-style-type: none;
-    overflow: auto;
-    margin: 0;
-    padding: 1em 0;
-    width: 18%;
-  }
-  
-  #gollum-editor-help-parent {
-    border-right: 1px solid #eee;
-  }
-  
-  #gollum-editor-help-list {
-    background: #fafafa;
-    border-right: 1px solid #eee;
-  }
-  
-  #gollum-editor-help-parent li,
-  #gollum-editor-help-list li {
-    font-size: 1.2em;
-    line-height: 1.6em;
-    margin: 0;
-    padding: 0;
-  }
-    
-    #gollum-editor-help-parent li a,
-    #gollum-editor-help-list li a {
-      border: 1px solid transparent;
-      border-width: 1px 0;
-      display: block;
-      font-weight: bold;
-      height: 100%;
-      width: auto;
-      padding: 0.2em 1em;
-      text-shadow: 0 -1px 0 #fff;
-    }
-    
-    #gollum-editor-help-parent li a:hover,
-    #gollum-editor-help-list li a:hover {
-      background: #fff;
-      border-color: #f0f0f0;
-      text-decoration: none;
-      
-      box-shadow: none;
-    }
-    
-    #gollum-editor-help-parent li a.selected,
-    #gollum-editor-help-list li a.selected {
-      border: 1px solid #eee;
-      border-bottom-color: #e7e7e7;
-      border-width: 1px 0;
-      background: #fff;
-      color: #000;
-      
-      box-shadow: 0 1px 2px #f0f0f0;
-    }
-    
-  #gollum-editor-help-wrapper {
-    background: #fff;
-    overflow: auto;
-    height: 17em;
-    padding: 1em;
-  }
-  
-    #gollum-editor-help-content {
-      font-size: 1.2em;
-      margin: 0 1em 0 0.5em;
-      padding: 0;
-      line-height: 1.8em;
-    }
-    
-    #gollum-editor-help-content p {
-      margin: 0 0 1em 0;
-      padding: 0;
-    }
-    
-/* IE */
-.ie #gollum-editor .singleline input {
-  padding-top: 0.25em;
-  padding-bottom: 0.75em;
-}
@@ -1,665 +0,0 @@
-/*
-  gollum.css
-  A basic stylesheet for Gollum
-*/
-
-/* @section core */
-body, html {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 10px; /* -> 1em */
-  margin: 0;
-  padding: 0;
-}
-
-#wiki-wrapper {
-  margin: 0 auto;
-  overflow: visible;
-  width: 80%;
-}
-
-a:link {
-  color: #4183c4;
-  text-decoration: none;
-}
-
-a:hover, a:visited {
-  color: #4183c4;
-  text-decoration: underline;
-}
-
-
-/* @section head */
-#head {
-  border-bottom: 1px solid #ccc;
-  margin: 4.5em 0 0.5em;
-  padding: 0.5em 0;
-  overflow: hidden;
-}
-
-  #head h1 {
-    font-size: 3.3em;
-    float: left;
-    line-height: normal;
-    margin: 0;
-    padding: 0.08em 0 0 0;
-    width: 50%;
-  }
-  
-  #head ul.actions {
-    float: right;
-  }
-  
-/* @section content */
-#wiki-content {
-  height: 1%;
-  overflow: visible;
-}
-
-  #wiki-content .wrap {
-    height: 1%;
-    overflow: auto;
-  }
-
-  /* @section comments */
-  #wiki-body #inline-comment {
-    display: none; /* todo */
-  }
-
-  /* @section body */
-  #wiki-body {
-    display: block;
-    float: left;
-    margin-right: 3%;
-    width: 100%;
-  }
-
-  .has-rightbar #wiki-body {
-    width: 68%;
-  }
-  
-  /* @section rightbar */
-  #wiki-rightbar {
-    background-color: #f7f7f7;
-    border: 1px solid #ddd;
-    font-size: 13px;
-    float: right;
-    padding: 7px;
-    width: 25%;
-    
-    border-radius: 0.5em;
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-  }
-  
-    #wiki-rightbar p {
-      margin: 13px 0 0;
-    }
-
-      #wiki-rightbar > p:first-child {
-        margin-top: 0;
-      }
-
-    #wiki-rightbar p.parent {
-      border-bottom: 1px solid #bbb;
-      font-weight: bold;
-      margin: 0 0 0.5em 0;
-      padding: 0 0 0.5em 0;
-      text-shadow: 0 1px 0 #fff;
-    }
-    
-    /* Back arrow */
-    #wiki-rightbar p.parent:before {
-      color: #666;
-      content: "← ";
-    }
-    
-    #wiki-rightbar h3 {
-      font-size: 1.2em;
-      color: #333;
-      margin: 1.2em 0 0;
-      padding: 0;
-      text-shadow: 0 1px 0 #fff;
-    }
-    
-    #wiki-rightbar ul {
-      margin: 0.5em 0 1em;
-      padding: 0;
-    }
-    
-    #wiki-rightbar ul li {
-      color: #bbb;
-      margin: 0 0 0 1em;
-      padding: 0;
-      line-height: 1.75em;
-      list-style-position: inside;
-      list-style-type: round;
-    } 
-    
-    #wiki-rightbar #nav ul li a {
-      font-weight: bold;
-      text-shadow: 0 1px 0 #fff;
-    }
-    
-  /* @section footer */
-  #wiki-footer {
-    clear: both;
-    margin: 2em 0 5em;
-  }
-  
-    .has-rightbar #wiki-footer {
-      width: 70%;
-    }
-    
-    #wiki-footer #footer-content {
-      background-color: #f7f7f7;
-      border: 1px solid #ddd;
-      font-size: 1.2em;
-      line-height: 1.5em;
-      margin-top: 1.5em;
-      padding: 1em;
-      
-      border-radius: 0.5em;
-      -moz-border-radius: 0.5em;
-      -webkit-border-radius: 0.5em;
-    }
-    
-    #wiki-footer #footer-content h3 {
-      font-size: 1.2em;
-      color: #333;
-      margin: 0;
-      padding: 0 0 0.2em;
-      text-shadow: 0 1px 0 #fff;
-    }
-    
-    #wiki-footer #footer-content p {
-      margin: 0.5em 0 0;
-      padding: 0;
-    }
-    
-    #wiki-footer #footer-content ul.links {
-      margin: 0.5em 0 0;
-      overflow: hidden;
-      padding: 0;
-    }
-    
-    #wiki-footer #footer-content ul.links li {
-      color: #999;
-      float: left;
-      list-style-position: inside;
-      list-style-type: square;
-      padding: 0;
-      margin-left: 0.75em;
-    }
-    
-    #wiki-footer #footer-content ul.links li a {
-      font-weight: bold;
-      text-shadow: 0 1px 0 #fff;
-    }
-    
-    #wiki-footer #footer-content ul.links li:first-child {
-      list-style-type: none;
-      margin: 0;
-    }  
-    
-    .ff #wiki-footer #footer-content ul.links li:first-child {
-      margin: 0 -0.75em 0 0;
-    }
-  
-  /* @section page-footer */
-  .page #footer {
-    border-top: 1px solid #ccc;
-    margin: 1em 0 7em;
-  }
-  
-  #footer p#last-edit {
-    font-size: 1.2em;
-    line-height: 1.6em;
-    color: #999;
-    margin: 0.9em 0;
-  }
-  
-    #footer p#last-edit span.username {
-      font-weight: bold;
-    }
-
-
-/* @section history */
-.history h1 {
-  color: #999;
-  font-weight: normal;
-}
-
-  .history h1 strong {
-    color: #000;
-    font-weight: bold;
-  }
-
-#wiki-history {
-  margin-top: 3em;
-}
-
-  #wiki-history fieldset {
-    border: 0;
-    margin: 2em 0;
-    padding: 0;
-  }
-  
-  #wiki-history table, #wiki-history tbody {
-    border-collapse: collapse;
-    padding: 0;
-    margin: 0;
-    width: 100%;
-  }
-  
-  #wiki-history table tr {
-    padding: 0;
-    margin: 0;
-  }
-  
-  #wiki-history table tr {
-    background-color: #ebf2f6;
-  }
-  
-  #wiki-history table tr td {
-    border: 1px solid #c0dce9;
-    font-size: 1.2em;
-    line-height: 1.6em;
-    margin: 0;
-    padding: 0.3em 0.7em;
-  }
-  
-  #wiki-history table tr td.checkbox {
-    min-width: 2em;
-    padding: 0.3em;
-  }
-  
-  #wiki-history table tr td.checkbox input {
-    cursor: pointer;
-    display: block;
-    padding-right: 0;
-    padding-top: 0.4em;
-    margin-right: -0.2em;
-  }
-  
-  #wiki-history table tr:nth-child(2n),
-  #wiki-history table tr.alt-row {
-    background-color: #f3f7fa;
-  }
-  
-  #wiki-history table tr.selected {
-    background-color: #ffffea !important;
-    z-index: 100;
-  }
-  
-  #wiki-history table tr td.commit-name {
-    border-left: 0;
-  }
-  
-  #wiki-history table tr td.commit-name span.time-elapsed {
-    color: #999;
-  }
-  
-  #wiki-history table tr td.author {
-    width: 20%;
-  }
-  
-  #wiki-history table tr td.author a {
-    color: #000;
-    font-weight: bold;
-  }
-  
-  #wiki-history table tr td.author a span.username {
-    display: block;
-    padding-top: 3px;
-  }
-  
-  #wiki-history table tr td img {
-    background-color: #fff;
-    border: 1px solid #999;
-    display: block;
-    float: left;
-    height: 18px;
-    overflow: hidden;
-    margin: 0 0.5em 0 0;
-    width: 18px;
-    padding: 2px;
-  }
-  
-  #wiki-history table tr td.commit-name a {
-    font-size: 0.9em;
-    font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace;
-    padding: 0 0.2em;
-  }
-
-.history #wiki-history ul.actions li,
-.history #footer ul.actions li {
-  margin: 0 0.6em 0 0;
-}
-
-
-/* @section edit */
-.edit h1 {
-  color: #999;
-  font-weight: normal;
-}
-
-  .edit h1 strong {
-    color: #000;
-    font-weight: bold;
-  }
-
-
-/* @section search */
-.results h1 {
-  color: #999;
-  font-weight: normal;
-}
-
-  .results h1 strong {
-    color: #000;
-    font-weight: bold;
-  }
-  
-  .results #results {
-    border-bottom: 1px solid #ccc;
-    margin-bottom: 2em;
-    padding-bottom: 2em;
-  }
-  
-  .results #results ul {
-    margin: 2em 0 0 0;
-    padding: 0;
-  }
-  
-    .results #results ul li {
-      font-size: 1.2em;
-      line-height: 1.6em;
-      list-style-position: outside;
-      padding: 0.2em 0;
-    }
-    
-    .results #results ul li span.count {
-      color: #999;
-    }
-
-  .results p#no-results {
-    font-size: 1.2em;
-    line-height: 1.6em;
-    margin-top: 2em;
-  }
-  
-  .results #footer ul.actions li {
-    margin: 0 1em 0 0;
-  }
-  
-
-/* @section compare */
-.compare h1 {
-  color: #999;
-  font-weight: normal;
-}
-
-  .compare h1 strong {
-    color: #000;
-    font-weight: bold;
-  }
-  
-  .compare #compare-content {
-    margin-top: 3em;
-  }
-  
-  .compare .data {
-    border: 1px solid #ddd;
-    margin-top: 1em;
-    overflow: auto;
-  }
-  
-  .compare .data pre {
-    margin: 0;
-    padding: 0;
-  }
-  
-  .compare .data pre div {
-    padding: 0 0 0 1em;
-  }
-  
-  .compare .data tr td {
-    font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace;
-    font-size: 1.2em;
-    line-height: 1.8em;
-    margin: 0;
-    padding: 0;
-  }
-  
-  .compare .data td.line_numbers {
-    background: #f7f7f7;
-    border-right: 1px solid #999;
-    color: #999; 
-    padding: 0 0 0 0.5em;
-  }
-
-.compare #compare-content ul.actions li,
-.compare #footer ul.actions li {
-  margin-left: 0;
-  margin-right: 0.6em;
-}
-  
-  
-  
-/* @control syntax */
-.highlight  { background: #ffffff; }
-.highlight .c { color: #999988; font-style: italic } 
-.highlight .err { color: #a61717; background-color: #e3d2d2 } 
-.highlight .k { font-weight: bold } 
-.highlight .o { font-weight: bold } 
-.highlight .cm { color: #999988; font-style: italic } 
-.highlight .cp { color: #999999; font-weight: bold } 
-.highlight .c1 { color: #999988; font-style: italic } 
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } 
-.highlight .gd { color: #000000; background-color: #ffdddd } 
-.highlight .gd .x { color: #000000; background-color: #ffaaaa } 
-.highlight .ge { font-style: italic } 
-.highlight .gr { color: #aa0000 } 
-.highlight .gh { color: #999999 } 
-.highlight .gi { color: #000000; background-color: #ddffdd } 
-.highlight .gi .x { color: #000000; background-color: #aaffaa } 
-.highlight .gc { color: #999; background-color: #EAF2F5 }
-.highlight .go { color: #888888 } 
-.highlight .gp { color: #555555 } 
-.highlight .gs { font-weight: bold } 
-.highlight .gu { color: #aaaaaa } 
-.highlight .gt { color: #aa0000 } 
-
-
-/* @control minibutton */
-ul.actions {
-   display: block;
-   list-style-type: none;
-   overflow: hidden;
-   padding: 0;
-}
-
- ul.actions li {
-   float: left;
-   font-size: 1.2em;
-   margin-left: 0.6em;
- }
-
-.minibutton a {
-  background-color: #f7f7f7;
-  border: 1px solid #d4d4d4;
-  color: #333;
-  display: block;
-  font-weight: bold;
-  margin: 0;
-  padding: 0.4em 1em;
-  height: 1.4em;
-
-  text-shadow: 0 1px 0 #fff;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-}
-
-#search-submit {
-  background-color: #f7f7f7;
-  border: 1px solid #d4d4d4;
-  color: #333;
-  display: block;
-  font-weight: bold;
-  margin: 0;
-  padding: 0.4em 1em;
-
-  text-shadow: 0 1px 0 #fff;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
-  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
-  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
-
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-}
-
-.minibutton a:hover,
-#search-submit:hover {
-  background: #3072b3;
-  border-color: #518cc6 #518cc6 #2a65a0;
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
-  text-decoration: none;
-
-  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
-  background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
-  background: -moz-linear-gradient(top, #599bdc, #3072b3);
-}
-
-.minibutton a:visited {
-  text-decoration: none;
-}
-
-
-/* @special error */
-#wiki-wrapper.error {
-  height: 1px;
-  position: absolute;
-  overflow: visible;
-  top: 50%;
-  width: 100%;
-}
-
-#error {
-  background-color: #f9f9f9;
-  border: 1px solid #e4e4e4;
-  left: 50%;
-  overflow: hidden;
-  padding: 2%;
-  margin: -10% 0 0 -35%;
-  position: absolute;
-  width: 70%;
-  
-  border-radius: 0.5em;
-  -moz-border-radius: 0.5em;
-  -webkit-border-radius: 0.5em;
-}
-
-#error h1 {
-  font-size: 3em;
-  line-height: normal;
-  margin: 0;
-  padding: 0;
-}
-
-#error p {
-  font-size: 1.2em;
-  line-height: 1.6em;
-  margin: 1em 0 0.5em;
-  padding: 0;
-}
-
-
-/* @control searchbar */
-#head #searchbar {
-  float: right;
-  margin: 1em 0 0 0;
-  padding: 0;
-  overflow: hidden;
-}
-
-  #head #searchbar #searchbar-fauxtext {
-    background: #fff;
-    border: 1px solid #d4d4d4;
-    overflow: hidden;
-    
-    border-radius: 0.3em;
-    -moz-border-radius: 0.3em;
-    -webkit-border-radius: 0.3em;
-  }
-
-  #head #searchbar #searchbar-fauxtext input#search-query {
-    border: none;
-    color: #000;
-    float: left;
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    font-size: 1.2em;
-    height: 1.8em;
-    
-    -webkit-focus-ring: none;
-  }
-
-  .ff #head #searchbar #searchbar-fauxtext input#search-query {
-    padding: 0.2em 0 0.2em 0.5em;
-  }
-  
-  .ie #head #searchbar #searchbar-fauxtext input#search-query {
-    padding: 0.4em 0 0 0.5em;
-  }
-  
-  #head #searchbar #searchbar-fauxtext input#search-query.ph {
-    color: #999;
-  }
-  
-  #head #searchbar #searchbar-fauxtext #search-submit {
-    border: 0;
-    border-left: 1px solid #d4d4d4;
-    cursor: pointer;
-    margin: 0 !important;
-    padding: 0;
-    float: right;
-    font-size: 1.2em;
-    
-    border-radius: 0 3px 3px 0;
-    -moz-border-radius: 0 3px 3px 0;
-    -webkit-border-radius: 0 3px 3px 0;
-  }
-  
-  #head #searchbar #searchbar-fauxtext #search-submit span {
-    background-image: url(/images/icon-sprite.png);
-    background-position: -431px -1px;
-    background-repeat: no-repeat;
-    display: block;
-    height: 2em;
-    overflow: hidden;
-    text-indent: -5000px;
-    width: 28px;
-  }
-  
-  .ff #head #searchbar #searchbar-fauxtext #search-submit span,
-  .ie #head #searchbar #searchbar-fauxtext #search-submit span {
-    height: 2.2em;
-  }
-  
-  #head #searchbar #searchbar-fauxtext #search-submit:hover span {
-    background-position: -431px -28px;
-    padding: 0;
-  }
-
-
-#MathJax_Message {
-  display: none;
-}
@@ -1,69 +0,0 @@
-/* IE7-specific styles */
-
-.ie #head #searchbar #searchbar-fauxtext input#search-query {
-  border: 0;
-  float: left;
-  padding: 0.4em 0 0 0.5em;
-}
-
-.ie #head #searchbar #searchbar-fauxtext #search-submit span {
-  height: 2.25em;
-}
-
-#head #searchbar,
-#head ul.actions {
-  margin: 1em 0 0 0;
-}
-
-ul.actions {
-  margin-left: 0;
-}
-
-.compare #footer ul.actions {
-  margin-top: 1em;
-}
-
-.compare div.data {
-  overflow: auto;
-}
-
-.history #version-form {
-  margin: -0.5em 0 -0.5em !important;
-}
-
-#gollum-editor {
-  padding-bottom: 0;
-}
-
-#gollum-editor-help-parent li a,
-#gollum-editor-help-list li a {
-  height: auto;
-}
-
-#gollum-editor #gollum-editor-format-selector {
-  margin-top: 6px;
-}
-
-#gollum-editor .singleline input {
-  padding-top: 0.25em;
-}
-
-#gollum-editor .collapsed {
-  padding-bottom: 1.1em;
-}
-
-#gollum-editor #gollum-editor-submit {
-  padding: 0.5em 1em 0.3em !important;
-}
-
-#gollum-editor #gollum-editor-preview {
-  line-height: 1.3em;
-}
-
-#gollum-editor form {
-  margin: 0;
-}
-
-#gollum-editor #gollum-editor-format-selector label {
-  padding-top: 0.1em !important;
-}
@@ -1,316 +0,0 @@
-/*
-  Gollum v3 Template
-*/
-
-#template {
-  font-size: 13px;
-  line-height: 23px;
-  margin-bottom: 40px;
-}
-
-/* Link Colors */
-a.absent {
-  color: #c00;
-}
-
-/* Primary Body Copy */
-#template p {
-  margin: 16px 0 0;
-  padding: 0;
-}
-  
-  /* ReST first graf in nested list */
-  #template * li p.first {
-    display: inline-block;
-  }
-
-/* Headings */
-#template h1, #template h2, #template h3, 
-#template h4, #template h5, #template h6 {
-  margin: 0;
-  padding: 0;
-}
-
-#template h1 {
-  border-top: 4px solid #ccc;
-  font-size: 32px;
-  line-height: normal;
-  padding: 10px 0 0;
-  margin: 30px 0 0;
-}
-
-#template h2 {
-  border-top: 4px solid #ccc;
-  font-size: 22px;
-  line-height: normal;
-  margin: 22px 0 0;
-  padding: 7px 0 0;
-}
-
-#template h3 {
-  font-size: 16px;
-  line-height: 26px;
-  padding: 26px 0 0;
-}
-
-#template h4 {
-  font-size: 14px;
-  line-height: 26px;
-  padding: 18px 0 4px;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
-#template h5 {
-  font-size: 13px;
-  line-height: 26px;
-  margin-bottom: -19px;
-  padding: 14px 0 0;
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
-#template h6 {
-  color: #666;
-  font-size: 14px; 
-  line-height: 26px;
-  margin-bottom: -19px;
-  padding: 18px 0 0;
-  font-weight: normal;
-  font-variant: italic;
-}
-
-#template hr {
-  background-color: #ccc;
-  color: #ccc;
-  border: 2px solid #ccc;
-  margin: 20px 0;
-  padding: 0;
-}
-
-  /* Border Reset for headers with horizontal rules */ 
-  #template > h2:first-child, 
-  #template > h1:first-child {
-    border: 0;
-    margin: 12px 0 0;
-    padding: 10px 0 0;
-  }
-
-
-/* Lists, Blockquotes & Such */
-#template ul, 
-#template ol {
-  margin: 0;
-  padding: 20px 0 0;
-  list-style-position: inside;  
-}
-
-  /* Nested Lists */
-  #template ul li ul, 
-  #template ol li ol,
-  #template ul li ol,
-  #template ol li ul,
-  #template ul ul, 
-  #template ol ol {
-    padding: 0 0 0 14px;
-  }
-
-#template dl {
-  margin: 0;
-  padding: 20px 0 0;
-}
-
-  #template dl dt {
-    font-size: 14px;
-    font-weight: bold;
-    line-height: normal;
-    margin: 0;
-    padding: 20px 0 0;
-  }
-
-    #template dl dt:first-child {
-      padding: 0;
-    }
-
-  #template dl dd {
-    font-size: 13px;
-    margin: 0;
-    padding: 3px 0 0;
-  }
-
-/* Tables */
-#template table {
-  border-collapse: collapse;
-  margin: 20px 0 0;
-  padding: 0;
-}
-
-#template table * tr {
-  border-top: 1px solid #ccc;
-  background-color: #fff;
-  margin: 0;
-  padding: 0;
-}
-
-  #template table * tr:nth-child(2n) {
-    background-color: #f8f8f8;
-  }
-
-  #template table * tr th,
-  #template table * tr td {
-    border: 1px solid #ccc;
-    text-align: left;
-    margin: 0;
-    padding: 6px 13px; 
-  }
-
-/* Images & Stuff */
-#template img {
-  max-width: 100%;
-}
-
-/* Gollum Image Tags */
-
-/* Framed */
-#template span.frame {
-  display: block;
-  overflow: hidden;
-}
-
-  #template span.frame > span {
-    border: 1px solid #ddd;
-    display: block;
-    float: left;
-    overflow: hidden;
-    margin: 13px 0 0;
-    padding: 7px;
-    width: auto;
-  }
-
-  #template span.frame span img {
-    display: block;
-    float: left;
-  }
-
-  #template span.frame span span {
-    clear: both;
-    color: #333;
-    display: block;
-    padding: 5px 0 0;
-  }
-
-#template span.align-center {
-  display: block;
-  overflow: hidden;
-  clear: both;
-}
-
-  #template span.align-center > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px auto 0;
-    text-align: center;
-  }
-
-  #template span.align-center span img {
-    margin: 0 auto;
-    text-align: center;
-  }
-
-#template span.align-right {
-  display: block;
-  overflow: hidden;
-  clear: both;
-}
-
-  #template span.align-right > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px 0 0;
-    text-align: right;
-  }
-
-  #template span.align-right span img {
-    margin: 0;
-    text-align: right;
-  }
-
-#template span.float-left {
-  display: block;
-  margin-right: 13px;
-  overflow: hidden;
-  float: left;
-}
-
-  #template span.float-left span {
-    margin: 13px 0 0;
-  }
-
-#template span.float-right {
-  display: block; 
-  margin-left: 13px;
-  overflow: hidden;
-  float: right;
-}
-
-  #template span.float-right > span {
-    display: block;
-    overflow: hidden;
-    margin: 13px auto 0;
-    text-align: right;
-  }
-
-
-/* Code */
-#template code, #template tt {
-  background-color: #f8f8f8;
-  border: 1px solid #dedede;
-  font-size: 13px;
-  padding: 1px 5px;
-
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-
-#template .highlight pre, #template pre {
-  background-color: #f8f8f8;
-  border: 1px solid #ccc;
-  font-size: 13px;
-  line-height: 19px;
-  overflow: auto;
-  padding: 6px;
-
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-}
-
-#template pre code, #template pre tt {
-  background-color: transparent;
-  border: none;
-}
-
-#template .highlight { background: #ffffff; }
-#template .highlight .c { color: #999988; font-style: italic }
-#template .highlight .err { color: #a61717; background-color: #e3d2d2 }
-#template .highlight .k { font-weight: bold }
-#template .highlight .o { font-weight: bold }
-#template .highlight .cm { color: #999988; font-style: italic }
-#template .highlight .cp { color: #999999; font-weight: bold }
-#template .highlight .c1 { color: #999988; font-style: italic }
-#template .highlight .cs { color: #999999; font-weight: bold; font-style: italic }
-#template .highlight .gd { color: #000000; background-color: #ffdddd }
-#template .highlight .gd .x { color: #000000; background-color: #ffaaaa }
-#template .highlight .ge { font-style: italic }
-#template .highlight .gr { color: #aa0000 }
-#template .highlight .gh { color: #999999 }
-#template .highlight .gi { color: #000000; background-color: #ddffdd }
-#template .highlight .gi .x { color: #000000; background-color: #aaffaa }
-#template .highlight .gc { color: #999; background-color: #EAF2F5 }
-#template .highlight .go { color: #888888 }
-#template .highlight .gp { color: #555555 }
-#template .highlight .gs { font-weight: bold }
-#template .highlight .gu { color: #aaaaaa }
-#template .highlight .gt { color: #aa0000 }
-
@@ -1,18 +0,0 @@
-/*
- *  ../SourceForge/trunk/mathjax/config/MMLorHTML.js
- *  
- *  Copyright (c) 2010 Design Science, Inc.
- *
- *  Part of the MathJax library.
- *  See http://www.mathjax.org for details.
- * 
- *  Licensed under the Apache License, Version 2.0;
- *  you may not use this file except in compliance with the License.
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- */
-
-MathJax.Unpack([
-  ['(function(c){var i="1.0";var g=','MathJax.Hub','.Insert({prefer:{MSIE:"MML",Firefox:"MML",Opera:"HTML",other:"HTML"}},(',1,'.config.MMLorHTML||{}));var e={Firefox:3,Opera:9.52,MSIE:6,Chrome:0.3,Safari:2,Konqueror:4};var h=(c','.Browser','.version==="0.0"||','c.Browser.versionAtLeast','(e[c',5,']||0));var b;try{new ActiveXObject("MathPlayer.Factory.1");b=true}catch(d){b=false}var f=(c',5,'.isFirefox&&',7,'("1.5"))||(c',5,'.isMSIE&&b)||(c',5,'.isOpera&&',7,'("9.52"));var a=(g.prefer&&typeof(g.prefer)==="object"?g.prefer[',1,5,']||g.prefer.other||"HTML":g.prefer);if(h||f){if(f&&(a==="MML"||!h)){','c.config.jax.unshift("output/','NativeMML")}else{',24,'HTML-CSS")}}else{c.PreProcess','.disabled=true;','c.prepareScripts',28,'MathJax.Message.Set("Your browser does not support MathJax",null,4000);c.Startup.signal.Post("MathJax not supported")}})(',1,');MathJax.Ajax.loadComplete("[MathJax]/config/MMLorHTML.js");']
-]);
-
@@ -1,590 +0,0 @@
-/*************************************************************
- *
- *  MathJax/config/MathJax.js
- *
- *  This configuration file is loaded when there is no explicit
- *  configuration script in the <script> tag that loads MathJax.js
- *
- *  Use it to customize the MathJax settings.  See comments below.
- *
- *  ---------------------------------------------------------------------
- *  
- *  Copyright (c) 2009-10 Design Science, Inc.
- * 
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-MathJax.Hub.Config({
-
-  //
-  //  A comma-separated list of configuration files to load
-  //  when MathJax starts up.  E.g., to define local macros, etc.
-  //  The default directory is the MathJax/config directory.
-  //  
-  //  Example:    config: ["local/local.js"],
-  //  Example:    config: ["local/local.js","MMLtoHTML.js"],
-  //
-  config: [],
-  
-  //
-  //  A comma-separated list of CSS stylesheet files to be loaded
-  //  when MathJax starts up.  The default directory is the
-  //  MathJax/config directory.
-  // 
-  //  Example:    styleSheets: ["MathJax.css"],
-  //
-  styleSheets: [],
-  
-  //
-  //  Styles to be defined dynamically at startup time.
-  //  
-  //  Example:
-  //      styles: {
-  //        ".MathJax .merror": {
-  //          color: "blue",
-  //          "background-color": "green"
-  //        }
-  //      },
-  //
-  styles: {},
-  
-  //
-  //  A comma-separated list of input and output jax to initialize at startup.
-  //  Their main code is loaded only when they are actually used, so it is not
-  //  inefficient to include jax that may not actually be used on the page.  These
-  //  are found in the MathJax/jax directory.
-  //  
-  jax: ["input/TeX","output/HTML-CSS"],
-  
-  //
-  //  A comma-separated list of extensions to load at startup.  The default
-  //  directory is MathJax/extensions.
-  //  
-  //  Example:    extensions: ["tex2jax.js","TeX/AMSmath.js","TeX/AMSsymbols.js"],
-  //
-  extensions: ["tex2jax.js"],
-  
-  //
-  //  Patterns to remove from before and after math script tags.  If you are not
-  //  using one of the preprocessors (e.g., tex2jax), you need to insert something
-  //  extra into your HTML file in order to avoid a bug in Internet Explorer.  IE
-  //  removes spaces from the DOM that it thinks are redundent, and since a SCRIPT
-  //  tag usually doesn't add content to the page, if there is a space before and after
-  //  a MathJax SCRIPT tag, IE will remove the first space.  When MathJax inserts
-  //  the typeset mathematics, this means there will be no space before it and the
-  //  preceeding text.  In order to avoid this, you should include some "guard characters"
-  //  before or after the math SCRIPT tag; define the patterns you want to use below.
-  //  Note that these are used as regular expressions, so you will need to quote
-  //  special characters.  Furthermore, since they are javascript strings, you must
-  //  quote javascript special characters as well.  So to obtain a backslash, you must
-  //  use \\ (doubled for javascript).  For example, "\\[" is the pattern \[ in the
-  //  regular expression.  That means that if you want an actual backslash in your
-  //  guard characters, you need to use "\\\\" in order to get \\ in the regular
-  //  expression, and \ in the actual text.  If both preJax and postJax are defined,
-  //  both must be present in order to be  removed.
-  //
-  //  See also the preRemoveClass comments below.
-  //  
-  //  Example:
-  //      preJax: "\\\\\\\\",  // makes a double backslash the preJax text
-  //    or
-  //      preJax:  "\\[\\[", // jax scripts must be enclosed in double brackets
-  //      postJax: "\\]\\]",
-  //
-  preJax: null,
-  postJax: null,
-  
-  //
-  //  The CSS class for a math preview to be removed preceeding a MathJax
-  //  SCRIPT tag.  If the tag just before the MathJax SCRIPT tag is of this
-  //  class, its contents are removed when MathJax processes the SCRIPT
-  //  tag.  This allows you to include a math preview in a form that will
-  //  be displayed prior to MathJax performing its typesetting.  It also
-  //  avoids the Internet Explorer space-removal bug, and can be used in
-  //  place of preJax and postJax if that is more convenient.
-  //  
-  //  For example
-  //  
-  //      <span class="MathJax_Preview">[math]</span><script type="math/tex">...</script>
-  //
-  //  would display "[math]" in place of the math until MathJax is able to typeset it.
-  //
-  preRemoveClass: "MathJax_Preview",
-  
-  //
-  //  This value controls whether the "Processing Math: nn%" message are displayed
-  //  in the lower left-hand corner.  Set to "false" to prevent those messages (though
-  //  file loading and other messages will still be shown).
-  //
-  showProcessingMessages: true,
-  
-  //
-  //  This value controls the verbosity of the messages in the lower left-hand corner.
-  //  Set it to "none" to eliminate all messages, or set it to "simple" to show
-  //  "Loading..." and "Processing..." rather than showing the full file name and the
-  //  percentage of the mathematics processed.
-  //
-  messageStyle: "normal",
-  
-  //
-  //  These two parameters control the alignment and shifting of displayed equations.
-  //  The first can be "left", "center", or "right", and determines the alignment of
-  //  displayed equations.  When the alignment is not "center", the second determines
-  //  an indentation from the left or right side for the displayed equations.
-  //  
-  displayAlign: "center",
-  displayIndent: "0em",
-  
-  //
-  //  Normally MathJax will perform its starup commands (loading of
-  //  configuration, styles, jax, and so on) as soon as it can.  If you
-  //  expect to be doing additional configuration on the page, however, you
-  //  may want to have it wait until the page's onload hander is called.  If so,
-  //  set this to "onload".
-  //
-  delayStartupUntil: "none",
-
-  //
-  //  Normally MathJax will typeset the mathematics on the page as soon as
-  //  the page is loaded.  If you want to delay that process, in which case
-  //  you will need to call MathJax.Hub.Typeset() yourself by hand, set
-  //  this value to true.
-  //
-  skipStartupTypeset: false,
-  
-  //============================================================================
-  //
-  //  These parameters control the tex2jax preprocessor (when you have included
-  //  "tex2jax.js" in the extensions list above).
-  //
-  tex2jax: {
-
-    //
-    //  The Id of the element to be processed (defaults to full document)
-    //
-    element: null,
-
-    //
-    //  The delimiters that surround in-line math expressions.  The first in each
-    //  pair is the initial delimiter and the second is the terminal delimiter.
-    //  Comment out any that you don't want, but be sure there is no extra
-    //  comma at the end of the last item in the list -- some browsers won't
-    //  be able to handle that.
-    //
-    inlineMath: [
-//    ['$','$'],      // uncomment this for standard TeX math delimiters
-      ['\\(','\\)']
-    ],
-
-    //
-    //  The delimiters that surround displayed math expressions.  The first in each
-    //  pair is the initial delimiter and the second is the terminal delimiter.
-    //  Comment out any that you don't want, but be sure there is no extra
-    //  comma at the end of the last item in the list -- some browsers won't
-    //  be able to handle that.
-    //
-    displayMath: [
-      ['$$','$$'],
-      ['\\[','\\]']
-    ],
-
-    //
-    //  This array lists the names of the tags whose contents should not be
-    //  processed by tex2jax (other than to look for ignore/process classes
-    //  as listed below).  You can add to (or remove from) this list to prevent
-    //  MathJax from processing mathematics in specific contexts.
-    //
-    skipTags: ["script","noscript","style","textarea","pre","code"],
-
-    //
-    //  This is the class name used to mark elements whose contents should
-    //  not be processed by tex2jax (other than to look for the
-    //  processClass pattern below).  Note that this is a regular
-    //  expression, and so you need to be sure to quote any regexp special
-    //  characters.  The pattern is automatically preceeded by '(^| )(' and
-    //  followed by ')( |$)', so your pattern will have to match full words
-    //  in the class name.  Assigning an element this class name will
-    //  prevent `tex2jax` from processing its contents.
-    //
-    ignoreClass: "tex2jax_ignore",
-
-    //
-    //  This is the class name used to mark elements whose contents SHOULD
-    //  be processed by tex2jax.  This is used to turn on processing within
-    //  tags that have been marked as ignored or skipped above.  Note that
-    //  this is a regular expression, and so you need to be sure to quote
-    //  any regexp special characters.  The pattern is automatically
-    //  preceeded by '(^| )(' and followed by ')( |$)', so your pattern
-    //  will have to match full words in the class name.  Use this to
-    //  restart processing within an element that has been marked as
-    //  ignored above.
-    //
-    processClass: "tex2jax_process",
-    
-    //
-    //  Set to "true" to allow \$ to produce a dollar without starting in-line
-    //  math mode.  If you uncomment the ['$','$'] line above, you should change
-    //  this to true so that you can insert plain dollar signs into your documents
-    //
-    processEscapes: false,
-
-    //
-    //  Controls whether tex2jax processes LaTeX environments outside of math
-    //  mode.  Set to "false" to prevent processing of environments except within
-    //  math mode.
-    //
-    processEnvironments: true,
-
-    //
-    //  Controls whether tex2jax inserts MathJax_Preview spans to make a
-    //  preview available, and what preview to use, when it locates in-line
-    //  and display mathetics on the page.  The default is "TeX", which
-    //  means use the TeX code as the preview (until it is processed by
-    //  MathJax).  Set to "none" to prevent the previews from being
-    //  inserted (the math will simply disappear until it is typeset).  Set
-    //  to an array containing the description of an HTML snippet in order
-    //  to use the same preview for all equations on the page (e.g., you
-    //  could have it say "[math]" or load an image).
-    //  
-    //  E.g.,     preview: ["[math]"],
-    //  or        preview: [["img",{src: "http://myserver.com/images/mypic.jpg"}]]
-    //  
-    preview: "TeX"
-    
-  },
-  
-  //============================================================================
-  //
-  //  These parameters control the mml2jax preprocessor (when you have included
-  //  "mml2jax.js" in the extensions list above).
-  //
-  mml2jax: {
-    
-    //
-    //  The Id of the element to be processed (defaults to full document)
-    //
-    element: null,
-
-    //
-    //  Controls whether mml2jax inserts MathJax_Preview spans to make a
-    //  preview available, and what preview to use, whrn it locates
-    //  mathematics on the page.  The default is "alttext", which means use
-    //  the <math> tag's alttext attribute as the preview (until it is
-    //  processed by MathJax), if the tag has one.  Set to "none" to
-    //  prevent the previews from being inserted (the math will simply
-    //  disappear until it is typeset).  Set to an array containing the
-    //  description of an HTML snippet in order to use the same preview for
-    //  all equations on the page (e.g., you could have it say "[math]" or
-    //  load an image).
-    //  
-    //  E.g.,     preview: ["[math]"],
-    //  or        preview: [["img",{src: "http://myserver.com/images/mypic.jpg"}]]
-    //  
-    preview: "alttext"
-    
-  },
-  
-  //============================================================================
-  //
-  //  These parameters control the jsMath2jax preprocessor (when you have included
-  //  "jsMath2jax.js" in the extensions list above).
-  //
-  jsMath2jax: {
-    
-    //
-    //  The Id of the element to be processed (defaults to full document)
-    //
-    element: null,
-
-    //
-    //  Controls whether jsMath2jax inserts MathJax_Preview spans to make a
-    //  preview available, and what preview to use, when it locates
-    //  mathematics on the page.  The default is "TeX", which means use the
-    //  TeX code as the preview (until it is processed by MathJax).  Set to
-    //  "none" to prevent the previews from being inserted (the math will
-    //  simply disappear until it is typeset).  Set to an array containing
-    //  the description of an HTML snippet in order to use the same preview
-    //  for all equations on the page (e.g., you could have it say "[math]"
-    //  or load an image).
-    //  
-    //  E.g.,     preview: ["[math]"],
-    //  or        preview: [["img",{src: "http://myserver.com/images/mypic.jpg"}]]
-    //  
-    preview: "TeX"
-    
-  },
-
-  //============================================================================
-  //
-  //  These parameters control the TeX input jax.
-  //
-  TeX: {
-
-    //
-    //  This specifies the side on which \tag{} macros will place the tags.
-    //  Set to "left" to place on the left-hand side.
-    //
-    TagSide: "right",
-    
-    //
-    //  This is the amound of indentation (from right or left) for the tags.
-    //
-    TagIndent: ".8em",
-    
-    //
-    //  This is the width to use for the multline environment
-    //
-    MultLineWidth: "85%",
-    
-    //
-    //  List of macros to define.  These are of the form
-    //      name: value
-    //  where 'value' is the replacement text for the macro \name.
-    //  The 'value' can also be [value,n] where 'value' is the replacement
-    //  text and 'n' is the number of parameters for the macro.
-    //  Note that backslashes must be doubled in the replacement string.
-    //  
-    //  E.g.,
-    //  
-    //      Macros: {
-    //        RR: '{\\bf R}',
-    //        bold: ['{\\bf #1}', 1]
-    //      }
-    //
-    Macros: {}
-    
-  },
-
-  //============================================================================
-  //
-  //  These parameters control the MathML inupt jax.
-  //
-  MathML: {
-    //
-    //  This specifies whether to use TeX spacing or MathML spacing when the
-    //  HTML-CSS output jax is used.
-    //
-    useMathMLspacing: false
-  },
-  
-  //============================================================================
-  //
-  //  These parameters control the HTML-CSS output jax.
-  //
-  "HTML-CSS": {
-    
-    //
-    //  This controls the global scaling of mathematics as compared to the 
-    //  surrounding text.  Values between 100 and 133 are usually good choices.
-    //
-    scale: 100,
-    
-    //
-    //  This is a list of the fonts to look for on a user's computer in
-    //  preference to using MathJax's web-based fonts.  These must
-    //  correspond to directories available in the  jax/output/HTML-CSS/fonts
-    //  directory, where MathJax stores data about the characters available
-    //  in the fonts.  Set this to ["TeX"], for example, to prevent the
-    //  use of the STIX fonts, or set it to an empty list, [], if
-    //  you want to force MathJax to use web-based or image fonts.
-    //
-    availableFonts: ["STIX","TeX"],
-    
-    //
-    //  This is the preferred font to use when more than one of those
-    //  listed above is available.
-    //
-    preferredFont: "TeX",
-    
-    //
-    //  This is the web-based font to use when none of the fonts listed
-    //  above are available on the user's computer.  Note that currently
-    //  only the TeX font is available in a web-based form.  Set this to
-    //  
-    //      webFont: null,
-    //
-    //  if you want to prevent the use of web-based fonts.
-    //
-    webFont: "TeX",
-    
-    //
-    //  This is the font to use for image fallback mode (when none of the
-    //  fonts listed above are available and the browser doesn't support
-    //  web-fonts via the @font-face CSS directive).  Note that currently
-    //  only the TeX font is available as an image font.  Set this to
-    //
-    //      imageFont: null,
-    //  
-    //  if you want to prevent the use of image fonts (e.g., you have not
-    //  installed the image fonts on your server).  In this case, only
-    //  browsers that support web-based fonts will be able to view your pages
-    //  without having the fonts installed on the client computer.  The browsers
-    //  that support web-based fonts include: IE6 and later, Chrome, Safari3.1
-    //  and above, Firefox3.5 and later, and Opera10 and later.  Note that
-    //  Firefox3.0 is NOT on this list, so without image fonts, FF3.0 users
-    //  will be required to to download and install either the STIX fonts or the
-    //  MathJax TeX fonts.
-    //
-    imageFont: "TeX",
-    
-    //
-    //  This controls whether the MathJax contextual menu will be available
-    //  on the mathematics in the page.  If true, then right-clicking (on
-    //  the PC) or control-clicking (on the Mac) will produce a MathJax
-    //  menu that allows you to get the source of the mathematics in
-    //  various formats, change the size of the mathematics relative to the
-    //  surrounding text, and get information about MathJax.
-    //  
-    //  Set this to false to disable the menu.  When true, the MathMenu 
-    //  items below configure the actions of the menu.
-    //  
-    showMathMenu: true,
-
-    //
-    //  This allows you to define or modify the styles used to display
-    //  various math elements created by MathJax.
-    //  
-    //  Example:
-    //      styles: {
-    //        ".MathJax_Preview": {
-    //          "font-size": "80%",          // preview uses a smaller font
-    //          color: "red"                 //    and is in red
-    //        }
-    //      }
-    //
-    styles: {},
-    
-    //
-    //  Configuration for <maction> tooltips
-    //    (see also the #MathJax_Tooltip CSS in MathJax/jax/output/HTML-CSS/config.js,
-    //     which can be overriden using the styles values above).
-    //
-    tooltip: {
-      delayPost: 600,          // milliseconds delay before tooltip is posted after mouseover
-      delayClear: 600,         // milliseconds delay before tooltip is cleared after mouseout
-      offsetX: 10, offsetY: 5  // pixels to offset tooltip from mouse position
-    }
-  },
-  
-  //============================================================================
-  //
-  //  These parameters control the NativeMML output jax.
-  //
-  NativeMML: {
-
-    //
-    //  This controls the global scaling of mathematics as compared to the 
-    //  surrounding text.  Values between 100 and 133 are usually good choices.
-    //
-    scale: 100,
-
-    //
-    //  This controls whether the MathJax contextual menu will be available
-    //  on the mathematics in the page.  If true, then right-clicking (on
-    //  the PC) or control-clicking (on the Mac) will produce a MathJax
-    //  menu that allows you to get the source of the mathematics in
-    //  various formats, change the size of the mathematics relative to the
-    //  surrounding text, and get information about MathJax.
-    //  
-    //  Set this to false to disable the menu.  When true, the MathMenu 
-    //  items below configure the actions of the menu.
-    //  
-    //  There is a separate setting for MSIE, since the code to handle that
-    //  is a bit delicate; if it turns out to have unexpected consequences, 
-    //  you can turn it off without turing off other browser support.
-    //  
-    showMathMenu: true,
-    showMathMenuMSIE: true,
-
-    //
-    //  This allows you to define or modify the styles used to display
-    //  various math elements created by MathJax.
-    //  
-    //  Example:
-    //      styles: {
-    //        ".MathJax_MathML": {
-    //          color: "red"         //    MathML is in red
-    //        }
-    //      }
-    //
-    styles: {}
-  },
-  
-  //============================================================================
-  //
-  //  These parameters control the contextual menus that are available on the 
-  //  mathematics within the page (provided the showMathMenu value is true above).
-  //
-  MathMenu: {
-    //
-    //  This is the hover delay for the display of submenus in the
-    //  contextual menu.  When the mouse is still over a submenu label for
-    //  this long, the menu will appear.  (The menu also will appear if you
-    //  click on the label.)  It is in milliseconds.
-    //  
-    delay: 400,
-    
-    //
-    //  This is the URL for the MathJax Help menu item.
-    //
-    helpURL: "http://www.mathjax.org/help/user/",
-
-    //
-    //  These control whether the "Math Renderer", "Font Preferences",
-    //  and "Contextual Menu" submenus will be displayed or not.
-    //
-    showRenderer: true,
-    showFontMenu: false,
-    showContext:  false,
-
-    //
-    //  These are the settings for the Show Source window.  The initial
-    //  width and height will be reset after the source is shown in an
-    //  attempt to make the window fit the output better.
-    //
-    windowSettings: {
-      status: "no", toolbar: "no", locationbar: "no", menubar: "no",
-      directories: "no", personalbar: "no", resizable: "yes", scrollbars: "yes",
-      width: 100, height: 50
-    },
-    
-    //
-    //  This allows you to change the CSS that controls the menu
-    //  appearance.  See the extensions/MathMenu.js file for details
-    //  of the default settings.
-    //
-    styles: {}
-    
-  },
-
-  //============================================================================
-  //
-  //  These parameters control the MMLorHTML configuration file.
-  //  NOTE:  if you add MMLorHTML.js to the config array above,
-  //  you must REMOVE the output jax from the jax array.
-  //
-  MMLorHTML: {
-    //
-    //  The output jax that is to be preferred when both are possible
-    //  (set to "MML" for native MathML, "HTML" for MathJax's HTML-CSS output jax).
-    //
-    prefer: {
-      MSIE:    "MML",
-      Firefox: "MML",
-      Opera:   "HTML",
-      other:   "HTML"
-    }
-  }
-});
-
-MathJax.Ajax.loadComplete("[MathJax]/config/MathJax.js");
@@ -1,37 +0,0 @@
-/*************************************************************
- *
- *  MathJax/config/local/local.js
- *  
- *  Include changes and configuration local to your installation
- *  in this file.  For example, common macros can be defined here
- *  (see below).  To use this file, add "local/local.js" to the
- *  config array in MathJax.js or your MathJax.Hub.Config() call.
- *
- *  ---------------------------------------------------------------------
- *  
- *  Copyright (c) 2009 Design Science, Inc.
- * 
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-
-MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
-  var TEX = MathJax.InputJax.TeX;
-
-  // place macros here.  E.g.:
-  //   TEX.Macro("R","{\\bf R}");
-  //   TEX.Macro("op","\\mathop{\\rm #1}",1); // a macro with 1 parameter
-  
-});
-
-MathJax.Ajax.loadComplete("[MathJax]/config/local/local.js");
@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: fedf9ba9a5b2ef65b82b1fa1eea24e52
-tags: fbb0d17656682115ca4d033fb2f83ba1
@@ -1,173 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>CSS Style Objects &mdash; MathJax v1.0 documentation</title>
-    <link rel="stylesheet" href="_static/mj.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="MathJax v1.0 documentation" href="index.html" />
-    <link rel="next" title="Glossary" href="glossary.html" />
-    <link rel="prev" title="Describing HTML snippets" href="HTML-snippets.html" /> 
-  </head>
-  <body>
-    <div class="related">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="glossary.html" title="Glossary"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="HTML-snippets.html" title="Describing HTML snippets"
-             accesskey="P">previous</a> |</li>
-        <li><a href="index.html">MathJax v1.0 documentation</a> &raquo;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body">
-            
-  <div class="section" id="css-style-objects">
-<span id="id1"></span><h1>CSS Style Objects<a class="headerlink" href="#css-style-objects" title="Permalink to this headline">¶</a></h1>
-<p>Many MathJax components allow you to specify CSS styles that control
-the look of the elements they create.  These are described using CSS
-style objects, which are JavaScript objects that represent standard
-CSS declarations.  The main CSS style object is a collection of
-<cite>name:value</cite> pairs where the <cite>name</cite> is the CSS selector that is being
-defined, and the <cite>value</cite> is an object that gives the style for that
-selector.  Most often, the selector will need to be enclosed in
-quotation marks, as it will contain special characters, so you would
-need to use <tt class="docutils literal"><span class="pre">&quot;#myID&quot;</span></tt> rather than just <tt class="docutils literal"><span class="pre">#myID</span></tt> and <tt class="docutils literal"><span class="pre">&quot;ul</span> <span class="pre">li&quot;</span></tt>
-rather than just <tt class="docutils literal"><span class="pre">ul</span> <span class="pre">li</span></tt>.</p>
-<p>The value used to define the CSS style can either be a string
-containing the CSS definition, or a javascript object that is itself a
-collection of <cite>name:value</cite> pairs, where the <cite>name</cite> is the attribute
-being defined and <cite>value</cite> is the value that attibute should be given.
-Note that, since this is a JavaScript object, the pairs are separated
-by commas (not semi-colons) and the values are enclosed in quotation
-marks.  If the name contains dashes, it should be enclosed in
-quotation marks as well.</p>
-<p>For example, <tt class="docutils literal"><span class="pre">jax/output/HTML-CSS/config.js</span></tt> includes the following
-declaration:</p>
-<div class="highlight-javascript"><div class="highlight"><pre><span class="nx">styles</span><span class="o">:</span> <span class="p">{</span>
-
-  <span class="s2">&quot;.MathJax .merror&quot;</span><span class="o">:</span> <span class="p">{</span>
-    <span class="s2">&quot;background-color&quot;</span><span class="o">:</span> <span class="s2">&quot;#FFFF88&quot;</span><span class="p">,</span>
-    <span class="nx">color</span><span class="o">:</span>   <span class="s2">&quot;#CC0000&quot;</span><span class="p">,</span>
-    <span class="nx">border</span><span class="o">:</span>  <span class="s2">&quot;1px solid #CC0000&quot;</span><span class="p">,</span>
-    <span class="nx">padding</span><span class="o">:</span> <span class="s2">&quot;1px 3px&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;font-family&quot;</span><span class="o">:</span> <span class="s2">&quot;serif&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;font-style&quot;</span><span class="o">:</span> <span class="s2">&quot;normal&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;font-size&quot;</span><span class="o">:</span>  <span class="s2">&quot;90%&quot;</span>
-  <span class="p">},</span>
-
-  <span class="s2">&quot;.MathJax_Preview&quot;</span><span class="o">:</span> <span class="p">{</span><span class="nx">color</span><span class="o">:</span> <span class="s2">&quot;#888888&quot;</span><span class="p">},</span>
-
-<span class="p">}</span>
-</pre></div>
-</div>
-<p>This defines two CSS styles, one for the selector <tt class="docutils literal"><span class="pre">.MathJax</span>
-<span class="pre">.merror</span></tt>, which specifies a background color, foreground color,
-border, and so on, and a second for <tt class="docutils literal"><span class="pre">.MathJax_Preview</span></tt> that sets its
-color.</p>
-<p>You can add as many such definitions to a <tt class="docutils literal"><span class="pre">styles</span></tt> object as you
-wish.  Note, however, that since this is a JavaScript object, the
-selectors must be unique (e.g., you can&#8217;t use two definitions for
-<tt class="docutils literal"><span class="pre">&quot;img&quot;</span></tt>, for example, as only the last one would be saved).  If you
-need to use more than one entry for a single selector, you can add
-comments like <tt class="docutils literal"><span class="pre">/*</span> <span class="pre">1</span> <span class="pre">*/</span></tt> and <tt class="docutils literal"><span class="pre">/*</span> <span class="pre">2</span> <span class="pre">*/</span></tt> to the selector to make them
-unique.</p>
-<p>It is possible to include selectors like <tt class="docutils literal"><span class="pre">&quot;&#64;media</span> <span class="pre">print&quot;</span></tt>, in which
-case the value is a CSS style object.  For example:</p>
-<div class="highlight-javascript"><div class="highlight"><pre><span class="nx">styles</span><span class="o">:</span> <span class="p">{</span>
-  <span class="s2">&quot;@media print&quot;</span><span class="o">:</span> <span class="p">{</span>
-    <span class="s2">&quot;.MathJax .merror&quot;</span><span class="o">:</span> <span class="p">{</span>
-       <span class="s2">&quot;background-color&quot;</span><span class="o">:</span> <span class="s2">&quot;white&quot;</span><span class="p">,</span>
-       <span class="nx">border</span><span class="o">:</span> <span class="mi">0</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<p>The various extensions and output processors include more examples of
-CSS style objects, so see the code for those files for additional
-samples.  In particular, the <tt class="docutils literal"><span class="pre">extensions/MathMenu.js</span></tt>,
-<tt class="docutils literal"><span class="pre">extensions/MathZoom.js</span></tt>, <tt class="docutils literal"><span class="pre">extensions/FontWarnsing.js</span></tt>, and
-<tt class="docutils literal"><span class="pre">jax/output/HTML-CSS/jax.js</span></tt> files include such definitions.</p>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="HTML-snippets.html"
-                        title="previous chapter">Describing HTML snippets</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="glossary.html"
-                        title="next chapter">Glossary</a></p>
-  <h3>This Page</h3>
-  <ul class="this-page-menu">
-    <li><a href="_sources/CSS-styles.txt"
-           rel="nofollow">Show Source</a></li>
-  </ul>
-<div id="searchbox" style="display: none">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <input type="text" name="q" size="18" />
-      <input type="submit" value="Go" />
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-    <p class="searchtip" style="font-size: 90%">
-    Enter search terms or a module, class or function name.
-    </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="glossary.html" title="Glossary"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="HTML-snippets.html" title="Describing HTML snippets"
-             >previous</a> |</li>
-        <li><a href="index.html">MathJax v1.0 documentation</a> &raquo;</li> 
-      </ul>
-    </div>
-    <div class="footer">
-        &copy; Copyright 2010 Design Science.
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0b2.
-    </div>
-  </body>
-</html>
@@ -1,170 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Describing HTML snippets &mdash; MathJax v1.0 documentation</title>
-    <link rel="stylesheet" href="_static/mj.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '',
-        VERSION:     '1.0',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="MathJax v1.0 documentation" href="index.html" />
-    <link rel="next" title="CSS Style Objects" href="CSS-styles.html" />
-    <link rel="prev" title="Converting to MathJax from jsMath" href="jsMath.html" /> 
-  </head>
-  <body>
-    <div class="related">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="CSS-styles.html" title="CSS Style Objects"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="jsMath.html" title="Converting to MathJax from jsMath"
-             accesskey="P">previous</a> |</li>
-        <li><a href="index.html">MathJax v1.0 documentation</a> &raquo;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body">
-            
-  <div class="section" id="describing-html-snippets">
-<span id="html-snippets"></span><h1>Describing HTML snippets<a class="headerlink" href="#describing-html-snippets" title="Permalink to this headline">¶</a></h1>
-<p>A number of MathJax configuration options allow you to specify an HTML
-snippet using a JavaScript object.  This lets you include HTML in your
-configutation files even though they are not HTML files themselves.
-The format is fairly simple, but flexible enough to let you represent
-complicated HTML trees.</p>
-<p>An HTML snippet is an array consisting of a series elements that formt
-he HTML tree.  Those elements are one of two things: either a string,
-which represents text to be included in the snippet, or an array,
-which represents an HTML tag to be included.  In the latter case, the
-array consists of three items: a string that is the tag name (e.g.,
-&#8220;img&#8221;), an optional object that gives attributes for the tag (as
-described below), and an optional HTML snippet array that gives the
-contents of the tag.</p>
-<p>When attributes are provided, they are given as <cite>name:value</cite> pairs,
-with the <cite>name</cite> giving the attribute name, and <cite>value</cite> giving its
-value.  For example</p>
-<div class="highlight-javascript"><div class="highlight"><pre><span class="p">[[</span><span class="s2">&quot;img&quot;</span><span class="p">,{</span><span class="nx">src</span><span class="o">:</span><span class="s2">&quot;/images/mypic.jpg&quot;</span><span class="p">}]]</span>
-</pre></div>
-</div>
-<p>represents an HTML snippet that includes one element: an <tt class="docutils literal"><span class="pre">&lt;img&gt;</span></tt> tag
-with <tt class="docutils literal"><span class="pre">src</span></tt> set to <tt class="docutils literal"><span class="pre">/images/mypic.jpg</span></tt>.  That is, this is
-equivalent to</p>
-<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;img</span> <span class="na">src=</span><span class="s">&quot;/images/mypic.jpg&quot;</span><span class="nt">&gt;</span>
-</pre></div>
-</div>
-<p>Note that the snippet has two sets of square brackets.  The outermost
-one is for the array that holds the snippet, and the innermost set is
-because the first (and only) element in the snippet is a tag, not
-text.  Note that the code <tt class="docutils literal"><span class="pre">[&quot;img&quot;,{src:&quot;/images/mypic.jpg&quot;}]</span></tt>
-is invalid as an HTML snippet.  It would represent a snippet that
-starts with &#8220;img&#8221; as text in the snippet (not a tag), but the second
-item is neither a string nor an array, and so is illegal.  This is a
-common mistake that should be avoided.</p>
-<p>A more complex example is the following:</p>
-<div class="highlight-javascript"><div class="highlight"><pre><span class="p">[</span>
-  <span class="s2">&quot;Please read the &quot;</span><span class="p">,</span>
-  <span class="p">[</span><span class="s2">&quot;a&quot;</span><span class="p">,{</span><span class="nx">href</span><span class="o">:</span><span class="s2">&quot;instructions.html&quot;</span><span class="p">},[</span><span class="s2">&quot;instructions&quot;</span><span class="p">]],</span>
-  <span class="s2">&quot; carefully before proceeding&quot;</span>
-<span class="p">]</span>
-</pre></div>
-</div>
-<p>which is equivalent to</p>
-<div class="highlight-html"><div class="highlight"><pre>please read the <span class="nt">&lt;a</span> <span class="na">href=</span><span class="s">&quot;instructions.html&quot;</span><span class="nt">&gt;</span>instructions<span class="nt">&lt;/a&gt;</span> carefully
-before proceeding.
-</pre></div>
-</div>
-<p>A final example shows how to set style attributes on an object:</p>
-<div class="highlight-javascript"><div class="highlight"><pre><span class="p">[[</span><span class="s2">&quot;span&quot;</span><span class="p">,</span>
-  <span class="p">{</span>
-    <span class="nx">id</span><span class="o">:</span><span class="s2">&quot;mySpan&quot;</span><span class="p">,</span>
-    <span class="nx">style</span><span class="o">:</span> <span class="p">{</span><span class="nx">color</span><span class="o">:</span><span class="s2">&quot;red&quot;</span><span class="p">,</span> <span class="s2">&quot;font-weight&quot;</span><span class="o">:</span><span class="s2">&quot;bold&quot;</span><span class="p">}</span>
-  <span class="p">},</span>
-  <span class="p">[</span><span class="s2">&quot; This is bold text shown in red &quot;</span><span class="p">]</span>
-<span class="p">]]</span>
-</pre></div>
-</div>
-<p>which is equivalent to</p>
-<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;span</span> <span class="na">id=</span><span class="s">&quot;mySpan&quot;</span> <span class="na">style=</span><span class="s">&quot;color: red; font-weight: bold;&quot;</span><span class="nt">&gt;</span>
-This is bold text shown in red
-<span class="nt">&lt;/span&gt;</span>
-</pre></div>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="jsMath.html"
-                        title="previous chapter">Converting to MathJax from jsMath</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="CSS-styles.html"
-                        title="next chapter">CSS Style Objects</a></p>
-  <h3>This Page</h3>
-  <ul class="this-page-menu">
-    <li><a href="_sources/HTML-snippets.txt"
-           rel="nofollow">Show Source</a></li>
-  </ul>
-<div id="searchbox" style="display: none">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <input type="text" name="q" size="18" />
-      <input type="submit" value="Go" />
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-    <p class="searchtip" style="font-size: 90%">
-    Enter search terms or a module, class or function name.
-    </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="CSS-styles.html" title="CSS Style Objects"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="jsMath.html" title="Converting to MathJax from jsMath"
-             >previous</a> |</li>
-        <li><a href="index.html">MathJax v1.0 documentation</a> &raquo;</li> 
-      </ul>
-    </div>
-    <div class="footer">
-        &copy; Copyright 2010 Design Science.
-      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0b2.
-    </div>
-  </body>
-</html>
--- a/Show More
+++ b/Show More