Author: rey4
Date: Tue Mar 21 14:47:11 2006
New Revision: 1292
Modified:
trunk/INSTALL
trunk/lib/config.py
trunk/lib/viewvc.py
trunk/viewvc.conf.dist
trunk/viewvc.org/upgrading.html
Log:
Get rid of Highlight line number workaround. Highlight 2.4.5 came out
yesterday and fixes all the issues we had with line numbering. This change
also allows ViewVC to work with old versions of Highlight all the way back
to 2.2.10.
Also, remove "highlight_style" configuration option as suggested by
Andreas Amann (aamann) in issue 126.
* INSTALL
document new version requirements
* lib/viewvc.py
(MarkupHighlight.__init__):
stop passing --style and --line-number-start options to highlight
* lib/config.py
* viewvc.conf.dist
* viewvc.org/upgrading.html
remove "highlight_style" option
Modified: trunk/INSTALL
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/INSTALL?view=diff&rev=1292&p1=trunk/INSTALL&r1=1291&p2=trunk/INSTALL&r2=1292
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Tue Mar 21 14:47:11 2006
@@ -44,8 +44,9 @@
(http://sourceforge.net/projects/mysql-python)
* Enscript, code colorizer
(http://www.codento.com/people/mtr/genscript/)
- * Highlight, code colorizer, 2.4.2 or later
- http://www.andre-simon.de/
+ * Highlight, code colorizer, 2.2.10 or later required, 2.4.5 or
+ later recommended for reliable line numbering
+ (http://www.andre-simon.de/)
* CvsGraph 1.5.0 or later, graphical CVS revision tree generator
(http://www.akhphd.au.dk/~bertho/cvsgraph/)
Modified: trunk/lib/config.py
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/lib/config.py?view=diff&rev=1292&p1=trunk/lib/config.py&r1=1291&p2=trunk/lib/config.py&r2=1292
==============================================================================
--- trunk/lib/config.py (original)
+++ trunk/lib/config.py Tue Mar 21 14:47:11 2006
@@ -206,7 +206,6 @@
self.options.enscript_path = ''
self.options.use_highlight = 0
self.options.highlight_path = ''
- self.options.highlight_style = 'emacs'
self.options.highlight_line_numbers = 1
self.options.highlight_convert_tabs = 2
self.options.use_php = 0
Modified: trunk/lib/viewvc.py
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/lib/viewvc.py?view=diff&rev=1292&p1=trunk/lib/viewvc.py&r1=1291&p2=trunk/lib/viewvc.py&r2=1292
==============================================================================
--- trunk/lib/viewvc.py (original)
+++ trunk/lib/viewvc.py Tue Mar 21 14:47:11 2006
@@ -1243,13 +1243,10 @@
highlight_cmd = [os.path.normpath(os.path.join(cfg.options.highlight_path,
'highlight')),
'--syntax', ext, '--force',
- '--style', str(cfg.options.highlight_style),
'--anchors', '--fragment', '--xhtml']
if cfg.options.highlight_line_numbers:
- ### there doesn't seem to be any way to get highlight to add line
- ### numbers for .txt files, it just ignores these options
- highlight_cmd.extend(['--linenumbers', '--line-number-start', '1'])
+ highlight_cmd.extend(['--linenumbers'])
if cfg.options.highlight_convert_tabs:
highlight_cmd.extend(['--replace-tabs',
Modified: trunk/viewvc.conf.dist
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/viewvc.conf.dist?view=diff&rev=1292&p1=trunk/viewvc.conf.dist&r1=1291&p2=trunk/viewvc.conf.dist&r2=1292
==============================================================================
--- trunk/viewvc.conf.dist (original)
+++ trunk/viewvc.conf.dist Tue Mar 21 14:47:11 2006
@@ -444,9 +444,6 @@
#
# highlight_path = /usr/bin
-# what coloring style should highlight use?
-highlight_style = emacs
-
# should we add line numbers?
highlight_line_numbers = 1
Modified: trunk/viewvc.org/upgrading.html
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/viewvc.org/upgrading.html?view=diff&rev=1292&p1=trunk/viewvc.org/upgrading.html&r1=1291&p2=trunk/viewvc.org/upgrading.html&r2=1292
==============================================================================
--- trunk/viewvc.org/upgrading.html (original)
+++ trunk/viewvc.org/upgrading.html Tue Mar 21 14:47:11 2006
@@ -135,7 +135,6 @@
<li>options/cross_copies</li>
<li>options/use_highlight</li>
<li>options/highlight_path</li>
- <li>options/highlight_style</li>
<li>options/highlight_line_numbers</li>
<li>options/highlight_convert_tabs</li>
<li>options/use_php</li>
|
