about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFerry Huberts <ferry.huberts@pelagic.nl>2012-03-18 11:48:01 +0000
committerLars Hjemli <hjemli@gmail.com>2012-03-18 20:12:36 +0000
commitf50be7fda0a7ab57009169dd5905fcbab8eb5166 (patch)
treec2d167f39385fa17733379137fe82d58f5cd849f
parentfilters/highlight.sh: manually support highlight version 2 and 3 (diff)
downloadcgit-pink-f50be7fda0a7ab57009169dd5905fcbab8eb5166.tar.gz
cgit-pink-f50be7fda0a7ab57009169dd5905fcbab8eb5166.zip
filters/syntax-highlighting.sh: work around highlight --force bug
Diffstat (limited to '')
-rwxr-xr-xfilters/syntax-highlighting.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 3fe7fa1..0acdf12 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -42,4 +42,21 @@ EXTENSION="${BASENAME##*.}"
 exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
 
 # This is for version 3
+#
+# On CentOS 6.2 (using highlight from EPEL), when highlight doesn't know about
+# an EXTENSION, it outputs a lua error and _no_ text, even when the --force
+# option is used.
+#
+# Also see the bug reports at:
+# http://sourceforge.net/tracker/?func=detail&aid=3490017&group_id=215618&atid=1034391
+# https://bugzilla.redhat.com/show_bug.cgi?id=795567
+#
+# This workaround can be removed when the bug is fixed upstream and the new
+# version is packaged in most distributions.
+#
+# The workaround is to set the extension to 'txt' (plain text) when highlight
+# exits with an error (doesn't know the format).
+#
+#echo "test" | highlight -f -I -O xhtml -S $EXTENSION &>/dev/null
+#[ ${?} -ne 0 ] && EXTENSION="txt"
 #exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
class='logheader'>2019-02-27Fix make target pattern whitespace in hiJune McEnroe 2019-02-27Delete extraneous <pre> in html.shJune McEnroe 2019-02-24Use setopt in upJune McEnroe 2019-02-24Add setoptJune McEnroe 2019-02-20Match make targets as TagJune McEnroe 2019-02-20Use $PWD in html.sh to pass absolute path to manJune McEnroe 2019-02-20Factor out html.sh and produce html for all sourcesJune McEnroe Except for gfx-cocoa because I don't have an Objective-C highlighter. Also hypothetically the .h rule could match up headers with .3 manual pages if I cared to write them. 2019-02-20Add Dirk Gently's Holistic Detective AgencyJune McEnroe 2019-02-20Move /opt/pkg after /usr in PATHJune McEnroe Installing mandoc from pkgsrc also installs a man executable which is horribly broken. Keep using the system man. 2019-02-20Set man_hard_wrap in nvimJune McEnroe Vendoring man.vim until <https://github.com/neovim/neovim/pull/9633> is merged and appears in a release. 2019-02-18Use hi -o anchor in upJune McEnroe 2019-02-18Don't match nested parentheses in Tag for CJune McEnroe Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe