@@ -2,8 +2,8 @@ Based on highlight: http://www.andre-simon.de/index.html
 (Was based on pygments: http://pygments.org)
 
 When installing a new version of highlight, make sure to update the 
-"highlight" symlink in the project dir.  Also patch with 
-highlight-2.6.6-getConfDir.diff if necessary.
+"highlight" symlink in the project dir.  Also merge in any updates to 
+filetypes.conf
 
 The version is handled in the Current Project Version variable in the project.
 
 
@@ -3,7 +3,7 @@
 # This file is a part of highlight, a free source code converter released under the GPL.
 #
 # Format: $ext(lang) = <extensions of source files>
-#         where lang is the file name of the language definition (eg php.lang)
+#         where lang is the file name of the language definition
 # If there exists only one extension, you do not have to list it here.
 # See README in the highlight directory for details.
 #
@@ -13,38 +13,49 @@
 
 # Modified by Nathan Gray <n8@n8gray.org>
 
-$ext(c)=c++ cpp CPP C cxx cc h hh hxx hpp H HPP pch cp pch++
-$ext(php)=php3 php4
-$ext(vb)=bas basic bi vbs
-$ext(pl)=perl cgi pm plx plex
-$ext(rb)=ruby rjs
-$ext(cob)=cobol
-$ext(sh)=bash command
-#$ext(sh)=bash
-$ext(f77)=f F for ftn
+$ext(ada)=adb ads a gnad
+$ext(ampl)=dat run
+$ext(amtrix)=s4 s4t s4h hnd t4
+$ext(asm)=a51 29k 68s 68x x68
+$ext(asp)=asa
+$ext(ats)=dats
+$ext(aspect)=was wud
+$ext(bat)=cmd
+$ext(c)=c++ cpp cxx cc h hh hxx hpp pch cp pch++
+$ext(cfc)=cfm
+$ext(cob)=cbl
+$ext(diff)=patch
+$ext(e)=se
+$ext(erl)=hrl
+$ext(euphoria)=ex exw exu ew eu
+$ext(f77)=f for ftn
 $ext(f90)=f95
-$ext(xml)=html htm xhtml sgm sgml nrm ent hdr hub dtd wml vxml wml tld svg xsl jnlp ecf rhtml erb
+$ext(haskell)=hs icl
+$ext(java)=groovy grv
+$ext(lisp)=asd cl clisp el lsp sbcl
 $ext(make)=mak mk
-$ext(amtrix)=S4 S4T S4H HND T4
-$ext(euphoria)=ex exw exu ew eu
-$ext(aspect)=was wud
-$ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
-$ext(pike)=pmod
+$ext(mib)=smi
+$ext(ml)=mli ocaml mll mly
 $ext(mod3)=mod m3 i3 ig mg
+$ext(oberon)=ooc
+$ext(objc)=mm
+$ext(php)=php3 php4 php5 php6
+$ext(pike)=pmod
+$ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
+$ext(pl)=perl cgi pm plx plex
+$ext(progress)=p i w
+$ext(rb)=ruby pp rjs
 $ext(rexx)=rex rx the
-$ext(ada)=adb ads a
-$ext(ampl)=dat run
+$ext(sh)=bash ebuild eclass command
+$ext(smalltalk)=st gst sq
 $ext(sybase)=sp
-$ext(ml)=mli mll mly
-$ext(haskell)=hs
-$ext(cfc)=cfm
-$ext(mib)=smi
-$ext(progress)=p i w
-$ext(bat)=cmd
-$ext(diff)=patch
-$ext(objc)=mm
+$ext(tcl)=wish itcl
+$ext(tex)=sty cls
+$ext(vb)=bas basic bi vbs
 $ext(verilog)=v
-$ext(lisp)=lsp asd el
+$ext(html)=htm xhtml
+$ext(xml)=sgm sgml nrm ent hdr hub dtd wml vxml wml tld svg xsl ecf jnlp
+$ext(fs)=fsx
 
 # Input file recognition
 # Highlight matches the first input line with the listed expressions.
 
@@ -0,0 +1,45 @@
+--- highlight/filetypes.conf	2009-09-07 13:33:02.000000000 -0700
++++ filetypes.conf	2009-09-19 23:34:53.000000000 -0700
+@@ -11,6 +11,8 @@
+ # andre.simon1@gmx.de
+ # http:/www.andre-simon.de/
+ 
++# Modified by Nathan Gray <n8@n8gray.org>
++
+ $ext(ada)=adb ads a gnad
+ $ext(ampl)=dat run
+ $ext(amtrix)=s4 s4t s4h hnd t4
+@@ -19,7 +21,7 @@
+ $ext(ats)=dats
+ $ext(aspect)=was wud
+ $ext(bat)=cmd
+-$ext(c)=c++ cpp cxx cc h hh hxx hpp
++$ext(c)=c++ cpp cxx cc h hh hxx hpp pch cp pch++
+ $ext(cfc)=cfm
+ $ext(cob)=cbl
+ $ext(diff)=patch
+@@ -30,12 +32,13 @@
+ $ext(f90)=f95
+ $ext(haskell)=hs icl
+ $ext(java)=groovy grv
+-$ext(lisp)=cl clisp el lsp sbcl
++$ext(lisp)=asd cl clisp el lsp sbcl
+ $ext(make)=mak mk
+ $ext(mib)=smi
+-$ext(ml)=mli ocaml
++$ext(ml)=mli ocaml mll mly
+ $ext(mod3)=mod m3 i3 ig mg
+ $ext(oberon)=ooc
++$ext(objc)=mm
+ $ext(php)=php3 php4 php5 php6
+ $ext(pike)=pmod
+ $ext(pl1)=ff fp fpp rpp sf sp spb spp sps wp wf wpp wps wpb bdy spe
+@@ -43,7 +46,7 @@
+ $ext(progress)=p i w
+ $ext(rb)=ruby pp rjs
+ $ext(rexx)=rex rx the
+-$ext(sh)=bash ebuild eclass
++$ext(sh)=bash ebuild eclass command
+ $ext(smalltalk)=st gst sq
+ $ext(sybase)=sp
+ $ext(tcl)=wish itcl