* [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8
@ 2013-08-14 12:08 mailings
2013-08-14 12:27 ` cgit
2013-11-09 17:49 ` mailings
0 siblings, 2 replies; 4+ messages in thread
From: mailings @ 2013-08-14 12:08 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 | 44 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 24f6bb4..5da1b38 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -9,7 +9,9 @@
#
# Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
# highlighting, so you'll probably want something like the following included
-# in your css file (generated by highlight 2.4.8 and adapted for cgit):
+# in your css file:
+#
+# Style definition file generated by highlight 2.4.8, http://www.andre-simon.de/
#
# table.blob .num { color:#2928ff; }
# table.blob .esc { color:#ff00ff; }
@@ -24,6 +26,46 @@
# table.blob .kwc { color:#000000; font-weight:bold; }
# table.blob .kwd { color:#010181; }
#
+#
+# Style definition file generated by highlight 2.6.14, http://www.andre-simon.de/
+#
+# body.hl { background-color:#ffffff; }
+# pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
+# .hl.num { color:#2928ff; }
+# .hl.esc { color:#ff00ff; }
+# .hl.str { color:#ff0000; }
+# .hl.dstr { color:#818100; }
+# .hl.slc { color:#838183; font-style:italic; }
+# .hl.com { color:#838183; font-style:italic; }
+# .hl.dir { color:#008200; }
+# .hl.sym { color:#000000; }
+# .hl.line { color:#555555; }
+# .hl.mark { background-color:#ffffbb;}
+# .hl.kwa { color:#000000; font-weight:bold; }
+# .hl.kwb { color:#830000; }
+# .hl.kwc { color:#000000; font-weight:bold; }
+# .hl.kwd { color:#010181; }
+#
+#
+# Style definition file generated by highlight 3.8, http://www.andre-simon.de/
+#
+# body.hl { background-color:#e0eaee; }
+# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New';}
+# .hl.num { color:#b07e00; }
+# .hl.esc { color:#ff00ff; }
+# .hl.str { color:#bf0303; }
+# .hl.pps { color:#818100; }
+# .hl.slc { color:#838183; font-style:italic; }
+# .hl.com { color:#838183; font-style:italic; }
+# .hl.ppc { color:#008200; }
+# .hl.opt { color:#000000; }
+# .hl.lin { color:#555555; }
+# .hl.kwa { color:#000000; font-weight:bold; }
+# .hl.kwb { color:#0057ae; }
+# .hl.kwc { color:#000000; font-weight:bold; }
+# .hl.kwd { color:#010181; }
+#
+#
# 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 )
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8
2013-08-14 12:08 [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8 mailings
@ 2013-08-14 12:27 ` cgit
2013-08-14 13:15 ` mailings
2013-11-09 17:49 ` mailings
1 sibling, 1 reply; 4+ messages in thread
From: cgit @ 2013-08-14 12:27 UTC (permalink / raw)
On Wed, Aug 14, 2013 at 02:08:22PM +0200, 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 | 44 +++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
> index 24f6bb4..5da1b38 100755
> --- a/filters/syntax-highlighting.sh
> +++ b/filters/syntax-highlighting.sh
> @@ -9,7 +9,9 @@
> #
> # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
> # highlighting, so you'll probably want something like the following included
> -# in your css file (generated by highlight 2.4.8 and adapted for cgit):
> +# in your css file:
> +#
> +# Style definition file generated by highlight 2.4.8, http://www.andre-simon.de/
> #
> # table.blob .num { color:#2928ff; }
> # table.blob .esc { color:#ff00ff; }
> @@ -24,6 +26,46 @@
> # table.blob .kwc { color:#000000; font-weight:bold; }
> # table.blob .kwd { color:#010181; }
> #
> +#
> +# Style definition file generated by highlight 2.6.14, http://www.andre-simon.de/
> +#
> +# body.hl { background-color:#ffffff; }
> +# pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
> +# .hl.num { color:#2928ff; }
> +# .hl.esc { color:#ff00ff; }
> +# .hl.str { color:#ff0000; }
> +# .hl.dstr { color:#818100; }
> +# .hl.slc { color:#838183; font-style:italic; }
> +# .hl.com { color:#838183; font-style:italic; }
> +# .hl.dir { color:#008200; }
> +# .hl.sym { color:#000000; }
> +# .hl.line { color:#555555; }
> +# .hl.mark { background-color:#ffffbb;}
> +# .hl.kwa { color:#000000; font-weight:bold; }
> +# .hl.kwb { color:#830000; }
> +# .hl.kwc { color:#000000; font-weight:bold; }
> +# .hl.kwd { color:#010181; }
Are you sure these are adapted for cgit? Because they look totally
different than he style definitions for highlight 2.4.8 above
("table.blob .num" vs ".hl.num").
Did you test this?
> +#
> +#
> +# Style definition file generated by highlight 3.8, http://www.andre-simon.de/
> +#
> +# body.hl { background-color:#e0eaee; }
> +# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New';}
> +# .hl.num { color:#b07e00; }
> +# .hl.esc { color:#ff00ff; }
> +# .hl.str { color:#bf0303; }
> +# .hl.pps { color:#818100; }
> +# .hl.slc { color:#838183; font-style:italic; }
> +# .hl.com { color:#838183; font-style:italic; }
> +# .hl.ppc { color:#008200; }
> +# .hl.opt { color:#000000; }
> +# .hl.lin { color:#555555; }
> +# .hl.kwa { color:#000000; font-weight:bold; }
> +# .hl.kwb { color:#0057ae; }
> +# .hl.kwc { color:#000000; font-weight:bold; }
> +# .hl.kwd { color:#010181; }
> +#
> +#
> # 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 )
> --
> 1.8.3.1
>
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> http://lists.zx2c4.com/mailman/listinfo/cgit
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8
2013-08-14 12:27 ` cgit
@ 2013-08-14 13:15 ` mailings
0 siblings, 0 replies; 4+ messages in thread
From: mailings @ 2013-08-14 13:15 UTC (permalink / raw)
On 14/08/13 14:27, Lukas Fleischer wrote:
> On Wed, Aug 14, 2013 at 02:08:22PM +0200, 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 | 44 +++++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 43 insertions(+), 1 deletion(-)
>>
>> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
>> index 24f6bb4..5da1b38 100755
>> --- a/filters/syntax-highlighting.sh
>> +++ b/filters/syntax-highlighting.sh
>> @@ -9,7 +9,9 @@
>> #
>> # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
>> # highlighting, so you'll probably want something like the following included
>> -# in your css file (generated by highlight 2.4.8 and adapted for cgit):
>> +# in your css file:
>> +#
>> +# Style definition file generated by highlight 2.4.8, http://www.andre-simon.de/
>> #
>> # table.blob .num { color:#2928ff; }
>> # table.blob .esc { color:#ff00ff; }
>> @@ -24,6 +26,46 @@
>> # table.blob .kwc { color:#000000; font-weight:bold; }
>> # table.blob .kwd { color:#010181; }
>> #
>> +#
>> +# Style definition file generated by highlight 2.6.14, http://www.andre-simon.de/
>> +#
>> +# body.hl { background-color:#ffffff; }
>> +# pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
>> +# .hl.num { color:#2928ff; }
>> +# .hl.esc { color:#ff00ff; }
>> +# .hl.str { color:#ff0000; }
>> +# .hl.dstr { color:#818100; }
>> +# .hl.slc { color:#838183; font-style:italic; }
>> +# .hl.com { color:#838183; font-style:italic; }
>> +# .hl.dir { color:#008200; }
>> +# .hl.sym { color:#000000; }
>> +# .hl.line { color:#555555; }
>> +# .hl.mark { background-color:#ffffbb;}
>> +# .hl.kwa { color:#000000; font-weight:bold; }
>> +# .hl.kwb { color:#830000; }
>> +# .hl.kwc { color:#000000; font-weight:bold; }
>> +# .hl.kwd { color:#010181; }
>
> Are you sure these are adapted for cgit? Because they look totally
> different than he style definitions for highlight 2.4.8 above
> ("table.blob .num" vs ".hl.num").
>
> Did you test this?
Yes I did (for highlight 3) on my CentOS 6.4 git server.
AFAIK cgit doesn't adjust the generated xhtml.
>
>> +#
>> +#
>> +# Style definition file generated by highlight 3.8, http://www.andre-simon.de/
>> +#
>> +# body.hl { background-color:#e0eaee; }
>> +# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New';}
>> +# .hl.num { color:#b07e00; }
>> +# .hl.esc { color:#ff00ff; }
>> +# .hl.str { color:#bf0303; }
>> +# .hl.pps { color:#818100; }
>> +# .hl.slc { color:#838183; font-style:italic; }
>> +# .hl.com { color:#838183; font-style:italic; }
>> +# .hl.ppc { color:#008200; }
>> +# .hl.opt { color:#000000; }
>> +# .hl.lin { color:#555555; }
>> +# .hl.kwa { color:#000000; font-weight:bold; }
>> +# .hl.kwb { color:#0057ae; }
>> +# .hl.kwc { color:#000000; font-weight:bold; }
>> +# .hl.kwd { color:#010181; }
>> +#
>> +#
>> # 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 )
>> --
>> 1.8.3.1
>>
>> _______________________________________________
>> CGit mailing list
>> CGit at lists.zx2c4.com
>> http://lists.zx2c4.com/mailman/listinfo/cgit
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> http://lists.zx2c4.com/mailman/listinfo/cgit
>
--
Ferry Huberts
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8
2013-08-14 12:08 [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8 mailings
2013-08-14 12:27 ` cgit
@ 2013-11-09 17:49 ` mailings
1 sibling, 0 replies; 4+ messages in thread
From: mailings @ 2013-11-09 17:49 UTC (permalink / raw)
ping
no response for about 3 months...
Jason removed the highlight css declarations in
8149be213f1c8f52b0dbe6c213f6073af57fa954 without a note somewhere on how
to restore the lost functionality.
I consider this a regression since from that point on all production
setups of cgit using highlight would be missing some css.
On 14/08/13 14:08, 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 | 44 +++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
> index 24f6bb4..5da1b38 100755
> --- a/filters/syntax-highlighting.sh
> +++ b/filters/syntax-highlighting.sh
> @@ -9,7 +9,9 @@
> #
> # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
> # highlighting, so you'll probably want something like the following included
> -# in your css file (generated by highlight 2.4.8 and adapted for cgit):
> +# in your css file:
> +#
> +# Style definition file generated by highlight 2.4.8, http://www.andre-simon.de/
> #
> # table.blob .num { color:#2928ff; }
> # table.blob .esc { color:#ff00ff; }
> @@ -24,6 +26,46 @@
> # table.blob .kwc { color:#000000; font-weight:bold; }
> # table.blob .kwd { color:#010181; }
> #
> +#
> +# Style definition file generated by highlight 2.6.14, http://www.andre-simon.de/
> +#
> +# body.hl { background-color:#ffffff; }
> +# pre.hl { color:#000000; background-color:#ffffff; font-size:10pt; font-family:'Courier New';}
> +# .hl.num { color:#2928ff; }
> +# .hl.esc { color:#ff00ff; }
> +# .hl.str { color:#ff0000; }
> +# .hl.dstr { color:#818100; }
> +# .hl.slc { color:#838183; font-style:italic; }
> +# .hl.com { color:#838183; font-style:italic; }
> +# .hl.dir { color:#008200; }
> +# .hl.sym { color:#000000; }
> +# .hl.line { color:#555555; }
> +# .hl.mark { background-color:#ffffbb;}
> +# .hl.kwa { color:#000000; font-weight:bold; }
> +# .hl.kwb { color:#830000; }
> +# .hl.kwc { color:#000000; font-weight:bold; }
> +# .hl.kwd { color:#010181; }
> +#
> +#
> +# Style definition file generated by highlight 3.8, http://www.andre-simon.de/
> +#
> +# body.hl { background-color:#e0eaee; }
> +# pre.hl { color:#000000; background-color:#e0eaee; font-size:10pt; font-family:'Courier New';}
> +# .hl.num { color:#b07e00; }
> +# .hl.esc { color:#ff00ff; }
> +# .hl.str { color:#bf0303; }
> +# .hl.pps { color:#818100; }
> +# .hl.slc { color:#838183; font-style:italic; }
> +# .hl.com { color:#838183; font-style:italic; }
> +# .hl.ppc { color:#008200; }
> +# .hl.opt { color:#000000; }
> +# .hl.lin { color:#555555; }
> +# .hl.kwa { color:#000000; font-weight:bold; }
> +# .hl.kwb { color:#0057ae; }
> +# .hl.kwc { color:#000000; font-weight:bold; }
> +# .hl.kwd { color:#010181; }
> +#
> +#
> # 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 )
>
--
Ferry Huberts
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-09 17:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-14 12:08 [PATCH v1 1/1] filters: highlight.sh: add css comments for highlight 2.6 and 3.8 mailings
2013-08-14 12:27 ` cgit
2013-08-14 13:15 ` mailings
2013-11-09 17:49 ` 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).