From 375353caffb0a251e7f0174aa9b73cc1961e93fd Mon Sep 17 00:00:00 2001
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Sun, 18 Mar 2012 11:38:26 +0000
Subject: filters/highlight.sh: manually support highlight version 2 and 3
---
filters/syntax-highlighting.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'filters')
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6b1c576..3fe7fa1 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -31,4 +31,15 @@ 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
+#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
--
cgit 1.3.0-6-gf8a5
From f50be7fda0a7ab57009169dd5905fcbab8eb5166 Mon Sep 17 00:00:00 2001
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Sun, 18 Mar 2012 11:48:01 +0000
Subject: filters/syntax-highlighting.sh: work around highlight --force bug
---
filters/syntax-highlighting.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(limited to 'filters')
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
--
cgit 1.3.0-6-gf8a5