* [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
@ 2012-03-18 10:44 mailings
2012-03-18 10:44 ` [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug mailings
2012-03-18 11:14 ` [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions larsh
0 siblings, 2 replies; 6+ messages in thread
From: mailings @ 2012-03-18 10:44 UTC (permalink / raw)
From: Ferry Huberts <ferry.huberts at pelagic.nl>
Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
filters/syntax-highlighting.sh | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6283ce9..65baaa0 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -42,4 +42,22 @@ EXTENSION="${BASENAME##*.}"
# map Makefile and Makefile.* to .mk
[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
-exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+#
+# 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 CentOS 5, while version 3 can be
+# found (for example) on CentOS 6.
+#
+# get highlight version
+regex='^[[:space:]]*highlight[[:space:]]+version[[:space:]]+([[:digit:]]+).*'
+highlightVersion=$(highlight --version | grep -E "${regex}" | sed -r "s/${regex}/\1/")
+
+if [[ ${highlightVersion} -le 2 ]]; then
+ # for highlight versions <= 2.x
+ exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+else
+ # for highlight versions >= 3.x
+ exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
+fi
--
1.7.7.6
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug
2012-03-18 10:44 [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions mailings
@ 2012-03-18 10:44 ` mailings
2012-03-18 11:14 ` [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions larsh
1 sibling, 0 replies; 6+ messages in thread
From: mailings @ 2012-03-18 10:44 UTC (permalink / raw)
From: Ferry Huberts <ferry.huberts at pelagic.nl>
Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
---
filters/syntax-highlighting.sh | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 65baaa0..cbc3056 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -59,5 +59,23 @@ if [[ ${highlightVersion} -le 2 ]]; then
exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
else
# for highlight versions >= 3.x
+
+ #
+ # 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
fi
--
1.7.7.6
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
2012-03-18 10:44 [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions mailings
2012-03-18 10:44 ` [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug mailings
@ 2012-03-18 11:14 ` larsh
2012-03-18 11:19 ` mailings
1 sibling, 1 reply; 6+ messages in thread
From: larsh @ 2012-03-18 11:14 UTC (permalink / raw)
On Sun, Mar 18, 2012 at 11:44:16AM +0100, Ferry Huberts wrote:
> From: Ferry Huberts <ferry.huberts at pelagic.nl>
>
> Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
> ---
> filters/syntax-highlighting.sh | 20 +++++++++++++++++++-
> 1 files changed, 19 insertions(+), 1 deletions(-)
>
> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
> index 6283ce9..65baaa0 100755
> --- a/filters/syntax-highlighting.sh
> +++ b/filters/syntax-highlighting.sh
> @@ -42,4 +42,22 @@ EXTENSION="${BASENAME##*.}"
> # map Makefile and Makefile.* to .mk
> [ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
>
> -exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
> +#
> +# 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 CentOS 5, while version 3 can be
> +# found (for example) on CentOS 6.
> +#
> +# get highlight version
> +regex='^[[:space:]]*highlight[[:space:]]+version[[:space:]]+([[:digit:]]+).*'
> +highlightVersion=$(highlight --version | grep -E "${regex}" | sed -r "s/${regex}/\1/")
> +
> +if [[ ${highlightVersion} -le 2 ]]; then
> + # for highlight versions <= 2.x
> + exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
> +else
> + # for highlight versions >= 3.x
> + exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
> +fi
> --
I really don't want the filter scripts to perform any more work than
necessary, so maybe we could to something like this instead:
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6283ce9..183bd68 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -42,4 +42,8 @@ EXTENSION="${BASENAME##*.}"
# map Makefile and Makefile.* to .mk
[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
+# This is for highlight v2
exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+
+# If you're using highlight v3, use this command instead:
+#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
--
larsh
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
2012-03-18 11:14 ` [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions larsh
@ 2012-03-18 11:19 ` mailings
2012-03-18 11:30 ` larsh
0 siblings, 1 reply; 6+ messages in thread
From: mailings @ 2012-03-18 11:19 UTC (permalink / raw)
On 18-03-12 12:14, larsh at hjemli.net wrote:
> On Sun, Mar 18, 2012 at 11:44:16AM +0100, Ferry Huberts wrote:
>> From: Ferry Huberts<ferry.huberts at pelagic.nl>
>>
>> Signed-off-by: Ferry Huberts<ferry.huberts at pelagic.nl>
>> ---
>> filters/syntax-highlighting.sh | 20 +++++++++++++++++++-
>> 1 files changed, 19 insertions(+), 1 deletions(-)
>>
>> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
>> index 6283ce9..65baaa0 100755
>> --- a/filters/syntax-highlighting.sh
>> +++ b/filters/syntax-highlighting.sh
>> @@ -42,4 +42,22 @@ EXTENSION="${BASENAME##*.}"
>> # map Makefile and Makefile.* to .mk
>> [ "${BASENAME%%.*}" == "Makefile" ]&& EXTENSION=mk
>>
>> -exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
>> +#
>> +# 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 CentOS 5, while version 3 can be
>> +# found (for example) on CentOS 6.
>> +#
>> +# get highlight version
>> +regex='^[[:space:]]*highlight[[:space:]]+version[[:space:]]+([[:digit:]]+).*'
>> +highlightVersion=$(highlight --version | grep -E "${regex}" | sed -r "s/${regex}/\1/")
>> +
>> +if [[ ${highlightVersion} -le 2 ]]; then
>> + # for highlight versions<= 2.x
>> + exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
>> +else
>> + # for highlight versions>= 3.x
>> + exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
>> +fi
>> --
> I really don't want the filter scripts to perform any more work than
> necessary, so maybe we could to something like this instead:
>
> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
> index 6283ce9..183bd68 100755
> --- a/filters/syntax-highlighting.sh
> +++ b/filters/syntax-highlighting.sh
> @@ -42,4 +42,8 @@ EXTENSION="${BASENAME##*.}"
> # map Makefile and Makefile.* to .mk
> [ "${BASENAME%%.*}" == "Makefile" ]&& EXTENSION=mk
>
> +# This is for highlight v2
> exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
> +
> +# If you're using highlight v3, use this command instead:
> +#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
> --
> larsh
fine with me. I just thought making it automatic was the way to go. this
is perfectly ok with me.
can you retain the comment though?
--
Ferry Huberts
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
2012-03-18 11:19 ` mailings
@ 2012-03-18 11:30 ` larsh
2012-03-18 11:33 ` mailings
0 siblings, 1 reply; 6+ messages in thread
From: larsh @ 2012-03-18 11:30 UTC (permalink / raw)
On Sun, Mar 18, 2012 at 12:19:34PM +0100, Ferry Huberts wrote:
>
>
> On 18-03-12 12:14, larsh at hjemli.net wrote:
> >I really don't want the filter scripts to perform any more work than
> >necessary, so maybe we could to something like this instead:
> >
> >diff --git a/filters/syntax-highlighting.sh
> >b/filters/syntax-highlighting.sh
> >index 6283ce9..183bd68 100755
> >--- a/filters/syntax-highlighting.sh
> >+++ b/filters/syntax-highlighting.sh
> >@@ -42,4 +42,8 @@ EXTENSION="${BASENAME##*.}"
> > # map Makefile and Makefile.* to .mk
> > [ "${BASENAME%%.*}" == "Makefile" ]&& EXTENSION=mk
> >
> >+# This is for highlight v2
> > exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
> >+
> >+# If you're using highlight v3, use this command instead:
> >+#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
> >--
> >larsh
>
> fine with me. I just thought making it automatic was the way to go. this
> is perfectly ok with me.
> can you retain the comment though?
Certainly, and I'll do something similar with the --force bug in patch 2/2.
--
larsh
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions
2012-03-18 11:30 ` larsh
@ 2012-03-18 11:33 ` mailings
0 siblings, 0 replies; 6+ messages in thread
From: mailings @ 2012-03-18 11:33 UTC (permalink / raw)
while you're at it, just realized that it's not CentOS 5/6 but EPEL
5/6... :-)
On 18-03-12 12:30, larsh at hjemli.net wrote:
> On Sun, Mar 18, 2012 at 12:19:34PM +0100, Ferry Huberts wrote:
>>
>> On 18-03-12 12:14, larsh at hjemli.net wrote:
>>> I really don't want the filter scripts to perform any more work than
>>> necessary, so maybe we could to something like this instead:
>>>
>>> diff --git a/filters/syntax-highlighting.sh
>>> b/filters/syntax-highlighting.sh
>>> index 6283ce9..183bd68 100755
>>> --- a/filters/syntax-highlighting.sh
>>> +++ b/filters/syntax-highlighting.sh
>>> @@ -42,4 +42,8 @@ EXTENSION="${BASENAME##*.}"
>>> # map Makefile and Makefile.* to .mk
>>> [ "${BASENAME%%.*}" == "Makefile" ]&& EXTENSION=mk
>>>
>>> +# This is for highlight v2
>>> exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
>>> +
>>> +# If you're using highlight v3, use this command instead:
>>> +#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null
>>> --
>>> larsh
>> fine with me. I just thought making it automatic was the way to go. this
>> is perfectly ok with me.
>> can you retain the comment though?
> Certainly, and I'll do something similar with the --force bug in patch 2/2.
>
> --
> larsh
--
Ferry Huberts
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-18 11:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-18 10:44 [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions mailings
2012-03-18 10:44 ` [PATCH v3 RESEND 2/2] highlight: add a workaround for the --force bug mailings
2012-03-18 11:14 ` [PATCH v3 RESEND 1/2] highlight: fix commandline options for different highlight versions larsh
2012-03-18 11:19 ` mailings
2012-03-18 11:30 ` larsh
2012-03-18 11:33 ` mailings
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).