10 files changed, 1815 insertions, 15 deletions

diff --git a/Makefile b/Makefileindex 4b83ac7..4df95b4 100644--- a/Makefile+++ b/Makefile@@ -17,6 +17,7 @@ SHA1_HEADER = <openssl/sha.h> GIT_VER = 1.8.3 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz INSTALL = install+COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) MAN_TXT  = $(MAN5_TXT) DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))@@ -77,7 +78,7 @@ install: all 	$(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css 	$(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png 	$(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)-	$(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)+	$(COPYTREE)  filters/* $(DESTDIR)$(filterdir)  install-doc: install-man install-html install-pdf 
diff --git a/Makefile b/Makefile
index 4b83ac7..4df95b4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.8.3
 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
 INSTALL = install
+COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
@@ -77,7 +78,7 @@ install: all
 	$(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
 	$(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
-	$(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+	$(COPYTREE)  filters/* $(DESTDIR)$(filterdir)
 
 install-doc: install-man install-html install-pdf
 
diff --git a/cgit.css b/cgit.cssindex a50d62b..d467c66 100644--- a/cgit.css+++ b/cgit.css@@ -800,17 +800,3 @@ div#cgit table.ssdiff td.space { div#cgit table.ssdiff td.space div { 	min-height: 3em; }--/* Syntax highlighting */-div#cgit table.blob .num  { color:#2928ff; }-div#cgit table.blob .esc  { color:#ff00ff; }-div#cgit table.blob .str  { color:#ff0000; }-div#cgit table.blob .dstr { color:#818100; }-div#cgit table.blob .slc  { color:#838183; font-style:italic; }-div#cgit table.blob .com  { color:#838183; font-style:italic; }-div#cgit table.blob .dir  { color:#008200; }-div#cgit table.blob .sym  { color:#000000; }-div#cgit table.blob .kwa  { color:#000000; font-weight:bold; }-div#cgit table.blob .kwb  { color:#830000; }-div#cgit table.blob .kwc  { color:#000000; font-weight:bold; }-div#cgit table.blob .kwd  { color:#010181; }
diff --git a/cgit.css b/cgit.css
index a50d62b..d467c66 100644
--- a/cgit.css
+++ b/cgit.css
@@ -800,17 +800,3 @@ div#cgit table.ssdiff td.space {
 div#cgit table.ssdiff td.space div {
 	min-height: 3em;
 }
-
-/* Syntax highlighting */
-div#cgit table.blob .num  { color:#2928ff; }
-div#cgit table.blob .esc  { color:#ff00ff; }
-div#cgit table.blob .str  { color:#ff0000; }
-div#cgit table.blob .dstr { color:#818100; }
-div#cgit table.blob .slc  { color:#838183; font-style:italic; }
-div#cgit table.blob .com  { color:#838183; font-style:italic; }
-div#cgit table.blob .dir  { color:#008200; }
-div#cgit table.blob .sym  { color:#000000; }
-div#cgit table.blob .kwa  { color:#000000; font-weight:bold; }
-div#cgit table.blob .kwb  { color:#830000; }
-div#cgit table.blob .kwc  { color:#000000; font-weight:bold; }
-div#cgit table.blob .kwd  { color:#010181; }
diff --git a/filters/about-formatting.sh b/filters/about-formatting.shnew file mode 100755index 0000000..313a4e6--- /dev/null+++ b/filters/about-formatting.sh@@ -0,0 +1,27 @@+#!/bin/sh++# This may be used with the about-filter or repo.about-filter setting in cgitrc.+# It passes formatting of about pages to differing programs, depending on the usage.++# Markdown support requires perl.+# RestructuredText support requires python and docutils.+# Man page support requires groff.++# The following environment variables can be used to retrieve the configuration+# of the repository for which this script is called:+# CGIT_REPO_URL        ( = repo.url       setting )+# CGIT_REPO_NAME       ( = repo.name      setting )+# CGIT_REPO_PATH       ( = repo.path      setting )+# CGIT_REPO_OWNER      ( = repo.owner     setting )+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )+# CGIT_REPO_SECTION    ( = section        setting )+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )++cd "$(dirname $0)/html-converters/"+case "$(tr '[:upper:]' '[:lower:]' <<<"$1")" in+	*.md|*.mkd) exec ./md2html; ;;+	*.rst) exec ./rst2html; ;;+	*.[1-9]) exec ./man2html; ;;+	*.htm|*.html) exec cat; ;;+	*.txt|*) exec ./txt2html; ;;+esac
diff --git a/filters/about-formatting.sh b/filters/about-formatting.sh
new file mode 100755
index 0000000..313a4e6
--- /dev/null
+++ b/filters/about-formatting.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# This may be used with the about-filter or repo.about-filter setting in cgitrc.
+# It passes formatting of about pages to differing programs, depending on the usage.
+
+# Markdown support requires perl.
+# RestructuredText support requires python and docutils.
+# Man page support requires groff.
+
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+
+cd "$(dirname $0)/html-converters/"
+case "$(tr '[:upper:]' '[:lower:]' <<<"$1")" in
+	*.md|*.mkd) exec ./md2html; ;;
+	*.rst) exec ./rst2html; ;;
+	*.[1-9]) exec ./man2html; ;;
+	*.htm|*.html) exec cat; ;;
+	*.txt|*) exec ./txt2html; ;;
+esac
diff --git a/filters/html-converters/man2html b/filters/html-converters/man2htmlnew file mode 100755index 0000000..1b28437--- /dev/null+++ b/filters/html-converters/man2html@@ -0,0 +1,5 @@+#!/bin/sh+echo "<div style=\"font-family: monospace\">"+groff -mandoc -T html -P -r -P -l | egrep -v '(<html>|<head>|<meta|<title>|</title>|</head>|<body>|</body>|</html>|<!DOCTYPE|"http://www.w3.org)'+echo "</div>"+
diff --git a/filters/html-converters/man2html b/filters/html-converters/man2html
new file mode 100755
index 0000000..1b28437
--- /dev/null
+++ b/filters/html-converters/man2html
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo "<div style=\"font-family: monospace\">"
+groff -mandoc -T html -P -r -P -l | egrep -v '(<html>|<head>|<meta|<title>|</title>|</head>|<body>|</body>|</html>|<!DOCTYPE|"http://www.w3.org)'
+echo "</div>"
+
diff --git a/filters/html-converters/md2html b/filters/html-converters/md2htmlnew file mode 100755index 0000000..5cab749--- /dev/null+++ b/filters/html-converters/md2html@@ -0,0 +1,2 @@+#!/bin/sh+exec "$(dirname "$0")/resources/markdown.pl"
diff --git a/filters/html-converters/md2html b/filters/html-converters/md2html
new file mode 100755
index 0000000..5cab749
--- /dev/null
+++ b/filters/html-converters/md2html
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$(dirname "$0")/resources/markdown.pl"
diff --git a/filters/html-converters/resources/markdown.pl b/filters/html-converters/resources/markdown.plnew file mode 100755index 0000000..abec173--- /dev/null+++ b/filters/html-converters/resources/markdown.plThis diff is too large to be rendered inline. View it on its own page.
diff --git a/filters/html-converters/resources/markdown.pl b/filters/html-converters/resources/markdown.pl
new file mode 100755
index 0000000..abec173
--- /dev/null
+++ b/filters/html-converters/resources/markdown.pl
This diff is too large to be rendered inline. View it on its own page.
diff --git a/filters/html-converters/resources/rst-template.txt b/filters/html-converters/resources/rst-template.txtnew file mode 100644index 0000000..43cde42--- /dev/null+++ b/filters/html-converters/resources/rst-template.txt@@ -0,0 +1,4 @@+%(stylesheet)s+%(body_pre_docinfo)s+%(docinfo)s+%(body)s
diff --git a/filters/html-converters/resources/rst-template.txt b/filters/html-converters/resources/rst-template.txt
new file mode 100644
index 0000000..43cde42
--- /dev/null
+++ b/filters/html-converters/resources/rst-template.txt
@@ -0,0 +1,4 @@
+%(stylesheet)s
+%(body_pre_docinfo)s
+%(docinfo)s
+%(body)s
diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2htmlnew file mode 100755index 0000000..c51f5be--- /dev/null+++ b/filters/html-converters/rst2html@@ -0,0 +1,2 @@+#!/bin/sh+rst2html.py --template="$(dirname $0)/resources/rst-template.txt"
diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2html
new file mode 100755
index 0000000..c51f5be
--- /dev/null
+++ b/filters/html-converters/rst2html
@@ -0,0 +1,2 @@
+#!/bin/sh
+rst2html.py --template="$(dirname $0)/resources/rst-template.txt"
diff --git a/filters/html-converters/txt2html b/filters/html-converters/txt2htmlnew file mode 100755index 0000000..a795995--- /dev/null+++ b/filters/html-converters/txt2html@@ -0,0 +1,4 @@+#!/bin/sh+echo "<pre>"+cat+echo "</pre>"
diff --git a/filters/html-converters/txt2html b/filters/html-converters/txt2html
new file mode 100755
index 0000000..a795995
--- /dev/null
+++ b/filters/html-converters/txt2html
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "<pre>"
+cat
+echo "</pre>"
diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.pynew file mode 100755index 0000000..dcdba03--- /dev/null+++ b/filters/syntax-highlighting.py@@ -0,0 +1,38 @@+#!/usr/bin/env python3++# This script uses Pygments and Python3. You must have both installed for this to work.+# http://pygments.org/+# http://python.org/+#+# It may be used with the source-filter or repo.source-filter settings in cgitrc.+#+# The following environment variables can be used to retrieve the configuration+# of the repository for which this script is called:+# CGIT_REPO_URL        ( = repo.url       setting )+# CGIT_REPO_NAME       ( = repo.name      setting )+# CGIT_REPO_PATH       ( = repo.path      setting )+# CGIT_REPO_OWNER      ( = repo.owner     setting )+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )+# CGIT_REPO_SECTION    ( = section        setting )+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )+++import sys+import cgi+import codecs+from pygments.lexers import get_lexer_for_filename+from pygments import highlight+from pygments.formatters import HtmlFormatter++sys.stdin = codecs.getreader("utf-8")(sys.stdin.detach())+doc = sys.stdin.read()+try:+	lexer = get_lexer_for_filename(sys.argv[1])+	formatter = HtmlFormatter(style='pastie')+	sys.stdout.write("<style>")+	sys.stdout.write(formatter.get_style_defs('.highlight'))+	sys.stdout.write("</style>")++	highlight(doc, lexer, formatter, sys.stdout)+except:+	sys.stdout.write(str(cgi.escape(doc).encode("ascii", "xmlcharrefreplace"), "ascii"))
diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.py
new file mode 100755
index 0000000..dcdba03
--- /dev/null
+++ b/filters/syntax-highlighting.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+
+# This script uses Pygments and Python3. You must have both installed for this to work.
+# http://pygments.org/
+# http://python.org/
+#
+# It may be used with the source-filter or repo.source-filter settings in cgitrc.
+#
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+
+
+import sys
+import cgi
+import codecs
+from pygments.lexers import get_lexer_for_filename
+from pygments import highlight
+from pygments.formatters import HtmlFormatter
+
+sys.stdin = codecs.getreader("utf-8")(sys.stdin.detach())
+doc = sys.stdin.read()
+try:
+	lexer = get_lexer_for_filename(sys.argv[1])
+	formatter = HtmlFormatter(style='pastie')
+	sys.stdout.write("<style>")
+	sys.stdout.write(formatter.get_style_defs('.highlight'))
+	sys.stdout.write("</style>")
+
+	highlight(doc, lexer, formatter, sys.stdout)
+except:
+	sys.stdout.write(str(cgi.escape(doc).encode("ascii", "xmlcharrefreplace"), "ascii"))