diff options
author | Lars Hjemli | 2012-03-18 20:23:30 +0000 |
---|---|---|
committer | Lars Hjemli | 2012-03-18 20:23:30 +0000 |
commit | 08352c7a02f057f6cbaf817ca7e53c53be590a62 (patch) | |
tree | f1fbe011c9279d3e7fd699e6ae3fe1fc89627126 /filters | |
parent | 6e63ebfe004342cbe35e0b0f28de646ffa61933a (diff) | |
parent | f50be7fda0a7ab57009169dd5905fcbab8eb5166 (diff) | |
download | cgit-08352c7a02f057f6cbaf817ca7e53c53be590a62.tar cgit-08352c7a02f057f6cbaf817ca7e53c53be590a62.tar.gz cgit-08352c7a02f057f6cbaf817ca7e53c53be590a62.zip |
Merge branch 'stable'
Diffstat (limited to 'filters')
-rwxr-xr-x | filters/syntax-highlighting.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh index 6283ce9..5fcc9c9 100755 --- a/filters/syntax-highlighting.sh +++ b/filters/syntax-highlighting.sh @@ -42,4 +42,32 @@ EXTENSION="${BASENAME##*.}" # map Makefile and Makefile.* to .mk [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk +# highlight versions 2 and 3 have different commandline options. Specifically, +# the -X option that is used for version 2 is replaced by the -O xhtml option +# for version 3. +# +# Version 2 can be found (for example) on EPEL 5, while version 3 can be +# found (for example) on EPEL 6. +# +# This is for version 2 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 |