From 8ea176a16b8bb8415d8f2c63d3ba14297a4bbe79 Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Thu, 15 Jul 2010 16:15:47 -0700 Subject: [PATCH] Remove roff support. --- README.md | 5 ++--- lib/gollum/frontend/public/javascript/gollum.js | 4 ---- lib/gollum/page.rb | 5 ++--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index bcdc39c8..14be837f 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ choose. Special footers can be created in `footer files`. Other content ## PAGE FILES Page files may be written in any format supported by -[GitHub-Markup](http://github.com/defunkt/github-markup). The current list of -formats and allowed extensions is: +[GitHub-Markup](http://github.com/defunkt/github-markup) (except roff). The +current list of formats and allowed extensions is: * Markdown: .markdown, .mdown, .mkdn, .mkd, .md * Textile: .textile @@ -34,7 +34,6 @@ formats and allowed extensions is: * ReStructured Text: .rest.txt, .rst.txt, .rest, .rst * ASCIIDoc: .asciidoc * POD: .pod - * Roff: .1, .2, .3, ... Gollum detects the page file format via the extension, so files must have one of the supported extensions in order to be converted. diff --git a/lib/gollum/frontend/public/javascript/gollum.js b/lib/gollum/frontend/public/javascript/gollum.js index 54ca6dc7..61d68211 100644 --- a/lib/gollum/frontend/public/javascript/gollum.js +++ b/lib/gollum/frontend/public/javascript/gollum.js @@ -96,10 +96,6 @@ Gollum.Formats = { ul: Gollum.prefixStrategy('* ', 'Bullet list item', true), ol: Gollum.prefixStrategy('1. ', 'Numbered list item', true) }, - roff: { - bold: Gollum.encloseStrategy('\\fB', 'bold text', '\\fP'), - italic: Gollum.encloseStrategy('\\fI', 'italic text', '\\fP') - }, textile: { bold: Gollum.encloseStrategy('*', 'bold text', '*'), italic: Gollum.encloseStrategy('_', 'italic text', '_'), diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb index 266319a2..24c15d9a 100644 --- a/lib/gollum/page.rb +++ b/lib/gollum/page.rb @@ -4,7 +4,7 @@ module Gollum Wiki.page_class = self - VALID_PAGE_RE = /^(.+)\.(md|mkdn?|mdown|markdown|textile|rdoc|org|creole|re?st(\.txt)?|asciidoc|pod|\d)$/i + VALID_PAGE_RE = /^(.+)\.(md|mkdn?|mdown|markdown|textile|rdoc|org|creole|re?st(\.txt)?|asciidoc|pod)$/i FORMAT_NAMES = { :markdown => "Markdown", :textile => "Textile", :rdoc => "RDoc", @@ -12,8 +12,7 @@ module Gollum :creole => "Creole", :rest => "reStructuredText", :asciidoc => "AsciiDoc", - :pod => "Pod", - :roff => "roff" } + :pod => "Pod" } # Public: Initialize a page. #