[Lxr-commits] CVS: lxr/templates lxr.conf,1.3,1.4

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv24731/templates

Modified Files:
	lxr.conf 
Log Message:
Adds proper import/package hyperlinking for Java.
Fixes bug #447979

Also fixes problem with the example lxr.conf and the new tabwidth code


Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lxr.conf	2001/10/16 20:25:32	1.3
+++ lxr.conf	2001/11/14 15:27:36	1.4
@@ -72,19 +72,20 @@
   'graphicfile' => '(?i)\.(gif|jpg|jpeg|pjpg|pjpeg|xbm|png)$',
 
   # How to map files to languages
-  # format is name, regex, module
-  'filetype' => [
+  # Note that the string for the key and the first entry in the
+  # array MUST match
+  'filetype' => {
 				 # Format is
-				 # Language name, filepatten regexp, module to envoke
+				 # Language name, filepatten regexp, module to invoke, tabwidth
 				 # Note that to have another language supported by Generic.pm,
 				 # you must ensure that:
 				 # a) exuberant ctags supports it
 				 # b) generic.conf is updated to specify information about the language
 				 # c) the name of the language given here matches the entry in generic.conf
-				 ['C', '\.c$' #'
-				  , 'LXR::Lang::Generic'],
-				 ['C++', '\.C$|((?i)\.c\+\+$|\.cc$|\.cpp$|\.cxx$|\.h$|\.hh$|\.hpp$|\.hxx$|\.h\+\+$)' #'
-				  , 'LXR::Lang::Generic'],
+				 'C' => ['C', '\.c$' #'
+				  , 'LXR::Lang::Generic', '8'],
+				 'C++' => ['C++', '\.C$|((?i)\.c\+\+$|\.cc$|\.cpp$|\.cxx$|\.h$|\.hh$|\.hpp$|\.hxx$|\.h\+\+$)' #'
+				  , 'LXR::Lang::Generic', '8'],
 
 # Some languages are commented out until the relevant entries in generic.conf are made
 # The list here is the set supported by ctags 5.0.1
@@ -96,20 +97,20 @@
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Fortran', '(?i)\.f$|\.for$|\.ftn$|\.f77$|\.f90$|\.f95$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				 ['Java', '(?i)\.java$'   #'
-				  , 'LXR::Lang::Generic'],
+				 'Java' => ['Java', '(?i)\.java$'   #'
+				  , 'LXR::Lang::Java', '4'],
 # 				 ['Lisp', '(?i)\.cl$|\.clisp$|\.el$|\.l$|\.lisp$|\.lsp$|\.ml$'   #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Make', '(?i)\.mak$|makefile*' #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Pascal', '(?i)\.p$|\.pas$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				 ['Perl', '(?i)\.pl$|\.pm$|\.perl$'   #'
-				  , 'LXR::Lang::Generic'],
- 				 ['php', '(?i)\.php$|\.php3$|\.phtml$'   #'
- 				  , 'LXR::Lang::Generic'],
-				 ['Python', '(?i)\.py$|\.python$'   #'
-				  , 'LXR::Lang::Generic'],
+				 'Perl' => ['Perl', '(?i)\.pl$|\.pm$|\.perl$'   #'
+				  , 'LXR::Lang::Generic', '4'],
+ 				 'php' => ['php', '(?i)\.php$|\.php3$|\.phtml$'   #'
+ 				  , 'LXR::Lang::Generic', '2'],
+				 'Python' => ['Python', '(?i)\.py$|\.python$'   #'
+				  , 'LXR::Lang::Generic', '4'],
 # 				 ['rexx', '(?i)\.cmd$|\.rexx$|\.rx$'   #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['ruby', '(?i)\.rb$'   #'
@@ -122,7 +123,7 @@
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['tcl', '(?i)\.tcl$|\.wish$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				],
+				},
   
   # If dbname is a directory the db-file databases will be stored here
   # if a relational database is used the name is a dbi database specifier